diff options
6526 files changed, 150290 insertions, 136923 deletions
diff --git a/.editorconfig b/.editorconfig index 3ff05f9a7fa0a..c9711d519408a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -95,3 +95,9 @@ trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] trim_trailing_whitespace = unset + +[pkgs/tools/virtualization/ovftool/*.ova] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a4a653b175e3b..86787c03a5e32 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -104,9 +104,7 @@ # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh -/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 @mweinelt /pkgs/development/tools/poetry2nix @adisbladis /pkgs/development/interpreters/python/hooks @FRidh @jonringer @@ -134,7 +132,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 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c197f03402397..258c85f9dde8c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,6 +26,7 @@ If applicable, add screenshots to help explain your problem. Add any other context about the problem here. ### Notify maintainers + <!-- Please @ people who are in the `meta.maintainers` list of the offending package or module. If in doubt, check `git blame` for whoever last touched something. diff --git a/.github/ISSUE_TEMPLATE/build_failure.md b/.github/ISSUE_TEMPLATE/build_failure.md index 7e57b2e208a57..dd6d681775ac3 100644 --- a/.github/ISSUE_TEMPLATE/build_failure.md +++ b/.github/ISSUE_TEMPLATE/build_failure.md @@ -1,31 +1,36 @@ --- name: Build failure about: Create a report to help us improve -title: '' +title: 'Build failure: PACKAGENAME' labels: '0.kind: build failure' assignees: '' --- ### Steps To Reproduce + Steps to reproduce the behavior: 1. build *X* ### Build log + ``` log here if short otherwise a link to a gist ``` ### Additional context + Add any other context about the problem here. ### Notify maintainers + <!-- Please @ people who are in the `meta.maintainers` list of the offending package or module. If in doubt, check `git blame` for whoever last touched something. --> ### Metadata + Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. ```console diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index c00dc91bae8fb..3018b6b994489 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -1,7 +1,7 @@ --- name: Missing or incorrect documentation about: Help us improve the Nixpkgs and NixOS reference manuals -title: '' +title: 'Documentation: ' labels: '9.needs: documentation' assignees: '' @@ -11,6 +11,10 @@ assignees: '' <!-- describe your problem --> +## Proposal + +<!-- propose a solution (optional) --> + ## Checklist <!-- make sure this issue is not redundant or obsolete --> @@ -26,7 +30,3 @@ assignees: '' [open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22 [open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22 -## Proposal - -<!-- propose a solution --> - diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index f1535526c2a77..2735534b0bc9b 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -1,24 +1,17 @@ --- name: Out-of-date package reports about: For packages that are out-of-date -title: '' +title: 'Update request: PACKAGENAME OLDVERSION → NEWVERSION' labels: '9.needs: package (update)' assignees: '' --- - -###### Checklist - -<!-- Note that these are hard requirements --> - -<!-- -You can use the "Go to file" functionality on GitHub to find the package -Then you can go to the history for this package -Find the latest "package_name: old_version -> new_version" commit -The "new_version" is the current version of the package ---> -- [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) +- Package name: +- Latest released version: +<!-- Search your package here: https://search.nixos.org/packages?channel=unstable --> +- Current version on the unstable channel: +- Current version on the stable/release channel: <!-- Type the name of your package and try to find an open pull request for the package If you find an open pull request, you can review it! @@ -26,23 +19,10 @@ There's a high chance that you'll have the new version right away while helping --> - [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls) -###### Project name -`nix search` name: -<!-- -The current version can be found easily with the same process as above for checking the master branch -If an open PR is present for the package, take this version as the current one and link to the PR ---> -current version: -desired version: - -###### Notify maintainers -<!-- -Search your package here: https://search.nixos.org/packages?channel=unstable -If no maintainer is listed for your package, tag the person that last updated the package ---> +**Notify maintainers** -maintainers: +<!-- If the search.nixos.org result shows no maintainers, tag the person that last updated the package. --> -###### Note for maintainers +----- -Please tag this issue in your PR. +Note for maintainers: Please tag this issue in your PR. diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md index 1ddcd983f31b2..a76741fa8e6a0 100644 --- a/.github/ISSUE_TEMPLATE/packaging_request.md +++ b/.github/ISSUE_TEMPLATE/packaging_request.md @@ -1,14 +1,15 @@ --- name: Packaging requests about: For packages that are missing -title: '' +title: 'Package request: PACKAGENAME' labels: '0.kind: packaging request' assignees: '' --- **Project description** -_describe the project a little_ + +<!-- Describe the project a little: --> **Metadata** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3d4bb049991f2..5f21df834d56c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,7 +26,6 @@ For new packages please briefly describe the package or provide a link to its ho - [ ] (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 - - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). <!-- diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f402376ebfb03..9a87e0e39588a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v1.1.0 + uses: korthout/backport-action@v1.2.0 with: # Config README: https://github.com/korthout/backport-action#backport-action pull_description: |- diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index c12999e8d0c0c..605d6a30a383f 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v20 - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index ae411fefbe47d..5dd85ca26f9d0 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,16 +28,14 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v20 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - - name: install editorconfig-checker - run: nix-env -iA editorconfig-checker -f '<nixpkgs>' - name: Checking EditorConfig run: | - cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size + cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 08af28fcfb4c4..85c7ac2d69290 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 23f2caf021b89..599840006524c 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index c9f77c191c66d..f571bf773fa4c 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml deleted file mode 100644 index b7f8c495a03f4..0000000000000 --- a/.github/workflows/nixos-manual.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: NixOS manual checks - -permissions: read-all - -on: - pull_request_target: - branches-ignore: - - 'release-**' - paths: - - 'nixos/**/*.xml' - - 'nixos/**/*.md' - -jobs: - tests: - runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' - steps: - - uses: actions/checkout@v3 - with: - # pull_request_target checks out the base branch by default - ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 - - name: Check DocBook files generated from Markdown are consistent - run: | - nixos/doc/manual/md-to-db.sh - git diff --exit-code || { - echo - echo 'Generated manual files are out of date.' - echo 'Please run' - echo - echo ' nixos/doc/manual/md-to-db.sh' - echo - exit 1 - } diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 079147f7d7247..4cf798a654bbe 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19108bb5a8fb6..7ebff3d332dd3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -128,14 +128,17 @@ Anything that does not cause user or downstream dependency regressions can be ba - Security critical applications (E.g. `firefox`) ## Generating 23.05 Release Notes +<!-- +note: title unchanged even though we don't need regeneration because extant +PRs will link here. definitely change the title for 23.11 though. +--> -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. +Documentation in nixpkgs is transitioning to a markdown-centric workflow. In the past release notes required a translation step to convert from markdown to a compatible docbook document, but this is no longer necessary. Steps for updating 23.05 Release notes: 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. +2. Commit changes to `rl-2305.section.md`. ## Reviewing contributions diff --git a/doc/.gitignore b/doc/.gitignore index b5c58be03d150..e532ed0eb9c81 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -6,3 +6,5 @@ functions/library/locations.xml highlightjs manual-full.xml out +result +result-* diff --git a/doc/Makefile b/doc/Makefile index 1e54aef9bd122..ee98a3ee92137 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' PANDOC ?= pandoc pandoc_media_dir = media -# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh) and conversion script (/maintainers/scripts/db-to-md.sh). +# NOTE: Keep in sync with conversion script (/maintainers/scripts/db-to-md.sh). # 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 # Not needed: diff --git a/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua b/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua deleted file mode 100644 index 8f4de40ce5f88..0000000000000 --- a/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua +++ /dev/null @@ -1,11 +0,0 @@ ---[[ -Converts some HTML elements commonly used in Markdown to corresponding DocBook elements. -]] - -function RawInline(elem) - if elem.format == 'html' and elem.text == '<kbd>' then - return pandoc.RawInline('docbook', '<keycap>') - elseif elem.format == 'html' and elem.text == '</kbd>' then - return pandoc.RawInline('docbook', '</keycap>') - end -end diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 773eb3028ddbe..551df86a58f40 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -163,3 +163,30 @@ or "hg"), `domain` and `fetchSubmodules`. If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit` or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`, respectively. Otherwise, the fetcher uses `fetchzip`. + +## `requireFile` {#requirefile} + +`requireFile` allows requesting files that cannot be fetched automatically, but whose content is known. +This is a useful last-resort workaround for license restrictions that prohibit redistribution, or for downloads that are only accessible after authenticating interactively in a browser. +If the requested file is present in the Nix store, the resulting derivation will not be built, because its expected output is already available. +Otherwise, the builder will run, but fail with a message explaining to the user how to provide the file. The following code, for example: + +``` +requireFile { + name = "jdk-${version}_linux-x64_bin.tar.gz"; + url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; + sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; +} +``` +results in this error message: +``` +*** +Unfortunately, we cannot download file jdk-11.0.10_linux-x64_bin.tar.gz automatically. +Please go to https://www.oracle.com/java/technologies/javase-jdk11-downloads.html to download it yourself, and add it to the Nix store +using either + nix-store --add-fixed sha256 jdk-11.0.10_linux-x64_bin.tar.gz +or + nix-prefetch-url --type sha256 file:///path/to/jdk-11.0.10_linux-x64_bin.tar.gz + +*** +``` diff --git a/doc/builders/images.xml b/doc/builders/images.xml index 7d06130e3eca2..a4661ab5a7af7 100644 --- a/doc/builders/images.xml +++ b/doc/builders/images.xml @@ -11,4 +11,5 @@ <xi:include href="images/snaptools.section.xml" /> <xi:include href="images/portableservice.section.xml" /> <xi:include href="images/makediskimage.section.xml" /> + <xi:include href="images/binarycache.section.xml" /> </chapter> diff --git a/doc/builders/images/binarycache.section.md b/doc/builders/images/binarycache.section.md new file mode 100644 index 0000000000000..fe2772f33b4bb --- /dev/null +++ b/doc/builders/images/binarycache.section.md @@ -0,0 +1,49 @@ +# pkgs.mkBinaryCache {#sec-pkgs-binary-cache} + +`pkgs.mkBinaryCache` is a function for creating Nix flat-file binary caches. Such a cache exists as a directory on disk, and can be used as a Nix substituter by passing `--substituter file:///path/to/cache` to Nix commands. + +Nix packages are most commonly shared between machines using [HTTP, SSH, or S3](https://nixos.org/manual/nix/stable/package-management/sharing-packages.html), but a flat-file binary cache can still be useful in some situations. For example, you can copy it directly to another machine, or make it available on a network file system. It can also be a convenient way to make some Nix packages available inside a container via bind-mounting. + +Note that this function is meant for advanced use-cases. The more idiomatic way to work with flat-file binary caches is via the [nix-copy-closure](https://nixos.org/manual/nix/stable/command-ref/nix-copy-closure.html) command. You may also want to consider [dockerTools](#sec-pkgs-dockerTools) for your containerization needs. + +## Example + +The following derivation will construct a flat-file binary cache containing the closure of `hello`. + +```nix +mkBinaryCache { + rootPaths = [hello]; +} +``` + +- `rootPaths` specifies a list of root derivations. The transitive closure of these derivations' outputs will be copied into the cache. + +Here's an example of building and using the cache. + +Build the cache on one machine, `host1`: + +```shellSession +nix-build -E 'with import <nixpkgs> {}; mkBinaryCache { rootPaths = [hello]; }' +``` + +```shellSession +/nix/store/cc0562q828rnjqjyfj23d5q162gb424g-binary-cache +``` + +Copy the resulting directory to the other machine, `host2`: + +```shellSession +scp result host2:/tmp/hello-cache +``` + +Substitute the derivation using the flat-file binary cache on the other machine, `host2`: +```shellSession +nix-build -A hello '<nixpkgs>' \ + --option require-sigs false \ + --option trusted-substituters file:///tmp/hello-cache \ + --option substituters file:///tmp/hello-cache +``` + +```shellSession +/nix/store/gl5a41azbpsadfkfmbilh9yk40dh5dl0-hello-2.12.1 +``` diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index dfc012b80c5a7..2467739a1a5e2 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -145,7 +145,7 @@ Create a Docker image with many of the store paths being on their own layer to i `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 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). +: 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:* `{}` diff --git a/doc/builders/special.xml b/doc/builders/special.xml index 525eb71abfe7e..c971134819818 100644 --- a/doc/builders/special.xml +++ b/doc/builders/special.xml @@ -6,6 +6,7 @@ This chapter describes several special builders. </para> <xi:include href="special/fhs-environments.section.xml" /> + <xi:include href="special/makesetuphook.section.xml" /> <xi:include href="special/mkshell.section.xml" /> <xi:include href="special/darwin-builder.section.xml" /> </chapter> diff --git a/doc/builders/special/makesetuphook.section.md b/doc/builders/special/makesetuphook.section.md new file mode 100644 index 0000000000000..90d75c5491cff --- /dev/null +++ b/doc/builders/special/makesetuphook.section.md @@ -0,0 +1,37 @@ +# pkgs.makeSetupHook {#sec-pkgs.makeSetupHook} + +`pkgs.makeSetupHook` is a builder that produces hooks that go in to `nativeBuildInputs` + +## Usage {#sec-pkgs.makeSetupHook-usage} + +```nix +pkgs.makeSetupHook { + name = "something-hook"; + propagatedBuildInputs = [ pkgs.commandsomething ]; + depsTargetTargetPropagated = [ pkgs.libsomething ]; +} ./script.sh +``` + +#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash + +```nix +pkgs.makeSetupHook { + name = "run-hello-hook"; + propagatedBuildInputs = [ pkgs.hello ]; + substitutions = { shell = "${pkgs.bash}/bin/bash"; }; + passthru.tests.greeting = callPackage ./test { }; + meta.platforms = lib.platforms.linux; +} (writeScript "run-hello-hook.sh" '' + #!@shell@ + hello +'') +``` + +## Attributes + +* `name` Set the name of the hook. +* `propagatedBuildInputs` Runtime dependencies (such as binaries) of the hook. +* `depsTargetTargetPropagated` Non-binary dependencies. +* `meta` +* `passthru` +* `substitutions` Variables for `substituteAll` diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 3d91f096051ee..a0f0f97f9d53f 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 <literal>testers</literal> 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 diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index f6a0970165f56..2530b14a2f7be 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -204,13 +204,13 @@ The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _s In Nixpkgs, there are generally three different names associated with a package: -- The `name` attribute of the derivation (excluding the version part). This is what most users see, in particular when using `nix-env`. +- The `pname` attribute of the derivation. This is what most users see, in particular when using `nix-env`. - The variable name used for the instantiated package in `all-packages.nix`, and when passing it as a dependency to other functions. Typically this is called the _package attribute name_. This is what Nix expression authors see. It can also be used when installing using `nix-env -iA`. - The filename for (the directory containing) the Nix expression. -Most of the time, these are the same. For instance, the package `e2fsprogs` has a `name` attribute `"e2fsprogs-version"`, is bound to the variable name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`. +Most of the time, these are the same. For instance, the package `e2fsprogs` has a `pname` attribute `"e2fsprogs"`, is bound to the variable name `e2fsprogs` in `all-packages.nix`, and the Nix expression is in `pkgs/os-specific/linux/e2fsprogs/default.nix`. There are a few naming guidelines: diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 889b4114accaf..a732eee4b9627 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…). @@ -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/default.nix b/doc/default.nix index 1d5fa4811a369..ac405c3790380 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,6 +1,5 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let - lib = pkgs.lib; doc-support = import ./doc-support { inherit pkgs nixpkgs; }; in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; @@ -15,7 +14,7 @@ in pkgs.stdenv.mkDerivation { xmlformat ]; - src = lib.cleanSource ./.; + src = pkgs.nix-gitignore.gitignoreSource [] ./.; postPatch = '' ln -s ${doc-support} ./doc-support/result diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index e9cb96e37fdd5..bea3e12a70b35 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -75,7 +75,7 @@ in pkgs.runCommand "doc-support" {} ln -s ${epub-xsl} ./epub.xsl ln -s ${xhtml-xsl} ./xhtml.xsl - ln -s ${../../nixos/doc/xmlformat.conf} ./xmlformat.conf + ln -s ${./xmlformat.conf} ./xmlformat.conf ln -s ${pkgs.documentation-highlighter} ./highlightjs echo -n "${version}" > ./version diff --git a/nixos/doc/xmlformat.conf b/doc/doc-support/xmlformat.conf index c3f39c7fd81b8..c3f39c7fd81b8 100644 --- a/nixos/doc/xmlformat.conf +++ b/doc/doc-support/xmlformat.conf diff --git a/doc/hooks/breakpoint.section.md b/doc/hooks/breakpoint.section.md index 41e50653e91df..9600e06b79342 100644 --- a/doc/hooks/breakpoint.section.md +++ b/doc/hooks/breakpoint.section.md @@ -10,9 +10,7 @@ nativeBuildInputs = [ breakpointHook ]; When a build failure happens there will be an instruction printed that shows how to attach with `cntr` to the build sandbox. ::: {.note} -::: {.title} Caution with remote builds -::: This won’t work with remote builds as the build environment is on a different machine and can’t be accessed by `cntr`. Remote builds can be turned off by setting `--option builders ''` for `nix-build` or `--builders ''` for `nix build`. ::: diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 15b8d3839b193..6f9717ca09cca 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -13,6 +13,7 @@ with import <nixpkgs> {}; 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. diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 6b3a369c291ff..707da43e9dd73 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -171,6 +171,7 @@ let inherit src version; # nix will complain and tell you the right value to replace this with hash = lib.fakeHash; + mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test". # if you have build time environment variables add them here MY_ENV_VAR="my_value"; }; diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index ff622cfb0b501..5f93dd5ff3159 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -56,11 +56,11 @@ See the `zlib` example: zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; - }).overrideDerivation + }).overrideAttrs (old: rec { buildInputs = old.buildInputs ++ [ pkg-config ]; # we need to reset this setting! - NIX_CFLAGS_COMPILE=""; + env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; configurePhase = '' # FIXME: Some tests require writing at $HOME HOME=$TMPDIR diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index f0b302bbc356f..c6d85a240a900 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -137,7 +137,12 @@ 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. +newest version. The `x_y_z` part encodes the version with dots replaced by +underscores. When the newest version changes by a new release to Hackage the +old package will disappear under that name and be replaced by a newer one under +the name with the new version. The package name including the version will +also disappear when the default version e.g. from Stackage catches up with the +newest version from Hackage. 5. For some packages, we also manually add other `haskellPackages.foo_x_y_z` versions, if they are required for a certain build. @@ -161,12 +166,14 @@ 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`. +and just check whether they fulfill the version bounds and fail if they don’t +(by default, see `jailbreak` to circumvent this). + +The `haskellPackages.callPackage` function does the package resolution. +It will, e.g., use `haskellPackages.aeson`which has the default version as +described above for a package input of name `aeson`. (More general: +`<packages>.callPackage f` will call `f` with named inputs provided from the +package set `<packages>`.) 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). @@ -195,7 +202,7 @@ 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 +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 @@ -538,7 +545,7 @@ 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 +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 diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 7d404643d3693..f089b99a0451b 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -32,11 +32,13 @@ <xi:include href="octave.section.xml" /> <xi:include href="perl.section.xml" /> <xi:include href="php.section.xml" /> + <xi:include href="pkg-config.section.xml" /> <xi:include href="python.section.xml" /> <xi:include href="qt.section.xml" /> <xi:include href="r.section.xml" /> <xi:include href="ruby.section.xml" /> <xi:include href="rust.section.xml" /> + <xi:include href="swift.section.xml" /> <xi:include href="texlive.section.xml" /> <xi:include href="titanium.section.xml" /> <xi:include href="vim.section.xml" /> diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 347b2ea2ecabe..1e5a5cb4536fb 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -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/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md new file mode 100644 index 0000000000000..fb6fee997d6f2 --- /dev/null +++ b/doc/languages-frameworks/pkg-config.section.md @@ -0,0 +1,51 @@ +# 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. + +## Writing packages providing pkg-config modules + +Packages should set `meta.pkgConfigModules` with the list of package config modules they provide. +They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list. +Additionally, the [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), will do extra checks on to-be-installed pkg-config modules. + +A good example of all these things is zlib: + +``` +{ pkg-config, testers, ... }: + +stdenv.mkDerivation (finalAttrs: { + ... + + nativeBuildInputs = [ pkg-config validatePkgConfig ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + ... + pkgConfigModules = [ "zlib" ]; + }; +}) +``` + +## Accessing packages via pkg-config module name + +### Within Nixpkgs + +A [setup hook](#setup-hook-pkg-config) is bundled in the `pkg-config` package to bring a derivation's declared build inputs into the environment. +This will populate environment variables like `PKG_CONFIG_PATH`, `PKG_CONFIG_PATH_FOR_BUILD`, and `PKG_CONFIG_PATH_HOST` based on: + + - how `pkg-config` itself is depended upon + + - how other dependencies are depended upon + +For more details see the section on [specifying dependencies in general](#ssec-stdenv-dependencies). + +Normal pkg-config commands to look up dependencies by name will then work with those environment variables defined by the hook. + +### Externally + +The `defaultPkgConfigPackages` package set is 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 7b8a804106af7..a65cea533bc05 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. @@ -744,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`: ``` 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. @@ -1019,7 +1019,7 @@ buildPythonPackage rec { The `buildPythonPackage` mainly does four things: -* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to +* In the `buildPhase`, it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile. * In the `installPhase`, it installs the wheel file using `pip install *.whl`. * In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to @@ -1546,7 +1546,7 @@ of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: ```shell -${python.interpreter} setup.py install_data --install-dir=$out --root=$out +${python.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data\_files/d' setup.py ``` @@ -1821,6 +1821,11 @@ hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended. Updating packages in bulk leads to lots of breakages, which is why a stabilization period on the `python-unstable` branch is required. +If a package is fragile and often breaks during these bulks updates, it +may be reasonable to set `passthru.skipBulkUpdate = true` in the +derivation. This decision should not be made on a whim and should +always be supported by a qualifying comment. + Once the branch is sufficiently stable it should normally be merged into the `staging` branch. diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md new file mode 100644 index 0000000000000..1cc452cc9b9bf --- /dev/null +++ b/doc/languages-frameworks/swift.section.md @@ -0,0 +1,176 @@ +# Swift {#swift} + +The Swift compiler is provided by the `swift` package: + +```sh +# Compile and link a simple executable. +nix-shell -p swift --run 'swiftc -' <<< 'print("Hello world!")' +# Run it! +./main +``` + +The `swift` package also provides the `swift` command, with some caveats: + +- Swift Package Manager (SwiftPM) is packaged separately as `swiftpm`. If you + need functionality like `swift build`, `swift run`, `swift test`, you must + also add the `swiftpm` package to your closure. +- On Darwin, the `swift repl` command requires an Xcode installation. This is + because it uses the system LLDB debugserver, which has special entitlements. + +## Module search paths {#ssec-swift-module-search-paths} + +Like other toolchains in Nixpkgs, the Swift compiler executables are wrapped +to help Swift find your application's dependencies in the Nix store. These +wrappers scan the `buildInputs` of your package derivation for specific +directories where Swift modules are placed by convention, and automatically +add those directories to the Swift compiler search paths. + +Swift follows different conventions depending on the platform. The wrappers +look for the following directories: + +- On Darwin platforms: `lib/swift/macosx` + (If not targeting macOS, replace `macosx` with the Xcode platform name.) +- On other platforms: `lib/swift/linux/x86_64` + (Where `linux` and `x86_64` are from lowercase `uname -sm`.) +- For convenience, Nixpkgs also adds simply `lib/swift` to the search path. + This can save a bit of work packaging Swift modules, because many Nix builds + will produce output for just one target any way. + +## Core libraries {#ssec-swift-core-libraries} + +In addition to the standard library, the Swift toolchain contains some +additional 'core libraries' that, on Apple platforms, are normally distributed +as part of the OS or Xcode. These are packaged separately in Nixpkgs, and can +be found (for use in `buildInputs`) as: + +- `swiftPackages.Dispatch` +- `swiftPackages.Foundation` +- `swiftPackages.XCTest` + +## Packaging with SwiftPM {#ssec-swift-packaging-with-swiftpm} + +Nixpkgs includes a small helper `swiftpm2nix` that can fetch your SwiftPM +dependencies for you, when you need to write a Nix expression to package your +application. + +The first step is to run the generator: + +```sh +cd /path/to/my/project +# Enter a Nix shell with the required tools. +nix-shell -p swift swiftpm swiftpm2nix +# First, make sure the workspace is up-to-date. +swift package resolve +# Now generate the Nix code. +swiftpm2nix +``` + +This produces some files in a directory `nix`, which will be part of your Nix +expression. The next step is to write that expression: + +```nix +{ stdenv, swift, swiftpm, swiftpm2nix, fetchFromGitHub }: + +let + # Pass the generated files to the helper. + generated = swiftpm2nix.helpers ./nix; +in + +stdenv.mkDerivation rec { + pname = "myproject"; + version = "0.0.0"; + + src = fetchFromGitHub { + owner = "nixos"; + repo = pname; + rev = version; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + }; + + # Including SwiftPM as a nativeBuildInput provides a buildPhase for you. + # This by default performs a release build using SwiftPM, essentially: + # swift build -c release + nativeBuildInputs = [ swift swiftpm ]; + + # The helper provides a configure snippet that will prepare all dependencies + # in the correct place, where SwiftPM expects them. + configurePhase = generated.configure; + + installPhase = '' + # This is a special function that invokes swiftpm to find the location + # of the binaries it produced. + binPath="$(swiftpmBinPath)" + # Now perform any installation steps. + mkdir -p $out/bin + cp $binPath/myproject $out/bin/ + ''; +} +``` + +### Custom build flags {#ssec-swiftpm-custom-build-flags} + +If you'd like to build a different configuration than `release`: + +```nix +swiftpmBuildConfig = "debug"; +``` + +It is also possible to provide additional flags to `swift build`: + +```nix +swiftpmFlags = [ "--disable-dead-strip" ]; +``` + +The default `buildPhase` already passes `-j` for parallel building. + +If these two customization options are insufficient, simply provide your own +`buildPhase` that invokes `swift build`. + +### Running tests {#ssec-swiftpm-running-tests} + +Including `swiftpm` in your `nativeBuildInputs` also provides a default +`checkPhase`, but it must be enabled with: + +```nix +doCheck = true; +``` + +This essentially runs: `swift test -c release` + +### Patching dependencies {#ssec-swiftpm-patching-dependencies} + +In some cases, it may be necessary to patch a SwiftPM dependency. SwiftPM +dependencies are located in `.build/checkouts`, but the `swiftpm2nix` helper +provides these as symlinks to read-only `/nix/store` paths. In order to patch +them, we need to make them writable. + +A special function `swiftpmMakeMutable` is available to replace the symlink +with a writable copy: + +``` +configurePhase = generated.configure ++ '' + # Replace the dependency symlink with a writable copy. + swiftpmMakeMutable swift-crypto + # Now apply a patch. + patch -p1 -d .build/checkouts/swift-crypto -i ${./some-fix.patch} +''; +``` + +## Considerations for custom build tools {#ssec-swift-considerations-for-custom-build-tools} + +### Linking the standard library {#ssec-swift-linking-the-standard-library} + +The `swift` package has a separate `lib` output containing just the Swift +standard library, to prevent Swift applications needing a dependency on the +full Swift compiler at run-time. Linking with the Nixpkgs Swift toolchain +already ensures binaries correctly reference the `lib` output. + +Sometimes, Swift is used only to compile part of a mixed codebase, and the +link step is manual. Custom build tools often locate the standard library +relative to the `swift` compiler executable, and while the result will work, +when this path ends up in the binary, it will have the Swift compiler as an +unintended dependency. + +In this case, you should investigate how your build process discovers the +standard library, and override the path. The correct path will be something +like: `"${swift.swift.lib}/${swift.swiftModuleSubdir}"` diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index e66cc3476776b..b3f9f681da4c6 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -95,6 +95,27 @@ installPhase() { genericBuild ``` +### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell} + +To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use + +```bash +nix-shell '<nixpkgs>' -A some_package +eval ${unpackPhase:-unpackPhase} +cd $sourceRoot +eval ${patchPhase:-patchPhase} +eval ${configurePhase:-configurePhase} +eval ${buildPhase:-buildPhase} +``` + +To modify a [phase](#sec-stdenv-phases), first print it with + +```bash +type buildPhase +``` + +then change it in a text editor, and paste it back to the terminal. + ## Tools provided by `stdenv` {#sec-tools-of-stdenv} The standard environment provides the following packages: @@ -116,6 +137,82 @@ On Linux, `stdenv` also includes the `patchelf` utility. ## Specifying dependencies {#ssec-stdenv-dependencies} +Build systems often require more dependencies than just what `stdenv` provides. This section describes attributes accepted by `stdenv.mkDerivation` that can be used to make these dependencies available to the build system. + +### Overview {#ssec-stdenv-dependencies-overview} + +A full reference of the different kinds of dependencies is provided in [](#ssec-stdenv-dependencies-reference), but here is an overview of the most common ones. +It should cover most use cases. + +Add dependencies to `nativeBuildInputs` if they are executed during the build: +- those which are needed on `$PATH` during the build, for example `cmake` and `pkg-config` +- [setup hooks](#ssec-setup-hooks), for example [`makeWrapper`](#fun-makeWrapper) +- interpreters needed by [`patchShebangs`](#patch-shebangs.sh) for build scripts (with the `--build` flag), which can be the case for e.g. `perl` + +Add dependencies to `buildInputs` if they will end up copied or linked into the final output or otherwise used at runtime: +- libraries used by compilers, for example `zlib`, +- interpreters needed by [`patchShebangs`](#patch-shebangs.sh) for scripts which are installed, which can be the case for e.g. `perl` + +::: {.note} +These criteria are independent. + +For example, software using Wayland usually needs the `wayland` library at runtime, so `wayland` should be added to `buildInputs`. +But it also executes the `wayland-scanner` program as part of the build to generate code, so `wayland` should also be added to `nativeBuildInputs`. +::: + +Dependencies needed only to run tests are similarly classified between native (executed during build) and non-native (executed at runtime): +- `nativeCheckInputs` for test tools needed on `$PATH` (such as `ctest`) and [setup hooks](#ssec-setup-hooks) (for example [`pytestCheckHook`](#python)) +- `checkInputs` for libraries linked into test executables (for example the `qcheck` OCaml package) + +These dependencies are only injected when [`doCheck`](#var-stdenv-doCheck) is set to `true`. + +#### Example {#ssec-stdenv-dependencies-overview-example} + +Consider for example this simplified derivation for `solo5`, a sandboxing tool: +```nix +stdenv.mkDerivation rec { + pname = "solo5"; + version = "0.7.5"; + + src = fetchurl { + url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; + sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ libseccomp ]; + + postInstall = '' + substituteInPlace $out/bin/solo5-virtio-mkimage \ + --replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \ + --replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \ + --replace "cp " "cp --no-preserve=mode " + + wrapProgram $out/bin/solo5-virtio-mkimage \ + --prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]} + ''; + + doCheck = true; + nativeCheckInputs = [ util-linux qemu ]; + checkPhase = '' [elided] ''; +} +``` + +- `makeWrapper` is a setup hook, i.e., a shell script sourced by the generic builder of `stdenv`. + It is thus executed during the build and must be added to `nativeBuildInputs`. +- `pkg-config` is a build tool which the configure script of `solo5` expects to be on `$PATH` during the build: + therefore, it must be added to `nativeBuildInputs`. +- `libseccomp` is a library linked into `$out/bin/solo5-elftool`. + As it is used at runtime, it must be added to `buildInputs`. +- Tests need `qemu` and `getopt` (from `util-linux`) on `$PATH`, these must be added to `nativeCheckInputs`. +- Some dependencies are injected directly in the shell code of phases: `syslinux`, `dosfstools`, `mtools`, and `parted`. +In this specific case, they will end up in the output of the derivation (`$out` here). +As Nix marks dependencies whose absolute path is present in the output as runtime dependencies, adding them to `buildInputs` is not required. + +For more complex cases, like libraries linked into an executable which is then executed as part of the build system, see [](#ssec-stdenv-dependencies-reference). + +### Reference {#ssec-stdenv-dependencies-reference} + As described in the Nix manual, almost any `*.drv` store path in a derivation’s attribute set will induce a dependency on that derivation. `mkDerivation`, however, takes a few attributes intended to include all the dependencies of a package. This is done both for structure and consistency, but also so that certain other setup can take place. For example, certain dependencies need their bin directories added to the `PATH`. That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. See [](#ssec-setup-hooks) for details. Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation’s, and whether they are propagated. The platform distinctions are motivated by cross compilation; see [](#chap-cross) for exactly what each platform means. [^footnote-stdenv-ignored-build-platform] But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. By default, the run-time/build-time distinction is just a hint for mental clarity, but with `strictDeps` set it is mostly enforced even in the native case. @@ -187,21 +284,21 @@ Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In Overall, the unifying theme here is that propagation shouldn’t be introducing transitive dependencies involving platforms the depending package is unaware of. \[One can imagine the dependending package asking for dependencies with the platforms it knows about; other platforms it doesn’t know how to ask for. The platform description in that scenario is a kind of unforagable capability.\] The offset bounds checking and definition of `mapOffset` together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren’t in the derivation “spec” of the needing package, they cannot be relevant. From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. -### Variables specifying dependencies {#variables-specifying-dependencies} +#### Variables specifying dependencies {#variables-specifying-dependencies} -#### `depsBuildBuild` {#var-stdenv-depsBuildBuild} +##### `depsBuildBuild` {#var-stdenv-depsBuildBuild} A list of dependencies whose host and target platforms are the new derivation’s build platform. These are programs and libraries used at build time that produce programs and libraries also used at build time. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it in `nativeBuildInputs` instead. The most common use of this `buildPackages.stdenv.cc`, the default C compiler for this role. That example crops up more than one might think in old commonly used C libraries. Since these packages are able to be run at build-time, they are always added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. -#### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs} +##### `nativeBuildInputs` {#var-stdenv-nativeBuildInputs} A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s host platform. These are programs and libraries used at build-time that, if they are a compiler or similar tool, produce code to run at run-time—i.e. tools used to build the new derivation. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild` or `depsBuildTarget`. This could be called `depsBuildHost` but `nativeBuildInputs` is used for historical continuity. Since these packages are able to be run at build-time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. -#### `depsBuildTarget` {#var-stdenv-depsBuildTarget} +##### `depsBuildTarget` {#var-stdenv-depsBuildTarget} A list of dependencies whose host platform is the new derivation’s build platform, and target platform is the new derivation’s target platform. These are programs used at build time that produce code to run with code produced by the depending package. Most commonly, these are tools used to build the runtime or standard library that the currently-being-built compiler will inject into any code it compiles. In many cases, the currently-being-built-compiler is itself employed for that task, but when that compiler won’t run (i.e. its build and host platform differ) this is not possible. Other times, the compiler relies on some other tool, like binutils, that is always built separately so that the dependency is unconditional. @@ -209,41 +306,41 @@ This is a somewhat confusing concept to wrap one’s head around, and for good r Since these packages are able to run at build time, they are added to the `PATH`, as described above. But since these packages are only guaranteed to be able to run then, they shouldn’t persist as run-time dependencies. This isn’t currently enforced, but could be in the future. -#### `depsHostHost` {#var-stdenv-depsHostHost} +##### `depsHostHost` {#var-stdenv-depsHostHost} A list of dependencies whose host and target platforms match the new derivation’s host platform. In practice, this would usually be tools used by compilers for macros or a metaprogramming system, or libraries used by the macros or metaprogramming code itself. It’s always preferable to use a `depsBuildBuild` dependency in the derivation being built over a `depsHostHost` on the tool doing the building for this purpose. -#### `buildInputs` {#var-stdenv-buildInputs} +##### `buildInputs` {#var-stdenv-buildInputs} A list of dependencies whose host platform and target platform match the new derivation’s. This would be called `depsHostTarget` but for historical continuity. If the dependency doesn’t care about the target platform (i.e. isn’t a compiler or similar tool), put it here, rather than in `depsBuildBuild`. These are often programs and libraries used by the new derivation at *run*-time, but that isn’t always the case. For example, the machine code in a statically-linked library is only used at run-time, but the derivation containing the library is only needed at build-time. Even in the dynamic case, the library may also be needed at build-time to appease the linker. -#### `depsTargetTarget` {#var-stdenv-depsTargetTarget} +##### `depsTargetTarget` {#var-stdenv-depsTargetTarget} A list of dependencies whose host platform matches the new derivation’s target platform. These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. It’s poor form in almost all cases for a package to depend on another from a future stage \[future stage corresponding to positive offset\]. Do not use this attribute unless you are packaging a compiler and are sure it is needed. -#### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated} +##### `depsBuildBuildPropagated` {#var-stdenv-depsBuildBuildPropagated} The propagated equivalent of `depsBuildBuild`. This perhaps never ought to be used, but it is included for consistency \[see below for the others\]. -#### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} +##### `propagatedNativeBuildInputs` {#var-stdenv-propagatedNativeBuildInputs} The propagated equivalent of `nativeBuildInputs`. This would be called `depsBuildHostPropagated` but for historical continuity. For example, if package `Y` has `propagatedNativeBuildInputs = [X]`, and package `Z` has `buildInputs = [Y]`, then package `Z` will be built as if it included package `X` in its `nativeBuildInputs`. If instead, package `Z` has `nativeBuildInputs = [Y]`, then `Z` will be built as if it included `X` in the `depsBuildBuild` of package `Z`, because of the sum of the two `-1` host offsets. -#### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} +##### `depsBuildTargetPropagated` {#var-stdenv-depsBuildTargetPropagated} The propagated equivalent of `depsBuildTarget`. This is prefixed for the same reason of alerting potential users. -#### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated} +##### `depsHostHostPropagated` {#var-stdenv-depsHostHostPropagated} The propagated equivalent of `depsHostHost`. -#### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs} +##### `propagatedBuildInputs` {#var-stdenv-propagatedBuildInputs} The propagated equivalent of `buildInputs`. This would be called `depsHostTargetPropagated` but for historical continuity. -#### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated} +##### `depsTargetTargetPropagated` {#var-stdenv-depsTargetTargetPropagated} The propagated equivalent of `depsTargetTarget`. This is prefixed for the same reason of alerting potential users. @@ -253,7 +350,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 +723,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](#var-stdenv-doCheck) is enabled. #### Variables controlling the check phase {#variables-controlling-the-check-phase} @@ -646,7 +743,8 @@ 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. +If unset, use `check` if it exists, otherwise `test`; if neither is found, do nothing. ##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} @@ -1231,7 +1329,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around. -Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set `NIX_CFLAGS_COMPILE` to `-Wno-error=warning-type`. +Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set `env.NIX_CFLAGS_COMPILE` to `-Wno-error=warning-type`. This needs to be turned off or fixed for errors similar to: diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1a51225a80ed5..30952651adf40 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -168,7 +168,7 @@ rec { ] { a.b.c = 0; } => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } - Type: updateManyAttrsByPath :: [{ path :: [String], update :: (Any -> Any) }] -> AttrSet -> AttrSet + Type: updateManyAttrsByPath :: [{ path :: [String]; update :: (Any -> Any); }] -> AttrSet -> AttrSet */ updateManyAttrsByPath = let # When recursing into attributes, instead of updating the `path` of each @@ -414,7 +414,7 @@ rec { => { name = "some"; value = 6; } Type: - nameValuePair :: String -> Any -> { name :: String, value :: Any } + nameValuePair :: String -> Any -> { name :: String; value :: Any; } */ nameValuePair = # Attribute name @@ -449,7 +449,7 @@ rec { => { foo_x = "bar-a"; foo_y = "bar-b"; } Type: - mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet + mapAttrs' :: (String -> Any -> { name :: String; value :: Any; }) -> AttrSet -> AttrSet */ mapAttrs' = # A function, given an attribute's name and value, returns a new `nameValuePair`. @@ -649,7 +649,7 @@ rec { 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 @@ -664,7 +664,7 @@ rec { Example: zipAttrs [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrs :: [ AttrSet ] -> AttrSet diff --git a/lib/customisation.nix b/lib/customisation.nix index 101c9e62b9e61..cb3a4b561151f 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -213,7 +213,14 @@ rec { outputSpecified = true; drvPath = assert condition; drv.${outputName}.drvPath; outPath = assert condition; drv.${outputName}.outPath; - }; + } // + # TODO: give the derivation control over the outputs. + # `overrideAttrs` may not be the only attribute that needs + # updating when switching outputs. + lib.optionalAttrs (passthru?overrideAttrs) { + # TODO: also add overrideAttrs when overrideAttrs is not custom, e.g. when not splicing. + overrideAttrs = f: (passthru.overrideAttrs f).${outputName}; + }; }; outputsList = map outputToAttrListElement outputs; @@ -252,7 +259,8 @@ 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 diff --git a/lib/debug.nix b/lib/debug.nix index e3ca3352397ec..35ca4c7dfb202 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -109,6 +109,8 @@ rec { traceSeqN 2 { a.b.c = 3; } null trace: { a = { b = {…}; }; } => null + + Type: traceSeqN :: Int -> a -> b -> b */ traceSeqN = depth: x: y: let snip = v: if isList v then noQuotes "[…]" v @@ -173,17 +175,63 @@ rec { # -- TESTING -- - /* Evaluate a set of tests. A test is an attribute set `{expr, - expected}`, denoting an expression and its expected result. The - result is a list of failed tests, each represented as `{name, - expected, actual}`, denoting the attribute name of the failing - test and its expected and actual results. + /* Evaluates a set of tests. - Used for regression testing of the functions in lib; see - tests.nix for an example. Only tests having names starting with - "test" are run. + A test is an attribute set `{expr, expected}`, + denoting an expression and its expected result. + + The result is a `list` of __failed tests__, each represented as + `{name, expected, result}`, + + - expected + - What was passed as `expected` + - result + - The actual `result` of the test - Add attr { tests = ["testName"]; } to run these tests only. + Used for regression testing of the functions in lib; see + tests.nix for more examples. + + Important: Only attributes that start with `test` are executed. + + - If you want to run only a subset of the tests add the attribute `tests = ["testName"];` + + Example: + + runTests { + testAndOk = { + expr = lib.and true false; + expected = false; + }; + testAndFail = { + expr = lib.and true false; + expected = true; + }; + } + -> + [ + { + name = "testAndFail"; + expected = true; + result = false; + } + ] + + Type: + runTests :: { + tests = [ String ]; + ${testName} :: { + expr :: a; + expected :: a; + }; + } + -> + [ + { + name :: String; + expected :: a; + result :: a; + } + ] */ runTests = # Tests to run diff --git a/lib/default.nix b/lib/default.nix index 8ce1de33f5dce..dc4df95754186 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -88,13 +88,13 @@ let updateManyAttrsByPath; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count - optional optionals toList range partition zipListsWith zipLists + optional optionals toList range replicate partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take drop sublist last init crossLists unique intersectLists 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 diff --git a/lib/licenses.nix b/lib/licenses.nix index f22d1401410b6..cf8caff2a780f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -109,11 +109,26 @@ in mkLicense lset) ({ fullName = "Apache License 2.0"; }; + asl20-llvm = { + spdxId = "Apache-2.0 WITH LLVM-exception"; + fullName = "Apache License 2.0 with LLVM Exceptions"; + }; + bitstreamVera = { spdxId = "Bitstream-Vera"; fullName = "Bitstream Vera Font License"; }; + bitTorrent10 = { + spdxId = "BitTorrent-1.0"; + fullName = " BitTorrent Open Source License v1.0"; + }; + + bitTorrent11 = { + spdxId = "BitTorrent-1.1"; + fullName = " BitTorrent Open Source License v1.1"; + }; + bola11 = { url = "https://blitiri.com.ar/p/bola/"; fullName = "Buena Onda License Agreement 1.1"; @@ -333,6 +348,13 @@ in mkLicense lset) ({ free = false; }; + ecl20 = { + fullName = "Educational Community License, Version 2.0"; + url = "https://opensource.org/licenses/ECL-2.0"; + shortName = "ECL 2.0"; + spdxId = "ECL-2.0"; + }; + efl10 = { spdxId = "EFL-1.0"; fullName = "Eiffel Forum License v1.0"; @@ -640,11 +662,6 @@ in mkLicense lset) ({ url = "https://opensource.franz.com/preamble.html"; }; - llvm-exception = { - spdxId = "LLVM-exception"; - fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License - }; - lppl12 = { spdxId = "LPPL-1.2"; fullName = "LaTeX Project Public License v1.2"; diff --git a/lib/lists.nix b/lib/lists.nix index 8b2c2d12801bb..2186cd4a79f60 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -303,10 +303,22 @@ rec { else genList (n: first + n) (last - first + 1); + /* Return a list with `n` copies of an element. + + Type: replicate :: int -> a -> [a] + + Example: + replicate 3 "a" + => [ "a" "a" "a" ] + replicate 2 true + => [ true true ] + */ + replicate = n: elem: genList (_: elem) n; + /* 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 ] @@ -374,7 +386,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 cdd3e1d596c03..5fd55c4e90d69 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -76,20 +76,19 @@ 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. (functional) a predicate function returning a boolean. + 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. */ - platformMatch = platform: elem: - if builtins.isFunction elem - then elem platform - else let + platformMatch = platform: elem: let pattern = if builtins.isString elem then { system = elem; } + else if elem?parsed + then elem else { parsed = elem; }; in lib.matchAttrs pattern platform; diff --git a/lib/options.nix b/lib/options.nix index ce66bfb9d5d9f..20e8fb8d5ed31 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -36,6 +36,12 @@ let inherit (lib.types) mkOptionType ; + inherit (lib.lists) + last + ; + prioritySuggestion = '' + Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions. + ''; in rec { @@ -104,17 +110,28 @@ rec { /* Creates an Option attribute set for an option that specifies the package a module should use for some purpose. - The package is specified as a list of strings representing its attribute path in nixpkgs. + Type: mkPackageOption :: pkgs -> (string|[string]) -> + { default? :: [string], example? :: null|string|[string], extraDescription? :: string } -> + option - Because of this, you need to pass nixpkgs itself as the first argument. + The package is specified in the third argument under `default` as a list of strings + representing its attribute path in nixpkgs (or another package set). + Because of this, you need to pass nixpkgs itself (or a subset) as the first argument. - The second argument is the name of the option, used in the description "The <name> package to use.". + The second argument may be either a string or a list of strings. + It provides the display name of the package in the description of the generated option + (using only the last element if the passed value is a list) + and serves as the fallback value for the `default` argument. - You can also pass an example value, either a literal string or a package's attribute path. + To include extra information in the description, pass `extraDescription` to + append arbitrary text to the generated description. + You can also pass an `example` value, either a literal string or an attribute path. - You can omit the default path if the name of the option is also attribute path in nixpkgs. + The default argument can be omitted if the provided name is + an attribute of pkgs (if name is a string) or a + valid attribute path in pkgs (if name is a list). - Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option + If you wish to explicitly provide no default, pass `null` as `default`. Example: mkPackageOption pkgs "hello" { } @@ -126,27 +143,46 @@ rec { example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } + + Example: + mkPackageOption pkgs [ "python39Packages" "pytorch" ] { + extraDescription = "This is an example and doesn't actually do anything."; + } + => { _type = "option"; default = «derivation /nix/store/gvqgsnc4fif9whvwd9ppa568yxbkmvk8-python3.9-pytorch-1.10.2.drv»; defaultText = { ... }; description = "The pytorch package to use. This is an example and doesn't actually do anything."; type = { ... }; } + */ mkPackageOption = - # Package set (a specific version of nixpkgs) + # Package set (a specific version of nixpkgs or a subset) pkgs: # Name for the package, shown in option description name: - { default ? [ name ], example ? null }: - let default' = if !isList default then [ default ] else default; + { + # The attribute path where the default package is located + default ? name, + # A string or an attribute path to use as an example + example ? null, + # Additional text to include in the option description + extraDescription ? "", + }: + let + name' = if isList name then last name else name; + default' = if isList default then default else [ default ]; + defaultPath = concatStringsSep "." default'; + defaultValue = attrByPath default' + (throw "${defaultPath} cannot be found in pkgs") pkgs; in mkOption { + defaultText = literalExpression ("pkgs." + defaultPath); type = lib.types.package; - description = "The ${name} package to use."; - default = attrByPath default' - (throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs; - defaultText = literalExpression ("pkgs." + concatStringsSep "." default'); + description = "The ${name'} package to use." + + (if extraDescription == "" then "" else " ") + extraDescription; + ${if default != null then "default" else null} = defaultValue; ${if example != null then "example" else null} = literalExpression (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; + mkPackageOptionMD = pkgs: name: extra: + let option = mkPackageOption pkgs name extra; in option // { description = lib.mdDoc option.description; }; /* This option accepts anything, but it does not produce any result. @@ -184,7 +220,7 @@ rec { if length defs == 1 then (head defs).value else assert length defs > 1; - throw "The option `${showOption loc}' is defined multiple times.\n${message}\nDefinition values:${showDefs defs}"; + throw "The option `${showOption loc}' is defined multiple times while it's expected to be unique.\n${message}\nDefinition values:${showDefs defs}\n${prioritySuggestion}"; /* "Merge" option definitions by checking that they all have the same value. */ mergeEqualOption = loc: defs: @@ -195,13 +231,13 @@ rec { else if length defs == 1 then (head defs).value else (foldl' (first: def: if def.value != first.value then - throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" + throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}\n${prioritySuggestion}" else first) (head defs) (tail defs)).value; /* 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 ] @@ -211,7 +247,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" ] @@ -334,19 +370,17 @@ rec { # Helper functions. - /* Convert an option, described as a list of the option parts in to a - safe, human readable version. + /* Convert an option, described as a list of the option parts to a + human-readable version. Example: (showOption ["foo" "bar" "baz"]) == "foo.bar.baz" - (showOption ["foo" "bar.baz" "tux"]) == "foo.bar.baz.tux" + (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux" + (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.\"2bwm\".enable" Placeholders will not be quoted as they are not actual values: (showOption ["foo" "*" "bar"]) == "foo.*.bar" (showOption ["foo" "<name>" "bar"]) == "foo.<name>.bar" - - Unlike attributes, options can also start with numbers: - (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.2bwm.enable" */ showOption = parts: let escapeOptionPart = part: diff --git a/lib/path/default.nix b/lib/path/default.nix index 96a9244407bf5..075e2fc0d1377 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -4,6 +4,7 @@ let inherit (builtins) isString + isPath split match ; @@ -25,6 +26,10 @@ let assertMsg ; + inherit (lib.path.subpath) + isValid + ; + # Return the reason why a subpath is invalid, or `null` if it's valid subpathInvalidReason = value: if ! isString value then @@ -94,6 +99,52 @@ let in /* No rec! Add dependencies on this file at the top. */ { + /* Append a subpath string to a path. + + Like `path + ("/" + string)` but safer, because it errors instead of returning potentially surprising results. + More specifically, it checks that the first argument is a [path value type](https://nixos.org/manual/nix/stable/language/values.html#type-path"), + and that the second argument is a valid subpath string (see `lib.path.subpath.isValid`). + + Type: + append :: Path -> String -> Path + + Example: + append /foo "bar/baz" + => /foo/bar/baz + + # subpaths don't need to be normalised + append /foo "./bar//baz/./" + => /foo/bar/baz + + # can append to root directory + append /. "foo/bar" + => /foo/bar + + # first argument needs to be a path value type + append "/foo" "bar" + => <error> + + # second argument needs to be a valid subpath string + append /foo /bar + => <error> + append /foo "" + => <error> + append /foo "/bar" + => <error> + append /foo "../bar" + => <error> + */ + append = + # The absolute path to append to + path: + # The subpath string to append + subpath: + assert assertMsg (isPath path) '' + lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected''; + assert assertMsg (isValid subpath) '' + lib.path.append: Second argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + path + ("/" + subpath); /* Whether a value is a valid subpath string. @@ -133,7 +184,9 @@ in /* No rec! Add dependencies on this file at the top. */ { subpath.isValid "./foo//bar/" => true */ - subpath.isValid = value: + subpath.isValid = + # The value to check + value: subpathInvalidReason value == null; @@ -150,11 +203,11 @@ in /* No rec! Add dependencies on this file at the top. */ { Laws: - - (Idempotency) Normalising multiple times gives the same result: + - 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: + - 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}) @@ -210,9 +263,12 @@ in /* No rec! Add dependencies on this file at the top. */ { subpath.normalise "/foo" => <error> */ - subpath.normalise = path: - assert assertMsg (subpathInvalidReason path == null) - "lib.path.subpath.normalise: Argument is not a valid subpath string: ${subpathInvalidReason path}"; - joinRelPath (splitRelPath path); + subpath.normalise = + # The subpath string to normalise + subpath: + assert assertMsg (isValid subpath) '' + lib.path.subpath.normalise: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + joinRelPath (splitRelPath subpath); } diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index eccf3b7b1c33b..a1a45173a9098 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -3,9 +3,44 @@ { libpath }: let lib = import libpath; - inherit (lib.path) subpath; + inherit (lib.path) append subpath; cases = lib.runTests { + # Test examples from the lib.path.append documentation + testAppendExample1 = { + expr = append /foo "bar/baz"; + expected = /foo/bar/baz; + }; + testAppendExample2 = { + expr = append /foo "./bar//baz/./"; + expected = /foo/bar/baz; + }; + testAppendExample3 = { + expr = append /. "foo/bar"; + expected = /foo/bar; + }; + testAppendExample4 = { + expr = (builtins.tryEval (append "/foo" "bar")).success; + expected = false; + }; + testAppendExample5 = { + expr = (builtins.tryEval (append /foo /bar)).success; + expected = false; + }; + testAppendExample6 = { + expr = (builtins.tryEval (append /foo "")).success; + expected = false; + }; + testAppendExample7 = { + expr = (builtins.tryEval (append /foo "/bar")).success; + expected = false; + }; + testAppendExample8 = { + expr = (builtins.tryEval (append /foo "../bar")).success; + expected = false; + }; + + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; expected = false; @@ -30,6 +65,7 @@ let expr = subpath.isValid "./foo//bar/"; expected = true; }; + # Some extra tests testSubpathIsValidTwoDotsEnd = { expr = subpath.isValid "foo/.."; expected = false; @@ -71,6 +107,7 @@ let expected = true; }; + # Test examples from the lib.path.subpath.normalise documentation testSubpathNormaliseExample1 = { expr = subpath.normalise "foo//bar"; expected = "./foo/bar"; @@ -107,6 +144,7 @@ let expr = (builtins.tryEval (subpath.normalise "/foo")).success; expected = false; }; + # Some extra tests testSubpathNormaliseIsValidDots = { expr = subpath.normalise "./foo/.bar/.../baz...qux"; expected = "./foo/.bar/.../baz...qux"; diff --git a/lib/strings.nix b/lib/strings.nix index 2188fcb1dbfd1..68d9309506625 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -128,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. diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 94127fa90b351..57b9184ca60cd 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -40,14 +40,21 @@ rec { # a superior CPU has all the features of an inferior and is able to build and test code for it inferiors = { # x86_64 Intel + # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html default = [ ]; westmere = [ ]; - sandybridge = [ "westmere" ] ++ inferiors.westmere; - ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; - haswell = [ "ivybridge" ] ++ inferiors.ivybridge; - broadwell = [ "haswell" ] ++ inferiors.haswell; - skylake = [ "broadwell" ] ++ inferiors.broadwell; - skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + sandybridge = [ "westmere" ] ++ inferiors.westmere; + ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; + haswell = [ "ivybridge" ] ++ inferiors.ivybridge; + broadwell = [ "haswell" ] ++ inferiors.haswell; + skylake = [ "broadwell" ] ++ inferiors.broadwell; + skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + cannonlake = [ "skylake-avx512" ] ++ inferiors.skylake-avx512; + icelake-client = [ "cannonlake" ] ++ inferiors.cannonlake; + icelake-server = [ "icelake-client" ] ++ inferiors.icelake-client; + cascadelake = [ "skylake-avx512" ] ++ inferiors.cannonlake; + cooperlake = [ "cascadelake" ] ++ inferiors.cascadelake; + tigerlake = [ "icelake-server" ] ++ inferiors.icelake-server; # x86_64 AMD # TODO: fill this (need testing) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index a5fed5acf2c53..30615c9fde32c 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; }; }; @@ -81,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" "riscv" ]; + isEfi = [ + { cpu = { family = "arm"; version = "6"; }; } + { cpu = { family = "arm"; version = "7"; }; } + { cpu = { family = "arm"; version = "8"; }; } + { cpu = { family = "riscv"; }; } + { cpu = { family = "x86"; }; } + ]; }; matchAnyAttrs = patterns: @@ -90,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/tests/maintainer-module.nix b/lib/tests/maintainer-module.nix index 8cf8411b476a4..afa12587a98d7 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 8a9a2b26efaf7..be1c8aaa85c52 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 faf2b96530c1c..406656dac1a92 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" ]; @@ -474,6 +479,11 @@ runTests { expected = [2 30 40 42]; }; + testReplicate = { + expr = replicate 3 "a"; + expected = ["a" "a" "a"]; + }; + testToIntShouldConvertStringToInt = { expr = toInt "27"; expected = 27; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 17394ed5870b8..628c819402e7b 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/<userhandle>`, - `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. @@ -72,7 +76,7 @@ _0xB10C = { email = "nixpkgs@b10c.me"; name = "0xB10C"; - github = "0xb10c"; + github = "0xB10C"; githubId = 19157360; }; _0xbe7a = { @@ -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; }; @@ -167,6 +169,12 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _9999years = { + email = "rbt@fastmail.com"; + github = "9999years"; + githubId = 15312184; + name = "Rebecca Turner"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -691,6 +699,15 @@ fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; }]; }; + Alper-Celik = { + email = "dev.alpercelik@gmail.com"; + name = "Alper Çelik"; + github = "Alper-Celik"; + githubId = 110625473; + keys = [{ + fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; + }]; + }; almac = { email = "alma.cemerlic@gmail.com"; github = "a1mac"; @@ -719,10 +736,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"; }]; @@ -757,6 +774,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"; @@ -794,7 +817,7 @@ notbandali = { name = "Amin Bandali"; email = "bandali@gnu.org"; - github = "notbandali"; + github = "bandali0"; githubId = 1254858; keys = [{ fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; @@ -909,6 +932,12 @@ githubId = 106511; name = "Andrew Kelley"; }; + andrewsmith = { + email = "andrew@velvet.software"; + github = "andrewsmith"; + githubId = 29887; + name = "Andrew Smith"; + }; andsild = { email = "andsild@gmail.com"; github = "andsild"; @@ -916,7 +945,6 @@ name = "Anders Sildnes"; }; andys8 = { - email = "andys8@users.noreply.github.com"; github = "andys8"; githubId = 13085980; name = "Andy"; @@ -1102,7 +1130,6 @@ name = "Blaž Hrastnik"; }; arcnmx = { - email = "arcnmx@users.noreply.github.com"; github = "arcnmx"; githubId = 13426784; name = "arcnmx"; @@ -1390,6 +1417,12 @@ githubId = 12958979; name = "Mika Naylor"; }; + avakhrenev = { + email = "avakhrenev@gmail.com"; + github = "avakhrenev"; + githubId = 1060224; + name = "Alexey Vakhrenev"; + }; avaq = { email = "nixpkgs@account.avaq.it"; github = "Avaq"; @@ -1638,12 +1671,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"; @@ -1723,7 +1772,7 @@ benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; - github = "benesim"; + github = "BeneSim"; githubId = 29384538; keys = [{ fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; @@ -1778,6 +1827,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"; @@ -1820,6 +1878,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"; @@ -2015,6 +2079,12 @@ github = "bouk"; githubId = 97820; }; + bpaulin = { + email = "brunopaulin@bpaulin.net"; + github = "bpaulin"; + githubId = 115711; + name = "bpaulin"; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -2124,6 +2194,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"; @@ -2218,6 +2294,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"; @@ -2261,6 +2352,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"; @@ -2297,6 +2394,12 @@ github = "CaptainJawZ"; githubId = 43111068; }; + CardboardTurkey = { + name = "Kiran Ostrolenk"; + email = "kostrolenk@gmail.com"; + github = "CardboardTurkey"; + githubId = 34030186; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -2339,6 +2442,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + cathalmullan = { + email = "contact@cathal.dev"; + github = "CathalMullan"; + githubId = 37139470; + name = "Cathal Mullan"; + }; catouc = { email = "catouc@philipp.boeschen.me"; github = "catouc"; @@ -2364,6 +2473,12 @@ githubId = 3471749; name = "Claudio Bley"; }; + cbrewster = { + email = "cbrewster@hey.com"; + github = "cbrewster"; + githubId = 9086315; + name = "Connor Brewster"; + }; cburstedde = { email = "burstedde@ins.uni-bonn.de"; github = "cburstedde"; @@ -2466,6 +2581,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + ChaosAttractor = { + email = "lostattractor@gmail.com"; + github = "LostAttractor"; + githubId = 46527539; + name = "ChaosAttractor"; + }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -2581,7 +2702,6 @@ }]; }; christophcharles = { - email = "23055925+christophcharles@users.noreply.github.com"; github = "christophcharles"; githubId = 23055925; name = "Christoph Charles"; @@ -2758,6 +2878,13 @@ githubId = 718298; name = "Michael Livshin"; }; + CobaltCause = { + name = "Charles Hall"; + email = "charles@computer.surgery"; + github = "CobaltCause"; + githubId = 7003738; + matrix = "@charles:computer.surgery"; + }; cobbal = { email = "andrew.cobb@gmail.com"; github = "cobbal"; @@ -2935,6 +3062,11 @@ githubId = 1573344; name = "Andrey Pavlov"; }; + cpcloud = { + name = "Phillip Cloud"; + github = "cpcloud"; + githubId = 417981; + }; cpages = { email = "page@ruiec.cat"; github = "cpages"; @@ -3035,7 +3167,7 @@ cust0dian = { email = "serg@effectful.software"; github = "cust0dian"; - githubId = 389387; + githubId = 119854490; name = "Serg Nesterov"; keys = [{ fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; @@ -3250,11 +3382,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"; @@ -3286,6 +3423,12 @@ githubId = 6754950; name = "David Armstrong Lewis"; }; + davidcromp = { + email = "davidcrompton1192@gmail.com"; + github = "DavidCromp"; + githubId = 10701143; + name = "David Crompton"; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; @@ -3309,7 +3452,7 @@ }; davsanchez = { email = "davidslt+nixpkgs@pm.me"; - github = "davsanchez"; + github = "DavSanchez"; githubId = 11422515; name = "David Sánchez"; }; @@ -3388,6 +3531,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"; @@ -3401,7 +3555,6 @@ githubId = 1153808; }; deliciouslytyped = { - email = "47436522+deliciouslytyped@users.noreply.github.com"; github = "deliciouslytyped"; githubId = 47436522; name = "deliciouslytyped"; @@ -3497,6 +3650,12 @@ 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"; @@ -3504,6 +3663,12 @@ github = "Dettorer"; githubId = 2761682; }; + developer-guy = { + name = "Batuhan Apaydın"; + email = "developerguyn@gmail.com"; + github = "developer-guy"; + githubId = 16693043; + }; devhell = { email = ''"^"@regexmail.net''; github = "devhell"; @@ -3528,6 +3693,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"; @@ -3565,7 +3736,6 @@ name = "David Leung"; }; DianaOlympos = { - email = "DianaOlympos@noreply.github.com"; github = "DianaOlympos"; githubId = 15774340; name = "Thomas Depierre"; @@ -3590,7 +3760,6 @@ }; diogox = { name = "Diogo Xavier"; - email = "13244408+diogox@users.noreply.github.com"; github = "diogox"; githubId = 13244408; }; @@ -3624,12 +3793,6 @@ githubId = 14034137; name = "Mostly Void"; }; - dizfer = { - email = "david@izquierdofernandez.com"; - github = "DIzFer"; - githubId = 8852888; - name = "David Izquierdo"; - }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -3735,6 +3898,12 @@ githubId = 39825; name = "Dominik Honnef"; }; + doriath = { + email = "tomasz.zurkowski@gmail.com"; + github = "doriath"; + githubId = 150959; + name = "Tomasz Zurkowski"; + }; doronbehar = { email = "me@doronbehar.com"; github = "doronbehar"; @@ -3776,6 +3945,7 @@ name = "Davide Peressoni"; email = "davide.peressoni@tuta.io"; matrix = "@dpd-:matrix.org"; + github = "DPDmancul"; githubId = 3186857; }; dpercy = { @@ -3815,7 +3985,6 @@ name = "Dominik Ritter"; }; drperceptron = { - email = "92106371+drperceptron@users.noreply.github.com"; github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; @@ -3860,6 +4029,11 @@ githubId = 1931963; name = "David Sferruzza"; }; + dsymbol = { + name = "dsymbol"; + github = "dsymbol"; + githubId = 88138099; + }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; @@ -4144,6 +4318,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"; @@ -4201,7 +4381,7 @@ }; elnudev = { email = "elnu@elnu.com"; - github = "elnudev"; + github = "ElnuDev"; githubId = 9874955; name = "Elnu"; }; @@ -4262,7 +4442,6 @@ name = "Ente"; }; Enzime = { - email = "enzime@users.noreply.github.com"; github = "Enzime"; githubId = 10492681; name = "Michael Hoang"; @@ -4393,7 +4572,6 @@ name = "Ertugrul Söylemez"; }; esclear = { - email = "esclear@users.noreply.github.com"; github = "esclear"; githubId = 7432848; name = "Daniel Albert"; @@ -4491,7 +4669,7 @@ }; ewok = { email = "ewok@ewok.ru"; - github = "ewok"; + github = "ewok-old"; githubId = 454695; name = "Artur Taranchiev"; }; @@ -4801,7 +4979,6 @@ name = "Florian Klink"; }; florentc = { - email = "florentc@users.noreply.github.com"; github = "florentc"; githubId = 1149048; name = "Florent Ch."; @@ -4903,13 +5080,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"; @@ -4923,7 +5105,6 @@ name = "Frede Emil"; }; freezeboy = { - email = "freezeboy@users.noreply.github.com"; github = "freezeboy"; githubId = 13279982; name = "freezeboy"; @@ -5000,6 +5181,12 @@ githubId = 36706276; name = "Fufezan Mihai"; }; + fugi = { + email = "me@fugi.dev"; + github = "FugiMuffi"; + githubId = 21362942; + name = "Fugi"; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; @@ -5024,12 +5211,25 @@ 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"; githubId = 606000; name = "Gabriel Adomnicai"; }; + garaiza-93 = { + email = "araizagustavo93@gmail.com"; + github = "garaiza-93"; + githubId = 57430880; + name = "Gustavo Araiza"; + }; Gabriel439 = { email = "Gabriel439@gmail.com"; github = "Gabriella439"; @@ -5130,6 +5330,15 @@ githubId = 313929; name = "Gabriel Ebner"; }; + genericnerdyusername = { + name = "GenericNerdyUsername"; + email = "genericnerdyusername@proton.me"; + github = "GenericNerdyUsername"; + githubId = 111183546; + keys = [{ + fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; + }]; + }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; @@ -5239,6 +5448,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"; @@ -5483,7 +5698,6 @@ name = "Guillaume Koenig"; }; guserav = { - email = "guserav@users.noreply.github.com"; github = "guserav"; githubId = 28863828; name = "guserav"; @@ -5592,7 +5806,7 @@ }; harrisonthorne = { email = "harrisonthorne@proton.me"; - github = "harrisonthorne"; + github = "muni-corn"; githubId = 33523827; name = "Harrison Thorne"; }; @@ -5734,6 +5948,15 @@ githubId = 41522204; name = "hexchen"; }; + heyimnova = { + email = "git@heyimnova.dev"; + github = "heyimnova"; + githubId = 115728866; + name = "Nova Witterick"; + keys = [{ + fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; + }]; + }; hh = { email = "hh@m-labs.hk"; github = "HarryMakes"; @@ -5800,12 +6023,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"; @@ -5917,6 +6156,12 @@ githubId = 1592375; name = "Walter Huf"; }; + hughobrien = { + email = "github@hughobrien.ie"; + github = "hughobrien"; + githubId = 3400690; + name = "Hugh O'Brien"; + }; hugolgst = { email = "hugo.lageneste@pm.me"; github = "hugolgst"; @@ -5972,7 +6217,6 @@ name = "Imran Hossain"; }; iagoq = { - email = "18238046+iagocq@users.noreply.github.com"; github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; @@ -6040,7 +6284,6 @@ name = "Dominic Steinitz"; }; ifurther = { - email = "55025025+ifurther@users.noreply.github.com"; github = "ifurther"; githubId = 55025025; name = "Feather Lin"; @@ -6297,7 +6540,6 @@ }]; }; ivankovnatsky = { - email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; @@ -6375,6 +6617,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"; @@ -6459,6 +6707,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"; @@ -6483,6 +6738,12 @@ github = "jayeshbhoot"; githubId = 1915507; }; + jayman2000 = { + email = "jason@jasonyundt.email"; + github = "Jayman2000"; + githubId = 5579359; + name = "Jason Yundt"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; @@ -6508,6 +6769,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"; @@ -6646,6 +6914,12 @@ githubId = 10786794; name = "Markus Hihn"; }; + jessemoore = { + email = "jesse@jessemoore.dev"; + github = "jesseDMoore1994"; + githubId = 30251156; + name = "Jesse Moore"; + }; jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; @@ -6782,7 +7056,7 @@ }; jkarlson = { email = "jekarlson@gmail.com"; - github = "jkarlson"; + github = "ethorsoe"; githubId = 1204734; name = "Emil Karlson"; }; @@ -6853,6 +7127,12 @@ githubId = 2308444; name = "Joshua Gilman"; }; + jnsgruk = { + email = "jon@sgrs.uk"; + github = "jnsgruk"; + githubId = 668505; + name = "Jon Seager"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; @@ -6890,7 +7170,6 @@ name = "Jocelyn Thode"; }; joedevivo = { - email = "55951+joedevivo@users.noreply.github.com"; github = "joedevivo"; githubId = 55951; name = "Joe DeVivo"; @@ -6926,6 +7205,12 @@ github = "joepie91"; githubId = 1663259; }; + joerdav = { + email = "joe.davidson.21111@gmail.com"; + github = "joerdav"; + name = "Joe Davidson"; + githubId = 19927761; + }; joesalisbury = { email = "salisbury.joseph@gmail.com"; github = "JosephSalisbury"; @@ -7065,6 +7350,12 @@ github = "jorsn"; githubId = 4646725; }; + joshniemela = { + name = "Joshua Niemelä"; + email = "josh@jniemela.dk"; + github = "joshniemela"; + githubId = 88747315; + }; joshuafern = { name = "Joshua Fern"; email = "joshuafern@protonmail.com"; @@ -7077,6 +7368,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"; @@ -7548,6 +7845,11 @@ githubId = 44045911; name = "Kid"; }; + kidsan = { + github = "Kidsan"; + githubId = 8798449; + name = "kidsan"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -7639,6 +7941,12 @@ github = "kjeremy"; githubId = 4325700; }; + kkharji = { + name = "kkharji"; + email = "kkharji@protonmail.com"; + github = "kkharji"; + githubId = 65782666; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; @@ -7860,6 +8168,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"; @@ -8322,6 +8636,12 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luizirber = { + email = "nixpkgs@luizirber.org"; + github = "luizirber"; + githubId = 6642; + name = "Luiz Irber"; + }; luizribeiro = { email = "nixpkgs@l9o.dev"; matrix = "@luizribeiro:matrix.org"; @@ -8429,6 +8749,8 @@ loveisgrief = { name = "LoveIsGrief"; email = "loveisgrief@tuta.io"; + github = "LoveIsGrief"; + githubId = 2829538; keys = [{ fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; }]; @@ -8580,7 +8902,7 @@ }; lux = { email = "lux@lux.name"; - github = "luxferresum"; + github = "luxzeitlos"; githubId = 1208273; matrix = "@lux:ontheblueplanet.com"; name = "Lux"; @@ -8640,6 +8962,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"; @@ -8695,6 +9026,12 @@ githubId = 1238350; name = "Matthias Herrmann"; }; + mahmoudk1000 = { + email = "mahmoudk1000@gmail.com"; + github = "mahmoudk1000"; + githubId = 24735185; + name = "Mahmoud Ayman"; + }; majesticmullet = { email = "hoccthomas@gmail.com.au"; github = "MajesticMullet"; @@ -8725,8 +9062,8 @@ githubId = 2914269; name = "Malo Bourgon"; }; - malvo = { - email = "malte@malvo.org"; + malte-v = { + email = "nixpkgs@mal.tc"; github = "malte-v"; githubId = 34393802; name = "Malte Voos"; @@ -8812,7 +9149,6 @@ githubId = 22586596; }; marsam = { - email = "marsam@users.noreply.github.com"; github = "marsam"; githubId = 65531; name = "Mario Rodas"; @@ -8856,6 +9192,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"; @@ -8910,6 +9252,18 @@ githubId = 952712; name = "Matt Christ"; }; + matthew-levan = { + email = "matthew@coeli.network"; + github = "matthew-levan"; + githubId = 91502660; + name = "Matthew LeVan"; + }; + matthewcroughan = { + email = "matt@croughan.sh"; + github = "MatthewCroughan"; + githubId = 26458780; + name = "Matthew Croughan"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; @@ -9033,7 +9387,7 @@ }; maxwell-lt = { email = "maxwell.lt@live.com"; - github = "maxwell-lt"; + github = "Maxwell-lt"; githubId = 17859747; name = "Maxwell L-T"; }; @@ -9056,7 +9410,6 @@ name = "Mateusz Mazur"; }; mbaeten = { - email = "mbaeten@users.noreply.github.com"; github = "mbaeten"; githubId = 2649304; name = "M. Baeten"; @@ -9206,11 +9559,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"; @@ -9218,6 +9571,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"; @@ -9274,7 +9639,6 @@ name = "Maximilian Güntner"; }; mh = { - email = "68288772+markus-heinrich@users.noreply.github.com"; github = "markus-heinrich"; githubId = 68288772; name = "Markus Heinrich"; @@ -9292,7 +9656,6 @@ name = "Max Hofer"; }; miangraham = { - email = "miangraham@users.noreply.github.com"; github = "miangraham"; githubId = 704580; name = "M. Ian Graham"; @@ -9323,6 +9686,12 @@ github = "michaelBelsanti"; githubId = 62124625; }; + michaelgrahamevans = { + email = "michaelgrahamevans@gmail.com"; + name = "Michael Evans"; + github = "michaelgrahamevans"; + githubId = 5932424; + }; michaelpj = { email = "michaelpj@gmail.com"; github = "michaelpj"; @@ -9503,6 +9872,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"; @@ -9567,6 +9942,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"; @@ -9575,7 +9956,6 @@ }; mlvzk = { name = "mlvzk"; - email = "mlvzk@users.noreply.github.com"; github = "mlvzk"; githubId = 44906333; }; @@ -9592,7 +9972,6 @@ name = "Henri Bourcereau"; }; mmesch = { - email = "mmesch@noreply.github.com"; github = "MMesch"; githubId = 2597803; name = "Matthias Meschede"; @@ -9653,7 +10032,7 @@ name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; matrix = "@mon:tchncs.de"; - github = "MonAaraj"; + github = "ribosomerocker"; githubId = 46468162; }; monsieurp = { @@ -9764,6 +10143,18 @@ githubId = 3073833; name = "Massimo Redaelli"; }; + mrfreezeex = { + email = "arthur@cri.epita.fr"; + github = "MrFreezeex"; + name = "Arthur Outhenin-Chalandre"; + githubId = 3845213; + }; + mrityunjaygr8 = { + email = "mrityunjaysaxena1996@gmail.com"; + github = "mrityunjaygr8"; + name = "Mrityunjay Saxena"; + githubId = 14573967; + }; mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; @@ -9896,7 +10287,7 @@ munksgaard = { name = "Philip Munksgaard"; email = "philip@munksgaard.me"; - github = "munksgaard"; + github = "Munksgaard"; githubId = 230613; matrix = "@philip:matrix.munksgaard.me"; keys = [{ @@ -9974,6 +10365,12 @@ githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; nagy = { email = "danielnagy@posteo.de"; github = "nagy"; @@ -9996,7 +10393,6 @@ name = "Roman Naumann"; }; naphta = { - email = "naphta@noreply.github.com"; github = "naphta"; githubId = 6709831; name = "Jake Hill"; @@ -10011,7 +10407,6 @@ }]; }; nat-418 = { - email = "93013864+nat-418@users.noreply.github.com"; github = "nat-418"; githubId = 93013864; name = "nat-418"; @@ -10029,7 +10424,6 @@ name = "Nathan Bijnens"; }; nathyong = { - email = "nathyong@noreply.github.com"; github = "nathyong"; githubId = 818502; name = "Nathan Yong"; @@ -10051,7 +10445,6 @@ }; nazarewk = { name = "Krzysztof Nazarewski"; - email = "3494992+nazarewk@users.noreply.github.com"; matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; @@ -10060,7 +10453,6 @@ }]; }; nbr = { - email = "nbr@users.noreply.github.com"; github = "nbr"; githubId = 3819225; name = "Nick Braga"; @@ -10093,6 +10485,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + nebulka = { + email = "arapun@proton.me"; + github = "nebulka1"; + githubId = 121920704; + name = "Nebulka"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -10218,6 +10616,24 @@ githubId = 6391776; name = "Nikita Voloboev"; }; + nikstur = { + email = "nikstur@outlook.com"; + name = "nikstur"; + github = "nikstur"; + githubId = 61635709; + }; + nintron = { + email = "nintron@sent.com"; + github = "Nintron27"; + githubId = 47835714; + name = "Nintron"; + }; + ngerstle = { + name = "Nicholas Gerstle"; + email = "ngerstle@gmail.com"; + github = "ngerstle"; + githubId = 1023752; + }; ngiger = { email = "niklaus.giger@member.fsf.org"; github = "ngiger"; @@ -10291,6 +10707,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"; @@ -10339,7 +10761,6 @@ }; nitsky = { name = "nitsky"; - email = "492793+nitsky@users.noreply.github.com"; github = "nitsky"; githubId = 492793; }; @@ -10468,6 +10889,12 @@ 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"; @@ -10481,6 +10908,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"; @@ -10650,7 +11083,6 @@ name = "Ole Jørgen Brønner"; }; ollieB = { - email = "1237862+oliverbunting@users.noreply.github.com"; github = "oliverbunting"; githubId = 1237862; name = "Ollie Bunting"; @@ -10668,7 +11100,6 @@ name = "Owen Lynch"; }; omasanori = { - email = "167209+omasanori@users.noreply.github.com"; github = "omasanori"; githubId = 167209; name = "Masanori Ogino"; @@ -10856,7 +11287,7 @@ }; paddygord = { email = "pgpatrickgordon@gmail.com"; - github = "paddygord"; + github = "avaunit02"; githubId = 10776658; name = "Patrick Gordon"; }; @@ -10979,6 +11410,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + paveloom = { + email = "paveloom@riseup.net"; + github = "paveloom"; + githubId = 49961859; + name = "Pavel Sobolev"; + }; payas = { email = "relekarpayas@gmail.com"; github = "bhankas"; @@ -11273,6 +11710,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"; @@ -11440,7 +11883,6 @@ githubId = 51489; }; polykernel = { - email = "81340136+polykernel@users.noreply.github.com"; github = "polykernel"; githubId = 81340136; name = "polykernel"; @@ -11463,6 +11905,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"; @@ -11517,6 +11971,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"; @@ -11658,6 +12122,11 @@ githubId = 37715; name = "Brian McKenna"; }; + pulsation = { + name = "Philippe Sam-Long"; + github = "pulsation"; + githubId = 1838397; + }; purcell = { email = "steve@sanityinc.com"; github = "purcell"; @@ -11677,6 +12146,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"; @@ -11695,6 +12170,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"; @@ -11737,6 +12222,7 @@ github = "alyssais"; githubId = 2768870; name = "Alyssa Ross"; + matrix = "@qyliss:fairydust.space"; keys = [{ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; @@ -11760,6 +12246,12 @@ githubId = 131856; name = "Arnout Engelen"; }; + raehik = { + email = "thefirstmuffinman@gmail.com"; + github = "raehik"; + githubId = 3764592; + name = "Ben Orchard"; + }; rafael = { name = "Rafael"; email = "pr9@tuta.io"; @@ -11807,6 +12299,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"; @@ -11846,7 +12344,7 @@ }; ratsclub = { email = "victor@freire.dev.br"; - github = "vtrf"; + github = "ratsclub"; githubId = 25647735; name = "Victor Freire"; }; @@ -11862,6 +12360,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"; @@ -11876,7 +12380,6 @@ }; rbreslow = { name = "Rocky Breslow"; - email = "1774125+rbreslow@users.noreply.github.com"; github = "rbreslow"; githubId = 1774125; keys = [{ @@ -11969,7 +12472,6 @@ name = "Ricky Elrod"; }; rembo10 = { - email = "rembo10@users.noreply.github.com"; github = "rembo10"; githubId = 801525; name = "rembo10"; @@ -11981,7 +12483,6 @@ name = "Renato Garcia"; }; rencire = { - email = "546296+rencire@users.noreply.github.com"; github = "rencire"; githubId = 546296; name = "Eric Ren"; @@ -12107,7 +12608,7 @@ }; rika = { email = "rika@paymentswit.ch"; - github = "NekomimiScience"; + github = "ScarletHg"; githubId = 1810487; name = "Rika"; }; @@ -12318,13 +12819,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"; @@ -12406,6 +12912,18 @@ githubId = 61306; name = "Rene Treffer"; }; + rubyowo = { + name = "Rei Star"; + email = "perhaps-you-know@what-is.ml"; + github = "rubyowo"; + githubId = 105302757; + }; + rumpelsepp = { + name = "Stefan Tatschner"; + email = "stefan@rumpelsepp.org"; + github = "rumpelsepp"; + githubId = 1961699; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -12442,6 +12960,12 @@ githubId = 5236428; name = "Gaëtan André"; }; + rvnstn = { + email = "github@rvnstn.de"; + github = "rvnstn"; + githubId = 2364742; + name = "Tobias Ravenstein"; + }; rvolosatovs = { email = "rvolosatovs@riseup.net"; github = "rvolosatovs"; @@ -12455,7 +12979,6 @@ name = "Ryan Artecona"; }; ryanorendorff = { - email = "12442942+ryanorendorff@users.noreply.github.com"; github = "ryanorendorff"; githubId = 12442942; name = "Ryan Orendorff"; @@ -12556,6 +13079,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"; @@ -12635,6 +13164,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"; @@ -12667,7 +13202,6 @@ }; sbond75 = { name = "sbond75"; - email = "43617712+sbond75@users.noreply.github.com"; github = "sbond75"; githubId = 43617712; }; @@ -12691,7 +13225,6 @@ }; sioodmy = { name = "Antoni Sokołowski"; - email = "81568712+sioodmy@users.noreply.github.com"; github = "sioodmy"; githubId = 81568712; }; @@ -12720,7 +13253,6 @@ name = "schneefux"; }; schnusch = { - email = "schnusch@users.noreply.github.com"; github = "schnusch"; githubId = 5104601; name = "schnusch"; @@ -12742,7 +13274,6 @@ }; scoder12 = { name = "Spencer Pogorzelski"; - email = "34356756+Scoder12@users.noreply.github.com"; github = "Scoder12"; githubId = 34356756; }; @@ -12772,7 +13303,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 = { @@ -12833,6 +13364,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"; @@ -12884,6 +13421,12 @@ githubId = 38824235; name = "Serge Belov"; }; + serge_sans_paille = { + email = "serge.guelton@telecom-bretagne.eu"; + github = "serge-sans-paille"; + githubId = 863807; + name = "Serge Guelton"; + }; sersorrel = { email = "ash@sorrel.sh"; github = "sersorrel"; @@ -12927,7 +13470,6 @@ name = "Sebastian Graf"; }; shadaj = { - email = "shadaj@users.noreply.github.com"; github = "shadaj"; githubId = 543055; name = "Shadaj Laddad"; @@ -12953,7 +13495,6 @@ }; ShamrockLee = { name = "Shamrock Lee"; - email = "44064051+ShamrockLee@users.noreply.github.com"; github = "ShamrockLee"; githubId = 44064051; }; @@ -12972,6 +13513,18 @@ }]; name = "Shane Sveller"; }; + shardy = { + email = "shardul@baral.ca"; + github = "shardulbee"; + githubId = 16765155; + name = "Shardul Baral"; + }; + sharzy = { + email = "me@sharzy.in"; + github = "SharzyL"; + githubId = 46294732; + name = "Sharzy"; + }; shawndellysse = { email = "sdellysse@gmail.com"; github = "sdellysse"; @@ -13062,7 +13615,7 @@ shreerammodi = { name = "Shreeram Modi"; email = "shreerammodi10@gmail.com"; - github = "Shrimpram"; + github = "shrimpram"; githubId = 67710369; keys = [{ fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; @@ -13145,7 +13698,6 @@ name = "Simon Vandel Sillesen"; }; sir4ur0n = { - email = "sir4ur0n@users.noreply.github.com"; github = "sir4ur0n"; githubId = 1204125; name = "sir4ur0n"; @@ -13209,7 +13761,6 @@ name = "Sven Keidel"; }; skykanin = { - email = "skykanin@users.noreply.github.com"; github = "skykanin"; githubId = 3789764; name = "skykanin"; @@ -13288,12 +13839,29 @@ 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"; }; + sno2wman = { + name = "SnO2WMaN"; + email = "me@sno2wman.net"; + github = "SnO2WMaN"; + githubId = 15155608; + }; + snpschaaf = { + email = "philipe.schaaf@secunet.com"; + name = "Philippe Schaaf"; + github = "snpschaaf"; + githubId = 105843013; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -13312,6 +13880,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"; @@ -13418,7 +13995,6 @@ name = "Sergei Khoma"; }; srgom = { - email = "srgom@users.noreply.github.com"; github = "SRGOM"; githubId = 8103619; name = "SRGOM"; @@ -13430,6 +14006,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"; @@ -13454,6 +14036,15 @@ 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"; @@ -13478,6 +14069,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"; @@ -13515,7 +14112,6 @@ }; stephenwithph = { name = "StephenWithPH"; - email = "StephenWithPH@users.noreply.github.com"; github = "StephenWithPH"; githubId = 2990492; }; @@ -13660,6 +14256,13 @@ 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"; @@ -13794,6 +14397,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"; @@ -13957,7 +14569,6 @@ name = "techknowlogick"; }; Technical27 = { - email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; githubId = 38222826; name = "Aamaruvi Yogamani"; @@ -13968,6 +14579,12 @@ githubId = 139251; name = "Tom Hunger"; }; + tehmatt = { + name = "tehmatt"; + email = "nix@programsareproofs.com"; + github = "tehmatt"; + githubId = 3358866; + }; tejasag = { name = "Tejas Agarwal"; email = "tejasagarwalbly@gmail.com"; @@ -13990,7 +14607,7 @@ }; teozkr = { email = "teo@nullable.se"; - github = "teozkr"; + github = "nightkr"; githubId = 649832; name = "Teo Klestrup Röijezon"; }; @@ -14053,6 +14670,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"; @@ -14205,6 +14827,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"; @@ -14235,6 +14863,12 @@ githubId = 1634990; name = "Tom McLaughlin"; }; + thornycrackers = { + email = "codyfh@gmail.com"; + github = "thornycrackers"; + githubId = 4313010; + name = "Cody Hiar"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; @@ -14335,6 +14969,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"; @@ -14356,6 +15000,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"; @@ -14377,7 +15027,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; - matrix = "@toastal:matrix.org"; + matrix = "@toastal:mozilla.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -14450,7 +15100,7 @@ }; tonyshkurenko = { email = "support@twingate.com"; - github = "tonyshkurenko"; + github = "antonshkurenko"; githubId = 8597964; name = "Anton Shkurenko"; }; @@ -14582,6 +15232,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"; @@ -14723,6 +15379,11 @@ github = "unrooted"; githubId = 30440603; }; + unsolvedcypher = { + name = "Matthew M"; + github = "UnsolvedCypher"; + githubId = 3170853; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; @@ -14783,7 +15444,7 @@ }; uthar = { email = "galkowskikasper@gmail.com"; - github = "uthar"; + github = "Uthar"; githubId = 15697697; name = "Kasper Gałkowski"; }; @@ -14831,6 +15492,12 @@ githubId = 27813; name = "Vincent Breitmoser"; }; + vamega = { + email = "github@madiathv.com"; + github = "vamega"; + githubId = 223408; + name = "Varun Madiath"; + }; vandenoever = { email = "jos@vandenoever.info"; github = "vandenoever"; @@ -14876,6 +15543,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"; @@ -14899,6 +15572,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"; @@ -15119,6 +15798,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"; @@ -15152,6 +15843,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"; @@ -15189,6 +15886,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"; @@ -15201,6 +15904,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"; @@ -15216,6 +15925,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"; @@ -15244,11 +15971,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"; @@ -15274,7 +16006,6 @@ name = "Alexander Krimm"; }; wishfort36 = { - email = "42300264+wishfort36@users.noreply.github.com"; github = "wishfort36"; githubId = 42300264; name = "wishfort36"; @@ -15357,6 +16088,12 @@ github = "wr0belj"; githubId = 40501814; }; + wraithm = { + name = "Matthew Wraith"; + email = "wraithm@gmail.com"; + github = "wraithm"; + githubId = 1512913; + }; wrmilling = { name = "Winston R. Milling"; email = "Winston@Milli.ng"; @@ -15396,8 +16133,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; @@ -15427,6 +16169,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"; @@ -15435,7 +16183,6 @@ }; xdhampus = { name = "Hampus"; - email = "16954508+xdHampus@users.noreply.github.com"; github = "xdHampus"; githubId = 16954508; }; @@ -15496,7 +16243,6 @@ name = "Guillermo NWDD"; }; xrelkd = { - email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; githubId = 46590321; name = "xrelkd"; @@ -15514,7 +16260,6 @@ name = "Marti Serra"; }; xworld21 = { - email = "1962985+xworld21@users.noreply.github.com"; github = "xworld21"; githubId = 1962985; name = "Vincenzo Mantova"; @@ -15537,14 +16282,25 @@ githubId = 2242427; name = "Yoann Ono"; }; + yajo = { + email = "yajo.sk8@gmail.com"; + github = "yajo"; + githubId = 973709; + name = "Jairo Llopis"; + }; yana = { email = "yana@riseup.net"; github = "yanalunaterra"; 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"; @@ -15562,6 +16318,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"; @@ -15574,6 +16339,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"; @@ -15598,6 +16369,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"; @@ -15629,6 +16419,12 @@ github = "yrd"; githubId = 1820447; }; + yshym = { + name = "Yevhen Shymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; + githubId = 44244245; + }; ysndr = { email = "me@ysndr.de"; github = "ysndr"; @@ -15736,6 +16532,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"; @@ -15760,13 +16571,40 @@ 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"; - github = "Zebreus"; + github = "zebreus"; 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"; @@ -15795,6 +16633,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"; @@ -15802,17 +16646,38 @@ name = "zimbatm"; }; Zimmi48 = { - email = "theo.zimmermann@univ-paris-diderot.fr"; + email = "theo.zimmermann@telecom-paris.fr"; github = "Zimmi48"; 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"; @@ -15826,7 +16691,6 @@ name = "Alexandre Macabies"; }; zowoq = { - email = "59103226+zowoq@users.noreply.github.com"; github = "zowoq"; githubId = 59103226; name = "zowoq"; @@ -15837,325 +16701,6 @@ githubId = 8100652; name = "David Mell"; }; - ztzg = { - email = "dd@crosstwine.com"; - github = "ztzg"; - githubId = 393108; - name = "Damien Diederen"; - }; - zx2c4 = { - email = "Jason@zx2c4.com"; - github = "zx2c4"; - githubId = 10643; - name = "Jason A. Donenfeld"; - }; - zyansheep = { - email = "zyansheep@protonmail.com"; - github = "zyansheep"; - githubId = 20029431; - name = "Zyansheep"; - }; - zzamboni = { - email = "diego@zzamboni.org"; - github = "zzamboni"; - 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"; @@ -16165,278 +16710,41 @@ 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; }; - 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 = "gus@p8s.co"; - 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; - }; - kkharji = { - name = "kkharji"; - email = "kkharji@protonmail.com"; - github = "kkharji"; - githubId = 65782666; - }; - 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 = "dev@wesleyjrz.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; }; - waelwindows = { - email = "waelwindows9922@gmail.com"; - github = "Waelwindows"; - githubId = 5228243; - name = "waelwindows"; - }; - 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"; - }]; - }; - wuyoli = { - name = "wuyoli"; - email = "wuyoli@tilde.team"; - github = "wuyoli"; - githubId = 104238274; - }; - ziguana = { - name = "Zig Uana"; - email = "git@ziguana.dev"; - github = "ziguana"; - githubId = 45833444; - }; - detegr = { - name = "Antti Keränen"; - email = "detegr@rbx.email"; - github = "Detegr"; - githubId = 724433; - }; - RossComputerGuy = { - name = "Tristan Ross"; - email = "tristan.ross@midstall.com"; - github = "RossComputerGuy"; - githubId = 19699320; + zx2c4 = { + email = "Jason@zx2c4.com"; + github = "zx2c4"; + githubId = 10643; + name = "Jason A. Donenfeld"; }; - franzmondlichtmann = { - name = "Franz Schroepf"; - email = "franz-schroepf@t-online.de"; - github = "franzmondlichtmann"; - githubId = 105480088; + zyansheep = { + email = "zyansheep@protonmail.com"; + github = "zyansheep"; + githubId = 20029431; + name = "Zyansheep"; }; - srounce = { - name = "Samuel Rounce"; - email = "me@samuelrounce.co.uk"; - github = "srounce"; - githubId = 60792; + zzamboni = { + email = "diego@zzamboni.org"; + github = "zzamboni"; + githubId = 32876; + name = "Diego Zamboni"; }; } +/* Keep the list alphabetically sorted. */ diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index bb9572cbc7956..4f0ca24650251 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/haskell/maintainer-handles.nix b/maintainers/scripts/haskell/maintainer-handles.nix index 08c6bc4c96afd..d650e82f8b0c1 100644 --- a/maintainers/scripts/haskell/maintainer-handles.nix +++ b/maintainers/scripts/haskell/maintainer-handles.nix @@ -1,7 +1,21 @@ # Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs. +# +# This script produces an attr set mapping of email addresses to GitHub handles: +# +# ```nix +# > import ./maintainer-handles.nix +# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... } +# ``` +# +# This mapping contains all maintainers in ../../mainatainer-list.nix, but it +# ignores maintainers who don't have a GitHub account or an email address. let pkgs = import ../../.. {}; maintainers = import ../../maintainer-list.nix; inherit (pkgs) lib; - mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {}; + mkMailGithubPair = _: maintainer: + if (maintainer ? email) && (maintainer ? github) then + { "${maintainer.email}" = maintainer.github; } + else + {}; in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers) diff --git a/maintainers/scripts/haskell/test-configurations.nix b/maintainers/scripts/haskell/test-configurations.nix index 12287896b50df..8473ed4db8a2c 100644 --- a/maintainers/scripts/haskell/test-configurations.nix +++ b/maintainers/scripts/haskell/test-configurations.nix @@ -66,6 +66,28 @@ let if !builtins.isList files then [ files ] else files ); + packageSetsWithVersionedHead = pkgs.haskell.packages // ( + let + headSet = pkgs.haskell.packages.ghcHEAD; + # Determine the next GHC release version following GHC HEAD. + # GHC HEAD always has an uneven, tentative version number, e.g. 9.7. + # GHC releases always have even numbers, i.e. GHC 9.8 is branched off from + # GHC HEAD 9.7. Since we use the to be release number for GHC HEAD's + # configuration file, we need to calculate this here. + headVersion = lib.pipe headSet.ghc.version [ + lib.versions.splitVersion + (lib.take 2) + lib.concatStrings + lib.strings.toInt + (builtins.add 1) + toString + ]; + in + { + "ghc${headVersion}" = headSet; + } + ); + setsForFile = fileName: let # extract the unique part of the config's file name @@ -77,12 +99,12 @@ let builtins.match "ghc-([0-9]+).([0-9]+).x" configName ); # return all package sets under haskell.packages matching the version components - setsForVersion = builtins.map (name: pkgs.haskell.packages.${name}) ( + setsForVersion = builtins.map (name: packageSetsWithVersionedHead.${name}) ( builtins.filter (setName: lib.hasPrefix "ghc${configVersion}" setName && (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName)) ) ( - builtins.attrNames pkgs.haskell.packages + builtins.attrNames packageSetsWithVersionedHead ) ); diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 426c371d1d35c..95efeff732b6e 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -63,11 +63,13 @@ sed -r \ -e '/ lsp-test /d' \ -e '/ hie-bios /d' \ -e '/ ShellCheck /d' \ + -e '/ Agda /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. +# Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs. if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index b8f8bf6ef4886..4f7e26ec58e3f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -32,7 +32,7 @@ lmpfrlib,,,,,5.3,alexshpilkin loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, -lpeglabel,,,,,, +lpeglabel,,,,1.6.0,, lpty,,,,,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 4a6024c40380b..8717808daaf04 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,5 +1,3 @@ -#!/bin/sh -build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"` -python=${build}/bin/python -exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ - +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git +exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 6543a6259828c..3aff32caf581a 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,3 +1,10 @@ +/* + To run: + + nix-shell maintainers/scripts/update.nix + + See https://nixos.org/manual/nixpkgs/unstable/#var-passthru-updateScript +*/ { package ? null , maintainer ? null , predicate ? null @@ -8,8 +15,6 @@ , commit ? null }: -# TODO: add assert statements - let pkgs = import ./../../default.nix ( if include-overlays == false then diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 2a29892e5dbff..4b3c0176910fa 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -81,6 +81,7 @@ with lib.maintainers; { # Verify additions to this team with at least one already existing member of the team. members = [ cdepillabout + wraithm ]; scope = "Group registration for packages maintained by Bitnomial."; shortName = "Bitnomial employees"; @@ -168,6 +169,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 = [ @@ -303,6 +313,19 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + graalvm-ce = { + members = [ + bandresen + hlolli + glittershark + babariviere + ericdallo + thiagokokada + ]; + scope = "Maintain GraalVM Community Edition packages."; + shortName = "GraalVM-CE"; + }; + haskell = { members = [ cdepillabout @@ -689,9 +712,11 @@ with lib.maintainers; { rust = { members = [ - andir + figsoda lnl7 mic92 + tjni + winter zowoq ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; diff --git a/nixos/doc/manual/.gitignore b/nixos/doc/manual/.gitignore deleted file mode 100644 index 8792826242173..0000000000000 --- a/nixos/doc/manual/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -generated -manual-combined.xml diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile deleted file mode 100644 index b2b6481b20c75..0000000000000 --- a/nixos/doc/manual/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -.PHONY: all -all: manual-combined.xml - -.PHONY: debug -debug: generated manual-combined.xml - -manual-combined.xml: generated *.xml **/*.xml - rm -f ./manual-combined.xml - nix-shell --pure -Q --packages xmloscopy \ - --run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml" - -.PHONY: format -format: - nix-shell --pure -Q --packages xmlformat \ - --run "find ../../ -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ - xmlformat --config-file '../xmlformat.conf' -i {}" - -.PHONY: fix-misc-xml -fix-misc-xml: - find . -iname '*.xml' -type f \ - -exec ../varlistentry-fixer.rb {} ';' - -.PHONY: clean -clean: - rm -f manual-combined.xml generated - -generated: - nix-build ../../release.nix \ - --attr manualGeneratedSources.x86_64-linux \ - --out-link ./generated diff --git a/nixos/doc/manual/administration/containers.chapter.md b/nixos/doc/manual/administration/containers.chapter.md index ea51f91f698fb..50493b562b542 100644 --- a/nixos/doc/manual/administration/containers.chapter.md +++ b/nixos/doc/manual/administration/containers.chapter.md @@ -21,8 +21,8 @@ which is often not what you want. By contrast, in the imperative approach, containers are configured and updated independently from the host system. -```{=docbook} -<xi:include href="imperative-containers.section.xml" /> -<xi:include href="declarative-containers.section.xml" /> -<xi:include href="container-networking.section.xml" /> +```{=include=} sections +imperative-containers.section.md +declarative-containers.section.md +container-networking.section.md ``` diff --git a/nixos/doc/manual/administration/running.md b/nixos/doc/manual/administration/running.md new file mode 100644 index 0000000000000..48e8c7c6668b7 --- /dev/null +++ b/nixos/doc/manual/administration/running.md @@ -0,0 +1,14 @@ +# Administration {#ch-running} + +This chapter describes various aspects of managing a running NixOS system, such as how to use the {command}`systemd` service manager. + +```{=include=} chapters +service-mgmt.chapter.md +rebooting.chapter.md +user-sessions.chapter.md +control-groups.chapter.md +logging.chapter.md +cleaning-store.chapter.md +containers.chapter.md +troubleshooting.chapter.md +``` diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml deleted file mode 100644 index d9fcc1aee263f..0000000000000 --- a/nixos/doc/manual/administration/running.xml +++ /dev/null @@ -1,21 +0,0 @@ -<part xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-running"> - <title>Administration</title> - <partintro xml:id="ch-running-intro"> - <para> - This chapter describes various aspects of managing a running NixOS system, - such as how to use the <command>systemd</command> service manager. - </para> - </partintro> - <xi:include href="../from_md/administration/service-mgmt.chapter.xml" /> - <xi:include href="../from_md/administration/rebooting.chapter.xml" /> - <xi:include href="../from_md/administration/user-sessions.chapter.xml" /> - <xi:include href="../from_md/administration/control-groups.chapter.xml" /> - <xi:include href="../from_md/administration/logging.chapter.xml" /> - <xi:include href="../from_md/administration/cleaning-store.chapter.xml" /> - <xi:include href="../from_md/administration/containers.chapter.xml" /> - <xi:include href="../from_md/administration/troubleshooting.chapter.xml" /> -</part> diff --git a/nixos/doc/manual/administration/troubleshooting.chapter.md b/nixos/doc/manual/administration/troubleshooting.chapter.md index 548456eaf6d67..1253607f8efc2 100644 --- a/nixos/doc/manual/administration/troubleshooting.chapter.md +++ b/nixos/doc/manual/administration/troubleshooting.chapter.md @@ -3,10 +3,10 @@ This chapter describes solutions to common problems you might encounter when you manage your NixOS system. -```{=docbook} -<xi:include href="boot-problems.section.xml" /> -<xi:include href="maintenance-mode.section.xml" /> -<xi:include href="rollback.section.xml" /> -<xi:include href="store-corruption.section.xml" /> -<xi:include href="network-problems.section.xml" /> +```{=include=} sections +boot-problems.section.md +maintenance-mode.section.md +rollback.section.md +store-corruption.section.md +network-problems.section.md ``` diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md index efd231fd1f4e4..b010026c58286 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/config-syntax.chapter.md b/nixos/doc/manual/configuration/config-syntax.chapter.md index 9f8d45d588997..9e606b2b82af3 100644 --- a/nixos/doc/manual/configuration/config-syntax.chapter.md +++ b/nixos/doc/manual/configuration/config-syntax.chapter.md @@ -11,8 +11,8 @@ manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions), but here we give a short overview of the most important constructs useful in NixOS configuration files. -```{=docbook} -<xi:include href="config-file.section.xml" /> -<xi:include href="abstractions.section.xml" /> -<xi:include href="modularity.section.xml" /> +```{=include=} sections +config-file.section.md +abstractions.section.md +modularity.section.md ``` diff --git a/nixos/doc/manual/configuration/configuration.md b/nixos/doc/manual/configuration/configuration.md new file mode 100644 index 0000000000000..4c966f3325b99 --- /dev/null +++ b/nixos/doc/manual/configuration/configuration.md @@ -0,0 +1,27 @@ +# Configuration {#ch-configuration} + +This chapter describes how to configure various aspects of a NixOS machine through the configuration file {file}`/etc/nixos/configuration.nix`. As described in [](#sec-changing-config), changes to this file only take effect after you run {command}`nixos-rebuild`. + +```{=include=} chapters +config-syntax.chapter.md +package-mgmt.chapter.md +user-mgmt.chapter.md +file-systems.chapter.md +x-windows.chapter.md +wayland.chapter.md +gpu-accel.chapter.md +xfce.chapter.md +networking.chapter.md +linux-kernel.chapter.md +subversion.chapter.md +``` + +```{=include=} chapters +@MODULE_CHAPTERS@ +``` + +```{=include=} chapters +profiles.chapter.md +kubernetes.chapter.md +``` +<!-- Apache; libvirtd virtualisation --> diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml deleted file mode 100644 index b04316cfa48e2..0000000000000 --- a/nixos/doc/manual/configuration/configuration.xml +++ /dev/null @@ -1,31 +0,0 @@ -<part xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-configuration"> - <title>Configuration</title> - <partintro xml:id="ch-configuration-intro"> - <para> - This chapter describes how to configure various aspects of a NixOS machine - through the configuration file - <filename>/etc/nixos/configuration.nix</filename>. As described in - <xref linkend="sec-changing-config" />, changes to this file only take - effect after you run <command>nixos-rebuild</command>. - </para> - </partintro> - <xi:include href="../from_md/configuration/config-syntax.chapter.xml" /> - <xi:include href="../from_md/configuration/package-mgmt.chapter.xml" /> - <xi:include href="../from_md/configuration/user-mgmt.chapter.xml" /> - <xi:include href="../from_md/configuration/file-systems.chapter.xml" /> - <xi:include href="../from_md/configuration/x-windows.chapter.xml" /> - <xi:include href="../from_md/configuration/wayland.chapter.xml" /> - <xi:include href="../from_md/configuration/gpu-accel.chapter.xml" /> - <xi:include href="../from_md/configuration/xfce.chapter.xml" /> - <xi:include href="../from_md/configuration/networking.chapter.xml" /> - <xi:include href="../from_md/configuration/linux-kernel.chapter.xml" /> - <xi:include href="../from_md/configuration/subversion.chapter.xml" /> - <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" /> - <xi:include href="../from_md/configuration/profiles.chapter.xml" /> - <xi:include href="../from_md/configuration/kubernetes.chapter.xml" /> -<!-- Apache; libvirtd virtualisation --> -</part> diff --git a/nixos/doc/manual/configuration/declarative-packages.section.md b/nixos/doc/manual/configuration/declarative-packages.section.md index 337cdf8472e40..02eaa56192e46 100644 --- a/nixos/doc/manual/configuration/declarative-packages.section.md +++ b/nixos/doc/manual/configuration/declarative-packages.section.md @@ -40,7 +40,7 @@ configuration use `pkgs` prefix (variable). To "uninstall" a package, simply remove it from [](#opt-environment.systemPackages) and run `nixos-rebuild switch`. -```{=docbook} -<xi:include href="customizing-packages.section.xml" /> -<xi:include href="adding-custom-packages.section.xml" /> +```{=include=} sections +customizing-packages.section.md +adding-custom-packages.section.md ``` diff --git a/nixos/doc/manual/configuration/file-systems.chapter.md b/nixos/doc/manual/configuration/file-systems.chapter.md index 901e2e4f181b3..aca978be064d3 100644 --- a/nixos/doc/manual/configuration/file-systems.chapter.md +++ b/nixos/doc/manual/configuration/file-systems.chapter.md @@ -36,7 +36,7 @@ dropping you to the emergency shell. You can make a mount asynchronous and non-critical by adding `options = [ "nofail" ];`. ::: -```{=docbook} -<xi:include href="luks-file-systems.section.xml" /> -<xi:include href="sshfs-file-systems.section.xml" /> +```{=include=} sections +luks-file-systems.section.md +sshfs-file-systems.section.md ``` diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md index 3395ace20c4fd..2eff15387987f 100644 --- a/nixos/doc/manual/configuration/modularity.section.md +++ b/nixos/doc/manual/configuration/modularity.section.md @@ -67,7 +67,13 @@ When using multiple modules, you may need to access configuration values defined in other modules. This is what the `config` function argument is for: it contains the complete, merged system configuration. That is, `config` is the result of combining the configurations returned by every -module [^1] . For example, here is a module that adds some packages to +module. (If you're wondering how it's possible that the (indirect) *result* +of a function is passed as an *input* to that same function: that's +because Nix is a "lazy" language --- it only computes values when +they are needed. This works as long as no individual configuration +value depends on itself.) + +For example, here is a module that adds some packages to [](#opt-environment.systemPackages) only if [](#opt-services.xserver.enable) is set to `true` somewhere else: @@ -125,9 +131,3 @@ in { imports = [ (netConfig "nixos.localdomain") ]; } ``` - -[^1]: If you're wondering how it's possible that the (indirect) *result* - of a function is passed as an *input* to that same function: that's - because Nix is a "lazy" language --- it only computes values when - they are needed. This works as long as no individual configuration - value depends on itself. diff --git a/nixos/doc/manual/configuration/networking.chapter.md b/nixos/doc/manual/configuration/networking.chapter.md index 529dc0610bdaf..abbd9766f173b 100644 --- a/nixos/doc/manual/configuration/networking.chapter.md +++ b/nixos/doc/manual/configuration/networking.chapter.md @@ -3,14 +3,14 @@ This section describes how to configure networking components on your NixOS machine. -```{=docbook} -<xi:include href="network-manager.section.xml" /> -<xi:include href="ssh.section.xml" /> -<xi:include href="ipv4-config.section.xml" /> -<xi:include href="ipv6-config.section.xml" /> -<xi:include href="firewall.section.xml" /> -<xi:include href="wireless.section.xml" /> -<xi:include href="ad-hoc-network-config.section.xml" /> -<xi:include href="renaming-interfaces.section.xml" /> +```{=include=} sections +network-manager.section.md +ssh.section.md +ipv4-config.section.md +ipv6-config.section.md +firewall.section.md +wireless.section.md +ad-hoc-network-config.section.md +renaming-interfaces.section.md ``` <!-- TODO: OpenVPN, NAT --> diff --git a/nixos/doc/manual/configuration/package-mgmt.chapter.md b/nixos/doc/manual/configuration/package-mgmt.chapter.md index a6c414be59a97..1148bbe84740c 100644 --- a/nixos/doc/manual/configuration/package-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/package-mgmt.chapter.md @@ -12,7 +12,7 @@ NixOS has two distinct styles of package management: `nix-env` command. This style allows mixing packages from different Nixpkgs versions. It's the only choice for non-root users. -```{=docbook} -<xi:include href="declarative-packages.section.xml" /> -<xi:include href="ad-hoc-packages.section.xml" /> +```{=include=} sections +declarative-packages.section.md +ad-hoc-packages.section.md ``` diff --git a/nixos/doc/manual/configuration/profiles.chapter.md b/nixos/doc/manual/configuration/profiles.chapter.md index 2c3dea27c1818..9f1f48f742ac5 100644 --- a/nixos/doc/manual/configuration/profiles.chapter.md +++ b/nixos/doc/manual/configuration/profiles.chapter.md @@ -19,16 +19,16 @@ install media, many are actually intended to be used in real installs. What follows is a brief explanation on the purpose and use-case for each profile. Detailing each option configured by each one is out of scope. -```{=docbook} -<xi:include href="profiles/all-hardware.section.xml" /> -<xi:include href="profiles/base.section.xml" /> -<xi:include href="profiles/clone-config.section.xml" /> -<xi:include href="profiles/demo.section.xml" /> -<xi:include href="profiles/docker-container.section.xml" /> -<xi:include href="profiles/graphical.section.xml" /> -<xi:include href="profiles/hardened.section.xml" /> -<xi:include href="profiles/headless.section.xml" /> -<xi:include href="profiles/installation-device.section.xml" /> -<xi:include href="profiles/minimal.section.xml" /> -<xi:include href="profiles/qemu-guest.section.xml" /> +```{=include=} sections +profiles/all-hardware.section.md +profiles/base.section.md +profiles/clone-config.section.md +profiles/demo.section.md +profiles/docker-container.section.md +profiles/graphical.section.md +profiles/hardened.section.md +profiles/headless.section.md +profiles/installation-device.section.md +profiles/minimal.section.md +profiles/qemu-guest.section.md ``` diff --git a/nixos/doc/manual/configuration/sshfs-file-systems.section.md b/nixos/doc/manual/configuration/sshfs-file-systems.section.md index 4dd1b203a2497..d8c9dea6c3375 100644 --- a/nixos/doc/manual/configuration/sshfs-file-systems.section.md +++ b/nixos/doc/manual/configuration/sshfs-file-systems.section.md @@ -8,7 +8,7 @@ It means that if you have SSH access to a machine, no additional setup is needed ## Interactive mounting {#sec-sshfs-interactive} -In NixOS, SSHFS is packaged as <package>sshfs</package>. +In NixOS, SSHFS is packaged as `sshfs`. Once installed, mounting a directory interactively is simple as running: ```ShellSession $ sshfs my-user@example.com:/my-dir /mnt/my-dir diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index be185cf4c314d..bef35f4488742 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -69,7 +69,7 @@ Wine, you should also set the following: hardware.opengl.driSupport32Bit = true; ``` -## Auto-login {#sec-x11-auto-login .unnumbered} +## Auto-login {#sec-x11-auto-login} The x11 login screen can be skipped entirely, automatically logging you into your window manager and desktop environment when you boot your @@ -96,7 +96,7 @@ services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "alice"; ``` -## Intel Graphics drivers {#sec-x11--graphics-cards-intel .unnumbered} +## Intel Graphics drivers {#sec-x11--graphics-cards-intel} There are two choices for Intel Graphics drivers in X.org: `modesetting` (included in the xorg-server itself) and `intel` (provided by the @@ -136,7 +136,7 @@ services.xserver.deviceSection = '' Note that this will likely downgrade the performance compared to `modesetting` or `intel` with DRI 3 (default). -## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia .unnumbered} +## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia} NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by @@ -158,7 +158,7 @@ services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. -## Proprietary AMD drivers {#sec-x11--graphics-cards-amd .unnumbered} +## Proprietary AMD drivers {#sec-x11--graphics-cards-amd} 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 @@ -173,7 +173,7 @@ services.xserver.videoDrivers = [ "amdgpu-pro" ]; You will need to reboot after enabling this driver to prevent a clash with other kernel modules. -## Touchpads {#sec-x11-touchpads .unnumbered} +## Touchpads {#sec-x11-touchpads} Support for Synaptics touchpads (found in many laptops such as the Dell Latitude series) can be enabled as follows: @@ -192,7 +192,7 @@ services.xserver.libinput.touchpad.tapping = false; Note: the use of `services.xserver.synaptics` is deprecated since NixOS 17.09. -## GTK/Qt themes {#sec-x11-gtk-and-qt-themes .unnumbered} +## GTK/Qt themes {#sec-x11-gtk-and-qt-themes} GTK themes can be installed either to user profile or system-wide (via `environment.systemPackages`). To make Qt 5 applications look similar to @@ -204,7 +204,7 @@ qt.platformTheme = "gtk2"; qt.style = "gtk2"; ``` -## Custom XKB layouts {#custom-xkb-layouts .unnumbered} +## Custom XKB layouts {#custom-xkb-layouts} It is possible to install custom [ XKB ](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index c331e63cfe54c..a80be2b523e24 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -24,7 +24,7 @@ Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your [](#opt-environment.systemPackages) from `pkgs.xfce`. -## Thunar {#sec-xfce-thunar-plugins .unnumbered} +## Thunar {#sec-xfce-thunar-plugins} Thunar (the Xfce file manager) is automatically enabled when Xfce is enabled. To enable Thunar without enabling Xfce, use the configuration @@ -35,7 +35,7 @@ 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} +## Troubleshooting {#sec-xfce-troubleshooting} Even after enabling udisks2, volume management might not work. Thunar and/or the desktop takes time to show up. Thunar will spit out this kind @@ -54,4 +54,4 @@ run this command to do the same thing. $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true ``` -A log-out and re-log will be needed for this to take effect. +It is necessary to log out and log in again for this to take effect. diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index 557599809222a..c306cc084cdbe 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -6,7 +6,6 @@ You can quickly check your edits with the following: ```ShellSession $ cd /path/to/nixpkgs -$ ./nixos/doc/manual/md-to-db.sh $ nix-build nixos/release.nix -A manual.x86_64-linux ``` diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 0ddb3fa7fbe9c..714b3efca20aa 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -21,6 +21,8 @@ let withManOptDedupPatch = true; }; + manpageUrls = pkgs.path + "/doc/manpage-urls.json"; + # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, # or else the build will fail. @@ -48,7 +50,7 @@ let }; in buildPackages.nixosOptionsDoc { inherit (eval) options; - inherit (revision); + inherit revision; transformOptions = opt: opt // { # Clean up declaration sites to not refer to the NixOS source tree. declarations = @@ -66,31 +68,6 @@ let optionIdPrefix = "test-opt-"; }; - sources = lib.sourceFilesBySuffices ./. [".xml"]; - - modulesDoc = builtins.toFile "modules.xml" '' - <section xmlns:xi="http://www.w3.org/2001/XInclude" id="modules"> - ${(lib.concatMapStrings (path: '' - <xi:include href="${path}" /> - '') (lib.catAttrs "value" config.meta.doc))} - </section> - ''; - - generatedSources = runCommand "generated-docbook" {} '' - mkdir $out - ln -s ${modulesDoc} $out/modules.xml - ln -s ${optionsDoc.optionsDocBook} $out/options-db.xml - ln -s ${testOptionsDoc.optionsDocBook} $out/test-options-db.xml - printf "%s" "${version}" > $out/version - ''; - - copySources = - '' - cp -prd $sources/* . # */ - ln -s ${generatedSources} ./generated - chmod -R u+w . - ''; - toc = builtins.toFile "toc.xml" '' <toc role="chunk-toc"> @@ -121,70 +98,102 @@ let "--stringparam chunk.toc ${toc}" ]; + linterFunctions = '' + # outputs the context of an xmllint error output + # LEN lines around the failing line are printed + function context { + # length of context + local LEN=6 + # lines to print before error line + local BEFORE=4 + + # xmllint output lines are: + # file.xml:1234: there was an error on line 1234 + while IFS=':' read -r file line rest; do + echo + if [[ -n "$rest" ]]; then + echo "$file:$line:$rest" + local FROM=$(($line>$BEFORE ? $line - $BEFORE : 1)) + # number lines & filter context + nl --body-numbering=a "$file" | sed -n "$FROM,+$LEN p" + else + if [[ -n "$line" ]]; then + echo "$file:$line" + else + echo "$file" + fi + fi + done + } + + function lintrng { + xmllint --debug --noout --nonet \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + "$1" \ + 2>&1 | context 1>&2 + # ^ redirect assumes xmllint doesn’t print to stdout + } + ''; + manual-combined = runCommand "nixos-manual-combined" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + { inputs = lib.sourceFilesBySuffices ./. [ ".xml" ".md" ]; + nativeBuildInputs = [ pkgs.nixos-render-docs pkgs.libxml2.bin pkgs.libxslt.bin ]; meta.description = "The NixOS manual as plain docbook XML"; } '' - ${copySources} - - xmllint --xinclude --output ./manual-combined.xml ./manual.xml - xmllint --xinclude --noxincludenode \ - --output ./man-pages-combined.xml ./man-pages.xml - - # outputs the context of an xmllint error output - # LEN lines around the failing line are printed - function context { - # length of context - local LEN=6 - # lines to print before error line - local BEFORE=4 - - # xmllint output lines are: - # file.xml:1234: there was an error on line 1234 - while IFS=':' read -r file line rest; do - echo - if [[ -n "$rest" ]]; then - echo "$file:$line:$rest" - local FROM=$(($line>$BEFORE ? $line - $BEFORE : 1)) - # number lines & filter context - nl --body-numbering=a "$file" | sed -n "$FROM,+$LEN p" - else - if [[ -n "$line" ]]; then - echo "$file:$line" - else - echo "$file" - fi - fi - done - } - - function lintrng { - xmllint --debug --noout --nonet \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - "$1" \ - 2>&1 | context 1>&2 - # ^ redirect assumes xmllint doesn’t print to stdout - } + cp -r --no-preserve=all $inputs/* . + + substituteInPlace ./manual.md \ + --replace '@NIXOS_VERSION@' "${version}" + substituteInPlace ./configuration/configuration.md \ + --replace \ + '@MODULE_CHAPTERS@' \ + ${lib.escapeShellArg (lib.concatMapStringsSep "\n" (p: "${p.value}") config.meta.doc)} + substituteInPlace ./nixos-options.md \ + --replace \ + '@NIXOS_OPTIONS_JSON@' \ + ${optionsDoc.optionsJSON}/share/doc/nixos/options.json + substituteInPlace ./development/writing-nixos-tests.section.md \ + --replace \ + '@NIXOS_TEST_OPTIONS_JSON@' \ + ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json + + nixos-render-docs -j $NIX_BUILD_CORES manual docbook \ + --manpage-urls ${manpageUrls} \ + --revision ${lib.escapeShellArg revision} \ + ./manual.md \ + ./manual-combined.xml + + ${linterFunctions} mkdir $out cp manual-combined.xml $out/ - cp man-pages-combined.xml $out/ lintrng $out/manual-combined.xml - lintrng $out/man-pages-combined.xml ''; -in rec { - inherit generatedSources; + manpages-combined = runCommand "nixos-manpages-combined.xml" + { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + meta.description = "The NixOS manpages as plain docbook XML"; + } + '' + mkdir generated + cp -prd ${./man-pages.xml} man-pages.xml + ln -s ${optionsDoc.optionsDocBook} generated/options-db.xml + + xmllint --xinclude --noxincludenode --output $out ./man-pages.xml + + ${linterFunctions} + lintrng $out + ''; + +in rec { inherit (optionsDoc) optionsJSON optionsNix optionsDocBook optionsUsedDocbook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; meta.description = "The NixOS manual in HTML format"; allowedReferences = ["out"]; } @@ -221,8 +230,7 @@ in rec { manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html"; manualEpub = runCommand "nixos-manual-epub" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; + { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; } '' # Generate the epub manual. @@ -250,21 +258,38 @@ in rec { # Generate the NixOS manpages. manpages = runCommand "nixos-manpages" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + { nativeBuildInputs = [ + buildPackages.installShellFiles + ] ++ lib.optionals allowDocBook [ + buildPackages.libxml2.bin + buildPackages.libxslt.bin + ] ++ lib.optionals (! allowDocBook) [ + buildPackages.nixos-render-docs + ]; allowedReferences = ["out"]; } '' # Generate manpages. - mkdir -p $out/share/man - 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 \ - ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ - ${manual-combined}/man-pages-combined.xml + mkdir -p $out/share/man/man8 + installManPage ${./manpages}/* + ${if allowDocBook + then '' + 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 \ + ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ + ${manpages-combined} + '' + else '' + mkdir -p $out/share/man/man5 + nixos-render-docs -j $NIX_BUILD_CORES options manpage \ + --revision ${lib.escapeShellArg revision} \ + ${optionsJSON}/share/doc/nixos/options.json \ + $out/share/man/man5/configuration.nix.5 + ''} ''; } diff --git a/nixos/doc/manual/development/developing-the-test-driver.chapter.md b/nixos/doc/manual/development/developing-the-test-driver.chapter.md new file mode 100644 index 0000000000000..4b70fe00af476 --- /dev/null +++ b/nixos/doc/manual/development/developing-the-test-driver.chapter.md @@ -0,0 +1,43 @@ + +# Developing the NixOS Test Driver {#chap-developing-the-test-driver} + +The NixOS test framework is a project of its own. + +It consists of roughly the following components: + + - `nixos/lib/test-driver`: The Python framework that sets up the test and runs the [`testScript`](#test-opt-testScript) + - `nixos/lib/testing`: The Nix code responsible for the wiring, written using the (NixOS) Module System. + +These components are exposed publicly through: + + - `nixos/lib/default.nix`: The public interface that exposes the `nixos/lib/testing` entrypoint. + - `flake.nix`: Exposes the `lib.nixos`, including the public test interface. + +Beyond the test driver itself, its integration into NixOS and Nixpkgs is important. + + - `pkgs/top-level/all-packages.nix`: Defines the `nixosTests` attribute, used + by the package `tests` attributes and OfBorg. + - `nixos/release.nix`: Defines the `tests` attribute built by Hydra, independently, but analogous to `nixosTests` + - `nixos/release-combined.nix`: Defines which tests are channel blockers. + +Finally, we have legacy entrypoints that users should move away from, but are cared for on a best effort basis. +These include `pkgs.nixosTest`, `testing-python.nix` and `make-test-python.nix`. + +## Testing changes to the test framework {#sec-test-the-test-framework} + +When making significant changes to the test framework, we run the tests on Hydra, to avoid disrupting the larger NixOS project. + +For this, we use the `python-test-refactoring` branch in the `NixOS/nixpkgs` repository, and its [corresponding Hydra jobset](https://hydra.nixos.org/jobset/nixos/python-test-refactoring). +This branch is used as a pointer, and not as a feature branch. + +1. Rebase the PR onto a recent, good evaluation of `nixos-unstable` +2. Create a baseline evaluation by force-pushing this revision of `nixos-unstable` to `python-test-refactoring`. +3. Note the evaluation number (we'll call it `<previous>`) +4. Push the PR to `python-test-refactoring` and evaluate the PR on Hydra +5. Create a comparison URL by navigating to the latest build of the PR and adding to the URL `?compare=<previous>`. This is not necessary for the evaluation that comes right after the baseline. + +Review the removed tests and newly failed tests using the constructed URL; otherwise you will accidentally compare iterations of the PR instead of changes to the PR base. + +As we currently have some flaky tests, newly failing tests are expected, but should be reviewed to make sure that + - The number of failures did not increase significantly. + - All failures that do occur can reasonably be assumed to fail for a different reason than the changes. diff --git a/nixos/doc/manual/development/development.md b/nixos/doc/manual/development/development.md new file mode 100644 index 0000000000000..76f405c3b29cc --- /dev/null +++ b/nixos/doc/manual/development/development.md @@ -0,0 +1,15 @@ +# Development {#ch-development} + +This chapter describes how you can modify and extend NixOS. + +```{=include=} chapters +sources.chapter.md +writing-modules.chapter.md +building-parts.chapter.md +bootspec.chapter.md +what-happens-during-a-system-switch.chapter.md +writing-documentation.chapter.md +nixos-tests.chapter.md +developing-the-test-driver.chapter.md +testing-installer.chapter.md +``` diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml deleted file mode 100644 index 949468c9021df..0000000000000 --- a/nixos/doc/manual/development/development.xml +++ /dev/null @@ -1,20 +0,0 @@ -<part xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-development"> - <title>Development</title> - <partintro xml:id="ch-development-intro"> - <para> - This chapter describes how you can modify and extend NixOS. - </para> - </partintro> - <xi:include href="../from_md/development/sources.chapter.xml" /> - <xi:include href="../from_md/development/writing-modules.chapter.xml" /> - <xi:include href="../from_md/development/building-parts.chapter.xml" /> - <xi:include href="../from_md/development/bootspec.chapter.xml" /> - <xi:include href="../from_md/development/what-happens-during-a-system-switch.chapter.xml" /> - <xi:include href="../from_md/development/writing-documentation.chapter.xml" /> - <xi:include href="../from_md/development/nixos-tests.chapter.xml" /> - <xi:include href="../from_md/development/testing-installer.chapter.xml" /> -</part> diff --git a/nixos/doc/manual/development/freeform-modules.section.md b/nixos/doc/manual/development/freeform-modules.section.md index 10e876b96d591..514a06f97ee77 100644 --- a/nixos/doc/manual/development/freeform-modules.section.md +++ b/nixos/doc/manual/development/freeform-modules.section.md @@ -13,9 +13,8 @@ checking for entire option trees, it is only recommended for use in submodules. ::: {#ex-freeform-module .example} -::: {.title} **Example: Freeform submodule** -::: + The following shows a submodule assigning a freeform type that allows arbitrary attributes with `str` values below `settings`, but also declares an option for the `settings.port` attribute to have it diff --git a/nixos/doc/manual/development/meta-attributes.section.md b/nixos/doc/manual/development/meta-attributes.section.md index 7129cf8723e68..33b41fe74d297 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: @@ -40,26 +42,6 @@ file. $ nix-build nixos/release.nix -A manual.x86_64-linux ``` - This file should *not* usually be written by hand. Instead it is preferred - to write documentation using CommonMark and converting it to CommonMark - using pandoc. The simplest documentation can be converted using just - - ```ShellSession - $ pandoc doc.md -t docbook --top-level-division=chapter -f markdown+smart > doc.xml - ``` - - More elaborate documentation may wish to add one or more of the pandoc - filters used to build the remainder of the manual, for example the GNOME - desktop uses - - ```ShellSession - $ pandoc gnome.md -t docbook --top-level-division=chapter \ - --extract-media=media -f markdown+smart \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ - > gnome.xml - ``` - - `buildDocsInSandbox` indicates whether the option documentation for the module can be built in a derivation sandbox. This option is currently only honored for modules shipped by nixpkgs. User modules and modules taken from diff --git a/nixos/doc/manual/development/nixos-tests.chapter.md b/nixos/doc/manual/development/nixos-tests.chapter.md index 2a4fdddeaa666..ec0e4b9f076af 100644 --- a/nixos/doc/manual/development/nixos-tests.chapter.md +++ b/nixos/doc/manual/development/nixos-tests.chapter.md @@ -5,9 +5,9 @@ NixOS tests are kept in the directory `nixos/tests`, and are executed (using Nix) by a testing framework that automatically starts one or more virtual machines containing the NixOS system(s) required for the test. -```{=docbook} -<xi:include href="writing-nixos-tests.section.xml" /> -<xi:include href="running-nixos-tests.section.xml" /> -<xi:include href="running-nixos-tests-interactively.section.xml" /> -<xi:include href="linking-nixos-tests-to-packages.section.xml" /> +```{=include=} sections +writing-nixos-tests.section.md +running-nixos-tests.section.md +running-nixos-tests-interactively.section.md +linking-nixos-tests-to-packages.section.md ``` diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 18ec7ba903a9f..f6fed3e16837f 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -87,6 +87,7 @@ lib.mkOption { description = lib.mdDoc "Whether to enable magic."; } ``` +::: ### `mkPackageOption`, `mkPackageOptionMD` {#sec-option-declarations-util-mkPackageOption} @@ -100,15 +101,28 @@ Creates an Option attribute set for an option that specifies the package a modul **Note**: You shouldn’t necessarily make package options for all of your modules. You can always overwrite a specific package throughout nixpkgs by using [nixpkgs overlays](https://nixos.org/manual/nixpkgs/stable/#chap-overlays). -The default 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. +The package is specified in the third argument under `default` as a list of strings +representing its attribute path in nixpkgs (or another package set). +Because of this, you need to pass nixpkgs itself (or a subset) as the first argument. + +The second argument may be either a string or a list of strings. +It provides the display name of the package in the description of the generated option +(using only the last element if the passed value is a list) +and serves as the fallback value for the `default` argument. + +To include extra information in the description, pass `extraDescription` to +append arbitrary text to the generated description. +You can also pass an `example` value, either a literal string or an attribute path. -The second argument is the name of the option, used in the description "The \<name\> package to use.". You can also pass an example value, either a literal string or a package's attribute path. +The default argument can be omitted if the provided name is +an attribute of pkgs (if name is a string) or a +valid attribute path in pkgs (if name is a list). -You can omit the default path if the name of the option is also attribute path in nixpkgs. +If you wish to explicitly provide no default, pass `null` as `default`. During the transition to CommonMark documentation `mkPackageOption` creates an option with a DocBook description attribute, once the transition is completed it will create a CommonMark description instead. `mkPackageOptionMD` always creates an option with a CommonMark description attribute and will be removed some time after the transition is completed. -::: {#ex-options-declarations-util-mkPackageOption .title} +[]{#ex-options-declarations-util-mkPackageOption} Examples: ::: {#ex-options-declarations-util-mkPackageOption-hello .example} @@ -122,6 +136,7 @@ lib.mkOption { description = lib.mdDoc "The hello package to use."; } ``` +::: ::: {#ex-options-declarations-util-mkPackageOption-ghc .example} ```nix @@ -138,6 +153,22 @@ lib.mkOption { description = lib.mdDoc "The GHC package to use."; } ``` +::: + +::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example} +```nix +mkPackageOption pkgs [ "python39Packages" "pytorch" ] { + extraDescription = "This is an example and doesn't actually do anything."; +} +# is like +lib.mkOption { + type = lib.types.package; + default = pkgs.python39Packages.pytorch; + defaultText = lib.literalExpression "pkgs.python39Packages.pytorch"; + description = "The pytorch package to use. This is an example and doesn't actually do anything."; +} +``` +::: ## Extensible Option Types {#sec-option-declarations-eot} @@ -186,9 +217,7 @@ changing the main service module file and the type system automatically enforces that there can only be a single display manager enabled. ::: {#ex-option-declaration-eot-service .example} -::: {.title} **Example: Extensible type placeholder in the service module** -::: ```nix services.xserver.displayManager.enable = mkOption { description = "Display manager to use"; @@ -198,9 +227,7 @@ services.xserver.displayManager.enable = mkOption { ::: ::: {#ex-option-declaration-eot-backend-gdm .example} -::: {.title} **Example: Extending `services.xserver.displayManager.enable` in the `gdm` module** -::: ```nix services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "gdm" ]); @@ -209,9 +236,7 @@ services.xserver.displayManager.enable = mkOption { ::: ::: {#ex-option-declaration-eot-backend-sddm .example} -::: {.title} **Example: Extending `services.xserver.displayManager.enable` in the `sddm` module** -::: ```nix services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md index 22cf38873cf07..6a3dc26b99be4 100644 --- a/nixos/doc/manual/development/option-def.section.md +++ b/nixos/doc/manual/development/option-def.section.md @@ -12,7 +12,7 @@ config = { However, sometimes you need to wrap an option definition or set of option definitions in a *property* to achieve certain effects: -## Delaying Conditionals {#sec-option-definitions-delaying-conditionals .unnumbered} +## Delaying Conditionals {#sec-option-definitions-delaying-conditionals} If a set of option definitions is conditional on the value of another option, you may need to use `mkIf`. Consider, for instance: @@ -56,7 +56,7 @@ config = { }; ``` -## Setting Priorities {#sec-option-definitions-setting-priorities .unnumbered} +## Setting Priorities {#sec-option-definitions-setting-priorities} A module can override the definitions of an option in other modules by setting an *override priority*. All option definitions that do not have the lowest @@ -72,7 +72,7 @@ This definition causes all other definitions with priorities above 10 to be discarded. The function `mkForce` is equal to `mkOverride 50`, and `mkDefault` is equal to `mkOverride 1000`. -## Ordering Definitions {#sec-option-definitions-ordering .unnumbered} +## Ordering Definitions {#sec-option-definitions-ordering} 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. @@ -89,7 +89,7 @@ definitions in the final list value of `hardware.firmware`. Note that this is different from [override priorities](#sec-option-definitions-setting-priorities): setting an order does not affect whether the definition is included or not. -## Merging Configurations {#sec-option-definitions-merging .unnumbered} +## Merging Configurations {#sec-option-definitions-merging} In conjunction with `mkIf`, it is sometimes useful for a module to return multiple sets of option definitions, to be merged together as if diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 0e9c4a4d16be4..51977c58333f9 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -36,9 +36,8 @@ merging is handled. together. This type is recommended when the option type is unknown. ::: {#ex-types-anything .example} - ::: {.title} **Example: `types.anything` Example** - ::: + Two definitions of this type like ```nix @@ -357,9 +356,7 @@ you will still need to provide a default value (e.g. an empty attribute set) if you want to allow users to leave it undefined. ::: {#ex-submodule-direct .example} -::: {.title} **Example: Directly defined submodule** -::: ```nix options.mod = mkOption { description = "submodule example"; @@ -378,9 +375,7 @@ options.mod = mkOption { ::: ::: {#ex-submodule-reference .example} -::: {.title} **Example: Submodule defined as a reference** -::: ```nix let modOptions = { @@ -408,9 +403,7 @@ multiple definitions of the submodule option set ([Example: Definition of a list of submodules](#ex-submodule-listof-definition)). ::: {#ex-submodule-listof-declaration .example} -::: {.title} **Example: Declaration of a list of submodules** -::: ```nix options.mod = mkOption { description = "submodule example"; @@ -429,9 +422,7 @@ options.mod = mkOption { ::: ::: {#ex-submodule-listof-definition .example} -::: {.title} **Example: Definition of a list of submodules** -::: ```nix config.mod = [ { foo = 1; bar = "one"; } @@ -446,9 +437,7 @@ multiple named definitions of the submodule option set ([Example: Definition of attribute sets of submodules](#ex-submodule-attrsof-definition)). ::: {#ex-submodule-attrsof-declaration .example} -::: {.title} **Example: Declaration of attribute sets of submodules** -::: ```nix options.mod = mkOption { description = "submodule example"; @@ -467,9 +456,7 @@ options.mod = mkOption { ::: ::: {#ex-submodule-attrsof-definition .example} -::: {.title} **Example: Definition of attribute sets of submodules** -::: ```nix config.mod.one = { foo = 1; bar = "one"; }; config.mod.two = { foo = 2; bar = "two"; }; @@ -489,9 +476,8 @@ Types are mainly characterized by their `check` and `merge` functions. ([Example: Overriding a type check](#ex-extending-type-check-2)). ::: {#ex-extending-type-check-1 .example} - ::: {.title} **Example: Adding a type check** - ::: + ```nix byte = mkOption { description = "An integer between 0 and 255."; @@ -501,9 +487,8 @@ Types are mainly characterized by their `check` and `merge` functions. ::: ::: {#ex-extending-type-check-2 .example} - ::: {.title} **Example: Overriding a type check** - ::: + ```nix nixThings = mkOption { description = "words that start with 'nix'"; 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 1130672cb3766..54002941d6349 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 `<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: + +```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 334149d021cb4..476ba4b03f9d5 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -119,9 +119,8 @@ have a predefined type and string generator already declared under default Elixir keyword list -::: {#pkgs-formats-result} +[]{#pkgs-formats-result} These functions all return an attribute set with these values: -::: `type` @@ -144,9 +143,8 @@ These functions all return an attribute set with these values: ::: ::: {#ex-settings-nix-representable .example} -::: {.title} **Example: Module with conventional `settings` option** -::: + The following shows a module for an example program that uses a JSON configuration file. It demonstrates how above values can be used, along with some other related best practices. See the comments for @@ -220,9 +218,7 @@ the port, which will enforce it to be a valid integer and make it show up in the manual. ::: {#ex-settings-typed-attrs .example} -::: {.title} **Example: Declaring a type-checked `settings` attribute** -::: ```nix settings = lib.mkOption { type = lib.types.submodule { diff --git a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md index aad82831a3c24..9cbec729803ac 100644 --- a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md +++ b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md @@ -47,7 +47,7 @@ Most of these actions are either self-explaining but some of them have to do with our units or the activation script. For this reason, these topics are explained in the next sections. -```{=docbook} -<xi:include href="unit-handling.section.xml" /> -<xi:include href="activation-script.section.xml" /> +```{=include=} sections +unit-handling.section.md +activation-script.section.md ``` diff --git a/nixos/doc/manual/development/writing-documentation.chapter.md b/nixos/doc/manual/development/writing-documentation.chapter.md index 4986c9f0a81b6..8d504dfb0b0a0 100644 --- a/nixos/doc/manual/development/writing-documentation.chapter.md +++ b/nixos/doc/manual/development/writing-documentation.chapter.md @@ -83,7 +83,7 @@ Keep the following guidelines in mind when you create and add a topic: ## Adding a Topic to the Book {#sec-writing-docs-adding-a-topic} -Open the parent XML file and add an `xi:include` element to the list of +Open the parent CommonMark file and add a line to the list of chapters with the file name of the topic that you created. If you created a `section`, you add the file to the `chapter` file. If you created a `chapter`, you add the file to the `part` file. diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index fa24679b7fc83..ae657458d7680 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -37,9 +37,7 @@ options, but does not declare any. The structure of full NixOS modules is shown in [Example: Structure of NixOS Modules](#ex-module-syntax). ::: {#ex-module-syntax .example} -::: {.title} **Example: Structure of NixOS Modules** -::: ```nix { config, pkgs, ... }: @@ -102,9 +100,7 @@ Exec directives](#exec-escaping-example) for an example. When using these functions system environment substitution should *not* be disabled explicitly. ::: {#locate-example .example} -::: {.title} **Example: NixOS Module for the "locate" Service** -::: ```nix { config, lib, pkgs, ... }: @@ -165,9 +161,7 @@ in { ::: ::: {#exec-escaping-example .example} -::: {.title} **Example: Escaping in Exec directives** -::: ```nix { config, lib, pkgs, utils, ... }: @@ -195,14 +189,14 @@ in { ``` ::: -```{=docbook} -<xi:include href="option-declarations.section.xml" /> -<xi:include href="option-types.section.xml" /> -<xi:include href="option-def.section.xml" /> -<xi:include href="assertions.section.xml" /> -<xi:include href="meta-attributes.section.xml" /> -<xi:include href="importing-modules.section.xml" /> -<xi:include href="replace-modules.section.xml" /> -<xi:include href="freeform-modules.section.xml" /> -<xi:include href="settings-options.section.xml" /> +```{=include=} sections +option-declarations.section.md +option-types.section.md +option-def.section.md +assertions.section.md +meta-attributes.section.md +importing-modules.section.md +replace-modules.section.md +freeform-modules.section.md +settings-options.section.md ``` diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 5bcdf6e58eb17..3de46fda3df67 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -417,8 +417,7 @@ with foo_running: `seconds_interval` -: - specifies how often the condition should be polled: +: specifies how often the condition should be polled: ```py @polling_condition(seconds_interval=10) @@ -428,8 +427,7 @@ def foo_running(): `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: +: 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: ```py @polling_condition @@ -472,6 +470,8 @@ In that case, `numpy` is chosen from the generic `python3Packages`. The following options can be used when writing tests. -```{=docbook} -<xi:include href="../../generated/test-options-db.xml" xpointer="test-options-list"/> +```{=include=} options +id-prefix: test-opt- +list-id: test-options-list +source: @NIXOS_TEST_OPTIONS_JSON@ ``` diff --git a/nixos/doc/manual/from_md/README.md b/nixos/doc/manual/from_md/README.md deleted file mode 100644 index cc6d08ca0a15a..0000000000000 --- a/nixos/doc/manual/from_md/README.md +++ /dev/null @@ -1,5 +0,0 @@ -This directory is temporarily needed while we transition the manual to CommonMark. It stores the output of the ../md-to-db.sh script that converts CommonMark files back to DocBook. - -We are choosing to convert the Markdown to DocBook at authoring time instead of manual building time, because we do not want the pandoc toolchain to become part of the NixOS closure. - -Do not edit the DocBook files inside this directory or its subdirectories. Instead, edit the corresponding .md file in the normal manual directories, and run ../md-to-db.sh to update the file here. diff --git a/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixos/doc/manual/from_md/administration/boot-problems.section.xml deleted file mode 100644 index 144661c86ebaa..0000000000000 --- a/nixos/doc/manual/from_md/administration/boot-problems.section.xml +++ /dev/null @@ -1,144 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-boot-problems"> - <title>Boot Problems</title> - <para> - If NixOS fails to boot, there are a number of kernel command line - parameters that may help you to identify or fix the issue. You can - add these parameters in the GRUB boot menu by pressing “e” to modify - the selected boot entry and editing the line starting with - <literal>linux</literal>. The following are some useful kernel - command line parameters that are recognised by the NixOS boot - scripts or by systemd: - </para> - <variablelist> - <varlistentry> - <term> - <literal>boot.shell_on_fail</literal> - </term> - <listitem> - <para> - Allows the user to start a root shell if something goes wrong - in stage 1 of the boot process (the initial ramdisk). This is - disabled by default because there is no authentication for the - root shell. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>boot.debug1</literal> - </term> - <listitem> - <para> - Start an interactive shell in stage 1 before anything useful - has been done. That is, no modules have been loaded and no - file systems have been mounted, except for - <literal>/proc</literal> and <literal>/sys</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>boot.debug1devices</literal> - </term> - <listitem> - <para> - Like <literal>boot.debug1</literal>, but runs stage1 until - kernel modules are loaded and device nodes are created. This - may help with e.g. making the keyboard work. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>boot.debug1mounts</literal> - </term> - <listitem> - <para> - Like <literal>boot.debug1</literal> or - <literal>boot.debug1devices</literal>, but runs stage1 until - all filesystems that are mounted during initrd are mounted - (see - <link linkend="opt-fileSystems._name_.neededForBoot">neededForBoot</link>). - As a motivating example, this could be useful if you’ve - forgotten to set - <link linkend="opt-fileSystems._name_.neededForBoot">neededForBoot</link> - on a file system. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>boot.trace</literal> - </term> - <listitem> - <para> - Print every shell command executed by the stage 1 and 2 boot - scripts. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>single</literal> - </term> - <listitem> - <para> - Boot into rescue mode (a.k.a. single user mode). This will - cause systemd to start nothing but the unit - <literal>rescue.target</literal>, which runs - <literal>sulogin</literal> to prompt for the root password and - start a root login shell. Exiting the shell causes the system - to continue with the normal boot process. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>systemd.log_level=debug</literal> - <literal>systemd.log_target=console</literal> - </term> - <listitem> - <para> - Make systemd very verbose and send log messages to the console - instead of the journal. For more parameters recognised by - systemd, see systemd(1). - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - In addition, these arguments are recognised by the live image only: - </para> - <variablelist> - <varlistentry> - <term> - <literal>live.nixos.passwd=password</literal> - </term> - <listitem> - <para> - Set the password for the <literal>nixos</literal> live user. - This can be used for SSH access if there are issues using the - terminal. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - Notice that for <literal>boot.shell_on_fail</literal>, - <literal>boot.debug1</literal>, - <literal>boot.debug1devices</literal>, and - <literal>boot.debug1mounts</literal>, if you did - <emphasis role="strong">not</emphasis> select <quote>start the new - shell as pid 1</quote>, and you <literal>exit</literal> from the new - shell, boot will proceed normally from the point where it failed, as - if you’d chosen <quote>ignore the error and continue</quote>. - </para> - <para> - If no login prompts or X11 login screens appear (e.g. due to hanging - dependencies), you can press Alt+ArrowUp. If you’re lucky, this will - start rescue mode (described above). (Also note that since most - units have a 90-second timeout before systemd gives up on them, the - <literal>agetty</literal> login prompts should appear eventually - unless something is very wrong.) - </para> -</section> diff --git a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml deleted file mode 100644 index 35dfaf30f4575..0000000000000 --- a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml +++ /dev/null @@ -1,72 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-gc"> - <title>Cleaning the Nix Store</title> - <para> - Nix has a purely functional model, meaning that packages are never - upgraded in place. Instead new versions of packages end up in a - different location in the Nix store (<literal>/nix/store</literal>). - You should periodically run Nix’s <emphasis>garbage - collector</emphasis> to remove old, unreferenced packages. This is - easy: - </para> - <programlisting> -$ nix-collect-garbage -</programlisting> - <para> - Alternatively, you can use a systemd unit that does the same in the - background: - </para> - <programlisting> -# systemctl start nix-gc.service -</programlisting> - <para> - You can tell NixOS in <literal>configuration.nix</literal> to run - this unit automatically at certain points in time, for instance, - every night at 03:15: - </para> - <programlisting language="nix"> -nix.gc.automatic = true; -nix.gc.dates = "03:15"; -</programlisting> - <para> - The commands above do not remove garbage collector roots, such as - old system configurations. Thus they do not remove the ability to - roll back to previous configurations. The following command deletes - old roots, removing the ability to roll back to them: - </para> - <programlisting> -$ nix-collect-garbage -d -</programlisting> - <para> - You can also do this for specific profiles, e.g. - </para> - <programlisting> -$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old -</programlisting> - <para> - Note that NixOS system configurations are stored in the profile - <literal>/nix/var/nix/profiles/system</literal>. - </para> - <para> - Another way to reclaim disk space (often as much as 40% of the size - of the Nix store) is to run Nix’s store optimiser, which seeks out - identical files in the store and replaces them with hard links to a - single copy. - </para> - <programlisting> -$ nix-store --optimise -</programlisting> - <para> - Since this command needs to read the entire Nix store, it can take - quite a while to finish. - </para> - <section xml:id="sect-nixos-gc-boot-entries"> - <title>NixOS Boot Entries</title> - <para> - If your <literal>/boot</literal> partition runs out of space, - after clearing old profiles you must rebuild your system with - <literal>nixos-rebuild boot</literal> or - <literal>nixos-rebuild switch</literal> to update the - <literal>/boot</literal> partition and clear space. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/container-networking.section.xml b/nixos/doc/manual/from_md/administration/container-networking.section.xml deleted file mode 100644 index a64053cdfa5e0..0000000000000 --- a/nixos/doc/manual/from_md/administration/container-networking.section.xml +++ /dev/null @@ -1,54 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-container-networking"> - <title>Container Networking</title> - <para> - When you create a container using - <literal>nixos-container create</literal>, it gets it own private - IPv4 address in the range <literal>10.233.0.0/16</literal>. You can - get the container’s IPv4 address as follows: - </para> - <programlisting> -# nixos-container show-ip foo -10.233.4.2 - -$ ping -c1 10.233.4.2 -64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms -</programlisting> - <para> - Networking is implemented using a pair of virtual Ethernet devices. - The network interface in the container is called - <literal>eth0</literal>, while the matching interface in the host is - called <literal>ve-container-name</literal> (e.g., - <literal>ve-foo</literal>). The container has its own network - namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it - can perform arbitrary network configuration such as setting up - firewall rules, without affecting or having access to the host’s - network. - </para> - <para> - By default, containers cannot talk to the outside network. If you - want that, you should set up Network Address Translation (NAT) rules - on the host to rewrite container traffic to use your external IP - address. This can be accomplished using the following configuration - on the host: - </para> - <programlisting language="nix"> -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; -</programlisting> - <para> - where <literal>eth0</literal> should be replaced with the desired - external interface. Note that <literal>ve-+</literal> is a wildcard - that matches all container interfaces. - </para> - <para> - If you are using Network Manager, you need to explicitly prevent it - from managing container interfaces: - </para> - <programlisting language="nix"> -networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; -</programlisting> - <para> - You may need to restart your system for the changes to take effect. - </para> -</section> diff --git a/nixos/doc/manual/from_md/administration/containers.chapter.xml b/nixos/doc/manual/from_md/administration/containers.chapter.xml deleted file mode 100644 index afbd5b35aaa5c..0000000000000 --- a/nixos/doc/manual/from_md/administration/containers.chapter.xml +++ /dev/null @@ -1,31 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-containers"> - <title>Container Management</title> - <para> - NixOS allows you to easily run other NixOS instances as - <emphasis>containers</emphasis>. Containers are a light-weight - approach to virtualisation that runs software in the container at - the same speed as in the host system. NixOS containers share the Nix - store of the host, making container creation very efficient. - </para> - <warning> - <para> - Currently, NixOS containers are not perfectly isolated from the - host system. This means that a user with root access to the - container can do things that affect the host. So you should not - give container root access to untrusted users. - </para> - </warning> - <para> - NixOS containers can be created in two ways: imperatively, using the - command <literal>nixos-container</literal>, and declaratively, by - specifying them in your <literal>configuration.nix</literal>. The - declarative approach implies that containers get upgraded along with - your host system when you run <literal>nixos-rebuild</literal>, - which is often not what you want. By contrast, in the imperative - approach, containers are configured and updated independently from - the host system. - </para> - <xi:include href="imperative-containers.section.xml" /> - <xi:include href="declarative-containers.section.xml" /> - <xi:include href="container-networking.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml b/nixos/doc/manual/from_md/administration/control-groups.chapter.xml deleted file mode 100644 index f78c05878031e..0000000000000 --- a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml +++ /dev/null @@ -1,67 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-cgroups"> - <title>Control Groups</title> - <para> - To keep track of the processes in a running system, systemd uses - <emphasis>control groups</emphasis> (cgroups). A control group is a - set of processes used to allocate resources such as CPU, memory or - I/O bandwidth. There can be multiple control group hierarchies, - allowing each kind of resource to be managed independently. - </para> - <para> - The command <literal>systemd-cgls</literal> lists all control groups - in the <literal>systemd</literal> hierarchy, which is what systemd - uses to keep track of the processes belonging to each service or - user session: - </para> - <programlisting> -$ systemd-cgls -├─user -│ └─eelco -│ └─c1 -│ ├─ 2567 -:0 -│ ├─ 2682 kdeinit4: kdeinit4 Running... -│ ├─ ... -│ └─10851 sh -c less -R -└─system - ├─httpd.service - │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH - │ └─... - ├─dhcpcd.service - │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf - └─ ... -</programlisting> - <para> - Similarly, <literal>systemd-cgls cpu</literal> shows the cgroups in - the CPU hierarchy, which allows per-cgroup CPU scheduling - priorities. By default, every systemd service gets its own CPU - cgroup, while all user sessions are in the top-level CPU cgroup. - This ensures, for instance, that a thousand run-away processes in - the <literal>httpd.service</literal> cgroup cannot starve the CPU - for one process in the <literal>postgresql.service</literal> cgroup. - (By contrast, it they were in the same cgroup, then the PostgreSQL - process would get 1/1001 of the cgroup’s CPU time.) You can limit a - service’s CPU share in <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -systemd.services.httpd.serviceConfig.CPUShares = 512; -</programlisting> - <para> - By default, every cgroup has 1024 CPU shares, so this will halve the - CPU allocation of the <literal>httpd.service</literal> cgroup. - </para> - <para> - There also is a <literal>memory</literal> hierarchy that controls - memory allocation limits; by default, all processes are in the - top-level cgroup, so any service or session can exhaust all - available memory. Per-cgroup memory limits can be specified in - <literal>configuration.nix</literal>; for instance, to limit - <literal>httpd.service</literal> to 512 MiB of RAM (excluding swap): - </para> - <programlisting language="nix"> -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; -</programlisting> - <para> - The command <literal>systemd-cgtop</literal> shows a continuously - updated list of all cgroups with their CPU and memory usage. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml deleted file mode 100644 index efc3432ba1a14..0000000000000 --- a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml +++ /dev/null @@ -1,60 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-declarative-containers"> - <title>Declarative Container Specification</title> - <para> - You can also specify containers and their configuration in the - host’s <literal>configuration.nix</literal>. For example, the - following specifies that there shall be a container named - <literal>database</literal> running PostgreSQL: - </para> - <programlisting language="nix"> -containers.database = - { config = - { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql_14; - }; - }; -</programlisting> - <para> - If you run <literal>nixos-rebuild switch</literal>, the container - will be built. If the container was already running, it will be - updated in place, without rebooting. The container can be configured - to start automatically by setting - <literal>containers.database.autoStart = true</literal> in its - configuration. - </para> - <para> - By default, declarative containers share the network namespace of - the host, meaning that they can listen on (privileged) ports. - However, they cannot change the network configuration. You can give - a container its own network as follows: - </para> - <programlisting language="nix"> -containers.database = { - privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; -}; -</programlisting> - <para> - This gives the container a private virtual Ethernet interface with - IP address <literal>192.168.100.11</literal>, which is hooked up to - a virtual Ethernet interface on the host with IP address - <literal>192.168.100.10</literal>. (See the next section for details - on container networking.) - </para> - <para> - To disable the container, just remove it from - <literal>configuration.nix</literal> and run - <literal>nixos-rebuild switch</literal>. Note that this will not - delete the root directory of the container in - <literal>/var/lib/nixos-containers</literal>. Containers can be - destroyed using the imperative method: - <literal>nixos-container destroy foo</literal>. - </para> - <para> - Declarative containers can be started and stopped using the - corresponding systemd service, e.g. - <literal>systemctl start container@database</literal>. - </para> -</section> diff --git a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml b/nixos/doc/manual/from_md/administration/imperative-containers.section.xml deleted file mode 100644 index 865fc46893981..0000000000000 --- a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml +++ /dev/null @@ -1,132 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-imperative-containers"> - <title>Imperative Container Management</title> - <para> - We’ll cover imperative container management using - <literal>nixos-container</literal> first. Be aware that container - management is currently only possible as <literal>root</literal>. - </para> - <para> - You create a container with identifier <literal>foo</literal> as - follows: - </para> - <programlisting> -# nixos-container create foo -</programlisting> - <para> - This creates the container’s root directory in - <literal>/var/lib/nixos-containers/foo</literal> and a small - configuration file in - <literal>/etc/nixos-containers/foo.conf</literal>. It also builds - the container’s initial system configuration and stores it in - <literal>/nix/var/nix/profiles/per-container/foo/system</literal>. - You can modify the initial configuration of the container on the - command line. For instance, to create a container that has - <literal>sshd</literal> running, with the given public key for - <literal>root</literal>: - </para> - <programlisting> -# nixos-container create foo --config ' - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; -' -</programlisting> - <para> - By default the next free address in the - <literal>10.233.0.0/16</literal> subnet will be chosen as container - IP. This behavior can be altered by setting - <literal>--host-address</literal> and - <literal>--local-address</literal>: - </para> - <programlisting> -# nixos-container create test --config-file test-container.nix \ - --local-address 10.235.1.2 --host-address 10.235.1.1 -</programlisting> - <para> - Creating a container does not start it. To start the container, run: - </para> - <programlisting> -# nixos-container start foo -</programlisting> - <para> - This command will return as soon as the container has booted and has - reached <literal>multi-user.target</literal>. On the host, the - container runs within a systemd unit called - <literal>container@container-name.service</literal>. Thus, if - something went wrong, you can get status info using - <literal>systemctl</literal>: - </para> - <programlisting> -# systemctl status container@foo -</programlisting> - <para> - If the container has started successfully, you can log in as root - using the <literal>root-login</literal> operation: - </para> - <programlisting> -# nixos-container root-login foo -[root@foo:~]# -</programlisting> - <para> - Note that only root on the host can do this (since there is no - authentication). You can also get a regular login prompt using the - <literal>login</literal> operation, which is available to all users - on the host: - </para> - <programlisting> -# nixos-container login foo -foo login: alice -Password: *** -</programlisting> - <para> - With <literal>nixos-container run</literal>, you can execute - arbitrary commands in the container: - </para> - <programlisting> -# nixos-container run foo -- uname -a -Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux -</programlisting> - <para> - There are several ways to change the configuration of the container. - First, on the host, you can edit - <literal>/var/lib/container/name/etc/nixos/configuration.nix</literal>, - and run - </para> - <programlisting> -# nixos-container update foo -</programlisting> - <para> - This will build and activate the new configuration. You can also - specify a new configuration on the command line: - </para> - <programlisting> -# nixos-container update foo --config ' - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - networking.firewall.allowedTCPPorts = [ 80 ]; -' - -# curl http://$(nixos-container show-ip foo)/ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… -</programlisting> - <para> - However, note that this will overwrite the container’s - <literal>/etc/nixos/configuration.nix</literal>. - </para> - <para> - Alternatively, you can change the configuration from within the - container itself by running <literal>nixos-rebuild switch</literal> - inside the container. Note that the container by default does not - have a copy of the NixOS channel, so you should run - <literal>nix-channel --update</literal> first. - </para> - <para> - Containers can be stopped and started using - <literal>nixos-container stop</literal> and - <literal>nixos-container start</literal>, respectively, or by using - <literal>systemctl</literal> on the container’s service unit. To - destroy a container, including its file system, do - </para> - <programlisting> -# nixos-container destroy foo -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/administration/logging.chapter.xml b/nixos/doc/manual/from_md/administration/logging.chapter.xml deleted file mode 100644 index 4da38c065a271..0000000000000 --- a/nixos/doc/manual/from_md/administration/logging.chapter.xml +++ /dev/null @@ -1,45 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-logging"> - <title>Logging</title> - <para> - System-wide logging is provided by systemd’s - <emphasis>journal</emphasis>, which subsumes traditional logging - daemons such as syslogd and klogd. Log entries are kept in binary - files in <literal>/var/log/journal/</literal>. The command - <literal>journalctl</literal> allows you to see the contents of the - journal. For example, - </para> - <programlisting> -$ journalctl -b -</programlisting> - <para> - shows all journal entries since the last reboot. (The output of - <literal>journalctl</literal> is piped into <literal>less</literal> - by default.) You can use various options and match operators to - restrict output to messages of interest. For instance, to get all - messages from PostgreSQL: - </para> - <programlisting> -$ journalctl -u postgresql.service --- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- -... -Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down --- Reboot -- -Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET -Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections -</programlisting> - <para> - Or to get all messages since the last reboot that have at least a - <quote>critical</quote> severity level: - </para> - <programlisting> -$ journalctl -b -p crit -Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] -Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) -</programlisting> - <para> - The system journal is readable by root and by users in the - <literal>wheel</literal> and <literal>systemd-journal</literal> - groups. All users have a private journal that can be read using - <literal>journalctl</literal>. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml b/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml deleted file mode 100644 index c86b1911c1172..0000000000000 --- a/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml +++ /dev/null @@ -1,14 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-maintenance-mode"> - <title>Maintenance Mode</title> - <para> - You can enter rescue mode by running: - </para> - <programlisting> -# systemctl rescue -</programlisting> - <para> - This will eventually give you a single-user root shell. Systemd will - stop (almost) all system services. To get out of maintenance mode, - just exit from the rescue shell. - </para> -</section> diff --git a/nixos/doc/manual/from_md/administration/network-problems.section.xml b/nixos/doc/manual/from_md/administration/network-problems.section.xml deleted file mode 100644 index 4c0598ca94e83..0000000000000 --- a/nixos/doc/manual/from_md/administration/network-problems.section.xml +++ /dev/null @@ -1,25 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-network-issues"> - <title>Network Problems</title> - <para> - Nix uses a so-called <emphasis>binary cache</emphasis> to optimise - building a package from source into downloading it as a pre-built - binary. That is, whenever a command like - <literal>nixos-rebuild</literal> needs a path in the Nix store, Nix - will try to download that path from the Internet rather than build - it from source. The default binary cache is - <literal>https://cache.nixos.org/</literal>. If this cache is - unreachable, Nix operations may take a long time due to HTTP - connection timeouts. You can disable the use of the binary cache by - adding <literal>--option use-binary-caches false</literal>, e.g. - </para> - <programlisting> -# nixos-rebuild switch --option use-binary-caches false -</programlisting> - <para> - If you have an alternative binary cache at your disposal, you can - use it instead: - </para> - <programlisting> -# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/administration/rebooting.chapter.xml b/nixos/doc/manual/from_md/administration/rebooting.chapter.xml deleted file mode 100644 index 78ee75afb642c..0000000000000 --- a/nixos/doc/manual/from_md/administration/rebooting.chapter.xml +++ /dev/null @@ -1,38 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-rebooting"> - <title>Rebooting and Shutting Down</title> - <para> - The system can be shut down (and automatically powered off) by - doing: - </para> - <programlisting> -# shutdown -</programlisting> - <para> - This is equivalent to running <literal>systemctl poweroff</literal>. - </para> - <para> - To reboot the system, run - </para> - <programlisting> -# reboot -</programlisting> - <para> - which is equivalent to <literal>systemctl reboot</literal>. - Alternatively, you can quickly reboot the system using - <literal>kexec</literal>, which bypasses the BIOS by directly - loading the new kernel into memory: - </para> - <programlisting> -# systemctl kexec -</programlisting> - <para> - The machine can be suspended to RAM (if supported) using - <literal>systemctl suspend</literal>, and suspended to disk using - <literal>systemctl hibernate</literal>. - </para> - <para> - These commands can be run by any user who is logged in locally, i.e. - on a virtual console or in X11; otherwise, the user is asked for - authentication. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/rollback.section.xml b/nixos/doc/manual/from_md/administration/rollback.section.xml deleted file mode 100644 index a8df053011c5c..0000000000000 --- a/nixos/doc/manual/from_md/administration/rollback.section.xml +++ /dev/null @@ -1,42 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-rollback"> - <title>Rolling Back Configuration Changes</title> - <para> - After running <literal>nixos-rebuild</literal> to switch to a new - configuration, you may find that the new configuration doesn’t work - very well. In that case, there are several ways to return to a - previous configuration. - </para> - <para> - First, the GRUB boot manager allows you to boot into any previous - configuration that hasn’t been garbage-collected. These - configurations can be found under the GRUB submenu <quote>NixOS - - All configurations</quote>. This is especially useful if the new - configuration fails to boot. After the system has booted, you can - make the selected configuration the default for subsequent boots: - </para> - <programlisting> -# /run/current-system/bin/switch-to-configuration boot -</programlisting> - <para> - Second, you can switch to the previous configuration in a running - system: - </para> - <programlisting> -# nixos-rebuild switch --rollback -</programlisting> - <para> - This is equivalent to running: - </para> - <programlisting> -# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch -</programlisting> - <para> - where <literal>N</literal> is the number of the NixOS system - configuration. To get a list of the available configurations, do: - </para> - <programlisting> -$ ls -l /nix/var/nix/profiles/system-*-link -... -lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml deleted file mode 100644 index 3b7bd6cd30cf5..0000000000000 --- a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml +++ /dev/null @@ -1,141 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-systemctl"> - <title>Service Management</title> - <para> - In NixOS, all system services are started and monitored using the - systemd program. systemd is the <quote>init</quote> process of the - system (i.e. PID 1), the parent of all other processes. It manages a - set of so-called <quote>units</quote>, which can be things like - system services (programs), but also mount points, swap files, - devices, targets (groups of units) and more. Units can have complex - dependencies; for instance, one unit can require that another unit - must be successfully started before the first unit can be started. - When the system boots, it starts a unit named - <literal>default.target</literal>; the dependencies of this unit - cause all system services to be started, file systems to be mounted, - swap files to be activated, and so on. - </para> - <section xml:id="sect-nixos-systemd-general"> - <title>Interacting with a running systemd</title> - <para> - The command <literal>systemctl</literal> is the main way to - interact with <literal>systemd</literal>. The following paragraphs - demonstrate ways to interact with any OS running systemd as init - system. NixOS is of no exception. The - <link linkend="sect-nixos-systemd-nixos">next section </link> - explains NixOS specific things worth knowing. - </para> - <para> - Without any arguments, <literal>systemctl</literal> the status of - active units: - </para> - <programlisting> -$ systemctl --.mount loaded active mounted / -swapfile.swap loaded active active /swapfile -sshd.service loaded active running SSH Daemon -graphical.target loaded active active Graphical Interface -... -</programlisting> - <para> - You can ask for detailed status information about a unit, for - instance, the PostgreSQL database service: - </para> - <programlisting> -$ systemctl status postgresql.service -postgresql.service - PostgreSQL Server - Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) - Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago - Main PID: 2390 (postgres) - CGroup: name=systemd:/system/postgresql.service - ├─2390 postgres - ├─2418 postgres: writer process - ├─2419 postgres: wal writer process - ├─2420 postgres: autovacuum launcher process - ├─2421 postgres: stats collector process - └─2498 postgres: zabbix zabbix [local] idle - -Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET -Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections -Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started -Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. -</programlisting> - <para> - Note that this shows the status of the unit (active and running), - all the processes belonging to the service, as well as the most - recent log messages from the service. - </para> - <para> - Units can be stopped, started or restarted: - </para> - <programlisting> -# systemctl stop postgresql.service -# systemctl start postgresql.service -# systemctl restart postgresql.service -</programlisting> - <para> - These operations are synchronous: they wait until the service has - finished starting or stopping (or has failed). Starting a unit - will cause the dependencies of that unit to be started as well (if - necessary). - </para> - </section> - <section xml:id="sect-nixos-systemd-nixos"> - <title>systemd in NixOS</title> - <para> - Packages in Nixpkgs sometimes provide systemd units with them, - usually in e.g <literal>#pkg-out#/lib/systemd/</literal>. Putting - such a package in <literal>environment.systemPackages</literal> - doesn’t make the service available to users or the system. - </para> - <para> - In order to enable a systemd <emphasis>system</emphasis> service - with provided upstream package, use (e.g): - </para> - <programlisting language="nix"> -systemd.packages = [ pkgs.packagekit ]; -</programlisting> - <para> - 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 - <literal>services.#name#.enable = true;</literal>. These services - are defined in Nixpkgs’ - <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"> - <literal>nixos/modules/</literal> directory </link>. In case the - service is simple enough, the above method should work, and start - the service on boot. - </para> - <para> - <emphasis>User</emphasis> systemd services on the other hand, - should be treated differently. Given a package that has a systemd - unit file at <literal>#pkg-out#/lib/systemd/user/</literal>, using - <xref linkend="opt-systemd.packages" /> will make you able to - start the service via <literal>systemctl --user start</literal>, - but it won’t start automatically on login. However, You can - imperatively enable it by adding the package’s attribute to - <xref linkend="opt-systemd.packages" /> and then do this (e.g): - </para> - <programlisting> -$ mkdir -p ~/.config/systemd/user/default.target.wants -$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ -$ systemctl --user daemon-reload -$ systemctl --user enable syncthing.service -</programlisting> - <para> - If you are interested in a timer file, use - <literal>timers.target.wants</literal> instead of - <literal>default.target.wants</literal> in the 1st and 2nd - command. - </para> - <para> - Using <literal>systemctl --user enable syncthing.service</literal> - instead of the above, will work, but it’ll use the absolute path - of <literal>syncthing.service</literal> for the symlink, and this - path is in <literal>/nix/store/.../lib/systemd/user/</literal>. - Hence <link linkend="sec-nix-gc">garbage collection</link> will - remove that file and you will wind up with a broken symlink in - your systemd configuration, which in turn will not make the - service / timer start on login. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/store-corruption.section.xml b/nixos/doc/manual/from_md/administration/store-corruption.section.xml deleted file mode 100644 index 9ed572d484dcc..0000000000000 --- a/nixos/doc/manual/from_md/administration/store-corruption.section.xml +++ /dev/null @@ -1,34 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-nix-store-corruption"> - <title>Nix Store Corruption</title> - <para> - After a system crash, it’s possible for files in the Nix store to - become corrupted. (For instance, the Ext4 file system has the - tendency to replace un-synced files with zero bytes.) NixOS tries - hard to prevent this from happening: it performs a - <literal>sync</literal> before switching to a new configuration, and - Nix’s database is fully transactional. If corruption still occurs, - you may be able to fix it automatically. - </para> - <para> - If the corruption is in a path in the closure of the NixOS system - configuration, you can fix it by doing - </para> - <programlisting> -# nixos-rebuild switch --repair -</programlisting> - <para> - This will cause Nix to check every path in the closure, and if its - cryptographic hash differs from the hash recorded in Nix’s database, - the path is rebuilt or redownloaded. - </para> - <para> - You can also scan the entire Nix store for corrupt paths: - </para> - <programlisting> -# nix-store --verify --check-contents --repair -</programlisting> - <para> - Any corrupt paths will be redownloaded if they’re available in a - binary cache; otherwise, they cannot be repaired. - </para> -</section> diff --git a/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml b/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml deleted file mode 100644 index 8bbb8a1fe7292..0000000000000 --- a/nixos/doc/manual/from_md/administration/troubleshooting.chapter.xml +++ /dev/null @@ -1,12 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-troubleshooting"> - <title>Troubleshooting</title> - <para> - This chapter describes solutions to common problems you might - encounter when you manage your NixOS system. - </para> - <xi:include href="boot-problems.section.xml" /> - <xi:include href="maintenance-mode.section.xml" /> - <xi:include href="rollback.section.xml" /> - <xi:include href="store-corruption.section.xml" /> - <xi:include href="network-problems.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml b/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml deleted file mode 100644 index e8c64f153fc57..0000000000000 --- a/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml +++ /dev/null @@ -1,46 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-user-sessions"> - <title>User Sessions</title> - <para> - Systemd keeps track of all users who are logged into the system - (e.g. on a virtual console or remotely via SSH). The command - <literal>loginctl</literal> allows querying and manipulating user - sessions. For instance, to list all user sessions: - </para> - <programlisting> -$ loginctl - SESSION UID USER SEAT - c1 500 eelco seat0 - c3 0 root seat0 - c4 500 alice -</programlisting> - <para> - This shows that two users are logged in locally, while another is - logged in remotely. (<quote>Seats</quote> are essentially the - combinations of displays and input devices attached to the system; - usually, there is only one seat.) To get information about a - session: - </para> - <programlisting> -$ loginctl session-status c3 -c3 - root (0) - Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago - Leader: 2536 (login) - Seat: seat0; vc3 - TTY: /dev/tty3 - Service: login; type tty; class user - State: online - CGroup: name=systemd:/user/root/c3 - ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- - ├─10339 -bash - └─10355 w3m nixos.org -</programlisting> - <para> - This shows that the user is logged in on virtual console 3. It also - lists the processes belonging to this session. Since systemd keeps - track of this, you can terminate a session in a way that ensures - that all the session’s processes are gone: - </para> - <programlisting> -# loginctl terminate-session c3 -</programlisting> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/abstractions.section.xml b/nixos/doc/manual/from_md/configuration/abstractions.section.xml deleted file mode 100644 index 469e85979e0f6..0000000000000 --- a/nixos/doc/manual/from_md/configuration/abstractions.section.xml +++ /dev/null @@ -1,101 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-module-abstractions"> - <title>Abstractions</title> - <para> - If you find yourself repeating yourself over and over, it’s time to - abstract. Take, for instance, this Apache HTTP Server configuration: - </para> - <programlisting language="nix"> -{ - services.httpd.virtualHosts = - { "blog.example.org" = { - documentRoot = "/webroot/blog.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - "wiki.example.org" = { - documentRoot = "/webroot/wiki.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - }; -} -</programlisting> - <para> - It defines two virtual hosts with nearly identical configuration; - the only difference is the document root directories. To prevent - this duplication, we can use a <literal>let</literal>: - </para> - <programlisting language="nix"> -let - commonConfig = - { adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; -in -{ - services.httpd.virtualHosts = - { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); - "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); - }; -} -</programlisting> - <para> - The <literal>let commonConfig = ...</literal> defines a variable - named <literal>commonConfig</literal>. The <literal>//</literal> - operator merges two attribute sets, so the configuration of the - second virtual host is the set <literal>commonConfig</literal> - extended with the document root option. - </para> - <para> - You can write a <literal>let</literal> wherever an expression is - allowed. Thus, you also could have written: - </para> - <programlisting language="nix"> -{ - services.httpd.virtualHosts = - let commonConfig = ...; in - { "blog.example.org" = (commonConfig // { ... }) - "wiki.example.org" = (commonConfig // { ... }) - }; -} -</programlisting> - <para> - but not <literal>{ let commonConfig = ...; in ...; }</literal> since - attributes (as opposed to attribute values) are not expressions. - </para> - <para> - <emphasis role="strong">Functions</emphasis> provide another method - of abstraction. For instance, suppose that we want to generate lots - of different virtual hosts, all with identical configuration except - for the document root. This can be done as follows: - </para> - <programlisting language="nix"> -{ - services.httpd.virtualHosts = - let - makeVirtualHost = webroot: - { documentRoot = webroot; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; - in - { "example.org" = (makeVirtualHost "/webroot/example.org"); - "example.com" = (makeVirtualHost "/webroot/example.com"); - "example.gov" = (makeVirtualHost "/webroot/example.gov"); - "example.nl" = (makeVirtualHost "/webroot/example.nl"); - }; -} -</programlisting> - <para> - Here, <literal>makeVirtualHost</literal> is a function that takes a - single argument <literal>webroot</literal> and returns the - configuration for a virtual host. That function is then called for - several names to produce the list of virtual host configurations. - </para> -</section> 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 deleted file mode 100644 index 516022dc16d24..0000000000000 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml +++ /dev/null @@ -1,16 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ad-hoc-network-config"> - <title>Ad-Hoc Configuration</title> - <para> - You can use <xref linkend="opt-networking.localCommands" /> to - specify shell commands to be run at the end of - <literal>network-setup.service</literal>. This is useful for doing - network configuration not covered by the existing NixOS modules. For - instance, to statically configure an IPv6 address: - </para> - <programlisting language="nix"> -networking.localCommands = - '' - ip -6 addr add 2001:610:685:1::1/64 dev eth0 - ''; -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml deleted file mode 100644 index c9a8d4f3f1065..0000000000000 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml +++ /dev/null @@ -1,59 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ad-hoc-packages"> - <title>Ad-Hoc Package Management</title> - <para> - With the command <literal>nix-env</literal>, you can install and - uninstall packages from the command line. For instance, to install - Mozilla Thunderbird: - </para> - <programlisting> -$ nix-env -iA nixos.thunderbird -</programlisting> - <para> - If you invoke this as root, the package is installed in the Nix - profile <literal>/nix/var/nix/profiles/default</literal> and visible - to all users of the system; otherwise, the package ends up in - <literal>/nix/var/nix/profiles/per-user/username/profile</literal> - and is not visible to other users. The <literal>-A</literal> flag - specifies the package by its attribute name; without it, the package - is installed by matching against its package name (e.g. - <literal>thunderbird</literal>). The latter is slower because it - requires matching against all available Nix packages, and is - ambiguous if there are multiple matching packages. - </para> - <para> - Packages come from the NixOS channel. You typically upgrade a - package by updating to the latest version of the NixOS channel: - </para> - <programlisting> -$ nix-channel --update nixos -</programlisting> - <para> - and then running <literal>nix-env -i</literal> again. Other packages - in the profile are <emphasis>not</emphasis> affected; this is the - crucial difference with the declarative style of package management, - where running <literal>nixos-rebuild switch</literal> causes all - packages to be updated to their current versions in the NixOS - channel. You can however upgrade all packages for which there is a - newer version by doing: - </para> - <programlisting> -$ nix-env -u '*' -</programlisting> - <para> - A package can be uninstalled using the <literal>-e</literal> flag: - </para> - <programlisting> -$ nix-env -e thunderbird -</programlisting> - <para> - Finally, you can roll back an undesirable <literal>nix-env</literal> - action: - </para> - <programlisting> -$ nix-env --rollback -</programlisting> - <para> - <literal>nix-env</literal> has many more flags. For details, see the - nix-env(1) manpage or the Nix manual. - </para> -</section> 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 deleted file mode 100644 index b1a1a8df32477..0000000000000 --- a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml +++ /dev/null @@ -1,118 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-custom-packages"> - <title>Adding Custom Packages</title> - <para> - It’s possible that a package you need is not available in NixOS. In - that case, you can do two things. Either you can package it with - Nix, or you can try to use prebuilt packages from upstream. Due to - the peculiarities of NixOS, it is important to note that building - software from source is often easier than using pre-built - executables. - </para> - <section xml:id="sec-custom-packages-nix"> - <title>Building with Nix</title> - <para> - This can be done either in-tree or out-of-tree. For an in-tree - build, you can clone the Nixpkgs repository, add the package to - your clone, and (optionally) submit a patch or pull request to - have it accepted into the main Nixpkgs repository. This is - described in detail in the - <link xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs - manual</link>. In short, you clone Nixpkgs: - </para> - <programlisting> -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs -</programlisting> - <para> - Then you write and test the package as described in the Nixpkgs - manual. Finally, you add it to - <xref linkend="opt-environment.systemPackages" />, e.g. - </para> - <programlisting language="nix"> -environment.systemPackages = [ pkgs.my-package ]; -</programlisting> - <para> - and you run <literal>nixos-rebuild</literal>, specifying your own - Nixpkgs tree: - </para> - <programlisting> -# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs -</programlisting> - <para> - The second possibility is to add the package outside of the - Nixpkgs tree. For instance, here is how you specify a build of the - <link xlink:href="https://www.gnu.org/software/hello/">GNU - Hello</link> package directly in - <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -environment.systemPackages = - let - my-hello = with pkgs; stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; - }; - in - [ my-hello ]; -</programlisting> - <para> - Of course, you can also move the definition of - <literal>my-hello</literal> into a separate Nix expression, e.g. - </para> - <programlisting language="nix"> -environment.systemPackages = [ (import ./my-hello.nix) ]; -</programlisting> - <para> - where <literal>my-hello.nix</literal> contains: - </para> - <programlisting language="nix"> -with import <nixpkgs> {}; # bring all of Nixpkgs into scope - -stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; -} -</programlisting> - <para> - This allows testing the package easily: - </para> - <programlisting> -$ nix-build my-hello.nix -$ ./result/bin/hello -Hello, world! -</programlisting> - </section> - <section xml:id="sec-custom-packages-prebuilt"> - <title>Using pre-built executables</title> - <para> - Most pre-built executables will not work on NixOS. There are two - notable exceptions: flatpaks and AppImages. For flatpaks see the - <link linkend="module-services-flatpak">dedicated section</link>. - AppImages will not run <quote>as-is</quote> on NixOS. First you - need to install <literal>appimage-run</literal>: add to - <literal>/etc/nixos/configuration.nix</literal> - </para> - <programlisting language="nix"> -environment.systemPackages = [ pkgs.appimage-run ]; -</programlisting> - <para> - Then instead of running the AppImage <quote>as-is</quote>, run - <literal>appimage-run foo.appimage</literal>. - </para> - <para> - To make other pre-built executables work on NixOS, you need to - package them with Nix and special helpers like - <literal>autoPatchelfHook</literal> or - <literal>buildFHSUserEnv</literal>. See the - <link xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs - manual</link> for details. This is complex and often doing a - source build is easier. - </para> - </section> -</section> diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml deleted file mode 100644 index f6c8f70cffc54..0000000000000 --- a/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ /dev/null @@ -1,231 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-configuration-file"> - <title>NixOS Configuration File</title> - <para> - The NixOS configuration file generally looks like this: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ option definitions -} -</programlisting> - <para> - The first line (<literal>{ config, pkgs, ... }:</literal>) denotes - that this is actually a function that takes at least the two - arguments <literal>config</literal> and <literal>pkgs</literal>. - (These are explained later, in chapter - <xref linkend="sec-writing-modules" />) The function returns a - <emphasis>set</emphasis> of option definitions - (<literal>{ ... }</literal>). These definitions have the form - <literal>name = value</literal>, where <literal>name</literal> is - the name of an option and <literal>value</literal> is its value. For - example, - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; -} -</programlisting> - <para> - defines a configuration with three option definitions that together - enable the Apache HTTP Server with <literal>/webroot</literal> as - the document root. - </para> - <para> - Sets can be nested, and in fact dots in option names are shorthand - for defining a set containing another set. For instance, - <xref linkend="opt-services.httpd.enable" /> defines a set named - <literal>services</literal> that contains a set named - <literal>httpd</literal>, which in turn contains an option - definition named <literal>enable</literal> with value - <literal>true</literal>. This means that the example above can also - be written as: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ services = { - httpd = { - enable = true; - adminAddr = "alice@example.org"; - virtualHosts = { - localhost = { - documentRoot = "/webroot"; - }; - }; - }; - }; -} -</programlisting> - <para> - which may be more convenient if you have lots of option definitions - that share the same prefix (such as - <literal>services.httpd</literal>). - </para> - <para> - NixOS checks your option definitions for correctness. For instance, - if you try to define an option that doesn’t exist (that is, doesn’t - have a corresponding <emphasis>option declaration</emphasis>), - <literal>nixos-rebuild</literal> will give an error like: - </para> - <programlisting> -The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. -</programlisting> - <para> - Likewise, values in option definitions must have a correct type. For - instance, <literal>services.httpd.enable</literal> must be a Boolean - (<literal>true</literal> or <literal>false</literal>). Trying to - give it a value of another type, such as a string, will cause an - error: - </para> - <programlisting> -The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. -</programlisting> - <para> - Options have various types of values. The most important are: - </para> - <variablelist> - <varlistentry> - <term> - Strings - </term> - <listitem> - <para> - Strings are enclosed in double quotes, e.g. - </para> - <programlisting language="nix"> -networking.hostName = "dexter"; -</programlisting> - <para> - Special characters can be escaped by prefixing them with a - backslash (e.g. <literal>\"</literal>). - </para> - <para> - Multi-line strings can be enclosed in <emphasis>double single - quotes</emphasis>, e.g. - </para> - <programlisting language="nix"> -networking.extraHosts = - '' - 127.0.0.2 other-localhost - 10.0.0.1 server - ''; -</programlisting> - <para> - The main difference is that it strips from each line a number - of spaces equal to the minimal indentation of the string as a - whole (disregarding the indentation of empty lines), and that - characters like <literal>"</literal> and - <literal>\</literal> are not special (making it more - convenient for including things like shell code). See more - info about this in the Nix manual - <link xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Booleans - </term> - <listitem> - <para> - These can be <literal>true</literal> or - <literal>false</literal>, e.g. - </para> - <programlisting language="nix"> -networking.firewall.enable = true; -networking.firewall.allowPing = false; -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - Integers - </term> - <listitem> - <para> - For example, - </para> - <programlisting language="nix"> -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; -</programlisting> - <para> - (Note that here the attribute name - <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in - quotes to prevent it from being interpreted as a set named - <literal>net</literal> containing a set named - <literal>ipv4</literal>, and so on. This is because it’s not a - NixOS option but the literal name of a Linux kernel setting.) - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - Sets - </term> - <listitem> - <para> - Sets were introduced above. They are name/value pairs enclosed - in braces, as in the option definition - </para> - <programlisting language="nix"> -fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - options = [ "rw" "data=ordered" "relatime" ]; - }; -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - Lists - </term> - <listitem> - <para> - The important thing to note about lists is that list elements - are separated by whitespace, like this: - </para> - <programlisting language="nix"> -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; -</programlisting> - <para> - List elements can be any other type, e.g. sets: - </para> - <programlisting language="nix"> -swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - Packages - </term> - <listitem> - <para> - Usually, the packages you need are already part of the Nix - Packages collection, which is a set that can be accessed - through the function argument <literal>pkgs</literal>. Typical - uses: - </para> - <programlisting language="nix"> -environment.systemPackages = - [ pkgs.thunderbird - pkgs.emacs - ]; - -services.postgresql.package = pkgs.postgresql_14; -</programlisting> - <para> - The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 10.x. For more - information on packages, including how to add new ones, see - <xref linkend="sec-custom-packages" />. - </para> - </listitem> - </varlistentry> - </variablelist> -</section> diff --git a/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml b/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml deleted file mode 100644 index baf9639554cc2..0000000000000 --- a/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml +++ /dev/null @@ -1,20 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-configuration-syntax"> - <title>Configuration Syntax</title> - <para> - The NixOS configuration file - <literal>/etc/nixos/configuration.nix</literal> is actually a - <emphasis>Nix expression</emphasis>, which is the Nix package - manager’s purely functional language for describing how to build - packages and configurations. This means you have all the expressive - power of that language at your disposal, including the ability to - abstract over common patterns, which is very useful when managing - complex systems. The syntax and semantics of the Nix language are - fully described in the - <link xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix - manual</link>, but here we give a short overview of the most - important constructs useful in NixOS configuration files. - </para> - <xi:include href="config-file.section.xml" /> - <xi:include href="abstractions.section.xml" /> - <xi:include href="modularity.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml deleted file mode 100644 index 8026c4102b486..0000000000000 --- a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml +++ /dev/null @@ -1,90 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-customising-packages"> - <title>Customising Packages</title> - <para> - Some packages in Nixpkgs have options to enable or disable optional - functionality or change other aspects of the package. For instance, - the Firefox wrapper package (which provides Firefox with a set of - plugins such as the Adobe Flash player) has an option to enable the - Google Talk plugin. It can be set in - <literal>configuration.nix</literal> as follows: - <literal>nixpkgs.config.firefox.enableGoogleTalkPlugin = true;</literal> - </para> - <warning> - <para> - Unfortunately, Nixpkgs currently lacks a way to query available - configuration options. - </para> - </warning> - <para> - Apart from high-level options, it’s possible to tweak a package in - almost arbitrary ways, such as changing or disabling dependencies of - a package. For instance, the Emacs package in Nixpkgs by default has - a dependency on GTK 2. If you want to build it against GTK 3, you - can specify that as follows: - </para> - <programlisting language="nix"> -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; -</programlisting> - <para> - The function <literal>override</literal> performs the call to the - Nix function that produces Emacs, with the original arguments - amended by the set of arguments specified by you. So here the - function argument <literal>gtk</literal> gets the value - <literal>pkgs.gtk3</literal>, causing Emacs to depend on GTK 3. (The - parentheses are necessary because in Nix, function application binds - more weakly than list construction, so without them, - <xref linkend="opt-environment.systemPackages" /> would be a list - with two elements.) - </para> - <para> - Even greater customisation is possible using the function - <literal>overrideAttrs</literal>. While the - <literal>override</literal> mechanism above overrides the arguments - of a package function, <literal>overrideAttrs</literal> allows - changing the <emphasis>attributes</emphasis> passed to - <literal>mkDerivation</literal>. This permits changing any aspect of - the package, such as the source code. For instance, if you want to - override the source code of Emacs, you can say: - </para> - <programlisting language="nix"> -environment.systemPackages = [ - (pkgs.emacs.overrideAttrs (oldAttrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) -]; -</programlisting> - <para> - Here, <literal>overrideAttrs</literal> takes the Nix derivation - specified by <literal>pkgs.emacs</literal> and produces a new - derivation in which the original’s <literal>name</literal> and - <literal>src</literal> attribute have been replaced by the given - values by re-calling <literal>stdenv.mkDerivation</literal>. The - original attributes are accessible via the function argument, which - is conventionally named <literal>oldAttrs</literal>. - </para> - <para> - The overrides shown above are not global. They do not affect the - original package; other packages in Nixpkgs continue to depend on - the original rather than the customised package. This means that if - another package in your system depends on the original package, you - end up with two instances of the package. If you want to have - everything depend on your customised instance, you can apply a - <emphasis>global</emphasis> override as follows: - </para> - <programlisting language="nix"> -nixpkgs.config.packageOverrides = pkgs: - { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; - }; -</programlisting> - <para> - The effect of this definition is essentially equivalent to modifying - the <literal>emacs</literal> attribute in the Nixpkgs source tree. - Any package in Nixpkgs that depends on <literal>emacs</literal> will - be passed your customised instance. (However, the value - <literal>pkgs.emacs</literal> in - <literal>nixpkgs.config.packageOverrides</literal> refers to the - original rather than overridden instance, to prevent an infinite - recursion.) - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml b/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml deleted file mode 100644 index bee310c2e34bf..0000000000000 --- a/nixos/doc/manual/from_md/configuration/declarative-packages.section.xml +++ /dev/null @@ -1,53 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-declarative-package-mgmt"> - <title>Declarative Package Management</title> - <para> - With declarative package management, you specify which packages you - want on your system by setting the option - <xref linkend="opt-environment.systemPackages" />. For instance, - adding the following line to <literal>configuration.nix</literal> - enables the Mozilla Thunderbird email application: - </para> - <programlisting language="nix"> -environment.systemPackages = [ pkgs.thunderbird ]; -</programlisting> - <para> - The effect of this specification is that the Thunderbird package - from Nixpkgs will be built or downloaded as part of the system when - you run <literal>nixos-rebuild switch</literal>. - </para> - <note> - <para> - Some packages require additional global configuration such as - D-Bus or systemd service registration so adding them to - <xref linkend="opt-environment.systemPackages" /> might not be - sufficient. You are advised to check the - <link linkend="ch-options">list of options</link> whether a NixOS - module for the package does not exist. - </para> - </note> - <para> - You can get a list of the available packages as follows: - </para> - <programlisting> -$ nix-env -qaP '*' --description -nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded -... -</programlisting> - <para> - The first column in the output is the <emphasis>attribute - name</emphasis>, such as <literal>nixos.thunderbird</literal>. - </para> - <para> - Note: the <literal>nixos</literal> prefix tells us that we want to - get the package from the <literal>nixos</literal> channel and works - only in CLI tools. In declarative configuration use - <literal>pkgs</literal> prefix (variable). - </para> - <para> - To <quote>uninstall</quote> a package, simply remove it from - <xref linkend="opt-environment.systemPackages" /> and run - <literal>nixos-rebuild switch</literal>. - </para> - <xi:include href="customizing-packages.section.xml" /> - <xi:include href="adding-custom-packages.section.xml" /> -</section> diff --git a/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml b/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml deleted file mode 100644 index e5285c7975556..0000000000000 --- a/nixos/doc/manual/from_md/configuration/file-systems.chapter.xml +++ /dev/null @@ -1,55 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-file-systems"> - <title>File Systems</title> - <para> - You can define file systems using the <literal>fileSystems</literal> - configuration option. For instance, the following definition causes - NixOS to mount the Ext4 file system on device - <literal>/dev/disk/by-label/data</literal> onto the mount point - <literal>/data</literal>: - </para> - <programlisting language="nix"> -fileSystems."/data" = - { device = "/dev/disk/by-label/data"; - fsType = "ext4"; - }; -</programlisting> - <para> - This will create an entry in <literal>/etc/fstab</literal>, which - will generate a corresponding - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.mount.html">systemd.mount</link> - unit via - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html">systemd-fstab-generator</link>. - The filesystem will be mounted automatically unless - <literal>"noauto"</literal> is present in - <link linkend="opt-fileSystems._name_.options">options</link>. - <literal>"noauto"</literal> filesystems can be mounted - explicitly using <literal>systemctl</literal> e.g. - <literal>systemctl start data.mount</literal>. Mount points are - created automatically if they don’t already exist. For - <literal>device</literal>, it’s best to use the topology-independent - device aliases in <literal>/dev/disk/by-label</literal> and - <literal>/dev/disk/by-uuid</literal>, as these don’t change if the - topology changes (e.g. if a disk is moved to another IDE - controller). - </para> - <para> - You can usually omit the file system type - (<literal>fsType</literal>), since <literal>mount</literal> can - usually detect the type and load the necessary kernel module - automatically. However, if the file system is needed at early boot - (in the initial ramdisk) and is not <literal>ext2</literal>, - <literal>ext3</literal> or <literal>ext4</literal>, then it’s best - to specify <literal>fsType</literal> to ensure that the kernel - module is available. - </para> - <note> - <para> - System startup will fail if any of the filesystems fails to mount, - dropping you to the emergency shell. You can make a mount - asynchronous and non-critical by adding - <literal>options = [ "nofail" ];</literal>. - </para> - </note> - <xi:include href="luks-file-systems.section.xml" /> - <xi:include href="sshfs-file-systems.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixos/doc/manual/from_md/configuration/firewall.section.xml deleted file mode 100644 index 6e1ffab72c540..0000000000000 --- a/nixos/doc/manual/from_md/configuration/firewall.section.xml +++ /dev/null @@ -1,39 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-firewall"> - <title>Firewall</title> - <para> - NixOS has a simple stateful firewall that blocks incoming - connections and other unexpected packets. The firewall applies to - both IPv4 and IPv6 traffic. It is enabled by default. It can be - disabled as follows: - </para> - <programlisting language="nix"> -networking.firewall.enable = false; -</programlisting> - <para> - If the firewall is enabled, you can open specific TCP ports to the - outside world: - </para> - <programlisting language="nix"> -networking.firewall.allowedTCPPorts = [ 80 443 ]; -</programlisting> - <para> - Note that TCP port 22 (ssh) is opened automatically if the SSH - daemon is enabled - (<literal>services.openssh.enable = true</literal>). UDP ports can - be opened through - <xref linkend="opt-networking.firewall.allowedUDPPorts" />. - </para> - <para> - To open ranges of TCP ports: - </para> - <programlisting language="nix"> -networking.firewall.allowedTCPPortRanges = [ - { from = 4000; to = 4007; } - { from = 8000; to = 8010; } -]; -</programlisting> - <para> - Similarly, UDP port ranges can be opened through - <xref linkend="opt-networking.firewall.allowedUDPPortRanges" />. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml deleted file mode 100644 index c95d3dc865256..0000000000000 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ /dev/null @@ -1,281 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-gpu-accel"> - <title>GPU acceleration</title> - <para> - NixOS provides various APIs that benefit from GPU hardware - acceleration, such as VA-API and VDPAU for video playback; OpenGL - and Vulkan for 3D graphics; and OpenCL for general-purpose - computing. This chapter describes how to set up GPU hardware - acceleration (as far as this is not done automatically) and how to - verify that hardware acceleration is indeed used. - </para> - <para> - Most of the aforementioned APIs are agnostic with regards to which - display server is used. Consequently, these instructions should - apply both to the X Window System and Wayland compositors. - </para> - <section xml:id="sec-gpu-accel-opencl"> - <title>OpenCL</title> - <para> - <link xlink:href="https://en.wikipedia.org/wiki/OpenCL">OpenCL</link> - is a general compute API. It is used by various applications such - as Blender and Darktable to accelerate certain operations. - </para> - <para> - OpenCL applications load drivers through the <emphasis>Installable - Client Driver</emphasis> (ICD) mechanism. In this mechanism, an - ICD file specifies the path to the OpenCL driver for a particular - GPU family. In NixOS, there are two ways to make ICD files visible - to the ICD loader. The first is through the - <literal>OCL_ICD_VENDORS</literal> environment variable. This - variable can contain a directory which is scanned by the ICL - loader for ICD files. For example: - </para> - <programlisting> -$ export \ - OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ -</programlisting> - <para> - The second mechanism is to add the OpenCL driver package to - <xref linkend="opt-hardware.opengl.extraPackages" />. This links - the ICD file under <literal>/run/opengl-driver</literal>, where it - will be visible to the ICD loader. - </para> - <para> - The proper installation of OpenCL drivers can be verified through - the <literal>clinfo</literal> command of the clinfo package. This - command will report the number of hardware devices that is found - and give detailed information for each device: - </para> - <programlisting> -$ clinfo | head -n3 -Number of platforms 1 -Platform Name AMD Accelerated Parallel Processing -Platform Vendor Advanced Micro Devices, Inc. -</programlisting> - <section xml:id="sec-gpu-accel-opencl-amd"> - <title>AMD</title> - <para> - Modern AMD - <link xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics - Core Next</link> (GCN) GPUs are supported through the - rocm-opencl-icd package. Adding this package to - <xref linkend="opt-hardware.opengl.extraPackages" /> enables - OpenCL support: - </para> - <programlisting language="nix"> -hardware.opengl.extraPackages = [ - rocm-opencl-icd -]; -</programlisting> - </section> - <section xml:id="sec-gpu-accel-opencl-intel"> - <title>Intel</title> - <para> - <link xlink:href="https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen8">Intel - Gen8 and later GPUs</link> are supported by the Intel NEO OpenCL - runtime that is provided by the intel-compute-runtime package. - For Gen7 GPUs, the deprecated Beignet runtime can be used, which - is provided by the beignet package. The proprietary Intel OpenCL - runtime, in the intel-ocl package, is an alternative for Gen7 - GPUs. - </para> - <para> - The intel-compute-runtime, beignet, or intel-ocl package can be - added to <xref linkend="opt-hardware.opengl.extraPackages" /> to - enable OpenCL support. For example, for Gen8 and later GPUs, the - following configuration can be used: - </para> - <programlisting language="nix"> -hardware.opengl.extraPackages = [ - intel-compute-runtime -]; -</programlisting> - </section> - </section> - <section xml:id="sec-gpu-accel-vulkan"> - <title>Vulkan</title> - <para> - <link xlink:href="https://en.wikipedia.org/wiki/Vulkan_(API)">Vulkan</link> - is a graphics and compute API for GPUs. It is used directly by - games or indirectly though compatibility layers like - <link xlink:href="https://github.com/doitsujin/dxvk/wiki">DXVK</link>. - </para> - <para> - By default, if <xref linkend="opt-hardware.opengl.driSupport" /> - is enabled, mesa is installed and provides Vulkan for supported - hardware. - </para> - <para> - Similar to OpenCL, Vulkan drivers are loaded through the - <emphasis>Installable Client Driver</emphasis> (ICD) mechanism. - ICD files for Vulkan are JSON files that specify the path to the - driver library and the supported Vulkan version. All successfully - loaded drivers are exposed to the application as different GPUs. - In NixOS, there are two ways to make ICD files visible to Vulkan - applications: an environment variable and a module option. - </para> - <para> - The first option is through the - <literal>VK_ICD_FILENAMES</literal> environment variable. This - variable can contain multiple JSON files, separated by - <literal>:</literal>. For example: - </para> - <programlisting> -$ export \ - VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json -</programlisting> - <para> - The second mechanism is to add the Vulkan driver package to - <xref linkend="opt-hardware.opengl.extraPackages" />. This links - the ICD file under <literal>/run/opengl-driver</literal>, where it - will be visible to the ICD loader. - </para> - <para> - The proper installation of Vulkan drivers can be verified through - the <literal>vulkaninfo</literal> command of the vulkan-tools - package. This command will report the hardware devices and drivers - found, in this example output amdvlk and radv: - </para> - <programlisting> -$ vulkaninfo | grep GPU - GPU id : 0 (Unknown AMD GPU) - GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) - ... -GPU0: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU - deviceName = Unknown AMD GPU -GPU1: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU -</programlisting> - <para> - A simple graphical application that uses Vulkan is - <literal>vkcube</literal> from the vulkan-tools package. - </para> - <section xml:id="sec-gpu-accel-vulkan-amd"> - <title>AMD</title> - <para> - Modern AMD - <link xlink:href="https://en.wikipedia.org/wiki/Graphics_Core_Next">Graphics - Core Next</link> (GCN) GPUs are supported through either radv, - which is part of mesa, or the amdvlk package. Adding the amdvlk - package to <xref linkend="opt-hardware.opengl.extraPackages" /> - makes amdvlk the default driver and hides radv and lavapipe from - the device list. A specific driver can be forced as follows: - </para> - <programlisting language="nix"> -hardware.opengl.extraPackages = [ - pkgs.amdvlk -]; - -# To enable Vulkan support for 32-bit applications, also add: -hardware.opengl.extraPackages32 = [ - pkgs.driversi686Linux.amdvlk -]; - -# Force radv -environment.variables.AMD_VULKAN_ICD = "RADV"; -# Or -environment.variables.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; -</programlisting> - </section> - </section> - <section xml:id="sec-gpu-accel-va-api"> - <title>VA-API</title> - <para> - <link xlink:href="https://www.intel.com/content/www/us/en/developer/articles/technical/linuxmedia-vaapi.html">VA-API - (Video Acceleration API)</link> is an open-source library and API - specification, which provides access to graphics hardware - acceleration capabilities for video processing. - </para> - <para> - VA-API drivers are loaded by <literal>libva</literal>. The version - in nixpkgs is built to search the opengl driver path, so drivers - can be installed in - <xref linkend="opt-hardware.opengl.extraPackages" />. - </para> - <para> - VA-API can be tested using: - </para> - <programlisting> -$ nix-shell -p libva-utils --run vainfo -</programlisting> - <section xml:id="sec-gpu-accel-va-api-intel"> - <title>Intel</title> - <para> - Modern Intel GPUs use the iHD driver, which can be installed - with: - </para> - <programlisting language="nix"> -hardware.opengl.extraPackages = [ - intel-media-driver -]; -</programlisting> - <para> - Older Intel GPUs use the i965 driver, which can be installed - with: - </para> - <programlisting language="nix"> -hardware.opengl.extraPackages = [ - vaapiIntel -]; -</programlisting> - </section> - </section> - <section xml:id="sec-gpu-accel-common-issues"> - <title>Common issues</title> - <section xml:id="sec-gpu-accel-common-issues-permissions"> - <title>User permissions</title> - <para> - Except where noted explicitly, it should not be necessary to - adjust user permissions to use these acceleration APIs. In the - default configuration, GPU devices have world-read/write - permissions (<literal>/dev/dri/renderD*</literal>) or are tagged - as <literal>uaccess</literal> - (<literal>/dev/dri/card*</literal>). The access control lists of - devices with the <literal>uaccess</literal> tag will be updated - automatically when a user logs in through - <literal>systemd-logind</literal>. For example, if the user - <emphasis>alice</emphasis> is logged in, the access control list - should look as follows: - </para> - <programlisting> -$ getfacl /dev/dri/card0 -# file: dev/dri/card0 -# owner: root -# group: video -user::rw- -user:alice:rw- -group::rw- -mask::rw- -other::--- -</programlisting> - <para> - If you disabled (this functionality of) - <literal>systemd-logind</literal>, you may need to add the user - to the <literal>video</literal> group and log in again. - </para> - </section> - <section xml:id="sec-gpu-accel-common-issues-mixing-nixpkgs"> - <title>Mixing different versions of nixpkgs</title> - <para> - The <emphasis>Installable Client Driver</emphasis> (ICD) - mechanism used by OpenCL and Vulkan loads runtimes into its - address space using <literal>dlopen</literal>. Mixing an ICD - loader mechanism and runtimes from different version of nixpkgs - may not work. For example, if the ICD loader uses an older - version of glibc than the runtime, the runtime may not be - loadable due to missing symbols. Unfortunately, the loader will - generally be quiet about such issues. - </para> - <para> - If you suspect that you are running into library version - mismatches between an ICL loader and a runtime, you could run an - application with the <literal>LD_DEBUG</literal> variable set to - get more diagnostic information. For example, OpenCL can be - tested with <literal>LD_DEBUG=files clinfo</literal>, which - should report missing symbols. - </para> - </section> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml deleted file mode 100644 index 49ec6f5952ecf..0000000000000 --- a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml +++ /dev/null @@ -1,43 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ipv4"> - <title>IPv4 Configuration</title> - <para> - By default, NixOS uses DHCP (specifically, - <literal>dhcpcd</literal>) to automatically configure network - interfaces. However, you can configure an interface manually as - follows: - </para> - <programlisting language="nix"> -networking.interfaces.eth0.ipv4.addresses = [ { - address = "192.168.1.2"; - prefixLength = 24; -} ]; -</programlisting> - <para> - Typically you’ll also want to set a default gateway and set of name - servers: - </para> - <programlisting language="nix"> -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; -</programlisting> - <note> - <para> - Statically configured interfaces are set up by the systemd service - <literal>interface-name-cfg.service</literal>. The default gateway - and name server configuration is performed by - <literal>network-setup.service</literal>. - </para> - </note> - <para> - The host name is set using - <xref linkend="opt-networking.hostName" />: - </para> - <programlisting language="nix"> -networking.hostName = "cartman"; -</programlisting> - <para> - The default host name is <literal>nixos</literal>. Set it to the - empty string (<literal>""</literal>) to allow the DHCP - server to provide the host name. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml deleted file mode 100644 index 2adb106226245..0000000000000 --- a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml +++ /dev/null @@ -1,47 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ipv6"> - <title>IPv6 Configuration</title> - <para> - IPv6 is enabled by default. Stateless address autoconfiguration is - used to automatically assign IPv6 addresses to all interfaces, and - Privacy Extensions (RFC 4946) are enabled by default. You can adjust - the default for this by setting - <xref linkend="opt-networking.tempAddresses" />. This option may be - overridden on a per-interface basis by - <xref linkend="opt-networking.interfaces._name_.tempAddress" />. You - can disable IPv6 support globally by setting: - </para> - <programlisting language="nix"> -networking.enableIPv6 = false; -</programlisting> - <para> - You can disable IPv6 on a single interface using a normal sysctl (in - this example, we use interface <literal>eth0</literal>): - </para> - <programlisting language="nix"> -boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; -</programlisting> - <para> - As with IPv4 networking interfaces are automatically configured via - DHCPv6. You can configure an interface manually: - </para> - <programlisting language="nix"> -networking.interfaces.eth0.ipv6.addresses = [ { - address = "fe00:aa:bb:cc::2"; - prefixLength = 64; -} ]; -</programlisting> - <para> - For configuring a gateway, optionally with explicitly specified - interface: - </para> - <programlisting language="nix"> -networking.defaultGateway6 = { - address = "fe00::1"; - interface = "enp0s3"; -}; -</programlisting> - <para> - See <xref linkend="sec-ipv4" /> for similar examples and additional - information. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml deleted file mode 100644 index da9ba323f18cf..0000000000000 --- a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml +++ /dev/null @@ -1,115 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-kubernetes"> - <title>Kubernetes</title> - <para> - The NixOS Kubernetes module is a collective term for a handful of - individual submodules implementing the Kubernetes cluster - components. - </para> - <para> - There are generally two ways of enabling Kubernetes on NixOS. One - way is to enable and configure cluster components appropriately by - hand: - </para> - <programlisting language="nix"> -services.kubernetes = { - apiserver.enable = true; - controllerManager.enable = true; - scheduler.enable = true; - addonManager.enable = true; - proxy.enable = true; - flannel.enable = true; -}; -</programlisting> - <para> - Another way is to assign cluster roles (<quote>master</quote> and/or - <quote>node</quote>) to the host. This enables apiserver, - controllerManager, scheduler, addonManager, kube-proxy and etcd: - </para> - <programlisting language="nix"> -services.kubernetes.roles = [ "master" ]; -</programlisting> - <para> - While this will enable the kubelet and kube-proxy only: - </para> - <programlisting language="nix"> -services.kubernetes.roles = [ "node" ]; -</programlisting> - <para> - Assigning both the master and node roles is usable if you want a - single node Kubernetes cluster for dev or testing purposes: - </para> - <programlisting language="nix"> -services.kubernetes.roles = [ "master" "node" ]; -</programlisting> - <para> - Note: Assigning either role will also default both - <xref linkend="opt-services.kubernetes.flannel.enable" /> and - <xref linkend="opt-services.kubernetes.easyCerts" /> to true. This - sets up flannel as CNI and activates automatic PKI bootstrapping. - </para> - <note> - <para> - As of NixOS 19.03, it is mandatory to configure: - <xref linkend="opt-services.kubernetes.masterAddress" />. The - masterAddress must be resolveable and routeable by all cluster - nodes. In single node clusters, this can be set to - <literal>localhost</literal>. - </para> - </note> - <para> - Role-based access control (RBAC) authorization mode is enabled by - default. This means that anonymous requests to the apiserver secure - port will expectedly cause a permission denied error. All cluster - components must therefore be configured with x509 certificates for - two-way tls communication. The x509 certificate subject section - determines the roles and permissions granted by the apiserver to - perform clusterwide or namespaced operations. See also: - <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/"> - Using RBAC Authorization</link>. - </para> - <para> - The NixOS kubernetes module provides an option for automatic - certificate bootstrapping and configuration, - <xref linkend="opt-services.kubernetes.easyCerts" />. The PKI - bootstrapping process involves setting up a certificate authority - (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a - CA-cert for the cluster, and uses the CA-cert for signing - subordinate certs issued to each of the cluster components. - Subsequently, the certmgr daemon monitors active certificates and - renews them when needed. For single node Kubernetes clusters, - setting <xref linkend="opt-services.kubernetes.easyCerts" /> = true - is sufficient and no further action is required. For joining extra - node machines to an existing cluster on the other hand, establishing - initial trust is mandatory. - </para> - <para> - To add new nodes to the cluster: On any (non-master) cluster node - where <xref linkend="opt-services.kubernetes.easyCerts" /> is - enabled, the helper script - <literal>nixos-kubernetes-node-join</literal> is available on PATH. - Given a token on stdin, it will copy the token to the kubernetes - secrets directory and restart the certmgr service. As requested - certificates are issued, the script will restart kubernetes cluster - components as needed for them to pick up new keypairs. - </para> - <note> - <para> - Multi-master (HA) clusters are not supported by the easyCerts - module. - </para> - </note> - <para> - In order to interact with an RBAC-enabled cluster as an - administrator, one needs to have cluster-admin privileges. By - default, when easyCerts is enabled, a cluster-admin kubeconfig file - is generated and linked into - <literal>/etc/kubernetes/cluster-admin.kubeconfig</literal> as - determined by - <xref linkend="opt-services.kubernetes.pki.etcClusterAdminKubeconfig" />. - <literal>export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig</literal> - will make kubectl use this kubeconfig to access and authenticate the - cluster. The cluster-admin kubeconfig references an auto-generated - keypair owned by root. Thus, only root on the kubernetes master may - obtain cluster-admin rights by means of this file. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml deleted file mode 100644 index f889306d51c02..0000000000000 --- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ /dev/null @@ -1,221 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-kernel-config"> - <title>Linux Kernel</title> - <para> - You can override the Linux kernel and associated packages using the - option <literal>boot.kernelPackages</literal>. For instance, this - selects the Linux 3.10 kernel: - </para> - <programlisting language="nix"> -boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; -</programlisting> - <para> - Note that this not only replaces the kernel, but also packages that - are specific to the kernel version, such as the NVIDIA video - drivers. This ensures that driver packages are consistent with the - kernel. - </para> - <para> - While <literal>pkgs.linuxKernel.packages</literal> contains all - available kernel packages, you may want to use one of the - unversioned <literal>pkgs.linuxPackages_*</literal> aliases such as - <literal>pkgs.linuxPackages_latest</literal>, that are kept up to - date with new versions. - </para> - <para> - 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. - </para> - <para> - Longterm versions of kernels will be removed before the next stable - NixOS that will exceed the maintenance period of the kernel version. - </para> - <para> - The default Linux kernel configuration should be fine for most - users. You can see the configuration of your current kernel with the - following command: - </para> - <programlisting> -zcat /proc/config.gz -</programlisting> - <para> - If you want to change the kernel configuration, you can use the - <literal>packageOverrides</literal> feature (see - <xref linkend="sec-customising-packages" />). For instance, to - enable support for the kernel debugger KGDB: - </para> - <programlisting language="nix"> -nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { - linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { - extraConfig = '' - KGDB y - ''; - }; -}; -</programlisting> - <para> - <literal>extraConfig</literal> takes a list of Linux kernel - configuration options, one per line. The name of the option should - not include the prefix <literal>CONFIG_</literal>. The option value - is typically <literal>y</literal>, <literal>n</literal> or - <literal>m</literal> (to build something as a kernel module). - </para> - <para> - Kernel modules for hardware devices are generally loaded - automatically by <literal>udev</literal>. You can force a module to - be loaded via <xref linkend="opt-boot.kernelModules" />, e.g. - </para> - <programlisting language="nix"> -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; -</programlisting> - <para> - If the module is required early during the boot (e.g. to mount the - root file system), you can use - <xref linkend="opt-boot.initrd.kernelModules" />: - </para> - <programlisting language="nix"> -boot.initrd.kernelModules = [ "cifs" ]; -</programlisting> - <para> - This causes the specified modules and their dependencies to be added - to the initial ramdisk. - </para> - <para> - Kernel runtime parameters can be set through - <xref linkend="opt-boot.kernel.sysctl" />, e.g. - </para> - <programlisting language="nix"> -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; -</programlisting> - <para> - sets the kernel’s TCP keepalive time to 120 seconds. To see the - available parameters, run <literal>sysctl -a</literal>. - </para> - <section xml:id="sec-linux-config-customizing"> - <title>Building a custom kernel</title> - <para> - You can customize the default kernel configuration by overriding - the arguments for your kernel package: - </para> - <programlisting language="nix"> -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; - }; -} -</programlisting> - <para> - See <literal>pkgs/os-specific/linux/kernel/generic.nix</literal> - for details on how these arguments affect the generated - configuration. You can also build a custom version of Linux by - calling <literal>pkgs.buildLinux</literal> directly, which - requires the <literal>src</literal> and <literal>version</literal> - arguments to be specified. - </para> - <para> - To use your custom kernel package in your NixOS configuration, set - </para> - <programlisting language="nix"> -boot.kernelPackages = pkgs.linuxPackagesFor yourCustomKernel; -</programlisting> - <para> - Note that this method will use the common configuration defined in - <literal>pkgs/os-specific/linux/kernel/common-config.nix</literal>, - which is suitable for a NixOS system. - </para> - <para> - If you already have a generated configuration file, you can build - a kernel that uses it with - <literal>pkgs.linuxManualConfig</literal>: - </para> - <programlisting language="nix"> -let - baseKernel = pkgs.linux_latest; -in pkgs.linuxManualConfig { - inherit (baseKernel) src modDirVersion; - version = "${baseKernel.version}-custom"; - configfile = ./my_kernel_config; - allowImportFromDerivation = true; -} -</programlisting> - <note> - <para> - The build will fail if <literal>modDirVersion</literal> does not - match the source’s <literal>kernel.release</literal> file, so - <literal>modDirVersion</literal> should remain tied to - <literal>src</literal>. - </para> - </note> - <para> - To edit the <literal>.config</literal> file for Linux X.Y, proceed - as follows: - </para> - <programlisting> -$ nix-shell '<nixpkgs>' -A linuxKernel.kernels.linux_X_Y.configEnv -$ unpackPhase -$ cd linux-* -$ make nconfig -</programlisting> - </section> - <section xml:id="sec-linux-config-developing-modules"> - <title>Developing kernel modules</title> - <para> - 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 <literal>mellanox</literal> drivers. - </para> - <programlisting> -$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev -$ nix-shell '<nixpkgs>' -A linuxPackages.kernel -$ unpackPhase -$ 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 -</programlisting> - </section> - <section xml:id="sec-linux-zfs"> - <title>ZFS</title> - <para> - 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. - <literal>pkgs.linuxPackages</literal>). - </para> - <para> - Alternatively, it’s possible to pin the system to the latest - available kernel version <emphasis>that is supported by - ZFS</emphasis> like this: - </para> - <programlisting language="nix"> -{ - boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages; -} -</programlisting> - <para> - 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. - </para> - <para> - 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. - </para> - </section> -</chapter> 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 deleted file mode 100644 index 144a5acecae30..0000000000000 --- a/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml +++ /dev/null @@ -1,84 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-luks-file-systems"> - <title>LUKS-Encrypted File Systems</title> - <para> - NixOS supports file systems that are encrypted using - <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, - here is how you create an encrypted Ext4 file system on the device - <literal>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</literal>: - </para> - <programlisting> -# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d - -WARNING! -======== -This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. - -Are you sure? (Type uppercase yes): YES -Enter LUKS passphrase: *** -Verify passphrase: *** - -# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted -Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** - -# mkfs.ext4 /dev/mapper/crypted -</programlisting> - <para> - The LUKS volume should be automatically picked up by - <literal>nixos-generate-config</literal>, but you might want to - verify that your <literal>hardware-configuration.nix</literal> looks - correct. To manually ensure that the system is automatically mounted - at boot time as <literal>/</literal>, add the following to - <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -fileSystems."/".device = "/dev/mapper/crypted"; -</programlisting> - <para> - Should grub be used as bootloader, and <literal>/boot</literal> is - located on an encrypted partition, it is necessary to add the - following grub option: - </para> - <programlisting language="nix"> -boot.loader.grub.enableCryptodisk = true; -</programlisting> - <section xml:id="sec-luks-file-systems-fido2"> - <title>FIDO2</title> - <para> - NixOS also supports unlocking your LUKS-Encrypted file system - using a FIDO2 compatible token. In the following example, we will - create a new FIDO2 credential and add it as a new key to our - existing device <literal>/dev/sda2</literal>: - </para> - <programlisting> -# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" -# fido2luks credential "$FIDO2_LABEL" -f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 - -# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 -Password: -Password (again): -Old password: -Old password (again): -Added to key to device /dev/sda2, slot: 2 -</programlisting> - <para> - To ensure that this file system is decrypted using the FIDO2 - compatible key, add the following to - <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -boot.initrd.luks.fido2Support = true; -boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; -</programlisting> - <para> - You can also use the FIDO2 passwordless setup, but for security - reasons, you might want to enable it only when your device is PIN - protected, such as - <link xlink:href="https://trezor.io/">Trezor</link>. - </para> - <programlisting language="nix"> -boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; -</programlisting> - </section> -</section> diff --git a/nixos/doc/manual/from_md/configuration/modularity.section.xml b/nixos/doc/manual/from_md/configuration/modularity.section.xml deleted file mode 100644 index 987b2fc43c013..0000000000000 --- a/nixos/doc/manual/from_md/configuration/modularity.section.xml +++ /dev/null @@ -1,152 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-modularity"> - <title>Modularity</title> - <para> - The NixOS configuration mechanism is modular. If your - <literal>configuration.nix</literal> becomes too big, you can split - it into multiple files. Likewise, if you have multiple NixOS - configurations (e.g. for different computers) with some commonality, - you can move the common configuration into a shared file. - </para> - <para> - Modules have exactly the same syntax as - <literal>configuration.nix</literal>. In fact, - <literal>configuration.nix</literal> is itself a module. You can use - other modules by including them from - <literal>configuration.nix</literal>, e.g.: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; - ... -} -</programlisting> - <para> - Here, we include two modules from the same directory, - <literal>vpn.nix</literal> and <literal>kde.nix</literal>. The - latter might look like this: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - environment.systemPackages = [ pkgs.vim ]; -} -</programlisting> - <para> - Note that both <literal>configuration.nix</literal> and - <literal>kde.nix</literal> define the option - <xref linkend="opt-environment.systemPackages" />. When multiple - modules define an option, NixOS will try to - <emphasis>merge</emphasis> the definitions. In the case of - <xref linkend="opt-environment.systemPackages" />, that’s easy: the - lists of packages can simply be concatenated. The value in - <literal>configuration.nix</literal> is merged last, so for - list-type options, it will appear at the end of the merged list. If - you want it to appear first, you can use - <literal>mkBefore</literal>: - </para> - <programlisting language="nix"> -boot.kernelModules = mkBefore [ "kvm-intel" ]; -</programlisting> - <para> - This causes the <literal>kvm-intel</literal> kernel module to be - loaded before any other kernel modules. - </para> - <para> - For other types of options, a merge may not be possible. For - instance, if two modules define - <xref linkend="opt-services.httpd.adminAddr" />, - <literal>nixos-rebuild</literal> will give an error: - </para> - <programlisting> -The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. -</programlisting> - <para> - When that happens, it’s possible to force one definition take - precedence over the others: - </para> - <programlisting language="nix"> -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; -</programlisting> - <para> - When using multiple modules, you may need to access configuration - values defined in other modules. This is what the - <literal>config</literal> function argument is for: it contains the - complete, merged system configuration. That is, - <literal>config</literal> is the result of combining the - configurations returned by every module <footnote> - <para> - If you’re wondering how it’s possible that the (indirect) - <emphasis>result</emphasis> of a function is passed as an - <emphasis>input</emphasis> to that same function: that’s because - Nix is a <quote>lazy</quote> language — it only computes values - when they are needed. This works as long as no individual - configuration value depends on itself. - </para> - </footnote> . For example, here is a module that adds some packages - to <xref linkend="opt-environment.systemPackages" /> only if - <xref linkend="opt-services.xserver.enable" /> is set to - <literal>true</literal> somewhere else: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ environment.systemPackages = - if config.services.xserver.enable then - [ pkgs.firefox - pkgs.thunderbird - ] - else - [ ]; -} -</programlisting> - <para> - With multiple modules, it may not be obvious what the final value of - a configuration option is. The command - <literal>nixos-option</literal> allows you to find out: - </para> - <programlisting> -$ nixos-option services.xserver.enable -true - -$ nixos-option boot.kernelModules -[ "tun" "ipv6" "loop" ... ] -</programlisting> - <para> - Interactive exploration of the configuration is possible using - <literal>nix repl</literal>, a read-eval-print loop for Nix - expressions. A typical use: - </para> - <programlisting> -$ nix repl '<nixpkgs/nixos>' - -nix-repl> config.networking.hostName -"mandark" - -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts -[ "example.org" "example.gov" ] -</programlisting> - <para> - While abstracting your configuration, you may find it useful to - generate modules using code, instead of writing files. The example - below would have the same effect as importing a file which sets - those options. - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -let netConfig = hostName: { - networking.hostName = hostName; - networking.useDHCP = false; -}; - -in - -{ imports = [ (netConfig "nixos.localdomain") ]; } -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml deleted file mode 100644 index c49618b4b9427..0000000000000 --- a/nixos/doc/manual/from_md/configuration/network-manager.section.xml +++ /dev/null @@ -1,49 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-networkmanager"> - <title>NetworkManager</title> - <para> - To facilitate network configuration, some desktop environments use - NetworkManager. You can enable NetworkManager by setting: - </para> - <programlisting language="nix"> -networking.networkmanager.enable = true; -</programlisting> - <para> - some desktop managers (e.g., GNOME) enable NetworkManager - automatically for you. - </para> - <para> - All users that should have permission to change network settings - must belong to the <literal>networkmanager</literal> group: - </para> - <programlisting language="nix"> -users.users.alice.extraGroups = [ "networkmanager" ]; -</programlisting> - <para> - NetworkManager is controlled using either <literal>nmcli</literal> - or <literal>nmtui</literal> (curses-based terminal user interface). - See their manual pages for details on their usage. Some desktop - environments (GNOME, KDE) have their own configuration tools for - NetworkManager. On XFCE, there is no configuration tool for - NetworkManager by default: by enabling - <xref linkend="opt-programs.nm-applet.enable" />, the graphical - applet will be installed and will launch automatically when the - graphical session is started. - </para> - <note> - <para> - <literal>networking.networkmanager</literal> and - <literal>networking.wireless</literal> (WPA Supplicant) can be - used together if desired. To do this you need to instruct - NetworkManager to ignore those interfaces like: - </para> - <programlisting language="nix"> -networking.networkmanager.unmanaged = [ - "*" "except:type:wwan" "except:type:gsm" -]; -</programlisting> - <para> - Refer to the option description for the exact syntax and - references to external documentation. - </para> - </note> -</section> diff --git a/nixos/doc/manual/from_md/configuration/networking.chapter.xml b/nixos/doc/manual/from_md/configuration/networking.chapter.xml deleted file mode 100644 index 2ed86ea3b5899..0000000000000 --- a/nixos/doc/manual/from_md/configuration/networking.chapter.xml +++ /dev/null @@ -1,15 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-networking"> - <title>Networking</title> - <para> - This section describes how to configure networking components on - your NixOS machine. - </para> - <xi:include href="network-manager.section.xml" /> - <xi:include href="ssh.section.xml" /> - <xi:include href="ipv4-config.section.xml" /> - <xi:include href="ipv6-config.section.xml" /> - <xi:include href="firewall.section.xml" /> - <xi:include href="wireless.section.xml" /> - <xi:include href="ad-hoc-network-config.section.xml" /> - <xi:include href="renaming-interfaces.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml deleted file mode 100644 index d3727edbe08d3..0000000000000 --- a/nixos/doc/manual/from_md/configuration/package-mgmt.chapter.xml +++ /dev/null @@ -1,28 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-package-management"> - <title>Package Management</title> - <para> - This section describes how to add additional packages to your - system. NixOS has two distinct styles of package management: - </para> - <itemizedlist> - <listitem> - <para> - <emphasis>Declarative</emphasis>, where you declare what - packages you want in your <literal>configuration.nix</literal>. - Every time you run <literal>nixos-rebuild</literal>, NixOS will - ensure that you get a consistent set of binaries corresponding - to your specification. - </para> - </listitem> - <listitem> - <para> - <emphasis>Ad hoc</emphasis>, where you install, upgrade and - uninstall packages via the <literal>nix-env</literal> command. - This style allows mixing packages from different Nixpkgs - versions. It’s the only choice for non-root users. - </para> - </listitem> - </itemizedlist> - <xi:include href="declarative-packages.section.xml" /> - <xi:include href="ad-hoc-packages.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml b/nixos/doc/manual/from_md/configuration/profiles.chapter.xml deleted file mode 100644 index f3aacfc0a2451..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml +++ /dev/null @@ -1,38 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="ch-profiles"> - <title>Profiles</title> - <para> - 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 - <literal><nixpkgs/nixos/modules/profiles></literal>. That is - to say, expected usage is to add them to the imports list of your - <literal>/etc/configuration.nix</literal> as such: - </para> - <programlisting language="nix"> -imports = [ - <nixpkgs/nixos/modules/profiles/profile-name.nix> -]; -</programlisting> - <para> - Even if some of these profiles seem only useful in the context of - install media, many are actually intended to be used in real - installs. - </para> - <para> - What follows is a brief explanation on the purpose and use-case for - each profile. Detailing each option configured by each one is out of - scope. - </para> - <xi:include href="profiles/all-hardware.section.xml" /> - <xi:include href="profiles/base.section.xml" /> - <xi:include href="profiles/clone-config.section.xml" /> - <xi:include href="profiles/demo.section.xml" /> - <xi:include href="profiles/docker-container.section.xml" /> - <xi:include href="profiles/graphical.section.xml" /> - <xi:include href="profiles/hardened.section.xml" /> - <xi:include href="profiles/headless.section.xml" /> - <xi:include href="profiles/installation-device.section.xml" /> - <xi:include href="profiles/minimal.section.xml" /> - <xi:include href="profiles/qemu-guest.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml deleted file mode 100644 index 43ac5edea7f88..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml +++ /dev/null @@ -1,15 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-all-hardware"> - <title>All Hardware</title> - <para> - Enables all hardware supported by NixOS: i.e., all firmware is - included, and all devices from which one may boot are enabled in the - initrd. Its primary use is in the NixOS installation CDs. - </para> - <para> - The enabled kernel modules include support for SATA and PATA, SCSI - (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), - VMware, and Hyper-V. Additionally, - <xref linkend="opt-hardware.enableAllFirmware" /> is enabled, and - the firmware for the ZyDAS ZD1211 chipset is specifically installed. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/base.section.xml b/nixos/doc/manual/from_md/configuration/profiles/base.section.xml deleted file mode 100644 index 83d35bd286763..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/base.section.xml +++ /dev/null @@ -1,10 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-base"> - <title>Base</title> - <para> - Defines the software packages included in the <quote>minimal</quote> - installation CD. It installs several utilities useful in a simple - recovery or install media, such as a text-mode web browser, and - tools for manipulating block devices, networking, hardware - diagnostics, and filesystems (with their respective kernel modules). - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml b/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml deleted file mode 100644 index 9430b49ea33d0..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml +++ /dev/null @@ -1,16 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-clone-config"> - <title>Clone Config</title> - <para> - This profile is used in installer images. It provides an editable - configuration.nix that imports all the modules that were also used - when creating the image in the first place. As a result it allows - users to edit and rebuild the live-system. - </para> - <para> - On images where the installation media also becomes an installation - target, copying over <literal>configuration.nix</literal> should be - disabled by setting <literal>installer.cloneConfig</literal> to - <literal>false</literal>. For example, this is done in - <literal>sd-image-aarch64-installer.nix</literal>. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml b/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml deleted file mode 100644 index 09c2680a1067a..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml +++ /dev/null @@ -1,10 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-demo"> - <title>Demo</title> - <para> - This profile just enables a <literal>demo</literal> user, with - password <literal>demo</literal>, uid <literal>1000</literal>, - <literal>wheel</literal> group and - <link linkend="opt-services.xserver.displayManager.autoLogin">autologin - in the SDDM display manager</link>. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml b/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml deleted file mode 100644 index 97c2a92dcab50..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml +++ /dev/null @@ -1,12 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-docker-container"> - <title>Docker Container</title> - <para> - This is the profile from which the Docker images are generated. It - prepares a working system by importing the - <link linkend="sec-profile-minimal">Minimal</link> and - <link linkend="sec-profile-clone-config">Clone Config</link> - profiles, and setting appropriate configuration options that are - useful inside a container context, like - <xref linkend="opt-boot.isContainer" />. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml deleted file mode 100644 index 1b109519d436f..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml +++ /dev/null @@ -1,14 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-graphical"> - <title>Graphical</title> - <para> - Defines a NixOS configuration with the Plasma 5 desktop. It’s used - by the graphical installation CD. - </para> - <para> - It sets <xref linkend="opt-services.xserver.enable" />, - <xref linkend="opt-services.xserver.displayManager.sddm.enable" />, - <xref linkend="opt-services.xserver.desktopManager.plasma5.enable" />, - and <xref linkend="opt-services.xserver.libinput.enable" /> to true. - It also includes glxinfo and firefox in the system packages list. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml deleted file mode 100644 index 1fd5a9179887f..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml +++ /dev/null @@ -1,25 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-hardened"> - <title>Hardened</title> - <para> - A profile with most (vanilla) hardening options enabled by default, - potentially at the cost of stability, features and performance. - </para> - <para> - This includes a hardened kernel, and limiting the system information - available to processes through the <literal>/sys</literal> and - <literal>/proc</literal> 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 overridden via - <xref linkend="opt-security.allowUserNamespaces" />). See the - <link xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">profile - source</link> for further detail on which settings are altered. - </para> - <warning> - <para> - This profile enables options that are known to affect system - stability. If you experience any stability issues when using the - profile, try disabling it. If you report an issue and use this - profile, always mention that you do. - </para> - </warning> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml deleted file mode 100644 index 0910b9ffaad23..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml +++ /dev/null @@ -1,15 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-headless"> - <title>Headless</title> - <para> - Common configuration for headless machines (e.g., Amazon EC2 - instances). - </para> - <para> - Disables <link linkend="opt-sound.enable">sound</link>, - <link linkend="opt-boot.vesa">vesa</link>, serial consoles, - <link linkend="opt-systemd.enableEmergencyMode">emergency - mode</link>, <link linkend="opt-boot.loader.grub.splashImage">grub - splash images</link> and configures the kernel to reboot - automatically on panic. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml deleted file mode 100644 index 837e69df06e15..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml +++ /dev/null @@ -1,32 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-installation-device"> - <title>Installation Device</title> - <para> - Provides a basic configuration for installation devices like CDs. - This enables redistributable firmware, includes the - <link linkend="sec-profile-clone-config">Clone Config profile</link> - and a copy of the Nixpkgs channel, so - <literal>nixos-install</literal> works out of the box. - </para> - <para> - Documentation for - <link linkend="opt-documentation.enable">Nixpkgs</link> and - <link linkend="opt-documentation.nixos.enable">NixOS</link> are - forcefully enabled (to override the - <link linkend="sec-profile-minimal">Minimal profile</link> - preference); the NixOS manual is shown automatically on TTY 8, - udisks is disabled. Autologin is enabled as <literal>nixos</literal> - user, while passwordless login as both <literal>root</literal> and - <literal>nixos</literal> is possible. Passwordless - <literal>sudo</literal> is enabled too. - <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> - is enabled, but configured to not autostart. - </para> - <para> - It is explained how to login, start the ssh server, and if - available, how to start the display manager. - </para> - <para> - Several settings are tweaked so that the installer has a better - chance of succeeding under low-memory environments. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml deleted file mode 100644 index a3fe30357dff5..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml +++ /dev/null @@ -1,13 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-minimal"> - <title>Minimal</title> - <para> - This profile defines a small NixOS configuration. It does not - contain any graphical stuff. It’s a very short file that enables - <link linkend="opt-environment.noXlibs">noXlibs</link>, sets - <xref linkend="opt-i18n.supportedLocales" /> to only support the - user-selected locale, - <link linkend="opt-documentation.enable">disables packages’ - documentation</link>, and <link linkend="opt-sound.enable">disables - sound</link>. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml b/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml deleted file mode 100644 index f33464f9db4dd..0000000000000 --- a/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml +++ /dev/null @@ -1,11 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-profile-qemu-guest"> - <title>QEMU Guest</title> - <para> - This profile contains common configuration for virtual machines - running under QEMU (using virtio). - </para> - <para> - It makes virtio modules available on the initrd and sets the system - time from the hardware clock to work around a bug in qemu-kvm. - </para> -</section> diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml deleted file mode 100644 index fca99edcbaea3..0000000000000 --- a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml +++ /dev/null @@ -1,62 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-rename-ifs"> - <title>Renaming network interfaces</title> - <para> - NixOS uses the udev - <link xlink:href="https://systemd.io/PREDICTABLE_INTERFACE_NAMES/">predictable - naming scheme</link> to assign names to network interfaces. This - means that by default cards are not given the traditional names like - <literal>eth0</literal> or <literal>eth1</literal>, whose order can - change unpredictably across reboots. Instead, relying on physical - locations and firmware information, the scheme produces names like - <literal>ens1</literal>, <literal>enp2s0</literal>, etc. - </para> - <para> - These names are predictable but less memorable and not necessarily - stable: for example installing new hardware or changing firmware - settings can result in a - <link xlink:href="https://github.com/systemd/systemd/issues/3715#issue-165347602">name - change</link>. If this is undesirable, for example if you have a - single ethernet card, you can revert to the traditional scheme by - setting - <xref linkend="opt-networking.usePredictableInterfaceNames" /> to - <literal>false</literal>. - </para> - <section xml:id="sec-custom-ifnames"> - <title>Assigning custom names</title> - <para> - In case there are multiple interfaces of the same type, it’s - better to assign custom names based on the device hardware - address. For example, we assign the name <literal>wan</literal> to - the interface with MAC address - <literal>52:54:00:12:01:01</literal> using a netword link unit: - </para> - <programlisting language="nix"> -systemd.network.links."10-wan" = { - matchConfig.PermanentMACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "wan"; -}; -</programlisting> - <para> - Note that links are directly read by udev, <emphasis>not - networkd</emphasis>, and will work even if networkd is disabled. - </para> - <para> - Alternatively, we can use a plain old udev rule: - </para> - <programlisting language="nix"> -services.udev.initrdRules = '' - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ - ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" -''; -</programlisting> - <warning> - <para> - The rule must be installed in the initrd using - <literal>services.udev.initrdRules</literal>, not the usual - <literal>services.udev.extraRules</literal> option. This is to - avoid race conditions with other programs controlling the - interface. - </para> - </warning> - </section> -</section> diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml deleted file mode 100644 index e0d4031443ef9..0000000000000 --- a/nixos/doc/manual/from_md/configuration/ssh.section.xml +++ /dev/null @@ -1,23 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-ssh"> - <title>Secure Shell Access</title> - <para> - Secure shell (SSH) access to your machine can be enabled by setting: - </para> - <programlisting language="nix"> -services.openssh.enable = true; -</programlisting> - <para> - By default, root logins using a password are disallowed. They can be - disabled entirely by setting - <xref linkend="opt-services.openssh.settings.PermitRootLogin" /> to - <literal>"no"</literal>. - </para> - <para> - You can declaratively specify authorised RSA/DSA public keys for a - user as follows: - </para> - <programlisting language="nix"> -users.users.alice.openssh.authorizedKeys.keys = - [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; -</programlisting> -</section> 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 deleted file mode 100644 index 26984dd411a11..0000000000000 --- a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml +++ /dev/null @@ -1,139 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-sshfs-file-systems"> - <title>SSHFS File Systems</title> - <para> - <link xlink:href="https://github.com/libfuse/sshfs">SSHFS</link> is - a - <link xlink:href="https://en.wikipedia.org/wiki/Filesystem_in_Userspace">FUSE</link> - filesystem that allows easy access to directories on a remote - machine using the SSH File Transfer Protocol (SFTP). It means that - if you have SSH access to a machine, no additional setup is needed - to mount a directory. - </para> - <section xml:id="sec-sshfs-interactive"> - <title>Interactive mounting</title> - <para> - In NixOS, SSHFS is packaged as <package>sshfs</package>. Once - installed, mounting a directory interactively is simple as - running: - </para> - <programlisting> -$ sshfs my-user@example.com:/my-dir /mnt/my-dir -</programlisting> - <para> - Like any other FUSE file system, the directory is unmounted using: - </para> - <programlisting> -$ fusermount -u /mnt/my-dir -</programlisting> - </section> - <section xml:id="sec-sshfs-non-interactive"> - <title>Non-interactive mounting</title> - <para> - Mounting non-interactively requires some precautions because - <literal>sshfs</literal> will run at boot and under a different - user (root). For obvious reason, you can’t input a password, so - public key authentication using an unencrypted key is needed. To - create a new key without a passphrase you can do: - </para> - <programlisting> -$ ssh-keygen -t ed25519 -P '' -f example-key -Generating public/private ed25519 key pair. -Your identification has been saved in test-key -Your public key has been saved in test-key.pub -The key fingerprint is: -SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation -</programlisting> - <para> - To keep the key safe, change the ownership to - <literal>root:root</literal> and make sure the permissions are - <literal>600</literal>: OpenSSH normally refuses to use the key if - it’s not well-protected. - </para> - <para> - The file system can be configured in NixOS via the usual - <link linkend="opt-fileSystems">fileSystems</link> option. Here’s - a typical setup: - </para> - <programlisting language="nix"> -{ - system.fsPackages = [ pkgs.sshfs ]; - - fileSystems."/mnt/my-dir" = { - device = "my-user@example.com:/my-dir/"; - fsType = "sshfs"; - options = - [ # Filesystem options - "allow_other" # for non-root access - "_netdev" # this is a network fs - "x-systemd.automount" # mount on demand - - # SSH options - "reconnect" # handle connection drops - "ServerAliveInterval=15" # keep connections alive - "IdentityFile=/var/secrets/example-key" - ]; - }; -} -</programlisting> - <para> - More options from <literal>ssh_config(5)</literal> can be given as - well, for example you can change the default SSH port or specify a - jump proxy: - </para> - <programlisting language="nix"> -{ - options = - [ "ProxyJump=bastion@example.com" - "Port=22" - ]; -} -</programlisting> - <para> - It’s also possible to change the <literal>ssh</literal> command - used by SSHFS to connect to the server. For example: - </para> - <programlisting language="nix"> -{ - options = - [ (builtins.replaceStrings [" "] ["\\040"] - "ssh_command=${pkgs.openssh}/bin/ssh -v -L 8080:localhost:80") - ]; - -} -</programlisting> - <note> - <para> - The escaping of spaces is needed because every option is written - to the <literal>/etc/fstab</literal> file, which is a - space-separated table. - </para> - </note> - <section xml:id="sec-sshfs-troubleshooting"> - <title>Troubleshooting</title> - <para> - If you’re having a hard time figuring out why mounting is - failing, you can add the option - <literal>"debug"</literal>. This enables a verbose log - in SSHFS that you can access via: - </para> - <programlisting> -$ journalctl -u $(systemd-escape -p /mnt/my-dir/).mount -Jun 22 11:41:18 workstation mount[87790]: SSHFS version 3.7.1 -Jun 22 11:41:18 workstation mount[87793]: executing <ssh> <-x> <-a> <-oClearAllForwardings=yes> <-oServerAliveInterval=15> <-oIdentityFile=/var/secrets/wrong-key> <-2> <my-user@example.com> <-s> <sftp> -Jun 22 11:41:19 workstation mount[87793]: my-user@example.com: Permission denied (publickey). -Jun 22 11:41:19 workstation mount[87790]: read: Connection reset by peer -Jun 22 11:41:19 workstation systemd[1]: mnt-my\x2ddir.mount: Mount process exited, code=exited, status=1/FAILURE -Jun 22 11:41:19 workstation systemd[1]: mnt-my\x2ddir.mount: Failed with result 'exit-code'. -Jun 22 11:41:19 workstation systemd[1]: Failed to mount /mnt/my-dir. -Jun 22 11:41:19 workstation systemd[1]: mnt-my\x2ddir.mount: Consumed 54ms CPU time, received 2.3K IP traffic, sent 2.7K IP traffic. -</programlisting> - <note> - <para> - If the mount point contains special characters it needs to be - escaped using <literal>systemd-escape</literal>. This is due - to the way systemd converts paths into unit names. - </para> - </note> - </section> - </section> -</section> diff --git a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml deleted file mode 100644 index 4390fc54ab534..0000000000000 --- a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml +++ /dev/null @@ -1,121 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-subversion"> - <title>Subversion</title> - <para> - <link xlink:href="https://subversion.apache.org/">Subversion</link> - is a centralized version-control system. It can use a - <link xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing">variety - of protocols</link> for communication between client and server. - </para> - <section xml:id="module-services-subversion-apache-httpd"> - <title>Subversion inside Apache HTTP</title> - <para> - This section focuses on configuring a web-based server on top of - the Apache HTTP server, which uses - <link xlink:href="http://www.webdav.org/">WebDAV</link>/<link xlink:href="http://www.webdav.org/deltav/WWW10/deltav-intro.htm">DeltaV</link> - for communication. - </para> - <para> - For more information on the general setup, please refer to the - <link xlink:href="http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd">the - appropriate section of the Subversion book</link>. - </para> - <para> - To configure, include in - <literal>/etc/nixos/configuration.nix</literal> code to activate - Apache HTTP, setting - <xref linkend="opt-services.httpd.adminAddr" /> appropriately: - </para> - <programlisting language="nix"> -services.httpd.enable = true; -services.httpd.adminAddr = ...; -networking.firewall.allowedTCPPorts = [ 80 443 ]; -</programlisting> - <para> - For a simple Subversion server with basic authentication, - configure the Subversion module for Apache as follows, setting - <literal>hostName</literal> and <literal>documentRoot</literal> - appropriately, and <literal>SVNParentPath</literal> to the parent - directory of the repositories, - <literal>AuthzSVNAccessFile</literal> to the location of the - <literal>.authz</literal> file describing access permission, and - <literal>AuthUserFile</literal> to the password file. - </para> - <programlisting language="nix"> -services.httpd.extraModules = [ - # note that order is *super* important here - { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } - { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } - ]; - services.httpd.virtualHosts = { - "svn" = { - hostName = HOSTNAME; - documentRoot = DOCUMENTROOT; - locations."/svn".extraConfig = '' - DAV svn - SVNParentPath REPO_PARENT - AuthzSVNAccessFile ACCESS_FILE - AuthName "SVN Repositories" - AuthType Basic - AuthUserFile PASSWORD_FILE - Require valid-user - ''; - } -</programlisting> - <para> - The key <literal>"svn"</literal> is just a symbolic name - identifying the virtual host. The - <literal>"/svn"</literal> in - <literal>locations."/svn".extraConfig</literal> is the - path underneath which the repositories will be served. - </para> - <para> - <link xlink:href="https://wiki.archlinux.org/index.php/Subversion">This - page</link> explains how to set up the Subversion configuration - itself. This boils down to the following: - </para> - <para> - Underneath <literal>REPO_PARENT</literal> repositories can be set - up as follows: - </para> - <programlisting> -$ svn create REPO_NAME -</programlisting> - <para> - Repository files need to be accessible by - <literal>wwwrun</literal>: - </para> - <programlisting> -$ chown -R wwwrun:wwwrun REPO_PARENT -</programlisting> - <para> - The password file <literal>PASSWORD_FILE</literal> can be created - as follows: - </para> - <programlisting> -$ htpasswd -cs PASSWORD_FILE USER_NAME -</programlisting> - <para> - Additional users can be set up similarly, omitting the - <literal>c</literal> flag: - </para> - <programlisting> -$ htpasswd -s PASSWORD_FILE USER_NAME -</programlisting> - <para> - The file describing access permissions - <literal>ACCESS_FILE</literal> will look something like the - following: - </para> - <programlisting language="nix"> -[/] -* = r - -[REPO_NAME:/] -USER_NAME = rw -</programlisting> - <para> - The Subversion repositories will be accessible as - <literal>http://HOSTNAME/svn/REPO_NAME</literal>. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml deleted file mode 100644 index d61b248d5eef6..0000000000000 --- a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml +++ /dev/null @@ -1,105 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-user-management"> - <title>User Management</title> - <para> - NixOS supports both declarative and imperative styles of user - management. In the declarative style, users are specified in - <literal>configuration.nix</literal>. For instance, the following - states that a user account named <literal>alice</literal> shall - exist: - </para> - <programlisting language="nix"> -users.users.alice = { - isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; -}; -</programlisting> - <para> - Note that <literal>alice</literal> is a member of the - <literal>wheel</literal> and <literal>networkmanager</literal> - groups, which allows her to use <literal>sudo</literal> to execute - commands as <literal>root</literal> and to configure the network, - respectively. Also note the SSH public key that allows remote logins - with the corresponding private key. Users created in this way do not - have a password by default, so they cannot log in via mechanisms - that require a password. However, you can use the - <literal>passwd</literal> program to set a password, which is - retained across invocations of <literal>nixos-rebuild</literal>. - </para> - <para> - If you set <xref linkend="opt-users.mutableUsers" /> to false, then - the contents of <literal>/etc/passwd</literal> and - <literal>/etc/group</literal> will be congruent to your NixOS - configuration. For instance, if you remove a user from - <xref linkend="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 - <link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link> - option. A hashed password can be generated using - <literal>mkpasswd</literal>. - </para> - <para> - A user ID (uid) is assigned automatically. You can also specify a - uid manually by adding - </para> - <programlisting language="nix"> -uid = 1000; -</programlisting> - <para> - to the user specification. - </para> - <para> - Groups can be specified similarly. The following states that a group - named <literal>students</literal> shall exist: - </para> - <programlisting language="nix"> -users.groups.students.gid = 1000; -</programlisting> - <para> - As with users, the group ID (gid) is optional and will be assigned - automatically if it’s missing. - </para> - <para> - In the imperative style, users and groups are managed by commands - such as <literal>useradd</literal>, <literal>groupmod</literal> and - so on. For instance, to create a user account named - <literal>alice</literal>: - </para> - <programlisting> -# useradd -m alice -</programlisting> - <para> - To make all nix tools available to this new user use `su - USER` - which opens a login shell (==shell that loads the profile) for given - user. This will create the ~/.nix-defexpr symlink. So run: - </para> - <programlisting> -# su - alice -c "true" -</programlisting> - <para> - The flag <literal>-m</literal> causes the creation of a home - directory for the new user, which is generally what you want. The - user does not have an initial password and therefore cannot log in. - A password can be set using the <literal>passwd</literal> utility: - </para> - <programlisting> -# passwd alice -Enter new UNIX password: *** -Retype new UNIX password: *** -</programlisting> - <para> - A user can be deleted using <literal>userdel</literal>: - </para> - <programlisting> -# userdel -r alice -</programlisting> - <para> - The flag <literal>-r</literal> deletes the user’s home directory. - Accounts can be modified using <literal>usermod</literal>. Unix - groups can be managed using <literal>groupadd</literal>, - <literal>groupmod</literal> and <literal>groupdel</literal>. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml deleted file mode 100644 index 07892c875bb25..0000000000000 --- a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml +++ /dev/null @@ -1,32 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-wayland"> - <title>Wayland</title> - <para> - While X11 (see <xref linkend="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 <quote>Server</quote> - functionality. This means it is sufficient to install a Wayland - Compositor such as sway without separately enabling a Wayland - server: - </para> - <programlisting language="nix"> -programs.sway.enable = true; -</programlisting> - <para> - This installs the sway compositor along with some essential - utilities. Now you can start sway from the TTY console. - </para> - <para> - If you are using a wlroots-based compositor, like sway, and want to - be able to share your screen, you might want to activate this - option: - </para> - <programlisting language="nix"> -xdg.portal.wlr.enable = true; -</programlisting> - <para> - and configure Pipewire using - <xref linkend="opt-services.pipewire.enable" /> and related options. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixos/doc/manual/from_md/configuration/wireless.section.xml deleted file mode 100644 index 79feab47203a5..0000000000000 --- a/nixos/doc/manual/from_md/configuration/wireless.section.xml +++ /dev/null @@ -1,73 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-wireless"> - <title>Wireless Networks</title> - <para> - For a desktop installation using NetworkManager (e.g., GNOME), you - just have to make sure the user is in the - <literal>networkmanager</literal> group and you can skip the rest of - this section on wireless networks. - </para> - <para> - NixOS will start wpa_supplicant for you if you enable this setting: - </para> - <programlisting language="nix"> -networking.wireless.enable = true; -</programlisting> - <para> - NixOS lets you specify networks for wpa_supplicant declaratively: - </para> - <programlisting language="nix"> -networking.wireless.networks = { - echelon = { # SSID with no spaces or special characters - psk = "abcdefgh"; - }; - "echelon's AP" = { # SSID with spaces and/or special characters - psk = "ijklmnop"; - }; - echelon = { # Hidden SSID - hidden = true; - psk = "qrstuvwx"; - }; - free.wifi = {}; # Public wireless network -}; -</programlisting> - <para> - Be aware that keys will be written to the nix store in plaintext! - When no networks are set, it will default to using a configuration - file at <literal>/etc/wpa_supplicant.conf</literal>. You should edit - this file yourself to define wireless networks, WPA keys and so on - (see wpa_supplicant.conf(5)). - </para> - <para> - If you are using WPA2 you can generate pskRaw key using - <literal>wpa_passphrase</literal>: - </para> - <programlisting> -$ wpa_passphrase ESSID PSK -network={ - ssid="echelon" - #psk="abcdefgh" - psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 -} -</programlisting> - <programlisting language="nix"> -networking.wireless.networks = { - echelon = { - pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; - }; -}; -</programlisting> - <para> - or you can use it to directly generate the - <literal>wpa_supplicant.conf</literal>: - </para> - <programlisting> -# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf -</programlisting> - <para> - After you have edited the <literal>wpa_supplicant.conf</literal>, - you need to restart the wpa_supplicant service. - </para> - <programlisting> -# systemctl restart wpa_supplicant.service -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml deleted file mode 100644 index 319d3e9801881..0000000000000 --- a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml +++ /dev/null @@ -1,380 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-x11"> - <title>X Window System</title> - <para> - The X Window System (X11) provides the basis of NixOS’ graphical - user interface. It can be enabled as follows: - </para> - <programlisting language="nix"> -services.xserver.enable = true; -</programlisting> - <para> - The X server will automatically detect and use the appropriate video - driver from a set of X.org drivers (such as <literal>vesa</literal> - and <literal>intel</literal>). You can also specify a driver - manually, e.g. - </para> - <programlisting language="nix"> -services.xserver.videoDrivers = [ "r128" ]; -</programlisting> - <para> - to enable X.org’s <literal>xf86-video-r128</literal> driver. - </para> - <para> - You also need to enable at least one desktop or window manager. - Otherwise, you can only log into a plain undecorated - <literal>xterm</literal> window. Thus you should pick one or more of - the following lines: - </para> - <programlisting language="nix"> -services.xserver.desktopManager.plasma5.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.desktopManager.gnome.enable = true; -services.xserver.desktopManager.mate.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; -services.xserver.windowManager.i3.enable = true; -services.xserver.windowManager.herbstluftwm.enable = true; -</programlisting> - <para> - NixOS’s default <emphasis>display manager</emphasis> (the program - that provides a graphical login prompt and manages the X server) is - LightDM. You can select an alternative one by picking one of the - following lines: - </para> - <programlisting language="nix"> -services.xserver.displayManager.sddm.enable = true; -services.xserver.displayManager.gdm.enable = true; -</programlisting> - <para> - You can set the keyboard layout (and optionally the layout variant): - </para> - <programlisting language="nix"> -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; -</programlisting> - <para> - The X server is started automatically at boot time. If you don’t - want this to happen, you can set: - </para> - <programlisting language="nix"> -services.xserver.autorun = false; -</programlisting> - <para> - The X server can then be started manually: - </para> - <programlisting> -# systemctl start display-manager.service -</programlisting> - <para> - On 64-bit systems, if you want OpenGL for 32-bit programs such as in - Wine, you should also set the following: - </para> - <programlisting language="nix"> -hardware.opengl.driSupport32Bit = true; -</programlisting> - <section xml:id="sec-x11-auto-login"> - <title>Auto-login</title> - <para> - The x11 login screen can be skipped entirely, automatically - logging you into your window manager and desktop environment when - you boot your computer. - </para> - <para> - This is especially helpful if you have disk encryption enabled. - Since you already have to provide a password to decrypt your disk, - entering a second password to login can be redundant. - </para> - <para> - 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: - </para> - <programlisting language="nix"> -services.xserver.displayManager.defaultSession = "none+i3"; -</programlisting> - <para> - Every display manager in NixOS supports auto-login, here is an - example using lightdm for a user <literal>alice</literal>: - </para> - <programlisting language="nix"> -services.xserver.displayManager.lightdm.enable = true; -services.xserver.displayManager.autoLogin.enable = true; -services.xserver.displayManager.autoLogin.user = "alice"; -</programlisting> - </section> - <section xml:id="sec-x11--graphics-cards-intel"> - <title>Intel Graphics drivers</title> - <para> - There are two choices for Intel Graphics drivers in X.org: - <literal>modesetting</literal> (included in the xorg-server - itself) and <literal>intel</literal> (provided by the package - xf86-video-intel). - </para> - <para> - The default and recommended is <literal>modesetting</literal>. It - is a generic driver which uses the kernel - <link xlink:href="https://en.wikipedia.org/wiki/Mode_setting">mode - setting</link> (KMS) mechanism. It supports Glamor (2D graphics - acceleration via OpenGL) and is actively maintained but may - perform worse in some cases (like in old chipsets). - </para> - <para> - The second driver, <literal>intel</literal>, 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. - </para> - <para> - The results vary depending on the hardware, so you may have to try - both drivers. Use the option - <xref linkend="opt-services.xserver.videoDrivers" /> to set one. - The recommended configuration for modern systems is: - </para> - <programlisting language="nix"> -services.xserver.videoDrivers = [ "modesetting" ]; -</programlisting> - <para> - If you experience screen tearing no matter what, this - configuration was reported to resolve the issue: - </para> - <programlisting language="nix"> -services.xserver.videoDrivers = [ "intel" ]; -services.xserver.deviceSection = '' - Option "DRI" "2" - Option "TearFree" "true" -''; -</programlisting> - <para> - Note that this will likely downgrade the performance compared to - <literal>modesetting</literal> or <literal>intel</literal> with - DRI 3 (default). - </para> - </section> - <section xml:id="sec-x11-graphics-cards-nvidia"> - <title>Proprietary NVIDIA drivers</title> - <para> - NVIDIA provides a proprietary driver for its graphics cards that - has better 3D performance than the X.org drivers. It is not - enabled by default because it’s not free software. You can enable - it as follows: - </para> - <programlisting language="nix"> -services.xserver.videoDrivers = [ "nvidia" ]; -</programlisting> - <para> - Or if you have an older card, you may have to use one of the - legacy drivers: - </para> - <programlisting language="nix"> -services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; -services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; -</programlisting> - <para> - You may need to reboot after enabling this driver to prevent a - clash with other kernel modules. - </para> - </section> - <section xml:id="sec-x11--graphics-cards-amd"> - <title>Proprietary AMD drivers</title> - <para> - 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 performance. If you still want to use it anyway, you - need to explicitly set: - </para> - <programlisting language="nix"> -services.xserver.videoDrivers = [ "amdgpu-pro" ]; -</programlisting> - <para> - You will need to reboot after enabling this driver to prevent a - clash with other kernel modules. - </para> - </section> - <section xml:id="sec-x11-touchpads"> - <title>Touchpads</title> - <para> - Support for Synaptics touchpads (found in many laptops such as the - Dell Latitude series) can be enabled as follows: - </para> - <programlisting language="nix"> -services.xserver.libinput.enable = true; -</programlisting> - <para> - The driver has many options (see <xref linkend="ch-options" />). - For instance, the following disables tap-to-click behavior: - </para> - <programlisting language="nix"> -services.xserver.libinput.touchpad.tapping = false; -</programlisting> - <para> - Note: the use of <literal>services.xserver.synaptics</literal> is - deprecated since NixOS 17.09. - </para> - </section> - <section xml:id="sec-x11-gtk-and-qt-themes"> - <title>GTK/Qt themes</title> - <para> - GTK themes can be installed either to user profile or system-wide - (via <literal>environment.systemPackages</literal>). To make Qt 5 - applications look similar to GTK ones, you can use the following - configuration: - </para> - <programlisting language="nix"> -qt.enable = true; -qt.platformTheme = "gtk2"; -qt.style = "gtk2"; -</programlisting> - </section> - <section xml:id="custom-xkb-layouts"> - <title>Custom XKB layouts</title> - <para> - It is possible to install custom - <link xlink:href="https://en.wikipedia.org/wiki/X_keyboard_extension"> - XKB </link> keyboard layouts using the option - <literal>services.xserver.extraLayouts</literal>. - </para> - <para> - As a first example, we are going to create a layout based on the - basic US layout, with an additional layer to type some greek - symbols by pressing the right-alt key. - </para> - <para> - Create a file called <literal>us-greek</literal> with the - following content (under a directory called - <literal>symbols</literal>; it’s an XKB peculiarity that will help - with testing): - </para> - <programlisting language="nix"> -xkb_symbols "us-greek" -{ - include "us(basic)" // includes the base US keys - include "level3(ralt_switch)" // configures right alt as a third level switch - - key <LatA> { [ a, A, Greek_alpha ] }; - key <LatB> { [ b, B, Greek_beta ] }; - key <LatG> { [ g, G, Greek_gamma ] }; - key <LatD> { [ d, D, Greek_delta ] }; - key <LatZ> { [ z, Z, Greek_zeta ] }; -}; -</programlisting> - <para> - A minimal layout specification must include the following: - </para> - <programlisting language="nix"> -services.xserver.extraLayouts.us-greek = { - description = "US layout with alt-gr greek"; - languages = [ "eng" ]; - symbolsFile = /yourpath/symbols/us-greek; -}; -</programlisting> - <note> - <para> - The name (after <literal>extraLayouts.</literal>) should match - the one given to the <literal>xkb_symbols</literal> block. - </para> - </note> - <para> - 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 <emphasis role="strong">test - your layout before applying it</emphasis>: - </para> - <programlisting> -$ nix-shell -p xorg.xkbcomp -$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY -</programlisting> - <para> - You can inspect the predefined XKB files for examples: - </para> - <programlisting> -$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" -</programlisting> - <para> - Once the configuration is applied, and you did a logout/login - cycle, the layout should be ready to use. You can try it by e.g. - running <literal>setxkbmap us-greek</literal> and then type - <literal><alt>+a</literal> (it may not get applied in your - terminal straight away). To change the default, the usual - <literal>services.xserver.layout</literal> option can still be - used. - </para> - <para> - A layout can have several other components besides - <literal>xkb_symbols</literal>, for example we will define new - keycodes for some multimedia key and bind these to some symbol. - </para> - <para> - Use the <emphasis>xev</emphasis> utility from - <literal>pkgs.xorg.xev</literal> to find the codes of the keys of - interest, then create a <literal>media-key</literal> file to hold - the keycodes definitions - </para> - <programlisting language="nix"> -xkb_keycodes "media" -{ - <volUp> = 123; - <volDown> = 456; -} -</programlisting> - <para> - Now use the newly define keycodes in <literal>media-sym</literal>: - </para> - <programlisting language="nix"> -xkb_symbols "media" -{ - key.type = "ONE_LEVEL"; - key <volUp> { [ XF86AudioLowerVolume ] }; - key <volDown> { [ XF86AudioRaiseVolume ] }; -} -</programlisting> - <para> - As before, to install the layout do - </para> - <programlisting language="nix"> -services.xserver.extraLayouts.media = { - description = "Multimedia keys remapping"; - languages = [ "eng" ]; - symbolsFile = /path/to/media-key; - keycodesFile = /path/to/media-sym; -}; -</programlisting> - <note> - <para> - The function - <literal>pkgs.writeText <filename> <content></literal> - can be useful if you prefer to keep the layout definitions - inside the NixOS configuration. - </para> - </note> - <para> - 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 workaround, you can set the keymap using - <literal>setxkbmap</literal> at the start of the session with: - </para> - <programlisting language="nix"> -services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; -</programlisting> - <para> - If you are manually starting the X server, you should set the - argument <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X - won’t find your layout files. For example with - <literal>xinit</literal> run - </para> - <programlisting> -$ xinit -- -xkbdir /etc/X11/xkb -</programlisting> - <para> - To learn how to write layouts take a look at the XKB - <link xlink:href="https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts">documentation - </link>. More example layouts can also be found - <link xlink:href="https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples">here - </link>. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml deleted file mode 100644 index 7ec69b5e9b8ff..0000000000000 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ /dev/null @@ -1,69 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-xfce"> - <title>Xfce Desktop Environment</title> - <para> - To enable the Xfce Desktop Environment, set - </para> - <programlisting language="nix"> -services.xserver.desktopManager.xfce.enable = true; -services.xserver.displayManager.defaultSession = "xfce"; -</programlisting> - <para> - Optionally, <emphasis>picom</emphasis> can be enabled for nice - graphical effects, some example settings: - </para> - <programlisting language="nix"> -services.picom = { - enable = true; - fade = true; - inactiveOpacity = 0.9; - shadow = true; - fadeDelta = 4; -}; -</programlisting> - <para> - Some Xfce programs are not installed automatically. To install them - manually (system wide), put them into your - <xref linkend="opt-environment.systemPackages" /> from - <literal>pkgs.xfce</literal>. - </para> - <section xml:id="sec-xfce-thunar-plugins"> - <title>Thunar</title> - <para> - Thunar (the Xfce file manager) is automatically enabled when Xfce - is enabled. To enable Thunar without enabling Xfce, use the - configuration option <xref linkend="opt-programs.thunar.enable" /> - instead of simply adding <literal>pkgs.xfce.thunar</literal> to - <xref linkend="opt-environment.systemPackages" />. - </para> - <para> - If you’d like to add extra plugins to Thunar, add them to - <xref linkend="opt-programs.thunar.plugins" />. You shouldn’t just - add them to <xref linkend="opt-environment.systemPackages" />. - </para> - </section> - <section xml:id="sec-xfce-troubleshooting"> - <title>Troubleshooting</title> - <para> - Even after enabling udisks2, volume management might not work. - Thunar and/or the desktop takes time to show up. Thunar will spit - out this kind of message on start (look at - <literal>journalctl --user -b</literal>). - </para> - <programlisting> -Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported -</programlisting> - <para> - This is caused by some needed GNOME services not running. This is - all fixed by enabling <quote>Launch GNOME services on - startup</quote> in the Advanced tab of the Session and Startup - settings panel. Alternatively, you can run this command to do the - same thing. - </para> - <programlisting> -$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true -</programlisting> - <para> - A log-out and re-log will be needed for this to take effect. - </para> - </section> -</chapter> 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 deleted file mode 100644 index 99dc5ce30b4b1..0000000000000 --- a/nixos/doc/manual/from_md/contributing-to-this-manual.chapter.xml +++ /dev/null @@ -1,52 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-contributing"> - <title>Contributing to this manual</title> - <para> - The - <link xlink:href="https://en.wikipedia.org/wiki/DocBook">DocBook</link> - and CommonMark sources of the NixOS manual are in the - <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">nixos/doc/manual</link> - subdirectory of the - <link xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link> - repository. - </para> - <para> - You can quickly check your edits with the following: - </para> - <programlisting> -$ cd /path/to/nixpkgs -$ ./nixos/doc/manual/md-to-db.sh -$ nix-build nixos/release.nix -A manual.x86_64-linux -</programlisting> - <para> - If the build succeeds, the manual will be in - <literal>./result/share/doc/nixos/index.html</literal>. - </para> - <para> - <emphasis role="strong">Contributing to the man pages</emphasis> - </para> - <para> - The man pages are written in - <link xlink:href="https://en.wikipedia.org/wiki/DocBook">DocBook</link> - which is XML. - </para> - <para> - To see what your edits look like: - </para> - <programlisting> -$ cd /path/to/nixpkgs -$ nix-build nixos/release.nix -A manpages.x86_64-linux -</programlisting> - <para> - You can then read the man page you edited by running - </para> - <programlisting> -$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited -</programlisting> - <para> - If you’re on a different architecture that’s supported by NixOS - (check nixos/release.nix) then replace - <literal>x86_64-linux</literal> with the architecture. - <literal>nix-build</literal> will complain otherwise, but should - also tell you which architecture you have + the supported ones. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/development/activation-script.section.xml b/nixos/doc/manual/from_md/development/activation-script.section.xml deleted file mode 100644 index 429b45c93defc..0000000000000 --- a/nixos/doc/manual/from_md/development/activation-script.section.xml +++ /dev/null @@ -1,150 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-activation-script"> - <title>Activation script</title> - <para> - The activation script is a bash script called to activate the new - configuration which resides in a NixOS system in - <literal>$out/activate</literal>. Since its contents depend on your - system configuration, the contents may differ. This chapter explains - how the script works in general and some common NixOS snippets. - Please be aware that the script is executed on every boot and system - switch, so tasks that can be performed in other places should be - performed there (for example letting a directory of a service be - created by systemd using mechanisms like - <literal>StateDirectory</literal>, - <literal>CacheDirectory</literal>, … or if that’s not possible using - <literal>preStart</literal> of the service). - </para> - <para> - Activation scripts are defined as snippets using - <xref linkend="opt-system.activationScripts" />. They can either be - a simple multiline string or an attribute set that can depend on - other snippets. The builder for the activation script will take - these dependencies into account and order the snippets accordingly. - As a simple example: - </para> - <programlisting language="nix"> -system.activationScripts.my-activation-script = { - deps = [ "etc" ]; - # supportsDryActivation = true; - text = '' - echo "Hallo i bims" - ''; -}; -</programlisting> - <para> - This example creates an activation script snippet that is run after - the <literal>etc</literal> snippet. The special variable - <literal>supportsDryActivation</literal> can be set so the snippet - is also run when <literal>nixos-rebuild dry-activate</literal> is - run. To differentiate between real and dry activation, the - <literal>$NIXOS_ACTION</literal> environment variable can be read - which is set to <literal>dry-activate</literal> when a dry - activation is done. - </para> - <para> - An activation script can write to special files instructing - <literal>switch-to-configuration</literal> to restart/reload units. - The script will take these requests into account and will - incorporate the unit configuration as described above. This means - that the activation script will <quote>fake</quote> a modified unit - file and <literal>switch-to-configuration</literal> will act - accordingly. By doing so, configuration like - <link linkend="opt-systemd.services">systemd.services.<name>.restartIfChanged</link> - is respected. Since the activation script is run - <emphasis role="strong">after</emphasis> services are already - stopped, - <link linkend="opt-systemd.services">systemd.services.<name>.stopIfChanged</link> - cannot be taken into account anymore and the unit is always - restarted instead of being stopped and started afterwards. - </para> - <para> - The files that can be written to are - <literal>/run/nixos/activation-restart-list</literal> and - <literal>/run/nixos/activation-reload-list</literal> with their - respective counterparts for dry activation being - <literal>/run/nixos/dry-activation-restart-list</literal> and - <literal>/run/nixos/dry-activation-reload-list</literal>. 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 possibility into - account that they have to create them first. - </para> - <section xml:id="sec-activation-script-nixos-snippets"> - <title>NixOS snippets</title> - <para> - There are some snippets NixOS enables by default because disabling - them would most likely break your system. This section lists a few - of them and what they do: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>binsh</literal> creates <literal>/bin/sh</literal> - which points to the runtime shell - </para> - </listitem> - <listitem> - <para> - <literal>etc</literal> sets up the contents of - <literal>/etc</literal>, this includes systemd units and - excludes <literal>/etc/passwd</literal>, - <literal>/etc/group</literal>, and - <literal>/etc/shadow</literal> (which are managed by the - <literal>users</literal> snippet) - </para> - </listitem> - <listitem> - <para> - <literal>hostname</literal> sets the system’s hostname in the - kernel (not in <literal>/etc</literal>) - </para> - </listitem> - <listitem> - <para> - <literal>modprobe</literal> sets the path to the - <literal>modprobe</literal> binary for module auto-loading - </para> - </listitem> - <listitem> - <para> - <literal>nix</literal> prepares the nix store and adds a - default initial channel - </para> - </listitem> - <listitem> - <para> - <literal>specialfs</literal> is responsible for mounting - filesystems like <literal>/proc</literal> and - <literal>sys</literal> - </para> - </listitem> - <listitem> - <para> - <literal>users</literal> creates and removes users and groups - by managing <literal>/etc/passwd</literal>, - <literal>/etc/group</literal> and - <literal>/etc/shadow</literal>. This also creates home - directories - </para> - </listitem> - <listitem> - <para> - <literal>usrbinenv</literal> creates - <literal>/usr/bin/env</literal> - </para> - </listitem> - <listitem> - <para> - <literal>var</literal> creates some directories in - <literal>/var</literal> that are not service-specific - </para> - </listitem> - <listitem> - <para> - <literal>wrappers</literal> creates setuid wrappers like - <literal>ping</literal> and <literal>sudo</literal> - </para> - </listitem> - </itemizedlist> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/assertions.section.xml b/nixos/doc/manual/from_md/development/assertions.section.xml deleted file mode 100644 index 13f04d5d1883e..0000000000000 --- a/nixos/doc/manual/from_md/development/assertions.section.xml +++ /dev/null @@ -1,58 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-assertions"> - <title>Warnings and Assertions</title> - <para> - When configuration problems are detectable in a module, it is a good - idea to write an assertion or warning. Doing so provides clear - feedback to the user and prevents errors after the build. - </para> - <para> - Although Nix has the <literal>abort</literal> and - <literal>builtins.trace</literal> - <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> - to perform such tasks, they are not ideally suited for NixOS - modules. Instead of these functions, you can declare your warnings - and assertions using the NixOS module system. - </para> - <section xml:id="sec-assertions-warnings"> - <title>Warnings</title> - <para> - This is an example of using <literal>warnings</literal>. - </para> - <programlisting language="nix"> -{ config, lib, ... }: -{ - config = lib.mkIf config.services.foo.enable { - warnings = - if config.services.foo.bar - then [ ''You have enabled the bar feature of the foo service. - This is known to cause some specific problems in certain situations. - '' ] - else []; - } -} -</programlisting> - </section> - <section xml:id="sec-assertions-assetions"> - <title>Assertions</title> - <para> - This example, extracted from the - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix"><literal>syslogd</literal> - module</link> shows how to use <literal>assertions</literal>. - Since there can only be one active syslog daemon at a time, an - assertion is useful to prevent such a broken system from being - built. - </para> - <programlisting language="nix"> -{ config, lib, ... }: -{ - config = lib.mkIf config.services.syslogd.enable { - assertions = - [ { assertion = !config.services.rsyslogd.enable; - message = "rsyslogd conflicts with syslogd"; - } - ]; - } -} -</programlisting> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/bootspec.chapter.xml b/nixos/doc/manual/from_md/development/bootspec.chapter.xml deleted file mode 100644 index 9ecbe1d1beede..0000000000000 --- a/nixos/doc/manual/from_md/development/bootspec.chapter.xml +++ /dev/null @@ -1,73 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-experimental-bootspec"> - <title>Experimental feature: Bootspec</title> - <para> - Bootspec is a experimental feature, introduced in the - <link xlink:href="https://github.com/NixOS/rfcs/pull/125">RFC-0125 - proposal</link>, the reference implementation can be found - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/172237">there</link> - in order to standardize bootloader support and advanced boot - workflows such as SecureBoot and potentially more. - </para> - <para> - You can enable the creation of bootspec documents through - <link xlink:href="options.html#opt-boot.bootspec.enable"><literal>boot.bootspec.enable = true</literal></link>, - which will prompt a warning until - <link xlink:href="https://github.com/NixOS/rfcs/pull/125">RFC-0125</link> - is officially merged. - </para> - <section xml:id="sec-experimental-bootspec-schema"> - <title>Schema</title> - <para> - The bootspec schema is versioned and validated against - <link xlink:href="https://cuelang.org/">a CUE schema file</link> - which should considered as the source of truth for your - applications. - </para> - <para> - You will find the current version - <link xlink:href="../../../modules/system/activation/bootspec.cue">here</link>. - </para> - </section> - <section xml:id="sec-experimental-bootspec-extensions"> - <title>Extensions mechanism</title> - <para> - Bootspec cannot account for all usecases. - </para> - <para> - For this purpose, Bootspec offers a generic extension facility - <link xlink:href="options.html#opt-boot.bootspec.extensions"><literal>boot.bootspec.extensions</literal></link> - which can be used to inject any data needed for your usecases. - </para> - <para> - An example for SecureBoot is to get the Nix store path to - <literal>/etc/os-release</literal> in order to bake it into a - unified kernel image: - </para> - <programlisting language="nix"> -{ config, lib, ... }: { - boot.bootspec.extensions = { - "org.secureboot.osRelease" = config.environment.etc."os-release".source; - }; -} -</programlisting> - <para> - To reduce incompatibility and prevent names from clashing between - applications, it is <emphasis role="strong">highly - recommended</emphasis> to use a unique namespace for your - extensions. - </para> - </section> - <section xml:id="sec-experimental-bootspec-external-bootloaders"> - <title>External bootloaders</title> - <para> - It is possible to enable your own bootloader through - <link xlink:href="options.html#opt-boot.loader.external.installHook"><literal>boot.loader.external.installHook</literal></link> - which can wrap an existing bootloader. - </para> - <para> - 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. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/development/building-parts.chapter.xml b/nixos/doc/manual/from_md/development/building-parts.chapter.xml deleted file mode 100644 index 4df24cc956528..0000000000000 --- a/nixos/doc/manual/from_md/development/building-parts.chapter.xml +++ /dev/null @@ -1,124 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-parts"> - <title>Building Specific Parts of NixOS</title> - <para> - With the command <literal>nix-build</literal>, you can build - specific parts of your NixOS configuration. This is done as follows: - </para> - <programlisting> -$ cd /path/to/nixpkgs/nixos -$ nix-build -A config.option -</programlisting> - <para> - where <literal>option</literal> is a NixOS option with type - <quote>derivation</quote> (i.e. something that can be built). - Attributes of interest include: - </para> - <variablelist> - <varlistentry> - <term> - <literal>system.build.toplevel</literal> - </term> - <listitem> - <para> - The top-level option that builds the entire NixOS system. - Everything else in your configuration is indirectly pulled in - by this option. This is what <literal>nixos-rebuild</literal> - builds and what <literal>/run/current-system</literal> points - to afterwards. - </para> - <para> - A shortcut to build this is: - </para> - <programlisting> -$ nix-build -A system -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>system.build.manual.manualHTML</literal> - </term> - <listitem> - <para> - The NixOS manual. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>system.build.etc</literal> - </term> - <listitem> - <para> - A tree of symlinks that form the static parts of - <literal>/etc</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>system.build.initialRamdisk</literal> , - <literal>system.build.kernel</literal> - </term> - <listitem> - <para> - The initial ramdisk and kernel of the system. This allows a - quick way to test whether the kernel and the initial ramdisk - boot correctly, by using QEMU’s <literal>-kernel</literal> and - <literal>-initrd</literal> options: - </para> - <programlisting> -$ nix-build -A config.system.build.initialRamdisk -o initrd -$ nix-build -A config.system.build.kernel -o kernel -$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>system.build.nixos-rebuild</literal> , - <literal>system.build.nixos-install</literal> , - <literal>system.build.nixos-generate-config</literal> - </term> - <listitem> - <para> - These build the corresponding NixOS commands. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>systemd.units.unit-name.unit</literal> - </term> - <listitem> - <para> - This builds the unit with the specified name. Note that since - unit names contain dots (e.g. - <literal>httpd.service</literal>), you need to put them - between quotes, like this: - </para> - <programlisting> -$ nix-build -A 'config.systemd.units."httpd.service".unit' -</programlisting> - <para> - You can also test individual units, without rebuilding the - whole system, by putting them in - <literal>/run/systemd/system</literal>: - </para> - <programlisting> -$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ - /run/systemd/system/tmp-httpd.service -# systemctl daemon-reload -# systemctl start tmp-httpd.service -</programlisting> - <para> - Note that the unit must not have the same name as any unit in - <literal>/etc/systemd/system</literal> since those take - precedence over <literal>/run/systemd/system</literal>. That’s - why the unit is installed as - <literal>tmp-httpd.service</literal> here. - </para> - </listitem> - </varlistentry> - </variablelist> -</chapter> diff --git a/nixos/doc/manual/from_md/development/freeform-modules.section.xml b/nixos/doc/manual/from_md/development/freeform-modules.section.xml deleted file mode 100644 index c51bc76ff966e..0000000000000 --- a/nixos/doc/manual/from_md/development/freeform-modules.section.xml +++ /dev/null @@ -1,87 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-freeform-modules"> - <title>Freeform modules</title> - <para> - Freeform modules allow you to define values for option paths that - have not been declared explicitly. This can be used to add - attribute-specific types to what would otherwise have to be - <literal>attrsOf</literal> options in order to accept all attribute - names. - </para> - <para> - This feature can be enabled by using the attribute - <literal>freeformType</literal> to define a freeform type. By doing - this, all assignments without an associated option will be merged - using the freeform type and combined into the resulting - <literal>config</literal> set. Since this feature nullifies name - checking for entire option trees, it is only recommended for use in - submodules. - </para> - <anchor xml:id="ex-freeform-module" /> - <para> - <emphasis role="strong">Example: Freeform submodule</emphasis> - </para> - <para> - The following shows a submodule assigning a freeform type that - allows arbitrary attributes with <literal>str</literal> values below - <literal>settings</literal>, but also declares an option for the - <literal>settings.port</literal> attribute to have it type-checked - and assign a default value. See - <link linkend="ex-settings-typed-attrs">Example: Declaring a - type-checked <literal>settings</literal> attribute</link> for a more - complete example. - </para> - <programlisting language="nix"> -{ lib, config, ... }: { - - options.settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = with lib.types; attrsOf str; - - # We want this attribute to be checked for the correct type - options.port = lib.mkOption { - type = lib.types.port; - # Declaring the option also allows defining a default value - default = 8080; - }; - - }; - }; -} -</programlisting> - <para> - And the following shows what such a module then allows - </para> - <programlisting language="nix"> -{ - # Not a declared option, but the freeform type allows this - settings.logLevel = "debug"; - - # Not allowed because the the freeform type only allows strings - # settings.enable = true; - - # Allowed because there is a port option declared - settings.port = 80; - - # Not allowed because the port option doesn't allow strings - # settings.port = "443"; -} -</programlisting> - <note> - <para> - Freeform attributes cannot depend on other attributes of the same - set without infinite recursion: - </para> - <programlisting language="nix"> -{ - # This throws infinite recursion encountered - settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; -} -</programlisting> - <para> - To prevent this, declare options for all attributes that need to - depend on others. For above example this means to declare - <literal>logLevel</literal> to be an option. - </para> - </note> -</section> diff --git a/nixos/doc/manual/from_md/development/importing-modules.section.xml b/nixos/doc/manual/from_md/development/importing-modules.section.xml deleted file mode 100644 index 96e5e1bb16b88..0000000000000 --- a/nixos/doc/manual/from_md/development/importing-modules.section.xml +++ /dev/null @@ -1,47 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-importing-modules"> - <title>Importing Modules</title> - <para> - Sometimes NixOS modules need to be used in configuration but exist - outside of Nixpkgs. These modules can be imported: - </para> - <programlisting language="nix"> -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Use a locally-available module definition in - # ./example-module/default.nix - ./example-module - ]; - - services.exampleModule.enable = true; -} -</programlisting> - <para> - The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> - is an absolute path to a NixOS module that is included alongside the - Nixpkgs NixOS modules. Like any NixOS module, this module can import - additional modules: - </para> - <programlisting language="nix"> -# ./module-list/default.nix -[ - ./example-module1 - ./example-module2 -] -</programlisting> - <programlisting language="nix"> -# ./extra-module/default.nix -{ imports = import ./module-list.nix; } -</programlisting> - <programlisting language="nix"> -# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module -{ config, lib, pkgs, ... }: - -{ - # No `imports` needed - - services.exampleModule1.enable = true; -} -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml b/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml deleted file mode 100644 index 666bbec6162bc..0000000000000 --- a/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml +++ /dev/null @@ -1,10 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-linking-nixos-tests-to-packages"> - <title>Linking NixOS tests to packages</title> - <para> - You can link NixOS module tests to the packages that they exercised, - so that the tests can be run automatically during code review when - the package gets changed. This is - <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking">described - in the nixpkgs manual</link>. - </para> -</section> diff --git a/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/nixos/doc/manual/from_md/development/meta-attributes.section.xml deleted file mode 100644 index 450a5f670f3a8..0000000000000 --- a/nixos/doc/manual/from_md/development/meta-attributes.section.xml +++ /dev/null @@ -1,116 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-meta-attributes"> - <title>Meta Attributes</title> - <para> - Like Nix packages, NixOS modules can declare meta-attributes to - provide extra information. Module meta attributes are defined in the - <literal>meta.nix</literal> special module. - </para> - <para> - <literal>meta</literal> is a top level attribute like - <literal>options</literal> and <literal>config</literal>. Available - meta-attributes are <literal>maintainers</literal>, - <literal>doc</literal>, and <literal>buildDocsInSandbox</literal>. - </para> - <para> - Each of the meta-attributes must be defined at most once per module - file. - </para> - <programlisting language="nix"> -{ config, lib, pkgs, ... }: -{ - options = { - ... - }; - - config = { - ... - }; - - meta = { - maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; - buildDocsInSandbox = true; - }; -} -</programlisting> - <itemizedlist> - <listitem> - <para> - <literal>maintainers</literal> contains a list of the module - maintainers. - </para> - </listitem> - <listitem> - <para> - <literal>doc</literal> points to a valid DocBook file containing - the module documentation. Its contents is automatically added to - <xref linkend="ch-configuration" />. Changes to a module - documentation have to be checked to not break building the NixOS - manual: - </para> - <programlisting> -$ nix-build nixos/release.nix -A manual.x86_64-linux -</programlisting> - <para> - This file should <emphasis>not</emphasis> usually be written by - hand. Instead it is preferred to write documentation using - CommonMark and converting it to CommonMark using pandoc. The - simplest documentation can be converted using just - </para> - <programlisting> -$ pandoc doc.md -t docbook --top-level-division=chapter -f markdown+smart > doc.xml -</programlisting> - <para> - More elaborate documentation may wish to add one or more of the - pandoc filters used to build the remainder of the manual, for - example the GNOME desktop uses - </para> - <programlisting> -$ pandoc gnome.md -t docbook --top-level-division=chapter \ - --extract-media=media -f markdown+smart \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ - > gnome.xml -</programlisting> - </listitem> - <listitem> - <para> - <literal>buildDocsInSandbox</literal> indicates whether the - option documentation for the module can be built in a derivation - sandbox. This option is currently only honored for modules - shipped by nixpkgs. User modules and modules taken from - <literal>NIXOS_EXTRA_MODULE_PATH</literal> are always built - outside of the sandbox, as has been the case in previous - releases. - </para> - <para> - Building NixOS option documentation in a sandbox allows caching - of the built documentation, which greatly decreases the amount - of time needed to evaluate a system configuration that has NixOS - documentation enabled. The sandbox also restricts which - attributes may be referenced by documentation attributes (such - as option descriptions) to the <literal>options</literal> and - <literal>lib</literal> module arguments and the - <literal>pkgs.formats</literal> attribute of the - <literal>pkgs</literal> argument, <literal>config</literal> and - the rest of <literal>pkgs</literal> are disallowed and will - cause doc build failures when used. This restriction is - necessary because we cannot reproduce the full nixpkgs - instantiation with configuration and overlays from a system - configuration inside the sandbox. The <literal>options</literal> - argument only includes options of modules that are also built - inside the sandbox, referencing an option of a module that isn’t - built in the sandbox is also forbidden. - </para> - <para> - The default is <literal>true</literal> and should usually not be - changed; set it to <literal>false</literal> only if the module - requires access to <literal>pkgs</literal> in its documentation - (e.g. because it loads information from a linked package to - build an option type) or if its documentation depends on other - modules that also aren’t sandboxed (e.g. by using types defined - in the other module). - </para> - </listitem> - </itemizedlist> -</section> diff --git a/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml b/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml deleted file mode 100644 index b9ff2269676cf..0000000000000 --- a/nixos/doc/manual/from_md/development/nixos-tests.chapter.xml +++ /dev/null @@ -1,14 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-nixos-tests"> - <title>NixOS Tests</title> - <para> - When you add some feature to NixOS, you should write a test for it. - NixOS tests are kept in the directory - <literal>nixos/tests</literal>, and are executed (using Nix) by a - testing framework that automatically starts one or more virtual - machines containing the NixOS system(s) required for the test. - </para> - <xi:include href="writing-nixos-tests.section.xml" /> - <xi:include href="running-nixos-tests.section.xml" /> - <xi:include href="running-nixos-tests-interactively.section.xml" /> - <xi:include href="linking-nixos-tests-to-packages.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml deleted file mode 100644 index af05e61363e4b..0000000000000 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ /dev/null @@ -1,345 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-option-declarations"> - <title>Option Declarations</title> - <para> - An option declaration specifies the name, type and description of a - NixOS configuration option. It is invalid to define an option that - hasn’t been declared in any module. An option declaration generally - looks like this: - </para> - <programlisting language="nix"> -options = { - name = mkOption { - type = type specification; - default = default value; - example = example value; - description = lib.mdDoc "Description for use in the NixOS manual."; - }; -}; -</programlisting> - <para> - The attribute names within the <literal>name</literal> attribute - path must be camel cased in general but should, as an exception, - match the - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> - package attribute name</link> when referencing a Nixpkgs package. - For example, the option - <literal>services.nix-serve.bindAddress</literal> references the - <literal>nix-serve</literal> Nixpkgs package. - </para> - <para> - The function <literal>mkOption</literal> accepts the following - arguments. - </para> - <variablelist> - <varlistentry> - <term> - <literal>type</literal> - </term> - <listitem> - <para> - The type of the option (see - <xref linkend="sec-option-types" />). This argument is - mandatory for nixpkgs modules. Setting this is highly - recommended for the sake of documentation and type checking. - In case it is not set, a fallback type with unspecified - behavior is used. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>default</literal> - </term> - <listitem> - <para> - The default value used if no value is defined by any module. A - default is not required; but if a default is not given, then - users of the module will have to define the value of the - option, otherwise an error will be thrown. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>defaultText</literal> - </term> - <listitem> - <para> - A textual representation of the default value to be rendered - verbatim in the manual. Useful if the default value is a - complex expression or depends on other values or packages. Use - <literal>lib.literalExpression</literal> for a Nix expression, - <literal>lib.literalMD</literal> for a plain English - description in - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-contributing-markup">Nixpkgs-flavored - Markdown</link> format. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>example</literal> - </term> - <listitem> - <para> - An example value that will be shown in the NixOS manual. You - can use <literal>lib.literalExpression</literal> and - <literal>lib.literalMD</literal> in the same way as in - <literal>defaultText</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>description</literal> - </term> - <listitem> - <para> - A textual description of the option, in - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-contributing-markup">Nixpkgs-flavored - Markdown</link> format, that will be included in the NixOS - manual. During the migration process from DocBook it is - necessary to mark descriptions written in CommonMark with - <literal>lib.mdDoc</literal>. The description may still be - written in DocBook (without any marker), but this is - discouraged and will be deprecated in the future. - </para> - </listitem> - </varlistentry> - </variablelist> - <section xml:id="sec-option-declarations-util"> - <title>Utility functions for common option patterns</title> - <section xml:id="sec-option-declarations-util-mkEnableOption"> - <title><literal>mkEnableOption</literal></title> - <para> - Creates an Option attribute set for a boolean value option i.e - an option to be toggled on or off. - </para> - <para> - This function takes a single string argument, the name of the - thing to be toggled. - </para> - <para> - The option’s description is <quote>Whether to enable - <name>.</quote>. - </para> - <para> - For example: - </para> - <anchor xml:id="ex-options-declarations-util-mkEnableOption-magic" /> - <programlisting language="nix"> -lib.mkEnableOption (lib.mdDoc "magic") -# is like -lib.mkOption { - type = lib.types.bool; - default = false; - example = true; - description = lib.mdDoc "Whether to enable magic."; -} -</programlisting> - <section xml:id="sec-option-declarations-util-mkPackageOption"> - <title><literal>mkPackageOption</literal>, - <literal>mkPackageOptionMD</literal></title> - <para> - Usage: - </para> - <programlisting language="nix"> -mkPackageOption pkgs "name" { default = [ "path" "in" "pkgs" ]; example = "literal example"; } -</programlisting> - <para> - Creates an Option attribute set for an option that specifies - the package a module should use for some purpose. - </para> - <para> - <emphasis role="strong">Note</emphasis>: You shouldn’t - necessarily make package options for all of your modules. You - can always overwrite a specific package throughout nixpkgs by - using - <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#chap-overlays">nixpkgs - overlays</link>. - </para> - <para> - The default 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. - </para> - <para> - The second argument is the name of the option, used in the - description <quote>The <name> package to use.</quote>. - You can also pass an example value, either a literal string or - a package’s attribute path. - </para> - <para> - You can omit the default path if the name of the option is - also attribute path in nixpkgs. - </para> - <para> - During the transition to CommonMark documentation - <literal>mkPackageOption</literal> creates an option with a - DocBook description attribute, once the transition is - completed it will create a CommonMark description instead. - <literal>mkPackageOptionMD</literal> always creates an option - with a CommonMark description attribute and will be removed - some time after the transition is completed. - </para> - <anchor xml:id="ex-options-declarations-util-mkPackageOption" /> - <para> - Examples: - </para> - <anchor xml:id="ex-options-declarations-util-mkPackageOption-hello" /> - <programlisting language="nix"> -lib.mkPackageOptionMD pkgs "hello" { } -# is like -lib.mkOption { - type = lib.types.package; - default = pkgs.hello; - defaultText = lib.literalExpression "pkgs.hello"; - description = lib.mdDoc "The hello package to use."; -} -</programlisting> - <anchor xml:id="ex-options-declarations-util-mkPackageOption-ghc" /> - <programlisting language="nix"> -lib.mkPackageOptionMD pkgs "GHC" { - default = [ "ghc" ]; - example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; -} -# is like -lib.mkOption { - type = lib.types.package; - default = pkgs.ghc; - defaultText = lib.literalExpression "pkgs.ghc"; - example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; - description = lib.mdDoc "The GHC package to use."; -} -</programlisting> - <section xml:id="sec-option-declarations-eot"> - <title>Extensible Option Types</title> - <para> - Extensible option types is a feature that allow to extend - certain types declaration through multiple module files. - This feature only work with a restricted set of types, - namely <literal>enum</literal> and - <literal>submodules</literal> and any composed forms of - them. - </para> - <para> - Extensible option types can be used for - <literal>enum</literal> options that affects multiple - modules, or as an alternative to related - <literal>enable</literal> options. - </para> - <para> - 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 …). - </para> - <para> - There are two approaches we could take with this module - structure: - </para> - <itemizedlist> - <listitem> - <para> - Configuring the display managers independently by adding - an enable option to every display manager module - backend. (NixOS) - </para> - </listitem> - <listitem> - <para> - Configuring the display managers in the central module - by adding an option to select which display manager - backend to use. - </para> - </listitem> - </itemizedlist> - <para> - Both approaches have problems. - </para> - <para> - Making backends independent can quickly become hard to - manage. For display managers, there can only be one enabled - at a time, but the type system cannot enforce this - restriction as there is no relation between each backend’s - <literal>enable</literal> option. As a result, this - restriction has to be done explicitly by adding assertions - in each display manager backend module. - </para> - <para> - On the other hand, managing the display manager backends in - the central module will require changing the central module - option every time a new backend is added or removed. - </para> - <para> - By using extensible option types, it is possible to create a - placeholder option in the central module - (<link linkend="ex-option-declaration-eot-service">Example: - Extensible type placeholder in the service module</link>), - and to extend it in each backend module - (<link linkend="ex-option-declaration-eot-backend-gdm">Example: - Extending - <literal>services.xserver.displayManager.enable</literal> in - the <literal>gdm</literal> module</link>, - <link linkend="ex-option-declaration-eot-backend-sddm">Example: - Extending - <literal>services.xserver.displayManager.enable</literal> in - the <literal>sddm</literal> module</link>). - </para> - <para> - As a result, <literal>displayManager.enable</literal> option - values can be added without changing the main service module - file and the type system automatically enforces that there - can only be a single display manager enabled. - </para> - <anchor xml:id="ex-option-declaration-eot-service" /> - <para> - <emphasis role="strong">Example: Extensible type placeholder - in the service module</emphasis> - </para> - <programlisting language="nix"> -services.xserver.displayManager.enable = mkOption { - description = "Display manager to use"; - type = with types; nullOr (enum [ ]); -}; -</programlisting> - <anchor xml:id="ex-option-declaration-eot-backend-gdm" /> - <para> - <emphasis role="strong">Example: Extending - <literal>services.xserver.displayManager.enable</literal> in - the <literal>gdm</literal> module</emphasis> - </para> - <programlisting language="nix"> -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "gdm" ]); -}; -</programlisting> - <anchor xml:id="ex-option-declaration-eot-backend-sddm" /> - <para> - <emphasis role="strong">Example: Extending - <literal>services.xserver.displayManager.enable</literal> in - the <literal>sddm</literal> module</emphasis> - </para> - <programlisting language="nix"> -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "sddm" ]); -}; -</programlisting> - <para> - The placeholder declaration is a standard - <literal>mkOption</literal> declaration, but it is important - that extensible option declarations only use the - <literal>type</literal> argument. - </para> - <para> - Extensible option types work with any of the composed - variants of <literal>enum</literal> such as - <literal>with types; nullOr (enum [ "foo" "bar" ])</literal> - or - <literal>with types; listOf (enum [ "foo" "bar" ])</literal>. - </para> - </section> - </section> - </section> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/option-def.section.xml b/nixos/doc/manual/from_md/development/option-def.section.xml deleted file mode 100644 index 87b290ec39c66..0000000000000 --- a/nixos/doc/manual/from_md/development/option-def.section.xml +++ /dev/null @@ -1,132 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-option-definitions"> - <title>Option Definitions</title> - <para> - Option definitions are generally straight-forward bindings of values - to option names, like - </para> - <programlisting language="nix"> -config = { - services.httpd.enable = true; -}; -</programlisting> - <para> - However, sometimes you need to wrap an option definition or set of - option definitions in a <emphasis>property</emphasis> to achieve - certain effects: - </para> - <section xml:id="sec-option-definitions-delaying-conditionals"> - <title>Delaying Conditionals</title> - <para> - If a set of option definitions is conditional on the value of - another option, you may need to use <literal>mkIf</literal>. - Consider, for instance: - </para> - <programlisting language="nix"> -config = if config.services.httpd.enable then { - environment.systemPackages = [ ... ]; - ... -} else {}; -</programlisting> - <para> - This definition will cause Nix to fail with an <quote>infinite - recursion</quote> error. Why? Because the value of - <literal>config.services.httpd.enable</literal> depends on the - value being constructed here. After all, you could also write the - clearly circular and contradictory: - </para> - <programlisting language="nix"> -config = if config.services.httpd.enable then { - services.httpd.enable = false; -} else { - services.httpd.enable = true; -}; -</programlisting> - <para> - The solution is to write: - </para> - <programlisting language="nix"> -config = mkIf config.services.httpd.enable { - environment.systemPackages = [ ... ]; - ... -}; -</programlisting> - <para> - The special function <literal>mkIf</literal> causes the evaluation - of the conditional to be <quote>pushed down</quote> into the - individual definitions, as if you had written: - </para> - <programlisting language="nix"> -config = { - environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; - ... -}; -</programlisting> - </section> - <section xml:id="sec-option-definitions-setting-priorities"> - <title>Setting Priorities</title> - <para> - A module can override the definitions of an option in other - modules by setting an <emphasis>override priority</emphasis>. 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 <literal>mkOverride</literal>, e.g. - </para> - <programlisting language="nix"> -services.openssh.enable = mkOverride 10 false; -</programlisting> - <para> - This definition causes all other definitions with priorities above - 10 to be discarded. The function <literal>mkForce</literal> is - equal to <literal>mkOverride 50</literal>, and - <literal>mkDefault</literal> is equal to - <literal>mkOverride 1000</literal>. - </para> - </section> - <section xml:id="sec-option-definitions-ordering"> - <title>Ordering Definitions</title> - <para> - It is also possible to influence the order in which the - definitions for an option are merged by setting an <emphasis>order - priority</emphasis> with <literal>mkOrder</literal>. The default - order priority is 1000. The functions <literal>mkBefore</literal> - and <literal>mkAfter</literal> are equal to - <literal>mkOrder 500</literal> and - <literal>mkOrder 1500</literal>, respectively. As an example, - </para> - <programlisting language="nix"> -hardware.firmware = mkBefore [ myFirmware ]; -</programlisting> - <para> - This definition ensures that <literal>myFirmware</literal> comes - before other unordered definitions in the final list value of - <literal>hardware.firmware</literal>. - </para> - <para> - Note that this is different from - <link linkend="sec-option-definitions-setting-priorities">override - priorities</link>: setting an order does not affect whether the - definition is included or not. - </para> - </section> - <section xml:id="sec-option-definitions-merging"> - <title>Merging Configurations</title> - <para> - In conjunction with <literal>mkIf</literal>, it is sometimes - useful for a module to return multiple sets of option definitions, - to be merged together as if they were declared in separate - modules. This can be done using <literal>mkMerge</literal>: - </para> - <programlisting language="nix"> -config = mkMerge - [ # Unconditional stuff. - { environment.systemPackages = [ ... ]; - } - # Conditional stuff. - (mkIf config.services.bla.enable { - environment.systemPackages = [ ... ]; - }) - ]; -</programlisting> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml deleted file mode 100644 index 363399b086610..0000000000000 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ /dev/null @@ -1,1148 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-option-types"> - <title>Options Types</title> - <para> - Option types are a way to put constraints on the values a module - option can take. Types are also responsible of how values are merged - in case of multiple value definitions. - </para> - <section xml:id="sec-option-types-basic"> - <title>Basic types</title> - <para> - Basic types are the simplest available types in the module system. - Basic types include multiple string types that mainly differ in - how definition merging is handled. - </para> - <variablelist> - <varlistentry> - <term> - <literal>types.bool</literal> - </term> - <listitem> - <para> - A boolean, its values can be <literal>true</literal> or - <literal>false</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.path</literal> - </term> - <listitem> - <para> - A filesystem path is anything that starts with a slash when - coerced to a string. Even if derivations can be considered - as paths, the more specific <literal>types.package</literal> - should be preferred. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.package</literal> - </term> - <listitem> - <para> - A top-level store path. This can be an attribute set - pointing to a store path, like a derivation or a flake - input. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.enum</literal> - <emphasis><literal>l</literal></emphasis> - </term> - <listitem> - <para> - One element of the list - <emphasis><literal>l</literal></emphasis>, e.g. - <literal>types.enum [ "left" "right" ]</literal>. - Multiple definitions cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.anything</literal> - </term> - <listitem> - <para> - A type that accepts any value and recursively merges - attribute sets together. This type is recommended when the - option type is unknown. - </para> - <anchor xml:id="ex-types-anything" /> - <para> - <emphasis role="strong">Example: - <literal>types.anything</literal> Example</emphasis> - </para> - <para> - Two definitions of this type like - </para> - <programlisting language="nix"> -{ - str = lib.mkDefault "foo"; - pkg.hello = pkgs.hello; - fun.fun = x: x + 1; -} -</programlisting> - <programlisting language="nix"> -{ - str = lib.mkIf true "bar"; - pkg.gcc = pkgs.gcc; - fun.fun = lib.mkForce (x: x + 2); -} -</programlisting> - <para> - will get merged to - </para> - <programlisting language="nix"> -{ - str = "bar"; - pkg.gcc = pkgs.gcc; - pkg.hello = pkgs.hello; - fun.fun = x: x + 2; -} -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.raw</literal> - </term> - <listitem> - <para> - A type which doesn’t do any checking, merging or nested - evaluation. It accepts a single arbitrary value that is not - recursed into, making it useful for values coming from - outside the module system, such as package sets or arbitrary - data. Options of this type are still evaluated according to - priorities and conditionals, so <literal>mkForce</literal>, - <literal>mkIf</literal> and co. still work on the option - value itself, but not for any value nested within it. This - type should only be used when checking, merging and nested - evaluation are not desirable. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.optionType</literal> - </term> - <listitem> - <para> - The type of an option’s type. Its merging operation ensures - that nested options have the correct file location - annotated, and that if possible, multiple option definitions - are correctly merged together. The main use case is as the - type of the <literal>_module.freeformType</literal> option. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.attrs</literal> - </term> - <listitem> - <para> - A free-form attribute set. - </para> - <warning> - <para> - 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 - <literal>lib.mkDefault</literal>, - <literal>lib.mkIf</literal> and co. For allowing arbitrary - attribute sets, prefer - <literal>types.attrsOf types.anything</literal> instead - which doesn’t have these problems. - </para> - </warning> - </listitem> - </varlistentry> - </variablelist> - <section xml:id="sec-option-types-numeric"> - <title>Numeric types</title> - <variablelist> - <varlistentry> - <term> - <literal>types.int</literal> - </term> - <listitem> - <para> - A signed integer. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.ints.{s8, s16, s32}</literal> - </term> - <listitem> - <para> - Signed integers with a fixed length (8, 16 or 32 bits). - They go from −2^n/2 to 2^n/2−1 respectively (e.g. - <literal>−128</literal> to <literal>127</literal> for 8 - bits). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.ints.unsigned</literal> - </term> - <listitem> - <para> - An unsigned integer (that is >= 0). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.ints.{u8, u16, u32}</literal> - </term> - <listitem> - <para> - Unsigned integers with a fixed length (8, 16 or 32 bits). - They go from 0 to 2^n−1 respectively (e.g. - <literal>0</literal> to <literal>255</literal> for 8 - bits). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.ints.between</literal> - <emphasis><literal>lowest highest</literal></emphasis> - </term> - <listitem> - <para> - An integer between - <emphasis><literal>lowest</literal></emphasis> and - <emphasis><literal>highest</literal></emphasis> (both - inclusive). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.ints.positive</literal> - </term> - <listitem> - <para> - A positive integer (that is > 0). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.port</literal> - </term> - <listitem> - <para> - A port number. This type is an alias to - <literal>types.ints.u16</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.float</literal> - </term> - <listitem> - <para> - A floating point number. - </para> - <warning> - <para> - Converting a floating point number to a string with - <literal>toString</literal> or <literal>toJSON</literal> - may result in - <link xlink:href="https://github.com/NixOS/nix/issues/5733">precision - loss</link>. - </para> - </warning> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.number</literal> - </term> - <listitem> - <para> - Either a signed integer or a floating point number. No - implicit conversion is done between the two types, and - multiple equal definitions will only be merged if they - have the same type. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.numbers.between</literal> - <emphasis><literal>lowest highest</literal></emphasis> - </term> - <listitem> - <para> - An integer or floating point number between - <emphasis><literal>lowest</literal></emphasis> and - <emphasis><literal>highest</literal></emphasis> (both - inclusive). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.numbers.nonnegative</literal> - </term> - <listitem> - <para> - A nonnegative integer or floating point number (that is - >= 0). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.numbers.positive</literal> - </term> - <listitem> - <para> - A positive integer or floating point number (that is > - 0). - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - <section xml:id="sec-option-types-string"> - <title>String types</title> - <variablelist> - <varlistentry> - <term> - <literal>types.str</literal> - </term> - <listitem> - <para> - A string. Multiple definitions cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.separatedString</literal> - <emphasis><literal>sep</literal></emphasis> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with - <emphasis><literal>sep</literal></emphasis>, e.g. - <literal>types.separatedString "|"</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.lines</literal> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with a new - line <literal>"\n"</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.commas</literal> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with a - comma <literal>","</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.envVar</literal> - </term> - <listitem> - <para> - A string. Multiple definitions are concatenated with a - colon <literal>":"</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.strMatching</literal> - </term> - <listitem> - <para> - A string matching a specific regular expression. Multiple - definitions cannot be merged. The regular expression is - processed using <literal>builtins.match</literal>. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - </section> - <section xml:id="sec-option-types-submodule"> - <title>Submodule types</title> - <para> - Submodules are detailed in - <link linkend="section-option-types-submodule">Submodule</link>. - </para> - <variablelist> - <varlistentry> - <term> - <literal>types.submodule</literal> - <emphasis><literal>o</literal></emphasis> - </term> - <listitem> - <para> - A set of sub options - <emphasis><literal>o</literal></emphasis>. - <emphasis><literal>o</literal></emphasis> can be an - attribute set, a function returning an attribute set, or a - path to a file containing such a value. Submodules are used - in composed types to create modular options. This is - equivalent to - <literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.submoduleWith</literal> { - <emphasis><literal>modules</literal></emphasis>, - <emphasis><literal>specialArgs</literal></emphasis> ? {}, - <emphasis><literal>shorthandOnlyDefinesConfig</literal></emphasis> - ? false } - </term> - <listitem> - <para> - Like <literal>types.submodule</literal>, but more flexible - and with better defaults. It has parameters - </para> - <itemizedlist> - <listitem> - <para> - <emphasis><literal>modules</literal></emphasis> A list - of modules to use by default for this submodule type. - This gets combined with all option definitions to build - the final list of modules that will be included. - </para> - <note> - <para> - Only options defined with this argument are included - in rendered documentation. - </para> - </note> - </listitem> - <listitem> - <para> - <emphasis><literal>specialArgs</literal></emphasis> An - attribute set of extra arguments to be passed to the - module functions. The option - <literal>_module.args</literal> should be used instead - for most arguments since it allows overriding. - <emphasis><literal>specialArgs</literal></emphasis> - 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 - <literal>lib</literal> argument, because - <literal>lib</literal> itself is used to define - <literal>_module.args</literal>, which makes using - <literal>_module.args</literal> to define it impossible. - </para> - </listitem> - <listitem> - <para> - <emphasis><literal>shorthandOnlyDefinesConfig</literal></emphasis> - Whether definitions of this type should default to the - <literal>config</literal> section of a module (see - <link linkend="ex-module-syntax">Example: Structure of - NixOS Modules</link>) if it is an attribute set. - Enabling this only has a benefit when the submodule - defines an option named <literal>config</literal> or - <literal>options</literal>. In such a case it would - allow the option to be set with - <literal>the-submodule.config = "value"</literal> - instead of requiring - <literal>the-submodule.config.config = "value"</literal>. - This is because only when modules - <emphasis>don’t</emphasis> set the - <literal>config</literal> or <literal>options</literal> - keys, all keys are interpreted as option definitions in - the <literal>config</literal> section. Enabling this - option implicitly puts all attributes in the - <literal>config</literal> section. - </para> - <para> - With this option enabled, defining a - non-<literal>config</literal> section requires using a - function: - <literal>the-submodule = { ... }: { options = { ... }; }</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.deferredModule</literal> - </term> - <listitem> - <para> - Whereas <literal>submodule</literal> represents an option - tree, <literal>deferredModule</literal> represents a module - value, such as a module file or a configuration. - </para> - <para> - It can be set multiple times. - </para> - <para> - Module authors can use its value in - <literal>imports</literal>, in - <literal>submoduleWith</literal><quote>s - <literal>modules</literal> or in - <literal>evalModules</literal></quote> - <literal>modules</literal> parameter, among other places. - </para> - <para> - Note that <literal>imports</literal> must be evaluated - before the module fixpoint. Because of this, deferred - modules can only be imported into <quote>other</quote> - fixpoints, such as submodules. - </para> - <para> - One use case for this type is the type of a - <quote>default</quote> module that allow the user to affect - all submodules in an <literal>attrsOf submodule</literal> at - once. This is more convenient and discoverable than - expecting the module user to type-merge with the - <literal>attrsOf submodule</literal> option. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - <section xml:id="sec-option-types-composed"> - <title>Composed types</title> - <para> - Composed types are types that take a type as parameter. - <literal>listOf int</literal> and - <literal>either int str</literal> are examples of composed types. - </para> - <variablelist> - <varlistentry> - <term> - <literal>types.listOf</literal> - <emphasis><literal>t</literal></emphasis> - </term> - <listitem> - <para> - A list of <emphasis><literal>t</literal></emphasis> type, - e.g. <literal>types.listOf int</literal>. Multiple - definitions are merged with list concatenation. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.attrsOf</literal> - <emphasis><literal>t</literal></emphasis> - </term> - <listitem> - <para> - An attribute set of where all the values are of - <emphasis><literal>t</literal></emphasis> type. Multiple - definitions result in the joined attribute set. - </para> - <note> - <para> - This type is <emphasis>strict</emphasis> in its values, - which in turn means attributes cannot depend on other - attributes. See <literal> types.lazyAttrsOf</literal> for - a lazy version. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.lazyAttrsOf</literal> - <emphasis><literal>t</literal></emphasis> - </term> - <listitem> - <para> - An attribute set of where all the values are of - <emphasis><literal>t</literal></emphasis> type. Multiple - definitions result in the joined attribute set. This is the - lazy version of <literal>types.attrsOf </literal>, allowing - attributes to depend on each other. - </para> - <warning> - <para> - This version does not fully support conditional - definitions! With an option <literal>foo</literal> of this - type and a definition - <literal>foo.attr = lib.mkIf false 10</literal>, - evaluating <literal>foo ? attr</literal> will return - <literal>true</literal> even though it should be false. - Accessing the value will then throw an error. For types - <emphasis><literal>t</literal></emphasis> that have an - <literal>emptyValue</literal> defined, that value will be - returned instead of throwing an error. So if the type of - <literal>foo.attr</literal> was - <literal>lazyAttrsOf (nullOr int)</literal>, - <literal>null</literal> would be returned instead for the - same <literal>mkIf false</literal> definition. - </para> - </warning> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.nullOr</literal> - <emphasis><literal>t</literal></emphasis> - </term> - <listitem> - <para> - <literal>null</literal> or type - <emphasis><literal>t</literal></emphasis>. Multiple - definitions are merged according to type - <emphasis><literal>t</literal></emphasis>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.uniq</literal> - <emphasis><literal>t</literal></emphasis> - </term> - <listitem> - <para> - Ensures that type <emphasis><literal>t</literal></emphasis> - cannot be merged. It is used to ensure option definitions - are declared only once. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.unique</literal> - <literal>{ message = m }</literal> - <emphasis><literal>t</literal></emphasis> - </term> - <listitem> - <para> - Ensures that type <emphasis><literal>t</literal></emphasis> - cannot be merged. Prints the message - <emphasis><literal>m</literal></emphasis>, after the line - <literal>The option <option path> is defined multiple times.</literal> - and before a list of definition locations. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.either</literal> - <emphasis><literal>t1 t2</literal></emphasis> - </term> - <listitem> - <para> - Type <emphasis><literal>t1</literal></emphasis> or type - <emphasis><literal>t2</literal></emphasis>, e.g. - <literal>with types; either int str</literal>. Multiple - definitions cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.oneOf</literal> [ - <emphasis><literal>t1 t2</literal></emphasis> … ] - </term> - <listitem> - <para> - Type <emphasis><literal>t1</literal></emphasis> or type - <emphasis><literal>t2</literal></emphasis> and so forth, - e.g. <literal>with types; oneOf [ int str bool ]</literal>. - Multiple definitions cannot be merged. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>types.coercedTo</literal> - <emphasis><literal>from f to</literal></emphasis> - </term> - <listitem> - <para> - Type <emphasis><literal>to</literal></emphasis> or type - <emphasis><literal>from</literal></emphasis> which will be - coerced to type <emphasis><literal>to</literal></emphasis> - using function <emphasis><literal>f</literal></emphasis> - which takes an argument of type - <emphasis><literal>from</literal></emphasis> and return a - value of type <emphasis><literal>to</literal></emphasis>. - Can be used to preserve backwards compatibility of an option - if its type was changed. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - <section xml:id="section-option-types-submodule"> - <title>Submodule</title> - <para> - <literal>submodule</literal> is a very powerful type that defines - a set of sub-options that are handled like a separate module. - </para> - <para> - It takes a parameter <emphasis><literal>o</literal></emphasis>, - that should be a set, or a function returning a set with an - <literal>options</literal> key defining the sub-options. Submodule - option definitions are type-checked accordingly to the - <literal>options</literal> declarations. Of course, you can nest - submodule option definitions for even higher modularity. - </para> - <para> - The option set can be defined directly - (<link linkend="ex-submodule-direct">Example: Directly defined - submodule</link>) or as reference - (<link linkend="ex-submodule-reference">Example: Submodule defined - as a reference</link>). - </para> - <para> - Note that even if your submodule’s options all have a default - value, you will still need to provide a default value (e.g. an - empty attribute set) if you want to allow users to leave it - undefined. - </para> - <anchor xml:id="ex-submodule-direct" /> - <para> - <emphasis role="strong">Example: Directly defined - submodule</emphasis> - </para> - <programlisting language="nix"> -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }; -}; -</programlisting> - <anchor xml:id="ex-submodule-reference" /> - <para> - <emphasis role="strong">Example: Submodule defined as a - reference</emphasis> - </para> - <programlisting language="nix"> -let - modOptions = { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = int; - }; - }; - }; -in -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule modOptions; -}; -</programlisting> - <para> - The <literal>submodule</literal> type is especially interesting - when used with composed types like <literal>attrsOf</literal> or - <literal>listOf</literal>. When composed with - <literal>listOf</literal> - (<link linkend="ex-submodule-listof-declaration">Example: - Declaration of a list of submodules</link>), - <literal>submodule</literal> allows multiple definitions of the - submodule option set - (<link linkend="ex-submodule-listof-definition">Example: - Definition of a list of submodules</link>). - </para> - <anchor xml:id="ex-submodule-listof-declaration" /> - <para> - <emphasis role="strong">Example: Declaration of a list of - submodules</emphasis> - </para> - <programlisting language="nix"> -options.mod = mkOption { - description = "submodule example"; - type = with types; listOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -}; -</programlisting> - <anchor xml:id="ex-submodule-listof-definition" /> - <para> - <emphasis role="strong">Example: Definition of a list of - submodules</emphasis> - </para> - <programlisting language="nix"> -config.mod = [ - { foo = 1; bar = "one"; } - { foo = 2; bar = "two"; } -]; -</programlisting> - <para> - When composed with <literal>attrsOf</literal> - (<link linkend="ex-submodule-attrsof-declaration">Example: - Declaration of attribute sets of submodules</link>), - <literal>submodule</literal> allows multiple named definitions of - the submodule option set - (<link linkend="ex-submodule-attrsof-definition">Example: - Definition of attribute sets of submodules</link>). - </para> - <anchor xml:id="ex-submodule-attrsof-declaration" /> - <para> - <emphasis role="strong">Example: Declaration of attribute sets of - submodules</emphasis> - </para> - <programlisting language="nix"> -options.mod = mkOption { - description = "submodule example"; - type = with types; attrsOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -}; -</programlisting> - <anchor xml:id="ex-submodule-attrsof-definition" /> - <para> - <emphasis role="strong">Example: Definition of attribute sets of - submodules</emphasis> - </para> - <programlisting language="nix"> -config.mod.one = { foo = 1; bar = "one"; }; -config.mod.two = { foo = 2; bar = "two"; }; -</programlisting> - </section> - <section xml:id="sec-option-types-extending"> - <title>Extending types</title> - <para> - Types are mainly characterized by their <literal>check</literal> - and <literal>merge</literal> functions. - </para> - <variablelist> - <varlistentry> - <term> - <literal>check</literal> - </term> - <listitem> - <para> - The function to type check the value. Takes a value as - parameter and return a boolean. It is possible to extend a - type check with the <literal>addCheck</literal> function - (<link linkend="ex-extending-type-check-1">Example: Adding a - type check</link>), or to fully override the check function - (<link linkend="ex-extending-type-check-2">Example: - Overriding a type check</link>). - </para> - <anchor xml:id="ex-extending-type-check-1" /> - <para> - <emphasis role="strong">Example: Adding a type - check</emphasis> - </para> - <programlisting language="nix"> -byte = mkOption { - description = "An integer between 0 and 255."; - type = types.addCheck types.int (x: x >= 0 && x <= 255); -}; -</programlisting> - <anchor xml:id="ex-extending-type-check-2" /> - <para> - <emphasis role="strong">Example: Overriding a type - check</emphasis> - </para> - <programlisting language="nix"> -nixThings = mkOption { - description = "words that start with 'nix'"; - type = types.str // { - check = (x: lib.hasPrefix "nix" x) - }; -}; -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>merge</literal> - </term> - <listitem> - <para> - Function to merge the options values when multiple values - are set. The function takes two parameters, - <literal>loc</literal> the option path as a list of strings, - and <literal>defs</literal> the list of defined values as a - list. It is possible to override a type merge function for - custom needs. - </para> - </listitem> - </varlistentry> - </variablelist> - </section> - <section xml:id="sec-option-types-custom"> - <title>Custom types</title> - <para> - Custom types can be created with the - <literal>mkOptionType</literal> function. As type creation - includes some more complex topics such as submodule handling, it - is recommended to get familiar with <literal>types.nix</literal> - code before creating a new type. - </para> - <para> - The only required parameter is <literal>name</literal>. - </para> - <variablelist> - <varlistentry> - <term> - <literal>name</literal> - </term> - <listitem> - <para> - A string representation of the type function name. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>definition</literal> - </term> - <listitem> - <para> - Description of the type used in documentation. Give - information of the type and any of its arguments. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>check</literal> - </term> - <listitem> - <para> - A function to type check the definition value. Takes the - definition value as a parameter and returns a boolean - indicating the type check result, <literal>true</literal> - for success and <literal>false</literal> for failure. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>merge</literal> - </term> - <listitem> - <para> - A function to merge multiple definitions values. Takes two - parameters: - </para> - <variablelist> - <varlistentry> - <term> - <emphasis><literal>loc</literal></emphasis> - </term> - <listitem> - <para> - The option path as a list of strings, e.g. - <literal>["boot" "loader "grub" "enable"]</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <emphasis><literal>defs</literal></emphasis> - </term> - <listitem> - <para> - The list of sets of defined <literal>value</literal> - and <literal>file</literal> where the value was - defined, e.g. - <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]</literal>. - The <literal>merge</literal> function should return - the merged value or throw an error in case the values - are impossible or not meant to be merged. - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>getSubOptions</literal> - </term> - <listitem> - <para> - For composed types that can take a submodule as type - parameter, this function generate sub-options documentation. - It takes the current option prefix as a list and return the - set of sub-options. Usually defined in a recursive manner by - adding a term to the prefix, e.g. - <literal>prefix: elemType.getSubOptions (prefix ++ ["prefix"])</literal> - where - <emphasis><literal>"prefix"</literal></emphasis> - is the newly added prefix. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>getSubModules</literal> - </term> - <listitem> - <para> - For composed types that can take a submodule as type - parameter, this function should return the type parameters - submodules. If the type parameter is called - <literal>elemType</literal>, the function should just - recursively look into submodules by returning - <literal>elemType.getSubModules;</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>substSubModules</literal> - </term> - <listitem> - <para> - For composed types that can take a submodule as type - parameter, this function can be used to substitute the - parameter of a submodule type. It takes a module as - parameter and return the type with the submodule options - substituted. It is usually defined as a type function call - with a recursive call to <literal>substSubModules</literal>, - e.g for a type <literal>composedType</literal> that take an - <literal>elemtype</literal> type parameter, this function - should be defined as - <literal>m: composedType (elemType.substSubModules m)</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>typeMerge</literal> - </term> - <listitem> - <para> - A function to merge multiple type declarations. Takes the - type to merge <literal>functor</literal> as parameter. A - <literal>null</literal> return value means that type cannot - be merged. - </para> - <variablelist> - <varlistentry> - <term> - <emphasis><literal>f</literal></emphasis> - </term> - <listitem> - <para> - The type to merge <literal>functor</literal>. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - Note: There is a generic <literal>defaultTypeMerge</literal> - that work with most of value and composed types. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>functor</literal> - </term> - <listitem> - <para> - An attribute set representing the type. It is used for type - operations and has the following keys: - </para> - <variablelist> - <varlistentry> - <term> - <literal>type</literal> - </term> - <listitem> - <para> - The type function. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wrapped</literal> - </term> - <listitem> - <para> - Holds the type parameter for composed types. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>payload</literal> - </term> - <listitem> - <para> - Holds the value parameter for value types. The types - that have a <literal>payload</literal> are the - <literal>enum</literal>, - <literal>separatedString</literal> and - <literal>submodule</literal> types. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>binOp</literal> - </term> - <listitem> - <para> - A binary operation that can merge the payloads of two - same types. Defined as a function that take two - payloads as parameters and return the payloads merged. - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - </variablelist> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/replace-modules.section.xml b/nixos/doc/manual/from_md/development/replace-modules.section.xml deleted file mode 100644 index d8aaf59df366f..0000000000000 --- a/nixos/doc/manual/from_md/development/replace-modules.section.xml +++ /dev/null @@ -1,70 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-replace-modules"> - <title>Replace Modules</title> - <para> - 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 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. - </para> - <para> - <literal>disabledModules</literal> is a top level attribute like - <literal>imports</literal>, <literal>options</literal> and - <literal>config</literal>. It contains a list of modules that will - be disabled. This can either be the full path to the module or a - string with the filename relative to the modules path (eg. - <nixpkgs/nixos/modules> for nixos). - </para> - <para> - 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 - nixos-unstable unless explicitly configured to do so. - </para> - <programlisting language="nix"> -{ config, lib, pkgs, ... }: - -{ - disabledModules = [ "services/databases/postgresql.nix" ]; - - imports = - [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable - <nixos-unstable/nixos/modules/services/databases/postgresql.nix> - ]; - - services.postgresql.enable = true; -} -</programlisting> - <para> - 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 its implementation details. - </para> - <programlisting language="nix"> -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.man; -in - -{ - disabledModules = [ "services/programs/man.nix" ]; - - options = { - programs.man.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable manual pages."; - }; - }; - - config = mkIf cfg.enabled { - warnings = [ "disabled manpages for production deployments." ]; - }; -} -</programlisting> -</section> 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 deleted file mode 100644 index 16db709f8b917..0000000000000 --- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ /dev/null @@ -1,64 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-running-nixos-tests-interactively"> - <title>Running Tests interactively</title> - <para> - The test itself can be run interactively. This is particularly - useful when developing or debugging a test: - </para> - <programlisting> -$ nix-build . -A nixosTests.login.driverInteractive -$ ./result/bin/nixos-test-driver -[...] ->>> -</programlisting> - <para> - You can then take any Python statement, e.g. - </para> - <programlisting language="python"> ->>> start_all() ->>> test_script() ->>> machine.succeed("touch /tmp/foo") ->>> print(machine.succeed("pwd")) # Show stdout of command -</programlisting> - <para> - The function <literal>test_script</literal> executes the entire test - script and drops you 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). - </para> - <section xml:id="sec-nixos-test-reuse-vm-state"> - <title>Reuse VM state</title> - <para> - You can re-use the VM states coming from a previous run by setting - the <literal>--keep-vm-state</literal> flag. - </para> - <programlisting> -$ ./result/bin/nixos-test-driver --keep-vm-state -</programlisting> - <para> - The machine state is stored in the - <literal>$TMPDIR/vm-state-machinename</literal> directory. - </para> - </section> - <section xml:id="sec-nixos-test-interactive-configuration"> - <title>Interactive-only test configuration</title> - <para> - The <literal>.driverInteractive</literal> attribute combines the - regular test configuration with definitions from the - <link linkend="test-opt-interactive"><literal>interactive</literal> - submodule</link>. This gives you a more usable, graphical, but - slightly different configuration. - </para> - <para> - You can add your own interactive-only test configuration by adding - extra configuration to the - <link linkend="test-opt-interactive"><literal>interactive</literal> - submodule</link>. - </para> - <para> - To interactively run only the regular configuration, build the - <literal><test>.driver</literal> attribute instead, and call - it with the flag - <literal>result/bin/nixos-test-driver --interactive</literal>. - </para> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml deleted file mode 100644 index 23abb546899f2..0000000000000 --- a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml +++ /dev/null @@ -1,23 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-running-nixos-tests"> - <title>Running Tests</title> - <para> - You can run tests using <literal>nix-build</literal>. For example, - to run the test - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>, - you do: - </para> - <programlisting> -$ cd /my/git/clone/of/nixpkgs -$ nix-build -A nixosTests.login -</programlisting> - <para> - After building/downloading all required dependencies, this will - perform a build that starts a QEMU/KVM virtual machine containing a - NixOS system. The virtual machine mounts the Nix store of the host; - this makes VM creation very fast, as no disk image needs to be - created. Afterwards, you can view a log of the test: - </para> - <programlisting> -$ nix-store --read-log result -</programlisting> -</section> diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml deleted file mode 100644 index 898cd3b2b6e97..0000000000000 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ /dev/null @@ -1,420 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-settings-options"> - <title>Options for Program Settings</title> - <para> - Many programs have configuration files where program-specific - settings can be declared. File formats can be separated into two - categories: - </para> - <itemizedlist> - <listitem> - <para> - Nix-representable ones: These can trivially be mapped to a - subset of Nix syntax. E.g. JSON is an example, since its values - like <literal>{"foo":{"bar":10}}</literal> - can be mapped directly to Nix: - <literal>{ foo = { bar = 10; }; }</literal>. Other examples are - INI, YAML and TOML. The following section explains the - convention for these settings. - </para> - </listitem> - <listitem> - <para> - 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 - <literal>if true; then echo hi; fi</literal> doesn’t have a - trivial representation in Nix. - </para> - <para> - Currently there are no fixed conventions for these, but it is - common to have a <literal>configFile</literal> option for - setting the configuration file path directly. The default value - of <literal>configFile</literal> can be an auto-generated file, - with convenient options for controlling the contents. For - example an option of type <literal>attrsOf str</literal> can be - used for representing environment variables which generates a - section like <literal>export FOO="foo"</literal>. - Often it can also be useful to also include an - <literal>extraConfig</literal> option of type - <literal>lines</literal> to allow arbitrary text after the - autogenerated part of the file. - </para> - </listitem> - </itemizedlist> - <section xml:id="sec-settings-nix-representable"> - <title>Nix-representable Formats (JSON, YAML, TOML, INI, …)</title> - <para> - By convention, formats like this are handled with a generic - <literal>settings</literal> option, representing the full program - configuration as a Nix value. The type of this option should - represent the format. The most common formats have a predefined - type and string generator already declared under - <literal>pkgs.formats</literal>: - </para> - <variablelist> - <varlistentry> - <term> - <literal>pkgs.formats.javaProperties</literal> { - <emphasis><literal>comment</literal></emphasis> ? - <literal>"Generated with Nix"</literal> } - </term> - <listitem> - <para> - A function taking an attribute set with values - </para> - <variablelist> - <varlistentry> - <term> - <literal>comment</literal> - </term> - <listitem> - <para> - A string to put at the start of the file in a comment. - It can have multiple lines. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - It returns the <literal>type</literal>: - <literal>attrsOf str</literal> and a function - <literal>generate</literal> to build a Java - <literal>.properties</literal> file, taking care of the - correct escaping, etc. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>pkgs.formats.json</literal> { } - </term> - <listitem> - <para> - A function taking an empty attribute set (for future - extensibility) and returning a set with JSON-specific - attributes <literal>type</literal> and - <literal>generate</literal> as specified - <link linkend="pkgs-formats-result">below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>pkgs.formats.yaml</literal> { } - </term> - <listitem> - <para> - A function taking an empty attribute set (for future - extensibility) and returning a set with YAML-specific - attributes <literal>type</literal> and - <literal>generate</literal> as specified - <link linkend="pkgs-formats-result">below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>pkgs.formats.ini</literal> { - <emphasis><literal>listsAsDuplicateKeys</literal></emphasis> ? - false, <emphasis><literal>listToValue</literal></emphasis> ? - null, ... } - </term> - <listitem> - <para> - A function taking an attribute set with values - </para> - <variablelist> - <varlistentry> - <term> - <literal>listsAsDuplicateKeys</literal> - </term> - <listitem> - <para> - A boolean for controlling whether list values can be - used to represent duplicate INI keys - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>listToValue</literal> - </term> - <listitem> - <para> - A function for turning a list of values into a single - value. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - It returns a set with INI-specific attributes - <literal>type</literal> and <literal>generate</literal> as - specified <link linkend="pkgs-formats-result">below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>pkgs.formats.toml</literal> { } - </term> - <listitem> - <para> - A function taking an empty attribute set (for future - extensibility) and returning a set with TOML-specific - attributes <literal>type</literal> and - <literal>generate</literal> as specified - <link linkend="pkgs-formats-result">below</link>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>pkgs.formats.elixirConf { elixir ? pkgs.elixir }</literal> - </term> - <listitem> - <para> - A function taking an attribute set with values - </para> - <variablelist> - <varlistentry> - <term> - <literal>elixir</literal> - </term> - <listitem> - <para> - The Elixir package which will be used to format the - generated output - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - It returns a set with Elixir-Config-specific attributes - <literal>type</literal>, <literal>lib</literal>, and - <literal>generate</literal> as specified - <link linkend="pkgs-formats-result">below</link>. - </para> - <para> - The <literal>lib</literal> attribute contains functions to - be used in settings, for generating special Elixir values: - </para> - <variablelist> - <varlistentry> - <term> - <literal>mkRaw elixirCode</literal> - </term> - <listitem> - <para> - Outputs the given string as raw Elixir code - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>mkGetEnv { envVariable, fallback ? null }</literal> - </term> - <listitem> - <para> - Makes the configuration fetch an environment variable - at runtime - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>mkAtom atom</literal> - </term> - <listitem> - <para> - Outputs the given string as an Elixir atom, instead of - the default Elixir binary string. Note: lowercase - atoms still needs to be prefixed with - <literal>:</literal> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>mkTuple array</literal> - </term> - <listitem> - <para> - Outputs the given array as an Elixir tuple, instead of - the default Elixir list - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>mkMap attrset</literal> - </term> - <listitem> - <para> - Outputs the given attribute set as an Elixir map, - instead of the default Elixir keyword list - </para> - </listitem> - </varlistentry> - </variablelist> - </listitem> - </varlistentry> - </variablelist> - <para xml:id="pkgs-formats-result"> - These functions all return an attribute set with these values: - </para> - <variablelist> - <varlistentry> - <term> - <literal>type</literal> - </term> - <listitem> - <para> - A module system type representing a value of the format - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>lib</literal> - </term> - <listitem> - <para> - Utility functions for convenience, or special interactions - with the format. This attribute is optional. It may contain - inside a <literal>types</literal> attribute containing types - specific to this format. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>generate</literal> - <emphasis><literal>filename jsonValue</literal></emphasis> - </term> - <listitem> - <para> - A function that can render a value of the format to a file. - Returns a file path. - </para> - <note> - <para> - This function puts the value contents in the Nix store. So - this should be avoided for secrets. - </para> - </note> - </listitem> - </varlistentry> - </variablelist> - <anchor xml:id="ex-settings-nix-representable" /> - <para> - <emphasis role="strong">Example: Module with conventional - <literal>settings</literal> option</emphasis> - </para> - <para> - The following shows a module for an example program that uses a - JSON configuration file. It demonstrates how above values can be - used, along with some other related best practices. See the - comments for explanations. - </para> - <programlisting language="nix"> -{ options, config, lib, pkgs, ... }: -let - cfg = config.services.foo; - # Define the settings format used for this program - settingsFormat = pkgs.formats.json {}; -in { - - options.services.foo = { - enable = lib.mkEnableOption "foo service"; - - settings = lib.mkOption { - # Setting this type allows for correct merging behavior - type = settingsFormat.type; - default = {}; - description = '' - Configuration for foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported settings. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - # We can assign some default settings here to make the service work by just - # enabling it. We use `mkDefault` for values that can be changed without - # problems - services.foo.settings = { - # Fails at runtime without any value set - log_level = lib.mkDefault "WARN"; - - # We assume systemd's `StateDirectory` is used, so we require this value, - # therefore no mkDefault - data_path = "/var/lib/foo"; - - # Since we use this to create a user we need to know the default value at - # eval time - user = lib.mkDefault "foo"; - }; - - environment.etc."foo.json".source = - # The formats generator function takes a filename and the Nix value - # representing the format value and produces a filepath with that value - # rendered in the format - settingsFormat.generate "foo-config.json" cfg.settings; - - # We know that the `user` attribute exists because we set a default value - # for it above, allowing us to use it without worries here - users.users.${cfg.settings.user} = { isSystemUser = true; }; - - # ... - }; -} -</programlisting> - <section xml:id="sec-settings-attrs-options"> - <title>Option declarations for attributes</title> - <para> - Some <literal>settings</literal> attributes may deserve some - extra care. They may need a different type, default or merging - behavior, or they are essential options that should show their - documentation in the manual. This can be done using - <xref linkend="sec-freeform-modules" />. - </para> - <para> - We extend above example using freeform modules to declare an - option for the port, which will enforce it to be a valid integer - and make it show up in the manual. - </para> - <anchor xml:id="ex-settings-typed-attrs" /> - <para> - <emphasis role="strong">Example: Declaring a type-checked - <literal>settings</literal> attribute</emphasis> - </para> - <programlisting language="nix"> -settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = settingsFormat.type; - - # Declare an option for the port such that the type is checked and this option - # is shown in the manual. - options.port = lib.mkOption { - type = lib.types.port; - default = 8080; - description = '' - Which port this service should listen on. - ''; - }; - - }; - default = {}; - description = '' - Configuration for Foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported values. - ''; -}; -</programlisting> - </section> - </section> -</section> diff --git a/nixos/doc/manual/from_md/development/sources.chapter.xml b/nixos/doc/manual/from_md/development/sources.chapter.xml deleted file mode 100644 index aac18c9d06c8b..0000000000000 --- a/nixos/doc/manual/from_md/development/sources.chapter.xml +++ /dev/null @@ -1,90 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-getting-sources"> - <title>Getting the Sources</title> - <para> - By default, NixOS’s <literal>nixos-rebuild</literal> command uses - the NixOS and Nixpkgs sources provided by the - <literal>nixos</literal> channel (kept in - <literal>/nix/var/nix/profiles/per-user/root/channels/nixos</literal>). - To modify NixOS, however, you should check out the latest sources - from Git. This is as follows: - </para> - <programlisting> -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs -$ git remote update origin -</programlisting> - <para> - This will check out the latest Nixpkgs sources to - <literal>./nixpkgs</literal> the NixOS sources to - <literal>./nixpkgs/nixos</literal>. (The NixOS source tree lives in - a subdirectory of the Nixpkgs repository.) The - <literal>nixpkgs</literal> repository has branches that correspond - to each Nixpkgs/NixOS channel (see <xref linkend="sec-upgrading" /> - for more information about channels). Thus, the Git branch - <literal>origin/nixos-17.03</literal> will contain the latest built - and tested version available in the <literal>nixos-17.03</literal> - channel. - </para> - <para> - It’s often inconvenient to develop directly on the master branch, - since if somebody has just committed (say) a change to GCC, then the - binary cache may not have caught up yet and you’ll have to rebuild - everything from source. So you may want to create a local branch - based on your current NixOS version: - </para> - <programlisting> -$ nixos-version -17.09pre104379.6e0b727 (Hummingbird) - -$ git checkout -b local 6e0b727 -</programlisting> - <para> - Or, to base your local branch on the latest version available in a - NixOS channel: - </para> - <programlisting> -$ git remote update origin -$ git checkout -b local origin/nixos-17.03 -</programlisting> - <para> - (Replace <literal>nixos-17.03</literal> with the name of the channel - you want to use.) You can use <literal>git merge</literal> or - <literal>git rebase</literal> to keep your local branch in sync with - the channel, e.g. - </para> - <programlisting> -$ git remote update origin -$ git merge origin/nixos-17.03 -</programlisting> - <para> - You can use <literal>git cherry-pick</literal> to copy commits from - your local branch to the upstream branch. - </para> - <para> - If you want to rebuild your system using your (modified) sources, - you need to tell <literal>nixos-rebuild</literal> about them using - the <literal>-I</literal> flag: - </para> - <programlisting> -# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs -</programlisting> - <para> - If you want <literal>nix-env</literal> to use the expressions in - <literal>/my/sources</literal>, use - <literal>nix-env -f /my/sources/nixpkgs</literal>, or change the - default by adding a symlink in <literal>~/.nix-defexpr</literal>: - </para> - <programlisting> -$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs -</programlisting> - <para> - You may want to delete the symlink - <literal>~/.nix-defexpr/channels_root</literal> to prevent root’s - NixOS channel from clashing with your own tree (this may break the - command-not-found utility though). If you want to go back to the - default state, you may just remove the - <literal>~/.nix-defexpr</literal> directory completely, log out and - log in again and it should have been recreated with a link to the - root channels. - </para> -</chapter> diff --git a/nixos/doc/manual/from_md/development/testing-installer.chapter.xml b/nixos/doc/manual/from_md/development/testing-installer.chapter.xml deleted file mode 100644 index 286d49f3c2910..0000000000000 --- a/nixos/doc/manual/from_md/development/testing-installer.chapter.xml +++ /dev/null @@ -1,22 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ch-testing-installer"> - <title>Testing the Installer</title> - <para> - Building, burning, and booting from an installation CD is rather - tedious, so here is a quick way to see if the installer works - properly: - </para> - <programlisting> -# mount -t tmpfs none /mnt -# nixos-generate-config --root /mnt -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install -# ./result/bin/nixos-install -</programlisting> - <para> - To start a login shell in the new NixOS installation in - <literal>/mnt</literal>: - </para> - <programlisting> -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter -# ./result/bin/nixos-enter -</programlisting> -</chapter> diff --git a/nixos/doc/manual/from_md/development/unit-handling.section.xml b/nixos/doc/manual/from_md/development/unit-handling.section.xml deleted file mode 100644 index 4c980e1213a83..0000000000000 --- a/nixos/doc/manual/from_md/development/unit-handling.section.xml +++ /dev/null @@ -1,131 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-unit-handling"> - <title>Unit handling</title> - <para> - To figure out what units need to be - started/stopped/restarted/reloaded, the script first checks the - current state of the system, similar to what - <literal>systemctl list-units</literal> shows. For each of the - units, the script goes through the following checks: - </para> - <itemizedlist> - <listitem> - <para> - Is the unit file still in the new system? If not, - <emphasis role="strong">stop</emphasis> the service unless it - sets <literal>X-StopOnRemoval</literal> in the - <literal>[Unit]</literal> section to <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - Is it a <literal>.target</literal> unit? If so, - <emphasis role="strong">start</emphasis> it unless it sets - <literal>RefuseManualStart</literal> in the - <literal>[Unit]</literal> section to <literal>true</literal> or - <literal>X-OnlyManualStart</literal> in the - <literal>[Unit]</literal> section to <literal>true</literal>. - Also <emphasis role="strong">stop</emphasis> the unit again - unless it sets <literal>X-StopOnReconfiguration</literal> to - <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - Are the contents of the unit files different? They are compared - by parsing them and comparing their contents. If they are - different but only <literal>X-Reload-Triggers</literal> in the - <literal>[Unit]</literal> section is changed, - <emphasis role="strong">reload</emphasis> the unit. The NixOS - module system allows setting these triggers with the option - <link linkend="opt-systemd.services">systemd.services.<name>.reloadTriggers</link>. - There are some additional keys in the <literal>[Unit]</literal> - section that are ignored as well. If the unit files differ in - any way, the following actions are performed: - </para> - <itemizedlist> - <listitem> - <para> - <literal>.path</literal> and <literal>.slice</literal> units - are ignored. There is no need to restart them since changes - in their values are applied by systemd when systemd is - reloaded. - </para> - </listitem> - <listitem> - <para> - <literal>.mount</literal> units are - <emphasis role="strong">reload</emphasis>ed. These mostly - come from the <literal>/etc/fstab</literal> parser. - </para> - </listitem> - <listitem> - <para> - <literal>.socket</literal> units are currently ignored. This - is to be fixed at a later point. - </para> - </listitem> - <listitem> - <para> - The rest of the units (mostly <literal>.service</literal> - units) are then <emphasis role="strong">reload</emphasis>ed - if <literal>X-ReloadIfChanged</literal> in the - <literal>[Service]</literal> section is set to - <literal>true</literal> (exposed via - <link linkend="opt-systemd.services">systemd.services.<name>.reloadIfChanged</link>). - A little exception is done for units that were deactivated - in the meantime, for example because they require a unit - that got stopped before. These are - <emphasis role="strong">start</emphasis>ed instead of - reloaded. - </para> - </listitem> - <listitem> - <para> - If the reload flag is not set, some more flags decide if the - unit is skipped. These flags are - <literal>X-RestartIfChanged</literal> in the - <literal>[Service]</literal> section (exposed via - <link linkend="opt-systemd.services">systemd.services.<name>.restartIfChanged</link>), - <literal>RefuseManualStop</literal> in the - <literal>[Unit]</literal> section, and - <literal>X-OnlyManualStart</literal> in the - <literal>[Unit]</literal> section. - </para> - </listitem> - <listitem> - <para> - Further behavior depends on the unit having - <literal>X-StopIfChanged</literal> in the - <literal>[Service]</literal> section set to - <literal>true</literal> (exposed via - <link linkend="opt-systemd.services">systemd.services.<name>.stopIfChanged</link>). - This is set to <literal>true</literal> by default and must - be explicitly turned off if not wanted. If the flag is - enabled, the unit is - <emphasis role="strong">stop</emphasis>ped and then - <emphasis role="strong">start</emphasis>ed. If not, the unit - is <emphasis role="strong">restart</emphasis>ed. The goal of - the flag is to make sure that the new unit never runs in the - old environment which is still in place before the - activation script is run. This behavior is different when - the service is socket-activated, as outlined in the - following steps. - </para> - </listitem> - <listitem> - <para> - The last thing that is taken into account is whether the - unit is a service and socket-activated. If - <literal>X-StopIfChanged</literal> is - <emphasis role="strong">not</emphasis> set, the service is - <emphasis role="strong">restart</emphasis>ed with the - others. If it is set, both the service and the socket are - <emphasis role="strong">stop</emphasis>ped and the socket is - <emphasis role="strong">start</emphasis>ed, leaving socket - activation to start the service when it’s needed. - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> -</section> diff --git a/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml b/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml deleted file mode 100644 index 66ba792ddacb4..0000000000000 --- a/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml +++ /dev/null @@ -1,122 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-switching-systems"> - <title>What happens during a system switch?</title> - <para> - Running <literal>nixos-rebuild switch</literal> is one of the more - common tasks under NixOS. This chapter explains some of the - internals of this command to make it simpler for new module - developers to configure their units correctly and to make it easier - to understand what is happening and why for curious administrators. - </para> - <para> - <literal>nixos-rebuild</literal>, like many deployment solutions, - calls <literal>switch-to-configuration</literal> which resides in a - NixOS system at <literal>$out/bin/switch-to-configuration</literal>. - The script is called with the action that is to be performed like - <literal>switch</literal>, <literal>test</literal>, - <literal>boot</literal>. There is also the - <literal>dry-activate</literal> action which does not really perform - the actions but rather prints what it would do if you called it with - <literal>test</literal>. This feature can be used to check what - service states would be changed if the configuration was switched - to. - </para> - <para> - If the action is <literal>switch</literal> or - <literal>boot</literal>, the bootloader is updated first so the - configuration will be the next one to boot. Unless - <literal>NIXOS_NO_SYNC</literal> is set to <literal>1</literal>, - <literal>/nix/store</literal> is synced to disk. - </para> - <para> - If the action is <literal>switch</literal> or - <literal>test</literal>, the currently running system is inspected - and the actions to switch to the new system are calculated. This - process takes two data sources into account: - <literal>/etc/fstab</literal> and the current systemd status. Mounts - and swaps are read from <literal>/etc/fstab</literal> and the - corresponding actions are generated. If a new mount is added, for - example, the proper <literal>.mount</literal> unit is marked to be - started. The current systemd state is inspected, the difference - between the current system and the desired configuration is - calculated and actions are generated to get to this state. There are - a lot of nuances that can be controlled by the units which are - explained here. - </para> - <para> - After calculating what should be done, the actions are carried out. - The order of actions is always the same: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Stop units (<literal>systemctl stop</literal>) - </para> - </listitem> - <listitem> - <para> - Run activation script (<literal>$out/activate</literal>) - </para> - </listitem> - <listitem> - <para> - See if the activation script requested more units to restart - </para> - </listitem> - <listitem> - <para> - Restart systemd if needed - (<literal>systemd daemon-reexec</literal>) - </para> - </listitem> - <listitem> - <para> - Forget about the failed state of units - (<literal>systemctl reset-failed</literal>) - </para> - </listitem> - <listitem> - <para> - Reload systemd (<literal>systemctl daemon-reload</literal>) - </para> - </listitem> - <listitem> - <para> - Reload systemd user instances - (<literal>systemctl --user daemon-reload</literal>) - </para> - </listitem> - <listitem> - <para> - Set up tmpfiles (<literal>systemd-tmpfiles --create</literal>) - </para> - </listitem> - <listitem> - <para> - Reload units (<literal>systemctl reload</literal>) - </para> - </listitem> - <listitem> - <para> - Restart units (<literal>systemctl restart</literal>) - </para> - </listitem> - <listitem> - <para> - Start units (<literal>systemctl start</literal>) - </para> - </listitem> - <listitem> - <para> - Inspect what changed during these actions and print units that - failed and that were newly started - </para> - </listitem> - </itemizedlist> - <para> - Most of these actions are either self-explaining but some of them - have to do with our units or the activation script. For this reason, - these topics are explained in the next sections. - </para> - <xi:include href="unit-handling.section.xml" /> - <xi:include href="activation-script.section.xml" /> -</chapter> diff --git a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml deleted file mode 100644 index 0d8a33df2069a..0000000000000 --- a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml +++ /dev/null @@ -1,144 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-writing-documentation"> - <title>Writing NixOS Documentation</title> - <para> - As NixOS grows, so too does the need for a catalogue and explanation - of its extensive functionality. Collecting pertinent information - from disparate sources and presenting it in an accessible style - would be a worthy contribution to the project. - </para> - <section xml:id="sec-writing-docs-building-the-manual"> - <title>Building the Manual</title> - <para> - The DocBook sources of the <xref linkend="book-nixos-manual" /> - are in the - <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><literal>nixos/doc/manual</literal></link> - subdirectory of the Nixpkgs repository. - </para> - <para> - You can quickly validate your edits with <literal>make</literal>: - </para> - <programlisting> -$ cd /path/to/nixpkgs/nixos/doc/manual -$ nix-shell -nix-shell$ make -</programlisting> - <para> - Once you are done making modifications to the manual, it’s - important to build it before committing. You can do that as - follows: - </para> - <programlisting> -nix-build nixos/release.nix -A manual.x86_64-linux -</programlisting> - <para> - When this command successfully finishes, it will tell you where - the manual got generated. The HTML will be accessible through the - <literal>result</literal> symlink at - <literal>./result/share/doc/nixos/index.html</literal>. - </para> - </section> - <section xml:id="sec-writing-docs-editing-docbook-xml"> - <title>Editing DocBook XML</title> - <para> - For general information on how to write in DocBook, see - <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html">DocBook - 5: The Definitive Guide</link>. - </para> - <para> - Emacs nXML Mode is very helpful for editing DocBook XML because it - validates the document as you write, and precisely locates errors. - To use it, see <xref linkend="sec-emacs-docbook-xml" />. - </para> - <para> - <link xlink:href="http://pandoc.org">Pandoc</link> can generate - DocBook XML from a multitude of formats, which makes a good - starting point. Here is an example of Pandoc invocation to convert - GitHub-Flavoured MarkDown to DocBook 5 XML: - </para> - <programlisting> -pandoc -f markdown_github -t docbook5 docs.md -o my-section.md -</programlisting> - <para> - Pandoc can also quickly convert a single - <literal>section.xml</literal> to HTML, which is helpful when - drafting. - </para> - <para> - Sometimes writing valid DocBook is simply too difficult. In this - case, submit your documentation updates in a - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub - Issue</link> and someone will handle the conversion to XML for - you. - </para> - </section> - <section xml:id="sec-writing-docs-creating-a-topic"> - <title>Creating a Topic</title> - <para> - You can use an existing topic as a basis for the new topic or - create a topic from scratch. - </para> - <para> - Keep the following guidelines in mind when you create and add a - topic: - </para> - <itemizedlist> - <listitem> - <para> - The NixOS - <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><literal>book</literal></link> - element is in <literal>nixos/doc/manual/manual.xml</literal>. - It includes several - <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><literal>parts</literal></link> - which are in subdirectories. - </para> - </listitem> - <listitem> - <para> - Store the topic file in the same directory as the - <literal>part</literal> to which it belongs. If your topic is - about configuring a NixOS module, then the XML file can be - stored alongside the module definition <literal>nix</literal> - file. - </para> - </listitem> - <listitem> - <para> - If you include multiple words in the file name, separate the - words with a dash. For example: - <literal>ipv6-config.xml</literal>. - </para> - </listitem> - <listitem> - <para> - Make sure that the <literal>xml:id</literal> value is unique. - You can use abbreviations if the ID is too long. For example: - <literal>nixos-config</literal>. - </para> - </listitem> - <listitem> - <para> - Determine whether your topic is a chapter or a section. If you - are unsure, open an existing topic file and check whether the - main element is chapter or section. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-writing-docs-adding-a-topic"> - <title>Adding a Topic to the Book</title> - <para> - Open the parent XML file and add an <literal>xi:include</literal> - element to the list of chapters with the file name of the topic - that you created. If you created a <literal>section</literal>, you - add the file to the <literal>chapter</literal> file. If you - created a <literal>chapter</literal>, you add the file to the - <literal>part</literal> file. - </para> - <para> - If the topic is about configuring a NixOS module, it can be - automatically included in the manual by using the - <literal>meta.doc</literal> attribute. See - <xref linkend="sec-meta-attributes" /> for an explanation. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml deleted file mode 100644 index 35e94845c97e7..0000000000000 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ /dev/null @@ -1,245 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-writing-modules"> - <title>Writing NixOS Modules</title> - <para> - NixOS has a modular system for declarative configuration. This - system combines multiple <emphasis>modules</emphasis> to produce the - full system configuration. One of the modules that constitute the - configuration is <literal>/etc/nixos/configuration.nix</literal>. - Most of the others live in the - <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><literal>nixos/modules</literal></link> - subdirectory of the Nixpkgs tree. - </para> - <para> - Each NixOS module is a file that handles one logical aspect of the - configuration, such as a specific kind of hardware, a service, or - network settings. A module configuration does not have to handle - everything from scratch; it can use the functionality provided by - other modules for its implementation. Thus a module can - <emphasis>declare</emphasis> options that can be used by other - modules, and conversely can <emphasis>define</emphasis> options - provided by other modules in its own implementation. For example, - the module - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><literal>pam.nix</literal></link> - declares the option <literal>security.pam.services</literal> that - allows other modules (e.g. - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><literal>sshd.nix</literal></link>) - to define PAM services; and it defines the option - <literal>environment.etc</literal> (declared by - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><literal>etc.nix</literal></link>) - to cause files to be created in <literal>/etc/pam.d</literal>. - </para> - <para> - In <xref linkend="sec-configuration-syntax" />, we saw the following - structure of NixOS modules: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ option definitions -} -</programlisting> - <para> - This is actually an <emphasis>abbreviated</emphasis> form of module - that only defines options, but does not declare any. The structure - of full NixOS modules is shown in - <link linkend="ex-module-syntax">Example: Structure of NixOS - Modules</link>. - </para> - <anchor xml:id="ex-module-syntax" /> - <para> - <emphasis role="strong">Example: Structure of NixOS - Modules</emphasis> - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -{ - imports = - [ paths of other modules - ]; - - options = { - option declarations - }; - - config = { - option definitions - }; -} -</programlisting> - <para> - The meaning of each part is as follows. - </para> - <itemizedlist> - <listitem> - <para> - The first line makes the current Nix expression a function. The - variable <literal>pkgs</literal> contains Nixpkgs (by default, - it takes the <literal>nixpkgs</literal> entry of - <literal>NIX_PATH</literal>, see the - <link xlink:href="https://nixos.org/manual/nix/stable/#sec-common-env">Nix - manual</link> for further details), while - <literal>config</literal> contains the full system - configuration. This line can be omitted if there is no reference - to <literal>pkgs</literal> and <literal>config</literal> inside - the module. - </para> - </listitem> - <listitem> - <para> - This <literal>imports</literal> 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 <literal>modules/module-list.nix</literal>. These don’t - need to be added in the import list. - </para> - </listitem> - <listitem> - <para> - The attribute <literal>options</literal> is a nested set of - <emphasis>option declarations</emphasis> (described below). - </para> - </listitem> - <listitem> - <para> - The attribute <literal>config</literal> is a nested set of - <emphasis>option definitions</emphasis> (also described below). - </para> - </listitem> - </itemizedlist> - <para> - <link linkend="locate-example">Example: NixOS Module for the - <quote>locate</quote> Service</link> shows a module that handles the - regular update of the <quote>locate</quote> database, an index of - all files in the file system. This module declares two options that - can be defined by other modules (typically the user’s - <literal>configuration.nix</literal>): - <literal>services.locate.enable</literal> (whether the database - should be updated) and <literal>services.locate.interval</literal> - (when the update should be done). It implements its functionality by - defining two options declared by other modules: - <literal>systemd.services</literal> (the set of all systemd - services) and <literal>systemd.timers</literal> (the list of - commands to be executed periodically by <literal>systemd</literal>). - </para> - <para> - Care must be taken when writing systemd services using - <literal>Exec*</literal> directives. By default systemd performs - substitution on <literal>%<char></literal> specifiers in these - directives, expands environment variables from - <literal>$FOO</literal> and <literal>${FOO}</literal>, splits - arguments on whitespace, and splits commands on - <literal>;</literal>. All of these must be escaped to avoid - unexpected substitution or splitting when interpolating into an - <literal>Exec*</literal> directive, e.g. when using an - <literal>extraArgs</literal> option to pass additional arguments to - the service. The functions - <literal>utils.escapeSystemdExecArg</literal> and - <literal>utils.escapeSystemdExecArgs</literal> are provided for - this, see <link linkend="exec-escaping-example">Example: Escaping in - Exec directives</link> for an example. When using these functions - system environment substitution should <emphasis>not</emphasis> be - disabled explicitly. - </para> - <anchor xml:id="locate-example" /> - <para> - <emphasis role="strong">Example: NixOS Module for the - <quote>locate</quote> Service</emphasis> - </para> - <programlisting language="nix"> -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.locate; -in { - options.services.locate = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, NixOS will periodically update the database of - files used by the locate command. - ''; - }; - - interval = mkOption { - type = types.str; - default = "02:15"; - example = "hourly"; - description = '' - Update the locate database at this interval. Updates by - default at 2:15 AM every day. - - The format is described in - systemd.time(7). - ''; - }; - - # Other options omitted for documentation - }; - - config = { - systemd.services.update-locatedb = - { description = "Update Locate Database"; - path = [ pkgs.su ]; - script = - '' - mkdir -m 0755 -p $(dirname ${toString cfg.output}) - exec updatedb \ - --localuser=${cfg.localuser} \ - ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ - --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} - ''; - }; - - systemd.timers.update-locatedb = mkIf cfg.enable - { description = "Update timer for locate database"; - partOf = [ "update-locatedb.service" ]; - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.interval; - }; - }; -} -</programlisting> - <anchor xml:id="exec-escaping-example" /> - <para> - <emphasis role="strong">Example: Escaping in Exec - directives</emphasis> - </para> - <programlisting language="nix"> -{ config, lib, pkgs, utils, ... }: - -with lib; - -let - cfg = config.services.echo; - echoAll = pkgs.writeScript "echo-all" '' - #! ${pkgs.runtimeShell} - for s in "$@"; do - printf '%s\n' "$s" - done - ''; - args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; -in { - systemd.services.echo = - { description = "Echo to the journal"; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - serviceConfig.ExecStart = '' - ${echoAll} ${utils.escapeSystemdExecArgs args} - ''; - }; -} -</programlisting> - <xi:include href="option-declarations.section.xml" /> - <xi:include href="option-types.section.xml" /> - <xi:include href="option-def.section.xml" /> - <xi:include href="assertions.section.xml" /> - <xi:include href="meta-attributes.section.xml" /> - <xi:include href="importing-modules.section.xml" /> - <xi:include href="replace-modules.section.xml" /> - <xi:include href="freeform-modules.section.xml" /> - <xi:include href="settings-options.section.xml" /> -</chapter> 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 deleted file mode 100644 index 308f7c6fb0f6d..0000000000000 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ /dev/null @@ -1,782 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-writing-nixos-tests"> - <title>Writing Tests</title> - <para> - A NixOS test is a module that has the following structure: - </para> - <programlisting language="nix"> -{ - - # One or more machines: - nodes = - { machine = - { config, pkgs, ... }: { … }; - machine2 = - { config, pkgs, ... }: { … }; - … - }; - - testScript = - '' - Python code… - ''; -} -</programlisting> - <para> - We refer to the whole test above as a test module, whereas the - values in - <link linkend="test-opt-nodes"><literal>nodes.<name></literal></link> - are NixOS modules themselves. - </para> - <para> - The option - <link linkend="test-opt-testScript"><literal>testScript</literal></link> - is a piece of Python code that executes the test (described below). - During the test, it will start one or more virtual machines, the - configuration of which is described by the option - <link linkend="test-opt-nodes"><literal>nodes</literal></link>. - </para> - <para> - An example of a single-node test is - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>. - It only needs a single machine to test whether users can log in on - the virtual console, whether device ownership is correctly - maintained when switching between consoles, and so on. An - interesting multi-node test is - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix"><literal>nfs/simple.nix</literal></link>. - It uses two client nodes to test correct locking across server - crashes. - </para> - <section xml:id="sec-calling-nixos-tests"> - <title>Calling a test</title> - <para> - Tests are invoked differently depending on whether the test is - part of NixOS or lives in a different project. - </para> - <section xml:id="sec-call-nixos-test-in-nixos"> - <title>Testing within NixOS</title> - <para> - Tests that are part of NixOS are added to - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/all-tests.nix"><literal>nixos/tests/all-tests.nix</literal></link>. - </para> - <programlisting language="nix"> - hostname = runTest ./hostname.nix; -</programlisting> - <para> - Overrides can be added by defining an anonymous module in - <literal>all-tests.nix</literal>. - </para> - <programlisting language="nix"> - hostname = runTest { - imports = [ ./hostname.nix ]; - defaults.networking.firewall.enable = false; - }; -</programlisting> - <para> - You can run a test with attribute name - <literal>hostname</literal> in - <literal>nixos/tests/all-tests.nix</literal> by invoking: - </para> - <programlisting> -cd /my/git/clone/of/nixpkgs -nix-build -A nixosTests.hostname -</programlisting> - </section> - <section xml:id="sec-call-nixos-test-outside-nixos"> - <title>Testing outside the NixOS project</title> - <para> - Outside the <literal>nixpkgs</literal> repository, you can - instantiate the test by first importing the NixOS library, - </para> - <programlisting language="nix"> -let nixos-lib = import (nixpkgs + "/nixos/lib") { }; -in - -nixos-lib.runTest { - imports = [ ./test.nix ]; - hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs - defaults.services.foo.package = mypkg; -} -</programlisting> - <para> - <literal>runTest</literal> returns a derivation that runs the - test. - </para> - </section> - </section> - <section xml:id="sec-nixos-test-nodes"> - <title>Configuring the nodes</title> - <para> - There are a few special NixOS options for test VMs: - </para> - <variablelist> - <varlistentry> - <term> - <literal>virtualisation.memorySize</literal> - </term> - <listitem> - <para> - The memory of the VM in megabytes. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>virtualisation.vlans</literal> - </term> - <listitem> - <para> - The virtual networks to which the VM is connected. See - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix"><literal>nat.nix</literal></link> - for an example. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>virtualisation.writableStore</literal> - </term> - <listitem> - <para> - By default, the Nix store in the VM is not writable. If you - enable this option, a writable union file system is mounted - on top of the Nix store to make it appear writable. This is - necessary for tests that run Nix operations that modify the - store. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - For more options, see the module - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix"><literal>qemu-vm.nix</literal></link>. - </para> - <para> - The test script is a sequence of Python statements that perform - various actions, such as starting VMs, executing commands in the - VMs, and so on. Each virtual machine is represented as an object - stored in the variable <literal>name</literal> if this is also the - identifier of the machine in the declarative config. If you - specified a node <literal>nodes.machine</literal>, the following - example starts the machine, waits until it has finished booting, - then executes a command and checks that the output is more-or-less - correct: - </para> - <programlisting language="python"> -machine.start() -machine.wait_for_unit("default.target") -if not "Linux" in machine.succeed("uname"): - raise Exception("Wrong OS") -</programlisting> - <para> - The first line is technically unnecessary; machines are implicitly - started when you first execute an action on them (such as - <literal>wait_for_unit</literal> or <literal>succeed</literal>). - If you have multiple machines, you can speed up the test by - starting them in parallel: - </para> - <programlisting language="python"> -start_all() -</programlisting> - </section> - <section xml:id="ssec-machine-objects"> - <title>Machine objects</title> - <para> - The following methods are available on machine objects: - </para> - <variablelist> - <varlistentry> - <term> - <literal>start</literal> - </term> - <listitem> - <para> - Start the virtual machine. This method is asynchronous — it - does not wait for the machine to finish booting. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>shutdown</literal> - </term> - <listitem> - <para> - Shut down the machine, waiting for the VM to exit. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>crash</literal> - </term> - <listitem> - <para> - Simulate a sudden power failure, by telling the VM to exit - immediately. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>block</literal> - </term> - <listitem> - <para> - Simulate unplugging the Ethernet cable that connects the - machine to the other machines. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>unblock</literal> - </term> - <listitem> - <para> - Undo the effect of <literal>block</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>screenshot</literal> - </term> - <listitem> - <para> - Take a picture of the display of the virtual machine, in PNG - format. The screenshot is linked from the HTML log. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>get_screen_text_variants</literal> - </term> - <listitem> - <para> - Return a list of different interpretations of what is - 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. - </para> - <note> - <para> - This requires - <link linkend="test-opt-enableOCR"><literal>enableOCR</literal></link> - to be set to <literal>true</literal>. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>get_screen_text</literal> - </term> - <listitem> - <para> - Return a textual representation of what is currently visible - on the machine’s screen using optical character recognition. - </para> - <note> - <para> - This requires - <link linkend="test-opt-enableOCR"><literal>enableOCR</literal></link> - to be set to <literal>true</literal>. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>send_monitor_command</literal> - </term> - <listitem> - <para> - Send a command to the QEMU monitor. This is rarely used, but - allows doing stuff such as attaching virtual USB disks to a - running machine. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>send_key</literal> - </term> - <listitem> - <para> - Simulate pressing keys on the virtual keyboard, e.g., - <literal>send_key("ctrl-alt-delete")</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>send_chars</literal> - </term> - <listitem> - <para> - Simulate typing a sequence of characters on the virtual - keyboard, e.g., - <literal>send_chars("foobar\n")</literal> will - type the string <literal>foobar</literal> followed by the - Enter key. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>send_console</literal> - </term> - <listitem> - <para> - Send keys to the kernel console. This allows interaction - with the systemd emergency mode, for example. Takes a string - that is sent, e.g., - <literal>send_console("\n\nsystemctl default\n")</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>execute</literal> - </term> - <listitem> - <para> - Execute a shell command, returning a list - <literal>(status, stdout)</literal>. - </para> - <para> - Commands are run with <literal>set -euo pipefail</literal> - set: - </para> - <itemizedlist> - <listitem> - <para> - If several commands are separated by - <literal>;</literal> and one fails, the command as a - whole will fail. - </para> - </listitem> - <listitem> - <para> - For pipelines, the last non-zero exit status will be - returned (if there is one; otherwise zero will be - returned). - </para> - </listitem> - <listitem> - <para> - Dereferencing unset variables fails the command. - </para> - </listitem> - <listitem> - <para> - It will wait for stdout to be closed. - </para> - </listitem> - </itemizedlist> - <para> - If the command detaches, it must close stdout, as - <literal>execute</literal> will wait for this to consume all - output reliably. This can be achieved by redirecting stdout - to stderr <literal>>&2</literal>, to - <literal>/dev/console</literal>, - <literal>/dev/null</literal> or a file. Examples of - detaching commands are <literal>sleep 365d &</literal>, - where the shell forks a new process that can write to stdout - and <literal>xclip -i</literal>, where the - <literal>xclip</literal> command itself forks without - closing stdout. - </para> - <para> - Takes an optional parameter <literal>check_return</literal> - that defaults to <literal>True</literal>. Setting this - parameter to <literal>False</literal> will not check for the - return code and return -1 instead. This can be used for - commands that shut down the VM and would therefore break the - pipe that would be used for retrieving the return code. - </para> - <para> - A timeout for the command can be specified (in seconds) - using the optional <literal>timeout</literal> parameter, - e.g., <literal>execute(cmd, timeout=10)</literal> or - <literal>execute(cmd, timeout=None)</literal>. The default - is 900 seconds. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>succeed</literal> - </term> - <listitem> - <para> - Execute a shell command, raising an exception if the exit - status is not zero, otherwise returning the standard output. - Similar to <literal>execute</literal>, except that the - timeout is <literal>None</literal> by default. See - <literal>execute</literal> for details on command execution. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>fail</literal> - </term> - <listitem> - <para> - Like <literal>succeed</literal>, but raising an exception if - the command returns a zero status. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_until_succeeds</literal> - </term> - <listitem> - <para> - Repeat a shell command with 1-second intervals until it - succeeds. Has a default timeout of 900 seconds which can be - modified, e.g. - <literal>wait_until_succeeds(cmd, timeout=10)</literal>. See - <literal>execute</literal> for details on command execution. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_until_fails</literal> - </term> - <listitem> - <para> - Like <literal>wait_until_succeeds</literal>, but repeating - the command until it fails. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_unit</literal> - </term> - <listitem> - <para> - Wait until the specified systemd unit has reached the - <quote>active</quote> state. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_file</literal> - </term> - <listitem> - <para> - Wait until the specified file exists. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_open_port</literal> - </term> - <listitem> - <para> - Wait until a process is listening on the given TCP port and - IP address (default <literal>localhost</literal>). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_closed_port</literal> - </term> - <listitem> - <para> - Wait until nobody is listening on the given TCP port and IP - address (default <literal>localhost</literal>). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_x</literal> - </term> - <listitem> - <para> - Wait until the X11 server is accepting connections. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_text</literal> - </term> - <listitem> - <para> - Wait until the supplied regular expressions matches the - textual contents of the screen by using optical character - recognition (see <literal>get_screen_text</literal> and - <literal>get_screen_text_variants</literal>). - </para> - <note> - <para> - This requires - <link linkend="test-opt-enableOCR"><literal>enableOCR</literal></link> - to be set to <literal>true</literal>. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_console_text</literal> - </term> - <listitem> - <para> - Wait until the supplied regular expressions match a line of - the serial console output. This method is useful when OCR is - not possible or accurate enough. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>wait_for_window</literal> - </term> - <listitem> - <para> - Wait until an X11 window has appeared whose name matches the - given regular expression, e.g., - <literal>wait_for_window("Terminal")</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>copy_from_host</literal> - </term> - <listitem> - <para> - Copies a file from host to machine, e.g., - <literal>copy_from_host("myfile", "/etc/my/important/file")</literal>. - </para> - <para> - The first argument is the file on the host. The file needs - to be accessible while building the nix derivation. The - second argument is the location of the file on the machine. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>systemctl</literal> - </term> - <listitem> - <para> - Runs <literal>systemctl</literal> commands with optional - support for <literal>systemctl --user</literal> - </para> - <programlisting language="python"> -machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` -machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` -</programlisting> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>shell_interact</literal> - </term> - <listitem> - <para> - Allows you to directly interact with the guest shell. This - should only be used during test development, not in - production tests. Killing the interactive session with - <literal>Ctrl-d</literal> or <literal>Ctrl-c</literal> also - ends the guest session. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>console_interact</literal> - </term> - <listitem> - <para> - Allows you to directly interact with QEMU’s stdin. This - should only be used during test development, not in - production tests. Output from QEMU is only read line-wise. - <literal>Ctrl-c</literal> kills QEMU and - <literal>Ctrl-d</literal> closes console and returns to the - test runner. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - To test user units declared by - <literal>systemd.user.services</literal> the optional - <literal>user</literal> argument can be used: - </para> - <programlisting language="python"> -machine.start() -machine.wait_for_x() -machine.wait_for_unit("xautolock.service", "x-session-user") -</programlisting> - <para> - This applies to <literal>systemctl</literal>, - <literal>get_unit_info</literal>, - <literal>wait_for_unit</literal>, <literal>start_job</literal> and - <literal>stop_job</literal>. - </para> - <para> - For faster dev cycles it’s also possible to disable the - code-linters (this shouldn’t be committed though): - </para> - <programlisting language="nix"> -{ - skipLint = true; - nodes.machine = - { config, pkgs, ... }: - { configuration… - }; - - testScript = - '' - Python code… - ''; -} -</programlisting> - <para> - 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 repository): - </para> - <programlisting language="nix"> - testScript = - '' - # fmt: off - Python code… - # fmt: on - ''; -</programlisting> - <para> - Similarly, the type checking of test scripts can be disabled in - the following way: - </para> - <programlisting language="nix"> -{ - skipTypeCheck = true; - nodes.machine = - { config, pkgs, ... }: - { configuration… - }; -} -</programlisting> - </section> - <section xml:id="ssec-failing-tests-early"> - <title>Failing tests early</title> - <para> - To fail tests early when certain invariants are no longer met - (instead of waiting for the build to time out), the decorator - <literal>polling_condition</literal> is provided. For example, if - we are testing a program <literal>foo</literal> that should not - quit after being started, we might write the following: - </para> - <programlisting language="python"> -@polling_condition -def foo_running(): - machine.succeed("pgrep -x foo") - - -machine.succeed("foo --start") -machine.wait_until_succeeds("pgrep -x foo") - -with foo_running: - ... # Put `foo` through its paces -</programlisting> - <para> - <literal>polling_condition</literal> takes the following - (optional) arguments: - </para> - <variablelist> - <varlistentry> - <term> - <literal>seconds_interval</literal> - </term> - <listitem> - <para> - specifies how often the condition should be polled: - </para> - </listitem> - </varlistentry> - </variablelist> - <programlisting language="python"> -@polling_condition(seconds_interval=10) -def foo_running(): - machine.succeed("pgrep -x foo") -</programlisting> - <variablelist> - <varlistentry> - <term> - <literal>description</literal> - </term> - <listitem> - <para> - 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: - </para> - </listitem> - </varlistentry> - </variablelist> - <programlisting language="python"> -@polling_condition -def foo_running(): - "check that foo is running" - machine.succeed("pgrep -x foo") -</programlisting> - <programlisting language="python"> -@polling_condition(description="check that foo is running") -def foo_running(): - machine.succeed("pgrep -x foo") -</programlisting> - </section> - <section xml:id="ssec-python-packages-in-test-script"> - <title>Adding Python packages to the test script</title> - <para> - When additional Python libraries are required in the test script, - they can be added using the parameter - <literal>extraPythonPackages</literal>. For example, you could add - <literal>numpy</literal> like this: - </para> - <programlisting language="nix"> -{ - extraPythonPackages = p: [ p.numpy ]; - - nodes = { }; - - # Type checking on extra packages doesn't work yet - skipTypeCheck = true; - - testScript = '' - import numpy as np - assert str(np.zeros(4) == "array([0., 0., 0., 0.])") - ''; -} -</programlisting> - <para> - In that case, <literal>numpy</literal> is chosen from the generic - <literal>python3Packages</literal>. - </para> - </section> - <section xml:id="sec-test-options-reference"> - <title>Test Options Reference</title> - <para> - The following options can be used when writing tests. - </para> - <xi:include href="../../generated/test-options-db.xml" xpointer="test-options-list"/> - </section> -</section> diff --git a/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml b/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml deleted file mode 100644 index 0e46c1d48ca65..0000000000000 --- a/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml +++ /dev/null @@ -1,111 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-image"> - <title>Building a NixOS (Live) ISO</title> - <para> - Default live installer configurations are available inside - <literal>nixos/modules/installer/cd-dvd</literal>. For building - other system images, - <link xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link> - is a good place to start looking at. - </para> - <para> - You have two options: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Use any of those default configurations as is - </para> - </listitem> - <listitem> - <para> - Combine them with (any of) your host config(s) - </para> - </listitem> - </itemizedlist> - <para> - System images, such as the live installer ones, know how to enforce - configuration settings on which they immediately depend in order to - work correctly. - </para> - <para> - However, if you are confident, you can opt to override those - enforced values with <literal>mkForce</literal>. - </para> - <section xml:id="sec-building-image-instructions"> - <title>Practical Instructions</title> - <para> - To build an ISO image for the channel - <literal>nixos-unstable</literal>: - </para> - <programlisting> -$ git clone https://github.com/NixOS/nixpkgs.git -$ cd nixpkgs/nixos -$ git switch nixos-unstable -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix -</programlisting> - <para> - To check the content of an ISO image, mount it like so: - </para> - <programlisting> -# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso -</programlisting> - </section> - <section xml:id="sec-building-image-drivers"> - <title>Additional drivers or firmware</title> - <para> - If you need additional (non-distributable) drivers or firmware in - the installer, you might want to extend these configurations. - </para> - <para> - For example, to build the GNOME graphical installer ISO, but with - support for certain WiFi adapters present in some MacBooks, you - can create the following file at - <literal>modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix</literal>: - </para> - <programlisting language="nix"> -{ config, ... }: - -{ - imports = [ ./installation-cd-graphical-gnome.nix ]; - - boot.initrd.kernelModules = [ "wl" ]; - - boot.kernelModules = [ "kvm-intel" "wl" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; -} -</programlisting> - <para> - Then build it like in the example above: - </para> - <programlisting> -$ git clone https://github.com/NixOS/nixpkgs.git -$ cd nixpkgs/nixos -$ export NIXPKGS_ALLOW_UNFREE=1 -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-graphical-gnome-macbook.nix default.nix -</programlisting> - </section> - <section xml:id="sec-building-image-tech-notes"> - <title>Technical Notes</title> - <para> - The config value enforcement is implemented via - <literal>mkImageMediaOverride = mkOverride 60;</literal> and - therefore primes over simple value assignments, but also yields to - <literal>mkForce</literal>. - </para> - <para> - This property allows image designers to implement in semantically - correct ways those configuration values upon which the correct - functioning of the image depends. - </para> - <para> - 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 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. - </para> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml deleted file mode 100644 index 727c61c45d273..0000000000000 --- a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml +++ /dev/null @@ -1,117 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-changing-config"> - <title>Changing the Configuration</title> - <para> - The file <literal>/etc/nixos/configuration.nix</literal> contains - the current configuration of your machine. Whenever you’ve - <link linkend="ch-configuration">changed something</link> in that - file, you should do - </para> - <programlisting> -# nixos-rebuild switch -</programlisting> - <para> - to build the new configuration, make it the default configuration - for booting, and try to realise the configuration in the running - system (e.g., by restarting system services). - </para> - <warning> - <para> - This command doesn’t start/stop - <link linkend="opt-systemd.user.services">user services</link> - automatically. <literal>nixos-rebuild</literal> only runs a - <literal>daemon-reload</literal> for each user with running user - services. - </para> - </warning> - <warning> - <para> - These commands must be executed as root, so you should either run - them from a root shell or by prefixing them with - <literal>sudo -i</literal>. - </para> - </warning> - <para> - You can also do - </para> - <programlisting> -# nixos-rebuild test -</programlisting> - <para> - to build the configuration and switch the running system to it, but - without making it the boot default. So if (say) the configuration - locks up your machine, you can just reboot to get back to a working - configuration. - </para> - <para> - There is also - </para> - <programlisting> -# nixos-rebuild boot -</programlisting> - <para> - to build the configuration and make it the boot default, but not - switch to it now (so it will only take effect after the next - reboot). - </para> - <para> - You can make your configuration show up in a different submenu of - the GRUB 2 boot screen by giving it a different <emphasis>profile - name</emphasis>, e.g. - </para> - <programlisting> -# nixos-rebuild switch -p test -</programlisting> - <para> - which causes the new configuration (and previous ones created using - <literal>-p test</literal>) to show up in the GRUB submenu - <quote>NixOS - Profile <quote>test</quote></quote>. This can be - useful to separate test configurations from <quote>stable</quote> - configurations. - </para> - <para> - Finally, you can do - </para> - <programlisting> -$ nixos-rebuild build -</programlisting> - <para> - to build the configuration but nothing more. This is useful to see - whether everything compiles cleanly. - </para> - <para> - If you have a machine that supports hardware virtualisation, you can - also test the new configuration in a sandbox by building and running - a QEMU <emphasis>virtual machine</emphasis> that contains the - desired configuration. Just do - </para> - <programlisting> -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm -</programlisting> - <para> - The VM does not have any data from your host system, so your - existing user accounts and home directories will not be available - unless you have set <literal>mutableUsers = false</literal>. Another - way is to temporarily add the following to your configuration: - </para> - <programlisting language="nix"> -users.users.your-user.initialHashedPassword = "test"; -</programlisting> - <para> - <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if - you have started the virtual machine at least once without the right - users, otherwise the changes will not get picked up. You can forward - ports on the host to the guest. For instance, the following will - forward host port 2222 to guest port 22 (SSH): - </para> - <programlisting> -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm -</programlisting> - <para> - allowing you to log in via SSH (assuming you have set the - appropriate passwords or SSH authorized keys): - </para> - <programlisting> -$ ssh -p 2222 localhost -</programlisting> -</chapter> 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 deleted file mode 100644 index 00b4e87667183..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml +++ /dev/null @@ -1,41 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-behind-proxy"> - <title>Installing behind a proxy</title> - <para> - To install NixOS behind a proxy, do the following before running - <literal>nixos-install</literal>. - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Update proxy configuration in - <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the - internet accessible after reboot. - </para> - <programlisting language="nix"> -networking.proxy.default = "http://user:password@proxy:port/"; -networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; -</programlisting> - </listitem> - <listitem> - <para> - Setup the proxy environment variables in the shell where you are - running <literal>nixos-install</literal>. - </para> - <programlisting> -# proxy_url="http://user:password@proxy:port/" -# export http_proxy="$proxy_url" -# export HTTP_PROXY="$proxy_url" -# export https_proxy="$proxy_url" -# export HTTPS_PROXY="$proxy_url" -</programlisting> - </listitem> - </orderedlist> - <note> - <para> - If you are switching networks with different proxy configurations, - use the <literal>specialisation</literal> option in - <literal>configuration.nix</literal> to switch proxies at runtime. - Refer to <xref linkend="ch-options" /> for more information. - </para> - </note> -</section> 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 deleted file mode 100644 index 5f18d528d32d0..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ /dev/null @@ -1,388 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-from-other-distro"> - <title>Installing from another Linux distribution</title> - <para> - Because Nix (the package manager) & Nixpkgs (the Nix packages - collection) can both be installed on any (most?) Linux - distributions, they can be used to install NixOS in various creative - ways. You can, for instance: - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Install NixOS on another partition, from your existing Linux - distribution (without the use of a USB or optical device!) - </para> - </listitem> - <listitem> - <para> - Install NixOS on the same partition (in place!), from your - existing non-NixOS Linux distribution using - <literal>NIXOS_LUSTRATE</literal>. - </para> - </listitem> - <listitem> - <para> - Install NixOS on your hard drive from the Live CD of any Linux - distribution. - </para> - </listitem> - </orderedlist> - <para> - The first steps to all these are the same: - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Install the Nix package manager: - </para> - <para> - Short version: - </para> - <programlisting> -$ curl -L https://nixos.org/nix/install | sh -$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell -</programlisting> - <para> - More details in the - <link xlink:href="https://nixos.org/nix/manual/#chap-quick-start"> - Nix manual</link> - </para> - </listitem> - <listitem> - <para> - Switch to the NixOS channel: - </para> - <para> - If you’ve just installed Nix on a non-NixOS distribution, you - will be on the <literal>nixpkgs</literal> channel by default. - </para> - <programlisting> -$ nix-channel --list -nixpkgs https://nixos.org/channels/nixpkgs-unstable -</programlisting> - <para> - As that channel gets released without running the NixOS tests, - it will be safer to use the <literal>nixos-*</literal> channels - instead: - </para> - <programlisting> -$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs -</programlisting> - <para> - You may want to throw in a - <literal>nix-channel --update</literal> for good measure. - </para> - </listitem> - <listitem> - <para> - Install the NixOS installation tools: - </para> - <para> - You’ll need <literal>nixos-generate-config</literal> and - <literal>nixos-install</literal>, but this also makes some man - pages and <literal>nixos-enter</literal> available, just in case - you want to chroot into your NixOS partition. NixOS installs - these by default, but you don’t have NixOS yet.. - </para> - <programlisting> -$ nix-env -f '<nixpkgs>' -iA nixos-install-tools -</programlisting> - </listitem> - <listitem> - <note> - <para> - The following 5 steps are only for installing NixOS to another - partition. For installing NixOS in place using - <literal>NIXOS_LUSTRATE</literal>, skip ahead. - </para> - </note> - <para> - Prepare your target partition: - </para> - <para> - At this point it is time to prepare your target partition. - Please refer to the partitioning, file-system creation, and - mounting steps of <xref linkend="sec-installation" /> - </para> - <para> - If you’re about to install NixOS in place using - <literal>NIXOS_LUSTRATE</literal> there is nothing to do for - this step. - </para> - </listitem> - <listitem> - <para> - Generate your NixOS configuration: - </para> - <programlisting> -$ sudo `which nixos-generate-config` --root /mnt -</programlisting> - <para> - You’ll probably want to edit the configuration files. Refer to - the <literal>nixos-generate-config</literal> step in - <xref linkend="sec-installation" /> for more information. - </para> - <para> - 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 - Ubuntu, you may want to add something like this to your - <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -boot.loader.grub.extraEntries = '' - menuentry "Ubuntu" { - search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e - configfile "($ubuntu)/boot/grub/grub.cfg" - } -''; -</programlisting> - <para> - (You can find the appropriate UUID for your partition in - <literal>/dev/disk/by-uuid</literal>) - </para> - </listitem> - <listitem> - <para> - Create the <literal>nixbld</literal> group and user on your - original distribution: - </para> - <programlisting> -$ sudo groupadd -g 30000 nixbld -$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld -</programlisting> - </listitem> - <listitem> - <para> - Download/build/install NixOS: - </para> - <warning> - <para> - Once you complete this step, you might no longer be able to - boot on existing systems without the help of a rescue USB - drive or similar. - </para> - </warning> - <note> - <para> - On some distributions there are separate PATHS for programs - intended only for root. In order for the installation to - succeed, you might have to use - <literal>PATH="$PATH:/usr/sbin:/sbin"</literal> in - the following command. - </para> - </note> - <programlisting> -$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt -</programlisting> - <para> - Again, please refer to the <literal>nixos-install</literal> step - in <xref linkend="sec-installation" /> for more information. - </para> - <para> - That should be it for installation to another partition! - </para> - </listitem> - <listitem> - <para> - Optionally, you may want to clean up your non-NixOS - distribution: - </para> - <programlisting> -$ sudo userdel nixbld -$ sudo groupdel nixbld -</programlisting> - <para> - If you do not wish to keep the Nix package manager installed - either, run something like - <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the line - that the Nix installer added to your - <literal>~/.profile</literal>. - </para> - </listitem> - <listitem> - <note> - <para> - The following steps are only for installing NixOS in place - using <literal>NIXOS_LUSTRATE</literal>: - </para> - </note> - <para> - Generate your NixOS configuration: - </para> - <programlisting> -$ sudo `which nixos-generate-config` -</programlisting> - <para> - Note that this will place the generated configuration files in - <literal>/etc/nixos</literal>. You’ll probably want to edit the - configuration files. Refer to the - <literal>nixos-generate-config</literal> step in - <xref linkend="sec-installation" /> for more information. - </para> - <para> - 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 <literal>sudo passwd -l root</literal> if you use - <literal>sudo</literal>) - </para> - <programlisting language="nix"> -users.users.root.initialHashedPassword = ""; -</programlisting> - </listitem> - <listitem> - <para> - Build the NixOS closure and install it in the - <literal>system</literal> profile: - </para> - <programlisting> -$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system -</programlisting> - </listitem> - <listitem> - <para> - Change ownership of the <literal>/nix</literal> tree to root - (since your Nix install was probably single user): - </para> - <programlisting> -$ sudo chown -R 0:0 /nix -</programlisting> - </listitem> - <listitem> - <para> - Set up the <literal>/etc/NIXOS</literal> and - <literal>/etc/NIXOS_LUSTRATE</literal> files: - </para> - <para> - <literal>/etc/NIXOS</literal> officializes that this is now a - NixOS partition (the bootup scripts require its presence). - </para> - <para> - <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup - scripts to move <emphasis>everything</emphasis> that’s in the - root partition to <literal>/old-root</literal>. 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 touch: - </para> - <itemizedlist> - <listitem> - <para> - The <literal>/nix</literal> directory - </para> - </listitem> - <listitem> - <para> - The <literal>/boot</literal> directory - </para> - </listitem> - <listitem> - <para> - Any file or directory listed in - <literal>/etc/NIXOS_LUSTRATE</literal> (one per line) - </para> - </listitem> - </itemizedlist> - <note> - <para> - Support for <literal>NIXOS_LUSTRATE</literal> was added in - NixOS 16.09. The act of <quote>lustrating</quote> refers to - the wiping of the existing distribution. Creating - <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on - NixOS to remove all mutable files from your root partition - (anything that’s not in <literal>/nix</literal> or - <literal>/boot</literal> gets <quote>lustrated</quote> on the - next boot. - </para> - <para> - lustrate /ˈlʌstreɪt/ verb. - </para> - <para> - purify by expiatory sacrifice, ceremonial washing, or some - other ritual action. - </para> - </note> - <para> - Let’s create the files: - </para> - <programlisting> -$ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE -</programlisting> - <para> - Let’s also make sure the NixOS configuration files are kept once - we reboot on NixOS: - </para> - <programlisting> -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE -</programlisting> - </listitem> - <listitem> - <para> - Finally, move the <literal>/boot</literal> directory of your - current distribution out of the way (the lustrate process will - take care of the rest once you reboot, but this one must be - moved out now because NixOS needs to install its own boot files: - </para> - <warning> - <para> - Once you complete this step, your current distribution will no - 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. - </para> - </warning> - <programlisting> -$ sudo mv -v /boot /boot.bak && -sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot -</programlisting> - <para> - Cross your fingers, reboot, hopefully you should get a NixOS - prompt! - </para> - </listitem> - <listitem> - <para> - 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 - these lines: - </para> - <programlisting> -# mkdir root -# mount /dev/sdaX root -# mkdir root/nixos-root -# mv -v root/* root/nixos-root/ -# mv -v root/nixos-root/old-root/* root/ -# mv -v root/boot.bak root/boot # We had renamed this by hand earlier -# umount root -# reboot -</programlisting> - <para> - This may work as is or you might also need to reinstall the boot - loader. - </para> - <para> - And of course, if you’re happy with NixOS and no longer need the - old distribution: - </para> - <programlisting> -sudo rm -rf /old-root -</programlisting> - </listitem> - <listitem> - <para> - 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, - <link xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> - uses the lustrate process to convert Digital Ocean droplets to - NixOS from other distributions automatically. - </para> - </listitem> - </orderedlist> -</section> diff --git a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml b/nixos/doc/manual/from_md/installation/installing-kexec.section.xml deleted file mode 100644 index 40a697c74096e..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml +++ /dev/null @@ -1,94 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-booting-via-kexec"> - <title><quote>Booting</quote> into NixOS via kexec</title> - <para> - In some cases, your system might already be booted into/preinstalled - with another Linux distribution, and booting NixOS by attaching an - installation image is quite a manual process. - </para> - <para> - This is particularly useful for (cloud) providers where you can’t - boot a custom image, but get some Debian or Ubuntu installation. - </para> - <para> - In these cases, it might be easier to use <literal>kexec</literal> - to <quote>jump into NixOS</quote> from the running system, which - only assumes <literal>bash</literal> and <literal>kexec</literal> to - be installed on the machine. - </para> - <para> - Note that kexec may not work correctly on some hardware, as devices - are not fully re-initialized in the process. In practice, this - however is rarely the case. - </para> - <para> - To build the necessary files from your current version of nixpkgs, - you can run: - </para> - <programlisting> -nix-build -A kexec.x86_64-linux '<nixpkgs/nixos/release.nix>' -</programlisting> - <para> - This will create a <literal>result</literal> directory containing - the following: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>bzImage</literal> (the Linux kernel) - </para> - </listitem> - <listitem> - <para> - <literal>initrd</literal> (the initrd file) - </para> - </listitem> - <listitem> - <para> - <literal>kexec-boot</literal> (a shellscript invoking - <literal>kexec</literal>) - </para> - </listitem> - </itemizedlist> - <para> - These three files are meant to be copied over to the other already - running Linux Distribution. - </para> - <para> - Note its symlinks pointing elsewhere, so <literal>cd</literal> in, - and use <literal>scp * root@$destination</literal> to copy it over, - rather than rsync. - </para> - <para> - Once you finished copying, execute <literal>kexec-boot</literal> - <emphasis>on the destination</emphasis>, and after some seconds, the - machine should be booting into an (ephemeral) NixOS installation - medium. - </para> - <para> - In case you want to describe your own system closure to kexec into, - instead of the default installer image, you can build your own - <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -{ modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/netboot/netboot-minimal.nix") - ]; - - services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [ - "my-ssh-pubkey" - ]; -} -</programlisting> - <programlisting> -nix-build '<nixpkgs/nixos>' \ - --arg configuration ./configuration.nix - --attr config.system.build.kexecTree -</programlisting> - <para> - Make sure your <literal>configuration.nix</literal> does still - import <literal>netboot-minimal.nix</literal> (or - <literal>netboot-base.nix</literal>). - </para> -</section> diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml deleted file mode 100644 index 94172de65ea06..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml +++ /dev/null @@ -1,42 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-booting-from-pxe"> - <title>Booting from the <quote>netboot</quote> media (PXE)</title> - <para> - Advanced users may wish to install NixOS using an existing PXE or - iPXE setup. - </para> - <para> - These instructions assume that you have an existing PXE or iPXE - infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from your current version of - nixpkgs, you can run: - </para> - <programlisting> -nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' -</programlisting> - <para> - This will create a <literal>result</literal> directory containing: * - <literal>bzImage</literal> – the Linux kernel * - <literal>initrd</literal> – the initrd file * - <literal>netboot.ipxe</literal> – an example ipxe script - demonstrating the appropriate kernel command line arguments for this - image - </para> - <para> - If you’re using plain PXE, configure your boot loader to use the - <literal>bzImage</literal> and <literal>initrd</literal> files and - have it provide the same kernel command line arguments found in - <literal>netboot.ipxe</literal>. - </para> - <para> - If you’re using iPXE, depending on how your HTTP/FTP/etc. server is - configured you may be able to use <literal>netboot.ipxe</literal> - unmodified, or you may need to update the paths to the files to - match your server’s directory layout. - </para> - <para> - In the future we may begin making these files available as build - products from hydra at which point we will update this documentation - with instructions on how to obtain them either for placing on a - dedicated TFTP server or to boot them directly over the internet. - </para> -</section> diff --git a/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixos/doc/manual/from_md/installation/installing-usb.section.xml deleted file mode 100644 index cb0fd95bc7c5f..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing-usb.section.xml +++ /dev/null @@ -1,135 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-booting-from-usb"> - <title>Booting from a USB flash drive</title> - <para> - The image has to be written verbatim to the USB flash drive for it - to be bootable on UEFI and BIOS systems. Here are the recommended - tools to do that. - </para> - <section xml:id="sec-booting-from-usb-graphical"> - <title>Creating bootable USB flash drive with a graphical - tool</title> - <para> - Etcher is a popular and user-friendly tool. It works on Linux, - Windows and macOS. - </para> - <para> - Download it from - <link xlink:href="https://www.balena.io/etcher/">balena.io</link>, - start the program, select the downloaded NixOS ISO, then select - the USB flash drive and flash it. - </para> - <warning> - <para> - Etcher reports errors and usage statistics by default, which can - be disabled in the settings. - </para> - </warning> - <para> - An alternative is - <link xlink:href="https://bztsrc.gitlab.io/usbimager">USBImager</link>, - which is very simple and does not connect to the internet. - Download the version with write-only (wo) interface for your - system. Start the program, select the image, select the USB flash - drive and click <quote>Write</quote>. - </para> - </section> - <section xml:id="sec-booting-from-usb-linux"> - <title>Creating bootable USB flash drive from a Terminal on - Linux</title> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - Plug in the USB flash drive. - </para> - </listitem> - <listitem> - <para> - Find the corresponding device with <literal>lsblk</literal>. - You can distinguish them by their size. - </para> - </listitem> - <listitem> - <para> - Make sure all partitions on the device are properly unmounted. - Replace <literal>sdX</literal> with your device (e.g. - <literal>sdb</literal>). - </para> - </listitem> - </orderedlist> - <programlisting> -sudo umount /dev/sdX* -</programlisting> - <orderedlist numeration="arabic" spacing="compact"> - <listitem override="4"> - <para> - Then use the <literal>dd</literal> utility to write the image - to the USB flash drive. - </para> - </listitem> - </orderedlist> - <programlisting> -sudo dd if=<path-to-image> of=/dev/sdX bs=4M conv=fsync -</programlisting> - </section> - <section xml:id="sec-booting-from-usb-macos"> - <title>Creating bootable USB flash drive from a Terminal on - macOS</title> - <orderedlist numeration="arabic" spacing="compact"> - <listitem> - <para> - Plug in the USB flash drive. - </para> - </listitem> - <listitem> - <para> - Find the corresponding device with - <literal>diskutil list</literal>. You can distinguish them by - their size. - </para> - </listitem> - <listitem> - <para> - Make sure all partitions on the device are properly unmounted. - Replace <literal>diskX</literal> with your device (e.g. - <literal>disk1</literal>). - </para> - </listitem> - </orderedlist> - <programlisting> -diskutil unmountDisk diskX -</programlisting> - <orderedlist numeration="arabic" spacing="compact"> - <listitem override="4"> - <para> - Then use the <literal>dd</literal> utility to write the image - to the USB flash drive. - </para> - </listitem> - </orderedlist> - <programlisting> -sudo dd if=<path-to-image> of=/dev/rdiskX bs=4m -</programlisting> - <para> - After <literal>dd</literal> completes, a GUI dialog <quote>The - disk you inserted was not readable by this computer</quote> will - pop up, which can be ignored. - </para> - <note> - <para> - Using the <quote>raw</quote> <literal>rdiskX</literal> device - instead of <literal>diskX</literal> with dd completes in minutes - instead of hours. - </para> - </note> - <orderedlist numeration="arabic" spacing="compact"> - <listitem override="5"> - <para> - Eject the disk when it is finished. - </para> - </listitem> - </orderedlist> - <programlisting> -diskutil eject /dev/diskX -</programlisting> - </section> -</section> 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 deleted file mode 100644 index e435081852993..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml +++ /dev/null @@ -1,92 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-virtualbox-guest"> - <title>Installing in a VirtualBox guest</title> - <para> - 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 use a pre-made VirtualBox appliance, it is available at - <link xlink:href="https://nixos.org/nixos/download.html">the - downloads page</link>. If you want to set up a VirtualBox guest - manually, follow these instructions: - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Add a New Machine in VirtualBox with OS Type <quote>Linux / - Other Linux</quote> - </para> - </listitem> - <listitem> - <para> - Base Memory Size: 768 MB or higher. - </para> - </listitem> - <listitem> - <para> - New Hard Disk of 8 GB or higher. - </para> - </listitem> - <listitem> - <para> - Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) - </para> - </listitem> - <listitem> - <para> - Click on Settings / System / Processor and enable PAE/NX - </para> - </listitem> - <listitem> - <para> - Click on Settings / System / Acceleration and enable - <quote>VT-x/AMD-V</quote> acceleration - </para> - </listitem> - <listitem> - <para> - Click on Settings / Display / Screen and select VMSVGA as - Graphics Controller - </para> - </listitem> - <listitem> - <para> - Save the settings, start the virtual machine, and continue - installation like normal - </para> - </listitem> - </orderedlist> - <para> - There are a few modifications you should make in configuration.nix. - Enable booting: - </para> - <programlisting language="nix"> -boot.loader.grub.device = "/dev/sda"; -</programlisting> - <para> - Also remove the fsck that runs at startup. It will always fail to - run, stopping your boot until you press <literal>*</literal>. - </para> - <programlisting language="nix"> -boot.initrd.checkJournalingFS = false; -</programlisting> - <para> - 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 <quote>Add</quote> icon). Add the following to the - <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. - If you do not add <literal>"nofail"</literal>, the system - will not boot properly. - </para> - <programlisting language="nix"> -{ config, pkgs, ...} : -{ - fileSystems."/virtualboxshare" = { - fsType = "vboxsf"; - device = "nameofthesharedfolder"; - options = [ "rw" "nofail" ]; - }; -} -</programlisting> - <para> - The folder will be available directly under the root directory. - </para> -</section> diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml deleted file mode 100644 index 5654eb424fc3b..0000000000000 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ /dev/null @@ -1,887 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="sec-installation"> - <title>Installing NixOS</title> - <section xml:id="sec-installation-booting"> - <title>Booting from the install medium</title> - <para> - To begin the installation, you have to boot your computer from the - install drive. - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Plug in the install drive. Then turn on or restart your - computer. - </para> - </listitem> - <listitem> - <para> - Open the boot menu by pressing the appropriate key, which is - usually shown on the display on early boot. Select the USB - flash drive (the option usually contains the word - <quote>USB</quote>). If you choose the incorrect drive, your - computer will likely continue to boot as normal. In that case - restart your computer and pick a different drive. - </para> - <note> - <para> - The key to open the boot menu is different across computer - brands and even models. It can be <keycap>F12</keycap>, but - also <keycap>F1</keycap>, <keycap>F9</keycap>, - <keycap>F10</keycap>, <keycap>Enter</keycap>, - <keycap>Del</keycap>, <keycap>Esc</keycap> or another - function key. If you are unsure and don’t see it on the - early boot screen, you can search online for your computers - brand, model followed by <quote>boot from usb</quote>. The - computer might not even have that feature, so you have to go - into the BIOS/UEFI settings to change the boot order. Again, - search online for details about your specific computer - model. - </para> - <para> - For Apple computers with Intel processors press and hold the - <keycap>⌥</keycap> (Option or Alt) key until you see the - boot menu. On Apple silicon press and hold the power button. - </para> - </note> - <note> - <para> - If your computer supports both BIOS and UEFI boot, choose - the UEFI option. - </para> - </note> - <note> - <para> - If you use a CD for the installation, the computer will - probably boot from it automatically. If not, choose the - option containing the word <quote>CD</quote> from the boot - menu. - </para> - </note> - </listitem> - <listitem> - <para> - Shortly after selecting the appropriate boot drive, you should - be presented with a menu with different installer options. - Leave the default and wait (or press <keycap>Enter</keycap> to - speed up). - </para> - </listitem> - <listitem> - <para> - The graphical images will start their corresponding desktop - environment and the graphical installer, which can take some - time. The minimal images will boot to a command line. You have - to follow the instructions in - <xref linkend="sec-installation-manual" /> there. - </para> - </listitem> - </orderedlist> - </section> - <section xml:id="sec-installation-graphical"> - <title>Graphical Installation</title> - <para> - The graphical installer is recommended for desktop users and will - guide you through the installation. - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - In the <quote>Welcome</quote> screen, you can select the - language of the Installer and the installed system. - </para> - <tip> - <para> - Leaving the language as <quote>American English</quote> will - make it easier to search for error messages in a search - engine or to report an issue. - </para> - </tip> - </listitem> - <listitem> - <para> - Next you should choose your location to have the timezone set - correctly. You can actually click on the map! - </para> - <note> - <para> - The installer will use an online service to guess your - location based on your public IP address. - </para> - </note> - </listitem> - <listitem> - <para> - Then you can select the keyboard layout. The default keyboard - model should work well with most desktop keyboards. If you - have a special keyboard or notebook, your model might be in - the list. Select the language you are most comfortable typing - in. - </para> - </listitem> - <listitem> - <para> - On the <quote>Users</quote> screen, you have to type in your - display name, login name and password. You can also enable an - option to automatically login to the desktop. - </para> - </listitem> - <listitem> - <para> - Then you have the option to choose a desktop environment. If - you want to create a custom setup with a window manager, you - can select <quote>No desktop</quote>. - </para> - <tip> - <para> - If you don’t have a favorite desktop and don’t know which - one to choose, you can stick to either GNOME or Plasma. They - have a quite different design, so you should choose - whichever you like better. They are both popular choices and - well tested on NixOS. - </para> - </tip> - </listitem> - <listitem> - <para> - You have the option to allow unfree software in the next - screen. - </para> - </listitem> - <listitem> - <para> - The easiest option in the <quote>Partitioning</quote> screen - is <quote>Erase disk</quote>, which will delete all data from - the selected disk and install the system on it. Also select - <quote>Swap (with Hibernation)</quote> in the dropdown below - it. You have the option to encrypt the whole disk with LUKS. - </para> - <note> - <para> - At the top left you see if the Installer was booted with - BIOS or UEFI. If you know your system supports UEFI and it - shows <quote>BIOS</quote>, reboot with the correct option. - </para> - </note> - <warning> - <para> - Make sure you have selected the correct disk at the top and - that no valuable data is still on the disk! It will be - deleted when formatting the disk. - </para> - </warning> - </listitem> - <listitem> - <para> - Check the choices you made in the <quote>Summary</quote> and - click <quote>Install</quote>. - </para> - <note> - <para> - The installation takes about 15 minutes. The time varies - based on the selected desktop environment, internet - connection speed and disk write speed. - </para> - </note> - </listitem> - <listitem> - <para> - When the install is complete, remove the USB flash drive and - reboot into your new system! - </para> - </listitem> - </orderedlist> - </section> - <section xml:id="sec-installation-manual"> - <title>Manual Installation</title> - <para> - NixOS can be installed on BIOS or UEFI systems. The procedure for - a UEFI installation is broadly the same as for a BIOS - installation. The differences are mentioned in the following - steps. - </para> - <para> - The NixOS manual is available by running - <literal>nixos-help</literal> in the command line or from the - application menu in the desktop environment. - </para> - <para> - To have access to the command line on the graphical images, open - Terminal (GNOME) or Konsole (Plasma) from the application menu. - </para> - <para> - You are logged-in automatically as <literal>nixos</literal>. The - <literal>nixos</literal> user account has an empty password so you - can use <literal>sudo</literal> without a password: - </para> - <programlisting> -$ sudo -i -</programlisting> - <para> - You can use <literal>loadkeys</literal> to switch to your - preferred keyboard layout. (We even provide neo2 via - <literal>loadkeys de neo</literal>!) - </para> - <para> - If the text is too small to be legible, try - <literal>setfont ter-v32n</literal> to increase the font size. - </para> - <para> - To install over a serial port connect with - <literal>115200n8</literal> (e.g. - <literal>picocom -b 115200 /dev/ttyUSB0</literal>). When the - bootloader lists boot entries, select the serial console boot - entry. - </para> - <section xml:id="sec-installation-manual-networking"> - <title>Networking in the installer</title> - <para> - <anchor xml:id="sec-installation-booting-networking" /> - <!-- legacy anchor --> - </para> - <para> - The boot process should have brought up networking (check - <literal>ip a</literal>). Networking is necessary for the - installer, since it will download lots of stuff (such as source - tarballs or Nixpkgs channel binaries). It’s best if you have a - DHCP server on your network. Otherwise configure networking - manually using <literal>ifconfig</literal>. - </para> - <para> - On the graphical installer, you can configure the network, wifi - included, through NetworkManager. Using the - <literal>nmtui</literal> program, you can do so even in a - non-graphical session. If you prefer to configure the network - manually, disable NetworkManager with - <literal>systemctl stop NetworkManager</literal>. - </para> - <para> - On the minimal installer, NetworkManager is not available, so - configuration must be performed manually. To configure the wifi, - first start wpa_supplicant with - <literal>sudo systemctl start wpa_supplicant</literal>, then run - <literal>wpa_cli</literal>. For most home networks, you need to - type in the following commands: - </para> - <programlisting> -> add_network -0 -> set_network 0 ssid "myhomenetwork" -OK -> set_network 0 psk "mypassword" -OK -> set_network 0 key_mgmt WPA-PSK -OK -> enable_network 0 -OK -</programlisting> - <para> - For enterprise networks, for example - <emphasis>eduroam</emphasis>, instead do: - </para> - <programlisting> -> add_network -0 -> set_network 0 ssid "eduroam" -OK -> set_network 0 identity "myname@example.com" -OK -> set_network 0 password "mypassword" -OK -> set_network 0 key_mgmt WPA-EAP -OK -> enable_network 0 -OK -</programlisting> - <para> - When successfully connected, you should see a line such as this - one - </para> - <programlisting> -<3>CTRL-EVENT-CONNECTED - Connection to 32:85:ab:ef:24:5c completed [id=0 id_str=] -</programlisting> - <para> - you can now leave <literal>wpa_cli</literal> by typing - <literal>quit</literal>. - </para> - <para> - If you would like to continue the installation from a different - machine you can use activated SSH daemon. You need to copy your - ssh key to either - <literal>/home/nixos/.ssh/authorized_keys</literal> or - <literal>/root/.ssh/authorized_keys</literal> (Tip: For - installers with a modifiable filesystem such as the sd-card - installer image a key can be manually placed by mounting the - image on a different machine). Alternatively you must set a - password for either <literal>root</literal> or - <literal>nixos</literal> with <literal>passwd</literal> to be - able to login. - </para> - </section> - <section xml:id="sec-installation-manual-partitioning"> - <title>Partitioning and formatting</title> - <para> - <anchor xml:id="sec-installation-partitioning" /> - <!-- legacy anchor --> - </para> - <para> - The NixOS installer doesn’t do any partitioning or formatting, - so you need to do that yourself. - </para> - <para> - The NixOS installer ships with multiple partitioning tools. The - examples below use <literal>parted</literal>, but also provides - <literal>fdisk</literal>, <literal>gdisk</literal>, - <literal>cfdisk</literal>, and <literal>cgdisk</literal>. - </para> - <para> - The recommended partition scheme differs depending if the - computer uses <emphasis>Legacy Boot</emphasis> or - <emphasis>UEFI</emphasis>. - </para> - <section xml:id="sec-installation-manual-partitioning-UEFI"> - <title>UEFI (GPT)</title> - <para> - <anchor xml:id="sec-installation-partitioning-UEFI" /> - <!-- legacy anchor --> - </para> - <para> - Here’s an example partition scheme for UEFI, using - <literal>/dev/sda</literal> as the device. - </para> - <note> - <para> - You can safely ignore <literal>parted</literal>’s - informational message about needing to update /etc/fstab. - </para> - </note> - <orderedlist numeration="arabic"> - <listitem> - <para> - Create a <emphasis>GPT</emphasis> partition table. - </para> - <programlisting> -# parted /dev/sda -- mklabel gpt -</programlisting> - </listitem> - <listitem> - <para> - Add the <emphasis>root</emphasis> partition. This will - fill the disk except for the end part, where the swap will - live, and the space left in front (512MiB) which will be - used by the boot partition. - </para> - <programlisting> -# parted /dev/sda -- mkpart primary 512MB -8GB -</programlisting> - </listitem> - <listitem> - <para> - Next, add a <emphasis>swap</emphasis> partition. The size - required will vary according to needs, here a 8GB one is - created. - </para> - <programlisting> -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% -</programlisting> - <note> - <para> - The swap partition size rules are no different than for - other Linux distributions. - </para> - </note> - </listitem> - <listitem> - <para> - Finally, the <emphasis>boot</emphasis> partition. NixOS by - default uses the ESP (EFI system partition) as its - <emphasis>/boot</emphasis> partition. It uses the - initially reserved 512MiB at the start of the disk. - </para> - <programlisting> -# parted /dev/sda -- mkpart ESP fat32 1MB 512MB -# parted /dev/sda -- set 3 esp on -</programlisting> - </listitem> - </orderedlist> - <para> - Once complete, you can follow with - <xref linkend="sec-installation-manual-partitioning-formatting" />. - </para> - </section> - <section xml:id="sec-installation-manual-partitioning-MBR"> - <title>Legacy Boot (MBR)</title> - <para> - <anchor xml:id="sec-installation-partitioning-MBR" /> - <!-- legacy anchor --> - </para> - <para> - Here’s an example partition scheme for Legacy Boot, using - <literal>/dev/sda</literal> as the device. - </para> - <note> - <para> - You can safely ignore <literal>parted</literal>’s - informational message about needing to update /etc/fstab. - </para> - </note> - <orderedlist numeration="arabic"> - <listitem> - <para> - Create a <emphasis>MBR</emphasis> partition table. - </para> - <programlisting> -# parted /dev/sda -- mklabel msdos -</programlisting> - </listitem> - <listitem> - <para> - Add the <emphasis>root</emphasis> partition. This will - fill the the disk except for the end part, where the swap - will live. - </para> - <programlisting> -# parted /dev/sda -- mkpart primary 1MB -8GB -</programlisting> - </listitem> - <listitem> - <para> - Set the root partition’s boot flag to on. This allows the - disk to be booted from. - </para> - <programlisting> -# parted /dev/sda -- set 1 boot on -</programlisting> - </listitem> - <listitem> - <para> - Finally, add a <emphasis>swap</emphasis> partition. The - size required will vary according to needs, here a 8GB one - is created. - </para> - <programlisting> -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% -</programlisting> - <note> - <para> - The swap partition size rules are no different than for - other Linux distributions. - </para> - </note> - </listitem> - </orderedlist> - <para> - Once complete, you can follow with - <xref linkend="sec-installation-manual-partitioning-formatting" />. - </para> - </section> - <section xml:id="sec-installation-manual-partitioning-formatting"> - <title>Formatting</title> - <para> - <anchor xml:id="sec-installation-partitioning-formatting" /> - <!-- legacy anchor --> - </para> - <para> - Use the following commands: - </para> - <itemizedlist> - <listitem> - <para> - For initialising Ext4 partitions: - <literal>mkfs.ext4</literal>. It is recommended that you - assign a unique symbolic label to the file system using - the option <literal>-L label</literal>, since this makes - the file system configuration independent from device - changes. For example: - </para> - <programlisting> -# mkfs.ext4 -L nixos /dev/sda1 -</programlisting> - </listitem> - <listitem> - <para> - For creating swap partitions: <literal>mkswap</literal>. - Again it’s recommended to assign a label to the swap - partition: <literal>-L label</literal>. For example: - </para> - <programlisting> -# mkswap -L swap /dev/sda2 -</programlisting> - </listitem> - <listitem> - <para> - <emphasis role="strong">UEFI systems</emphasis> - </para> - <para> - For creating boot partitions: <literal>mkfs.fat</literal>. - Again it’s recommended to assign a label to the boot - partition: <literal>-n label</literal>. For example: - </para> - <programlisting> -# mkfs.fat -F 32 -n boot /dev/sda3 -</programlisting> - </listitem> - <listitem> - <para> - For creating LVM volumes, the LVM commands, e.g., - <literal>pvcreate</literal>, <literal>vgcreate</literal>, - and <literal>lvcreate</literal>. - </para> - </listitem> - <listitem> - <para> - For creating software RAID devices, use - <literal>mdadm</literal>. - </para> - </listitem> - </itemizedlist> - </section> - </section> - <section xml:id="sec-installation-manual-installing"> - <title>Installing</title> - <para> - <anchor xml:id="sec-installation-installing" /> - <!-- legacy anchor --> - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Mount the target file system on which NixOS should be - installed on <literal>/mnt</literal>, e.g. - </para> - <programlisting> -# mount /dev/disk/by-label/nixos /mnt -</programlisting> - </listitem> - <listitem> - <para> - <emphasis role="strong">UEFI systems</emphasis> - </para> - <para> - Mount the boot file system on <literal>/mnt/boot</literal>, - e.g. - </para> - <programlisting> -# mkdir -p /mnt/boot -# mount /dev/disk/by-label/boot /mnt/boot -</programlisting> - </listitem> - <listitem> - <para> - If your machine has a limited amount of memory, you may want - to activate swap devices now - (<literal>swapon device</literal>). The installer (or - rather, the build actions that it may spawn) may need quite - a bit of RAM, depending on your configuration. - </para> - <programlisting> -# swapon /dev/sda2 -</programlisting> - </listitem> - <listitem> - <para> - You now need to create a file - <literal>/mnt/etc/nixos/configuration.nix</literal> that - specifies the intended configuration of the system. This is - because NixOS has a <emphasis>declarative</emphasis> - configuration model: you create or edit a description of the - desired configuration of your system, and then NixOS takes - care of making it happen. The syntax of the NixOS - configuration file is described in - <xref linkend="sec-configuration-syntax" />, while a list of - available configuration options appears in - <xref linkend="ch-options" />. A minimal example is shown in - <link linkend="ex-config">Example: NixOS - Configuration</link>. - </para> - <para> - The command <literal>nixos-generate-config</literal> can - generate an initial configuration file for you: - </para> - <programlisting> -# nixos-generate-config --root /mnt -</programlisting> - <para> - You should then edit - <literal>/mnt/etc/nixos/configuration.nix</literal> to suit - your needs: - </para> - <programlisting> -# nano /mnt/etc/nixos/configuration.nix -</programlisting> - <para> - If you’re using the graphical ISO image, other editors may - be available (such as <literal>vim</literal>). If you have - network access, you can also install other editors – for - instance, you can install Emacs by running - <literal>nix-env -f '<nixpkgs>' -iA emacs</literal>. - </para> - <variablelist> - <varlistentry> - <term> - BIOS systems - </term> - <listitem> - <para> - You <emphasis>must</emphasis> set the option - <xref linkend="opt-boot.loader.grub.device" /> to - specify on which disk the GRUB boot loader is to be - installed. Without it, NixOS cannot boot. - </para> - <para> - If there are other operating systems running on the - machine before installing NixOS, the - <xref linkend="opt-boot.loader.grub.useOSProber" /> - option can be set to <literal>true</literal> to - automatically add them to the grub menu. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - UEFI systems - </term> - <listitem> - <para> - You must select a boot-loader, either system-boot or - GRUB. The recommended option is systemd-boot: set the - option - <xref linkend="opt-boot.loader.systemd-boot.enable" /> - to <literal>true</literal>. - <literal>nixos-generate-config</literal> should do - this automatically for new configurations when booted - in UEFI mode. - </para> - <para> - You may want to look at the options starting with - <link linkend="opt-boot.loader.efi.canTouchEfiVariables"><literal>boot.loader.efi</literal></link> - and - <link linkend="opt-boot.loader.systemd-boot.enable"><literal>boot.loader.systemd-boot</literal></link> - as well. - </para> - <para> - If you want to use GRUB, set - <xref linkend="opt-boot.loader.grub.device" /> to - <literal>nodev</literal> and - <xref linkend="opt-boot.loader.grub.efiSupport" /> to - <literal>true</literal>. - </para> - <para> - With system-boot, you should not need any special - configuration to detect other installed systems. With - GRUB, set - <xref linkend="opt-boot.loader.grub.useOSProber" /> to - <literal>true</literal>, but this will only detect - windows partitions, not other linux distributions. If - you dual boot another linux distribution, use - system-boot instead. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - If you need to configure networking for your machine the - configuration options are described in - <xref linkend="sec-networking" />. In particular, while wifi - is supported on the installation image, it is not enabled by - default in the configuration generated by - <literal>nixos-generate-config</literal>. - </para> - <para> - Another critical option is <literal>fileSystems</literal>, - specifying the file systems that need to be mounted by - NixOS. However, you typically don’t need to set it yourself, - because <literal>nixos-generate-config</literal> sets it - automatically in - <literal>/mnt/etc/nixos/hardware-configuration.nix</literal> - from your currently mounted file systems. (The configuration - file <literal>hardware-configuration.nix</literal> is - included from <literal>configuration.nix</literal> and will - be overwritten by future invocations of - <literal>nixos-generate-config</literal>; thus, you - generally should not modify it.) Additionally, you may want - to look at - <link xlink:href="https://github.com/NixOS/nixos-hardware">Hardware - configuration for known-hardware</link> at this point or - after installation. - </para> - <note> - <para> - Depending on your hardware configuration or type of file - system, you may need to set the option - <literal>boot.initrd.kernelModules</literal> to include - the kernel modules that are necessary for mounting the - root file system, otherwise the installed system will not - be able to boot. (If this happens, boot from the - installation media again, mount the target file system on - <literal>/mnt</literal>, fix - <literal>/mnt/etc/nixos/configuration.nix</literal> and - rerun <literal>nixos-install</literal>.) In most cases, - <literal>nixos-generate-config</literal> will figure out - the required modules. - </para> - </note> - </listitem> - <listitem> - <para> - Do the installation: - </para> - <programlisting> -# nixos-install -</programlisting> - <para> - This will install your system based on the configuration you - provided. If anything fails due to a configuration problem - or any other issue (such as a network outage while - downloading binaries from the NixOS binary cache), you can - re-run <literal>nixos-install</literal> after fixing your - <literal>configuration.nix</literal>. - </para> - <para> - As the last step, <literal>nixos-install</literal> will ask - you to set the password for the <literal>root</literal> - user, e.g. - </para> - <programlisting> -setting root password... -New password: *** -Retype new password: *** -</programlisting> - <note> - <para> - For unattended installations, it is possible to use - <literal>nixos-install --no-root-passwd</literal> in order - to disable the password prompt entirely. - </para> - </note> - </listitem> - <listitem> - <para> - If everything went well: - </para> - <programlisting> -# reboot -</programlisting> - </listitem> - <listitem> - <para> - You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of <emphasis>available - configurations</emphasis> (initially just one). Every time - you change the NixOS configuration (see - <link linkend="sec-changing-config">Changing - Configuration</link>), a new item is added to the menu. This - allows you to easily roll back to a previous configuration - if something goes wrong. - </para> - <para> - You should log in and change the <literal>root</literal> - password with <literal>passwd</literal>. - </para> - <para> - You’ll probably want to create some user accounts as well, - which can be done with <literal>useradd</literal>: - </para> - <programlisting> -$ useradd -c 'Eelco Dolstra' -m eelco -$ passwd eelco -</programlisting> - <para> - You may also want to install some software. This will be - covered in <xref linkend="sec-package-management" />. - </para> - </listitem> - </orderedlist> - </section> - <section xml:id="sec-installation-manual-summary"> - <title>Installation summary</title> - <para> - <anchor xml:id="sec-installation-summary" /> - <!-- legacy anchor --> - </para> - <para> - To summarise, <link linkend="ex-install-sequence">Example: - Commands for Installing NixOS on - <literal>/dev/sda</literal></link> shows a typical sequence of - commands for installing NixOS on an empty hard drive (here - <literal>/dev/sda</literal>). <link linkend="ex-config">Example: - NixOS Configuration</link> shows a corresponding configuration - Nix expression. - </para> - <anchor xml:id="ex-partition-scheme-MBR" /> - <para> - <emphasis role="strong">Example: Example partition schemes for - NixOS on <literal>/dev/sda</literal> (MBR)</emphasis> - </para> - <programlisting> -# parted /dev/sda -- mklabel msdos -# parted /dev/sda -- mkpart primary 1MB -8GB -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% -</programlisting> - <anchor xml:id="ex-partition-scheme-UEFI" /> - <para> - <emphasis role="strong">Example: Example partition schemes for - NixOS on <literal>/dev/sda</literal> (UEFI)</emphasis> - </para> - <programlisting> -# parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary 512MB -8GB -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% -# parted /dev/sda -- mkpart ESP fat32 1MB 512MB -# parted /dev/sda -- set 3 esp on -</programlisting> - <anchor xml:id="ex-install-sequence" /> - <para> - <emphasis role="strong">Example: Commands for Installing NixOS - on <literal>/dev/sda</literal></emphasis> - </para> - <para> - With a partitioned disk. - </para> - <programlisting> -# mkfs.ext4 -L nixos /dev/sda1 -# mkswap -L swap /dev/sda2 -# swapon /dev/sda2 -# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) -# mount /dev/disk/by-label/nixos /mnt -# mkdir -p /mnt/boot # (for UEFI systems only) -# mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) -# nixos-generate-config --root /mnt -# nano /mnt/etc/nixos/configuration.nix -# nixos-install -# reboot -</programlisting> - <anchor xml:id="ex-config" /> - <para> - <emphasis role="strong">Example: NixOS Configuration</emphasis> - </para> - <programlisting> -{ config, pkgs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - boot.loader.grub.device = "/dev/sda"; # (for BIOS systems only) - boot.loader.systemd-boot.enable = true; # (for UEFI systems only) - - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; - - # Enable the OpenSSH server. - services.sshd.enable = true; -} -</programlisting> - </section> - </section> - <section xml:id="sec-installation-additional-notes"> - <title>Additional installation notes</title> - <xi:include href="installing-usb.section.xml" /> - <xi:include href="installing-pxe.section.xml" /> - <xi:include href="installing-kexec.section.xml" /> - <xi:include href="installing-virtualbox-guest.section.xml" /> - <xi:include href="installing-from-other-distro.section.xml" /> - <xi:include href="installing-behind-a-proxy.section.xml" /> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml b/nixos/doc/manual/from_md/installation/obtaining.chapter.xml deleted file mode 100644 index d187adfc0c535..0000000000000 --- a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml +++ /dev/null @@ -1,47 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-obtaining"> - <title>Obtaining NixOS</title> - <para> - NixOS ISO images can be downloaded from the - <link xlink:href="https://nixos.org/download.html#nixos-iso">NixOS - download page</link>. Follow the instructions in - <xref linkend="sec-booting-from-usb" /> to create a bootable USB - flash drive. - </para> - <para> - If you have a very old system that can’t boot from USB, you can burn - the image to an empty CD. NixOS might not work very well on such - systems. - </para> - <para> - As an alternative to installing NixOS yourself, you can get a - running NixOS system through several other means: - </para> - <itemizedlist> - <listitem> - <para> - Using virtual appliances in Open Virtualization Format (OVF) - that can be imported into VirtualBox. These are available from - the - <link xlink:href="https://nixos.org/download.html#nixos-virtualbox">NixOS - download page</link>. - </para> - </listitem> - <listitem> - <para> - Using AMIs for Amazon’s EC2. To find one for your region, please - refer to the - <link xlink:href="https://nixos.org/download.html#nixos-amazon">download - page</link>. - </para> - </listitem> - <listitem> - <para> - Using NixOps, the NixOS-based cloud deployment tool, which - allows you to provision VirtualBox and EC2 NixOS instances from - declarative specifications. Check out the - <link xlink:href="https://nixos.org/nixops">NixOps - homepage</link> for details. - </para> - </listitem> - </itemizedlist> -</chapter> diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml deleted file mode 100644 index 99882784b46fc..0000000000000 --- a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml +++ /dev/null @@ -1,152 +0,0 @@ -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-upgrading"> - <title>Upgrading NixOS</title> - <para> - The best way to keep your NixOS installation up to date is to use - one of the NixOS <emphasis>channels</emphasis>. A channel is a Nix - mechanism for distributing Nix 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: - </para> - <itemizedlist> - <listitem> - <para> - <emphasis>Stable channels</emphasis>, such as - <link xlink:href="https://nixos.org/channels/nixos-22.11"><literal>nixos-22.11</literal></link>. - 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 from 4.19.x to 4.20.x (a major change that has the - potential to break things). Stable channels are generally - maintained until the next stable branch is created. - </para> - </listitem> - <listitem> - <para> - The <emphasis>unstable channel</emphasis>, - <link xlink:href="https://nixos.org/channels/nixos-unstable"><literal>nixos-unstable</literal></link>. - This corresponds to NixOS’s main development branch, and may - thus see radical changes between channel updates. It’s not - recommended for production systems. - </para> - </listitem> - <listitem> - <para> - <emphasis>Small channels</emphasis>, such as - <link xlink:href="https://nixos.org/channels/nixos-22.11-small"><literal>nixos-22.11-small</literal></link> - or - <link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>. - These are identical to the stable and unstable channels - described above, except that they contain fewer binary packages. - This means they get updated faster than the regular channels - (for instance, when a critical security patch is committed to - NixOS’s source tree), but may require more packages to be built - from source than usual. They’re mostly intended for server - environments and as such contain few GUI applications. - </para> - </listitem> - </itemizedlist> - <para> - To see what channels are available, go to - <link xlink:href="https://nixos.org/channels">https://nixos.org/channels</link>. - (Note that the URIs of the various channels redirect to a directory - that contains the channel’s latest version and includes ISO images - and VirtualBox appliances.) Please note that during the release - process, channels that are not yet released will be present here as - well. See the Getting NixOS page - <link xlink:href="https://nixos.org/nixos/download.html">https://nixos.org/nixos/download.html</link> - to find the newest supported stable release. - </para> - <para> - 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.11 ISO, you will be subscribed - to the <literal>nixos-22.11</literal> channel. To see which NixOS - channel you’re subscribed to, run the following as root: - </para> - <programlisting> -# nix-channel --list | grep nixos -nixos https://nixos.org/channels/nixos-unstable -</programlisting> - <para> - To switch to a different NixOS channel, do - </para> - <programlisting> -# nix-channel --add https://nixos.org/channels/channel-name nixos -</programlisting> - <para> - (Be sure to include the <literal>nixos</literal> parameter at the - end.) For instance, to use the NixOS 22.11 stable channel: - </para> - <programlisting> -# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos -</programlisting> - <para> - If you have a server, you may want to use the <quote>small</quote> - channel instead: - </para> - <programlisting> -# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos -</programlisting> - <para> - And if you want to live on the bleeding edge: - </para> - <programlisting> -# nix-channel --add https://nixos.org/channels/nixos-unstable nixos -</programlisting> - <para> - You can then upgrade NixOS to the latest version in your chosen - channel by running - </para> - <programlisting> -# nixos-rebuild switch --upgrade -</programlisting> - <para> - which is equivalent to the more verbose - <literal>nix-channel --update nixos; nixos-rebuild switch</literal>. - </para> - <note> - <para> - Channels are set per user. This means that running - <literal>nix-channel --add</literal> as a non root user (or - without sudo) will not affect configuration in - <literal>/etc/nixos/configuration.nix</literal> - </para> - </note> - <warning> - <para> - It is generally safe to switch back and forth between channels. - The only exception is that a newer NixOS may also have a newer Nix - version, which may involve an upgrade of Nix’s database schema. - This cannot be undone easily, so in that case you will not be able - to go back to your original channel. - </para> - </warning> - <section xml:id="sec-upgrading-automatic"> - <title>Automatic Upgrades</title> - <para> - You can keep a NixOS system up-to-date automatically by adding the - following to <literal>configuration.nix</literal>: - </para> - <programlisting language="nix"> -system.autoUpgrade.enable = true; -system.autoUpgrade.allowReboot = true; -</programlisting> - <para> - This enables a periodically executed systemd service named - <literal>nixos-upgrade.service</literal>. If the - <literal>allowReboot</literal> option is <literal>false</literal>, - it runs <literal>nixos-rebuild switch --upgrade</literal> to - upgrade NixOS to the latest version in the current channel. (To - see when the service runs, see - <literal>systemctl list-timers</literal>.) If - <literal>allowReboot</literal> is <literal>true</literal>, then - the system will automatically reboot if the new generation - contains a different kernel, initrd or kernel modules. You can - also specify a channel explicitly, e.g. - </para> - <programlisting language="nix"> -system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11; -</programlisting> - </section> -</chapter> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml deleted file mode 100644 index b4f3657b4b88d..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1310.section.xml +++ /dev/null @@ -1,6 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-13.10"> - <title>Release 13.10 (<quote>Aardvark</quote>, 2013/10/31)</title> - <para> - This is the first stable release branch of NixOS. - </para> -</section> 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 deleted file mode 100644 index 5686545c1afb9..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1404.section.xml +++ /dev/null @@ -1,189 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-14.04"> - <title>Release 14.04 (<quote>Baboon</quote>, 2014/04/30)</title> - <para> - This is the second stable release branch of NixOS. In addition to - numerous new and upgraded packages and modules, this release has the - following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Installation on UEFI systems is now supported. See - <xref linkend="sec-installation" /> for details. - </para> - </listitem> - <listitem> - <para> - Systemd has been updated to version 212, which has - <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous - improvements</link>. NixOS now automatically starts systemd user - instances when you log in. You can define global user units - through the <literal>systemd.unit.*</literal> options. - </para> - </listitem> - <listitem> - <para> - NixOS is now based on Glibc 2.19 and GCC 4.8. - </para> - </listitem> - <listitem> - <para> - The default Linux kernel has been updated to 3.12. - </para> - </listitem> - <listitem> - <para> - KDE has been updated to 4.12. - </para> - </listitem> - <listitem> - <para> - GNOME 3.10 experimental support has been added. - </para> - </listitem> - <listitem> - <para> - Nix has been updated to 1.7 - (<link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>). - </para> - </listitem> - <listitem> - <para> - NixOS now supports fully declarative management of users and - groups. If you set <literal>users.mutableUsers</literal> to - <literal>false</literal>, then the contents of - <literal>/etc/passwd</literal> and <literal>/etc/group</literal> - will be - <link xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link> - to your NixOS configuration. For instance, if you remove a user - from <literal>users.extraUsers</literal> and run - <literal>nixos-rebuild</literal>, the user account will cease to - exist. Also, imperative commands for managing users and groups, - such as <literal>useradd</literal>, are no longer available. If - <literal>users.mutableUsers</literal> is <literal>true</literal> - (the default), then behaviour is unchanged from NixOS 13.10. - </para> - </listitem> - <listitem> - <para> - NixOS now has basic container support, meaning you can easily - run a NixOS instance as a container in a NixOS host system. - These containers are suitable for testing and experimentation - but not production use, since they’re not fully isolated from - the host. See <xref linkend="ch-containers" /> for details. - </para> - </listitem> - <listitem> - <para> - Systemd units provided by packages can now be overridden from - the NixOS configuration. For instance, if a package - <literal>foo</literal> provides systemd units, you can say: - </para> - <programlisting language="nix"> -{ - systemd.packages = [ pkgs.foo ]; -} -</programlisting> - <para> - to enable those units. You can then set or override unit options - in the usual way, e.g. - </para> - <programlisting language="nix"> -{ - systemd.services.foo.wantedBy = [ "multi-user.target" ]; - systemd.services.foo.serviceConfig.MemoryLimit = "512M"; -} -</programlisting> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - </listitem> - <listitem> - <para> - Nixpkgs no longer exposes unfree packages by default. If your - NixOS configuration requires unfree packages from Nixpkgs, you - need to enable support for them explicitly by setting: - </para> - <programlisting language="nix"> -{ - nixpkgs.config.allowUnfree = true; -} -</programlisting> - <para> - Otherwise, you get an error message such as: - </para> - <programlisting> - error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’ - has an unfree license, refusing to evaluate -</programlisting> - </listitem> - <listitem> - <para> - The Adobe Flash player is no longer enabled by default in the - Firefox and Chromium wrappers. To enable it, you must set: - </para> - <programlisting language="nix"> -{ - nixpkgs.config.allowUnfree = true; - nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox - nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium -} -</programlisting> - </listitem> - <listitem> - <para> - The firewall is now enabled by default. If you don’t want this, - you need to disable it explicitly: - </para> - <programlisting language="nix"> -{ - networking.firewall.enable = false; -} -</programlisting> - </listitem> - <listitem> - <para> - The option <literal>boot.loader.grub.memtest86</literal> has - been renamed to - <literal>boot.loader.grub.memtest86.enable</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>mysql55</literal> service has been merged into the - <literal>mysql</literal> service, which no longer sets a default - for the option <literal>services.mysql.package</literal>. - </para> - </listitem> - <listitem> - <para> - Package variants are now differentiated by suffixing the name, - rather than the version. For instance, - <literal>sqlite-3.8.4.3-interactive</literal> is now called - <literal>sqlite-interactive-3.8.4.3</literal>. This ensures that - <literal>nix-env -i sqlite</literal> is unambiguous, and that - <literal>nix-env -u</literal> won’t <quote>upgrade</quote> - <literal>sqlite</literal> to - <literal>sqlite-interactive</literal> or vice versa. Notably, - this change affects the Firefox wrapper (which provides - plugins), as it is now called - <literal>firefox-wrapper</literal>. So when using - <literal>nix-env</literal>, you should do - <literal>nix-env -e firefox; nix-env -i firefox-wrapper</literal> - if you want to keep using the wrapper. This change does not - affect declarative package management, since attribute names - like <literal>pkgs.firefoxWrapper</literal> were already - unambiguous. - </para> - </listitem> - <listitem> - <para> - The symlink <literal>/etc/ca-bundle.crt</literal> is gone. - Programs should instead use the environment variable - <literal>OPENSSL_X509_CERT_FILE</literal> (which points to - <literal>/etc/ssl/certs/ca-bundle.crt</literal>). - </para> - </listitem> - </itemizedlist> -</section> 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 deleted file mode 100644 index ccaa4f6bd0812..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1412.section.xml +++ /dev/null @@ -1,466 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-14.12"> - <title>Release 14.12 (<quote>Caterpillar</quote>, 2014/12/30)</title> - <para> - In addition to numerous new and upgraded packages, this release has - the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Systemd has been updated to version 217, which has numerous - <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">Nix - has been updated to 1.8.</link> - </para> - </listitem> - <listitem> - <para> - NixOS is now based on Glibc 2.20. - </para> - </listitem> - <listitem> - <para> - KDE has been updated to 4.14. - </para> - </listitem> - <listitem> - <para> - The default Linux kernel has been updated to 3.14. - </para> - </listitem> - <listitem> - <para> - If <literal>users.mutableUsers</literal> is enabled (the - default), changes made to the declaration of a user or group - will be correctly realised when running - <literal>nixos-rebuild</literal>. For instance, removing a user - specification from <literal>configuration.nix</literal> will - cause the actual user account to be deleted. If - <literal>users.mutableUsers</literal> is disabled, it is no - longer necessary to specify UIDs or GIDs; if omitted, they are - allocated dynamically. - </para> - </listitem> - </itemizedlist> - <para> - Following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>atftpd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>bosun</literal> - </para> - </listitem> - <listitem> - <para> - <literal>bspwm</literal> - </para> - </listitem> - <listitem> - <para> - <literal>chronos</literal> - </para> - </listitem> - <listitem> - <para> - <literal>collectd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>consul</literal> - </para> - </listitem> - <listitem> - <para> - <literal>cpuminer-cryptonight</literal> - </para> - </listitem> - <listitem> - <para> - <literal>crashplan</literal> - </para> - </listitem> - <listitem> - <para> - <literal>dnscrypt-proxy</literal> - </para> - </listitem> - <listitem> - <para> - <literal>docker-registry</literal> - </para> - </listitem> - <listitem> - <para> - <literal>docker</literal> - </para> - </listitem> - <listitem> - <para> - <literal>etcd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>fail2ban</literal> - </para> - </listitem> - <listitem> - <para> - <literal>fcgiwrap</literal> - </para> - </listitem> - <listitem> - <para> - <literal>fleet</literal> - </para> - </listitem> - <listitem> - <para> - <literal>fluxbox</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gdm</literal> - </para> - </listitem> - <listitem> - <para> - <literal>geoclue2</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gitlab</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gitolite</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome3.gnome-documents</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome3.gnome-online-miners</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome3.gvfs</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome3.seahorse</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hbase</literal> - </para> - </listitem> - <listitem> - <para> - <literal>i2pd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>influxdb</literal> - </para> - </listitem> - <listitem> - <para> - <literal>kubernetes</literal> - </para> - </listitem> - <listitem> - <para> - <literal>liquidsoap</literal> - </para> - </listitem> - <listitem> - <para> - <literal>lxc</literal> - </para> - </listitem> - <listitem> - <para> - <literal>mailpile</literal> - </para> - </listitem> - <listitem> - <para> - <literal>mesos</literal> - </para> - </listitem> - <listitem> - <para> - <literal>mlmmj</literal> - </para> - </listitem> - <listitem> - <para> - <literal>monetdb</literal> - </para> - </listitem> - <listitem> - <para> - <literal>mopidy</literal> - </para> - </listitem> - <listitem> - <para> - <literal>neo4j</literal> - </para> - </listitem> - <listitem> - <para> - <literal>nsd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>openntpd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>opentsdb</literal> - </para> - </listitem> - <listitem> - <para> - <literal>openvswitch</literal> - </para> - </listitem> - <listitem> - <para> - <literal>parallels-guest</literal> - </para> - </listitem> - <listitem> - <para> - <literal>peerflix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>phd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>polipo</literal> - </para> - </listitem> - <listitem> - <para> - <literal>prosody</literal> - </para> - </listitem> - <listitem> - <para> - <literal>radicale</literal> - </para> - </listitem> - <listitem> - <para> - <literal>redmine</literal> - </para> - </listitem> - <listitem> - <para> - <literal>riemann</literal> - </para> - </listitem> - <listitem> - <para> - <literal>scollector</literal> - </para> - </listitem> - <listitem> - <para> - <literal>seeks</literal> - </para> - </listitem> - <listitem> - <para> - <literal>siproxd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>strongswan</literal> - </para> - </listitem> - <listitem> - <para> - <literal>tcsd</literal> - </para> - </listitem> - <listitem> - <para> - <literal>teamspeak3</literal> - </para> - </listitem> - <listitem> - <para> - <literal>thermald</literal> - </para> - </listitem> - <listitem> - <para> - <literal>torque/mrom</literal> - </para> - </listitem> - <listitem> - <para> - <literal>torque/server</literal> - </para> - </listitem> - <listitem> - <para> - <literal>uhub</literal> - </para> - </listitem> - <listitem> - <para> - <literal>unifi</literal> - </para> - </listitem> - <listitem> - <para> - <literal>znc</literal> - </para> - </listitem> - <listitem> - <para> - <literal>zookeeper</literal> - </para> - </listitem> - </itemizedlist> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - The default version of Apache httpd is now 2.4. If you use the - <literal>extraConfig</literal> option to pass literal Apache - configuration text, you may need to update it — see - <link xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s - documentation</link> for details. If you wish to continue to use - httpd 2.2, add the following line to your NixOS configuration: - </para> - <programlisting language="nix"> -{ - services.httpd.package = pkgs.apacheHttpd_2_2; -} -</programlisting> - </listitem> - <listitem> - <para> - PHP 5.3 has been removed because it is no longer supported by - the PHP project. A - <link xlink:href="http://php.net/migration54">migration - guide</link> is available. - </para> - </listitem> - <listitem> - <para> - The host side of a container virtual Ethernet pair is now called - <literal>ve-container-name</literal> rather than - <literal>c-container-name</literal>. - </para> - </listitem> - <listitem> - <para> - GNOME 3.10 support has been dropped. The default GNOME version - is now 3.12. - </para> - </listitem> - <listitem> - <para> - VirtualBox has been upgraded to 4.3.20 release. Users may be - required to run <literal>rm -rf /tmp/.vbox*</literal>. The line - <literal>imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ]</literal> - is no longer necessary, use - <literal>services.virtualboxHost.enable = true</literal> - instead. - </para> - <para> - Also, hardening mode is now enabled by default, which means that - unless you want to use USB support, you no longer need to be a - member of the <literal>vboxusers</literal> group. - </para> - </listitem> - <listitem> - <para> - Chromium has been updated to 39.0.2171.65. - <literal>enablePepperPDF</literal> is now enabled by default. - <literal>chromium*Wrapper</literal> packages no longer exist, - because upstream removed NSAPI support. - <literal>chromium-stable</literal> has been renamed to - <literal>chromium</literal>. - </para> - </listitem> - <listitem> - <para> - Python packaging documentation is now part of nixpkgs manual. To - override the python packages available to a custom python you - now use <literal>pkgs.pythonFull.buildEnv.override</literal> - instead of <literal>pkgs.pythonFull.override</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>boot.resumeDevice = "8:6"</literal> is no - longer supported. Most users will want to leave it undefined, - which takes the swap partitions automatically. There is an - evaluation assertion to ensure that the string starts with a - slash. - </para> - </listitem> - <listitem> - <para> - The system-wide default timezone for NixOS installations changed - from <literal>CET</literal> to <literal>UTC</literal>. To choose - a different timezone for your system, configure - <literal>time.timeZone</literal> in - <literal>configuration.nix</literal>. A fairly complete list of - possible values for that setting is available at - <link xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones">https://en.wikipedia.org/wiki/List_of_tz_database_time_zones</link>. - </para> - </listitem> - <listitem> - <para> - GNU screen has been updated to 4.2.1, which breaks the ability - to connect to sessions created by older versions of screen. - </para> - </listitem> - <listitem> - <para> - The Intel GPU driver was updated to the 3.x prerelease version - (used by most distributions) and supports DRI3 now. - </para> - </listitem> - </itemizedlist> -</section> 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 deleted file mode 100644 index 96b51a0510666..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml +++ /dev/null @@ -1,776 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-15.09"> - <title>Release 15.09 (<quote>Dingo</quote>, 2015/09/30)</title> - <para> - In addition to numerous new and upgraded packages, this release has - the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - The <link xlink:href="http://haskell.org/">Haskell</link> - packages infrastructure has been re-designed from the ground up - (<quote>Haskell NG</quote>). NixOS now distributes the latest - version of every single package registered on - <link xlink:href="http://hackage.haskell.org/">Hackage</link> -- - well in excess of 8,000 Haskell packages. Detailed instructions - on how to use that infrastructure can be found in the - <link xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User’s - Guide to the Haskell Infrastructure</link>. 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 <link xlink:href="http://www.stackage.org/">LTS - Haskell</link> release since version 0.0 as well as the most - recent <link xlink:href="http://www.stackage.org/">Stackage - Nightly</link> snapshot. The announcement - <link xlink:href="https://nixos.org/nix-dev/2015-September/018138.html"><quote>Full - Stackage Support in Nixpkgs</quote></link> gives additional - details. - </para> - </listitem> - <listitem> - <para> - Nix has been updated to version 1.10, which among other - improvements enables cryptographic signatures on binary caches - for improved security. - </para> - </listitem> - <listitem> - <para> - You can now keep your NixOS system up to date automatically by - setting - </para> - </listitem> - </itemizedlist> - <programlisting language="nix"> -{ - system.autoUpgrade.enable = true; -} -</programlisting> - <para> - This will cause the system to periodically check for updates in your - current channel and run <literal>nixos-rebuild</literal>. - </para> - <itemizedlist> - <listitem> - <para> - This release is based on Glibc 2.21, GCC 4.9 and Linux 3.18. - </para> - </listitem> - <listitem> - <para> - GNOME has been upgraded to 3.16. - </para> - </listitem> - <listitem> - <para> - Xfce has been upgraded to 4.12. - </para> - </listitem> - <listitem> - <para> - KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and - Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10. - </para> - </listitem> - <listitem> - <para> - E19 has been upgraded to 0.16.8.15. - </para> - </listitem> - </itemizedlist> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>services/mail/exim.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/apache-kafka.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/canto-daemon.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/confd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/devmon.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/gitit.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/ihaskell.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/mbpfan.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/mediatomb.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/mwlib.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/parsoid.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/plex.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/ripple-rest.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/ripple-data-api.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/subsonic.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/sundtek.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/cadvisor.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/das_watchdog.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/grafana.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/riemann-tools.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/teamviewer.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/u9fs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/aiccu.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/asterisk.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/bird.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/charybdis.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/docker-registry-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/fan.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/firefox/sync-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/gateone.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/heyefi.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/i2p.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/lambdabot.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/mstpd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/nix-serve.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/nylon.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/racoon.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/skydns.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/shout.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/softether.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/sslh.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/tinc.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/tlsdated.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/tox-bootstrapd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/tvheadend.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/zerotierone.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/scheduling/marathon.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/fprintd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/hologram.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/munge.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/system/cloud-init.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-servers/shellinabox.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-servers/uwsgi.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/unclutter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/display-managers/sddm.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/coredump.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/loader/loader.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/loader/generic-extlinux-compatible</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/networkd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/resolved.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/timesyncd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>tasks/filesystems/exfat.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>tasks/filesystems/ntfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>tasks/filesystems/vboxsf.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/virtualbox-host.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/vmware-guest.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/xen-dom0.nix</literal> - </para> - </listitem> - </itemizedlist> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>sshd</literal> no longer supports DSA and ECDSA host - keys by default. If you have existing systems with such host - keys and want to continue to use them, please set - </para> - </listitem> - </itemizedlist> - <programlisting language="nix"> -{ - system.stateVersion = "14.12"; -} -</programlisting> - <para> - The new option <literal>system.stateVersion</literal> ensures that - certain configuration changes that could break existing systems - (such as the <literal>sshd</literal> host key setting) will maintain - compatibility with the specified NixOS release. NixOps sets the - state version of existing deployments automatically. - </para> - <itemizedlist> - <listitem> - <para> - <literal>cron</literal> is no longer enabled by default, unless - you have a non-empty - <literal>services.cron.systemCronJobs</literal>. To force - <literal>cron</literal> to be enabled, set - <literal>services.cron.enable = true</literal>. - </para> - </listitem> - <listitem> - <para> - 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 - <literal>nix.requireSignedBinaryCaches = false</literal>. - </para> - </listitem> - <listitem> - <para> - Steam now doesn’t need root rights to work. Instead of using - <literal>*-steam-chrootenv</literal>, you should now just run - <literal>steam</literal>. <literal>steamChrootEnv</literal> - package was renamed to <literal>steam</literal>, and old - <literal>steam</literal> package -- to - <literal>steamOriginal</literal>. - </para> - </listitem> - <listitem> - <para> - CMPlayer has been renamed to bomi upstream. Package - <literal>cmplayer</literal> was accordingly renamed to - <literal>bomi</literal> - </para> - </listitem> - <listitem> - <para> - Atom Shell has been renamed to Electron upstream. Package - <literal>atom-shell</literal> was accordingly renamed to - <literal>electron</literal> - </para> - </listitem> - <listitem> - <para> - Elm is not released on Hackage anymore. You should now use - <literal>elmPackages.elm</literal> which contains the latest Elm - platform. - </para> - </listitem> - <listitem> - <para> - The CUPS printing service has been updated to version - <literal>2.0.2</literal>. Furthermore its systemd service has - been renamed to <literal>cups.service</literal>. - </para> - <para> - Local printers are no longer shared or advertised by default. - This behavior can be changed by enabling - <literal>services.printing.defaultShared</literal> or - <literal>services.printing.browsing</literal> respectively. - </para> - </listitem> - <listitem> - <para> - The VirtualBox host and guest options have been named more - consistently. They can now found in - <literal>virtualisation.virtualbox.host.*</literal> instead of - <literal>services.virtualboxHost.*</literal> and - <literal>virtualisation.virtualbox.guest.*</literal> instead of - <literal>services.virtualboxGuest.*</literal>. - </para> - <para> - Also, there now is support for the <literal>vboxsf</literal> - file system using the <literal>fileSystems</literal> - configuration attribute. An example of how this can be used in a - configuration: - </para> - </listitem> - </itemizedlist> - <programlisting language="nix"> -{ - fileSystems."/shiny" = { - device = "myshinysharedfolder"; - fsType = "vboxsf"; - }; -} -</programlisting> - <itemizedlist spacing="compact"> - <listitem> - <para> - <quote><literal>nix-env -qa</literal></quote> no longer - discovers Haskell packages by name. The only packages visible in - the global scope are <literal>ghc</literal>, - <literal>cabal-install</literal>, and <literal>stack</literal>, - 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 - <literal>nix-env -qa</literal> 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: - </para> - </listitem> - </itemizedlist> - <programlisting> -nix-env -f "<nixpkgs>" -qaP -A haskellPackages -</programlisting> - <para> - Executable programs written in Haskell can be installed with: - </para> - <programlisting> -nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc -</programlisting> - <para> - Installing Haskell <emphasis>libraries</emphasis> this way, however, - is no longer supported. See the next item for more details. - </para> - <itemizedlist> - <listitem> - <para> - Previous versions of NixOS came with a feature called - <literal>ghc-wrapper</literal>, a small script that allowed GHC - to transparently pick up on libraries installed in the user’s - profile. This feature has been deprecated; - <literal>ghc-wrapper</literal> was removed from the - distribution. The proper way to register Haskell libraries with - the compiler now is the - <literal>haskellPackages.ghcWithPackages</literal> function. The - <link xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User’s - Guide to the Haskell Infrastructure</link> provides more - information about this subject. - </para> - </listitem> - <listitem> - <para> - All Haskell builds that have been generated with version 1.x of - the <literal>cabal2nix</literal> utility are now invalid and - need to be re-generated with a current version of - <literal>cabal2nix</literal> to function. The most recent - version of this tool can be installed by running - <literal>nix-env -i cabal2nix</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>haskellPackages</literal> set in Nixpkgs used to - have a function attribute called <literal>extension</literal> - that users could override in their - <literal>~/.nixpkgs/config.nix</literal> files to configure - additional attributes, etc. That function still exists, but it’s - now called <literal>overrides</literal>. - </para> - </listitem> - <listitem> - <para> - The OpenBLAS library has been updated to version - <literal>0.2.14</literal>. Support for the - <literal>x86_64-darwin</literal> 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. - </para> - </listitem> - <listitem> - <para> - The <literal>phpfpm</literal> is now using the default PHP - version (<literal>pkgs.php</literal>) instead of PHP 5.4 - (<literal>pkgs.php54</literal>). - </para> - </listitem> - <listitem> - <para> - The <literal>locate</literal> service no longer indexes the Nix - store by default, preventing packages with potentially numerous - versions from cluttering the output. Indexing the store can be - activated by setting - <literal>services.locate.includeStore = true</literal>. - </para> - </listitem> - <listitem> - <para> - The Nix expression search path (<literal>NIX_PATH</literal>) no - longer contains <literal>/etc/nixos/nixpkgs</literal> by - default. You can override <literal>NIX_PATH</literal> by setting - <literal>nix.nixPath</literal>. - </para> - </listitem> - <listitem> - <para> - Python 2.6 has been marked as broken (as it no longer receives - security updates from upstream). - </para> - </listitem> - <listitem> - <para> - Any use of module arguments such as <literal>pkgs</literal> to - access library functions, or to define - <literal>imports</literal> attributes will now lead to an - infinite loop at the time of the evaluation. - </para> - <para> - In case of an infinite loop, use the - <literal>--show-trace</literal> command line argument and read - the line just above the error message. - </para> - <programlisting> -$ nixos-rebuild build --show-trace -… -while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix": -infinite recursion encountered -</programlisting> - <para> - Any use of <literal>pkgs.lib</literal>, should be replaced by - <literal>lib</literal>, after adding it as argument of the - module. The following module - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -with pkgs.lib; - -{ - options = { - foo = mkOption { … }; - }; - config = mkIf config.foo { … }; -} -</programlisting> - <para> - should be modified to look like: - </para> - <programlisting language="nix"> -{ config, pkgs, lib, ... }: - -with lib; - -{ - options = { - foo = mkOption { option declaration }; - }; - config = mkIf config.foo { option definition }; -} -</programlisting> - <para> - When <literal>pkgs</literal> is used to download other projects - to import their modules, and only in such cases, it should be - replaced by <literal>(import <nixpkgs> {})</literal>. The - following module - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -let - myProject = pkgs.fetchurl { - src = url; - sha256 = hash; - }; -in - -{ - imports = [ "${myProject}/module.nix" ]; -} -</programlisting> - <para> - should be modified to look like: - </para> - <programlisting language="nix"> -{ config, pkgs, ... }: - -let - myProject = (import <nixpkgs> {}).fetchurl { - src = url; - sha256 = hash; - }; -in - -{ - imports = [ "${myProject}/module.nix" ]; -} -</programlisting> - </listitem> - </itemizedlist> - <para> - Other notable improvements: - </para> - <itemizedlist> - <listitem> - <para> - The nixos and nixpkgs channels were unified, so one - <emphasis>can</emphasis> use - <literal>nix-env -iA nixos.bash</literal> instead of - <literal>nix-env -iA nixos.pkgs.bash</literal>. See - <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the - commit</link> for details. - </para> - </listitem> - <listitem> - <para> - Users running an SSH server who worry about the quality of their - <literal>/etc/ssh/moduli</literal> file with respect to the - <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities - discovered in the Diffie-Hellman key exchange</link> can now - replace OpenSSH’s default version with one they generated - themselves using the new - <literal>services.openssh.moduliFile</literal> option. - </para> - </listitem> - <listitem> - <para> - A newly packaged TeX Live 2015 is provided in - <literal>pkgs.texlive</literal>, split into 6500 nix packages. - For basic user documentation see - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1">the - source</link>. Beware of - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757">an - issue</link> when installing a too large package set. The plan - is to deprecate and maybe delete the original TeX packages until - the next release. - </para> - </listitem> - <listitem> - <para> - <literal>buildEnv.env</literal> on all Python interpreters is - now available for nix-shell interoperability. - </para> - </listitem> - </itemizedlist> -</section> 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 deleted file mode 100644 index 25b356e0aa6ad..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml +++ /dev/null @@ -1,695 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-16.03"> - <title>Release 16.03 (<quote>Emu</quote>, 2016/03/31)</title> - <para> - In addition to numerous new and upgraded packages, this release has - the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Systemd 229, bringing - <link xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous - improvements</link> over 217. - </para> - </listitem> - <listitem> - <para> - Linux 4.4 (was 3.18). - </para> - </listitem> - <listitem> - <para> - GCC 5.3 (was 4.9). Note that GCC 5 - <link xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes - the C++ ABI in an incompatible way</link>; this may cause - problems if you try to link objects compiled with different - versions of GCC. - </para> - </listitem> - <listitem> - <para> - Glibc 2.23 (was 2.21). - </para> - </listitem> - <listitem> - <para> - Binutils 2.26 (was 2.23.1). See #909 - </para> - </listitem> - <listitem> - <para> - Improved support for ensuring - <link xlink:href="https://reproducible-builds.org/">bitwise - reproducible builds</link>. For example, - <literal>stdenv</literal> now sets the environment variable - <literal>SOURCE_DATE_EPOCH</literal> to a deterministic value, - and Nix has - <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.11">gained - an option</link> to repeat a build a number of times to test - determinism. An ongoing project, the goal of exact - reproducibility is to allow binaries to be verified - independently (e.g., a user might only trust binaries that - appear in three independent binary caches). - </para> - </listitem> - <listitem> - <para> - Perl 5.22. - </para> - </listitem> - </itemizedlist> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>services/monitoring/longview.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/video/webcam/facetimehd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>i18n/input-method/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>i18n/input-method/fcitx.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>i18n/input-method/ibus.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>i18n/input-method/nabi.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>i18n/input-method/uim.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/fish.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>security/acme.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>security/audit.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>security/oath.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/hardware/irqbalance.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/dspam.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/opendkim.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/postsrsd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/rspamd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/rmilter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/autofs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/bepasty.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/calibre-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/cfdyndns.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/gammu-smsd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/mathics.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/matrix-synapse.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/octoprint.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/hdaps.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/heapster.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/longview.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/netatalk.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/xtreemfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/autossh.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/dnschain.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/gale.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/miniupnpd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/namecoind.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/ostinato.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/pdnsd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/shairport-sync.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/supplicant.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/search/kibana.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/haka.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/physlock.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/pump.io.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/hardware/libinput.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/window-managers/windowlab.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/initrd-network.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/initrd-ssh.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/loader/loader.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/networkd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/resolved.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/lxd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/rkt.nix</literal> - </para> - </listitem> - </itemizedlist> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - We no longer produce graphical ISO images and VirtualBox images - for <literal>i686-linux</literal>. A minimal ISO image is still - provided. - </para> - </listitem> - <listitem> - <para> - Firefox and similar browsers are now <emphasis>wrapped by - default</emphasis>. The package and attribute names are plain - <literal>firefox</literal> or <literal>midori</literal>, etc. - Backward-compatibility attributes were set up, but note that - <literal>nix-env -u</literal> will <emphasis>not</emphasis> - update your current <literal>firefox-with-plugins</literal>; you - have to uninstall it and install <literal>firefox</literal> - instead. - </para> - </listitem> - <listitem> - <para> - <literal>wmiiSnap</literal> has been replaced with - <literal>wmii_hg</literal>, but - <literal>services.xserver.windowManager.wmii.enable</literal> - has been updated respectively so this only affects you if you - have explicitly installed <literal>wmiiSnap</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>jobs</literal> NixOS option has been removed. It served - as compatibility layer between Upstart jobs and SystemD - services. All services have been rewritten to use - <literal>systemd.services</literal> - </para> - </listitem> - <listitem> - <para> - <literal>wmiimenu</literal> is removed, as it has been removed - by the developers upstream. Use <literal>wimenu</literal> from - the <literal>wmii-hg</literal> package. - </para> - </listitem> - <listitem> - <para> - Gitit is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. - You will need to add an import statement to your NixOS - configuration in order to use it, e.g. - </para> - <programlisting language="nix"> -{ - imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; -} -</programlisting> - <para> - will include the Gitit service configuration options. - </para> - </listitem> - <listitem> - <para> - <literal>nginx</literal> does not accept flags for enabling and - disabling modules anymore. Instead it accepts - <literal>modules</literal> argument, which is a list of modules - to be built in. All modules now reside in - <literal>nginxModules</literal> set. Example configuration: - </para> - <programlisting language="nix"> -nginx.override { - modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>s3sync</literal> 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 - <literal>tarsnap</literal> and others. - </para> - </listitem> - <listitem> - <para> - <literal>ruby_1_8</literal> has been removed as it’s not - supported from upstream anymore and probably contains security - issues. - </para> - </listitem> - <listitem> - <para> - <literal>tidy-html5</literal> package is removed. Upstream only - provided <literal>(lib)tidy5</literal> during development, and - now they went back to <literal>(lib)tidy</literal> to work as a - drop-in replacement of the original package that has been - unmaintained for years. You can (still) use the - <literal>html-tidy</literal> package, which got updated to a - stable release from this new upstream. - </para> - </listitem> - <listitem> - <para> - <literal>extraDeviceOptions</literal> argument is removed from - <literal>bumblebee</literal> package. Instead there are now two - separate arguments: <literal>extraNvidiaDeviceOptions</literal> - and <literal>extraNouveauDeviceOptions</literal> for setting - extra X11 options for nvidia and nouveau drivers, respectively. - </para> - </listitem> - <listitem> - <para> - The <literal>Ctrl+Alt+Backspace</literal> key combination no - longer kills the X server by default. There’s a new option - <literal>services.xserver.enableCtrlAltBackspace</literal> - allowing to enable the combination again. - </para> - </listitem> - <listitem> - <para> - <literal>emacsPackagesNg</literal> now contains all packages - from the ELPA, MELPA, and MELPA Stable repositories. - </para> - </listitem> - <listitem> - <para> - Data directory for Postfix MTA server is moved from - <literal>/var/postfix</literal> to - <literal>/var/lib/postfix</literal>. Old configurations are - migrated automatically. <literal>service.postfix</literal> - module has also received many improvements, such as correct - directories’ access rights, new <literal>aliasFiles</literal> - and <literal>mapFiles</literal> options and more. - </para> - </listitem> - <listitem> - <para> - 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: - </para> - <programlisting language="nix"> -{ - fileSystems."/example" = { - device = "/dev/sdc"; - fsType = "btrfs"; - options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ]; - }; -} -</programlisting> - </listitem> - <listitem> - <para> - CUPS, installed by <literal>services.printing</literal> module, - now has its data directory in <literal>/var/lib/cups</literal>. - Old configurations from <literal>/etc/cups</literal> are moved - there automatically, but there might be problems. Also - configuration options - <literal>services.printing.cupsdConf</literal> and - <literal>services.printing.cupsdFilesConf</literal> 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, <literal>services.printing.extraConf</literal> and - new option <literal>services.printing.extraFilesConf</literal> - should be enough; if you encounter a situation when they are - not, please file a bug. - </para> - <para> - There are also Gutenprint improvements; in particular, a new - option <literal>services.printing.gutenprint</literal> is added - to enable automatic updating of Gutenprint PPMs; it’s greatly - recommended to enable it instead of adding - <literal>gutenprint</literal> to the <literal>drivers</literal> - list. - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.vaapiDrivers</literal> has been - removed. Use - <literal>hardware.opengl.extraPackages{,32}</literal> instead. - You can also specify VDPAU drivers there. - </para> - </listitem> - <listitem> - <para> - <literal>programs.ibus</literal> moved to - <literal>i18n.inputMethod.ibus</literal>. The option - <literal>programs.ibus.plugins</literal> changed to - <literal>i18n.inputMethod.ibus.engines</literal> and the option - to enable ibus changed from - <literal>programs.ibus.enable</literal> to - <literal>i18n.inputMethod.enabled</literal>. - <literal>i18n.inputMethod.enabled</literal> should be set to the - used input method name, <literal>"ibus"</literal> for - ibus. An example of the new style: - </para> - <programlisting language="nix"> -{ - i18n.inputMethod.enabled = "ibus"; - i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ]; -} -</programlisting> - <para> - That is equivalent to the old version: - </para> - <programlisting language="nix"> -{ - programs.ibus.enable = true; - programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>services.udev.extraRules</literal> option now writes - rules to <literal>99-local.rules</literal> instead of - <literal>10-local.rules</literal>. This makes all the user rules - apply after others, so their results wouldn’t be overridden by - anything else. - </para> - </listitem> - <listitem> - <para> - Large parts of the <literal>services.gitlab</literal> module has - been been rewritten. There are new configuration options - available. The <literal>stateDir</literal> option was renamned - to <literal>statePath</literal> and the - <literal>satellitesDir</literal> option was removed. Please - review the currently available options. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.nsd.zones.<name>.data</literal> no - longer interpret the dollar sign ($) as a shell variable, as - such it should not be escaped anymore. Thus the following zone - data: - </para> - <programlisting> -$ORIGIN example.com. -$TTL 1800 -@ IN SOA ns1.vpn.nbp.name. admin.example.com. ( -</programlisting> - <para> - Should modified to look like the actual file expected by nsd: - </para> - <programlisting> -$ORIGIN example.com. -$TTL 1800 -@ IN SOA ns1.vpn.nbp.name. admin.example.com. ( -</programlisting> - </listitem> - <listitem> - <para> - <literal>service.syncthing.dataDir</literal> options now has to - point to exact folder where syncthing is writing to. Example - configuration should look something like: - </para> - <programlisting language="nix"> -{ - services.syncthing = { - enable = true; - dataDir = "/home/somebody/.syncthing"; - user = "somebody"; - }; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>networking.firewall.allowPing</literal> is now enabled - by default. Users are encouraged to configure an appropriate - rate limit for their machines using the Kernel interface at - <literal>/proc/sys/net/ipv4/icmp_ratelimit</literal> and - <literal>/proc/sys/net/ipv6/icmp/ratelimit</literal> or using - the firewall itself, i.e. by setting the NixOS option - <literal>networking.firewall.pingLimit</literal>. - </para> - </listitem> - <listitem> - <para> - Systems with some broadcom cards used to result into a generated - config that is no longer accepted. If you get errors like - </para> - <programlisting> -error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created -</programlisting> - <para> - you should either re-run - <literal>nixos-generate-config</literal> or manually replace - <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> - by <literal>config.boot.kernelPackages.broadcom_sta</literal> in - your <literal>/etc/nixos/hardware-configuration.nix</literal>. - More discussion is on - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> - the github issue</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>services.xserver.startGnuPGAgent</literal> 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 <quote>start everything as a child of the - agent</quote> scheme we’ve implemented in NixOS for older - versions. To configure the gpg-agent for your X session, add the - following code to <literal>~/.bashrc</literal> or some file - that’s sourced when your shell is started: - </para> - <programlisting> -GPG_TTY=$(tty) -export GPG_TTY -</programlisting> - <para> - If you want to use gpg-agent for SSH, too, add the following to - your session initialization (e.g. - <literal>displayManager.sessionCommands</literal>) - </para> - <programlisting> - gpg-connect-agent /bye - unset SSH_AGENT_PID - export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh" -</programlisting> - <para> - and make sure that - </para> - <programlisting> - enable-ssh-support -</programlisting> - <para> - is included in your <literal>~/.gnupg/gpg-agent.conf</literal>. - You will need to use <literal>ssh-add</literal> to re-add your - ssh keys. If gpg’s automatic transformation of the private keys - to the new format fails, you will need to re-import your private - keyring as well: - </para> - <programlisting> - gpg --import ~/.gnupg/secring.gpg -</programlisting> - <para> - The <literal>gpg-agent(1)</literal> man page has more details - about this subject, i.e. in the <quote>EXAMPLES</quote> section. - </para> - </listitem> - </itemizedlist> - <para> - Other notable improvements: - </para> - <itemizedlist> - <listitem> - <para> - <literal>ejabberd</literal> module is brought back and now works - on NixOS. - </para> - </listitem> - <listitem> - <para> - Input method support was improved. New NixOS modules (fcitx, - nabi and uim), fcitx engines (chewing, hangul, m17n, mozc and - table-other) and ibus engines (hangul and m17n) have been added. - </para> - </listitem> - </itemizedlist> -</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 deleted file mode 100644 index c2adbc88f5caa..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml +++ /dev/null @@ -1,273 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-16.09"> - <title>Release 16.09 (<quote>Flounder</quote>, 2016/09/30)</title> - <para> - In addition to numerous new and upgraded packages, this release has - the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Many NixOS configurations and Nix packages now use significantly - less disk space, thanks to the - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive - work on closure size reduction</link>. For example, the closure - size of a minimal NixOS container went down from ~424 MiB in - 16.03 to ~212 MiB in 16.09, while the closure size of Firefox - went from ~651 MiB to ~259 MiB. - </para> - </listitem> - <listitem> - <para> - To improve security, packages are now - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built - using various hardening features</link>. See the Nixpkgs manual - for more information. - </para> - </listitem> - <listitem> - <para> - Support for PXE netboot. See - <xref linkend="sec-booting-from-pxe" /> for documentation. - </para> - </listitem> - <listitem> - <para> - X.org server 1.18. If you use the <literal>ati_unfree</literal> - driver, 1.17 is still used due to an ABI incompatibility. - </para> - </listitem> - <listitem> - <para> - This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. - The default Linux kernel remains 4.4. - </para> - </listitem> - </itemizedlist> - <para> - The following new services were added since the last release: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>(this will get automatically generated at release time)</literal> - </para> - </listitem> - </itemizedlist> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were - changed</link> late (August 2016) in the release cycle and - differ from the initial introduction of multiple outputs.) - </para> - </listitem> - <listitem> - <para> - Previous versions of Nixpkgs had support for all versions of the - LTS Haskell package set. That support has been dropped. The - previously provided <literal>haskell.packages.lts-x_y</literal> - 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. - <link xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The - motivation for this change</link> has been discussed at length - on the <literal>nix-dev</literal> mailing list and in - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github - issue #14897</link>. Development strategies for Haskell hackers - who want to rely on Nix and NixOS have been described in - <link xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another - nix-dev article</link>. - </para> - </listitem> - <listitem> - <para> - Shell aliases for systemd sub-commands - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were - dropped</link>: <literal>start</literal>, - <literal>stop</literal>, <literal>restart</literal>, - <literal>status</literal>. - </para> - </listitem> - <listitem> - <para> - Redis now binds to 127.0.0.1 only instead of listening to all - network interfaces. This is the default behavior of Redis 3.2 - </para> - </listitem> - <listitem> - <para> - <literal>/var/empty</literal> is now immutable. Activation - script runs <literal>chattr +i</literal> to forbid any - modifications inside the folder. See - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> - the pull request</link> for what bugs this caused. - </para> - </listitem> - <listitem> - <para> - Gitlab’s maintainance script <literal>gitlab-runner</literal> - was removed and split up into the more clearer - <literal>gitlab-run</literal> and <literal>gitlab-rake</literal> - scripts, because <literal>gitlab-runner</literal> is a component - of Gitlab CI. - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.libinput.accelProfile</literal> - default changed from <literal>flat</literal> to - <literal>adaptive</literal>, as per - <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79"> - official documentation</link>. - </para> - </listitem> - <listitem> - <para> - <literal>fonts.fontconfig.ultimate.rendering</literal> was - removed because our presets were obsolete for some time. New - presets are hardcoded into FreeType; you can select a preset via - <literal>fonts.fontconfig.ultimate.preset</literal>. You can - customize those presets via ordinary environment variables, - using <literal>environment.variables</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>audit</literal> service is no longer enabled by - default. Use <literal>security.audit.enable = true</literal> to - explicitly enable it. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.linuxPackages.virtualbox</literal> 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 <literal>pkgs.virtualbox</literal> instead. - </para> - </listitem> - <listitem> - <para> - <literal>goPackages</literal> was replaced with separated Go - applications in appropriate <literal>nixpkgs</literal> - categories. Each Go package uses its own dependency set. There’s - also a new <literal>go2nix</literal> tool introduced to generate - a Go package definition from its Go source automatically. - </para> - </listitem> - <listitem> - <para> - <literal>services.mongodb.extraConfig</literal> configuration - format was changed to YAML. - </para> - </listitem> - <listitem> - <para> - PHP has been upgraded to 7.0 - </para> - </listitem> - </itemizedlist> - <para> - Other notable improvements: - </para> - <itemizedlist> - <listitem> - <para> - Revamped grsecurity/PaX support. There is now only a single - general-purpose distribution kernel and the configuration - interface has been streamlined. Desktop users should be able to - simply set - </para> - <programlisting language="nix"> -{ - security.grsecurity.enable = true; -} -</programlisting> - <para> - to get a reasonably secure system without having to sacrifice - too much functionality. - </para> - </listitem> - <listitem> - <para> - Special filesystems, like <literal>/proc</literal>, - <literal>/run</literal> and others, now have the same mount - options as recommended by systemd and are unified across - different places in NixOS. Mount options are updated during - <literal>nixos-rebuild switch</literal> if possible. One benefit - from this is improved security — most such filesystems are now - mounted with <literal>noexec</literal>, <literal>nodev</literal> - and/or <literal>nosuid</literal> options. - </para> - </listitem> - <listitem> - <para> - The reverse path filter was interfering with DHCPv4 server - operation in the past. An exception for DHCPv4 and a new option - to log packets that were dropped due to the reverse path filter - was added - (<literal>networking.firewall.logReversePathDrops</literal>) for - easier debugging. - </para> - </listitem> - <listitem> - <para> - Containers configuration within - <literal>containers.<name>.config</literal> is - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now - properly typed and checked</link>. In particular, partial - configurations are merged correctly. - </para> - </listitem> - <listitem> - <para> - The directory container setuid wrapper programs, - <literal>/var/setuid-wrappers</literal>, - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is - now updated atomically to prevent failures if the switch to a - new configuration is interrupted.</link> - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.startGnuPGAgent</literal> has been - removed due to GnuPG 2.1.x bump. See - <link xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c"> - how to achieve similar behavior</link>. You might need to - <literal>pkill gpg-agent</literal> after the upgrade to prevent - a stale agent being in the way. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147"> - Declarative users could share the uid due to the bug in the - script handling conflict resolution. </link> - </para> - </listitem> - <listitem> - <para> - Gummi boot has been replaced using systemd-boot. - </para> - </listitem> - <listitem> - <para> - Hydra package and NixOS module were added for convenience. - </para> - </listitem> - </itemizedlist> -</section> 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 deleted file mode 100644 index 8667063f37e08..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml +++ /dev/null @@ -1,818 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-17.03"> - <title>Release 17.03 (<quote>Gorilla</quote>, 2017/03/31)</title> - <section xml:id="sec-release-17.03-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Nixpkgs is now extensible through overlays. See the - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs - manual</link> for more information. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The default desktop environment now is KDE’s Plasma 5. KDE 4 - has been removed - </para> - </listitem> - <listitem> - <para> - The setuid wrapper functionality now supports setting - capabilities. - </para> - </listitem> - <listitem> - <para> - X.org server uses branch 1.19. Due to ABI incompatibilities, - <literal>ati_unfree</literal> keeps forcing 1.17 and - <literal>amdgpu-pro</literal> starts forcing 1.18. - </para> - </listitem> - <listitem> - <para> - Cross compilation has been rewritten. See the nixpkgs manual - for details. The most obvious breaking change is that in - derivations there is no <literal>.nativeDrv</literal> nor - <literal>.crossDrv</literal> are now cross by default, not - native. - </para> - </listitem> - <listitem> - <para> - The <literal>overridePackages</literal> function has been - rewritten to be replaced by - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> - overlays</link> - </para> - </listitem> - <listitem> - <para> - Packages in nixpkgs can be marked as insecure through listed - vulnerabilities. See the - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs - manual</link> for more information. - </para> - </listitem> - <listitem> - <para> - PHP now defaults to PHP 7.1 - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-17.03-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>hardware/ckb.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/mcelog.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/usb-wwan.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/video/capture/mwprocapture.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/adb.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/chromium.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/gphoto2.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/java.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/mtr.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/oblogout.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/vim.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/wireshark.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>security/dhparams.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/audio/ympd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/computing/boinc/client.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/continuous-integration/buildbot/master.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/continuous-integration/buildbot/worker.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/continuous-integration/gitlab-runner.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/databases/riak-cs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/databases/stanchion.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/desktops/gnome3/gnome-terminal-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/editors/infinoted.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/hardware/illum.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/hardware/trezord.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/logging/journalbeat.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/offlineimap.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/postgrey.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/couchpotato.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/docker-registry.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/errbot.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/geoip-updater.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/gogs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/leaps.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/nix-optimise.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/ssm-agent.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/sssd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/arbtt.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/netdata.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/alertmanager.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/blackbox-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/json-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/nginx-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/node-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/snmp-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/unifi-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/varnish-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/sysstat.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/telegraf.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/vnstat.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/cachefilesd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/glusterfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/ipfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/dante.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/dnscrypt-wrapper.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/fakeroute.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/flannel.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/htpdate.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/miredo.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/nftables.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/powerdns.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/pdns-recursor.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/quagga.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/redsocks.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/wireguard.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/system/cgmanager.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/torrent/opentracker.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/atlassian/confluence.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/atlassian/crowd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/atlassian/jira.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/frab.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/nixbot.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/selfoss.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/quassel-webserver.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/unclutter-xfixes.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/urxvtd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>system/boot/systemd-nspawn.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/ecs-agent.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/lxcfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/openstack/keystone.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>virtualisation/openstack/glance.nix</literal> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-17.03-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - Derivations have no <literal>.nativeDrv</literal> nor - <literal>.crossDrv</literal> and are now cross by default, not - native. - </para> - </listitem> - <listitem> - <para> - <literal>stdenv.overrides</literal> is now expected to take - <literal>self</literal> and <literal>super</literal> - arguments. See <literal>lib.trivial.extends</literal> for what - those parameters represent. - </para> - </listitem> - <listitem> - <para> - <literal>ansible</literal> now defaults to ansible version 2 - as version 1 has been removed due to a serious - <link xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt"> - vulnerability</link> unpatched by upstream. - </para> - </listitem> - <listitem> - <para> - <literal>gnome</literal> alias has been removed along with - <literal>gtk</literal>, <literal>gtkmm</literal> and several - others. Now you need to use versioned attributes, like - <literal>gnome3</literal>. - </para> - </listitem> - <listitem> - <para> - The attribute name of the Radicale daemon has been changed - from <literal>pythonPackages.radicale</literal> to - <literal>radicale</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>stripHash</literal> bash function in - <literal>stdenv</literal> changed according to its - documentation; it now outputs the stripped name to - <literal>stdout</literal> instead of putting it in the - variable <literal>strippedName</literal>. - </para> - </listitem> - <listitem> - <para> - PHP now scans for extra configuration .ini files in /etc/php.d - instead of /etc. This prevents accidentally loading non-PHP - .ini files that may be in /etc. - </para> - </listitem> - <listitem> - <para> - Two lone top-level dict dbs moved into - <literal>dictdDBs</literal>. This affects: - <literal>dictdWordnet</literal> which is now at - <literal>dictdDBs.wordnet</literal> and - <literal>dictdWiktionary</literal> which is now at - <literal>dictdDBs.wiktionary</literal> - </para> - </listitem> - <listitem> - <para> - Parsoid service now uses YAML configuration format. - <literal>service.parsoid.interwikis</literal> is now called - <literal>service.parsoid.wikis</literal> and is a list of - either API URLs or attribute sets as specified in parsoid’s - documentation. - </para> - </listitem> - <listitem> - <para> - <literal>Ntpd</literal> was replaced by - <literal>systemd-timesyncd</literal> as the default service to - synchronize system time with a remote NTP server. The old - behavior can be restored by setting - <literal>services.ntp.enable</literal> to - <literal>true</literal>. Upstream time servers for all NTP - implementations are now configured using - <literal>networking.timeServers</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>service.nylon</literal> is now declared using named - instances. As an example: - </para> - <programlisting language="nix"> -{ - services.nylon = { - enable = true; - acceptInterface = "br0"; - bindInterface = "tun1"; - port = 5912; - }; -} -</programlisting> - <para> - should be replaced with: - </para> - <programlisting language="nix"> -{ - services.nylon.myvpn = { - enable = true; - acceptInterface = "br0"; - bindInterface = "tun1"; - port = 5912; - }; -} -</programlisting> - <para> - this enables you to declare a SOCKS proxy for each uplink. - </para> - </listitem> - <listitem> - <para> - <literal>overridePackages</literal> function no longer exists. - It is replaced by - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> - overlays</link>. For example, the following code: - </para> - <programlisting language="nix"> -let - pkgs = import <nixpkgs> {}; -in - pkgs.overridePackages (self: super: ...) -</programlisting> - <para> - should be replaced by: - </para> - <programlisting language="nix"> -let - pkgs = import <nixpkgs> {}; -in - import pkgs.path { overlays = [(self: super: ...)]; } -</programlisting> - </listitem> - <listitem> - <para> - 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 - <literal>networking.firewall.autoLoadConntrackHelpers</literal> - and tune - <literal>networking.firewall.connectionTrackingModules</literal> - to suit your needs. - </para> - </listitem> - <listitem> - <para> - <literal>local_recipient_maps</literal> 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 - <literal>services.postfix.extraConfig</literal>. - </para> - </listitem> - <listitem> - <para> - 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 <literal>-4</literal> and <literal>-6</literal> have - been added. One notable incompatibility is that specifying an - interface (for link-local IPv6 for instance) is no longer done - with the <literal>-I</literal> flag, but by encoding the - interface into the address - (<literal>ping fe80::1%eth0</literal>). - </para> - </listitem> - <listitem> - <para> - The socket handling of the <literal>services.rmilter</literal> - module has been fixed and refactored. As rmilter doesn’t - support binding to more than one socket, the options - <literal>bindUnixSockets</literal> and - <literal>bindInetSockets</literal> have been replaced by - <literal>services.rmilter.bindSocket.*</literal>. The default - is still a unix socket in - <literal>/run/rmilter/rmilter.sock</literal>. Refer to the - options documentation for more information. - </para> - </listitem> - <listitem> - <para> - The <literal>fetch*</literal> functions no longer support md5, - please use sha256 instead. - </para> - </listitem> - <listitem> - <para> - The dnscrypt-proxy module interface has been streamlined - around the <literal>extraArgs</literal> option. Where - possible, legacy option declarations are mapped to - <literal>extraArgs</literal> but will emit warnings. The - <literal>resolverList</literal> has been outright removed: to - use an unlisted resolver, use the - <literal>customResolver</literal> option. - </para> - </listitem> - <listitem> - <para> - torbrowser now stores local state under - <literal>~/.local/share/tor-browser</literal> by default. Any - browser profile data from the old location, - <literal>~/.torbrowser4</literal>, must be migrated manually. - </para> - </listitem> - <listitem> - <para> - The ihaskell, monetdb, offlineimap and sitecopy services have - been removed. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-17.03-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - <literal>jre</literal> 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 - <literal>jre_headless</literal>. - </para> - </listitem> - <listitem> - <para> - Python 2.6 interpreter and package set have been removed. - </para> - </listitem> - <listitem> - <para> - The Python 2.7 interpreter does not use modules anymore. - Instead, all CPython interpreters now include the whole - standard library except for `tkinter`, which is available in - the Python package set. - </para> - </listitem> - <listitem> - <para> - Python 2.7, 3.5 and 3.6 are now built deterministically and - 3.4 mostly. Minor modifications had to be made to the - interpreters in order to generate deterministic bytecode. This - has security implications and is relevant for those using - Python in a <literal>nix-shell</literal>. See the Nixpkgs - manual for details. - </para> - </listitem> - <listitem> - <para> - The Python package sets now use a fixed-point combinator and - the sets are available as attributes of the interpreters. - </para> - </listitem> - <listitem> - <para> - The Python function <literal>buildPythonPackage</literal> has - been improved and can be used to build from Setuptools source, - Flit source, and precompiled Wheels. - </para> - </listitem> - <listitem> - <para> - When adding new or updating current Python libraries, the - expressions should be put in separate files in - <literal>pkgs/development/python-modules</literal> and called - from <literal>python-packages.nix</literal>. - </para> - </listitem> - <listitem> - <para> - The dnscrypt-proxy service supports synchronizing the list of - public resolvers without working DNS resolution. This fixes - issues caused by the resolver list becoming outdated. It also - improves the viability of DNSCrypt only configurations. - </para> - </listitem> - <listitem> - <para> - Containers using bridged networking no longer lose their - connection after changes to the host networking. - </para> - </listitem> - <listitem> - <para> - ZFS supports pool auto scrubbing. - </para> - </listitem> - <listitem> - <para> - The bind DNS utilities (e.g. dig) have been split into their - own output and are now also available in - <literal>pkgs.dnsutils</literal> and it is no longer necessary - to pull in all of <literal>bind</literal> to use them. - </para> - </listitem> - <listitem> - <para> - Per-user configuration was moved from - <literal>~/.nixpkgs</literal> to - <literal>~/.config/nixpkgs</literal>. The former is still - valid for <literal>config.nix</literal> for backwards - compatibility. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 849ec868c783b..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml +++ /dev/null @@ -1,922 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-17.09"> - <title>Release 17.09 (<quote>Hummingbird</quote>, 2017/09/??)</title> - <section xml:id="sec-release-17.09-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - The GNOME version is now 3.24. KDE Plasma was upgraded to - 5.10, KDE Applications to 17.08.1 and KDE Frameworks to 5.37. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The module option - <literal>services.xserver.xrandrHeads</literal> 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: - </para> - <programlisting language="nix"> -{ services.xserver.xrandrHeads = [ - "HDMI-0" - { - output = "DVI-0"; - primary = true; - monitorConfig = '' - Option "Rotate" "right" - ''; - } - ]; -} -</programlisting> - <para> - This will set the <literal>DVI-0</literal> output to be the - primary head, even though <literal>HDMI-0</literal> is the - first head in the list. - </para> - </listitem> - <listitem> - <para> - The handling of SSL in the <literal>services.nginx</literal> - module has been cleaned up, renaming the misnamed - <literal>enableSSL</literal> to <literal>onlySSL</literal> - which reflects its original intention. This is not to be used - with the already existing <literal>forceSSL</literal> which - creates a second non-SSL virtual host redirecting to the SSL - virtual host. This by chance had worked earlier due to - specific implementation details. In case you had specified - both please remove the <literal>enableSSL</literal> option to - keep the previous behaviour. - </para> - <para> - Another <literal>addSSL</literal> option has been introduced - to configure both a non-SSL virtual host and an SSL virtual - host with the same configuration. - </para> - <para> - Options to configure <literal>resolver</literal> options and - <literal>upstream</literal> blocks have been introduced. See - their information for further details. - </para> - <para> - The <literal>port</literal> option has been replaced by a more - generic <literal>listen</literal> option which makes it - possible to specify multiple addresses, ports and SSL configs - dependant on the new SSL handling mentioned above. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-17.09-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>config/fonts/fontconfig-penultimate.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>config/fonts/fontconfig-ultimate.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>config/terminfo.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/sensor/iio.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/nitrokey.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>hardware/raid/hpsa.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/browserpass.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/gnupg.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/qt5ct.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/slock.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs/thefuck.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>security/auditd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>security/lock-kernel-modules.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>service-managers/docker.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>service-managers/trivial.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/admin/salt/master.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/admin/salt/minion.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/audio/slimserver.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/cluster/kubernetes/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/cluster/kubernetes/dns.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/cluster/kubernetes/dashboard.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/continuous-integration/hail.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/databases/clickhouse.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/databases/postage.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/desktops/gnome3/gnome-disks.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/desktops/gnome3/gpaste.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/logging/SystemdJournal2Gelf.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/logging/heartbeat.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/logging/journalwatch.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/logging/syslogd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/mailhog.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/mail/nullmailer.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/airsonic.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/autorandr.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/exhibitor.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/fstrim.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/gollum.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/irkerd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/jackett.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/radarr.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/misc/snapper.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/osquery.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/collectd-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/monitoring/prometheus/fritzbox-exporter.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/network-filesystems/kbfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/dnscache.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/fireqos.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/iwd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/keepalived/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/keybase.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/lldpd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/matterbridge.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/squid.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/tinydns.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/networking/xrdp.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/shibboleth-sp.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/sks.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/sshguard.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/torify.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/usbguard.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/security/vault.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/system/earlyoom.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/system/saslauthd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/nexus.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/pgpkeyserver-lite.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-apps/piwik.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-servers/lighttpd/collectd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/web-servers/minio.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/display-managers/xpra.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services/x11/xautolock.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>tasks/filesystems/bcachefs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>tasks/powertop.nix</literal> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-17.09-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - <emphasis role="strong">In an Qemu-based virtualization - environment, the network interface names changed from i.e. - <literal>enp0s3</literal> to - <literal>ens3</literal>.</emphasis> - </para> - <para> - This is due to a kernel configuration change. The new naming - is consistent with those of other Linux distributions with - systemd. See - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link> - for more information. - </para> - <para> - A machine is affected if the <literal>virt-what</literal> tool - either returns <literal>qemu</literal> or - <literal>kvm</literal> <emphasis>and</emphasis> has interface - names used in any part of its NixOS configuration, in - particular if a static network configuration with - <literal>networking.interfaces</literal> is used. - </para> - <para> - Before rebooting affected machines, please ensure: - </para> - <itemizedlist> - <listitem> - <para> - Change the interface names in your NixOS configuration. - The first interface will be called - <literal>ens3</literal>, the second one - <literal>ens8</literal> and starting from there - incremented by 1. - </para> - </listitem> - <listitem> - <para> - After changing the interface names, rebuild your system - with <literal>nixos-rebuild boot</literal> to activate the - new configuration after a reboot. If you switch to the new - configuration right away you might lose network - connectivity! If using <literal>nixops</literal>, deploy - with <literal>nixops deploy --force-reboot</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The following changes apply if the - <literal>stateVersion</literal> is changed to 17.09 or higher. - For <literal>stateVersion = "17.03"</literal> or - lower the old behavior is preserved. - </para> - <itemizedlist> - <listitem> - <para> - The <literal>postgres</literal> default version was - changed from 9.5 to 9.6. - </para> - </listitem> - <listitem> - <para> - The <literal>postgres</literal> superuser name has changed - from <literal>root</literal> to - <literal>postgres</literal> to more closely follow what - other Linux distributions are doing. - </para> - </listitem> - <listitem> - <para> - The <literal>postgres</literal> default - <literal>dataDir</literal> has changed from - <literal>/var/db/postgres</literal> to - <literal>/var/lib/postgresql/$psqlSchema</literal> where - $psqlSchema is 9.6 for example. - </para> - </listitem> - <listitem> - <para> - The <literal>mysql</literal> default - <literal>dataDir</literal> has changed from - <literal>/var/mysql</literal> to - <literal>/var/lib/mysql</literal>. - </para> - </listitem> - <listitem> - <para> - Radicale’s default package has changed from 1.x to 2.x. - Instructions to migrate can be found - <link xlink:href="http://radicale.org/1to2/"> here - </link>. It is also possible to use the newer version by - setting the <literal>package</literal> to - <literal>radicale2</literal>, which is done automatically - when <literal>stateVersion</literal> is 17.09 or higher. - The <literal>extraArgs</literal> option has been added to - allow passing the data migration arguments specified in - the instructions; see the <literal>radicale.nix</literal> - NixOS test for an example migration. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>aiccu</literal> package was removed. This is due - to SixXS <link xlink:href="https://www.sixxs.net/main/"> - sunsetting</link> its IPv6 tunnel. - </para> - </listitem> - <listitem> - <para> - The <literal>fanctl</literal> package and - <literal>fan</literal> module have been removed due to the - developers not upstreaming their iproute2 patches and lagging - with compatibility to recent iproute2 versions. - </para> - </listitem> - <listitem> - <para> - Top-level <literal>idea</literal> package collection was - renamed. All JetBrains IDEs are now at - <literal>jetbrains</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>flexget</literal>’s state database cannot be upgraded - to its new internal format, requiring removal of any existing - <literal>db-config.sqlite</literal> which will be - automatically recreated. - </para> - </listitem> - <listitem> - <para> - The <literal>ipfs</literal> service now doesn’t ignore the - <literal>dataDir</literal> 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 - </para> - <programlisting> -dataDir=<valueOfDataDir> -mv /var/lib/ipfs/.ipfs/* $dataDir -rmdir /var/lib/ipfs/.ipfs -</programlisting> - </listitem> - <listitem> - <para> - The <literal>caddy</literal> service was previously using an - extra <literal>.caddy</literal> directory in the data - directory specified with the <literal>dataDir</literal> - option. The contents of the <literal>.caddy</literal> - directory are now expected to be in the - <literal>dataDir</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>ssh-agent</literal> user service is not started - by default anymore. Use - <literal>programs.ssh.startAgent</literal> to enable it if - needed. There is also a new - <literal>programs.gnupg.agent</literal> module that creates a - <literal>gpg-agent</literal> user service. It can also serve - as a SSH agent if <literal>enableSSHSupport</literal> is set. - </para> - </listitem> - <listitem> - <para> - The - <literal>services.tinc.networks.<name>.listenAddress</literal> - option had a misleading name that did not correspond to its - behavior. It now correctly defines the ip to listen for - incoming connections on. To keep the previous behaviour, use - <literal>services.tinc.networks.<name>.bindToAddress</literal> - instead. Refer to the description of the options for more - details. - </para> - </listitem> - <listitem> - <para> - <literal>tlsdate</literal> package and module were removed. - This is due to the project being dead and not building with - openssl 1.1. - </para> - </listitem> - <listitem> - <para> - <literal>wvdial</literal> package and module were removed. - This is due to the project being dead and not building with - openssl 1.1. - </para> - </listitem> - <listitem> - <para> - <literal>cc-wrapper</literal><quote>s setup-hook now exports a - number of environment variables corresponding to binutils - binaries, (e.g. <literal>LD</literal>, - <literal>STRIP</literal>, <literal>RANLIB</literal>, etc). - This is done to prevent packages</quote> 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. - </para> - </listitem> - <listitem> - <para> - <literal>services.firefox.syncserver</literal> 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. - </para> - </listitem> - <listitem> - <para> - The <literal>compiz</literal> window manager and package was - removed. The system support had been broken for several years. - </para> - </listitem> - <listitem> - <para> - Touchpad support should now be enabled through - <literal>libinput</literal> as <literal>synaptics</literal> is - now deprecated. See the option - <literal>services.xserver.libinput.enable</literal>. - </para> - </listitem> - <listitem> - <para> - grsecurity/PaX support has been dropped, following upstream’s - decision to cease free support. See - <link xlink:href="https://grsecurity.net/passing_the_baton.php"> - upstream’s announcement</link> for more information. No - complete replacement for grsecurity/PaX is available - presently. - </para> - </listitem> - <listitem> - <para> - <literal>services.mysql</literal> now has declarative - configuration of databases and users with the - <literal>ensureDatabases</literal> and - <literal>ensureUsers</literal> options. - </para> - <para> - These options will never delete existing databases and users, - especially not when the value of the options are changed. - </para> - <para> - The MySQL users will be identified using - <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/"> - Unix socket authentication</link>. This authenticates the Unix - user with the same name only, and that without the need for a - password. - </para> - <para> - If you have previously created a MySQL <literal>root</literal> - user <emphasis>with a password</emphasis>, you will need to - add <literal>root</literal> user for unix socket - authentication before using the new options. This can be done - by running the following SQL script: - </para> - <programlisting language="SQL"> -CREATE USER 'root'@'%' IDENTIFIED BY ''; -GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; -FLUSH PRIVILEGES; - --- Optionally, delete the password-authenticated user: --- DROP USER 'root'@'localhost'; -</programlisting> - </listitem> - <listitem> - <para> - <literal>services.mysqlBackup</literal> now works by default - without any user setup, including for users other than - <literal>mysql</literal>. - </para> - <para> - By default, the <literal>mysql</literal> user is no longer the - user which performs the backup. Instead a system account - <literal>mysqlbackup</literal> is used. - </para> - <para> - The <literal>mysqlBackup</literal> service is also now using - systemd timers instead of <literal>cron</literal>. - </para> - <para> - Therefore, the <literal>services.mysqlBackup.period</literal> - option no longer exists, and has been replaced with - <literal>services.mysqlBackup.calendar</literal>, which is in - the format of - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events">systemd.time(7)</link>. - </para> - <para> - If you expect to be sent an e-mail when the backup fails, - consider using a script which monitors the systemd journal for - errors. Regretfully, at present there is no built-in - functionality for this. - </para> - <para> - You can check that backups still work by running - <literal>systemctl start mysql-backup</literal> then - <literal>systemctl status mysql-backup</literal>. - </para> - </listitem> - <listitem> - <para> - Templated systemd services e.g - <literal>container@name</literal> are now handled currectly - when switching to a new configuration, resulting in them being - reloaded. - </para> - </listitem> - <listitem> - <para> - Steam: the <literal>newStdcpp</literal> parameter was removed - and should not be needed anymore. - </para> - </listitem> - <listitem> - <para> - Redis has been updated to version 4 which mandates a cluster - mass-restart, due to changes in the network handling, in order - to ensure compatibility with networks NATing traffic. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-17.09-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - Modules can now be disabled by using - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules"> - disabledModules</link>, 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. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - ZFS/SPL have been updated to 0.7.0, - <literal>zfsUnstable, splUnstable</literal> have therefore - been removed. - </para> - </listitem> - <listitem> - <para> - The <literal>time.timeZone</literal> option now allows the - value <literal>null</literal> in addition to timezone strings. - This value allows changing the timezone of a system - imperatively using - <literal>timedatectl set-timezone</literal>. The default - timezone is still UTC. - </para> - </listitem> - <listitem> - <para> - Nixpkgs overlays may now be specified with a file as well as a - directory. The value of - <literal><nixpkgs-overlays></literal> may be a file, and - <literal>~/.config/nixpkgs/overlays.nix</literal> can be used - instead of the <literal>~/.config/nixpkgs/overlays</literal> - directory. - </para> - <para> - See the overlays chapter of the Nixpkgs manual for more - details. - </para> - </listitem> - <listitem> - <para> - Definitions for <literal>/etc/hosts</literal> can now be - specified declaratively with - <literal>networking.hosts</literal>. - </para> - </listitem> - <listitem> - <para> - Two new options have been added to the installer loader, in - addition to the default having changed. The kernel log - verbosity has been lowered to the upstream default for the - default options, in order to not spam the console when e.g. - joining a network. - </para> - <para> - This therefore leads to adding a new <literal>debug</literal> - option to set the log level to the previous verbose mode, to - make debugging easier, but still accessible easily. - </para> - <para> - Additionally a <literal>copytoram</literal> option has been - added, which makes it possible to remove the install medium - after booting. This allows tethering from your phone after - booting from it. - </para> - </listitem> - <listitem> - <para> - <literal>services.gitlab-runner.configOptions</literal> has - been added to specify the configuration of gitlab-runners - declaratively. - </para> - </listitem> - <listitem> - <para> - <literal>services.jenkins.plugins</literal> has been added to - install plugins easily, this can be generated with - jenkinsPlugins2nix. - </para> - </listitem> - <listitem> - <para> - <literal>services.postfix.config</literal> has been added to - specify the main.cf with NixOS options. Additionally other - options have been added to the postfix module and has been - improved further. - </para> - </listitem> - <listitem> - <para> - The GitLab package and module have been updated to the latest - 10.0 release. - </para> - </listitem> - <listitem> - <para> - The <literal>systemd-boot</literal> boot loader now lists the - NixOS version, kernel version and build date of all bootable - generations. - </para> - </listitem> - <listitem> - <para> - The dnscrypt-proxy service now defaults to using a random - upstream resolver, selected from the list of public - non-logging resolvers with DNSSEC support. Existing - configurations can be migrated to this mode of operation by - omitting the - <literal>services.dnscrypt-proxy.resolverName</literal> option - or setting it to <literal>"random"</literal>. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index f197c52906b01..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml +++ /dev/null @@ -1,879 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-18.03"> - <title>Release 18.03 (<quote>Impala</quote>, 2018/04/04)</title> - <section xml:id="sec-release-18.03-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - End of support is planned for end of October 2018, handing - over to 18.09. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - Nix now defaults to 2.0; see its - <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> - 2.26, gcc: 6 -> 7, systemd: 234 -> 237. - </para> - </listitem> - <listitem> - <para> - Desktop version changes: gnome: 3.24 -> 3.26, (KDE) - plasma-desktop: 5.10 -> 5.12. - </para> - </listitem> - <listitem> - <para> - MariaDB 10.2, updated from 10.1, is now the default MySQL - implementation. While upgrading a few changes have been made - to the infrastructure involved: - </para> - <itemizedlist> - <listitem> - <para> - <literal>libmysql</literal> has been deprecated, please - use <literal>mysql.connector-c</literal> instead, a - compatibility passthru has been added to the MySQL - packages. - </para> - </listitem> - <listitem> - <para> - The <literal>mysql57</literal> package has a new - <literal>static</literal> output containing the static - libraries including <literal>libmysqld.a</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - PHP now defaults to PHP 7.2, updated from 7.1. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-18.03-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>./config/krb5/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./hardware/digitalbitbox.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./misc/label.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/ccache.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/criu.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/digitalbitbox/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/less.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/npm.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/plotinus.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/rootston.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/systemtap.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/sway.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/udevil.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/way-cooler.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/yabar.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/zsh/zsh-autoenv.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/borgbackup.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/crashplan-small-business.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/dleyna-renderer.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/dleyna-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/pipewire.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/gnome3/chrome-gnome-shell.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/gnome3/tracker-miners.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/fwupd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/interception-tools.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/u2f.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/usbmuxd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/mail/clamsmtp.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/mail/dkimproxy-out.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/mail/pfix-srsd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/gitea.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/home-assistant.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/ihaskell.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/logkeys.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/novacomd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/osrm.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/plexpy.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/pykms.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/tzupdate.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/monitoring/fusion-inventory.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/monitoring/prometheus/exporters.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/beegfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/davfs2.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/openafs/client.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/openafs/server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/ceph.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/aria2.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/monero.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/nghttpx/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/nixops-dns.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/rxe.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/stunnel.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/matomo.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/restya-board.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-servers/mighttpd2.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/x11/fractalart.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./system/boot/binfmt.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./system/boot/grow-partition.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./tasks/filesystems/ecryptfs.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./virtualisation/hyperv-guest.nix</literal> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-18.03-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - <literal>sound.enable</literal> now defaults to false. - </para> - </listitem> - <listitem> - <para> - Dollar signs in options under - <literal>services.postfix</literal> are passed verbatim to - Postfix, which will interpret them as the beginning of a - parameter expression. This was already true for string-valued - options in the previous release, but not for list-valued - options. If you need to pass literal dollar signs through - Postfix, double them. - </para> - </listitem> - <listitem> - <para> - The <literal>postage</literal> package (for web-based - PostgreSQL administration) has been renamed to - <literal>pgmanage</literal>. The corresponding module has also - been renamed. To migrate please rename all - <literal>services.postage</literal> options to - <literal>services.pgmanage</literal>. - </para> - </listitem> - <listitem> - <para> - Package attributes starting with a digit have been prefixed - with an underscore sign. This is to avoid quoting in the - configuration and other issues with command-line tools like - <literal>nix-env</literal>. The change affects the following - packages: - </para> - <itemizedlist> - <listitem> - <para> - <literal>2048-in-terminal</literal> → - <literal>_2048-in-terminal</literal> - </para> - </listitem> - <listitem> - <para> - <literal>90secondportraits</literal> → - <literal>_90secondportraits</literal> - </para> - </listitem> - <listitem> - <para> - <literal>2bwm</literal> → <literal>_2bwm</literal> - </para> - </listitem> - <listitem> - <para> - <literal>389-ds-base</literal> → - <literal>_389-ds-base</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <emphasis role="strong">The OpenSSH service no longer enables - support for DSA keys by default, which could cause a system - lock out. Update your keys or, unfavorably, re-enable DSA - support manually.</emphasis> - </para> - <para> - DSA support was - <link xlink:href="https://www.openssh.com/legacy.html">deprecated - in OpenSSH 7.0</link>, due to it being too weak. To re-enable - support, add - <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end - of your <literal>services.openssh.extraConfig</literal>. - </para> - <para> - After updating the keys to be stronger, anyone still on a - pre-17.03 version is safe to jump to 17.03, as vetted - <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>openssh</literal> package now includes Kerberos - support by default; the - <literal>openssh_with_kerberos</literal> package is now a - deprecated alias. If you do not want Kerberos support, you can - do - <literal>openssh.override { withKerberos = false; }</literal>. - Note, this also applies to the <literal>openssh_hpn</literal> - package. - </para> - </listitem> - <listitem> - <para> - <literal>cc-wrapper</literal> has been split in two; there is - now also a <literal>bintools-wrapper</literal>. The most - commonly used files in <literal>nix-support</literal> are now - split between the two wrappers. Some commonly used ones, like - <literal>nix-support/dynamic-linker</literal>, are duplicated - for backwards compatability, even though they rightly belong - only in <literal>bintools-wrapper</literal>. Other more - obscure ones are just moved. - </para> - </listitem> - <listitem> - <para> - The propagation logic has been changed. The new logic, along - with new types of dependencies that go with, is thoroughly - documented in the <quote>Specifying dependencies</quote> - section of the <quote>Standard Environment</quote> 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 - <literal>propagatedNativeBuildInputs</literal> should instead - be <literal>propagatedBuildInputs</literal>. Thankfully, that - was and is the least used type of dependency. Also, it means - that some <literal>propagatedBuildInputs</literal> should - instead be <literal>depsTargetTargetPropagated</literal>. - Other types dependencies should be unaffected. - </para> - </listitem> - <listitem> - <para> - <literal>lib.addPassthru drv passthru</literal> is removed. - Use <literal>lib.extendDerivation true passthru drv</literal> - instead. - </para> - </listitem> - <listitem> - <para> - The <literal>memcached</literal> service no longer accept - dynamic socket paths via - <literal>services.memcached.socket</literal>. Unix sockets can - be still enabled by - <literal>services.memcached.enableUnixSocket</literal> and - will be accessible at - <literal>/run/memcached/memcached.sock</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>hardware.amdHybridGraphics.disable</literal> - 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. - </para> - </listitem> - <listitem> - <para> - The merging of config options for - <literal>services.postfix.config</literal> was buggy. - Previously, if other options in the Postfix module like - <literal>services.postfix.useSrs</literal> 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, <literal>lib.mkForce</literal> or - <literal>lib.mkOverride</literal> can be used. - </para> - </listitem> - <listitem> - <para> - The following changes apply if the - <literal>stateVersion</literal> is changed to 18.03 or higher. - For <literal>stateVersion = "17.09"</literal> or - lower the old behavior is preserved. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>matrix-synapse</literal> uses postgresql by - default instead of sqlite. Migration instructions can be - found - <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite"> - here </link>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>jid</literal> package has been removed, due to - maintenance overhead of a go package having non-versioned - dependencies. - </para> - </listitem> - <listitem> - <para> - When using <literal>services.xserver.libinput</literal> - (enabled by default in GNOME), it now handles all input - devices, not just touchpads. As a result, you might need to - re-evaluate any custom Xorg configuration. In particular, - <literal>Option "XkbRules" "base"</literal> - may result in broken keyboard layout. - </para> - </listitem> - <listitem> - <para> - The <literal>attic</literal> package was removed. A maintained - fork called - <link xlink:href="https://www.borgbackup.org/">Borg</link> - should be used instead. Migration instructions can be found - <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>. - </para> - </listitem> - <listitem> - <para> - The Piwik analytics software was renamed to Matomo: - </para> - <itemizedlist> - <listitem> - <para> - The package <literal>pkgs.piwik</literal> was renamed to - <literal>pkgs.matomo</literal>. - </para> - </listitem> - <listitem> - <para> - The service <literal>services.piwik</literal> was renamed - to <literal>services.matomo</literal>. - </para> - </listitem> - <listitem> - <para> - The data directory <literal>/var/lib/piwik</literal> was - renamed to <literal>/var/lib/matomo</literal>. All files - will be moved automatically on first startup, but you - might need to adjust your backup scripts. - </para> - </listitem> - <listitem> - <para> - The default <literal>serverName</literal> for the nginx - configuration changed from - <literal>piwik.${config.networking.hostName}</literal> to - <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal> - if <literal>config.networking.domain</literal> is set, - <literal>matomo.${config.networking.hostName}</literal> if - it is not set. If you change your - <literal>serverName</literal>, remember you’ll need to - update the <literal>trustedHosts[]</literal> array in - <literal>/var/lib/matomo/config/config.ini.php</literal> - as well. - </para> - </listitem> - <listitem> - <para> - The <literal>piwik</literal> user was renamed to - <literal>matomo</literal>. The service will adjust - ownership automatically for files in the data directory. - If you use unix socket authentication, remember to give - the new <literal>matomo</literal> user access to the - database and to change the <literal>username</literal> to - <literal>matomo</literal> in the - <literal>[database]</literal> section of - <literal>/var/lib/matomo/config/config.ini.php</literal>. - </para> - </listitem> - <listitem> - <para> - If you named your database `piwik`, you might want to - rename it to `matomo` to keep things clean, but this is - neither enforced nor required. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>nodejs-4_x</literal> is end-of-life. - <literal>nodejs-4_x</literal>, - <literal>nodejs-slim-4_x</literal> and - <literal>nodePackages_4_x</literal> are removed. - </para> - </listitem> - <listitem> - <para> - The <literal>pump.io</literal> NixOS module was removed. It is - now maintained as an - <link xlink:href="https://github.com/rvl/pump.io-nixos">external - module</link>. - </para> - </listitem> - <listitem> - <para> - The Prosody XMPP server has received a major update. The - following modules were renamed: - </para> - <itemizedlist> - <listitem> - <para> - <literal>services.prosody.modules.httpserver</literal> is - now <literal>services.prosody.modules.http_files</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.prosody.modules.console</literal> is now - <literal>services.prosody.modules.admin_telnet</literal> - </para> - </listitem> - </itemizedlist> - <para> - Many new modules are now core modules, most notably - <literal>services.prosody.modules.carbons</literal> and - <literal>services.prosody.modules.mam</literal>. - </para> - <para> - The better-performing <literal>libevent</literal> backend is - now enabled by default. - </para> - <para> - <literal>withCommunityModules</literal> now passes through the - modules to <literal>services.prosody.extraModules</literal>. - Use <literal>withOnlyInstalledCommunityModules</literal> for - modules that should not be enabled directly, e.g - <literal>lib_ldap</literal>. - </para> - </listitem> - <listitem> - <para> - All prometheus exporter modules are now defined as submodules. - The exporters are configured using - <literal>services.prometheus.exporters</literal>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-18.03-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - ZNC option <literal>services.znc.mutable</literal> now - defaults to <literal>true</literal>. That means that old - configuration is not overwritten by default when update to the - znc options are made. - </para> - </listitem> - <listitem> - <para> - The option - <literal>networking.wireless.networks.<name>.auth</literal> - has been added for wireless networks with WPA-Enterprise - authentication. There is also a new - <literal>extraConfig</literal> option to directly configure - <literal>wpa_supplicant</literal> and - <literal>hidden</literal> to connect to hidden networks. - </para> - </listitem> - <listitem> - <para> - In the module - <literal>networking.interfaces.<name></literal> the - following options have been removed: - </para> - <itemizedlist> - <listitem> - <para> - <literal>ipAddress</literal> - </para> - </listitem> - <listitem> - <para> - <literal>ipv6Address</literal> - </para> - </listitem> - <listitem> - <para> - <literal>prefixLength</literal> - </para> - </listitem> - <listitem> - <para> - <literal>ipv6PrefixLength</literal> - </para> - </listitem> - <listitem> - <para> - <literal>subnetMask</literal> - </para> - </listitem> - </itemizedlist> - <para> - To assign static addresses to an interface the options - <literal>ipv4.addresses</literal> and - <literal>ipv6.addresses</literal> should be used instead. The - options <literal>ip4</literal> and <literal>ip6</literal> have - been renamed to <literal>ipv4.addresses</literal> - <literal>ipv6.addresses</literal> respectively. The new - options <literal>ipv4.routes</literal> and - <literal>ipv6.routes</literal> have been added to set up - static routing. - </para> - </listitem> - <listitem> - <para> - The option <literal>services.logstash.listenAddress</literal> - is now <literal>127.0.0.1</literal> by default. Previously the - default behaviour was to listen on all interfaces. - </para> - </listitem> - <listitem> - <para> - <literal>services.btrfs.autoScrub</literal> has been added, to - periodically check btrfs filesystems for data corruption. If - there’s a correct copy available, it will automatically repair - corrupted blocks. - </para> - </listitem> - <listitem> - <para> - <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> - has been added, the clock format string (as expected by - strftime, e.g. <literal>%H:%M</literal>) to use with the - lightdm gtk greeter panel. - </para> - <para> - If set to null the default clock format is used. - </para> - </listitem> - <listitem> - <para> - <literal>displayManager.lightdm.greeters.gtk.indicators</literal> - has been added, a list of allowed indicator modules to use - with the lightdm gtk greeter panel. - </para> - <para> - Built-in indicators include <literal>~a11y</literal>, - <literal>~language</literal>, <literal>~session</literal>, - <literal>~power</literal>, <literal>~clock</literal>, - <literal>~host</literal>, <literal>~spacer</literal>. Unity - indicators can be represented by short name (e.g. - <literal>sound</literal>, <literal>power</literal>), service - file name, or absolute path. - </para> - <para> - If set to <literal>null</literal> the default indicators are - used. - </para> - <para> - In order to have the previous default configuration add - </para> - <programlisting language="nix"> -{ - services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ - "~host" "~spacer" - "~clock" "~spacer" - "~session" - "~language" - "~a11y" - "~power" - ]; -} -</programlisting> - <para> - to your <literal>configuration.nix</literal>. - </para> - </listitem> - <listitem> - <para> - The NixOS test driver supports user services declared by - <literal>systemd.user.services</literal>. The methods - <literal>waitForUnit</literal>, - <literal>getUnitInfo</literal>, <literal>startJob</literal> - and <literal>stopJob</literal> provide an optional - <literal>$user</literal> argument for that purpose. - </para> - </listitem> - <listitem> - <para> - Enabling bash completion on NixOS, - <literal>programs.bash.enableCompletion</literal>, will now - also enable completion for the Nix command line tools by - installing the - <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link> - package. - </para> - </listitem> - <listitem> - <para> - The vim/kakoune plugin updater now reads from a CSV file: - check - <literal>pkgs/applications/editors/vim/plugins/vim-plugin-names</literal> - out to see the new format - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 4bbfa7be398eb..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml +++ /dev/null @@ -1,941 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-18.09"> - <title>Release 18.09 (<quote>Jellyfish</quote>, 2018/10/05)</title> - <section xml:id="sec-release-18.09-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following notable updates: - </para> - <itemizedlist> - <listitem> - <para> - End of support is planned for end of April 2019, handing over - to 19.03. - </para> - </listitem> - <listitem> - <para> - Platform support: x86_64-linux and x86_64-darwin as always. - Support for aarch64-linux is as with the previous releases, - not equivalent to the x86-64-linux release, but with efforts - to reach parity. - </para> - </listitem> - <listitem> - <para> - Nix has been updated to 2.1; see its - <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → - 2.27, gcc: 7 (unchanged), systemd: 237 → 239. - </para> - </listitem> - <listitem> - <para> - Desktop version changes: gnome: 3.26 → 3.28, (KDE) - plasma-desktop: 5.12 → 5.13. - </para> - </listitem> - </itemizedlist> - <para> - Notable changes and additions for 18.09 include: - </para> - <itemizedlist> - <listitem> - <para> - Support for wrapping binaries using - <literal>firejail</literal> has been added through - <literal>programs.firejail.wrappedBinaries</literal>. - </para> - <para> - For example - </para> - <programlisting language="nix"> -{ - programs.firejail = { - enable = true; - wrappedBinaries = { - firefox = "${lib.getBin pkgs.firefox}/bin/firefox"; - mpv = "${lib.getBin pkgs.mpv}/bin/mpv"; - }; - }; -} -</programlisting> - <para> - This will place <literal>firefox</literal> and - <literal>mpv</literal> binaries in the global path wrapped by - firejail. - </para> - </listitem> - <listitem> - <para> - User channels are now in the default - <literal>NIX_PATH</literal>, allowing users to use their - personal <literal>nix-channel</literal> defined channels in - <literal>nix-build</literal> and <literal>nix-shell</literal> - commands, as well as in imports like - <literal>import <mychannel></literal>. - </para> - <para> - For example - </para> - <programlisting> -$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable -$ nix-channel --update -$ nix-build '<nixpkgsunstable>' -A gitFull -$ nix run -f '<nixpkgsunstable>' gitFull -$ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' -</programlisting> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-18.09-new-services"> - <title>New Services</title> - <para> - A curated selection of new services that were added since the last - release: - </para> - <itemizedlist> - <listitem> - <para> - The <literal>services.cassandra</literal> module has been - reworked and was rewritten from scratch. The service has - succeeding tests for the versions 2.1, 2.2, 3.0 and 3.11 of - <link xlink:href="https://cassandra.apache.org/">Apache - Cassandra</link>. - </para> - </listitem> - <listitem> - <para> - There is a new <literal>services.foundationdb</literal> module - for deploying - <link xlink:href="https://www.foundationdb.org">FoundationDB</link> - clusters. - </para> - </listitem> - <listitem> - <para> - When enabled the <literal>iproute2</literal> will copy the - files expected by ip route (e.g., - <literal>rt_tables</literal>) in - <literal>/etc/iproute2</literal>. This allows to write aliases - for routing tables for instance. - </para> - </listitem> - <listitem> - <para> - <literal>services.strongswan-swanctl</literal> is a modern - replacement for <literal>services.strongswan</literal>. You - can use either one of them to setup IPsec VPNs but not both at - the same time. - </para> - <para> - <literal>services.strongswan-swanctl</literal> uses the - <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> - command which uses the modern - <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> - <emphasis>Versatile IKE Configuration Interface</emphasis>. - The deprecated <literal>ipsec</literal> command used in - <literal>services.strongswan</literal> is using the legacy - <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke - configuration interface</link>. - </para> - </listitem> - <listitem> - <para> - The new <literal>services.elasticsearch-curator</literal> - service periodically curates or manages, your Elasticsearch - indices and snapshots. - </para> - </listitem> - </itemizedlist> - <para> - Every new services: - </para> - <itemizedlist> - <listitem> - <para> - <literal>./config/xdg/autostart.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./config/xdg/icons.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./config/xdg/menus.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./config/xdg/mime.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./hardware/brightnessctl.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./hardware/onlykey.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./hardware/video/uvcvideo/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./misc/documentation.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/firejail.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/iftop.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/sedutil.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/singularity.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/xss-lock.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/zsh/zsh-autosuggestions.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/admin/oxidized.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/duplicati.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/restic.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/restic-rest-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/cluster/hadoop/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/databases/aerospike.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/databases/monetdb.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/bamf.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/flatpak.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/zeitgeist.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/development/bloop.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/development/jupyter/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/lcd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/undervolt.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/clipmenu.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/gitweb.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/serviio.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/safeeyes.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/sysprof.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/weechat.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/monitoring/datadog-agent.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/monitoring/incron.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/dnsdist.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/freeradius.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/hans.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/morty.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/ndppd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/ocserv.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/owamp.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/quagga.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/shadowsocks.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/stubby.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/zeronet.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/security/certmgr.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/security/cfssl.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/security/oauth2_proxy_nginx.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/virtlyst.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/youtrack.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-servers/hitch/default.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-servers/hydron.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-servers/meguca.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-servers/nginx/gitweb.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./virtualisation/kvmgt.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./virtualisation/qemu-guest-agent.nix</literal> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-18.09-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - Some licenses that were incorrectly not marked as unfree now - are. This is the case for: - </para> - <itemizedlist> - <listitem> - <para> - cc-by-nc-sa-20: Creative Commons Attribution Non - Commercial Share Alike 2.0 - </para> - </listitem> - <listitem> - <para> - cc-by-nc-sa-25: Creative Commons Attribution Non - Commercial Share Alike 2.5 - </para> - </listitem> - <listitem> - <para> - cc-by-nc-sa-30: Creative Commons Attribution Non - Commercial Share Alike 3.0 - </para> - </listitem> - <listitem> - <para> - cc-by-nc-sa-40: Creative Commons Attribution Non - Commercial Share Alike 4.0 - </para> - </listitem> - <listitem> - <para> - cc-by-nd-30: Creative Commons Attribution-No Derivative - Works v3.00 - </para> - </listitem> - <listitem> - <para> - msrla: Microsoft Research License Agreement - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The deprecated <literal>services.cassandra</literal> module - has seen a complete rewrite. (See above.) - </para> - </listitem> - <listitem> - <para> - <literal>lib.strict</literal> is removed. Use - <literal>builtins.seq</literal> instead. - </para> - </listitem> - <listitem> - <para> - The <literal>clementine</literal> package points now to the - free derivation. <literal>clementineFree</literal> is removed - now and <literal>clementineUnfree</literal> points to the - package which is bundled with the unfree - <literal>libspotify</literal> package. - </para> - </listitem> - <listitem> - <para> - The <literal>netcat</literal> package is now taken directly - from OpenBSD’s <literal>libressl</literal>, 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. - </para> - </listitem> - <listitem> - <para> - The <literal>services.docker-registry.extraConfig</literal> - 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 - <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the - <literal>docker/distribution</literal> docs</link>. - </para> - </listitem> - <listitem> - <para> - <literal>gnucash</literal> has changed from version 2.4 to - 3.x. If you’ve been using <literal>gnucash</literal> (version - 2.4) instead of <literal>gnucash26</literal> (version 2.6) you - must open your Gnucash data file(s) with - <literal>gnucash26</literal> and then save them to upgrade the - file format. Then you may use your data file(s) with Gnucash - 3.x. See the upgrade - <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>. - Gnucash 2.4 is still available under the attribute - <literal>gnucash24</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.munge</literal> now runs as user (and group) - <literal>munge</literal> instead of root. Make sure the key - file is accessible to the daemon. - </para> - </listitem> - <listitem> - <para> - <literal>dockerTools.buildImage</literal> now uses - <literal>null</literal> as default value for - <literal>tag</literal>, which indicates that the nix output - hash will be used as tag. - </para> - </listitem> - <listitem> - <para> - The ELK stack: <literal>elasticsearch</literal>, - <literal>logstash</literal> and <literal>kibana</literal> has - been upgraded from 2.* to 6.3.*. The 2.* versions have been - <link xlink:href="https://www.elastic.co/support/eol">unsupported - since last year</link> so they have been removed. You can - still use the 5.* versions under the names - <literal>elasticsearch5</literal>, - <literal>logstash5</literal> and <literal>kibana5</literal>. - </para> - <para> - The elastic beats: <literal>filebeat</literal>, - <literal>heartbeat</literal>, <literal>metricbeat</literal> - and <literal>packetbeat</literal> have had the same treatment: - they now target 6.3.* as well. The 5.* versions are available - under the names: <literal>filebeat5</literal>, - <literal>heartbeat5</literal>, <literal>metricbeat5</literal> - and <literal>packetbeat5</literal> - </para> - <para> - The ELK-6.3 stack now comes with - <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack - by default</link>. Since X-Pack is licensed under the - <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic - License</link> the ELK packages now have an unfree license. To - use them you need to specify - <literal>allowUnfree = true;</literal> in your nixpkgs - configuration. - </para> - <para> - Fortunately there is also a free variant of the ELK stack - without X-Pack. The packages are available under the names: - <literal>elasticsearch-oss</literal>, - <literal>logstash-oss</literal> and - <literal>kibana-oss</literal>. - </para> - </listitem> - <listitem> - <para> - Options - <literal>boot.initrd.luks.devices.name.yubikey.ramfsMountPoint</literal> - <literal>boot.initrd.luks.devices.name.yubikey.storage.mountPoint</literal> - were removed. <literal>luksroot.nix</literal> module never - supported more than one YubiKey at a time anyway, hence those - options never had any effect. You should be able to remove - them from your config without any issues. - </para> - </listitem> - <listitem> - <para> - <literal>stdenv.system</literal> and <literal>system</literal> - in nixpkgs now refer to the host platform instead of the build - platform. For native builds this is not change, let alone a - breaking one. For cross builds, it is a breaking change, and - <literal>stdenv.buildPlatform.system</literal> can be used - instead for the old behavior. They should be using that - anyways for clarity. - </para> - </listitem> - <listitem> - <para> - Groups <literal>kvm</literal> and <literal>render</literal> - are introduced now, as systemd requires them. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-18.09-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - <literal>dockerTools.pullImage</literal> relies on image - digest instead of image tag to download the image. The - <literal>sha256</literal> of a pulled image has to be updated. - </para> - </listitem> - <listitem> - <para> - <literal>lib.attrNamesToStr</literal> has been deprecated. Use - more specific concatenation - (<literal>lib.concat(Map)StringsSep</literal>) instead. - </para> - </listitem> - <listitem> - <para> - <literal>lib.addErrorContextToAttrs</literal> has been - deprecated. Use <literal>builtins.addErrorContext</literal> - directly. - </para> - </listitem> - <listitem> - <para> - <literal>lib.showVal</literal> has been deprecated. Use - <literal>lib.traceSeqN</literal> instead. - </para> - </listitem> - <listitem> - <para> - <literal>lib.traceXMLVal</literal> has been deprecated. Use - <literal>lib.traceValFn builtins.toXml</literal> instead. - </para> - </listitem> - <listitem> - <para> - <literal>lib.traceXMLValMarked</literal> has been deprecated. - Use - <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> - instead. - </para> - </listitem> - <listitem> - <para> - The <literal>pkgs</literal> argument to NixOS modules can now - be set directly using <literal>nixpkgs.pkgs</literal>. - Previously, only the <literal>system</literal>, - <literal>config</literal> and <literal>overlays</literal> - arguments could be used to influence <literal>pkgs</literal>. - </para> - </listitem> - <listitem> - <para> - A NixOS system can now be constructed more easily based on a - preexisting invocation of Nixpkgs. For example: - </para> - <programlisting language="nix"> -{ - inherit (pkgs.nixos { - boot.loader.grub.enable = false; - fileSystems."/".device = "/dev/xvda1"; - }) toplevel kernel initialRamdisk manual; -} -</programlisting> - <para> - This benefits evaluation performance, lets you write Nixpkgs - packages that depend on NixOS images and is consistent with a - deployment architecture that would be centered around Nixpkgs - overlays. - </para> - </listitem> - <listitem> - <para> - <literal>lib.traceValIfNot</literal> has been deprecated. Use - <literal>if/then/else</literal> and - <literal>lib.traceValSeq</literal> instead. - </para> - </listitem> - <listitem> - <para> - <literal>lib.traceCallXml</literal> has been deprecated. - Please complain if you use the function regularly. - </para> - </listitem> - <listitem> - <para> - The attribute <literal>lib.nixpkgsVersion</literal> has been - deprecated in favor of <literal>lib.version</literal>. Please - refer to the discussion in - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> - for further reference. - </para> - </listitem> - <listitem> - <para> - <literal>lib.recursiveUpdateUntil</literal> was not acting - according to its specification. It has been fixed to act - according to the docstring, and a test has been added. - </para> - </listitem> - <listitem> - <para> - The module for <literal>security.dhparams</literal> has two - new options now: - </para> - <variablelist> - <varlistentry> - <term> - <literal>security.dhparams.stateless</literal> - </term> - <listitem> - <para> - Puts the generated Diffie-Hellman parameters into the - Nix store instead of managing them in a stateful manner - in <literal>/var/lib/dhparams</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>security.dhparams.defaultBitSize</literal> - </term> - <listitem> - <para> - The default bit size to use for the generated - Diffie-Hellman parameters. - </para> - </listitem> - </varlistentry> - </variablelist> - <note> - <para> - The path to the actual generated parameter files should now - be queried using - <literal>config.security.dhparams.params.name.path</literal> - because it might be either in the Nix store or in a - directory configured by - <literal>security.dhparams.path</literal>. - </para> - </note> - <note> - <para> - <emphasis role="strong">For developers:</emphasis> - </para> - <para> - Module implementers should not set a specific bit size in - order to let users configure it by themselves if they want - to have a different bit size than the default (2048). - </para> - <para> - An example usage of this would be: - </para> - <programlisting language="nix"> -{ config, ... }: - -{ - security.dhparams.params.myservice = {}; - environment.etc."myservice.conf".text = '' - dhparams = ${config.security.dhparams.params.myservice.path} - ''; -} -</programlisting> - </note> - </listitem> - <listitem> - <para> - <literal>networking.networkmanager.useDnsmasq</literal> has - been deprecated. Use - <literal>networking.networkmanager.dns</literal> instead. - </para> - </listitem> - <listitem> - <para> - The Kubernetes package has been bumped to major version 1.11. - Please consult the - <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release - notes</link> for details on new features and api changes. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.kubernetes.apiserver.admissionControl</literal> - was renamed to - <literal>services.kubernetes.apiserver.enableAdmissionPlugins</literal>. - </para> - </listitem> - <listitem> - <para> - Recommended way to access the Kubernetes Dashboard is via - HTTPS (TLS) Therefore; public service port for the dashboard - has changed to 443 (container port 8443) and scheme to https. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.kubernetes.apiserver.address</literal> was - renamed to - <literal>services.kubernetes.apiserver.bindAddress</literal>. - Note that the default value has changed from 127.0.0.1 to - 0.0.0.0. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.kubernetes.apiserver.publicAddress</literal> - was not used and thus has been removed. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.kubernetes.addons.dashboard.enableRBAC</literal> - was renamed to - <literal>services.kubernetes.addons.dashboard.rbac.enable</literal>. - </para> - </listitem> - <listitem> - <para> - The Kubernetes Dashboard now has only minimal RBAC permissions - by default. If dashboard cluster-admin rights are desired, set - <literal>services.kubernetes.addons.dashboard.rbac.clusterAdmin</literal> - 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: - <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal> - </para> - </listitem> - <listitem> - <para> - The <literal>programs.screen</literal> module provides allows - to configure <literal>/etc/screenrc</literal>, however the - module behaved fairly counterintuitive as the config exists, - but the package wasn’t available. Since 18.09 - <literal>pkgs.screen</literal> will be added to - <literal>environment.systemPackages</literal>. - </para> - </listitem> - <listitem> - <para> - The module <literal>services.networking.hostapd</literal> now - uses WPA2 by default. - </para> - </listitem> - <listitem> - <para> - <literal>s6Dns</literal>, <literal>s6Networking</literal>, - <literal>s6LinuxUtils</literal> and - <literal>s6PortableUtils</literal> renamed to - <literal>s6-dns</literal>, <literal>s6-networking</literal>, - <literal>s6-linux-utils</literal> and - <literal>s6-portable-utils</literal> respectively. - </para> - </listitem> - <listitem> - <para> - The module option <literal>nix.useSandbox</literal> is now - defaulted to <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - The config activation script of - <literal>nixos-rebuild</literal> now - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link> - all user units for each authenticated user. - </para> - </listitem> - <listitem> - <para> - The default display manager is now LightDM. To use SLiM set - <literal>services.xserver.displayManager.slim.enable</literal> - to <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - 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 - <literal></para><para></literal> to start a new - paragraph. - </para> - </listitem> - <listitem> - <para> - Top-level <literal>buildPlatform</literal>, - <literal>hostPlatform</literal>, and - <literal>targetPlatform</literal> in Nixpkgs are deprecated. - Please use their equivalents in <literal>stdenv</literal> - instead: <literal>stdenv.buildPlatform</literal>, - <literal>stdenv.hostPlatform</literal>, and - <literal>stdenv.targetPlatform</literal>. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index ed26f2ba45d05..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml +++ /dev/null @@ -1,790 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-19.03"> - <title>Release 19.03 (<quote>Koi</quote>, 2019/04/11)</title> - <section xml:id="sec-release-19.03-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - End of support is planned for end of October 2019, handing - over to 19.09. - </para> - </listitem> - <listitem> - <para> - The default Python 3 interpreter is now CPython 3.7 instead of - CPython 3.6. - </para> - </listitem> - <listitem> - <para> - Added the Pantheon desktop environment. It can be enabled - through - <literal>services.xserver.desktopManager.pantheon.enable</literal>. - </para> - <note> - <para> - By default, - <literal>services.xserver.desktopManager.pantheon</literal> - 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 - <literal>services.xserver.displayManager.lightdm.enable</literal> - to <literal>false</literal> and enable your preferred - display manager. - </para> - </note> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - 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: - <xref linkend="sec-kubernetes" /> for details. - </para> - </listitem> - <listitem> - <para> - There is now a set of <literal>confinement</literal> options - for <literal>systemd.services</literal>, which allows to - restrict services into a chroot 2 ed environment that only - contains the store paths from the runtime closure of the - service. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-19.03-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>./programs/nm-applet.nix</literal> - </para> - </listitem> - <listitem> - <para> - There is a new <literal>security.googleOsLogin</literal> - module for using - <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS - Login</link> to manage SSH access to Google Compute Engine - instances, which supersedes the imperative and broken - <literal>google-accounts-daemon</literal> used in - <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/beanstalkd.nix</literal> - </para> - </listitem> - <listitem> - <para> - There is a new <literal>services.cockroachdb</literal> module - for running CockroachDB databases. NixOS now ships with - CockroachDB 2.1.x as well, available on - <literal>x86_64-linux</literal> and - <literal>aarch64-linux</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>./security/duosec.nix</literal> - </para> - </listitem> - <listitem> - <para> - The <link xlink:href="https://duo.com/docs/duounix">PAM module - for Duo Security</link> has been enabled for use. One can - configure it using the <literal>security.duosec</literal> - options along with the corresponding PAM option in - <literal>security.pam.services.<name?>.duoSecurity.enable</literal>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-19.03-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - The minimum version of Nix required to evaluate Nixpkgs is now - 2.0. - </para> - <itemizedlist> - <listitem> - <para> - For users of NixOS 18.03 and 19.03, NixOS defaults to Nix - 2.0, but supports using Nix 1.11 by setting - <literal>nix.package = pkgs.nix1;</literal>. If this - option is set to a Nix 1.11 package, you will need to - either unset the option or upgrade it to Nix 2.0. - </para> - </listitem> - <listitem> - <para> - For users of NixOS 17.09, you will first need to upgrade - Nix by setting - <literal>nix.package = pkgs.nixStable2;</literal> and run - <literal>nixos-rebuild switch</literal> as the - <literal>root</literal> user. - </para> - </listitem> - <listitem> - <para> - For users of a daemon-less Nix installation on Linux or - macOS, you can upgrade Nix by running - <literal>curl -L https://nixos.org/nix/install | sh</literal>, - or prior to doing a channel update, running - <literal>nix-env -iA nix</literal>. If you have already - run a channel update and Nix is no longer able to evaluate - Nixpkgs, the error message printed should provide adequate - directions for upgrading Nix. - </para> - </listitem> - <listitem> - <para> - For users of the Nix daemon on macOS, you can upgrade Nix - by running - <literal>sudo -i sh -c 'nix-channel --update && nix-env -iA nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl start org.nixos.nix-daemon</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>buildPythonPackage</literal> function now sets - <literal>strictDeps = true</literal> to help distinguish - between native and non-native dependencies in order to improve - cross-compilation compatibility. Note however that this may - break user expressions. - </para> - </listitem> - <listitem> - <para> - The <literal>buildPythonPackage</literal> function now sets - <literal>LANG = C.UTF-8</literal> to enable Unicode support. - The <literal>glibcLocales</literal> package is no longer - needed as a build input. - </para> - </listitem> - <listitem> - <para> - The Syncthing state and configuration data has been moved from - <literal>services.syncthing.dataDir</literal> to the newly - defined <literal>services.syncthing.configDir</literal>, which - default to - <literal>/var/lib/syncthing/.config/syncthing</literal>. This - change makes possible to share synced directories using ACLs - without Syncthing resetting the permission on every start. - </para> - </listitem> - <listitem> - <para> - The <literal>ntp</literal> 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 - <literal>services.ntp.restrictDefault</literal> and - <literal>services.ntp.restrictSource</literal> to - <literal>[]</literal>. - </para> - </listitem> - <listitem> - <para> - Package <literal>rabbitmq_server</literal> is renamed to - <literal>rabbitmq-server</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>light</literal> module no longer uses setuid - binaries, but udev rules. As a consequence users of that - module have to belong to the <literal>video</literal> group in - order to use the executable (i.e. - <literal>users.users.yourusername.extraGroups = ["video"];</literal>). - </para> - </listitem> - <listitem> - <para> - Buildbot now supports Python 3 and its packages have been - moved to <literal>pythonPackages</literal>. The options - <literal>services.buildbot-master.package</literal> and - <literal>services.buildbot-worker.package</literal> can be - used to select the Python 2 or 3 version of the package. - </para> - </listitem> - <listitem> - <para> - Options - <literal>services.znc.confOptions.networks.name.userName</literal> - and - <literal>services.znc.confOptions.networks.name.modulePackages</literal> - were removed. They were never used for anything and can - therefore safely be removed. - </para> - </listitem> - <listitem> - <para> - Package <literal>wasm</literal> has been renamed - <literal>proglodyte-wasm</literal>. The package - <literal>wasm</literal> will be pointed to - <literal>ocamlPackages.wasm</literal> in 19.09, so make sure - to update your configuration if you want to keep - <literal>proglodyte-wasm</literal> - </para> - </listitem> - <listitem> - <para> - When the <literal>nixpkgs.pkgs</literal> option is set, NixOS - will no longer ignore the <literal>nixpkgs.overlays</literal> - option. The old behavior can be recovered by setting - <literal>nixpkgs.overlays = lib.mkForce [];</literal>. - </para> - </listitem> - <listitem> - <para> - OpenSMTPD has been upgraded to version 6.4.0p1. This release - makes backwards-incompatible changes to the configuration file - format. See <literal>man smtpd.conf</literal> for more - information on the new file format. - </para> - </listitem> - <listitem> - <para> - The versioned <literal>postgresql</literal> have been renamed - to use underscore number separators. For example, - <literal>postgresql96</literal> has been renamed to - <literal>postgresql_9_6</literal>. - </para> - </listitem> - <listitem> - <para> - Package <literal>consul-ui</literal> and passthrough - <literal>consul.ui</literal> have been removed. The package - <literal>consul</literal> now uses upstream releases that - vendor the UI into the binary. See - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link> - for details. - </para> - </listitem> - <listitem> - <para> - Slurm introduces the new option - <literal>services.slurm.stateSaveLocation</literal>, which is - now set to <literal>/var/spool/slurm</literal> by default - (instead of <literal>/var/spool</literal>). Make sure to move - all files to the new directory or to set the option - accordingly. - </para> - <para> - The slurmctld now runs as user <literal>slurm</literal> - instead of <literal>root</literal>. If you want to keep - slurmctld running as <literal>root</literal>, set - <literal>services.slurm.user = root</literal>. - </para> - <para> - The options <literal>services.slurm.nodeName</literal> and - <literal>services.slurm.partitionName</literal> are now sets - of strings to correctly reflect that fact that each of these - options can occour more than once in the configuration. - </para> - </listitem> - <listitem> - <para> - The <literal>solr</literal> package has been upgraded from - 4.10.3 to 7.5.0 and has undergone some major changes. The - <literal>services.solr</literal> module has been updated to - reflect these changes. Please review - http://lucene.apache.org/solr/ carefully before upgrading. - </para> - </listitem> - <listitem> - <para> - Package <literal>ckb</literal> is renamed to - <literal>ckb-next</literal>, and options - <literal>hardware.ckb.*</literal> are renamed to - <literal>hardware.ckb-next.*</literal>. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.xserver.displayManager.job.logToFile</literal> - which was previously set to <literal>true</literal> when using - the display managers <literal>lightdm</literal>, - <literal>sddm</literal> or <literal>xpra</literal> has been - reset to the default value (<literal>false</literal>). - </para> - </listitem> - <listitem> - <para> - Network interface indiscriminate NixOS firewall options - (<literal>networking.firewall.allow*</literal>) are now - preserved when also setting interface specific rules such as - <literal>networking.firewall.interfaces.en0.allow*</literal>. - These rules continue to use the pseudo device - <quote>default</quote> - (<literal>networking.firewall.interfaces.default.*</literal>), - and assigning to this pseudo device will override the - (<literal>networking.firewall.allow*</literal>) options. - </para> - </listitem> - <listitem> - <para> - The <literal>nscd</literal> service now disables all caching - of <literal>passwd</literal> and <literal>group</literal> - databases by default. This was interferring with the correct - functioning of the <literal>libnss_systemd.so</literal> module - which is used by <literal>systemd</literal> to manage uids and - usernames in the presence of <literal>DynamicUser=</literal> - in systemd services. This was already the default behaviour in - presence of <literal>services.sssd.enable = true</literal> - because nscd caching would interfere with - <literal>sssd</literal> 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. - </para> - <para> - If the old behaviour is desired, this can be restored by - setting the <literal>services.nscd.config</literal> option - with the desired caching parameters. - </para> - <programlisting language="nix"> -{ - services.nscd.config = - '' - server-user nscd - threads 1 - paranoia no - debug-level 0 - - enable-cache passwd yes - positive-time-to-live passwd 600 - negative-time-to-live passwd 20 - suggested-size passwd 211 - check-files passwd yes - persistent passwd no - shared passwd yes - - enable-cache group yes - positive-time-to-live group 3600 - negative-time-to-live group 60 - suggested-size group 211 - check-files group yes - persistent group no - shared group yes - - enable-cache hosts yes - positive-time-to-live hosts 600 - negative-time-to-live hosts 5 - suggested-size hosts 211 - check-files hosts yes - persistent hosts no - shared hosts yes - ''; -} -</programlisting> - <para> - See - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link> - for details. - </para> - </listitem> - <listitem> - <para> - GitLab Shell previously used the nix store paths for the - <literal>gitlab-shell</literal> command in its - <literal>authorized_keys</literal> file, which might stop - working after garbage collection. To circumvent that, we - regenerated that file on each startup. As - <literal>gitlab-shell</literal> has now been changed to use - <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, - this is not necessary anymore, but there might be leftover - lines with a nix store path. Regenerate the - <literal>authorized_keys</literal> file via - <literal>sudo -u git -H gitlab-rake gitlab:shell:setup</literal> - in that case. - </para> - </listitem> - <listitem> - <para> - The <literal>pam_unix</literal> account module is now loaded - with its control field set to <literal>required</literal> - instead of <literal>sufficient</literal>, 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 <literal>pam_unix</literal>. 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 - <literal>security.pam.services.<name?>.text</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>pam_unix</literal> password module is now loaded - with its control field set to <literal>sufficient</literal> - instead of <literal>required</literal>, 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 - <literal>pam_unix</literal>, preventing - <literal>pam_ldap</literal> to manage the password as it - should. - </para> - </listitem> - <listitem> - <para> - <literal>fish</literal> has been upgraded to 3.0. It comes - with a number of improvements and backwards incompatible - changes. See the <literal>fish</literal> - <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release - notes</link> for more information. - </para> - </listitem> - <listitem> - <para> - The ibus-table input method has had a change in config format, - which causes all previous settings to be lost. See - <link xlink:href="https://github.com/mike-fabian/ibus-table/commit/f9195f877c5212fef0dfa446acb328c45ba5852b">this - commit message</link> for details. - </para> - </listitem> - <listitem> - <para> - NixOS module system type <literal>types.optionSet</literal> - and <literal>lib.mkOption</literal> argument - <literal>options</literal> are deprecated. Use - <literal>types.submodule</literal> instead. - (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/54637">#54637</link>) - </para> - </listitem> - <listitem> - <para> - <literal>matrix-synapse</literal> has been updated to version - 0.99. It will - <link xlink:href="https://github.com/matrix-org/synapse/pull/4509">no - longer generate a self-signed certificate on first - launch</link> and will be - <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the - last version to accept self-signed certificates</link>. As - such, it is now recommended to use a proper certificate - verified by a root CA (for example Let’s Encrypt). The new - <link linkend="module-services-matrix">manual chapter on - Matrix</link> contains a working example of using nginx as a - reverse proxy in front of <literal>matrix-synapse</literal>, - using Let’s Encrypt certificates. - </para> - </listitem> - <listitem> - <para> - <literal>mailutils</literal> now works by default when - <literal>sendmail</literal> is not in a setuid wrapper. As a - consequence, the <literal>sendmailPath</literal> argument, - having lost its main use, has been removed. - </para> - </listitem> - <listitem> - <para> - <literal>graylog</literal> has been upgraded from version 2.* - to 3.*. Some setups making use of extraConfig (especially - those exposing Graylog via reverse proxies) need to be updated - as upstream removed/replaced some settings. See - <link xlink:href="http://docs.graylog.org/en/3.0/pages/upgrade/graylog-3.0.html#simplified-http-interface-configuration">Upgrading - Graylog</link> for details. - </para> - </listitem> - <listitem> - <para> - The option <literal>users.ldap.bind.password</literal> was - renamed to <literal>users.ldap.bind.passwordFile</literal>, - and needs to be readable by the <literal>nslcd</literal> user. - Same applies to the new - <literal>users.ldap.daemon.rootpwmodpwFile</literal> option. - </para> - </listitem> - <listitem> - <para> - <literal>nodejs-6_x</literal> is end-of-life. - <literal>nodejs-6_x</literal>, - <literal>nodejs-slim-6_x</literal> and - <literal>nodePackages_6_x</literal> are removed. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-19.03-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - The <literal>services.matomo</literal> module gained the - option <literal>services.matomo.package</literal> which - determines the used Matomo version. - </para> - <para> - The Matomo module now also comes with the systemd service - <literal>matomo-archive-processing.service</literal> and a - timer that automatically triggers archive processing every - hour. This means that you can safely - <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour"> - disable browser triggers for Matomo archiving </link> at - <literal>Administration > System > General Settings</literal>. - </para> - <para> - Additionally, you can enable to - <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs"> - delete old visitor logs </link> at - <literal>Administration > System > Privacy</literal>, - but make sure that you run - <literal>systemctl start matomo-archive-processing.service</literal> - at least once without errors if you have already collected - data before, so that the reports get archived before the - source data gets deleted. - </para> - </listitem> - <listitem> - <para> - <literal>composableDerivation</literal> along with supporting - library functions has been removed. - </para> - </listitem> - <listitem> - <para> - The deprecated <literal>truecrypt</literal> package has been - removed and <literal>truecrypt</literal> attribute is now an - alias for <literal>veracrypt</literal>. VeraCrypt is - backward-compatible with TrueCrypt volumes. Note that - <literal>cryptsetup</literal> also supports loading TrueCrypt - volumes. - </para> - </listitem> - <listitem> - <para> - The Kubernetes DNS addons, kube-dns, has been replaced with - CoreDNS. This change is made in accordance with Kubernetes - making CoreDNS the official default starting from - <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes - v1.11</link>. Please beware that upgrading DNS-addon on - existing clusters might induce minor downtime while the - DNS-addon terminates and re-initializes. Also note that the - DNS-service now runs with 2 pod replicas by default. The - desired number of replicas can be configured using: - <literal>services.kubernetes.addons.dns.replicas</literal>. - </para> - </listitem> - <listitem> - <para> - The quassel-webserver package and module was removed from - nixpkgs due to the lack of maintainers. - </para> - </listitem> - <listitem> - <para> - The manual gained a <link linkend="module-services-matrix"> - new chapter on self-hosting <literal>matrix-synapse</literal> - and <literal>riot-web</literal> </link>, the most prevalent - server and client implementations for the - <link xlink:href="https://matrix.org/">Matrix</link> federated - communication network. - </para> - </listitem> - <listitem> - <para> - The astah-community package was removed from nixpkgs due to it - being discontinued and the downloads not being available - anymore. - </para> - </listitem> - <listitem> - <para> - The httpd service now saves log files with a .log file - extension by default for easier integration with the logrotate - service. - </para> - </listitem> - <listitem> - <para> - The owncloud server packages and httpd subservice module were - removed from nixpkgs due to the lack of maintainers. - </para> - </listitem> - <listitem> - <para> - It is possible now to uze ZRAM devices as general purpose - ephemeral block devices, not only as swap. Using more than 1 - device as ZRAM swap is no longer recommended, but is still - possible by setting <literal>zramSwap.swapDevices</literal> - explicitly. - </para> - <para> - ZRAM algorithm can be changed now. - </para> - <para> - Changes to ZRAM algorithm are applied during - <literal>nixos-rebuild switch</literal>, so make sure you have - enough swap space on disk to survive ZRAM device rebuild. - Alternatively, use - <literal>nixos-rebuild boot; reboot</literal>. - </para> - </listitem> - <listitem> - <para> - Flat volumes are now disabled by default in - <literal>hardware.pulseaudio</literal>. This has been done to - prevent applications, which are unaware of this feature, - setting their volumes to 100% on startup causing harm to your - audio hardware and potentially your ears. - </para> - <note> - <para> - 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. - </para> - </note> - </listitem> - <listitem> - <para> - The - <link xlink:href="https://github.com/DanielAdolfsson/ndppd"><literal>ndppd</literal></link> - module now supports - <link xlink:href="options.html#opt-services.ndppd.enable">all - config options</link> provided by the current upstream version - as service options. Additionally the <literal>ndppd</literal> - package doesn’t contain the systemd unit configuration from - upstream anymore, the unit is completely configured by the - NixOS module now. - </para> - </listitem> - <listitem> - <para> - New installs of NixOS will default to the Redmine 4.x series - unless otherwise specified in - <literal>services.redmine.package</literal> while existing - installs of NixOS will default to the Redmine 3.x series. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.grafana.enable">Grafana - module</link> now supports declarative - <link xlink:href="http://docs.grafana.org/administration/provisioning/">datasource - and dashboard</link> provisioning. - </para> - </listitem> - <listitem> - <para> - The use of insecure ports on kubernetes has been deprecated. - Thus options: - <literal>services.kubernetes.apiserver.port</literal> and - <literal>services.kubernetes.controllerManager.port</literal> - has been renamed to <literal>.insecurePort</literal>, and - default of both options has changed to 0 (disabled). - </para> - </listitem> - <listitem> - <para> - Note that the default value of - <literal>services.kubernetes.apiserver.bindAddress</literal> - has changed from 127.0.0.1 to 0.0.0.0, allowing the apiserver - to be accessible from outside the master node itself. If the - apiserver insecurePort is enabled, it is strongly recommended - to only bind on the loopback interface. See: - <literal>services.kubernetes.apiserver.insecurebindAddress</literal>. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.kubernetes.apiserver.allowPrivileged</literal> - and - <literal>services.kubernetes.kubelet.allowPrivileged</literal> - now defaults to false. Disallowing privileged containers on - the cluster. - </para> - </listitem> - <listitem> - <para> - The kubernetes module does no longer add the kubernetes - package to <literal>environment.systemPackages</literal> - implicitly. - </para> - </listitem> - <listitem> - <para> - The <literal>intel</literal> driver has been removed from the - default list of - <link xlink:href="options.html#opt-services.xserver.videoDrivers">X.org - video drivers</link>. The <literal>modesetting</literal> - driver should take over automatically, it is better maintained - upstream and has less problems with advanced X11 features. - This can lead to a change in the output names used by - <literal>xrandr</literal>. Some performance regressions on - some GPU models might happen. Some OpenCL and VA-API - applications might also break (Beignet seems to provide OpenCL - support with <literal>modesetting</literal> driver, too). - Kernel mode setting API does not support backlight control, so - <literal>xbacklight</literal> tool will not work; backlight - level can be controlled directly via <literal>/sys/</literal> - or with <literal>brightnessctl</literal>. Users who need this - functionality more than multi-output XRandR are advised to add - `intel` to `videoDrivers` and report an issue (or provide - additional details in an existing one) - </para> - </listitem> - <listitem> - <para> - Openmpi has been updated to version 4.0.0, which removes some - deprecated MPI-1 symbols. This may break some older - applications that still rely on those symbols. An upgrade - guide can be found - <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>. - </para> - <para> - The nginx package now relies on OpenSSL 1.1 and supports TLS - 1.3 by default. You can set the protocols used by the nginx - service using - <link xlink:href="options.html#opt-services.nginx.sslProtocols">services.nginx.sslProtocols</link>. - </para> - </listitem> - <listitem> - <para> - A new subcommand <literal>nixos-rebuild edit</literal> was - added. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 3bf83e1eccbd0..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml +++ /dev/null @@ -1,1197 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-19.09"> - <title>Release 19.09 (<quote>Loris</quote>, 2019/10/09)</title> - <section xml:id="sec-release-19.09-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - End of support is planned for end of April 2020, handing over - to 20.03. - </para> - </listitem> - <listitem> - <para> - Nix has been updated to 2.3; see its - <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.3">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - Core version changes: - </para> - <para> - systemd: 239 -> 243 - </para> - <para> - gcc: 7 -> 8 - </para> - <para> - glibc: 2.27 (unchanged) - </para> - <para> - linux: 4.19 LTS (unchanged) - </para> - <para> - openssl: 1.0 -> 1.1 - </para> - </listitem> - <listitem> - <para> - Desktop version changes: - </para> - <para> - plasma5: 5.14 -> 5.16 - </para> - <para> - gnome3: 3.30 -> 3.32 - </para> - </listitem> - <listitem> - <para> - PHP now defaults to PHP 7.3, updated from 7.2. - </para> - </listitem> - <listitem> - <para> - PHP 7.1 is no longer supported due to upstream not supporting - this version for the entire lifecycle of the 19.09 release. - </para> - </listitem> - <listitem> - <para> - The binfmt module is now easier to use. Additional systems can - be added through - <literal>boot.binfmt.emulatedSystems</literal>. For instance, - <literal>boot.binfmt.emulatedSystems = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ];</literal> - will set up binfmt interpreters for each of those listed - systems. - </para> - </listitem> - <listitem> - <para> - The installer now uses a less privileged - <literal>nixos</literal> user whereas before we logged in as - root. To gain root privileges use <literal>sudo -i</literal> - without a password. - </para> - </listitem> - <listitem> - <para> - We’ve updated to Xfce 4.14, which brings a new module - <literal>services.xserver.desktopManager.xfce4-14</literal>. - If you’d like to upgrade, please switch from the - <literal>services.xserver.desktopManager.xfce</literal> module - as it will be deprecated in a future release. They’re - incompatibilities with the current Xfce module; it doesn’t - support <literal>thunarPlugins</literal> and it isn’t - recommended to use - <literal>services.xserver.desktopManager.xfce</literal> and - <literal>services.xserver.desktopManager.xfce4-14</literal> - simultaneously or to downgrade from Xfce 4.14 after upgrading. - </para> - </listitem> - <listitem> - <para> - The GNOME 3 desktop manager module sports an interface to - enable/disable core services, applications, and optional GNOME - packages like games. - </para> - <itemizedlist> - <listitem> - <para> - <literal>services.gnome3.core-os-services.enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.gnome3.core-shell.enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.gnome3.core-utilities.enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.gnome3.games.enable</literal> - </para> - </listitem> - </itemizedlist> - <para> - 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 - <literal>environment.gnome3.excludePackages</literal> which - only excluded the optional applications. - <literal>environment.gnome3.excludePackages</literal> is now - unguarded, it can exclude any package installed with - <literal>environment.systemPackages</literal> in the GNOME 3 - module. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - <para> - <emphasis role="strong">The following changes were enacted in - <literal>services.gnome3.core-utilities.enable</literal></emphasis> - </para> - <itemizedlist> - <listitem> - <para> - <literal>accerciser</literal> - </para> - </listitem> - <listitem> - <para> - <literal>dconf-editor</literal> - </para> - </listitem> - <listitem> - <para> - <literal>evolution</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome-documents</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome-nettool</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome-power-manager</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome-todo</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome-tweaks</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gnome-usage</literal> - </para> - </listitem> - <listitem> - <para> - <literal>gucharmap</literal> - </para> - </listitem> - <listitem> - <para> - <literal>nautilus-sendto</literal> - </para> - </listitem> - <listitem> - <para> - <literal>vinagre</literal> - </para> - </listitem> - <listitem> - <para> - <literal>cheese</literal> - </para> - </listitem> - <listitem> - <para> - <literal>geary</literal> - </para> - </listitem> - </itemizedlist> - <para> - <emphasis role="strong">The following changes were enacted in - <literal>services.gnome3.core-shell.enable</literal></emphasis> - </para> - <itemizedlist> - <listitem> - <para> - <literal>gnome-color-manager</literal> - </para> - </listitem> - <listitem> - <para> - <literal>orca</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.avahi.enable</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-19.09-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <literal>./programs/dwm-status.nix</literal> - </para> - </listitem> - <listitem> - <para> - The new <literal>hardware.printers</literal> module allows to - declaratively configure CUPS printers via the - <literal>ensurePrinters</literal> and - <literal>ensureDefaultPrinter</literal> options. - <literal>ensurePrinters</literal> will never delete existing - printers, but will make sure that the given printers are - configured as declared. - </para> - </listitem> - <listitem> - <para> - There is a new - <link xlink:href="options.html#opt-services.system-config-printer.enable">services.system-config-printer.enable</link> - and - <link xlink:href="options.html#opt-programs.system-config-printer.enable">programs.system-config-printer.enable</link> - module for the program of the same name. If you previously had - <literal>system-config-printer</literal> enabled through some - other means you should migrate to using one of these modules. - </para> - <itemizedlist> - <listitem> - <para> - <literal>services.xserver.desktopManager.plasma5</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.desktopManager.gnome3</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.desktopManager.pantheon</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.desktopManager.mate</literal> - Note Mate uses - <literal>programs.system-config-printer</literal> as it - doesn’t use it as a service, but its graphical interface - directly. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.blueman.enable">services.blueman.enable</link> - has been added. If you previously had blueman installed via - <literal>environment.systemPackages</literal> please migrate - to using the NixOS module, as this would result in an - insufficiently configured blueman. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-19.09-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - Buildbot no longer supports Python 2, as support was dropped - upstream in version 2.0.0. Configurations may need to be - modified to make them compatible with Python 3. - </para> - </listitem> - <listitem> - <para> - PostgreSQL now uses <literal>/run/postgresql</literal> as its - socket directory instead of <literal>/tmp</literal>. So if you - run an application like eg. Nextcloud, where you need to use - the Unix socket path as the database host name, you need to - change it accordingly. - </para> - </listitem> - <listitem> - <para> - PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle - and has been removed. - </para> - </listitem> - <listitem> - <para> - The options - <literal>services.prometheus.alertmanager.user</literal> and - <literal>services.prometheus.alertmanager.group</literal> have - been removed because the alertmanager service is now using - systemd’s - <link xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> - DynamicUser mechanism</link> which obviates these options. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The <literal>services.nzbget.configFile</literal> and - <literal>services.nzbget.openFirewall</literal> options were - removed as they are managed internally by the nzbget. The - <literal>services.nzbget.dataDir</literal> option hadn’t - actually been used by the module for some time and so was - removed as cleanup. - </para> - </listitem> - <listitem> - <para> - The <literal>services.mysql.pidDir</literal> 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) - <literal>/run/mysqld/mysql.sock</literal> file to appear. - </para> - </listitem> - <listitem> - <para> - The <literal>services.emby.enable</literal> module has been - removed, see <literal>services.jellyfin.enable</literal> - instead for a free software fork of Emby. See the Jellyfin - documentation: - <link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/"> - Migrating from Emby to Jellyfin </link> - </para> - </listitem> - <listitem> - <para> - IPv6 Privacy Extensions are now enabled by default for - undeclared interfaces. The previous behaviour was quite - misleading — even though the default value for - <literal>networking.interfaces.*.preferTempAddress</literal> - was <literal>true</literal>, undeclared interfaces would not - prefer temporary addresses. Now, interfaces not mentioned in - the config will prefer temporary addresses. EUI64 addresses - can still be set as preferred by explicitly setting the option - to <literal>false</literal> for the interface in question. - </para> - </listitem> - <listitem> - <para> - Since Bittorrent Sync was superseded by Resilio Sync in 2016, - the <literal>bittorrentSync</literal>, - <literal>bittorrentSync14</literal>, and - <literal>bittorrentSync16</literal> packages have been removed - in favor of <literal>resilio-sync</literal>. - </para> - <para> - The corresponding module, <literal>services.btsync</literal> - has been replaced by the <literal>services.resilio</literal> - module. - </para> - </listitem> - <listitem> - <para> - The httpd service no longer attempts to start the postgresql - service. If you have come to depend on this behaviour then you - can preserve the behavior with the following configuration: - <literal>systemd.services.httpd.after = [ "postgresql.service" ];</literal> - </para> - <para> - The option <literal>services.httpd.extraSubservices</literal> - has been marked as deprecated. You may still use this feature, - but it will be removed in a future release of NixOS. You are - encouraged to convert any httpd subservices you may have - written to a full NixOS module. - </para> - <para> - Most of the httpd subservices packaged with NixOS have been - replaced with full NixOS modules including LimeSurvey, - WordPress, and Zabbix. These modules can be enabled using the - <literal>services.limesurvey.enable</literal>, - <literal>services.mediawiki.enable</literal>, - <literal>services.wordpress.enable</literal>, and - <literal>services.zabbixWeb.enable</literal> options. - </para> - </listitem> - <listitem> - <para> - The option - <literal>systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnlink</literal> - was renamed to - <literal>systemd.network.networks.<name>.routes.*.routeConfig.GatewayOnLink</literal> - (capital <literal>L</literal>). This follows - <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c"> - upstreams renaming </link> of the setting. - </para> - </listitem> - <listitem> - <para> - As of this release the NixOps feature - <literal>autoLuks</literal> is deprecated. It no longer works - with our systemd version without manual intervention. - </para> - <para> - Whenever the usage of the module is detected the evaluation - will fail with a message explaining why and how to deal with - the situation. - </para> - <para> - A new knob named - <literal>nixops.enableDeprecatedAutoLuks</literal> 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. - </para> - <para> - Make sure you set the <literal>_netdev</literal> 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. - </para> - <para> - If you are actively using the <literal>autoLuks</literal> - module please let us know in - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/62211">issue - #62211</link>. - </para> - </listitem> - <listitem> - <para> - The setopt declarations will be evaluated at the end of - <literal>/etc/zshrc</literal>, so any code in - <link xlink:href="options.html#opt-programs.zsh.interactiveShellInit">programs.zsh.interactiveShellInit</link>, - <link xlink:href="options.html#opt-programs.zsh.loginShellInit">programs.zsh.loginShellInit</link> - and - <link xlink:href="options.html#opt-programs.zsh.promptInit">programs.zsh.promptInit</link> - may break if it relies on those options being set. - </para> - </listitem> - <listitem> - <para> - The <literal>prometheus-nginx-exporter</literal> 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 - <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official - repo</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>shibboleth-sp</literal> package has been updated - to version 3. It is largely backward compatible, for further - information refer to the - <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes">release - notes</link> and - <link xlink:href="https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2">upgrade - guide</link>. - </para> - <para> - Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has - been dropped. - </para> - </listitem> - <listitem> - <para> - By default, prometheus exporters are now run with - <literal>DynamicUser</literal> enabled. Exporters that need a - real user, now run under a separate user and group which - follow the pattern - <literal><exporter-name>-exporter</literal>, instead of - the previous default <literal>nobody</literal> and - <literal>nogroup</literal>. Only some exporters are affected - by the latter, namely the exporters - <literal>dovecot</literal>, <literal>node</literal>, - <literal>postfix</literal> and <literal>varnish</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>ibus-qt</literal> package is not installed by - default anymore when - <link xlink:href="options.html#opt-i18n.inputMethod.enabled">i18n.inputMethod.enabled</link> - is set to <literal>ibus</literal>. If IBus support in Qt 4.x - applications is required, add the <literal>ibus-qt</literal> - package to your - <link xlink:href="options.html#opt-environment.systemPackages">environment.systemPackages</link> - manually. - </para> - </listitem> - <listitem> - <para> - The CUPS Printing service now uses socket-based activation by - default, only starting when needed. The previous behavior can - be restored by setting - <literal>services.cups.startWhenNeeded</literal> to - <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>services.systemhealth</literal> module has been - removed from nixpkgs due to lack of maintainer. - </para> - </listitem> - <listitem> - <para> - The <literal>services.mantisbt</literal> module has been - removed from nixpkgs due to lack of maintainer. - </para> - </listitem> - <listitem> - <para> - Squid 3 has been removed and the <literal>squid</literal> - derivation now refers to Squid 4. - </para> - </listitem> - <listitem> - <para> - The <literal>services.pdns-recursor.extraConfig</literal> - option has been replaced by - <literal>services.pdns-recursor.settings</literal>. The new - option allows setting extra configuration while being better - type-checked and mergeable. - </para> - </listitem> - <listitem> - <para> - No service depends on <literal>keys.target</literal> anymore - which is a systemd target that indicates if all - <link xlink:href="https://nixos.org/nixops/manual/#idm140737322342384">NixOps - keys</link> were successfully uploaded. Instead, - <literal><key-name>-key.service</literal> should be used - to define a dependency of a key in a service. The full issue - behind the <literal>keys.target</literal> dependency is - described at - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/67265">NixOS/nixpkgs#67265</link>. - </para> - <para> - The following services are affected by this: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="options.html#opt-services.dovecot2.enable"><literal>services.dovecot2</literal></link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.nsd.enable"><literal>services.nsd</literal></link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.softether.enable"><literal>services.softether</literal></link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.strongswan.enable"><literal>services.strongswan</literal></link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.strongswan-swanctl.enable"><literal>services.strongswan-swanctl</literal></link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.httpd.enable"><literal>services.httpd</literal></link> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>security.acme.directory</literal> option has been - replaced by a read-only - <literal>security.acme.certs.<cert>.directory</literal> - option for each certificate you define. This will be a - subdirectory of <literal>/var/lib/acme</literal>. You can use - this read-only option to figure out where the certificates are - stored for a specific certificate. For example, the - <literal>services.nginx.virtualhosts.<name>.enableACME</literal> - option will use this directory option to find the certs for - the virtual host. - </para> - <para> - <literal>security.acme.preDelay</literal> and - <literal>security.acme.activationDelay</literal> options have - been removed. To execute a service before certificates are - provisioned or renewed add a - <literal>RequiredBy=acme-${cert}.service</literal> to any - service. - </para> - <para> - Furthermore, the acme module will not automatically add a - dependency on <literal>lighttpd.service</literal> anymore. If - you are using certficates provided by letsencrypt for - lighttpd, then you should depend on the certificate service - <literal>acme-${cert}.service></literal> manually. - </para> - <para> - For nginx, the dependencies are still automatically managed - when - <literal>services.nginx.virtualhosts.<name>.enableACME</literal> - 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 - <literal>acme-certificates.target</literal>. 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>. - </para> - </listitem> - <listitem> - <para> - The old deprecated <literal>emacs</literal> package sets have - been dropped. What used to be called - <literal>emacsPackagesNg</literal> is now simply called - <literal>emacsPackages</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.desktopManager.xterm</literal> is - now disabled by default if <literal>stateVersion</literal> 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. - </para> - </listitem> - <listitem> - <para> - The WeeChat plugin - <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been - removed as it doesn’t receive any updates from upstream and - depends on outdated Python2-based modules. - </para> - </listitem> - <listitem> - <para> - Old unsupported versions (<literal>logstash5</literal>, - <literal>kibana5</literal>, <literal>filebeat5</literal>, - <literal>heartbeat5</literal>, <literal>metricbeat5</literal>, - <literal>packetbeat5</literal>) of the ELK-stack and Elastic - beats have been removed. - </para> - </listitem> - <listitem> - <para> - For NixOS 19.03, both Prometheus 1 and 2 were available to - allow for a seamless transition from version 1 to 2 with - existing setups. Because Prometheus 1 is no longer developed, - it was removed. Prometheus 2 is now configured with - <literal>services.prometheus</literal>. - </para> - </listitem> - <listitem> - <para> - Citrix Receiver (<literal>citrix_receiver</literal>) has been - dropped in favor of Citrix Workspace - (<literal>citrix_workspace</literal>). - </para> - </listitem> - <listitem> - <para> - The <literal>services.gitlab</literal> module has had its - literal secret options - (<literal>services.gitlab.smtp.password</literal>, - <literal>services.gitlab.databasePassword</literal>, - <literal>services.gitlab.initialRootPassword</literal>, - <literal>services.gitlab.secrets.secret</literal>, - <literal>services.gitlab.secrets.db</literal>, - <literal>services.gitlab.secrets.otp</literal> and - <literal>services.gitlab.secrets.jws</literal>) replaced by - file-based versions - (<literal>services.gitlab.smtp.passwordFile</literal>, - <literal>services.gitlab.databasePasswordFile</literal>, - <literal>services.gitlab.initialRootPasswordFile</literal>, - <literal>services.gitlab.secrets.secretFile</literal>, - <literal>services.gitlab.secrets.dbFile</literal>, - <literal>services.gitlab.secrets.otpFile</literal> and - <literal>services.gitlab.secrets.jwsFile</literal>). 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 <quote>File</quote> to - the end of the option name, and change the definition to a - string pointing to the corresponding file; e.g. - <literal>services.gitlab.databasePassword = "supersecurepassword"</literal> - becomes - <literal>services.gitlab.databasePasswordFile = "/path/to/secret_file"</literal> - where the file <literal>secret_file</literal> contains the - string <literal>supersecurepassword</literal>. - </para> - <para> - The state path (<literal>services.gitlab.statePath</literal>) - now has the following restriction: no parent directory can be - owned by any other user than <literal>root</literal> or the - user specified in <literal>services.gitlab.user</literal>; - i.e. if <literal>services.gitlab.statePath</literal> is set to - <literal>/var/lib/gitlab/state</literal>, - <literal>gitlab</literal> and all parent directories must be - owned by either <literal>root</literal> or the user specified - in <literal>services.gitlab.user</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>networking.useDHCP</literal> option is - unsupported in combination with - <literal>networking.useNetworkd</literal> in anticipation of - defaulting to it. It has to be set to <literal>false</literal> - and enabled per interface with - <literal>networking.interfaces.<name>.useDHCP = true;</literal> - </para> - </listitem> - <listitem> - <para> - The Twitter client <literal>corebird</literal> has been - dropped as - <link xlink:href="https://www.patreon.com/posts/corebirds-future-18921328">it - is discontinued and does not work against the new Twitter - API</link>. Please use the fork <literal>cawbird</literal> - instead which has been adapted to the API changes and is still - maintained. - </para> - </listitem> - <listitem> - <para> - The <literal>nodejs-11_x</literal> package has been removed as - it’s EOLed by upstream. - </para> - </listitem> - <listitem> - <para> - Because of the systemd upgrade, systemd-timesyncd will no - longer work if <literal>system.stateVersion</literal> is not - set correctly. When upgrading from NixOS 19.03, please make - sure that <literal>system.stateVersion</literal> is set to - <literal>"19.03"</literal>, or lower if the - installation dates back to an earlier version of NixOS. - </para> - </listitem> - <listitem> - <para> - Due to the short lifetime of non-LTS kernel releases package - attributes like <literal>linux_5_1</literal>, - <literal>linux_5_2</literal> and <literal>linux_5_3</literal> - have been removed to discourage dependence on specific non-LTS - kernel versions in stable NixOS releases. Going forward, - versioned attributes like <literal>linux_4_9</literal> will - exist for LTS versions only. Please use - <literal>linux_latest</literal> or - <literal>linux_testing</literal> if you depend on non-LTS - releases. Keep in mind that <literal>linux_latest</literal> - and <literal>linux_testing</literal> will change versions - under the hood during the lifetime of a stable release and - might include breaking changes. - </para> - </listitem> - <listitem> - <para> - Because of the systemd upgrade, some network interfaces might - change their name. For details see - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.net-naming-scheme.html#History"> - upstream docs</link> or - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/71086"> - our ticket</link>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-19.09-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - The <literal>documentation</literal> module gained an option - named <literal>documentation.nixos.includeAllModules</literal> - which makes the generated configuration.nix 5 manual page - include all options from all NixOS modules included in a given - <literal>configuration.nix</literal> configuration file. - Currently, it is set to <literal>false</literal> by default as - enabling it frequently prevents evaluation. But the plan is to - eventually have it set to <literal>true</literal> by default. - Please set it to <literal>true</literal> now in your - <literal>configuration.nix</literal> and fix all the bugs it - uncovers. - </para> - </listitem> - <listitem> - <para> - The <literal>vlc</literal> package gained support for - Chromecast streaming, enabled by default. TCP port 8010 must - be open for it to work, so something like - <literal>networking.firewall.allowedTCPPorts = [ 8010 ];</literal> - may be required in your configuration. Also consider enabling - <link xlink:href="https://nixos.wiki/wiki/Accelerated_Video_Playback"> - Accelerated Video Playback</link> for better transcoding - performance. - </para> - </listitem> - <listitem> - <para> - The following changes apply if the - <literal>stateVersion</literal> is changed to 19.09 or higher. - For <literal>stateVersion = "19.03"</literal> or - lower the old behavior is preserved. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>solr.package</literal> defaults to - <literal>pkgs.solr_8</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>hunspellDicts.fr-any</literal> dictionary now - ships with <literal>fr_FR.{aff,dic}</literal> which is linked - to <literal>fr-toutesvariantes.{aff,dic}</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>mysql</literal> service now runs as - <literal>mysql</literal> user. Previously, systemd did execute - it as root, and mysql dropped privileges itself. This includes - <literal>ExecStartPre=</literal> and - <literal>ExecStartPost=</literal> phases. To accomplish that, - runtime and data directory setup was delegated to - RuntimeDirectory and tmpfiles. - </para> - </listitem> - <listitem> - <para> - With the upgrade to systemd version 242 the - <literal>systemd-timesyncd</literal> service is no longer - using <literal>DynamicUser=yes</literal>. In order for the - upgrade to work we rely on an activation script to move the - state from the old to the new directory. The older directory - (prior <literal>19.09</literal>) was - <literal>/var/lib/private/systemd/timesync</literal>. - </para> - <para> - As long as the <literal>system.config.stateVersion</literal> - is below <literal>19.09</literal> the state folder will - migrated to its proper location - (<literal>/var/lib/systemd/timesync</literal>), if required. - </para> - </listitem> - <listitem> - <para> - The package <literal>avahi</literal> is now built to look up - service definitions from - <literal>/etc/avahi/services</literal> instead of its output - directory in the nix store. Accordingly the module - <literal>avahi</literal> now supports custom service - definitions via - <literal>services.avahi.extraServiceFiles</literal>, which are - then placed in the aforementioned directory. See - avahi.service5 for more information on custom service - definitions. - </para> - </listitem> - <listitem> - <para> - Since version 0.1.19, <literal>cargo-vendor</literal> honors - package includes that are specified in the - <literal>Cargo.toml</literal> file of Rust crates. - <literal>rustPlatform.buildRustPackage</literal> uses - <literal>cargo-vendor</literal> to collect and build dependent - crates. Since this change in <literal>cargo-vendor</literal> - changes the set of vendored files for most Rust packages, the - hash that use used to verify the dependencies, - <literal>cargoSha256</literal>, also changes. - </para> - <para> - The <literal>cargoSha256</literal> hashes of all in-tree - derivations that use <literal>buildRustPackage</literal> have - been updated to reflect this change. However, third-party - derivations that use <literal>buildRustPackage</literal> may - have to be updated as well. - </para> - </listitem> - <listitem> - <para> - The <literal>consul</literal> package was upgraded past - version <literal>1.5</literal>, so its deprecated legacy UI is - no longer available. - </para> - </listitem> - <listitem> - <para> - The default resample-method for PulseAudio has been changed - from the upstream default <literal>speex-float-1</literal> to - <literal>speex-float-5</literal>. Be aware that low-powered - ARM-based and MIPS-based boards will struggle with this so - you’ll need to set - <literal>hardware.pulseaudio.daemon.config.resample-method</literal> - back to <literal>speex-float-1</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>phabricator</literal> package and associated - <literal>httpd.extraSubservice</literal>, as well as the - <literal>phd</literal> service have been removed from nixpkgs - due to lack of maintainer. - </para> - </listitem> - <listitem> - <para> - The <literal>mercurial</literal> - <literal>httpd.extraSubservice</literal> has been removed from - nixpkgs due to lack of maintainer. - </para> - </listitem> - <listitem> - <para> - The <literal>trac</literal> - <literal>httpd.extraSubservice</literal> has been removed from - nixpkgs because it was unmaintained. - </para> - </listitem> - <listitem> - <para> - The <literal>foswiki</literal> package and associated - <literal>httpd.extraSubservice</literal> have been removed - from nixpkgs due to lack of maintainer. - </para> - </listitem> - <listitem> - <para> - The <literal>tomcat-connector</literal> - <literal>httpd.extraSubservice</literal> has been removed from - nixpkgs. - </para> - </listitem> - <listitem> - <para> - It’s now possible to change configuration in - <link xlink:href="options.html#opt-services.nextcloud.enable">services.nextcloud</link> - 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 - <literal>/var/lib/nextcloud</literal>. - </para> - </listitem> - <listitem> - <para> - There exists now <literal>lib.forEach</literal>, which is like - <literal>map</literal>, but with arguments flipped. When - mapping function body spans many lines (or has nested - <literal>map</literal>s), it is often hard to follow which - list is modified. - </para> - <para> - Previous solution to this problem was either to use - <literal>lib.flip map</literal> idiom or extract that - anonymous mapping function to a named one. Both can still be - used but <literal>lib.forEach</literal> is preferred over - <literal>lib.flip map</literal>. - </para> - <para> - The <literal>/etc/sysctl.d/nixos.conf</literal> file - containing all the options set via - <link xlink:href="options.html#opt-boot.kernel.sysctl">boot.kernel.sysctl</link> - was moved to <literal>/etc/sysctl.d/60-nixos.conf</literal>, - as sysctl.d5 recommends prefixing all filenames in - <literal>/etc/sysctl.d</literal> with a two-digit number and a - dash to simplify the ordering of the files. - </para> - </listitem> - <listitem> - <para> - We now install the sysctl snippets shipped with systemd. - </para> - <itemizedlist> - <listitem> - <para> - Loose reverse path filtering - </para> - </listitem> - <listitem> - <para> - Source route filtering - </para> - </listitem> - <listitem> - <para> - <literal>fq_codel</literal> as a packet scheduler (this - helps to fight bufferbloat) - </para> - </listitem> - </itemizedlist> - <para> - This also configures the kernel to pass core dumps to - <literal>systemd-coredump</literal>, and restricts the SysRq - key combinations to the sync command only. These sysctl - snippets can be found in - <literal>/etc/sysctl.d/50-*.conf</literal>, and overridden via - <link xlink:href="options.html#opt-boot.kernel.sysctl">boot.kernel.sysctl</link> - (which will place the parameters in - <literal>/etc/sysctl.d/60-nixos.conf</literal>). - </para> - </listitem> - <listitem> - <para> - Core dumps are now processed by - <literal>systemd-coredump</literal> by default. - <literal>systemd-coredump</literal> behaviour can still be - modified via <literal>systemd.coredump.extraConfig</literal>. - To stick to the old behaviour (having the kernel dump to a - file called <literal>core</literal> in the working directory), - without piping it through <literal>systemd-coredump</literal>, - set <literal>systemd.coredump.enable</literal> to - <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>systemd.packages</literal> option now also supports - generators and shutdown scripts. Old - <literal>systemd.generator-packages</literal> option has been - removed. - </para> - </listitem> - <listitem> - <para> - The <literal>rmilter</literal> package was removed with - associated module and options due deprecation by upstream - developer. Use <literal>rspamd</literal> in proxy mode - instead. - </para> - </listitem> - <listitem> - <para> - systemd cgroup accounting via the - <link xlink:href="options.html#opt-systemd.enableCgroupAccounting">systemd.enableCgroupAccounting</link> - option is now enabled by default. It now also enables the more - recent Block IO and IP accounting features. - </para> - </listitem> - <listitem> - <para> - We no longer enable custom font rendering settings with - <literal>fonts.fontconfig.penultimate.enable</literal> by - default. The defaults from fontconfig are sufficient. - </para> - </listitem> - <listitem> - <para> - The <literal>crashplan</literal> package and the - <literal>crashplan</literal> service have been removed from - nixpkgs due to crashplan shutting down the service, while the - <literal>crashplansb</literal> package and - <literal>crashplan-small-business</literal> service have been - removed from nixpkgs due to lack of maintainer. - </para> - <para> - The - <link xlink:href="options.html#opt-services.redis.enable">redis - module</link> was hardcoded to use the - <literal>redis</literal> user, <literal>/run/redis</literal> - as runtime directory and <literal>/var/lib/redis</literal> as - state directory. Note that the NixOS module for Redis now - disables kernel support for Transparent Huge Pages (THP), - because this features causes major performance problems for - Redis, e.g. (https://redis.io/topics/latency). - </para> - </listitem> - <listitem> - <para> - Using <literal>fonts.enableDefaultFonts</literal> adds a - default emoji font <literal>noto-fonts-emoji</literal>. - </para> - <itemizedlist> - <listitem> - <para> - <literal>services.xserver.enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs.sway.enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>programs.way-cooler.enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>services.xrdp.enable</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>altcoins</literal> categorization of packages has - been removed. You now access these packages at the top level, - ie. <literal>nix-shell -p dogecoin</literal> instead of - <literal>nix-shell -p altcoins.dogecoin</literal>, etc. - </para> - </listitem> - <listitem> - <para> - Ceph has been upgraded to v14.2.1. See the - <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release - notes</link> 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. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.weechat</literal> is now compiled against - <literal>pkgs.python3</literal>. Weechat also recommends - <link xlink:href="https://weechat.org/scripts/python3/">to use - Python3 in their docs.</link> - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 35fbb7447c70d..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml +++ /dev/null @@ -1,1497 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-20.03"> - <title>Release 20.03 (<quote>Markhor</quote>, 2020.04/20)</title> - <section xml:id="sec-release-20.03-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Support is planned until the end of October 2020, handing over - to 20.09. - </para> - </listitem> - <listitem> - <para> - Core version changes: - </para> - <para> - gcc: 8.3.0 -> 9.2.0 - </para> - <para> - glibc: 2.27 -> 2.30 - </para> - <para> - linux: 4.19 -> 5.4 - </para> - <para> - mesa: 19.1.5 -> 19.3.3 - </para> - <para> - openssl: 1.0.2u -> 1.1.1d - </para> - </listitem> - <listitem> - <para> - Desktop version changes: - </para> - <para> - plasma5: 5.16.5 -> 5.17.5 - </para> - <para> - kdeApplications: 19.08.2 -> 19.12.3 - </para> - <para> - gnome3: 3.32 -> 3.34 - </para> - <para> - pantheon: 5.0 -> 5.1.3 - </para> - </listitem> - <listitem> - <para> - Linux kernel is updated to branch 5.4 by default (from 4.19). - </para> - </listitem> - <listitem> - <para> - Grub is updated to 2.04, adding support for booting from F2FS - filesystems and Btrfs volumes using zstd compression. Note - that some users have been unable to boot after upgrading to - 2.04 - for more information, please see - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/61718#issuecomment-617618503">this - discussion</link>. - </para> - </listitem> - <listitem> - <para> - Postgresql for NixOS service now defaults to v11. - </para> - </listitem> - <listitem> - <para> - The graphical installer image starts the graphical session - automatically. Before you’d be greeted by a tty and asked to - enter <literal>systemctl start display-manager</literal>. It - is now possible to disable the display-manager from running by - selecting the <literal>Disable display-manager</literal> quirk - in the boot menu. - </para> - </listitem> - <listitem> - <para> - GNOME 3 has been upgraded to 3.34. Please take a look at their - <link xlink:href="https://help.gnome.org/misc/release-notes/3.34">Release - Notes</link> for details. - </para> - </listitem> - <listitem> - <para> - If you enable the Pantheon Desktop Manager via - <link xlink:href="options.html#opt-services.xserver.desktopManager.pantheon.enable">services.xserver.desktopManager.pantheon.enable</link>, - we now default to also use - <link xlink:href="https://blog.elementary.io/say-hello-to-the-new-greeter/"> - Pantheon’s newly designed greeter </link>. Contrary to NixOS’s - usual update policy, Pantheon will receive updates during the - cycle of NixOS 20.03 when backwards compatible. - </para> - </listitem> - <listitem> - <para> - 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 - <literal>services.zfs.trim.enable</literal> varname. The zfs - scrub service - (<literal>services.zfs.autoScrub.enable</literal>) and the zfs - autosnapshot service - (<literal>services.zfs.autoSnapshot.enable</literal>) are now - only enabled if zfs is set in - <literal>config.boot.initrd.supportedFilesystems</literal> or - <literal>config.boot.supportedFilesystems</literal>. These - lists will automatically contain zfs as soon as any zfs - mountpoint is configured in <literal>fileSystems</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>nixos-option</literal> has been rewritten in C++, - speeding it up, improving correctness, and adding a - <literal>-r</literal> option which prints all options and - their values recursively. - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.desktopManager.default</literal> and - <literal>services.xserver.windowManager.default</literal> - options were replaced by a single - <link xlink:href="options.html#opt-services.xserver.displayManager.defaultSession">services.xserver.displayManager.defaultSession</link> - option to improve support for upstream session files. If you - used something like: - </para> - <programlisting language="nix"> -{ - services.xserver.desktopManager.default = "xfce"; - services.xserver.windowManager.default = "icewm"; -} -</programlisting> - <para> - you should change it to: - </para> - <programlisting language="nix"> -{ - services.xserver.displayManager.defaultSession = "xfce+icewm"; -} -</programlisting> - </listitem> - <listitem> - <para> - The testing driver implementation in NixOS is now in Python - <literal>make-test-python.nix</literal>. This was done by - Jacek Galowicz - (<link xlink:href="https://github.com/tfc">@tfc</link>), and - with the collaboration of Julian Stecklina - (<link xlink:href="https://github.com/blitz">@blitz</link>) - and Jana Traue - (<link xlink:href="https://github.com/jtraue">@jtraue</link>). - All documentation has been updated to use this testing driver, - and a vast majority of the 286 tests in NixOS were ported to - python driver. In 20.09 the Perl driver implementation, - <literal>make-test.nix</literal>, is slated for removal. This - should give users of the NixOS integration framework a - transitory period to rewrite their tests to use the Python - implementation. Users of the Perl driver will see this warning - everytime they use it: - </para> - <programlisting> -$ warning: Perl VM tests are deprecated and will be removed for 20.09. -Please update your tests to use the python test driver. -See https://github.com/NixOS/nixpkgs/pull/71684 for details. -</programlisting> - <para> - API compatibility is planned to be kept for at least the next - release with the perl driver. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.03-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - The kubernetes kube-proxy now supports a new hostname - configuration - <literal>services.kubernetes.proxy.hostname</literal> which - has to be set if the hostname of the node should be non - default. - </para> - </listitem> - <listitem> - <para> - UPower’s configuration is now managed by NixOS and can be - customized via <literal>services.upower</literal>. - </para> - </listitem> - <listitem> - <para> - To use Geary you should enable - <link xlink:href="options.html#opt-programs.geary.enable">programs.geary.enable</link> - instead of just adding it to - <link xlink:href="options.html#opt-environment.systemPackages">environment.systemPackages</link>. - It was created so Geary could function properly outside of - GNOME. - </para> - </listitem> - <listitem> - <para> - <literal>./config/console.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./hardware/brillo.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./hardware/tuxedo-keyboard.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/bandwhich.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/bash-my-aws.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/liboping.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./programs/traceroute.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/sanoid.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/syncoid.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/backup/zfs-replication.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/continuous-integration/buildkite-agents.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/databases/victoriametrics.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/gnome3/gnome-initial-setup.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/desktops/neard.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/games/openarena.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/hardware/fancontrol.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/mail/sympa.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/freeswitch.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/misc/mame.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/monitoring/do-agent.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/monitoring/prometheus/xmpp-alerts.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/orangefs/server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/network-filesystems/orangefs/client.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/3proxy.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/corerad.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/go-shadowsocks2.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/ntp/openntpd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/shorewall.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/shorewall6.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/spacecookie.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/trickster.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/v2ray.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/xandikos.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/networking/yggdrasil.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/dokuwiki.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/gotify-server.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/grocy.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/ihatemoney</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/moinmoin.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/trac.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/trilium.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-apps/shiori.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/web-servers/ttyd.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/x11/picom.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/x11/hardware/digimend.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./services/x11/imwheel.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>./virtualisation/cri-o.nix</literal> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.03-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - The dhcpcd package - <link xlink:href="https://roy.marples.name/archives/dhcpcd-discuss/0002621.html"> - does not request IPv4 addresses for tap and bridge interfaces - anymore by default</link>. In order to still get an address on - a bridge interface, one has to disable - <literal>networking.useDHCP</literal> and explicitly enable - <literal>networking.interfaces.<name>.useDHCP</literal> - on every interface, that should get an address via DHCP. This - way, dhcpcd is configured in an explicit way about which - interface to run on. - </para> - </listitem> - <listitem> - <para> - GnuPG is now built without support for a graphical passphrase - entry by default. Please enable the - <literal>gpg-agent</literal> user service via the NixOS option - <literal>programs.gnupg.agent.enable</literal>. Note that - upstream recommends using <literal>gpg-agent</literal> and - will spawn a <literal>gpg-agent</literal> on the first - invocation of GnuPG anyway. - </para> - </listitem> - <listitem> - <para> - The <literal>dynamicHosts</literal> option has been removed - from the - <link xlink:href="options.html#opt-networking.networkmanager.enable">NetworkManager</link> - module. Allowing (multiple) regular users to override host - entries affecting the whole system opens up a huge attack - vector. There seem to be very rare cases where this might be - useful. Consider setting system-wide host entries using - <link xlink:href="options.html#opt-networking.hosts">networking.hosts</link>, - provide them via the DNS server in your network, or use - <link xlink:href="options.html#opt-environment.etc">environment.etc</link> - to add a file into - <literal>/etc/NetworkManager/dnsmasq.d</literal> reconfiguring - <literal>hostsdir</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>99-main.network</literal> file was removed. - Matching all network interfaces caused many breakages, see - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link> - and - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>. - </para> - <para> - We already don’t support the global - <link xlink:href="options.html#opt-networking.useDHCP">networking.useDHCP</link>, - <link xlink:href="options.html#opt-networking.defaultGateway">networking.defaultGateway</link> - and - <link xlink:href="options.html#opt-networking.defaultGateway6">networking.defaultGateway6</link> - options if - <link xlink:href="options.html#opt-networking.useNetworkd">networking.useNetworkd</link> - is enabled, but direct users to configure the per-device - <link xlink:href="options.html#opt-networking.interfaces">networking.interfaces.<name>….</link> - options. - </para> - </listitem> - <listitem> - <para> - The stdenv now runs all bash with <literal>set -u</literal>, - to catch the use of undefined variables. Before, it itself - used <literal>set -u</literal> 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. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The Way Cooler wayland compositor has been removed, as the - project has been officially canceled. There are no more - <literal>way-cooler</literal> attribute and - <literal>programs.way-cooler</literal> options. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - There is now only one Xfce package-set and module. This means - that attributes <literal>xfce4-14</literal> and - <literal>xfceUnstable</literal> 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). - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.phpfpm.pools">phpfpm</link> - module now sets <literal>PrivateTmp=true</literal> in its - systemd units for better process isolation. If you rely on - <literal>/tmp</literal> being shared with other services, - explicitly override this by setting - <literal>serviceConfig.PrivateTmp</literal> to - <literal>false</literal> for each phpfpm unit. - </para> - </listitem> - <listitem> - <para> - KDE’s old multimedia framework Phonon no longer supports Qt 4. - For that reason, Plasma desktop also does not have - <literal>enableQt4Support</literal> option any more. - </para> - </listitem> - <listitem> - <para> - The BeeGFS module has been removed. - </para> - </listitem> - <listitem> - <para> - The osquery module has been removed. - </para> - </listitem> - <listitem> - <para> - Going forward, <literal>~/bin</literal> in the users home - directory will no longer be in <literal>PATH</literal> by - default. If you depend on this you should set the option - <literal>environment.homeBinInPath</literal> to - <literal>true</literal>. The aforementioned option was added - this release. - </para> - </listitem> - <listitem> - <para> - The <literal>buildRustCrate</literal> infrastructure now - produces <literal>lib</literal> outputs in addition to the - <literal>out</literal> output. This has led to drastically - reduced closure sizes for some rust crates since development - dependencies are now in the <literal>lib</literal> output. - </para> - </listitem> - <listitem> - <para> - Pango was upgraded to 1.44, which no longer uses freetype for - font loading. This means that type1 and bitmap fonts are no - longer supported in applications relying on Pango for font - rendering (notably, GTK application). See - <link xlink:href="https://gitlab.gnome.org/GNOME/pango/issues/386"> - upstream issue</link> for more information. - </para> - </listitem> - <listitem> - <para> - The <literal>roundcube</literal> module has been hardened. - </para> - <itemizedlist> - <listitem> - <para> - The password of the database is not written world readable - in the store any more. If <literal>database.host</literal> - is set to <literal>localhost</literal>, then a unix user - of the same name as the database will be created and - PostreSQL peer authentication will be used, removing the - need for a password. Otherwise, a password is still needed - and can be provided with the new option - <literal>database.passwordFile</literal>, which should be - set to the path of a file containing the password and - readable by the user <literal>nginx</literal> only. The - <literal>database.password</literal> option is insecure - and deprecated. Usage of this option will print a warning. - </para> - </listitem> - <listitem> - <para> - A random <literal>des_key</literal> is set by default in - the configuration of roundcube, instead of using the - hardcoded and insecure default. To ensure a clean - migration, all users will be logged out when you upgrade - to this release. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The packages <literal>openobex</literal> and - <literal>obexftp</literal> are no longer installed when - enabling Bluetooth via - <literal>hardware.bluetooth.enable</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>dump1090</literal> 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 <literal>share/dump1090</literal> directory of - the derivation can be used in conjunction with an external - webserver to replace this functionality. - </para> - </listitem> - <listitem> - <para> - The fourStore and fourStoreEndpoint modules have been removed. - </para> - </listitem> - <listitem> - <para> - Polkit no longer has the user of uid 0 (root) as an admin - identity. We now follow the upstream default of only having - every member of the wheel group admin privileged. Before it - was root and members of wheel. The positive outcome of this is - pkexec GUI popups or terminal prompts will no longer require - the user to choose between two essentially equivalent choices - (whether to perform the action as themselves with wheel - permissions, or as the root user). - </para> - </listitem> - <listitem> - <para> - NixOS containers no longer build NixOS manual by default. This - saves evaluation time, especially if there are many - declarative containers defined. Note that this is already done - when - <literal><nixos/modules/profiles/minimal.nix></literal> - module is included in container config. - </para> - </listitem> - <listitem> - <para> - The <literal>kresd</literal> services deprecates the - <literal>interfaces</literal> option in favor of the - <literal>listenPlain</literal> option which requires full - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream=">systemd.socket - compatible</link> declaration which always include a port. - </para> - </listitem> - <listitem> - <para> - Virtual console options have been reorganized and can be found - under a single top-level attribute: - <literal>console</literal>. The full set of changes is as - follows: - </para> - <itemizedlist> - <listitem> - <para> - <literal>i18n.consoleFont</literal> renamed to - <link xlink:href="options.html#opt-console.font">console.font</link> - </para> - </listitem> - <listitem> - <para> - <literal>i18n.consoleKeyMap</literal> renamed to - <link xlink:href="options.html#opt-console.keyMap">console.keyMap</link> - </para> - </listitem> - <listitem> - <para> - <literal>i18n.consoleColors</literal> renamed to - <link xlink:href="options.html#opt-console.colors">console.colors</link> - </para> - </listitem> - <listitem> - <para> - <literal>i18n.consolePackages</literal> renamed to - <link xlink:href="options.html#opt-console.packages">console.packages</link> - </para> - </listitem> - <listitem> - <para> - <literal>i18n.consoleUseXkbConfig</literal> renamed to - <link xlink:href="options.html#opt-console.useXkbConfig">console.useXkbConfig</link> - </para> - </listitem> - <listitem> - <para> - <literal>boot.earlyVconsoleSetup</literal> renamed to - <link xlink:href="options.html#opt-console.earlySetup">console.earlySetup</link> - </para> - </listitem> - <listitem> - <para> - <literal>boot.extraTTYs</literal> renamed to - <literal>console.extraTTYs</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.awstats.enable">awstats</link> - module has been rewritten to serve stats via static html - pages, updated on a timer, over - <link xlink:href="options.html#opt-services.nginx.virtualHosts">nginx</link>, - instead of dynamic cgi pages over - <link xlink:href="options.html#opt-services.httpd.enable">apache</link>. - </para> - <para> - Minor changes will be required to migrate existing - configurations. Details of the required changes can seen by - looking through the - <link xlink:href="options.html#opt-services.awstats.enable">awstats</link> - module. - </para> - </listitem> - <listitem> - <para> - The httpd module no longer provides options to support serving - web content without defining a virtual host. As a result of - this the - <link xlink:href="options.html#opt-services.httpd.logPerVirtualHost">services.httpd.logPerVirtualHost</link> - option now defaults to <literal>true</literal> instead of - <literal>false</literal>. Please update your configuration to - make use of - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts</link>. - </para> - <para> - The - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name></link> - option has changed type from a list of submodules to an - attribute set of submodules, better matching - <link xlink:href="options.html#opt-services.nginx.virtualHosts">services.nginx.virtualHosts.<name></link>. - </para> - <para> - This change comes with the addition of the following options - which mimic the functionality of their - <literal>nginx</literal> counterparts: - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.addSSL</link>, - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.forceSSL</link>, - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.onlySSL</link>, - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.enableACME</link>, - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.acmeRoot</link>, - and - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.useACMEHost</link>. - </para> - </listitem> - <listitem> - <para> - For NixOS configuration options, the <literal>loaOf</literal> - type has been deprecated and will be removed in a future - release. In nixpkgs, options of this type will be changed to - <literal>attrsOf</literal> instead. If you were using one of - these in your configuration, you will see a warning suggesting - what changes will be required. - </para> - <para> - For example, - <link xlink:href="options.html#opt-users.users">users.users</link> - is a <literal>loaOf</literal> option that is commonly used as - follows: - </para> - <programlisting language="nix"> -{ - users.users = - [ { name = "me"; - description = "My personal user."; - isNormalUser = true; - } - ]; -} -</programlisting> - <para> - This should be rewritten by removing the list and using the - value of <literal>name</literal> as the name of the attribute - set: - </para> - <programlisting language="nix"> -{ - users.users.me = - { description = "My personal user."; - isNormalUser = true; - }; -} -</programlisting> - <para> - For more information on this change have look at these links: - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/1800">issue - #1800</link>, - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR - #63103</link>. - </para> - </listitem> - <listitem> - <para> - For NixOS modules, the types - <literal>types.submodule</literal> and - <literal>types.submoduleWith</literal> now support paths as - allowed values, similar to how <literal>imports</literal> - supports paths. Because of this, if you have a module that - defines an option of type - <literal>either (submodule ...) path</literal>, it will break - since a path is now treated as the first type instead of the - second. To fix this, change the type to - <literal>either path (submodule ...)</literal>. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.buildkite-agents">Buildkite - Agent</link> module and corresponding packages have been - updated to 3.x, and to support multiple instances of the agent - running at the same time. This means you will have to rename - <literal>services.buildkite-agent</literal> to - <literal>services.buildkite-agents.<name></literal>. - Furthermore, the following options have been changed: - </para> - <itemizedlist> - <listitem> - <para> - <literal>services.buildkite-agent.meta-data</literal> has - been renamed to - <link xlink:href="options.html#opt-services.buildkite-agents">services.buildkite-agents.<name>.tags</link>, - to match upstreams naming for 3.x. Its type has also - changed - it now accepts an attrset of strings. - </para> - </listitem> - <listitem> - <para> - The<literal>services.buildkite-agent.openssh.publicKeyPath</literal> - option has been removed, as it’s not necessary to deploy - public keys to clone private repositories. - </para> - </listitem> - <listitem> - <para> - <literal>services.buildkite-agent.openssh.privateKeyPath</literal> - has been renamed to - <link xlink:href="options.html#opt-services.buildkite-agents">buildkite-agents.<name>.privateSshKeyPath</link>, - as the whole <literal>openssh</literal> now only contained - that single option. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.buildkite-agents">services.buildkite-agents.<name>.shell</link> - has been introduced, allowing to specify a custom shell to - be used. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>citrix_workspace_19_3_0</literal> package has - been removed as it will be EOLed within the lifespan of 20.03. - For further information, please refer to the - <link xlink:href="https://www.citrix.com/de-de/support/product-lifecycle/milestones/receiver.html">support - and maintenance information</link> from upstream. - </para> - </listitem> - <listitem> - <para> - The <literal>gcc5</literal> and <literal>gfortran5</literal> - packages have been removed. - </para> - </listitem> - <listitem> - <para> - The <literal>services.xserver.displayManager.auto</literal> - 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 - <literal>services.xserver.displayManager.lightdm.autoLogin</literal> - 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: - </para> - <programlisting language="nix"> -{ - security.pam.services.lightdm-autologin.text = lib.mkForce '' - auth requisite pam_nologin.so - auth required pam_succeed_if.so quiet - auth required pam_permit.so - - account include lightdm - - password include lightdm - - session include lightdm - ''; -} -</programlisting> - <para> - The difference is the: - </para> - <programlisting> -auth required pam_succeed_if.so quiet -</programlisting> - <para> - line, where default it’s: - </para> - <programlisting> - auth required pam_succeed_if.so uid >= 1000 quiet -</programlisting> - <para> - not permitting users with uid’s below 1000 (like root). All - other display managers in NixOS are configured like this. - </para> - </listitem> - <listitem> - <para> - There have been lots of improvements to the Mailman module. As - a result, - </para> - <itemizedlist> - <listitem> - <para> - The <literal>services.mailman.hyperkittyBaseUrl</literal> - option has been renamed to - <link xlink:href="options.html#opt-services.mailman.hyperkitty.baseUrl">services.mailman.hyperkitty.baseUrl</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>services.mailman.hyperkittyApiKey</literal> - option has been removed. This is because having an option - for the Hyperkitty API key meant that the API key would be - stored in the world-readable Nix store, which was a - security vulnerability. A new Hyperkitty API key will be - generated the first time the new Hyperkitty service is - run, and it will then be persisted outside of the Nix - store. To continue using Hyperkitty, you must set - <link xlink:href="options.html#opt-services.mailman.hyperkitty.enable">services.mailman.hyperkitty.enable</link> - to <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - Additionally, some Postfix configuration must now be set - manually instead of automatically by the Mailman module: - </para> - <programlisting language="nix"> -{ - services.postfix.relayDomains = [ "hash:/var/lib/mailman/data/postfix_domains" ]; - services.postfix.config.transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; - services.postfix.config.local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ]; -} -</programlisting> - <para> - This is because some users may want to include other - values in these lists as well, and this was not possible - if they were set automatically by the Mailman module. It - would not have been possible to just concatenate values - from multiple modules each setting the values they needed, - because the order of elements in the list is significant. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The LLVM versions 3.5, 3.9 and 4 (including the corresponding - CLang versions) have been dropped. - </para> - </listitem> - <listitem> - <para> - The - <literal>networking.interfaces.*.preferTempAddress</literal> - option has been replaced by - <literal>networking.interfaces.*.tempAddress</literal>. The - new option allows better control of the IPv6 temporary - addresses, including completely disabling them for interfaces - where they are not needed. - </para> - </listitem> - <listitem> - <para> - Rspamd was updated to version 2.2. Read - <link xlink:href="https://rspamd.com/doc/migration.html#migration-to-rspamd-20"> - the upstream migration notes</link> carefully. Please be - especially aware that some modules were removed and the - default Bayes backend is now Redis. - </para> - </listitem> - <listitem> - <para> - The <literal>*psu</literal> versions of oraclejdk8 have been - removed as they aren’t provided by upstream anymore. - </para> - </listitem> - <listitem> - <para> - The <literal>services.dnscrypt-proxy</literal> module has been - removed as it used the deprecated version of dnscrypt-proxy. - We’ve added - <link xlink:href="options.html#opt-services.dnscrypt-proxy2.enable">services.dnscrypt-proxy2.enable</link> - to use the supported version. This module supports - configuration via the Nix attribute set - <link xlink:href="options.html#opt-services.dnscrypt-proxy2.settings">services.dnscrypt-proxy2.settings</link>, - or by passing a TOML configuration file via - <link xlink:href="options.html#opt-services.dnscrypt-proxy2.configFile">services.dnscrypt-proxy2.configFile</link>. - </para> - <programlisting language="nix"> -{ - # Example configuration: - services.dnscrypt-proxy2.enable = true; - services.dnscrypt-proxy2.settings = { - listen_addresses = [ "127.0.0.1:43" ]; - sources.public-resolvers = { - urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ]; - cache_file = "public-resolvers.md"; - minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; - refresh_delay = 72; - }; - }; - - services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#43" ]; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>qesteidutil</literal> has been deprecated in favor of - <literal>qdigidoc</literal>. - </para> - </listitem> - <listitem> - <para> - sqldeveloper_18 has been removed as it’s not maintained - anymore, sqldeveloper has been updated to version - <literal>19.4</literal>. Please note that this means that this - means that the oraclejdk is now required. For further - information please read the - <link xlink:href="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - Haskell <literal>env</literal> and <literal>shellFor</literal> - 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. - </para> - <para> - This means that if you incorrectly categorize a dependency, - e.g. non-Haskell library dependency as a - <literal>buildDepends</literal> or run-time Haskell dependency - as a <literal>setupDepends</literal>, whereas things would - have worked before they may not work now. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The nixos-build-vms8 -script now uses the python test-driver. - </para> - </listitem> - <listitem> - <para> - The riot-web package now accepts configuration overrides as an - attribute set instead of a string. A formerly used JSON - configuration can be converted to an attribute set with - <literal>builtins.fromJSON</literal>. - </para> - <para> - The new default configuration also disables automatic guest - account registration and analytics to improve privacy. The - previous behavior can be restored by setting - <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>. - </para> - </listitem> - <listitem> - <para> - Stand-alone usage of <literal>Upower</literal> now requires - <literal>services.upower.enable</literal> instead of just - installing into - <link xlink:href="options.html#opt-environment.systemPackages">environment.systemPackages</link>. - </para> - </listitem> - <listitem> - <para> - nextcloud has been updated to <literal>v18.0.2</literal>. This - means that users from NixOS 19.09 can’t upgrade directly since - you can only move one version forward and 19.09 uses - <literal>v16.0.8</literal>. - </para> - <para> - To provide a safe upgrade-path and to circumvent similar - issues in the future, the following measures were taken: - </para> - <itemizedlist> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - Existing setups will be detected using - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>: - 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 - <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link>. - </para> - </listitem> - <listitem> - <para> - Users with an overlay (e.g. to use nextcloud at version - <literal>v18</literal> on <literal>19.09</literal>) will - get an evaluation error by default. This is done to ensure - that our - <link xlink:href="options.html#opt-services.nextcloud.package">package</link>-option - doesn’t select an older version by accident. It’s - recommended to use pkgs.nextcloud18 or to set - <link xlink:href="options.html#opt-services.nextcloud.package">package</link> - to pkgs.nextcloud explicitly. - </para> - </listitem> - </itemizedlist> - <warning> - <para> - Please note that if you’re coming from - <literal>19.03</literal> or older, you have to manually - upgrade to <literal>19.09</literal> first to upgrade your - server to Nextcloud v16. - </para> - </warning> - </listitem> - <listitem> - <para> - Hydra has gained a massive performance improvement due to - <link xlink:href="https://github.com/NixOS/hydra/pull/710">some - database schema changes</link> by adding several IDs and - better indexing. However, it’s necessary to upgrade Hydra in - multiple steps: - </para> - <itemizedlist> - <listitem> - <para> - At first, an older version of Hydra needs to be deployed - which adds those (nullable) columns. When having set - <link xlink:href="options.html#opt-system.stateVersion">stateVersion - </link> to a value older than <literal>20.03</literal>, - this package will be selected by default from the module - when upgrading. Otherwise, the package can be deployed - using the following config: - </para> - <programlisting language="nix"> -{ pkgs, ... }: { - services.hydra.package = pkgs.hydra-migration; -} -</programlisting> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Automatically fill the newly added ID columns on the server by - running the following command: - </para> - <programlisting> -$ hydra-backfill-ids -</programlisting> - <warning> - <para> - Please note that this process can take a while depending on - your database-size! - </para> - </warning> - </listitem> - <listitem> - <para> - Deploy a newer version of Hydra to activate the DB - optimizations. This can be done by using hydra-unstable. This - package already includes - <link xlink:href="https://github.com/nixos/rfcs/pull/49">flake-support</link> - and is therefore compiled against pkgs.nixFlakes. - </para> - <warning> - <para> - If your - <link xlink:href="options.html#opt-system.stateVersion">stateVersion</link> - is set to <literal>20.03</literal> or greater, - hydra-unstable will be used automatically! This will break - your setup if you didn’t run the migration. - </para> - </warning> - <para> - Please note that Hydra is currently not available with - nixStable as this doesn’t compile anymore. - </para> - <warning> - <para> - 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 - <link xlink:href="options.html#opt-services.hydra.package">services.hydra.package</link> - to pkgs.hydra explicitly and make sure you know what you’re - doing! - </para> - </warning> - </listitem> - <listitem> - <para> - The TokuDB storage engine will be disabled in mariadb 10.5. It - is recommended to switch to RocksDB. See also - <link xlink:href="https://mariadb.com/kb/en/tokudb/">TokuDB</link>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.03-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - SD images are now compressed by default using - <literal>bzip2</literal>. - </para> - </listitem> - <listitem> - <para> - The nginx web server previously started its master process as - root privileged, then ran worker processes as a less - privileged identity user (the <literal>nginx</literal> user). - This was changed to start all of nginx as a less privileged - user (defined by <literal>services.nginx.user</literal> and - <literal>services.nginx.group</literal>). As a consequence, - all files that are needed for nginx to run (included - configuration fragments, SSL certificates and keys, etc.) must - now be readable by this less privileged user/group. - </para> - <para> - To continue to use the old approach, you can configure: - </para> - <programlisting language="nix"> -{ - services.nginx.appendConfig = let cfg = config.services.nginx; in ''user ${cfg.user} ${cfg.group};''; - systemd.services.nginx.serviceConfig.User = lib.mkForce "root"; -} -</programlisting> - </listitem> - <listitem> - <para> - OpenSSH has been upgraded from 7.9 to 8.1, improving security - and adding features but with potential incompatibilities. - Consult the - <link xlink:href="https://www.openssh.com/txt/release-8.1"> - release announcement</link> for more information. - </para> - </listitem> - <listitem> - <para> - <literal>PRETTY_NAME</literal> in - <literal>/etc/os-release</literal> now uses the short rather - than full version string. - </para> - </listitem> - <listitem> - <para> - The ACME module has switched from simp-le to - <link xlink:href="https://github.com/go-acme/lego">lego</link> - which allows us to support DNS-01 challenges and wildcard - certificates. The following options have been added: - <link xlink:href="options.html#opt-security.acme.acceptTerms">security.acme.acceptTerms</link>, - <link xlink:href="options.html#opt-security.acme.certs">security.acme.certs.<name>.dnsProvider</link>, - <link xlink:href="options.html#opt-security.acme.certs">security.acme.certs.<name>.credentialsFile</link>, - <link xlink:href="options.html#opt-security.acme.certs">security.acme.certs.<name>.dnsPropagationCheck</link>. - As well as this, the options - <literal>security.acme.acceptTerms</literal> and either - <literal>security.acme.email</literal> or - <literal>security.acme.certs.<name>.email</literal> must - be set in order to use the ACME module. Certificates will be - regenerated on activation, no account or certificate will be - migrated from simp-le. In particular private keys will not be - preserved. However, the credentials for simp-le are preserved - and thus it is possible to roll back to previous versions - without breaking certificate generation. Note also that in - contrary to simp-le a new private key is recreated at each - renewal by default, which can have consequences if you embed - your public key in apps. - </para> - </listitem> - <listitem> - <para> - It is now possible to unlock LUKS-Encrypted file systems using - a FIDO2 token via - <literal>boot.initrd.luks.fido2Support</literal>. - </para> - </listitem> - <listitem> - <para> - Predictably named network interfaces get renamed in stage-1. - This means that it is possible to use the proper interface - name for e.g. Dropbear setups. - </para> - <para> - For further reference, please read - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> - or the corresponding - <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse - thread</link>. - </para> - </listitem> - <listitem> - <para> - The matrix-synapse-package has been updated to - <link xlink:href="https://github.com/matrix-org/synapse/releases/tag/v1.11.1">v1.11.1</link>. - Due to - <link xlink:href="https://github.com/matrix-org/synapse/releases/tag/v1.10.0rc1">stricter - requirements</link> for database configuration when using - postgresql, the automated database setup of the module has - been removed to avoid any further edge-cases. - </para> - <para> - matrix-synapse expects <literal>postgresql</literal>-databases - to have the options <literal>LC_COLLATE</literal> and - <literal>LC_CTYPE</literal> set to - <link xlink:href="https://www.postgresql.org/docs/12/locale.html"><literal>'C'</literal></link> - which basically instructs <literal>postgresql</literal> to - ignore any locale-based preferences. - </para> - <para> - Depending on your setup, you need to incorporate one of the - following changes in your setup to upgrade to 20.03: - </para> - <itemizedlist> - <listitem> - <para> - If you use <literal>sqlite3</literal> you don’t need to do - anything. - </para> - </listitem> - <listitem> - <para> - If you use <literal>postgresql</literal> on a different - server, you don’t need to change anything as well since - this module was never designed to configure remote - databases. - </para> - </listitem> - <listitem> - <para> - If you use <literal>postgresql</literal> and configured - your synapse initially on <literal>19.09</literal> or - older, you simply need to enable postgresql-support - explicitly: - </para> - <programlisting language="nix"> -{ ... }: { - services.matrix-synapse = { - enable = true; - /* and all the other config you've defined here */ - }; - services.postgresql.enable = true; -} -</programlisting> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - If you deploy a fresh matrix-synapse, you need to configure - the database yourself (e.g. by using the - <link xlink:href="options.html#opt-services.postgresql.initialScript">services.postgresql.initialScript</link> - option). An example for this can be found in the - <link linkend="module-services-matrix">documentation of the - Matrix module</link>. - </para> - </listitem> - <listitem> - <para> - If you initially deployed your matrix-synapse on - <literal>nixos-unstable</literal> <emphasis>after</emphasis> - the <literal>19.09</literal>-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 - <literal>LC_COLLATE</literal> and <literal>LC_CTYPE</literal> - to - <link xlink:href="https://www.postgresql.org/docs/12/locale.html"><literal>'C'</literal></link>. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-systemd.network.links">systemd.network.links</link> - option is now respected even when - <link xlink:href="options.html#opt-systemd.network.enable">systemd-networkd</link> - is disabled. This mirrors the behaviour of systemd - It’s udev - that parses <literal>.link</literal> files, not - <literal>systemd-networkd</literal>. - </para> - </listitem> - <listitem> - <para> - mongodb has been updated to version <literal>3.4.24</literal>. - </para> - <warning> - <para> - Please note that mongodb has been relicensed under their own - <link xlink:href="https://www.mongodb.com/licensing/server-side-public-license/faq"><literal> sspl</literal></link>-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. - </para> - </warning> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index a1b007e711d73..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ /dev/null @@ -1,2210 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-20.09"> - <title>Release 20.09 (<quote>Nightingale</quote>, 2020.10/27)</title> - <para> - Support is planned until the end of June 2021, handing over to - 21.05. (Plans - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md#core-changes"> - have shifted</link> by two months since release of 20.09.) - </para> - <section xml:id="sec-release-20.09-highlights"> - <title>Highlights</title> - <para> - In addition to 7349 new, 14442 updated, and 8181 removed packages, - this release has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Core version changes: - </para> - <itemizedlist> - <listitem> - <para> - gcc: 9.2.0 -> 9.3.0 - </para> - </listitem> - <listitem> - <para> - glibc: 2.30 -> 2.31 - </para> - </listitem> - <listitem> - <para> - linux: still defaults to 5.4.x, all supported kernels - available - </para> - </listitem> - <listitem> - <para> - mesa: 19.3.5 -> 20.1.7 - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Desktop Environments: - </para> - <itemizedlist> - <listitem> - <para> - plasma5: 5.17.5 -> 5.18.5 - </para> - </listitem> - <listitem> - <para> - kdeApplications: 19.12.3 -> 20.08.1 - </para> - </listitem> - <listitem> - <para> - gnome3: 3.34 -> 3.36, see its - <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release - notes</link> - </para> - </listitem> - <listitem> - <para> - cinnamon: added at 4.6 - </para> - </listitem> - <listitem> - <para> - NixOS now distributes an official - <link xlink:href="https://nixos.org/download.html#nixos-iso">GNOME - ISO</link> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Programming Languages and Frameworks: - </para> - <itemizedlist> - <listitem> - <para> - Agda ecosystem was heavily reworked (see more details - below) - </para> - </listitem> - <listitem> - <para> - PHP now defaults to PHP 7.4, updated from 7.3 - </para> - </listitem> - <listitem> - <para> - PHP 7.2 is no longer supported due to upstream not - supporting this version for the entire lifecycle of the - 20.09 release - </para> - </listitem> - <listitem> - <para> - Python 3 now defaults to Python 3.8 instead of 3.7 - </para> - </listitem> - <listitem> - <para> - Python 3.5 reached its upstream EOL at the end of - September 2020: it has been removed from the list of - available packages - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Databases and Service Monitoring: - </para> - <itemizedlist> - <listitem> - <para> - MariaDB has been updated to 10.4, MariaDB Galera to 26.4. - Please read the related upgrade instructions under - <link linkend="sec-release-20.09-incompatibilities">backwards - incompatibilities</link> before upgrading. - </para> - </listitem> - <listitem> - <para> - Zabbix now defaults to 5.0, updated from 4.4. Please read - related sections under - <link linkend="sec-release-20.09-incompatibilities">backwards - compatibilities</link> before upgrading. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Major module changes: - </para> - <itemizedlist> - <listitem> - <para> - Quickly configure a complete, private, self-hosted video - conferencing solution with the new Jitsi Meet module. - </para> - </listitem> - <listitem> - <para> - Two new options, - <link xlink:href="options.html#opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link> - and - <link xlink:href="options.html#opt-services.openssh.authorizedKeysCommandUser">authorizedKeysCommandUser</link>, - have been added to the <literal>openssh</literal> module. - If you have <literal>AuthorizedKeysCommand</literal> in - your - <link xlink:href="options.html#opt-services.openssh.extraConfig">services.openssh.extraConfig</link> - you should make use of these new options instead. - </para> - </listitem> - <listitem> - <para> - There is a new module for Podman - (<literal>virtualisation.podman</literal>), a drop-in - replacement for the Docker command line. - </para> - </listitem> - <listitem> - <para> - The new <literal>virtualisation.containers</literal> - module manages configuration shared by the CRI-O and - Podman modules. - </para> - </listitem> - <listitem> - <para> - Declarative Docker containers are renamed from - <literal>docker-containers</literal> to - <literal>virtualisation.oci-containers.containers</literal>. - This is to make it possible to use - <literal>podman</literal> instead of - <literal>docker</literal>. - </para> - </listitem> - <listitem> - <para> - The new option - <link xlink:href="options.html#opt-documentation.man.generateCaches">documentation.man.generateCaches</link> - has been added to automatically generate the - <literal>man-db</literal> caches, which are needed by - utilities like <literal>whatis</literal> and - <literal>apropos</literal>. The caches are generated - during the build of the NixOS configuration: since this - can be expensive when a large number of packages are - installed, the feature is disabled by default. - </para> - </listitem> - <listitem> - <para> - <literal>services.postfix.sslCACert</literal> was replaced - by - <literal>services.postfix.tlsTrustedAuthorities</literal> - which now defaults to system certificate authorities. - </para> - </listitem> - <listitem> - <para> - The various documented workarounds to use steam have been - converted to a module. - <literal>programs.steam.enable</literal> enables steam, - controller support and the workarounds. - </para> - </listitem> - <listitem> - <para> - Support for built-in LCDs in various pieces of Logitech - hardware (keyboards and USB speakers). - <literal>hardware.logitech.lcd.enable</literal> enables - support for all hardware supported by the - <link xlink:href="https://sourceforge.net/projects/g15daemon/">g15daemon - project</link>. - </para> - </listitem> - <listitem> - <para> - The GRUB module gained support for basic password - protection, which allows to restrict non-default entries - in the boot menu to one or more users. The users and - passwords are defined via the option - <literal>boot.loader.grub.users</literal>. Note: Password - support is only available in GRUB version 2. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - NixOS module changes: - </para> - <itemizedlist> - <listitem> - <para> - The NixOS module system now supports freeform modules as a - mix between <literal>types.attrsOf</literal> and - <literal>types.submodule</literal>. These allow you to - explicitly declare a subset of options while still - permitting definitions without an associated option. See - <xref linkend="sec-freeform-modules" /> for how to use - them. - </para> - </listitem> - <listitem> - <para> - Following its deprecation in 20.03, the Perl NixOS test - driver has been removed. All remaining tests have been - ported to the Python test framework. Code outside nixpkgs - using <literal>make-test.nix</literal> or - <literal>testing.nix</literal> needs to be ported to - <literal>make-test-python.nix</literal> and - <literal>testing-python.nix</literal> respectively. - </para> - </listitem> - <listitem> - <para> - Subordinate GID and UID mappings are now set up - automatically for all normal users. This will make - container tools like Podman work as non-root users out of - the box. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Starting with this release, the hydra-build-result - <literal>nixos-YY.MM</literal> branches no longer exist in the - <link xlink:href="https://github.com/nixos/nixpkgs-channels">deprecated - nixpkgs-channels repository</link>. These branches are now in - <link xlink:href="https://github.com/nixos/nixpkgs">the main - nixpkgs repository</link>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.09-new-services"> - <title>New Services</title> - <para> - In addition to 1119 new, 118 updated, and 476 removed options; 61 - new modules were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - Hardware: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="options.html#opt-hardware.system76.firmware-daemon.enable">hardware.system76.firmware-daemon.enable</link> - adds easy support of system76 firmware - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-hardware.uinput.enable">hardware.uinput.enable</link> - loads uinput kernel module - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-hardware.video.hidpi.enable">hardware.video.hidpi.enable</link> - enable good defaults for HiDPI displays - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-hardware.wooting.enable">hardware.wooting.enable</link> - support for Wooting keyboards - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-hardware.xpadneo.enable">hardware.xpadneo.enable</link> - xpadneo driver for Xbox One wireless controllers - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Programs: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="options.html#opt-programs.hamster.enable">programs.hamster.enable</link> - enable hamster time tracking - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-programs.steam.enable">programs.steam.enable</link> - adds easy enablement of steam and related system - configuration - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Security: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="options.html#opt-security.doas.enable">security.doas.enable</link> - alternative to sudo, allows non-root users to execute - commands as root - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-security.tpm2.enable">security.tpm2.enable</link> - add Trusted Platform Module 2 support - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - System: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <link xlink:href="options.html#opt-boot.initrd.network.openvpn.enable">boot.initrd.network.openvpn.enable</link> - start an OpenVPN client during initrd boot - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Virtualization: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="options.html#opt-boot.enableContainers">boot.enableContainers</link> - use nixos-containers - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-virtualisation.oci-containers.containers">virtualisation.oci-containers.containers</link> - run OCI (Docker) containers - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-virtualisation.podman.enable">virtualisation.podman.enable</link> - daemonless container engine - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Services: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="options.html#opt-services.ankisyncd.enable">services.ankisyncd.enable</link> - Anki sync server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.bazarr.enable">services.bazarr.enable</link> - Subtitle manager for Sonarr and Radarr - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.biboumi.enable">services.biboumi.enable</link> - Biboumi XMPP gateway to IRC - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.blockbook-frontend">services.blockbook-frontend</link> - Blockbook-frontend, a service for the Trezor wallet - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.cage.enable">services.cage.enable</link> - Wayland cage service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.convos.enable">services.convos.enable</link> - IRC daemon, which can be accessed throught the browser - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.engelsystem.enable">services.engelsystem.enable</link> - Tool for coordinating volunteers and shifts on large - events - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.espanso.enable">services.espanso.enable</link> - text-expander written in rust - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.foldingathome.enable">services.foldingathome.enable</link> - Folding@home client - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.gerrit.enable">services.gerrit.enable</link> - Web-based team code collaboration tool - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.go-neb.enable">services.go-neb.enable</link> - Matrix bot - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.hardware.xow.enable">services.hardware.xow.enable</link> - xow as a systemd service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.hercules-ci-agent.enable">services.hercules-ci-agent.enable</link> - Hercules CI build agent - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.jicofo.enable">services.jicofo.enable</link> - Jitsi Conference Focus, component of Jitsi Meet - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.jirafeau.enable">services.jirafeau.enable</link> - A web file repository - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.jitsi-meet.enable">services.jitsi-meet.enable</link> - Secure, simple and scalable video conferences - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.jitsi-videobridge.enable">services.jitsi-videobridge.enable</link> - Jitsi Videobridge, a WebRTC compatible router - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.jupyterhub.enable">services.jupyterhub.enable</link> - Jupyterhub development server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.k3s.enable">services.k3s.enable</link> - Lightweight Kubernetes distribution - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.magic-wormhole-mailbox-server.enable">services.magic-wormhole-mailbox-server.enable</link> - Magic Wormhole Mailbox Server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.malcontent.enable">services.malcontent.enable</link> - Parental Control support - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.matrix-appservice-discord.enable">services.matrix-appservice-discord.enable</link> - Matrix and Discord bridge - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.mautrix-telegram.enable">services.mautrix-telegram.enable</link> - Matrix-Telegram puppeting/relaybot bridge - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.mirakurun.enable">services.mirakurun.enable</link> - Japanese DTV Tuner Server Service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.molly-brown.enable">services.molly-brown.enable</link> - Molly-Brown Gemini server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.mullvad-vpn.enable">services.mullvad-vpn.enable</link> - Mullvad VPN daemon - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.ncdns.enable">services.ncdns.enable</link> - Namecoin to DNS bridge - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.nextdns.enable">services.nextdns.enable</link> - NextDNS to DoH Proxy service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.nix-store-gcs-proxy">services.nix-store-gcs-proxy</link> - Google storage bucket to be used as a nix store - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.onedrive.enable">services.onedrive.enable</link> - OneDrive sync service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.pinnwand.enable">services.pinnwand.enable</link> - Pastebin-like service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.pixiecore.enable">services.pixiecore.enable</link> - Manage network booting of machines - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.privacyidea.enable">services.privacyidea.enable</link> - Privacy authentication server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.quorum.enable">services.quorum.enable</link> - Quorum blockchain daemon - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.robustirc-bridge.enable">services.robustirc-bridge.enable</link> - RobustIRC bridge - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.rss-bridge.enable">services.rss-bridge.enable</link> - Generate RSS and Atom feeds - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.rtorrent.enable">services.rtorrent.enable</link> - rTorrent service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.smartdns.enable">services.smartdns.enable</link> - SmartDNS DNS server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.sogo.enable">services.sogo.enable</link> - SOGo groupware - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.teeworlds.enable">services.teeworlds.enable</link> - Teeworlds game server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.torque.mom.enable">services.torque.mom.enable</link> - torque computing node - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.torque.server.enable">services.torque.server.enable</link> - torque server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.tuptime.enable">services.tuptime.enable</link> - A total uptime service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.urserver.enable">services.urserver.enable</link> - X11 remote server - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.wasabibackend.enable">services.wasabibackend.enable</link> - Wasabi backend service - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.yubikey-agent.enable">services.yubikey-agent.enable</link> - Yubikey agent - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.zigbee2mqtt.enable">services.zigbee2mqtt.enable</link> - Zigbee to MQTT bridge - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.09-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - 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 - <link xlink:href="https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104-with-galera-cluster/">Upgrading - from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster</link> - instead. Before doing the upgrade read - <link xlink:href="https://mariadb.com/kb/en/upgrading-from-mariadb-103-to-mariadb-104/#incompatible-changes-between-103-and-104">Incompatible - Changes Between 10.3 and 10.4</link>. After the upgrade you - will need to run <literal>mysql_upgrade</literal>. MariaDB - 10.4 introduces a number of changes to the authentication - process, intended to make things easier and more intuitive. - See - <link xlink:href="https://mariadb.com/kb/en/authentication-from-mariadb-104/">Authentication - from MariaDB 10.4</link>. 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: - </para> - <programlisting language="nix"> -{ -services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' - ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); -''; -} -</programlisting> - <para> - When MariaDB data directory is just upgraded (not - initialized), the users are not created or modified. - </para> - </listitem> - <listitem> - <para> - MySQL server is now started with additional systemd - sandbox/hardening options for better security. The PrivateTmp, - ProtectHome, and ProtectSystem options may be problematic when - MySQL is attempting to read from or write to your filesystem - anywhere outside of its own state directory, for example when - calling - <literal>LOAD DATA INFILE or SELECT * INTO OUTFILE</literal>. - In this scenario a variant of the following may be required: - - allow MySQL to read from /home and /tmp directories when using - <literal>LOAD DATA INFILE</literal> - </para> - <programlisting language="nix"> -{ - systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; -} -</programlisting> - <para> - - allow MySQL to write to custom folder - <literal>/var/data</literal> when using - <literal>SELECT * INTO OUTFILE</literal>, assuming the mysql - user has write access to <literal>/var/data</literal> - </para> - <programlisting language="nix"> -{ - systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; -} -</programlisting> - <para> - The MySQL service no longer runs its - <literal>systemd</literal> service startup script as - <literal>root</literal> anymore. A dedicated non - <literal>root</literal> super user account is required for - operation. This means users with an existing MySQL or MariaDB - database server are required to run the following SQL - statements as a super admin user before upgrading: - </para> - <programlisting language="SQL"> -CREATE USER IF NOT EXISTS 'mysql'@'localhost' identified with unix_socket; -GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; -</programlisting> - <para> - If you use MySQL instead of MariaDB please replace - <literal>unix_socket</literal> with - <literal>auth_socket</literal>. If you have changed the value - of - <link xlink:href="options.html#opt-services.mysql.user">services.mysql.user</link> - from the default of <literal>mysql</literal> to a different - user please change <literal>'mysql'@'localhost'</literal> to - the corresponding user instead. - </para> - </listitem> - <listitem> - <para> - Zabbix now defaults to 5.0, updated from 4.4. Please carefully - read through - <link xlink:href="https://www.zabbix.com/documentation/current/manual/installation/upgrade/sources">the - upgrade guide</link> and apply any changes required. Be sure - to take special note of the section on - <link xlink:href="https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500#enabling_extended_range_of_numeric_float_values">enabling - extended range of numeric (float) values</link> as you will - need to apply this database migration manually. - </para> - <para> - If you are using Zabbix Server with a MySQL or MariaDB - database you should note that using a character set of - <literal>utf8</literal> and a collate of - <literal>utf8_bin</literal> has become mandatory with this - release. See the upstream - <link xlink:href="https://support.zabbix.com/browse/ZBX-17357">issue</link> - for further discussion. Before upgrading you should check the - character set and collation used by your database and ensure - they are correct: - </para> - <programlisting language="SQL"> -SELECT - default_character_set_name, - default_collation_name -FROM - information_schema.schemata -WHERE - schema_name = 'zabbix'; -</programlisting> - <para> - If these values are not correct you should take a backup of - your database and convert the character set and collation as - required. Here is an - <link xlink:href="https://www.zabbix.com/forum/zabbix-help/396573-reinstall-after-upgrade?p=396891#post396891">example</link> - of how to do so, taken from the Zabbix forums: - </para> - <programlisting language="SQL"> -ALTER DATABASE `zabbix` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; - --- the following will produce a list of SQL commands you should subsequently execute -SELECT CONCAT("ALTER TABLE ", TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") AS ExecuteTheString -FROM information_schema.`COLUMNS` -WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ci"; -</programlisting> - </listitem> - <listitem> - <para> - maxx package removed along with - <literal>services.xserver.desktopManager.maxx</literal> - module. Please migrate to cdesktopenv and - <literal>services.xserver.desktopManager.cde</literal> module. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.matrix-synapse.enable">matrix-synapse</link> - module no longer includes optional dependencies by default, - they have to be added through the - <link xlink:href="options.html#opt-services.matrix-synapse.plugins">plugins</link> - option. - </para> - </listitem> - <listitem> - <para> - <literal>buildGoModule</literal> now internally creates a - vendor directory in the source tree for downloaded modules - instead of using go’s - <link xlink:href="https://golang.org/cmd/go/#hdr-Module_proxy_protocol">module - proxy protocol</link>. This storage format is simpler and - therefore less likely to break with future versions of go. As - a result <literal>buildGoModule</literal> switched from - <literal>modSha256</literal> to the - <literal>vendorSha256</literal> attribute to pin fetched - version data. - </para> - </listitem> - <listitem> - <para> - Grafana is now built without support for phantomjs by default. - Phantomjs support has been - <link xlink:href="https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/">deprecated - in Grafana</link> and the phantomjs project is - <link xlink:href="https://github.com/ariya/phantomjs/issues/15344#issue-302015362">currently - unmaintained</link>. It can still be enabled by providing - <literal>phantomJsSupport = true</literal> to the package - instantiation: - </para> - <programlisting language="nix"> -{ - services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { - phantomJsSupport = true; - }); -} -</programlisting> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.supybot.enable">supybot</link> - module now uses <literal>/var/lib/supybot</literal> as its - default - <link xlink:href="options.html#opt-services.supybot.stateDir">stateDir</link> - path if <literal>stateVersion</literal> is 20.09 or higher. It - also enables a number of - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Sandboxing">systemd - sandboxing options</link> which may possibly interfere with - some plugins. If this is the case you can disable the options - through attributes in - <literal>systemd.services.supybot.serviceConfig</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>security.duosec.skey</literal> option, which - stored a secret in the nix store, has been replaced by a new - <link xlink:href="options.html#opt-security.duosec.secretKeyFile">security.duosec.secretKeyFile</link> - option for better security. - </para> - <para> - <literal>security.duosec.ikey</literal> has been renamed to - <link xlink:href="options.html#opt-security.duosec.integrationKey">security.duosec.integrationKey</link>. - </para> - </listitem> - <listitem> - <para> - <literal>vmware</literal> has been removed from the - <literal>services.x11.videoDrivers</literal> defaults. For - VMWare guests set - <literal>virtualisation.vmware.guest.enable</literal> to - <literal>true</literal> which will include the appropriate - drivers. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - <para> - If you used the - <literal>boot.initrd.network.ssh.host*Key</literal> options, - you’ll get an error explaining how to convert your host keys - and migrate to the new - <literal>boot.initrd.network.ssh.hostKeys</literal> option. - Otherwise, if you don’t have any host keys set, you’ll need to - generate some; see the <literal>hostKeys</literal> option - documentation for instructions. - </para> - </listitem> - <listitem> - <para> - 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 <literal>imagick</literal>, - <literal>opcache</literal>, <literal>pdo</literal> and - <literal>pdo_mysql</literal> loaded: - </para> - <programlisting language="nix"> -{ - environment.systemPackages = [ - (pkgs.php.withExtensions - ({ all, ... }: with all; [ - imagick - opcache - pdo - pdo_mysql - ]) - ) - ]; -} -</programlisting> - <para> - The default <literal>php</literal> attribute hasn’t lost any - extensions. The <literal>opcache</literal> extension has been - added. All upstream PHP extensions are available under - php.extensions.<name?>. - </para> - <para> - All PHP <literal>config</literal> flags have been removed for - the following reasons: - </para> - </listitem> - <listitem> - <para> - The updated <literal>php</literal> attribute is now easily - customizable to your liking by using - <literal>php.withExtensions</literal> or - <literal>php.buildEnv</literal> instead of writing config - files or changing configure flags. - </para> - </listitem> - <listitem> - <para> - The remaining configuration flags can now be set directly on - the <literal>php</literal> attribute. For example, instead of - </para> - <programlisting language="nix"> -{ - php.override { - config.php.embed = true; - config.php.apxs2 = false; - } -} -</programlisting> - <para> - you should now write - </para> - <programlisting language="nix"> -{ - php.override { - embedSupport = true; - apxs2Support = false; - } -} -</programlisting> - </listitem> - <listitem> - <para> - The ACME module has been overhauled for simplicity and - maintainability. Cert generation now implicitly uses the - <literal>acme</literal> user, and the - <literal>security.acme.certs._name_.user</literal> option has - been removed. Instead, certificate access from other services - is now managed through group permissions. The module no longer - runs lego twice under certain conditions, and will correctly - renew certificates if their configuration is changed. Services - which reload nginx and httpd after certificate renewal are now - properly configured too so you no longer have to do this - manually if you are using HTTPS enabled virtual hosts. A - mechanism for regenerating certs on demand has also been added - and documented. - </para> - </listitem> - <listitem> - <para> - Gollum received a major update to version 5.x and you may have - to change some links in your wiki when migrating from gollum - 4.x. More information can be found - <link xlink:href="https://github.com/gollum/gollum/wiki/5.0-release-notes#migrating-your-wiki">here</link>. - </para> - </listitem> - <listitem> - <para> - Deluge 2.x was added and is used as default for new NixOS - installations where stateVersion is >= 20.09. If you are - upgrading from a previous NixOS version, you can set - <literal>service.deluge.package = pkgs.deluge-2_x</literal> to - upgrade to Deluge 2.x and migrate the state to the new format. - Be aware that backwards state migrations are not supported by - Deluge. - </para> - </listitem> - <listitem> - <para> - Nginx web server now starting with additional - sandbox/hardening options. By default, write access to - <literal>/var/log/nginx</literal> and - <literal>/var/cache/nginx</literal> is allowed. To allow - writing to other folders, use - <literal>systemd.services.nginx.serviceConfig.ReadWritePaths</literal> - </para> - <programlisting language="nix"> -{ - systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; -} -</programlisting> - <para> - Nginx is also started with the systemd option - <literal>ProtectHome = mkDefault true;</literal> which forbids - it to read anything from <literal>/home</literal>, - <literal>/root</literal> and <literal>/run/user</literal> (see - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ProtectHome=">ProtectHome - docs</link> for details). If you require serving files from - home directories, you may choose to set e.g. - </para> - <programlisting language="nix"> -{ - systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; -} -</programlisting> - </listitem> - <listitem> - <para> - The NixOS options <literal>nesting.clone</literal> and - <literal>nesting.children</literal> have been deleted, and - replaced with named - <link xlink:href="options.html#opt-specialisation">specialisation</link> - configurations. - </para> - <para> - Replace a <literal>nesting.clone</literal> entry with: - </para> - <programlisting language="nix"> -{ - specialisation.example-sub-configuration = { - configuration = { - ... - }; -}; -</programlisting> - <para> - Replace a <literal>nesting.children</literal> entry with: - </para> - <programlisting language="nix"> -{ - specialisation.example-sub-configuration = { - inheritParentConfig = false; - configuration = { - ... - }; -}; -</programlisting> - <para> - To switch to a specialised configuration at runtime you need - to run: - </para> - <programlisting> -$ sudo /run/current-system/specialisation/example-sub-configuration/bin/switch-to-configuration test -</programlisting> - <para> - Before you would have used: - </para> - <programlisting> -$ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test -</programlisting> - </listitem> - <listitem> - <para> - The Nginx log directory has been moved to - <literal>/var/log/nginx</literal>, the cache directory to - <literal>/var/cache/nginx</literal>. The option - <literal>services.nginx.stateDir</literal> has been removed. - </para> - </listitem> - <listitem> - <para> - The httpd web server previously started its main process as - root privileged, then ran worker processes as a less - privileged identity user. This was changed to start all of - httpd as a less privileged user (defined by - <link xlink:href="options.html#opt-services.httpd.user">services.httpd.user</link> - and - <link xlink:href="options.html#opt-services.httpd.group">services.httpd.group</link>). - As a consequence, all files that are needed for httpd to run - (included configuration fragments, SSL certificates and keys, - etc.) must now be readable by this less privileged user/group. - </para> - <para> - The default value for - <link xlink:href="options.html#opt-services.httpd.mpm">services.httpd.mpm</link> - has been changed from <literal>prefork</literal> to - <literal>event</literal>. Along with this change the default - value for - <link xlink:href="options.html#opt-services.httpd.virtualHosts">services.httpd.virtualHosts.<name>.http2</link> - has been set to <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>systemd-networkd</literal> option - <literal>systemd.network.networks.<name>.dhcp.CriticalConnection</literal> - has been removed following upstream systemd’s deprecation of - the same. It is recommended to use - <literal>systemd.network.networks.<name>.networkConfig.KeepConfiguration</literal> - instead. See systemd.network 5 for details. - </para> - </listitem> - <listitem> - <para> - The <literal>systemd-networkd</literal> option - <literal>systemd.network.networks._name_.dhcpConfig</literal> - has been renamed to - <link xlink:href="options.html#opt-systemd.network.networks._name_.dhcpV4Config">systemd.network.networks.<emphasis>name</emphasis>.dhcpV4Config</link> - following upstream systemd’s documentation change. See - systemd.network 5 for details. - </para> - </listitem> - <listitem> - <para> - In the <literal>picom</literal> module, several options that - accepted floating point numbers encoded as strings (for - example - <link xlink:href="options.html#opt-services.picom.activeOpacity">services.picom.activeOpacity</link>) - have been changed to the (relatively) new native - <literal>float</literal> type. To migrate your configuration - simply remove the quotes around the numbers. - </para> - </listitem> - <listitem> - <para> - When using <literal>buildBazelPackage</literal> from Nixpkgs, - <literal>flat</literal> hash mode is now used for dependencies - instead of <literal>recursive</literal>. This is to better - allow using hashed mirrors where needed. As a result, these - hashes will have changed. - </para> - </listitem> - <listitem> - <para> - The syntax of the PostgreSQL configuration file is now checked - at build time. If your configuration includes a file - inaccessible inside the build sandbox, set - <literal>services.postgresql.checkConfig</literal> to - <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - The rkt module has been removed, it was archived by upstream. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="https://bazaar.canonical.com">Bazaar</link> - VCS is unmaintained and, as consequence of the Python 2 EOL, - the packages <literal>bazaar</literal> and - <literal>bazaarTools</literal> were removed. Breezy, the - backward compatible fork of Bazaar (see the - <link xlink:href="https://www.jelmer.uk/breezy-intro.html">announcement</link>), - was packaged as <literal>breezy</literal> and can be used - instead. - </para> - <para> - Regarding Nixpkgs, <literal>fetchbzr</literal>, - <literal>nix-prefetch-bzr</literal> and Bazaar support in - Hydra will continue to work through Breezy. - </para> - </listitem> - <listitem> - <para> - In addition to the hostname, the fully qualified domain name - (FQDN), which consists of - <literal>${networking.hostName}</literal> and - <literal>${networking.domain}</literal> is now added to - <literal>/etc/hosts</literal>, to allow local FQDN resolution, - as used by the <literal>hostname --fqdn</literal> command and - other applications that try to determine the FQDN. These new - entries take precedence over entries from the DNS which could - cause regressions in some very specific setups. Additionally - the hostname is now resolved to <literal>127.0.0.2</literal> - instead of <literal>127.0.1.1</literal> to be consistent with - what <literal>nss-myhostname</literal> (from systemd) returns. - The old behaviour can e.g. be restored by using - <literal>networking.hosts = lib.mkForce { "127.0.1.1" = [ config.networking.hostName ]; };</literal>. - </para> - </listitem> - <listitem> - <para> - The hostname (<literal>networking.hostName</literal>) must now - be a valid DNS label (see RFC 1035, RFC 1123) and as such must - not contain the domain part. This means that the hostname must - start with a letter or digit, end with a letter or digit, and - have as interior characters only letters, digits, and hyphen. - The maximum length is 63 characters. Additionally it is - recommended to only use lower-case characters. If (e.g. for - legacy reasons) a FQDN is required as the Linux kernel network - node hostname (<literal>uname --nodename</literal>) the option - <literal>boot.kernel.sysctl."kernel.hostname"</literal> - can be used as a workaround (but be aware of the 64 character - limit). - </para> - </listitem> - <listitem> - <para> - The GRUB specific option - <literal>boot.loader.grub.extraInitrd</literal> has been - replaced with the generic option - <literal>boot.initrd.secrets</literal>. This option creates a - secondary initrd from the specified files, rather than using a - manually created initrd file. Due to an existing bug with - <literal>boot.loader.grub.extraInitrd</literal>, 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. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="https://github.com/okTurtles/dnschain">DNSChain</link> - package and NixOS module have been removed from Nixpkgs as the - software is unmaintained and can’t be built. For more - information see issue - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/89205">#89205</link>. - </para> - </listitem> - <listitem> - <para> - In the <literal>resilio</literal> module, - <link xlink:href="options.html#opt-services.resilio.httpListenAddr">services.resilio.httpListenAddr</link> - has been changed to listen to <literal>[::1]</literal> instead - of <literal>0.0.0.0</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>sslh</literal> has been updated to version - <literal>1.21</literal>. The <literal>ssl</literal> probe must - be renamed to <literal>tls</literal> in - <link xlink:href="options.html#opt-services.sslh.appendConfig">services.sslh.appendConfig</link>. - </para> - </listitem> - <listitem> - <para> - Users of <link xlink:href="http://openafs.org">OpenAFS - 1.6</link> must upgrade their services to OpenAFS 1.8! In this - release, the OpenAFS package version 1.6.24 is marked broken - but can be used during transition to OpenAFS 1.8.x. Use the - options - <literal>services.openafsClient.packages.module</literal>, - <literal>services.openafsClient.packages.programs</literal> - and <literal>services.openafsServer.package</literal> to - select a different OpenAFS package. OpenAFS 1.6 will be - removed in the next release. The package - <literal>openafs</literal> and the service options will then - silently point to the OpenAFS 1.8 release. - </para> - <para> - See also the OpenAFS - <link xlink:href="http://docs.openafs.org/AdminGuide/index.html">Administrator - Guide</link> for instructions. Beware of the following when - updating servers: - </para> - <itemizedlist> - <listitem> - <para> - The storage format of the server key has changed and the - key must be converted before running the new release. - </para> - </listitem> - <listitem> - <para> - When updating multiple database servers, turn off the - database servers from the highest IP down to the lowest - with resting periods in between. Start up in reverse - order. Do not concurrently run database servers working - with different OpenAFS releases! - </para> - </listitem> - <listitem> - <para> - Update servers first, then clients. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Radicale’s default package has changed from 2.x to 3.x. An - upgrade checklist can be found - <link xlink:href="https://github.com/Kozea/Radicale/blob/3.0.x/NEWS.md#upgrade-checklist">here</link>. - You can use the newer version in the NixOS service by setting - the <literal>package</literal> to - <literal>radicale3</literal>, which is done automatically if - <literal>stateVersion</literal> is 20.09 or higher. - </para> - </listitem> - <listitem> - <para> - <literal>udpt</literal> experienced a complete rewrite from - C++ to rust. The configuration format changed from ini to - toml. The new configuration documentation can be found at - <link xlink:href="https://naim94a.github.io/udpt/config.html">the - official website</link> and example configuration is packaged - in <literal>${udpt}/share/udpt/udpt.toml</literal>. - </para> - </listitem> - <listitem> - <para> - We now have a unified - <link xlink:href="options.html#opt-services.xserver.displayManager.autoLogin">services.xserver.displayManager.autoLogin</link> - option interface to be used for every display-manager in - NixOS. - </para> - </listitem> - <listitem> - <para> - The <literal>bitcoind</literal> module has changed to - multi-instance, using submodules. Therefore, it is now - mandatory to name each instance. To use this new - multi-instance config with an existing bitcoind data directory - and user, you have to adjust the original config, e.g.: - </para> - <programlisting language="nix"> -{ - services.bitcoind = { - enable = true; - extraConfig = "..."; - ... - }; -} -</programlisting> - <para> - To something similar: - </para> - <programlisting language="nix"> -{ - services.bitcoind.mainnet = { - enable = true; - dataDir = "/var/lib/bitcoind"; - user = "bitcoin"; - extraConfig = "..."; - ... - }; -} -</programlisting> - <para> - The key settings are: - </para> - <itemizedlist> - <listitem> - <para> - <literal>dataDir</literal> - to continue using the same - data directory. - </para> - </listitem> - <listitem> - <para> - <literal>user</literal> - to continue using the same user - so that bitcoind maintains access to its files. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Graylog introduced a change in the LDAP server certificate - validation behaviour for version 3.3.3 which might break - existing setups. When updating Graylog from a version before - 3.3.3 make sure to check the Graylog - <link xlink:href="https://www.graylog.org/post/announcing-graylog-v3-3-3">release - info</link> for information on how to avoid the issue. - </para> - </listitem> - <listitem> - <para> - The <literal>dokuwiki</literal> module has changed to - multi-instance, using submodules. Therefore, it is now - mandatory to name each instance. Moreover, forcing SSL by - default has been dropped, so <literal>nginx.forceSSL</literal> - and <literal>nginx.enableACME</literal> are no longer set to - <literal>true</literal>. To continue using your service with - the original SSL settings, you have to adjust the original - config, e.g.: - </para> - <programlisting language="nix"> -{ - services.dokuwiki = { - enable = true; - ... - }; -} -</programlisting> - <para> - To something similar: - </para> - <programlisting language="nix"> -{ - services.dokuwiki."mywiki" = { - enable = true; - nginx = { - forceSSL = true; - enableACME = true; - }; - ... - }; -} -</programlisting> - <para> - The base package has also been upgraded to the 2020-07-29 - <quote>Hogfather</quote> release. Plugins might be - incompatible or require upgrading. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.postgresql.dataDir">services.postgresql.dataDir</link> - option is now set to - <literal>"/var/lib/postgresql/${cfg.package.psqlSchema}"</literal> - regardless of your - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>. - Users with an existing postgresql install that have a - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link> - of <literal>17.03</literal> or below should double check what - the value of their - <link xlink:href="options.html#opt-services.postgresql.dataDir">services.postgresql.dataDir</link> - option is (<literal>/var/db/postgresql</literal>) and then - explicitly set this value to maintain compatibility: - </para> - <programlisting language="nix"> -{ - services.postgresql.dataDir = "/var/db/postgresql"; -} -</programlisting> - <para> - The postgresql module now expects there to be a database super - user account called <literal>postgres</literal> regardless of - your - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>. - Users with an existing postgresql install that have a - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link> - of <literal>17.03</literal> or below should run the following - SQL statements as a database super admin user before - upgrading: - </para> - <programlisting language="SQL"> -CREATE ROLE postgres LOGIN SUPERUSER; -</programlisting> - </listitem> - <listitem> - <para> - The USBGuard module now removes options and instead hardcodes - values for <literal>IPCAccessControlFiles</literal>, - <literal>ruleFiles</literal>, and - <literal>auditFilePath</literal>. Audit logs can be found in - the journal. - </para> - </listitem> - <listitem> - <para> - The NixOS module system now evaluates option definitions more - strictly, allowing it to detect a larger set of problems. As a - result, what previously evaluated may not do so anymore. See - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/82743#issuecomment-674520472">the - PR that changed this</link> for more info. - </para> - </listitem> - <listitem> - <para> - For NixOS configuration options, the type - <literal>loaOf</literal>, after its initial deprecation in - release 20.03, has been removed. In NixOS and Nixpkgs options - using this type have been converted to - <literal>attrsOf</literal>. For more information on this - change have look at these links: - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/1800">issue - #1800</link>, - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR - #63103</link>. - </para> - </listitem> - <listitem> - <para> - <literal>config.systemd.services.${name}.path</literal> now - returns a list of paths instead of a colon-separated string. - </para> - </listitem> - <listitem> - <para> - Caddy module now uses Caddy v2 by default. Caddy v1 can still - be used by setting - <link xlink:href="options.html#opt-services.caddy.package">services.caddy.package</link> - to <literal>pkgs.caddy1</literal>. - </para> - <para> - New option - <link xlink:href="options.html#opt-services.caddy.adapter">services.caddy.adapter</link> - has been added. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.jellyfin.enable">jellyfin</link> - module will use and stay on the Jellyfin version - <literal>10.5.5</literal> if <literal>stateVersion</literal> - is lower than <literal>20.09</literal>. 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 - <literal>stateVersion</literal> to <literal>20.09</literal> or - higher, or set the - <literal>services.jellyfin.package</literal> to - <literal>pkgs.jellyfin</literal>. If you do not wish to - upgrade Jellyfin, but want to change your - <literal>stateVersion</literal>, you can set the value of - <literal>services.jellyfin.package</literal> to - <literal>pkgs.jellyfin_10_5</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>security.rngd</literal> 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. - </para> - </listitem> - <listitem> - <para> - The <literal>hardware.nvidia.optimus_prime.enable</literal> - service has been renamed to - <literal>hardware.nvidia.prime.sync.enable</literal> and has - many new enhancements. Related nvidia prime settings may have - also changed. - </para> - </listitem> - <listitem> - <para> - The package nextcloud17 has been removed and nextcloud18 was - marked as insecure since both of them will - <link xlink:href="https://docs.nextcloud.com/server/19/admin_manual/release_schedule.html"> - will be EOL (end of life) within the lifetime of 20.09</link>. - </para> - <para> - It’s necessary to upgrade to nextcloud19: - </para> - <itemizedlist> - <listitem> - <para> - 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 - <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link> - to nextcloud18. - </para> - </listitem> - <listitem> - <para> - From nextcloud18, it’s possible to directly upgrade to - nextcloud19 by setting - <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link> - to nextcloud19. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/98819">#98819</link>) - that makes it unsuitable to be a default app. - </para> - <note> - <para> - Issue - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/98819">#98819</link> - is now fixed and gnome3.epiphany is once again installed by - default. - </para> - </note> - </listitem> - <listitem> - <para> - If you want to manage the configuration of wpa_supplicant - outside of NixOS you must ensure that none of - <link xlink:href="options.html#opt-networking.wireless.networks">networking.wireless.networks</link>, - <link xlink:href="options.html#opt-networking.wireless.extraConfig">networking.wireless.extraConfig</link> - or - <link xlink:href="options.html#opt-networking.wireless.userControlled.enable">networking.wireless.userControlled.enable</link> - is being used or <literal>true</literal>. Using any of those - options will cause wpa_supplicant to be started with a NixOS - generated configuration file instead of your own. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.09-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - SD images are now compressed by default using - <literal>zstd</literal>. The compression for ISO images has - also been changed to <literal>zstd</literal>, but ISO images - are still not compressed by default. - </para> - </listitem> - <listitem> - <para> - <literal>services.journald.rateLimitBurst</literal> was - updated from <literal>1000</literal> to - <literal>10000</literal> to follow the new upstream systemd - default. - </para> - </listitem> - <listitem> - <para> - The notmuch package moves its emacs-related binaries and emacs - lisp files to a separate output. They’re not part of the - default <literal>out</literal> output anymore - if you relied - on the <literal>notmuch-emacs-mua</literal> binary or the - emacs lisp files, access them via the - <literal>notmuch.emacs</literal> output. - </para> - </listitem> - <listitem> - <para> - Device tree overlay support was improved in - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/79370">#79370</link> - and now uses - <link xlink:href="options.html#opt-hardware.deviceTree.kernelPackage">hardware.deviceTree.kernelPackage</link> - instead of <literal>hardware.deviceTree.base</literal>. - <link xlink:href="options.html#opt-hardware.deviceTree.overlays">hardware.deviceTree.overlays</link> - configuration was extended to support <literal>.dts</literal> - files with symbols. Device trees can now be filtered by - setting - <link xlink:href="options.html#opt-hardware.deviceTree.filter">hardware.deviceTree.filter</link> - option. - </para> - </listitem> - <listitem> - <para> - The default output of <literal>buildGoPackage</literal> is now - <literal>$out</literal> instead of <literal>$bin</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>buildGoModule</literal> <literal>doCheck</literal> - now defaults to <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - Packages built using <literal>buildRustPackage</literal> now - use <literal>release</literal> mode for the - <literal>checkPhase</literal> by default. - </para> - <para> - Please note that Rust packages utilizing a custom - build/install procedure (e.g. by using a - <literal>Makefile</literal>) or test suites that rely on the - structure of the <literal>target/</literal> directory may - break due to those assumptions. For further information, - please read the Rust section in the Nixpkgs manual. - </para> - </listitem> - <listitem> - <para> - The cc- and binutils-wrapper’s <quote>infix salt</quote> and - <literal>_BUILD_</literal> and <literal>_TARGET_</literal> - user infixes have been replaced with with a <quote>suffix - salt</quote> and suffixes and <literal>_FOR_BUILD</literal> - and <literal>_FOR_TARGET</literal>. This matches the autotools - convention for env vars which standard for these things, - making interfacing with other tools easier. - </para> - </listitem> - <listitem> - <para> - Additional Git documentation (HTML and text files) is now - available via the <literal>git-doc</literal> package. - </para> - </listitem> - <listitem> - <para> - Default algorithm for ZRAM swap was changed to - <literal>zstd</literal>. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The scripted networking system now uses - <literal>.link</literal> files in - <literal>/etc/systemd/network</literal> to configure mac - address and link MTU, instead of the sometimes buggy - <literal>network-link-*</literal> units, which have been - removed. Bringing the interface up has been moved to the - beginning of the <literal>network-addresses-*</literal> unit. - Note this doesn’t require <literal>systemd-networkd</literal> - - it’s udev that parses <literal>.link</literal> files. Extra - care needs to be taken in the presence of - <link xlink:href="https://wiki.debian.org/NetworkInterfaceNames#THE_.22PERSISTENT_NAMES.22_SCHEME">legacy - udev rules</link> 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 - <literal>10-*.link</literal> file through - <link xlink:href="options.html#opt-systemd.network.links">systemd.network.links</link> - and set both name and MAC Address / MTU there. - </para> - </listitem> - <listitem> - <para> - 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 - <link xlink:href="https://grafana.com/docs/grafana/latest/installation/upgrading/#upgrading-to-v7-0">in - the Grafana documentation</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>hardware.u2f</literal> module, which was - installing udev rules was removed, as udev gained native - support to handle FIDO security tokens. - </para> - </listitem> - <listitem> - <para> - The <literal>services.transmission</literal> module was - enhanced with the new options: - <link xlink:href="options.html#opt-services.transmission.credentialsFile">services.transmission.credentialsFile</link>, - <link xlink:href="options.html#opt-services.transmission.openFirewall">services.transmission.openFirewall</link>, - and - <link xlink:href="options.html#opt-services.transmission.performanceNetParameters">services.transmission.performanceNetParameters</link>. - </para> - <para> - <literal>transmission-daemon</literal> is now started with - additional systemd sandbox/hardening options for better - security. Please - <link xlink:href="https://github.com/NixOS/nixpkgs/issues">report</link> - any use case where this is not working well. In particular, - the <literal>RootDirectory</literal> option newly set forbids - uploading or downloading a torrent outside of the default - directory configured at - <link xlink:href="options.html#opt-services.transmission.settings">settings.download-dir</link>. - If you really need Transmission to access other directories, - you must include those directories into the - <literal>BindPaths</literal> of the service: - </para> - <programlisting language="nix"> -{ - systemd.services.transmission.serviceConfig.BindPaths = [ "/path/to/alternative/download-dir" ]; -} -</programlisting> - <para> - Also, connection to the RPC (Remote Procedure Call) of - <literal>transmission-daemon</literal> is now only available - on the local network interface by default. Use: - </para> - <programlisting language="nix"> -{ - services.transmission.settings.rpc-bind-address = "0.0.0.0"; -} -</programlisting> - <para> - to get the previous behavior of listening on all network - interfaces. - </para> - </listitem> - <listitem> - <para> - With this release <literal>systemd-networkd</literal> (when - enabled through - <link xlink:href="options.html#opt-networking.useNetworkd">networking.useNetworkd</link>) - has it’s netlink socket created through a - <literal>systemd.socket</literal> 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. - </para> - <para> - 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. - </para> - <para> - By having <literal>systemd-networkd</literal> start with a - netlink socket created by <literal>systemd</literal> we can - configure the <literal>ReceiveBufferSize=</literal> parameter - in the socket options (i.e. - <literal>systemd.sockets.systemd-networkd.socketOptions.ReceiveBufferSize</literal>) - without recompiling <literal>systemd-networkd</literal>. - </para> - <para> - 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 - <literal>systemd-networkd</literal> for - <literal>rtnl: kernel receive buffer overrun</literal> spam - and increase the memory limit as they see fit. - </para> - <para> - Note: Increasing the <literal>ReceiveBufferSize=</literal> - 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. - </para> - </listitem> - <listitem> - <para> - Specifying - <link xlink:href="options.html#opt-services.dovecot2.mailboxes">mailboxes</link> - 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 <literal>name</literal> should be the key of the - attribute. - </para> - <para> - This means that a configuration like this - </para> - <programlisting language="nix"> -{ - services.dovecot2.mailboxes = [ - { name = "Junk"; - auto = "create"; - } - ]; -} -</programlisting> - <para> - should now look like this: - </para> - <programlisting language="nix"> -{ - services.dovecot2.mailboxes = { - Junk.auto = "create"; - }; -} -</programlisting> - </listitem> - <listitem> - <para> - netbeans was upgraded to 12.0 and now defaults to OpenJDK 11. - This might cause problems if your projects depend on packages - that were removed in Java 11. - </para> - </listitem> - <listitem> - <para> - nextcloud has been updated to - <link xlink:href="https://nextcloud.com/blog/nextcloud-hub-brings-productivity-to-home-office/">v19</link>. - </para> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The <literal>nixos-run-vms</literal> script now deletes the - previous run machines states on test startup. You can use the - <literal>--keep-vm-state</literal> flag to match the previous - behaviour and keep the same VM state between different test - runs. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-nix.buildMachines">nix.buildMachines</link> - option is now type-checked. There are no functional changes, - however this may require updating some configurations to use - correct types for all attributes. - </para> - </listitem> - <listitem> - <para> - The <literal>fontconfig</literal> module stopped generating - config and cache files for fontconfig 2.10.x, the - <literal>/etc/fonts/fonts.conf</literal> now belongs to the - latest fontconfig, just like on other Linux distributions, and - we will - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/95358">no - longer</link> be versioning the config directories. - </para> - <para> - Fontconfig 2.10.x was removed from Nixpkgs since it hasn’t - been used in any Nixpkgs package for years now. - </para> - </listitem> - <listitem> - <para> - Nginx module - <literal>nginxModules.fastcgi-cache-purge</literal> renamed to - official name <literal>nginxModules.cache-purge</literal>. - Nginx module <literal>nginxModules.ngx_aws_auth</literal> - renamed to official name - <literal>nginxModules.aws-auth</literal>. - </para> - </listitem> - <listitem> - <para> - The option <literal>defaultPackages</literal> was added. It - installs the packages perl, rsync and strace for now. They - were added unconditionally to - <literal>systemPackages</literal> before, but are not strictly - necessary for a minimal NixOS install. You can set it to an - empty list to have a more minimal system. Be aware that some - functionality might still have an impure dependency on those - packages, so things might break. - </para> - </listitem> - <listitem> - <para> - The <literal>undervolt</literal> option no longer needs to - apply its settings every 30s. If they still become undone, - open an issue and restore the previous behaviour using - <literal>undervolt.useTimer</literal>. - </para> - </listitem> - <listitem> - <para> - Agda has been heavily reworked. - </para> - <itemizedlist> - <listitem> - <para> - <literal>agda.mkDerivation</literal> has been heavily - changed and is now located at agdaPackages.mkDerivation. - </para> - </listitem> - <listitem> - <para> - New top-level packages agda and - <literal>agda.withPackages</literal> have been added, the - second of which sets up agda with access to chosen - libraries. - </para> - </listitem> - <listitem> - <para> - All agda libraries now live under - <literal>agdaPackages</literal>. - </para> - </listitem> - <listitem> - <para> - Many broken libraries have been removed. - </para> - </listitem> - </itemizedlist> - <para> - See the - <link xlink:href="https://nixos.org/nixpkgs/manual/#agda">new - documentation</link> for more information. - </para> - </listitem> - <listitem> - <para> - The <literal>deepin</literal> package set has been removed - from nixpkgs. It was a work in progress to package the - <link xlink:href="https://www.deepin.org/en/dde/">Deepin - Desktop Environment (DDE)</link>, including libraries, tools - and applications, and it was still missing a service to launch - the desktop environment. It has shown to no longer be a - feasible goal due to reasons discussed in - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/94870">issue - #94870</link>. The package - <literal>netease-cloud-music</literal> has also been removed, - as it depends on libraries from deepin. - </para> - </listitem> - <listitem> - <para> - The <literal>opendkim</literal> module now uses systemd - sandboxing features to limit the exposure of the system - towards the opendkim service. - </para> - </listitem> - <listitem> - <para> - Kubernetes has been upgraded to 1.19.1, which also means that - the golang version to build it has been bumped to 1.15. This - may have consequences for your existing clusters and their - certificates. Please consider - <link xlink:href="https://relnotes.k8s.io/?markdown=93264"> - the release notes for Kubernetes 1.19 carefully </link> before - upgrading. - </para> - </listitem> - <listitem> - <para> - For AMD GPUs, Vulkan can now be used by adding - <literal>amdvlk</literal> to - <literal>hardware.opengl.extraPackages</literal>. - </para> - </listitem> - <listitem> - <para> - Similarly, still for AMD GPUs, the ROCm OpenCL stack can now - be used by adding <literal>rocm-opencl-icd</literal> to - <literal>hardware.opengl.extraPackages</literal>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-20.09-contributions"> - <title>Contributions</title> - <para> - I, Jonathan Ringer, would like to thank the following individuals - for their work on nixpkgs. This release could not be done without - the hard work of the NixOS community. There were 31282 - contributions across 1313 contributors. - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - 2288 Mario Rodas - </para> - </listitem> - <listitem> - <para> - 1837 Frederik Rietdijk - </para> - </listitem> - <listitem> - <para> - 946 Jörg Thalheim - </para> - </listitem> - <listitem> - <para> - 925 Maximilian Bosch - </para> - </listitem> - <listitem> - <para> - 687 Jonathan Ringer - </para> - </listitem> - <listitem> - <para> - 651 Jan Tojnar - </para> - </listitem> - <listitem> - <para> - 622 Daniël de Kok - </para> - </listitem> - <listitem> - <para> - 605 WORLDofPEACE - </para> - </listitem> - <listitem> - <para> - 597 Florian Klink - </para> - </listitem> - <listitem> - <para> - 528 José Romildo Malaquias - </para> - </listitem> - <listitem> - <para> - 281 volth - </para> - </listitem> - <listitem> - <para> - 101 Robert Scott - </para> - </listitem> - <listitem> - <para> - 86 Tim Steinbach - </para> - </listitem> - <listitem> - <para> - 76 WORLDofPEACE - </para> - </listitem> - <listitem> - <para> - 49 Maximilian Bosch - </para> - </listitem> - <listitem> - <para> - 42 Thomas Tuegel - </para> - </listitem> - <listitem> - <para> - 37 Doron Behar - </para> - </listitem> - <listitem> - <para> - 36 Vladimír Čunát - </para> - </listitem> - <listitem> - <para> - 27 Jonathan Ringer - </para> - </listitem> - <listitem> - <para> - 27 Maciej Krüger - </para> - </listitem> - </orderedlist> - <para> - I, Jonathan Ringer, would also like to personally thank - @WORLDofPEACE for their help in mentoring me on the release - process. Special thanks also goes to Thomas Tuegel for helping - immensely with stabilizing Qt, KDE, and Plasma5; I would also like - to thank Robert Scott for his numerous fixes and pull request - reviews. - </para> - </section> -</section> 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 deleted file mode 100644 index 868c1709879d2..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ /dev/null @@ -1,1568 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.05"> - <title>Release 21.05 (<quote>Okapi</quote>, 2021.05/31)</title> - <para> - Support is planned until the end of December 2021, handing over to - 21.11. - </para> - <section xml:id="sec-release-21.05-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Core version changes: - </para> - <itemizedlist> - <listitem> - <para> - gcc: 9.3.0 -> 10.3.0 - </para> - </listitem> - <listitem> - <para> - glibc: 2.30 -> 2.32 - </para> - </listitem> - <listitem> - <para> - default linux: 5.4 -> 5.10, all supported kernels - available - </para> - </listitem> - <listitem> - <para> - mesa: 20.1.7 -> 21.0.1 - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Desktop Environments: - </para> - <itemizedlist> - <listitem> - <para> - GNOME: 3.36 -> 40, see its - <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">release - notes</link> - </para> - </listitem> - <listitem> - <para> - Plasma5: 5.18.5 -> 5.21.3 - </para> - </listitem> - <listitem> - <para> - kdeApplications: 20.08.1 -> 20.12.3 - </para> - </listitem> - <listitem> - <para> - cinnamon: 4.6 -> 4.8.1 - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Programming Languages and Frameworks: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Python optimizations were disabled again. Builds with - optimizations enabled are not reproducible. Optimizations - can now be enabled with an option. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The linux_latest kernel was updated to the 5.13 series. It - currently is not officially supported for use with the zfs - filesystem. If you use zfs, you should use a different kernel - version (either the LTS kernel, or track a specific one). - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-21.05-new-services"> - <title>New Services</title> - <para> - The following new services were added since the last release: - </para> - <itemizedlist> - <listitem> - <para> - <link xlink:href="https://www.gnuradio.org/">GNURadio</link> - 3.8 and 3.9 were - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link> - packaged, along with a rewrite to the Nix expressions, - allowing users to override the features upstream supports - selecting to compile or not to. Additionally, the attribute - <literal>gnuradio</literal> (3.9), - <literal>gnuradio3_8</literal> and - <literal>gnuradio3_7</literal> now point to an externally - wrapped by default derivations, that allow you to also add - `extraPythonPackages` to the Python interpreter used by - GNURadio. Missing environmental variables needed for - operational GUI were also added - (<link xlink:href="https://github.com/NixOS/nixpkgs/issues/75478">#75478</link>). - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.keycloak.org/">Keycloak</link>, - an open source identity and access management server with - support for - <link xlink:href="https://openid.net/connect/">OpenID - Connect</link>, <link xlink:href="https://oauth.net/2/">OAUTH - 2.0</link> and - <link xlink:href="https://en.wikipedia.org/wiki/SAML_2.0">SAML - 2.0</link>. - </para> - <para> - See the <link linkend="module-services-keycloak">Keycloak - section of the NixOS manual</link> for more information. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.samba-wsdd.enable">services.samba-wsdd.enable</link> - Web Services Dynamic Discovery host daemon - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.discourse.org/">Discourse</link>, - a modern and open source discussion platform. - </para> - <para> - See the <link linkend="module-services-discourse">Discourse - section of the NixOS manual</link> for more information. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.nebula.networks">services.nebula.networks</link> - <link xlink:href="https://github.com/slackhq/nebula">Nebula - VPN</link> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-21.05-incompatibilities"> - <title>Backward Incompatibilities</title> - <para> - When upgrading from a previous release, please be aware of the - following incompatible changes: - </para> - <itemizedlist> - <listitem> - <para> - GNOME desktop environment was upgraded to 40, see the release - notes for - <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> - and - <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. - The <literal>gnome3</literal> attribute set has been renamed - to <literal>gnome</literal> and so have been the NixOS - options. - </para> - </listitem> - <listitem> - <para> - If you are using <literal>services.udev.extraRules</literal> - to assign custom names to network interfaces, this may stop - working due to a change in the initialisation of dhcpcd and - systemd networkd. To avoid this, either move them to - <literal>services.udev.initrdRules</literal> or see the new - <link linkend="sec-custom-ifnames">Assigning custom - names</link> section of the NixOS manual for an example using - networkd links. - </para> - </listitem> - <listitem> - <para> - The <literal>security.hideProcessInformation</literal> module - has been removed. It was broken since the switch to - cgroups-v2. - </para> - </listitem> - <listitem> - <para> - The <literal>linuxPackages.ati_drivers_x11</literal> kernel - modules have been removed. The drivers only supported kernels - prior to 4.2, and thus have become obsolete. - </para> - </listitem> - <listitem> - <para> - The <literal>systemConfig</literal> kernel parameter is no - longer added to boot loader entries. It has been unused since - September 2010, but if do have a system generation from that - era, you will now be unable to boot into them. - </para> - </listitem> - <listitem> - <para> - <literal>systemd-journal2gelf</literal> no longer parses json - and expects the receiving system to handle it. How to achieve - this with Graylog is described in this - <link xlink:href="https://github.com/parse-nl/SystemdJournal2Gelf/issues/10">GitHub - issue</link>. - </para> - </listitem> - <listitem> - <para> - If the <literal>services.dbus</literal> module is enabled, - then the user D-Bus session is now always socket activated. - The associated options - <literal>services.dbus.socketActivated</literal> and - <literal>services.xserver.startDbusSession</literal> 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. - </para> - </listitem> - <listitem> - <para> - The <literal>networking.wireless.iwd</literal> module now - installs the upstream-provided 80-iwd.link file, which sets - the NamePolicy= for all wlan devices to <quote>keep - kernel</quote>, to avoid race conditions between iwd and - networkd. If you don’t want this, you can set - <literal>systemd.network.links."80-iwd" = lib.mkForce {}</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>rubyMinimal</literal> 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 <literal>jitSupport = false;</literal> in an overlay. - See - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/90151">#90151</link> - for more info. - </para> - </listitem> - <listitem> - <para> - Setting - <literal>services.openssh.authorizedKeysFiles</literal> now - also affects which keys - <literal>security.pam.enableSSHAgentAuth</literal> will use. - WARNING: If you are using these options in combination do make - sure that any key paths you use are present in - <literal>services.openssh.authorizedKeysFiles</literal>! - </para> - </listitem> - <listitem> - <para> - The option <literal>fonts.enableFontDir</literal> has been - renamed to - <link xlink:href="options.html#opt-fonts.fontDir.enable">fonts.fontDir.enable</link>. - The path of font directory has also been changed to - <literal>/run/current-system/sw/share/X11/fonts</literal>, for - consistency with other X11 resources. - </para> - </listitem> - <listitem> - <para> - A number of options have been renamed in the kicad interface. - <literal>oceSupport</literal> has been renamed to - <literal>withOCE</literal>, <literal>withOCCT</literal> has - been renamed to <literal>withOCC</literal>, - <literal>ngspiceSupport</literal> has been renamed to - <literal>withNgspice</literal>, and - <literal>scriptingSupport</literal> has been renamed to - <literal>withScripting</literal>. Additionally, - <literal>kicad/base.nix</literal> no longer provides default - argument values since these are provided by - <literal>kicad/default.nix</literal>. - </para> - </listitem> - <listitem> - <para> - The socket for the <literal>pdns-recursor</literal> module was - moved from <literal>/var/lib/pdns-recursor</literal> to - <literal>/run/pdns-recursor</literal> to match upstream. - </para> - </listitem> - <listitem> - <para> - Paperwork was updated to version 2. The on-disk format - slightly changed, and it is not possible to downgrade from - Paperwork 2 back to Paperwork 1.3. Back your documents up - before upgrading. See - <link xlink:href="https://forum.openpaper.work/t/paperwork-2-0/112/5">this - thread</link> for more details. - </para> - </listitem> - <listitem> - <para> - PowerDNS has been updated from <literal>4.2.x</literal> to - <literal>4.3.x</literal>. Please be sure to review the - <link xlink:href="https://doc.powerdns.com/authoritative/upgrading.html#x-to-4-3-0">Upgrade - Notes</link> provided by upstream before upgrading. Worth - specifically noting is that the service now runs entirely as a - dedicated <literal>pdns</literal> user, instead of starting as - <literal>root</literal> and dropping privileges, as well as - the default <literal>socket-dir</literal> location changing - from <literal>/var/lib/powerdns</literal> to - <literal>/run/pdns</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>mediatomb</literal> service is now using by - default the new and maintained fork <literal>gerbera</literal> - package instead of the unmaintained - <literal>mediatomb</literal> package. If you want to keep the - old behavior, you must declare it with: - </para> - <programlisting language="nix"> -{ - services.mediatomb.package = pkgs.mediatomb; -} -</programlisting> - <para> - One new option <literal>openFirewall</literal> has been - introduced which defaults to false. If you relied on the - service declaration to add the firewall rules itself before, - you should now declare it with: - </para> - <programlisting language="nix"> -{ - services.mediatomb.openFirewall = true; -} -</programlisting> - </listitem> - <listitem> - <para> - xfsprogs was update from 4.19 to 5.11. It now enables reflink - support by default on filesystem creation. Support for - reflinks was added with an experimental status to kernel 4.9 - and deemed stable in kernel 4.16. If you want to be able to - mount XFS filesystems created with this release of xfsprogs on - kernel releases older than those, you need to format them with - <literal>mkfs.xfs -m reflink=0</literal>. - </para> - </listitem> - <listitem> - <para> - The uWSGI server is now built with POSIX capabilities. As a - consequence, root is no longer required in emperor mode and - the service defaults to running as the unprivileged - <literal>uwsgi</literal> user. Any additional capability can - be added via the new option - <link xlink:href="options.html#opt-services.uwsgi.capabilities">services.uwsgi.capabilities</link>. - The previous behaviour can be restored by setting: - </para> - <programlisting language="nix"> -{ - services.uwsgi.user = "root"; - services.uwsgi.group = "root"; - services.uwsgi.instance = - { - uid = "uwsgi"; - gid = "uwsgi"; - }; -} -</programlisting> - <para> - Another incompatibility from the previous release is that - vassals running under a different user or group need to use - <literal>immediate-{uid,gid}</literal> instead of the usual - <literal>uid,gid</literal> options. - </para> - </listitem> - <listitem> - <para> - btc1 has been abandoned upstream, and removed. - </para> - </listitem> - <listitem> - <para> - cpp_ethereum (aleth) has been abandoned upstream, and removed. - </para> - </listitem> - <listitem> - <para> - riak-cs package removed along with - <literal>services.riak-cs</literal> module. - </para> - </listitem> - <listitem> - <para> - stanchion package removed along with - <literal>services.stanchion</literal> module. - </para> - </listitem> - <listitem> - <para> - mutt has been updated to a new major version (2.x), which - comes with some backward incompatible changes that are - described in the - <link xlink:href="http://www.mutt.org/relnotes/2.0/">release - notes for Mutt 2.0</link>. - </para> - </listitem> - <listitem> - <para> - <literal>vim</literal> and <literal>neovim</literal> switched - to Python 3, dropping all Python 2 support. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-networking.wireguard.interfaces">networking.wireguard.interfaces.<name>.generatePrivateKeyFile</link>, - which is off by default, had a <literal>chmod</literal> 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/121294">#121294</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-boot.zfs.forceImportAll">boot.zfs.forceImportAll</link> - previously did nothing, but has been fixed. However its - default has been changed to <literal>false</literal> to - preserve the existing default behaviour. If you have this - explicitly set to <literal>true</literal>, please note that - your non-root pools will now be forcibly imported. - </para> - </listitem> - <listitem> - <para> - openafs now points to openafs_1_8, which is the new stable - release. OpenAFS 1.6 was removed. - </para> - </listitem> - <listitem> - <para> - The WireGuard module gained a new option - <literal>networking.wireguard.interfaces.<name>.peers.*.dynamicEndpointRefreshSeconds</literal> - that implements refreshing the IP of DNS-based endpoints - periodically (which WireGuard itself - <link xlink:href="https://lists.zx2c4.com/pipermail/wireguard/2017-November/002028.html">cannot - do</link>). - </para> - </listitem> - <listitem> - <para> - MariaDB has been updated to 10.5. Before you upgrade, it would - be best to take a backup of your database and read - <link xlink:href="https://mariadb.com/kb/en/upgrading-from-mariadb-104-to-mariadb-105/#incompatible-changes-between-104-and-105"> - Incompatible Changes Between 10.4 and 10.5</link>. After the - upgrade you will need to run <literal>mysql_upgrade</literal>. - </para> - </listitem> - <listitem> - <para> - The TokuDB storage engine dropped in mariadb 10.5 and removed - in mariadb 10.6. It is recommended to switch to RocksDB. See - also - <link xlink:href="https://mariadb.com/kb/en/tokudb/">TokuDB</link> - and - <link xlink:href="https://jira.mariadb.org/browse/MDEV-19780">MDEV-19780: - Remove the TokuDB storage engine</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>openldap</literal> module now has support for - OLC-style configuration, users of the - <literal>configDir</literal> option may wish to migrate. If - you continue to use <literal>configDir</literal>, ensure that - <literal>olcPidFile</literal> is set to - <literal>/run/slapd/slapd.pid</literal>. - </para> - <para> - As a result, <literal>extraConfig</literal> and - <literal>extraDatabaseConfig</literal> are removed. To help - with migration, you can convert your - <literal>slapd.conf</literal> file to OLC configuration with - the following script (find the location of this configuration - file by running <literal>systemctl status openldap</literal>, - it is the <literal>-f</literal> option. - </para> - <programlisting> -$ TMPDIR=$(mktemp -d) -$ slaptest -f /path/to/slapd.conf -F $TMPDIR -$ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' -</programlisting> - <para> - This will dump your current configuration in LDIF format, - which should be straightforward to convert into Nix settings. - This does not show your schema configuration, as this is - unnecessarily verbose for users of the default schemas and - <literal>slaptest</literal> is buggy with schemas directly in - the config file. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - <warning> - <para> - Specifically, <literal>/etc/ec2-metadata</literal> 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: <literal>root</literal>’s SSH key is only added if - <literal>/root/.ssh/authorized_keys</literal> does not - exist, and SSH host keys are only set from user data if they - do not exist in <literal>/etc/ssh</literal>. - </para> - </warning> - </listitem> - <listitem> - <para> - The <literal>rspamd</literal> 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 - <literal>/run/rspamd</literal> instead of - <literal>/run</literal>. - </para> - </listitem> - <listitem> - <para> - Enabling the Tor client no longer silently also enables and - configures Privoxy, and the - <literal>services.tor.client.privoxy.enable</literal> option - has been removed. To enable Privoxy, and to configure it to - use Tor’s faster port, use the following configuration: - </para> - <programlisting language="nix"> -{ - opt-services.privoxy.enable = true; - opt-services.privoxy.enableTor = true; -} -</programlisting> - </listitem> - <listitem> - <para> - The <literal>services.tor</literal> module has a new - exhaustively typed - <link xlink:href="options.html#opt-services.tor.settings">services.tor.settings</link> - option following RFC 0042; backward compatibility with old - options has been preserved when aliasing was possible. The - corresponding systemd service has been hardened, but there is - a chance that the service still requires more permissions, so - please report any related trouble on the bugtracker. Onion - services v3 are now supported in - <link xlink:href="options.html#opt-services.tor.relay.onionServices">services.tor.relay.onionServices</link>. - A new - <link xlink:href="options.html#opt-services.tor.openFirewall">services.tor.openFirewall</link> - option as been introduced for allowing connections on all the - TCP ports configured. - </para> - </listitem> - <listitem> - <para> - The options - <literal>services.slurm.dbdserver.storagePass</literal> and - <literal>services.slurm.dbdserver.configFile</literal> have - been removed. Use - <literal>services.slurm.dbdserver.storagePassFile</literal> - instead to provide the database password. Extra config options - can be given via the option - <literal>services.slurm.dbdserver.extraConfig</literal>. The - actual configuration file is created on the fly on startup of - the service. This avoids that the password gets exposed in the - nix store. - </para> - </listitem> - <listitem> - <para> - The <literal>wafHook</literal> hook does not wrap Python - anymore. Packages depending on <literal>wafHook</literal> need - to include any Python into their - <literal>nativeBuildInputs</literal>. - </para> - </listitem> - <listitem> - <para> - Starting with version 1.7.0, the project formerly named - <literal>CodiMD</literal> is now named - <literal>HedgeDoc</literal>. New installations will no longer - use the old name for users, state directories and such, this - needs to be considered when moving state to a more recent - NixOS installation. Based on - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>, - existing installations will continue to work. - </para> - </listitem> - <listitem> - <para> - The fish-foreign-env package has been replaced with - fishPlugins.foreign-env, in which the fish functions have been - relocated to the <literal>vendor_functions.d</literal> - directory to be loaded automatically. - </para> - </listitem> - <listitem> - <para> - 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 <literal>/probe</literal> endpoint. In the - prometheus scrape configuration the scrape target might look - like this: - </para> - <programlisting> -http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/endpoint -</programlisting> - <para> - Existing configuration for the exporter needs to be updated, - but can partially be re-used. Documentation is available in - the upstream repository and a small example for NixOS is - available in the corresponding NixOS test. - </para> - <para> - These changes also affect - <link xlink:href="options.html#opt-services.prometheus.exporters.rspamd.enable">services.prometheus.exporters.rspamd.enable</link>, - which is just a preconfigured instance of the json exporter. - </para> - <para> - For more information, take a look at the - <link xlink:href="https://github.com/prometheus-community/json_exporter"> - official documentation</link> of the json_exporter. - </para> - </listitem> - <listitem> - <para> - Androidenv was updated, removing the - <literal>includeDocs</literal> and - <literal>lldbVersions</literal> arguments. Docs only covered a - single version of the Android SDK, LLDB is now bundled with - the NDK, and both are no longer available to download from the - Android package repositories. Additionally, since the package - lists have been updated, some older versions of Android - packages may not be bundled. If you depend on older versions - of Android packages, we recommend overriding the repo. - </para> - <para> - Android packages are now loaded from a repo.json file created - by parsing Android repo XML files. The arguments - <literal>repoJson</literal> and <literal>repoXmls</literal> - have been added to allow overriding the built-in androidenv - repo.json with your own. Additionally, license files are now - written to allow compatibility with Gradle-based tools, and - the <literal>extraLicenses</literal> argument has been added - to accept more SDK licenses if your project requires it. See - the androidenv documentation for more details. - </para> - </listitem> - <listitem> - <para> - The attribute <literal>mpi</literal> is now consistently used - to provide a default, system-wide MPI implementation. The - default implementation is openmpi, which has been used before - by all derivations affects by this change. Note that all - packages that have used <literal>mpi ? null</literal> in the - input for optional MPI builds, have been changed to the - boolean input paramater <literal>useMpi</literal> to enable - building with MPI. Building all packages with - <literal>mpich</literal> instead of the default - <literal>openmpi</literal> can now be achived like this: - </para> - <programlisting language="nix"> -self: super: -{ - mpi = super.mpich; -} -</programlisting> - </listitem> - <listitem> - <para> - The Searx module has been updated with the ability to - configure the service declaratively and uWSGI integration. The - option <literal>services.searx.configFile</literal> has been - renamed to - <link xlink:href="options.html#opt-services.searx.settingsFile">services.searx.settingsFile</link> - for consistency with the new - <link xlink:href="options.html#opt-services.searx.settings">services.searx.settings</link>. - In addition, the <literal>searx</literal> uid and gid - reservations have been removed since they were not necessary: - the service is now running with a dynamically allocated uid. - </para> - </listitem> - <listitem> - <para> - The libinput module has been updated with the ability to - configure mouse and touchpad settings separately. The options - in <literal>services.xserver.libinput</literal> have been - renamed to - <literal>services.xserver.libinput.touchpad</literal>, while - there is a new - <literal>services.xserver.libinput.mouse</literal> for mouse - related configuration. - </para> - <para> - Since touchpad options no longer apply to all devices, you may - want to replicate your touchpad configuration in mouse - section. - </para> - </listitem> - <listitem> - <para> - ALSA OSS emulation - (<literal>sound.enableOSSEmulation</literal>) is now disabled - by default. - </para> - </listitem> - <listitem> - <para> - Thinkfan as been updated to <literal>1.2.x</literal>, which - comes with a new YAML based configuration format. For this - reason, several NixOS options of the thinkfan module have been - changed to non-backward compatible types. In addition, a new - <link xlink:href="options.html#opt-services.thinkfan.settings">services.thinkfan.settings</link> - option has been added. - </para> - <para> - Please read the - <link xlink:href="https://github.com/vmatare/thinkfan#readme"> - thinkfan documentation</link> before updating. - </para> - </listitem> - <listitem> - <para> - Adobe Flash Player support has been dropped from the tree. In - particular, the following packages no longer support it: - </para> - <itemizedlist> - <listitem> - <para> - chromium - </para> - </listitem> - <listitem> - <para> - firefox - </para> - </listitem> - <listitem> - <para> - qt48 - </para> - </listitem> - <listitem> - <para> - qt5.qtwebkit - </para> - </listitem> - </itemizedlist> - <para> - Additionally, packages flashplayer and hal-flash were removed - along with the <literal>services.flashpolicyd</literal> - module. - </para> - </listitem> - <listitem> - <para> - The <literal>security.rngd</literal> 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. - </para> - <para> - The default SMTP port for GitLab has been changed to - <literal>25</literal> from its previous default of - <literal>465</literal>. If you depended on this default, you - should now set the - <link xlink:href="options.html#opt-services.gitlab.smtp.port">services.gitlab.smtp.port</link> - option. - </para> - </listitem> - <listitem> - <para> - The default version of ImageMagick has been updated from 6 to - 7. You can use imagemagick6, imagemagick6_light, and - imagemagick6Big if you need the older version. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-services.xserver.videoDrivers">services.xserver.videoDrivers</link> - no longer uses the deprecated <literal>cirrus</literal> and - <literal>vesa</literal> device dependent X drivers by default. - It also enables both <literal>amdgpu</literal> and - <literal>nouveau</literal> drivers by default now. - </para> - </listitem> - <listitem> - <para> - The <literal>kindlegen</literal> package is gone, because it - is no longer supported or hosted by Amazon. Sadly, its - replacement, Kindle Previewer, has no Linux support. However, - there are other ways to generate MOBI files. See - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/96439">the - discussion</link> for more info. - </para> - </listitem> - <listitem> - <para> - The apacheKafka packages are now built with version-matched - JREs. Versions 2.6 and above, the ones that recommend it, use - jdk11, while versions below remain on jdk8. The NixOS service - has been adjusted to start the service using the same version - as the package, adjustable with the new - <link xlink:href="options.html#opt-services.apache-kafka.jre">services.apache-kafka.jre</link> - option. Furthermore, the default list of - <link xlink:href="options.html#opt-services.apache-kafka.jvmOptions">services.apache-kafka.jvmOptions</link> - have been removed. You should set your own according to the - <link xlink:href="https://kafka.apache.org/documentation/#java">upstream - documentation</link> for your Kafka version. - </para> - </listitem> - <listitem> - <para> - The kodi package has been modified to allow concise addon - management. Consider the following configuration from previous - releases of NixOS to install kodi, including the - kodiPackages.inputstream-adaptive and kodiPackages.vfs-sftp - addons: - </para> - <programlisting language="nix"> -{ - environment.systemPackages = [ - pkgs.kodi - ]; - - nixpkgs.config.kodi = { - enableInputStreamAdaptive = true; - enableVFSSFTP = true; - }; -} -</programlisting> - <para> - All Kodi <literal>config</literal> flags have been removed, - and as a result the above configuration should now be written - as: - </para> - <programlisting language="nix"> -{ - environment.systemPackages = [ - (pkgs.kodi.withPackages (p: with p; [ - inputstream-adaptive - vfs-sftp - ])) - ]; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>environment.defaultPackages</literal> now includes - the nano package. If pkgs.nano is not added to the list, make - sure another editor is installed and the - <literal>EDITOR</literal> environment variable is set to it. - Environment variables can be set using - <literal>environment.variables</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.minio.dataDir</literal> 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. - </para> - </listitem> - <listitem> - <para> - All CUDA toolkit versions prior to CUDA 10 have been removed. - </para> - </listitem> - <listitem> - <para> - 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 - <literal>dvorak-programmer</literal> in - <literal>console.keyMap</literal> now instead of - <literal>dvp</literal>. In - <literal>services.xserver.xkbVariant</literal> it’s still - <literal>dvp</literal>. - </para> - </listitem> - <listitem> - <para> - The babeld service is now being run as an unprivileged user. - To achieve that the module configures - <literal>skip-kernel-setup true</literal> and takes care of - setting forwarding and rp_filter sysctls by itself as well as - for each interface in - <literal>services.babeld.interfaces</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>services.zigbee2mqtt.config</literal> option has - been renamed to - <literal>services.zigbee2mqtt.settings</literal> and now - follows - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link>. - </para> - </listitem> - </itemizedlist> - <para> - The yadm dotfile manager has been updated from 2.x to 3.x, which - has new (XDG) default locations for some data/state files. Most - yadm commands will fail and print a legacy path warning (which - describes how to upgrade/migrate your repository). If you have - scripts, daemons, scheduled jobs, shell profiles, etc. that invoke - yadm, expect them to fail or misbehave until you perform this - migration and prepare accordingly. - </para> - <itemizedlist> - <listitem> - <para> - Instead of determining - <literal>services.radicale.package</literal> automatically - based on <literal>system.stateVersion</literal>, the latest - version is always used because old versions are not officially - supported. - </para> - <para> - Furthermore, Radicale’s systemd unit was hardened which might - break some deployments. In particular, a non-default - <literal>filesystem_folder</literal> has to be added to - <literal>systemd.services.radicale.serviceConfig.ReadWritePaths</literal> - if the deprecated <literal>services.radicale.config</literal> - is used. - </para> - </listitem> - <listitem> - <para> - In the <literal>security.acme</literal> module, use of - <literal>--reuse-key</literal> 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 - <literal>extraLegoRenewFlags</literal> as an option for the - appropriate certificate. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-21.05-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - <literal>stdenv.lib</literal> has been deprecated and will - break eval in 21.11. Please use <literal>pkgs.lib</literal> - instead. See - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/108938">#108938</link> - for details. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.gnuradio.org/">GNURadio</link> - has a <literal>pkgs</literal> attribute set, and there’s a - <literal>gnuradio.callPackage</literal> function that extends - <literal>pkgs</literal> with a - <literal>mkDerivation</literal>, and a - <literal>mkDerivationWith</literal>, like Qt5. Now all - <literal>gnuradio.pkgs</literal> are defined with - <literal>gnuradio.callPackage</literal> and some packages that - depend on gnuradio are defined with this as well. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.privoxy.org/">Privoxy</link> has - been updated to version 3.0.32 (See - <link xlink:href="https://lists.privoxy.org/pipermail/privoxy-announce/2021-February/000007.html">announcement</link>). - 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. - </para> - <para> - Regarding the NixOS module, new options for HTTPS inspection - have been added and - <literal>services.privoxy.extraConfig</literal> has been - replaced by the new - <link xlink:href="options.html#opt-services.privoxy.settings">services.privoxy.settings</link> - (See - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link> for the motivation). - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://kodi.tv/">Kodi</link> has been - updated to version 19.1 <quote>Matrix</quote>. See the - <link xlink:href="https://kodi.tv/article/kodi-19-0-matrix-release">announcement</link> - for further details. - </para> - </listitem> - <listitem> - <para> - The <literal>services.packagekit.backend</literal> option has - been removed as it only supported a single setting which would - always be the default. Instead new - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link> compliant - <link xlink:href="options.html#opt-services.packagekit.settings">services.packagekit.settings</link> - and - <link xlink:href="options.html#opt-services.packagekit.vendorSettings">services.packagekit.vendorSettings</link> - options have been introduced. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://nginx.org">Nginx</link> has been - updated to stable version 1.20.0. Now nginx uses the zlib-ng - library by default. - </para> - </listitem> - <listitem> - <para> - KDE Gear (formerly KDE Applications) is upgraded to 21.04, see - its - <link xlink:href="https://kde.org/announcements/gear/21.04/">release - notes</link> for details. - </para> - <para> - The <literal>kdeApplications</literal> package set is now - <literal>kdeGear</literal>, in keeping with the new name. The - old name remains for compatibility, but it is deprecated. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://libreswan.org/">Libreswan</link> has - been updated to version 4.4. The package now includes example - configurations and manual pages by default. The NixOS module - has been changed to use the upstream systemd units and write - the configuration in the <literal>/etc/ipsec.d/ </literal> - directory. In addition, two new options have been added to - specify connection policies - (<link xlink:href="options.html#opt-services.libreswan.policies">services.libreswan.policies</link>) - and disable send/receive redirects - (<link xlink:href="options.html#opt-services.libreswan.disableRedirects">services.libreswan.disableRedirects</link>). - </para> - </listitem> - <listitem> - <para> - The Mailman NixOS module (<literal>services.mailman</literal>) - has a new option - <link xlink:href="options.html#opt-services.mailman.enablePostfix">services.mailman.enablePostfix</link>, - defaulting to true, that controls integration with Postfix. - </para> - <para> - If this option is disabled, default MTA config becomes not set - and you should set the options in - <literal>services.mailman.settings.mta</literal> according to - the desired configuration as described in - <link xlink:href="https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html">Mailman - documentation</link>. - </para> - </listitem> - <listitem> - <para> - The default-version of <literal>nextcloud</literal> is - nextcloud21. Please note that it’s <emphasis>not</emphasis> - possible to upgrade <literal>nextcloud</literal> 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 <literal>20.09</literal> users will - have to upgrade to nextcloud20 first. - </para> - <para> - The package can be manually upgraded by setting - <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link> - to nextcloud21. - </para> - </listitem> - <listitem> - <para> - The setting - <link xlink:href="options.html#opt-services.redis.bind">services.redis.bind</link> - defaults to <literal>127.0.0.1</literal> now, making Redis - listen on the loopback interface only, and not all public - network interfaces. - </para> - </listitem> - <listitem> - <para> - NixOS now emits a deprecation warning if systemd’s - <literal>StartLimitInterval</literal> setting is used in a - <literal>serviceConfig</literal> section instead of in a - <literal>unitConfig</literal>; 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/45785">#45785</link> - for details. - </para> - <para> - All services should use - <link xlink:href="options.html#opt-systemd.services._name_.startLimitIntervalSec">systemd.services.<emphasis>name</emphasis>.startLimitIntervalSec</link> - or <literal>StartLimitIntervalSec</literal> in - <link xlink:href="options.html#opt-systemd.services._name_.unitConfig">systemd.services.<emphasis>name</emphasis>.unitConfig</link> - instead. - </para> - </listitem> - <listitem> - <para> - The <literal>mediatomb</literal> service declares new options. - It also adapts existing options so the configuration - generation is now lazy. The existing option - <literal>customCfg</literal> (defaults to false), when - enabled, stops the service configuration generation - completely. It then expects the users to provide their own - correct configuration at the right location (whereas the - configuration was generated and not used at all before). The - new option <literal>transcodingOption</literal> (defaults to - no) allows a generated configuration. It makes the mediatomb - service pulls the necessary runtime dependencies in the nix - store (whereas it was generated with hardcoded values before). - The new option <literal>mediaDirectories</literal> allows the - users to declare autoscan media directories from their nixos - configuration: - </para> - <programlisting language="nix"> -{ - services.mediatomb.mediaDirectories = [ - { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } - { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; } - ]; -} -</programlisting> - </listitem> - <listitem> - <para> - The Unbound DNS resolver service - (<literal>services.unbound</literal>) has been refactored to - allow reloading, control sockets and to fix startup ordering - issues. - </para> - <para> - It is now possible to enable a local UNIX control socket for - unbound by setting the - <link xlink:href="options.html#opt-services.unbound.localControlSocketPath">services.unbound.localControlSocketPath</link> - option. - </para> - <para> - Previously we just applied a very minimal set of restrictions - and trusted unbound to properly drop root privs and - capabilities. - </para> - <para> - As of this we are (for the most part) just using the upstream - example unit file for unbound. The main difference is that we - start unbound as <literal>unbound</literal> user with the - required capabilities instead of letting unbound do the chroot - & uid/gid changes. - </para> - <para> - The upstream unit configuration this is based on is a lot - stricter with all kinds of permissions then our previous - variant. It also came with the default of having the - <literal>Type</literal> set to <literal>notify</literal>, - therefore we are now also using the - <literal>unbound-with-systemd</literal> package here. Unbound - will start up, read the configuration files and start - listening on the configured ports before systemd will declare - the unit <literal>active (running)</literal>. This will likely - help with startup order and the occasional race condition - during system activation where the DNS service is started but - not yet ready to answer queries. Services depending on - <literal>nss-lookup.target</literal> or - <literal>unbound.service</literal> are now be able to use - unbound when those targets have been reached. - </para> - <para> - Additionally to the much stricter runtime environment the - <literal>/dev/urandom</literal> mount lines we previously had - in the code (that randomly failed during the stop-phase) have - been removed as systemd will take care of those for us. - </para> - <para> - The <literal>preStart</literal> script is now only required if - we enabled the trust anchor updates (which are still enabled - by default). - </para> - <para> - Another benefit of the refactoring is that we can now issue - reloads via either <literal>pkill -HUP unbound</literal> and - <literal>systemctl reload unbound</literal> to reload the - running configuration without taking the daemon offline. A - prerequisite of this was that unbound configuration is - available on a well known path on the file system. We are - using the path <literal>/etc/unbound/unbound.conf</literal> as - that is the default in the CLI tooling which in turn enables - us to use <literal>unbound-control</literal> without passing a - custom configuration location. - </para> - <para> - The module has also been reworked to be - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link> compliant. As such, - <literal>sevices.unbound.extraConfig</literal> has been - removed and replaced by - <link xlink:href="options.html#opt-services.unbound.settings">services.unbound.settings</link>. - <literal>services.unbound.interfaces</literal> has been - renamed to - <literal>services.unbound.settings.server.interface</literal>. - </para> - <para> - <literal>services.unbound.forwardAddresses</literal> and - <literal>services.unbound.allowedAccess</literal> have also - been changed to use the new settings interface. You can follow - the instructions when executing - <literal>nixos-rebuild</literal> to upgrade your configuration - to use the new interface. - </para> - </listitem> - <listitem> - <para> - The <literal>services.dnscrypt-proxy2</literal> 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. - </para> - </listitem> - <listitem> - <para> - NixOS now defaults to the unified cgroup hierarchy - (cgroupsv2). See the - <link xlink:href="https://www.redhat.com/sysadmin/fedora-31-control-group-v2">Fedora - Article for 31</link> for details on why this is desirable, - and how it impacts containers. - </para> - <para> - If you want to run containers with a runtime that does not yet - support cgroupsv2, you can switch back to the old behaviour by - setting - <link xlink:href="options.html#opt-systemd.enableUnifiedCgroupHierarchy">systemd.enableUnifiedCgroupHierarchy</link> - = <literal>false</literal>; and rebooting. - </para> - </listitem> - <listitem> - <para> - PulseAudio was upgraded to 14.0, with changes to the handling - of default sinks. See its - <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - GNOME users may wish to delete their - <literal>~/.config/pulse</literal> due to the changes to - stream routing logic. See - <link xlink:href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/832">PulseAudio - bug 832</link> for more information. - </para> - </listitem> - <listitem> - <para> - The zookeeper package does not provide - <literal>zooInspector.sh</literal> anymore, as that - <quote>contrib</quote> has been dropped from upstream - releases. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-users.users._name_.createHome">users.users.<emphasis>name</emphasis>.createHome</link> - now always ensures home directory permissions to be - <literal>0700</literal>. 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. - </para> - </listitem> - <listitem> - <para> - When defining a new user, one of - <link xlink:href="options.html#opt-users.users._name_.isNormalUser">users.users.<emphasis>name</emphasis>.isNormalUser</link> - and - <link xlink:href="options.html#opt-users.users._name_.isSystemUser">users.users.<emphasis>name</emphasis>.isSystemUser</link> - 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 - <link xlink:href="options.html#opt-users.users._name_.isSystemUser">users.users.<emphasis>name</emphasis>.isSystemUser</link> - has no effect for those. - </para> - </listitem> - <listitem> - <para> - The <literal>security.apparmor</literal> module, for the - <link xlink:href="https://gitlab.com/apparmor/apparmor/-/wikis/Documentation">AppArmor</link> - Mandatory Access Control system, has been substantialy - improved along with related tools, so that module maintainers - can now more easily write AppArmor profiles for NixOS. The - most notable change on the user-side is the new option - <link xlink:href="options.html#opt-security.apparmor.policies">security.apparmor.policies</link>, - replacing the previous <literal>profiles</literal> option to - provide a way to disable a profile and to select whether to - confine in enforce mode (default) or in complain mode (see - <literal>journalctl -b --grep apparmor</literal>). - Security-minded users may also want to enable - <link xlink:href="options.html#opt-security.apparmor.killUnconfinedConfinables">security.apparmor.killUnconfinedConfinables</link>, - at the cost of having some of their processes killed when - updating to a NixOS version introducing new AppArmor profiles. - </para> - </listitem> - <listitem> - <para> - The GNOME desktop manager once again installs gnome.epiphany - by default. - </para> - </listitem> - <listitem> - <para> - NixOS now generates empty <literal>/etc/netgroup</literal>. - <literal>/etc/netgroup</literal> defines network-wide groups - and may affect to setups using NIS. - </para> - </listitem> - <listitem> - <para> - Platforms, like <literal>stdenv.hostPlatform</literal>, no - longer have a <literal>platform</literal> attribute. It has - been (mostly) flattened away: - </para> - <itemizedlist> - <listitem> - <para> - <literal>platform.gcc</literal> is now - <literal>gcc</literal> - </para> - </listitem> - <listitem> - <para> - <literal>platform.kernel*</literal> is now - <literal>linux-kernel.*</literal> - </para> - </listitem> - </itemizedlist> - <para> - Additionally, <literal>platform.kernelArch</literal> moved to - the top level as <literal>linuxArch</literal> to match the - other <literal>*Arch</literal> variables. - </para> - <para> - The <literal>platform</literal> grouping of these things never - meant anything, and was just a historial/implementation - artifact that was overdue removal. - </para> - </listitem> - <listitem> - <para> - <literal>services.restic</literal> now uses a dedicated cache - directory for every backup defined in - <literal>services.restic.backups</literal>. The old global - cache directory, <literal>/root/.cache/restic</literal>, is - now unused and can be removed to free up disk space. - </para> - </listitem> - <listitem> - <para> - <literal>isync</literal>: The <literal>isync</literal> - compatibility wrapper was removed and the Master/Slave - terminology has been deprecated and should be replaced with - Far/Near in the configuration file. - </para> - </listitem> - <listitem> - <para> - The nix-gc service now accepts randomizedDelaySec (default: 0) - and persistent (default: true) parameters. By default nix-gc - will now run immediately if it would have been triggered at - least once during the time when the timer was inactive. - </para> - </listitem> - <listitem> - <para> - The <literal>rustPlatform.buildRustPackage</literal> function - is split into several hooks: cargoSetupHook to set up - vendoring for Cargo-based projects, cargoBuildHook to build a - project using Cargo, cargoInstallHook to install a project - using Cargo, and cargoCheckHook to run tests in Cargo-based - projects. With this change, mixed-language projects can use - the relevant hooks within builders other than - <literal>buildRustPackage</literal>. However, these changes - also required several API changes to - <literal>buildRustPackage</literal> itself: - </para> - <itemizedlist> - <listitem> - <para> - The <literal>target</literal> argument was removed. - Instead, <literal>buildRustPackage</literal> will always - use the same target as the C/C++ compiler that is used. - </para> - </listitem> - <listitem> - <para> - The <literal>cargoParallelTestThreads</literal> argument - was removed. Parallel tests are now disabled through - <literal>dontUseCargoParallelTests</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>rustPlatform.maturinBuildHook</literal> hook was - added. This hook can be used with - <literal>buildPythonPackage</literal> to build Python packages - that are written in Rust and use Maturin as their build tool. - </para> - </listitem> - <listitem> - <para> - Kubernetes has - <link xlink:href="https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/">deprecated - docker</link> as container runtime. As a consequence, the - Kubernetes module now has support for configuration of custom - remote container runtimes and enables containerd by default. - Note that containerd is more strict regarding container image - OCI-compliance. As an example, images with CMD or ENTRYPOINT - defined as strings (not lists) will fail on containerd, while - working fine on docker. Please test your setup and container - images with containerd prior to upgrading. - </para> - </listitem> - <listitem> - <para> - The GitLab module now has support for automatic backups. A - schedule can be set with the - <link xlink:href="options.html#opt-services.gitlab.backup.startAt">services.gitlab.backup.startAt</link> - option. - </para> - </listitem> - <listitem> - <para> - Prior to this release, systemd would also read system units - from an undocumented - <literal>/etc/systemd-mutable/system</literal> path. This path - has been dropped from the defaults. That path (or others) can - be re-enabled by adding it to the - <link xlink:href="options.html#opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> - list. - </para> - </listitem> - <listitem> - <para> - PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle - and has been removed. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.xfce.org/">Xfce4</link> relies - on GIO/GVfs for userspace virtual filesystem access in - applications like - <link xlink:href="https://docs.xfce.org/xfce/thunar/">thunar</link> - and - <link xlink:href="https://docs.xfce.org/apps/gigolo/">gigolo</link>. - For that to work, the gvfs nixos service is enabled by - default, and it can be configured with the specific package - that provides GVfs. Until now Xfce4 was setting it to use a - lighter version of GVfs (without support for samba). To avoid - conflicts with other desktop environments this setting has - been dropped. Users that still want it should add the - following to their system configuration: - </para> - <programlisting language="nix"> -{ - services.gvfs.package = pkgs.gvfs.override { samba = null; }; -} -</programlisting> - </listitem> - <listitem> - <para> - The newly enabled <literal>systemd-pstore.service</literal> - now automatically evacuates crashdumps and panic logs from the - persistent storage to - <literal>/var/lib/systemd/pstore</literal>. This prevents - NVRAM from filling up, which ensures the latest diagnostic - data is always stored and alleviates problems with writing new - boot configurations. - </para> - </listitem> - <listitem> - <para> - Nixpkgs now contains - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/118232">automatically - packaged GNOME Shell extensions</link> from the - <link xlink:href="https://extensions.gnome.org/">GNOME - Extensions</link> portal. You can find them, filed by their - UUID, under <literal>gnome38Extensions</literal> attribute for - GNOME 3.38 and under <literal>gnome40Extensions</literal> for - GNOME 40. Finally, the <literal>gnomeExtensions</literal> - attribute contains extensions for the latest GNOME Shell - version in Nixpkgs, listed under a more human-friendly name. - The unqualified attribute scope also contains manually - packaged extensions. Note that the automatically packaged - extensions are provided for convenience and are not checked or - guaranteed to work. - </para> - </listitem> - <listitem> - <para> - Erlang/OTP versions older than R21 got dropped. We also - dropped the cuter package, as it was purely an example of how - to build a package. We also dropped <literal>lfe_1_2</literal> - as it could not build with R21+. Moving forward, we expect to - only support 3 yearly releases of OTP. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 48a717916535e..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ /dev/null @@ -1,2122 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11"> - <title>Release 21.11 (“Porcupine”, 2021/11/30)</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - Support is planned until the end of June 2022, handing over to - 22.05. - </para> - </listitem> - </itemizedlist> - <section xml:id="sec-release-21.11-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Nix has been updated to version 2.4, reference its - <link xlink:href="https://discourse.nixos.org/t/nix-2-4-released/15822">release - notes</link> for more information on what has changed. The - previous version of Nix, 2.3.16, remains available for the - time being in the <literal>nix_2_3</literal> package. - </para> - </listitem> - <listitem> - <para> - <literal>iptables</literal> is now using - <literal>nf_tables</literal> under the hood, by using - <literal>iptables-nft</literal>, similar to - <link xlink:href="https://wiki.debian.org/nftables#Current_status">Debian</link> - and - <link xlink:href="https://fedoraproject.org/wiki/Changes/iptables-nft-default">Fedora</link>. - This means, <literal>ip[6]tables</literal>, - <literal>arptables</literal> and <literal>ebtables</literal> - commands will actually show rules from some specific tables in - the <literal>nf_tables</literal> kernel subsystem. In case - you’re migrating from an older release without rebooting, - there might be cases where you end up with iptable rules - configured both in the legacy <literal>iptables</literal> - kernel backend, as well as in the <literal>nf_tables</literal> - backend. This can lead to confusing firewall behaviour. An - <literal>iptables-save</literal> after switching will complain - about <quote>iptables-legacy tables present</quote>. It’s - probably best to reboot after the upgrade, or manually - removing all legacy iptables rules (via the - <literal>iptables-legacy</literal> package). - </para> - </listitem> - <listitem> - <para> - systemd got an <literal>nftables</literal> backend, and - configures (networkd) rules in their own - <literal>io.systemd.*</literal> tables. Check - <literal>nft list ruleset</literal> to see these rules, not - <literal>iptables-save</literal> (which only shows - <literal>iptables</literal>-created rules. - </para> - </listitem> - <listitem> - <para> - PHP now defaults to PHP 8.0, updated from 7.4. - </para> - </listitem> - <listitem> - <para> - kops now defaults to 1.21.1, which uses containerd as the - default runtime. - </para> - </listitem> - <listitem> - <para> - <literal>python3</literal> now defaults to Python 3.9, updated - from Python 3.8. - </para> - </listitem> - <listitem> - <para> - PostgreSQL now defaults to major version 13. - </para> - </listitem> - <listitem> - <para> - spark now defaults to spark 3, updated from 2. A - <link xlink:href="https://spark.apache.org/docs/latest/core-migration-guide.html#upgrading-from-core-24-to-30">migration - guide</link> is available. - </para> - </listitem> - <listitem> - <para> - Improvements have been made to the Hadoop module and package: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - HDFS and YARN now support production-ready highly - available deployments with automatic failover. - </para> - </listitem> - <listitem> - <para> - Hadoop now defaults to Hadoop 3, updated from 2. - </para> - </listitem> - <listitem> - <para> - JournalNode, ZKFS and HTTPFS services have been added. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Activation scripts can now, optionally, be run during a - <literal>nixos-rebuild dry-activate</literal> and can detect - the dry activation by reading - <literal>$NIXOS_ACTION</literal>. This allows activation - scripts to output what they would change if the activation was - really run. The users/modules activation script supports this - and outputs some of is actions. - </para> - </listitem> - <listitem> - <para> - KDE Plasma now finally works on Wayland. - </para> - </listitem> - <listitem> - <para> - bash now defaults to major version 5. - </para> - </listitem> - <listitem> - <para> - Systemd was updated to version 249 (from 247). - </para> - </listitem> - <listitem> - <para> - Pantheon desktop has been updated to version 6. Due to changes - of screen locker, if locking doesn’t work for you, please try - <literal>gsettings set org.gnome.desktop.lockdown disable-lock-screen false</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>kubernetes-helm</literal> now defaults to 3.7.0, - which introduced some breaking changes to the experimental OCI - manifest format. See - <link xlink:href="https://github.com/helm/community/blob/main/hips/hip-0006.md">HIP - 6</link> for more details. <literal>helmfile</literal> also - defaults to 0.141.0, which is the minimum compatible version. - </para> - </listitem> - <listitem> - <para> - GNOME has been upgraded to 41. Please take a look at their - <link xlink:href="https://help.gnome.org/misc/release-notes/41.0/">Release - Notes</link> for details. - </para> - </listitem> - <listitem> - <para> - LXD support was greatly improved: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - building LXD images from configurations is now directly - possible with just nixpkgs - </para> - </listitem> - <listitem> - <para> - hydra is now building nixOS LXD images that can be used - standalone with full nixos-rebuild support - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - OpenSSH was updated to version 8.8p1 - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - This breaks connections to old SSH daemons as ssh-rsa host - keys and ssh-rsa public keys that were signed with SHA-1 - are disabled by default now - </para> - </listitem> - <listitem> - <para> - These can be re-enabled, see the - <link xlink:href="https://www.openssh.com/txt/release-8.8">OpenSSH - changelog</link> for details - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - ORY Kratos was updated to version 0.8.0-alpha.3 - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - This release requires you to run SQL migrations. Please, - as always, create a backup of your database first! - </para> - </listitem> - <listitem> - <para> - The SDKs are now generated with tag v0alpha2 to reflect - that some signatures have changed in a breaking fashion. - Please update your imports from v0alpha1 to v0alpha2. - </para> - </listitem> - <listitem> - <para> - The SMTPS scheme used in courier config URL with - cleartext/StartTLS/TLS SMTP connection types is now only - supporting implicit TLS. For StartTLS and cleartext SMTP, - please use the SMTP scheme instead. - </para> - </listitem> - <listitem> - <para> - for more details, see - <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.0-alpha.1">Release - Notes</link>. - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-21.11-new-services"> - <title>New Services</title> - <itemizedlist> - <listitem> - <para> - <link xlink:href="https://digint.ch/btrbk/index.html">btrbk</link>, - a backup tool for btrfs subvolumes, taking advantage of btrfs - specific capabilities to create atomic snapshots and transfer - them incrementally to your backup locations. Available as - <link xlink:href="options.html#opt-services.brtbk.instances">services.btrbk</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/xrelkd/clipcat/">clipcat</link>, - an X11 clipboard manager written in Rust. Available at - <link xlink:href="options.html#opt-services.clipcat.enable">services.clipcat</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/dexidp/dex">dex</link>, - an OpenID Connect (OIDC) identity and OAuth 2.0 provider. - Available at - <link xlink:href="options.html#opt-services.dex.enable">services.dex</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/maxmind/geoipupdate">geoipupdate</link>, - a GeoIP database updater from MaxMind. Available as - <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/jitsi/jibri">Jibri</link>, - a service for recording or streaming a Jitsi Meet conference. - Available as - <link xlink:href="options.html#opt-services.jibri.enable">services.jibri</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.isc.org/kea/">Kea</link>, ISCs - 2nd generation DHCP and DDNS server suite. Available at - <link xlink:href="options.html#opt-services.kea.dhcp4">services.kea</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://owncast.online/">owncast</link>, - self-hosted video live streaming solution. Available at - <link xlink:href="options.html#opt-services.owncast.enable">services.owncast</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://joinpeertube.org/">PeerTube</link>, - developed by Framasoft, is the free and decentralized - alternative to video platforms. Available at - <link xlink:href="options.html#opt-services.peertube.enable">services.peertube</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://sr.ht">sourcehut</link>, a - collection of tools useful for software development. Available - as - <link xlink:href="options.html#opt-services.sourcehut.enable">services.sourcehut</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://download.pureftpd.org/pub/ucarp/README">ucarp</link>, - an userspace implementation of the Common Address Redundancy - Protocol (CARP). Available as - <link xlink:href="options.html#opt-networking.ucarp.enable">networking.ucarp</link>. - </para> - </listitem> - <listitem> - <para> - Users of flashrom should migrate to - <link xlink:href="options.html#opt-programs.flashrom.enable">programs.flashrom.enable</link> - and add themselves to the <literal>flashrom</literal> group to - be able to access programmers supported by flashrom. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://vikunja.io">vikunja</link>, a to-do - list app. Available as - <link linkend="opt-services.vikunja.enable">services.vikunja</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/evilsocket/opensnitch">opensnitch</link>, - an application firewall. Available as - <link linkend="opt-services.opensnitch.enable">services.opensnitch</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.snapraid.it/">snapraid</link>, a - backup program for disk arrays. Available as - <link linkend="opt-snapraid.enable">snapraid</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/hockeypuck/hockeypuck">Hockeypuck</link>, - a OpenPGP Key Server. Available as - <link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/buildkite/buildkite-agent-metrics">buildkite-agent-metrics</link>, - a command-line tool for collecting Buildkite agent metrics, - now has a Prometheus exporter available as - <link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/prometheus/influxdb_exporter">influxdb-exporter</link> - a Prometheus exporter that exports metrics received on an - InfluxDB compatible endpoint is now available as - <link linkend="opt-services.prometheus.exporters.influxdb.enable">services.prometheus.exporters.influxdb</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/matrix-discord/mx-puppet-discord">mx-puppet-discord</link>, - a discord puppeting bridge for matrix. Available as - <link linkend="opt-services.mx-puppet-discord.enable">services.mx-puppet-discord</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.meshcommander.com/meshcentral2/overview">MeshCentral</link>, - a remote administration service (<quote>TeamViewer but - self-hosted and with more features</quote>) is now available - with a package and a module: - <link linkend="opt-services.meshcentral.enable">services.meshcentral.enable</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/Arksine/moonraker">moonraker</link>, - an API web server for Klipper. Available as - <link linkend="opt-services.moonraker.enable">moonraker</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/influxdata/influxdb">influxdb2</link>, - a Scalable datastore for metrics, events, and real-time - analytics. Available as - <link linkend="opt-services.influxdb2.enable">services.influxdb2</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://posativ.org/isso/">isso</link>, a - commenting server similar to Disqus. Available as - <link linkend="opt-services.isso.enable">isso</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.navidrome.org/">navidrome</link>, - a personal music streaming server with subsonic-compatible - api. Available as - <link linkend="opt-services.navidrome.enable">navidrome</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://docs.fluidd.xyz/">fluidd</link>, a - Klipper web interface for managing 3d printers using - moonraker. Available as - <link linkend="opt-services.fluidd.enable">fluidd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/earnestly/sx">sx</link>, - a simple alternative to both xinit and startx for starting a - Xorg server. Available as - <link linkend="opt-services.xserver.displayManager.sx.enable">services.xserver.displayManager.sx</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://postfixadmin.sourceforge.io/">postfixadmin</link>, - a web based virtual user administration interface for Postfix - mail servers. Available as - <link linkend="opt-services.postfixadmin.enable">postfixadmin</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://wiki.servarr.com/prowlarr">prowlarr</link>, - an indexer manager/proxy built on the popular arr .net/reactjs - base stack - <link linkend="opt-services.prowlarr.enable">services.prowlarr</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://sr.ht/~emersion/soju">soju</link>, a - user-friendly IRC bouncer. Available as - <link xlink:href="options.html#opt-services.soju.enable">services.soju</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://nats.io/">nats</link>, a high - performance cloud and edge messaging system. Available as - <link linkend="opt-services.nats.enable">services.nats</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://git-scm.com">git</link>, a - distributed version control system. Available as - <link xlink:href="options.html#opt-programs.git.enable">programs.git</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://domainaware.github.io/parsedmarc/">parsedmarc</link>, - a service which parses incoming - <link xlink:href="https://dmarc.org/">DMARC</link> reports and - stores or sends them to a downstream service for further - analysis. Documented in - <link linkend="module-services-parsedmarc">its manual - entry</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://spark.apache.org/">spark</link>, a - unified analytics engine for large-scale data processing. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/JoseExposito/touchegg">touchegg</link>, - a multi-touch gesture recognizer. Available as - <link linkend="opt-services.touchegg.enable">services.touchegg</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/pantheon-tweaks/pantheon-tweaks">pantheon-tweaks</link>, - an unofficial system settings panel for Pantheon. Available as - <link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/DanielOgorchock/joycond">joycond</link>, - a service that uses <literal>hid-nintendo</literal> to provide - nintendo joycond pairing and better nintendo switch pro - controller support. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/opensvc/multipath-tools">multipath</link>, - the device mapper multipath (DM-MP) daemon. Available as - <link linkend="opt-services.multipath.enable">services.multipath</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.seafile.com/en/home/">seafile</link>, - an open source file syncing & sharing software. Available - as - <link xlink:href="options.html#opt-services.seafile.enable">services.seafile</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/mchehab/rasdaemon">rasdaemon</link>, - a hardware error logging daemon. Available as - <link linkend="opt-hardware.rasdaemon.enable">hardware.rasdaemon</link>. - </para> - </listitem> - <listitem> - <para> - <literal>code-server</literal>-module now available - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/xmrig/xmrig">xmrig</link>, - a high performance, open source, cross platform RandomX, - KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and - RandomX benchmark. - </para> - </listitem> - <listitem> - <para> - Auto nice daemons - <link xlink:href="https://github.com/Nefelim4ag/Ananicy">ananicy</link> - and - <link xlink:href="https://gitlab.com/ananicy-cpp/ananicy-cpp/">ananicy-cpp</link>. - Available as - <link linkend="opt-services.ananicy.enable">services.ananicy</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/prometheus-community/smartctl_exporter">smartctl_exporter</link>, - a Prometheus exporter for - <link xlink:href="https://en.wikipedia.org/wiki/S.M.A.R.T.">S.M.A.R.T.</link> - data. Available as - <link xlink:href="options.html#opt-services.prometheus.exporters.smartctl.enable">services.prometheus.exporters.smartctl</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://docs.twingate.com/docs/linux">twingate</link>, - a high performance, easy to use zero trust solution that - enables access to private resources from any device with - better security than a VPN. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-21.11-incompatibilities"> - <title>Backward Incompatibilities</title> - <itemizedlist> - <listitem> - <para> - The NixOS VM test framework, - <literal>pkgs.nixosTest</literal>/<literal>make-test-python.nix</literal> - (<literal>pkgs.testers.nixosTest</literal> since 22.05), now - requires detaching commands such as - <literal>succeed("foo &")</literal> and - <literal>succeed("foo | xclip -i")</literal> to - close stdout. This can be done with a redirect such as - <literal>succeed("foo >&2 &")</literal>. - This breaking change was necessitated by a race condition - causing tests to fail or hang. It applies to all methods that - invoke commands on the nodes, including - <literal>execute</literal>, <literal>succeed</literal>, - <literal>fail</literal>, - <literal>wait_until_succeeds</literal>, - <literal>wait_until_fails</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>services.wakeonlan</literal> option was removed, - and replaced with - <literal>networking.interfaces.<name>.wakeOnLan</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>security.wrappers</literal> option now requires - to always specify an owner, group and whether the - setuid/setgid bit should be set. This is motivated by the fact - that before NixOS 21.11, specifying either setuid or setgid - but not owner/group resulted in wrappers owned by - nobody/nogroup, which is unsafe. - </para> - </listitem> - <listitem> - <para> - Since <literal>iptables</literal> now uses - <literal>nf_tables</literal> backend and - <literal>ipset</literal> doesn’t support it, some applications - (ferm, shorewall, firehol) may have limited functionality. - </para> - </listitem> - <listitem> - <para> - The <literal>paperless</literal> module and package have been - removed. All users should migrate to the successor - <literal>paperless-ng</literal> instead. The Paperless project - <link xlink:href="https://github.com/the-paperless-project/paperless/commit/9b0063c9731f7c5f65b1852cb8caff97f5e40ba4">has - been archived</link> and advises all users to use - <literal>paperless-ng</literal> instead. - </para> - <para> - Users can use the <literal>services.paperless-ng</literal> - module as a replacement while noting the following - incompatibilities: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>services.paperless.ocrLanguages</literal> has no - replacement. Users should migrate to - <link xlink:href="options.html#opt-services.paperless-ng.extraConfig"><literal>services.paperless-ng.extraConfig</literal></link> - instead: - </para> - </listitem> - </itemizedlist> - <programlisting language="nix"> -{ - services.paperless-ng.extraConfig = { - # Provide languages as ISO 639-2 codes - # separated by a plus (+) sign. - # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes - PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse - }; -} -</programlisting> - <itemizedlist> - <listitem> - <para> - If you previously specified - <literal>PAPERLESS_CONSUME_MAIL_*</literal> settings in - <literal>services.paperless.extraConfig</literal> you - should remove those options now. You now - <emphasis>must</emphasis> define those settings in the - admin interface of paperless-ng. - </para> - </listitem> - <listitem> - <para> - Option <literal>services.paperless.manage</literal> no - longer exists. Use the script at - <literal>${services.paperless-ng.dataDir}/paperless-ng-manage</literal> - instead. Note that this script only exists after the - <literal>paperless-ng</literal> service has been started - at least once. - </para> - </listitem> - <listitem> - <para> - After switching to the new system configuration you should - run the Django management command to reindex your - documents and optionally create a user, if you don’t have - one already. - </para> - <para> - To do so, enter the data directory (the value of - <literal>services.paperless-ng.dataDir</literal>, - <literal>/var/lib/paperless</literal> by default), switch - to the paperless user and execute the management command - like below: - </para> - <programlisting> -$ cd /var/lib/paperless -$ su paperless -s /bin/sh -$ ./paperless-ng-manage document_index reindex -# if not already done create a user account, paperless-ng requires a login -$ ./paperless-ng-manage createsuperuser -Username (leave blank to use 'paperless'): my-user-name -Email address: me@example.com -Password: ********** -Password (again): ********** -Superuser created successfully. -</programlisting> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>staticjinja</literal> package has been upgraded - from 1.0.4 to 4.1.1 - </para> - </listitem> - <listitem> - <para> - Firefox v91 does not support addons with invalid signature - anymore. Firefox ESR needs to be used for nix addon support. - </para> - </listitem> - <listitem> - <para> - The <literal>erigon</literal> ethereum node has moved to a new - database format in <literal>2021-05-04</literal>, and requires - a full resync - </para> - </listitem> - <listitem> - <para> - The <literal>erigon</literal> ethereum node has moved its - database location in <literal>2021-08-03</literal>, users - upgrading must manually move their chaindata (see - <link xlink:href="https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03">release - notes</link>). - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-users.users._name_.group">users.users.<name>.group</link> - no longer defaults to <literal>nogroup</literal>, which was - insecure. Out-of-tree modules are likely to require - adaptation: instead of - </para> - <programlisting language="nix"> -{ - users.users.foo = { - isSystemUser = true; - }; -} -</programlisting> - <para> - also create a group for your user: - </para> - <programlisting language="nix"> -{ - users.users.foo = { - isSystemUser = true; - group = "foo"; - }; - users.groups.foo = {}; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>services.geoip-updater</literal> was broken and has - been replaced by - <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>. - </para> - </listitem> - <listitem> - <para> - <literal>ihatemoney</literal> has been updated to version - 5.1.1 - (<link xlink:href="https://github.com/spiral-project/ihatemoney/blob/5.1.1/CHANGELOG.rst">release - notes</link>). If you serve ihatemoney by HTTP rather than - HTTPS, you must set - <link xlink:href="options.html#opt-services.ihatemoney.secureCookie">services.ihatemoney.secureCookie</link> - to <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - PHP 7.3 is no longer supported due to upstream not supporting - this version for the entire lifecycle of the 21.11 release. - </para> - </listitem> - <listitem> - <para> - Those making use of <literal>buildBazelPackage</literal> will - need to regenerate the fetch hashes (preferred), or set - <literal>fetchConfigured = false;</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>consul</literal> was upgraded to a new major release - with breaking changes, see - <link xlink:href="https://github.com/hashicorp/consul/releases/tag/v1.10.0">upstream - changelog</link>. - </para> - </listitem> - <listitem> - <para> - fsharp41 has been removed in preference to use the latest - dotnet-sdk - </para> - </listitem> - <listitem> - <para> - The following F#-related packages have been removed for being - unmaintaned. Please use <literal>fetchNuGet</literal> for - specific packages. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - ExtCore - </para> - </listitem> - <listitem> - <para> - Fake - </para> - </listitem> - <listitem> - <para> - Fantomas - </para> - </listitem> - <listitem> - <para> - FsCheck - </para> - </listitem> - <listitem> - <para> - FsCheck262 - </para> - </listitem> - <listitem> - <para> - FsCheckNunit - </para> - </listitem> - <listitem> - <para> - FSharpAutoComplete - </para> - </listitem> - <listitem> - <para> - FSharpCompilerCodeDom - </para> - </listitem> - <listitem> - <para> - FSharpCompilerService - </para> - </listitem> - <listitem> - <para> - FSharpCompilerTools - </para> - </listitem> - <listitem> - <para> - FSharpCore302 - </para> - </listitem> - <listitem> - <para> - FSharpCore3125 - </para> - </listitem> - <listitem> - <para> - FSharpCore4001 - </para> - </listitem> - <listitem> - <para> - FSharpCore4117 - </para> - </listitem> - <listitem> - <para> - FSharpData - </para> - </listitem> - <listitem> - <para> - FSharpData225 - </para> - </listitem> - <listitem> - <para> - FSharpDataSQLProvider - </para> - </listitem> - <listitem> - <para> - FSharpFormatting - </para> - </listitem> - <listitem> - <para> - FsLexYacc - </para> - </listitem> - <listitem> - <para> - FsLexYacc706 - </para> - </listitem> - <listitem> - <para> - FsLexYaccRuntime - </para> - </listitem> - <listitem> - <para> - FsPickler - </para> - </listitem> - <listitem> - <para> - FsUnit - </para> - </listitem> - <listitem> - <para> - Projekt - </para> - </listitem> - <listitem> - <para> - Suave - </para> - </listitem> - <listitem> - <para> - UnionArgParser - </para> - </listitem> - <listitem> - <para> - ExcelDnaRegistration - </para> - </listitem> - <listitem> - <para> - MathNetNumerics - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>programs.x2goserver</literal> is now - <literal>services.x2goserver</literal> - </para> - </listitem> - <listitem> - <para> - The following dotnet-related packages have been removed for - being unmaintaned. Please use <literal>fetchNuGet</literal> - for specific packages. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Autofac - </para> - </listitem> - <listitem> - <para> - SystemValueTuple - </para> - </listitem> - <listitem> - <para> - MicrosoftDiaSymReader - </para> - </listitem> - <listitem> - <para> - MicrosoftDiaSymReaderPortablePdb - </para> - </listitem> - <listitem> - <para> - SystemCollectionsImmutable - </para> - </listitem> - <listitem> - <para> - SystemCollectionsImmutable131 - </para> - </listitem> - <listitem> - <para> - SystemReflectionMetadata - </para> - </listitem> - <listitem> - <para> - NUnit350 - </para> - </listitem> - <listitem> - <para> - Deedle - </para> - </listitem> - <listitem> - <para> - ExcelDna - </para> - </listitem> - <listitem> - <para> - GitVersionTree - </para> - </listitem> - <listitem> - <para> - NDeskOptions - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - <itemizedlist> - <listitem> - <para> - The <literal>antlr</literal> package now defaults to the 4.x - release instead of the old 2.7.7 version. - </para> - </listitem> - <listitem> - <para> - The <literal>pulseeffects</literal> package updated to - <link xlink:href="https://github.com/wwmm/easyeffects/releases/tag/v6.0.0">version - 4.x</link> and renamed to <literal>easyeffects</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>libwnck</literal> package now defaults to the 3.x - release instead of the old 2.31.0 version. - </para> - </listitem> - <listitem> - <para> - The <literal>bitwarden_rs</literal> packages and modules were - renamed to <literal>vaultwarden</literal> - <link xlink:href="https://github.com/dani-garcia/vaultwarden/discussions/1642">following - upstream</link>. More specifically, - </para> - <itemizedlist> - <listitem> - <para> - <literal>pkgs.bitwarden_rs</literal>, - <literal>pkgs.bitwarden_rs-sqlite</literal>, - <literal>pkgs.bitwarden_rs-mysql</literal> and - <literal>pkgs.bitwarden_rs-postgresql</literal> were - renamed to <literal>pkgs.vaultwarden</literal>, - <literal>pkgs.vaultwarden-sqlite</literal>, - <literal>pkgs.vaultwarden-mysql</literal> and - <literal>pkgs.vaultwarden-postgresql</literal>, - respectively. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Old names are preserved as aliases for backwards - compatibility, but may be removed in the future. - </para> - </listitem> - <listitem> - <para> - The <literal>bitwarden_rs</literal> executable was - also renamed to <literal>vaultwarden</literal> in all - packages. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>pkgs.bitwarden_rs-vault</literal> was renamed to - <literal>pkgs.vaultwarden-vault</literal>. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>pkgs.bitwarden_rs-vault</literal> is - preserved as an alias for backwards compatibility, but - may be removed in the future. - </para> - </listitem> - <listitem> - <para> - The static files were moved from - <literal>/usr/share/bitwarden_rs</literal> to - <literal>/usr/share/vaultwarden</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>services.bitwarden_rs</literal> config module - was renamed to <literal>services.vaultwarden</literal>. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>services.bitwarden_rs</literal> is preserved - as an alias for backwards compatibility, but may be - removed in the future. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>systemd.services.bitwarden_rs</literal>, - <literal>systemd.services.backup-bitwarden_rs</literal> - and <literal>systemd.timers.backup-bitwarden_rs</literal> - were renamed to - <literal>systemd.services.vaultwarden</literal>, - <literal>systemd.services.backup-vaultwarden</literal> and - <literal>systemd.timers.backup-vaultwarden</literal>, - respectively. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Old names are preserved as aliases for backwards - compatibility, but may be removed in the future. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>users.users.bitwarden_rs</literal> and - <literal>users.groups.bitwarden_rs</literal> were renamed - to <literal>users.users.vaultwarden</literal> and - <literal>users.groups.vaultwarden</literal>, respectively. - </para> - </listitem> - <listitem> - <para> - The data directory remains located at - <literal>/var/lib/bitwarden_rs</literal>, for backwards - compatibility. - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - <itemizedlist> - <listitem> - <para> - <literal>yggdrasil</literal> was upgraded to a new major - release with breaking changes, see - <link xlink:href="https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0">upstream - changelog</link>. - </para> - </listitem> - <listitem> - <para> - <literal>icingaweb2</literal> was upgraded to a new release - which requires a manual database upgrade, see - <link xlink:href="https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0">upstream - changelog</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>isabelle</literal> package has been upgraded from - 2020 to 2021 - </para> - </listitem> - <listitem> - <para> - the <literal>mingw-64</literal> package has been upgraded from - 6.0.0 to 9.0.0 - </para> - </listitem> - <listitem> - <para> - <literal>tt-rss</literal> was upgraded to the commit on - 2021-06-21, which has breaking changes. If you use - <literal>services.tt-rss.extraConfig</literal> you should - migrate to the <literal>putenv</literal>-style configuration. - See - <link xlink:href="https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337">this - Discourse post</link> in the tt-rss forums for more details. - </para> - </listitem> - <listitem> - <para> - The following Visual Studio Code extensions were renamed to - keep the naming convention uniform. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>bbenoist.Nix</literal> -> - <literal>bbenoist.nix</literal> - </para> - </listitem> - <listitem> - <para> - <literal>CoenraadS.bracket-pair-colorizer</literal> -> - <literal>coenraads.bracket-pair-colorizer</literal> - </para> - </listitem> - <listitem> - <para> - <literal>golang.Go</literal> -> - <literal>golang.go</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>services.uptimed</literal> now uses - <literal>/var/lib/uptimed</literal> as its stateDirectory - instead of <literal>/var/spool/uptimed</literal>. Make sure to - move all files to the new directory. - </para> - </listitem> - <listitem> - <para> - Deprecated package aliases in <literal>emacs.pkgs.*</literal> - have been removed. These aliases were remnants of the old - Emacs package infrastructure. We now use exact upstream names - wherever possible. - </para> - </listitem> - <listitem> - <para> - <literal>programs.neovim.runtime</literal> switched to a - <literal>linkFarm</literal> internally, making it impossible - to use wildcards in the <literal>source</literal> argument. - </para> - </listitem> - <listitem> - <para> - The <literal>openrazer</literal> and - <literal>openrazer-daemon</literal> packages as well as the - <literal>hardware.openrazer</literal> module now require users - to be members of the <literal>openrazer</literal> group - instead of <literal>plugdev</literal>. With this change, users - no longer need be granted the entire set of - <literal>plugdev</literal> group permissions, which can - include permissions other than those required by - <literal>openrazer</literal>. This is desirable from a - security point of view. The setting - <link xlink:href="options.html#opt-services.hardware.openrazer.users"><literal>harware.openrazer.users</literal></link> - can be used to add users to the <literal>openrazer</literal> - group. - </para> - </listitem> - <listitem> - <para> - The fontconfig service’s dpi option has been removed. - Fontconfig should use Xft settings by default so there’s no - need to override one value in multiple places. The user can - set DPI via ~/.Xresources properly, or at the system level per - monitor, or as a last resort at the system level with - <literal>services.xserver.dpi</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>yambar</literal> package has been split into - <literal>yambar</literal> and - <literal>yambar-wayland</literal>, corresponding to the xorg - and wayland backend respectively. Please switch to - <literal>yambar-wayland</literal> if you are on wayland. - </para> - </listitem> - <listitem> - <para> - The <literal>services.minio</literal> module gained an - additional option <literal>consoleAddress</literal>, that - configures the address and port the web UI is listening, it - defaults to <literal>:9001</literal>. To be able to access the - web UI this port needs to be opened in the firewall. - </para> - </listitem> - <listitem> - <para> - The <literal>varnish</literal> package was upgraded from 6.3.x - to 7.x. <literal>varnish60</literal> for the last LTS release - is also still available. - </para> - </listitem> - <listitem> - <para> - The <literal>kubernetes</literal> package was upgraded to - 1.22. The <literal>kubernetes.apiserver.kubeletHttps</literal> - option was removed and HTTPS is always used. - </para> - </listitem> - <listitem> - <para> - The attribute <literal>linuxPackages_latest_hardened</literal> - was dropped because the hardened patches lag behind the - upstream kernel which made version bumps harder. If you want - to use a hardened kernel, please pin it explicitly with a - versioned attribute such as - <literal>linuxPackages_5_10_hardened</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>nomad</literal> package now defaults to a 1.1.x - release instead of 1.0.x - </para> - </listitem> - <listitem> - <para> - If <literal>exfat</literal> is included in - <literal>boot.supportedFilesystems</literal> and when using - kernel 5.7 or later, the <literal>exfatprogs</literal> - user-space utilities are used instead of - <literal>exfat</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>todoman</literal> package was upgraded from 3.9.0 - to 4.0.0. This introduces breaking changes in the - <link xlink:href="https://todoman.readthedocs.io/en/stable/configure.html#configuration-file">configuration - file</link> format. - </para> - </listitem> - <listitem> - <para> - The <literal>datadog-agent</literal>, - <literal>datadog-integrations-core</literal> and - <literal>datadog-process-agent</literal> packages were - upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and - 6.11.1 to 7.30.2, respectively. As a result - <literal>services.datadog-agent</literal> has had breaking - changes to the configuration file. For details, see the - <link xlink:href="https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst">upstream - changelog</link>. - </para> - </listitem> - <listitem> - <para> - <literal>opencv2</literal> no longer includes the non-free - libraries by default, and consequently - <literal>pfstools</literal> no longer includes OpenCV support - by default. Both packages now support an - <literal>enableUnfree</literal> option to re-enable this - functionality. - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.displayManager.defaultSession = "plasma5"</literal> - does not work anymore, instead use either - <literal>"plasma"</literal> for the Plasma X11 - session or <literal>"plasmawayland"</literal> for - the Plasma Wayland sesison. - </para> - </listitem> - <listitem> - <para> - <literal>boot.kernelParams</literal> now only accepts one - command line parameter per string. This change is aimed to - reduce common mistakes like <quote>param = 12</quote>, which - would be parsed as 3 parameters. - </para> - </listitem> - <listitem> - <para> - <literal>nix.daemonNiceLevel</literal> and - <literal>nix.daemonIONiceLevel</literal> have been removed in - favour of the new options - <link xlink:href="options.html#opt-nix.daemonCPUSchedPolicy"><literal>nix.daemonCPUSchedPolicy</literal></link>, - <link xlink:href="options.html#opt-nix.daemonIOSchedClass"><literal>nix.daemonIOSchedClass</literal></link> - and - <link xlink:href="options.html#opt-nix.daemonIOSchedPriority"><literal>nix.daemonIOSchedPriority</literal></link>. - Please refer to the options documentation and the - <literal>sched(7)</literal> and - <literal>ioprio_set(2)</literal> man pages for guidance on how - to use them. - </para> - </listitem> - <listitem> - <para> - The <literal>coursier</literal> package’s binary was renamed - from <literal>coursier</literal> to <literal>cs</literal>. - Completions which haven’t worked for a while should now work - with the renamed binary. To keep using - <literal>coursier</literal>, you can create a shell alias. - </para> - </listitem> - <listitem> - <para> - The <literal>services.mosquitto</literal> module has been - rewritten to support multiple listeners and per-listener - configuration. Module configurations from previous releases - will no longer work and must be updated. - </para> - </listitem> - <listitem> - <para> - The <literal>fluidsynth_1</literal> attribute has been - removed, as this legacy version is no longer needed in - nixpkgs. The actively maintained 2.x series is available as - <literal>fluidsynth</literal> unchanged. - </para> - </listitem> - <listitem> - <para> - Nextcloud 20 (<literal>pkgs.nextcloud20</literal>) has been - dropped because it was EOLed by upstream in 2021-10. - </para> - </listitem> - <listitem> - <para> - The <literal>virtualisation.pathsInNixDB</literal> option was - renamed - <link xlink:href="options.html#opt-virtualisation.additionalPaths"><literal>virtualisation.additionalPaths</literal></link>. - </para> - </listitem> - <listitem> - <para> - The <literal>services.ddclient.password</literal> option was - removed, and replaced with - <literal>services.ddclient.passwordFile</literal>. - </para> - </listitem> - <listitem> - <para> - The default GNAT version has been changed: The - <literal>gnat</literal> attribute now points to - <literal>gnat12</literal> instead of <literal>gnat9</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>retroArchCores</literal> has been removed. This means - that using <literal>nixpkgs.config.retroarch</literal> to - customize RetroArch cores is not supported anymore. Instead, - use package overrides, for example: - <literal>retroarch.override { cores = with libretro; [ citra snes9x ]; };</literal>. - Also, <literal>retroarchFull</literal> derivation is available - for those who want to have all RetroArch cores available. - </para> - </listitem> - <listitem> - <para> - The Linux kernel for security reasons now restricts access to - BPF syscalls via <literal>BPF_UNPRIV_DEFAULT_OFF=y</literal>. - Unprivileged access can be reenabled via the - <literal>kernel.unprivileged_bpf_disabled</literal> sysctl - knob. - </para> - </listitem> - <listitem> - <para> - <literal>/usr</literal> will always be included in the initial - ramdisk. See the - <literal>fileSystems.<name>.neededForBoot</literal> - option. If any files exist under <literal>/usr</literal> - (which is not typical for NixOS), they will be included in the - initial ramdisk, increasing its size to a possibly problematic - extent. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.haskell-language-server</literal> will now by - default be linked dynamically to improve TemplateHaskell - compatibility. To mitigate the increased closure size it will - now by default only support our current default ghc (at the - moment 9.0.2). Add other ghc versions via e.g. - <literal>pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }</literal>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-21.11-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - The linux kernel package infrastructure was moved out of - <literal>all-packages.nix</literal>, and restructured. Linux - related functions and attributes now live under the - <literal>pkgs.linuxKernel</literal> attribute set. In - particular the versioned <literal>linuxPackages_*</literal> - package sets (such as <literal>linuxPackages_5_4</literal>) - and kernels from <literal>pkgs</literal> were moved there and - now live under <literal>pkgs.linuxKernel.packages.*</literal>. - The unversioned ones (such as - <literal>linuxPackages_latest</literal>) remain untouched. - </para> - </listitem> - <listitem> - <para> - In NixOS virtual machines (QEMU), the - <literal>virtualisation</literal> module has been updated with - new options: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <link xlink:href="options.html#opt-virtualisation.forwardPorts"><literal>forwardPorts</literal></link> - to configure IPv4 port forwarding, - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-virtualisation.sharedDirectories"><literal>sharedDirectories</literal></link> - to set up shared host directories, - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-virtualisation.resolution"><literal>resolution</literal></link> - to set the screen resolution, - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-virtualisation.useNixStoreImage"><literal>useNixStoreImage</literal></link> - to use a disk image for the Nix store instead of 9P. - </para> - </listitem> - </itemizedlist> - <para> - In addition, the default - <link xlink:href="options.html#opt-virtualisation.msize"><literal>msize</literal></link> - parameter in 9P filesystems (including /nix/store and all - shared directories) has been increased to 16K for improved - performance. - </para> - </listitem> - <listitem> - <para> - The setting - <link xlink:href="options.html#opt-services.openssh.logLevel"><literal>services.openssh.logLevel</literal></link> - <literal>"VERBOSE"</literal> - <literal>"INFO"</literal>. This brings NixOS in line - with upstream and other Linux distributions, and reduces log - spam on servers due to bruteforcing botnets. - </para> - <para> - However, if - <link xlink:href="options.html#opt-services.fail2ban.enable"><literal>services.fail2ban.enable</literal></link> - is <literal>true</literal>, the <literal>fail2ban</literal> - will override the verbosity to - <literal>"VERBOSE"</literal>, so that - <literal>fail2ban</literal> can observe the failed login - attempts from the SSH logs. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.xserver.extraLayouts"><literal>services.xserver.extraLayouts</literal></link> - no longer cause additional rebuilds when a layout is added or - modified. - </para> - </listitem> - <listitem> - <para> - Sway: The terminal emulator <literal>rxvt-unicode</literal> is - no longer installed by default via - <literal>programs.sway.extraPackages</literal>. The current - default configuration uses <literal>alacritty</literal> (and - soon <literal>foot</literal>) so this is only an issue when - using a customized configuration and not installing - <literal>rxvt-unicode</literal> explicitly. - </para> - </listitem> - <listitem> - <para> - <literal>python3</literal> now defaults to Python 3.9. Python - 3.9 introduces many deprecation warnings, please look at the - <link xlink:href="https://docs.python.org/3/whatsnew/3.9.html">What’s - New In Python 3.9 post</link> for more information. - </para> - </listitem> - <listitem> - <para> - <literal>qtile</literal> hase been updated from - <quote>0.16.0</quote> to <quote>0.18.0</quote>, please check - <link xlink:href="https://github.com/qtile/qtile/blob/master/CHANGELOG">qtile - changelog</link> for changes. - </para> - </listitem> - <listitem> - <para> - The <literal>claws-mail</literal> package now references the - new GTK+ 3 release branch, major version 4. To use the GTK+ 2 - releases, one can install the - <literal>claws-mail-gtk2</literal> package. - </para> - </listitem> - <listitem> - <para> - The wordpress module provides a new interface which allows to - use different webservers with the new option - <link xlink:href="options.html#opt-services.wordpress.webserver"><literal>services.wordpress.webserver</literal></link>. - Currently <literal>httpd</literal>, <literal>caddy</literal> - and <literal>nginx</literal> are supported. The definitions of - wordpress sites should now be set in - <link xlink:href="options.html#opt-services.wordpress.sites"><literal>services.wordpress.sites</literal></link>. - </para> - <para> - Sites definitions that use the old interface are automatically - migrated in the new option. This backward compatibility will - be removed in 22.05. - </para> - </listitem> - <listitem> - <para> - The dokuwiki module provides a new interface which allows to - use different webservers with the new option - <link xlink:href="options.html#opt-services.dokuwiki.webserver"><literal>services.dokuwiki.webserver</literal></link>. - Currently <literal>caddy</literal> and - <literal>nginx</literal> are supported. The definitions of - dokuwiki sites should now be set in - <link xlink:href="options.html#opt-services.dokuwiki.sites"><literal>services.dokuwiki.sites</literal></link>. - </para> - <para> - Sites definitions that use the old interface are automatically - migrated in the new option. This backward compatibility will - be removed in 22.05. - </para> - </listitem> - <listitem> - <para> - The order of NSS (host) modules has been brought in line with - upstream recommendations: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - The <literal>myhostname</literal> module is placed before - the <literal>resolve</literal> (optional) and - <literal>dns</literal> entries, but after - <literal>file</literal> (to allow overriding via - <literal>/etc/hosts</literal> / - <literal>networking.extraHosts</literal>, and prevent ISPs - with catchall-DNS resolvers from hijacking - <literal>.localhost</literal> domains) - </para> - </listitem> - <listitem> - <para> - The <literal>mymachines</literal> module, which provides - hostname resolution for local containers (registered with - <literal>systemd-machined</literal>) is placed to the - front, to make sure its mappings are preferred over other - resolvers. - </para> - </listitem> - <listitem> - <para> - If systemd-networkd is enabled, the - <literal>resolve</literal> module is placed before - <literal>files</literal> and - <literal>myhostname</literal>, as it provides the same - logic internally, with caching. - </para> - </listitem> - <listitem> - <para> - The <literal>mdns(_minimal)</literal> module has been - updated to the new priorities. - </para> - </listitem> - </itemizedlist> - <para> - If you use your own NSS host modules, make sure to update your - priorities according to these rules: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - NSS modules which should be queried before - <literal>resolved</literal> DNS resolution should use - mkBefore. - </para> - </listitem> - <listitem> - <para> - NSS modules which should be queried after - <literal>resolved</literal>, <literal>files</literal> and - <literal>myhostname</literal>, but before - <literal>dns</literal> should use the default priority - </para> - </listitem> - <listitem> - <para> - NSS modules which should come after <literal>dns</literal> - should use mkAfter. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-networking.wireless.enable">networking.wireless</link> - module (based on wpa_supplicant) has been heavily reworked, - solving a number of issues and adding useful features: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - The automatic discovery of wireless interfaces at boot has - been made reliable again (issues - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/101963">#101963</link>, - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/23196">#23196</link>). - </para> - </listitem> - <listitem> - <para> - WPA3 and Fast BSS Transition (802.11r) are now enabled by - default for all networks. - </para> - </listitem> - <listitem> - <para> - Secrets like pre-shared keys and passwords can now be - handled safely, meaning without including them in a - world-readable file - (<literal>wpa_supplicant.conf</literal> under /nix/store). - This is achieved by storing the secrets in a secured - <link xlink:href="options.html#opt-networking.wireless.environmentFile">environmentFile</link> - and referring to them though environment variables that - are expanded inside the configuration. - </para> - </listitem> - <listitem> - <para> - With multiple interfaces declared, independent - wpa_supplicant daemons are started, one for each interface - (the services are named - <literal>wpa_supplicant-wlan0</literal>, - <literal>wpa_supplicant-wlan1</literal>, etc.). - </para> - </listitem> - <listitem> - <para> - The generated <literal>wpa_supplicant.conf</literal> file - is now formatted for easier reading. - </para> - </listitem> - <listitem> - <para> - A new - <link xlink:href="options.html#opt-networking.wireless.scanOnLowSignal">scanOnLowSignal</link> - option has been added to facilitate fast roaming between - access points (enabled by default). - </para> - </listitem> - <listitem> - <para> - A new - <link xlink:href="options.html#opt-networking.wireless.networks._name_.authProtocols">networks.<name>.authProtocols</link> - option has been added to change the authentication - protocols used when connecting to a network. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-networking.wireless.iwd.enable">networking.wireless.iwd</link> - module has a new - <link xlink:href="options.html#opt-networking.wireless.iwd.settings">networking.wireless.iwd.settings</link> - option. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.smokeping.host">services.smokeping.host</link> - option was added and defaulted to - <literal>localhost</literal>. Before, - <literal>smokeping</literal> listened to all interfaces by - default. NixOS defaults generally aim to provide - non-Internet-exposed defaults for databases and internal - monitoring tools, see e.g. - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/100192">#100192</link>. - Further, the systemd service for <literal>smokeping</literal> - got reworked defaults for increased operational stability, see - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/144127">PR - #144127</link> for details. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.syncoid.enable">services.syncoid.enable</link> - module now properly drops ZFS permissions after usage. Before - it delegated permissions to whole pools instead of datasets - and didn’t clean up after execution. You can manually look - this up for your pools by running - <literal>zfs allow your-pool-name</literal> and use - <literal>zfs unallow syncoid your-pool-name</literal> to clean - this up. - </para> - </listitem> - <listitem> - <para> - Zfs: <literal>latestCompatibleLinuxPackages</literal> is now - exported on the zfs package. One can use - <literal>boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;</literal> - to always track the latest compatible kernel with a given - version of zfs. - </para> - </listitem> - <listitem> - <para> - Nginx will use the value of - <literal>sslTrustedCertificate</literal> if provided for a - virtual host, even if <literal>enableACME</literal> is set. - This is useful for providers not using the same certificate to - sign OCSP responses and server certificates. - </para> - </listitem> - <listitem> - <para> - <literal>lib.formats.yaml</literal>’s - <literal>generate</literal> will not generate JSON anymore, - but instead use more of the YAML-specific syntax. - </para> - </listitem> - <listitem> - <para> - MariaDB was upgraded from 10.5.x to 10.6.x. Please read the - <link xlink:href="https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/">upstream - release notes</link> for changes and upgrade instructions. - </para> - </listitem> - <listitem> - <para> - The MariaDB C client library, also known as libmysqlclient or - mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While - this should hopefully not have any impact, this upgrade comes - with some changes to default behavior, so you might want to - review the - <link xlink:href="https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/">upstream - release notes</link>. - </para> - </listitem> - <listitem> - <para> - GNOME desktop environment now enables - <literal>QGnomePlatform</literal> as the Qt platform theme, - which should avoid crashes when opening file chooser dialogs - in Qt apps by using XDG desktop portal. Additionally, it will - make the apps fit better visually. - </para> - </listitem> - <listitem> - <para> - <literal>rofi</literal> has been updated from - <quote>1.6.1</quote> to <quote>1.7.0</quote>, one important - thing is the removal of the old xresources based configuration - setup. Read more - <link xlink:href="https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1">in - rofi’s changelog</link>. - </para> - </listitem> - <listitem> - <para> - ipfs now defaults to not listening on you local network. This - setting was change as server providers won’t accept port - scanning on their private network. If you have several ipfs - instances running on a network you own, feel free to change - the setting <literal>ipfs.localDiscovery = true;</literal>. - localDiscovery enables different instances to discover each - other and share data. - </para> - </listitem> - <listitem> - <para> - <literal>lua</literal> and <literal>luajit</literal> - interpreters have been patched to avoid looking into /usr/lib - directories, thus increasing the purity of the build. - </para> - </listitem> - <listitem> - <para> - Three new options, - <link linkend="opt-xdg.mime.addedAssociations">xdg.mime.addedAssociations</link>, - <link linkend="opt-xdg.mime.defaultApplications">xdg.mime.defaultApplications</link>, - and - <link linkend="opt-xdg.mime.removedAssociations">xdg.mime.removedAssociations</link> - have been added to the - <link linkend="opt-xdg.mime.enable">xdg.mime</link> module to - allow the configuration of - <literal>/etc/xdg/mimeapps.list</literal>. - </para> - </listitem> - <listitem> - <para> - Kopia was upgraded from 0.8.x to 0.9.x. Please read the - <link xlink:href="https://github.com/kopia/kopia/releases/tag/v0.9.0">upstream - release notes</link> for changes and upgrade instructions. - </para> - </listitem> - <listitem> - <para> - The <literal>systemd.network</literal> module has gained - support for the FooOverUDP link type. - </para> - </listitem> - <listitem> - <para> - The <literal>networking</literal> module has a new - <literal>networking.fooOverUDP</literal> option to configure - Foo-over-UDP encapsulations. - </para> - </listitem> - <listitem> - <para> - <literal>networking.sits</literal> now supports Foo-over-UDP - encapsulation. - </para> - </listitem> - <listitem> - <para> - The <literal>virtualisation.libvirtd</literal> module has been - refactored and updated with new options: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>virtualisation.libvirtd.qemu*</literal> options - (e.g.: - <literal>virtualisation.libvirtd.qemuRunAsRoot</literal>) - were moved to - <link xlink:href="options.html#opt-virtualisation.libvirtd.qemu"><literal>virtualisation.libvirtd.qemu</literal></link> - submodule, - </para> - </listitem> - <listitem> - <para> - software TPM1/TPM2 support (e.g.: Windows 11 guests) - (<link xlink:href="options.html#opt-virtualisation.libvirtd.qemu.swtpm"><literal>virtualisation.libvirtd.qemu.swtpm</literal></link>), - </para> - </listitem> - <listitem> - <para> - custom OVMF package (e.g.: - <literal>pkgs.OVMFFull</literal> with HTTP, CSM and Secure - Boot support) - (<link xlink:href="options.html#opt-virtualisation.libvirtd.qemu.ovmf.package"><literal>virtualisation.libvirtd.qemu.ovmf.package</literal></link>). - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>cawbird</literal> Twitter client now uses its own - API keys to count as different application than upstream - builds. This is done to evade application-level rate limiting. - While existing accounts continue to work, users may want to - remove and re-register their account in the client to enjoy a - better user experience and benefit from this change. - </para> - </listitem> - <listitem> - <para> - A new option - <literal>services.prometheus.enableReload</literal> has been - added which can be enabled to reload the prometheus service - when its config file changes instead of restarting. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.prometheus.environmentFile</literal> has - been removed since it was causing - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/126083">issues</link> - and Prometheus now has native support for secret files, i.e. - <literal>basic_auth.password_file</literal> and - <literal>authorization.credentials_file</literal>. - </para> - </listitem> - <listitem> - <para> - Dokuwiki now supports caddy! However - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - the nginx option has been removed, in the new - configuration, please use the - <literal>dokuwiki.webserver = "nginx"</literal> - instead. - </para> - </listitem> - <listitem> - <para> - The <quote>${hostname}</quote> option has been deprecated, - please use - <literal>dokuwiki.sites = [ "${hostname}" ]</literal> - instead - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The - <link xlink:href="options.html#opt-services.unifi.enable">services.unifi</link> - module has been reworked, solving a number of issues. This - leads to several user facing changes: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - The <literal>services.unifi.dataDir</literal> option is - removed and the data is now always located under - <literal>/var/lib/unifi/data</literal>. This is done to - make better use of systemd state direcotiry and thus - making the service restart more reliable. - </para> - </listitem> - <listitem> - <para> - The unifi logs can now be found under: - <literal>/var/log/unifi</literal> instead of - <literal>/var/lib/unifi/logs</literal>. - </para> - </listitem> - <listitem> - <para> - The unifi run directory can now be found under: - <literal>/run/unifi</literal> instead of - <literal>/var/lib/unifi/run</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>security.pam.services.<name>.makeHomeDir</literal> - now uses <literal>umask=0077</literal> instead of - <literal>umask=0022</literal> when creating the home - directory. - </para> - </listitem> - <listitem> - <para> - Loki has had another release. Some default values have been - changed for the configuration and some configuration options - have been renamed. For more details, please check - <link xlink:href="https://grafana.com/docs/loki/latest/upgrading/#240">the - upgrade guide</link>. - </para> - </listitem> - <listitem> - <para> - <literal>julia</literal> now refers to - <literal>julia-stable</literal> instead of - <literal>julia-lts</literal>. In practice this means it has - been upgraded from <literal>1.0.4</literal> to - <literal>1.5.4</literal>. - </para> - </listitem> - <listitem> - <para> - RetroArch has been upgraded from version - <literal>1.8.5</literal> to <literal>1.9.13.2</literal>. Since - the previous release was quite old, if you’re having issues - after the upgrade, please delete your - <literal>$XDG_CONFIG_HOME/retroarch/retroarch.cfg</literal> - file. - </para> - </listitem> - <listitem> - <para> - hydrus has been upgraded from version <literal>438</literal> - to <literal>463</literal>. Since upgrading between releases - this old is advised against, be sure to have a backup of your - data before upgrading. For details, see - <link xlink:href="https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates">the - hydrus manual</link>. - </para> - </listitem> - <listitem> - <para> - More jdk and jre versions are now exposed via - <literal>java-packages.compiler</literal>. - </para> - </listitem> - <listitem> - <para> - The sets <literal>haskell.packages</literal> and - <literal>haskell.compiler</literal> now contain for every ghc - version an attribute with the minor version dropped. E.g. for - <literal>ghc8107</literal> there also now exists - <literal>ghc810</literal>. Those attributes point to the same - compilers and packagesets but have the advantage that e.g. - <literal>ghc92</literal> stays stable when we update from - <literal>ghc925</literal> to <literal>ghc926</literal>. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 64217c53c3b8d..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ /dev/null @@ -1,2840 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-22.05"> - <title>Release 22.05 (“Quokka”, 2022.05/30)</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - Support is planned until the end of December 2022, handing over - to 22.11. - </para> - </listitem> - </itemizedlist> - <section xml:id="sec-release-22.05-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Nix has been updated from 2.3 to 2.8. This mainly brings - experimental support for Flakes, but also marks the - <literal>nix</literal> 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 - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html">nix-2.4</link>, - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html">nix-2.5</link>, - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html">nix-2.6</link>, - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html">nix-2.7</link> - and - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.8.html">nix-2.8</link> - </para> - </listitem> - <listitem> - <para> - The <literal>firefox</literal> browser on - <literal>x86_64-linux</literal> now makes use of - profile-guided optimisation, resulting in a much more - responsive browsing experience. - </para> - </listitem> - <listitem> - <para> - GNOME has been upgraded to 42. Please take a look at their - <link xlink:href="https://release.gnome.org/42/">Release - Notes</link> for details. In particular, it replaces gedit - with GNOME Text Editor, GNOME Terminal with GNOME Console - (formerly King’s Cross) and GNOME Screenshot by a tool - integrated into the Shell. - </para> - </listitem> - <listitem> - <para> - PHP 8.1 is now available. - </para> - </listitem> - <listitem> - <para> - systemd services can now set - <link linkend="opt-systemd.services">systemd.services.<name>.reloadTriggers</link> - instead of <literal>reloadIfChanged</literal> for a more - granular distinction between reloads and restarts. - </para> - </listitem> - <listitem> - <para> - Systemd has been upgraded to the version 250. - </para> - </listitem> - <listitem> - <para> - Pulseaudio has been updated to version 15.0 and now optionally - <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters">supports - additional Bluetooth audio codecs</link> such as aptX or LDAC, - with codec switching available in - <literal>pavucontrol</literal>. This feature is disabled by - default, but can be enabled with the option - <literal>hardware.pulseaudio.package = pkgs.pulseaudioFull;</literal>. - Existing third-party modules that offered similar functions, - such as <literal>pulseaudio-modules-bt</literal> or - <literal>pulseaudio-hsphfpd</literal>, are obsolete and have - been removed. - </para> - </listitem> - <listitem> - <para> - PostgreSQL now defaults to major version 14. - </para> - </listitem> - <listitem> - <para> - Module authors can use - <literal>mkRenamedOptionModuleWith</literal> to automate the - deprecation cycle without annoying out-of-tree module authors - and their users. - </para> - </listitem> - <listitem> - <para> - The default GHC version has been updated from 8.10.7 to 9.0.2. - <literal>pkgs.haskellPackages</literal> and - <literal>pkgs.ghc</literal> will now use this version by - default. - </para> - </listitem> - <listitem> - <para> - The GNOME and Plasma installation CDs now use - <literal>pkgs.calamares</literal> and - <literal>pkgs.calamares-nixos-extensions</literal> to allow - users to easily install and set up NixOS with a GUI. - </para> - </listitem> - <listitem> - <para> - <literal>security.acme.defaults</literal> has been added to - simplify the configuration of settings for many certificates - at once. This also opens up the option to use DNS-01 - validation when using <literal>enableACME</literal> web server - virtual hosts (e.g. - <literal>services.nginx.virtualHosts.*.enableACME</literal>). - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.05-new-services"> - <title>New Services</title> - <itemizedlist> - <listitem> - <para> - <link xlink:href="https://1password.com/">1password</link>, - command-lines and graphic interface for 1Password. Available - as - <link linkend="opt-programs._1password.enable">programs._1password</link> - and - <link linkend="opt-programs._1password.enable">programs._1password-gui</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw">aesmd</link>, - the Intel SGX Architectural Enclave Service Manager. Available - as - <link linkend="opt-services.aesmd.enable">services.aesmd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/mbrubeck/agate">agate</link>, - a very simple server for the Gemini hypertext protocol. - Available as - <link linkend="opt-services.agate.enable">services.agate</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/linux-apfs/linux-apfs-rw">apfs</link>, - a kernel module for mounting the Apple File System (APFS). - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://gitlab.com/DarkElvenAngel/argononed">argonone</link>, - a replacement daemon for the Raspberry Pi Argon One power - button and cooler. Available at - <link xlink:href="options.html#opt-services.hardware.argonone.enable">services.hardware.argonone</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/JustArchiNET/ArchiSteamFarm">ArchiSteamFarm</link>, - a C# application with primary purpose of idling Steam cards - from multiple accounts simultaneously. Available as - <link linkend="opt-services.archisteamfarm.enable">services.archisteamfarm</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://loic-sharma.github.io/BaGet/">BaGet</link>, - a lightweight NuGet and symbol server. Available at - <link linkend="opt-services.baget.enable">services.baget</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/xddxdd/bird-lg-go">bird-lg</link>, - a BGP looking glass for Bird Routing. Available as - <link linkend="opt-services.bird-lg.package">services.bird-lg</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://0xerr0r.github.io/blocky/">blocky</link>, - fast and lightweight DNS proxy as ad-blocker for local network - with many features. Available as - <link linkend="opt-services.blocky.enable">services.blocky</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/kissgyorgy/cloudflare-dyndns">cloudflare-dyndns</link>, - CloudFlare Dynamic DNS client. Available as - <link linkend="opt-services.cloudflare-dyndns.enable">services.cloudflare-dyndns</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://corosync.github.io/corosync/">Corosync</link> - and - <link xlink:href="https://clusterlabs.org/pacemaker/">Pacemaker</link>, - A open-source high availability resource manager. Available as - <link linkend="opt-services.corosync.enable">services.corosync</link> - and - <link linkend="opt-services.pacemaker.enable">services.pacemaker</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/lakinduakash/linux-wifi-hotspot">create_ap</link>, - a module for creating wifi hotspots using the program - linux-wifi-hotspot. Available as - <link linkend="opt-services.create_ap.enable">services.create_ap</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.envoyproxy.io/">Envoy</link>, a - high-performance reverse proxy. Available as - <link linkend="opt-services.envoy.enable">services.envoy</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://ergo.chat">ergochat</link>, a modern - IRC with IRCv3 features. Available as - <link linkend="opt-services.ergochat.enable">services.ergochat</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>, - an online collaborative spreadsheet. Available as - <link linkend="opt-services.ethercalc.enable">services.ethercalc</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html">filebeat</link>, - a lightweight shipper for forwarding and centralizing log - data. Available as - <link linkend="opt-services.filebeat.enable">services.filebeat</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://frrouting.org/">FRRouting</link>, a - popular suite of Internet routing protocol daemons (BGP, BFD, - OSPF, IS-IS, VRRP and others). Available as - <link linkend="opt-services.frr.babel.enable">services.frr</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://grafana.com/oss/mimir/">Grafana - Mimir</link>, an open source, horizontally scalable, highly - available, multi-tenant, long-term storage for Prometheus. - Available as - <link linkend="opt-services.mimir.enable">services.mimir</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://hastebin.com/about.md">Haste</link>, - a pastebin written in node.js. Available as - <link linkend="opt-services.haste-server.enable">services.haste</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/juanfont/headscale">headscale</link>, - an Open Source implementation of the - <link xlink:href="https://tailscale.io">Tailscale</link> - Control Server. Available as - <link linkend="opt-services.headscale.enable">services.headscale</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/hifi/heisenbridge">heisenbridge</link>, - a bouncer-style Matrix IRC bridge. Available as - <link linkend="opt-services.heisenbridge.enable">services.heisenbridge</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/aarond10/https_dns_proxy">https-dns-proxy</link>, - DNS to DNS over HTTPS (DoH) proxy. Available as - <link linkend="opt-services.https-dns-proxy.enable">services.https-dns-proxy</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/sezanzeb/input-remapper">input-remapper</link>, - an easy to use tool to change the mapping of your input device - buttons. Available at - <link linkend="opt-services.input-remapper.enable">services.input-remapper</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://invoiceplane.com">InvoicePlane</link>, - web application for managing and creating invoices. Available - at - <link linkend="opt-services.invoiceplane.sites._name_.enable">services.invoiceplane</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://userbase.kde.org/K3b">k3b</link>, - the KDE disk burning application. Available as - <link linkend="opt-programs.k3b.enable">programs.k3b</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.scorchworks.com/K40whisperer/k40whisperer.html">K40-Whisperer</link>, - a program to control cheap Chinese laser cutters. Available as - <link linkend="opt-programs.k40-whisperer.enable">programs.k40-whisperer.enable</link>. - Users must add themselves to the <literal>k40</literal> group - to be able to access the device. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://kanidm.github.io/kanidm/stable/">kanidm</link>, - an identity management server written in Rust. Available as - <link linkend="opt-services.kanidm.enableServer">services.kanidm</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://maddy.email/">Maddy</link>, a free - an open source mail server. Available as - <link linkend="opt-services.maddy.enable">services.maddy</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://conduit.rs/">matrix-conduit</link>, - a simple, fast and reliable chat server powered by matrix. - Available as - <link xlink:href="option.html#opt-services.matrix-conduit.enable">services.matrix-conduit</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://moosefs.com">Moosefs</link>, fault - tolerant petabyte distributed file system. Available as - <link linkend="opt-services.moosefs.master.enable">moosefs</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/mozilla-mobile/mozilla-vpn-client">mozillavpn</link>, - the client for the - <link xlink:href="https://vpn.mozilla.org/">Mozilla VPN</link> - service. Available as - <link linkend="opt-services.mozillavpn.enable">services.mozillavpn</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/mgumz/mtr-exporter">mtr-exporter</link>, - a Prometheus exporter for mtr metrics. Available as - <link linkend="opt-services.mtr-exporter.enable">services.mtr-exporter</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://nbd.sourceforge.io/">nbd</link>, a - Network Block Device server. Available as - <link linkend="opt-services.nbd.server.enable">services.nbd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/netbox-community/netbox">netbox</link>, - infrastructure resource modeling (IRM) tool. Available as - <link linkend="opt-services.netbox.enable">services.netbox</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/vvilhonen/nethoscope">nethoscope</link>, - listen to your network traffic. Available as - <link linkend="opt-programs.nethoscope.enable">programs.nethoscope</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://nifi.apache.org">nifi</link>, an - easy to use, powerful, and reliable system to process and - distribute data. Available as - <link linkend="opt-services.nifi.enable">services.nifi</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/Mic92/nix-ld">nix-ld</link>, - Run unpatched dynamic binaries on NixOS. Available as - <link linkend="opt-programs.nix-ld.enable">programs.nix-ld</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="http://www.nncpgo.org">NNCP</link>, NNCP - (Node to Node copy) utilities and configuration, Available as - <link linkend="opt-programs.nncp.enable">programs.nncp</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/postgres/pgadmin4">pgadmin4</link>, - an admin interface for the PostgreSQL database. Available at - <link linkend="opt-services.pgadmin.enable">services.pgadmin</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/ngoduykhanh/PowerDNS-Admin">PowerDNS-Admin</link>, - a web interface for the PowerDNS server. Available at - <link linkend="opt-services.powerdns-admin.enable">services.powerdns-admin</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/prometheus-pve/prometheus-pve-exporter">prometheus-pve-exporter</link>, - a tool that exposes information from the Proxmox VE API for - use by Prometheus. Available as - <link linkend="opt-services.prometheus.exporters.pve.enable">services.prometheus.exporters.pve</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/ThomasLeister/prosody-filer">prosody-filer</link>, - a server for handling XMPP HTTP Upload requests. Available at - <link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://public-inbox.org">Public - Inbox</link>, an <quote>archives first</quote> approach to - mailing lists. Available as - <link linkend="opt-services.public-inbox.enable">services.public-inbox</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/fleaz/r53-ddns">r53-ddns</link>, - a small tool to run your own DDNS service via AWS Route53. - Available as - <link linkend="opt-services.r53-ddns.enable">services.r53-ddns</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://ddvk.github.io/rmfakecloud/">rmfakecloud</link>, - a clone of the cloud sync the remarkable tablet. Available as - <link linkend="opt-services.rmfakecloud.enable">services.rmfakecloud</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://docs.docker.com/engine/security/rootless/">rootless - Docker</link>, a <literal>systemd --user</literal> Docker - service which runs without root permissions. Available as - <link linkend="opt-virtualisation.docker.rootless.enable">virtualisation.docker.rootless.enable</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.rstudio.com/products/rstudio/#rstudio-server">rstudio-server</link>, - a browser-based version of the RStudio IDE for the R - programming language. Available as - <link linkend="opt-services.rstudio-server.enable">services.rstudio-server</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/aler9/rtsp-simple-server">rtsp-simple-server</link>, - ready-to-use RTSP / RTMP / HLS server and proxy that allows to - read, publish and proxy video and audio streams. Available as - <link linkend="opt-services.rtsp-simple-server.enable">services.rtsp-simple-server</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://snipeitapp.com">Snipe-IT</link>, a - free open source IT asset/license management system. Available - as - <link linkend="opt-services.snipe-it.enable">services.snipe-it</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://snowflake.torproject.org/">snowflake-proxy</link>, - a system to defeat internet censorship. Available as - <link linkend="opt-services.snowflake-proxy.enable">services.snowflake-proxy</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://sslmate.com/">sslmate-agent</link>, - a daemon for managing SSL/TLS certificates on a server. - Available as - <link xlink:href="services.sslmate-agent.enable">services.sslmate-agent</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://starship.rs">starship</link>, a - minimal, blazing-fast, and infinitely customizable prompt for - any shell. Available at - <link linkend="opt-programs.starship.enable">programs.startship</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/rfjakob/systembus-notify">systembus-notify</link>, - allow system level notifications to reach the users. Available - as - <link xlink:href="opt-services.systembus-notify.enable">services.systembus-notify</link>. - Please keep in mind that this service should only be enabled - on machines with fully trusted users, as any local user is - able to DoS user sessions by spamming notifications. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://goteleport.com">teleport</link>, - allows engineers and security professionals to unify access - for SSH servers, Kubernetes clusters, web applications, and - databases across all environments. Available at - <link linkend="opt-services.teleport.enable">services.teleport</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://tetrd.app">tetrd</link>, share your - internet connection from your device to your PC and vice versa - through a USB cable. Available at - <link linkend="opt-services.tetrd.enable">services.tetrd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://upterm.dev">uptermd</link>, an - open-source solution for sharing terminal sessions instantly - over the public internet via secure tunnels. Available at - <link linkend="opt-services.uptermd.enable">services.uptermd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/darrylb123/usbrelay">usbrelayd</link>, - an USB Relay MQTT daemon. Available as - <link linkend="opt-services.usbrelayd.enable">services.usbrelayd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/miquels/webdav-server-rs">webdav-server-rs</link>, - Webdav server in rust. Available as - <link linkend="opt-services.webdav-server-rs.enable">services.webdav-server-rs</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/gin66/wg_netmanager">wg-netmanager</link>, - the Wireguard network manager. Available as - <link linkend="opt-services.wg-netmanager.enable">services.wg-netmanager</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://zammad.org/">Zammad</link>, a - web-based, open source user support/ticketing solution. - Available as - <link linkend="opt-services.zammad.enable">services.zammad</link>. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.05-incompatibilities"> - <title>Backward Incompatibilities</title> - <itemizedlist> - <listitem> - <para> - <literal>pkgs.ghc</literal> now refers to - <literal>pkgs.targetPackages.haskellPackages.ghc</literal>. - This <emphasis>only</emphasis> makes a difference if you are - cross-compiling and will ensure that - <literal>pkgs.ghc</literal> always runs on the host platform - and compiles for the target platform (similar to - <literal>pkgs.gcc</literal> for example). - <literal>haskellPackages.ghc</literal> still behaves as - before, running on the build platform and compiling for the - host platform (similar to <literal>stdenv.cc</literal>). This - means you don’t have to adjust your derivations if you use - <literal>haskellPackages.callPackage</literal>, but when using - <literal>pkgs.callPackage</literal> and taking - <literal>ghc</literal> as an input, you should now use - <literal>buildPackages.ghc</literal> instead to ensure cross - compilation keeps working (or switch to - <literal>haskellPackages.callPackage</literal>). - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.ghc.withPackages</literal> as well as - <literal>haskellPackages.ghcWithPackages</literal> etc. now - needs be overridden directly, as opposed to overriding the - result of calling it. Additionally, the - <literal>withLLVM</literal> parameter has been renamed to - <literal>useLLVM</literal>. So instead of - <literal>(ghc.withPackages (p: [])).override { withLLVM = true; }</literal>, - one needs to use - <literal>(ghc.withPackages.override { useLLVM = true; }) (p: [])</literal>. - </para> - </listitem> - <listitem> - <para> - The update of the haskell package set brings with it a new - version of the <literal>xmonad</literal> module, which will - break your configuration if you use <literal>launch</literal> - as entrypoint. The example code the corresponding nixos module - was adjusted, you may want to have a look at it. - </para> - </listitem> - <listitem> - <para> - The <literal>home-assistant</literal> module now requires - users that don’t want their configuration to be managed - declaratively to set - <literal>services.home-assistant.config = null;</literal>. - This is required due to the way default settings are handled - with the new settings style. - </para> - <para> - Additionally the default list of - <literal>extraComponents</literal> now includes the minimal - dependencies to successfully complete the - <link xlink:href="https://www.home-assistant.io/getting-started/onboarding/">onboarding</link> - procedure. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.emacsPackages.orgPackages</literal> is removed - because org elpa is deprecated. The packages in the top level - of <literal>pkgs.emacsPackages</literal>, such as org and - org-contrib, refer to the ones in - <literal>pkgs.emacsPackages.elpaPackages</literal> and - <literal>pkgs.emacsPackages.nongnuPackages</literal> where the - new versions will release. - </para> - </listitem> - <listitem> - <para> - The configuration and state directories used by - <literal>nixos-containers</literal> have been moved from - <literal>/etc/containers</literal> and - <literal>/var/lib/containers</literal> to - <literal>/etc/nixos-containers</literal> and - <literal>/var/lib/nixos-containers</literal>. - </para> - <para> - If you are changing <literal>system.stateVersion</literal> to - <literal>"22.05"</literal> manually on an existing - system you are responsible for migrating these directories - yourself. - </para> - <para> - This is to improve compatibility with - <literal>libcontainer</literal> based software such as Podman - and Skopeo which assumes they have ownership over - <literal>/etc/containers</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>lib.systems.supported</literal> has been removed, as - it was overengineered for determining the systems to support - in the nixpkgs flake. The list of systems exposed by the - nixpkgs flake can now be accessed as - <literal>lib.systems.flakeExposed</literal>. - </para> - </listitem> - <listitem> - <para> - For new installations - <literal>virtualisation.oci-containers.backend</literal> is - now set to <literal>podman</literal> by default. If you still - want to use Docker on systems where - <literal>system.stateVersion</literal> is set to to - <literal>"22.05"</literal> set - <literal>virtualisation.oci-containers.backend = "docker";</literal>.Old - systems with older <literal>stateVersion</literal>s stay with - <quote>docker</quote>. - </para> - </listitem> - <listitem> - <para> - <literal>security.klogd</literal> was removed. Logging of - kernel messages is handled by systemd since Linux 3.5. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.ssmtp</literal> has been dropped due to the - program being unmaintained. <literal>pkgs.msmtp</literal> can - be used instead as a substitute <literal>sendmail</literal> - implementation. The corresponding options - <literal>services.ssmtp.*</literal> have been removed as well. - <literal>programs.msmtp.*</literal> can be used instead for an - equivalent setup. For example: - </para> - <programlisting language="nix"> -{ - # Original ssmtp configuration: - services.ssmtp = { - enable = true; - useTLS = true; - useSTARTTLS = true; - hostName = "smtp.example:587"; - authUser = "someone"; - authPassFile = "/secrets/password.txt"; - }; - - # Equivalent msmtp configuration: - programs.msmtp = { - enable = true; - accounts.default = { - tls = true; - tls_starttls = true; - auth = true; - host = "smtp.example"; - port = 587; - user = "someone"; - passwordeval = "cat /secrets/password.txt"; - }; - }; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>services.kubernetes.addons.dashboard</literal> was - removed due to it being an outdated version. - </para> - </listitem> - <listitem> - <para> - <literal>services.kubernetes.scheduler.{port,address}</literal> - now set <literal>--secure-port</literal> and - <literal>--bind-address</literal> instead of - <literal>--port</literal> and <literal>--address</literal>, - since the former have been deprecated and are no longer - functional in kubernetes>=1.23. Ensure that you are not - relying on the insecure behaviour before upgrading. - </para> - </listitem> - <listitem> - <para> - In the PowerDNS Recursor module - (<literal>services.pdns-recursor</literal>), default values of - several IP address-related NixOS options have been updated to - match the default upstream behavior. In particular, Recursor - by default will: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - listen on (and allows connections from) both IPv4 and IPv6 - addresses - (<literal>services.pdns-recursor.dns.address</literal>, - <literal>services.pdns-recursor.dns.allowFrom</literal>); - </para> - </listitem> - <listitem> - <para> - allow only local connections to the REST API server - (<literal>services.pdns-recursor.api.allowFrom</literal>). - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - In the ncdns module, the default value of - <literal>services.ncdns.address</literal> has been changed to - the IPv6 loopback address (<literal>::1</literal>). - </para> - </listitem> - <listitem> - <para> - <literal>openldap</literal> (and therefore the slapd LDAP - server) were updated to version 2.6.2. The project introduced - backwards-incompatible changes, namely the removal of the bdb, - hdb, ndb, and shell backends in slapd. Therefore before - updating, dump your database <literal>slapcat -n 1</literal> - in LDIF format, and reimport it after updating your - <literal>services.openldap.settings</literal>, which - represents your <literal>cn=config</literal>. - </para> - <para> - Additionally with 2.5 the argon2 module was included in the - standard distrubtion and renamed from - <literal>pw-argon2</literal> to <literal>argon2</literal>. - Remember to update your <literal>olcModuleLoad</literal> entry - in <literal>cn=config</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>openssh</literal> has been update to 8.9p1, changing - the FIDO security key middleware interface. - </para> - </listitem> - <listitem> - <para> - <literal>git</literal> no longer hardcodes the path to - openssh’ ssh binary to reduce the amount of rebuilds. If you - are using git with ssh remotes and do not have a ssh binary in - your enviroment consider adding <literal>openssh</literal> to - it or switching to <literal>gitFull</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.k3s.enable</literal> no longer implies - <literal>systemd.enableUnifiedCgroupHierarchy = false</literal>, - and will default to the <quote>systemd</quote> cgroup driver - when using <literal>services.k3s.docker = true</literal>. This - change may require a reboot to take effect, and k3s may not be - able to run if the boot cgroup hierarchy does not match its - configuration. The previous behavior may be retained by - explicitly setting - <literal>systemd.enableUnifiedCgroupHierarchy = false</literal> - in your configuration. - </para> - </listitem> - <listitem> - <para> - <literal>fonts.fonts</literal> no longer includes ancient - bitmap fonts when both - <literal>config.services.xserver.enable</literal> and - <literal>config.nixpkgs.config.allowUnfree</literal> are - enabled. If you still want these fonts, use: - </para> - <programlisting language="nix"> -{ - fonts.fonts = [ - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.xorg.fontbh100dpi - ]; -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>services.prometheus.alertManagerTimeout</literal> has - been removed as it has been deprecated upstream and has no - effect. - </para> - </listitem> - <listitem> - <para> - The DHCP server (<literal>services.dhcpd4</literal>, - <literal>services.dhcpd6</literal>) has been hardened. The - service is now using the systemd’s - <literal>DynamicUser</literal> mechanism to run as an - unprivileged dynamically-allocated user with limited - capabilities. The dhcpd state files are now always stored in - <literal>/var/lib/dhcpd{4,6}</literal> and the - <literal>services.dhcpd4.stateDir</literal> and - <literal>service.dhcpd6.stateDir</literal> options have been - removed. If you were depending on root privileges or - set{uid,gid,cap} binaries in dhcpd shell hooks, you may give - dhcpd more capabilities with e.g. - <literal>systemd.services.dhcpd6.serviceConfig.AmbientCapabilities</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>mailpile</literal> email webclient - (<literal>services.mailpile</literal>) has been removed due to - its reliance on python2. - </para> - </listitem> - <listitem> - <para> - <literal>services.ipfs.extraFlags</literal> is now escaped - with <literal>utils.escapeSystemdExecArgs</literal>. If you - rely on systemd interpolating <literal>extraFlags</literal> in - the service <literal>ExecStart</literal>, this will no longer - work. - </para> - </listitem> - <listitem> - <para> - <literal>hbase</literal> version 0.98.24 has been removed. The - package now defaults to version 2.4.11. Versions 1.7.1 and - 3.0.0-alpha-2 are also available. - </para> - </listitem> - <listitem> - <para> - <literal>services.paperless-ng</literal> was renamed to - <literal>services.paperless</literal>. Accordingly, the - <literal>paperless-ng-manage</literal> script (located in - <literal>dataDir</literal>) was renamed to - <literal>paperless-manage</literal>. - <literal>services.paperless</literal> now uses - <literal>paperless-ngx</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>matrix-synapse</literal> service - (<literal>services.matrix-synapse</literal>) has been - converted to use the <literal>settings</literal> option - defined in RFC42. This means that options that are part of - your <literal>homeserver.yaml</literal> configuration, and - that were specified at the top-level of the module - (<literal>services.matrix-synapse</literal>) now need to be - moved into - <literal>services.matrix-synapse.settings</literal>. And while - not all options you may use are defined in there, they are - still supported, because you can set arbitrary values in this - freeform type. - </para> - <para> - The <literal>listeners.*.bind_address</literal> option was - renamed to <literal>bind_addresses</literal> in order to match - the upstream <literal>homeserver.yaml</literal> option name. - It is now also a list of strings instead of a string. - </para> - <para> - An example to make the required migration clearer: - </para> - <para> - Before: - </para> - <programlisting language="nix"> -{ - services.matrix-synapse = { - enable = true; - - server_name = "example.com"; - public_baseurl = "https://example.com:8448"; - - enable_registration = false; - registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; - macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; - - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - - listeners = [ { - port = 8448; - bind_address = ""; - type = "http"; - tls = true; - resources = [ { - names = [ "client" ]; - compress = true; - } { - names = [ "federation" ]; - compress = false; - } ]; - } ]; - - }; -} -</programlisting> - <para> - After: - </para> - <programlisting language="nix"> -{ - services.matrix-synapse = { - enable = true; - - # this attribute set holds all values that go into your homeserver.yaml configuration - # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for - # possible values. - settings = { - server_name = "example.com"; - public_baseurl = "https://example.com:8448"; - - enable_registration = false; - # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead - - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; - - listeners = [ { - port = 8448; - bind_addresses = [ - "::" - "0.0.0.0" - ]; - type = "http"; - tls = true; - resources = [ { - names = [ "client" ]; - compress = true; - } { - names = [ "federation" ]; - compress = false; - } ]; - } ]; - }; - - extraConfigFiles = [ - "/run/keys/matrix-synapse/secrets.yaml" - ]; - }; -} -</programlisting> - <para> - The secrets in your original config should be migrated into a - YAML file that is included via - <literal>extraConfigFiles</literal>. The filename must be - quoted to prevent nix from copying it to the (world readable) - store. - </para> - <para> - Additionally a few option defaults have been synced up with - upstream default values, for example the - <literal>max_upload_size</literal> grew from - <literal>10M</literal> to <literal>50M</literal>. For the same - reason, the default <literal>media_store_path</literal> was - changed from <literal>${dataDir}/media</literal> to - <literal>${dataDir}/media_store</literal> if - <literal>system.stateVersion</literal> is at least - <literal>22.05</literal>. Files will need to be manually moved - to the new location if the <literal>stateVersion</literal> is - updated. - </para> - <para> - As of Synapse 1.58.0, the old groups/communities feature has - been disabled by default. It will be completely removed with - Synapse 1.61.0. - </para> - </listitem> - <listitem> - <para> - The Keycloak package (<literal>pkgs.keycloak</literal>) has - been switched from the Wildfly version, which will soon be - deprecated, to the Quarkus based version. The Keycloak service - (<literal>services.keycloak</literal>) has been updated to - accommodate the change and now differs from the previous - version in a few ways: - </para> - <itemizedlist> - <listitem> - <para> - <literal>services.keycloak.extraConfig</literal> has been - removed in favor of the new - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">settings-style</link> - <link linkend="opt-services.keycloak.settings"><literal>services.keycloak.settings</literal></link> - option. The available options correspond directly to - parameters in <literal>conf/keycloak.conf</literal>. Some - of the most important parameters are documented as - suboptions, the rest can be found in the - <link xlink:href="https://www.keycloak.org/server/all-config">All - configuration section of the Keycloak Server Installation - and Configuration Guide</link>. While the new - configuration is much simpler and cleaner than the old - JBoss CLI one, this unfortunately mean that there’s no - straightforward way to convert an old configuration to the - new format and some settings may not even be available - anymore. - </para> - </listitem> - <listitem> - <para> - <literal>services.keycloak.frontendUrl</literal> was - removed and the frontend URL is now configured through the - <literal>hostname</literal> family of settings in - <link linkend="opt-services.keycloak.settings"><literal>services.keycloak.settings</literal></link> - instead. See the - <link xlink:href="https://www.keycloak.org/server/hostname">Hostname - section of the Keycloak Server Installation and - Configuration Guide</link> for more details. Additionally, - <literal>/auth</literal> was removed from the default - context path and needs to be added back in - <link linkend="opt-services.keycloak.settings.http-relative-path"><literal>services.keycloak.settings.http-relative-path</literal></link> - if you want to keep compatibility with your current - clients. - </para> - </listitem> - <listitem> - <para> - <literal>services.keycloak.bindAddress</literal>, - <literal>services.keycloak.forceBackendUrlToFrontendUrl</literal>, - <literal>services.keycloak.httpPort</literal> and - <literal>services.keycloak.httpsPort</literal> have been - removed in favor of their equivalent options in - <link linkend="opt-services.keycloak.settings"><literal>services.keycloak.settings</literal></link>. - <literal>httpPort</literal> and - <literal>httpsPort</literal> have additionally had their - types changed from <literal>str</literal> to - <literal>port</literal>. - </para> - <para> - The new names are as follows: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>bindAddress</literal>: - <link linkend="opt-services.keycloak.settings.http-host"><literal>services.keycloak.settings.http-host</literal></link> - </para> - </listitem> - <listitem> - <para> - <literal>forceBackendUrlToFrontendUrl</literal>: - <link linkend="opt-services.keycloak.settings.hostname-strict-backchannel"><literal>services.keycloak.settings.hostname-strict-backchannel</literal></link> - </para> - </listitem> - <listitem> - <para> - <literal>httpPort</literal>: - <link linkend="opt-services.keycloak.settings.http-port"><literal>services.keycloak.settings.http-port</literal></link> - </para> - </listitem> - <listitem> - <para> - <literal>httpsPort</literal>: - <link linkend="opt-services.keycloak.settings.https-port"><literal>services.keycloak.settings.https-port</literal></link> - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - <para> - For example, when using a reverse proxy the migration could - look like this: - </para> - <para> - Before: - </para> - <programlisting language="nix"> - services.keycloak = { - enable = true; - httpPort = "8080"; - frontendUrl = "https://keycloak.example.com/auth"; - database.passwordFile = "/run/keys/db_password"; - extraConfig = { - "subsystem=undertow"."server=default-server"."http-listener=default".proxy-address-forwarding = true; - }; - }; -</programlisting> - <para> - After: - </para> - <programlisting language="nix"> - services.keycloak = { - enable = true; - settings = { - http-port = 8080; - hostname = "keycloak.example.com"; - http-relative-path = "/auth"; - proxy = "edge"; - }; - database.passwordFile = "/run/keys/db_password"; - }; -</programlisting> - </listitem> - <listitem> - <para> - The MoinMoin wiki engine - (<literal>services.moinmoin</literal>) has been removed, - because Python 2 is being retired from nixpkgs. - </para> - </listitem> - <listitem> - <para> - Services in the <literal>hadoop</literal> module previously - set <literal>openFirewall</literal> to true by default. This - has now been changed to false. Node definitions for multi-node - clusters would need <literal>openFirewall = true;</literal> to - be added to to hadoop services when upgrading from NixOS - 21.11. - </para> - </listitem> - <listitem> - <para> - <literal>services.hadoop.yarn.nodemanager</literal> now uses - cgroup-based CPU limit enforcement by default. Additionally, - the option <literal>useCGroups</literal> was added to - nodemanagers as an easy way to switch back to the old - behavior. - </para> - </listitem> - <listitem> - <para> - The <literal>wafHook</literal> hook now honors - <literal>NIX_BUILD_CORES</literal> when - <literal>enableParallelBuilding</literal> is not set - explicitly. Packages can restore the old behaviour by setting - <literal>enableParallelBuilding=false</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.claws-mail-gtk2</literal>, representing Claws - Mail’s older release version three, was removed in order to - get rid of Python 2. Please switch to - <literal>claws-mail</literal>, which is Claws Mail’s latest - release based on GTK+3 and Python 3. - </para> - </listitem> - <listitem> - <para> - The <literal>writers.writePython2</literal> and corresponding - <literal>writers.writePython2Bin</literal> convenience - functions to create executable Python 2 scripts in the store - were removed in preparation of removal of the Python 2 - interpreter. Scripts have to be converted to Python 3 for use - with <literal>writers.writePython3</literal> or - <literal>writers.writePyPy2</literal> needs to be used. - </para> - </listitem> - <listitem> - <para> - <literal>buildGoModule</literal> was updated to use - <literal>go_1_17</literal>, third party derivations that - specify >= go 1.17 in the main <literal>go.mod</literal> - will need to regenerate their <literal>vendorSha256</literal> - hash. - </para> - </listitem> - <listitem> - <para> - The <literal>gnome-passwordsafe</literal> package updated to - <link xlink:href="https://gitlab.gnome.org/World/secrets/-/tags/6.0">version - 6.x</link> and renamed to <literal>gnome-secrets</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.gnome.experimental-features.realtime-scheduling</literal> - option has been removed, as GNOME Shell now - <link xlink:href="https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060">uses - rtkit</link>. Use - <literal>security.rtkit.enable = true;</literal> instead. As - before, you will need to have it enabled using GSettings. - </para> - </listitem> - <listitem> - <para> - <literal>services.telepathy</literal> will no longer be - enabled by default for GNOME desktops, one should enable it in - their configs if using Empathy or Polari. - </para> - </listitem> - <listitem> - <para> - If you previously used - <literal>/etc/docker/daemon.json</literal>, you need to - incorporate the changes into the new option - <literal>virtualisation.docker.daemon.settings</literal>. - </para> - </listitem> - <listitem> - <para> - Ntopng (<literal>services.ntopng</literal>) is updated to - 5.2.1 and uses a separate Redis instance if - <literal>system.stateVersion</literal> is at least - <literal>22.05</literal>. Existing setups shouldn’t be - affected. - </para> - </listitem> - <listitem> - <para> - The backward compatibility in - <literal>services.wordpress</literal> to configure sites with - the old interface has been removed. Please use - <literal>services.wordpress.sites</literal> instead. - </para> - </listitem> - <listitem> - <para> - The backward compatibility in - <literal>services.dokuwiki</literal> to configure sites with - the old interface has been removed. Please use - <literal>services.dokuwiki.sites</literal> instead. - </para> - </listitem> - <listitem> - <para> - opensmtpd-extras is no longer build with python2 scripting - support due to python2 deprecation in nixpkgs - </para> - </listitem> - <listitem> - <para> - <literal>services.miniflux.adminCredentialFiles</literal> is - now required, instead of defaulting to - <literal>admin</literal> and <literal>password</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>taskserver</literal> module no longer implicitly - opens ports in the firewall configuration. This is now - controlled through the option - <literal>services.taskserver.openFirewall</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>autorestic</literal> package has been upgraded - from 1.3.0 to 1.5.0 which introduces breaking changes in - config file, check - <link xlink:href="https://autorestic.vercel.app/migration/1.4_1.5">their - migration guide</link> for more details. - </para> - </listitem> - <listitem> - <para> - <literal>teleport</literal> has been upgraded to major version - 9. Please see upstream - <link xlink:href="https://goteleport.com/docs/setup/operations/upgrading/">upgrade - instructions</link> and - <link xlink:href="https://goteleport.com/docs/changelog/#900">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - For <literal>pkgs.python3.pkgs.ipython</literal>, its direct - dependency - <literal>pkgs.python3.pkgs.matplotlib-inline</literal> (which - is really an adapter to integrate matplotlib in ipython if it - is installed) does not depend on - <literal>pkgs.python3.pkgs.matplotlib</literal> anymore. This - is closer to a non-Nix install of ipython. This has the added - benefit to reduce the closure size of - <literal>ipython</literal> from ~400MB to ~160MB (including - ~100MB for python itself). - </para> - </listitem> - <listitem> - <para> - <literal>documentation.man</literal> has been refactored to - support choosing a man implementation other than GNU’s - <literal>man-db</literal>. For this, - <literal>documentation.man.manualPages</literal> has been - renamed to - <literal>documentation.man.man-db.manualPages</literal>. If - you want to use the new alternative man implementation - <literal>mandoc</literal>, add - <literal>documentation.man = { enable = true; man-db.enable = false; mandoc.enable = true; }</literal> - to your configuration. - </para> - </listitem> - <listitem> - <para> - Normal users (with <literal>isNormalUser = true</literal>) - which have non-empty <literal>subUidRanges</literal> or - <literal>subGidRanges</literal> set no longer have additional - implicit ranges allocated. To enable automatic allocation back - set <literal>autoSubUidGidRange = true</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>idris2</literal> now requires - <literal>--package</literal> when using packages - <literal>contrib</literal> and <literal>network</literal>, - while previously these idris2 packages were automatically - loaded. - </para> - </listitem> - <listitem> - <para> - The iputils package, which is installed by default, no longer - provides the legacy tools <literal>tftpd</literal> and - <literal>traceroute6</literal>. More tools - (<literal>ninfod</literal>, <literal>rarpd</literal>, and - <literal>rdisc</literal>) are going to be removed in the next - release. See - <link xlink:href="https://github.com/iputils/iputils/releases/tag/20211215">upstream’s - release notes</link> for more details and available - replacements. - </para> - </listitem> - <listitem> - <para> - <literal>services.thelounge.private</literal> was removed in - favor of <literal>services.thelounge.public</literal>, to - follow with upstream changes. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.docbookrx</literal> was removed since it’s - unmaintained - </para> - </listitem> - <listitem> - <para> - <literal>pkgs._7zz</literal> is now correctly licensed as - LGPL3+ and BSD3 with optional unfree unRAR licensed code - </para> - </listitem> - <listitem> - <para> - The <literal>vim.customize</literal> function produced by - <literal>vimUtils.makeCustomizable</literal> now has a - slightly different interface: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - The wrapper now includes everything in the given Vim - derivation if <literal>name</literal> is - <literal>"vim"</literal> (the default). This - makes the <literal>wrapManual</literal> argument obsolete, - but this behavior can be overridden by setting the - <literal>standalone</literal> argument. - </para> - </listitem> - <listitem> - <para> - All the executables present in the given derivation (or, - in <literal>standalone</literal> mode, only the - <literal>*vim</literal> ones) are wrapped. This makes the - <literal>wrapGui</literal> argument obsolete. - </para> - </listitem> - <listitem> - <para> - The <literal>vimExecutableName</literal> and - <literal>gvimExecutableName</literal> arguments were - replaced by a single <literal>executableName</literal> - argument in which the shell variable - <literal>$exe</literal> can be used to refer to the - wrapped executable’s name. - </para> - </listitem> - </itemizedlist> - <para> - See the comments in - <literal>pkgs/applications/editors/vim/plugins/vim-utils.nix</literal> - for more details. - </para> - <para> - <literal>vimUtils.vimWithRC</literal> was removed. You should - instead use <literal>customize</literal> on a Vim derivation, - which now accepts <literal>vimrcFile</literal> and - <literal>gvimrcFile</literal> arguments. - </para> - </listitem> - <listitem> - <para> - <literal>tilp2</literal> was removed together with its module - </para> - </listitem> - <listitem> - <para> - The F-PROT antivirus (<literal>fprot</literal> package) and - its service module were removed because it reached - <link xlink:href="https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam">end-of-life</link>. - </para> - </listitem> - <listitem> - <para> - <literal>bird1</literal> and its modules - <literal>services.bird</literal> as well as - <literal>services.bird6</literal> have been removed. Upgrade - to <literal>services.bird2</literal>. - </para> - </listitem> - <listitem> - <para> - The options - <literal>networking.interfaces.<name>.ipv4.routes</literal> - and - <literal>networking.interfaces.<name>.ipv6.routes</literal> - are no longer ignored when using networkd instead of the - default scripted network backend by setting - <literal>networking.useNetworkd</literal> to - <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>miller</literal> package has been upgraded from - 5.10.3 to - <link xlink:href="https://github.com/johnkerl/miller/releases/tag/v6.2.0">6.2.0</link>. - See - <link xlink:href="https://miller.readthedocs.io/en/latest/new-in-miller-6">What’s - new in Miller 6</link>. - </para> - </listitem> - <listitem> - <para> - MultiMC has been replaced with the fork PrismLauncher due to - upstream developers being hostile to 3rd party package - maintainers. PrismLauncher removes all MultiMC branding and is - aimed at providing proper 3rd party packages like the one - contained in Nixpkgs. This change affects the data folder - where game instances and other save and configuration files - are stored. Users with existing installations should rename - <literal>~/.local/share/multimc</literal> to - <literal>~/.local/share/PrismLauncher</literal>. The main - config file’s path has also moved from - <literal>~/.local/share/multimc/multimc.cfg</literal> to - <literal>~/.local/share/PrismLauncher/prismlauncher.cfg</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>systemd-nspawn@.service</literal> settings have been - reverted to the default systemd behaviour. User namespaces are - now activated by default. If you want to keep running nspawn - containers without user namespaces you need to set - <literal>systemd.nspawn.<name>.execConfig.PrivateUsers = false</literal> - </para> - </listitem> - <listitem> - <para> - <literal>systemd-shutdown</literal> is now properly linked on - shutdown to unmount all filesystems and device mapper devices - cleanly. This can be disabled using - <literal>systemd.shutdownRamfs.enable</literal>. - </para> - </listitem> - <listitem> - <para> - The Tor SOCKS proxy is now actually disabled if - <literal>services.tor.client.enable</literal> is set to - <literal>false</literal> (the default). If you are using this - functionality but didn’t change the setting or set it to - <literal>false</literal>, you now need to set it to - <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.github-runner</literal> has been hardened. - Notably address families and system calls have been - restricted, which may adversely affect some kinds of testing, - e.g. using <literal>AF_BLUETOOTH</literal> to test bluetooth - devices. - </para> - </listitem> - <listitem> - <para> - The terraform 0.12 compatibility has been removed and the - <literal>terraform.withPlugins</literal> and - <literal>terraform-providers.mkProvider</literal> - implementations simplified. Providers now need to be stored - under - <literal>$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version></literal> - (which mkProvider does). - </para> - <para> - This breaks back-compat so it’s not possible to mix-and-match - with previous versions of nixpkgs. In exchange, it now becomes - possible to use the providers from - <link xlink:href="https://github.com/numtide/nixpkgs-terraform-providers-bin">nixpkgs-terraform-providers-bin</link> - directly. - </para> - </listitem> - <listitem> - <para> - The <literal>dendrite</literal> package has been upgraded from - 0.5.1 to - <link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.5">0.6.5</link>. - Instances configured with split sqlite databases, which has - been the default in NixOS, require merging of the federation - sender and signing key databases. See upstream - <link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.0">release - notes</link> on version 0.6.0 for details on database changes. - </para> - </listitem> - <listitem> - <para> - The existing <literal>pkgs.opentelemetry-collector</literal> - has been moved to - <literal>pkgs.opentelemetry-collector-contrib</literal> to - match the actual source being the <quote>contrib</quote> - edition. <literal>pkgs.opentelemetry-collector</literal> is - now the actual core release of opentelemetry-collector. If you - use the community contributions you should change the package - you refer to. If you don’t need them update your commands from - <literal>otelcontribcol</literal> to - <literal>otelcorecol</literal> and enjoy a 7x smaller binary. - </para> - </listitem> - <listitem> - <para> - <literal>services.zookeeper</literal> has a new option - <literal>jre</literal> for specifying the JRE to start - zookeeper with. It defaults to the JRE that - <literal>pkgs.zookeeper</literal> was wrapped with, instead of - <literal>pkgs.jre</literal>. This changes the JRE to - <literal>pkgs.jdk11_headless</literal> by default. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.pgadmin</literal> now refers to - <literal>pkgs.pgadmin4</literal>. <literal>pgadmin3</literal> - has been removed. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.minetestclient_4</literal> and - <literal>pkgs.minetestserver_4</literal> have been removed, as - the last 4.x release was in 2018. - <literal>pkgs.minetestclient</literal> (equivalent to - <literal>pkgs.minetest</literal> ) and - <literal>pkgs.minetestserver</literal> can be used instead. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.noto-fonts-cjk</literal> is now deprecated in - favor of <literal>pkgs.noto-fonts-cjk-sans</literal> and - <literal>pkgs.noto-fonts-cjk-serif</literal> because they each - have different release schedules. To maintain compatibility - with prior releases of Nixpkgs, - <literal>pkgs.noto-fonts-cjk</literal> is currently an alias - of <literal>pkgs.noto-fonts-cjk-sans</literal> and doesn’t - include serif fonts. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.epgstation</literal> has been upgraded from v1 - to v2, resulting in incompatible changes in the database - scheme and configuration format. - </para> - </listitem> - <listitem> - <para> - Some top-level settings under - <link linkend="opt-services.epgstation.enable">services.epgstation</link> - is now deprecated because it was redudant due to the same - options being present in - <link linkend="opt-services.epgstation.settings">services.epgstation.settings</link>. - </para> - </listitem> - <listitem> - <para> - The option <literal>services.epgstation.basicAuth</literal> - was removed because basic authentication support was dropped - by upstream. - </para> - </listitem> - <listitem> - <para> - The option - <link linkend="opt-services.epgstation.database.passwordFile">services.epgstation.database.passwordFile</link> - no longer has a default value. Make sure to set this option - explicitly before upgrading. Change the database password if - necessary. - </para> - </listitem> - <listitem> - <para> - The - <link linkend="opt-services.epgstation.settings">services.epgstation.settings</link> - option now expects options for <literal>config.yml</literal> - in EPGStation v2. - </para> - </listitem> - <listitem> - <para> - Existing data for the - <link linkend="opt-services.epgstation.enable">services.epgstation</link> - module would have to be backed up prior to the upgrade. To - back up exising data to - <literal>/tmp/epgstation.bak</literal>, run - <literal>sudo -u epgstation epgstation run backup /tmp/epgstation.bak</literal>. - To import that data after to the upgrade, run - <literal>sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak</literal> - </para> - </listitem> - <listitem> - <para> - <literal>switch-to-configuration</literal> (the script that is - run when running <literal>nixos-rebuild switch</literal> for - example) has been reworked - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - The interface that allows activation scripts to restart - units has been streamlined. Restarting and reloading is - now done by a single file - <literal>/run/nixos/activation-restart-list</literal> that - honors <literal>restartIfChanged</literal> and - <literal>reloadIfChanged</literal> of the units. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Preferring to reload instead of restarting can still - be achieved using - <literal>/run/nixos/activation-reload-list</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The script now uses a proper ini-file parser to parse - systemd units. Some values are now only searched in one - section instead of in the entire unit. This is only - relevant for units that don’t use the NixOS systemd moule. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>RefuseManualStop</literal>, - <literal>X-OnlyManualStart</literal>, - <literal>X-StopOnRemoval</literal>, - <literal>X-StopOnReconfiguration</literal> are only - searched in the <literal>[Unit]</literal> section - </para> - </listitem> - <listitem> - <para> - <literal>X-ReloadIfChanged</literal>, - <literal>X-RestartIfChanged</literal>, - <literal>X-StopIfChanged</literal> are only searched - in the <literal>[Service]</literal> section - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>services.bookstack.cacheDir</literal> option has - been removed, since the cache directory is now handled by - systemd. - </para> - </listitem> - <listitem> - <para> - The <literal>services.bookstack.extraConfig</literal> option - has been replaced by - <literal>services.bookstack.config</literal> which implements - a - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">settings-style</link> - configuration. - </para> - </listitem> - <listitem> - <para> - <literal>lib.assertMsg</literal> and - <literal>lib.assertOneOf</literal> no longer return - <literal>false</literal> if the passed condition is - <literal>false</literal>, <literal>throw</literal>ing the - given error message instead (which makes the resulting error - message less cluttered). This will not impact the behaviour of - code using these functions as intended, namely as top-level - wrapper for <literal>assert</literal> conditions. - </para> - </listitem> - <listitem> - <para> - The <literal>vpnc</literal> package has been changed to use - GnuTLS instead of OpenSSL by default for licensing reasons. - </para> - </listitem> - <listitem> - <para> - The default version of <literal>nextcloud</literal> is - <emphasis role="strong">nextcloud24</emphasis>. Please note - that it’s <emphasis role="strong">not</emphasis> possible to - upgrade <literal>nextcloud</literal> across multiple major - versions! This means it’s e.g. not possible to upgrade from - <literal>nextcloud22</literal> to - <literal>nextcloud24</literal> in a single deploy and most - <literal>21.11</literal> users will have to upgrade to - <literal>nextcloud23</literal> first. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to - <link xlink:href="https://github.com/navarasu/onedark.nvim">navarasu/onedark.nvim</link> - (formerly refers to - <link xlink:href="https://github.com/olimorris/onedarkpro.nvim">olimorris/onedarkpro.nvim</link>). - </para> - </listitem> - <listitem> - <para> - <literal>services.pipewire.enable</literal> will default to - enabling the WirePlumber session manager instead of - pipewire-media-session. pipewire-media-session is deprecated - by upstream and not recommended, but can still be manually - enabled by setting - <literal>services.pipewire.media-session.enable</literal> to - <literal>true</literal> and - <literal>services.pipewire.wireplumber.enable</literal> to - <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.makeDesktopItem</literal> has been refactored to - provide a more idiomatic API. Specifically: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - All valid options as of FDO Desktop Entry specification - version 1.4 can now be passed in as explicit arguments - </para> - </listitem> - <listitem> - <para> - <literal>exec</literal> can now be null, for entries that - are not of type Application - </para> - </listitem> - <listitem> - <para> - <literal>mimeType</literal> argument is renamed to - <literal>mimeTypes</literal> for consistency - </para> - </listitem> - <listitem> - <para> - <literal>mimeTypes</literal>, - <literal>categories</literal>, - <literal>implements</literal>, - <literal>keywords</literal>, <literal>onlyShowIn</literal> - and <literal>notShowIn</literal> take lists of strings - instead of one string with semicolon separators - </para> - </listitem> - <listitem> - <para> - <literal>extraDesktopEntries</literal> renamed to - <literal>extraConfig</literal> for consistency - </para> - </listitem> - <listitem> - <para> - Actions should now be provided as an attrset - <literal>actions</literal>, the <literal>Actions</literal> - line will be autogenerated. - </para> - </listitem> - <listitem> - <para> - <literal>extraEntries</literal> is removed. - </para> - </listitem> - <listitem> - <para> - Additional validation is added both at eval time and at - build time. - </para> - </listitem> - </itemizedlist> - <para> - See the <literal>vscode</literal> package for a more detailed - example. - </para> - </listitem> - <listitem> - <para> - Existing <literal>resholve*</literal> functions have been - renamed and nested under <literal>pkgs.resholve</literal>. - Update uses to: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>resholvePackage</literal> -> - <literal>resholve.mkDerivation</literal> - </para> - </listitem> - <listitem> - <para> - <literal>resholveScript</literal> -> - <literal>resholve.writeScript</literal> - </para> - </listitem> - <listitem> - <para> - <literal>resholveScriptBin</literal> -> - <literal>resholve.writeScriptBin</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>pkgs.cosmopolitan</literal> no longer provides the - <literal>cosmoc</literal> command. It has been moved to - <literal>pkgs.cosmoc</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.graalvmXX-ce</literal> packages no longer - provide support for Python/Ruby/WASM, instead focusing only in - Java and Native Image Support. If you need to add support - back, please see the - <literal>pkgs.graalvmCEPackages.mkGraal</literal> function to - create your own customized version of GraalVM with support for - what you need. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.05-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - The option - <link linkend="opt-services.redis.servers">services.redis.servers</link> - was added to support per-application - <literal>redis-server</literal> which is more secure since - Redis databases are only mere key prefixes without any - configuration or ACL of their own. Backward-compatibility is - preserved by mapping old - <literal>services.redis.settings</literal> to - <literal>services.redis.servers."".settings</literal>, - but you are strongly encouraged to name each - <literal>redis-server</literal> instance after the application - using it, instead of keeping that nameless one. Except for the - nameless - <literal>services.redis.servers.""</literal> still - accessible at <literal>127.0.0.1:6379</literal>, and to the - members of the Unix group <literal>redis</literal> through the - Unix socket <literal>/run/redis/redis.sock</literal>, all - other <literal>services.redis.servers.${serverName}</literal> - are only accessible by default to the members of the Unix - group <literal>redis-${serverName}</literal> through the Unix - socket <literal>/run/redis-${serverName}/redis.sock</literal>. - </para> - </listitem> - <listitem> - <para> - The option - <link linkend="opt-virtualisation.vmVariant">virtualisation.vmVariant</link> - was added to allow users to make changes to the - <literal>nixos-rebuild build-vm</literal> configuration that - do not apply to their normal system. - </para> - <para> - The <literal>config.system.build.vm</literal> attribute now - always exists and defaults to the value from - <literal>vmVariant</literal>. Configurations that import the - <literal>virtualisation/qemu-vm.nix</literal> module - themselves will override this value, such that - <literal>vmVariant</literal> is not used. - </para> - <para> - Similarly - <link linkend="opt-virtualisation.vmVariantWithBootLoader">virtualisation.vmVariantWithBootloader</link> - was added. - </para> - </listitem> - <listitem> - <para> - The configuration portion of the <literal>nix-daemon</literal> - module has been reworked and exposed as - <link xlink:href="options.html#opt-nix-settings">nix.settings</link>: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Legacy options have been mapped to the corresponding - options under under - <link xlink:href="options.html#opt-nix.settings">nix.settings</link> - and will be deprecated when NixOS 21.11 reaches end of - life. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="options.html#opt-nix.buildMachines.publicHostKey">nix.buildMachines.publicHostKey</link> - has been added. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <link xlink:href="https://kops.sigs.k8s.io"><literal>kops</literal></link> - defaults to 1.23.2, which will enable - <link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html">Instance - Metadata Service Version 2</link> 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 - <literal>spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS</literal> - has changed from <literal>true</literal> to - <literal>false</literal>. Cilium now has - <literal>disable-cnp-status-updates: true</literal> 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 - <link xlink:href="https://kops.sigs.k8s.io/releases/1.22-notes/">1.22 - release notes</link> and - <link xlink:href="https://kops.sigs.k8s.io/releases/1.23-notes/">1.23 - release notes</link> for more details, including other - significant changes. - </para> - </listitem> - <listitem> - <para> - Mattermost has been upgraded to extended support version 6.3 - as the previously packaged extended support version 5.37 is - <link xlink:href="https://docs.mattermost.com/upgrade/extended-support-release.html">reaching - end of life</link>. Migration may take some time, see the - <link xlink:href="https://docs.mattermost.com/install/self-managed-changelog.html#release-v6-3-extended-support-release">changelog</link> - and - <link xlink:href="https://docs.mattermost.com/upgrade/important-upgrade-notes.html">important - upgrade notes</link>. - </para> - </listitem> - <listitem> - <para> - The - <literal>writers.writePyPy2</literal>/<literal>writers.writePyPy3</literal> - and corresponding - <literal>writers.writePyPy2Bin</literal>/<literal>writers.writePyPy3Bin</literal> - convenience functions to create executable Python 2/3 scripts - using the PyPy interpreter were added. - </para> - </listitem> - <listitem> - <para> - Some improvements have been made to the - <literal>hadoop</literal> module: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - A <literal>gatewayRole</literal> option has been added, - for deploying hadoop cluster configuration files to a node - that does not have any active services - </para> - </listitem> - <listitem> - <para> - Support for older versions of hadoop have been added to - the module - </para> - </listitem> - <listitem> - <para> - Overriding and extending site XML files has been made - easier - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The auto-upgrade service now accepts persistent (default: - true) parameter. 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. - </para> - </listitem> - <listitem> - <para> - Mastodon now uses <literal>services.redis.servers</literal> to - start a new redis server, instead of using a global redis - server. This improves compatibility with other services that - use redis. - </para> - <para> - Note that this will recreate the redis database, although - according to the - <link xlink:href="https://docs.joinmastodon.org/admin/backups/">Mastodon - docs</link>, this is almost harmless: - </para> - <blockquote> - <para> - 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. - </para> - </blockquote> - <para> - If you do want to save the redis database, you can use the - following commands: - </para> - <programlisting language="bash"> -redis-cli save -cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb" -</programlisting> - </listitem> - <listitem> - <para> - Peertube 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. - </para> - <para> - Redis database is used for storage only cache and job queue. - More information can be found here - - <link xlink:href="https://docs.joinpeertube.org/contribute-architecture">Peertube - architecture</link>. - </para> - <para> - If you do want to save the redis database, you can use the - following commands before upgrade OS: - </para> - <programlisting language="bash"> -redis-cli save -sudo mkdir /var/lib/redis-peertube -sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb -</programlisting> - </listitem> - <listitem> - <para> - Added the <literal>keter</literal> NixOS module. Keter reverse - proxies requests to your loaded application based on virtual - hostnames. - </para> - </listitem> - <listitem> - <para> - If you are using Wayland you can choose to use the Ozone - Wayland support in Chrome and several Electron apps by setting - the environment variable <literal>NIXOS_OZONE_WL=1</literal> - (for example via - <literal>environment.sessionVariables.NIXOS_OZONE_WL = "1"</literal>). - This is not enabled by default because Ozone Wayland is still - under heavy development and behavior is not always flawless. - Furthermore, not all Electron apps use the latest Electron - versions. - </para> - </listitem> - <listitem> - <para> - A new option group - <literal>systemd.network.wait-online</literal> was added, with - options to configure - <literal>systemd-networkd-wait-online.service</literal>: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>anyInterface</literal> allows specifying that the - network should be considered online when <emphasis>at - least one</emphasis> interface is online (useful on - laptops) - </para> - </listitem> - <listitem> - <para> - <literal>timeout</literal> defines how long to wait for - the network to come online - </para> - </listitem> - <listitem> - <para> - <literal>extraArgs</literal> for everything else - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>influxdb2</literal> package was split into - <literal>influxdb2-server</literal> and - <literal>influxdb2-cli</literal>, matching the split that took - place upstream. A combined <literal>influxdb2</literal> - package is still provided in this release for backwards - compatibilty, but will be removed at a later date. - </para> - </listitem> - <listitem> - <para> - The <literal>unifi</literal> package was switched from - <literal>unifi6</literal> to <literal>unifi7</literal>. Direct - downgrades from Unifi 7 to Unifi 6 are not possible and - require restoring from a backup made by Unifi 6. - </para> - </listitem> - <listitem> - <para> - <literal>programs.zsh.autosuggestions.strategy</literal> now - takes a list of strings instead of a string. - </para> - </listitem> - <listitem> - <para> - The <literal>asterisk</literal> and - <literal>asterisk-stable</literal> packages were switched from - <literal>asterisk_18</literal> to the newly-packaged - <literal>asterisk_19</literal>. Asterisk 13 and 17 have been - removed as they have reached their end of life. - </para> - </listitem> - <listitem> - <para> - The <literal>services.unifi.openPorts</literal> option default - value of <literal>true</literal> is now deprecated and will be - changed to <literal>false</literal> in 22.11. Configurations - using this default will print a warning when rebuilt. - </para> - </listitem> - <listitem> - <para> - The <literal>services.unifi-video.openPorts</literal> option - default value of <literal>true</literal> is now deprecated and - will be changed to <literal>false</literal> in 22.11. - Configurations using this default will print a warning when - rebuilt. - </para> - </listitem> - <listitem> - <para> - <literal>security.acme</literal> certificates will now - correctly check for CA revokation before reaching their - minimum age. - </para> - </listitem> - <listitem> - <para> - Removing domains from - <literal>security.acme.certs._name_.extraDomainNames</literal> - will now correctly remove those domains during rebuild/renew. - </para> - </listitem> - <listitem> - <para> - MariaDB is now offered in several versions, not just the - newest one. So if you have a need for running MariaDB 10.4 for - example, you can now just set - <literal>services.mysql.package = pkgs.mariadb_104;</literal>. - In general, it is recommended to run the newest version, to - get the newest features, while sticking with an LTS version - will most likely provide a more stable experience. Sometimes - software is also incompatible with the newest version of - MariaDB. - </para> - </listitem> - <listitem> - <para> - The option - <link linkend="opt-programs.ssh.enableAskPassword">programs.ssh.enableAskPassword</link> - was added, decoupling the setting of - <literal>SSH_ASKPASS</literal> from - <literal>services.xserver.enable</literal>. This allows easy - usage in non-X11 environments, e.g. Wayland. - </para> - </listitem> - <listitem> - <para> - <link linkend="opt-programs.ssh.knownHosts">programs.ssh.knownHosts</link> - has gained an <literal>extraHostNames</literal> option to - augment <literal>hostNames</literal>. It is now possible to - use the attribute name of a <literal>knownHosts</literal> - entry as the primary host name and specify secondary host - names using <literal>extraHostNames</literal> without having - to duplicate the primary host name. - </para> - </listitem> - <listitem> - <para> - The <literal>services.stubby</literal> module was converted to - a - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">settings-style</link> - configuration. - </para> - </listitem> - <listitem> - <para> - The option - <link linkend="opt-services.xserver.desktopManager.runXdgAutostartIfNone">services.xserver.desktopManager.runXdgAutostartIfNone</link> - was added in order to automatically run XDG autostart files - for sessions without a desktop manager. This replaces helpers - like the <literal>dex</literal> package. - </para> - </listitem> - <listitem> - <para> - When setting - <link linkend="opt-i18n.inputMethod.enabled">i18n.inputMethod.enabled</link> - to <literal>fcitx5</literal>, it no longer creates - corresponding systemd user services. It now relies on XDG - autostart files to start and work properly in your desktop - sessions. If you are using only a window manager without a - desktop manager, you need to enable - <literal>services.xserver.desktopManager.runXdgAutostartIfNone</literal> - or using the <literal>dex</literal> package to make - <literal>fcitx5</literal> work. - </para> - </listitem> - <listitem> - <para> - The option <literal>services.duplicati.dataDir</literal> has - been added to allow changing the location of duplicati’s - files. - </para> - </listitem> - <listitem> - <para> - The options <literal>boot.extraModprobeConfig</literal> and - <literal>boot.blacklistedKernelModules</literal> now also take - effect in the initrd by copying the file - <literal>/etc/modprobe.d/nixos.conf</literal> into the initrd. - </para> - </listitem> - <listitem> - <para> - <literal>nixos-generate-config</literal> now puts the dhcp - configuration in <literal>hardware-configuration.nix</literal> - instead of <literal>configuration.nix</literal>. - </para> - </listitem> - <listitem> - <para> - ORY Kratos was updated to version 0.9.0-alpha.3, which - introduces some breaking changes: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - All endpoints at the Admin API are now exposed at - <literal>/admin/</literal>. For example, endpoint - <literal>https://kratos:4434/identities</literal> is now - exposed at - <literal>https://kratos:4434/admin/identities</literal> - </para> - </listitem> - <listitem> - <para> - Configuration key - <literal>selfservice.whitelisted_return_urls</literal> has - been renamed to <literal>allowed_return_urls</literal> - </para> - </listitem> - <listitem> - <para> - The <literal>password_identifier</literal> form field of - the password login strategy has been renamed to - <literal>identifier</literal> to make compatibility with - passwordless flows possible. - </para> - </listitem> - <listitem> - <para> - Instead of having a global - <literal>default_schema_url</literal> which developers - used to update their schema, you now need to define the - <literal>default_schema_id</literal> which must reference - schema ID in your config. - </para> - </listitem> - <listitem> - <para> - Calling <literal>/self-service/recovery</literal> without - flow ID or with an invalid flow ID while authenticated - will now respond with an error instead of redirecting to - the default page. - </para> - </listitem> - <listitem> - <para> - If you are relying on the SQLite images, update your - Docker Pull commands as follows: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>docker pull oryd/kratos:{version}</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Additionally, all passwords now have to be at least 8 - characters long. - </para> - </listitem> - <listitem> - <para> - For more details, see: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1">Release - Notes for v0.8.1-alpha-1</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1">Release - Notes for v0.8.2-alpha-1</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.1">Release - Notes for v0.9.0-alpha-1</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.3">Release - Notes for v0.9.0-alpha-3</link> - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>fetchFromSourcehut</literal> now allows fetching - repositories recursively using <literal>fetchgit</literal> or - <literal>fetchhg</literal> if the argument - <literal>fetchSubmodules</literal> is set to - <literal>true</literal>. - </para> - </listitem> - <listitem> - <para> - A module for declarative configuration of openconnect VPN - profiles was added under - <literal>networking.openconnect</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>element-desktop</literal> package now has an - <literal>useKeytar</literal> option (defaults to - <literal>true</literal>), which allows disabling - <literal>keytar</literal> and in turn - <literal>libsecret</literal> usage (which binds to native - credential managers / keychain libraries). - </para> - </listitem> - <listitem> - <para> - The option <literal>services.thelounge.plugins</literal> has - been added to allow installing plugins for The Lounge. Plugins - can be found in - <literal>pkgs.theLoungePlugins.plugins</literal> and - <literal>pkgs.theLoungePlugins.themes</literal>. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.xserver.videoDriver = [ "nvidia" ];</literal> - will now also install - <link xlink:href="https://github.com/elFarto/nvidia-vaapi-driver">nvidia - VA-API drivers</link> by default. - </para> - </listitem> - <listitem> - <para> - The <literal>firmwareLinuxNonfree</literal> package has been - renamed to <literal>linux-firmware</literal>. - </para> - </listitem> - <listitem> - <para> - It is now possible to specify wordlists to include as handy to - access environment variables using the - <literal>config.environment.wordlist</literal> configuration - options. - </para> - </listitem> - <listitem> - <para> - The <literal>services.mbpfan</literal> module was converted to - a - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link> configuration. - </para> - </listitem> - <listitem> - <para> - The default value for - <literal>programs.spacefm.settings.graphical_su</literal> got - unset. It previously pointed to <literal>gksu</literal> which - has been removed. - </para> - </listitem> - <listitem> - <para> - The <link xlink:href="https://dino.im">Dino</link> XMPP client - was updated to 0.3, adding support for audio and video calls. - </para> - </listitem> - <listitem> - <para> - <literal>services.mattermost.plugins</literal> has been added - to allow the declarative installation of Mattermost plugins. - Plugins are automatically repackaged using autoPatchelf. - </para> - </listitem> - <listitem> - <para> - <link linkend="opt-services.logrotate.enable">services.logrotate.enable</link> - now defaults to true if any rotate path has been defined, and - some paths have been added by default. - </para> - </listitem> - <listitem> - <para> - The logrotate module also has been updated to freeform syntax: - <literal>services.logrotate.paths</literal> and - <literal>services.logrotate.extraConfig</literal> will work, - but issue deprecation warnings and - <link linkend="opt-services.logrotate.settings">services.logrotate.settings</link> - should now be used instead. - </para> - </listitem> - <listitem> - <para> - <literal>security.pam.ussh</literal> has been added, which - allows authorizing PAM sessions based on SSH - <emphasis>certificates</emphasis> held within an SSH agent, - using - <link xlink:href="https://github.com/uber/pam-ussh">pam-ussh</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>vscode-extensions.ionide.ionide-fsharp</literal> - package has been updated to 6.0.0 and now requires .NET 6.0. - </para> - </listitem> - <listitem> - <para> - The <literal>phpPackages.box</literal> package has been - updated from 2.7.5 to 3.16.0. See the - <link xlink:href="https://github.com/box-project/box/blob/master/UPGRADE.md#from-27-to-30">upgrade - guide</link> for more details. - </para> - </listitem> - <listitem> - <para> - The <literal>zrepl</literal> package has been updated from - 0.4.0 to 0.5: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - The RPC protocol version was bumped; all zrepl daemons in - a setup must be updated and restarted before replication - can resume. - </para> - </listitem> - <listitem> - <para> - A bug involving encrypt-on-receive has been fixed. Read - the - <link xlink:href="https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder">zrepl - documentation</link> and check the output of - <literal>zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS</literal> - on the receiver. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>polybar</literal> package has been updated from - 3.5.7 to 3.6.2. See - <link xlink:href="https://github.com/polybar/polybar/releases/tag/3.6.0">the - changelog</link> for more details. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Breaking changes include changes to escaping rules in - configuration values, changes in behavior when - encountering invalid tag names, and changes to - inter-process-messaging (IPC). - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Renamed option - <literal>services.openssh.challengeResponseAuthentication</literal> - to - <literal>services.openssh.kbdInteractiveAuthentication</literal>. - Reason is that the old name has been deprecated upstream. - Using the old option name will still work, but produce a - warning. - </para> - </listitem> - <listitem> - <para> - <literal>services.autorandr</literal> now allows for adding - hooks and profiles declaratively. - </para> - </listitem> - <listitem> - <para> - The <literal>pomerium-cli</literal> command has been moved out - of the <literal>pomerium</literal> package into the - <literal>pomerium-cli</literal> package, following upstream’s - repository split. If you are using the - <literal>pomerium-cli</literal> command, you should now - install the <literal>pomerium-cli</literal> package. - </para> - </listitem> - <listitem> - <para> - The option - <link linkend="opt-networking.networkmanager.enableFccUnlock">services.networking.networkmanager.enableFccUnlock</link> - was added to support FCC unlock procedures. Since release - 1.18.4, the ModemManager daemon no longer automatically - performs the FCC unlock procedure by default. See - <link xlink:href="https://modemmanager.org/docs/modemmanager/fcc-unlock/">the - docs</link> for more details. - </para> - </listitem> - <listitem> - <para> - <literal>programs.tmux</literal> has a new option - <literal>plugins</literal> that accepts a list of packages - from the <literal>tmuxPlugins</literal> group. The specified - packages are added to the system and loaded by - <literal>tmux</literal>. - </para> - </listitem> - <listitem> - <para> - The polkit service, available at - <literal>security.polkit.enable</literal>, is now disabled by - default. It will automatically be enabled through services and - desktop environments as needed. - </para> - </listitem> - <listitem> - <para> - <literal>mercury</literal> was updated to 22.01.1, which has - some breaking changes - (<link xlink:href="https://dl.mercurylang.org/release/release-notes-22.01.html">Mercury - 22.01 news</link>). - </para> - </listitem> - <listitem> - <para> - xfsprogs was update to version 5.15, which enables inobtcount - and bigtime by default on filesystem creation. Support for - these features was added in kernel 5.10 and deemed stable in - kernel 5.15. If you want to be able to mount XFS filesystems - created with this release of xfsprogs on kernel releases older - than 5.10, you need to format them with - <literal>mkfs.xfs -m bigtime=0 -m inobtcount=0</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.xserver.desktopManager.xfce</literal> now - includes Xfce’s screen locker, - <literal>xfce4-screensaver</literal> that is enabled by - default. You can disable it by setting - <literal>false</literal> to - <link linkend="opt-services.xserver.desktopManager.xfce.enableScreensaver">services.xserver.desktopManager.xfce.enableScreensaver</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>hadoop</literal> package has added support for - <literal>aarch64-linux</literal> and - <literal>aarch64-darwin</literal> as of 3.3.1 - (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>). - </para> - </listitem> - <listitem> - <para> - The <literal>R</literal> package now builds again on - <literal>aarch64-darwin</literal> - (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>). - </para> - </listitem> - <listitem> - <para> - The <literal>nss</literal> package was split into - <literal>nss_esr</literal> and <literal>nss_latest</literal>, - with <literal>nss</literal> being an alias for - <literal>nss_esr</literal>. This was done to ease maintenance - of <literal>nss</literal> and dependent high-profile packages - like <literal>firefox</literal>. - </para> - </listitem> - <listitem> - <para> - The default <literal>scribus</literal> version is now 1.5, - while version 1.4 is still available as - <literal>scribus_1_4</literal> - (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/172700">#172700</link>). - </para> - </listitem> - <listitem> - <para> - The Nextcloud module now supports to create a Mysql database - automatically with - <literal>services.nextcloud.database.createLocally</literal> - enabled. - </para> - </listitem> - <listitem> - <para> - The Nextcloud module now allows setting the value of the - <literal>max-age</literal> directive of the - <literal>Strict-Transport-Security</literal> HTTP header, - which is now controlled by the - <literal>services.nextcloud.https</literal> option, rather - than <literal>services.nginx.recommendedHttpHeaders</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>spark3</literal> package has been updated from - 3.1.2 to 3.2.1 - (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/160075">#160075</link>): - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Testing has been enabled for - <literal>aarch64-linux</literal> in addition to - <literal>x86_64-linux</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>spark3</literal> package is now usable on - <literal>aarch64-darwin</literal> as a result of - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link> - and - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The option <literal>services.snapserver.openFirewall</literal> - will no longer default to <literal>true</literal> starting - with NixOS 22.11. Enable it explicitly if you need to control - Snapserver remotely or connect streamig clients from other - hosts. - </para> - </listitem> - <listitem> - <para> - The option - <link xlink:href="options.html#opt-networking.useDHCP">networking.useDHCP</link> - isn’t deprecated anymore. When using - <link xlink:href="options.html#opt-networking.useNetworkd"><literal>systemd-networkd</literal></link>, - a generic <literal>.network</literal>-unit is added which - enables DHCP for each interface matching - <literal>en*</literal>, <literal>eth*</literal> or - <literal>wl*</literal> with priority 99 (which means that it - doesn’t have any effect if such an interface is matched by a - <literal>.network-</literal>unit with a lower priority). In - case of scripted networking, no behavior was changed. - </para> - </listitem> - <listitem> - <para> - The new - <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook"><literal>postgresqlTestHook</literal></link> - runs a PostgreSQL server for the duration of package checks. - </para> - </listitem> - <listitem> - <para> - <literal>zfs</literal> was updated from 2.1.4 to 2.1.5, - enabling it to be used with Linux kernel 5.18. - </para> - </listitem> - <listitem> - <para> - <literal>stdenv.mkDerivation</literal> now supports a - self-referencing <literal>finalAttrs:</literal> parameter - containing the final <literal>mkDerivation</literal> arguments - including overrides. <literal>drv.overrideAttrs</literal> now - supports two parameters - <literal>finalAttrs: previousAttrs:</literal>. This allows - packaging configuration to be overridden in a consistent - manner by providing an alternative to - <literal>rec {}</literal> syntax. - </para> - <para> - Additionally, <literal>passthru</literal> can now reference - <literal>finalAttrs.finalPackage</literal> containing the - final package, including attributes such as the output paths - and <literal>overrideAttrs</literal>. - </para> - <para> - New language integrations can be simplified by overriding a - <quote>prototype</quote> package containing the - language-specific logic. This removes the need for a extra - layer of overriding for the <quote>generic builder</quote> - arguments, thus removing a usability problem and source of - error. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index 2d7226caa5b56..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ /dev/null @@ -1,1841 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-22.11"> - <title>Release 22.11 (“Raccoon”, 2022.11/30)</title> - <para> - 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. - </para> - <para> - This release is supported until the end of June 2023, handing over - to NixOS 23.05. - </para> - <para> - To upgrade to the latest release follow the - <link linkend="sec-upgrading">upgrade chapter</link>. - </para> - <section xml:id="sec-release-22.11-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - includes the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Software that uses the <literal>crypt</literal> password - hashing API is now using the implementation provided by - <link xlink:href="https://github.com/besser82/libxcrypt"><literal>libxcrypt</literal></link> - instead of glibc’s, which enables support for more secure - algorithms. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Support for algorithms that <literal>libxcrypt</literal> - <link xlink:href="https://github.com/besser82/libxcrypt/blob/v4.4.28/lib/hashes.conf#L41">does - not consider strong</link> are - <emphasis role="strong">deprecated</emphasis> as of this - release, and will be removed in NixOS 23.05. - </para> - </listitem> - <listitem> - <para> - This includes system login passwords. Given this, we - <emphasis role="strong">strongly encourage</emphasis> 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. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - When using - <literal>users.users.<name>.hashedPassword</literal> - to configure user passwords, run - <literal>mkpasswd</literal>, and use the yescrypt hash - that is provided as the new value. - </para> - </listitem> - <listitem> - <para> - On the other hand, for interactively configured user - passwords, simply re-set the passwords for all users - with <literal>passwd</literal>. - </para> - </listitem> - <listitem> - <para> - This release introduces warnings for the use of - deprecated hash algorithms for both methods of - configuring passwords. To make sure you migrated - correctly, run - <literal>nixos-rebuild switch</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - <literal>aarch64-linux</literal> is now included in the - <literal>nixos-22.11</literal> and - <literal>nixos-22.11-small</literal> channels. This means that - when those channel update, both - <literal>x86_64-linux</literal> and - <literal>aarch64-linux</literal> will be available in the - binary cache. - </para> - </listitem> - <listitem> - <para> - <literal>aarch64-linux</literal> ISOs are now available on the - <link xlink:href="https://nixos.org/download.html">downloads - page</link>. - </para> - </listitem> - <listitem> - <para> - <literal>nsncd</literal> is now available as a replacement of - <literal>nscd</literal>. - </para> - <para> - <literal>nscd</literal> is responsible for resolving - hostnames, users and more in NixOS and has been a long - standing source of bugs, such as sporadic network freezes. - </para> - <para> - More context in this - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/135888">issue</link>. - </para> - <para> - Help us test the new implementation by setting - <literal>services.nscd.enableNsncd</literal> to - <literal>true</literal>. - </para> - <para> - We plan to use <literal>nsncd</literal> by default in NixOS - 23.05. - </para> - </listitem> - <listitem> - <para> - Linode cloud images are now supported by importing - <literal>${modulesPath}/virtualisation/linode-image.nix</literal> - and accessing <literal>system.build.linodeImage</literal> on - the output. - </para> - </listitem> - <listitem> - <para> - <literal>hardware.nvidia</literal> has a new option, - <literal>hardware.nvidia.open</literal>, 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 - <link xlink:href="https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/">the - release announcement</link> for more information. - </para> - </listitem> - <listitem> - <para> - The <literal>emacs</literal> package now makes use of native - compilation which means: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - 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; - </para> - </listitem> - <listitem> - <para> - Emacs packages from somewhere else, e.g. - <literal>package-install</literal>, will perform - asynchronously deferred native compilation. If you do not - want this, maybe to avoid CPU consumption for compilation, - you can use - <literal>(setq native-comp-deferred-compilation nil)</literal> - to disable it while still benefiting from native - compilation for packages from Nixpkgs. - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.11-internal"> - <title>Internal changes</title> - <itemizedlist> - <listitem> - <para> - Haskell <literal>ghcWithPackages</literal> is now up to 15 - times faster to evaluate, thanks to changing - <literal>lib.closePropagation</literal> from a quadratic to - linear complexity. Please see backward incompatibilities notes - below. - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/194391">https://github.com/NixOS/nixpkgs/pull/194391</link> - </para> - </listitem> - <listitem> - <para> - For cross-compilation targets that can also run on the - building machine, we now run tests. This, for example, is the - case for the <literal>pkgsStatic</literal> and - <literal>pkgsLLVM</literal> package sets or i686 packages on - <literal>x86_64</literal> machines. - </para> - </listitem> - <listitem> - <para> - To simplify cross-compilation in NixOS, this release - introduces the <literal>nixpkgs.hostPlatform</literal> and - <literal>nixpkgs.buildPlatform</literal> options. These cover - and override the - <literal>nixpkgs.{system,localSystem,crossSystem}</literal> - options. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>hostPlatform</literal> is the platform or - <quote><literal>system</literal></quote> string of the - NixOS system described by the configuration. - </para> - </listitem> - <listitem> - <para> - <literal>buildPlatform</literal> is the platform that is - responsible for building the NixOS configuration. It - defaults to the <literal>hostPlatform</literal>, for a - non-cross build configuration. To cross compile, set - <literal>buildPlatform</literal> to a different value. - </para> - </listitem> - </itemizedlist> - <para> - The new options convey the same information, but with fewer - options, and following the Nixpkgs terminology. - </para> - <para> - The existing options - <literal>nixpkgs.{system,localSystem,crossSystem}</literal> - have not been formally deprecated, to allow for evaluation of - the change and to allow for a transition period so that in - time the ecosystem can switch without breaking compatibility - with any supported NixOS release. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.11-version-updates"> - <title>Notable version updates</title> - <itemizedlist> - <listitem> - <para> - Nix has been upgraded from v2.8.1 to v2.11.0. For more - information, please see the release notes for - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.9.html">2.9</link>, - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.10.html">2.10</link> - and - <link xlink:href="https://nixos.org/manual/nix/stable/release-notes/rl-2.11.html">2.11</link>. - </para> - </listitem> - <listitem> - <para> - OpenSSL now defaults to OpenSSL 3, updated from 1.1.1. - </para> - </listitem> - <listitem> - <para> - GNOME has been upgraded to version 43. Please see the - <link xlink:href="https://release.gnome.org/43/">release - notes</link> for details. - </para> - </listitem> - <listitem> - <para> - KDE Plasma has been upgraded from v5.24 to v5.26. Please see - the release notes for - <link xlink:href="https://kde.org/announcements/plasma/5/5.25.0/">v5.25</link> - and - <link xlink:href="https://kde.org/announcements/plasma/5/5.26.0/">v5.26</link> - for more details on the included changes. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - PHP now defaults to PHP 8.1, updated from 8.0. - </para> - </listitem> - <listitem> - <para> - Perl has been updated to 5.36, and its core module - <literal>HTTP::Tiny</literal> was patched to verify SSL/TLS - certificates by default. - </para> - </listitem> - <listitem> - <para> - Python now defaults to 3.10, updated from 3.9. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.11-incompatibilities"> - <title>Backward Incompatibilities</title> - <itemizedlist> - <listitem> - <para> - Nixpkgs now requires Nix 2.3 or newer. - </para> - </listitem> - <listitem> - <para> - The <literal>isCompatible</literal> predicate checking CPU - compatibility is no longer exposed by the platform sets - generated using <literal>lib.systems.elaborate</literal>. In - most cases you will want to use the new - <literal>canExecute</literal> predicate instead which also - takes the kernel / syscall interface into account. - <literal>lib.systems.parse.isCompatible</literal> still - exists, but has changed semantically: Architectures with - differing endianness modes are <emphasis>no longer considered - compatible</emphasis>. - </para> - </listitem> - <listitem> - <para> - <literal>ngrok</literal> has been upgraded from 2.3.40 to - 3.0.4. Please see - <link xlink:href="https://ngrok.com/docs/guides/upgrade-v2-v3">the - upgrade guide</link> and - <link xlink:href="https://ngrok.com/docs/ngrok-agent/changelog">changelog</link>. - Notably, breaking changes are that the config file format has - changed and support for single hyphen arguments was dropped. - </para> - </listitem> - <listitem> - <para> - <literal>i18n.supportedLocales</literal> is now only generated - with the locales set in <literal>i18n.defaultLocale</literal> - and <literal>i18n.extraLocaleSettings</literal>. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - This reduces the final system closure size by up to 200MB. - </para> - </listitem> - <listitem> - <para> - If you require all locales installed, set the option to - <literal>[ "all" ]</literal>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Deprecated settings <literal>logrotate.paths</literal> and - <literal>logrotate.extraConfig</literal> have been removed. - Please convert any uses to - <link linkend="opt-services.logrotate.settings">services.logrotate.settings</link> - instead. - </para> - </listitem> - <listitem> - <para> - The <literal>isPowerPC</literal> predicate, found on - <literal>platform</literal> attrsets - (<literal>hostPlatform</literal>, - <literal>buildPlatform</literal>, - <literal>targetPlatform</literal>, etc) has been removed in - order to reduce confusion. The predicate was was defined such - that it matches only the 32-bit big-endian members of the - POWER/PowerPC family, despite having a name which would imply - a broader set of systems. If you were using this predicate, - you can replace <literal>foo.isPowerPC</literal> with - <literal>(with foo; isPower && is32bit && isBigEndian)</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>fetchgit</literal> fetcher now uses - <link xlink:href="https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling">cone - mode</link> by default for sparse checkouts. - <link xlink:href="https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems">Non-cone - mode</link> can be enabled by passing - <literal>nonConeMode = true</literal>, but note that non-cone - mode is deprecated and this option may be removed alongside a - future Git update without notice. - </para> - </listitem> - <listitem> - <para> - The <literal>fetchgit</literal> fetcher supports sparse - checkouts via the <literal>sparseCheckout</literal> option. - This used to accept a multi-line string with - directories/patterns to check out, but now requires a list of - strings. - </para> - </listitem> - <listitem> - <para> - <literal>openssh</literal> was updated to version 9.1, - disabling the generation of DSA keys when using - <literal>ssh-keygen -A</literal> as they are insecure. Also, - <literal>SetEnv</literal> directives in - <literal>ssh_config</literal> and - <literal>sshd_config</literal> are now first-match-wins. - </para> - </listitem> - <listitem> - <para> - <literal>bsp-layout</literal> no longer uses the command - <literal>cycle</literal> to switch to other window layouts, as - it got replaced by the commands <literal>previous</literal> - and <literal>next</literal>. - </para> - </listitem> - <listitem> - <para> - The Barco ClickShare driver/client package - <literal>pkgs.clickshare-csc1</literal> and the option - <literal>programs.clickshare-csc1.enable</literal> have been - removed, as it requires <literal>qt4</literal>, which reached - its end-of-life 2015 and will no longer be supported by - nixpkgs. - <link xlink:href="https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units">According - to Barco</link> many of their base unit models can be used - with Google Chrome and the Google Cast extension. - </para> - </listitem> - <listitem> - <para> - <literal>services.hbase</literal> has been renamed to - <literal>services.hbase-standalone</literal>. For production - HBase clusters, use <literal>services.hadoop.hbase</literal> - instead. - </para> - </listitem> - <listitem> - <para> - The <literal>p4</literal> 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 - <literal>p4d</literal>, <literal>p4broker</literal>, and - <literal>p4p</literal>. To install the Helix Core Server - binaries, use the <literal>p4d</literal> package instead. - </para> - </listitem> - <listitem> - <para> - The OpenSSL extension for the PHP interpreter used by - Nextcloud is built against OpenSSL 1.1 if - <xref linkend="opt-system.stateVersion" /> is below - <literal>22.11</literal>. This is to make sure that people - using - <link xlink:href="https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html">server-side - encryption</link> don’t lose access to their files. - </para> - <para> - In any other case, it’s safe to use OpenSSL 3 for PHP’s - OpenSSL extension. This can be done by setting - <xref linkend="opt-services.nextcloud.enableBrokenCiphersForSSE" /> - to <literal>false</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>coq</literal> package and versioned variants - starting at <literal>coq_8_14</literal> no longer include - CoqIDE, which is now available through - <literal>coqPackages.coqide</literal>. It is still possible to - get CoqIDE as part of the <literal>coq</literal> package by - overriding the <literal>buildIde</literal> argument of the - derivation. - </para> - </listitem> - <listitem> - <para> - PHP 7.4 is no longer supported due to upstream not supporting - this version for the entire lifecycle of the 22.11 release. - </para> - </listitem> - <listitem> - <para> - The ipfs package and module were renamed to kubo. The kubo - module now uses an RFC42-style <literal>settings</literal> - option instead of <literal>extraConfig</literal> and the - <literal>gatewayAddress</literal>, - <literal>apiAddress</literal> and - <literal>swarmAddress</literal> options were renamed. Using - the old names will print a warning but still work. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.cosign</literal> does not provide the - <literal>cosigned</literal> binary anymore. The - <literal>sget</literal> binary has been moved into its own - package. - </para> - </listitem> - <listitem> - <para> - 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 - <literal>emacs-gtk</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>kanidm</literal> has been updated to 1.1.0-alpha.10 - and now requires a TLS certificate and key. It will always - start <literal>https</literal> and-–-if enabled-–-an LDAPS - server and no HTTP and LDAP server anymore. - </para> - </listitem> - <listitem> - <para> - riak package removed along with - <literal>services.riak</literal> module, due to lack of - maintainer to update the package. - </para> - </listitem> - <listitem> - <para> - ppd files in <literal>pkgs.cups-drv-rastertosag-gdi</literal> - are now gzipped. If you refer to such a ppd file with its path - (e.g. via - <link xlink:href="options.html#opt-hardware.printers.ensurePrinters">hardware.printers.ensurePrinters</link>) - you will need to append <literal>.gz</literal> to the path. - </para> - </listitem> - <listitem> - <para> - xow package removed along with the - <literal>hardware.xow</literal> module, due to the project - being deprecated in favor of <literal>xone</literal>, which is - available via the <literal>hardware.xone</literal> module. - </para> - </listitem> - <listitem> - <para> - dd-agent package removed along with the - <literal>services.dd-agent</literal> module, due to the - project being deprecated in favor of - <literal>datadog-agent</literal>, which is available via the - <literal>services.datadog-agent</literal> module. - </para> - </listitem> - <listitem> - <para> - <literal>teleport</literal> has been upgraded to major version - 10. Please see upstream - <link xlink:href="https://goteleport.com/docs/ver/10.0/management/operations/upgrading/">upgrade - instructions</link> and - <link xlink:href="https://goteleport.com/docs/ver/10.0/changelog/#1000">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - <literal>lib.closePropagation</literal> now needs that all - gathered sets have an <literal>outPath</literal> attribute. - </para> - </listitem> - <listitem> - <para> - lemmy module option - <literal>services.lemmy.settings.database.createLocally</literal> - moved to - <literal>services.lemmy.database.createLocally</literal>. - </para> - </listitem> - <listitem> - <para> - virtlyst package and <literal>services.virtlyst</literal> - module removed, due to lack of maintainers. - </para> - </listitem> - <listitem> - <para> - The <literal>nix.checkConfig</literal> option now fully - disables the config check. The new - <literal>nix.checkAllErrors</literal> option behaves like - <literal>nix.checkConfig</literal> previously did. - </para> - </listitem> - <listitem> - <para> - <literal>generateOptparseApplicativeCompletions</literal> and - <literal>generateOptparseApplicativeCompletion</literal> from - <literal>haskell.lib.compose</literal> (and - <literal>haskell.lib</literal>) have been deprecated in favor - of <literal>generateOptparseApplicativeCompletions</literal> - (plural!) as provided by the haskell package sets (so - <literal>haskellPackages.generateOptparseApplicativeCompletions</literal> - etc.). The latter allows for cross-compilation (by - automatically disabling generation of completion in the cross - case). For it to work properly you need to make sure that the - function comes from the same context as the package you are - trying to override, i.e. always use the same package set as - your package is coming from or – even better – use - <literal>self.generateOptparseApplicativeCompletions</literal> - if you are overriding a haskell package set. The old functions - are retained for backwards compatibility, but yield are - warning. - </para> - </listitem> - <listitem> - <para> - The <literal>services.graphite.api</literal> and - <literal>services.graphite.beacon</literal> NixOS options, and - the <literal>python3.pkgs.graphite_api</literal>, - <literal>python3.pkgs.graphite_beacon</literal> and - <literal>python3.pkgs.influxgraph</literal> packages, have - been removed due to lack of upstream maintenance. - </para> - </listitem> - <listitem> - <para> - The <literal>trace</literal> binary from - <literal>perf-linux</literal> package has been removed, due to - being a duplicate of the <literal>perf</literal> binary. - </para> - </listitem> - <listitem> - <para> - The <literal>aws</literal> package has been removed due to - being abandoned by the upstream. It is recommended to use - <literal>awscli</literal> or <literal>awscli2</literal> - instead. - </para> - </listitem> - <listitem> - <para> - The - <link xlink:href="https://ce-programming.github.io/CEmu">CEmu - TI-84 Plus CE emulator</link> package has been renamed to - <literal>cemu-ti</literal>. The - <link xlink:href="https://cemu.info">Cemu Wii U - emulator</link> is now packaged as <literal>cemu</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>systemd-networkd</literal> v250 deprecated, renamed, - and moved some sections and settings which leads to the - following breaking module changes: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>systemd.network.networks.<name>.dhcpV6PrefixDelegationConfig</literal> - is renamed to - <literal>systemd.network.networks.<name>.dhcpPrefixDelegationConfig</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>systemd.network.networks.<name>.dhcpV6Config</literal> - no longer accepts the - <literal>ForceDHCPv6PDOtherInformation=</literal> setting. - Please use the <literal>WithoutRA=</literal> and - <literal>UseDelegatedPrefix=</literal> settings in your - <literal>systemd.network.networks.<name>.dhcpV6Config</literal> - and the <literal>DHCPv6Client=</literal> setting in your - <literal>systemd.network.networks.<name>.ipv6AcceptRAConfig</literal> - to control when the DHCPv6 client is started and how the - delegated prefixes are handled by the DHCPv6 client. - </para> - </listitem> - <listitem> - <para> - <literal>systemd.network.networks.<name>.networkConfig</literal> - no longer accepts the <literal>IPv6Token=</literal> - setting. Use the <literal>Token=</literal> setting in your - <literal>systemd.network.networks.<name>.ipv6AcceptRAConfig</literal> - instead. The - <literal>systemd.network.networks.<name>.ipv6Prefixes.*.ipv6PrefixConfig</literal> - now also accepts the <literal>Token=</literal> setting. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>arangodb</literal> versions 3.3, 3.4, and 3.5 have - been removed because they are at EOL upstream. The default is - now 3.10.0. Support for aarch64-linux has been removed since - the target cannot be built reproducibly. By default - <literal>arangodb</literal> is now built for the - <literal>haswell</literal> architecture. If you wish to build - for a different architecture, you may override the - <literal>targetArchitecture</literal> argument with a value - from - <link xlink:href="https://github.com/arangodb/arangodb/blob/207ec6937e41a46e10aea34953879341f0606841/cmake/OptimizeForArchitecture.cmake#L594">this - list supported upstream</link>. Some architecture specific - optimizations are also conditionally enabled. You may alter - this behavior by overriding the - <literal>asmOptimizations</literal> parameter. You may also - add additional architecture support by adding more - <literal>-DHAS_XYZ</literal> flags to - <literal>cmakeFlags</literal> via - <literal>overrideAttrs</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>meta.mainProgram</literal> attribute of packages - in <literal>wineWowPackages</literal> now defaults to - <literal>"wine64"</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>paperless</literal> module now defaults - <literal>PAPERLESS_TIME_ZONE</literal> to your configured - system timezone. - </para> - </listitem> - <listitem> - <para> - The top-level <literal>termonad-with-packages</literal> alias - for <literal>termonad</literal> has been removed. - </para> - </listitem> - <listitem> - <para> - Linux 4.9 has been removed because it will reach its end of - life within the lifespan of 22.11. - </para> - </listitem> - <listitem> - <para> - (Neo)Vim can not be configured with - <literal>configure.pathogen</literal> anymore to reduce - maintainance burden. Use <literal>configure.packages</literal> - instead. - </para> - </listitem> - <listitem> - <para> - Neovim can not be configured with plug anymore (still works - for vim). - </para> - </listitem> - <listitem> - <para> - The <literal>adguardhome</literal> module no longer uses - <literal>host</literal> and <literal>port</literal> options, - use <literal>settings.bind_host</literal> and - <literal>settings.bind_port</literal> instead. - </para> - </listitem> - <listitem> - <para> - The default <literal>kops</literal> version is now 1.25.1 and - support for 1.22 and older has been dropped. - </para> - </listitem> - <listitem> - <para> - The <literal>zrepl</literal> package has been updated from - 0.5.0 to 0.6.0. See the - <link xlink:href="https://zrepl.github.io/changelog.html">changelog</link> - for details. - </para> - </listitem> - <listitem> - <para> - <literal>k3s</literal> no longer supports Docker as runtime - due to upstream dropping support. - </para> - </listitem> - <listitem> - <para> - <literal>cassandra_2_1</literal> and - <literal>cassandra_2_2</literal> have been removed. Please - update to <literal>cassandra_3_11</literal> or - <literal>cassandra_3_0</literal>. See the - <link xlink:href="https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt">changelog</link> - for more information about the upgrade process. - </para> - </listitem> - <listitem> - <para> - <literal>mysql57</literal> has been removed. Please update to - <literal>mysql80</literal> or <literal>mariadb</literal>. See - the - <link xlink:href="https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/">upgrade - guide</link> for more information. - </para> - </listitem> - <listitem> - <para> - Consequently, <literal>cqrlog</literal> and - <literal>amorok</literal> now use <literal>mariadb</literal> - instead of <literal>mysql57</literal> for their embedded - databases. Running <literal>mysql_upgrade</literal> may be - neccesary. - </para> - </listitem> - <listitem> - <para> - <literal>k3s</literal> supports <literal>clusterInit</literal> - option, and it is enabled by default, for servers. - </para> - </listitem> - <listitem> - <para> - <literal>percona-server56</literal> has been removed. Please - migrate to <literal>mysql</literal> or - <literal>mariadb</literal> if possible. - </para> - </listitem> - <listitem> - <para> - <literal>obs-studio</literal> hase been updated to version 28. - If you have packaged custom plugins, check if they are - compatible. <literal>obs-websocket</literal> has been - integrated into <literal>obs-studio</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>signald</literal> has been bumped to - <literal>0.23.0</literal>. For the upgrade, a migration - process is necessary. It can be done by running a command like - this before starting <literal>signald.service</literal>: - </para> - <programlisting> -signald -d /var/lib/signald/db \ - --database sqlite:/var/lib/signald/db \ - --migrate-data -</programlisting> - <para> - For further information, please read the upstream changelogs. - </para> - </listitem> - <listitem> - <para> - <literal>stylua</literal> no longer accepts - <literal>lua52Support</literal> and - <literal>luauSupport</literal> overrides. Use - <literal>features</literal> instead, which defaults to - <literal>[ "lua54" "luau" ]</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>ocamlPackages.ocaml_extlib</literal> has been renamed - to <literal>ocamlPackages.extlib</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>pkgs.fetchNextcloudApp</literal> has been rewritten - to circumvent impurities in e.g. tarballs from GitHub and to - make it easier to apply patches. This means that your hashes - are out-of-date and the (previously required) attributes - <literal>name</literal> and <literal>version</literal> are no - longer accepted. - </para> - </listitem> - <listitem> - <para> - The Syncthing service now only allows absolute paths—starting - with <literal>/</literal> or <literal>~/</literal>—for - <literal>services.syncthing.folders.<name>.path</literal>. - In a future release other paths will be allowed again and - interpreted relative to - <literal>services.syncthing.dataDir</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.github-runner</literal> and - <literal>services.github-runners.<name></literal> gained - the option <literal>serviceOverrides</literal> which allows - overriding the systemd <literal>serviceConfig</literal>. If - you have been overriding the systemd service configuration - (i.e., by defining - <literal>systemd.services.github-runner.serviceConfig</literal>), - you have to use the <literal>serviceOverrides</literal> option - now. Example: - </para> - <programlisting> -services.github-runner.serviceOverrides.SupplementaryGroups = [ - "docker" -]; -</programlisting> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.11-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - PHP is now built in <literal>NTS</literal> (Non-Thread Safe) - mode by default. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - For Apache and <literal>mod_php</literal> usage, we enable - <literal>ZTS</literal> (Zend Thread Safe) mode. This has - been a common practice for a long time in other - distributions. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>firefox</literal>, <literal>thunderbird</literal> and - <literal>librewolf</literal> now come with Wayland support by - default. The <literal>firefox-wayland</literal>, - <literal>firefox-esr-wayland</literal>, - <literal>thunderbird-wayland</literal> and - <literal>librewolf-wayland</literal> attributes are obsolete - and have been aliased to their generic attribute. - </para> - </listitem> - <listitem> - <para> - The <literal>xplr</literal> package has been updated from - 0.18.0 to 0.19.0, which brings some breaking changes. See the - <link xlink:href="https://github.com/sayanarijit/xplr/releases/tag/v0.19.0">upstream - release notes</link> for more details. - </para> - </listitem> - <listitem> - <para> - Configuring multiple GitHub runners is now possible through - <literal>services.github-runners.<name></literal>. The - options under <literal>services.github-runner</literal> - remain, to configure a single runner. - </para> - </listitem> - <listitem> - <para> - <literal>github-runner</literal> gained support for ephemeral - runners and registrations using a personal access token (PAT) - instead of a registration token. See - <literal>services.github-runner.ephemeral</literal> and - <literal>services.github-runner.tokenFile</literal> for - details. - </para> - </listitem> - <listitem> - <para> - A new module was added to provide hardware support for the - Saleae Logic device family, providing the options - <literal>hardware.saleae-logic.enable</literal> and - <literal>hardware.saleae-logic.package</literal>. - </para> - </listitem> - <listitem> - <para> - ZFS module will no longer allow hibernation by default. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - This is a safety measure to prevent data loss cases like - the ones described at - <link xlink:href="https://github.com/openzfs/zfs/issues/260">OpenZFS/260</link> - and - <link xlink:href="https://github.com/openzfs/zfs/issues/12842">OpenZFS/12842</link>. - </para> - </listitem> - <listitem> - <para> - Use the <literal>boot.zfs.allowHibernation</literal> - option to configure this behaviour. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - Mastodon now automatically removes remote media attachments - older than 30 days. This is configurable through - <literal>services.mastodon.mediaAutoRemove</literal>. - </para> - </listitem> - <listitem> - <para> - The Redis module now disables RDB persistence when - <literal>services.redis.servers.<name>.save = []</literal> - instead of using the Redis default. - </para> - </listitem> - <listitem> - <para> - Neo4j was updated from version 3 to version 4. See upstream’s - <link xlink:href="https://neo4j.com/docs/upgrade-migration-guide/current/">migration - guide</link> for information on how to migrate your instance. - </para> - </listitem> - <listitem> - <para> - The <literal>networking.wireguard</literal> module now can set - the mtu on interfaces and tag its packets with an fwmark. - </para> - </listitem> - <listitem> - <para> - The option <literal>overrideStrategy</literal> was added to - the different systemd unit options - (<literal>systemd.services.<name></literal>, - <literal>systemd.sockets.<name></literal>, …) to allow - enforcing the creation of a dropin file, rather than the main - unit file, by setting it to <literal>asDropin</literal>. This - is useful in cases where the existence of the main unit file - is not known to Nix at evaluation time, for example when the - main unit file is provided by adding a package to - <literal>systemd.packages</literal>. See the fix proposed in - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/135557#issuecomment-1295392470">NixOS’s - systemd abstraction doesn’t work with systemd template - units</link> for an example. - </para> - </listitem> - <listitem> - <para> - The <literal>polymc</literal> package has been removed due to - a rogue maintainer. It has been replaced by - <literal>prismlauncher</literal>, a fork by the rest of the - maintainers. For more details, see - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/196624">the - PR that made this change</link> and - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/196460">the - issue detailing the vulnerability</link>. Users with existing - installations should rename - <literal>~/.local/share/polymc</literal> to - <literal>~/.local/share/PrismLauncher</literal>. The main - config file’s path has also moved from - <literal>~/.local/share/polymc/polymc.cfg</literal> to - <literal>~/.local/share/PrismLauncher/prismlauncher.cfg</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>bloat</literal> package has been updated from - unstable-2022-03-31 to unstable-2022-10-25, which brings a - breaking change. See - <link xlink:href="https://git.freesoftwareextremist.com/bloat/commit/?id=887ed241d64ba5db3fd3d87194fb5595e5ad7d73">this - upstream commit message</link> for details. - </para> - </listitem> - <listitem> - <para> - Synapse’s systemd unit has been hardened. - </para> - </listitem> - <listitem> - <para> - The module <literal>services.grafana</literal> was refactored - to be compliant with - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link>. To be precise, this means that the following - things have changed: - </para> - <itemizedlist> - <listitem> - <para> - The newly introduced option - <xref linkend="opt-services.grafana.settings" /> is an - attribute-set that will be converted into Grafana’s INI - format. This means that the configuration from - <link xlink:href="https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/">Grafana’s - configuration reference</link> can be directly written as - attribute-set in Nix within this option. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.grafana.extraOptions</literal> has been - removed. This option was an association of environment - variables for Grafana. If you had an expression like - </para> - <programlisting language="nix"> -{ - services.grafana.extraOptions.SECURITY_ADMIN_USER = "foobar"; -} -</programlisting> - <para> - your Grafana instance was running with - <literal>GF_SECURITY_ADMIN_USER=foobar</literal> in its - environment. - </para> - <para> - For the migration, it is recommended to turn it into the - INI format, i.e. to declare - </para> - <programlisting language="nix"> -{ - services.grafana.settings.security.admin_user = "foobar"; -} -</programlisting> - <para> - instead. - </para> - <para> - The keys in - <literal>services.grafana.extraOptions</literal> have the - format - <literal><INI section name>_<Key Name></literal>. - Further details are outlined in the - <link xlink:href="https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#override-configuration-with-environment-variables">configuration - reference</link>. - </para> - <para> - Alternatively you can also set all your values from - <literal>extraOptions</literal> to - <literal>systemd.services.grafana.environment</literal>, - make sure you don’t forget to add the - <literal>GF_</literal> prefix though! - </para> - </listitem> - <listitem> - <para> - Previously, the options - <link linkend="opt-services.grafana.provision.datasources">services.grafana.provision.datasources</link> - and - <link linkend="opt-services.grafana.provision.dashboards">services.grafana.provision.dashboards</link> - expected lists of datasources or dashboards for the - <link xlink:href="https://grafana.com/docs/grafana/latest/administration/provisioning/">declarative - provisioning</link>. - </para> - <para> - To declare lists of - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <emphasis role="strong">datasources</emphasis>, please - rename your declarations to - <link linkend="opt-services.grafana.provision.datasources.settings.datasources">services.grafana.provision.datasources.settings.datasources</link>. - </para> - </listitem> - <listitem> - <para> - <emphasis role="strong">dashboards</emphasis>, please - rename your declarations to - <link linkend="opt-services.grafana.provision.dashboards.settings.providers">services.grafana.provision.dashboards.settings.providers</link>. - </para> - </listitem> - </itemizedlist> - <para> - This change was made to support more features for that: - </para> - <itemizedlist> - <listitem> - <para> - It’s possible to declare the - <literal>apiVersion</literal> of your dashboards and - datasources by - <link linkend="opt-services.grafana.provision.datasources.settings.apiVersion">services.grafana.provision.datasources.settings.apiVersion</link> - (or - <link linkend="opt-services.grafana.provision.dashboards.settings.apiVersion">services.grafana.provision.dashboards.settings.apiVersion</link>). - </para> - </listitem> - <listitem> - <para> - Instead of declaring datasources and dashboards in - pure Nix, it’s also possible to specify configuration - files (or directories) with YAML instead using - <link linkend="opt-services.grafana.provision.datasources.path">services.grafana.provision.datasources.path</link> - (or - <link linkend="opt-services.grafana.provision.dashboards.path">services.grafana.provision.dashboards.path</link>. - This is useful when having provisioning files from - non-NixOS Grafana instances that you also want to - deploy to NixOS. - </para> - <para> - <emphasis role="strong">Note:</emphasis> secrets from - these files will be leaked into the store unless you - use a - <link xlink:href="https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider"><emphasis role="strong">file</emphasis>-provider - or env-var</link> for secrets! - </para> - </listitem> - <listitem> - <para> - <link linkend="opt-services.grafana.provision.notifiers">services.grafana.provision.notifiers</link> - 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 - <literal>services.grafana.provision.alerting.contactPoints</literal> - instead. - </para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - The <literal>services.grafana.provision.alerting</literal> - option was added. It includes suboptions for every - alerting-related objects (with the exception of - <literal>notifiers</literal>), which means it’s now possible - to configure modern Grafana alerting declaratively. - </para> - </listitem> - <listitem> - <para> - Synapse now requires entries in the - <literal>state_group_edges</literal> 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. - </para> - </listitem> - <listitem> - <para> - The <literal>diamond</literal> package has been update from - 0.8.36 to 2.0.15. See the - <link xlink:href="https://github.com/bbuchfink/diamond/releases">upstream - release notes</link> for more details. - </para> - </listitem> - <listitem> - <para> - The <literal>guake</literal> package has been updated from - 3.6.3 to 3.9.0, see the - <link xlink:href="https://github.com/Guake/guake/releases">changelog</link> - for more details. - </para> - </listitem> - <listitem> - <para> - The <literal>netlify-cli</literal> package has been updated - from 6.13.2 to 12.2.4, see the - <link xlink:href="https://github.com/netlify/cli/releases">changelog</link> - for more details. - </para> - </listitem> - <listitem> - <para> - <literal>dockerTools.buildImage</literal>’s - <literal>contents</literal> parameter has been deprecated in - favor of <literal>copyToRoot</literal>. Use - <literal>copyToRoot = buildEnv { ... };</literal> or similar - if you intend to add packages to <literal>/bin</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>proxmox.qemuConf.bios</literal> option was added, - it corresponds to <literal>Hardware->BIOS</literal> field - in Proxmox web interface. Use - <literal>"ovmf"</literal> value to build UEFI image, - default value remains <literal>"bios"</literal>. New - option <literal>proxmox.partitionTableType</literal> defaults - to either <literal>"legacy"</literal> or - <literal>"efi"</literal>, depending on the - <literal>bios</literal> value. Setting - <literal>partitionTableType</literal> to - <literal>"hybrid"</literal> results in an image, - which supports both methods - (<literal>"bios"</literal> and - <literal>"ovmf"</literal>), thereby remaining - bootable after change to Proxmox - <literal>Hardware->BIOS</literal> field. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - Option descriptions, examples, and defaults writing in DocBook - are now deprecated. Using CommonMark is preferred and will - become the default in a future release. - </para> - </listitem> - <listitem> - <para> - The - <literal>documentation.nixos.options.allowDocBook</literal> - option was added to ease the transition to CommonMark option - documentation. Setting this option to <literal>false</literal> - causes an error for every option included in the manual that - uses DocBook documentation; it defaults to - <literal>true</literal> to preserve the previous behavior and - will be removed once the transition to CommonMark is complete. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - <literal>protonup</literal> has been aliased to and replaced - by <literal>protonup-ng</literal> due to upstream not - maintaining it. - </para> - </listitem> - <listitem> - <para> - The udisks2 service, available at - <literal>services.udisks2.enable</literal>, 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 - <literal>security.polkit.enable</literal> was already flipped - in the previous release, but udisks2 being enabled by default - re-enabled it. - </para> - </listitem> - <listitem> - <para> - Nextcloud has been updated to version - <emphasis role="strong">25</emphasis>. Additionally the - following things have changed for Nextcloud in NixOS: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - For Nextcloud <emphasis role="strong">>=24</emphasis>, - the default PHP version is 8.1. - </para> - </listitem> - <listitem> - <para> - Nextcloud <emphasis role="strong">23</emphasis> has been - removed since it will reach its - <link xlink:href="https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule/d76576a12a626d53305d480a6065b57cab705d3d">end - of life in December 2022</link>. - </para> - </listitem> - <listitem> - <para> - If <literal>system.stateVersion</literal> is - <emphasis role="strong">>=22.11</emphasis>, Nextcloud - 25 will be installed by default. For older versions, - Nextcloud 24 will be installed. - </para> - </listitem> - <listitem> - <para> - 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 - <emphasis role="strong">23</emphasis> to - <emphasis role="strong">25</emphasis> is only possible - when upgrading to <emphasis role="strong">24</emphasis> - first. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - systemd-oomd is enabled by default. Depending on which systemd - units have <literal>ManagedOOMSwap=kill</literal> or - <literal>ManagedOOMMemoryPressure=kill</literal>, systemd-oomd - will SIGKILL all the processes under the appropriate - descendant cgroups when the configured limits are exceeded. - NixOS does currently not configure cgroups with oomd by - default, this can be enabled using - <link xlink:href="options.html#opt-systemd.oomd.enableRootSlice">systemd.oomd.enableRootSlice</link>, - <link xlink:href="options.html#opt-systemd.oomd.enableSystemSlice">systemd.oomd.enableSystemSlice</link>, - and - <link xlink:href="options.html#opt-systemd.oomd.enableUserServices">systemd.oomd.enableUserServices</link>. - </para> - </listitem> - <listitem> - <para> - The <literal>tt-rss</literal> service performs two database - migrations when you first use its web UI after upgrade. - Consider backing up its database before updating. - </para> - </listitem> - <listitem> - <para> - The <literal>pass-secret-service</literal> package now - includes systemd units from upstream, so adding it to the - NixOS <literal>services.dbus.packages</literal> option will - make it start automatically as a systemd user service when an - application tries to talk to the libsecret D-Bus API. - </para> - </listitem> - <listitem> - <para> - The Wordpress module now has support for installing language - packs through a new option, - <literal>services.wordpress.sites.<site>.languages</literal>. - </para> - </listitem> - <listitem> - <para> - The default package for - <literal>services.mullvad-vpn.package</literal> was changed to - <literal>pkgs.mullvad</literal>, allowing cross-platform usage - of Mullvad. <literal>pkgs.mullvad</literal> only contains the - Mullvad CLI tool, so users who rely on the Mullvad GUI will - want to change it back to <literal>pkgs.mullvad-vpn</literal>, - or add <literal>pkgs.mullvad-vpn</literal> to their - environment. - </para> - </listitem> - <listitem> - <para> - PowerDNS has been updated from v4.6.2 to v4.7.2. Please be - sure to review the - <link xlink:href="https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master">Upgrade - Notes</link> 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. - </para> - </listitem> - <listitem> - <para> - There is a new module for the <literal>thunar</literal> - program (the Xfce file manager), which depends on the - <literal>xfconf</literal> dbus service, and also has a dbus - service and a systemd unit. The option - <literal>services.xserver.desktopManager.xfce.thunarPlugins</literal> - has been renamed to - <literal>programs.thunar.plugins</literal>, and may be removed - in a future release. - </para> - </listitem> - <listitem> - <para> - There is a new module for <literal>xfconf</literal> (the Xfce - configuration storage system), which has a dbus service. - </para> - </listitem> - <listitem> - <para> - The Mastodon package has been upgraded to v4.0.0. See the - <link xlink:href="https://github.com/mastodon/mastodon/releases/tag/v4.0.0">v4.0.0 - release notes</link> for a list of changes. On standard - setups, no manual migration steps are required. Nevertheless, - a database backup is recommended. - </para> - </listitem> - <listitem> - <para> - The <literal>nomad</literal> package now defaults to v1.3, - which no longer has a downgrade path to v1.2 or older. - </para> - </listitem> - <listitem> - <para> - The <literal>nodePackages</literal> package set now defaults - to the LTS release in the <literal>nodejs</literal> package - again, instead of being pinned to - <literal>nodejs-14_x</literal>. Several updates to node2nix - have been made for compatibility with newer Node.js and npm - versions and a new <literal>postRebuild</literal> hook has - been added for packages to perform extra build steps before - the npm install step prunes dev dependencies. - </para> - </listitem> - <listitem> - <para> - <literal>boot.kernel.sysctl</literal> is defined as a - freeformType and adds a custom merge option for - <literal>net.core.rmem_max</literal> (taking the highest value - defined to avoid conflicts between 2 services trying to set - that value). - </para> - </listitem> - <listitem> - <para> - The <literal>mame</literal> package does not ship with its - tools anymore in the default output. They were moved to a - separate <literal>tools</literal> output instead. For - convenience, <literal>mame-tools</literal> package was added - for those who want to use it. - </para> - </listitem> - <listitem> - <para> - A NixOS module for Firefox has been added which allows - preferences and - <link xlink:href="https://github.com/mozilla/policy-templates/blob/master/README.md">policies</link> - to be set. This also allows extensions to be installed via the - <literal>ExtensionSettings</literal> policy. The new options - are under <literal>programs.firefox</literal>. - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.picom.experimentalBackends</literal> was - removed since it is now the default and the option will cause - <literal>picom</literal> to quit instead. - </para> - </listitem> - <listitem> - <para> - <literal>haskellPackages.callHackage</literal> is not always - invalidated if <literal>all-cabal-hashes</literal> changes, - leading to less rebuilds of haskell dependencies. - </para> - </listitem> - <listitem> - <para> - <literal>haskellPackages.callHackage</literal> and - <literal>haskellPackages.callCabal2nix</literal> (and related - functions) no longer keep a reference to the - <literal>cabal2nix</literal> call used to generate them. As a - result, they will be garbage collected more often. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-22.11-new-services"> - <title>New Services</title> - <itemizedlist> - <listitem> - <para> - <link xlink:href="https://git.sr.ht/~migadu/alps">alps</link>, - a simple and extensible webmail. Available as - <link linkend="opt-services.alps.enable">services.alps</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/jollheef/appvm">appvm</link>, - Nix based app VMs. Available as - <link xlink:href="options.html#opt-virtualisation.appvm.enable">virtualisation.appvm</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.ausweisapp.bund.de/">AusweisApp2</link>, - the authentication software for the German ID card. Available - as - <link linkend="opt-programs.ausweisapp.enable">programs.ausweisapp</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/maxbrunet/automatic-timezoned">automatic-timezoned</link>. - a Linux daemon to automatically update the system timezone - based on location. Available as - <link linkend="opt-services.automatic-timezoned.enable">services.automatic-timezoned</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.dolibarr.org/">Dolibarr</link>, - an enterprise resource planning and customer relationship - manager. Enable using - <link linkend="opt-services.dolibarr.enable">services.dolibarr</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://dragonflydb.io/">dragonflydb</link>, - a modern replacement for Redis and Memcached. Available as - <link linkend="opt-services.dragonflydb.enable">services.dragonflydb</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/shizunge/endlessh-go">endlessh-go</link>, - an SSH tarpit that exposes Prometheus metrics. Available as - <link linkend="opt-services.endlessh-go.enable">services.endlessh-go</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/skeeto/endlessh">endlessh</link>, - an SSH tarpit. Available as - <link linkend="opt-services.endlessh.enable">services.endlessh</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://evcc.io">EVCC</link> 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 - <link linkend="opt-services.evcc.enable">services.evcc</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.expressvpn.com">expressvpn</link>, - the CLI client for ExpressVPN. Available as - <link linkend="opt-services.expressvpn.enable">services.expressvpn</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://freshrss.org/">FreshRSS</link>, a - free, self-hostable RSS feed aggregator. Available as - <link linkend="opt-services.freshrss.enable">services.freshrss</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://garagehq.deuxfleurs.fr/">Garage</link>, - a simple object storage server for geodistributed deployments, - alternative to MinIO. Available as - <link linkend="opt-services.garage.enable">services.garage</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/L11R/go-autoconfig">go-autoconfig</link>, - IMAP/SMTP autodiscover server. Available as - <link linkend="opt-services.go-autoconfig.enable">services.go-autoconfig</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.grafana.com/oss/tempo/">Grafana - Tempo</link>, a distributed tracing store. Available as - <link linkend="opt-services.tempo.enable">services.tempo</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://hbase.apache.org/">HBase - cluster</link>, a distributed, scalable, big data store. - Available as - <link xlink:href="options.html#opt-services.hadoop.hbase.enable">services.hadoop.hbase</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/leetronics/infnoise">infnoise</link>, - a hardware True Random Number Generator dongle. Available as - <link xlink:href="options.html#opt-services.infnoise.enable">services.infnoise</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/jtroo/kanata">kanata</link>, - a tool to improve keyboard comfort and usability with advanced - customization. Available as - <link xlink:href="options.html#opt-services.kanata.enable">services.kanata</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/prymitive/karma">karma</link>, - an alert dashboard for Prometheus Alertmanager. Available as - <link xlink:href="options.html#opt-services.karma.enable">services.karma</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://komga.org/">Komga</link>, a free and - open source comics/mangas media server. Available as - <link linkend="opt-services.komga.enable">services.komga</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/prymitive/kthxbye">kthxbye</link>, - an alert acknowledgement management daemon for Prometheus - Alertmanager. Available as - <link xlink:href="options.html#opt-services.kthxbye.enable">services.kthxbye</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://languagetool.org/">languagetool</link>, - a multilingual grammar, style, and spell checker. Available as - <link xlink:href="options.html#opt-services.languagetool.enable">services.languagetool</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://listmonk.app">Listmonk</link>, a - self-hosted newsletter manager. Enable using - <link xlink:href="options.html#opt-services.listmonk.enable">services.listmonk</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://mepo.milesalan.com">Mepo</link>, a - fast, simple, hackable OSM map viewer for mobile and desktop - Linux. Available as - <link linkend="opt-programs.mepo.enable">programs.mepo.enable</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://troglobit.com/projects/merecat/">merecat</link>, - a small and easy HTTP server based on thttpd. Available as - <link linkend="opt-services.merecat.enable">services.merecat</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://netbird.io">netbird</link>, a zero - configuration VPN. Available as - <link xlink:href="options.html#opt-services.netbird.enable">services.netbird</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://ntfy.sh">ntfy.sh</link>, a push - notification service. Available as - <link linkend="opt-services.ntfy-sh.enable">services.ntfy-sh</link> - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master">OpenRGB</link>, - a FOSS tool for controlling RGB lighting. Available as - <link xlink:href="options.html#opt-services.hardware.openrgb.enable">services.hardware.openrgb.enable</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.getoutline.com/">Outline</link>, - a wiki and knowledge base similar to Notion. Available as - <link linkend="opt-services.outline.enable">services.outline</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/zalando/patroni">Patroni</link>, - a template for PostgreSQL HA with ZooKeeper, etcd or Consul. - Available as - <link xlink:href="options.html#opt-services.patroni.enable">services.patroni</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/aiberia/persistent-evdev">persistent-evdev</link>, - 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 - <link linkend="opt-services.persistent-evdev.enable">services.persistent-evdev</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/edneville/please">Please</link>, - a Sudo clone written in Rust. Available as - <link linkend="opt-security.please.enable">security.please</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/prometheus-community/ipmi_exporter">Prometheus - IPMI exporter</link>, an IPMI exporter for Prometheus. - Available as - <link linkend="opt-services.prometheus.exporters.ipmi.enable">services.prometheus.exporters.ipmi</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/messagebird/sachet/">Sachet</link>, - an SMS alerting tool for the Prometheus Alertmanager. - Available as - <link linkend="opt-services.prometheus.sachet.enable">services.prometheus.sachet</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://schleuder.org/">schleuder</link>, a - mailing list manager with PGP support. Enable using - <link linkend="opt-services.schleuder.enable">services.schleuder</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/mozilla-services/syncstorage-rs">syncstorage-rs</link>, - a self-hostable sync server for Firefox. Available as - <link xlink:href="options.html#opt-services.firefox-syncserver.enable">services.firefox-syncserver</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://tandoor.dev">Tandoor Recipes</link>, - a self-hosted multi-tenant recipe collection. Available as - <link xlink:href="options.html#opt-services.tandoor-recipes.enable">services.tandoor-recipes</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="http://www.litech.org/tayga/">TAYGA</link>, - an out-of-kernel stateless NAT64 implementation. Available as - <link linkend="opt-services.tayga.enable">services.tayga</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/tmate-io/tmate-ssh-server">tmate-ssh-server</link>, - server side part of - <link xlink:href="https://tmate.io/">tmate</link>. Available - as - <link linkend="opt-services.tmate-ssh-server.enable">services.tmate-ssh-server</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://uptime.kuma.pet/">Uptime - Kuma</link>, a fancy self-hosted monitoring tool. Available as - <link linkend="opt-services.uptime-kuma.enable">services.uptime-kuma</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://writefreely.org">WriteFreely</link>, - a simple blogging platform with ActivityPub support. Available - as - <link xlink:href="options.html#opt-services.writefreely.enable">services.writefreely</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/XTLS/Xray-core">xray</link>, - a fully compatible v2ray-core replacement. Features XTLS, - which when enabled on server and client, brings UDP FullCone - NAT to proxy setups. Available as - <link xlink:href="options.html#opt-services.xray.enable">services.xray</link>. - </para> - </listitem> - </itemizedlist> - </section> -</section> 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 deleted file mode 100644 index ae41b9ee30b3e..0000000000000 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ /dev/null @@ -1,750 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-23.05"> - <title>Release 23.05 (“Stoat”, 2023.05/??)</title> - <para> - Support is planned until the end of December 2023, handing over to - 23.11. - </para> - <section xml:id="sec-release-23.05-highlights"> - <title>Highlights</title> - <para> - In addition to numerous new and upgraded packages, this release - has the following highlights: - </para> - <itemizedlist> - <listitem> - <para> - Cinnamon has been updated to 5.6, see - <link xlink:href="https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204">the - pull request</link> for what is changed. - </para> - </listitem> - <listitem> - <para> - <literal>nixos-rebuild</literal> now supports an extra - <literal>--specialisation</literal> option that can be used to - change specialisation for <literal>switch</literal> and - <literal>test</literal> commands. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-23.05-new-services"> - <title>New Services</title> - <itemizedlist> - <listitem> - <para> - <link xlink:href="https://akkoma.social">Akkoma</link>, an - ActivityPub microblogging server. Available as - <link xlink:href="options.html#opt-services.akkoma.enable">services.akkoma</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/akinomyoga/ble.sh">blesh</link>, - a line editor written in pure bash. Available as - <link linkend="opt-programs.bash.blesh.enable">programs.bash.blesh</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/adnanh/webhook">webhook</link>, - a lightweight webhook server. Available as - <link linkend="opt-services.webhook.enable">services.webhook</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/alexivkin/CUPS-PDF-to-PDF">cups-pdf-to-pdf</link>, - a pdf-generating cups backend based on - <link xlink:href="https://www.cups-pdf.de/">cups-pdf</link>. - Available as - <link linkend="opt-services.printing.cups-pdf.enable">services.printing.cups-pdf</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.magicbug.co.uk/cloudlog/">Cloudlog</link>, - a web-based Amateur Radio logging application. Available as - <link linkend="opt-services.cloudlog.enable">services.cloudlog</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/junegunn/fzf">fzf</link>, - a command line fuzzyfinder. Available as - <link linkend="opt-programs.fzf.fuzzyCompletion">programs.fzf</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/hzeller/gmrender-resurrect">gmediarender</link>, - a simple, headless UPnP/DLNA renderer. Available as - <link xlink:href="options.html#opt-services.gmediarender.enable">services.gmediarender</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/StevenBlack/hosts">stevenblack-blocklist</link>, - A unified hosts file with base extensions for blocking - unwanted websites. Available as - <link xlink:href="options.html#opt-networking.stevenblack.enable">networking.stevenblack</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/slurdge/goeland">goeland</link>, - an alternative to rss2email written in golang with many - filters. Available as - <link linkend="opt-services.goeland.enable">services.goeland</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/ellie/atuin">atuin</link>, - a sync server for shell history. Available as - <link linkend="opt-services.atuin.enable">services.atuin</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://gitlab.com/kop316/mmsd">mmsd</link>, - a lower level daemon that transmits and recieves MMSes. - Available as - <link linkend="opt-services.mmsd.enable">services.mmsd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://v2raya.org">v2rayA</link>, a Linux - web GUI client of Project V which supports V2Ray, Xray, SS, - SSR, Trojan and Pingtunnel. Available as - <link xlink:href="options.html#opt-services.v2raya.enable">services.v2raya</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://www.netfilter.org/projects/ulogd/index.html">ulogd</link>, - a userspace logging daemon for netfilter/iptables related - logging. Available as - <link xlink:href="options.html#opt-services.ulogd.enable">services.ulogd</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://photoprism.app/">photoprism</link>, - a AI-Powered Photos App for the Decentralized Web. Available - as - <link xlink:href="options.html#opt-services.photoprism.enable">services.photoprism</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://github.com/languitar/autosuspend">autosuspend</link>, - a python daemon that suspends a system if certain conditions - are met, or not met. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-23.05-incompatibilities"> - <title>Backward Incompatibilities</title> - <itemizedlist> - <listitem> - <para> - <literal>carnix</literal> and <literal>cratesIO</literal> has - been removed due to being unmaintained, use alternatives such - as - <link xlink:href="https://github.com/nix-community/naersk">naersk</link> - and - <link xlink:href="https://github.com/kolloch/crate2nix">crate2nix</link> - instead. - </para> - </listitem> - <listitem> - <para> - <literal>checkInputs</literal> have been renamed to - <literal>nativeCheckInputs</literal>, because they behave the - same as <literal>nativeBuildInputs</literal> when - <literal>doCheck</literal> is set. - <literal>checkInputs</literal> now denote a new type of - dependencies, added to <literal>buildInputs</literal> when - <literal>doCheck</literal> is set. As a rule of thumb, - <literal>nativeCheckInputs</literal> are tools on - <literal>$PATH</literal> used during the tests, and - <literal>checkInputs</literal> are libraries which are linked - to executables built as part of the tests. Similarly, - <literal>installCheckInputs</literal> are renamed to - <literal>nativeInstallCheckInputs</literal>, corresponding to - <literal>nativeBuildInputs</literal>, and - <literal>installCheckInputs</literal> are a new type of - dependencies added to <literal>buildInputs</literal> when - <literal>doInstallCheck</literal> is set. (Note that this - change will not cause breakage to derivations with - <literal>strictDeps</literal> unset, which are most packages - except python, rust and go packages). - </para> - </listitem> - <listitem> - <para> - <literal>borgbackup</literal> module now has an option for - inhibiting system sleep while backups are running, defaulting - to off (not inhibiting sleep), available as - <link linkend="opt-services.borgbackup.jobs._name_.inhibitsSleep"><literal>services.borgbackup.jobs.<name>.inhibitsSleep</literal></link>. - </para> - </listitem> - <listitem> - <para> - <literal>podman</literal> now uses the - <literal>netavark</literal> network stack. Users will need to - delete all of their local containers, images, volumes, etc, by - running <literal>podman system reset --force</literal> once - before upgrading their systems. - </para> - </listitem> - <listitem> - <para> - <literal>git-bug</literal> has been updated to at least - version 0.8.0, which includes backwards incompatible changes. - The <literal>git-bug-migration</literal> package can be used - to upgrade existing repositories. - </para> - </listitem> - <listitem> - <para> - 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 - <literal>/etc/ec2-metadata</literal> should now have an - <literal>after</literal> dependency on - <literal>fetch-ec2-metadata.service</literal> - </para> - </listitem> - <listitem> - <para> - <literal>minio</literal> removed support for its legacy - filesystem backend in - <link xlink:href="https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z">RELEASE.2022-10-29T06-21-33Z</link>. - 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 - <link xlink:href="https://min.io/docs/minio/windows/operations/install-deploy-manage/migrate-fs-gateway.html">instructions - how to manually convert the node</link>. To facilitate this - migration we keep around the last version that still supports - the old filesystem backend as - <literal>minio_legacy_fs</literal>. Use it via - <literal>services.minio.package = minio_legacy_fs;</literal> - to export your data before switching to the new version. See - the corresponding - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/199318">issue</link> - for more details. - </para> - </listitem> - <listitem> - <para> - <literal>services.sourcehut.dispatch</literal> and the - corresponding package - (<literal>sourcehut.dispatchsrht</literal>) have been removed - due to - <link xlink:href="https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/">upstream - deprecation</link>. - </para> - </listitem> - <listitem> - <para> - The - <link linkend="opt-services.snapserver.openFirewall">services.snapserver.openFirewall</link> - module option default value has been changed from - <literal>true</literal> to <literal>false</literal>. You will - need to explicitly set this option to <literal>true</literal>, - or configure your firewall. - </para> - </listitem> - <listitem> - <para> - The - <link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link> - module option default value has been changed from - <literal>true</literal> to <literal>false</literal>. You will - need to explicitly set this option to <literal>true</literal>, - or configure your firewall. - </para> - </listitem> - <listitem> - <para> - The - <link linkend="opt-services.unifi-video.openFirewall">services.unifi-video.openFirewall</link> - module option default value has been changed from - <literal>true</literal> to <literal>false</literal>. You will - need to explicitly set this option to <literal>true</literal>, - or configure your firewall. - </para> - </listitem> - <listitem> - <para> - Kime has been updated from 2.5.6 to 3.0.2 and the - <literal>i18n.inputMethod.kime.config</literal> option has - been removed. Users should use - <literal>daemonModules</literal>, - <literal>iconColor</literal>, and - <literal>extraConfig</literal> options under - <literal>i18n.inputMethod.kime</literal> instead. - </para> - </listitem> - <listitem> - <para> - <literal>tut</literal> 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 - <link xlink:href="https://github.com/RasmusLindroth/tut/releases/tag/2.0.0">here</link>. - </para> - </listitem> - <listitem> - <para> - <literal>llvmPackages_rocm.llvm</literal> will not contain - <literal>clang</literal> or <literal>compiler-rt</literal>. - <literal>llvmPackages_rocm.clang</literal> will not contain - <literal>llvm</literal>. - <literal>llvmPackages_rocm.clangNoCompilerRt</literal> has - been removed in favor of using - <literal>llvmPackages_rocm.clang-unwrapped</literal>. - </para> - </listitem> - <listitem> - <para> - The EC2 image module previously detected and automatically - mounted ext3-formatted instance store devices and partitions - in stage-1 (initramfs), storing <literal>/tmp</literal> 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. - </para> - </listitem> - <listitem> - <para> - <literal>teleport</literal> has been upgraded to major version - 11. Please see upstream - <link xlink:href="https://goteleport.com/docs/setup/operations/upgrading/">upgrade - instructions</link> and - <link xlink:href="https://goteleport.com/docs/changelog/#1100">release - notes</link>. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - In <literal>mastodon</literal> it is now necessary to specify - location of file with <literal>PostgreSQL</literal> database - password. In - <literal>services.mastodon.database.passwordFile</literal> - parameter default value - <literal>/var/lib/mastodon/secrets/db-password</literal> has - been changed to <literal>null</literal>. - </para> - </listitem> - <listitem> - <para> - The <literal>--target-host</literal> and - <literal>--build-host</literal> options of - <literal>nixos-rebuild</literal> no longer treat the - <literal>localhost</literal> value specially – to build - on/deploy to local machine, omit the relevant flag. - </para> - </listitem> - <listitem> - <para> - The <literal>nix.readOnlyStore</literal> option has been - renamed to <literal>boot.readOnlyNixStore</literal> to clarify - that it configures the NixOS boot process, not the Nix daemon. - </para> - </listitem> - <listitem> - <para> - Deprecated <literal>xlibsWrapper</literal> transitional - package has been removed in favour of direct use of its - constitutents: <literal>xorg.libX11</literal>, - <literal>freetype</literal> and others. - </para> - </listitem> - <listitem> - <para> - .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 - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="sec-release-23.05-notable-changes"> - <title>Other Notable Changes</title> - <itemizedlist> - <listitem> - <para> - <literal>vim_configurable</literal> has been renamed to - <literal>vim-full</literal> to avoid confusion: - <literal>vim-full</literal>’s build-time features are - configurable, but both <literal>vim</literal> and - <literal>vim-full</literal> are - <emphasis>customizable</emphasis> (in the sense of user - configuration, like vimrc). - </para> - </listitem> - <listitem> - <para> - The module for the application firewall - <literal>opensnitch</literal> got the ability to configure - rules. Available as - <link linkend="opt-services.opensnitch.rules">services.opensnitch.rules</link> - </para> - </listitem> - <listitem> - <para> - The module <literal>usbmuxd</literal> now has the ability to - change the package used by the daemon. In case you’re - experiencing issues with <literal>usbmuxd</literal> you can - try an alternative program like <literal>usbmuxd2</literal>. - Available as - <link linkend="opt-services.usbmuxd.package">services.usbmuxd.package</link> - </para> - </listitem> - <listitem> - <para> - A few openssh options have been moved from extraConfig to the - new freeform option <literal>settings</literal> and renamed as - follow: - <literal>services.openssh.kbdInteractiveAuthentication</literal> - to - <literal>services.openssh.settings.KbdInteractiveAuthentication</literal>, - <literal>services.openssh.passwordAuthentication</literal> to - <literal>services.openssh.settings.PasswordAuthentication</literal>, - <literal>services.openssh.useDns</literal> to - <literal>services.openssh.settings.UseDns</literal>, - <literal>services.openssh.permitRootLogin</literal> to - <literal>services.openssh.settings.PermitRootLogin</literal>, - <literal>services.openssh.logLevel</literal> to - <literal>services.openssh.settings.LogLevel</literal>. - </para> - </listitem> - <listitem> - <para> - <literal>services.mastodon</literal> gained a tootctl wrapped - named <literal>mastodon-tootctl</literal> similar to - <literal>nextcloud-occ</literal> which can be executed from - any user and switches to the configured mastodon user with - sudo and sources the environment variables. - </para> - </listitem> - <listitem> - <para> - 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 - <xref linkend="sec-option-declarations" /> to silence this - warning. - </para> - <para> - 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. - </para> - </listitem> - <listitem> - <para> - The <literal>dnsmasq</literal> service now takes configuration - via the <literal>services.dnsmasq.settings</literal> attribute - set. The option - <literal>services.dnsmasq.extraConfig</literal> will be - deprecated when NixOS 22.11 reaches end of life. - </para> - </listitem> - <listitem> - <para> - The <literal>dokuwiki</literal> service now takes - configuration via the - <literal>services.dokuwiki.sites.<name>.settings</literal> - attribute set, <literal>extraConfig</literal> is deprecated - and will be removed. The - <literal>{aclUse,superUser,disableActions}</literal> - attributes have been renamed, <literal>pluginsConfig</literal> - now also accepts an attribute set of booleans, passing plain - PHP is deprecated. Same applies to <literal>acl</literal> - which now also accepts structured settings. - </para> - </listitem> - <listitem> - <para> - The <literal>wordpress</literal> service now takes - configuration via the - <literal>services.wordpress.sites.<name>.settings</literal> - attribute set, <literal>extraConfig</literal> is still - available to append additional text to - <literal>wp-config.php</literal>. - </para> - </listitem> - <listitem> - <para> - To reduce closure size in - <literal>nixos/modules/profiles/minimal.nix</literal> profile - disabled installation documentations and manuals. Also - disabled <literal>logrotate</literal> and - <literal>udisks2</literal> services. - </para> - </listitem> - <listitem> - <para> - The minimal ISO image now uses the - <literal>nixos/modules/profiles/minimal.nix</literal> profile. - </para> - </listitem> - <listitem> - <para> - <literal>mastodon</literal> now supports connection to a - remote <literal>PostgreSQL</literal> database. - </para> - </listitem> - <listitem> - <para> - <literal>services.peertube</literal> now requires you to - specify the secret file - <literal>secrets.secretsFile</literal>. It can be generated by - running <literal>openssl rand -hex 32</literal>. Before - upgrading, read the release notes for PeerTube: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <link xlink:href="https://github.com/Chocobozzz/PeerTube/releases/tag/v5.0.0">Release - v5.0.0</link> - </para> - </listitem> - </itemizedlist> - <para> - And backup your data. - </para> - </listitem> - <listitem> - <para> - <literal>services.chronyd</literal> is now started with - additional systemd sandbox/hardening options for better - security. - </para> - </listitem> - <listitem> - <para> - <literal>services.dhcpcd</literal> service now don’t solicit - or accept IPv6 Router Advertisements on interfaces that use - static IPv6 addresses. - </para> - </listitem> - <listitem> - <para> - The module <literal>services.headscale</literal> was - refactored to be compliant with - <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC - 0042</link>. To be precise, this means that the following - things have changed: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Most settings has been migrated under - <link linkend="opt-services.headscale.settings">services.headscale.settings</link> - which is an attribute-set that will be converted into - headscale’s YAML config format. This means that the - configuration from - <link xlink:href="https://github.com/juanfont/headscale/blob/main/config-example.yaml">headscale’s - example configuration</link> can be directly written as - attribute-set in Nix within this option. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <literal>nixos/lib/make-disk-image.nix</literal> can now - mutate EFI variables, run user-provided EFI firmware or - variable templates. This is now extensively documented in the - NixOS manual. - </para> - </listitem> - <listitem> - <para> - <literal>services.grafana</literal> listens only on localhost - by default again. This was changed to upstreams default of - <literal>0.0.0.0</literal> by accident in the freeform setting - conversion. - </para> - </listitem> - <listitem> - <para> - A new <literal>virtualisation.rosetta</literal> module was - added to allow running <literal>x86_64</literal> binaries - through - <link xlink:href="https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment">Rosetta</link> - inside virtualised NixOS guests on Apple silicon. This feature - works by default with the - <link xlink:href="https://docs.getutm.app/">UTM</link> - virtualisation - <link xlink:href="https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm">package</link>. - </para> - </listitem> - <listitem> - <para> - The new option <literal>users.motdFile</literal> allows - configuring a Message Of The Day that can be updated - dynamically. - </para> - </listitem> - <listitem> - <para> - The <literal>root</literal> package is now built with the - <literal>"-Dgnuinstall=ON"</literal> CMake flag, - making the output conform the <literal>bin</literal> - <literal>lib</literal> <literal>share</literal> layout. In - this layout, <literal>tutorials</literal> is under - <literal>share/doc/ROOT/</literal>; <literal>cmake</literal>, - <literal>font</literal>, <literal>icons</literal>, - <literal>js</literal> and <literal>macro</literal> under - <literal>share/root</literal>; - <literal>Makefile.comp</literal> and - <literal>Makefile.config</literal> under - <literal>etc/root</literal>. - </para> - </listitem> - <listitem> - <para> - Enabling global redirect in - <literal>services.nginx.virtualHosts</literal> now allows one - to add exceptions with the <literal>locations</literal> - option. - </para> - </listitem> - <listitem> - <para> - A new option <literal>recommendedBrotliSettings</literal> has - been added to <literal>services.nginx</literal>. Learn more - about compression in Brotli format - <link xlink:href="https://github.com/google/ngx_brotli/blob/master/README.md">here</link>. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://garagehq.deuxfleurs.fr/">Garage</link> - version is based on - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>, - existing installations will keep using version 0.7. New - installations will use version 0.8. In order to upgrade a - Garage cluster, please follow - <link xlink:href="https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/">upstream - instructions</link> and force - <link xlink:href="options.html#opt-services.garage.package">services.garage.package</link> - or upgrade accordingly - <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>. - </para> - </listitem> - <listitem> - <para> - <literal>hip</literal> has been separated into - <literal>hip</literal>, <literal>hip-common</literal> and - <literal>hipcc</literal>. - </para> - </listitem> - <listitem> - <para> - Resilio sync secret keys can now be provided using a secrets - file at runtime, preventing these secrets from ending up in - the Nix store. - </para> - </listitem> - <listitem> - <para> - The <literal>firewall</literal> and <literal>nat</literal> - module now has a nftables based implementation. Enable - <literal>networking.nftables</literal> to use it. - </para> - </listitem> - <listitem> - <para> - The <literal>services.fwupd</literal> module now allows - arbitrary daemon settings to be configured in a structured - manner - (<link linkend="opt-services.fwupd.daemonSettings"><literal>services.fwupd.daemonSettings</literal></link>). - </para> - </listitem> - <listitem> - <para> - The <literal>unifi-poller</literal> package and corresponding - NixOS module have been renamed to <literal>unpoller</literal> - to match upstream. - </para> - </listitem> - <listitem> - <para> - The new option - <literal>services.tailscale.useRoutingFeatures</literal> - 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 - <literal>server</literal>, otherwise if you wish to use an - exit node you can set this setting to - <literal>client</literal>. The strict RPF warning has been - removed as the RPF will be loosened automatically based on the - value of this setting. - </para> - </listitem> - <listitem> - <para> - <link xlink:href="https://xastir.org/index.php/Main_Page">Xastir</link> - can now access AX.25 interfaces via the - <literal>libax25</literal> package. - </para> - </listitem> - <listitem> - <para> - <literal>nixos-version</literal> now accepts - <literal>--configuration-revision</literal> to display more - information about the current generation revision - </para> - </listitem> - <listitem> - <para> - The option - <literal>services.nomad.extraSettingsPlugins</literal> has - been fixed to allow more than one plugin in the path. - </para> - </listitem> - <listitem> - <para> - A new option was added to the virtualisation module that - enables specifying explicitly named network interfaces in QEMU - VMs. The existing <literal>virtualisation.vlans</literal> is - still supported for cases where the name of the network - interface is irrelevant. - </para> - </listitem> - </itemizedlist> - </section> -</section> diff --git a/nixos/doc/manual/installation/installation.md b/nixos/doc/manual/installation/installation.md new file mode 100644 index 0000000000000..140594256609f --- /dev/null +++ b/nixos/doc/manual/installation/installation.md @@ -0,0 +1,11 @@ +# Installation {#ch-installation} + +This section describes how to obtain, install, and configure NixOS for first-time use. + +```{=include=} chapters +obtaining.chapter.md +installing.chapter.md +changing-config.chapter.md +upgrading.chapter.md +building-nixos.chapter.md +``` diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml deleted file mode 100644 index ba07d71d0ca35..0000000000000 --- a/nixos/doc/manual/installation/installation.xml +++ /dev/null @@ -1,18 +0,0 @@ -<part xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-installation"> - <title>Installation</title> - <partintro xml:id="ch-installation-intro"> - <para> - This section describes how to obtain, install, and configure NixOS for - first-time use. - </para> - </partintro> - <xi:include href="../from_md/installation/obtaining.chapter.xml" /> - <xi:include href="../from_md/installation/installing.chapter.xml" /> - <xi:include href="../from_md/installation/changing-config.chapter.xml" /> - <xi:include href="../from_md/installation/upgrading.chapter.xml" /> - <xi:include href="../from_md/installation/building-nixos.chapter.xml" /> -</part> diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index ac7cf5a7bfc59..7d67894e59f92 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -15,16 +15,16 @@ To begin the installation, you have to boot your computer from the install drive ::: {.note} The key to open the boot menu is different across computer brands and even - models. It can be <kbd>F12</kbd>, but also <kbd>F1</kbd>, - <kbd>F9</kbd>, <kbd>F10</kbd>, <kbd>Enter</kbd>, <kbd>Del</kbd>, - <kbd>Esc</kbd> or another function key. If you are unsure and don't see + models. It can be [F12]{.keycap}, but also [F1]{.keycap}, + [F9]{.keycap}, [F10]{.keycap}, [Enter]{.keycap}, [Del]{.keycap}, + [Esc]{.keycap} or another function key. If you are unsure and don't see it on the early boot screen, you can search online for your computers brand, model followed by "boot from usb". The computer might not even have that feature, so you have to go into the BIOS/UEFI settings to change the boot order. Again, search online for details about your specific computer model. - For Apple computers with Intel processors press and hold the <kbd>⌥</kbd> + For Apple computers with Intel processors press and hold the [⌥]{.keycap} (Option or Alt) key until you see the boot menu. On Apple silicon press and hold the power button. ::: @@ -41,7 +41,7 @@ To begin the installation, you have to boot your computer from the install drive 3. Shortly after selecting the appropriate boot drive, you should be presented with a menu with different installer options. Leave the default - and wait (or press <kbd>Enter</kbd> to speed up). + and wait (or press [Enter]{.keycap} to speed up). 4. The graphical images will start their corresponding desktop environment and the graphical installer, which can take some time. The minimal images @@ -421,14 +421,14 @@ Use the following commands: specify on which disk the GRUB boot loader is to be installed. Without it, NixOS cannot boot. - : If there are other operating systems running on the machine before + If there are other operating systems running on the machine before installing NixOS, the [](#opt-boot.loader.grub.useOSProber) option can be set to `true` to automatically add them to the grub menu. UEFI systems - : You must select a boot-loader, either system-boot or GRUB. The recommended + : You must select a boot-loader, either systemd-boot or GRUB. The recommended option is systemd-boot: set the option [](#opt-boot.loader.systemd-boot.enable) to `true`. `nixos-generate-config` should do this automatically for new configurations when booted in UEFI mode. @@ -438,13 +438,13 @@ Use the following commands: [`boot.loader.systemd-boot`](#opt-boot.loader.systemd-boot.enable) as well. - : If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and + If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and [](#opt-boot.loader.grub.efiSupport) to `true`. - : With system-boot, you should not need any special configuration to detect + With systemd-boot, you should not need any special configuration to detect other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber) - to `true`, but this will only detect windows partitions, not other linux - distributions. If you dual boot another linux distribution, use system-boot + to `true`, but this will only detect windows partitions, not other Linux + distributions. If you dual boot another Linux distribution, use systemd-boot instead. If you need to configure networking for your machine the @@ -538,9 +538,7 @@ drive (here `/dev/sda`). [Example: NixOS Configuration](#ex-config) shows a corresponding configuration Nix expression. ::: {#ex-partition-scheme-MBR .example} -::: {.title} **Example: Example partition schemes for NixOS on `/dev/sda` (MBR)** -::: ```ShellSession # parted /dev/sda -- mklabel msdos # parted /dev/sda -- mkpart primary 1MB -8GB @@ -549,9 +547,7 @@ corresponding configuration Nix expression. ::: ::: {#ex-partition-scheme-UEFI .example} -::: {.title} **Example: Example partition schemes for NixOS on `/dev/sda` (UEFI)** -::: ```ShellSession # parted /dev/sda -- mklabel gpt # parted /dev/sda -- mkpart primary 512MB -8GB @@ -562,9 +558,8 @@ corresponding configuration Nix expression. ::: ::: {#ex-install-sequence .example} -::: {.title} **Example: Commands for Installing NixOS on `/dev/sda`** -::: + With a partitioned disk. ```ShellSession @@ -583,9 +578,7 @@ With a partitioned disk. ::: ::: {#ex-config .example} -::: {.title} **Example: NixOS Configuration** -::: ```ShellSession { config, pkgs, ... }: { imports = [ @@ -609,11 +602,11 @@ With a partitioned disk. ## Additional installation notes {#sec-installation-additional-notes} -```{=docbook} -<xi:include href="installing-usb.section.xml" /> -<xi:include href="installing-pxe.section.xml" /> -<xi:include href="installing-kexec.section.xml" /> -<xi:include href="installing-virtualbox-guest.section.xml" /> -<xi:include href="installing-from-other-distro.section.xml" /> -<xi:include href="installing-behind-a-proxy.section.xml" /> +```{=include=} sections +installing-usb.section.md +installing-pxe.section.md +installing-kexec.section.md +installing-virtualbox-guest.section.md +installing-from-other-distro.section.md +installing-behind-a-proxy.section.md ``` diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml deleted file mode 100644 index ddb1408fdcf59..0000000000000 --- a/nixos/doc/manual/man-configuration.xml +++ /dev/null @@ -1,31 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><filename>configuration.nix</filename> - </refentrytitle><manvolnum>5</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><filename>configuration.nix</filename></refname> - <refpurpose>NixOS system configuration specification</refpurpose> - </refnamediv> - <refsection> - <title>Description</title> - <para> - The file <filename>/etc/nixos/configuration.nix</filename> contains the - declarative specification of your NixOS system configuration. The command - <command>nixos-rebuild</command> takes this file and realises the system - configuration specified therein. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - You can use the following options in <filename>configuration.nix</filename>. - </para> - <xi:include href="./generated/options-db.xml" - xpointer="configuration-variable-list" /> - </refsection> -</refentry> 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 fa7c8c0c6d799..0000000000000 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ /dev/null @@ -1,138 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-build-vms</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-build-vms</command></refname> - <refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-build-vms</command> - <arg> - <option>--show-trace</option> - </arg> - - <arg> - <option>--no-out-link</option> - </arg> - - <arg> - <option>--help</option> - </arg> - - <arg> - <option>--option</option> - <replaceable>name</replaceable> - <replaceable>value</replaceable> - </arg> - - <arg choice="plain"> - <replaceable>network.nix</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - 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 <filename>bin/run-vms</filename> shell script - that is generated by this command. By default, a <filename>result</filename> - symlink is produced that points to the generated virtual network. - </para> - <para> - A network Nix expression has the following structure: -<screen> -{ - 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 - }; -} -</screen> - Each attribute in the expression represents a machine in the network (e.g. - <varname>test1</varname> and <varname>test2</varname>) referring to a - function defining a NixOS configuration. In each NixOS configuration, two - attributes have a special meaning. The - <varname>deployment.targetHost</varname> specifies the address (domain name - or IP address) of the system which is used by <command>ssh</command> to - perform remote deployment operations. The - <varname>nixpkgs.localSystem.system</varname> attribute can be used to - specify an architecture for the target machine, such as - <varname>i686-linux</varname> which builds a 32-bit NixOS configuration. - Omitting this property will build the configuration for the same - architecture as the host system. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term> - <option>--show-trace</option> - </term> - <listitem> - <para> - Shows a trace of the output. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--no-out-link</option> - </term> - <listitem> - <para> - Do not create a 'result' symlink. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>-h</option>, <option>--help</option> - </term> - <listitem> - <para> - Shows the usage of this command to the user. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> - </term> - <listitem> - <para>Set the Nix configuration option - <replaceable>name</replaceable> to <replaceable>value</replaceable>. - This overrides settings in the Nix configuration file (see - <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml deleted file mode 100644 index 41f0e6b975159..0000000000000 --- a/nixos/doc/manual/man-nixos-enter.xml +++ /dev/null @@ -1,154 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-enter</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-enter</command></refname> - <refpurpose>run a command in a NixOS chroot environment</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-enter</command> - <arg> - <arg choice='plain'> - <option>--root</option> - </arg> - <replaceable>root</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--system</option> - </arg> - <replaceable>system</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>-c</option> - </arg> - <replaceable>shell-command</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--silent</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--help</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--</option> - </arg> - <replaceable>arguments</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command runs a command in a NixOS chroot environment, that is, in a - filesystem hierarchy previously prepared using - <command>nixos-install</command>. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term> - <option>--root</option> - </term> - <listitem> - <para> - The path to the NixOS system you want to enter. It defaults to - <filename>/mnt</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--system</option> - </term> - <listitem> - <para> - The NixOS system configuration to use. It defaults to - <filename>/nix/var/nix/profiles/system</filename>. You can enter a - previous NixOS configuration by specifying a path such as - <filename>/nix/var/nix/profiles/system-106-link</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--command</option> - </term> - <term> - <option>-c</option> - </term> - <listitem> - <para> - The bash command to execute. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--silent</option> - </term> - <listitem> - <para> - Suppresses all output from the activation script of the target system. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--</option> - </term> - <listitem> - <para> - Interpret the remaining arguments as the program name and arguments to be - invoked. The program is not executed in a shell. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - Start an interactive shell in the NixOS installation in - <filename>/mnt</filename>: - </para> -<screen> -<prompt># </prompt>nixos-enter --root /mnt -</screen> - <para> - Run a shell command: - </para> -<screen> -<prompt># </prompt>nixos-enter -c 'ls -l /; cat /proc/mounts' -</screen> - <para> - Run a non-shell command: - </para> -<screen> -# nixos-enter -- cat /proc/mounts -</screen> - </refsection> -</refentry> 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 9ac3b918ff693..0000000000000 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ /dev/null @@ -1,214 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-generate-config</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-generate-config</command></refname> - <refpurpose>generate NixOS configuration modules</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-generate-config</command> - <arg> - <option>--force</option> - </arg> - - <arg> - <arg choice='plain'> - <option>--root</option> - </arg> - <replaceable>root</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--dir</option> - </arg> - <replaceable>dir</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command writes two NixOS configuration modules: - <variablelist> - <varlistentry> - <term> - <option>/etc/nixos/hardware-configuration.nix</option> - </term> - <listitem> - <para> - This module sets NixOS configuration options based on your current - hardware configuration. In particular, it sets the - <option>fileSystem</option> option to reflect all currently mounted file - systems, the <option>swapDevices</option> option to reflect active swap - devices, and the <option>boot.initrd.*</option> options to ensure that - the initial ramdisk contains any kernel modules necessary for mounting - the root file system. - </para> - <para> - If this file already exists, it is overwritten. Thus, you should not - modify it manually. Rather, you should include it from your - <filename>/etc/nixos/configuration.nix</filename>, and re-run - <command>nixos-generate-config</command> to update it whenever your - hardware configuration changes. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>/etc/nixos/configuration.nix</option> - </term> - <listitem> - <para> - This is the main NixOS system configuration module. If it already - exists, it’s left unchanged. Otherwise, - <command>nixos-generate-config</command> will write a template for you - to customise. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term> - <option>--root</option> - </term> - <listitem> - <para> - If this option is given, treat the directory - <replaceable>root</replaceable> as the root of the file system. This - means that configuration files will be written to - <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that - any file systems outside of <replaceable>root</replaceable> are ignored - for the purpose of generating the <option>fileSystems</option> option. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--dir</option> - </term> - <listitem> - <para> - If this option is given, write the configuration files to the directory - <replaceable>dir</replaceable> instead of - <filename>/etc/nixos</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--force</option> - </term> - <listitem> - <para> - Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already - exists. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--no-filesystems</option> - </term> - <listitem> - <para> - Omit everything concerning file systems and swap devices from the - hardware configuration. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--show-hardware-config</option> - </term> - <listitem> - <para> - Don't generate <filename>configuration.nix</filename> or - <filename>hardware-configuration.nix</filename> and print the hardware - configuration to stdout only. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - 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 <filename>/mnt</filename> and - <filename>/mnt/boot</filename>, you would run: -<screen> -<prompt>$ </prompt>nixos-generate-config --root /mnt -</screen> - The resulting file - <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look - like this: -<programlisting> -# 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; -} -</programlisting> - It will also create a basic - <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit - to customise the logical configuration of your system. This file includes - the result of the hardware scan as follows: -<programlisting> - imports = [ ./hardware-configuration.nix ]; -</programlisting> - </para> - <para> - After installation, if your hardware configuration changes, you can run: -<screen> -<prompt>$ </prompt>nixos-generate-config -</screen> - to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your - <filename>/etc/nixos/configuration.nix</filename> will - <emphasis>not</emphasis> be overwritten. - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml deleted file mode 100644 index eb6680b65677e..0000000000000 --- a/nixos/doc/manual/man-nixos-install.xml +++ /dev/null @@ -1,357 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-install</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-install</command></refname> - <refpurpose>install bootloader and NixOS</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-install</command> - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--verbose</option> - </arg> - <arg choice='plain'> - <option>-v</option> - </arg> - </group> - </arg> - <arg> - <arg choice='plain'> - <option>-I</option> - </arg> - <replaceable>path</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--root</option> - </arg> - <replaceable>root</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--system</option> - </arg> - <replaceable>path</replaceable> - </arg> - - <arg> - <option>--flake</option> <replaceable>flake-uri</replaceable> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'><option>--impure</option></arg> - </group> - </arg> - - <arg> - <arg choice='plain'> - <option>--channel</option> - </arg> - <replaceable>channel</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--no-channel-copy</option> - </arg> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--no-root-password</option> - </arg> - <arg choice='plain'> - <option>--no-root-passwd</option> - </arg> - </group> - </arg> - - <arg> - <arg choice='plain'> - <option>--no-bootloader</option> - </arg> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--max-jobs</option> - </arg> - - <arg choice='plain'> - <option>-j</option> - </arg> - </group> <replaceable>number</replaceable> - </arg> - - <arg> - <option>--cores</option> <replaceable>number</replaceable> - </arg> - - <arg> - <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--show-trace</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--keep-going</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--help</option> - </arg> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command installs NixOS in the file system mounted on - <filename>/mnt</filename>, based on the NixOS configuration specified in - <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the - following steps: - <itemizedlist> - <listitem> - <para> - It copies Nix and its dependencies to - <filename>/mnt/nix/store</filename>. - </para> - </listitem> - <listitem> - <para> - It runs Nix in <filename>/mnt</filename> to build the NixOS configuration - specified in <filename>/mnt/etc/nixos/configuration.nix</filename>. - </para> - </listitem> - <listitem> - <para> - It installs the current channel <quote>nixos</quote> in the target channel - profile (unless <option>--no-channel-copy</option> is specified). - </para> - </listitem> - <listitem> - <para> - It installs the GRUB boot loader on the device specified in the option - <option>boot.loader.grub.device</option> (unless - <option>--no-bootloader</option> is specified), and generates a GRUB - configuration file that boots into the NixOS configuration just - installed. - </para> - </listitem> - <listitem> - <para> - It prompts you for a password for the root account (unless - <option>--no-root-password</option> is specified). - </para> - </listitem> - </itemizedlist> - </para> - <para> - 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. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term><option>--verbose</option> / <option>-v</option></term> - <listitem> - <para>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.</para> - <para>Please note that this option may be specified repeatedly.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--root</option> - </term> - <listitem> - <para> - Defaults to <filename>/mnt</filename>. If this option is given, treat the - directory <replaceable>root</replaceable> as the root of the NixOS - installation. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--system</option> - </term> - <listitem> - <para> - If this option is provided, <command>nixos-install</command> will install - the specified closure rather than attempt to build one from - <filename>/mnt/etc/nixos/configuration.nix</filename>. - </para> - <para> - 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 <command>nix-build - -I nixos-config=./configuration.nix '<nixpkgs/nixos>' -A system - --no-out-link</command> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--flake</option> <replaceable>flake-uri</replaceable>#<replaceable>name</replaceable> - </term> - <listitem> - <para> - Build the NixOS system from the specified flake. - The flake must contain an output named - <literal>nixosConfigurations.<replaceable>name</replaceable></literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--channel</option> - </term> - <listitem> - <para> - If this option is provided, do not copy the current - <quote>nixos</quote> channel to the target host. Instead, use the - specified derivation. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>-I</option> - </term> - <listitem> - <para> - 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 - <replaceable>-I</replaceable> take precedence over NIX_PATH. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--max-jobs</option> - </term> - <term> - <option>-j</option> - </term> - <listitem> - <para> - Sets the maximum number of build jobs that Nix will perform in parallel - to the specified number. The default is <literal>1</literal>. A higher - value is useful on SMP systems or to exploit I/O latency. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--cores</option> - </term> - <listitem> - <para> - Sets the value of the <envar>NIX_BUILD_CORES</envar> 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 - <varname>enableParallelBuilding</varname> is set to - <literal>true</literal>, the builder passes the - <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The - value <literal>0</literal> means that the builder should use all - available CPU cores in the system. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> - </term> - <listitem> - <para> - Set the Nix configuration option <replaceable>name</replaceable> to - <replaceable>value</replaceable>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--show-trace</option> - </term> - <listitem> - <para> - Causes Nix to print out a stack trace in case of Nix expression - evaluation errors. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--keep-going</option> - </term> - <listitem> - <para> - Causes Nix to continue building derivations as far as possible - in the face of failed builds. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--help</option> - </term> - <listitem> - <para> - Synonym for <command>man nixos-install</command>. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - A typical NixOS installation is done by creating and mounting a file system - on <filename>/mnt</filename>, generating a NixOS configuration in - <filename>/mnt/etc/nixos/configuration.nix</filename>, and running - <command>nixos-install</command>. For instance, if we want to install NixOS - on an <literal>ext4</literal> file system created in - <filename>/dev/sda1</filename>: -<screen> -<prompt>$ </prompt>mkfs.ext4 /dev/sda1 -<prompt>$ </prompt>mount /dev/sda1 /mnt -<prompt>$ </prompt>nixos-generate-config --root /mnt -<prompt>$ </prompt># edit /mnt/etc/nixos/configuration.nix -<prompt>$ </prompt>nixos-install -<prompt>$ </prompt>reboot -</screen> - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml deleted file mode 100644 index b921386d0df01..0000000000000 --- a/nixos/doc/manual/man-nixos-option.xml +++ /dev/null @@ -1,134 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-option</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-option</command></refname> - <refpurpose>inspect a NixOS configuration</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-option</command> - - <arg> - <group choice='req'> - <arg choice='plain'><option>-r</option></arg> - <arg choice='plain'><option>--recursive</option></arg> - </group> - </arg> - - <arg> - <option>-I</option> <replaceable>path</replaceable> - </arg> - - <arg> - <replaceable>option.name</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command evaluates the configuration specified in - <filename>/etc/nixos/configuration.nix</filename> and returns the properties - of the option name given as argument. - </para> - <para> - When the option name is not an option, the command prints the list of - attributes contained in the attribute set. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term><option>-r</option></term> - <term><option>--recursive</option></term> - <listitem> - <para> - Print all the values at or below the specified path recursively. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>-I</option> <replaceable>path</replaceable> - </term> - <listitem> - <para> - This option is passed to the underlying - <command>nix-instantiate</command> invocation. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Environment</title> - <variablelist> - <varlistentry> - <term> - <envar>NIXOS_CONFIG</envar> - </term> - <listitem> - <para> - Path to the main NixOS configuration module. Defaults to - <filename>/etc/nixos/configuration.nix</filename>. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - Investigate option values: -<screen><prompt>$ </prompt>nixos-option boot.loader -This attribute set contains: -generationsDir -grub -initScript - -<prompt>$ </prompt>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" -</screen> - </para> - </refsection> - <refsection> - <title>Bugs</title> - <para> - The author listed in the following section is wrong. If there is any other - bug, please report to Nicolas Pierron. - </para> - </refsection> - <refsection> - <title>See also</title> - <para> - <citerefentry> - <refentrytitle>configuration.nix</refentrytitle> - <manvolnum>5</manvolnum> - </citerefentry> - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml deleted file mode 100644 index bf0f4aafa1429..0000000000000 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ /dev/null @@ -1,781 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-rebuild</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - - <refnamediv> - <refname><command>nixos-rebuild</command></refname> - <refpurpose>reconfigure a NixOS machine</refpurpose> - </refnamediv> - - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-rebuild</command><group choice='req'> - <arg choice='plain'> - <option>switch</option> - </arg> - - <arg choice='plain'> - <option>boot</option> - </arg> - - <arg choice='plain'> - <option>test</option> - </arg> - - <arg choice='plain'> - <option>build</option> - </arg> - - <arg choice='plain'> - <option>dry-build</option> - </arg> - - <arg choice='plain'> - <option>dry-activate</option> - </arg> - - <arg choice='plain'> - <option>edit</option> - </arg> - - <arg choice='plain'> - <option>build-vm</option> - </arg> - - <arg choice='plain'> - <option>build-vm-with-bootloader</option> - </arg> - </group> - <sbr /> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--upgrade</option> - </arg> - <arg choice='plain'> - <option>--upgrade-all</option> - </arg> - </group> - </arg> - - <arg> - <option>--install-bootloader</option> - </arg> - - <arg> - <option>--no-build-nix</option> - </arg> - - <arg> - <option>--fast</option> - </arg> - - <arg> - <option>--rollback</option> - </arg> - - <arg> - <option>--builders</option> <replaceable>builder-spec</replaceable> - </arg> - - <sbr/> - - <arg> - <option>--flake</option> <replaceable>flake-uri</replaceable> - </arg> - - <arg> - <option>--no-flake</option> - </arg> - - <arg> - <option>--override-input</option> <replaceable>input-name</replaceable> <replaceable>flake-uri</replaceable> - </arg> - - <sbr /> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--profile-name</option> - </arg> - - <arg choice='plain'> - <option>-p</option> - </arg> - </group> <replaceable>name</replaceable> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--specialisation</option> - </arg> - - <arg choice='plain'> - <option>-c</option> - </arg> - </group> <replaceable>name</replaceable> - </arg> - - <sbr /> - - <arg> - <option>--build-host</option> <replaceable>host</replaceable> - </arg> - - <arg> - <option>--target-host</option> <replaceable>host</replaceable> - </arg> - - <arg> - <option>--use-remote-sudo</option> - </arg> - - <sbr /> - - <arg> - <option>--show-trace</option> - </arg> - <arg> - <option>-I</option> - <replaceable>NIX_PATH</replaceable> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--verbose</option></arg> - <arg choice='plain'><option>-v</option></arg> - </group> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--impure</option></arg> - </group> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--max-jobs</option></arg> - <arg choice='plain'><option>-j</option></arg> - </group> - <replaceable>number</replaceable> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--keep-failed</option></arg> - <arg choice='plain'><option>-K</option></arg> - </group> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--keep-going</option></arg> - <arg choice='plain'><option>-k</option></arg> - </group> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - - <refsection> - <title>Description</title> - - <para> - This command updates the system so that it corresponds to the - configuration specified in - <filename>/etc/nixos/configuration.nix</filename> or - <filename>/etc/nixos/flake.nix</filename>. Thus, every time you - modify the configuration or any other NixOS module, you must run - <command>nixos-rebuild</command> to make the changes take - effect. It builds the new system in - <filename>/nix/store</filename>, 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. - </para> - - <para> - This command has one required argument, which specifies the desired - operation. It must be one of the following: - - <variablelist> - <varlistentry> - <term> - <option>switch</option> - </term> - <listitem> - <para> - 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 - <command>nixos-rebuild switch</command> or <command>nixos-rebuild - boot</command> remain available in the GRUB menu. - </para> - <para> - Note that if you are using specializations, running just - <command>nixos-rebuild switch</command> will switch you back to the - unspecialized, base system - in that case, you might want to use this - instead: -<screen> -<prompt>$ </prompt>nixos-rebuild switch --specialisation your-specialisation-name -</screen> - This command will build all specialisations and make them bootable just - like regular <command>nixos-rebuild switch</command> does - 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. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>boot</option> - </term> - <listitem> - <para> - Build the new configuration and make it the boot default (as with - <command>nixos-rebuild switch</command>), but do not activate it. That - is, the system continues to run the previous configuration until the - next reboot. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>test</option> - </term> - <listitem> - <para> - 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 <command>nixos-rebuild - switch</command> or <command>nixos-rebuild boot</command>). - </para> - <para> - Note that if you are using specialisations, running just - <command>nixos-rebuild test</command> will activate the unspecialised, - base system - in that case, you might want to use this instead: -<screen> -<prompt>$ </prompt>nixos-rebuild test --specialisation your-specialisation-name -</screen> - This command can be also used to switch from the base system into a - specialised one, or to switch between specialisations. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>build</option> - </term> - <listitem> - <para> - Build the new configuration, but neither activate it nor add it to the - GRUB boot menu. It leaves a symlink named <filename>result</filename> in - the current directory, which points to the output of the top-level - “system” derivation. This is essentially the same as doing -<screen> -<prompt>$ </prompt>nix-build /path/to/nixpkgs/nixos -A system -</screen> - Note that you do not need to be <literal>root</literal> to run - <command>nixos-rebuild build</command>. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>dry-build</option> - </term> - <listitem> - <para> - Show what store paths would be built or downloaded by any of the - operations above, but otherwise do nothing. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>dry-activate</option> - </term> - <listitem> - <para> - Build the new configuration, but instead of activating it, show what - changes would be performed by the activation (i.e. by - <command>nixos-rebuild test</command>). For instance, this command will - print which systemd units would be restarted. The list of changes is not - guaranteed to be complete. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>edit</option> - </term> - <listitem> - <para> - Opens <filename>configuration.nix</filename> in the default editor. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>build-vm</option> - </term> - <listitem> - <para> - Build a script that starts a NixOS virtual machine with the desired - configuration. It leaves a symlink <filename>result</filename> in the - current directory that points (under - <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>) - at the script that starts the VM. Thus, to test a NixOS configuration in - a virtual machine, you should do the following: -<screen> -<prompt>$ </prompt>nixos-rebuild build-vm -<prompt>$ </prompt>./result/bin/run-*-vm -</screen> - </para> - - <para> - The VM is implemented using the <literal>qemu</literal> package. For - best performance, you should load the <literal>kvm-intel</literal> or - <literal>kvm-amd</literal> kernel modules to get hardware - virtualisation. - </para> - - <para> - 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 - <command>nixos-rebuild</command>; to change the VM’s configuration, - you must halt the VM and re-run the commands above. - </para> - - <para> - The VM has its own <literal>ext3</literal> 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 - <literal>./<replaceable>hostname</replaceable>.qcow2</literal>. -<!-- The entire file system hierarchy of the host is available in - the VM under <filename>/hostfs</filename>.--> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>build-vm-with-bootloader</option> - </term> - <listitem> - <para> - Like <option>build-vm</option>, 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 <command>nixos-rebuild - switch</command>), 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 <filename>/boot</filename> - partition. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsection> - - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - - <variablelist> - <varlistentry> - <term> - <option>--upgrade</option> - </term> - <term> - <option>--upgrade-all</option> - </term> - <listitem> - <para> - Update the root user's channel named <literal>nixos</literal> - before rebuilding the system. - </para> - <para> - In addition to the <literal>nixos</literal> channel, the root - user's channels which have a file named - <literal>.update-on-nixos-rebuild</literal> in their base - directory will also be updated. - </para> - <para> - Passing <option>--upgrade-all</option> updates all of the root - user's channels. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--install-bootloader</option> - </term> - <listitem> - <para> - Causes the boot loader to be (re)installed on the device specified by the - relevant configuration options. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--no-build-nix</option> - </term> - <listitem> - <para> - Normally, <command>nixos-rebuild</command> first builds the - <varname>nixUnstable</varname> 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. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--fast</option> - </term> - <listitem> - <para> - Equivalent to <option>--no-build-nix</option>. This option is - useful if you call <command>nixos-rebuild</command> frequently - (e.g. if you’re hacking on a NixOS module). - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--rollback</option> - </term> - <listitem> - <para> - Instead of building a new configuration as specified by - <filename>/etc/nixos/configuration.nix</filename>, roll back to the - previous configuration. (The previous configuration is defined as the one - before the “current” generation of the Nix profile - <filename>/nix/var/nix/profiles/system</filename>.) - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--builders</option> <replaceable>builder-spec</replaceable> - </term> - <listitem> - <para> - Allow ad-hoc remote builders for building the new system. This requires - the user executing <command>nixos-rebuild</command> (usually root) to be - configured as a trusted user in the Nix daemon. This can be achieved by - using the <literal>nix.settings.trusted-users</literal> NixOS option. Examples - values for that option are described in the <literal>Remote builds - chapter</literal> in the Nix manual, (i.e. <command>--builders - "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string - existing builders specified in <filename>/etc/nix/machines</filename> can - be ignored: <command>--builders ""</command> for example when they are - not reachable due to network connectivity. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--profile-name</option> - </term> - <term> - <option>-p</option> - </term> - <listitem> - <para> - Instead of using the Nix profile - <filename>/nix/var/nix/profiles/system</filename> to keep track of the - current and previous system configurations, use - <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>. - When you use GRUB 2, for every system profile created with this flag, - NixOS will create a submenu named “NixOS - Profile - '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing - the current and previous configurations of this profile. - </para> - <para> - For instance, if you want to test a configuration file named - <filename>test.nix</filename> without affecting the default system - profile, you would do: -<screen> -<prompt>$ </prompt>nixos-rebuild switch -p test -I nixos-config=./test.nix -</screen> - The new configuration will appear in the GRUB 2 submenu “NixOS - - Profile 'test'”. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--specialisation</option> - </term> - <term> - <option>-c</option> - </term> - <listitem> - <para> - Activates given specialisation; when not specified, switching and testing - will activate the base, unspecialised system. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--build-host</option> - </term> - <listitem> - <para> - 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 - <option>--target-host</option> is not set, the build will be copied back - to the local machine when done. - </para> - <para> - Note that, if <option>--no-build-nix</option> 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. - </para> - <para> - You can include a remote user name in the host name - (<replaceable>user@host</replaceable>). You can also set ssh options by - defining the <envar>NIX_SSHOPTS</envar> environment variable. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--target-host</option> - </term> - <listitem> - <para> - 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 ssh, and for the commands <option>switch</option>, - <option>boot</option> and <option>test</option> you need root access. - </para> - - <para> - If <option>--build-host</option> is not explicitly specified or empty, - building will take place locally. - </para> - - <para> - You can include a remote user name in the host name - (<replaceable>user@host</replaceable>). You can also set ssh options by - defining the <envar>NIX_SSHOPTS</envar> environment variable. - </para> - - <para> - Note that <command>nixos-rebuild</command> honors the - <literal>nixpkgs.crossSystem</literal> setting of the given configuration - but disregards the true architecture of the target host. Hence the - <literal>nixpkgs.crossSystem</literal> setting has to match the target - platform or else activation will fail. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--use-substitutes</option> - </term> - <listitem> - <para> - When set, nixos-rebuild will add <option>--use-substitutes</option> - to each invocation of nix-copy-closure. This will only affect the - behavior of nixos-rebuild if <option>--target-host</option> or - <option>--build-host</option> is also set. This is useful when - the target-host connection to cache.nixos.org is faster than the - connection between hosts. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--use-remote-sudo</option> - </term> - <listitem> - <para> - When set, nixos-rebuild prefixes remote commands that run on - the <option>--build-host</option> and <option>--target-host</option> - systems with <command>sudo</command>. Setting this option allows - deploying as a non-root user. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--flake</option> <replaceable>flake-uri</replaceable><optional>#<replaceable>name</replaceable></optional> - </term> - <listitem> - <para> - Build the NixOS system from the specified flake. It defaults to - the directory containing the target of the symlink - <filename>/etc/nixos/flake.nix</filename>, if it exists. The - flake must contain an output named - <literal>nixosConfigurations.<replaceable>name</replaceable></literal>. If - <replaceable>name</replaceable> is omitted, it default to the - current host name. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--no-flake</option> - </term> - <listitem> - <para> - Do not imply <option>--flake</option> if - <filename>/etc/nixos/flake.nix</filename> exists. With this - option, it is possible to build non-flake NixOS configurations - even if the current NixOS systems uses flakes. - </para> - </listitem> - </varlistentry> - - </variablelist> - - <para> - In addition, <command>nixos-rebuild</command> accepts various Nix-related - flags, including <option>--max-jobs</option> / <option>-j</option>, <option>-I</option>, - <option>--show-trace</option>, <option>--keep-failed</option>, - <option>--keep-going</option>, <option>--impure</option>, and <option>--verbose</option> / - <option>-v</option>. See the Nix manual for details. - </para> - </refsection> - - <refsection> - <title>Environment</title> - - <variablelist> - <varlistentry> - <term> - <envar>NIXOS_CONFIG</envar> - </term> - <listitem> - <para> - Path to the main NixOS configuration module. Defaults to - <filename>/etc/nixos/configuration.nix</filename>. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <envar>NIX_PATH</envar> - </term> - <listitem> - <para> - A colon-separated list of directories used to look up Nix expressions enclosed in angle brackets (e.g <nixpkgs>). Example - <screen> - nixpkgs=./my-nixpkgs - </screen> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <envar>NIX_SSHOPTS</envar> - </term> - <listitem> - <para> - Additional options to be passed to <command>ssh</command> on the command - line. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - - <refsection> - <title>Files</title> - - <variablelist> - - <varlistentry> - <term> - <filename>/etc/nixos/flake.nix</filename> - </term> - <listitem> - <para> - If this file exists, then <command>nixos-rebuild</command> will - use it as if the <option>--flake</option> option was given. This - file may be a symlink to a <filename>flake.nix</filename> in an - actual flake; thus <filename>/etc/nixos</filename> need not be a - flake. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <filename>/run/current-system</filename> - </term> - <listitem> - <para> - A symlink to the currently active system configuration in the Nix store. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <filename>/nix/var/nix/profiles/system</filename> - </term> - <listitem> - <para> - The Nix profile that contains the current and previous system - configurations. Used to generate the GRUB boot menu. - </para> - </listitem> - </varlistentry> - - </variablelist> - </refsection> - - <refsection> - <title>Bugs</title> - <para> - This command should be renamed to something more descriptive. - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml deleted file mode 100644 index 507c5035ed8d1..0000000000000 --- a/nixos/doc/manual/man-nixos-version.xml +++ /dev/null @@ -1,158 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-version</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> - </refmeta> - <refnamediv> - <refname><command>nixos-version</command></refname> - <refpurpose>show the NixOS version</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-version</command> - <arg> - <option>--hash</option> - </arg> - - <arg> - <option>--revision</option> - </arg> - - <arg> - <option>--configuration-revision</option> - </arg> - - <arg> - <option>--json</option> - </arg> - - </cmdsynopsis> - </refsynopsisdiv> - - <refsection> - <title>Description</title> - <para> - This command shows the version of the currently active NixOS configuration. - For example: -<screen><prompt>$ </prompt>nixos-version -16.03.1011.6317da4 (Emu) -</screen> - The version consists of the following elements: - <variablelist> - <varlistentry> - <term> - <literal>16.03</literal> - </term> - <listitem> - <para> - The NixOS release, indicating the year and month in which it was - released (e.g. March 2016). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>1011</literal> - </term> - <listitem> - <para> - 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 - <literal>git</literal> when the current NixOS configuration was built - from a checkout of the Nixpkgs Git repository rather than from a NixOS - channel. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>6317da4</literal> - </term> - <listitem> - <para> - The first 7 characters of the commit in the Nixpkgs Git repository from - which this version was built. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>Emu</literal> - </term> - <listitem> - <para> - 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. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsection> - - <refsection> - <title>Options</title> - - <para> - This command accepts the following options: - </para> - - <variablelist> - - <varlistentry> - <term> - <option>--hash</option> - </term> - <term> - <option>--revision</option> - </term> - <listitem> - <para> - Show the full SHA1 hash of the Git commit from which this configuration - was built, e.g. -<screen><prompt>$ </prompt>nixos-version --hash -6317da40006f6bc2480c6781999c52d88dde2acf -</screen> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--configuration-revision</option> - </term> - <listitem> - <para> - Show the configuration revision if available. This could be the full SHA1 - hash of the Git commit of the system flake, if you add - <screen>{ system.configurationRevision = self.rev or "dirty"; }</screen> - to the <screen>modules</screen> array of your flake.nix system configuration e.g. -<screen><prompt>$ </prompt>nixos-version --configuration-revision -aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 -</screen> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--json</option> - </term> - <listitem> - <para> - Print a JSON representation of the versions of NixOS and the - top-level configuration flake. - </para> - </listitem> - </varlistentry> - - </variablelist> - - </refsection> - -</refentry> diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 58f73521e94fd..52183f1f9ee0c 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -14,12 +14,33 @@ <copyright><year>2007-2022</year><holder>Eelco Dolstra and the Nixpkgs/NixOS contributors</holder> </copyright> </info> - <xi:include href="man-configuration.xml" /> - <xi:include href="man-nixos-build-vms.xml" /> - <xi:include href="man-nixos-generate-config.xml" /> - <xi:include href="man-nixos-install.xml" /> - <xi:include href="man-nixos-enter.xml" /> - <xi:include href="man-nixos-option.xml" /> - <xi:include href="man-nixos-rebuild.xml" /> - <xi:include href="man-nixos-version.xml" /> + <refentry> + <refmeta> + <refentrytitle><filename>configuration.nix</filename> + </refentrytitle><manvolnum>5</manvolnum> + <refmiscinfo class="source">NixOS</refmiscinfo> + <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> + </refmeta> + <refnamediv> + <refname><filename>configuration.nix</filename></refname> + <refpurpose>NixOS system configuration specification</refpurpose> + </refnamediv> + <refsection> + <title>Description</title> + <para> + The file <filename>/etc/nixos/configuration.nix</filename> contains the + declarative specification of your NixOS system configuration. The command + <command>nixos-rebuild</command> takes this file and realises the system + configuration specified therein. + </para> + </refsection> + <refsection> + <title>Options</title> + <para> + You can use the following options in <filename>configuration.nix</filename>. + </para> + <xi:include href="./generated/options-db.xml" + xpointer="configuration-variable-list" /> + </refsection> + </refentry> </reference> diff --git a/nixos/doc/manual/manpages/README.md b/nixos/doc/manual/manpages/README.md new file mode 100644 index 0000000000000..9923f48239227 --- /dev/null +++ b/nixos/doc/manual/manpages/README.md @@ -0,0 +1,57 @@ +# 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.) + +For previewing edited files, you can just run `man -l path/to/file.8` and you will see it rendered. + +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 0000000000000..6a8f2c42eddfa --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-build-vms.8 @@ -0,0 +1,105 @@ +.Dd January 1, 1980 +.Dt nixos-build-vms 8 +.Os +.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 0000000000000..646f92199d62f --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-enter.8 @@ -0,0 +1,72 @@ +.Dd January 1, 1980 +.Dt nixos-enter 8 +.Os +.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 0000000000000..1b95599e156ae --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-generate-config.8 @@ -0,0 +1,165 @@ +.Dd January 1, 1980 +.Dt nixos-generate-config 8 +.Os +.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 = + [ <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; +} +.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 0000000000000..c6c8ed15224d3 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-install.8 @@ -0,0 +1,191 @@ +.Dd January 1, 1980 +.Dt nixos-install 8 +.Os +.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 '<nixpkgs/nixos>' -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 0000000000000..28438b03580b1 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-option.8 @@ -0,0 +1,89 @@ +.Dd January 1, 1980 +.Dt nixos-option 8 +.Os +.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 0000000000000..64bbbee411d7f --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-rebuild.8 @@ -0,0 +1,452 @@ +.Dd January 1, 1980 +.Dt nixos-rebuild 8 +.Os +.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. <nixpkgs>). 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 0000000000000..f661611599fb0 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-version.8 @@ -0,0 +1,86 @@ +.Dd January 1, 1980 +.Dt nixos-version 8 +.Os +.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/manual.md b/nixos/doc/manual/manual.md new file mode 100644 index 0000000000000..1972eaeda8728 --- /dev/null +++ b/nixos/doc/manual/manual.md @@ -0,0 +1,53 @@ +# NixOS Manual {#book-nixos-manual} +## Version @NIXOS_VERSION@ + +<!-- + this is the top-level structure file for the nixos manual. + + the manual structure extends the nixpkgs commonmark further with include + blocks to allow better organization of input text. there are six types of + include blocks: preface, parts, chapters, sections, appendix, and options. + each type except `options`` corresponds to the docbook elements of (roughly) + the same name, and can itself can further include blocks to denote its + substructure. + + non-`options`` include blocks are fenced code blocks that list a number of + files to include, in the form + + ```{=include=} <type> + <file-name-1> + <file-name-2> + <...> + ``` + + `options` include blocks do not list file names but contain a list of key-value + pairs that describe the options to be included and how to convert them into + elements of the manual output type: + + ```{=include=} options + id-prefix: <options id prefix> + list-id: <variable list element id> + source: <path to options.json> + ``` + +--> + +```{=include=} preface +preface.md +``` + +```{=include=} parts +installation/installation.md +configuration/configuration.md +administration/running.md +development/development.md +``` + +```{=include=} chapters +contributing-to-this-manual.chapter.md +``` + +```{=include=} appendix +nixos-options.md +release-notes/release-notes.md +``` diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml deleted file mode 100644 index 158b3507a58ea..0000000000000 --- a/nixos/doc/manual/manual.xml +++ /dev/null @@ -1,24 +0,0 @@ -<book xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="book-nixos-manual"> - <info> - <title>NixOS Manual</title> - <subtitle>Version <xi:include href="./generated/version" parse="text" /> - </subtitle> - </info> - <xi:include href="preface.xml" /> - <xi:include href="installation/installation.xml" /> - <xi:include href="configuration/configuration.xml" /> - <xi:include href="administration/running.xml" /> -<!-- <xi:include href="userconfiguration.xml" /> --> - <xi:include href="development/development.xml" /> - <appendix xml:id="ch-options"> - <title>Configuration Options</title> - <xi:include href="./generated/options-db.xml" - xpointer="configuration-variable-list" /> - </appendix> - <xi:include href="./from_md/contributing-to-this-manual.chapter.xml" /> - <xi:include href="release-notes/release-notes.xml" /> -</book> diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh deleted file mode 100755 index a7421bed532e8..0000000000000 --- a/nixos/doc/manual/md-to-db.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /usr/bin/env nix-shell -#! 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 -# into DocBook files in the from_md folder. - -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 -pandoc_flags=( - # Not needed: - # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) - # - 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=$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" - -f "commonmark${pandoc_commonmark_enabled_extensions}+smart" - -t docbook -) - -OUT="$DIR/from_md" -mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') - -for mf in ${MD_FILES[*]}; do - if [ "${mf: -11}" == ".section.md" ]; then - mkdir -p "$(dirname "$OUT/$mf")" - OUTFILE="$OUT/${mf%".section.md"}.section.xml" - pandoc "$mf" "${pandoc_flags[@]}" \ - -o "$OUTFILE" - grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" - fi - - if [ "${mf: -11}" == ".chapter.md" ]; then - mkdir -p "$(dirname "$OUT/$mf")" - OUTFILE="$OUT/${mf%".chapter.md"}.chapter.xml" - pandoc "$mf" "${pandoc_flags[@]}" \ - --top-level-division=chapter \ - -o "$OUTFILE" - grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" - fi -done - -popd - -# now handle module chapters. we'll need extra checks to ensure that we don't process -# markdown files we're not interested in, so we'll require an x.nix file for ever x.md -# that we'll convert to xml. -pushd "$DIR/../../modules" - -mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') - -for mf in ${MD_FILES[*]}; do - [ -f "${mf%.md}.nix" ] || continue - - pandoc --top-level-division=chapter "$mf" "${pandoc_flags[@]}" -o "${mf%.md}.xml" - sed -i -e '1 i <!-- Do not edit this file directly, edit its companion .md instead\ - and regenerate this file using nixos/doc/manual/md-to-db.sh -->' \ - "${mf%.md}.xml" -done - -popd diff --git a/nixos/doc/manual/nixos-options.md b/nixos/doc/manual/nixos-options.md new file mode 100644 index 0000000000000..33b487c95a2e1 --- /dev/null +++ b/nixos/doc/manual/nixos-options.md @@ -0,0 +1,7 @@ +# Configuration Options {#ch-options} + +```{=include=} options +id-prefix: opt- +list-id: configuration-variable-list +source: @NIXOS_OPTIONS_JSON@ +``` diff --git a/nixos/doc/manual/preface.md b/nixos/doc/manual/preface.md new file mode 100644 index 0000000000000..d5e6364780a7d --- /dev/null +++ b/nixos/doc/manual/preface.md @@ -0,0 +1,11 @@ +# Preface {#preface} + +This manual describes how to install, use and extend NixOS, a Linux distribution based on the purely functional package management system [Nix](https://nixos.org/nix), that is composed using modules and packages defined in the [Nixpkgs](https://nixos.org/nixpkgs) project. + +Additional information regarding the Nix package manager and the Nixpkgs project can be found in respectively the [Nix manual](https://nixos.org/nix/manual) and the [Nixpkgs manual](https://nixos.org/nixpkgs/manual). + +If you encounter problems, please report them on the [`Discourse`](https://discourse.nixos.org), the [Matrix room](https://matrix.to/#nix:nixos.org), or on the [`#nixos` channel on Libera.Chat](irc://irc.libera.chat/#nixos). Alternatively, consider [contributing to this manual](#chap-contributing). Bugs should be reported in [NixOS’ GitHub issue tracker](https://github.com/NixOS/nixpkgs/issues). + +::: {.note} +Commands prefixed with `#` have to be run as root, either requiring to login as root user or temporarily switching to it using `sudo` for example. +::: diff --git a/nixos/doc/manual/preface.xml b/nixos/doc/manual/preface.xml deleted file mode 100644 index c0d530c3d1b5b..0000000000000 --- a/nixos/doc/manual/preface.xml +++ /dev/null @@ -1,42 +0,0 @@ -<preface xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="preface"> - <title>Preface</title> - <para> - This manual describes how to install, use and extend NixOS, a Linux - distribution based on the purely functional package management system - <link xlink:href="https://nixos.org/nix">Nix</link>, that is composed - using modules and packages defined in the - <link xlink:href="https://nixos.org/nixpkgs">Nixpkgs</link> project. - </para> - <para> - Additional information regarding the Nix package manager and the Nixpkgs - project can be found in respectively the - <link xlink:href="https://nixos.org/nix/manual">Nix manual</link> and the - <link xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. - </para> - <para> - If you encounter problems, please report them on the - <literal - xlink:href="https://discourse.nixos.org">Discourse</literal>, - the <link - xlink:href="https://matrix.to/#nix:nixos.org">Matrix room</link>, - or on the <link - xlink:href="irc://irc.libera.chat/#nixos"> - <literal>#nixos</literal> channel on Libera.Chat</link>. - Alternatively, consider <link - xlink:href="#chap-contributing"> - contributing to this manual</link>. Bugs should be - reported in - <link - xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’ - GitHub issue tracker</link>. - </para> - <note> - <para> - Commands prefixed with <literal>#</literal> have to be run as root, either - requiring to login as root user or temporarily switching to it using - <literal>sudo</literal> for example. - </para> - </note> -</preface> diff --git a/nixos/doc/manual/release-notes/release-notes.md b/nixos/doc/manual/release-notes/release-notes.md new file mode 100644 index 0000000000000..ac61de3793e85 --- /dev/null +++ b/nixos/doc/manual/release-notes/release-notes.md @@ -0,0 +1,25 @@ +# Release Notes {#ch-release-notes} + +This section lists the release notes for each stable version of NixOS and current unstable revision. + +```{=include=} sections +rl-2305.section.md +rl-2211.section.md +rl-2205.section.md +rl-2111.section.md +rl-2105.section.md +rl-2009.section.md +rl-2003.section.md +rl-1909.section.md +rl-1903.section.md +rl-1809.section.md +rl-1803.section.md +rl-1709.section.md +rl-1703.section.md +rl-1609.section.md +rl-1603.section.md +rl-1509.section.md +rl-1412.section.md +rl-1404.section.md +rl-1310.section.md +``` diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml deleted file mode 100644 index bb5cc677afb80..0000000000000 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ /dev/null @@ -1,30 +0,0 @@ -<appendix xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="ch-release-notes"> - <title>Release Notes</title> - <para> - This section lists the release notes for each stable version of NixOS and - current unstable revision. - </para> - <xi:include href="../from_md/release-notes/rl-2305.section.xml" /> - <xi:include href="../from_md/release-notes/rl-2211.section.xml" /> - <xi:include href="../from_md/release-notes/rl-2205.section.xml" /> - <xi:include href="../from_md/release-notes/rl-2111.section.xml" /> - <xi:include href="../from_md/release-notes/rl-2105.section.xml" /> - <xi:include href="../from_md/release-notes/rl-2009.section.xml" /> - <xi:include href="../from_md/release-notes/rl-2003.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1909.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1903.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1809.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1803.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1709.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1703.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1609.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1603.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1509.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1412.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1404.section.xml" /> - <xi:include href="../from_md/release-notes/rl-1310.section.xml" /> -</appendix> diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 82a069632fe0e..f6a37b92a0985 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -10,6 +10,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed. +- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) 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} @@ -32,12 +34,22 @@ In addition to numerous new and upgraded packages, this release has the followin - [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). +- [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable). + +- [opensearch](https://opensearch.org), a search server alternative to Elasticsearch. Available as [services.opensearch](options.html#opt-services.opensearch.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). +- [tts](https://github.com/coqui-ai/TTS), a battle-tested deep learning toolkit for Text-to-Speech. Mutiple servers may be configured below [services.tts.servers](#opt-services.tts.servers). + - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). +- [networkd-dispatcher](https://gitlab.com/craftyguy/networkd-dispatcher), a dispatcher service for systemd-networkd connection status changes. Available as [services.networkd-dispatcher](#opt-services.networkd-dispatcher.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 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). @@ -46,20 +58,30 @@ In addition to numerous new and upgraded packages, this release has the followin - [autosuspend](https://github.com/languitar/autosuspend), a python daemon that suspends a system if certain conditions are met, or not met. +- [sharing](https://github.com/parvardegr/sharing), a command-line tool to share directories and files from the CLI to iOS and Android devices without the need of an extra client app. Available as [programs.sharing](#opt-programs.sharing.enable). + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> - `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 and go packages). +- `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`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). +- The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes` + - `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. +- `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative. + +- 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` @@ -77,6 +99,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `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. @@ -85,8 +109,18 @@ In addition to numerous new and upgraded packages, this release has the followin - 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. + +- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. + - 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. + +- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream. + +- Nebula now runs as a system user and group created for each nebula network, using the `CAP_NET_ADMIN` ambient capability on launch rather than starting as root. Ensure that any files each Nebula instance needs to access are owned by the correct user and group, by default `nebula-${networkName}`. + - 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. @@ -97,17 +131,34 @@ In addition to numerous new and upgraded packages, this release has the followin - .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} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> - `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). +- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates. + - 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`. +- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follows: + - `services.openssh.forwardX11` to `services.openssh.settings.X11Forwarding` + - `services.openssh.kbdInteractiveAuthentication` -> `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.openssh.kexAlgorithms` to `services.openssh.settings.KexAlgorithms` + - `services.openssh.macs` to `services.openssh.settings.Macs` + - `services.openssh.ciphers` to `services.openssh.settings.Ciphers` + - `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts` - `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. @@ -115,6 +166,8 @@ In addition to numerous new and upgraded packages, this release has the followin 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 @@ -130,6 +183,11 @@ In addition to numerous new and upgraded packages, this release has the followin - 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`. @@ -153,6 +211,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `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. @@ -163,24 +223,58 @@ In addition to numerous new and upgraded packages, this release has the followin - 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). +- Nebula now supports the `services.nebula.networks.<name>.isRelay` and `services.nebula.networks.<name>.relays` configuration options for setting up or allowing traffic relaying. See the [announcement](https://www.defined.net/blog/announcing-relay-support-in-nebula/) for more details about relays. + - `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)). +- `services.xserver.desktopManager.plasma5.phononBackend` now defaults to vlc according to [upstrean recommendation](https://community.kde.org/Distributions/Packaging_Recommendations#Non-Plasma_packages) + +- The `zramSwap` is now implemented with `zram-generator`, and the option `zramSwap.numDevices` for using ZRAM devices as general purpose ephemeral block devices has been removed. + +- As Singularity has renamed to [Apptainer](https://apptainer.org/news/community-announcement-20211130) + to distinguish from [an un-renamed fork by Sylabs Inc.](https://sylabs.io/2021/05/singularity-community-edition), + there are now two packages of Singularity/Apptainer: + * `apptainer`: From `github.com/apptainer/apptainer`, which is the new repo after renaming. + * `singularity`: From `github.com/sylabs/singularity`, which is the fork by Sylabs Inc.. + + `programs.singularity` got a new `package` option to specify which package to use. + + `singularity-tools.buildImage` got a new input argument `singularity` to specify which package to use. + +- The new option `programs.singularity.enableFakeroot`, if set to `true`, provides `--fakeroot` support for `apptainer` and `singularity`. + - The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream. +- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with 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. +- `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`. + - [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package. +- `tvbrowser-bin` was removed, and now `tvbrowser` is built from source. + - `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. -- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. +- The option `services.prometheus.exporters.pihole.interval` does not exist anymore and has been removed. + +- `k3s` can now be configured with an EnvironmentFile for its systemd service, allowing secrets to be provided without ending up in the Nix Store. diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix deleted file mode 100644 index e5ec9b8f97f7d..0000000000000 --- a/nixos/doc/manual/shell.nix +++ /dev/null @@ -1,8 +0,0 @@ -let - pkgs = import ../../.. { }; -in -pkgs.mkShell { - name = "nixos-manual"; - - packages = with pkgs; [ xmlformat jing xmloscopy ruby ]; -} diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb deleted file mode 100755 index 02168016b554b..0000000000000 --- a/nixos/doc/varlistentry-fixer.rb +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/env ruby - -# This script is written intended as a living, evolving tooling -# to fix oopsies within the docbook documentation. -# -# This is *not* a formatter. It, instead, handles some known cases -# where something bad happened, and fixing it manually is tedious. -# -# Read the code to see the different cases it handles. -# -# ALWAYS `make format` after fixing with this! -# ALWAYS read the changes, this tool isn't yet proven to be always right. - -require "rexml/document" -include REXML - -if ARGV.length < 1 then - $stderr.puts "Needs a filename." - exit 1 -end - -filename = ARGV.shift -doc = Document.new(File.open(filename)) - -$touched = false - -# Fixing varnames having a sibling element without spacing. -# This is to fix an initial `xmlformat` issue where `term` -# would mangle as spaces. -# -# <varlistentry> -# <term><varname>types.separatedString</varname><replaceable>sep</replaceable> <---- -# </term> -# ... -# -# Generates: types.separatedStringsep -# ^^^^ -# -# <varlistentry xml:id='fun-makeWrapper'> -# <term> -# <function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable> <---- -# </term> -# -# Generates: makeWrapperexecutablewrapperfileargs -# ^^^^ ^^^^ ^^ ^^ -# -# <term> -# <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable> <----- -# </term> -# -# Generates: --optionnamevalue -# ^^ ^^ -doc.elements.each("//varlistentry/term") do |term| - ["varname", "function", "option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end -end - - - -# <cmdsynopsis> -# <command>nixos-option</command> -# <arg> -# <option>-I</option><replaceable>path</replaceable> <------ -# </arg> -# -# Generates: -Ipath -# ^^ -doc.elements.each("//cmdsynopsis/arg") do |term| - ["option", "replaceable"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end -end - -# <cmdsynopsis> -# <arg> -# <group choice='req'> -# <arg choice='plain'> -# <option>--profile-name</option> -# </arg> -# -# <arg choice='plain'> -# <option>-p</option> -# </arg> -# </group><replaceable>name</replaceable> <---- -# </arg> -# -# Generates: [{--profile-name | -p }name] -# ^^^^ -doc.elements.each("//cmdsynopsis/arg") do |term| - ["group"].each do |prev_name| - term.elements.each(prev_name) do |el| - if el.next_element and - el.next_element.name == "replaceable" and - el.next_sibling_node.class == Element - then - $touched = true - term.insert_after(el, Text.new(" ")) - end - end - end -end - - -if $touched then - doc.context[:attribute_quote] = :quote - doc.write(output: File.open(filename, "w")) -end diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index 9b920b989fcf3..0a511468fb2db 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 ‘<nixpkgs>’ 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-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 01db7bcbee9bf..a2385582a014d 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -78,7 +78,7 @@ 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 (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}" @@ -91,18 +91,24 @@ let in rec { inherit optionsNix; - optionsAsciiDoc = pkgs.runCommand "options.adoc" {} '' - ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \ - --format asciidoc \ + optionsAsciiDoc = pkgs.runCommand "options.adoc" { + nativeBuildInputs = [ pkgs.nixos-render-docs ]; + } '' + nixos-render-docs -j $NIX_BUILD_CORES options asciidoc \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + --revision ${lib.escapeShellArg revision} \ ${optionsJSON}/share/doc/nixos/options.json \ - > $out + $out ''; - optionsCommonMark = pkgs.runCommand "options.md" {} '' - ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \ - --format commonmark \ + optionsCommonMark = pkgs.runCommand "options.md" { + nativeBuildInputs = [ pkgs.nixos-render-docs ]; + } '' + nixos-render-docs -j $NIX_BUILD_CORES options commonmark \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + --revision ${lib.escapeShellArg revision} \ ${optionsJSON}/share/doc/nixos/options.json \ - > $out + $out ''; optionsJSON = pkgs.runCommand "options.json" @@ -148,42 +154,19 @@ in rec { ''; optionsDocBook = pkgs.runCommand "options-docbook.xml" { - MANPAGE_URLS = pkgs.path + "/doc/manpage-urls.json"; - OTD_DOCUMENT_TYPE = documentType; - OTD_VARIABLE_LIST_ID = variablelistId; - OTD_OPTION_ID_PREFIX = optionIdPrefix; - OTD_REVISION = revision; - nativeBuildInputs = [ - (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: - let - # TODO add our own small test suite when rendering is split out into a new tool - markdown-it-py = p.markdown-it-py.override { - disableTests = true; - }; - mdit-py-plugins = p.mdit-py-plugins.override { - inherit markdown-it-py; - disableTests = true; - }; - in [ - markdown-it-py - mdit-py-plugins - ])) + pkgs.nixos-render-docs ]; } '' - python ${./optionsToDocbook.py} \ + nixos-render-docs -j $NIX_BUILD_CORES 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 + options.xml if grep /nixpkgs/nixos/modules options.xml; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" diff --git a/nixos/lib/make-options-doc/generateDoc.py b/nixos/lib/make-options-doc/generateDoc.py deleted file mode 100644 index 07884ed657e49..0000000000000 --- a/nixos/lib/make-options-doc/generateDoc.py +++ /dev/null @@ -1,112 +0,0 @@ -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/optionsToDocbook.py b/nixos/lib/make-options-doc/optionsToDocbook.py deleted file mode 100644 index 021623d10a7a8..0000000000000 --- a/nixos/lib/make-options-doc/optionsToDocbook.py +++ /dev/null @@ -1,343 +0,0 @@ -import collections -import json -import os -import sys -from typing import Any, Dict, List -from collections.abc import MutableMapping, Sequence -import inspect - -# for MD conversion -import markdown_it -import markdown_it.renderer -from markdown_it.token import Token -from markdown_it.utils import OptionsDict -from mdit_py_plugins.container import container_plugin -from mdit_py_plugins.deflist import deflist_plugin -from mdit_py_plugins.myst_role import myst_role_plugin -from xml.sax.saxutils import escape, quoteattr - -manpage_urls = json.load(open(os.getenv('MANPAGE_URLS'))) - -class Renderer(markdown_it.renderer.RendererProtocol): - __output__ = "docbook" - def __init__(self, parser=None): - self.rules = { - k: v - for k, v in inspect.getmembers(self, predicate=inspect.ismethod) - if not (k.startswith("render") or k.startswith("_")) - } | { - "container_{.note}_open": self._note_open, - "container_{.note}_close": self._note_close, - "container_{.important}_open": self._important_open, - "container_{.important}_close": self._important_close, - "container_{.warning}_open": self._warning_open, - "container_{.warning}_close": self._warning_close, - } - def render(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping) -> str: - assert '-link-tag-stack' not in env - env['-link-tag-stack'] = [] - assert '-deflist-stack' not in env - env['-deflist-stack'] = [] - def do_one(i, token): - if token.type == "inline": - assert token.children is not None - return self.renderInline(token.children, options, env) - elif token.type in self.rules: - return self.rules[token.type](tokens[i], tokens, i, options, env) - else: - raise NotImplementedError("md token not supported yet", token) - return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) - def renderInline(self, tokens: Sequence[Token], options: OptionsDict, env: MutableMapping) -> str: - # HACK to support docbook links and xrefs. link handling is only necessary because the docbook - # manpage stylesheet converts - in urls to a mathematical minus, which may be somewhat incorrect. - for i, token in enumerate(tokens): - if token.type != 'link_open': - continue - token.tag = 'link' - # turn [](#foo) into xrefs - if token.attrs['href'][0:1] == '#' and tokens[i + 1].type == 'link_close': - token.tag = "xref" - # turn <x> into links without contents - if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: - tokens[i + 1].content = '' - - def do_one(i, token): - if token.type in self.rules: - return self.rules[token.type](tokens[i], tokens, i, options, env) - else: - raise NotImplementedError("md node not supported yet", token) - return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) - - def text(self, token, tokens, i, options, env): - return escape(token.content) - def paragraph_open(self, token, tokens, i, options, env): - return "<para>" - def paragraph_close(self, token, tokens, i, options, env): - return "</para>" - def hardbreak(self, token, tokens, i, options, env): - return "<literallayout>\n</literallayout>" - def softbreak(self, token, tokens, i, options, env): - # should check options.breaks() and emit hard break if so - return "\n" - def code_inline(self, token, tokens, i, options, env): - return f"<literal>{escape(token.content)}</literal>" - def code_block(self, token, tokens, i, options, env): - return f"<programlisting>{escape(token.content)}</programlisting>" - def link_open(self, token, tokens, i, options, env): - env['-link-tag-stack'].append(token.tag) - (attr, start) = ('linkend', 1) if token.attrs['href'][0] == '#' else ('xlink:href', 0) - return f"<{token.tag} {attr}={quoteattr(token.attrs['href'][start:])}>" - def link_close(self, token, tokens, i, options, env): - return f"</{env['-link-tag-stack'].pop()}>" - def list_item_open(self, token, tokens, i, options, env): - return "<listitem>" - def list_item_close(self, token, tokens, i, options, env): - return "</listitem>\n" - # HACK open and close para for docbook change size. remove soon. - def bullet_list_open(self, token, tokens, i, options, env): - return "<para><itemizedlist>\n" - def bullet_list_close(self, token, tokens, i, options, env): - return "\n</itemizedlist></para>" - def em_open(self, token, tokens, i, options, env): - return "<emphasis>" - def em_close(self, token, tokens, i, options, env): - return "</emphasis>" - def strong_open(self, token, tokens, i, options, env): - return "<emphasis role=\"strong\">" - def strong_close(self, token, tokens, i, options, env): - return "</emphasis>" - def fence(self, token, tokens, i, options, env): - info = f" language={quoteattr(token.info)}" if token.info != "" else "" - return f"<programlisting{info}>{escape(token.content)}</programlisting>" - def blockquote_open(self, token, tokens, i, options, env): - return "<para><blockquote>" - def blockquote_close(self, token, tokens, i, options, env): - return "</blockquote></para>" - def _note_open(self, token, tokens, i, options, env): - return "<para><note>" - def _note_close(self, token, tokens, i, options, env): - return "</note></para>" - def _important_open(self, token, tokens, i, options, env): - return "<para><important>" - def _important_close(self, token, tokens, i, options, env): - return "</important></para>" - def _warning_open(self, token, tokens, i, options, env): - return "<para><warning>" - def _warning_close(self, token, tokens, i, options, env): - return "</warning></para>" - # markdown-it emits tokens based on the html syntax tree, but docbook is - # slightly different. html has <dl>{<dt/>{<dd/>}}</dl>, - # docbook has <variablelist>{<varlistentry><term/><listitem/></varlistentry>}<variablelist> - # we have to reject multiple definitions for the same term for time being. - def dl_open(self, token, tokens, i, options, env): - env['-deflist-stack'].append({}) - return "<para><variablelist>" - def dl_close(self, token, tokens, i, options, env): - env['-deflist-stack'].pop() - return "</variablelist></para>" - def dt_open(self, token, tokens, i, options, env): - env['-deflist-stack'][-1]['has-dd'] = False - return "<varlistentry><term>" - def dt_close(self, token, tokens, i, options, env): - return "</term>" - def dd_open(self, token, tokens, i, options, env): - if env['-deflist-stack'][-1]['has-dd']: - raise Exception("multiple definitions per term not supported") - env['-deflist-stack'][-1]['has-dd'] = True - return "<listitem>" - def dd_close(self, token, tokens, i, options, env): - return "</listitem></varlistentry>" - def myst_role(self, token, tokens, i, options, env): - if token.meta['name'] == 'command': - return f"<command>{escape(token.content)}</command>" - if token.meta['name'] == 'file': - return f"<filename>{escape(token.content)}</filename>" - if token.meta['name'] == 'var': - return f"<varname>{escape(token.content)}</varname>" - if token.meta['name'] == 'env': - return f"<envar>{escape(token.content)}</envar>" - if token.meta['name'] == 'option': - return f"<option>{escape(token.content)}</option>" - if token.meta['name'] == 'manpage': - [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] - section = section[:-1] - man = f"{page}({section})" - title = f"<refentrytitle>{escape(page)}</refentrytitle>" - vol = f"<manvolnum>{escape(section)}</manvolnum>" - ref = f"<citerefentry>{title}{vol}</citerefentry>" - if man in manpage_urls: - return f"<link xlink:href={quoteattr(manpage_urls[man])}>{ref}</link>" - else: - return ref - raise NotImplementedError("md node not supported yet", token) - -md = ( - markdown_it.MarkdownIt(renderer_cls=Renderer) - # TODO maybe fork the plugin and have only a single rule for all? - .use(container_plugin, name="{.note}") - .use(container_plugin, name="{.important}") - .use(container_plugin, name="{.warning}") - .use(deflist_plugin) - .use(myst_role_plugin) -) - -# converts in-place! -def convertMD(options: Dict[str, Any]) -> str: - 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 - - def convertCode(name: str, option: Dict[str, Any], key: str): - if optionIs(option, key, 'literalMD'): - option[key] = md.render(f"*{key.capitalize()}:*\n{option[key]['text']}") - elif optionIs(option, key, 'literalExpression'): - code = option[key]['text'] - # for multi-line code blocks we only have to count ` runs at the beginning - # of a line, but this is much easier. - multiline = '\n' in code - longest, current = (0, 0) - for c in code: - current = current + 1 if c == '`' else 0 - longest = max(current, longest) - # inline literals need a space to separate ticks from content, code blocks - # need newlines. inline literals need one extra tick, code blocks need three. - ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') - code = f"{ticks}{sep}{code}{sep}{ticks}" - option[key] = md.render(f"*{key.capitalize()}:*\n{code}") - elif optionIs(option, key, 'literalDocBook'): - option[key] = f"<para><emphasis>{key.capitalize()}:</emphasis> {option[key]['text']}</para>" - elif key in option: - raise Exception(f"{name} {key} has unrecognized type", option[key]) - - for (name, option) in options.items(): - try: - if optionIs(option, 'description', 'mdDoc'): - option['description'] = md.render(option['description']['text']) - elif markdownByDefault: - option['description'] = md.render(option['description']) - else: - option['description'] = ("<nixos:option-description><para>" + - option['description'] + - "</para></nixos:option-description>") - - convertCode(name, option, 'example') - convertCode(name, option, 'default') - - if 'relatedPackages' in option: - option['relatedPackages'] = md.render(option['relatedPackages']) - except Exception as e: - raise Exception(f"Failed to render option {name}") from e - - return options - -id_translate_table = { - ord('*'): ord('_'), - ord('<'): ord('_'), - ord(' '): ord('_'), - ord('>'): ord('_'), - ord('['): ord('_'), - ord(']'): ord('_'), - ord(':'): ord('_'), - ord('"'): ord('_'), -} - -def need_env(n): - if n not in os.environ: - raise RuntimeError("required environment variable not set", n) - return os.environ[n] - -OTD_REVISION = need_env('OTD_REVISION') -OTD_DOCUMENT_TYPE = need_env('OTD_DOCUMENT_TYPE') -OTD_VARIABLE_LIST_ID = need_env('OTD_VARIABLE_LIST_ID') -OTD_OPTION_ID_PREFIX = need_env('OTD_OPTION_ID_PREFIX') - -def print_decl_def(header, locs): - print(f"""<para><emphasis>{header}:</emphasis></para>""") - print(f"""<simplelist>""") - for loc in locs: - # locations can be either plain strings (specific to nixpkgs), or attrsets - # { name = "foo/bar.nix"; url = "https://github.com/....."; } - if isinstance(loc, str): - # Hyperlink the filename either to the NixOS github - # repository (if it’s a module and we have a revision number), - # or to the local filesystem. - if not loc.startswith('/'): - if OTD_REVISION == 'local': - href = f"https://github.com/NixOS/nixpkgs/blob/master/{loc}" - else: - href = f"https://github.com/NixOS/nixpkgs/blob/{OTD_REVISION}/{loc}" - else: - href = f"file://{loc}" - # Print the filename and make it user-friendly by replacing the - # /nix/store/<hash> prefix by the default location of nixos - # sources. - if not loc.startswith('/'): - name = f"<nixpkgs/{loc}>" - elif loc.contains('nixops') and loc.contains('/nix/'): - name = f"<nixops/{loc[loc.find('/nix/') + 5:]}>" - else: - name = loc - print(f"""<member><filename xlink:href={quoteattr(href)}>""") - print(escape(name)) - print(f"""</filename></member>""") - else: - href = f" xlink:href={quoteattr(loc['url'])}" if 'url' in loc else "" - print(f"""<member><filename{href}>{escape(loc['name'])}</filename></member>""") - print(f"""</simplelist>""") - -markdownByDefault = False -optOffset = 0 -for arg in sys.argv[1:]: - if arg == "--markdown-by-default": - optOffset += 1 - markdownByDefault = True - -options = convertMD(json.load(open(sys.argv[1 + optOffset], 'r'))) - -keys = list(options.keys()) -keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) - for p in options[opt]['loc'] ]) - -print(f"""<?xml version="1.0" encoding="UTF-8"?>""") -if OTD_DOCUMENT_TYPE == 'appendix': - print("""<appendix xmlns="http://docbook.org/ns/docbook" xml:id="appendix-configuration-options">""") - print(""" <title>Configuration Options</title>""") -print(f"""<variablelist xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:nixos="tag:nixos.org" - xmlns="http://docbook.org/ns/docbook" - xml:id="{OTD_VARIABLE_LIST_ID}">""") - -for name in keys: - opt = options[name] - id = OTD_OPTION_ID_PREFIX + name.translate(id_translate_table) - print(f"""<varlistentry>""") - # NOTE adding extra spaces here introduces spaces into xref link expansions - print(f"""<term xlink:href={quoteattr("#" + id)} xml:id={quoteattr(id)}>""", end='') - print(f"""<option>{escape(name)}</option>""", end='') - print(f"""</term>""") - print(f"""<listitem>""") - print(opt['description']) - if typ := opt.get('type'): - ro = " <emphasis>(read only)</emphasis>" if opt.get('readOnly', False) else "" - print(f"""<para><emphasis>Type:</emphasis> {escape(typ)}{ro}</para>""") - if default := opt.get('default'): - print(default) - if example := opt.get('example'): - print(example) - if related := opt.get('relatedPackages'): - print(f"""<para>""") - print(f""" <emphasis>Related packages:</emphasis>""") - print(f"""</para>""") - print(related) - if decl := opt.get('declarations'): - print_decl_def("Declared by", decl) - if defs := opt.get('definitions'): - print_decl_def("Defined by", defs) - print(f"""</listitem>""") - print(f"""</varlistentry>""") - -print("""</variablelist>""") -if OTD_DOCUMENT_TYPE == 'appendix': - print("""</appendix>""") diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 6af964a0f588e..0db7930f496b2 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -1,4 +1,4 @@ -from contextlib import _GeneratorContextManager +from contextlib import _GeneratorContextManager, nullcontext from pathlib import Path from queue import Queue from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple @@ -406,25 +406,23 @@ class Machine: return rootlog.nested(msg, my_attrs) def wait_for_monitor_prompt(self) -> str: - with self.nested("waiting for monitor prompt"): - assert self.monitor is not None - answer = "" - while True: - undecoded_answer = self.monitor.recv(1024) - if not undecoded_answer: - break - answer += undecoded_answer.decode() - if answer.endswith("(qemu) "): - break - return answer + assert self.monitor is not None + answer = "" + while True: + undecoded_answer = self.monitor.recv(1024) + if not undecoded_answer: + break + answer += undecoded_answer.decode() + if answer.endswith("(qemu) "): + break + return answer def send_monitor_command(self, command: str) -> str: self.run_callbacks() - 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() + message = f"{command}\n".encode() + assert self.monitor is not None + self.monitor.send(message) + return self.wait_for_monitor_prompt() def wait_for_unit( self, unit: str, user: Optional[str] = None, timeout: int = 900 @@ -547,20 +545,29 @@ class Machine: self.shell.send("echo ${PIPESTATUS[0]}\n".encode()) rc = int(self._next_newline_closed_block_from_shell().strip()) - return (rc, output.decode()) + return (rc, output.decode(errors="replace")) - 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 @@ -676,9 +683,9 @@ class Machine: retry(tty_matches) def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: - with self.nested(f"sending keys '{chars}'"): + with self.nested(f"sending keys {repr(chars)}"): for char in chars: - self.send_key(char, delay) + self.send_key(char, delay, log=False) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -851,11 +858,15 @@ class Machine: if matches is not None: return - def send_key(self, key: str, delay: Optional[float] = 0.01) -> None: + def send_key( + self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True + ) -> None: key = CHAR_TO_KEY.get(key, key) - self.send_monitor_command(f"sendkey {key}") - if delay is not None: - time.sleep(delay) + context = self.nested(f"sending key {repr(key)}") if log else nullcontext() + with context: + self.send_monitor_command(f"sendkey {key}") + if delay is not None: + time.sleep(delay) def send_console(self, chars: str) -> None: assert self.process diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index 2c2ee179fede6..fb181c1d7e9ad 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -12,9 +12,7 @@ let }; - vlans = map (m: ( - m.virtualisation.vlans ++ - (lib.mapAttrsToList (_: v: v.vlan) m.virtualisation.interfaces))) (lib.attrValues config.nodes); + vlans = map (m: m.virtualisation.vlans) (lib.attrValues config.nodes); vms = map (m: m.system.build.vm) (lib.attrValues config.nodes); nodeHostNames = diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 65754fe3c5419..805b7520edff3 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -22,7 +22,7 @@ in }; timeout = lib.mkOption { type = types.nullOr types.int; - default = null; # NOTE: null values are filtered out by `meta`. + default = 3600; # 1 hour description = mdDoc '' The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds. ''; diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index 98a77f918e079..04ea9a2bc9f7a 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -18,40 +18,24 @@ let networkModule = { config, nodes, pkgs, ... }: let - qemu-common = import ../qemu-common.nix { inherit lib pkgs; }; - - # Convert legacy VLANs to named interfaces and merge with explicit interfaces. - vlansNumbered = forEach (zipLists config.virtualisation.vlans (range 1 255)) (v: { - name = "eth${toString v.snd}"; - vlan = v.fst; - assignIP = true; - }); - explicitInterfaces = lib.mapAttrsToList (n: v: v // { name = n; }) config.virtualisation.interfaces; - interfaces = vlansNumbered ++ explicitInterfaces; - interfacesNumbered = zipLists interfaces (range 1 255); - - # Automatically assign IP addresses to requested interfaces. - assignIPs = lib.filter (i: i.assignIP) interfaces; - ipInterfaces = forEach assignIPs (i: - nameValuePair i.name { ipv4.addresses = - [ { address = "192.168.${toString i.vlan}.${toString config.virtualisation.test.nodeNumber}"; + interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); + interfaces = forEach interfacesNumbered ({ fst, snd }: + nameValuePair "eth${toString snd}" { + ipv4.addresses = + [{ + address = "192.168.${toString fst}.${toString config.virtualisation.test.nodeNumber}"; prefixLength = 24; }]; }); - qemuOptions = lib.flatten (forEach interfacesNumbered ({ fst, snd }: - qemu-common.qemuNICFlags snd fst.vlan config.virtualisation.test.nodeNumber)); - udevRules = forEach interfacesNumbered ({ fst, snd }: - "SUBSYSTEM==\"net\",ACTION==\"add\",ATTR{address}==\"${qemu-common.qemuNicMac fst.vlan config.virtualisation.test.nodeNumber}\",NAME=\"${fst.name}\""); - networkConfig = { networking.hostName = mkDefault config.virtualisation.test.nodeName; - networking.interfaces = listToAttrs ipInterfaces; + networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (ipInterfaces != [ ]) (head (head ipInterfaces).value.ipv4.addresses).address; + optionalString (interfaces != [ ]) (head (head interfaces).value.ipv4.addresses).address; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple @@ -67,13 +51,16 @@ let "${config.networking.hostName}.${config.networking.domain} " + "${config.networking.hostName}\n")); - virtualisation.qemu.options = qemuOptions; - boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules; + virtualisation.qemu.options = + let qemu-common = import ../qemu-common.nix { inherit lib pkgs; }; + in + flip concatMap interfacesNumbered + ({ fst, snd }: qemu-common.qemuNICFlags snd fst config.virtualisation.test.nodeNumber); }; in { - key = "network-interfaces"; + key = "ip-address"; config = networkConfig // { # Expose the networkConfig items for tests like nixops # that need to recreate the network config. diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index c8cf2a04fb10a..ee55da1e9ce2b 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -89,7 +89,7 @@ with lib; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It’s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 9542de9fa1f62..eb1e41a3d8dc6 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,8 +30,8 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; - ffmpeg_4 = super.ffmpeg_4-headless; - ffmpeg_5 = super.ffmpeg_5-headless; + ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; }; + ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; }; # dep of graphviz, libXpm is optional for Xpm support gd = super.gd.override { withXorg = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; @@ -46,8 +46,10 @@ with lib; libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; limesuite = super.limesuite.override { withGui = false; }; + mc = super.mc.override { x11Support = false; }; mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; }; msmtp = super.msmtp.override { withKeyring = false; }; + neofetch = super.neofetch.override { x11Support = 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; }; @@ -59,12 +61,13 @@ with lib; 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; }; + 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; }; + vim-full = super.vim-full.override { guiSupport = false; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix index ec6868484942b..07a0aa339a561 100644 --- a/nixos/modules/config/stevenblack.nix +++ b/nixos/modules/config/stevenblack.nix @@ -15,7 +15,7 @@ let in { options.networking.stevenblack = { - enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist."); + enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist"); block = mkOption { type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 4368ec24ea9e9..54352a517a24d 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -215,10 +215,12 @@ foreach my $u (@{$spec->{users}}) { } else { $u->{uid} = allocUid($name, $u->{isSystemUser}) if !defined $u->{uid}; - if (defined $u->{initialPassword}) { - $u->{hashedPassword} = hashPassword($u->{initialPassword}); - } elsif (defined $u->{initialHashedPassword}) { - $u->{hashedPassword} = $u->{initialHashedPassword}; + if (!defined $u->{hashedPassword}) { + if (defined $u->{initialPassword}) { + $u->{hashedPassword} = hashPassword($u->{initialPassword}); + } elsif (defined $u->{initialHashedPassword}) { + $u->{hashedPassword} = $u->{initialHashedPassword}; + } } } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 76092e738ebd4..ee4692fc6a6a6 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. @@ -273,6 +273,9 @@ let {command}`passwd` command. Otherwise, it's equivalent to setting the {option}`hashedPassword` option. + Note that the {option}`hashedPassword` option will override + this option if both are set. + ${hashedPasswordDescription} ''; }; @@ -291,6 +294,9 @@ let is world-readable in the Nix store, so it should only be used for guest accounts or passwords that will be changed promptly. + + Note that the {option}`password` option will override this + option if both are set. ''; }; @@ -677,7 +683,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/zram.nix b/nixos/modules/config/zram.nix index 87ac53a60b7ed..4df646cf27966 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -1,45 +1,27 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.zramSwap; - - # don't set swapDevices as mkDefault, so we can detect user had read our warning - # (see below) and made an action (or not) - devicesCount = if cfg.swapDevices != null then cfg.swapDevices else cfg.numDevices; - - devices = map (nr: "zram${toString nr}") (range 0 (devicesCount - 1)); - - modprobe = "${pkgs.kmod}/bin/modprobe"; - - warnings = - assert cfg.swapDevices != null -> cfg.numDevices >= cfg.swapDevices; - flatten [ - (optional (cfg.numDevices > 1 && cfg.swapDevices == null) '' - Using several small zram devices as swap is no better than using one large. - Set either zramSwap.numDevices = 1 or explicitly set zramSwap.swapDevices. - - Previously multiple zram devices were used to enable multithreaded - compression. Linux supports multithreaded compression for 1 device - since 3.15. See https://lkml.org/lkml/2014/2/28/404 for details. - '') - ]; + devices = map (nr: "zram${toString nr}") (lib.range 0 (cfg.swapDevices - 1)); in { + imports = [ + (lib.mkRemovedOptionModule [ "zramSwap" "numDevices" ] "Using ZRAM devices as general purpose ephemeral block devices is no longer supported") + ]; + ###### interface options = { zramSwap = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = lib.mdDoc '' Enable in-memory compressed devices and swap space provided by the zram kernel module. @@ -49,29 +31,17 @@ in ''; }; - numDevices = mkOption { + swapDevices = lib.mkOption { default = 1; - type = types.int; + type = lib.types.int; description = lib.mdDoc '' - Number of zram devices to create. See also - `zramSwap.swapDevices` + Number of zram devices to be used as swap, recommended is 1. ''; }; - swapDevices = mkOption { - default = null; - example = 1; - type = with types; nullOr int; - description = lib.mdDoc '' - Number of zram devices to be used as swap. Must be - `<= zramSwap.numDevices`. - Default is same as `zramSwap.numDevices`, recommended is 1. - ''; - }; - - memoryPercent = mkOption { + memoryPercent = lib.mkOption { default = 50; - type = types.int; + type = lib.types.int; description = lib.mdDoc '' Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total @@ -80,9 +50,9 @@ in ''; }; - memoryMax = mkOption { + memoryMax = lib.mkOption { default = null; - type = with types; nullOr int; + type = with lib.types; nullOr int; description = lib.mdDoc '' Maximum total amount of memory (in bytes) that can be stored in the zram swap devices. @@ -90,9 +60,9 @@ in ''; }; - priority = mkOption { + priority = lib.mkOption { default = 5; - type = types.int; + type = lib.types.int; description = lib.mdDoc '' Priority of the zram swap devices. It should be a number higher than the priority of your disk-based swap devices (so that the system will @@ -100,10 +70,10 @@ in ''; }; - algorithm = mkOption { + algorithm = lib.mkOption { default = "zstd"; example = "lz4"; - type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; + type = with lib.types; either (enum [ "lzo" "lz4" "zstd" ]) str; description = lib.mdDoc '' Compression algorithm. `lzo` has good compression, but is slow. `lz4` has bad compression, but is fast. @@ -116,9 +86,7 @@ in }; - config = mkIf cfg.enable { - - inherit warnings; + config = lib.mkIf cfg.enable { system.requiredKernelConfig = with config.lib.kernelConfig; [ (isModule "ZRAM") @@ -128,78 +96,25 @@ in # once in stage 2 boot, and again when the zram-reloader service starts. # boot.kernelModules = [ "zram" ]; - boot.extraModprobeConfig = '' - 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" - ''; - - systemd.services = - let - createZramInitService = dev: - nameValuePair "zram-init-${dev}" { - description = "Init swap on zram-based device ${dev}"; - after = [ "dev-${dev}.device" "zram-reloader.service" ]; - requires = [ "dev-${dev}.device" "zram-reloader.service" ]; - before = [ "dev-${dev}.swap" ]; - requiredBy = [ "dev-${dev}.swap" ]; - unitConfig.DefaultDependencies = false; # needed to prevent a cycle - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; - }; - script = '' - set -euo pipefail - - # Calculate memory to use for zram - mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / { - value=int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024); - ${lib.optionalString (cfg.memoryMax != null) '' - memory_max=int(${toString cfg.memoryMax}/${toString devicesCount}); - if (value > memory_max) { value = memory_max } - ''} - print value - }' /proc/meminfo) - - ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev} - ${pkgs.util-linux}/sbin/mkswap /dev/${dev} - ''; - restartIfChanged = false; - }; - in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader" - { - description = "Reload zram kernel module when number of devices changes"; - wants = [ "systemd-udevd.service" ]; - after = [ "systemd-udevd.service" ]; - unitConfig.DefaultDependencies = false; # needed to prevent a cycle - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStartPre = "-${modprobe} -r zram"; - ExecStart = "-${modprobe} zram"; - ExecStop = "-${modprobe} -r zram"; - }; - restartTriggers = [ - cfg.numDevices - cfg.algorithm - cfg.memoryPercent - ]; - restartIfChanged = true; - })]); - - swapDevices = - let - useZramSwap = dev: - { - device = "/dev/${dev}"; - priority = cfg.priority; - }; - in map useZramSwap devices; + systemd.packages = [ pkgs.zram-generator ]; + systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap + + environment.etc."systemd/zram-generator.conf".source = + (pkgs.formats.ini { }).generate "zram-generator.conf" (lib.listToAttrs + (builtins.map + (dev: { + name = dev; + value = + let + size = "${toString cfg.memoryPercent} / 100 * ram"; + in + { + zram-size = if cfg.memoryMax != null then "min(${size}, ${toString cfg.memoryMax} / 1024 / 1024)" else size; + compression-algorithm = cfg.algorithm; + swap-priority = cfg.priority; + }; + }) + devices)); }; diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 2d5a0007ff01c..75247286368bc 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -65,8 +65,6 @@ in { ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware - ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [ - rtw89-firmware ]; hardware.wirelessRegulatoryDatabase = true; }) diff --git a/nixos/modules/hardware/flipperzero.nix b/nixos/modules/hardware/flipperzero.nix new file mode 100644 index 0000000000000..82f9b76fa3a73 --- /dev/null +++ b/nixos/modules/hardware/flipperzero.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.hardware.flipperzero; + +in + +{ + options.hardware.flipperzero.enable = mkEnableOption (mdDoc "udev rules and software for Flipper Zero devices"); + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.qFlipper ]; + services.udev.packages = [ pkgs.qFlipper ]; + }; +} diff --git a/nixos/modules/hardware/keyboard/qmk.nix b/nixos/modules/hardware/keyboard/qmk.nix new file mode 100644 index 0000000000000..df3bcaeccd2ec --- /dev/null +++ b/nixos/modules/hardware/keyboard/qmk.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.hardware.keyboard.qmk; + inherit (lib) mdDoc mkEnableOption mkIf; + +in +{ + options.hardware.keyboard.qmk = { + enable = mkEnableOption (mdDoc "non-root access to the firmware of QMK keyboards"); + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.qmk-udev-rules ]; + }; +} diff --git a/nixos/modules/hardware/keyboard/teck.nix b/nixos/modules/hardware/keyboard/teck.nix index 2705668d9a750..8376c6b9c50b2 100644 --- a/nixos/modules/hardware/keyboard/teck.nix +++ b/nixos/modules/hardware/keyboard/teck.nix @@ -1,16 +1,16 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.hardware.keyboard.teck; + inherit (lib) mdDoc mkEnableOption mkIf; + in { options.hardware.keyboard.teck = { - enable = mkEnableOption (lib.mdDoc "non-root access to the firmware of TECK keyboards"); + enable = mkEnableOption (mdDoc "non-root access to the firmware of TECK keyboards"); }; config = mkIf cfg.enable { services.udev.packages = [ pkgs.teck-udev-rules ]; }; } - diff --git a/nixos/modules/hardware/keyboard/uhk.nix b/nixos/modules/hardware/keyboard/uhk.nix index c18051439938d..17baff83d886b 100644 --- a/nixos/modules/hardware/keyboard/uhk.nix +++ b/nixos/modules/hardware/keyboard/uhk.nix @@ -1,13 +1,14 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.hardware.keyboard.uhk; + inherit (lib) mdDoc mkEnableOption mkIf; + in { options.hardware.keyboard.uhk = { - enable = mkEnableOption (lib.mdDoc '' - non-root access to the firmware of UHK keyboards. + enable = mkEnableOption (mdDoc '' + non-root access to the firmware of UHK keyboards. You need it when you want to flash a new firmware on the keyboard. Access to the keyboard is granted to users in the "input" group. You may want to install the uhk-agent package. diff --git a/nixos/modules/hardware/keyboard/zsa.nix b/nixos/modules/hardware/keyboard/zsa.nix index 5bf4022cdc435..a04b67b5c8d0e 100644 --- a/nixos/modules/hardware/keyboard/zsa.nix +++ b/nixos/modules/hardware/keyboard/zsa.nix @@ -1,21 +1,18 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkOption mkIf types; cfg = config.hardware.keyboard.zsa; + inherit (lib) mkEnableOption mkIf mdDoc; + in { options.hardware.keyboard.zsa = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I. - You need it when you want to flash a new configuration on the keyboard - or use their live training in the browser. - You may want to install the wally-cli package. - ''; - }; + enable = mkEnableOption (mdDoc '' + udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I. + You need it when you want to flash a new configuration on the keyboard + or use their live training in the browser. + You may want to install the wally-cli package. + ''); }; config = mkIf cfg.enable { diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index cee230ac41cb1..434931ccae5a7 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -21,7 +21,8 @@ let pCfg = cfg.prime; syncCfg = pCfg.sync; offloadCfg = pCfg.offload; - primeEnabled = syncCfg.enable || offloadCfg.enable; + reverseSyncCfg = pCfg.reverseSync; + primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable; nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; nvidiaSettings = cfg.nvidiaSettings; busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; @@ -31,7 +32,8 @@ in imports = [ (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ]) - (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "allowExternalGpu" ]) + (mkRenamedOptionModule [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "allowExternalGpu" ]) (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "nvidiaBusId" ]) (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "intelBusId" ]) ]; @@ -104,16 +106,17 @@ in description = lib.mdDoc '' Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME. If enabled, the NVIDIA GPU will be always on and used for all rendering, - while enabling output to displays attached only to the integrated Intel GPU - without a multiplexer. + while enabling output to displays attached only to the integrated Intel/AMD + GPU without a multiplexer. Note that this option only has any effect if the "nvidia" driver is specified in {option}`services.xserver.videoDrivers`, and it should preferably be the only driver there. - If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified ({option}`hardware.nvidia.prime.nvidiaBusId` and - {option}`hardware.nvidia.prime.intelBusId`). + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). If you enable this, you may want to also enable kernel modesetting for the NVIDIA driver ({option}`hardware.nvidia.modesetting.enable`) in order @@ -125,11 +128,11 @@ in ''; }; - hardware.nvidia.prime.sync.allowExternalGpu = mkOption { + hardware.nvidia.prime.allowExternalGpu = mkOption { type = types.bool; default = false; description = lib.mdDoc '' - Configure X to allow external NVIDIA GPUs when using optimus. + Configure X to allow external NVIDIA GPUs when using Prime [Reverse] sync optimus. ''; }; @@ -139,9 +142,54 @@ in description = lib.mdDoc '' Enable render offload support using the NVIDIA proprietary driver via PRIME. - If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be - specified ({option}`hardware.nvidia.prime.nvidiaBusId` and - {option}`hardware.nvidia.prime.intelBusId`). + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). + ''; + }; + + hardware.nvidia.prime.offload.enableOffloadCmd = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Adds a `nvidia-offload` convenience script to {option}`environment.systemPackages` + for offloading programs to an nvidia device. To work, should have also enabled + {option}`hardware.nvidia.prime.offload.enable` or {option}`hardware.nvidia.prime.reverseSync.enable`. + + Example usage `nvidia-offload sauerbraten_client`. + ''; + }; + + hardware.nvidia.prime.reverseSync.enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Warning: This feature is relatively new, depending on your system this might + work poorly. AMD support, especially so. + See: https://forums.developer.nvidia.com/t/the-all-new-outputsink-feature-aka-reverse-prime/129828 + + Enable NVIDIA Optimus support using the NVIDIA proprietary driver via reverse + PRIME. If enabled, the Intel/AMD GPU will be used for all rendering, while + enabling output to displays attached only to the NVIDIA GPU without a + multiplexer. + + Note that this option only has any effect if the "nvidia" driver is specified + in {option}`services.xserver.videoDrivers`, and it should preferably + be the only driver there. + + If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to + be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId` or + {option}`hardware.nvidia.prime.amdgpuBusId`). + + If you enable this, you may want to also enable kernel modesetting for the + NVIDIA driver ({option}`hardware.nvidia.modesetting.enable`) in order + to prevent tearing. + + Note that this configuration will only be successful when a display manager + for which the {option}`services.xserver.displayManager.setupCommands` + option is supported is used. ''; }; @@ -206,6 +254,13 @@ in } { + assertion = offloadCfg.enableOffloadCmd -> offloadCfg.enable || reverseSyncCfg.enable; + message = '' + Offload command requires offloading or reverse prime sync to be enabled. + ''; + } + + { assertion = primeEnabled -> pCfg.nvidiaBusId != "" && (pCfg.intelBusId != "" || pCfg.amdgpuBusId != ""); message = '' When NVIDIA PRIME is enabled, the GPU bus IDs must configured. @@ -218,8 +273,18 @@ in } { + assertion = (reverseSyncCfg.enable && pCfg.amdgpuBusId != "") -> versionAtLeast nvidia_x11.version "470.0"; + message = "NVIDIA PRIME render offload for AMD APUs is currently only supported on versions >= 470 beta."; + } + + { assertion = !(syncCfg.enable && offloadCfg.enable); - message = "Only one NVIDIA PRIME solution may be used at a time."; + message = "PRIME Sync and Offload cannot be both enabled"; + } + + { + assertion = !(syncCfg.enable && reverseSyncCfg.enable); + message = "PRIME Sync and PRIME Reverse Sync cannot be both enabled"; } { @@ -257,8 +322,10 @@ in # - Configure the display manager to run specific `xrandr` commands which will # configure/enable displays connected to the Intel iGPU / AMD APU. - services.xserver.drivers = let - in optional primeEnabled { + # reverse sync implies offloading + hardware.nvidia.prime.offload.enable = mkDefault reverseSyncCfg.enable; + + services.xserver.drivers = optional primeEnabled { name = igpuDriver; display = offloadCfg.enable; modules = optionals (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; @@ -273,7 +340,7 @@ in deviceSection = optionalString primeEnabled '' BusID "${pCfg.nvidiaBusId}" - ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} + ${optionalString pCfg.allowExternalGpu "Option \"AllowExternalGpus\""} ''; screenSection = '' @@ -290,19 +357,22 @@ in services.xserver.serverLayoutSection = optionalString syncCfg.enable '' Inactive "Device-${igpuDriver}[0]" + '' + optionalString reverseSyncCfg.enable '' + Inactive "Device-nvidia[0]" '' + optionalString offloadCfg.enable '' Option "AllowNVIDIAGPUScreens" ''; services.xserver.displayManager.setupCommands = let - sinkGpuProviderName = if igpuDriver == "amdgpu" then + gpuProviderName = if igpuDriver == "amdgpu" then # find the name of the provider if amdgpu "`${pkgs.xorg.xrandr}/bin/xrandr --listproviders | ${pkgs.gnugrep}/bin/grep -i AMD | ${pkgs.gnused}/bin/sed -n 's/^.*name://p'`" else igpuDriver; - in optionalString syncCfg.enable '' + providerCmdParams = if syncCfg.enable then "\"${gpuProviderName}\" NVIDIA-0" else "NVIDIA-G0 \"${gpuProviderName}\""; + in optionalString (syncCfg.enable || reverseSyncCfg.enable) '' # Added by nvidia configuration module for Optimus/PRIME. - ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource "${sinkGpuProviderName}" NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${providerCmdParams} ${pkgs.xorg.xrandr}/bin/xrandr --auto ''; @@ -325,7 +395,16 @@ in environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] - ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ]; + ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ] + ++ optionals offloadCfg.enableOffloadCmd [ + (pkgs.writeShellScriptBin "nvidia-offload" '' + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + '') + ]; systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; @@ -382,7 +461,9 @@ in # If requested enable modesetting via kernel parameter. boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"; + ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" + # proprietary driver is not compiled with support for X86_KERNEL_IBT + ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off"; services.udev.extraRules = '' diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 07fb86bcc25e8..5f803b4f2ee79 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 7b7907cd32a62..0000000000000 --- a/nixos/modules/i18n/input-method/default.xml +++ /dev/null @@ -1,275 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-input-methods"> - <title>Input Methods</title> - <para> - 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. - </para> - <para> - The following input methods are available in NixOS: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - IBus: The intelligent input bus. - </para> - </listitem> - <listitem> - <para> - Fcitx: A customizable lightweight input method. - </para> - </listitem> - <listitem> - <para> - Nabi: A Korean input method based on XIM. - </para> - </listitem> - <listitem> - <para> - Uim: The universal input method, is a library with a XIM bridge. - </para> - </listitem> - <listitem> - <para> - Hime: An extremely easy-to-use input method framework. - </para> - </listitem> - <listitem> - <para> - Kime: Korean IME - </para> - </listitem> - </itemizedlist> - <section xml:id="module-services-input-methods-ibus"> - <title>IBus</title> - <para> - IBus is an Intelligent Input Bus. It provides full featured and - user friendly input method user interface. - </para> - <para> - The following snippet can be used to configure IBus: - </para> - <programlisting> -i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; -}; -</programlisting> - <para> - <literal>i18n.inputMethod.ibus.engines</literal> is optional and - can be used to add extra IBus engines. - </para> - <para> - Available extra IBus engines are: - </para> - <itemizedlist> - <listitem> - <para> - Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a - system for Japanese input method. It converts Hiragana text to - Kana Kanji mixed text. - </para> - </listitem> - <listitem> - <para> - Hangul (<literal>ibus-engines.hangul</literal>): Korean input - method. - </para> - </listitem> - <listitem> - <para> - m17n (<literal>ibus-engines.m17n</literal>): m17n is an input - method that uses input methods and corresponding icons in the - m17n database. - </para> - </listitem> - <listitem> - <para> - mozc (<literal>ibus-engines.mozc</literal>): A Japanese input - method from Google. - </para> - </listitem> - <listitem> - <para> - Table (<literal>ibus-engines.table</literal>): An input method - that load tables of input methods. - </para> - </listitem> - <listitem> - <para> - table-others (<literal>ibus-engines.table-others</literal>): - 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 <literal>table</literal>. For example: - </para> - <programlisting> -ibus.engines = with pkgs.ibus-engines; [ table table-others ]; -</programlisting> - </listitem> - </itemizedlist> - <para> - To use any input method, the package must be added in the - configuration, as shown above, and also (after running - <literal>nixos-rebuild</literal>) the input method must be added - from IBus’ preference dialog. - </para> - <section xml:id="module-services-input-methods-troubleshooting"> - <title>Troubleshooting</title> - <para> - If IBus works in some applications but not others, a likely - cause of this is that IBus is depending on a different version - of <literal>glib</literal> to what the applications are - depending on. This can be checked by running - <literal>nix-store -q --requisites <path> | grep glib</literal>, - where <literal><path></literal> is the path of either IBus - or an application in the Nix store. The <literal>glib</literal> - packages must match exactly. If they do not, uninstalling and - reinstalling the application is a likely fix. - </para> - </section> - </section> - <section xml:id="module-services-input-methods-fcitx"> - <title>Fcitx</title> - <para> - Fcitx is an input method framework with extension support. It has - three built-in Input Method Engine, Pinyin, QuWei and Table-based - input methods. - </para> - <para> - The following snippet can be used to configure Fcitx: - </para> - <programlisting> -i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; -}; -</programlisting> - <para> - <literal>i18n.inputMethod.fcitx.engines</literal> is optional and - can be used to add extra Fcitx engines. - </para> - <para> - Available extra Fcitx engines are: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a - system for Japanese input method. It converts Hiragana text to - Kana Kanji mixed text. - </para> - </listitem> - <listitem> - <para> - Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is - an intelligent Zhuyin input method. It is one of the most - popular input methods among Traditional Chinese Unix users. - </para> - </listitem> - <listitem> - <para> - Hangul (<literal>fcitx-engines.hangul</literal>): Korean input - method. - </para> - </listitem> - <listitem> - <para> - Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese - input method. - </para> - </listitem> - <listitem> - <para> - m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input - method that uses input methods and corresponding icons in the - m17n database. - </para> - </listitem> - <listitem> - <para> - mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input - method from Google. - </para> - </listitem> - <listitem> - <para> - table-others (<literal>fcitx-engines.table-others</literal>): - Various table-based input methods. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-input-methods-nabi"> - <title>Nabi</title> - <para> - Nabi is an easy to use Korean X input method. It allows you to - enter phonetic Korean characters (hangul) and pictographic Korean - characters (hanja). - </para> - <para> - The following snippet can be used to configure Nabi: - </para> - <programlisting> -i18n.inputMethod = { - enabled = "nabi"; -}; -</programlisting> - </section> - <section xml:id="module-services-input-methods-uim"> - <title>Uim</title> - <para> - Uim (short for <quote>universal input method</quote>) is a - multilingual input method framework. Applications can use it - through so-called bridges. - </para> - <para> - The following snippet can be used to configure uim: - </para> - <programlisting> -i18n.inputMethod = { - enabled = "uim"; -}; -</programlisting> - <para> - Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar" /> - option can be used to choose uim toolbar. - </para> - </section> - <section xml:id="module-services-input-methods-hime"> - <title>Hime</title> - <para> - 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… - </para> - <para> - The following snippet can be used to configure Hime: - </para> - <programlisting> -i18n.inputMethod = { - enabled = "hime"; -}; -</programlisting> - </section> - <section xml:id="module-services-input-methods-kime"> - <title>Kime</title> - <para> - Kime is Korean IME. it’s built with Rust language and let you get - simple, safe, fast Korean typing - </para> - <para> - The following snippet can be used to configure Kime: - </para> - <programlisting> -i18n.inputMethod = { - enabled = "kime"; -}; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix b/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix new file mode 100644 index 0000000000000..143c678e43fbc --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-powerpc64le.nix @@ -0,0 +1,49 @@ +# To build, use: +# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-powerpc64le.nix -A config.system.build.sdImage +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../profiles/base.nix + ../../profiles/installation-device.nix + ./sd-image.nix + ]; + + boot.loader = { + # powerpc64le-linux typically uses petitboot + grub.enable = false; + generic-extlinux-compatible = { + # petitboot is not does not support all of the extlinux extensions to + # syslinux, but its parser is very forgiving; it essentially ignores + # whatever it doesn't understand. See below for a filename adjustment. + enable = true; + }; + }; + + boot.consoleLogLevel = lib.mkDefault 7; + boot.kernelParams = [ "console=hvc0" ]; + + sdImage = { + populateFirmwareCommands = ""; + populateRootCommands = '' + mkdir -p ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} \ + -c ${config.system.build.toplevel} \ + -d ./files/boot + '' + # https://github.com/open-power/petitboot/blob/master/discover/syslinux-parser.c + # petitboot will look in these paths (plus all-caps versions of them): + # /boot/syslinux/syslinux.cfg + # /syslinux/syslinux.cfg + # /syslinux.cfg + + '' + mv ./files/boot/extlinux ./files/boot/syslinux + mv ./files/boot/syslinux/extlinux.conf ./files/boot/syslinux/syslinux.cfg + '' + # petitboot does not support relative paths for LINUX or INITRD; it prepends + # a `/` when parsing these fields + + '' + sed -i 's_^\(\W\W*\(INITRD\|initrd\|LINUX\|linux\)\W\)\.\./_\1/boot/_' ./files/boot/syslinux/syslinux.cfg + ''; + }; +} diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index c9cb65dbbe5a3..1058a34133b14 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/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"; + x86_64-linux = "/nix/store/mc43d38fibi94pp5crfwacl5gbslccd0-nix-2.13.3"; + i686-linux = "/nix/store/09m966pj26cgd4ihlg8ihl1106j3vih8-nix-2.13.3"; + aarch64-linux = "/nix/store/7f191d125akld27gc6jl0r13l8pl7x0h-nix-2.13.3"; + x86_64-darwin = "/nix/store/1wn9jkvi2zqfjnjgg7lnp30r2q2y8whd-nix-2.13.3"; + aarch64-darwin = "/nix/store/8w0v2mffa10chrf1h66cbvbpw86qmh85-nix-2.13.3"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index caf97f66ef31e..d1b16d042d86a 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -217,7 +217,7 @@ in # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It’s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index e1d16f802cee9..95f2765aff1eb 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/version.nix b/nixos/modules/misc/version.nix index 30d11913c533b..447f8193855f1 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -130,7 +130,7 @@ in to be compatible. The effect is that NixOS will use defaults corresponding to the specified release (such as using an older version of PostgreSQL). - It‘s perfectly fine and recommended to leave this value at the + It’s perfectly fine and recommended to leave this value at the release version of the first install of this system. Changing this option will not upgrade your system. In fact it is meant to stay constant exactly when you upgrade your system. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e520c8308cf1..de390d801478e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -53,11 +53,13 @@ ./hardware/cpu/intel-sgx.nix ./hardware/device-tree.nix ./hardware/digitalbitbox.nix + ./hardware/flipperzero.nix ./hardware/flirc.nix ./hardware/gkraken.nix ./hardware/gpgsmartcards.nix ./hardware/hackrf.nix ./hardware/i2c.nix + ./hardware/keyboard/qmk.nix ./hardware/keyboard/teck.nix ./hardware/keyboard/uhk.nix ./hardware/keyboard/zsa.nix @@ -195,6 +197,7 @@ ./programs/mdevctl.nix ./programs/mepo.nix ./programs/mininet.nix + ./programs/miriway.nix ./programs/mosh.nix ./programs/msmtp.nix ./programs/mtr.nix @@ -214,6 +217,7 @@ ./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 @@ -221,6 +225,7 @@ ./programs/seahorse.nix ./programs/sedutil.nix ./programs/shadow.nix + ./programs/sharing.nix ./programs/singularity.nix ./programs/skim.nix ./programs/slock.nix @@ -311,6 +316,7 @@ ./services/audio/snapserver.nix ./services/audio/spotifyd.nix ./services/audio/squeezelite.nix + ./services/audio/tts.nix ./services/audio/ympd.nix ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix @@ -695,6 +701,7 @@ ./services/monitoring/arbtt.nix ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix + ./services/monitoring/cockpit.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/datadog-agent.nix @@ -856,6 +863,7 @@ ./services/networking/i2pd.nix ./services/networking/icecream/daemon.nix ./services/networking/icecream/scheduler.nix + ./services/networking/imaginary.nix ./services/networking/inspircd.nix ./services/networking/iodine.nix ./services/networking/iperf3.nix @@ -907,6 +915,7 @@ ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/netbird.nix + ./services/networking/networkd-dispatcher.nix ./services/networking/networkmanager.nix ./services/networking/nextdns.nix ./services/networking/nftables.nix @@ -1043,6 +1052,8 @@ ./services/search/hound.nix ./services/search/kibana.nix ./services/search/meilisearch.nix + ./services/search/opensearch.nix + ./services/search/qdrant.nix ./services/search/solr.nix ./services/security/aesmd.nix ./services/security/certmgr.nix @@ -1158,6 +1169,7 @@ ./services/web-apps/moodle.nix ./services/web-apps/netbox.nix ./services/web-apps/nextcloud.nix + ./services/web-apps/nextcloud-notify_push.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix @@ -1303,6 +1315,7 @@ ./system/boot/systemd/logind.nix ./system/boot/systemd/nspawn.nix ./system/boot/systemd/oomd.nix + ./system/boot/systemd/repart.nix ./system/boot/systemd/shutdown.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix @@ -1363,6 +1376,7 @@ ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix + ./virtualisation/multipass.nix ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix ./virtualisation/openstack-options.nix diff --git a/nixos/modules/programs/digitalbitbox/default.nix b/nixos/modules/programs/digitalbitbox/default.nix index 054110fe5df2e..5ee6cdafe63a0 100644 --- a/nixos/modules/programs/digitalbitbox/default.nix +++ b/nixos/modules/programs/digitalbitbox/default.nix @@ -33,7 +33,7 @@ in }; meta = { - doc = ./default.xml; + doc = ./default.md; maintainers = with lib.maintainers; [ vidbina ]; }; } diff --git a/nixos/modules/programs/digitalbitbox/default.xml b/nixos/modules/programs/digitalbitbox/default.xml deleted file mode 100644 index ee892523223c8..0000000000000 --- a/nixos/modules/programs/digitalbitbox/default.xml +++ /dev/null @@ -1,70 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-programs-digitalbitbox"> - <title>Digital Bitbox</title> - <para> - Digital Bitbox is a hardware wallet and second-factor authenticator. - </para> - <para> - The <literal>digitalbitbox</literal> programs module may be - installed by setting <literal>programs.digitalbitbox</literal> to - <literal>true</literal> in a manner similar to - </para> - <programlisting> -programs.digitalbitbox.enable = true; -</programlisting> - <para> - and bundles the <literal>digitalbitbox</literal> package (see - <xref linkend="sec-digitalbitbox-package" />), which contains the - <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, - along with the hardware module (see - <xref linkend="sec-digitalbitbox-hardware-module" />) which sets up - the necessary udev rules to access the device. - </para> - <para> - Enabling the digitalbitbox module is pretty much the easiest way to - get a Digital Bitbox device working on your system. - </para> - <para> - For more information, see - <link xlink:href="https://digitalbitbox.com/start_linux">https://digitalbitbox.com/start_linux</link>. - </para> - <section xml:id="sec-digitalbitbox-package"> - <title>Package</title> - <para> - The binaries, <literal>dbb-app</literal> (a GUI tool) and - <literal>dbb-cli</literal> (a CLI tool), are available through the - <literal>digitalbitbox</literal> package which could be installed - as follows: - </para> - <programlisting> -environment.systemPackages = [ - pkgs.digitalbitbox -]; -</programlisting> - </section> - <section xml:id="sec-digitalbitbox-hardware-module"> - <title>Hardware</title> - <para> - The digitalbitbox hardware package enables the udev rules for - Digital Bitbox devices and may be installed as follows: - </para> - <programlisting> -hardware.digitalbitbox.enable = true; -</programlisting> - <para> - In order to alter the udev rules, one may provide different values - for the <literal>udevRule51</literal> and - <literal>udevRule52</literal> attributes by means of overriding as - follows: - </para> - <programlisting> -programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; -}; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/programs/flashrom.nix b/nixos/modules/programs/flashrom.nix index 294b208a37208..9f8faff14e472 100644 --- a/nixos/modules/programs/flashrom.nix +++ b/nixos/modules/programs/flashrom.nix @@ -22,6 +22,5 @@ in config = mkIf cfg.enable { services.udev.packages = [ cfg.package ]; environment.systemPackages = [ cfg.package ]; - users.groups.flashrom = { }; }; } diff --git a/nixos/modules/programs/k3b.nix b/nixos/modules/programs/k3b.nix index cdaed3cf70fba..5d19e4f1cc4fb 100644 --- a/nixos/modules/programs/k3b.nix +++ b/nixos/modules/programs/k3b.nix @@ -28,7 +28,7 @@ with lib; k3b dvdplusrwtools cdrdao - cdrkit + cdrtools ]; security.wrappers = { @@ -44,7 +44,7 @@ with lib; owner = "root"; group = "cdrom"; permissions = "u+wrx,g+x"; - source = "${pkgs.cdrkit}/bin/cdrecord"; + source = "${pkgs.cdrtools}/bin/cdrecord"; }; }; diff --git a/nixos/modules/programs/miriway.nix b/nixos/modules/programs/miriway.nix new file mode 100644 index 0000000000000..52b5f84762220 --- /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 <https://github.com/Miriway/Miriway>, + 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/plotinus.nix b/nixos/modules/programs/plotinus.nix index a011bb862aeaf..c2b6884d6490d 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 2d4db0285148b..0000000000000 --- a/nixos/modules/programs/plotinus.xml +++ /dev/null @@ -1,30 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-program-plotinus"> - <title>Plotinus</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/programs/plotinus.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://github.com/p-e-w/plotinus">https://github.com/p-e-w/plotinus</link> - </para> - <para> - Plotinus is a searchable command palette in every modern GTK - application. - </para> - <para> - When in a GTK 3 application and Plotinus is enabled, you can press - <literal>Ctrl+Shift+P</literal> to open the command palette. The - command palette provides a searchable list of of all menu items in - the application. - </para> - <para> - To enable Plotinus, add the following to your - <filename>configuration.nix</filename>: - </para> - <programlisting> -programs.plotinus.enable = true; -</programlisting> -</chapter> diff --git a/nixos/modules/programs/proxychains.nix b/nixos/modules/programs/proxychains.nix index 0771f03c77d30..a52783aa66982 100644 --- a/nixos/modules/programs/proxychains.nix +++ b/nixos/modules/programs/proxychains.nix @@ -86,7 +86,7 @@ in { description = lib.mdDoc "Proxy DNS requests - no leak for DNS data."; }; - quietMode = mkEnableOption (lib.mdDoc "Quiet mode (no output from the library)."); + quietMode = mkEnableOption (lib.mdDoc "Quiet mode (no output from the library)"); remoteDNSSubnet = mkOption { type = types.enum [ 10 127 224 ]; diff --git a/nixos/modules/programs/qdmr.nix b/nixos/modules/programs/qdmr.nix new file mode 100644 index 0000000000000..1bb81317bda8d --- /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.dialout = {}; + }; +} diff --git a/nixos/modules/programs/sharing.nix b/nixos/modules/programs/sharing.nix new file mode 100644 index 0000000000000..9ab51859dc51d --- /dev/null +++ b/nixos/modules/programs/sharing.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: +with lib; +{ + options.programs.sharing = { + enable = mkEnableOption (lib.mdDoc '' + sharing, a CLI tool for sharing files. + + Note that it will opens the 7478 port for TCP in the firewall, which is needed for it to function properly + ''); + }; + config = + let + cfg = config.programs.sharing; + in + mkIf cfg.enable { + environment.systemPackages = [ pkgs.sharing ]; + networking.firewall.allowedTCPPorts = [ 7478 ]; + }; +} diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index 9648d0c278740..4884e5bdf2ddd 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -3,32 +3,90 @@ with lib; let cfg = config.programs.singularity; - singularity = pkgs.singularity.overrideAttrs (attrs : { - installPhase = attrs.installPhase + '' - mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig - ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid - ''; - }); -in { +in +{ + options.programs.singularity = { - enable = mkEnableOption (lib.mdDoc "Singularity"); + enable = mkEnableOption (mdDoc "singularity") // { + description = mdDoc '' + Whether to install Singularity/Apptainer with system-level overriding such as SUID support. + ''; + }; + package = mkOption { + type = types.package; + default = pkgs.singularity; + defaultText = literalExpression "pkgs.singularity"; + example = literalExpression "pkgs.apptainer"; + description = mdDoc '' + Singularity/Apptainer package to override and install. + ''; + }; + packageOverriden = mkOption { + type = types.nullOr types.package; + default = null; + description = mdDoc '' + This option provides access to the overriden result of `programs.singularity.package`. + + For example, the following configuration makes all the Nixpkgs packages use the overriden `singularity`: + ```Nix + { config, lib, pkgs, ... }: + { + nixpkgs.overlays = [ + (final: prev: { + _singularity-orig = prev.singularity; + singularity = config.programs.singularity.packageOverriden; + }) + ]; + programs.singularity.enable = true; + programs.singularity.package = pkgs._singularity-orig; + } + ``` + + Use `lib.mkForce` to forcefully specify the overriden package. + ''; + }; + enableFakeroot = mkOption { + type = types.bool; + default = true; + example = false; + description = mdDoc '' + Whether to enable the `--fakeroot` support of Singularity/Apptainer. + ''; + }; + enableSuid = mkOption { + type = types.bool; + default = true; + example = false; + description = mdDoc '' + Whether to enable the SUID support of Singularity/Apptainer. + ''; + }; }; config = mkIf cfg.enable { - environment.systemPackages = [ singularity ]; - security.wrappers.singularity-suid = - { setuid = true; - owner = "root"; - group = "root"; - source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; - }; - systemd.tmpfiles.rules = [ - "d /var/singularity/mnt/session 0770 root root -" - "d /var/singularity/mnt/final 0770 root root -" - "d /var/singularity/mnt/overlay 0770 root root -" - "d /var/singularity/mnt/container 0770 root root -" - "d /var/singularity/mnt/source 0770 root root -" - ]; + programs.singularity.packageOverriden = (cfg.package.override ( + optionalAttrs cfg.enableFakeroot { + newuidmapPath = "/run/wrappers/bin/newuidmap"; + newgidmapPath = "/run/wrappers/bin/newgidmap"; + } // optionalAttrs cfg.enableSuid { + enableSuid = true; + starterSuidPath = "/run/wrappers/bin/${cfg.package.projectName}-suid"; + } + )); + environment.systemPackages = [ cfg.packageOverriden ]; + security.wrappers."${cfg.packageOverriden.projectName}-suid" = mkIf cfg.enableSuid { + setuid = true; + owner = "root"; + group = "root"; + source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig"; + }; + systemd.tmpfiles.rules = [ + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/final 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/overlay 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/container 0770 root root -" + "d /var/lib/${cfg.packageOverriden.projectName}/mnt/source 0770 root root -" + ]; }; } diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 36b724e04bde6..3b8da78e2af5e 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -282,7 +282,7 @@ in config = { programs.ssh.setXAuthLocation = - mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11); + mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.settings.X11Forwarding); assertions = [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index b0a766dd055f5..3b2e69bd37c3e 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -26,7 +26,7 @@ let }; }; - swayPackage = pkgs.sway.override { + defaultSwayPackage = pkgs.sway.override { extraSessionCommands = cfg.extraSessionCommands; extraOptions = cfg.extraOptions; withBaseWrapper = cfg.wrapperFeatures.base; @@ -42,6 +42,19 @@ in { <https://github.com/swaywm/sway/wiki> and "man 5 sway" for more information''); + package = mkOption { + type = with types; nullOr package; + default = defaultSwayPackage; + defaultText = literalExpression "pkgs.sway"; + description = lib.mdDoc '' + Sway package to use. Will override the options + 'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'. + Set to <code>null</code> to not add any Sway package to your + path. This should be done if you want to use the Home Manager Sway + module to install Sway. + ''; + }; + wrapperFeatures = mkOption { type = wrapperOptions; default = { }; @@ -121,16 +134,17 @@ in { } ]; environment = { - systemPackages = [ swayPackage ] ++ cfg.extraPackages; + systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages; # Needed for the default wallpaper: - pathsToLink = [ "/share/backgrounds/sway" ]; + pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ]; etc = { - "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config"; "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' # Import the most important environment variables into the D-Bus and systemd # user environments (e.g. required for screen sharing and Pinentry prompts): exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP ''; + } // optionalAttrs (cfg.package != null) { + "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; security.polkit.enable = true; @@ -139,7 +153,7 @@ in { fonts.enableDefaultFonts = mkDefault true; programs.dconf.enable = mkDefault true; # To make a Sway session available if a display manager like SDDM is enabled: - services.xserver.displayManager.sessionPackages = [ swayPackage ]; + services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; programs.xwayland.enable = mkDefault true; # For screen sharing (this option only has an effect with xdg.portal.enable): xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 41ea31b0f122c..83eee1c88b3ca 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 2a2bba96b859c..0000000000000 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ /dev/null @@ -1,154 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-programs-zsh-ohmyzsh"> - <title>Oh my ZSH</title> - <para> - <link xlink:href="https://ohmyz.sh/"><literal>oh-my-zsh</literal></link> - is a framework to manage your - <link xlink:href="https://www.zsh.org/">ZSH</link> configuration - including completion scripts for several CLI tools or custom prompt - themes. - </para> - <section xml:id="module-programs-oh-my-zsh-usage"> - <title>Basic usage</title> - <para> - The module uses the <literal>oh-my-zsh</literal> package with all - available features. The initial setup using Nix expressions is - fairly similar to the configuration format of - <literal>oh-my-zsh</literal>. - </para> - <programlisting> -{ - programs.zsh.ohMyZsh = { - enable = true; - plugins = [ "git" "python" "man" ]; - theme = "agnoster"; - }; -} -</programlisting> - <para> - For a detailed explanation of these arguments please refer to the - <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> - docs</link>. - </para> - <para> - The expression generates the needed configuration and writes it - into your <literal>/etc/zshrc</literal>. - </para> - </section> - <section xml:id="module-programs-oh-my-zsh-additions"> - <title>Custom additions</title> - <para> - Sometimes third-party or custom scripts such as a modified theme - may be needed. <literal>oh-my-zsh</literal> provides the - <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> - environment variable for this which points to a directory with - additional scripts. - </para> - <para> - The module can do this as well: - </para> - <programlisting> -{ - programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; -} -</programlisting> - </section> - <section xml:id="module-programs-oh-my-zsh-environments"> - <title>Custom environments</title> - <para> - There are several extensions for <literal>oh-my-zsh</literal> - packaged in <literal>nixpkgs</literal>. One of them is - <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> - which bundles completion scripts and a plugin for - <literal>oh-my-zsh</literal>. - </para> - <para> - Rather than using a single mutable path for - <literal>ZSH_CUSTOM</literal>, it’s also possible to generate this - path from a list of Nix packages: - </para> - <programlisting> -{ pkgs, ... }: -{ - programs.zsh.ohMyZsh.customPkgs = [ - pkgs.nix-zsh-completions - # and even more... - ]; -} -</programlisting> - <para> - Internally a single store path will be created using - <literal>buildEnv</literal>. Please refer to the docs of - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> - for further reference. - </para> - <para> - <emphasis>Please keep in mind that this is not compatible with - <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an - immutable store path while <literal>custom</literal> shall remain - mutable! An evaluation failure will be thrown if both - <literal>custom</literal> and <literal>customPkgs</literal> are - set.</emphasis> - </para> - </section> - <section xml:id="module-programs-oh-my-zsh-packaging-customizations"> - <title>Package your own customizations</title> - <para> - If third-party customizations (e.g. new themes) are supposed to be - added to <literal>oh-my-zsh</literal> there are several pitfalls - to keep in mind: - </para> - <itemizedlist> - <listitem> - <para> - To comply with the default structure of <literal>ZSH</literal> - the entire output needs to be written to - <literal>$out/share/zsh.</literal> - </para> - </listitem> - <listitem> - <para> - Completion scripts are supposed to be stored at - <literal>$out/share/zsh/site-functions</literal>. This - directory is part of the - <link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html"><literal>fpath</literal></link> - and the package should be compatible with pure - <literal>ZSH</literal> setups. The module will automatically - link the contents of <literal>site-functions</literal> to - completions directory in the proper store path. - </para> - </listitem> - <listitem> - <para> - The <literal>plugins</literal> directory needs the structure - <literal>pluginname/pluginname.plugin.zsh</literal> as - structured in the - <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream - repo.</link> - </para> - </listitem> - </itemizedlist> - <para> - A derivation for <literal>oh-my-zsh</literal> may look like this: - </para> - <programlisting> -{ 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 - ''; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index b92561ed48594..d8a18cfcc6dc1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -50,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.nix b/nixos/modules/security/acme/default.nix index eb4f11f7dcdec..ef0636258994c 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -916,6 +916,6 @@ in { meta = { maintainers = lib.teams.acme.members; - doc = ./default.xml; + doc = ./default.md; }; } diff --git a/nixos/modules/security/acme/default.xml b/nixos/modules/security/acme/default.xml deleted file mode 100644 index e80ce3b6a4943..0000000000000 --- a/nixos/modules/security/acme/default.xml +++ /dev/null @@ -1,395 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-security-acme"> - <title>SSL/TLS Certificates with ACME</title> - <para> - 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 - <link xlink:href="https://go-acme.github.io/lego/">lego</link> is - used under the hood. - </para> - <para> - 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. - </para> - <section xml:id="module-security-acme-prerequisites"> - <title>Prerequisites</title> - <para> - To use the ACME module, you must accept the provider’s terms of - service by setting - <xref linkend="opt-security.acme.acceptTerms" /> to - <literal>true</literal>. The Let’s Encrypt ToS can be found - <link xlink:href="https://letsencrypt.org/repository/">here</link>. - </para> - <para> - 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 - <xref linkend="opt-security.acme.defaults.email" /> and/or on a - per-cert basis with - <xref linkend="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. - </para> - <para> - Alternatively, you can use a different ACME server by changing the - <xref linkend="opt-security.acme.defaults.server" /> option to a - provider of your choosing, or just change the server for one cert - with <xref linkend="opt-security.acme.certs._name_.server" />. - </para> - <para> - You will need an HTTP server or DNS server for verification. For - HTTP, the server must have a webroot defined that can serve - <filename>.well-known/acme-challenge</filename>. 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. - </para> - </section> - <section xml:id="module-security-acme-nginx"> - <title>Using ACME certificates in Nginx</title> - <para> - NixOS supports fetching ACME certificates for you by setting - <literal>enableACME = true;</literal> 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 <literal>foo.example.com</literal> the - config would look like this: - </para> - <programlisting> -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"; - }; - }; - }; -} -</programlisting> - </section> - <section xml:id="module-security-acme-httpd"> - <title>Using ACME certificates in Apache/httpd</title> - <para> - Using ACME certificates with Apache virtual hosts is identical to - using them with Nginx. The attribute names are all the same, just - replace <quote>nginx</quote> with <quote>httpd</quote> where - appropriate. - </para> - </section> - <section xml:id="module-security-acme-configuring"> - <title>Manual configuration of HTTP-01 validation</title> - <para> - First off you will need to set up a virtual host to serve the - challenges. This example uses a vhost called - <literal>certs.example.com</literal>, with the intent that you - will generate certs for all your vhosts and redirect everyone to - HTTPS. - </para> - <programlisting> -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] - ''; - }; - }; -} -</programlisting> - <para> - Now you need to configure ACME to generate a certificate. - </para> - <programlisting> -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" ]; -}; -</programlisting> - <para> - The private key <filename>key.pem</filename> and certificate - <filename>fullchain.pem</filename> will be put into - <filename>/var/lib/acme/foo.example.com</filename>. - </para> - <para> - Refer to <xref linkend="ch-options" /> for all available - configuration options for the - <link linkend="opt-security.acme.certs">security.acme</link> - module. - </para> - </section> - <section xml:id="module-security-acme-config-dns"> - <title>Configuring ACME for DNS validation</title> - <para> - 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 - <link xlink:href="https://go-acme.github.io/lego/dns/">lego - docs</link> for provider/server specific configuration values. For - the sake of these docs, we will provide a fully self-hosted - example using bind. - </para> - <programlisting> -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; -}; -</programlisting> - <para> - The <filename>dnskeys.conf</filename> and - <filename>certs.secret</filename> 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: - </para> - <programlisting> -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 - ''; -}; -</programlisting> - <para> - Now you’re all set to generate certs! You should monitor the first - invocation by running - <literal>systemctl start acme-example.com.service & journalctl -fu acme-example.com.service</literal> - and watching its log output. - </para> - </section> - <section xml:id="module-security-acme-config-dns-with-vhosts"> - <title>Using DNS validation with web server virtual hosts</title> - <para> - It is possible to use DNS-01 validation with all certificates, - including those automatically configured via the Nginx/Apache - <link linkend="opt-services.nginx.virtualHosts._name_.enableACME"><literal>enableACME</literal></link> - option. This configuration pattern is fully supported and part of - the module’s test suite for Nginx + Apache. - </para> - <para> - You must follow the guide above on configuring DNS-01 validation - first, however instead of setting the options for one certificate - (e.g. - <xref linkend="opt-security.acme.certs._name_.dnsProvider" />) you - will set them as defaults (e.g. - <xref linkend="opt-security.acme.defaults.dnsProvider" />). - </para> - <programlisting> -# 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; - }; - }; -} -</programlisting> - <para> - And that’s it! Next time your configuration is rebuilt, or when - you add a new virtualHost, it will be DNS-01 validated. - </para> - </section> - <section xml:id="module-security-acme-root-owned"> - <title>Using ACME with services demanding root owned - certificates</title> - <para> - 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 <literal>acme</literal>), however you can use - systemd’s <literal>LoadCredential</literal> feature to resolve - this elegantly. Below is an example configuration for OpenSMTPD, - but this pattern can be applied to any service. - </para> - <programlisting> -# 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 - ''; -}; -</programlisting> - </section> - <section xml:id="module-security-acme-regenerate"> - <title>Regenerating certificates</title> - <para> - 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 - <literal>systemctl clean --what=state acme-example.com.service</literal> - will remove all certificate files and the account data for the - given domain, allowing you to then - <literal>systemctl start acme-example.com.service</literal> to - generate fresh ones. - </para> - </section> - <section xml:id="module-security-acme-fix-jws"> - <title>Fixing JWS Verification error</title> - <para> - It is possible that your account credentials file may become - corrupt and need to be regenerated. In this scenario lego will - produce the error <literal>JWS verification error</literal>. The - solution is to simply delete the associated accounts file and - re-run the affected service(s). - </para> - <programlisting> -# 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 -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index f33898578b817..de427ccb295bb 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -14,7 +14,7 @@ in security.polkit.enable = mkEnableOption (lib.mdDoc "polkit"); - security.polkit.debug = mkEnableOption (lib.mdDoc "debug logs from polkit. This is required in order to see log messages from rule definitions."); + security.polkit.debug = mkEnableOption (lib.mdDoc "debug logs from polkit. This is required in order to see log messages from rule definitions"); security.polkit.extraConfig = mkOption { type = types.lines; diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index eff1549380c84..d54400b18e307 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/roon-bridge.nix b/nixos/modules/services/audio/roon-bridge.nix index e9335091ba9a9..70392b647cc66 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; diff --git a/nixos/modules/services/audio/tts.nix b/nixos/modules/services/audio/tts.nix new file mode 100644 index 0000000000000..1a355c8ee39f5 --- /dev/null +++ b/nixos/modules/services/audio/tts.nix @@ -0,0 +1,151 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.tts; +in + +{ + options.services.tts = let + inherit (lib) literalExpression mkOption mdDoc mkEnableOption types; + in { + servers = mkOption { + type = types.attrsOf (types.submodule ( + { ... }: { + options = { + enable = mkEnableOption (mdDoc "Coqui TTS server"); + + port = mkOption { + type = types.port; + example = 5000; + description = mdDoc '' + Port to bind the TTS server to. + ''; + }; + + model = mkOption { + type = types.nullOr types.str; + default = "tts_models/en/ljspeech/tacotron2-DDC"; + example = null; + description = mdDoc '' + Name of the model to download and use for speech synthesis. + + Check `tts-server --list_models` for possible values. + + Set to `null` to use a custom model. + ''; + }; + + useCuda = mkOption { + type = types.bool; + default = false; + example = true; + description = mdDoc '' + Whether to offload computation onto a CUDA compatible GPU. + ''; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = mdDoc '' + Extra arguments to pass to the server commandline. + ''; + }; + }; + } + )); + default = {}; + example = literalExpression '' + { + english = { + port = 5300; + model = "tts_models/en/ljspeech/tacotron2-DDC"; + }; + german = { + port = 5301; + model = "tts_models/de/thorsten/tacotron2-DDC"; + }; + dutch = { + port = 5302; + model = "tts_models/nl/mai/tacotron2-DDC"; + }; + } + ''; + description = mdDoc '' + TTS server instances. + ''; + }; + }; + + config = let + inherit (lib) mkIf mapAttrs' nameValuePair optionalString concatMapStringsSep escapeShellArgs; + in mkIf (cfg.servers != {}) { + systemd.services = mapAttrs' (server: options: + nameValuePair "tts-${server}" { + description = "Coqui TTS server instance ${server}"; + after = [ + "network-online.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + path = with pkgs; [ + espeak-ng + ]; + environment.HOME = "/var/lib/tts"; + serviceConfig = { + DynamicUser = true; + User = "tts"; + StateDirectory = "tts"; + ExecStart = "${pkgs.tts}/bin/tts-server --port ${toString options.port}" + + optionalString (options.model != null) " --model_name ${options.model}" + + optionalString (options.useCuda) " --use_cuda" + + (concatMapStringsSep " " escapeShellArgs options.extraArgs); + CapabilityBoundingSet = ""; + DeviceAllow = if options.useCuda then [ + # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf + "/dev/nvidia1" + "/dev/nvidia2" + "/dev/nvidia3" + "/dev/nvidia4" + "/dev/nvidia-caps/nvidia-cap1" + "/dev/nvidia-caps/nvidia-cap2" + "/dev/nvidiactl" + "/dev/nvidia-modeset" + "/dev/nvidia-uvm" + "/dev/nvidia-uvm-tools" + ] else ""; + DevicePolicy = "closed"; + LockPersonality = true; + # jit via numba->llvmpipe + MemoryDenyWriteExecute = false; + PrivateDevices = true; + PrivateUsers = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }) cfg.servers; + }; +} diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index 811b81030efcf..b74cc3f9c0b41 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -48,8 +48,46 @@ in { systemd.services.ympd = { description = "Standalone MPD Web GUI written in C"; + wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${toString cfg.webPort} --user nobody"; + after = [ "network-online.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.ympd}/bin/ympd \ + --host ${cfg.mpd.host} \ + --port ${toString cfg.mpd.port} \ + --webport ${toString cfg.webPort} + ''; + + DynamicUser = true; + NoNewPrivileges = true; + + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictSUIDSGID = true; + + SystemCallFilter = [ + "@system-service" + "~@process" + "~@setuid" + ]; + }; }; }; diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md index e86ae593bbd62..39141f6ec8587 100644 --- a/nixos/modules/services/backup/borgbackup.md +++ b/nixos/modules/services/backup/borgbackup.md @@ -128,7 +128,7 @@ To backup your home directory to borgbase you have to: - Initialize the repository on the server. Eg. sudo borg init --encryption=repokey-blake2 \ - -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ + --rsh "ssh -i /run/keys/id_ed25519_borgbase" \ zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo - Add it to your NixOS configuration, e.g. diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index c5fc09dcea028..bc2d79ac10ac6 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -226,7 +226,7 @@ let in { meta.maintainers = with maintainers; [ dotlambda ]; - meta.doc = ./borgbackup.xml; + meta.doc = ./borgbackup.md; ###### interface diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml deleted file mode 100644 index 2b9e0baa6d09a..0000000000000 --- a/nixos/modules/services/backup/borgbackup.xml +++ /dev/null @@ -1,215 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-borgbase"> - <title>BorgBackup</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/backup/borgbackup.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://borgbackup.readthedocs.io/">https://borgbackup.readthedocs.io/</link> - </para> - <para> - <link xlink:href="https://www.borgbackup.org/">BorgBackup</link> - (short: Borg) is a deduplicating backup program. Optionally, it - supports compression and authenticated encryption. - </para> - <para> - 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. - </para> - <section xml:id="module-services-backup-borgbackup-configuring"> - <title>Configuring</title> - <para> - A complete list of options for the Borgbase module may be found - <link linkend="opt-services.borgbackup.jobs">here</link>. - </para> - </section> - <section xml:id="opt-services-backup-borgbackup-local-directory"> - <title>Basic usage for a local backup</title> - <para> - A very basic configuration for backing up to a locally accessible - directory is: - </para> - <programlisting> -{ - 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"; - }; - } - }; -} -</programlisting> - <warning> - <para> - If you do not want the passphrase to be stored in the - world-readable Nix store, use passCommand. You find an example - below. - </para> - </warning> - </section> - <section xml:id="opt-services-backup-create-server"> - <title>Create a borg backup server</title> - <para> - 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. - </para> - <programlisting> -# 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 -</programlisting> - <para> - Add the following snippet to your NixOS configuration: - </para> - <programlisting> -{ - services.borgbackup.repos = { - my_borg_repo = { - authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" - ] ; - path = "/var/lib/my_borg_repo" ; - }; - }; -} -</programlisting> - </section> - <section xml:id="opt-services-backup-borgbackup-remote-server"> - <title>Backup to the borg repository server</title> - <para> - 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 - <filename>/run/keys/borgbackup_passphrase</filename>, which should - be only accessible by root - </para> - <programlisting> -{ - 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"; - }; - }; -}; -</programlisting> - <para> - The following few commands (run as root) let you test your backup. - </para> - <programlisting> -> 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] -</programlisting> - </section> - <section xml:id="opt-services-backup-borgbackup-borgbase"> - <title>Backup to a hosting service</title> - <para> - Several companies offer - <link xlink:href="https://www.borgbackup.org/support/commercial.html">(paid) - hosting services</link> for Borg repositories. - </para> - <para> - To backup your home directory to borgbase you have to: - </para> - <itemizedlist> - <listitem> - <para> - Generate a SSH key without a password, to access the remote - server. E.g. - </para> - <programlisting> -sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase -</programlisting> - </listitem> - <listitem> - <para> - Create the repository on the server by following the - instructions for your hosting server. - </para> - </listitem> - <listitem> - <para> - Initialize the repository on the server. Eg. - </para> - <programlisting> -sudo borg init --encryption=repokey-blake2 \ - -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ - zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo -</programlisting> - </listitem> - <listitem> - <para> - Add it to your NixOS configuration, e.g. - </para> - <programlisting> -{ - 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"; - }; - }; -}} -</programlisting> - </listitem> - </itemizedlist> - </section> - <section xml:id="opt-services-backup-borgbackup-vorta"> - <title>Vorta backup client for the desktop</title> - <para> - 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. - </para> - <para> - It can be installed in NixOS e.g. by adding - <literal>pkgs.vorta</literal> to - <xref linkend="opt-environment.systemPackages" />. - </para> - <para> - Details about using Vorta can be found under - <link xlink:href="https://vorta.borgbase.com/usage">https://vorta.borgbase.com</link> - . - </para> - </section> -</chapter> diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index ce914003c6222..8e7059e5b59d0 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/nixos/modules/services/backup/zfs-replication.nix @@ -9,7 +9,7 @@ let in { options = { services.zfs.autoReplication = { - enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication."); + enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication"); followDelete = mkOption { description = lib.mdDoc "Remove remote snapshots that don't have a local correspondent."; diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 693f388de14a6..97c1e57f9b579 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -106,6 +106,14 @@ in description = lib.mdDoc "Only run the server. This option only makes sense for a server."; }; + environmentFile = mkOption { + type = types.nullOr types.path; + description = lib.mdDoc '' + File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5). + ''; + default = null; + }; + configPath = mkOption { type = types.nullOr types.path; default = null; @@ -154,6 +162,7 @@ in LimitNPROC = "infinity"; LimitCORE = "infinity"; TasksMax = "infinity"; + EnvironmentFile = cfg.environmentFile; ExecStart = concatStringsSep " \\\n " ( [ "${cfg.package}/bin/k3s ${cfg.role}" diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 7aa2a8323b1d7..dc851688fbecd 100644 --- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -62,7 +62,7 @@ in ''; }; - enable = mkEnableOption (lib.mdDoc "Kubernetes addon manager."); + enable = mkEnableOption (lib.mdDoc "Kubernetes addon manager"); }; ###### implementation diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 3ede1cb80e85a..8e935d621be4e 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -146,7 +146,7 @@ in default = "unix:///run/containerd/containerd.sock"; }; - enable = mkEnableOption (lib.mdDoc "Kubernetes kubelet."); + enable = mkEnableOption (lib.mdDoc "Kubernetes kubelet"); extraOpts = mkOption { description = lib.mdDoc "Kubernetes kubelet extra command line options."; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 0c80e79d4b797..344c43a429b32 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -383,7 +383,7 @@ in "d /var/spool/slurmd 755 root root -" ]; - services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true); + services.openssh.settings.X11Forwarding = mkIf cfg.client.enable (mkDefault true); systemd.services.slurmctld = mkIf (cfg.server.enable) { path = with pkgs; [ wrappedSlurm munge coreutils ] diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix index 6ce08aaaece84..ce88092137241 100644 --- a/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -41,17 +41,42 @@ with lib; tokenFile = mkOption { type = types.path; description = lib.mdDoc '' - The full path to a file which contains either a runner registration token or a - (fine-grained) personal access token (PAT). + The full path to a file which contains either + + * a fine-grained personal access token (PAT), + * a classic PAT + * or a runner registration token + + Changing this option or the `tokenFile`’s content triggers a new runner registration. + + We suggest using the fine-grained PATs. A runner registration token is valid + only for 1 hour after creation, so the next time the runner configuration changes + this will give you hard-to-debug HTTP 404 errors in the configure step. + The file should contain exactly one line with the token without any newline. + (Use `echo -n '…token…' > …token file…` to make sure no newlines sneak in.) + + If the file contains a PAT, the service creates a new registration token + on startup as needed. If a registration token is given, it can be used to re-register a runner of the same - name but is time-limited. If the file contains a PAT, the service creates a new - 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 "Administration" resources. + name but is time-limited as noted above. + + For fine-grained PATs: + + Give it "Read and Write access to organization/repository self hosted runners", + depending on whether it is organization wide or per-repository. You might have to + experiment a little, fine-grained PATs are a `beta` Github feature and still subject + to change; nonetheless they are the best option at the moment. + + For classic PATs: + + Make sure the PAT has a scope of `admin:org` for organization-wide registrations + or a scope of `repo` for a single repository. + + For runner registration tokens: - Changing this option or the file's content triggers a new runner registration. + Nothing special needs to be done, but updating will break after one hour, + so these are not recommended. ''; example = "/run/secrets/github-runner/nixos.token"; }; diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index db9a19815ec1b..3d11728ebfdd7 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -124,6 +124,8 @@ in # The state directory is entirely empty which indicates a first start copy_tokens fi + # Always clean workDir + find -H "$WORK_DIRECTORY" -mindepth 1 -delete ''; configureRunner = writeScript "configure" '' if [[ -e "${newConfigTokenPath}" ]]; then @@ -159,9 +161,6 @@ in fi ''; setupWorkDir = writeScript "setup-work-dirs" '' - # Cleanup previous service - ${pkgs.findutils}/bin/find -H "$WORK_DIRECTORY" -mindepth 1 -delete - # Link _diag dir ln -s "$LOGS_DIRECTORY" "$WORK_DIRECTORY/_diag" diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 3e6dba16e8ace..53f39f40daa5a 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -34,7 +34,7 @@ let text = if (cfg.configFile != null) then '' cp ${cfg.configFile} ${configPath} # make config file readable by service - chown -R --reference=$HOME $(dirname ${configPath}) + chown -R --reference="$HOME" "$(dirname ${configPath})" '' else '' export CONFIG_FILE=${configPath} @@ -577,7 +577,7 @@ in { }; }; # Enable periodic clear-docker-cache script - systemd.services.gitlab-runner-clear-docker-cache = { + systemd.services.gitlab-runner-clear-docker-cache = mkIf (cfg.clear-docker-cache.enable && (any (s: s.executor == "docker") (attrValues cfg.services))) { description = "Prune gitlab-runner docker resources"; restartIfChanged = false; unitConfig.X-StopOnRemoval = false; @@ -590,7 +590,7 @@ in { ${pkgs.gitlab-runner}/bin/clear-docker-cache ${toString cfg.clear-docker-cache.flags} ''; - startAt = optional cfg.clear-docker-cache.enable cfg.clear-docker-cache.dates; + startAt = cfg.clear-docker-cache.dates; }; # Enable docker if `docker` executor is used in any service virtualisation.docker.enable = mkIf ( diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 04dd20b5f14d1..1f4a39765cd77 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -54,7 +54,7 @@ with lib; AmbientCapabilities = "CAP_SYS_NICE"; StateDirectory = "clickhouse"; LogsDirectory = "clickhouse"; - ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=${cfg.package}/etc/clickhouse-server/config.xml"; + ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml"; }; }; diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 16d539b661eb4..48e9898a68c2b 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 611535a9eb8a0..0000000000000 --- a/nixos/modules/services/databases/foundationdb.xml +++ /dev/null @@ -1,425 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-foundationdb"> - <title>FoundationDB</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/databases/foundationdb.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://apple.github.io/foundationdb/">https://apple.github.io/foundationdb/</link> - </para> - <para> - <emphasis>Maintainer:</emphasis> Austin Seipp - </para> - <para> - <emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x - </para> - <para> - FoundationDB (or <quote>FDB</quote>) is an open source, distributed, - transactional key-value store. - </para> - <section xml:id="module-services-foundationdb-configuring"> - <title>Configuring and basic setup</title> - <para> - To enable FoundationDB, add the following to your - <filename>configuration.nix</filename>: - </para> - <programlisting> -services.foundationdb.enable = true; -services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x -</programlisting> - <para> - The <option>services.foundationdb.package</option> 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. - </para> - <para> - After running <command>nixos-rebuild</command>, you can verify - whether FoundationDB is running by executing - <command>fdbcli</command> (which is added to - <option>environment.systemPackages</option>): - </para> - <programlisting> -$ 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> -</programlisting> - <para> - 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</command> shebang support to automatically - supply the necessary Python modules). - </para> - <programlisting> -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> -</programlisting> - <para> - FoundationDB is run under the <command>foundationdb</command> user - and group by default, but this may be changed in the NixOS - configuration. The systemd unit - <command>foundationdb.service</command> controls the - <command>fdbmonitor</command> process. - </para> - <para> - 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 - <quote>memory</quote> 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</command>.) - </para> - <para> - Furthermore, only 1 server process and 1 backup agent are started - in the default configuration. See below for more on scaling to - increase this. - </para> - <para> - FoundationDB stores all data for all server processes under - <filename>/var/lib/foundationdb</filename>. You can override this - using <option>services.foundationdb.dataDir</option>, e.g. - </para> - <programlisting> -services.foundationdb.dataDir = "/data/fdb"; -</programlisting> - <para> - Similarly, logs are stored under - <filename>/var/log/foundationdb</filename> by default, and there - is a corresponding <option>services.foundationdb.logDir</option> - as well. - </para> - </section> - <section xml:id="module-services-foundationdb-scaling"> - <title>Scaling processes and backup agents</title> - <para> - Scaling the number of server processes is quite easy; simply - specify <option>services.foundationdb.serverProcesses</option> to - be the number of FoundationDB worker processes that should be - started on the machine. - </para> - <para> - 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. - </para> - <para> - A similar option exists in order to scale backup agent processes, - <option>services.foundationdb.backupProcesses</option>. Backup - agents are not as performance/RAM sensitive, so feel free to - experiment with the number of available backup processes. - </para> - </section> - <section xml:id="module-services-foundationdb-clustering"> - <title>Clustering</title> - <para> - 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. - </para> - <para> - FoundationDB organizes clusters using a set of - <emphasis>coordinators</emphasis>, 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</command>. - </para> - <para> - Coordinators are specified globally using the - <command>/etc/foundationdb/fdb.cluster</command> file, which all - servers and client applications will use to find and join - coordinators. Note that this file <emphasis>can not</emphasis> 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. - </para> - <para> - When dealing with a cluster, there are two main things you want to - do: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Add a node to the cluster for storage/compute. - </para> - </listitem> - <listitem> - <para> - Promote an ordinary worker to a coordinator. - </para> - </listitem> - </itemizedlist> - <para> - 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. - </para> - <para> - To add a machine to a FoundationDB cluster: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Choose one of the servers to start as the initial coordinator. - </para> - </listitem> - <listitem> - <para> - Copy the <command>/etc/foundationdb/fdb.cluster</command> file - from this server to all the other servers. Restart - FoundationDB on all of these other servers, so they join the - cluster. - </para> - </listitem> - <listitem> - <para> - All of these servers are now connected and working together in - the cluster, under the chosen coordinator. - </para> - </listitem> - </itemizedlist> - <para> - 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</command> to change this - and add new coordinators. - </para> - <para> - 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> command - </para> - <para> - 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 <emphasis>every</emphasis> node a coordinator automatically: - </para> - <programlisting> -fdbcli> configure double ssd -fdbcli> coordinators auto -</programlisting> - <para> - This will transparently update all the servers within seconds, and - appropriately rewrite the <command>fdb.cluster</command> file, as - well as informing all client processes to do the same. - </para> - </section> - <section xml:id="module-services-foundationdb-connectivity"> - <title>Client connectivity</title> - <para> - By default, all clients must use the current - <command>fdb.cluster</command> file to access a given FoundationDB - cluster. This file is located by default in - <command>/etc/foundationdb/fdb.cluster</command> 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. - </para> - </section> - <section xml:id="module-services-foundationdb-authorization"> - <title>Client authorization and TLS</title> - <para> - 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 <emphasis>Acme - Co</emphasis> in the <emphasis>Research and Development</emphasis> - unit. - </para> - <para> - Configuring TLS with FoundationDB is done using the - <option>services.foundationdb.tls</option> options in order to - control the peer verification string, as well as the certificate - and its private key. - </para> - <para> - 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. - </para> - <para> - 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</command> file to specify that - a given set of coordinators use TLS. This is as simple as adding - the suffix <command>:tls</command> to your cluster coordinator - configuration, after the port number. For example, assuming you - have a coordinator on localhost with the default configuration, - simply specifying: - </para> - <programlisting> -XXXXXX:XXXXXX@127.0.0.1:4500:tls -</programlisting> - <para> - will configure all clients and server processes to use TLS from - now on. - </para> - </section> - <section xml:id="module-services-foundationdb-disaster-recovery"> - <title>Backups and Disaster Recovery</title> - <para> - 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</command> systemd unit uses <emphasis>Linux - namespaces</emphasis> to restrict write access to the system, - except for the log directory, data directory, and the - <command>/etc/foundationdb/</command> directory. This is enforced - by default and cannot be disabled. - </para> - <para> - However, a side effect of this is that the - <command>fdbbackup</command> 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. - </para> - <para> - In order to allow flexible backup locations on local disks, the - FoundationDB NixOS module supports a - <option>services.foundationdb.extraReadWritePaths</option> 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. - </para> - <para> - For example, to create backups in - <command>/opt/fdb-backups</command>, first set up the paths in the - module options: - </para> - <programlisting> -services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; -</programlisting> - <para> - 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 - <emphasis>must</emphasis> 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). - </para> - <para> - You can now perform a backup: - </para> - <programlisting> -$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups -$ sudo -u foundationdb fdbbackup status -t default -</programlisting> - </section> - <section xml:id="module-services-foundationdb-limitations"> - <title>Known limitations</title> - <para> - 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. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - There is no way to specify individual parameters for - individual <command>fdbserver</command> processes. Currently, - all server processes inherit all the global - <command>fdbmonitor</command> settings. - </para> - </listitem> - <listitem> - <para> - Ruby bindings are not currently installed. - </para> - </listitem> - <listitem> - <para> - Go bindings are not currently installed. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-foundationdb-options"> - <title>Options</title> - <para> - NixOS’s FoundationDB module allows you to configure all of the - most relevant configuration options for - <command>fdbmonitor</command>, matching it quite closely. A - complete list of options for the FoundationDB module may be found - <link linkend="opt-services.foundationdb.enable">here</link>. You - should also read the FoundationDB documentation as well. - </para> - </section> - <section xml:id="module-services-foundationdb-full-docs"> - <title>Full documentation</title> - <para> - FoundationDB is a complex piece of software, and requires careful - administration to properly use. Full documentation for - administration can be found here: - <link xlink:href="https://apple.github.io/foundationdb/">https://apple.github.io/foundationdb/</link>. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 6665e7a088fc1..7bbe1ad225955 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -585,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 2f62d5d80b192..0000000000000 --- a/nixos/modules/services/databases/postgresql.xml +++ /dev/null @@ -1,250 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-postgresql"> - <title>PostgreSQL</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/databases/postgresql.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="http://www.postgresql.org/docs/">http://www.postgresql.org/docs/</link> - </para> - <para> - PostgreSQL is an advanced, free relational database. - </para> - <section xml:id="module-services-postgres-configuring"> - <title>Configuring</title> - <para> - To enable PostgreSQL, add the following to your - <filename>configuration.nix</filename>: - </para> - <programlisting> -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql_11; -</programlisting> - <para> - Note that you are required to specify the desired version of - PostgreSQL (e.g. <literal>pkgs.postgresql_11</literal>). Since - upgrading your PostgreSQL version requires a database dump and - reload (see below), NixOS cannot provide a default value for - <xref linkend="opt-services.postgresql.package" /> such as the - most recent release of PostgreSQL. - </para> - <para> - By default, PostgreSQL stores its databases in - <filename>/var/lib/postgresql/$psqlSchema</filename>. You can - override this using - <xref linkend="opt-services.postgresql.dataDir" />, e.g. - </para> - <programlisting> -services.postgresql.dataDir = "/data/postgresql"; -</programlisting> - </section> - <section xml:id="module-services-postgres-upgrading"> - <title>Upgrading</title> - <note> - <para> - The steps below demonstrate how to upgrade from an older version - to <literal>pkgs.postgresql_13</literal>. These instructions are - also applicable to other versions. - </para> - </note> - <para> - 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 - <filename>/var/lib/postgresql/<version></filename> where - each <literal>version</literal> can be obtained like this: - </para> - <programlisting> -$ nix-instantiate --eval -A postgresql_13.psqlSchema -"13" -</programlisting> - <para> - For an upgrade, a script like this can be used to simplify the - process: - </para> - <programlisting> -{ 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 \ - "$@" - '') - ]; -} -</programlisting> - <para> - The upgrade process is: - </para> - <orderedlist numeration="arabic"> - <listitem> - <para> - Rebuild nixos configuration with the configuration above added - to your <filename>configuration.nix</filename>. Alternatively, - add that into separate file and reference it in - <literal>imports</literal> list. - </para> - </listitem> - <listitem> - <para> - Login as root (<literal>sudo su -</literal>) - </para> - </listitem> - <listitem> - <para> - Run <literal>upgrade-pg-cluster</literal>. It will stop old - postgresql, initialize a new one and migrate the old one to - the new one. You may supply arguments like - <literal>--jobs 4</literal> and <literal>--link</literal> to - speedup migration process. See - <link xlink:href="https://www.postgresql.org/docs/current/pgupgrade.html">https://www.postgresql.org/docs/current/pgupgrade.html</link> - for details. - </para> - </listitem> - <listitem> - <para> - Change postgresql package in NixOS configuration to the one - you were upgrading to via - <xref linkend="opt-services.postgresql.package" />. Rebuild - NixOS. This should start new postgres using upgraded data - directory and all services you stopped during the upgrade. - </para> - </listitem> - <listitem> - <para> - After the upgrade it’s advisable to analyze the new cluster. - </para> - <itemizedlist> - <listitem> - <para> - For PostgreSQL ≥ 14, use the <literal>vacuumdb</literal> - command printed by the upgrades script. - </para> - </listitem> - <listitem> - <para> - For PostgreSQL < 14, run (as - <literal>su -l postgres</literal> in the - <xref linkend="opt-services.postgresql.dataDir" />, in - this example <filename>/var/lib/postgresql/13</filename>): - </para> - <programlisting> -$ ./analyze_new_cluster.sh -</programlisting> - </listitem> - </itemizedlist> - <warning> - <para> - The next step removes the old state-directory! - </para> - </warning> - <programlisting> -$ ./delete_old_cluster.sh -</programlisting> - </listitem> - </orderedlist> - </section> - <section xml:id="module-services-postgres-options"> - <title>Options</title> - <para> - A complete list of options for the PostgreSQL module may be found - <link linkend="opt-services.postgresql.enable">here</link>. - </para> - </section> - <section xml:id="module-services-postgres-plugins"> - <title>Plugins</title> - <para> - Plugins collection for each PostgreSQL version can be accessed - with <literal>.pkgs</literal>. For example, for - <literal>pkgs.postgresql_11</literal> package, its plugin - collection is accessed by - <literal>pkgs.postgresql_11.pkgs</literal>: - </para> - <programlisting> -$ 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 -... -</programlisting> - <para> - To add plugins via NixOS configuration, set - <literal>services.postgresql.extraPlugins</literal>: - </para> - <programlisting> -services.postgresql.package = pkgs.postgresql_11; -services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ - pg_repack - postgis -]; -</programlisting> - <para> - You can build custom PostgreSQL-with-plugins (to be used outside - of NixOS) using function <literal>.withPackages</literal>. For - example, creating a custom PostgreSQL package in an overlay can - look like: - </para> - <programlisting> -self: super: { - postgresql_custom = self.postgresql_11.withPackages (ps: [ - ps.pg_repack - ps.postgis - ]); -} -</programlisting> - <para> - Here’s a recipe on how to override a particular plugin through an - overlay: - </para> - <programlisting> -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"; - }; - }); - }; - }; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 3b14ad75ab300..d99faf381e019 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 cdc3278fa9963..0000000000000 --- a/nixos/modules/services/desktops/flatpak.xml +++ /dev/null @@ -1,59 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-flatpak"> - <title>Flatpak</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/desktop/flatpak.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://github.com/flatpak/flatpak/wiki">https://github.com/flatpak/flatpak/wiki</link> - </para> - <para> - Flatpak is a system for building, distributing, and running - sandboxed desktop applications on Linux. - </para> - <para> - To enable Flatpak, add the following to your - <filename>configuration.nix</filename>: - </para> - <programlisting> - services.flatpak.enable = true; -</programlisting> - <para> - 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 - <filename>configuration.nix</filename>: - </para> - <programlisting> - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; -</programlisting> - <para> - Then, you will need to add a repository, for example, - <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, - either using the following commands: - </para> - <programlisting> -$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -$ flatpak update -</programlisting> - <para> - or by opening the - <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository - file</link> in GNOME Software. - </para> - <para> - Finally, you can search and install programs: - </para> - <programlisting> -$ flatpak search bustle -$ flatpak install flathub org.freedesktop.Bustle -$ flatpak run org.freedesktop.Bustle -</programlisting> - <para> - Again, GNOME Software offers graphical interface for these tasks. - </para> -</chapter> diff --git a/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix index 0006ba1a7bad5..a8db7dce8fdf2 100644 --- a/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -27,7 +27,7 @@ with lib; options = { services.gnome.evolution-data-server = { - enable = mkEnableOption (lib.mdDoc "Evolution Data Server, a collection of services for storing addressbooks and calendars."); + enable = mkEnableOption (lib.mdDoc "Evolution Data Server, a collection of services for storing addressbooks and calendars"); plugins = mkOption { type = types.listOf types.package; default = [ ]; @@ -35,7 +35,7 @@ with lib; }; }; programs.evolution = { - enable = mkEnableOption (lib.mdDoc "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality."); + enable = mkEnableOption (lib.mdDoc "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality"); plugins = mkOption { type = types.listOf types.package; default = [ ]; 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 9aa51b61431db..c204606193af5 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 4a173f7322972..f2e396dd28d76 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json @@ -58,6 +58,18 @@ "node.passive": true } } + }, + { + "matches": [ + { + "client.name": "Mixxx" + } + ], + "actions": { + "update-props": { + "jack.merge-monitor": false + } + } } ] } diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire-aes67.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire-aes67.conf.json new file mode 100644 index 0000000000000..aaffa93ca964c --- /dev/null +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-aes67.conf.json @@ -0,0 +1,38 @@ +{ + "context.properties": {}, + "context.modules": [ + { + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, + "flags": [ + "ifexists", + "nofail" + ] + }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-rtp-source", + "args": { + "sap.ip": "239.255.255.255", + "sap.port": 9875, + "sess.latency.msec": 10, + "local.ifname": "eth0", + "stream.props": { + "media.class": "Audio/Source", + "node.virtual": false, + "device.api": "aes67" + } + } + } + ] +} diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json index 53fc103d22144..a47abe2213d94 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json @@ -3,10 +3,10 @@ "link.max-buffers": 16, "core.daemon": true, "core.name": "pipewire-0", - "default.clock.min-quantum": 16, "vm.overrides": { "default.clock.min-quantum": 1024 - } + }, + "module.x11.bell": true }, "context.spa-libs": { "audio.convert.*": "audioconvert/libspa-audioconvert", @@ -77,6 +77,11 @@ "flags": [ "ifexists", "nofail" + ], + "condition": [ + { + "module.x11.bell": true + } ] } ], diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index a4ef88a45ad08..09cec9a791091 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/development/blackfire.nix b/nixos/modules/services/development/blackfire.nix index 054cef9ae80b2..3c98d7a281c63 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 842e5bec97d51..0000000000000 --- a/nixos/modules/services/development/blackfire.xml +++ /dev/null @@ -1,61 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-blackfire"> - <title>Blackfire profiler</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/development/blackfire.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://blackfire.io/docs/introduction">https://blackfire.io/docs/introduction</link> - </para> - <para> - <link xlink:href="https://blackfire.io">Blackfire</link> 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 <emphasis>probe</emphasis>) - and a service (<emphasis>agent</emphasis>) that the probe connects - to and that sends the profiles to the server. - </para> - <para> - 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: - </para> - <programlisting> -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" ]; -} -</programlisting> - <para> - On your developer machine, you will also want to install - <link xlink:href="https://blackfire.io/docs/up-and-running/installation#install-a-profiling-client">the - client</link> (see <literal>blackfire</literal> package) or the - browser extension to actually trigger the profiling. - </para> -</chapter> diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 7de11b08b7e77..0faeb4c0e9fab 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/nixos/modules/services/development/zammad.nix @@ -28,7 +28,7 @@ in options = { services.zammad = { - enable = mkEnableOption (lib.mdDoc "Zammad, a web-based, open source user support/ticketing solution."); + enable = mkEnableOption (lib.mdDoc "Zammad, a web-based, open source user support/ticketing solution"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 5ae28cd9bbb31..2be46e47d64cf 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 37d7a93a12b36..0000000000000 --- a/nixos/modules/services/editors/emacs.xml +++ /dev/null @@ -1,490 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-emacs"> - <title>Emacs</title> - <para> - <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> - 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. - </para> - <para> - Emacs runs within a graphical desktop environment using the X Window - System, but works equally well on a text terminal. Under macOS, a - <quote>Mac port</quote> edition is available, which uses Apple’s - native GUI frameworks. - </para> - <para> - 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</command> user service for automatically - starting the Emacs daemon. - </para> - <section xml:id="module-services-emacs-installing"> - <title>Installing Emacs</title> - <para> - Emacs can be installed in the normal way for Nix (see - <xref linkend="sec-package-management" />). In addition, a NixOS - <emphasis>service</emphasis> can be enabled. - </para> - <section xml:id="module-services-emacs-releases"> - <title>The Different Releases of Emacs</title> - <para> - Nixpkgs defines several basic Emacs packages. The following are - attributes belonging to the <varname>pkgs</varname> set: - </para> - <variablelist spacing="compact"> - <varlistentry> - <term> - <varname>emacs</varname> - </term> - <listitem> - <para> - The latest stable version of Emacs using the - <link xlink:href="http://www.gtk.org">GTK 2</link> widget - toolkit. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>emacs-nox</varname> - </term> - <listitem> - <para> - Emacs built without any dependency on X11 libraries. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <varname>emacsMacport</varname> - </term> - <listitem> - <para> - Emacs with the <quote>Mac port</quote> patches, providing - a more native look and feel under macOS. - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - If those aren’t suitable, then the following imitation Emacs - editors are also available in Nixpkgs: - <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>, - <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>, - <link xlink:href="http://yi-editor.github.io/">Yi</link>, - <link xlink:href="https://joe-editor.sourceforge.io/">jmacs</link>. - </para> - </section> - <section xml:id="module-services-emacs-adding-packages"> - <title>Adding Packages to Emacs</title> - <para> - Emacs includes an entire ecosystem of functionality beyond text - editing, including a project planner, mail and news reader, - debugger interface, calendar, and more. - </para> - <para> - Most extensions are gotten with the Emacs packaging system - (<filename>package.el</filename>) from - <link xlink:href="https://elpa.gnu.org/">Emacs Lisp Package - Archive (ELPA)</link>, - <link xlink:href="https://melpa.org/">MELPA</link>, - <link xlink:href="https://stable.melpa.org/">MELPA - Stable</link>, and - <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. - Nixpkgs is regularly updated to mirror all these archives. - </para> - <para> - Under NixOS, you can continue to use - <literal>package-list-packages</literal> and - <literal>package-install</literal> 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. - </para> - <para> - 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 <filename>emacs.nix</filename> file such - as: - </para> - <para> - <anchor xml:id="ex-emacsNix" /> - </para> - <programlisting language="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 <nixpkgs> {} }: - -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 <C-x g> - zerodark-theme # ; Nicolas' theme - ]) - # Two packages (undo-tree and zoom-frm) are taken from MELPA. - ++ (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-+> - ]) - # 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 - ]) -</programlisting> - <para> - The result of this configuration will be an - <command>emacs</command> command which launches Emacs with all - of your chosen packages in the <varname>load-path</varname>. - </para> - <para> - You can check that it works by executing this in a terminal: - </para> - <programlisting> -$ nix-build emacs.nix -$ ./result/bin/emacs -q -</programlisting> - <para> - and then typing <literal>M-x package-initialize</literal>. Check - that you can use all the packages you want in this Emacs - instance. For example, try switching to the zerodark theme - through - <literal>M-x load-theme <RET> zerodark <RET> y</literal>. - </para> - <tip> - <para> - A few popular extensions worth checking out are: auctex, - company, edit-server, flycheck, helm, iedit, magit, - multiple-cursors, projectile, and yasnippet. - </para> - </tip> - <para> - The list of available packages in the various ELPA repositories - can be seen with the following commands: - <anchor xml:id="module-services-emacs-querying-packages" /> - </para> - <programlisting> -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.elpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaStablePackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.orgPackages -</programlisting> - <para> - If you are on NixOS, you can install this particular Emacs for - all users by adding it to the list of system packages (see - <xref linkend="sec-declarative-package-mgmt" />). Simply modify - your file <filename>configuration.nix</filename> to make it - contain: - <anchor xml:id="module-services-emacs-configuration-nix" /> - </para> - <programlisting> -{ - environment.systemPackages = [ - # [...] - (import /path/to/emacs.nix { inherit pkgs; }) - ]; -} -</programlisting> - <para> - In this case, the next <command>nixos-rebuild switch</command> - will take care of adding your <command>emacs</command> to the - <varname>PATH</varname> environment variable (see - <xref linkend="sec-changing-config" />). - </para> - <para> - 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 - <filename>~/.config/nixpkgs/config.nix</filename> (see - <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs - manual</link>): - <anchor xml:id="module-services-emacs-config-nix" /> - </para> - <programlisting> -{ - packageOverrides = super: let self = super.pkgs; in { - myemacs = import /path/to/emacs.nix { pkgs = self; }; - }; -} -</programlisting> - <para> - In this case, the next - <literal>nix-env -f '<nixpkgs>' -iA myemacs</literal> will - take care of adding your emacs to the <varname>PATH</varname> - environment variable. - </para> - </section> - <section xml:id="module-services-emacs-advanced"> - <title>Advanced Emacs Configuration</title> - <para> - If you want, you can tweak the Emacs package itself from your - <filename>emacs.nix</filename>. 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 - <filename>emacs.desktop</filename> (useful if you only use - <command>emacsclient</command>), you can change your file - <filename>emacs.nix</filename> in this way: - </para> - <para> - <anchor xml:id="ex-emacsGtk3Nix" /> - </para> - <programlisting> -{ pkgs ? import <nixpkgs> {} }: -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 [...] -</programlisting> - <para> - After building this file as shown in - <link linkend="ex-emacsNix">the example above</link>, you will - get an GTK 3-based Emacs binary pre-loaded with your favorite - packages. - </para> - </section> - </section> - <section xml:id="module-services-emacs-running"> - <title>Running Emacs as a Service</title> - <para> - NixOS provides an optional <command>systemd</command> service - which launches - <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html">Emacs - daemon</link> with the user’s login session. - </para> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/editors/emacs.nix</filename> - </para> - <section xml:id="module-services-emacs-enabling"> - <title>Enabling the Service</title> - <para> - To install and enable the <command>systemd</command> user - service for Emacs daemon, add the following to your - <filename>configuration.nix</filename>: - </para> - <programlisting> -services.emacs.enable = true; -services.emacs.package = import /home/cassou/.emacs.d { pkgs = pkgs; }; -</programlisting> - <para> - The <varname>services.emacs.package</varname> option allows a - custom derivation to be used, for example, one created by - <literal>emacsWithPackages</literal>. - </para> - <para> - Ensure that the Emacs server is enabled for your user’s Emacs - configuration, either by customizing the - <varname>server-mode</varname> variable, or by adding - <literal>(server-start)</literal> to - <filename>~/.emacs.d/init.el</filename>. - </para> - <para> - To start the daemon, execute the following: - </para> - <programlisting> -$ 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 -</programlisting> - <para> - The server should now be ready to serve Emacs clients. - </para> - </section> - <section xml:id="module-services-emacs-starting-client"> - <title>Starting the client</title> - <para> - Ensure that the emacs server is enabled, either by customizing - the <varname>server-mode</varname> variable, or by adding - <literal>(server-start)</literal> to - <filename>~/.emacs</filename>. - </para> - <para> - To connect to the emacs daemon, run one of the following: - </para> - <programlisting> -emacsclient FILENAME -emacsclient --create-frame # opens a new frame (window) -emacsclient --create-frame --tty # opens a new frame on the current terminal -</programlisting> - </section> - <section xml:id="module-services-emacs-editor-variable"> - <title>Configuring the <varname>EDITOR</varname> variable</title> - <para> - If <xref linkend="opt-services.emacs.defaultEditor" /> is - <literal>true</literal>, the <varname>EDITOR</varname> variable - will be set to a wrapper script which launches - <command>emacsclient</command>. - </para> - <para> - Any setting of <varname>EDITOR</varname> in the shell config - files will override - <varname>services.emacs.defaultEditor</varname>. To make sure - <varname>EDITOR</varname> refers to the Emacs wrapper script, - remove any existing <varname>EDITOR</varname> assignment from - <filename>.profile</filename>, <filename>.bashrc</filename>, - <filename>.zshenv</filename> or any other shell config file. - </para> - <para> - If you have formed certain bad habits when editing files, these - can be corrected with a shell alias to the wrapper script: - </para> - <programlisting> -alias vi=$EDITOR -</programlisting> - </section> - <section xml:id="module-services-emacs-per-user"> - <title>Per-User Enabling of the Service</title> - <para> - In general, <command>systemd</command> user services are - globally enabled by symlinks in - <filename>/etc/systemd/user</filename>. In the case where Emacs - daemon is not wanted for all users, it is possible to install - the service but not globally enable it: - </para> - <programlisting> -services.emacs.enable = false; -services.emacs.install = true; -</programlisting> - <para> - To enable the <command>systemd</command> user service for just - the currently logged in user, run: - </para> - <programlisting> -systemctl --user enable emacs -</programlisting> - <para> - This will add the symlink - <filename>~/.config/systemd/user/emacs.service</filename>. - </para> - </section> - </section> - <section xml:id="module-services-emacs-configuring"> - <title>Configuring Emacs</title> - <para> - The Emacs init file should be changed to load the extension - packages at startup: - <anchor xml:id="module-services-emacs-package-initialisation" /> - </para> - <programlisting> -(require 'package) - -;; optional. makes unpure packages archives unavailable -(setq package-archives nil) - -(setq package-enable-at-startup nil) -(package-initialize) -</programlisting> - <para> - After the declarative emacs package configuration has been tested, - previously downloaded packages can be cleaned up by removing - <filename>~/.emacs.d/elpa</filename> (do make a backup first, in - case you forgot a package). - </para> - <section xml:id="module-services-emacs-major-mode"> - <title>A Major Mode for Nix Expressions</title> - <para> - Of interest may be <varname>melpaPackages.nix-mode</varname>, - which provides syntax highlighting for the Nix language. This is - particularly convenient if you regularly edit Nix files. - </para> - </section> - <section xml:id="module-services-emacs-man-pages"> - <title>Accessing man pages</title> - <para> - You can use <literal>woman</literal> to get completion of all - available man pages. For example, type - <literal>M-x woman <RET> nixos-rebuild <RET>.</literal> - </para> - </section> - <section xml:id="sec-emacs-docbook-xml"> - <title>Editing DocBook 5 XML Documents</title> - <para> - Emacs includes - <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>, - a major-mode for validating and editing XML documents. When - editing DocBook 5.0 documents, such as - <link linkend="book-nixos-manual">this one</link>, nXML needs to - be configured with the relevant schema, which is not included. - </para> - <para> - To install the DocBook 5.0 schemas, either add - <varname>pkgs.docbook5</varname> to - <xref linkend="opt-environment.systemPackages" /> - (<link linkend="sec-declarative-package-mgmt">NixOS</link>), or - run <literal>nix-env -f '<nixpkgs>' -iA docbook5</literal> - (<link linkend="sec-ad-hoc-packages">Nix</link>). - </para> - <para> - Then customize the variable - <varname>rng-schema-locating-files</varname> to include - <filename>~/.emacs.d/schemas.xml</filename> and put the - following text into that file: - <anchor xml:id="ex-emacs-docbook-xml" /> - </para> - <programlisting language="xml"> -<?xml version="1.0"?> -<!-- - To let emacs find this file, evaluate: - (add-to-list 'rng-schema-locating-files "~/.emacs.d/schemas.xml") ---> -<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> - <!-- - Use this variation if pkgs.docbook5 is added to environment.systemPackages - --> - <namespace ns="http://docbook.org/ns/docbook" - uri="/run/current-system/sw/share/xml/docbook-5.0/rng/docbookxi.rnc"/> - <!-- - Use this variation if installing schema with "nix-env -iA pkgs.docbook5". - <namespace ns="http://docbook.org/ns/docbook" - uri="../.nix-profile/share/xml/docbook-5.0/rng/docbookxi.rnc"/> - --> -</locatingRules> -</programlisting> - </section> - </section> -</chapter> diff --git a/nixos/modules/services/games/freeciv.nix b/nixos/modules/services/games/freeciv.nix index 8b340bb161a56..f33ea5c08a270 100644 --- a/nixos/modules/services/games/freeciv.nix +++ b/nixos/modules/services/games/freeciv.nix @@ -54,7 +54,7 @@ in default = 0; description = lib.mdDoc "Set debug log level."; }; - options.exit-on-end = mkEnableOption (lib.mdDoc "exit instead of restarting when a game ends."); + options.exit-on-end = mkEnableOption (lib.mdDoc "exit instead of restarting when a game ends"); options.Guests = mkEnableOption (lib.mdDoc "guests to login if auth is enabled"); options.Newusers = mkEnableOption (lib.mdDoc "new users to login if auth is enabled"); options.port = mkOption { diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 6453e6968dccb..2a58be51bb023 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -71,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)."; + }; }; }; @@ -80,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/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index a3bb61a6cb0c8..4e7d730d127b7 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -18,12 +18,6 @@ let fwupd = cfg.daemonSettings; }; }; - "fwupd/uefi_capsule.conf" = { - source = pkgs.writeText "uefi_capsule.conf" '' - [uefi_capsule] - OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} - ''; - }; }; originalEtc = @@ -127,6 +121,16 @@ in { 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 = {}; @@ -147,7 +151,10 @@ in { ###### implementation config = mkIf cfg.enable { # Disable test related plug-ins implicitly so that users do not have to care about them. - services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins; + services.fwupd.daemonSettings = { + DisabledPlugins = cfg.package.defaultDisabledPlugins; + EspLocation = config.boot.loader.efi.efiSysMountPoint; + }; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index 84265eb8f947c..bb730037277b8 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -8,19 +8,9 @@ let keyboard = { options = { devices = mkOption { - type = types.addCheck (types.listOf types.str) - (devices: (length devices) > 0); + type = types.listOf types.str; example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ]; - # TODO replace note with tip, which has not been implemented yet in - # nixos/lib/make-options-doc/mergeJSON.py - description = mdDoc '' - Paths to keyboard devices. - - ::: {.note} - To avoid unnecessary triggers of the service unit, unplug devices in - the order of the list. - ::: - ''; + description = mdDoc "Paths to keyboard devices."; }; config = mkOption { type = types.lines; @@ -44,8 +34,10 @@ let cap (tap-hold 100 100 caps lctl)) ''; description = mdDoc '' - Configuration other than `defcfg`. See [example config - files](https://github.com/jtroo/kanata) for more information. + Configuration other than `defcfg`. + + See [example config files](https://github.com/jtroo/kanata) + for more information. ''; }; extraDefCfg = mkOption { @@ -53,8 +45,12 @@ let default = ""; example = "danger-enable-cmd yes"; description = mdDoc '' - Configuration of `defcfg` other than `linux-dev`. See [example - config files](https://github.com/jtroo/kanata) for more information. + Configuration of `defcfg` other than `linux-dev` (generated + from the devices option) and + `linux-continue-if-no-devs-found` (hardcoded to be yes). + + See [example config files](https://github.com/jtroo/kanata) + for more information. ''; }; extraArgs = mkOption { @@ -67,8 +63,7 @@ let default = null; example = 6666; description = mdDoc '' - Port to run the notification server on. `null` will not run the - server. + Port to run the TCP server on. `null` will not run the server. ''; }; }; @@ -76,28 +71,23 @@ let mkName = name: "kanata-${name}"; - mkDevices = devices: concatStringsSep ":" devices; + mkDevices = devices: + optionalString ((length devices) > 0) "linux-dev ${concatStringsSep ":" devices}"; mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" '' (defcfg ${keyboard.extraDefCfg} - linux-dev ${mkDevices keyboard.devices}) + ${mkDevices keyboard.devices} + linux-continue-if-no-devs-found yes) ${keyboard.config} ''; mkService = name: keyboard: nameValuePair (mkName name) { - description = "kanata for ${mkDevices keyboard.devices}"; - - # Because path units are used to activate service units, which - # will start the old stopped services during "nixos-rebuild - # switch", stopIfChanged here is a workaround to make sure new - # services are running after "nixos-rebuild switch". - stopIfChanged = false; - + wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = '' - ${cfg.package}/bin/kanata \ + ${getExe cfg.package} \ --cfg ${mkConfig name keyboard} \ --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ @@ -146,37 +136,10 @@ let UMask = "0077"; }; }; - - mkPathName = i: name: "${mkName name}-${toString i}"; - - mkPath = name: n: i: device: - nameValuePair (mkPathName i name) { - description = - "${toString (i+1)}/${toString n} kanata trigger for ${name}, watching ${device}"; - wantedBy = optional (i == 0) "multi-user.target"; - pathConfig = { - PathExists = device; - # (ab)use systemd.path to construct a trigger chain so that the - # service unit is only started when all paths exist - # however, manual of systemd.path says Unit's suffix is not ".path" - Unit = - if (i + 1) == n - then "${mkName name}.service" - else "${mkPathName (i + 1) name}.path"; - }; - unitConfig.StopPropagatedFrom = optional (i > 0) "${mkName name}.service"; - }; - - mkPaths = name: keyboard: - let - n = length keyboard.devices; - in - imap0 (mkPath name n) keyboard.devices - ; in { options.services.kanata = { - enable = mkEnableOption (lib.mdDoc "kanata"); + enable = mkEnableOption (mdDoc "kanata"); package = mkOption { type = types.package; default = pkgs.kanata; @@ -201,14 +164,7 @@ in config = mkIf cfg.enable { hardware.uinput.enable = true; - systemd = { - paths = trivial.pipe cfg.keyboards [ - (mapAttrsToList mkPaths) - concatLists - listToAttrs - ]; - services = mapAttrs' mkService cfg.keyboards; - }; + systemd.services = mapAttrs' mkService cfg.keyboards; }; meta.maintainers = with maintainers; [ linj ]; diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index 2d801a7e838ff..afca24d976e1a 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -20,7 +20,7 @@ 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."throttled.conf".source = if cfg.extraConfig != "" diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 70c1fd09860e8..b2217fc971241 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 1ba9dc1f18873..0000000000000 --- a/nixos/modules/services/hardware/trezord.xml +++ /dev/null @@ -1,29 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="trezor"> - <title>Trezor</title> - <para> - Trezor is an open-source cryptocurrency hardware wallet and security - token allowing secure storage of private keys. - </para> - <para> - It offers advanced features such U2F two-factor authorization, SSH - login through - <link xlink:href="https://wiki.trezor.io/Apps:SSH_agent">Trezor SSH - agent</link>, - <link xlink:href="https://wiki.trezor.io/GPG">GPG</link> and a - <link xlink:href="https://wiki.trezor.io/Trezor_Password_Manager">password - manager</link>. For more information, guides and documentation, see - <link xlink:href="https://wiki.trezor.io">https://wiki.trezor.io</link>. - </para> - <para> - To enable Trezor support, add the following to your - <filename>configuration.nix</filename>: - </para> - <programlisting> -services.trezord.enable = true; -</programlisting> - <para> - This will add all necessary udev rules and start Trezor Bridge. - </para> -</chapter> diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index 7368845dafd55..c53dbf477742d 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -1,10 +1,9 @@ # Udisks daemon. - { config, lib, pkgs, ... }: - with lib; let + cfg = config.services.udisks2; settingsFormat = pkgs.formats.ini { listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {}); }; @@ -19,7 +18,17 @@ in services.udisks2 = { - enable = mkEnableOption (lib.mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices."); + enable = mkEnableOption (mdDoc "udisks2, a DBus service that allows applications to query and manipulate storage devices"); + + mountOnMedia = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + When enabled, instructs udisks2 to mount removable drives under `/media/` directory, instead of the + default, ACL-controlled `/run/media/$USER/`. Since `/media/` is not mounted as tmpfs by default, it + requires cleanup to get rid of stale mountpoints; enabling this option will take care of this at boot. + ''; + }; settings = mkOption rec { type = types.attrsOf settingsFormat.type; @@ -44,7 +53,7 @@ in }; }; ''; - description = lib.mdDoc '' + description = mdDoc '' Options passed to udisksd. See [here](http://manpages.ubuntu.com/manpages/latest/en/man5/udisks2.conf.5.html) and drive configuration in [here](http://manpages.ubuntu.com/manpages/latest/en/man8/udisks.8.html) for supported options. @@ -73,10 +82,15 @@ in services.dbus.packages = [ pkgs.udisks2 ]; - systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]; + systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ] + ++ optional cfg.mountOnMedia "D! /media 0755 root root -"; services.udev.packages = [ pkgs.udisks2 ]; + services.udev.extraRules = optionalString cfg.mountOnMedia '' + ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1" + ''; + systemd.packages = [ pkgs.udisks2 ]; }; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index fa06e5391bbfe..6adc58ec58ec4 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -409,6 +409,7 @@ in { (optionalString (cfg.config != null) copyConfig) + (optionalString (cfg.lovelaceConfig != null) copyLovelaceConfig) ; + environment.PYTHONPATH = package.pythonPath; serviceConfig = let # List of capabilities to equip home-assistant with, depending on configured components capabilities = lib.unique ([ @@ -438,11 +439,13 @@ in { "aranet" "bluemaestro" "bluetooth" + "bluetooth_adapters" "bluetooth_le_tracker" "bluetooth_tracker" "bthome" "default_config" "eq3btsmart" + "eufylife_ble" "esphome" "fjaraskupan" "govee_ble" @@ -452,8 +455,10 @@ in { "led_ble" "melnor" "moat" + "mopeka" "oralb" "qingping" + "ruuvi_gateway" "ruuvitag_ble" "sensirion_ble" "sensorpro" diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index f6a167572f722..21bafd859c3c2 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -171,11 +171,11 @@ in options.services.dovecot2 = { enable = mkEnableOption (lib.mdDoc "the dovecot 2.x POP3/IMAP server"); - enablePop3 = mkEnableOption (lib.mdDoc "starting the POP3 listener (when Dovecot is enabled)."); + enablePop3 = mkEnableOption (lib.mdDoc "starting the POP3 listener (when Dovecot is enabled)"); - enableImap = mkEnableOption (lib.mdDoc "starting the IMAP listener (when Dovecot is enabled).") // { default = true; }; + enableImap = mkEnableOption (lib.mdDoc "starting the IMAP listener (when Dovecot is enabled)") // { default = true; }; - enableLmtp = mkEnableOption (lib.mdDoc "starting the LMTP listener (when Dovecot is enabled)."); + enableLmtp = mkEnableOption (lib.mdDoc "starting the LMTP listener (when Dovecot is enabled)"); protocols = mkOption { type = types.listOf types.str; @@ -300,9 +300,9 @@ in description = lib.mdDoc "Path to the server's private key."; }; - enablePAM = mkEnableOption (lib.mdDoc "creating a own Dovecot PAM service and configure PAM user logins.") // { default = true; }; + enablePAM = mkEnableOption (lib.mdDoc "creating a own Dovecot PAM service and configure PAM user logins") // { default = true; }; - enableDHE = mkEnableOption (lib.mdDoc "enable ssl_dh and generation of primes for the key exchange.") // { default = true; }; + enableDHE = mkEnableOption (lib.mdDoc "enable ssl_dh and generation of primes for the key exchange") // { default = true; }; sieveScripts = mkOption { type = types.attrsOf types.path; @@ -310,7 +310,7 @@ in description = lib.mdDoc "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc."; }; - showPAMFailure = mkEnableOption (lib.mdDoc "showing the PAM failure message on authentication error (useful for OTPW)."); + showPAMFailure = mkEnableOption (lib.mdDoc "showing the PAM failure message on authentication error (useful for OTPW)"); mailboxes = mkOption { type = with types; coercedTo @@ -326,7 +326,7 @@ in description = lib.mdDoc "Configure mailboxes and auto create or subscribe them."; }; - enableQuota = mkEnableOption (lib.mdDoc "the dovecot quota service."); + enableQuota = mkEnableOption (lib.mdDoc "the dovecot quota service"); quotaPort = mkOption { type = types.str; diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index eeb113e204c6e..5f3a9b56292d2 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -223,22 +223,59 @@ in { ''; }; + ensureAccounts = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + List of IMAP accounts which get automatically created. Note that for + a complete setup, user credentials for these accounts are required too + and can be created using the command `maddyctl creds`. + This option does not delete accounts which are not (anymore) listed. + ''; + example = [ + "user1@localhost" + "user2@localhost" + ]; + }; + }; }; config = mkIf cfg.enable { systemd = { + packages = [ pkgs.maddy ]; - services.maddy = { - serviceConfig = { - User = cfg.user; - Group = cfg.group; - StateDirectory = [ "maddy" ]; + services = { + maddy = { + serviceConfig = { + User = cfg.user; + Group = cfg.group; + StateDirectory = [ "maddy" ]; + }; + restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ]; + wantedBy = [ "multi-user.target" ]; + }; + maddy-ensure-accounts = { + script = '' + ${optionalString (cfg.ensureAccounts != []) '' + ${concatMapStrings (account: '' + if ! ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "${account}"; then + ${pkgs.maddy}/bin/maddyctl imap-acct create ${account} + fi + '') cfg.ensureAccounts} + ''} + ''; + serviceConfig = { + Type = "oneshot"; + User= "maddy"; + }; + after = [ "maddy.service" ]; + wantedBy = [ "multi-user.target" ]; }; - restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ]; - wantedBy = [ "multi-user.target" ]; + }; + }; environment.etc."maddy/maddy.conf" = { diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 2adc7427abf49..9273f71db7d56 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -642,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 23b0d0b7da4c8..0000000000000 --- a/nixos/modules/services/mail/mailman.xml +++ /dev/null @@ -1,112 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-mailman"> - <title>Mailman</title> - <para> - <link xlink:href="https://www.list.org">Mailman</link> 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. - </para> - <section xml:id="module-services-mailman-basic-usage"> - <title>Basic usage with Postfix</title> - <para> - For a basic configuration with Postfix as the MTA, the following - settings are suggested: - </para> - <programlisting> -{ 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 ]; -} -</programlisting> - <para> - DNS records will also be required: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>AAAA</literal> and <literal>A</literal> records - pointing to the host in question, in order for browsers to be - able to discover the address of the web server; - </para> - </listitem> - <listitem> - <para> - An <literal>MX</literal> 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. - </para> - </listitem> - </itemizedlist> - <para> - 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. - </para> - </section> - <section xml:id="module-services-mailman-other-mtas"> - <title>Using with other MTAs</title> - <para> - 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: - </para> - <programlisting> -{ 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; - }; - }; -} -</programlisting> - <para> - The exim config needs some special additions to work with Mailman. - Currently NixOS can’t manage Exim config with such granularity. - Please refer to - <link xlink:href="https://mailman.readthedocs.io/en/latest/src/mailman/docs/mta.html">Mailman - documentation</link> for more info on configuring Mailman for - working with Exim. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index d01734d61e87e..852340c05aa7a 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -809,7 +809,7 @@ in // optionalAttrs (cfg.relayHost != "") { relayhost = if cfg.lookupMX then "${cfg.relayHost}:${toString cfg.relayPort}" else "[${cfg.relayHost}]:${toString cfg.relayPort}"; } - // optionalAttrs config.networking.enableIPv6 { inet_protocols = mkDefault "all"; } + // optionalAttrs (!config.networking.enableIPv6) { inet_protocols = mkDefault "ipv4"; } // optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; } // optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; } // optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; } diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index e05820fb87cf1..95dc2f6aa2c92 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -150,9 +150,13 @@ in root = cfg.package; index = "index.php"; extraConfig = '' - location ~* \.php$ { + location ~* \.php(/|$) { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${fpm.socket}; + + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix index 15f0f0cc0cdbf..f579c2529c0a5 100644 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ b/nixos/modules/services/matrix/appservice-discord.nix @@ -5,7 +5,6 @@ with lib; let dataDir = "/var/lib/matrix-appservice-discord"; registrationFile = "${dataDir}/discord-registration.yaml"; - appDir = "${pkgs.matrix-appservice-discord}/${pkgs.matrix-appservice-discord.passthru.nodeAppDir}"; cfg = config.services.matrix-appservice-discord; opt = options.services.matrix-appservice-discord; # TODO: switch to configGen.json once RFC42 is implemented @@ -16,6 +15,15 @@ in { services.matrix-appservice-discord = { enable = mkEnableOption (lib.mdDoc "a bridge between Matrix and Discord"); + package = mkOption { + type = types.package; + default = pkgs.matrix-appservice-discord; + defaultText = literalExpression "pkgs.matrix-appservice-discord"; + description = lib.mdDoc '' + Which package of matrix-appservice-discord to use. + ''; + }; + settings = mkOption rec { # TODO: switch to types.config.json as prescribed by RFC42 once it's implemented type = types.attrs; @@ -114,7 +122,7 @@ in { preStart = '' if [ ! -f '${registrationFile}' ]; then - ${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \ + ${cfg.package}/bin/matrix-appservice-discord \ --generate-registration \ --url=${escapeShellArg cfg.url} \ ${optionalString (cfg.localpart != null) "--localpart=${escapeShellArg cfg.localpart}"} \ @@ -135,13 +143,13 @@ in { DynamicUser = true; PrivateTmp = true; - WorkingDirectory = appDir; + WorkingDirectory = "${cfg.package}/${cfg.package.passthru.nodeAppDir}"; StateDirectory = baseNameOf dataDir; UMask = "0027"; EnvironmentFile = cfg.environmentFile; ExecStart = '' - ${pkgs.matrix-appservice-discord}/bin/matrix-appservice-discord \ + ${cfg.package}/bin/matrix-appservice-discord \ --file='${registrationFile}' \ --config='${settingsFile}' \ --port='${toString cfg.port}' diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index e74f25df764db..e995f1aecf27d 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -96,7 +96,7 @@ in { type = types.nullOr types.path; default = null; description = lib.mdDoc '' - File containing environment variables to be passed to the mautrix-telegram service. + File containing environment variables to be passed to the mautrix-facebook service. Any config variable can be overridden by setting `MAUTRIX_FACEBOOK_SOME_KEY` to override the `some.key` variable. ''; diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 5a632fd27e80d..b64cc71d98735 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -137,7 +137,7 @@ in { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ cfg.serviceDependencies; after = [ "network-online.target" ] ++ cfg.serviceDependencies; - path = [ pkgs.lottieconverter ]; + path = [ pkgs.lottieconverter pkgs.ffmpeg-full ]; # mautrix-telegram tries to generate a dotfile in the home directory of # the running user if using a postgresql database: diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix index cbf7b93329d7a..b6a3e5e8c7308 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 5bd2919e437c6..0000000000000 --- a/nixos/modules/services/matrix/mjolnir.xml +++ /dev/null @@ -1,148 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-mjolnir"> - <title>Mjolnir (Matrix Moderation Tool)</title> - <para> - This chapter will show you how to set up your own, self-hosted - <link xlink:href="https://github.com/matrix-org/mjolnir">Mjolnir</link> - instance. - </para> - <para> - 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. - </para> - <para> - 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. - </para> - <para> - See the - <link xlink:href="https://github.com/matrix-org/mjolnir#readme">README</link> - page and the - <link xlink:href="https://github.com/matrix-org/mjolnir/blob/main/docs/moderators.md">Moderator’s - guide</link> for additional instructions on how to setup and use - Mjolnir. - </para> - <para> - For <link linkend="opt-services.mjolnir.settings">additional - settings</link> see - <link xlink:href="https://github.com/matrix-org/mjolnir/blob/main/config/default.yaml">the - default configuration</link>. - </para> - <section xml:id="module-services-mjolnir-setup"> - <title>Mjolnir Setup</title> - <para> - 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 - <link linkend="opt-services.mjolnir.managementRoom">services.mjolnir.managementRoom</link>. - </para> - <para> - Next, create a new user for Mjolnir on your homeserver, if not - present already. - </para> - <para> - The Mjolnir Matrix user expects to be free of any rate limiting. - See - <link xlink:href="https://github.com/matrix-org/synapse/issues/6286">Synapse - #6286</link> for an example on how to achieve this. - </para> - <para> - 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. - </para> - <para> - Now invite the Mjolnir user to the management room. - </para> - <para> - It is recommended to use - <link xlink:href="https://github.com/matrix-org/pantalaimon">Pantalaimon</link>, - so your management room can be encrypted. This also applies if you - are looking to moderate an encrypted room. - </para> - <para> - To enable the Pantalaimon E2E Proxy for mjolnir, enable - <link linkend="opt-services.mjolnir.pantalaimon.enable">services.mjolnir.pantalaimon</link>. - This will autoconfigure a new Pantalaimon instance, which will - connect to the homeserver set in - <link linkend="opt-services.mjolnir.homeserverUrl">services.mjolnir.homeserverUrl</link> - and Mjolnir itself will be configured to connect to the new - Pantalaimon instance. - </para> - <programlisting> -{ - 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"; - }; -} -</programlisting> - <section xml:id="module-services-mjolnir-setup-ems"> - <title>Element Matrix Services (EMS)</title> - <para> - If you are using a managed - <link xlink:href="https://ems.element.io/"><quote>Element Matrix - Services (EMS)</quote></link> 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. - </para> - </section> - </section> - <section xml:id="module-services-mjolnir-matrix-synapse-antispam"> - <title>Synapse Antispam Module</title> - <para> - A Synapse module is also available to apply the same rulesets the - bot uses across an entire homeserver. - </para> - <para> - To use the Antispam Module, add - <literal>matrix-synapse-plugins.matrix-synapse-mjolnir-antispam</literal> - to the Synapse plugin list and enable the - <literal>mjolnir.Module</literal> module. - </para> - <programlisting> -{ - 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" - ''; - }; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md index 22f3bce64a40c..7a9ddf8c9daf3 100644 --- a/nixos/modules/services/matrix/synapse.md +++ b/nixos/modules/services/matrix/synapse.md @@ -31,7 +31,7 @@ let "m.homeserver".base_url = "https://${fqdn}"; "m.identity_server" = {}; }; - serverConfig."m.server" = "${config.services.matrix-synapse.settings.server_name}:443"; + serverConfig."m.server" = "${fqdn}:443"; mkWellKnown = data: '' add_header Content-Type application/json; add_header Access-Control-Allow-Origin *; diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 3087d879b9d2b..aee275dab1ec1 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -801,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 686aec93ab675..0000000000000 --- a/nixos/modules/services/matrix/synapse.xml +++ /dev/null @@ -1,263 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-matrix"> - <title>Matrix</title> - <para> - <link xlink:href="https://matrix.org/">Matrix</link> 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. - </para> - <para> - 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 - <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try - Matrix Now!</link> 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. - </para> - <section xml:id="module-services-matrix-synapse"> - <title>Synapse Homeserver</title> - <para> - <link xlink:href="https://github.com/matrix-org/synapse">Synapse</link> - 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 - <literal>example.org</literal> domain, served from the host - <literal>myhostname.example.org</literal>. For more information, - please refer to the - <link xlink:href="https://matrix-org.github.io/synapse/latest/setup/installation.html">installation - instructions of Synapse</link> . - </para> - <programlisting> -{ 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; - } ]; - } - ]; - }; -} -</programlisting> - </section> - <section xml:id="module-services-matrix-register-users"> - <title>Registering Matrix users</title> - <para> - If you want to run a server with public registration by anybody, - you can then enable - <literal>services.matrix-synapse.settings.enable_registration = true;</literal>. - Otherwise, or you can generate a registration secret with - <command>pwgen -s 64 1</command> and set it with - <xref linkend="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: - </para> - <programlisting> -$ 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! -</programlisting> - <para> - In the example, this would create a user with the Matrix - Identifier <literal>@your-username:example.org</literal>. - </para> - <warning> - <para> - When using - <xref linkend="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: - </para> - <itemizedlist> - <listitem> - <para> - Create a file with the following contents: - </para> - <programlisting> -registration_shared_secret: your-very-secret-secret -</programlisting> - </listitem> - <listitem> - <para> - Deploy the file with a secret-manager such as - <link xlink:href="https://nixops.readthedocs.io/en/latest/overview.html#managing-keys"><option>deployment.keys</option></link> - from - <citerefentry><refentrytitle>nixops</refentrytitle><manvolnum>1</manvolnum></citerefentry> - or - <link xlink:href="https://github.com/Mic92/sops-nix/">sops-nix</link> - to e.g. - <filename>/run/secrets/matrix-shared-secret</filename> and - ensure that it’s readable by - <literal>matrix-synapse</literal>. - </para> - </listitem> - <listitem> - <para> - Include the file like this in your configuration: - </para> - <programlisting> -{ - services.matrix-synapse.extraConfigFiles = [ - "/run/secrets/matrix-shared-secret" - ]; -} -</programlisting> - </listitem> - </itemizedlist> - </warning> - <note> - <para> - It’s also possible to user alternative authentication mechanism - such as - <link xlink:href="https://github.com/matrix-org/matrix-synapse-ldap3">LDAP - (via <literal>matrix-synapse-ldap3</literal>)</link> or - <link xlink:href="https://matrix-org.github.io/synapse/latest/openid.html">OpenID</link>. - </para> - </note> - </section> - <section xml:id="module-services-matrix-element-web"> - <title>Element (formerly known as Riot) Web Client</title> - <para> - <link xlink:href="https://github.com/vector-im/riot-web/">Element - Web</link> 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 - <link xlink:href="https://element.io/blog/welcome-to-element/">Element - introductory blog post</link> 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 - <literal>https://element.myhostname.example.org</literal> and - <literal>https://element.example.org</literal>. Alternatively, you - can use the hosted copy at - <link xlink:href="https://app.element.io/">https://app.element.io/</link>, - or use other web clients or native client applications. Due to the - <literal>/.well-known</literal> urls set up done above, many - clients should fill in the required connection details - automatically when you enter your Matrix Identifier. See - <link xlink:href="https://matrix.org/docs/projects/try-matrix-now.html">Try - Matrix Now!</link> for a list of existing clients and their - supported featureset. - </para> - <programlisting> -{ - 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. - }; - }; - }; -} -</programlisting> - <note> - <para> - 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 <literal>myhostname.example.org</literal> virtualHost - to also serve Element, but instead serve it on a different - subdomain, like <literal>element.example.org</literal> in the - example. See the - <link xlink:href="https://github.com/vector-im/element-web/tree/v1.10.0#important-security-notes">Element - Important Security Notes</link> for more information on this - subject. - </para> - </note> - </section> -</chapter> diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index c94852e3aad9c..508e2862b63f5 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -8,7 +8,7 @@ in { options = { services.atuin = { - enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin."); + enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin"); openRegistration = mkOption { type = types.bool; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e6689217ad9ad..179359c97a3af 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1504,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 a193657b0b761..0000000000000 --- a/nixos/modules/services/misc/gitlab.xml +++ /dev/null @@ -1,143 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-gitlab"> - <title>GitLab</title> - <para> - GitLab is a feature-rich git hosting service. - </para> - <section xml:id="module-services-gitlab-prerequisites"> - <title>Prerequisites</title> - <para> - The <literal>gitlab</literal> service exposes only an Unix socket - at <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You - need to configure a webserver to proxy HTTP requests to the - socket. - </para> - <para> - For instance, the following configuration could be used to use - nginx as frontend proxy: - </para> - <programlisting> -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"; - }; -}; -</programlisting> - </section> - <section xml:id="module-services-gitlab-configuring"> - <title>Configuring</title> - <para> - 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. - </para> - <para> - The default state dir is <literal>/var/gitlab/state</literal>. - This is where all data like the repositories and uploads will be - stored. - </para> - <para> - A basic configuration with some custom settings could look like - this: - </para> - <programlisting> -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; }; - }; - }; -}; -</programlisting> - <para> - If you’re setting up a new GitLab instance, generate new secrets. - You for instance use - <literal>tr -dc A-Za-z0-9 < /dev/urandom | head -c 128 > /var/keys/gitlab/db</literal> - to generate a new db secret. Make sure the files can be read by, - and only by, the user specified by - <link linkend="opt-services.gitlab.user">services.gitlab.user</link>. - GitLab encrypts sensitive data stored in the database. If you’re - restoring an existing GitLab instance, you must specify the - secrets secret from <literal>config/secrets.yml</literal> located - in your GitLab state folder. - </para> - <para> - When <literal>incoming_mail.enabled</literal> is set to - <literal>true</literal> in - <link linkend="opt-services.gitlab.extraConfig">extraConfig</link> - an additional service called <literal>gitlab-mailroom</literal> is - enabled for fetching incoming mail. - </para> - <para> - Refer to <xref linkend="ch-options" /> for all available - configuration options for the - <link linkend="opt-services.gitlab.enable">services.gitlab</link> - module. - </para> - </section> - <section xml:id="module-services-gitlab-maintenance"> - <title>Maintenance</title> - <section xml:id="module-services-gitlab-maintenance-backups"> - <title>Backups</title> - <para> - Backups can be configured with the options in - <link linkend="opt-services.gitlab.backup.keepTime">services.gitlab.backup</link>. - Use the - <link linkend="opt-services.gitlab.backup.startAt">services.gitlab.backup.startAt</link> - option to configure regular backups. - </para> - <para> - To run a manual backup, start the - <literal>gitlab-backup</literal> service: - </para> - <programlisting> -$ systemctl start gitlab-backup.service -</programlisting> - </section> - <section xml:id="module-services-gitlab-maintenance-rake"> - <title>Rake tasks</title> - <para> - You can run GitLab’s rake tasks with - <literal>gitlab-rake</literal> 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. - </para> - <para> - A list of all available rake tasks can be obtained by running: - </para> - <programlisting> -$ sudo -u git -H gitlab-rake -T -</programlisting> - </section> - </section> -</chapter> diff --git a/nixos/modules/services/misc/input-remapper.nix b/nixos/modules/services/misc/input-remapper.nix index 6353966f5c3ff..3f6d97f857381 100644 --- a/nixos/modules/services/misc/input-remapper.nix +++ b/nixos/modules/services/misc/input-remapper.nix @@ -6,7 +6,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."); + enable = mkEnableOption (lib.mdDoc "input-remapper, an easy to use tool to change the mapping of your input device buttons"); 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 { diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index a2158e9461bce..9f8539980aaab 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -135,7 +135,7 @@ in } { assertion = (cfg.configFile != null) != (cfg.settings != null); - message = "You need to either specify services.klipper.settings or services.klipper.defaultConfig."; + message = "You need to either specify services.klipper.settings or services.klipper.configFile."; } ]; diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index d467aa8797678..1a6b54854d1cd 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: - with lib; let @@ -16,17 +15,19 @@ in { type = types.package; default = pkgs.mbpfan; defaultText = literalExpression "pkgs.mbpfan"; - description = lib.mdDoc '' - The package used for the mbpfan daemon. - ''; + description = lib.mdDoc "The package used for the mbpfan daemon."; }; verbose = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' - If true, sets the log level to verbose. - ''; + description = lib.mdDoc "If true, sets the log level to verbose."; + }; + + aggressive = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "If true, favors higher default fan speeds."; }; settings = mkOption { @@ -35,24 +36,14 @@ in { type = types.submodule { freeformType = settingsFormat.type; - options.general.min_fan1_speed = mkOption { - type = types.nullOr types.int; - default = 2000; - description = lib.mdDoc '' - You can check minimum and maximum fan limits with - `cat /sys/devices/platform/applesmc.768/fan*_min` and - `cat /sys/devices/platform/applesmc.768/fan*_max` respectively. - Setting to null implies using default value from applesmc. - ''; - }; options.general.low_temp = mkOption { type = types.int; - default = 55; + default = 63; description = lib.mdDoc "If temperature is below this, fans will run at minimum speed."; }; options.general.high_temp = mkOption { type = types.int; - default = 58; + default = 66; description = lib.mdDoc "If temperature is above this, fan speed will gradually increase."; }; options.general.max_temp = mkOption { @@ -79,10 +70,16 @@ in { ]; config = mkIf cfg.enable { - boot.kernelModules = [ "coretemp" "applesmc" ]; + services.mbpfan.settings = mkIf cfg.aggressive { + general.min_fan1_speed = mkDefault 2000; + general.low_temp = mkDefault 55; + general.high_temp = mkDefault 58; + general.max_temp = mkDefault 70; + }; - environment.etc."mbpfan.conf".source = settingsFile; + boot.kernelModules = [ "coretemp" "applesmc" ]; environment.systemPackages = [ cfg.package ]; + environment.etc."mbpfan.conf".source = settingsFile; systemd.services.mbpfan = { description = "A fan manager daemon for MacBook Pro"; diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index 62064b5d90fb3..53638ded29634 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -11,6 +11,8 @@ let else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l; mkKeyValue = generators.mkKeyValueDefault {} ":"; }; + + unifiedConfigDir = cfg.stateDir + "/config"; in { options = { services.moonraker = { @@ -30,11 +32,10 @@ in { }; configDir = mkOption { - type = types.path; - default = cfg.stateDir + "/config"; - defaultText = literalExpression ''config.${opt.stateDir} + "/config"''; + type = types.nullOr types.path; + default = null; description = lib.mdDoc '' - The directory containing client-writable configuration files. + Deprecated directory containing client-writable configuration files. Clients will be able to edit files in this directory via the API. This directory must be writable. ''; @@ -96,8 +97,18 @@ in { }; config = mkIf cfg.enable { - warnings = optional (cfg.settings ? update_manager) - ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''; + warnings = [] + ++ optional (cfg.settings ? update_manager) + ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'' + ++ optional (cfg.configDir != null) + '' + services.moonraker.configDir has been deprecated upstream and will be removed. + + Action: ${ + if cfg.configDir == unifiedConfigDir then "Simply remove services.moonraker.configDir from your config." + else "Move files from `${cfg.configDir}` to `${unifiedConfigDir}` then remove services.moonraker.configDir from your config." + } + ''; assertions = [ { @@ -124,20 +135,20 @@ in { port = cfg.port; klippy_uds_address = cfg.klipperSocket; }; + machine = { + validate_service = false; + }; + } // (lib.optionalAttrs (cfg.configDir != null) { file_manager = { config_path = cfg.configDir; }; - database = { - database_path = "${cfg.stateDir}/database"; - }; - }; + }); fullConfig = recursiveUpdate cfg.settings forcedConfig; in format.generate "moonraker.cfg" fullConfig; systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" - "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -" - ]; + ] ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"; systemd.services.moonraker = { description = "Moonraker, an API web server for Klipper"; @@ -147,9 +158,16 @@ in { # Moonraker really wants its own config to be writable... script = '' - cp /etc/moonraker.cfg ${cfg.configDir}/moonraker-temp.cfg - chmod u+w ${cfg.configDir}/moonraker-temp.cfg - exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg + config_path=${ + # Deprecated separate config dir + if cfg.configDir != null then "${cfg.configDir}/moonraker-temp.cfg" + # Config in unified data path + else "${unifiedConfigDir}/moonraker-temp.cfg" + } + mkdir -p $(dirname "$config_path") + cp /etc/moonraker.cfg "$config_path" + chmod u+w "$config_path" + exec ${pkg}/bin/moonraker -d ${cfg.stateDir} -c "$config_path" ''; # Needs `ip` command @@ -184,5 +202,6 @@ in { meta.maintainers = with maintainers; [ cab404 vtuan10 + zhaofengli ]; } diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index f0cb5cc151388..2d0d91f95985a 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -185,6 +185,13 @@ in description = lib.mdDoc "Replace YouTube links with links to this instance (blank to disable)."; }; + replaceReddit = mkOption { + type = types.str; + default = ""; + example = "teddit.net"; + description = lib.mdDoc "Replace Reddit links with links to this instance (blank to disable)."; + }; + replaceInstagram = mkOption { type = types.str; default = ""; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index c216c6fa2b77a..43e0ce0c21d32 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -106,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 = { diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 1dddd147ac095..667f16d98f828 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -226,9 +226,26 @@ in # 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) '' diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 314388e0152ef..be3accc0d7e5c 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -85,7 +85,7 @@ in WorkingDirectory = libDir; SyslogIdentifier = "pykms"; Restart = "on-failure"; - MemoryLimit = cfg.memoryLimit; + MemoryMax = cfg.memoryLimit; }; }; }; diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index b03cf0739e9d9..d4391bc49e315 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -438,7 +438,7 @@ in }; options."lists.sr.ht" = commonServiceSettings "lists" // { - allow-new-lists = mkEnableOption (lib.mdDoc "Allow creation of new lists."); + allow-new-lists = mkEnableOption (lib.mdDoc "Allow creation of new lists"); notify-from = mkOption { description = lib.mdDoc "Outgoing email for notifications generated by users."; type = types.str; @@ -1390,6 +1390,6 @@ in '') ]; - meta.doc = ./default.xml; + meta.doc = ./default.md; meta.maintainers = with maintainers; [ tomberek ]; } diff --git a/nixos/modules/services/misc/sourcehut/default.xml b/nixos/modules/services/misc/sourcehut/default.xml deleted file mode 100644 index 1d8330931ddf0..0000000000000 --- a/nixos/modules/services/misc/sourcehut/default.xml +++ /dev/null @@ -1,113 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-sourcehut"> - <title>Sourcehut</title> - <para> - <link xlink:href="https://sr.ht.com/">Sourcehut</link> is an - open-source, self-hostable software development platform. The server - setup can be automated using - <link linkend="opt-services.sourcehut.enable">services.sourcehut</link>. - </para> - <section xml:id="module-services-sourcehut-basic-usage"> - <title>Basic usage</title> - <para> - Sourcehut is a Python and Go based set of applications. This NixOS - module also provides basic configuration integrating Sourcehut - into locally running <literal>services.nginx</literal>, - <literal>services.redis.servers.sourcehut</literal>, - <literal>services.postfix</literal> and - <literal>services.postgresql</literal> services. - </para> - <para> - A very basic configuration may look like this: - </para> - <programlisting> -{ 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: - }; - }; -} -</programlisting> - <para> - The <literal>hostName</literal> option is used internally to - configure the nginx reverse-proxy. The <literal>settings</literal> - attribute set is used by the configuration generator and the - result is placed in <literal>/etc/sr.ht/config.ini</literal>. - </para> - </section> - <section xml:id="module-services-sourcehut-configuration"> - <title>Configuration</title> - <para> - All configuration parameters are also stored in - <literal>/etc/sr.ht/config.ini</literal> which is generated by the - module and linked from the store to ensure that all values from - <literal>config.ini</literal> can be modified by the module. - </para> - </section> - <section xml:id="module-services-sourcehut-httpd"> - <title>Using an alternative webserver as reverse-proxy (e.g. - <literal>httpd</literal>)</title> - <para> - By default, <literal>nginx</literal> is used as reverse-proxy for - <literal>sourcehut</literal>. However, it’s possible to use e.g. - <literal>httpd</literal> by explicitly disabling - <literal>nginx</literal> using - <xref linkend="opt-services.nginx.enable" /> and fixing the - <literal>settings</literal>. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 7331c323adbaa..775b3b6d2eae9 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -566,5 +566,5 @@ in { }) ]; - meta.doc = ./default.xml; + meta.doc = ./default.md; } diff --git a/nixos/modules/services/misc/taskserver/default.xml b/nixos/modules/services/misc/taskserver/default.xml deleted file mode 100644 index bbb38211b7cae..0000000000000 --- a/nixos/modules/services/misc/taskserver/default.xml +++ /dev/null @@ -1,130 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-taskserver"> - <title>Taskserver</title> - <para> - Taskserver is the server component of - <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a - free and open source todo list application. - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://taskwarrior.org/docs/#taskd">https://taskwarrior.org/docs/#taskd</link> - </para> - <section xml:id="module-services-taskserver-configuration"> - <title>Configuration</title> - <para> - 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 - <quote>server certificates</quote>. - </para> - <para> - So in order to make it easier to handle your own CA, there is a - helper tool called <command>nixos-taskserver</command> which - manages the custom CA along with Taskserver organisations, users - and groups. - </para> - <para> - 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. - </para> - <para> - With <command>nixos-taskserver</command> 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. - </para> - </section> - <section xml:id="module-services-taskserver-nixos-taskserver-tool"> - <title>The nixos-taskserver tool</title> - <para> - Because Taskserver by default only provides scripts to setup users - imperatively, the <command>nixos-taskserver</command> tool is used - for addition and deletion of organisations along with users and - groups defined by - <xref linkend="opt-services.taskserver.organisations" /> and as - well for imperative set up. - </para> - <para> - The tool is designed to not interfere if the command is used to - manually set up some organisations, users or groups. - </para> - <para> - For example if you add a new organisation using - <command>nixos-taskserver org add foo</command>, the organisation - is not modified and deleted no matter what you define in - <option>services.taskserver.organisations</option>, even if you’re - adding the same organisation in that option. - </para> - <para> - The tool is modelled to imitate the official - <command>taskd</command> command, documentation for each - subcommand can be shown by using the <option>--help</option> - switch. - </para> - </section> - <section xml:id="module-services-taskserver-declarative-ca-management"> - <title>Declarative/automatic CA management</title> - <para> - 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. - </para> - <para> - This is done using - <command>nixos-taskserver user export $orgname $username</command> - 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. - </para> - <para> - For example, let’s say you have the following configuration: - </para> - <programlisting> -{ - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; -} -</programlisting> - <para> - This creates an organisation called <literal>my-company</literal> - with the user <literal>alice</literal>. - </para> - <para> - Now in order to import the <literal>alice</literal> user to - another machine <literal>alicebox</literal>, all we need to do is - something like this: - </para> - <programlisting> -$ ssh server nixos-taskserver user export my-company alice | sh -</programlisting> - <para> - Of course, if no SSH daemon is available on the server you can - also copy & paste it directly into a shell. - </para> - <para> - 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</command> on <literal>alicebox</literal>. - </para> - <para> - Subsequent synchronisation requests merely require the command - <command>task sync</command> after that stage. - </para> - </section> - <section xml:id="module-services-taskserver-manual-ca-management"> - <title>Manual CA management</title> - <para> - If you set any options within - <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*, - <command>nixos-taskserver</command> won’t issue certificates, but - you can still use it for adding or removing user accounts. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index aa5b9b22837e2..338493e3cd378 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -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 83ae171217d24..0000000000000 --- a/nixos/modules/services/misc/weechat.xml +++ /dev/null @@ -1,63 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-weechat"> - <title>WeeChat</title> - <para> - <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and - extensible IRC client. - </para> - <section xml:id="module-services-weechat-basic-usage"> - <title>Basic Usage</title> - <para> - By default, the module creates a - <link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/"><literal>systemd</literal></link> - unit which runs the chat client in a detached - <link xlink:href="https://www.gnu.org/software/screen/"><literal>screen</literal></link> - session. - </para> - <para> - This can be done by enabling the <literal>weechat</literal> - service: - </para> - <programlisting> -{ ... }: - -{ - services.weechat.enable = true; -} -</programlisting> - <para> - The service is managed by a dedicated user named - <literal>weechat</literal> in the state directory - <literal>/var/lib/weechat</literal>. - </para> - </section> - <section xml:id="module-services-weechat-reattach"> - <title>Re-attaching to WeeChat</title> - <para> - WeeChat runs in a screen session owned by a dedicated user. To - explicitly allow your another user to attach to this session, the - <literal>screenrc</literal> needs to be tweaked by adding - <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> - support: - </para> - <programlisting> -{ - programs.screen.screenrc = '' - multiuser on - acladd normal_user - ''; -} -</programlisting> - <para> - Now, the session can be re-attached like this: - </para> - <programlisting> -screen -x weechat/weechat-screen -</programlisting> - <para> - <emphasis>The session name can be changed using - <link xlink:href="options.html#opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis> - </para> - </section> -</chapter> diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a8fba4e6e8cef..68e6e8e40b314 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/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix new file mode 100644 index 0000000000000..2947b4d801201 --- /dev/null +++ b/nixos/modules/services/monitoring/cockpit.nix @@ -0,0 +1,231 @@ +{ pkgs, config, lib, ... }: + +let + cfg = config.services.cockpit; + inherit (lib) types mkEnableOption mkOption mkIf mdDoc literalMD mkPackageOptionMD; + settingsFormat = pkgs.formats.ini {}; +in { + options = { + services.cockpit = { + enable = mkEnableOption (mdDoc "Cockpit"); + + package = mkPackageOptionMD pkgs "Cockpit" { + default = [ "cockpit" ]; + }; + + settings = lib.mkOption { + type = settingsFormat.type; + + default = {}; + + description = mdDoc '' + Settings for cockpit that will be saved in /etc/cockpit/cockpit.conf. + + See the [documentation](https://cockpit-project.org/guide/latest/cockpit.conf.5.html), that is also available with `man cockpit.conf.5` for details. + ''; + }; + + port = mkOption { + description = mdDoc "Port where cockpit will listen."; + type = types.port; + default = 9090; + }; + + openFirewall = mkOption { + description = mdDoc "Open port for cockpit."; + type = types.bool; + default = false; + }; + }; + }; + config = mkIf cfg.enable { + + # expose cockpit-bridge system-wide + environment.systemPackages = [ cfg.package ]; + + # allow cockpit to find its plugins + environment.pathsToLink = [ "/share/cockpit" ]; + + # generate cockpit settings + environment.etc."cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings; + + security.pam.services.cockpit = {}; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + # units are in reverse sort order if you ls $out/lib/systemd/system + # all these units are basically verbatim translated from upstream + + # Translation from $out/lib/systemd/system/systemd-cockpithttps.slice + systemd.slices.system-cockpithttps = { + description = "Resource limits for all cockpit-ws-https@.service instances"; + sliceConfig = { + TasksMax = 200; + MemoryHigh = "75%"; + MemoryMax = "90%"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https@.socket + systemd.sockets."cockpit-wsinstance-https@" = { + unitConfig = { + Description = "Socket for Cockpit Web Service https instance %I"; + BindsTo = [ "cockpit.service" "cockpit-wsinstance-https@%i.service" ]; + # clean up the socket after the service exits, to prevent fd leak + # this also effectively prevents a DoS by starting arbitrarily many sockets, as + # the services are resource-limited by system-cockpithttps.slice + Documentation = "man:cockpit-ws(8)"; + }; + socketConfig = { + ListenStream = "/run/cockpit/wsinstance/https@%i.sock"; + SocketUser = "root"; + SocketMode = "0600"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https@.service + systemd.services."cockpit-wsinstance-https@" = { + description = "Cockpit Web Service https instance %I"; + bindsTo = [ "cockpit.service"]; + path = [ cfg.package ]; + documentation = [ "man:cockpit-ws(8)" ]; + serviceConfig = { + Slice = "system-cockpithttps.slice"; + ExecStart = "${cfg.package}/libexec/cockpit-ws --for-tls-proxy --port=0"; + User = "root"; + Group = ""; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-http.socket + systemd.sockets.cockpit-wsinstance-http = { + unitConfig = { + Description = "Socket for Cockpit Web Service http instance"; + BindsTo = "cockpit.service"; + Documentation = "man:cockpit-ws(8)"; + }; + socketConfig = { + ListenStream = "/run/cockpit/wsinstance/http.sock"; + SocketUser = "root"; + SocketMode = "0600"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https-factory.socket + systemd.sockets.cockpit-wsinstance-https-factory = { + unitConfig = { + Description = "Socket for Cockpit Web Service https instance factory"; + BindsTo = "cockpit.service"; + Documentation = "man:cockpit-ws(8)"; + }; + socketConfig = { + ListenStream = "/run/cockpit/wsinstance/https-factory.sock"; + Accept = true; + SocketUser = "root"; + SocketMode = "0600"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-https-factory@.service + systemd.services."cockpit-wsinstance-https-factory@" = { + description = "Cockpit Web Service https instance factory"; + documentation = [ "man:cockpit-ws(8)" ]; + path = [ cfg.package ]; + serviceConfig = { + ExecStart = "${cfg.package}/libexec/cockpit-wsinstance-factory"; + User = "root"; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-wsinstance-http.service + systemd.services."cockpit-wsinstance-http" = { + description = "Cockpit Web Service http instance"; + bindsTo = [ "cockpit.service" ]; + path = [ cfg.package ]; + documentation = [ "man:cockpit-ws(8)" ]; + serviceConfig = { + ExecStart = "${cfg.package}/libexec/cockpit-ws --no-tls --port=0"; + User = "root"; + Group = ""; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit.socket + systemd.sockets."cockpit" = { + unitConfig = { + Description = "Cockpit Web Service Socket"; + Documentation = "man:cockpit-ws(8)"; + Wants = "cockpit-motd.service"; + }; + socketConfig = { + ListenStream = cfg.port; + ExecStartPost = [ + "-${cfg.package}/share/cockpit/motd/update-motd \"\" localhost" + "-${pkgs.coreutils}/bin/ln -snf active.motd /run/cockpit/motd" + ]; + ExecStopPost = "-${pkgs.coreutils}/bin/ln -snf inactive.motd /run/cockpit/motd"; + }; + wantedBy = [ "sockets.target" ]; + }; + + # Translation from $out/lib/systemd/system/cockpit.service + systemd.services."cockpit" = { + description = "Cockpit Web Service"; + documentation = [ "man:cockpit-ws(8)" ]; + restartIfChanged = true; + path = with pkgs; [ coreutils cfg.package ]; + requires = [ "cockpit.socket" "cockpit-wsinstance-http.socket" "cockpit-wsinstance-https-factory.socket" ]; + after = [ "cockpit-wsinstance-http.socket" "cockpit-wsinstance-https-factory.socket" ]; + environment = { + G_MESSAGES_DEBUG = "cockpit-ws,cockpit-bridge"; + }; + serviceConfig = { + RuntimeDirectory="cockpit/tls"; + ExecStartPre = [ + # cockpit-tls runs in a more constrained environment, these + means that these commands + # will run with full privilege instead of inside that constrained environment + # See https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart= for details + "+${cfg.package}/libexec/cockpit-certificate-ensure --for-cockpit-tls" + ]; + ExecStart = "${cfg.package}/libexec/cockpit-tls"; + User = "root"; + Group = ""; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + MemoryDenyWriteExecute = true; + }; + }; + + # Translation from $out/lib/systemd/system/cockpit-motd.service + # This part basically implements a motd state machine: + # - If cockpit.socket is enabled then /run/cockpit/motd points to /run/cockpit/active.motd + # - If cockpit.socket is disabled then /run/cockpit/motd points to /run/cockpit/inactive.motd + # - As cockpit.socket is disabled by default, /run/cockpit/motd points to /run/cockpit/inactive.motd + # /run/cockpit/active.motd is generated dynamically by cockpit-motd.service + systemd.services."cockpit-motd" = { + path = with pkgs; [ nettools ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${cfg.package}/share/cockpit/motd/update-motd"; + }; + description = "Cockpit motd updater service"; + documentation = [ "man:cockpit-ws(8)" ]; + wants = [ "network.target" ]; + after = [ "network.target" "cockpit.socket" ]; + }; + + systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf + "C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd" + "f /run/cockpit/active.motd 0640 root root -" + "L+ /run/cockpit/motd - - - - inactive.motd" + "d /etc/cockpit/ws-certs.d 0600 root root 0" + ]; + }; + + meta.maintainers = pkgs.cockpit.meta.maintainers; +} diff --git a/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix index 4185cd76c4eb0..67dc1bc19edd8 100644 --- a/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/nixos/modules/services/monitoring/mackerel-agent.nix @@ -11,7 +11,7 @@ in { # the upstream package runs as root, but doesn't seem to be strictly # necessary for basic functionality - runAsRoot = mkEnableOption (lib.mdDoc "Whether to run as root."); + runAsRoot = mkEnableOption (lib.mdDoc "Whether to run as root"); autoRetirement = mkEnableOption (lib.mdDoc '' Whether to automatically retire the host upon OS shutdown. diff --git a/nixos/modules/services/monitoring/mimir.nix b/nixos/modules/services/monitoring/mimir.nix index 568066990f23e..edca9b7be4ff0 100644 --- a/nixos/modules/services/monitoring/mimir.nix +++ b/nixos/modules/services/monitoring/mimir.nix @@ -25,6 +25,13 @@ in { Specify a configuration file that Mimir should use. ''; }; + + package = mkOption { + default = pkgs.mimir; + defaultText = lib.literalExpression "pkgs.mimir"; + type = types.package; + description = lib.mdDoc ''Mimir package to use.''; + }; }; config = mkIf cfg.enable { @@ -53,7 +60,7 @@ in { else cfg.configFile; in { - ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}"; + ExecStart = "${cfg.package}/bin/mimir --config.file=${conf}"; DynamicUser = true; Restart = "always"; ProtectSystem = "full"; diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 2e7c4fd00b426..44fc359b6a7de 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -409,7 +409,7 @@ in provision = { enable = cfg.provision.grafana.datasource || cfg.provision.grafana.dashboard; - datasources = + datasources.settings.datasources = let esVersion = lib.getVersion config.services.elasticsearch.package; in @@ -435,7 +435,7 @@ in }; } ]; - dashboards = lib.mkIf cfg.provision.grafana.dashboard [{ + dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{ name = "parsedmarc"; options.path = "${pkgs.python3Packages.parsedmarc.dashboard}"; }]; @@ -539,6 +539,6 @@ in }; }; - 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 4d9b12c9a4293..0000000000000 --- a/nixos/modules/services/monitoring/parsedmarc.xml +++ /dev/null @@ -1,126 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-parsedmarc"> - <title>parsedmarc</title> - <para> - <link xlink:href="https://domainaware.github.io/parsedmarc/">parsedmarc</link> - is a service which parses incoming - <link xlink:href="https://dmarc.org/">DMARC</link> 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. - </para> - <section xml:id="module-services-parsedmarc-basic-usage"> - <title>Basic usage</title> - <para> - A very minimal setup which reads incoming reports from an external - email address and saves them to a local Elasticsearch instance - looks like this: - </para> - <programlisting language="nix"> -services.parsedmarc = { - enable = true; - settings.imap = { - host = "imap.example.com"; - user = "alice@example.com"; - password = "/path/to/imap_password_file"; - }; - provision.geoIp = false; # Not recommended! -}; -</programlisting> - <para> - Note that GeoIP provisioning is disabled in the example for - simplicity, but should be turned on for fully functional reports. - </para> - </section> - <section xml:id="module-services-parsedmarc-local-mail"> - <title>Local mail</title> - <para> - Instead of watching an external inbox, a local inbox can be - automatically provisioned. The recipient’s name is by default set - to <literal>dmarc</literal>, but can be configured in - <link xlink:href="options.html#opt-services.parsedmarc.provision.localMail.recipientName">services.parsedmarc.provision.localMail.recipientName</link>. - 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 <literal>monitoring.example.com</literal> and the complete - email address that should be configured in the domain’s dmarc - policy is <literal>dmarc@monitoring.example.com</literal>. - </para> - <programlisting language="nix"> -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = monitoring.example.com; - }; - geoIp = false; # Not recommended! - }; -}; -</programlisting> - </section> - <section xml:id="module-services-parsedmarc-grafana-geoip"> - <title>Grafana and GeoIP</title> - <para> - 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. - </para> - <programlisting language="nix"> -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" ]; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f3fbfb149ad77..fd40dce1410c1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -64,6 +64,7 @@ let "rspamd" "rtl_433" "script" + "shelly" "snmp" "smartctl" "smokeping" @@ -323,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 0ea95e513ff33..0000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ /dev/null @@ -1,245 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-prometheus-exporters"> - <title>Prometheus exporters</title> - <para> - Prometheus exporters provide metrics for the - <link xlink:href="https://prometheus.io">prometheus monitoring - system</link>. - </para> - <section xml:id="module-services-prometheus-exporters-configuration"> - <title>Configuration</title> - <para> - One of the most common exporters is the - <link xlink:href="https://github.com/prometheus/node_exporter">node - exporter</link>, it provides hardware and OS metrics from the host - it’s running on. The exporter could be configured as follows: - </para> - <programlisting> - services.prometheus.exporters.node = { - enable = true; - port = 9100; - enabledCollectors = [ - "logind" - "systemd" - ]; - disabledCollectors = [ - "textfile" - ]; - openFirewall = true; - firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; - }; -</programlisting> - <para> - It should now serve all metrics from the collectors that are - explicitly enabled and the ones that are - <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled - by default</link>, via http under <literal>/metrics</literal>. In - this example the firewall should just allow incoming connections - to the exporter’s port on the bridge interface - <literal>br0</literal> (this would have to be configured - separately of course). For more information about configuration - see <literal>man configuration.nix</literal> or search through the - <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available - options</link>. - </para> - <para> - Prometheus can now be configured to consume the metrics produced - by the exporter: - </para> - <programlisting> - services.prometheus = { - # ... - - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [{ - targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; - }]; - } - ]; - - # ... - } -</programlisting> - </section> - <section xml:id="module-services-prometheus-exporters-new-exporter"> - <title>Adding a new exporter</title> - <para> - To add a new exporter, it has to be packaged first (see - <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for - examples), then a module can be added. The postfix exporter is - used in this example: - </para> - <itemizedlist> - <listitem> - <para> - Some default options for all exporters are provided by - <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>enable</literal> - </para> - </listitem> - <listitem> - <para> - <literal>port</literal> - </para> - </listitem> - <listitem> - <para> - <literal>listenAddress</literal> - </para> - </listitem> - <listitem> - <para> - <literal>extraFlags</literal> - </para> - </listitem> - <listitem> - <para> - <literal>openFirewall</literal> - </para> - </listitem> - <listitem> - <para> - <literal>firewallFilter</literal> - </para> - </listitem> - <listitem> - <para> - <literal>user</literal> - </para> - </listitem> - <listitem> - <para> - <literal>group</literal> - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - As there is already a package available, the module can now be - added. This is accomplished by adding a new file to the - <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> - directory, which will be called postfix.nix and contains all - exporter specific options and configuration: - </para> - <programlisting> -# 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} - ''; - }; - }; -} -</programlisting> - </listitem> - <listitem> - <para> - 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 - <quote>meta-module</quote> that combines all exporter - definitions and generates the submodules: - <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal> - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-prometheus-exporters-update-exporter-module"> - <title>Updating an exporter module</title> - <para> - Should an exporter option change at some point, it is possible to - add information about the change to the exporter definition - similar to <literal>nixpkgs/nixos/modules/rename.nix</literal>: - </para> - <programlisting> -{ 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; }) - ]; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix b/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix index 537d72e85c8f0..6f403b3e58c81 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pihole.nix @@ -6,6 +6,11 @@ let cfg = config.services.prometheus.exporters.pihole; in { + imports = [ + (mkRemovedOptionModule [ "interval"] "This option has been removed.") + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; + port = 9617; extraOpts = { apiToken = mkOption { @@ -13,15 +18,7 @@ in default = ""; example = "580a770cb40511eb85290242ac130003580a770cb40511eb85290242ac130003"; description = lib.mdDoc '' - pi-hole API token which can be used instead of a password - ''; - }; - interval = mkOption { - type = types.str; - default = "10s"; - example = "30s"; - description = lib.mdDoc '' - How often to scrape new data + Pi-Hole API token which can be used instead of a password ''; }; password = mkOption { @@ -29,7 +26,7 @@ in default = ""; example = "password"; description = lib.mdDoc '' - The password to login into pihole. An api token can be used instead. + The password to login into Pi-Hole. An api token can be used instead. ''; }; piholeHostname = mkOption { @@ -37,7 +34,7 @@ in default = "pihole"; example = "127.0.0.1"; description = lib.mdDoc '' - Hostname or address where to find the pihole webinterface + Hostname or address where to find the Pi-Hole webinterface ''; }; piholePort = mkOption { @@ -45,7 +42,7 @@ in default = 80; example = 443; description = lib.mdDoc '' - The port pihole webinterface is reachable on + The port Pi-Hole webinterface is reachable on ''; }; protocol = mkOption { @@ -53,21 +50,28 @@ in default = "http"; example = "https"; description = lib.mdDoc '' - The protocol which is used to connect to pihole + The protocol which is used to connect to Pi-Hole + ''; + }; + timeout = mkOption { + type = types.str; + default = "5s"; + description = lib.mdDoc '' + Controls the timeout to connect to a Pi-Hole instance ''; }; }; serviceOpts = { serviceConfig = { ExecStart = '' - ${pkgs.bash}/bin/bash -c "${pkgs.prometheus-pihole-exporter}/bin/pihole-exporter \ - -interval ${cfg.interval} \ + ${pkgs.prometheus-pihole-exporter}/bin/pihole-exporter \ ${optionalString (cfg.apiToken != "") "-pihole_api_token ${cfg.apiToken}"} \ -pihole_hostname ${cfg.piholeHostname} \ ${optionalString (cfg.password != "") "-pihole_password ${cfg.password}"} \ -pihole_port ${toString cfg.piholePort} \ -pihole_protocol ${cfg.protocol} \ - -port ${toString cfg.port}" + -port ${toString cfg.port} \ + -timeout ${cfg.timeout} ''; }; }; 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 0000000000000..b9cfd1b1e84a9 --- /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/unpoller.nix b/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix index 5cd1e2c65e906..3b7f978528cd1 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix @@ -24,9 +24,9 @@ in { 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."); - prometheusErrors = mkEnableOption (lib.mdDoc "emitting errors to prometheus."); + debug = mkEnableOption (lib.mdDoc "debug logging including line numbers, high resolution timestamps, per-device logs"); + quiet = mkEnableOption (lib.mdDoc "startup and error logs only"); + prometheusErrors = mkEnableOption (lib.mdDoc "emitting errors to prometheus"); }; }; diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 886e14b5f6c9f..5f803d57b5e97 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -11,7 +11,7 @@ in options = { services.uptime-kuma = { - enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set."); + enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set"); package = mkOption { type = types.package; @@ -20,7 +20,7 @@ in description = lib.mdDoc "Uptime Kuma package to use."; }; - appriseSupport = mkEnableOption (mdDoc "apprise support for notifications."); + appriseSupport = mkEnableOption (mdDoc "apprise support for notifications"); settings = lib.mkOption { type = lib.types.submodule { freeformType = with lib.types; attrsOf str; }; diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 13a062c32128a..4d423c9059866 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" ++ @@ -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/default.nix b/nixos/modules/services/network-filesystems/litestream/default.nix index 0d987f12a3242..6e2ec1ccaa3c7 100644 --- a/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/nixos/modules/services/network-filesystems/litestream/default.nix @@ -95,5 +95,5 @@ in users.groups.litestream = {}; }; - meta.doc = ./default.xml; + meta.doc = ./default.md; } diff --git a/nixos/modules/services/network-filesystems/litestream/default.xml b/nixos/modules/services/network-filesystems/litestream/default.xml deleted file mode 100644 index 756899fdb88d9..0000000000000 --- a/nixos/modules/services/network-filesystems/litestream/default.xml +++ /dev/null @@ -1,62 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-litestream"> - <title>Litestream</title> - <para> - <link xlink:href="https://litestream.io/">Litestream</link> is a - standalone streaming replication tool for SQLite. - </para> - <section xml:id="module-services-litestream-configuration"> - <title>Configuration</title> - <para> - Litestream service is managed by a dedicated user named - <literal>litestream</literal> which needs permission to the - database file. Here’s an example config which gives required - permissions to access - <link linkend="opt-services.grafana.settings.database.path">grafana - database</link>: - </para> - <programlisting> -{ pkgs, ... }: -{ - users.users.litestream.extraGroups = [ "grafana" ]; - - systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" '' - timeout=10 - - while [ ! -f /var/lib/grafana/data/grafana.db ]; - do - if [ "$timeout" == 0 ]; then - echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db." - exit 1 - fi - - sleep 1 - - ((timeout--)) - done - - find /var/lib/grafana -type d -exec chmod -v 775 {} \; - find /var/lib/grafana -type f -exec chmod -v 660 {} \; - ''; - - services.litestream = { - enable = true; - - environmentFile = "/run/secrets/litestream"; - - settings = { - dbs = [ - { - path = "/var/lib/grafana/data/grafana.db"; - replicas = [{ - url = "s3://mybkt.litestream.io/grafana"; - }]; - } - ]; - }; - }; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/network-filesystems/moosefs.nix b/nixos/modules/services/network-filesystems/moosefs.nix index ab82a2a07dd4b..49cbc89d5a91f 100644 --- a/nixos/modules/services/network-filesystems/moosefs.nix +++ b/nixos/modules/services/network-filesystems/moosefs.nix @@ -85,7 +85,7 @@ in { description = lib.mdDoc "Run daemons as user moosefs instead of root."; }; - client.enable = mkEnableOption (lib.mdDoc "Moosefs client."); + client.enable = mkEnableOption (lib.mdDoc "Moosefs client"); master = { enable = mkOption { @@ -131,7 +131,7 @@ in { }; metalogger = { - enable = mkEnableOption (lib.mdDoc "Moosefs metalogger daemon."); + enable = mkEnableOption (lib.mdDoc "Moosefs metalogger daemon"); settings = mkOption { type = types.submodule { @@ -149,7 +149,7 @@ in { }; chunkserver = { - enable = mkEnableOption (lib.mdDoc "Moosefs chunkserver daemon."); + enable = mkEnableOption (lib.mdDoc "Moosefs chunkserver daemon"); openFirewall = mkOption { type = types.bool; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 28dd24f4e7c0c..103f73fdaa685 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -275,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/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix index ab784563e4acf..46b26195d2113 100644 --- a/nixos/modules/services/networking/blockbook-frontend.nix +++ b/nixos/modules/services/networking/blockbook-frontend.nix @@ -10,7 +10,7 @@ let options = { - enable = mkEnableOption (lib.mdDoc "blockbook-frontend application."); + enable = mkEnableOption (lib.mdDoc "blockbook-frontend application"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index 20cfebb799144..c68ceab9619c4 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -6,18 +6,29 @@ let cfg = config.services.envoy; format = pkgs.formats.json { }; conf = format.generate "envoy.json" cfg.settings; - validateConfig = file: + validateConfig = required: file: pkgs.runCommand "validate-envoy-conf" { } '' - ${pkgs.envoy}/bin/envoy --log-level error --mode validate -c "${file}" + ${cfg.package}/bin/envoy --log-level error --mode validate -c "${file}" ${lib.optionalString (!required) "|| true"} cp "${file}" "$out" ''; - in { options.services.envoy = { enable = mkEnableOption (lib.mdDoc "Envoy reverse proxy"); + package = mkPackageOptionMD pkgs "envoy" { }; + + requireValidConfig = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether a failure during config validation at build time is fatal. + When the config can't be checked during build time, for example when it includes + other files, disable this option. + ''; + }; + settings = mkOption { type = format.type; default = { }; @@ -46,38 +57,44 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.envoy ]; + environment.systemPackages = [ cfg.package ]; systemd.services.envoy = { description = "Envoy reverse proxy"; after = [ "network-online.target" ]; requires = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}"; - DynamicUser = true; + ExecStart = "${cfg.package}/bin/envoy -c ${validateConfig cfg.requireValidConfig conf}"; + CacheDirectory = [ "envoy" ]; + LogsDirectory = [ "envoy" ]; Restart = "no"; - CacheDirectory = "envoy"; - LogsDirectory = "envoy"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; - RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK AF_XDP"; - SystemCallArchitectures = "native"; + # Hardening + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + DeviceAllow = [ "" ]; + DevicePolicy = "closed"; + DynamicUser = true; LockPersonality = true; - RestrictNamespaces = true; - RestrictRealtime = true; - PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + MemoryDenyWriteExecute = false; # at least wasmr needs WX permission PrivateDevices = true; + PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; + ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "ptraceable"; - ProtectHostname = true; ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_XDP" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; UMask = "0066"; - SystemCallFilter = "~@clock @module @mount @reboot @swap @obsolete @cpu-emulation"; }; }; }; diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index c26a6ae265ffe..42924d7f69938 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/nixos/modules/services/networking/firefox-syncserver.nix @@ -304,6 +304,10 @@ in forceSSL = cfg.singleNode.enableTLS; locations."/" = { proxyPass = "http://127.0.0.1:${toString cfg.settings.port}"; + # We need to pass the Host header that matches the original Host header. Otherwise, + # Hawk authentication will fail (because it assumes that the client and server see + # the same value of the Host header). + recommendedProxySettings = true; }; }; }; @@ -311,6 +315,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - 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 440922cbba00f..0000000000000 --- a/nixos/modules/services/networking/firefox-syncserver.xml +++ /dev/null @@ -1,79 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-firefox-syncserver"> - <title>Firefox Sync server</title> - <para> - A storage server for Firefox Sync that you can easily host yourself. - </para> - <section xml:id="module-services-firefox-syncserver-quickstart"> - <title>Quickstart</title> - <para> - The absolute minimal configuration for the sync server looks like - this: - </para> - <programlisting language="nix"> -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"; - }; -}; -</programlisting> - <para> - This will start a sync server that is only accessible locally. - Once the services is running you can navigate to - <literal>about:config</literal> in your Firefox profile and set - <literal>identity.sync.tokenserver.uri</literal> to - <literal>http://localhost:5000/1.0/sync/1.5</literal>. Your - browser will now use your local sync server for data storage. - </para> - <warning> - <para> - This configuration should never be used in production. It is not - encrypted and stores its secrets in a world-readable location. - </para> - </warning> - </section> - <section xml:id="module-services-firefox-syncserver-configuration"> - <title>More detailed setup</title> - <para> - The <literal>firefox-syncserver</literal> service provides a - number of options to make setting up small deployment easier. - These are grouped under the <literal>singleNode</literal> element - of the option tree and allow simple configuration of the most - important parameters. - </para> - <para> - 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 - <literal>capacity</literal>, which configures how many accounts - may be active on this instance, and <literal>url</literal>, which - holds the URL under which the sync server can be accessed. The - <literal>url</literal> can be configured automatically when using - nginx. - </para> - <para> - Options that affect the surroundings of the sync server are - <literal>enableNginx</literal>, <literal>enableTLS</literal> and - <literal>hostnam</literal>. If <literal>enableNginx</literal> is - set the sync server module will automatically add an nginx virtual - host to the system using <literal>hostname</literal> as the domain - and set <literal>url</literal> accordingly. If - <literal>enableTLS</literal> is set the module will also enable - ACME certificates on the new virtual host and force all - connections to be made via TLS. - </para> - <para> - For actual deployment it is also recommended to store the - <literal>secrets</literal> file in a secure location. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index cc46819eed5a6..390a448ab5842 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -299,17 +299,51 @@ in { ''; }; - domain_map = mkOption { + scope = mkOption { + type = types.listOf types.str; + default = ["openid" "profile" "email"]; + description = lib.mdDoc '' + Scopes used in the OIDC flow. + ''; + }; + + extra_params = mkOption { type = types.attrsOf types.str; - default = {}; + 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. + Custom query parameters to send with the Authorize Endpoint request. ''; example = { - ".*" = "default-namespace"; + domain_hint = "example.com"; }; }; + + allowed_domains = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + Allowed principal domains. if an authenticated user's domain + is not in this list authentication request will be rejected. + ''; + example = [ "example.com" ]; + }; + + allowed_users = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + Users allowed to authenticate even if not in allowedDomains. + ''; + example = [ "alice@example.com" ]; + }; + + strip_email_domain = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether the domain part of the email address should be removed when generating namespaces. + ''; + }; }; tls_letsencrypt_hostname = mkOption { @@ -392,13 +426,16 @@ in { (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"]) + + (mkRemovedOptionModule ["services" "headscale" "openIdConnect" "domainMap"] '' + Headscale no longer uses domain_map. If you're using an old version of headscale you can still set this option via services.headscale.settings.oidc.domain_map. + '') ]; config = mkIf cfg.enable { diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index f13457fcde252..ecc158f8151d1 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,6 +20,8 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} + ieee80211n=1 + ieee80211ac=1 ${optionalString (cfg.countryCode != null) "country_code=${cfg.countryCode}"} ${optionalString (cfg.countryCode != null) "ieee80211d=1"} @@ -34,6 +36,7 @@ let ${optionalString cfg.wpa '' wpa=2 + wpa_pairwise=CCMP wpa_passphrase=${cfg.wpaPassphrase} ''} ${optionalString cfg.noScan "noscan=1"} @@ -66,7 +69,6 @@ in }; interface = mkOption { - default = ""; example = "wlp2s0"; type = types.str; description = lib.mdDoc '' diff --git a/nixos/modules/services/networking/imaginary.nix b/nixos/modules/services/networking/imaginary.nix new file mode 100644 index 0000000000000..a655903d1031c --- /dev/null +++ b/nixos/modules/services/networking/imaginary.nix @@ -0,0 +1,113 @@ +{ lib, config, pkgs, utils, ... }: + +let + inherit (lib) mdDoc mkEnableOption mkIf mkOption types; + + cfg = config.services.imaginary; +in { + options.services.imaginary = { + enable = mkEnableOption (mdDoc "imaginary image processing microservice"); + + address = mkOption { + type = types.str; + default = "localhost"; + description = mdDoc '' + Bind address. Corresponds to the `-a` flag. + Set to `""` to bind to all addresses. + ''; + example = "[::1]"; + }; + + port = mkOption { + type = types.port; + default = 8088; + description = mdDoc "Bind port. Corresponds to the `-p` flag."; + }; + + settings = mkOption { + description = mdDoc '' + Command line arguments passed to the imaginary executable, stripped of + the prefix `-`. See upstream's + [README](https://github.com/h2non/imaginary#command-line-usage) for all + options. + ''; + type = types.submodule { + freeformType = with types; attrsOf (oneOf [ + bool + int + (nonEmptyListOf str) + str + ]); + + options = { + return-size = mkOption { + type = types.bool; + default = false; + description = mdDoc "Return the image size in the HTTP headers."; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ { + assertion = ! lib.hasAttr "a" cfg.settings; + message = "Use services.imaginary.address to specify the -a flag."; + } { + assertion = ! lib.hasAttr "p" cfg.settings; + message = "Use services.imaginary.port to specify the -p flag."; + } ]; + + systemd.services.imaginary = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = rec { + ExecStart = let + args = lib.mapAttrsToList (key: val: + "-" + key + "=" + lib.concatStringsSep "," (map toString (lib.toList val)) + ) (cfg.settings // { a = cfg.address; p = cfg.port; }); + in "${pkgs.imaginary}/bin/imaginary ${utils.escapeSystemdExecArgs args}"; + ProtectProc = "invisible"; + BindReadOnlyPaths = lib.optional (cfg.settings ? mount) cfg.settings.mount; + CapabilityBoundingSet = if cfg.port < 1024 then + [ "CAP_NET_BIND_SERVICE" ] + else + [ "" ]; + AmbientCapabilities = CapabilityBoundingSet; + NoNewPrivileges = true; + DynamicUser = true; + ProtectSystem = "strict"; + ProtectHome = true; + TemporaryFileSystem = [ "/:ro" ]; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = cfg.port >= 1024; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + PrivateMounts = true; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + DevicePolicy = "closed"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 549f1fe5de304..d0de6cd4fdc6b 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -16,7 +16,7 @@ in description = lib.mdDoc '' Whether to enable MiniDLNA, a simple DLNA server. It serves media files such as video and music to DLNA client devices - such as televisions and media players. If you use the firewall consider + such as televisions and media players. If you use the firewall, consider adding the following: `services.minidlna.openFirewall = true;` ''; }; @@ -54,10 +54,7 @@ in description = lib.mdDoc '' The interval between announces (in seconds). Instead of waiting for announces, you should set `openFirewall` option to use SSDP discovery. - Furthermore, this option has been set to 90000 in order to prevent disconnects with certain - clients and relies solely on the discovery. - - Lower values (e.g. 30 seconds) should be used if you can't use the discovery. + Lower values (e.g. 30 seconds) should be used if your network blocks the discovery unicast. Some relevant information can be found here: https://sourceforge.net/p/minidlna/discussion/879957/thread/1389d197/ ''; @@ -82,8 +79,8 @@ in }; options.root_container = mkOption { type = types.str; - default = "."; - example = "B"; + default = "B"; + example = "."; description = lib.mdDoc "Use a different container as the root of the directory tree presented to clients."; }; options.log_level = mkOption { @@ -133,22 +130,19 @@ in users.groups.minidlna.gid = config.ids.gids.minidlna; - systemd.services.minidlna = - { description = "MiniDLNA Server"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + systemd.services.minidlna = { + description = "MiniDLNA Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - serviceConfig = - { User = "minidlna"; - Group = "minidlna"; - CacheDirectory = "minidlna"; - RuntimeDirectory = "minidlna"; - PIDFile = "/run/minidlna/pid"; - ExecStart = - "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" + - " -f ${settingsFile}"; - }; + serviceConfig = { + User = "minidlna"; + Group = "minidlna"; + CacheDirectory = "minidlna"; + RuntimeDirectory = "minidlna"; + PIDFile = "/run/minidlna/pid"; + ExecStart = "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid -f ${settingsFile}"; }; + }; }; } diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 563412025561f..a4fd2fd7c89f1 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -671,6 +671,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - 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 91934617c56d5..0000000000000 --- a/nixos/modules/services/networking/mosquitto.xml +++ /dev/null @@ -1,149 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-mosquitto"> - <title>Mosquitto</title> - <para> - Mosquitto is a MQTT broker often used for IoT or home automation - data transport. - </para> - <section xml:id="module-services-mosquitto-quickstart"> - <title>Quickstart</title> - <para> - A minimal configuration for Mosquitto is - </para> - <programlisting language="nix"> -services.mosquitto = { - enable = true; - listeners = [ { - acl = [ "pattern readwrite #" ]; - omitPasswordAuth = true; - settings.allow_anonymous = true; - } ]; -}; -</programlisting> - <para> - 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. - </para> - <para> - User authentication can be configured with the - <literal>users</literal> key of listeners. A config that gives - full read access to a user <literal>monitor</literal> and - restricted write access to a user <literal>service</literal> could - look like - </para> - <programlisting language="nix"> -services.mosquitto = { - enable = true; - listeners = [ { - users = { - monitor = { - acl = [ "read #" ]; - password = "monitor"; - }; - service = { - acl = [ "write service/#" ]; - password = "service"; - }; - }; - } ]; -}; -</programlisting> - <para> - TLS authentication is configured by setting TLS-related options of - the listener: - </para> - <programlisting language="nix"> -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"; - }; - } ]; -</programlisting> - </section> - <section xml:id="module-services-mosquitto-config"> - <title>Configuration</title> - <para> - 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). - </para> - <para> - Almost all options of Mosquitto are available for configuration at - their appropriate levels, some as NixOS options written in camel - case, the remainders under <literal>settings</literal> with their - exact names in the Mosquitto config file. The exceptions are - <literal>acl_file</literal> (which is always set according to the - <literal>acl</literal> attributes of a listener and its users) and - <literal>per_listener_settings</literal> (which is always set to - <literal>true</literal>). - </para> - <section xml:id="module-services-mosquitto-config-passwords"> - <title>Password authentication</title> - <para> - 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 - <literal>omitPasswordAuth = true</literal> for a listener; in - this case it is necessary to either set - <literal>settings.allow_anonymous = true</literal> to allow all - logins, or to configure other authentication methods like TLS - client certificates with - <literal>settings.use_identity_as_username = true</literal>. - </para> - <para> - 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. - </para> - </section> - <section xml:id="module-services-mosquitto-config-acl"> - <title>ACL format</title> - <para> - Every listener has a Mosquitto <literal>acl_file</literal> - attached to it. This ACL is configured via two attributes of the - config: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - the <literal>acl</literal> attribute of the listener - configures pattern ACL entries and topic ACL entries for - anonymous users. Each entry must be prefixed with - <literal>pattern</literal> or <literal>topic</literal> to - distinguish between these two cases. - </para> - </listitem> - <listitem> - <para> - the <literal>acl</literal> 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. - </para> - </listitem> - </itemizedlist> - <para> - The default ACL for a listener is empty, disallowing all - accesses from all clients. To configure a completely open ACL, - set <literal>acl = [ "pattern readwrite #" ]</literal> - in the listener. - </para> - </section> - </section> -</chapter> diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index 54ee2a0156878..b20ec76ddf594 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -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/nebula.nix b/nixos/modules/services/networking/nebula.nix index 2bedafc5d9fe8..e1a8c6740f57e 100644 --- a/nixos/modules/services/networking/nebula.nix +++ b/nixos/modules/services/networking/nebula.nix @@ -68,6 +68,12 @@ in description = lib.mdDoc "Whether this node is a lighthouse."; }; + isRelay = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether this node is a relay."; + }; + lighthouses = mkOption { type = types.listOf types.str; default = []; @@ -78,6 +84,15 @@ in example = [ "192.168.100.1" ]; }; + relays = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + List of IPs of relays that this node should allow traffic from. + ''; + example = [ "192.168.100.1" ]; + }; + listen.host = mkOption { type = types.str; default = "0.0.0.0"; @@ -157,6 +172,11 @@ in am_lighthouse = netCfg.isLighthouse; hosts = netCfg.lighthouses; }; + relay = { + am_relay = netCfg.isRelay; + relays = netCfg.relays; + use_relays = true; + }; listen = { host = netCfg.listen.host; port = netCfg.listen.port; @@ -173,25 +193,41 @@ in configFile = format.generate "nebula-config-${netName}.yml" settings; in { - # Create systemd service for Nebula. + # Create the systemd service for Nebula. "nebula@${netName}" = { description = "Nebula VPN service for ${netName}"; wants = [ "basic.target" ]; after = [ "basic.target" "network.target" ]; before = [ "sshd.service" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = mkMerge [ - { - Type = "simple"; - Restart = "always"; - ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; - } - # The service needs to launch as root to access the tun device, if it's enabled. - (mkIf netCfg.tun.disable { - User = networkId; - Group = networkId; - }) - ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; + UMask = "0027"; + CapabilityBoundingSet = "CAP_NET_ADMIN"; + AmbientCapabilities = "CAP_NET_ADMIN"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = false; # needs access to /dev/net/tun (below) + DeviceAllow = "/dev/net/tun rw"; + DevicePolicy = "closed"; + PrivateTmp = true; + PrivateUsers = false; # CapabilityBoundingSet needs to apply to the host namespace + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + User = networkId; + Group = networkId; + }; unitConfig.StartLimitIntervalSec = 0; # ensure Restart=always is always honoured (networks can go down for arbitrarily long) }; }) enabledNetworks); @@ -202,7 +238,7 @@ in # Create the service users and groups. users.users = mkMerge (mapAttrsToList (netName: netCfg: - mkIf netCfg.tun.disable { + { ${nameToId netName} = { group = nameToId netName; description = "Nebula service user for network ${netName}"; @@ -210,9 +246,8 @@ in }; }) enabledNetworks); - users.groups = mkMerge (mapAttrsToList (netName: netCfg: - mkIf netCfg.tun.disable { - ${nameToId netName} = {}; - }) enabledNetworks); + users.groups = mkMerge (mapAttrsToList (netName: netCfg: { + ${nameToId netName} = {}; + }) enabledNetworks); }; } diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix new file mode 100644 index 0000000000000..d13ca23368c5b --- /dev/null +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.networkd-dispatcher; +in { + options = { + services.networkd-dispatcher = { + + enable = mkEnableOption (mdDoc '' + Networkd-dispatcher service for systemd-networkd connection status + change. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) + for usage. + ''); + + scriptDir = mkOption { + type = types.path; + default = "/var/lib/networkd-dispatcher"; + description = mdDoc '' + This directory is used for keeping various scripts read and run by + networkd-dispatcher. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) + for directory structure and script usage. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd = { + + packages = [ pkgs.networkd-dispatcher ]; + services.networkd-dispatcher = { + wantedBy = [ "multi-user.target" ]; + # Override existing ExecStart definition + serviceConfig.ExecStart = [ + "" + "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${cfg.scriptDir} $networkd_dispatcher_args" + ]; + }; + + # Directory structure required according to upstream instructions + # https://gitlab.com/craftyguy/networkd-dispatcher + tmpfiles.rules = [ + "d '${cfg.scriptDir}' 0750 root root - -" + "d '${cfg.scriptDir}/routable.d' 0750 root root - -" + "d '${cfg.scriptDir}/dormant.d' 0750 root root - -" + "d '${cfg.scriptDir}/no-carrier.d' 0750 root root - -" + "d '${cfg.scriptDir}/off.d' 0750 root root - -" + "d '${cfg.scriptDir}/carrier.d' 0750 root root - -" + "d '${cfg.scriptDir}/degraded.d' 0750 root root - -" + "d '${cfg.scriptDir}/configuring.d' 0750 root root - -" + "d '${cfg.scriptDir}/configured.d' 0750 root root - -" + ]; + + }; + + + }; +} + diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index dc180d4a4f954..6c8d7b985d5f1 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -185,7 +185,7 @@ in ProtectSystem = "full"; ProtectHome = true; PrivateTmp = true; - PrivateDevices = true; + PrivateDevices = false; PrivateUsers = false; ProtectHostname = true; ProtectClock = false; @@ -203,7 +203,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ]; + 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/openconnect.nix b/nixos/modules/services/networking/openconnect.nix index 5a02bd072257f..7f9006053b890 100644 --- a/nixos/modules/services/networking/openconnect.nix +++ b/nixos/modules/services/networking/openconnect.nix @@ -90,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) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 492a0936fdbb6..9a5866f2afd40 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -14,7 +14,6 @@ let path = makeBinPath (getAttr "openvpn-${name}" config.systemd.services).path; upScript = '' - #! /bin/sh export PATH=${path} # For convenience in client scripts, extract the remote domain @@ -34,7 +33,6 @@ let ''; downScript = '' - #! /bin/sh export PATH=${path} ${optionalString cfg.updateResolvConf "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"} @@ -47,9 +45,9 @@ let ${optionalString (cfg.up != "" || cfg.down != "" || cfg.updateResolvConf) "script-security 2"} ${cfg.config} ${optionalString (cfg.up != "" || cfg.updateResolvConf) - "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"} + "up ${pkgs.writeShellScript "openvpn-${name}-up" upScript}"} ${optionalString (cfg.down != "" || cfg.updateResolvConf) - "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"} + "down ${pkgs.writeShellScript "openvpn-${name}-down" downScript}"} ${optionalString (cfg.authUserPass != null) "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" '' ${cfg.authUserPass.username} @@ -57,7 +55,8 @@ let ''}"} ''; - in { + in + { description = "OpenVPN instance ‘${name}’"; wantedBy = optional cfg.autoStart "multi-user.target"; @@ -70,6 +69,16 @@ let serviceConfig.Type = "notify"; }; + restartService = optionalAttrs cfg.restartAfterSleep { + openvpn-restart = { + wantedBy = [ "sleep.target" ]; + path = [ pkgs.procps ]; + script = "pkill --signal SIGHUP --exact openvpn"; + #SIGHUP makes openvpn process to self-exit and then it got restarted by systemd because of Restart=always + description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep"; + }; + }; + in { @@ -82,7 +91,7 @@ in options = { services.openvpn.servers = mkOption { - default = {}; + default = { }; example = literalExpression '' { @@ -201,14 +210,21 @@ in }; + services.openvpn.restartAfterSleep = mkOption { + default = true; + type = types.bool; + description = lib.mdDoc "Whether OpenVPN client should be restarted after sleep."; + }; + }; ###### implementation - config = mkIf (cfg.servers != {}) { + config = mkIf (cfg.servers != { }) { - systemd.services = listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers); + systemd.services = (listToAttrs (mapAttrsFlatten (name: value: nameValuePair "openvpn-${name}" (makeOpenVPNJob value name)) cfg.servers)) + // restartService; environment.systemPackages = [ openvpn ]; diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index f317510258ba5..e9db7f3eab8ed 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -147,5 +147,5 @@ in { }; 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 97954f4b95141..0000000000000 --- a/nixos/modules/services/networking/pleroma.xml +++ /dev/null @@ -1,244 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-pleroma"> - <title>Pleroma</title> - <para> - <link xlink:href="https://pleroma.social/">Pleroma</link> is a - lightweight activity pub server. - </para> - <section xml:id="module-services-pleroma-generate-config"> - <title>Generating the Pleroma config</title> - <para> - The <literal>pleroma_ctl</literal> CLI utility will prompt you - some questions and it will generate an initial config file. This - is an example of usage - </para> - <programlisting> -$ mkdir tmp-pleroma -$ cd tmp-pleroma -$ nix-shell -p pleroma-otp -$ pleroma_ctl instance gen --output config.exs --output-psql setup.psql -</programlisting> - <para> - The <literal>config.exs</literal> file can be further customized - following the instructions on the - <link xlink:href="https://docs-develop.pleroma.social/backend/configuration/cheatsheet/">upstream - documentation</link>. Many refinements can be applied also after - the service is running. - </para> - </section> - <section xml:id="module-services-pleroma-initialize-db"> - <title>Initializing the database</title> - <para> - First, the Postgresql service must be enabled in the NixOS - configuration - </para> - <programlisting> -services.postgresql = { - enable = true; - package = pkgs.postgresql_13; -}; -</programlisting> - <para> - and activated with the usual - </para> - <programlisting> -$ nixos-rebuild switch -</programlisting> - <para> - Then you can create and seed the database, using the - <literal>setup.psql</literal> file that you generated in the - previous section, by running - </para> - <programlisting> -$ sudo -u postgres psql -f setup.psql -</programlisting> - </section> - <section xml:id="module-services-pleroma-enable"> - <title>Enabling the Pleroma service locally</title> - <para> - In this section we will enable the Pleroma service only locally, - so its configurations can be improved incrementally. - </para> - <para> - This is an example of configuration, where - <xref linkend="opt-services.pleroma.configs" /> option contains - the content of the file <literal>config.exs</literal>, generated - <link linkend="module-services-pleroma-generate-config">in the - first section</link>, 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. - </para> - <programlisting> -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 ... - '' - ]; -}; -</programlisting> - <para> - Secrets must be moved into a file pointed by - <xref linkend="opt-services.pleroma.secretConfigFile" />, in our - case <literal>/var/lib/pleroma/secrets.exs</literal>. This file - can be created copying the previously generated - <literal>config.exs</literal> file and then removing all the - settings, except the secrets. This is an example - </para> - <programlisting> -# 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 ... -</programlisting> - <para> - 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. - </para> - <para> - The service can be enabled with the usual - </para> - <programlisting> -$ nixos-rebuild switch -</programlisting> - <para> - The service is accessible only from the local - <literal>127.0.0.1:4000</literal> port. It can be tested using a - port forwarding like this - </para> - <programlisting> -$ ssh -L 4000:localhost:4000 myuser@example.net -</programlisting> - <para> - and then accessing - <link xlink:href="http://localhost:4000">http://localhost:4000</link> - from a web browser. - </para> - </section> - <section xml:id="module-services-pleroma-admin-user"> - <title>Creating the admin user</title> - <para> - After Pleroma service is running, all - <link xlink:href="https://docs-develop.pleroma.social/">Pleroma - administration utilities</link> can be used. In particular an - admin user can be created with - </para> - <programlisting> -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> -</programlisting> - </section> - <section xml:id="module-services-pleroma-nginx"> - <title>Configuring Nginx</title> - <para> - 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 - <link xlink:href="https://letsencrypt.org/">Let’s Encrypt</link> - for the TLS certificates - </para> - <programlisting> -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 - ''; - }; - }; - }; -}; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 0746bbf184fce..9f68853f9fa83 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -905,5 +905,5 @@ 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 5df046f814591..0000000000000 --- a/nixos/modules/services/networking/prosody.xml +++ /dev/null @@ -1,92 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-prosody"> - <title>Prosody</title> - <para> - <link xlink:href="https://prosody.im/">Prosody</link> is an - open-source, modern XMPP server. - </para> - <section xml:id="module-services-prosody-basic-usage"> - <title>Basic usage</title> - <para> - 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! - </para> - <para> - 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 - <link xlink:href="https://xmpp.org/extensions/xep-0423.html">XEP-0423</link>. - </para> - <para> - 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 - <link xlink:href="https://xmpp.org/extensions/xep-0045.html">Multi - User Chat (MUC)</link> and the - <link xlink:href="https://xmpp.org/extensions/xep-0363.html">HTTP - File Upload</link> ones. You’ll need to create a DNS subdomain for - each of those. The current convention is to name your MUC endpoint - <literal>conference.example.org</literal> and your HTTP upload - domain <literal>upload.example.org</literal>. - </para> - <para> - A good configuration to start with, including a - <link xlink:href="https://xmpp.org/extensions/xep-0045.html">Multi - User Chat (MUC)</link> endpoint as well as a - <link xlink:href="https://xmpp.org/extensions/xep-0363.html">HTTP - File Upload</link> endpoint will look like this: - </para> - <programlisting> -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"; - }; -}; -</programlisting> - </section> - <section xml:id="module-services-prosody-letsencrypt"> - <title>Let’s Encrypt Configuration</title> - <para> - As you can see in the code snippet from the - <link linkend="module-services-prosody-basic-usage">previous - section</link>, 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 - <link linkend="opt-security.acme.certs._name_.extraDomainNames">extraDomainNames</link> - module option. - </para> - <para> - Provided the setup detailed in the previous section, you’ll need - the following acme configuration to generate a TLS certificate for - the three endponits: - </para> - <programlisting> -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" ]; - }; - }; -}; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix index d4c4ca47bc801..7f0ac3e3b8e69 100644 --- a/nixos/modules/services/networking/soju.nix +++ b/nixos/modules/services/networking/soju.nix @@ -120,5 +120,5 @@ in }; }; - meta.maintainers = with maintainers; [ malvo ]; + meta.maintainers = with maintainers; [ malte-v ]; } diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f2b8d12ccc943..095c7de0b7aa1 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -13,11 +13,12 @@ let else pkgs.buildPackages.openssh; # reports boolean as yes / no - mkValueStringSshd = v: + mkValueStringSshd = with lib; v: if isInt v then toString v else if isString v then v else if true == v then "yes" else if false == v then "no" + else if isList v then concatStringsSep "," v else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; # dont use the "=" operator @@ -104,6 +105,11 @@ in (mkRenamedOptionModule [ "services" "openssh" "useDns" ] [ "services" "openssh" "settings" "UseDns" ]) (mkRenamedOptionModule [ "services" "openssh" "permitRootLogin" ] [ "services" "openssh" "settings" "PermitRootLogin" ]) (mkRenamedOptionModule [ "services" "openssh" "logLevel" ] [ "services" "openssh" "settings" "LogLevel" ]) + (mkRenamedOptionModule [ "services" "openssh" "macs" ] [ "services" "openssh" "settings" "Macs" ]) + (mkRenamedOptionModule [ "services" "openssh" "ciphers" ] [ "services" "openssh" "settings" "Ciphers" ]) + (mkRenamedOptionModule [ "services" "openssh" "kexAlgorithms" ] [ "services" "openssh" "settings" "KexAlgorithms" ]) + (mkRenamedOptionModule [ "services" "openssh" "gatewayPorts" ] [ "services" "openssh" "settings" "GatewayPorts" ]) + (mkRenamedOptionModule [ "services" "openssh" "forwardX11" ] [ "services" "openssh" "settings" "X11Forwarding" ]) ]; ###### interface @@ -131,14 +137,6 @@ in ''; }; - forwardX11 = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to allow X11 connections to be forwarded. - ''; - }; - allowSFTP = mkOption { type = types.bool; default = true; @@ -167,16 +165,6 @@ in ''; }; - gatewayPorts = mkOption { - type = types.str; - default = "no"; - description = lib.mdDoc '' - Specifies whether remote hosts are allowed to connect to - ports forwarded for the client. See - {manpage}`sshd_config(5)`. - ''; - }; - ports = mkOption { type = types.listOf types.port; default = [22]; @@ -286,63 +274,6 @@ in ''; }; - kexAlgorithms = mkOption { - type = types.listOf types.str; - default = [ - "sntrup761x25519-sha512@openssh.com" - "curve25519-sha256" - "curve25519-sha256@libssh.org" - "diffie-hellman-group-exchange-sha256" - ]; - description = lib.mdDoc '' - Allowed key exchange algorithms - - Uses the lower bound recommended in both - <https://stribika.github.io/2015/01/04/secure-secure-shell.html> - and - <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> - ''; - }; - - ciphers = mkOption { - type = types.listOf types.str; - default = [ - "chacha20-poly1305@openssh.com" - "aes256-gcm@openssh.com" - "aes128-gcm@openssh.com" - "aes256-ctr" - "aes192-ctr" - "aes128-ctr" - ]; - description = lib.mdDoc '' - Allowed ciphers - - Defaults to recommended settings from both - <https://stribika.github.io/2015/01/04/secure-secure-shell.html> - and - <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> - ''; - }; - - macs = mkOption { - type = types.listOf types.str; - default = [ - "hmac-sha2-512-etm@openssh.com" - "hmac-sha2-256-etm@openssh.com" - "umac-128-etm@openssh.com" - "hmac-sha2-512" - "hmac-sha2-256" - "umac-128@openssh.com" - ]; - description = lib.mdDoc '' - Allowed MACs - - Defaults to recommended settings from both - <https://stribika.github.io/2015/01/04/secure-secure-shell.html> - and - <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> - ''; - }; settings = mkOption { @@ -374,7 +305,13 @@ in ~/.ssh/authorized_keys from and sshd_config Match Host directives. ''; }; - + X11Forwarding = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to allow X11 connections to be forwarded. + ''; + }; PasswordAuthentication = mkOption { type = types.bool; default = true; @@ -396,6 +333,70 @@ in Specifies whether keyboard-interactive authentication is allowed. ''; }; + GatewayPorts = mkOption { + type = types.str; + default = "no"; + description = lib.mdDoc '' + Specifies whether remote hosts are allowed to connect to + ports forwarded for the client. See + {manpage}`sshd_config(5)`. + ''; + }; + KexAlgorithms = mkOption { + type = types.listOf types.str; + default = [ + "sntrup761x25519-sha512@openssh.com" + "curve25519-sha256" + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + ]; + description = lib.mdDoc '' + Allowed key exchange algorithms + + Uses the lower bound recommended in both + <https://stribika.github.io/2015/01/04/secure-secure-shell.html> + and + <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> + ''; + }; + Macs = mkOption { + type = types.listOf types.str; + default = [ + "hmac-sha2-512-etm@openssh.com" + "hmac-sha2-256-etm@openssh.com" + "umac-128-etm@openssh.com" + "hmac-sha2-512" + "hmac-sha2-256" + "umac-128@openssh.com" + ]; + description = lib.mdDoc '' + Allowed MACs + + Defaults to recommended settings from both + <https://stribika.github.io/2015/01/04/secure-secure-shell.html> + and + <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> + ''; + }; + Ciphers = mkOption { + type = types.listOf types.str; + default = [ + "chacha20-poly1305@openssh.com" + "aes256-gcm@openssh.com" + "aes128-gcm@openssh.com" + "aes256-ctr" + "aes192-ctr" + "aes128-ctr" + ]; + description = lib.mdDoc '' + Allowed ciphers + + Defaults to recommended settings from both + <https://stribika.github.io/2015/01/04/secure-secure-shell.html> + and + <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> + ''; + }; }; }); }; @@ -555,17 +556,10 @@ in ${optionalString cfgc.setXAuthLocation '' XAuthLocation ${pkgs.xorg.xauth}/bin/xauth ''} - - X11Forwarding ${if cfg.forwardX11 then "yes" else "no"} - ${optionalString cfg.allowSFTP '' Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags} ''} - - GatewayPorts ${cfg.gatewayPorts} - PrintMotd no # handled by pam_motd - AuthorizedKeysFile ${toString cfg.authorizedKeysFiles} ${optionalString (cfg.authorizedKeysCommand != "none") '' AuthorizedKeysCommand ${cfg.authorizedKeysCommand} @@ -575,13 +569,9 @@ in ${flip concatMapStrings cfg.hostKeys (k: '' HostKey ${k.path} '')} - - KexAlgorithms ${concatStringsSep "," cfg.kexAlgorithms} - Ciphers ${concatStringsSep "," cfg.ciphers} - MACs ${concatStringsSep "," cfg.macs} ''; - assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; + assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] ++ forEach cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 233bfdf9ebf57..c81cf293ab6d9 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -82,8 +82,8 @@ in { }; boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") { - "net.ipv4.conf.all.forwarding" = mkDefault true; - "net.ipv6.conf.all.forwarding" = mkDefault true; + "net.ipv4.conf.all.forwarding" = mkOverride 97 true; + "net.ipv6.conf.all.forwarding" = mkOverride 97 true; }; networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose"; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index c85dd03867f77..0426dbb0c83c3 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -286,6 +286,8 @@ in { LockPersonality = true; RestrictSUIDSGID = true; + ReadWritePaths = [ cfg.stateDir ]; + Restart = "on-failure"; RestartSec = "5s"; }; diff --git a/nixos/modules/services/networking/v2raya.nix b/nixos/modules/services/networking/v2raya.nix index 2d697b4fb56f3..0bea73798daf1 100644 --- a/nixos/modules/services/networking/v2raya.nix +++ b/nixos/modules/services/networking/v2raya.nix @@ -12,27 +12,38 @@ with lib; 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" ]; - }; + systemd.services.v2raya = + let + nftablesEnabled = config.networking.nftables.enable; + iptablesServices = [ + "iptables.service" + ] ++ optional config.networking.enableIPv6 "ip6tables.service"; + tableServices = if nftablesEnabled then [ "nftables.service" ] else iptablesServices; + in + { + unitConfig = { + Description = "v2rayA service"; + Documentation = "https://github.com/v2rayA/v2rayA/wiki"; + After = [ + "network.target" + "nss-lookup.target" + ] ++ tableServices; + 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"; - }; + 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 - }; + 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/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 1d6556f626be9..b08f1015e8b8a 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -176,7 +176,7 @@ let publicKey = mkOption { example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; - type = types.str; + type = types.singleLineStr; description = lib.mdDoc "The base64 public key of the peer."; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 119575bdddb41..0595e9e6df238 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/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 3d5cbdd2dc3ed..fd7193154c6c7 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/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.xml deleted file mode 100644 index 39faacbf30efe..0000000000000 --- a/nixos/modules/services/networking/yggdrasil.xml +++ /dev/null @@ -1,157 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-networking-yggdrasil"> - <title>Yggdrasil</title> - <para> - <emphasis>Source:</emphasis> - <filename>modules/services/networking/yggdrasil/default.nix</filename> - </para> - <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://yggdrasil-network.github.io/">https://yggdrasil-network.github.io/</link> - </para> - <para> - Yggdrasil is an early-stage implementation of a fully end-to-end - encrypted, self-arranging IPv6 network. - </para> - <section xml:id="module-services-networking-yggdrasil-configuration"> - <title>Configuration</title> - <section xml:id="module-services-networking-yggdrasil-configuration-simple"> - <title>Simple ephemeral node</title> - <para> - An annotated example of a simple configuration: - </para> - <programlisting> -{ - services.yggdrasil = { - enable = true; - persistentKeys = false; - # The NixOS module will generate new keys and a new IPv6 address each time - # it is started if persistentKeys is not enabled. - - settings = { - Peers = [ - # Yggdrasil will automatically connect and "peer" with other nodes it - # 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" - "tcp://1.2.3.5:1024" - # Public peers can be found at - # https://github.com/yggdrasil-network/public-peers - ]; - }; - }; -} -</programlisting> - </section> - <section xml:id="module-services-networking-yggdrasil-configuration-prefix"> - <title>Persistent node with prefix</title> - <para> - A node with a fixed address that announces a prefix: - </para> - <programlisting> -let - address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2"; - prefix = "310:5217:69c0:9afc"; - # taken from the output of "yggdrasilctl getself". -in { - - services.yggdrasil = { - enable = true; - persistentKeys = true; # Maintain a fixed public key and IPv6 address. - settings = { - Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ]; - NodeInfo = { - # This information is visible to the network. - name = config.networking.hostName; - location = "The North Pole"; - }; - }; - }; - - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - # Forward traffic under the prefix. - - networking.interfaces.${eth0}.ipv6.addresses = [{ - # Set a 300::/8 address on the local physical device. - address = prefix + "::1"; - prefixLength = 64; - }]; - - services.radvd = { - # Announce the 300::/8 prefix to eth0. - enable = true; - config = '' - interface eth0 - { - AdvSendAdvert on; - prefix ${prefix}::/64 { - AdvOnLink on; - AdvAutonomous on; - }; - route 200::/8 {}; - }; - ''; - }; -} -</programlisting> - </section> - <section xml:id="module-services-networking-yggdrasil-configuration-container"> - <title>Yggdrasil attached Container</title> - <para> - A NixOS container attached to the Yggdrasil network via a node - running on the host: - </para> - <programlisting> -let - yggPrefix64 = "310:5217:69c0:9afc"; - # Again, taken from the output of "yggdrasilctl getself". -in -{ - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - # Enable IPv6 forwarding. - - networking = { - bridges.br0.interfaces = [ ]; - # A bridge only to containers… - - interfaces.br0 = { - # … configured with a prefix address. - ipv6.addresses = [{ - address = "${yggPrefix64}::1"; - prefixLength = 64; - }]; - }; - }; - - containers.foo = { - autoStart = true; - privateNetwork = true; - hostBridge = "br0"; - # Attach the container to the bridge only. - config = { config, pkgs, ... }: { - networking.interfaces.eth0.ipv6 = { - addresses = [{ - # Configure a prefix address. - address = "${yggPrefix64}::2"; - prefixLength = 64; - }]; - routes = [{ - # Configure the prefix route. - address = "200::"; - prefixLength = 7; - via = "${yggPrefix64}::1"; - }]; - }; - - services.httpd.enable = true; - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - }; - -} -</programlisting> - </section> - </section> -</chapter> diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 9b727b76b1c69..7c9fa62ae9542 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -9,7 +9,7 @@ in { meta.maintainers = with maintainers; [ Br1ght0ne happysalada ]; - meta.doc = ./meilisearch.xml; + meta.doc = ./meilisearch.md; ###### interface @@ -115,7 +115,7 @@ in MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}"; MEILI_NO_ANALYTICS = toString cfg.noAnalytics; MEILI_ENV = cfg.environment; - MEILI_DUMPS_DIR = "/var/lib/meilisearch/dumps"; + MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps"; MEILI_LOG_LEVEL = cfg.logLevel; MEILI_MAX_INDEX_SIZE = cfg.maxIndexSize; }; diff --git a/nixos/modules/services/search/meilisearch.xml b/nixos/modules/services/search/meilisearch.xml deleted file mode 100644 index 8bfd64920b039..0000000000000 --- a/nixos/modules/services/search/meilisearch.xml +++ /dev/null @@ -1,87 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-meilisearch"> - <title>Meilisearch</title> - <para> - Meilisearch is a lightweight, fast and powerful search engine. Think - elastic search with a much smaller footprint. - </para> - <section xml:id="module-services-meilisearch-quickstart"> - <title>Quickstart</title> - <para> - the minimum to start meilisearch is - </para> - <programlisting language="nix"> -services.meilisearch.enable = true; -</programlisting> - <para> - this will start the http server included with meilisearch on port - 7700. - </para> - <para> - test with - <literal>curl -X GET 'http://localhost:7700/health'</literal> - </para> - </section> - <section xml:id="module-services-meilisearch-usage"> - <title>Usage</title> - <para> - you first need to add documents to an index before you can search - for documents. - </para> - <section xml:id="module-services-meilisearch-quickstart-add"> - <title>Add a documents to the <literal>movies</literal> - index</title> - <para> - <literal>curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'</literal> - </para> - </section> - <section xml:id="module-services-meilisearch-quickstart-search"> - <title>Search documents in the <literal>movies</literal> - index</title> - <para> - <literal>curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'</literal> - (note the typo is intentional and there to demonstrate the typo - tolerant capabilities) - </para> - </section> - </section> - <section xml:id="module-services-meilisearch-defaults"> - <title>Defaults</title> - <itemizedlist> - <listitem> - <para> - The default nixos package doesn’t come with the - <link xlink:href="https://docs.meilisearch.com/learn/getting_started/quick_start.html#search">dashboard</link>, - since the dashboard features makes some assets downloads at - compile time. - </para> - </listitem> - <listitem> - <para> - Anonimized Analytics sent to meilisearch are disabled by - default. - </para> - </listitem> - <listitem> - <para> - Default deployment is development mode. It doesn’t require a - secret master key. All routes are not protected and - accessible. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-meilisearch-missing"> - <title>Missing</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - the snapshot feature is not yet configurable from the module, - it’s just a matter of adding the relevant environment - variables. - </para> - </listitem> - </itemizedlist> - </section> -</chapter> diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix new file mode 100644 index 0000000000000..9a50e79631380 --- /dev/null +++ b/nixos/modules/services/search/opensearch.nix @@ -0,0 +1,248 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.opensearch; + + settingsFormat = pkgs.formats.yaml {}; + + configDir = cfg.dataDir + "/config"; + + usingDefaultDataDir = cfg.dataDir == "/var/lib/opensearch"; + usingDefaultUserAndGroup = cfg.user == "opensearch" && cfg.group == "opensearch"; + + opensearchYml = settingsFormat.generate "opensearch.yml" cfg.settings; + + loggingConfigFilename = "log4j2.properties"; + loggingConfigFile = pkgs.writeTextFile { + name = loggingConfigFilename; + text = cfg.logging; + }; +in +{ + + options.services.opensearch = { + enable = mkEnableOption (lib.mdDoc "OpenSearch"); + + package = lib.mkPackageOptionMD pkgs "OpenSearch" { + default = [ "opensearch" ]; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options."network.host" = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + Which port this service should listen on. + ''; + }; + + options."cluster.name" = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The name of the cluster. + ''; + }; + + options."discovery.type" = lib.mkOption { + type = lib.types.str; + default = "single-node"; + description = lib.mdDoc '' + The type of discovery to use. + ''; + }; + + options."http.port" = lib.mkOption { + type = lib.types.port; + default = 9200; + description = lib.mdDoc '' + The port to listen on for HTTP traffic. + ''; + }; + + options."transport.port" = lib.mkOption { + type = lib.types.port; + default = 9300; + description = lib.mdDoc '' + The port to listen on for transport traffic. + ''; + }; + }; + + default = {}; + + description = lib.mdDoc '' + OpenSearch configuration. + ''; + }; + + logging = lib.mkOption { + description = lib.mdDoc "opensearch logging configuration."; + + default = '' + logger.action.name = org.opensearch.action + logger.action.level = info + + appender.console.type = Console + appender.console.name = console + appender.console.layout.type = PatternLayout + appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + + rootLogger.level = info + rootLogger.appenderRef.console.ref = console + ''; + type = types.str; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/opensearch"; + apply = converge (removeSuffix "/"); + description = lib.mdDoc '' + Data directory for OpenSearch. If you change this, you need to + manually create the directory. You also need to create the + `opensearch` user and group, or change + [](#opt-services.opensearch.user) and + [](#opt-services.opensearch.group) to existing ones with + access to the directory. + ''; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The user OpenSearch runs as. Should be left at default unless + you have very specific needs. + ''; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The group OpenSearch runs as. Should be left at default unless + you have very specific needs. + ''; + }; + + extraCmdLineOptions = lib.mkOption { + description = lib.mdDoc "Extra command line options for the OpenSearch launcher."; + default = [ ]; + type = lib.types.listOf lib.types.str; + }; + + extraJavaOptions = lib.mkOption { + description = lib.mdDoc "Extra command line options for Java."; + default = [ ]; + type = lib.types.listOf lib.types.str; + example = [ "-Djava.net.preferIPv4Stack=true" ]; + }; + + restartIfChanged = lib.mkOption { + type = lib.types.bool; + description = lib.mdDoc '' + Automatically restart the service on config change. + This can be set to false to defer restarts on a server or cluster. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + }; + + config = mkIf cfg.enable { + systemd.services.opensearch = { + description = "OpenSearch Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = [ pkgs.inetutils ]; + inherit (cfg) restartIfChanged; + environment = { + OPENSEARCH_HOME = cfg.dataDir; + OPENSEARCH_JAVA_OPTS = toString cfg.extraJavaOptions; + OPENSEARCH_PATH_CONF = configDir; + }; + serviceConfig = { + ExecStartPre = + let + startPreFullPrivileges = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + '' + (optionalString (!config.boot.isContainer) '' + # Only set vm.max_map_count if lower than ES required minimum + # This avoids conflict if configured via boot.kernel.sysctl + if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then + ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 + fi + ''); + startPreUnprivileged = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + # Install plugins + ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib + ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules + + # opensearch needs to create the opensearch.keystore in the config directory + # so this directory needs to be writable. + mkdir -p ${configDir} + chmod 0700 ${configDir} + + # Note that we copy config files from the nix store instead of symbolically linking them + # because otherwise X-Pack Security will raise the following exception: + # java.security.AccessControlException: + # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read") + + rm -f ${configDir}/opensearch.yml + cp ${opensearchYml} ${configDir}/opensearch.yml + + # Make sure the logging configuration for old OpenSearch versions is removed: + rm -f "${configDir}/logging.yml" + rm -f ${configDir}/${loggingConfigFilename} + cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} + mkdir -p ${configDir}/scripts + + rm -f ${configDir}/jvm.options + cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options + + # redirect jvm logs to the data directory + mkdir -p ${cfg.dataDir}/logs + chmod 0700 ${cfg.dataDir}/logs + sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options + ''; + in [ + "+${pkgs.writeShellScript "opensearch-start-pre-full-privileges" startPreFullPrivileges}" + "${pkgs.writeShellScript "opensearch-start-pre-unprivileged" startPreUnprivileged}" + ]; + ExecStartPost = pkgs.writeShellScript "opensearch-start-post" '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + # Make sure opensearch is up and running before dependents + # are started + while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${toString cfg.settings."http.port"} 2>/dev/null; do + sleep 1 + done + ''; + ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}"; + User = cfg.user; + Group = cfg.group; + LimitNOFILE = "1024000"; + Restart = "always"; + TimeoutStartSec = "infinity"; + DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir; + } // (optionalAttrs (usingDefaultDataDir) { + StateDirectory = "opensearch"; + StateDirectoryMode = "0700"; + }); + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/search/qdrant.nix b/nixos/modules/services/search/qdrant.nix new file mode 100644 index 0000000000000..a843c44dbb5f9 --- /dev/null +++ b/nixos/modules/services/search/qdrant.nix @@ -0,0 +1,128 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + + cfg = config.services.qdrant; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "config.yaml" cfg.settings; +in { + + options = { + services.qdrant = { + enable = mkEnableOption (lib.mdDoc "Vector Search Engine for the next generation of AI applications"); + + settings = mkOption { + description = lib.mdDoc '' + Configuration for Qdrant + Refer to <https://github.com/qdrant/qdrant/blob/master/config/config.yaml> for details on supported values. + ''; + + type = settingsFormat.type; + + example = { + storage = { + storage_path = "/var/lib/qdrant/storage"; + snapshots_path = "/var/lib/qdrant/snapshots"; + }; + hsnw_index = { + on_disk = true; + }; + service = { + host = "127.0.0.1"; + http_port = 6333; + grpc_port = 6334; + }; + telemetry_disabled = true; + }; + + defaultText = literalExpression '' + { + storage = { + storage_path = "/var/lib/qdrant/storage"; + snapshots_path = "/var/lib/qdrant/snapshots"; + }; + hsnw_index = { + on_disk = true; + }; + service = { + host = "127.0.0.1"; + http_port = 6333; + grpc_port = 6334; + }; + telemetry_disabled = true; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.qdrant.settings = { + storage.storage_path = mkDefault "/var/lib/qdrant/storage"; + storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots"; + # The following default values are the same as in the default config, + # they are just written here for convenience. + storage.on_disk_payload = mkDefault true; + storage.wal.wal_capacity_mb = mkDefault 32; + storage.wal.wal_segments_ahead = mkDefault 0; + storage.performance.max_search_threads = mkDefault 0; + storage.performance.max_optimization_threads = mkDefault 1; + storage.optimizers.deleted_threshold = mkDefault 0.2; + storage.optimizers.vacuum_min_vector_number = mkDefault 1000; + storage.optimizers.default_segment_number = mkDefault 0; + storage.optimizers.max_segment_size_kb = mkDefault null; + storage.optimizers.memmap_threshold_kb = mkDefault null; + storage.optimizers.indexing_threshold_kb = mkDefault 20000; + storage.optimizers.flush_interval_sec = mkDefault 5; + storage.optimizers.max_optimization_threads = mkDefault 1; + storage.hnsw_index.m = mkDefault 16; + storage.hnsw_index.ef_construct = mkDefault 100; + storage.hnsw_index.full_scan_threshold_kb = mkDefault 10000; + storage.hnsw_index.max_indexing_threads = mkDefault 0; + storage.hnsw_index.on_disk = mkDefault false; + storage.hnsw_index.payload_m = mkDefault null; + service.max_request_size_mb = mkDefault 32; + service.max_workers = mkDefault 0; + service.http_port = mkDefault 6333; + service.grpc_port = mkDefault 6334; + service.enable_cors = mkDefault true; + cluster.enabled = mkDefault false; + # the following have been altered for security + service.host = mkDefault "127.0.0.1"; + telemetry_disabled = mkDefault true; + }; + + systemd.services.qdrant = { + description = "Vector Search Engine for the next generation of AI applications"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.qdrant}/bin/qdrant --config-path ${configFile}"; + DynamicUser = true; + Restart = "on-failure"; + StateDirectory = "qdrant"; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectHome = true; + ProtectClock = true; + ProtectProc = "noaccess"; + ProcSubset = "pid"; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectHostname = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + RestrictNamespaces = true; + LockPersonality = true; + RemoveIPC = true; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + }; + }; + }; +} diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 55120799c9934..5583c39368f77 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -55,7 +55,7 @@ in options.services.kanidm = { enableClient = lib.mkEnableOption (lib.mdDoc "the Kanidm client"); enableServer = lib.mkEnableOption (lib.mdDoc "the Kanidm server"); - enablePam = lib.mkEnableOption (lib.mdDoc "the Kanidm PAM and NSS integration."); + enablePam = lib.mkEnableOption (lib.mdDoc "the Kanidm PAM and NSS integration"); serverSettings = lib.mkOption { type = lib.types.submodule { diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index e446e606cad8b..664335cb58e89 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -6,7 +6,7 @@ let cfg = config.services.privacyidea; opt = options.services.privacyidea; - uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python39; }; + uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python310; }; python = uwsgi.python3; penv = python.withPackages (const [ pkgs.privacyidea ]); logCfg = pkgs.writeText "privacyidea-log.cfg" '' @@ -41,7 +41,7 @@ let piCfgFile = pkgs.writeText "privacyidea.cfg" '' SUPERUSER_REALM = [ '${concatStringsSep "', '" cfg.superuserRealm}' ] - SQLALCHEMY_DATABASE_URI = 'postgresql:///privacyidea' + SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2:///privacyidea' SECRET_KEY = '${cfg.secretKey}' PI_PEPPER = '${cfg.pepper}' PI_ENCFILE = '${cfg.encFile}' diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index c91ff3e69a0a4..ee57ec8bf8120 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -57,6 +57,9 @@ in ]; }; + # Yubikey-agent expects pcsd to be running in order to function. + services.pcscd.enable = true; + environment.extraInit = '' if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index fdc5190d084b3..971dffbadc132 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/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index 627439e1079bf..64cda7fb675f8 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"; @@ -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/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index fc849be0c8726..5419940a68d63 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = { ## Frontend management {#modules-services-akkoma-frontend-management} -Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be +Akkoma will be deployed with the `akkoma-fe` and `admin-fe` frontends by default. These can be modified by setting [{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends). @@ -160,7 +160,7 @@ The following example overrides the primary frontend’s default configuration u derivation. ```nix -services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { +services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" { config = builtins.toJSON { expertLevel = 1; collapseMessageWithSubject = false; @@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { passAsFile = [ "config" ]; } '' mkdir $out - lndir ${pkgs.akkoma-frontends.pleroma-fe} $out + lndir ${pkgs.akkoma-frontends.akkoma-fe} $out rm $out/static/config.json - jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \ + jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \ >$out/static/config.json ''; ``` diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 47ba53e42221a..8d17752586128 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -51,13 +51,13 @@ let package = mkOption { type = types.package; description = mdDoc "Akkoma frontend package."; - example = literalExpression "pkgs.akkoma-frontends.pleroma-fe"; + example = literalExpression "pkgs.akkoma-frontends.akkoma-fe"; }; name = mkOption { type = types.nonEmptyStr; description = mdDoc "Akkoma frontend name."; - example = "pleroma-fe"; + example = "akkoma-fe"; }; ref = mkOption { @@ -476,8 +476,8 @@ in { type = with types; attrsOf (submodule frontend); default = { primary = { - package = pkgs.akkoma-frontends.pleroma-fe; - name = "pleroma-fe"; + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; ref = "stable"; }; admin = { @@ -489,8 +489,8 @@ in { defaultText = literalExpression '' { primary = { - package = pkgs.akkoma-frontends.pleroma-fe; - name = "pleroma-fe"; + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; ref = "stable"; }; admin = { @@ -1082,5 +1082,5 @@ in { }; meta.maintainers = with maintainers; [ mvs ]; - meta.doc = ./akkoma.xml; + meta.doc = ./akkoma.md; } diff --git a/nixos/modules/services/web-apps/akkoma.xml b/nixos/modules/services/web-apps/akkoma.xml deleted file mode 100644 index 49cbcc911e1d1..0000000000000 --- a/nixos/modules/services/web-apps/akkoma.xml +++ /dev/null @@ -1,398 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-akkoma"> - <title>Akkoma</title> - <para> - <link xlink:href="https://akkoma.dev/">Akkoma</link> is a - lightweight ActivityPub microblogging server forked from Pleroma. - </para> - <section xml:id="modules-services-akkoma-service-configuration"> - <title>Service configuration</title> - <para> - The Elixir configuration file required by Akkoma is generated - automatically from - <link xlink:href="options.html#opt-services.akkoma.config"><option>services.akkoma.config</option></link>. - 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</option> – a string - pointing to the file containing the actual value of the option. - </para> - <para> - For the mandatory configuration settings these secrets will be - generated automatically if the referenced file does not exist - during startup, unless disabled through - <link xlink:href="options.html#opt-services.akkoma.initSecrets"><option>services.akkoma.initSecrets</option></link>. - </para> - <para> - The following configuration binds Akkoma to the Unix socket - <literal>/run/akkoma/socket</literal>, expecting to be run behind - a HTTP proxy on <literal>fediverse.example.com</literal>. - </para> - <programlisting language="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"; - }; - }; -}; -</programlisting> - <para> - Please refer to the - <link xlink:href="https://docs.akkoma.dev/stable/configuration/cheatsheet/">configuration - cheat sheet</link> for additional configuration options. - </para> - </section> - <section xml:id="modules-services-akkoma-user-management"> - <title>User management</title> - <para> - After the Akkoma service is running, the administration utility - can be used to - <link xlink:href="https://docs.akkoma.dev/stable/administration/CLI_tasks/user/">manage - users</link>. In particular an administrative user can be created - with - </para> - <programlisting> -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> -</programlisting> - </section> - <section xml:id="modules-services-akkoma-proxy-configuration"> - <title>Proxy configuration</title> - <para> - Although it is possible to expose Akkoma directly, it is common - practice to operate it behind an HTTP reverse proxy such as nginx. - </para> - <programlisting language="nix"> -services.akkoma.nginx = { - enableACME = true; - forceSSL = true; -}; - -services.nginx = { - enable = true; - - clientMaxBodySize = "16m"; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; -}; -</programlisting> - <para> - Please refer to <xref linkend="module-security-acme" /> for - details on how to provision an SSL/TLS certificate. - </para> - <section xml:id="modules-services-akkoma-media-proxy"> - <title>Media proxy</title> - <para> - 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. - </para> - <programlisting language="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; - ''; - }; -}; -</programlisting> - <section xml:id="modules-services-akkoma-prefetch-remote-media"> - <title>Prefetch remote media</title> - <para> - The following example enables the - <literal>MediaProxyWarmingPolicy</literal> 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. - </para> - <programlisting language="nix"> -services.akkoma.config.":pleroma".":mrf".policies = - map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy" -]; -</programlisting> - </section> - <section xml:id="modules-services-akkoma-media-previews"> - <title>Media previews</title> - <para> - Akkoma can generate previews for media. - </para> - <programlisting language="nix"> -services.akkoma.config.":pleroma".":media_preview_proxy" = { - enabled = true; - thumbnail_max_width = 1920; - thumbnail_max_height = 1080; -}; -</programlisting> - </section> - </section> - </section> - <section xml:id="modules-services-akkoma-frontend-management"> - <title>Frontend management</title> - <para> - Akkoma will be deployed with the <literal>pleroma-fe</literal> and - <literal>admin-fe</literal> frontends by default. These can be - modified by setting - <link xlink:href="options.html#opt-services.akkoma.frontends"><option>services.akkoma.frontends</option></link>. - </para> - <para> - The following example overrides the primary frontend’s default - configuration using a custom derivation. - </para> - <programlisting language="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 -''; -</programlisting> - </section> - <section xml:id="modules-services-akkoma-federation-policies"> - <title>Federation policies</title> - <para> - Akkoma comes with a number of modules to police federation with - other ActivityPub instances. The most valuable for typical users - is the - <link xlink:href="https://docs.akkoma.dev/stable/configuration/cheatsheet/#mrf_simple"><literal>:mrf_simple</literal></link> - module which allows limiting federation based on instance - hostnames. - </para> - <para> - 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. - </para> - <programlisting language="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"; - }; - }; -}; -</programlisting> - </section> - <section xml:id="modules-services-akkoma-upload-filters"> - <title>Upload filters</title> - <para> - This example strips GPS and location metadata from uploads, - deduplicates them and anonymises the the file name. - </para> - <programlisting language="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" - ]; -</programlisting> - </section> - <section xml:id="modules-services-akkoma-migration-pleroma"> - <title>Migration from Pleroma</title> - <para> - 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. - </para> - <para> - The configuration has to be copy‐edited manually. - </para> - <para> - 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</option> - or simply run the migrations manually: - </para> - <programlisting> -pleroma_ctl migrate -</programlisting> - <section xml:id="modules-services-akkoma-migration-pleroma-copy"> - <title>Copying data</title> - <para> - 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. - </para> - <para> - First disable Pleroma and then copy its database and upload - data: - </para> - <programlisting> -# 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/ -</programlisting> - <para> - 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: - </para> - <programlisting> -# Delete original database -nix-shell -p postgresql --run 'dropdb pleroma' - -# Delete original Pleroma state -rm -r /var/lib/pleroma -</programlisting> - </section> - <section xml:id="modules-services-akkoma-migration-pleroma-reuse"> - <title>Re‐using data</title> - <para> - To re‐use the Pleroma data in place, disable Pleroma and enable - Akkoma, pointing it to the Pleroma database and upload - directory. - </para> - <programlisting language="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"; -</programlisting> - <para> - 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 <literal>pleroma_ctl ecto.rollback</literal>. - Refer to the - <link xlink:href="https://hexdocs.pm/ecto_sql/Mix.Tasks.Ecto.Rollback.html">Ecto - SQL documentation</link> for details. - </para> - </section> - </section> - <section xml:id="modules-services-akkoma-advanced-deployment"> - <title>Advanced deployment options</title> - <section xml:id="modules-services-akkoma-confinement"> - <title>Confinement</title> - <para> - The Akkoma systemd service may be confined to a chroot with - </para> - <programlisting language="nix"> -services.systemd.akkoma.confinement.enable = true; -</programlisting> - <para> - 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: - </para> - <para> - Use - <link xlink:href="options.html#opt-systemd.services._name_.confinement.packages"><option>services.systemd.akkoma.confinement.packages</option></link> - to make packages available in the chroot. - </para> - <para> - <option>services.systemd.akkoma.serviceConfig.BindPaths</option> - and - <option>services.systemd.akkoma.serviceConfig.BindReadOnlyPaths</option> - permit access to outside paths through bind mounts. Refer to - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#BindPaths="><citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry></link> - for details. - </para> - </section> - <section xml:id="modules-services-akkoma-distributed-deployment"> - <title>Distributed deployment</title> - <para> - Being an Elixir application, Akkoma can be deployed in a - distributed fashion. - </para> - <para> - This requires setting - <link xlink:href="options.html#opt-services.akkoma.dist.address"><option>services.akkoma.dist.address</option></link> - and - <link xlink:href="options.html#opt-services.akkoma.dist.cookie"><option>services.akkoma.dist.cookie</option></link>. - The specifics depend strongly on the deployment environment. For - more information please check the relevant - <link xlink:href="https://www.erlang.org/doc/reference_manual/distributed.html">Erlang - documentation</link>. - </para> - </section> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix index 1a58df2da1d29..05fb676102df4 100644 --- a/nixos/modules/services/web-apps/alps.nix +++ b/nixos/modules/services/web-apps/alps.nix @@ -84,7 +84,7 @@ in { "-addr" "${cfg.bindIP}:${toString cfg.port}" "-theme" "${cfg.theme}" "imaps://${cfg.imaps.host}:${toString cfg.imaps.port}" - "smpts://${cfg.smtps.host}:${toString cfg.smtps.port}" + "smtps://${cfg.smtps.host}:${toString cfg.smtps.port}" ]; }; }; diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix index ffd1085bde653..9c6284fd1b57a 100644 --- a/nixos/modules/services/web-apps/cloudlog.nix +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -68,7 +68,7 @@ let in { options.services.cloudlog = with types; { - enable = mkEnableOption (mdDoc "Whether to enable Cloudlog."); + enable = mkEnableOption (mdDoc "Whether to enable Cloudlog"); dataDir = mkOption { type = str; default = "/var/lib/cloudlog"; diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index b8104ade4676d..151fb812ddea6 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -615,6 +615,7 @@ in s3_endpoint = null; s3_http_continue_timeout = null; s3_install_cors_rule = null; + s3_asset_cdn_url = null; max_user_api_reqs_per_minute = 20; max_user_api_reqs_per_day = 2880; @@ -647,6 +648,9 @@ in multisite_config_path = "config/multisite.yml"; enable_long_polling = null; long_polling_interval = null; + preload_link_header = false; + redirect_avatar_requests = false; + pg_force_readonly_mode = false; }; services.redis.servers.discourse = @@ -1011,6 +1015,7 @@ in notification_email = cfg.mail.notificationEmailAddress; contact_email = cfg.mail.contactEmailAddress; }; + security.force_https = tlsEnabled; email = { manual_polling_enabled = cfg.mail.incoming.enable; reply_by_email_enabled = cfg.mail.incoming.enable; @@ -1080,6 +1085,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 a5e8b3656b7de..0000000000000 --- a/nixos/modules/services/web-apps/discourse.xml +++ /dev/null @@ -1,331 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-discourse"> - <title>Discourse</title> - <para> - <link xlink:href="https://www.discourse.org/">Discourse</link> is a - modern and open source discussion platform. - </para> - <section xml:id="module-services-discourse-basic-usage"> - <title>Basic usage</title> - <para> - A minimal configuration using Let’s Encrypt for TLS certificates - looks like this: - </para> - <programlisting> -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; -</programlisting> - <para> - Provided a proper DNS setup, you’ll be able to connect to the - instance at <literal>discourse.example.com</literal> and log in - using the credentials provided in - <literal>services.discourse.admin</literal>. - </para> - </section> - <section xml:id="module-services-discourse-tls"> - <title>Using a regular TLS certificate</title> - <para> - To set up TLS using a regular certificate and key on file, use the - <xref linkend="opt-services.discourse.sslCertificate" /> and - <xref linkend="opt-services.discourse.sslCertificateKey" /> - options: - </para> - <programlisting> -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"; -}; -</programlisting> - </section> - <section xml:id="module-services-discourse-database"> - <title>Database access</title> - <para> - Discourse uses PostgreSQL to store most of its data. A database - will automatically be enabled and a database and role created - unless <xref linkend="opt-services.discourse.database.host" /> is - changed from its default of <literal>null</literal> or - <xref linkend="opt-services.discourse.database.createLocally" /> - is set to <literal>false</literal>. - </para> - <para> - External database access can also be configured by setting - <xref linkend="opt-services.discourse.database.host" />, - <xref linkend="opt-services.discourse.database.username" /> and - <xref linkend="opt-services.discourse.database.passwordFile" /> as - appropriate. Note that you need to manually create a database - called <literal>discourse</literal> (or the name you chose in - <xref linkend="opt-services.discourse.database.name" />) and allow - the configured database user full access to it. - </para> - </section> - <section xml:id="module-services-discourse-mail"> - <title>Email</title> - <para> - 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. - </para> - <para> - A basic setup which assumes you want to use your configured - <link linkend="opt-services.discourse.hostname">hostname</link> as - email domain can be done like this: - </para> - <programlisting> -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"; -}; -</programlisting> - <para> - This assumes you have set up an MX record for the address you’ve - set in - <link linkend="opt-services.discourse.hostname">hostname</link> - 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. - </para> - <para> - If you want to use a different domain for your outgoing email (for - example <literal>example.com</literal> instead of - <literal>discourse.example.com</literal>) you should set - <xref linkend="opt-services.discourse.mail.notificationEmailAddress" /> - and - <xref linkend="opt-services.discourse.mail.contactEmailAddress" /> - manually. - </para> - <note> - <para> - Setup of TLS for incoming email is currently only configured - automatically when a regular TLS certificate is used, i.e. when - <xref linkend="opt-services.discourse.sslCertificate" /> and - <xref linkend="opt-services.discourse.sslCertificateKey" /> are - set. - </para> - </note> - </section> - <section xml:id="module-services-discourse-settings"> - <title>Additional settings</title> - <para> - Additional site settings and backend settings, for which no - explicit NixOS options are provided, can be set in - <xref linkend="opt-services.discourse.siteSettings" /> and - <xref linkend="opt-services.discourse.backendSettings" /> - respectively. - </para> - <section xml:id="module-services-discourse-site-settings"> - <title>Site settings</title> - <para> - <quote>Site settings</quote> are the settings that can be - changed through the Discourse UI. Their - <emphasis>default</emphasis> values can be set using - <xref linkend="opt-services.discourse.siteSettings" />. - </para> - <para> - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - <link xlink:href="https://github.com/discourse/discourse/blob/master/config/site_settings.yml">config/site_settings.yml</link>. - To find a setting’s path, you only need to care about the first - two levels; i.e. its category (e.g. <literal>login</literal>) - and name (e.g. <literal>invite_only</literal>). - </para> - <para> - Settings containing secret data should be set to an attribute - set containing the attribute <literal>_secret</literal> - a - string pointing to a file containing the value the option should - be set to. See the example. - </para> - </section> - <section xml:id="module-services-discourse-backend-settings"> - <title>Backend settings</title> - <para> - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - <link xlink:href="https://github.com/discourse/discourse/blob/stable/config/discourse_defaults.conf">config/discourse.conf</link>. - Empty parameters can be defined by setting them to - <literal>null</literal>. - </para> - </section> - <section xml:id="module-services-discourse-settings-example"> - <title>Example</title> - <para> - 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: - </para> - <programlisting> -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"; -}; -</programlisting> - <para> - In the resulting site settings file, the - <literal>login.github_client_secret</literal> key will be set to - the contents of the - <filename>/run/keys/discourse_github_client_secret</filename> - file. - </para> - </section> - </section> - <section xml:id="module-services-discourse-plugins"> - <title>Plugins</title> - <para> - You can install Discourse plugins using the - <xref linkend="opt-services.discourse.plugins" /> option. - Pre-packaged plugins are provided in - <literal><your_discourse_package_here>.plugins</literal>. If - you want the full suite of plugins provided through - <literal>nixpkgs</literal>, you can also set the - <xref linkend="opt-services.discourse.package" /> option to - <literal>pkgs.discourseAllPlugins</literal>. - </para> - <para> - Plugins can be built with the - <literal><your_discourse_package_here>.mkDiscoursePlugin</literal> - function. Normally, it should suffice to provide a - <literal>name</literal> and <literal>src</literal> attribute. If - the plugin has Ruby dependencies, however, they need to be - packaged in accordance with the - <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#developing-with-ruby">Developing - with Ruby</link> section of the Nixpkgs manual and the appropriate - gem options set in <literal>bundlerEnvArgs</literal> (normally - <literal>gemdir</literal> is sufficient). A plugin’s Ruby - dependencies are listed in its <filename>plugin.rb</filename> file - as function calls to <literal>gem</literal>. To construct the - corresponding <filename>Gemfile</filename> manually, run - <command>bundle init</command>, then add the - <literal>gem</literal> lines to it verbatim. - </para> - <para> - Much of the packaging can be done automatically by the - <filename>nixpkgs/pkgs/servers/web-apps/discourse/update.py</filename> - script - just add the plugin to the <literal>plugins</literal> - list in the <literal>update_plugins</literal> function and run the - script: - </para> - <programlisting language="bash"> -./update.py update-plugins -</programlisting> - <para> - Some plugins provide - <link linkend="module-services-discourse-site-settings">site - settings</link>. Their defaults can be configured using - <xref linkend="opt-services.discourse.siteSettings" />, just like - regular site settings. To find the names of these settings, look - in the <literal>config/settings.yml</literal> file of the plugin - repo. - </para> - <para> - For example, to add the - <link xlink:href="https://github.com/discourse/discourse-spoiler-alert">discourse-spoiler-alert</link> - and - <link xlink:href="https://github.com/discourse/discourse-solved">discourse-solved</link> - plugins, and disable <literal>discourse-spoiler-alert</literal> by - default: - </para> - <programlisting> -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"; -}; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 54cd5fd33bef7..c85109b1479ed 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -82,7 +82,7 @@ let basePackage = cfg.package; localConfig = dokuwikiLocalConfig hostName cfg; pluginsConfig = dokuwikiPluginsLocalConfig hostName cfg; - aclConfig = if cfg.aclUse && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; + aclConfig = if cfg.settings.useacl && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; }; aclOpts = { ... }: { @@ -148,7 +148,7 @@ let ]; options = { - enable = mkEnableOption (lib.mdDoc "DokuWiki web application."); + enable = mkEnableOption (lib.mdDoc "DokuWiki web application"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix index 15ef09aa0b879..747b85f94c65a 100644 --- a/nixos/modules/services/web-apps/galene.nix +++ b/nixos/modules/services/web-apps/galene.nix @@ -12,7 +12,7 @@ in { options = { services.galene = { - enable = mkEnableOption (lib.mdDoc "Galene Service."); + enable = mkEnableOption (lib.mdDoc "Galene Service"); stateDir = mkOption { default = defaultstateDir; diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index 6efc2ccfd3020..3bcda3caedace 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 08de25b4ce2b8..0000000000000 --- a/nixos/modules/services/web-apps/grocy.xml +++ /dev/null @@ -1,84 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-grocy"> - <title>Grocy</title> - <para> - <link xlink:href="https://grocy.info/">Grocy</link> is a web-based - self-hosted groceries & household management solution for your - home. - </para> - <section xml:id="module-services-grocy-basic-usage"> - <title>Basic usage</title> - <para> - A very basic configuration may look like this: - </para> - <programlisting> -{ pkgs, ... }: -{ - services.grocy = { - enable = true; - hostName = "grocy.tld"; - }; -} -</programlisting> - <para> - This configures a simple vhost using - <link linkend="opt-services.nginx.enable">nginx</link> which - listens to <literal>grocy.tld</literal> with fully configured - ACME/LE (this can be disabled by setting - <link linkend="opt-services.grocy.nginx.enableSSL">services.grocy.nginx.enableSSL</link> - to <literal>false</literal>). After the initial setup the - credentials <literal>admin:admin</literal> can be used to login. - </para> - <para> - The application’s state is persisted at - <literal>/var/lib/grocy/grocy.db</literal> in a - <literal>sqlite3</literal> database. The migration is applied when - requesting the <literal>/</literal>-route of the application. - </para> - </section> - <section xml:id="module-services-grocy-settings"> - <title>Settings</title> - <para> - The configuration for <literal>grocy</literal> is located at - <literal>/etc/grocy/config.php</literal>. By default, the - following settings can be defined in the NixOS-configuration: - </para> - <programlisting> -{ 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; - }; - }; -} -</programlisting> - <para> - If you want to alter the configuration file on your own, you can - do this manually with an expression like this: - </para> - <programlisting> -{ lib, ... }: -{ - environment.etc."grocy/config.php".text = lib.mkAfter '' - // Arbitrary PHP code in grocy's configuration file - ''; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix index 86716a02649c5..0fc283ff52191 100644 --- a/nixos/modules/services/web-apps/hledger-web.nix +++ b/nixos/modules/services/web-apps/hledger-web.nix @@ -7,7 +7,7 @@ in { enable = mkEnableOption (lib.mdDoc "hledger-web service"); - serveApi = mkEnableOption (lib.mdDoc "Serve only the JSON web API, without the web UI."); + serveApi = mkEnableOption (lib.mdDoc "Serve only the JSON web API, without the web UI"); host = mkOption { type = types.str; diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix index 293cbb3af4252..b2e2741671641 100644 --- a/nixos/modules/services/web-apps/jirafeau.nix +++ b/nixos/modules/services/web-apps/jirafeau.nix @@ -36,7 +36,7 @@ in description = lib.mdDoc "Location of Jirafeau storage directory."; }; - enable = mkEnableOption (lib.mdDoc "Jirafeau file upload application."); + enable = mkEnableOption (lib.mdDoc "Jirafeau file upload application"); extraConfig = mkOption { type = types.lines; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 5b0934b2fb76f..28be3a3702eb6 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -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 4d2d8aa55e19f..0000000000000 --- a/nixos/modules/services/web-apps/jitsi-meet.xml +++ /dev/null @@ -1,55 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-jitsi-meet"> - <title>Jitsi Meet</title> - <para> - With Jitsi Meet on NixOS you can quickly configure a complete, - private, self-hosted video conferencing solution. - </para> - <section xml:id="module-services-jitsi-basic-usage"> - <title>Basic usage</title> - <para> - A minimal configuration using Let’s Encrypt for TLS certificates - looks like this: - </para> - <programlisting> -{ - 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; -} -</programlisting> - </section> - <section xml:id="module-services-jitsi-configuration"> - <title>Configuration</title> - <para> - Here is the minimal configuration with additional configurations: - </para> - <programlisting> -{ - 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; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index d52190a28648e..a7e4fab8ea287 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 148782d30f39e..0000000000000 --- a/nixos/modules/services/web-apps/keycloak.xml +++ /dev/null @@ -1,177 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-keycloak"> - <title>Keycloak</title> - <para> - <link xlink:href="https://www.keycloak.org/">Keycloak</link> is an - open source identity and access management server with support for - <link xlink:href="https://openid.net/connect/">OpenID - Connect</link>, <link xlink:href="https://oauth.net/2/">OAUTH - 2.0</link> and - <link xlink:href="https://en.wikipedia.org/wiki/SAML_2.0">SAML - 2.0</link>. - </para> - <section xml:id="module-services-keycloak-admin"> - <title>Administration</title> - <para> - An administrative user with the username <literal>admin</literal> - is automatically created in the <literal>master</literal> realm. - Its initial password can be configured by setting - <xref linkend="opt-services.keycloak.initialAdminPassword" /> and - defaults to <literal>changeme</literal>. The password is not - stored safely and should be changed immediately in the admin - panel. - </para> - <para> - Refer to the - <link xlink:href="https://www.keycloak.org/docs/latest/server_admin/index.html">Keycloak - Server Administration Guide</link> for information on how to - administer your Keycloak instance. - </para> - </section> - <section xml:id="module-services-keycloak-database"> - <title>Database access</title> - <para> - Keycloak can be used with either PostgreSQL, MariaDB or MySQL. - Which one is used can be configured in - <xref linkend="opt-services.keycloak.database.type" />. The - selected database will automatically be enabled and a database and - role created unless - <xref linkend="opt-services.keycloak.database.host" /> is changed - from its default of <literal>localhost</literal> or - <xref linkend="opt-services.keycloak.database.createLocally" /> is - set to <literal>false</literal>. - </para> - <para> - External database access can also be configured by setting - <xref linkend="opt-services.keycloak.database.host" />, - <xref linkend="opt-services.keycloak.database.name" />, - <xref linkend="opt-services.keycloak.database.username" />, - <xref linkend="opt-services.keycloak.database.useSSL" /> and - <xref linkend="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. - </para> - <para> - <xref linkend="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 - <xref linkend="opt-services.keycloak.database.host" /> and - <xref linkend="opt-services.keycloak.database.createLocally" /> - are kept at their defaults, the database role - <literal>keycloak</literal> with that password is provisioned on - the local database instance. - </para> - <warning> - <para> - The path should be provided as a string, not a Nix path, since - Nix paths are copied into the world readable Nix store. - </para> - </warning> - </section> - <section xml:id="module-services-keycloak-hostname"> - <title>Hostname</title> - <para> - The hostname is used to build the public URL used as base for all - frontend requests and must be configured through - <xref linkend="opt-services.keycloak.settings.hostname" />. - </para> - <note> - <para> - 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 - <xref linkend="opt-services.keycloak.settings.http-relative-path" /> - to <literal>/auth</literal>. See the option description for more - details. - </para> - </note> - <para> - <xref linkend="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. - </para> - <para> - For more information on hostname configuration, see the - <link xlink:href="https://www.keycloak.org/server/hostname">Hostname - section of the Keycloak Server Installation and Configuration - Guide</link>. - </para> - </section> - <section xml:id="module-services-keycloak-tls"> - <title>Setting up TLS/SSL</title> - <para> - By default, Keycloak won’t accept unsecured HTTP connections - originating from outside its local network. - </para> - <para> - HTTPS support requires a TLS/SSL certificate and a private key, - both - <link xlink:href="https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail">PEM - formatted</link>. Their paths should be set through - <xref linkend="opt-services.keycloak.sslCertificate" /> and - <xref linkend="opt-services.keycloak.sslCertificateKey" />. - </para> - <warning> - <para> - The paths should be provided as a strings, not a Nix paths, - since Nix paths are copied into the world readable Nix store. - </para> - </warning> - </section> - <section xml:id="module-services-keycloak-themes"> - <title>Themes</title> - <para> - You can package custom themes and make them visible to Keycloak - through <xref linkend="opt-services.keycloak.themes" />. See the - <link xlink:href="https://www.keycloak.org/docs/latest/server_development/#_themes">Themes - section of the Keycloak Server Development Guide</link> and the - description of the aforementioned NixOS option for more - information. - </para> - </section> - <section xml:id="module-services-keycloak-settings"> - <title>Configuration file settings</title> - <para> - Keycloak server configuration parameters can be set in - <xref linkend="opt-services.keycloak.settings" />. These - correspond directly to options in - <filename>conf/keycloak.conf</filename>. Some of the most - important parameters are documented as suboptions, the rest can be - found in the - <link xlink:href="https://www.keycloak.org/server/all-config">All - configuration section of the Keycloak Server Installation and - Configuration Guide</link>. - </para> - <para> - Options containing secret data should be set to an attribute set - containing the attribute <literal>_secret</literal> - a string - pointing to a file containing the value the option should be set - to. See the description of - <xref linkend="opt-services.keycloak.settings" /> for an example. - </para> - </section> - <section xml:id="module-services-keycloak-example-config"> - <title>Example configuration</title> - <para> - A basic configuration with some custom settings could look like - this: - </para> - <programlisting> -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"; -}; -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index f2eb6e726b903..af0fb38121a34 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -6,7 +6,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - 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 114e11f3488ad..0000000000000 --- a/nixos/modules/services/web-apps/lemmy.xml +++ /dev/null @@ -1,53 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-lemmy"> - <title>Lemmy</title> - <para> - Lemmy is a federated alternative to reddit in rust. - </para> - <section xml:id="module-services-lemmy-quickstart"> - <title>Quickstart</title> - <para> - the minimum to start lemmy is - </para> - <programlisting language="nix"> -services.lemmy = { - enable = true; - settings = { - hostname = "lemmy.union.rocks"; - database.createLocally = true; - }; - caddy.enable = true; -} -</programlisting> - <para> - 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. - </para> - </section> - <section xml:id="module-services-lemmy-usage"> - <title>Usage</title> - <para> - On first connection you will be asked to define an admin user. - </para> - </section> - <section xml:id="module-services-lemmy-missing"> - <title>Missing</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - Exposing with nginx is not implemented yet. - </para> - </listitem> - <listitem> - <para> - This has been tested using a local database with a unix socket - connection. Using different database settings will likely - require modifications - </para> - </listitem> - </itemizedlist> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 7093d1de0dacf..dd51174c8b8e0 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -32,7 +32,7 @@ in # interface options.services.limesurvey = { - enable = mkEnableOption (lib.mdDoc "Limesurvey web application."); + enable = mkEnableOption (lib.mdDoc "Limesurvey web application"); database = { type = mkOption { diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 9845106599527..eadf8b62b9779 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -325,7 +325,7 @@ in { }; meta = { - doc = ./matomo.xml; + doc = ./matomo.md; maintainers = with lib.maintainers; [ florianjacob ]; }; } diff --git a/nixos/modules/services/web-apps/matomo.xml b/nixos/modules/services/web-apps/matomo.xml deleted file mode 100644 index 30994cc9f1dad..0000000000000 --- a/nixos/modules/services/web-apps/matomo.xml +++ /dev/null @@ -1,107 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-matomo"> - <title>Matomo</title> - <para> - Matomo is a real-time web analytics application. This module - configures php-fpm as backend for Matomo, optionally configuring an - nginx vhost as well. - </para> - <para> - An automatic setup is not suported by Matomo, so you need to - configure Matomo itself in the browser-based Matomo setup. - </para> - <section xml:id="module-services-matomo-database-setup"> - <title>Database Setup</title> - <para> - 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: - </para> - <programlisting> -# 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'; -</programlisting> - <para> - Then fill in <literal>matomo</literal> as database user and - database name, and leave the password field blank. This - authentication works by allowing only the - <literal>matomo</literal> unix user to authenticate as the - <literal>matomo</literal> database user (without needing a - password), but no other users. For more information on - passwordless login, see - <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/">https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/</link>. - </para> - <para> - Of course, you can use password based authentication as well, e.g. - when the database is not on the same host. - </para> - </section> - <section xml:id="module-services-matomo-archive-processing"> - <title>Archive Processing</title> - <para> - This module comes with the systemd service - <literal>matomo-archive-processing.service</literal> and a timer - that automatically triggers archive processing every hour. This - means that you can safely - <link xlink:href="https://matomo.org/docs/setup-auto-archiving/#disable-browser-triggers-for-matomo-archiving-and-limit-matomo-reports-to-updating-every-hour">disable - browser triggers for Matomo archiving</link> at - <literal>Administration > System > General Settings</literal>. - </para> - <para> - With automatic archive processing, you can now also enable to - <link xlink:href="https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs">delete - old visitor logs</link> at - <literal>Administration > System > Privacy</literal>, but - make sure that you run - <literal>systemctl start matomo-archive-processing.service</literal> - at least once without errors if you have already collected data - before, so that the reports get archived before the source data - gets deleted. - </para> - </section> - <section xml:id="module-services-matomo-backups"> - <title>Backup</title> - <para> - You only need to take backups of your MySQL database and the - <filename>/var/lib/matomo/config/config.ini.php</filename> file. - Use a user in the <literal>matomo</literal> group or root to - access the file. For more information, see - <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/">https://matomo.org/faq/how-to-install/faq_138/</link>. - </para> - </section> - <section xml:id="module-services-matomo-issues"> - <title>Issues</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - 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. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-matomo-other-web-servers"> - <title>Using other Web Servers than nginx</title> - <para> - You can use other web servers by forwarding calls for - <filename>index.php</filename> and <filename>piwik.php</filename> - to the - <link linkend="opt-services.phpfpm.pools._name_.socket"><literal>services.phpfpm.pools.<name>.socket</literal></link> - fastcgi unix socket. You can use the nginx configuration in the - module code as a reference to what else should be configured. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix new file mode 100644 index 0000000000000..e36631b6093c5 --- /dev/null +++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -0,0 +1,96 @@ +{ config, options, lib, pkgs, ... }: + +let + cfg = config.services.nextcloud.notify_push; +in +{ + options.services.nextcloud.notify_push = { + enable = lib.mkEnableOption (lib.mdDoc "Notify push"); + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.nextcloud-notify_push; + defaultText = lib.literalMD "pkgs.nextcloud-notify_push"; + description = lib.mdDoc "Which package to use for notify_push"; + }; + + socketPath = lib.mkOption { + type = lib.types.str; + default = "/run/nextcloud-notify_push/sock"; + description = lib.mdDoc "Socket path to use for notify_push"; + }; + + logLevel = lib.mkOption { + type = lib.types.enum [ "error" "warn" "info" "debug" "trace" ]; + default = "error"; + description = lib.mdDoc "Log level"; + }; + } // ( + lib.genAttrs [ + "dbtype" + "dbname" + "dbuser" + "dbpassFile" + "dbhost" + "dbport" + "dbtableprefix" + ] ( + opt: options.services.nextcloud.config.${opt} // { + default = config.services.nextcloud.config.${opt}; + defaultText = "config.services.nextcloud.config.${opt}"; + } + ) + ); + + config = lib.mkIf cfg.enable { + systemd.services.nextcloud-notify_push = let + nextcloudUrl = "http${lib.optionalString config.services.nextcloud.https "s"}://${config.services.nextcloud.hostName}"; + in { + description = "Push daemon for Nextcloud clients"; + documentation = [ "https://github.com/nextcloud/notify_push" ]; + after = [ "phpfpm-nextcloud.service" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + NEXTCLOUD_URL = nextcloudUrl; + SOCKET_PATH = cfg.socketPath; + DATABASE_PREFIX = cfg.dbtableprefix; + LOG = cfg.logLevel; + }; + postStart = '' + ${config.services.nextcloud.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push + ''; + script = let + dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype; + dbUser = lib.optionalString (cfg.dbuser != null) cfg.dbuser; + dbPass = lib.optionalString (cfg.dbpassFile != null) ":$DATABASE_PASSWORD"; + isSocket = lib.hasPrefix "/" (toString cfg.dbhost); + dbHost = lib.optionalString (cfg.dbhost != null) (if + isSocket then + if dbType == "postgresql" then "?host=${cfg.dbhost}" else + if dbType == "mysql" then "?socket=${cfg.dbhost}" else throw "unsupported dbtype" + else + "@${cfg.dbhost}"); + dbName = lib.optionalString (cfg.dbname != null) "/${cfg.dbname}"; + dbUrl = "${dbType}://${dbUser}${dbPass}${lib.optionalString (!isSocket) dbHost}${dbName}${lib.optionalString isSocket dbHost}"; + in lib.optionalString (dbPass != "") '' + export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")" + '' + '' + export DATABASE_URL="${dbUrl}" + ${cfg.package}/bin/notify_push --glob-config '${config.services.nextcloud.datadir}/config/config.php' + ''; + serviceConfig = { + User = "nextcloud"; + Group = "nextcloud"; + RuntimeDirectory = [ "nextcloud-notify_push" ]; + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + + services.nginx.virtualHosts.${config.services.nextcloud.hostName}.locations."^~ /push/" = { + proxyPass = "http://unix:${cfg.socketPath}"; + proxyWebsockets = true; + recommendedProxySettings = true; + }; + }; +} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 90801e9968175..c5e161c2516ad 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -79,7 +79,7 @@ in { (which can be opened e.g. by running `nixos-help`). '') (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] '' - Use services.nextcloud.nginx.enableImagemagick instead. + Use services.nextcloud.enableImagemagick instead. '') ]; @@ -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 a5ac05723ef47..0000000000000 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ /dev/null @@ -1,333 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-nextcloud"> - <title>Nextcloud</title> - <para> - <link xlink:href="https://nextcloud.com/">Nextcloud</link> is an - open-source, self-hostable cloud platform. The server setup can be - automated using - <link linkend="opt-services.nextcloud.enable">services.nextcloud</link>. - A desktop client is packaged at - <literal>pkgs.nextcloud-client</literal>. - </para> - <para> - The current default by NixOS is <literal>nextcloud25</literal> which - is also the latest major version available. - </para> - <section xml:id="module-services-nextcloud-basic-usage"> - <title>Basic usage</title> - <para> - Nextcloud is a PHP-based application which requires an HTTP server - (<link linkend="opt-services.nextcloud.enable"><literal>services.nextcloud</literal></link> - optionally supports - <link linkend="opt-services.nginx.enable"><literal>services.nginx</literal></link>) - and a database (it’s recommended to use - <link linkend="opt-services.postgresql.enable"><literal>services.postgresql</literal></link>). - </para> - <para> - A very basic configuration may look like this: - </para> - <programlisting> -{ 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 ]; -} -</programlisting> - <para> - The <literal>hostName</literal> option is used internally to - configure an HTTP server using - <link xlink:href="https://php-fpm.org/"><literal>PHP-FPM</literal></link> - and <literal>nginx</literal>. The <literal>config</literal> - 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. - </para> - <para> - In case the application serves multiple domains (those are checked - with - <link xlink:href="http://php.net/manual/en/reserved.variables.server.php"><literal>$_SERVER['HTTP_HOST']</literal></link>) - it’s needed to add them to - <link linkend="opt-services.nextcloud.config.extraTrustedDomains"><literal>services.nextcloud.config.extraTrustedDomains</literal></link>. - </para> - <para> - Auto updates for Nextcloud apps can be enabled using - <link linkend="opt-services.nextcloud.autoUpdateApps.enable"><literal>services.nextcloud.autoUpdateApps</literal></link>. - </para> - </section> - <section xml:id="module-services-nextcloud-pitfalls-during-upgrade"> - <title>Common problems</title> - <itemizedlist> - <listitem> - <para> - <emphasis role="strong">General notes.</emphasis> - 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 <literal>nextcloud</literal> user - (by default - <literal>/var/lib/nextcloud/config/config.php</literal>) and - is also used to track several states of the application (e.g., - whether installed or not). - </para> - <para> - All configuration parameters are also stored in - <filename>/var/lib/nextcloud/config/override.config.php</filename> - which is generated by the module and linked from the store to - ensure that all values from <filename>config.php</filename> - can be modified by the module. However - <filename>config.php</filename> manages the application’s - state and shouldn’t be touched manually because of that. - </para> - <warning> - <para> - Don’t delete <filename>config.php</filename>! This file - tracks the application’s state and a deletion can cause - unwanted side-effects! - </para> - </warning> - <warning> - <para> - Don’t rerun - <literal>nextcloud-occ maintenance:install</literal>! This - command tries to install the application and can cause - unwanted side-effects! - </para> - </warning> - </listitem> - <listitem> - <para> - <emphasis role="strong">Multiple version upgrades.</emphasis> - Nextcloud doesn’t allow to move more than one major-version - forward. E.g., if you’re on <literal>v16</literal>, you cannot - upgrade to <literal>v18</literal>, you need to upgrade to - <literal>v17</literal> first. This is ensured automatically as - long as the - <link linkend="opt-system.stateVersion">stateVersion</link> 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 - <emphasis>after</emphasis> that deploy. - </para> - </listitem> - <listitem> - <para> - <emphasis role="strong"><literal>Error: Command "upgrade" is not defined.</literal></emphasis> - This error usually occurs if the initial installation - (<command>nextcloud-occ maintenance:install</command>) has - failed. After that, the application is not installed, but the - upgrade is attempted to be executed. Further context can be - found in - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/111175">NixOS/nixpkgs#111175</link>. - </para> - <para> - 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</command> and try to - fix the underlying issue. - </para> - <itemizedlist> - <listitem> - <para> - If this occurs on an <emphasis>existing</emphasis> setup, - this is most likely because the maintenance mode is - active. It can be deactivated by running - <command>nextcloud-occ maintenance:mode --off</command>. - It’s advisable though to check the logs first on why the - maintenance mode was activated. - </para> - </listitem> - <listitem> - <warning> - <para> - Only perform the following measures on <emphasis>freshly - installed instances!</emphasis> - </para> - </warning> - <para> - A re-run of the installer can be forced by - <emphasis>deleting</emphasis> - <filename>/var/lib/nextcloud/config/config.php</filename>. - 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/</command>. - </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> - <para> - <emphasis role="strong">Server-side encryption.</emphasis> - Nextcloud supports - <link xlink:href="https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html">server-side - encryption (SSE)</link>. 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 - <xref linkend="opt-system.stateVersion" /> is - <emphasis>above</emphasis> <literal>22.05</literal>, this is - disabled by default. To turn it on again and for further - information please refer to - <xref linkend="opt-services.nextcloud.enableBrokenCiphersForSSE" />. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-nextcloud-httpd"> - <title>Using an alternative webserver as reverse-proxy (e.g. - <literal>httpd</literal>)</title> - <para> - By default, <literal>nginx</literal> is used as reverse-proxy for - <literal>nextcloud</literal>. However, it’s possible to use e.g. - <literal>httpd</literal> by explicitly disabling - <literal>nginx</literal> using - <xref linkend="opt-services.nginx.enable" /> and fixing the - settings <literal>listen.owner</literal> & - <literal>listen.group</literal> in the - <link linkend="opt-services.phpfpm.pools">corresponding - <literal>phpfpm</literal> pool</link>. - </para> - <para> - An exemplary configuration may look like this: - </para> - <programlisting> -{ 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> - ''; - }; - }; -} -</programlisting> - </section> - <section xml:id="installing-apps-php-extensions-nextcloud"> - <title>Installing Apps and PHP extensions</title> - <para> - 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 - <xref linkend="opt-services.nextcloud.phpExtraExtensions" /> - setting. - </para> - <para> - Alternatively, extra apps can also be declared with the - <xref linkend="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. - </para> - </section> - <section xml:id="module-services-nextcloud-maintainer-info"> - <title>Maintainer information</title> - <para> - 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. - </para> - <para> - 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 - <literal>v19.0.0</literal> should be available in - <literal>nixpkgs</literal> as - <literal>pkgs.nextcloud19</literal>). 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 - <literal>nextcloud</literal>-module should be updated to make sure - that the - <link linkend="opt-services.nextcloud.package">package</link>-option - selects the latest version on fresh setups. - </para> - <para> - 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 - <literal><nixpkgs/pkgs/servers/nextcloud/default.nix></literal>): - </para> - <programlisting> -/* ... */ -{ - nextcloud17 = generic { - version = "17.0.x"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} -</programlisting> - <para> - 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. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index 79ed3e43dd18a..3494f2fa21f09 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -229,6 +229,9 @@ in cp -r ${cfg.package}/etc/onlyoffice/documentserver/* /run/onlyoffice/config/ chmod u+w /run/onlyoffice/config/default.json + # Allow members of the onlyoffice group to serve files under /var/lib/onlyoffice/documentserver/App_Data + chmod g+x /var/lib/onlyoffice/documentserver + cp /run/onlyoffice/config/default.json{,.orig} # for a mapping of environment variables from the docker container to json options see @@ -267,7 +270,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper DocService/docservice /run/onlyoffice/config"; - ExecStartPre = onlyoffice-prestart; + ExecStartPre = [ onlyoffice-prestart ]; Group = "onlyoffice"; Restart = "always"; RuntimeDirectory = "onlyoffice"; @@ -284,6 +287,8 @@ in group = "onlyoffice"; isSystemUser = true; }; + + nginx.extraGroups = [ "onlyoffice" ]; }; users.groups.onlyoffice = { }; diff --git a/nixos/modules/services/web-apps/pict-rs.nix b/nixos/modules/services/web-apps/pict-rs.nix index ad07507ca37db..0f13b2ae6db13 100644 --- a/nixos/modules/services/web-apps/pict-rs.nix +++ b/nixos/modules/services/web-apps/pict-rs.nix @@ -5,7 +5,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - 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 3f5900c55f151..0000000000000 --- a/nixos/modules/services/web-apps/pict-rs.xml +++ /dev/null @@ -1,185 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-pict-rs"> - <title>Pict-rs</title> - <para> - pict-rs is a a simple image hosting service. - </para> - <section xml:id="module-services-pict-rs-quickstart"> - <title>Quickstart</title> - <para> - the minimum to start pict-rs is - </para> - <programlisting language="nix"> -services.pict-rs.enable = true; -</programlisting> - <para> - this will start the http server on port 8080 by default. - </para> - </section> - <section xml:id="module-services-pict-rs-usage"> - <title>Usage</title> - <para> - pict-rs offers the following endpoints: - </para> - <itemizedlist> - <listitem> - <para> - <literal>POST /image</literal> for uploading an image. - Uploaded content must be valid multipart/form-data with an - image array located within the <literal>images[]</literal> key - </para> - <para> - This endpoint returns the following JSON structure on success - with a 201 Created status - </para> - <programlisting language="json"> -{ - "files": [ - { - "delete_token": "JFvFhqJA98", - "file": "lkWZDRvugm.jpg" - }, - { - "delete_token": "kAYy9nk2WK", - "file": "8qFS0QooAn.jpg" - }, - { - "delete_token": "OxRpM3sf0Y", - "file": "1hJaYfGE01.jpg" - } - ], - "msg": "ok" -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>GET /image/download?url=...</literal> Download an - image from a remote server, returning the same JSON payload as - the <literal>POST</literal> endpoint - </para> - </listitem> - <listitem> - <para> - <literal>GET /image/original/{file}</literal> for getting a - full-resolution image. <literal>file</literal> here is the - <literal>file</literal> key from the <literal>/image</literal> - endpoint’s JSON - </para> - </listitem> - <listitem> - <para> - <literal>GET /image/details/original/{file}</literal> for - getting the details of a full-resolution image. The returned - JSON is structured like so: - </para> - <programlisting language="json"> -{ - "width": 800, - "height": 537, - "content_type": "image/webp", - "created_at": [ - 2020, - 345, - 67376, - 394363487 - ] -} -</programlisting> - </listitem> - <listitem> - <para> - <literal>GET /image/process.{ext}?src={file}&...</literal> - get a file with transformations applied. existing - transformations include - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <literal>identity=true</literal>: apply no changes - </para> - </listitem> - <listitem> - <para> - <literal>blur={float}</literal>: apply a gaussian blur to - the file - </para> - </listitem> - <listitem> - <para> - <literal>thumbnail={int}</literal>: produce a thumbnail of - the image fitting inside an <literal>{int}</literal> by - <literal>{int}</literal> square using raw pixel sampling - </para> - </listitem> - <listitem> - <para> - <literal>resize={int}</literal>: produce a thumbnail of - the image fitting inside an <literal>{int}</literal> by - <literal>{int}</literal> square using a Lanczos2 filter. - This is slower than sampling but looks a bit better in - some cases - </para> - </listitem> - <listitem> - <para> - <literal>crop={int-w}x{int-h}</literal>: produce a cropped - version of the image with an <literal>{int-w}</literal> by - <literal>{int-h}</literal> 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. - </para> - </listitem> - </itemizedlist> - <para> - Supported <literal>ext</literal> file extensions include - <literal>png</literal>, <literal>jpg</literal>, and - <literal>webp</literal> - </para> - <para> - An example of usage could be - </para> - <programlisting> -GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 -</programlisting> - <para> - which would create a 256x256px JPEG thumbnail and blur it - </para> - </listitem> - <listitem> - <para> - <literal>GET /image/details/process.{ext}?src={file}&...</literal> - for getting the details of a processed image. The returned - JSON is the same format as listed for the full-resolution - details endpoint. - </para> - </listitem> - <listitem> - <para> - <literal>DELETE /image/delete/{delete_token}/{file}</literal> - or <literal>GET /image/delete/{delete_token}/{file}</literal> - to delete a file, where <literal>delete_token</literal> and - <literal>file</literal> are from the <literal>/image</literal> - endpoint’s JSON - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-pict-rs-missing"> - <title>Missing</title> - <itemizedlist spacing="compact"> - <listitem> - <para> - 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. - </para> - </listitem> - </itemizedlist> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index e5dc1b1036017..f64254d62524e 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 39ff004ffd95f..0000000000000 --- a/nixos/modules/services/web-apps/plausible.xml +++ /dev/null @@ -1,45 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-plausible"> - <title>Plausible</title> - <para> - <link xlink:href="https://plausible.io/">Plausible</link> is a - privacy-friendly alternative to Google analytics. - </para> - <section xml:id="module-services-plausible-basic-usage"> - <title>Basic Usage</title> - <para> - At first, a secret key is needed to be generated. This can be done - with e.g. - </para> - <programlisting> -$ openssl rand -base64 64 -</programlisting> - <para> - After that, <literal>plausible</literal> can be deployed like - this: - </para> - <programlisting> -{ - 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"; - }; - }; -} -</programlisting> - </section> -</chapter> diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 416ad8556bdda..d4c987da1144c 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -32,8 +32,8 @@ 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} ''; }; @@ -130,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; + } ''; }; diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 50213ec252ff2..f5a9cfac5d77f 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -35,7 +35,8 @@ let Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } '' mkdir -p $out - ${cfg.package}/bin/caddy fmt ${Caddyfile}/Caddyfile > $out/Caddyfile + cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile + caddy fmt --overwrite $out/Caddyfile ''; in "${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile"; diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 1c25d865f980c..2491c788d6c51 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -9,7 +9,7 @@ let in { meta = { - doc = ./garage.xml; + doc = ./garage.md; maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; }; diff --git a/nixos/modules/services/web-servers/garage.xml b/nixos/modules/services/web-servers/garage.xml deleted file mode 100644 index 6a16b1693dafd..0000000000000 --- a/nixos/modules/services/web-servers/garage.xml +++ /dev/null @@ -1,206 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-garage"> - <title>Garage</title> - <para> - <link xlink:href="https://garagehq.deuxfleurs.fr/">Garage</link> is - an open-source, self-hostable S3 store, simpler than MinIO, for - geodistributed stores. The server setup can be automated using - <link linkend="opt-services.garage.enable">services.garage</link>. A - client configured to your local Garage instance is available in the - global environment as <literal>garage-manage</literal>. - </para> - <para> - The current default by NixOS is <literal>garage_0_8</literal> which - is also the latest major version available. - </para> - <section xml:id="module-services-garage-upgrade-scenarios"> - <title>General considerations on upgrades</title> - <para> - Garage provides a cookbook documentation on how to upgrade: - <link xlink:href="https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/">https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/</link> - </para> - <warning> - <para> - Garage has two types of upgrades: patch-level upgrades and - minor/major version upgrades. - </para> - <para> - In all cases, you should read the changelog and ideally test the - upgrade on a staging cluster. - </para> - <para> - Checking the health of your cluster can be achieved using - <literal>garage-manage repair</literal>. - </para> - </warning> - <warning> - <para> - 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. - </para> - </warning> - <itemizedlist spacing="compact"> - <listitem> - <para> - <emphasis role="strong">Straightforward upgrades (patch-level - upgrades).</emphasis> Upgrades must be performed one by one, - i.e. for each node, stop it, upgrade it : change - <link linkend="opt-system.stateVersion">stateVersion</link> or - <link linkend="opt-services.garage.package">services.garage.package</link>, - restart it if it was not already by switching. - </para> - </listitem> - <listitem> - <para> - <emphasis role="strong">Multiple version upgrades.</emphasis> - Garage do not provide any guarantee on moving more than one - major-version forward. E.g., if you’re on - <literal>0.7</literal>, you cannot upgrade to - <literal>0.9</literal>. You need to upgrade to - <literal>0.8</literal> first. As long as - <link linkend="opt-system.stateVersion">stateVersion</link> is - declared properly, this is enforced automatically. The module - will issue a warning to remind the user to upgrade to latest - Garage <emphasis>after</emphasis> that deploy. - </para> - </listitem> - </itemizedlist> - </section> - <section xml:id="module-services-garage-advanced-upgrades"> - <title>Advanced upgrades (minor/major version upgrades)</title> - <para> - Here are some baseline instructions to handle advanced upgrades in - Garage, when in doubt, please refer to upstream instructions. - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - Disable API and web access to Garage. - </para> - </listitem> - <listitem> - <para> - Perform - <literal>garage-manage repair --all-nodes --yes tables</literal> - and - <literal>garage-manage repair --all-nodes --yes blocks</literal>. - </para> - </listitem> - <listitem> - <para> - Verify the resulting logs and check that data is synced - properly between all nodes. If you have time, do additional - checks (<literal>scrub</literal>, - <literal>block_refs</literal>, etc.). - </para> - </listitem> - <listitem> - <para> - Check if queues are empty by - <literal>garage-manage stats</literal> or through monitoring - tools. - </para> - </listitem> - <listitem> - <para> - Run <literal>systemctl stop garage</literal> to stop the - actual Garage version. - </para> - </listitem> - <listitem> - <para> - Backup the metadata folder of ALL your nodes, e.g. for a - metadata directory (the default one) in - <literal>/var/lib/garage/meta</literal>, you can run - <literal>pushd /var/lib/garage; tar -acf meta-v0.7.tar.zst meta/; popd</literal>. - </para> - </listitem> - <listitem> - <para> - Run the offline migration: - <literal>nix-shell -p garage_0_8 --run "garage offline-repair --yes"</literal>, - this can take some time depending on how many objects are - stored in your cluster. - </para> - </listitem> - <listitem> - <para> - Bump Garage version in your NixOS configuration, either by - changing - <link linkend="opt-system.stateVersion">stateVersion</link> or - bumping - <link linkend="opt-services.garage.package">services.garage.package</link>, - this should restart Garage automatically. - </para> - </listitem> - <listitem> - <para> - Perform - <literal>garage-manage repair --all-nodes --yes tables</literal> - and - <literal>garage-manage repair --all-nodes --yes blocks</literal>. - </para> - </listitem> - <listitem> - <para> - Wait for a full table sync to run. - </para> - </listitem> - </itemizedlist> - <para> - Your upgraded cluster should be in a working state, re-enable API - and web access. - </para> - </section> - <section xml:id="module-services-garage-maintainer-info"> - <title>Maintainer information</title> - <para> - 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. - </para> - <para> - 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 <literal>v0.8.0</literal> should be - available in <literal>nixpkgs</literal> as - <literal>pkgs.garage_0_8_0</literal>). 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 - <literal>garage</literal>-module should be updated to make sure - that the - <link linkend="opt-services.garage.package">package</link>-option - selects the latest version on fresh setups. - </para> - <para> - 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 - <literal><nixpkgs/pkgs/tools/filesystem/garage/default.nix></literal>): - </para> - <programlisting> -/* ... */ -{ - garage_0_7_3 = generic { - version = "0.7.3"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} -</programlisting> - <para> - 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. - </para> - </section> -</chapter> diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c723b962c8474..bc5b4be510985 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -117,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; @@ -184,25 +184,17 @@ let brotli_window 512k; brotli_min_length 256; brotli_types ${lib.concatStringsSep " " compressMimeTypes}; - brotli_buffers 32 8k; ''} + # https://docs.nginx.com/nginx/admin-guide/web-server/compression/ ${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_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 '' @@ -211,6 +203,9 @@ let 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. See the nginx blog for details: + # https://www.nginx.com/blog/avoiding-top-10-nginx-configuration-mistakes/#no-keepalives + proxy_set_header "Connection" ""; include ${recommendedProxyConfig}; ''} diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a693f3e2379a1..2d8addb0f10e3 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -109,6 +109,7 @@ in 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; @@ -214,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 [ @@ -232,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.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index dadfb421d3a87..79b2e7c6ead78 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; }; 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 6613f49eec7af..0000000000000 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ /dev/null @@ -1,261 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-gnome"> - <title>GNOME Desktop</title> - <para> - 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. - </para> - <section xml:id="sec-gnome-enable"> - <title>Enabling GNOME</title> - <para> - All of the core apps, optional apps, games, and core developer - tools from GNOME are available. - </para> - <para> - To enable the GNOME desktop use: - </para> - <programlisting> -services.xserver.desktopManager.gnome.enable = true; -services.xserver.displayManager.gdm.enable = true; -</programlisting> - <note> - <para> - 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 - <link linkend="sec-gnome-faq-can-i-use-lightdm-with-gnome">might - not work</link> without it. - </para> - </note> - <para> - The default applications used in NixOS are very minimal, inspired - by the defaults used in - <link xlink:href="https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/40.0/elements/core/meta-gnome-core-utilities.bst">gnome-build-meta</link>. - </para> - <section xml:id="sec-gnome-without-the-apps"> - <title>GNOME without the apps</title> - <para> - If you’d like to only use the GNOME desktop and not the apps, - you can disable them with: - </para> - <programlisting> -services.gnome.core-utilities.enable = false; -</programlisting> - <para> - and none of them will be installed. - </para> - <para> - If you’d only like to omit a subset of the core utilities, you - can use - <xref linkend="opt-environment.gnome.excludePackages" />. Note - that this mechanism can only exclude core utilities, games and - core developer tools. - </para> - </section> - <section xml:id="sec-gnome-disabling-services"> - <title>Disabling GNOME services</title> - <para> - It is also possible to disable many of the - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/b8ec4fd2a4edc4e30d02ba7b1a2cc1358f3db1d5/nixos/modules/services/x11/desktop-managers/gnome.nix#L329-L348">core - services</link>. For example, if you do not need indexing files, - you can disable Tracker with: - </para> - <programlisting> -services.gnome.tracker-miners.enable = false; -services.gnome.tracker.enable = false; -</programlisting> - <para> - Note, however, that doing so is not supported and might break - some applications. Notably, GNOME Music cannot work without - Tracker. - </para> - </section> - <section xml:id="sec-gnome-games"> - <title>GNOME games</title> - <para> - You can install all of the GNOME games with: - </para> - <programlisting> -services.gnome.games.enable = true; -</programlisting> - </section> - <section xml:id="sec-gnome-core-developer-tools"> - <title>GNOME core developer tools</title> - <para> - You can install GNOME core developer tools with: - </para> - <programlisting> -services.gnome.core-developer-tools.enable = true; -</programlisting> - </section> - </section> - <section xml:id="sec-gnome-enable-flashback"> - <title>Enabling GNOME Flashback</title> - <para> - 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: - </para> - <programlisting> -services.xserver.desktopManager.gnome.flashback.enableMetacity = true; -</programlisting> - <para> - It is also possible to create custom sessions that replace - Metacity with a different window manager using - <xref linkend="opt-services.xserver.desktopManager.gnome.flashback.customSessions" />. - </para> - <para> - The following example uses <literal>xmonad</literal> window - manager: - </para> - <programlisting> -services.xserver.desktopManager.gnome.flashback.customSessions = [ - { - wmName = "xmonad"; - wmLabel = "XMonad"; - wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; - enableGnomePanel = false; - } -]; -</programlisting> - </section> - <section xml:id="sec-gnome-icons-and-gtk-themes"> - <title>Icons and GTK Themes</title> - <para> - Icon themes and GTK themes don’t require any special option to - install in NixOS. - </para> - <para> - You can add them to - <xref linkend="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: - </para> - <programlisting> -/org/gnome/desktop/interface/gtk-theme -/org/gnome/desktop/interface/icon-theme -</programlisting> - <para> - in <literal>dconf-editor</literal> - </para> - </section> - <section xml:id="sec-gnome-shell-extensions"> - <title>Shell Extensions</title> - <para> - Most Shell extensions are packaged under the - <literal>gnomeExtensions</literal> attribute. Some packages that - include Shell extensions, like <literal>gnome.gpaste</literal>, - don’t have their extension decoupled under this attribute. - </para> - <para> - You can install them like any other package: - </para> - <programlisting> -environment.systemPackages = [ - gnomeExtensions.dash-to-dock - gnomeExtensions.gsconnect - gnomeExtensions.mpris-indicator-button -]; -</programlisting> - <para> - 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 - <link linkend="sec-gnome-gsettings-overrides">GSettings - override</link> for this on - <literal>org.gnome.shell.enabled-extensions</literal>, but that - will only influence the default value. - </para> - </section> - <section xml:id="sec-gnome-gsettings-overrides"> - <title>GSettings Overrides</title> - <para> - Majority of software building on the GNOME platform use GLib’s - <link xlink:href="https://developer.gnome.org/gio/unstable/GSettings.html">GSettings</link> - 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. - </para> - <para> - <link xlink:href="https://developer.gnome.org/gio/unstable/GSettings.html#id-1.4.19.2.9.25">GSettings - vendor overrides</link> 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. - </para> - <warning> - <para> - 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/54150">NixOS’s - dconf module implements changing values</link>, you will either - need to keep that in mind and clear the setting from the backend - using <literal>dconf reset</literal> command when that happens, - or use the - <link xlink:href="https://nix-community.github.io/home-manager/options.html#opt-dconf.settings">module - from home-manager</link>. - </para> - </warning> - <para> - You can override the default GSettings values using the - <xref linkend="opt-services.xserver.desktopManager.gnome.extraGSettingsOverrides" /> - option. - </para> - <para> - Take note that whatever packages you want to override GSettings - for, you need to add them to - <xref linkend="opt-services.xserver.desktopManager.gnome.extraGSettingsOverridePackages" />. - </para> - <para> - You can use <literal>dconf-editor</literal> tool to explore which - GSettings you can set. - </para> - <section xml:id="sec-gnome-gsettings-overrides-example"> - <title>Example</title> - <programlisting> -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 - ]; -}; -</programlisting> - </section> - </section> - <section xml:id="sec-gnome-faq"> - <title>Frequently Asked Questions</title> - <section xml:id="sec-gnome-faq-can-i-use-lightdm-with-gnome"> - <title>Can I use LightDM with GNOME?</title> - <para> - Yes you can, and any other display-manager in NixOS. - </para> - <para> - However, it doesn’t work correctly for the Wayland session of - GNOME Shell yet, and won’t be able to lock your screen. - </para> - <para> - See - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56342">this - issue.</link> - </para> - </section> - </section> -</chapter> diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index f5cc2d8187da5..7791a98965d1a 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; }; 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 0e98b08fb6580..0000000000000 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ /dev/null @@ -1,171 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-pantheon"> - <title>Pantheon Desktop</title> - <para> - 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. - </para> - <section xml:id="sec-pantheon-enable"> - <title>Enabling Pantheon</title> - <para> - All of Pantheon is working in NixOS and the applications should be - available, aside from a few - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/58161">exceptions</link>. - To enable Pantheon, set - </para> - <programlisting> -services.xserver.desktopManager.pantheon.enable = true; -</programlisting> - <para> - This automatically enables LightDM and Pantheon’s LightDM greeter. - If you’d like to disable this, set - </para> - <programlisting> -services.xserver.displayManager.lightdm.greeters.pantheon.enable = false; -services.xserver.displayManager.lightdm.enable = false; -</programlisting> - <para> - 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 - </para> - <programlisting> -services.pantheon.apps.enable = false; -</programlisting> - <para> - You can also use - <xref linkend="opt-environment.pantheon.excludePackages" /> to - remove any other app (like <literal>elementary-mail</literal>). - </para> - </section> - <section xml:id="sec-pantheon-wingpanel-switchboard"> - <title>Wingpanel and Switchboard plugins</title> - <para> - 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</option>) to start using it. - You should instead be using the following options: - </para> - <itemizedlist spacing="compact"> - <listitem> - <para> - <xref linkend="opt-services.xserver.desktopManager.pantheon.extraWingpanelIndicators" /> - </para> - </listitem> - <listitem> - <para> - <xref linkend="opt-services.xserver.desktopManager.pantheon.extraSwitchboardPlugs" /> - </para> - </listitem> - </itemizedlist> - <para> - to configure the programs with plugs or indicators. - </para> - <para> - 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: - </para> - <programlisting> -wingpanel-with-indicators.override { - indicators = [ - pkgs.some-special-indicator - ]; -}; - -switchboard-with-plugs.override { - plugs = [ - pkgs.some-special-plug - ]; -}; -</programlisting> - <para> - 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: - </para> - <programlisting> -wingpanel-with-indicators.override { - useDefaultIndicators = false; - indicators = specialListOfIndicators; -}; - -switchboard-with-plugs.override { - useDefaultPlugs = false; - plugs = specialListOfPlugs; -}; -</programlisting> - <para> - this could be most useful for testing a particular plug-in in - isolation. - </para> - </section> - <section xml:id="sec-pantheon-faq"> - <title>FAQ</title> - <variablelist spacing="compact"> - <varlistentry> - <term> - <anchor xml:id="sec-pantheon-faq-messed-up-theme" />I have - switched from a different desktop and Pantheon’s theming looks - messed up. - </term> - <listitem> - <para> - 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. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <anchor xml:id="sec-pantheon-faq-gnome-and-pantheon" />I - cannot enable both GNOME and Pantheon. - </term> - <listitem> - <para> - This is a known - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/64611">issue</link> - and there is no known workaround. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <anchor xml:id="sec-pantheon-faq-appcenter" />Does AppCenter - work, or is it available? - </term> - <listitem> - <para> - 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 - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/15932">issue</link>. - </para> - <para> - If you are using Pantheon, AppCenter should be installed by - default if you have - <link linkend="module-services-flatpak">Flatpak - support</link> enabled. If you also wish to add the - <literal>appcenter</literal> Flatpak remote: - </para> - <programlisting> -$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo -</programlisting> - </listitem> - </varlistentry> - </variablelist> - </section> -</chapter> diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b295b9a109b6d..73322696aeac6 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -28,52 +28,11 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; - inherit (pkgs) writeText; inherit (lib) getBin optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; - ini = pkgs.formats.ini { }; - - gtkrc2 = writeText "gtkrc-2.0" '' - # Default GTK+ 2 config for NixOS Plasma 5 - include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" - style "user-font" - { - font_name="Sans Serif Regular" - } - widget_class "*" style "user-font" - gtk-font-name="Sans Serif Regular 10" - gtk-theme-name="Breeze" - gtk-icon-theme-name="breeze" - gtk-fallback-icon-theme="hicolor" - gtk-cursor-theme-name="breeze_cursors" - gtk-toolbar-style=GTK_TOOLBAR_ICONS - gtk-menu-images=1 - gtk-button-images=1 - ''; - - gtk3_settings = ini.generate "settings.ini" { - Settings = { - gtk-font-name = "Sans Serif Regular 10"; - gtk-theme-name = "Breeze"; - gtk-icon-theme-name = "breeze"; - gtk-fallback-icon-theme = "hicolor"; - gtk-cursor-theme-name = "breeze_cursors"; - gtk-toolbar-style = "GTK_TOOLBAR_ICONS"; - gtk-menu-images = 1; - gtk-button-images = 1; - }; - }; - - kcminputrc = ini.generate "kcminputrc" { - Mouse = { - cursorTheme = "breeze_cursors"; - cursorSize = 0; - }; - }; - activationScript = '' ${set_XDG_CONFIG_HOME} @@ -119,37 +78,6 @@ let XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config} ''; - startplasma = '' - ${set_XDG_CONFIG_HOME} - mkdir -p "''${XDG_CONFIG_HOME}" - '' + optionalString config.hardware.pulseaudio.enable '' - # Load PulseAudio module for routing support. - # See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - '' + '' - ${activationScript} - - # Create default configurations if Plasma has never been started. - kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals" - if ! [ -f "$kdeglobals" ]; then - kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc" - if ! [ -f "$kcminputrc" ]; then - cat ${kcminputrc} >"$kcminputrc" - fi - - gtkrc2="$HOME/.gtkrc-2.0" - if ! [ -f "$gtkrc2" ]; then - cat ${gtkrc2} >"$gtkrc2" - fi - - gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini" - if ! [ -f "$gtk3_settings" ]; then - mkdir -p "$(dirname "$gtk3_settings")" - cat ${gtk3_settings} >"$gtk3_settings" - fi - fi - ''; - in { @@ -162,8 +90,8 @@ in phononBackend = mkOption { type = types.enum [ "gstreamer" "vlc" ]; - default = "gstreamer"; - example = "vlc"; + default = "vlc"; + example = "gstreamer"; description = lib.mdDoc "Phonon audio backend to install."; }; @@ -365,6 +293,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 @@ -387,7 +316,8 @@ in ++ lib.optional config.services.colord.enable pkgs.colord-kde ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ] - ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet; + ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet + ++ lib.optional config.services.flatpak.enable flatpak-kcm; # Extra services for D-Bus activation services.dbus.packages = [ @@ -449,12 +379,7 @@ in security.pam.services.kde = { allowNullPassword = true; }; - # Doing these one by one seems silly, but we currently lack a better - # construct for handling common pam configs. - security.pam.services.gdm.enableKwallet = true; - security.pam.services.kdm.enableKwallet = true; - security.pam.services.lightdm.enableKwallet = true; - security.pam.services.sddm.enableKwallet = true; + security.pam.services.login.enableKwallet = true; systemd.user.services = { plasma-early-setup = mkIf cfg.runUsingSystemd { @@ -473,7 +398,6 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; - services.xserver.displayManager.setupCommands = startplasma; nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) @@ -520,6 +444,7 @@ in dolphin-plugins ffmpegthumbs kdegraphics-thumbnailers + pkgs.kio-admin kio-extras ]; optionalPackages = [ diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f74e8efb8f640..65f414705fc51 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 a3f03d7a19a6b..0ddeac0f10984 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -215,10 +215,12 @@ in }; security.pam.services = { - sddm = { - allowNullPassword = true; - startSession = true; - }; + sddm.text = '' + auth substack login + account include login + password substack login + session include login + ''; sddm-greeter.text = '' auth required pam_succeed_if.so audit quiet_success user = sddm diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 574657a50c82d..9c88d12ca6f29 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -106,9 +106,9 @@ in description = lib.mdDoc '' Extra custom layouts that will be included in the xkb configuration. Information on how to create a new layout can be found here: - [](https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts). + <https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts>. For more examples see - [](https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples) + <https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples> ''; }; diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 7f817e5d350da..98db67e7c00e0 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -316,11 +316,13 @@ in { mkdir -p -m 0755 /run/binfmt ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ''; - systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ - "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - "systemd-binfmt.service" - ]; - systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { + additionalUpstreamSystemUnits = [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; + services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + }; }; } diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 701d242abc154..125f75d667069 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -128,13 +128,13 @@ in HostKey ${initrdKeyPath path} '')} - KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms} - Ciphers ${concatStringsSep "," sshdCfg.ciphers} - MACs ${concatStringsSep "," sshdCfg.macs} + KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms} + Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers} + MACs ${concatStringsSep "," sshdCfg.settings.Macs} - LogLevel ${sshdCfg.logLevel} + LogLevel ${sshdCfg.settings.LogLevel} - ${if sshdCfg.useDns then '' + ${if sshdCfg.settings.UseDns then '' UseDNS yes '' else '' UseDNS no diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 8f203b2c8b328..0298e28f32897 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -20,7 +20,7 @@ in ###### interface options = { - boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel.") // { + boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel") // { default = true; }; diff --git a/nixos/modules/system/boot/loader/external/external.nix b/nixos/modules/system/boot/loader/external/external.nix index 7c5455bb47aa2..926cbd2b4b3f3 100644 --- a/nixos/modules/system/boot/loader/external/external.nix +++ b/nixos/modules/system/boot/loader/external/external.nix @@ -8,7 +8,7 @@ in { meta = { maintainers = with maintainers; [ cole-h grahamc raitobezarius ]; - doc = ./external.xml; + doc = ./external.md; }; options.boot.loader.external = { diff --git a/nixos/modules/system/boot/loader/external/external.xml b/nixos/modules/system/boot/loader/external/external.xml deleted file mode 100644 index 9a392c27441d9..0000000000000 --- a/nixos/modules/system/boot/loader/external/external.xml +++ /dev/null @@ -1,43 +0,0 @@ -<!-- Do not edit this file directly, edit its companion .md instead - and regenerate this file using nixos/doc/manual/md-to-db.sh --> -<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-bootloader-external"> - <title>External Bootloader Backends</title> - <para> - 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. - </para> - <para> - You can replace the built-in bootloader support with your own - tooling using the <quote>external</quote> bootloader option. - </para> - <para> - Imagine you have created a new package called FooBoot. FooBoot - provides a program at - <literal>${pkgs.fooboot}/bin/fooboot-install</literal> which takes - the system closure’s path as its only argument and configures the - system’s bootloader. - </para> - <para> - You can enable FooBoot like this: - </para> - <programlisting language="nix"> -{ pkgs, ... }: { - boot.loader.external = { - enable = true; - installHook = "${pkgs.fooboot}/bin/fooboot-install"; - }; -} -</programlisting> - <section xml:id="sec-bootloader-external-developing"> - <title>Developing Custom Bootloader Backends</title> - <para> - Bootloaders should use - <link xlink:href="https://github.com/NixOS/rfcs/pull/125">RFC-0125</link>’s - Bootspec format and synthesis tools to identify the key properties - for bootable system generations. - </para> - </section> -</chapter> diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 03d03cb348e82..cdb5d8bf3c26f 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -929,7 +929,14 @@ in ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []); # copy the cryptsetup binary and it's dependencies - boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' + boot.initrd.extraUtilsCommands = let + pbkdf2-sha512 = pkgs.runCommandCC "pbkdf2-sha512" { buildInputs = [ pkgs.openssl ]; } '' + mkdir -p "$out/bin" + cc -O3 -lcrypto ${./pbkdf2-sha512.c} -o "$out/bin/pbkdf2-sha512" + strip -s "$out/bin/pbkdf2-sha512" + ''; + in + mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup copy_bin_and_libs ${askPass}/bin/cryptsetup-askpass sed -i s,/bin/sh,$out/bin/sh, $out/bin/cryptsetup-askpass @@ -939,9 +946,7 @@ in copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl - cc -O3 -I${pkgs.openssl.dev}/include -L${lib.getLib pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto - strip -s pbkdf2-sha512 - copy_bin_and_libs pbkdf2-sha512 + copy_bin_and_libs ${pbkdf2-sha512}/bin/pbkdf2-sha512 mkdir -p $out/etc/ssl cp -pdv ${pkgs.openssl.out}/etc/ssl/openssl.cnf $out/etc/ssl diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 9b6472fea4293..a1ab709385756 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.nix b/nixos/modules/system/boot/stage-1.nix index 4fcaeebffc3b2..d26ea7597c450 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 } diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index c2ca973d38074..03ef00e5683c1 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/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 620d76aef20d8..cf76704577fd0 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -118,7 +118,7 @@ let name = "initrd-bin-env"; paths = map getBin cfg.initrdBin; pathsToLink = ["/bin" "/sbin"]; - postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -s '${v}' $out/bin/'${n}'") cfg.extraBin); + postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -sf '${v}' $out/bin/'${n}'") cfg.extraBin); }; initialRamdisk = pkgs.makeInitrdNG { @@ -427,9 +427,6 @@ in { # fido2 support "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" "${pkgs.libfido2}/lib/libfido2.so.1" - - # the unwrapped systemd-cryptsetup executable - "${cfg.package}/lib/systemd/.systemd-cryptsetup-wrapped" ] ++ jobScripts; targets.initrd.aliases = ["default.target"]; @@ -495,7 +492,7 @@ in { # If we are not booting a NixOS closure (e.g. init=/bin/sh), # we don't know what root to prepare so we don't do anything - if ! [ -x "/sysroot$closure/prepare-root" ]; then + if ! [ -x "/sysroot$(readlink "/sysroot$closure/prepare-root" || echo "$closure/prepare-root")" ]; then echo "NEW_INIT=''${initParam[1]}" > /etc/switch-root.conf echo "$closure does not look like a NixOS installation - not activating" exit 0 diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix new file mode 100644 index 0000000000000..8f3a700237700 --- /dev/null +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -0,0 +1,123 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.systemd.repart; + initrdCfg = config.boot.initrd.systemd.repart; + + writeDefinition = name: partitionConfig: pkgs.writeText + "${name}.conf" + (lib.generators.toINI { } { Partition = partitionConfig; }); + + listOfDefinitions = lib.mapAttrsToList + writeDefinition + (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions); + + # Create a directory in the store that contains a copy of all definition + # files. This is then passed to systemd-repart in the initrd so it can access + # the definition files after the sysroot has been mounted but before + # activation. This needs a hard copy of the files and not just symlinks + # because otherwise the files do not show up in the sysroot. + definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } '' + mkdir -p $out + ${(lib.concatStringsSep "\n" + (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions) + )} + ''; +in +{ + options = { + boot.initrd.systemd.repart.enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // { + description = lib.mdDoc '' + Grow and add partitions to a partition table at boot time in the initrd. + systemd-repart only works with GPT partition tables. + + To run systemd-repart after the initrd, see + `options.systemd.repart.enable`. + ''; + }; + + systemd.repart = { + enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // { + description = lib.mdDoc '' + Grow and add partitions to a partition table. + systemd-repart only works with GPT partition tables. + + To run systemd-repart while in the initrd, see + `options.boot.initrd.systemd.repart.enable`. + ''; + }; + + partitions = lib.mkOption { + type = with lib.types; attrsOf (attrsOf (oneOf [ str int bool ])); + default = { }; + example = { + "10-root" = { + Type = "root"; + }; + "20-home" = { + Type = "home"; + SizeMinBytes = "512M"; + SizeMaxBytes = "2G"; + }; + }; + description = lib.mdDoc '' + Specify partitions as a set of the names of the definition files as the + key and the partition configuration as its value. The partition + configuration can use all upstream options. See <link + xlink:href="https://www.freedesktop.org/software/systemd/man/repart.d.html"/> + for all available options. + ''; + }; + }; + }; + + config = lib.mkIf (cfg.enable || initrdCfg.enable) { + # Always link the definitions into /etc so that they are also included in + # the /nix/store of the sysroot during early userspace (i.e. while in the + # initrd). + environment.etc."repart.d".source = definitionsDirectory; + + boot.initrd.systemd = lib.mkIf initrdCfg.enable { + additionalUpstreamUnits = [ + "systemd-repart.service" + ]; + + storePaths = [ + "${config.boot.initrd.systemd.package}/bin/systemd-repart" + ]; + + # Override defaults in upstream unit. + services.systemd-repart = { + # Unset the conditions as they cannot be met before activation because + # the definition files are not stored in the expected locations. + unitConfig.ConditionDirectoryNotEmpty = [ + " " # required to unset the previous value. + ]; + serviceConfig = { + # systemd-repart runs before the activation script. Thus we cannot + # rely on them being linked in /etc already. Instead we have to + # explicitly pass their location in the sysroot to the binary. + ExecStart = [ + " " # required to unset the previous value. + ''${config.boot.initrd.systemd.package}/bin/systemd-repart \ + --definitions=/sysroot${definitionsDirectory} \ + --dry-run=no + '' + ]; + }; + # Because the initrd does not have the `initrd-usr-fs.target` the + # upestream unit runs too early in the boot process, before the sysroot + # is available. However, systemd-repart needs access to the sysroot to + # find the definition files. + after = [ "sysroot.mount" ]; + }; + }; + + systemd = lib.mkIf cfg.enable { + additionalUpstreamSystemUnits = [ + "systemd-repart.service" + ]; + }; + }; + +} diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix index 450b805f0f580..76344f5f87eaf 100644 --- a/nixos/modules/tasks/filesystems/envfs.nix +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -7,11 +7,11 @@ let device = "none"; fsType = "envfs"; options = [ - "fallback-path=${pkgs.runCommand "fallback-path" {} '' + "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 - ''}" + ln -s ${config.environment.usrbinenv} $out/env + ln -s ${config.environment.binsh} $out/sh + '' + cfg.extraFallbackPathCommands)}" ]; }; "/bin" = { @@ -31,11 +31,19 @@ in { 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"; + description = lib.mdDoc "Which package to use for the envfs."; + }; + + extraFallbackPathCommands = lib.mkOption { + type = lib.types.lines; + default = ""; + example = "ln -s $''{pkgs.bash}/bin/bash $out/bash"; + description = lib.mdDoc "Extra commands to run in the package that contains fallback executables in case not other executable is found"; }; }; }; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index e6c2c72339fd7..aa44f26426970 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -25,11 +25,7 @@ in config = { - assertions = [ - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; - message = "ENA driver fails to build with kernel >= 5.17"; - } - ]; + assertions = [ ]; boot.growPartition = true; diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 926fe43b0ffe6..3ea4a6cf78183 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -28,13 +28,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/docker.nix b/nixos/modules/virtualisation/docker.nix index d9bd10ba1fc8f..046b8e2f79010 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -100,7 +100,7 @@ in logDriver = mkOption { - type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"]; + type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs" "local"]; default = "journald"; description = lib.mdDoc '' @@ -163,7 +163,7 @@ in ###### implementation config = mkIf cfg.enable (mkMerge [{ - boot.kernelModules = [ "bridge" "veth" ]; + boot.kernelModules = [ "bridge" "veth" "br_netfilter" "xt_nat" ]; boot.kernel.sysctl = { "net.ipv4.conf.all.forwarding" = mkOverride 98 true; "net.ipv4.conf.default.forwarding" = mkOverride 98 true; diff --git a/nixos/modules/virtualisation/linode-config.nix b/nixos/modules/virtualisation/linode-config.nix index d664e8269f411..bbf81bda9c024 100644 --- a/nixos/modules/virtualisation/linode-config.nix +++ b/nixos/modules/virtualisation/linode-config.nix @@ -6,8 +6,8 @@ with lib; services.openssh = { enable = true; - permitRootLogin = "prohibit-password"; - passwordAuthentication = mkDefault false; + settings.PermitRootLogin = "prohibit-password"; + settings.PasswordAuthentication = mkDefault false; }; networking = { diff --git a/nixos/modules/virtualisation/multipass.nix b/nixos/modules/virtualisation/multipass.nix new file mode 100644 index 0000000000000..6ef7de4b2bf50 --- /dev/null +++ b/nixos/modules/virtualisation/multipass.nix @@ -0,0 +1,61 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.virtualisation.multipass; +in +{ + options = { + virtualisation.multipass = { + enable = lib.mkEnableOption (lib.mdDoc '' + Multipass, a simple manager for virtualised Ubuntu instances. + ''); + + logLevel = lib.mkOption { + type = lib.types.enum [ "error" "warning" "info" "debug" "trace" ]; + default = "debug"; + description = lib.mdDoc '' + The logging verbosity of the multipassd binary. + ''; + }; + + package = lib.mkPackageOptionMD pkgs "multipass" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.multipass = { + description = "Multipass orchestrates virtual Ubuntu instances."; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + + environment = { + "XDG_DATA_HOME" = "/var/lib/multipass/data"; + "XDG_CACHE_HOME" = "/var/lib/multipass/cache"; + "XDG_CONFIG_HOME" = "/var/lib/multipass/config"; + }; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}"; + SyslogIdentifier = "multipassd"; + Restart = "on-failure"; + TimeoutStopSec = 300; + Type = "simple"; + + WorkingDirectory = "/var/lib/multipass"; + + StateDirectory = "multipass"; + StateDirectoryMode = "0750"; + CacheDirectory = "multipass"; + CacheDirectoryMode = "0750"; + }; + }; + }; +} diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index e1e640c447425..669981da59740 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -514,6 +514,7 @@ in }; in [ extraConfig ] ++ (map (x: x.value) defs); prefix = [ "containers" name ]; + inherit (config) specialArgs; }).config; }; }; @@ -555,6 +556,16 @@ in ''; }; + specialArgs = mkOption { + type = types.attrsOf types.unspecified; + default = {}; + description = lib.mdDoc '' + A set of special arguments to be passed to NixOS modules. + This will be merged into the `specialArgs` used to evaluate + the NixOS configurations. + ''; + }; + ephemeral = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/virtualisation/openstack-options.nix b/nixos/modules/virtualisation/openstack-options.nix index c71b581b02ca7..52f45de92ecbb 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 6c00fabaa1858..83ddba3ce06ef 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -7,6 +7,8 @@ let podmanPackage = (pkgs.podman.override { extraPackages = cfg.extraPackages + # setuid shadow + ++ [ "/run/wrappers" ] ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; }); @@ -181,10 +183,6 @@ in systemd.packages = [ cfg.package ]; - systemd.services.podman.serviceConfig = { - ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; - }; - systemd.services.podman-prune = { description = "Prune podman resources"; @@ -205,10 +203,6 @@ in systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; - systemd.user.services.podman.serviceConfig = { - ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; - }; - systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.tmpfiles.packages = [ diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 933a9c539e48b..06210529eb8c4 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -545,8 +545,7 @@ in virtualisation.vlans = mkOption { type = types.listOf types.ints.unsigned; - default = if config.virtualisation.interfaces == {} then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; + default = [ 1 ]; example = [ 1 2 ]; description = lib.mdDoc '' @@ -561,35 +560,6 @@ in ''; }; - virtualisation.interfaces = mkOption { - default = {}; - example = { - enp1s0.vlan = 1; - }; - description = lib.mdDoc '' - Network interfaces to add to the VM. - ''; - type = with types; attrsOf (submodule { - options = { - vlan = mkOption { - type = types.ints.unsigned; - description = lib.mdDoc '' - VLAN to which the network interface is connected. - ''; - }; - - assignIP = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Automatically assign an IP address to the network interface using the same scheme as - virtualisation.vlans. - ''; - }; - }; - }); - }; - virtualisation.writableStore = mkOption { type = types.bool; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 2ea23d958cf77..bb42e6de069bd 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -107,6 +107,46 @@ in { }; }); }; + postExportCommands = mkOption { + type = types.lines; + default = ""; + example = '' + ${pkgs.cot}/bin/cot edit-hardware "$fn" \ + -v vmx-14 \ + --nics 2 \ + --nic-types VMXNET3 \ + --nic-names 'Nic name' \ + --nic-networks 'Nic match' \ + --network-descriptions 'Nic description' \ + --scsi-subtypes VirtualSCSI + ''; + description = lib.mdDoc '' + Extra commands to run after exporting the OVA to `$fn`. + ''; + }; + storageController = mkOption { + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + example = { + name = "SCSI"; + add = "scsi"; + portcount = 16; + bootable = "on"; + hostiocache = "on"; + }; + default = { + name = "SATA"; + add = "sata"; + portcount = 4; + bootable = "on"; + hostiocache = "on"; + }; + description = lib.mdDoc '' + Parameters passed to the VirtualBox appliance. Must have at least + `name`. + + Run `VBoxManage storagectl --help` to see more options. + ''; + }; }; }; @@ -167,11 +207,11 @@ in { VBoxManage modifyvm "$vmName" \ --memory ${toString cfg.memorySize} \ ${lib.cli.toGNUCommandLineShell { } cfg.params} - VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on - VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ + VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ --medium disk.vmdk ${optionalString (cfg.extraDisk != null) '' - VBoxManage storageattach "$vmName" --storagectl SATA --port 1 --device 0 --type hdd \ + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ --medium data-disk.vmdk ''} @@ -179,6 +219,7 @@ in { mkdir -p $out fn="$out/${cfg.vmFileName}" VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams} + ${cfg.postExportCommands} rm -v $diskImage diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ed698b63ee63d..9652be5d85b4d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -131,8 +131,7 @@ in rec { (onFullSupported "nixos.tests.networking.networkd.virtual") (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") - # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 - #(onFullSupported "nixos.tests.nfs3.simple") + (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman") (onFullSupported "nixos.tests.openssh") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index deb428d1bec05..05ff9ca2499f1 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -39,8 +39,7 @@ in rec { login misc nat - # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 - #nfs3 + nfs3 openssh php predictable-interface-names @@ -122,8 +121,7 @@ in rec { "nixos.tests.nat.firewall-conntrack" "nixos.tests.nat.firewall" "nixos.tests.nat.standalone" - # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 - #"nixos.tests.nfs3.simple" + "nixos.tests.nfs3.simple" "nixos.tests.openssh" "nixos.tests.php.fpm" "nixos.tests.php.pcre" diff --git a/nixos/release.nix b/nixos/release.nix index 946379bcd6611..78a74af41242f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -144,7 +144,6 @@ in rec { manual = manualHTML; # TODO(@oxij): remove eventually manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub)); manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages); - manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources); options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b839d539c9f51..785a5621f57eb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -92,6 +92,7 @@ in { bcachefs = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bcachefs.nix {}; beanstalkd = handleTest ./beanstalkd.nix {}; bees = handleTest ./bees.nix {}; + binary-cache = handleTest ./binary-cache.nix {}; bind = handleTest ./bind.nix {}; bird = handleTest ./bird.nix {}; bitcoind = handleTest ./bitcoind.nix {}; @@ -126,6 +127,7 @@ 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 {}; @@ -133,8 +135,10 @@ in { cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; cloudlog = handleTest ./cloudlog.nix {}; cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; + cockpit = handleTest ./cockpit.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 {}; @@ -224,6 +228,7 @@ in { fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; + forgejo = handleTest ./gitea.nix { giteaPackage = pkgs.forgejo; }; freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; @@ -237,7 +242,7 @@ in { geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; gitdaemon = handleTest ./gitdaemon.nix {}; - gitea = handleTest ./gitea.nix {}; + gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; gitlab = handleTest ./gitlab.nix {}; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; @@ -245,6 +250,7 @@ in { gnome = handleTest ./gnome.nix {}; gnome-flashback = handleTest ./gnome-flashback.nix {}; gnome-xorg = handleTest ./gnome-xorg.nix {}; + gnupg = handleTest ./gnupg.nix {}; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; @@ -363,6 +369,7 @@ in { login = handleTest ./login.nix {}; logrotate = handleTest ./logrotate.nix {}; loki = handleTest ./loki.nix {}; + luks = handleTest ./luks.nix {}; lvm2 = handleTest ./lvm2 {}; lxd = handleTest ./lxd.nix {}; lxd-nftables = handleTest ./lxd-nftables.nix {}; @@ -396,6 +403,7 @@ in { 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 {}; @@ -409,8 +417,11 @@ in { mpd = handleTest ./mpd.nix {}; mpv = handleTest ./mpv.nix {}; mtp = handleTest ./mtp.nix {}; + multipass = handleTest ./multipass.nix {}; mumble = handleTest ./mumble.nix {}; - musescore = handleTest ./musescore.nix {}; + # Fails on aarch64-linux at the PDF creation step - need to debug this on an + # aarch64 machine.. + musescore = handleTestOn ["x86_64-linux"] ./musescore.nix {}; munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; mxisd = handleTest ./mxisd.nix {}; @@ -481,10 +492,12 @@ in { ombi = handleTest ./ombi.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; + opensearch = discoverTests (import ./opensearch.nix); openresty-lua = handleTest ./openresty-lua.nix {}; 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 {}; @@ -511,7 +524,6 @@ in { 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 {}; @@ -636,6 +648,7 @@ in { systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-coredump = handleTest ./systemd-coredump.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; + systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix {}; systemd-escaping = handleTest ./systemd-escaping.nix {}; systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {}; systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix {}; @@ -646,6 +659,7 @@ in { systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; }; systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {}; systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {}; + systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; @@ -657,6 +671,7 @@ in { systemd-nspawn = handleTest ./systemd-nspawn.nix {}; systemd-oomd = handleTest ./systemd-oomd.nix {}; systemd-portabled = handleTest ./systemd-portabled.nix {}; + systemd-repart = handleTest ./systemd-repart.nix {}; systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {}; @@ -750,6 +765,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/apfs.nix b/nixos/tests/apfs.nix index a8841fe93046e..ac0459b57e9ce 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/binary-cache.nix b/nixos/tests/binary-cache.nix new file mode 100644 index 0000000000000..0809e59e5a115 --- /dev/null +++ b/nixos/tests/binary-cache.nix @@ -0,0 +1,62 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "binary-cache"; + meta.maintainers = with maintainers; [ thomasjm ]; + + nodes.machine = + { pkgs, ... }: { + imports = [ ../modules/installer/cd-dvd/channel.nix ]; + environment.systemPackages = with pkgs; [python3]; + system.extraDependencies = with pkgs; [hello.inputDerivation]; + nix.extraOptions = '' + experimental-features = nix-command + ''; + }; + + testScript = '' + # Build the cache, then remove it from the store + cachePath = machine.succeed("nix-build --no-out-link -E 'with import <nixpkgs> {}; mkBinaryCache { rootPaths = [hello]; }'").strip() + machine.succeed("cp -r %s/. /tmp/cache" % cachePath) + machine.succeed("nix-store --delete " + cachePath) + + # Sanity test of cache structure + status, stdout = machine.execute("ls /tmp/cache") + cache_files = stdout.split() + assert ("nix-cache-info" in cache_files) + assert ("nar" in cache_files) + + # Nix store ping should work + machine.succeed("nix store ping --store file:///tmp/cache") + + # Cache should contain a .narinfo referring to "hello" + grepLogs = machine.succeed("grep -l 'StorePath: /nix/store/[[:alnum:]]*-hello-.*' /tmp/cache/*.narinfo") + + # Get the store path referenced by the .narinfo + narInfoFile = grepLogs.strip() + narInfoContents = machine.succeed("cat " + narInfoFile) + import re + match = re.match(r"^StorePath: (/nix/store/[a-z0-9]*-hello-.*)$", narInfoContents, re.MULTILINE) + if not match: raise Exception("Couldn't find hello store path in cache") + storePath = match[1] + + # Delete the store path + machine.succeed("nix-store --delete " + storePath) + machine.succeed("[ ! -d %s ] || exit 1" % storePath) + + # Should be able to build hello using the cache + logs = machine.succeed("nix-build -A hello '<nixpkgs>' --option require-sigs false --option trusted-substituters file:///tmp/cache --option substituters file:///tmp/cache 2>&1") + logLines = logs.split("\n") + if not "this path will be fetched" in logLines[0]: raise Exception("Unexpected first log line") + def shouldBe(got, desired): + if got != desired: raise Exception("Expected '%s' but got '%s'" % (desired, got)) + shouldBe(logLines[1], " " + storePath) + shouldBe(logLines[2], "copying path '%s' from 'file:///tmp/cache'..." % storePath) + shouldBe(logLines[3], storePath) + + # Store path should exist in the store now + machine.succeed("[ -d %s ] || exit 1" % storePath) + ''; +}) diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 5868e3bfcb4cc..5dc97404772be 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/chrony-ptp.nix b/nixos/tests/chrony-ptp.nix new file mode 100644 index 0000000000000..b2634a8cfc5c6 --- /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/cockpit.nix b/nixos/tests/cockpit.nix new file mode 100644 index 0000000000000..4a4983f9bc4e6 --- /dev/null +++ b/nixos/tests/cockpit.nix @@ -0,0 +1,135 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + user = "alice"; # from ./common/user-account.nix + password = "foobar"; # from ./common/user-account.nix + in { + name = "cockpit"; + meta = { + maintainers = with lib.maintainers; [ lucasew ]; + }; + nodes = { + server = { config, ... }: { + imports = [ ./common/user-account.nix ]; + security.polkit.enable = true; + users.users.${user} = { + extraGroups = [ "wheel" ]; + }; + services.cockpit = { + enable = true; + openFirewall = true; + settings = { + WebService = { + Origins = "https://server:9090"; + }; + }; + }; + }; + client = { config, ... }: { + imports = [ ./common/user-account.nix ]; + environment.systemPackages = let + seleniumScript = pkgs.writers.writePython3Bin "selenium-script" { + libraries = with pkgs.python3Packages; [ selenium ]; + } '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + from time import sleep + + + def log(msg): + from sys import stderr + print(f"[*] {msg}", file=stderr) + + + log("Initializing") + + options = Options() + options.add_argument("--headless") + + driver = webdriver.Firefox(options=options) + + driver.implicitly_wait(10) + + log("Opening homepage") + driver.get("https://server:9090") + + wait = WebDriverWait(driver, 60) + + + def wait_elem(by, query): + wait.until(EC.presence_of_element_located((by, query))) + + + def wait_title_contains(title): + wait.until(EC.title_contains(title)) + + + def find_element(by, query): + return driver.find_element(by, query) + + + def set_value(elem, value): + script = 'arguments[0].value = arguments[1]' + return driver.execute_script(script, elem, value) + + + log("Waiting for the homepage to load") + + # cockpit sets initial title as hostname + wait_title_contains("server") + wait_elem(By.CSS_SELECTOR, 'input#login-user-input') + + log("Homepage loaded!") + + log("Filling out username") + login_input = find_element(By.CSS_SELECTOR, 'input#login-user-input') + set_value(login_input, "${user}") + + log("Filling out password") + password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input') + set_value(password_input, "${password}") + + log("Submiting credentials for login") + driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() + + # driver.implicitly_wait(1) + # driver.get("https://server:9090/system") + + log("Waiting dashboard to load") + wait_title_contains("${user}@server") + + log("Waiting for the frontend to initalize") + sleep(1) + + log("Looking for that banner that tells about limited access") + container_iframe = find_element(By.CSS_SELECTOR, 'iframe.container-frame') + driver.switch_to.frame(container_iframe) + + assert "Web console is running in limited access mode" in driver.page_source + + driver.close() + ''; + in with pkgs; [ firefox-unwrapped geckodriver seleniumScript ]; + }; + }; + + testScript = '' + start_all() + + server.wait_for_open_port(9090) + server.wait_for_unit("network.target") + server.wait_for_unit("multi-user.target") + server.systemctl("start", "polkit") + + client.wait_for_unit("multi-user.target") + + client.succeed("curl -k https://server:9090 -o /dev/stderr") + print(client.succeed("whoami")) + client.succeed('PYTHONUNBUFFERED=1 selenium-script') + ''; + } +) diff --git a/nixos/tests/connman.nix b/nixos/tests/connman.nix new file mode 100644 index 0000000000000..348b2a895a632 --- /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/cups-pdf.nix b/nixos/tests/cups-pdf.nix index 70d14f29e2e5d..957b0296a755b 100644 --- a/nixos/tests/cups-pdf.nix +++ b/nixos/tests/cups-pdf.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { testScript = '' from subprocess import run - machine.wait_for_unit("cups.service") + machine.wait_for_unit("multi-user.target") for name in ("opt", "noopt"): text = f"test text {name}".upper() machine.wait_until_succeeds(f"lpstat -v {name}") diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index 35ca083c6c4e0..c79ba41c2eb9c 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -40,7 +40,7 @@ import ./make-test-python.nix ( networking.extraHosts = '' 127.0.0.1 ${discourseDomain} - ${nodes.client.config.networking.primaryIPAddress} ${clientDomain} + ${nodes.client.networking.primaryIPAddress} ${clientDomain} ''; services.postfix = { @@ -90,7 +90,7 @@ import ./make-test-python.nix ( networking.extraHosts = '' 127.0.0.1 ${clientDomain} - ${nodes.discourse.config.networking.primaryIPAddress} ${discourseDomain} + ${nodes.discourse.networking.primaryIPAddress} ${discourseDomain} ''; services.dovecot2 = { @@ -178,8 +178,8 @@ import ./make-test-python.nix ( discourse.wait_until_succeeds("curl -sS -f https://${discourseDomain}") discourse.succeed( "curl -sS -f https://${discourseDomain}/session/csrf -c cookie -b cookie -H 'Accept: application/json' | jq -r '\"X-CSRF-Token: \" + .csrf' > csrf_token", - "curl -sS -f https://${discourseDomain}/session -c cookie -b cookie -H @csrf_token -H 'Accept: application/json' -d 'login=${nodes.discourse.config.services.discourse.admin.username}' -d \"password=${adminPassword}\" | jq -e '.user.username == \"${nodes.discourse.config.services.discourse.admin.username}\"'", - "curl -sS -f https://${discourseDomain}/login -v -H 'Accept: application/json' -c cookie -b cookie 2>&1 | grep ${nodes.discourse.config.services.discourse.admin.username}", + "curl -sS -f https://${discourseDomain}/session -c cookie -b cookie -H @csrf_token -H 'Accept: application/json' -d 'login=${nodes.discourse.services.discourse.admin.username}' -d \"password=${adminPassword}\" | jq -e '.user.username == \"${nodes.discourse.services.discourse.admin.username}\"'", + "curl -sS -f https://${discourseDomain}/login -v -H 'Accept: application/json' -c cookie -b cookie 2>&1 | grep ${nodes.discourse.services.discourse.admin.username}", ) client.wait_for_unit("postfix.service") diff --git a/nixos/tests/envoy.nix b/nixos/tests/envoy.nix index 9d2c32ce102f2..1e4bfe626398e 100644 --- a/nixos/tests/envoy.nix +++ b/nixos/tests/envoy.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { socket_address = { protocol = "TCP"; address = "127.0.0.1"; - port_value = 9901; + port_value = 80; }; }; }; @@ -22,12 +22,33 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { clusters = []; }; }; + specialisation = { + withoutConfigValidation.configuration = { ... }: { + services.envoy = { + requireValidConfig = false; + settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log"; + }; + }; + }; }; - testScript = '' - machine.start() - machine.wait_for_unit("envoy.service") - machine.wait_for_open_port(9901) - machine.wait_until_succeeds("curl -fsS localhost:9901/ready") - ''; + testScript = { nodes, ... }: + let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + machine.start() + + with subtest("envoy.service starts and responds with ready"): + machine.wait_for_unit("envoy.service") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") + + with subtest("envoy.service works with config path not available at eval time"): + machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test') + machine.wait_for_unit("envoy.service") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") + machine.succeed('test -f /var/log/envoy/access.log') + ''; }) diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 68a2566c11911..d856ecca9a132 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -1,5 +1,6 @@ { system ? builtins.currentSystem, config ? {}, + giteaPackage, pkgs ? import ../.. { inherit system config; } }: @@ -9,8 +10,8 @@ with pkgs.lib; let supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { - name = "gitea-${type}"; - meta.maintainers = with maintainers; [ aanderse kolaente ma27 ]; + name = "${giteaPackage.pname}-${type}"; + meta.maintainers = with maintainers; [ aanderse indeednotjames kolaente ma27 ]; nodes = { server = { config, pkgs, ... }: { @@ -18,9 +19,10 @@ let services.gitea = { enable = true; database = { inherit type; }; + package = giteaPackage; settings.service.DISABLE_REGISTRATION = true; }; - environment.systemPackages = [ pkgs.gitea pkgs.jq ]; + environment.systemPackages = [ giteaPackage pkgs.jq ]; services.openssh.enable = true; }; client1 = { config, pkgs, ... }: { diff --git a/nixos/tests/gnupg.nix b/nixos/tests/gnupg.nix new file mode 100644 index 0000000000000..65a9a93007fd9 --- /dev/null +++ b/nixos/tests/gnupg.nix @@ -0,0 +1,118 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: + +{ + name = "gnupg"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # server for testing SSH + nodes.server = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + users.users.alice.isNormalUser = true; + services.openssh.enable = true; + }; + + # machine for testing GnuPG + nodes.machine = { pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + users.users.alice.isNormalUser = true; + services.getty.autologinUser = "alice"; + + environment.shellInit = '' + # preset a key passphrase in gpg-agent + preset_key() { + # find all keys + case "$1" in + ssh) grips=$(awk '/^[0-9A-F]/{print $1}' "''${GNUPGHOME:-$HOME/.gnupg}/sshcontrol") ;; + pgp) grips=$(gpg --with-keygrip --list-secret-keys | awk '/Keygrip/{print $3}') ;; + esac + + # try to preset the passphrase for each key found + for grip in $grips; do + "$(gpgconf --list-dirs libexecdir)/gpg-preset-passphrase" -c -P "$2" "$grip" + done + } + ''; + + programs.gnupg.agent.enable = true; + programs.gnupg.agent.enableSSHSupport = true; + }; + + testScript = + '' + import shlex + + + def as_alice(command: str) -> str: + """ + Wraps a command to run it as Alice in a login shell + """ + quoted = shlex.quote(command) + return "su --login alice --command " + quoted + + + start_all() + + with subtest("Wait for the autologin"): + machine.wait_until_tty_matches("1", "alice@machine") + + with subtest("Can generate a PGP key"): + # Note: this needs a tty because of pinentry + machine.send_chars("gpg --gen-key\n") + machine.wait_until_tty_matches("1", "Real name:") + machine.send_chars("Alice\n") + machine.wait_until_tty_matches("1", "Email address:") + machine.send_chars("alice@machine\n") + machine.wait_until_tty_matches("1", "Change") + machine.send_chars("O\n") + machine.wait_until_tty_matches("1", "Please enter") + machine.send_chars("pgp_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please re-enter") + machine.send_chars("pgp_p4ssphrase\n") + machine.wait_until_tty_matches("1", "public and secret key created") + + with subtest("Confirm the key is in the keyring"): + machine.wait_until_succeeds(as_alice("gpg --list-secret-keys | grep -q alice@machine")) + + with subtest("Can generate and add an SSH key"): + machine.succeed(as_alice("ssh-keygen -t ed25519 -f alice -N ssh_p4ssphrase")) + + # Note: apparently this must be run before using the OpenSSH agent + # socket for the first time in a tty. It's not needed for `ssh` + # because there's a hook that calls it automatically (only in NixOS). + machine.send_chars("gpg-connect-agent updatestartuptty /bye\n") + + # Note: again, this needs a tty because of pinentry + machine.send_chars("ssh-add alice\n") + machine.wait_until_tty_matches("1", "Enter passphrase") + machine.send_chars("ssh_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please enter") + machine.send_chars("ssh_agent_p4ssphrase\n") + machine.wait_until_tty_matches("1", "Please re-enter") + machine.send_chars("ssh_agent_p4ssphrase\n") + + with subtest("Confirm the SSH key has been registered"): + machine.wait_until_succeeds(as_alice("ssh-add -l | grep -q alice@machine")) + + with subtest("Can preset the key passphrases in the agent"): + machine.succeed(as_alice("echo allow-preset-passphrase > .gnupg/gpg-agent.conf")) + machine.succeed(as_alice("pkill gpg-agent")) + machine.succeed(as_alice("preset_key pgp pgp_p4ssphrase")) + machine.succeed(as_alice("preset_key ssh ssh_agent_p4ssphrase")) + + with subtest("Can encrypt and decrypt a message"): + machine.succeed(as_alice("echo Hello | gpg -e -r alice | gpg -d | grep -q Hello")) + + with subtest("Can log into the server"): + # Install Alice's public key + public_key = machine.succeed(as_alice("cat alice.pub")) + server.succeed("mkdir /etc/ssh/authorized_keys.d") + server.succeed(f"printf '{public_key}' > /etc/ssh/authorized_keys.d/alice") + + server.wait_for_open_port(22) + machine.succeed(as_alice("ssh -i alice -o StrictHostKeyChecking=no server exit")) + ''; +}) diff --git a/nixos/tests/google-oslogin/server.py b/nixos/tests/google-oslogin/server.py index 5ea9bbd2c96ba..622cd86b26195 100755 --- a/nixos/tests/google-oslogin/server.py +++ b/nixos/tests/google-oslogin/server.py @@ -103,6 +103,16 @@ class ReqHandler(BaseHTTPRequestHandler): self._send_json_ok(gen_mockuser(username=username, uid=uid, gid=uid, home_directory=f"/home/{username}", snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) return + # we need to provide something at the groups endpoint. + # the nss module does segfault if we don't. + elif pu.path == "/computeMetadata/v1/oslogin/groups": + self._send_json_ok({ + "posixGroups": [ + {"name" : "demo", "gid" : 4294967295} + ], + }) + return + # authorize endpoint elif pu.path == "/computeMetadata/v1/oslogin/authorize": # is user allowed to login? diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 1eb927632eb7a..96378452ade31 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/haproxy.nix b/nixos/tests/haproxy.nix index b6ff4102fe683..555474d7f2999 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -2,7 +2,6 @@ import ./make-test-python.nix ({ pkgs, ...}: { name = "haproxy"; nodes = { machine = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; services.haproxy = { enable = true; config = '' diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 8d58de75eabc3..8585cb3585fef 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -22,22 +22,23 @@ in { enable = true; inherit configDir; - # tests loading components by overriding the package + # provide dependencies through package overrides package = (pkgs.home-assistant.override { extraPackages = ps: with ps; [ colorama ]; - extraComponents = [ "zha" ]; - }).overrideAttrs (oldAttrs: { - doInstallCheck = false; + extraComponents = [ + # test char-tty device allow propagation into the service + "zha" + ]; }); - # tests loading components from the module + # provide component dependencies explicitly from the module extraComponents = [ - "wake_on_lan" + "mqtt" ]; - # test extra package passing from the module + # provide package for postgresql support extraPackages = python3Packages: with python3Packages; [ psycopg2 ]; @@ -111,36 +112,38 @@ in { }; testScript = { nodes, ... }: let - system = nodes.hass.config.system.build.toplevel; + system = nodes.hass.system.build.toplevel; in '' - import re import json start_all() - # Parse the package path out of the systemd unit, as we cannot - # access the final package, that is overridden inside the module, - # by any other means. - pattern = re.compile(r"path=(?P<path>[\/a-z0-9-.]+)\/bin\/hass") - response = hass.execute("systemctl show -p ExecStart home-assistant.service")[1] - match = pattern.search(response) - assert match - package = match.group('path') - - def get_journal_cursor(host) -> str: - exit, out = host.execute("journalctl -u home-assistant.service -n1 -o json-pretty --output-fields=__CURSOR") + def get_journal_cursor() -> str: + exit, out = hass.execute("journalctl -u home-assistant.service -n1 -o json-pretty --output-fields=__CURSOR") assert exit == 0 return json.loads(out)["__CURSOR"] - def wait_for_homeassistant(host, cursor): - host.wait_until_succeeds(f"journalctl --after-cursor='{cursor}' -u home-assistant.service | grep -q 'Home Assistant initialized in'") + def get_journal_since(cursor) -> str: + exit, out = hass.execute(f"journalctl --after-cursor='{cursor}' -u home-assistant.service") + assert exit == 0 + return out + + + def get_unit_property(property) -> str: + exit, out = hass.execute(f"systemctl show --property={property} home-assistant.service") + assert exit == 0 + return out + + + def wait_for_homeassistant(cursor): + hass.wait_until_succeeds(f"journalctl --after-cursor='{cursor}' -u home-assistant.service | grep -q 'Home Assistant initialized in'") hass.wait_for_unit("home-assistant.service") - cursor = get_journal_cursor(hass) + cursor = get_journal_cursor() with subtest("Check that YAML configuration file is in place"): hass.succeed("test -L ${configDir}/configuration.yaml") @@ -148,19 +151,22 @@ in { with subtest("Check the lovelace config is copied because lovelaceConfigWritable = true"): hass.succeed("test -f ${configDir}/ui-lovelace.yaml") - with subtest("Check extraComponents and extraPackages are considered from the package"): - hass.succeed(f"grep -q 'colorama' {package}/extra_packages") - hass.succeed(f"grep -q 'zha' {package}/extra_components") - - with subtest("Check extraComponents and extraPackages are considered from the module"): - hass.succeed(f"grep -q 'psycopg2' {package}/extra_packages") - hass.succeed(f"grep -q 'wake_on_lan' {package}/extra_components") - with subtest("Check that Home Assistant's web interface and API can be reached"): - wait_for_homeassistant(hass, cursor) + wait_for_homeassistant(cursor) hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") + with subtest("Check that optional dependencies are in the PYTHONPATH"): + env = get_unit_property("Environment") + python_path = env.split("PYTHONPATH=")[1].split()[0] + for package in ["colorama", "paho-mqtt", "psycopg2"]: + assert package in python_path, f"{package} not in PYTHONPATH" + + with subtest("Check that declaratively configured components get setup"): + journal = get_journal_since(cursor) + for domain in ["emulated_hue", "wake_on_lan"]: + assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing" + with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"): hass.wait_for_open_port(80) hass.succeed("curl --fail http://localhost:80/description.xml") @@ -169,25 +175,28 @@ in { hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB") with subtest("Check service reloads when configuration changes"): - # store the old pid of the process - pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") - cursor = get_journal_cursor(hass) - hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test") - new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") - assert pid == new_pid, "The PID of the process should not change between process reloads" - wait_for_homeassistant(hass, cursor) - - with subtest("check service restarts when package changes"): - pid = new_pid - cursor = get_journal_cursor(hass) - hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test") - new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") - assert pid != new_pid, "The PID of the process shoudl change when the HA binary changes" - wait_for_homeassistant(hass, cursor) + pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") + cursor = get_journal_cursor() + hass.succeed("${system}/specialisation/differentName/bin/switch-to-configuration test") + new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") + assert pid == new_pid, "The PID of the process should not change between process reloads" + wait_for_homeassistant(cursor) + + with subtest("Check service restarts when dependencies change"): + pid = new_pid + cursor = get_journal_cursor() + hass.succeed("${system}/specialisation/newFeature/bin/switch-to-configuration test") + new_pid = hass.succeed("systemctl show --property=MainPID home-assistant.service") + assert pid != new_pid, "The PID of the process should change when its PYTHONPATH changess" + wait_for_homeassistant(cursor) + + with subtest("Check that new components get setup after restart"): + journal = get_journal_since(cursor) + for domain in ["esphome"]: + assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing" with subtest("Check that no errors were logged"): - output_log = hass.succeed("cat ${configDir}/home-assistant.log") - assert "ERROR" not in output_log + hass.fail("journalctl -u home-assistant -o cat | grep -q ERROR") with subtest("Check systemd unit hardening"): hass.log(hass.succeed("systemctl cat home-assistant.service")) diff --git a/nixos/tests/isso.nix b/nixos/tests/isso.nix index 575e1c52eccf6..4ec8b5ec3593d 100644 --- a/nixos/tests/isso.nix +++ b/nixos/tests/isso.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "isso"; meta = with pkgs.lib.maintainers; { - maintainers = [ asbachb ]; + maintainers = [ ]; }; nodes.machine = { config, pkgs, ... }: { diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index 07d93c41c7a68..e168f8233c763 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -1,9 +1,13 @@ { system ? builtins.currentSystem , pkgs ? import ../../.. { inherit system; } +, lib ? pkgs.lib }: +let + allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs; +in { # Run a single node k3s cluster and verify a pod can run - single-node = import ./single-node.nix { inherit system pkgs; }; + single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s; # Run a multi-node k3s cluster and verify pod networking works across nodes - multi-node = import ./multi-node.nix { inherit system pkgs; }; + multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s; } diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 9a6c7fd465739..932b4639b39c8 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -39,7 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: tokenFile = pkgs.writeText "token" "p@s$w0rd"; in { - name = "k3s-multi-node"; + name = "${k3s.name}-multi-node"; nodes = { server = { pkgs, ... }: { @@ -52,7 +52,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: inherit tokenFile; enable = true; role = "server"; - package = pkgs.k3s; + package = k3s; clusterInit = true; extraFlags = builtins.toString [ "--disable" "coredns" diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index a95fa4a031e3f..d61595d889e2a 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -24,7 +24,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: ''; in { - name = "k3s"; + name = "${k3s.name}-single-node"; meta = with pkgs.lib.maintainers; { maintainers = [ euank ]; }; @@ -38,7 +38,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: services.k3s.enable = true; services.k3s.role = "server"; - services.k3s.package = pkgs.k3s; + services.k3s.package = k3s; # Slightly reduce resource usage services.k3s.extraFlags = builtins.toString [ "--disable" "coredns" @@ -77,6 +77,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test") machine.succeed("k3s kubectl delete -f ${testPodYaml}") + # regression test for #176445 + machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + machine.shutdown() ''; }) diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index debb469032a62..a4f452412cdf8 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -4,6 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : name = "keepassxc"; meta = with pkgs.lib.maintainers; { maintainers = [ turion ]; + timeout = 1800; }; nodes.machine = { ... }: @@ -55,9 +56,12 @@ import ./make-test-python.nix ({ pkgs, ...} : machine.sleep(5) # Regression #163482: keepassxc did not crash machine.succeed("ps -e | grep keepassxc") - machine.wait_for_text("foo.kdbx") + machine.wait_for_text("Open database") machine.send_key("ret") - machine.sleep(1) + + # Wait for the enter password screen to appear. + machine.wait_for_text("/home/alice/foo.kdbx") + # Click on "Browse" button to select keyfile machine.send_key("tab") machine.send_chars("/home/alice/foo.keyfile") diff --git a/nixos/tests/luks.nix b/nixos/tests/luks.nix new file mode 100644 index 0000000000000..82f5095cb2602 --- /dev/null +++ b/nixos/tests/luks.nix @@ -0,0 +1,69 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "luks"; + + nodes.machine = { pkgs, ... }: { + # Use systemd-boot + virtualisation = { + emptyDiskImages = [ 512 512 ]; + useBootLoader = true; + useEFIBoot = true; + }; + boot.loader.systemd-boot.enable = true; + + boot.kernelParams = lib.mkOverride 5 [ "console=tty1" ]; + + environment.systemPackages = with pkgs; [ cryptsetup ]; + + specialisation = rec { + boot-luks.configuration = { + boot.initrd.luks.devices = lib.mkVMOverride { + # We have two disks and only type one password - key reuse is in place + cryptroot.device = "/dev/vdc"; + cryptroot2.device = "/dev/vdd"; + }; + virtualisation.bootDevice = "/dev/mapper/cryptroot"; + }; + boot-luks-custom-keymap.configuration = lib.mkMerge [ + boot-luks.configuration + { + console.keyMap = "neo"; + } + ]; + }; + }; + + enableOCR = true; + + testScript = '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdd -") + + # Boot from the encrypted disk + machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") + machine.succeed("sync") + machine.crash() + + # Boot and decrypt the disk + machine.start() + machine.wait_for_text("Passphrase for") + machine.send_chars("supersecret\n") + machine.wait_for_unit("multi-user.target") + + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + + # Boot from the encrypted disk with custom keymap + machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-custom-keymap.conf") + machine.succeed("sync") + machine.crash() + + # Boot and decrypt the disk + machine.start() + machine.wait_for_text("Passphrase for") + machine.send_chars("havfkhfrkfl\n") + machine.wait_for_unit("multi-user.target") + + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; +}) diff --git a/nixos/tests/maddy.nix b/nixos/tests/maddy.nix index b9d0416482da1..800d254f17704 100644 --- a/nixos/tests/maddy.nix +++ b/nixos/tests/maddy.nix @@ -9,6 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { hostname = "server"; primaryDomain = "server"; openFirewall = true; + ensureAccounts = [ "postmaster@server" ]; }; }; @@ -50,7 +51,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.wait_for_open_port(587) server.succeed("maddyctl creds create --password test postmaster@server") - server.succeed("maddyctl imap-acct create postmaster@server") client.succeed("send-testmail") client.succeed("test-imap") diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix new file mode 100644 index 0000000000000..d0d9f16d40f95 --- /dev/null +++ b/nixos/tests/miriway.nix @@ -0,0 +1,130 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "miriway"; + + meta = { + maintainers = with lib.maintainers; [ OPNA2608 ]; + # Natively running Mir has problems with capturing the first registered libinput device. + # In our VM runners on ARM and on some hardware configs (my RPi4, distro-independent), this misses the keyboard. + # It can be worked around by dis- and reconnecting the affected hardware, but we can't do this in these tests. + # https://github.com/MirServer/mir/issues/2837 + 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 + enable-x11= + + 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/multipass.nix b/nixos/tests/multipass.nix new file mode 100644 index 0000000000000..0980e9195f5aa --- /dev/null +++ b/nixos/tests/multipass.nix @@ -0,0 +1,37 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + multipass-image = import ../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + +in +{ + name = "multipass"; + + meta.maintainers = [ lib.maintainers.jnsgruk ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + cores = 1; + memorySize = 1024; + diskSize = 4096; + + multipass.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("multipass.service") + machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet") + + # Wait for Multipass to settle + machine.sleep(1) + + machine.succeed("multipass list") + ''; +}) diff --git a/nixos/tests/musescore.nix b/nixos/tests/musescore.nix index ac2f4ba74c0f6..6aeb0558a49db 100644 --- a/nixos/tests/musescore.nix +++ b/nixos/tests/musescore.nix @@ -2,13 +2,12 @@ import ./make-test-python.nix ({ pkgs, ...} : let # Make sure we don't have to go through the startup tutorial - customMuseScoreConfig = pkgs.writeText "MuseScore3.ini" '' + customMuseScoreConfig = pkgs.writeText "MuseScore4.ini" '' [application] - startup\firstStart=false + hasCompletedFirstLaunchSetup=true - [ui] - application\startup\showTours=false - application\startup\showStartCenter=false + [project] + preferredScoreCreationMode=1 ''; in { @@ -40,26 +39,43 @@ in # Inject custom settings machine.succeed("mkdir -p /root/.config/MuseScore/") machine.succeed( - "cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore3.ini" + "cp ${customMuseScoreConfig} /root/.config/MuseScore/MuseScore4.ini" ) # Start MuseScore window machine.execute("DISPLAY=:0.0 mscore >&2 &") # Wait until MuseScore has launched - machine.wait_for_window("MuseScore") + machine.wait_for_window("MuseScore 4") # Wait until the window has completely initialised - machine.wait_for_text("MuseScore") + machine.wait_for_text("MuseScore 4") + + machine.screenshot("MuseScore0") + + # Create a new score + machine.send_key("ctrl-n") + + # Wait until the creation wizard appears + machine.wait_for_window("New score") + + machine.screenshot("MuseScore1") + + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("right") + machine.send_key("right") + machine.send_key("ret") + + machine.sleep(1) - # Start entering notes - machine.send_key("n") # Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen machine.send_chars("cdef6gg5aaaa7g") - # Make sure the VM catches up with all the keys machine.sleep(1) - machine.screenshot("MuseScore0") + machine.screenshot("MuseScore2") # Go to the export dialogue and create a PDF machine.send_key("alt-f") @@ -67,24 +83,24 @@ in machine.send_key("e") # Wait until the export dialogue appears. - machine.wait_for_window("Export") - machine.screenshot("MuseScore1") - machine.send_key("shift-tab") - machine.sleep(1) + machine.wait_for_text("Export") + + machine.screenshot("MuseScore3") + machine.send_key("shift-tab") machine.sleep(1) machine.send_key("ret") machine.sleep(1) machine.send_key("ret") - machine.screenshot("MuseScore2") + machine.screenshot("MuseScore4") # Wait until PDF is exported - machine.wait_for_file("/root/Documents/MuseScore3/Scores/Untitled.pdf") + machine.wait_for_file('"/root/Documents/MuseScore4/Scores/Untitled score.pdf"') # Check that it contains the title of the score - machine.succeed("pdfgrep Title /root/Documents/MuseScore3/Scores/Untitled.pdf") + machine.succeed('pdfgrep "Untitled score" "/root/Documents/MuseScore4/Scores/Untitled score.pdf"') - machine.screenshot("MuseScore3") + machine.screenshot("MuseScore5") ''; }) diff --git a/nixos/tests/nebula.nix b/nixos/tests/nebula.nix index 372cfebdf801b..89b91d89fcb3f 100644 --- a/nixos/tests/nebula.nix +++ b/nixos/tests/nebula.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let environment.systemPackages = [ pkgs.nebula ]; users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; services.openssh.enable = true; + networking.interfaces.eth1.useDHCP = false; services.nebula.networks.smoke = { # Note that these paths won't exist when the machine is first booted. @@ -30,13 +31,14 @@ in lighthouse = { ... } @ args: makeNebulaNode args "lighthouse" { - networking.interfaces.eth1.ipv4.addresses = [{ + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.1"; prefixLength = 24; }]; services.nebula.networks.smoke = { isLighthouse = true; + isRelay = true; firewall = { outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -44,9 +46,9 @@ in }; }; - node2 = { ... } @ args: - makeNebulaNode args "node2" { - networking.interfaces.eth1.ipv4.addresses = [{ + allowAny = { ... } @ args: + makeNebulaNode args "allowAny" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.2"; prefixLength = 24; }]; @@ -55,6 +57,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -62,9 +65,9 @@ in }; }; - node3 = { ... } @ args: - makeNebulaNode args "node3" { - networking.interfaces.eth1.ipv4.addresses = [{ + allowFromLighthouse = { ... } @ args: + makeNebulaNode args "allowFromLighthouse" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.3"; prefixLength = 24; }]; @@ -73,6 +76,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; inbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; @@ -80,9 +84,9 @@ in }; }; - node4 = { ... } @ args: - makeNebulaNode args "node4" { - networking.interfaces.eth1.ipv4.addresses = [{ + allowToLighthouse = { ... } @ args: + makeNebulaNode args "allowToLighthouse" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.4"; prefixLength = 24; }]; @@ -92,6 +96,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -99,9 +104,9 @@ in }; }; - node5 = { ... } @ args: - makeNebulaNode args "node5" { - networking.interfaces.eth1.ipv4.addresses = [{ + disabled = { ... } @ args: + makeNebulaNode args "disabled" { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ address = "192.168.1.5"; prefixLength = 24; }]; @@ -111,6 +116,7 @@ in staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; isLighthouse = false; lighthouses = [ "10.0.100.1" ]; + relays = [ "10.0.100.1" ]; firewall = { outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; @@ -123,12 +129,14 @@ in testScript = let setUpPrivateKey = name: '' - ${name}.succeed( - "mkdir -p /root/.ssh", - "chown 700 /root/.ssh", - "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", - "chown 600 /root/.ssh/id_snakeoil", - ) + ${name}.start() + ${name}.succeed( + "mkdir -p /root/.ssh", + "chown 700 /root/.ssh", + "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", + "chown 600 /root/.ssh/id_snakeoil", + "mkdir -p /root" + ) ''; # From what I can tell, StrictHostKeyChecking=no is necessary for ssh to work between machines. @@ -146,26 +154,48 @@ in ${name}.succeed( "mkdir -p /etc/nebula", "nebula-cert keygen -out-key /etc/nebula/${name}.key -out-pub /etc/nebula/${name}.pub", - "scp ${sshOpts} /etc/nebula/${name}.pub 192.168.1.1:/tmp/${name}.pub", + "scp ${sshOpts} /etc/nebula/${name}.pub root@192.168.1.1:/root/${name}.pub", ) lighthouse.succeed( - 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /tmp/${name}.pub -out-crt /tmp/${name}.crt', + 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /root/${name}.pub -out-crt /root/${name}.crt' ) ${name}.succeed( - "scp ${sshOpts} 192.168.1.1:/tmp/${name}.crt /etc/nebula/${name}.crt", - "scp ${sshOpts} 192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt", + "scp ${sshOpts} root@192.168.1.1:/root/${name}.crt /etc/nebula/${name}.crt", + "scp ${sshOpts} root@192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt", + '(id nebula-smoke >/dev/null && chown -R nebula-smoke:nebula-smoke /etc/nebula) || true' ) ''; - in '' - start_all() + getPublicIp = node: '' + ${node}.succeed("ip --brief addr show eth1 | awk '{print $3}' | tail -n1 | cut -d/ -f1").strip() + ''; + # Never do this for anything security critical! (Thankfully it's just a test.) + # Restart Nebula right after the mutual block and/or restore so the state is fresh. + blockTrafficBetween = nodeA: nodeB: '' + node_a = ${getPublicIp nodeA} + node_b = ${getPublicIp nodeB} + ${nodeA}.succeed("iptables -I INPUT -s " + node_b + " -j DROP") + ${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP") + ${nodeA}.systemctl("restart nebula@smoke.service") + ${nodeB}.systemctl("restart nebula@smoke.service") + ''; + allowTrafficBetween = nodeA: nodeB: '' + node_a = ${getPublicIp nodeA} + node_b = ${getPublicIp nodeB} + ${nodeA}.succeed("iptables -D INPUT -s " + node_b + " -j DROP") + ${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP") + ${nodeA}.systemctl("restart nebula@smoke.service") + ${nodeB}.systemctl("restart nebula@smoke.service") + ''; + in '' # Create the certificate and sign the lighthouse's keys. ${setUpPrivateKey "lighthouse"} lighthouse.succeed( "mkdir -p /etc/nebula", 'nebula-cert ca -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key', 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -ip "10.0.100.1/24" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key', + 'chown -R nebula-smoke:nebula-smoke /etc/nebula' ) # Reboot the lighthouse and verify that the nebula service comes up on boot. @@ -175,49 +205,104 @@ in lighthouse.wait_for_unit("nebula@smoke.service") lighthouse.succeed("ping -c5 10.0.100.1") - # Create keys for node2's nebula service and test that it comes up. - ${setUpPrivateKey "node2"} - ${signKeysFor "node2" "10.0.100.2/24"} - ${restartAndCheckNebula "node2" "10.0.100.2"} + # Create keys for allowAny's nebula service and test that it comes up. + ${setUpPrivateKey "allowAny"} + ${signKeysFor "allowAny" "10.0.100.2/24"} + ${restartAndCheckNebula "allowAny" "10.0.100.2"} - # Create keys for node3's nebula service and test that it comes up. - ${setUpPrivateKey "node3"} - ${signKeysFor "node3" "10.0.100.3/24"} - ${restartAndCheckNebula "node3" "10.0.100.3"} + # Create keys for allowFromLighthouse's nebula service and test that it comes up. + ${setUpPrivateKey "allowFromLighthouse"} + ${signKeysFor "allowFromLighthouse" "10.0.100.3/24"} + ${restartAndCheckNebula "allowFromLighthouse" "10.0.100.3"} - # Create keys for node4's nebula service and test that it comes up. - ${setUpPrivateKey "node4"} - ${signKeysFor "node4" "10.0.100.4/24"} - ${restartAndCheckNebula "node4" "10.0.100.4"} + # Create keys for allowToLighthouse's nebula service and test that it comes up. + ${setUpPrivateKey "allowToLighthouse"} + ${signKeysFor "allowToLighthouse" "10.0.100.4/24"} + ${restartAndCheckNebula "allowToLighthouse" "10.0.100.4"} - # Create keys for node4's nebula service and test that it does not come up. - ${setUpPrivateKey "node5"} - ${signKeysFor "node5" "10.0.100.5/24"} - node5.fail("systemctl status nebula@smoke.service") - node5.fail("ping -c5 10.0.100.5") + # Create keys for disabled's nebula service and test that it does not come up. + ${setUpPrivateKey "disabled"} + ${signKeysFor "disabled" "10.0.100.5/24"} + disabled.fail("systemctl status nebula@smoke.service") + disabled.fail("ping -c5 10.0.100.5") - # The lighthouse can ping node2 and node3 but not node5 + # The lighthouse can ping allowAny and allowFromLighthouse but not disabled lighthouse.succeed("ping -c3 10.0.100.2") lighthouse.succeed("ping -c3 10.0.100.3") lighthouse.fail("ping -c3 10.0.100.5") - # node2 can ping the lighthouse, but not node3 because of its inbound firewall - node2.succeed("ping -c3 10.0.100.1") - node2.fail("ping -c3 10.0.100.3") - - # node3 can ping the lighthouse and node2 - node3.succeed("ping -c3 10.0.100.1") - node3.succeed("ping -c3 10.0.100.2") - - # node4 can ping the lighthouse but not node2 or node3 - node4.succeed("ping -c3 10.0.100.1") - node4.fail("ping -c3 10.0.100.2") - node4.fail("ping -c3 10.0.100.3") - - # node2 can ping node3 now that node3 pinged it first - node2.succeed("ping -c3 10.0.100.3") - # node4 can ping node2 if node2 pings it first - node2.succeed("ping -c3 10.0.100.4") - node4.succeed("ping -c3 10.0.100.2") + # allowAny can ping the lighthouse, but not allowFromLighthouse because of its inbound firewall + allowAny.succeed("ping -c3 10.0.100.1") + allowAny.fail("ping -c3 10.0.100.3") + + # allowFromLighthouse can ping the lighthouse and allowAny + allowFromLighthouse.succeed("ping -c3 10.0.100.1") + allowFromLighthouse.succeed("ping -c3 10.0.100.2") + + # block allowFromLighthouse <-> allowAny, and allowFromLighthouse -> allowAny should still work. + ${blockTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + ${allowTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + + # allowToLighthouse can ping the lighthouse but not allowAny or allowFromLighthouse + allowToLighthouse.succeed("ping -c3 10.0.100.1") + allowToLighthouse.fail("ping -c3 10.0.100.2") + allowToLighthouse.fail("ping -c3 10.0.100.3") + + # allowAny can ping allowFromLighthouse now that allowFromLighthouse pinged it first + allowAny.succeed("ping -c3 10.0.100.3") + + # block allowAny <-> allowFromLighthouse, and allowAny -> allowFromLighthouse should still work. + ${blockTrafficBetween "allowAny" "allowFromLighthouse"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + allowAny.succeed("ping -c10 10.0.100.3") + ${allowTrafficBetween "allowAny" "allowFromLighthouse"} + allowFromLighthouse.succeed("ping -c10 10.0.100.2") + allowAny.succeed("ping -c10 10.0.100.3") + + # allowToLighthouse can ping allowAny if allowAny pings it first + allowAny.succeed("ping -c3 10.0.100.4") + allowToLighthouse.succeed("ping -c3 10.0.100.2") + + # block allowToLighthouse <-> allowAny, and allowAny <-> allowToLighthouse should still work. + ${blockTrafficBetween "allowAny" "allowToLighthouse"} + allowAny.succeed("ping -c10 10.0.100.4") + allowToLighthouse.succeed("ping -c10 10.0.100.2") + ${allowTrafficBetween "allowAny" "allowToLighthouse"} + allowAny.succeed("ping -c10 10.0.100.4") + allowToLighthouse.succeed("ping -c10 10.0.100.2") + + # block lighthouse <-> allowFromLighthouse and allowAny <-> allowFromLighthouse; allowFromLighthouse won't get to allowAny + ${blockTrafficBetween "allowFromLighthouse" "lighthouse"} + ${blockTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.fail("ping -c3 10.0.100.2") + ${allowTrafficBetween "allowFromLighthouse" "lighthouse"} + ${allowTrafficBetween "allowFromLighthouse" "allowAny"} + allowFromLighthouse.succeed("ping -c3 10.0.100.2") + + # block lighthouse <-> allowAny, allowAny <-> allowFromLighthouse, and allowAny <-> allowToLighthouse; it won't get to allowFromLighthouse or allowToLighthouse + ${blockTrafficBetween "allowAny" "lighthouse"} + ${blockTrafficBetween "allowAny" "allowFromLighthouse"} + ${blockTrafficBetween "allowAny" "allowToLighthouse"} + allowFromLighthouse.fail("ping -c3 10.0.100.2") + allowAny.fail("ping -c3 10.0.100.3") + allowAny.fail("ping -c3 10.0.100.4") + ${allowTrafficBetween "allowAny" "lighthouse"} + ${allowTrafficBetween "allowAny" "allowFromLighthouse"} + ${allowTrafficBetween "allowAny" "allowToLighthouse"} + allowFromLighthouse.succeed("ping -c3 10.0.100.2") + allowAny.succeed("ping -c3 10.0.100.3") + allowAny.succeed("ping -c3 10.0.100.4") + + # block lighthouse <-> allowToLighthouse and allowToLighthouse <-> allowAny; it won't get to allowAny + ${blockTrafficBetween "allowToLighthouse" "lighthouse"} + ${blockTrafficBetween "allowToLighthouse" "allowAny"} + allowAny.fail("ping -c3 10.0.100.4") + allowToLighthouse.fail("ping -c3 10.0.100.2") + ${allowTrafficBetween "allowToLighthouse" "lighthouse"} + ${allowTrafficBetween "allowToLighthouse" "allowAny"} + allowAny.succeed("ping -c3 10.0.100.4") + allowToLighthouse.succeed("ping -c3 10.0.100.2") ''; }) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index b16ee7d059670..441d258afc08f 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -93,19 +93,18 @@ let name = "Static"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; defaultGateway = "192.168.1.1"; defaultGateway6 = "fd00:1234:5678:1::1"; - interfaces.enp1s0.ipv4.addresses = [ + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } { address = "192.168.1.3"; prefixLength = 32; } { address = "192.168.1.10"; prefixLength = 32; } ]; - interfaces.enp2s0.ipv4.addresses = [ + interfaces.eth2.ipv4.addresses = mkOverride 0 [ { address = "192.168.2.2"; prefixLength = 24; } ]; }; @@ -171,12 +170,12 @@ let # Disable test driver default config networking.interfaces = lib.mkForce {}; networking.useNetworkd = networkd; - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; }; testScript = '' start_all() client.wait_for_unit("multi-user.target") - client.wait_until_succeeds("ip addr show dev enp1s0 | grep '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep '192.168.1'") client.shell_interact() client.succeed("ping -c 1 192.168.1.1") router.succeed("ping -c 1 192.168.1.1") @@ -188,13 +187,20 @@ let name = "SimpleDHCP"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.useDHCP = true; - interfaces.enp2s0.useDHCP = true; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.eth2 = { + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; }; }; testScript = { ... }: @@ -205,10 +211,10 @@ let router.wait_for_unit("network-online.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") - client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") - client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'") + client.wait_until_succeeds("ip addr show dev eth2 | grep -q '192.168.2'") + client.wait_until_succeeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -237,15 +243,16 @@ let name = "OneInterfaceDHCP"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; mtu = 1343; useDHCP = true; }; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; testScript = { ... }: @@ -257,10 +264,10 @@ let router.wait_for_unit("network.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") with subtest("ensure MTU is set"): - assert "mtu 1343" in client.succeed("ip link show dev enp1s0") + assert "mtu 1343" in client.succeed("ip link show dev eth1") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -279,15 +286,16 @@ let }; bond = let node = address: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; bonds.bond0 = { - interfaces = [ "enp1s0" "enp2s0" ]; + interfaces = [ "eth1" "eth2" ]; driverOptions.mode = "802.3ad"; }; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; interfaces.bond0.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; @@ -318,11 +326,12 @@ let }; bridge = let node = { address, vlan }: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = vlan; + virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv4.addresses = [ { inherit address; prefixLength = 24; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { inherit address; prefixLength = 24; } ]; }; }; in { @@ -330,12 +339,11 @@ let nodes.client1 = node { address = "192.168.1.2"; vlan = 1; }; nodes.client2 = node { address = "192.168.1.3"; vlan = 2; }; nodes.router = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - bridges.bridge.interfaces = [ "enp1s0" "enp2s0" ]; + bridges.bridge.interfaces = [ "eth1" "eth2" ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; interfaces.bridge.ipv4.addresses = mkOverride 0 @@ -369,7 +377,7 @@ let nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; @@ -377,9 +385,14 @@ let # reverse path filtering rules for the macvlan interface seem # to be incorrect, causing the test to fail. Disable temporarily. firewall.checkReversePath = false; - macvlans.macvlan.interface = "enp1s0"; - interfaces.enp1s0.useDHCP = true; - interfaces.macvlan.useDHCP = true; + macvlans.macvlan.interface = "eth1"; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.macvlan = { + useDHCP = true; + }; }; }; testScript = { ... }: @@ -391,7 +404,7 @@ let router.wait_for_unit("network.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") client.wait_until_succeeds("ip addr show dev macvlan | grep -q '192.168.1'") with subtest("Print lots of diagnostic information"): @@ -418,22 +431,23 @@ let fou = { name = "foo-over-udp"; nodes.machine = { ... }: { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { address = "192.168.1.1"; prefixLength = 24; } ]; fooOverUDP = { fou1 = { port = 9001; }; fou2 = { port = 9002; protocol = 41; }; fou3 = mkIf (!networkd) { port = 9003; local.address = "192.168.1.1"; }; fou4 = mkIf (!networkd) - { port = 9004; local = { address = "192.168.1.1"; dev = "enp1s0"; }; }; + { port = 9004; local = { address = "192.168.1.1"; dev = "eth1"; }; }; }; }; systemd.services = { - fou3-fou-encap.after = optional (!networkd) "network-addresses-enp1s0.service"; + fou3-fou-encap.after = optional (!networkd) "network-addresses-eth1.service"; }; }; testScript = { ... }: @@ -456,20 +470,20 @@ let "gue": None, "family": "inet", "local": "192.168.1.1", - "dev": "enp1s0", + "dev": "eth1", } in fous, "fou4 exists" ''; }; sit = let node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; sits.sit = { inherit remote; local = address4; - dev = "enp1s0"; + dev = "eth1"; }; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = address4; prefixLength = 24; } ]; @@ -671,10 +685,10 @@ let vlan-ping = let baseIP = number: "10.10.10.${number}"; vlanIP = number: "10.1.1.${number}"; - baseInterface = "enp1s0"; + baseInterface = "eth1"; vlanInterface = "vlan42"; node = number: {pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { #useNetworkd = networkd; useDHCP = false; @@ -771,12 +785,12 @@ let privacy = { name = "Privacy"; nodes.router = { ... }: { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv6.addresses = singleton { + interfaces.eth1.ipv6.addresses = singleton { address = "fd00:1234:5678:1::1"; prefixLength = 64; }; @@ -798,11 +812,11 @@ let }; }; nodes.client_with_privacy = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { tempAddress = "default"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; @@ -811,11 +825,11 @@ let }; }; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { tempAddress = "enabled"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; @@ -833,9 +847,9 @@ let with subtest("Wait until we have an ip address"): client_with_privacy.wait_until_succeeds( - "ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'" + "ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'" ) - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'") with subtest("Test vlan 1"): client_with_privacy.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") @@ -933,7 +947,7 @@ let ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue) ''; }; - rename = if networkd then { + rename = { name = "RenameInterface"; nodes.machine = { pkgs, ... }: { virtualisation.vlans = [ 1 ]; @@ -941,18 +955,23 @@ let useNetworkd = networkd; useDHCP = false; }; - systemd.network.links."10-custom_name" = { - matchConfig.MACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "custom_name"; - }; - }; + } // + (if networkd + then { systemd.network.links."10-custom_name" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "custom_name"; + }; + } + else { boot.initrd.services.udev.rules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="custom_name" + ''; + }); testScript = '' machine.succeed("udevadm settle") print(machine.succeed("ip link show dev custom_name")) ''; - } else { - name = "RenameInterface"; - testScript = ""; + }; + 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/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 1ef848cfb1217..d28c1bdfd6e1e 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -13,7 +13,7 @@ in { # The only thing the client needs to do is download a file. client = { ... }: {}; - nextcloud = { config, pkgs, ... }: { + nextcloud = { config, pkgs, lib, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; services.nextcloud = { @@ -34,6 +34,15 @@ in { adminpassFile = toString (pkgs.writeText "admin-pass-file" '' ${adminpass} ''); + trustedProxies = [ "::1" ]; + }; + notify_push = { + enable = true; + logLevel = "debug"; + }; + extraAppsEnable = true; + extraApps = { + inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push; }; }; @@ -94,8 +103,10 @@ in { "${withRcloneEnv} ${copySharedFile}" ) client.wait_for_unit("multi-user.target") + client.execute("${pkgs.nextcloud-notify_push.passthru.test_client}/bin/test_client http://nextcloud ${adminuser} ${adminpass} >&2 &") client.succeed( "${withRcloneEnv} ${diffSharedFile}" ) + nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"") ''; })) args diff --git a/nixos/tests/nscd.nix b/nixos/tests/nscd.nix index 1922812ef8c89..356c6d2e2a540 100644 --- a/nixos/tests/nscd.nix +++ b/nixos/tests/nscd.nix @@ -40,12 +40,13 @@ in }; specialisation = { + withGlibcNscd.configuration = { ... }: { + services.nscd.enableNsncd = false; + }; withUnscd.configuration = { ... }: { + services.nscd.enableNsncd = false; services.nscd.package = pkgs.unscd; }; - withNsncd.configuration = { ... }: { - services.nscd.enableNsncd = true; - }; }; }; @@ -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/octoprint.nix b/nixos/tests/octoprint.nix new file mode 100644 index 0000000000000..15a2d677d4cf8 --- /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/opensearch.nix b/nixos/tests/opensearch.nix new file mode 100644 index 0000000000000..c0caf950cb9c9 --- /dev/null +++ b/nixos/tests/opensearch.nix @@ -0,0 +1,52 @@ +let + opensearchTest = + import ./make-test-python.nix ( + { pkgs, lib, extraSettings ? {} }: { + name = "opensearch"; + meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; + + nodes.machine = lib.mkMerge [ + { + virtualisation.memorySize = 2048; + services.opensearch.enable = true; + } + extraSettings + ]; + + testScript = '' + machine.start() + machine.wait_for_unit("opensearch.service") + machine.wait_for_open_port(9200) + + machine.succeed( + "curl --fail localhost:9200" + ) + ''; + }); +in +{ + opensearch = opensearchTest {}; + opensearchCustomPathAndUser = opensearchTest { + extraSettings = { + services.opensearch.dataDir = "/var/opensearch_test"; + services.opensearch.user = "open_search"; + services.opensearch.group = "open_search"; + system.activationScripts.createDirectory = { + text = '' + mkdir -p "/var/opensearch_test" + chown open_search:open_search /var/opensearch_test + chmod 0700 /var/opensearch_test + ''; + deps = [ "users" "groups" ]; + }; + users = { + groups.open_search = {}; + users.open_search = { + description = "OpenSearch daemon user"; + group = "open_search"; + isSystemUser = true; + }; + }; + }; + }; +} diff --git a/nixos/tests/pass-secret-service.nix b/nixos/tests/pass-secret-service.nix index a85a508bfe16b..e0dddf0ad29e2 100644 --- a/nixos/tests/pass-secret-service.nix +++ b/nixos/tests/pass-secret-service.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "pass-secret-service"; - meta.maintainers = with lib; [ aidalgol ]; + meta.maintainers = [ lib.maintainers.aidalgol ]; nodes.machine = { nodes, pkgs, ... }: { diff --git a/nixos/tests/pgadmin4-standalone.nix b/nixos/tests/pgadmin4-standalone.nix deleted file mode 100644 index 5aa17fcb5bb9d..0000000000000 --- a/nixos/tests/pgadmin4-standalone.nix +++ /dev/null @@ -1,43 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: - # This is separate from pgadmin4 since we don't want both running at once - - { - name = "pgadmin4-standalone"; - meta.maintainers = with lib.maintainers; [ mkg20001 ]; - - nodes.machine = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - curl - ]; - - services.postgresql = { - enable = true; - - authentication = '' - host all all localhost trust - ''; - - ensureUsers = [ - { - name = "postgres"; - ensurePermissions = { - "DATABASE \"postgres\"" = "ALL PRIVILEGES"; - }; - } - ]; - }; - - services.pgadmin = { - enable = true; - initialEmail = "bruh@localhost.de"; - initialPasswordFile = pkgs.writeText "pw" "bruh2012!"; - }; - }; - - testScript = '' - machine.wait_for_unit("postgresql") - machine.wait_for_unit("pgadmin") - - machine.wait_until_succeeds("curl -s localhost:5050") - ''; - }) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index 2a2b5aaa2841d..6a9ce6ceae298 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -1,133 +1,57 @@ -import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }: - - /* - This test suite replaces the typical pytestCheckHook function in python - packages. Pgadmin4 test suite needs a running and configured postgresql - server. This is why this test exists. - - To not repeat all the python dependencies needed, this test is called directly - from the pgadmin4 derivation, which also passes the currently - used propagatedBuildInputs and any python overrides. - - Unfortunately, there doesn't seem to be an easy way to otherwise include - the needed packages here. - - Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails - and needs to be called as "pgadmin4.tests" - - */ - - let - pgadmin4SrcDir = "/pgadmin"; - pgadmin4Dir = "/var/lib/pgadmin"; - pgadmin4LogDir = "/var/log/pgadmin"; - - in - { - name = "pgadmin4"; - meta.maintainers = with lib.maintainers; [ gador ]; - - nodes.machine = { pkgs, ... }: { - imports = [ ./common/x11.nix ]; - # needed because pgadmin 6.8 will fail, if those dependencies get updated - nixpkgs.overlays = [ - (self: super: { - pythonPackages = pythonEnv; - }) +import ./make-test-python.nix ({ pkgs, lib, ... }: + +{ + name = "pgadmin4"; + meta.maintainers = with lib.maintainers; [ mkg20001 gador ]; + + nodes.machine = { pkgs, ... }: { + + imports = [ ./common/user-account.nix ]; + + environment.systemPackages = with pkgs; [ + curl + pgadmin4-desktopmode + ]; + + services.postgresql = { + enable = true; + authentication = '' + host all all localhost trust + ''; + ensureUsers = [ + { + name = "postgres"; + ensurePermissions = { + "DATABASE \"postgres\"" = "ALL PRIVILEGES"; + }; + } ]; + }; - environment.systemPackages = with pkgs; [ - pgadmin4 - postgresql - chromedriver - chromium - # include the same packages as in pgadmin minus speaklater3 - (python3.withPackages - (ps: buildDeps ++ - [ - # test suite package requirements - pythonPackages.testscenarios - pythonPackages.selenium - ]) - ) - ]; - services.postgresql = { - enable = true; - authentication = '' - host all all localhost trust - ''; - ensureUsers = [ - { - name = "postgres"; - ensurePermissions = { - "DATABASE \"postgres\"" = "ALL PRIVILEGES"; - }; - } - ]; - }; + services.pgadmin = { + port = 5051; + enable = true; + initialEmail = "bruh@localhost.de"; + initialPasswordFile = pkgs.writeText "pw" "bruh2012!"; }; + }; - testScript = '' + testScript = '' + with subtest("Check pgadmin module"): machine.wait_for_unit("postgresql") - - # pgadmin4 needs its data and log directories - machine.succeed( - "mkdir -p ${pgadmin4Dir} \ - && mkdir -p ${pgadmin4LogDir} \ - && mkdir -p ${pgadmin4SrcDir}" - ) - - machine.succeed( - "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}" - ) - - machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md") - - # set paths and config for tests - machine.succeed( - "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ - && cp -v web/regression/test_config.json.in web/regression/test_config.json \ - && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \ - && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \ - && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json" - ) - - # adapt chrome config to run within a sandbox without GUI - # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913 - # add chrome binary path. use spaces to satisfy python indention (tabs throw an error) - # this works for selenium 3 (currently used), but will need to be updated - # to work with "from selenium.webdriver.chrome.service import Service" in selenium 4 - machine.succeed( - "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ - && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \ - && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \ - && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \ - && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \ - && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py" - ) - - # Don't bother to test LDAP or kerberos authentication - with subtest("run browser test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && python regression/runtests.py \ - --pkg browser \ - --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking' - ) - - # fontconfig is necessary for chromium to run - # https://github.com/NixOS/nixpkgs/issues/136207 - with subtest("run feature test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \ - && python regression/runtests.py --pkg feature_tests' - ) - - with subtest("run resql test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && python regression/runtests.py --pkg resql' - ) - ''; - }) + machine.wait_for_unit("pgadmin") + machine.wait_until_succeeds("curl -s localhost:5051") + machine.wait_until_succeeds("curl -s localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null") + + # pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py + # pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file + # is owned by the user of the pgadmin module. With the check-system-config-dir.patch this will just throw a warning + # but will continue and not read the file. + # If we run pgadmin4-desktopmode as root (something one really shouldn't do), it can read the config file and fail, + # because of the wrong config for desktopmode. + with subtest("Check pgadmin standalone desktop mode"): + machine.execute("sudo -u alice pgadmin4 >&2 &", timeout=60) + machine.wait_until_succeeds("curl -s localhost:5050") + machine.wait_until_succeeds("curl -s localhost:5050/browser/ | grep \"<title>pgAdmin 4</title>\" > /dev/null") + ''; +}) diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index c2ea399d65af3..0e1f420f2a7de 100644 --- a/nixos/tests/podman/default.nix +++ b/nixos/tests/podman/default.nix @@ -6,7 +6,14 @@ import ../make-test-python.nix ( }; nodes = { - podman = { pkgs, ... }: { + rootful = { pkgs, ... }: { + virtualisation.podman.enable = true; + + # hack to ensure that podman built with and without zfs in extraPackages is cached + boot.supportedFilesystems = [ "zfs" ]; + networking.hostId = "00000000"; + }; + rootless = { pkgs, ... }: { virtualisation.podman.enable = true; users.users.alice = { @@ -49,107 +56,114 @@ import ../make-test-python.nix ( return f"su {user} -l -c {cmd}" - podman.wait_for_unit("sockets.target") + rootful.wait_for_unit("sockets.target") + rootless.wait_for_unit("sockets.target") dns.wait_for_unit("sockets.target") docker.wait_for_unit("sockets.target") start_all() with subtest("Run container as root with runc"): - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( + rootful.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + rootful.succeed( "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) - podman.succeed("podman ps | grep sleeping") - podman.succeed("podman stop sleeping") - podman.succeed("podman rm sleeping") + rootful.succeed("podman ps | grep sleeping") + rootful.succeed("podman stop sleeping") + rootful.succeed("podman rm sleeping") with subtest("Run container as root with crun"): - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( + rootful.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + rootful.succeed( "podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) - podman.succeed("podman ps | grep sleeping") - podman.succeed("podman stop sleeping") - podman.succeed("podman rm sleeping") + rootful.succeed("podman ps | grep sleeping") + rootful.succeed("podman stop sleeping") + rootful.succeed("podman rm sleeping") with subtest("Run container as root with the default backend"): - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( + rootful.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + rootful.succeed( "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) - podman.succeed("podman ps | grep sleeping") - podman.succeed("podman stop sleeping") - podman.succeed("podman rm sleeping") + rootful.succeed("podman ps | grep sleeping") + rootful.succeed("podman stop sleeping") + rootful.succeed("podman rm sleeping") # start systemd session for rootless - podman.succeed("loginctl enable-linger alice") - podman.succeed(su_cmd("whoami")) - podman.sleep(1) + rootless.succeed("loginctl enable-linger alice") + rootless.succeed(su_cmd("whoami")) + rootless.sleep(1) with subtest("Run container rootless with runc"): - podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) - podman.succeed( + rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + rootless.succeed( su_cmd( "podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) ) - podman.succeed(su_cmd("podman ps | grep sleeping")) - podman.succeed(su_cmd("podman stop sleeping")) - podman.succeed(su_cmd("podman rm sleeping")) + rootless.succeed(su_cmd("podman ps | grep sleeping")) + rootless.succeed(su_cmd("podman stop sleeping")) + rootless.succeed(su_cmd("podman rm sleeping")) with subtest("Run container rootless with crun"): - podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) - podman.succeed( + rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + rootless.succeed( su_cmd( "podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) ) - podman.succeed(su_cmd("podman ps | grep sleeping")) - podman.succeed(su_cmd("podman stop sleeping")) - podman.succeed(su_cmd("podman rm sleeping")) + rootless.succeed(su_cmd("podman ps | grep sleeping")) + rootless.succeed(su_cmd("podman stop sleeping")) + rootless.succeed(su_cmd("podman rm sleeping")) with subtest("Run container rootless with the default backend"): - podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) - podman.succeed( + rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + rootless.succeed( su_cmd( "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) ) - podman.succeed(su_cmd("podman ps | grep sleeping")) - podman.succeed(su_cmd("podman stop sleeping")) - podman.succeed(su_cmd("podman rm sleeping")) + rootless.succeed(su_cmd("podman ps | grep sleeping")) + rootless.succeed(su_cmd("podman stop sleeping")) + rootless.succeed(su_cmd("podman rm sleeping")) + + with subtest("rootlessport"): + rootless.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + rootless.succeed( + su_cmd( + "podman run -d -p 9000:8888 --name=rootlessport -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${pkgs.writeTextDir "index.html" "<h1>Testing</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8888" + ) + ) + rootless.succeed(su_cmd("podman ps | grep rootlessport")) + rootless.wait_until_succeeds(su_cmd("${pkgs.curl}/bin/curl localhost:9000 | grep Testing")) + rootless.succeed(su_cmd("podman stop rootlessport")) + rootless.succeed(su_cmd("podman rm rootlessport")) with subtest("Run container with init"): - podman.succeed( + rootful.succeed( "tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox" ) - pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip() + pid = rootful.succeed("podman run --rm busybox readlink /proc/self").strip() assert pid == "1" - pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() + pid = rootful.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" "<h1>Hi</h1>"} 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") + 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" "<h1>Testing</h1>"} scratchimg ${pkgs.python3}/bin/python -m http.server 8000" + ) + dns.succeed("podman ps | grep webserver") + dns.wait_until_succeeds( + "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 | grep Testing" + ) + 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")) with subtest("Run container via docker cli"): - docker.succeed("docker network create default") docker.succeed("tar cv --files-from /dev/null | podman import - scratchimg") docker.succeed( "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" @@ -158,7 +172,6 @@ import ../make-test-python.nix ( docker.succeed("podman ps | grep sleeping") docker.succeed("docker stop sleeping") docker.succeed("docker rm sleeping") - docker.succeed("docker network rm default") with subtest("A podman non-member can not use the docker cli"): docker.fail(su_cmd("docker version", user="mallory")) diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index 268a55701ccf2..52c31dc21f101 100644 --- a/nixos/tests/podman/tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -113,9 +113,6 @@ import ../make-test-python.nix ( podman.wait_for_unit("sockets.target") podman.wait_for_unit("ghostunnel-server-podman-socket.service") - with subtest("Create default network"): - podman.succeed("docker network create default") - with subtest("Root docker cli also works"): podman.succeed("docker version") diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 08773120bc127..684df9c39246c 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -13,7 +13,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: { name = pkgs.lib.optionalString (!predictable) "un" + "predictable" + pkgs.lib.optionalString withNetworkd "Networkd"; value = makeTest { - name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + name = "${pkgs.lib.optionalString (!predictable) "un"}predictableInterfaceNames${pkgs.lib.optionalString withNetworkd "-with-networkd"}"; meta = {}; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 5f50a3f87d5d2..82d50da638183 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -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; diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 82af1af463d03..ef5fcc41476bc 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./make-test-python.nix ({ pkgs, lib, ...} : let @@ -11,9 +11,9 @@ let }; # Only allow the demo data to be used (only if it's unfreeRedistributable). - unfreePredicate = pkg: with pkgs.lib; let + unfreePredicate = pkg: with lib; let allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ]; - allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ]; + allowLicenses = [ lib.licenses.unfreeRedistributable ]; in elem pkg.pname allowPackageNames && elem (pkg.meta.license or null) allowLicenses; @@ -31,7 +31,7 @@ in rec { name = "quake3"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with lib.maintainers; { maintainers = [ domenkozar eelco ]; }; diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index baa2e5945c05d..c9a04088e8709 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -5,6 +5,7 @@ let password4 = "asdf123"; hashed_bcrypt = "$2b$05$8xIEflrk2RxQtcVXbGIxs.Vl0x7dF1/JSv3cyX6JJt0npzkTCWvxK"; # fnord hashed_yeshash = "$y$j9T$d8Z4EAf8P1SvM/aDFbxMS0$VnTXMp/Hnc7QdCBEaLTq5ZFOAFo2/PM0/xEAFuOE88."; # fnord + hashed_sha512crypt = "$6$ymzs8WINZ5wGwQcV$VC2S0cQiX8NVukOLymysTPn4v1zJoJp3NGyhnqyv/dAf4NWZsBWYveQcj6gEJr4ZUjRBRjM0Pj1L8TCQ8hUUp0"; # meow in import ./make-test-python.nix ({ pkgs, ... }: { name = "shadow"; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; @@ -39,6 +40,12 @@ in import ./make-test-python.nix ({ pkgs, ... }: { hashedPassword = hashed_yeshash; shell = pkgs.bash; }; + users.leo = { + isNormalUser = true; + initialHashedPassword = "!"; + hashedPassword = hashed_sha512crypt; # should take precedence over initialHashedPassword + shell = pkgs.bash; + }; }; }; @@ -145,5 +152,21 @@ in import ./make-test-python.nix ({ pkgs, ... }: { print(shadow.succeed(f"cat /tmp/{u}")) assert u in shadow.succeed(f"cat /tmp/{u}") shadow.send_chars("logout\n") + + with subtest("Ensure hashedPassword does not get overridden by initialHashedPassword"): + shadow.send_key("alt-f6") + shadow.wait_until_succeeds("[ $(fgconsole) = 6 ]") + shadow.wait_for_unit("getty@tty6.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty6'") + shadow.wait_until_tty_matches("6", "login: ") + shadow.send_chars("leo\n") + shadow.wait_until_tty_matches("6", "login: leo") + shadow.wait_until_succeeds("pgrep login") + shadow.sleep(2) + shadow.send_chars("meow\n") + shadow.send_chars("whoami > /tmp/leo\n") + shadow.wait_for_file("/tmp/leo") + assert "leo" in shadow.succeed("cat /tmp/leo") + shadow.send_chars("logout\n") ''; }) diff --git a/nixos/tests/soapui.nix b/nixos/tests/soapui.nix index e4ce3888fd437..3a2d11a167562 100644 --- a/nixos/tests/soapui.nix +++ b/nixos/tests/soapui.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "soapui"; meta = with pkgs.lib.maintainers; { - maintainers = [ asbachb ]; + maintainers = [ ]; }; nodes.machine = { config, pkgs, ... }: { diff --git a/nixos/tests/systemd-credentials-tpm2.nix b/nixos/tests/systemd-credentials-tpm2.nix new file mode 100644 index 0000000000000..d2dc1fd7b615b --- /dev/null +++ b/nixos/tests/systemd-credentials-tpm2.nix @@ -0,0 +1,124 @@ +import ./make-test-python.nix ({ lib, pkgs, system, ... }: + +let + tpmSocketPath = "/tmp/swtpm-sock"; + tpmDeviceModels = { + x86_64-linux = "tpm-tis"; + aarch64-linux = "tpm-tis-device"; + }; +in + +{ + name = "systemd-credentials-tpm2"; + + meta = { + maintainers = with pkgs.lib.maintainers; [ tmarkus ]; + }; + + nodes.machine = { pkgs, ... }: { + virtualisation = { + qemu.options = [ + "-chardev socket,id=chrtpm,path=${tpmSocketPath}" + "-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm" + "-device ${tpmDeviceModels.${system}},tpmdev=tpm_dev_0" + ]; + }; + + boot.initrd.availableKernelModules = [ "tpm_tis" ]; + + environment.systemPackages = with pkgs; [ diffutils ]; + }; + + testScript = '' + import subprocess + from tempfile import TemporaryDirectory + + # From systemd-initrd-luks-tpm2.nix + class Tpm: + def __init__(self): + self.state_dir = TemporaryDirectory() + self.start() + + def start(self): + self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", + "socket", + "--tpmstate", f"dir={self.state_dir.name}", + "--ctrl", "type=unixio,path=${tpmSocketPath}", + "--tpm2", + ]) + + # Check whether starting swtpm failed + try: + exit_code = self.proc.wait(timeout=0.2) + if exit_code is not None and exit_code != 0: + raise Exception("failed to start swtpm") + except subprocess.TimeoutExpired: + pass + + """Check whether the swtpm process exited due to an error""" + def check(self): + exit_code = self.proc.poll() + if exit_code is not None and exit_code != 0: + raise Exception("swtpm process died") + + CRED_NAME = "testkey" + CRED_RAW_FILE = f"/root/{CRED_NAME}" + CRED_FILE = f"/root/{CRED_NAME}.cred" + + def systemd_run(machine, cmd): + machine.log(f"Executing command (via systemd-run): \"{cmd}\"") + + (status, out) = machine.execute( " ".join([ + "systemd-run", + "--service-type=exec", + "--quiet", + "--wait", + "-E PATH=\"$PATH\"", + "-p StandardOutput=journal", + "-p StandardError=journal", + f"-p LoadCredentialEncrypted={CRED_NAME}:{CRED_FILE}", + f"$SHELL -c '{cmd}'" + ]) ) + + if status != 0: + raise Exception(f"systemd_run failed (status {status})") + + machine.log("systemd-run finished successfully") + + tpm = Tpm() + + @polling_condition + def swtpm_running(): + tpm.check() + + machine.wait_for_unit("multi-user.target") + + with subtest("Check whether TPM device exists"): + machine.succeed("test -e /dev/tpm0") + machine.succeed("test -e /dev/tpmrm0") + + with subtest("Check whether systemd-creds detects TPM2 correctly"): + cmd = "systemd-creds has-tpm2" + machine.log(f"Running \"{cmd}\"") + (status, _) = machine.execute(cmd) + + # Check exit code equals 0 or 1 (1 means firmware support is missing, which is OK here) + if status != 0 and status != 1: + raise Exception("systemd-creds failed to detect TPM2") + + with subtest("Encrypt credential using systemd-creds"): + machine.succeed(f"dd if=/dev/urandom of={CRED_RAW_FILE} bs=1k count=16") + machine.succeed(f"systemd-creds --with-key=host+tpm2 encrypt --name=testkey {CRED_RAW_FILE} {CRED_FILE}") + + with subtest("Write provided credential and check for equality"): + CRED_OUT_FILE = f"/root/{CRED_NAME}.out" + systemd_run(machine, f"systemd-creds cat testkey > {CRED_OUT_FILE}") + machine.succeed(f"cmp --silent -- {CRED_RAW_FILE} {CRED_OUT_FILE}") + + with subtest("Check whether systemd service can see credential in systemd-creds list"): + systemd_run(machine, f"systemd-creds list | grep {CRED_NAME}") + + with subtest("Check whether systemd service can access credential in $CREDENTIALS_DIRECTORY"): + systemd_run(machine, f"cmp --silent -- $CREDENTIALS_DIRECTORY/{CRED_NAME} {CRED_RAW_FILE}") + ''; +}) diff --git a/nixos/tests/systemd-cryptenroll.nix b/nixos/tests/systemd-cryptenroll.nix index 9ee2d280fbbea..055ae7d1681f2 100644 --- a/nixos/tests/systemd-cryptenroll.nix +++ b/nixos/tests/systemd-cryptenroll.nix @@ -2,7 +2,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-cryptenroll"; meta = with pkgs.lib.maintainers; { maintainers = [ ymatsiuk ]; - broken = true; # times out after two hours, details -> https://github.com/NixOS/nixpkgs/issues/167994 }; nodes.machine = { pkgs, lib, ... }: { diff --git a/nixos/tests/systemd-initrd-vconsole.nix b/nixos/tests/systemd-initrd-vconsole.nix new file mode 100644 index 0000000000000..b74df410c4224 --- /dev/null +++ b/nixos/tests/systemd-initrd-vconsole.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "systemd-initrd-vconsole"; + + nodes.machine = { pkgs, ... }: { + boot.kernelParams = [ "rd.systemd.unit=rescue.target" ]; + + boot.initrd.systemd = { + enable = true; + emergencyAccess = true; + }; + + console = { + earlySetup = true; + keyMap = "colemak"; + }; + }; + + testScript = '' + # Boot into rescue shell in initrd + machine.start() + machine.wait_for_console_text("Press Enter for maintenance") + machine.send_console("\n") + machine.wait_for_console_text("Logging in with home") + + # Check keymap + machine.send_console("(printf '%s to receive text: \\n' Ready && read text && echo \"$text\") </dev/tty1\n") + machine.wait_for_console_text("Ready to receive text:") + for key in "asdfjkl;\n": + machine.send_key(key) + machine.wait_for_console_text("arstneio") + machine.send_console("systemctl poweroff\n") + ''; +}) diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix new file mode 100644 index 0000000000000..36de5d988fdb1 --- /dev/null +++ b/nixos/tests/systemd-repart.nix @@ -0,0 +1,134 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + # A testScript fragment that prepares a disk with some empty, unpartitioned + # space. and uses it to boot the test with. Takes a single argument `machine` + # from which the diskImage is extraced. + useDiskImage = machine: '' + import os + import shutil + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name) + + subprocess.run([ + "${pkgs.qemu}/bin/qemu-img", + "resize", + "-f", + "raw", + tmp_disk_image.name, + "+32M", + ]) + + # Fix the GPT table by moving the backup table to the end of the enlarged + # disk image. This is necessary because we increased the size of the disk + # before. The disk needs to be a raw disk because sgdisk can only run on + # raw images. + subprocess.run([ + "${pkgs.gptfdisk}/bin/sgdisk", + "--move-second-header", + tmp_disk_image.name, + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + ''; + + common = { config, pkgs, lib, ... }: { + virtualisation.useDefaultFilesystems = false; + virtualisation.fileSystems = { + "/" = { + device = "/dev/vda2"; + fsType = "ext4"; + }; + }; + + # systemd-repart operates on disks with a partition table. The qemu module, + # however, creates separate filesystem images without a partition table, so + # we have to create a disk image manually. + # + # This creates two partitions, an ESP mounted on /dev/vda1 and the root + # partition mounted on /dev/vda2 + system.build.diskImage = import ../lib/make-disk-image.nix { + inherit config pkgs lib; + # Use a raw format disk so that it can be resized before starting the + # test VM. + format = "raw"; + # Keep the image as small as possible but leave some room for changes. + bootSize = "32M"; + additionalSpace = "0M"; + # GPT with an EFI System Partition is the typical use case for + # systemd-repart because it does not support MBR. + partitionTableType = "efi"; + # We do not actually care much about the content of the partitions, so we + # do not need a bootloader installed. + installBootLoader = false; + # Improve determinism by not copying a channel. + copyChannel = false; + }; + }; +in +{ + basic = makeTest { + name = "systemd-repart"; + meta.maintainers = with maintainers; [ nikstur ]; + + nodes.machine = { config, pkgs, ... }: { + imports = [ common ]; + + boot.initrd.systemd.enable = true; + + boot.initrd.systemd.repart.enable = true; + systemd.repart.partitions = { + "10-root" = { + Type = "linux-generic"; + }; + }; + }; + + testScript = { nodes, ... }: '' + ${useDiskImage nodes.machine} + + machine.start() + machine.wait_for_unit("multi-user.target") + + systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service") + assert "Growing existing partition 1." in systemd_repart_logs + ''; + }; + + after-initrd = makeTest { + name = "systemd-repart-after-initrd"; + meta.maintainers = with maintainers; [ nikstur ]; + + nodes.machine = { config, pkgs, ... }: { + imports = [ common ]; + + systemd.repart.enable = true; + systemd.repart.partitions = { + "10-root" = { + Type = "linux-generic"; + }; + }; + }; + + testScript = { nodes, ... }: '' + ${useDiskImage nodes.machine} + + machine.start() + machine.wait_for_unit("multi-user.target") + + systemd_repart_logs = machine.succeed("journalctl --unit systemd-repart.service") + assert "Growing existing partition 1." in systemd_repart_logs + ''; + }; +} diff --git a/nixos/tests/systemd-shutdown.nix b/nixos/tests/systemd-shutdown.nix index 688cd6dd2c175..dad8167f198fc 100644 --- a/nixos/tests/systemd-shutdown.nix +++ b/nixos/tests/systemd-shutdown.nix @@ -11,6 +11,7 @@ in { systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/shutdown-message".source = pkgs.writeShellScript "shutdown-message" '' echo "${msg}" ''; + boot.initrd.systemd.enable = systemdStage1; }; testScript = '' diff --git a/nixos/tests/tracee.nix b/nixos/tests/tracee.nix index 6ef7e5342bee0..1609d3abc69fd 100644 --- a/nixos/tests/tracee.nix +++ b/nixos/tests/tracee.nix @@ -2,28 +2,33 @@ 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} 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" - # 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/... runHook postBuild @@ -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/tuxguitar.nix b/nixos/tests/tuxguitar.nix index 037f489e54483..00833024bfeac 100644 --- a/nixos/tests/tuxguitar.nix +++ b/nixos/tests/tuxguitar.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "tuxguitar"; meta = with pkgs.lib.maintainers; { - maintainers = [ asbachb ]; + maintainers = [ ]; }; nodes.machine = { config, pkgs, ... }: { diff --git a/nixos/tests/txredisapi.nix b/nixos/tests/txredisapi.nix index 7c6b36a5c47d5..47c2ba6d3749a 100644 --- a/nixos/tests/txredisapi.nix +++ b/nixos/tests/txredisapi.nix @@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { services.redis.servers."".enable = true; - environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))]; + environment.systemPackages = with pkgs; [ (python3.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))]; }; }; diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix index 9dc7e5d04bd5d..d371bafd69652 100644 --- a/nixos/tests/unifi.nix +++ b/nixos/tests/unifi.nix @@ -16,6 +16,8 @@ let }; nodes.server = { + nixpkgs.config = config; + services.unifi = { enable = true; unifiPackage = unifi; diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 37bb649889b45..3eda8b6cfb206 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -33,13 +33,6 @@ let }; enableOCR = true; - # testScriptWithTypes:55: error: Item "function" of - # "Union[Callable[[Callable[..., Any]], ContextManager[Any]], ContextManager[Any]]" - # has no attribute "__enter__" - # with codium_running: - # ^ - skipTypeCheck = true; - testScript = '' @polling_condition def codium_running(): @@ -50,10 +43,10 @@ let machine.wait_for_unit('graphical.target') - codium_running.wait() - with codium_running: + codium_running.wait() # type: ignore[union-attr] + with codium_running: # type: ignore[union-attr] # Wait until vscodium is visible. "File" is in the menu bar. - machine.wait_for_text('Get Started') + machine.wait_for_text('Welcome') machine.screenshot('start_screen') test_string = 'testfile' diff --git a/nixos/tests/wireguard/snakeoil-keys.nix b/nixos/tests/wireguard/snakeoil-keys.nix index 55ad582d40595..c979f0e0c8a96 100644 --- a/nixos/tests/wireguard/snakeoil-keys.nix +++ b/nixos/tests/wireguard/snakeoil-keys.nix @@ -6,6 +6,7 @@ peer1 = { privateKey = "uO8JVo/sanx2DOM0L9GUEtzKZ82RGkRnYgpaYc7iXmg="; - publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI="; + # readFile'd keys may have trailing newlines, emulate this + publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI=\n"; }; } diff --git a/nixos/tests/zram-generator.nix b/nixos/tests/zram-generator.nix new file mode 100644 index 0000000000000..3407361d2824f --- /dev/null +++ b/nixos/tests/zram-generator.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix { + name = "zram-generator"; + + nodes.machine = { ... }: { + zramSwap = { + enable = true; + priority = 10; + algorithm = "lz4"; + swapDevices = 2; + memoryPercent = 30; + memoryMax = 10 * 1024 * 1024; + }; + }; + + testScript = '' + machine.wait_for_unit("systemd-zram-setup@zram0.service") + machine.wait_for_unit("systemd-zram-setup@zram1.service") + zram = machine.succeed("zramctl --noheadings --raw") + swap = machine.succeed("swapon --show --noheadings") + for i in range(2): + assert f"/dev/zram{i} lz4 10M" in zram + assert f"/dev/zram{i} partition 10M" in swap + ''; +} diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 62a72fea62a0a..4d45de86f3a1f 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libtool ]; - NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; meta = with lib; { description = "ReplayGain for AAC files"; diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix index 358dfce0d4f05..59bd228d4751a 100644 --- a/pkgs/applications/audio/aaxtomp3/default.nix +++ b/pkgs/applications/audio/aaxtomp3/default.nix @@ -1,31 +1,22 @@ -{ coreutils +{ bash +, bc +, coreutils , fetchFromGitHub , ffmpeg , findutils +, gawk , gnugrep , gnused , jq , lame , lib -, makeWrapper , mediainfo , mp4v2 -, stdenv +, ncurses +, resholve }: -let - runtimeInputs = [ - coreutils - ffmpeg - findutils - gnugrep - gnused - jq - lame - mediainfo - mp4v2 - ]; -in -stdenv.mkDerivation rec { + +resholve.mkDerivation rec { pname = "aaxtomp3"; version = "1.3"; @@ -36,17 +27,48 @@ stdenv.mkDerivation rec { hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; }; - dontBuild = false; - - nativeBuildInputs = [ makeWrapper ]; + postPatch = '' + substituteInPlace AAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' + substituteInPlace interactiveAAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' \ + --replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"' + ''; installPhase = '' - install -Dm755 AAXtoMP3 $out/bin/aaxtomp3 - wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} - install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 - wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + 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"; diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index a0f5b48a63231..a5d82b6e00ddd 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "-DADLplug_Jack=${if withJack then "ON" else "OFF"}" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # "fp.h" file not found "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers" ]); diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix index e912c7fa49a42..6710aaa87f4e3 100644 --- a/pkgs/applications/audio/aether-lv2/default.nix +++ b/pkgs/applications/audio/aether-lv2/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { lv2 libX11 libGL libGLU mesa ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + "-Wno-error=stringop-overflow" + ]; + installPhase = '' mkdir -p $out/lib/lv2 cp -r aether.lv2 $out/lib/lv2 diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 6ed488d7d643f..a57f43eea651a 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper -, qt5, requireFile, unzip, wine +{ lib, + stdenv, + multiStdenv, + fetchFromGitHub, + requireFile, + unzip, + wine, + cmake, + makeWrapper, + wrapQtAppsHook, + file, + libX11, + qt5 }: let @@ -13,11 +24,11 @@ let }; vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk368_08_11_2017_build_121"; + name = "vstsdk369_01_03_2018_build_132"; src = requireFile { name = "${name}.zip"; url = "http://www.steinberg.net/en/company/developers.html"; - sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70"; + sha256 = "0r29fv6yhm2m5yznn8m4my7fq01w1lpphax4sshagy6b1dgjlv3w"; }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; @@ -42,9 +53,18 @@ multiStdenv.mkDerivation { src = airwave-src; - nativeBuildInputs = [ cmake makeWrapper ]; - - buildInputs = [ file libX11 qt5.qtbase wine-xembed ]; + nativeBuildInputs = [ + cmake + makeWrapper + wrapQtAppsHook + ]; + + buildInputs = [ + file + libX11 + qt5.qtbase + wine-xembed + ]; postPatch = '' # Binaries not used directly should land in libexec/. diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index b58dbddc811ff..15db4c1cf03d9 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 = "14.0"; + version = "16.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urlj9XwMqKt5JvvsA1f7YpuLhQXMGxp0V1pGv+LTroE="; + sha256 = "sha256-jdeJ/VAJTDeiR9pyYps82F2Ty16r+a/FK+XV5L3rWco="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 276b3d6c7bc22..e48e27b5cc699 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -4,7 +4,6 @@ , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver, breeze-icons , curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras -, pmdk, numactl }: mkDerivation rec { diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 3051dc7ceb828..ed421277f9d07 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.2"; + version = "unstable-2023-01-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; - rev = version; - hash = "sha256-L8yHKwtCAZC1myIouL0Oq3lj0QPWn5dVe0g3nkyAKI8="; + rev = "0623386c813d0d68564002324958cef7217cec7f"; + hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0XuWBUG37GNHRXgjz0/Vv6VSqaPG36xTj7oN0ukFIJY="; + hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso="; }; postPatch = '' diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index acd8bf1f74f0b..c51dced37724d 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtime modular synthesizer for ALSA"; - homepage = "http://alsamodular.sourceforge.net"; + homepage = "https://alsamodular.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ sjfloat ]; diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index bd5a644857409..0184b042888b8 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -6,24 +6,24 @@ , meson , ninja , libmpdclient -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.13.4"; + version = "3.13.6"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - sha256 = "sha256-J6NN0Rsc9Zw9gagksDlwpwEErs+4XmrGF9YHKlAE1FA="; + sha256 = "sha256-8XjLs4MI5MXvA6veCoTAj8tlYDe7YTggutO3F9eNyMM="; fetchSubmodules = true; }; 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/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 44ba848bc2b70..4a652e1ac474d 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-0F9+4hyUoKb0UP5t02yws/ErogscvI1nsdnSTpcr53E="; + hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho="; }; postPatch = '' diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index bb89cb45672bd..aaf6777533ffd 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # https://bugs.launchpad.net/audio-recorder/+bug/1784622 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 875daa196d5dd..0cb33062bd0ed 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,39 +1,67 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub -, qmake , pkg-config -, qttools +, qmake +, qt5compat ? null , qtbase +, qttools , rtaudio , rtmidi +, wrapQtAppsHook }: -mkDerivation rec { +assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; + +stdenv.mkDerivation rec { pname = "bambootracker"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-OaktEUWWDEW+MYnQkaB8FvkuH29VDXFqBVSTEJ7Sz7A="; + hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; }; - nativeBuildInputs = [ qmake qttools pkg-config ]; + postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' + # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path + # https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace BambooTracker/lang/lang.pri \ + --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' + ''; + + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; - buildInputs = [ qtbase rtaudio rtmidi ]; + buildInputs = [ + qtbase + rtaudio + rtmidi + ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ + qt5compat + ]; - qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; + qmakeFlags = [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ]; postConfigure = "make qmake_all"; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ''; meta = with lib; { diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 6c48c756ab24c..919768d58ed73 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + sed '1i#include <memory>' -i Source/TitleBar.h # gcc12 + ''; + cmakeBuildType = "Release"; cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ]; @@ -104,7 +108,7 @@ stdenv.mkDerivation rec { CoreAudioKit ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # Fails to find fp.h on its own "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/" ]); diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index b96155cf688bf..39227fd065227 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of # `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A range of synthesiser, electric piano and organ emulations"; - homepage = "http://bristol.sourceforge.net"; + homepage = "https://bristol.sourceforge.net"; license = licenses.gpl3; platforms = ["x86_64-linux" "i686-linux"]; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4ab651e3fb847..e4e679e780828 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; + outputs = [ "out" "doc" ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://calf-studio-gear.org"; + homepage = "https://calf-studio-gear.org"; description = "A set of high quality open source audio plugins for musicians"; license = licenses.lgpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 562a53fe59275..221febf35dcd1 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-71+9ALz55aqxXRBRwOcs9fwiQK31pJ9E72pGRmt0OkE="; + sha256 = "sha256-BDEu3ASlnovMK0lQC+CQvpXvtdt33BRntstPAWaAnsg="; }; strictDeps = true; diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 68eb295c48525..358c1f0e7900e 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -2,6 +2,9 @@ stdenv , fetchFromGitHub , fetchurl +, cmake +, dbus +, file , freetype , jansson , lib @@ -11,32 +14,44 @@ , libXext , libXrandr , libarchive +, libjack2 , liblo , libsamplerate -, mesa +, libsndfile +, makeWrapper , pkg-config , python3 , speexdsp +, libglvnd }: stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.11"; + version = "22.12"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0="; + sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY="; }; prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; + strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + file + pkg-config + makeWrapper + python3 + ]; buildInputs = [ + dbus freetype jansson libGL @@ -44,18 +59,25 @@ stdenv.mkDerivation rec { libXcursor libXext libXrandr - libXrandr libarchive liblo libsamplerate - mesa - python3 + libsndfile speexdsp + libglvnd ]; hardeningDisable = [ "format" ]; makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/Cardinal \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + + # this doesn't work and is mainly just a test tool for the developers anyway. + rm -f $out/bin/CardinalNative + ''; + meta = { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; diff --git a/pkgs/applications/audio/cavalier/default.nix b/pkgs/applications/audio/cavalier/default.nix new file mode 100644 index 0000000000000..17fdabc5bc0db --- /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 bb0e885cd7465..a62337d7d55ac 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.1.1"; + version = "1.4.2.0"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M="; + sha256 = "sha256-hIwsC9rYgXWSTFqUufKGqoT0Gnsf4nR4KQ0iSVbj8xg="; }; nativeBuildInputs = [ flex bison which ] diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index dc8ea92ae2421..6afddb467d0d3 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 @@ -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/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index 0db9da5d2161d..8a4ffab5dc1fe 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , meson , ninja , pkg-config @@ -18,14 +18,15 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; owner = "knuxify"; repo = pname; - rev = "refs/tags/${version}"; - sha256 = "sha256-gN3V5ZHlhHp52Jg/i+hDLEDpSvP8yFngujyw5ZncQQg="; + rev = version; + sha256 = "sha256-XvbfQtE8LsztQ2VByG2jLYND3qVpH6owdAgh3b//lI4="; }; postPatch = '' @@ -67,7 +68,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/knuxify/eartag"; + homepage = "https://gitlab.gnome.org/knuxify/eartag"; description = "Simple music tag editor"; # This seems to be using ICU license but we're flagging it to MIT license # since ICU license is a modified version of MIT and to prevent it from diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 0c48c582c4fc2..776698a06d0d7 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { CFLAGS = lib.optionalString debug " -DDEBUG=2"; meta = { - homepage = "http://eflite.sourceforge.net"; + homepage = "https://eflite.sourceforge.net"; description = "Speech server for screen readers"; longDescription = '' EFlite is a speech server for Emacspeak and other screen diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 84eb4e1d39c92..28b60fa600743 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "espeak-ng"; - version = "1.51"; + version = "1.51.1"; src = fetchFromGitHub { owner = "espeak-ng"; repo = "espeak-ng"; rev = version; - hash = "sha256-KwzMlQ3/JgpNOpuV4zNc0zG9oWEGFbVSJ4bEd3dtD3Y="; + hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk="; }; patches = lib.optionals mbrolaSupport [ diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 2c59068720d08..7164cb5fd3e0c 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { prePatch = '' sed -e s,/bin/ln,ln,g -i src/Makefile sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile - '' + (if portaudio.api_version == 19 then '' + '' + (lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h - '' else ""); + ''); configurePhase = '' cd src diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index be6e0fcca228a..2350bde0bd6ac 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -2,24 +2,15 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo="; + sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls="; }; - 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/fire/default.nix b/pkgs/applications/audio/fire/default.nix index 54d5bba446618..93536944d96dd 100644 --- a/pkgs/applications/audio/fire/default.nix +++ b/pkgs/applications/audio/fire/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { ''; # Fails to find fp.h on its own - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/applications/audio/flac2all/default.nix b/pkgs/applications/audio/flac2all/default.nix new file mode 100644 index 0000000000000..e0681b94f6837 --- /dev/null +++ b/pkgs/applications/audio/flac2all/default.nix @@ -0,0 +1,45 @@ +{ python3Packages, lib, flac, lame, opusTools, vorbis-tools, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "flac2all"; + version = "5.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI="; + }; + + # Not sure why this is needed, but setup.py expects this to be set + postPatch = '' + echo ${version} > ./flac2all_pkg/version + ''; + + propagatedBuildInputs = [ + python3Packages.pyzmq + ]; + + postInstall = '' + wrapProgram $out/bin/flac2all \ + --set PATH ${lib.makeBinPath [ + # Hard requirements + flac + lame + # Optional deps depending on encoding types + opusTools + vorbis-tools + ffmpeg + ]} + ''; + + # Has no standard tests, so we verify a few imports instead. + doCheck = false; + pythonImportsCheck = [ "flac2all_pkg.vorbis" "flac2all_pkg.mp3" ]; + + meta = with lib; { + description = "Multi process, clustered, FLAC to multi codec audio converter with tagging support"; + homepage = "https://github.com/ZivaVatra/flac2all"; + license = licenses.gpl3; + # TODO: This has only been tested on Linux, but may work on Mac too. + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 98b9faf8d24ac..4564fcccc4e16 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.5.1"; + version = "10.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-45aA2Ib69Gb1Mg/5907rp1nfRbNyQq12pm/aFwTdgeA="; + 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 cbed4b36181eb..df42258700cad 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 ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index b7afb0d57a03a..531352d0ed949 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) ]; - NIX_CFLAGS_COMPILE = toString + env.NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]); hardeningDisable = [ "format" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { software, released under the GNU GPL license. '' ; - homepage = "http://freewheeling.sourceforge.net"; + homepage = "https://freewheeling.sourceforge.net"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sepi ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 0f15775b38d54..372a873ca5804 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.6pre3"; + version = "0.6pre4-hotfix"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-bHVeTw69k6LLcrfkmGxvjlFfR/hWiCfm/P3utknid1o="; + sha256 = "sha256-lJtV/0GnWN5mSjv2LaPEMnkuThaNeijBMjLGFPOJX4k="; }; nativeBuildInputs = [ @@ -63,6 +63,12 @@ stdenv.mkDerivation rec { "-DWARNINGS_ARE_ERRORS=ON" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc) + "-Wno-error=mismatched-new-delete" + "-Wno-error=use-after-free" + ]); + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 15eccc46943fa..c5dcec05a9d1d 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-w" "-Wno-error" ]; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 42b28eacc4f46..e7753ef28e6b3 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint'; # src/net/../../src/gnauralnet.h:233: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix new file mode 100644 index 0000000000000..e08400220790f --- /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.7.0"; + + src = fetchFromGitHub { + owner = "anhoder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM="; + }; + + deleteVendor = true; + + vendorHash = null; + + 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/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 1b20f306166f8..f988e5cd1d420 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.4-1"; + version = "3.9.5-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24="; + sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw="; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DINSTALL_DEPEND=OFF" ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin,lib} @@ -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 index 5611407cfe913..f5b2cf5576e3d 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -5,24 +5,27 @@ , 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.6"; + version = "0.0.9"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-uEG1pAHMQT+C/E5rKByflvL0NNkC8SeSPMAXanzvhE4="; + hash = "sha256-55mS+hrhLLRkhgih5lvdM9Xka+WKg2iliFm6TYF6n3w="; }; nativeBuildInputs = [ @@ -38,6 +41,14 @@ buildGoModule rec { 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 ]; @@ -45,12 +56,12 @@ buildGoModule rec { tags = lib.optionals withLibadwaita [ "libadwaita" ]; postInstall = '' - install -D -m 444 -t $out/share/applications .nix/com.github.diamondburned.gtkcord4.desktop + 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-QZSjSk1xu5ZcrNEra5TxnUVvlQWb5/h31fm5Nc7WMoI="; + vendorHash = "sha256-IQpokMeo46vZIdVA1F7JILXCN9bUqTMOCa/SQ0JSjaM="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 220d2d38e145d..a16ad3c932017 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: .libs/autodetection.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: multiple definition of # `gtkpod_app'; .libs/gtkpod_app_iface.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 870f4b216f51f..3033888996a19 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { "--install-roboto-font" ] ++ optional optimizationSupport "--optimization"; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; meta = with lib; { description = "A virtual guitar amplifier for Linux running with JACK"; diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix index aeb64b92c88ad..29bfc047e1993 100644 --- a/pkgs/applications/audio/gwc/default.nix +++ b/pkgs/applications/audio/gwc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gwc"; - version = "0.22-05"; + version = "0.22-06"; src = fetchFromGitHub { owner = "AlisterH"; repo = pname; rev = version; - sha256 = "sha256-FHKu5qAyRyMxXdWYTCeAc6Q4J+NOaU1SGgoTbe0PiFE="; + sha256 = "sha256-hRwy++gZiW/olIIeiVTpdIjPLIHgvgVUGEaUX9tpFbY="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; homepage = "https://github.com/AlisterH/gwc/"; + changelog = "https://github.com/AlisterH/gwc/blob/${version}/Changelog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 5e8747f765669..847096c38816f 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877"; + sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 684f074b4e612..78891967fa41d 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pname = "helvum"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = pname; rev = version; - sha256 = "0nhv6zw2zzxz2bg2zj32w1brywnm5lv6j3cvmmvwshc389z2k5x1"; + hash = "sha256-TvjO7fGobGmAltVHeXWyMtMLANdVWVGvBYq20JD3mMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-EIHO9qVPIXgezfFOaarlTU0an762nFmX1ELbQuAZ7rY"; + hash = "sha256-W5Imlut30cjV4A6TCjBFLbViB0CDUucNsvIUiCXqu7I="; }; nativeBuildInputs = [ @@ -50,9 +50,6 @@ 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/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 420c11562e2a0..8cf55289b2f33 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ]; - NIX_LDFLAGS = "-ldl -lm -lpthread"; + NIX_LDFLAGS = "-lm -lpthread"; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 70cb4d7f11094..e130d9a642d42 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -19,16 +19,14 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; - - NIX_LDFLAGS = "-ldl"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; meta = with lib; { - homepage = "http://jamin.sourceforge.net"; + homepage = "https://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; license = licenses.gpl2; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index d9d7bf19e7d61..7a1676e7873c5 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/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index 362c76a0d4dec..9ea5f40be14bb 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # ld: libengine_gui.a(gui_menu.o):(.bss+0x0): multiple definition of # `menu_t'; objs.release/action.o:(.bss+0x20): first defined here # TODO: remove it for 1.7.7+ release as it was fixed upstream. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 47a36ed1b5dfd..8055683a3fcf4 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/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix new file mode 100644 index 0000000000000..04216bdf09f6f --- /dev/null +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitea +, pkg-config +, stdenv +, openssl +, libiconv +, Security }: + +rustPlatform.buildRustPackage rec { + pname = "listenbrainz-mpd"; + version = "2.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "elomatreb"; + repo = "listenbrainz-mpd"; + rev = "v${version}"; + hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ="; + }; + + cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]; + + meta = with lib; { + homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; + changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md"; + description = "ListenBrainz submission client for MPD"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index abeaa7dff4270..846936e65f6a7 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ - lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++ + lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"); NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3ee546de223b3..005bef77d4567 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromGitLab , nix-update-script , meson , ninja @@ -9,7 +9,7 @@ , gst_all_1 , libhandy , libsecret -, libsoup +, libsoup_3 , appstream-glib , desktop-file-utils , totem-pl-parser @@ -25,16 +25,17 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.35"; + version = "1.4.37"; format = "other"; - doCheck = false; - src = fetchgit { - url = "https://gitlab.gnome.org/World/lollypop"; - rev = "refs/tags/${version}"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; fetchSubmodules = true; - sha256 = "sha256-Rdp0gZjdj2tXOWarsTpqgvSZVXAQsCLfk5oUyalE/ZA="; + sha256 = "sha256-3GPmGNbbSxvLq0t3F9q1x64BwNQCEvFQWLb0bSO9KUY="; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 libhandy - libsoup + libsoup_3 pango totem-pl-parser ] ++ lib.optional lastFMSupport libsecret; @@ -98,7 +99,6 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index be841577ad79b..c3d8671b26dd1 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -4,22 +4,24 @@ , ladspaH, php, libXrandr }: stdenv.mkDerivation rec { - pname = "lsp-plugins"; - version = "1.2.4"; + pname = "lsp-plugins"; + version = "1.2.5"; - src = fetchurl { - url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-GTrcUy10bN9Xj2I7uuGyP82c6NVpnQbXTI85H231yyo="; - }; + src = fetchurl { + url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw="; + }; - nativeBuildInputs = [ pkg-config php makeWrapper ]; - buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; + outputs = [ "out" "dev" "doc" ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" + nativeBuildInputs = [ pkg-config php makeWrapper ]; + buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" ]; - NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; + env.NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; configurePhase = '' make config PREFIX=${placeholder "out"} diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index 9a046a2e11aac..2ba12575543c1 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-fgnu89-inline" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fgnu89-inline" ]; buildPhase = "./cc"; installPhase = '' diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 7e11c0a8d75fd..2819e288ec115 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { pcre2 ] ++ lib.optional pulseaudioSupport libpulseaudio; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=free-nonheap-object" + ]; + postInstall = '' wrapProgram $out/bin/mimic \ --run "export ALSA_PLUGIN_DIR=${alsa-plugins}/lib/alsa-lib" diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index 5a229f0ae3485..ccbe14d767252 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.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE="; + sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4="; }; - cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk="; + cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 0d65fe813ec19..8d4a63f3b9ef1 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libvorbis ] ++ lib.optional stdenv.isDarwin SDL; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-reserved-user-defined-literal" diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 9a693c0eaa39f..7746d1c63fa83 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildInputs = [ gettext libmpcdec libao ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 29f28203e1389..3eb2cf20ee777 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mpg123"; - version = "1.29.3"; + version = "1.31.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ljiF2Mx3Ji8ot3GHx9GJ4yGV5kJE3iUwt5jd8yGD6Ec="; + sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94="; }; outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ]; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 4a73ddf03c877..e00b6722f38d6 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of # `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 065c943764ea1..5663070d7dfeb 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord ]; - NIX_CFLAGS_COMPILE = [ "-I${lib.getDev serd}/include/serd-0" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev serd}/include/serd-0" ]; meta = with lib; { homepage = "https://muse-sequencer.github.io/"; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 88b5d3b74c150..652adb03b66ac 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -1,8 +1,9 @@ { stdenv, lib, fetchurl, undmg }: let - versionComponents = [ "3" "6" "2" "548020600" ]; + versionComponents = [ "4" "0" "1" ]; appName = "MuseScore ${builtins.head versionComponents}"; + ref = "230121751"; in stdenv.mkDerivation rec { @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; - sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; + url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.${ref}.dmg"; + hash = "sha256-tkIEV+tCS0SYh2TlC70/zEBUEOSg//EaSKDGA7kH/vo="; }; buildInputs = [ undmg ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 573a78a92583b..97f71a1b48f8a 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,28 +1,35 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ninja , alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects +, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects, flac , qtquickcontrols2, qtscript, qtsvg, qttools -, qtwebengine, qtxmlpatterns +, qtwebengine, qtxmlpatterns, qtnetworkauth, qtx11extras , nixosTests }: mkDerivation rec { pname = "musescore"; - version = "3.6.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-GBGAD/qdOhoNfDzI+O0EiKgeb86GFJxpci35T6tZ+2s="; + sha256 = "sha256-Xhjjm/pYcjfZE632eP2jujqUAmzdYNa81EPrvS5UKnQ="; }; - patches = [ - ./remove_qtwebengine_install_hack.patch + # See https://github.com/musescore/MuseScore/issues/15571 + (fetchpatch { + url = "https://github.com/musescore/MuseScore/commit/365be5dfb7296ebee4677cb74b67c1721bc2cf7b.patch"; + hash = "sha256-tJ2M21i3geO9OsjUQKNatSXTkJ5U9qMT4RLNdJnyoKw="; + }) ]; cmakeFlags = [ "-DMUSESCORE_BUILD_CONFIG=release" + # Disable the _usage_ of the `/bin/crashpad_handler` utility. See: + # https://github.com/musescore/MuseScore/pull/15577 + "-DBUILD_CRASHPAD_CLIENT=OFF" + # Use our freetype "-DUSE_SYSTEM_FREETYPE=ON" ]; @@ -34,13 +41,13 @@ mkDerivation rec { "--set-default QT_QPA_PLATFORM xcb" ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ninja ]; buildInputs = [ alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio portmidi # tesseract + portaudio portmidi flac # tesseract qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 - qtscript qtsvg qttools qtwebengine qtxmlpatterns + qtscript qtsvg qttools qtwebengine qtxmlpatterns qtnetworkauth qtx11extras ]; passthru.tests = nixosTests.musescore; @@ -48,8 +55,11 @@ mkDerivation rec { meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; - license = licenses.gpl2; + license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever turion doronbehar ]; + # Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg + # file in ./darwin.nix in the meantime. platforms = platforms.linux; + mainProgram = "mscore"; }; } diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch deleted file mode 100644 index 57a6092d58522..0000000000000 --- a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/main/CMakeLists.txt -+++ b/main/CMakeLists.txt -@@ -220,16 +219,0 @@ else (MINGW) -- ## install qwebengine core -- if (NOT APPLE AND USE_WEBENGINE) -- install(PROGRAMS -- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess -- DESTINATION bin -- ) -- install(DIRECTORY -- ${QT_INSTALL_DATA}/resources -- DESTINATION lib/qt5 -- ) -- install(DIRECTORY -- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales -- DESTINATION lib/qt5/translations -- ) -- endif(NOT APPLE AND USE_WEBENGINE) -- diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 7dd7670d67f79..c9e1bed1db25b 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,39 +1,44 @@ -{ lib -, stdenv +{ asio , cmake -, pkg-config -, boost , curl , fetchFromGitHub , fetchpatch , ffmpeg , gnutls , lame +, lib , libev +, game-music-emu , libmicrohttpd , libopenmpt , mpg123 , ncurses +, pkg-config +, portaudio +, stdenv , taglib # Linux Dependencies , alsa-lib +, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire , pulseaudio -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, sndioSupport ? true, sndio , systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # Darwin Dependencies , Cocoa , SystemConfiguration +, coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio }: stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.98.1"; + version = "0.99.5"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-pnAdlCCqWzR0W8dF9CE48K8yHMVIx3egZlXvibxU18A="; + sha256 = "sha256-SbWL36GRIJPSvxZyj6sebJxTkSPsUcsKyC3TmcIq2O0"; }; outputs = [ "out" "dev" ]; @@ -44,16 +49,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + asio curl ffmpeg gnutls lame libev + game-music-emu libmicrohttpd libopenmpt mpg123 ncurses + portaudio taglib ] ++ lib.optionals systemdSupport [ systemd @@ -61,6 +68,12 @@ stdenv.mkDerivation rec { alsa-lib pulseaudio ] ++ lib.optionals stdenv.isDarwin [ Cocoa SystemConfiguration + ] ++ lib.optionals coreaudioSupport [ + CoreAudio + ] ++ lib.optional sndioSupport [ + sndio + ] ++ lib.optional pipewireSupport [ + pipewire ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 0d10b55d32964..470d5c1050753 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; buildInputs = [ eigen ffmpeg ]; - fixupPhase = if stdenv.isDarwin then '' + fixupPhase = lib.optionalString stdenv.isDarwin '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib - '' else ""; + ''; meta = with lib; { homepage = "https://www.musly.org"; diff --git a/pkgs/applications/audio/netease-music-tui/Cargo.lock b/pkgs/applications/audio/netease-music-tui/Cargo.lock new file mode 100644 index 0000000000000..471b1a53eae7d --- /dev/null +++ b/pkgs/applications/audio/netease-music-tui/Cargo.lock @@ -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.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags", + "libc", + "nix", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bytes 0.5.6", + "flate2", + "futures-core", + "memchr", + "pin-project-lite 0.2.9", +] + +[[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 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" +version = "0.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 = "bindgen" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static 1.4.0", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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 = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cc" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom 7.1.1", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits 0.2.15", + "time 0.1.44", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "claxon" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "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", +] + +[[package]] +name = "config" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" +dependencies = [ + "lazy_static 1.4.0", + "nom 4.2.3", + "rust-ini", + "serde 1.0.147", + "serde-hjson", + "serde_json", + "toml 0.4.10", + "yaml-rust", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "percent-encoding", + "time 0.2.27", + "version_check 0.9.4", +] + +[[package]] +name = "cookie_store" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde 1.0.147", + "serde_json", + "time 0.2.27", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "coreaudio-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +dependencies = [ + "bitflags", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "jni", + "js-sys", + "lazy_static 1.4.0", + "libc", + "mach", + "ndk", + "ndk-glue", + "nix", + "oboe", + "parking_lot", + "stdweb 0.1.3", + "thiserror", + "web-sys", + "winapi 0.3.9", +] + +[[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 = "cxx" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ + "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.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dbus" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[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-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 = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[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.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-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-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-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite 0.2.9", + "pin-utils", + "slab", +] + +[[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.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "h2" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", + "tracing-futures", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[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 = "hound" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes 1.2.1", + "fnv", + "itoa 1.0.4", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + +[[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 0.4.8", + "pin-project", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", + "tokio-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 = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.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 = "lazy_static" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libdbus-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 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" +checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" +dependencies = [ + "serde 0.8.23", + "serde_test", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "log", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.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 = "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 = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "minimp3" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" +dependencies = [ + "minimp3-sys", + "slice-deque", + "thiserror", +] + +[[package]] +name = "minimp3-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" +dependencies = [ + "cc", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + +[[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", + "net2", + "slab", + "winapi 0.2.8", +] + +[[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 = "mp3-duration" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static 1.4.0", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "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 = "netease_music_tui" +version = "0.1.3" +dependencies = [ + "base64 0.11.0", + "byteorder", + "bytes 0.4.12", + "chrono", + "config", + "cpal", + "dbus", + "dirs", + "failure", + "futures", + "hex", + "lazy_static 1.4.0", + "log", + "log-panics", + "mp3-duration", + "num-bigint", + "openssl", + "rand", + "regex", + "reqwest", + "rodio", + "serde 1.0.147", + "serde_derive", + "serde_json", + "serde_urlencoded 0.6.1", + "simple-logging", + "tempfile", + "termion", + "tokio", + "tui", + "unicode-width", +] + +[[package]] +name = "nix" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +dependencies = [ + "memchr", + "version_check 0.1.5", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits 0.2.15", +] + +[[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 0.2.15", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.15", +] + +[[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.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni", + "ndk", + "ndk-context", + "num-derive", + "num-traits 0.2.15", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "openssl" +version = "0.10.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +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.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml 0.5.9", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[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 = "publicsuffix" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ + "idna 0.2.3", + "url", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "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 = [ + "bitflags", +] + +[[package]] +name = "redox_termios" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ + "redox_syscall 0.2.16", +] + +[[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 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "reqwest" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "async-compression", + "base64 0.13.1", + "bytes 0.5.6", + "cookie", + "cookie_store", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static 1.4.0", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.9", + "serde 1.0.147", + "serde_urlencoded 0.7.1", + "time 0.2.27", + "tokio", + "tokio-socks", + "tokio-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rodio" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" +dependencies = [ + "claxon", + "cpal", + "hound", + "lewton", + "minimp3", +] + +[[package]] +name = "rust-ini" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[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 = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static 1.4.0", + "windows-sys", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "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.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 = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-hjson" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" +dependencies = [ + "lazy_static 0.2.11", + "linked-hash-map 0.3.0", + "num-traits 0.1.43", + "regex", + "serde 0.8.23", +] + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +dependencies = [ + "itoa 1.0.4", + "ryu", + "serde 1.0.147", +] + +[[package]] +name = "serde_test" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" +dependencies = [ + "serde 0.8.23", +] + +[[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 1.0.147", + "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.4", + "ryu", + "serde 1.0.147", +] + +[[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 = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "simple-logging" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" +dependencies = [ + "lazy_static 1.4.0", + "log", + "thread-id", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slice-deque" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" +dependencies = [ + "libc", + "mach", + "winapi 0.3.9", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check 0.9.4", +] + +[[package]] +name = "stdweb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde 1.0.147", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde 1.0.147", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[package]] +name = "strsim" +version = "0.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 = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "libc", + "redox_syscall 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" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", + "redox_termios", +] + +[[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 = "thread-id" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" +dependencies = [ + "libc", + "redox_syscall 0.1.57", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb 0.4.20", + "time-macros", + "version_check 0.9.4", + "winapi 0.3.9", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + +[[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 = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static 1.4.0", + "memchr", + "mio", + "num_cpus", + "pin-project-lite 0.1.12", + "slab", + "tokio-macros", +] + +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-socks" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" +dependencies = [ + "bytes 0.4.12", + "either", + "futures", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio", +] + +[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ + "serde 1.0.147", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde 1.0.147", +] + +[[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 0.2.9", + "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 = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "tui" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" +dependencies = [ + "bitflags", + "cassowary", + "either", + "itertools", + "log", + "termion", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check 0.9.4", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +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-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 = "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 = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.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", + "serde 1.0.147", + "serde_json", + "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 = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-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" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "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", + "winapi-build", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map 0.5.6", +] diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch deleted file mode 100644 index 45754a1f9e5d8..0000000000000 --- a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch +++ /dev/null @@ -1,2784 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..471b1a5 ---- /dev/null -+++ b/Cargo.lock -@@ -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.17.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "alsa" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" -+dependencies = [ -+ "alsa-sys", -+ "bitflags", -+ "libc", -+ "nix", -+] -+ -+[[package]] -+name = "alsa-sys" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -+dependencies = [ -+ "libc", -+ "pkg-config", -+] -+ -+[[package]] -+name = "android_system_properties" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "async-compression" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -+dependencies = [ -+ "bytes 0.5.6", -+ "flate2", -+ "futures-core", -+ "memchr", -+ "pin-project-lite 0.2.9", -+] -+ -+[[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 1.0.0", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "base-x" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -+ -+[[package]] -+name = "base64" -+version = "0.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 = "bindgen" -+version = "0.61.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" -+dependencies = [ -+ "bitflags", -+ "cexpr", -+ "clang-sys", -+ "lazy_static 1.4.0", -+ "lazycell", -+ "peeking_take_while", -+ "proc-macro2", -+ "quote", -+ "regex", -+ "rustc-hash", -+ "shlex", -+ "syn", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[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 = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -+ -+[[package]] -+name = "bytes" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+ -+[[package]] -+name = "cassowary" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -+ -+[[package]] -+name = "cc" -+version = "1.0.76" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" -+dependencies = [ -+ "jobserver", -+] -+ -+[[package]] -+name = "cesu8" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -+ -+[[package]] -+name = "cexpr" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -+dependencies = [ -+ "nom 7.1.1", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "chrono" -+version = "0.4.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -+dependencies = [ -+ "iana-time-zone", -+ "js-sys", -+ "num-integer", -+ "num-traits 0.2.15", -+ "time 0.1.44", -+ "wasm-bindgen", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "clang-sys" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -+dependencies = [ -+ "glob", -+ "libc", -+ "libloading", -+] -+ -+[[package]] -+name = "claxon" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" -+ -+[[package]] -+name = "codespan-reporting" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -+dependencies = [ -+ "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", -+] -+ -+[[package]] -+name = "config" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "nom 4.2.3", -+ "rust-ini", -+ "serde 1.0.147", -+ "serde-hjson", -+ "serde_json", -+ "toml 0.4.10", -+ "yaml-rust", -+] -+ -+[[package]] -+name = "const_fn" -+version = "0.4.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" -+ -+[[package]] -+name = "cookie" -+version = "0.14.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -+dependencies = [ -+ "percent-encoding", -+ "time 0.2.27", -+ "version_check 0.9.4", -+] -+ -+[[package]] -+name = "cookie_store" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" -+dependencies = [ -+ "cookie", -+ "idna 0.2.3", -+ "log", -+ "publicsuffix", -+ "serde 1.0.147", -+ "serde_json", -+ "time 0.2.27", -+ "url", -+] -+ -+[[package]] -+name = "core-foundation" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "core-foundation-sys" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -+ -+[[package]] -+name = "coreaudio-rs" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" -+dependencies = [ -+ "bitflags", -+ "coreaudio-sys", -+] -+ -+[[package]] -+name = "coreaudio-sys" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" -+dependencies = [ -+ "bindgen", -+] -+ -+[[package]] -+name = "cpal" -+version = "0.13.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" -+dependencies = [ -+ "alsa", -+ "core-foundation-sys", -+ "coreaudio-rs", -+ "jni", -+ "js-sys", -+ "lazy_static 1.4.0", -+ "libc", -+ "mach", -+ "ndk", -+ "ndk-glue", -+ "nix", -+ "oboe", -+ "parking_lot", -+ "stdweb 0.1.3", -+ "thiserror", -+ "web-sys", -+ "winapi 0.3.9", -+] -+ -+[[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 = "cxx" -+version = "1.0.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" -+dependencies = [ -+ "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.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -+dependencies = [ -+ "darling_core", -+ "darling_macro", -+] -+ -+[[package]] -+name = "darling_core" -+version = "0.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -+dependencies = [ -+ "fnv", -+ "ident_case", -+ "proc-macro2", -+ "quote", -+ "strsim", -+ "syn", -+] -+ -+[[package]] -+name = "darling_macro" -+version = "0.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -+dependencies = [ -+ "darling_core", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "dbus" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" -+dependencies = [ -+ "libc", -+ "libdbus-sys", -+] -+ -+[[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-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 = "discard" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -+ -+[[package]] -+name = "dtoa" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -+ -+[[package]] -+name = "either" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -+ -+[[package]] -+name = "encoding_rs" -+version = "0.8.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -+dependencies = [ -+ "crc32fast", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "fnv" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -+ -+[[package]] -+name = "foreign-types" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+dependencies = [ -+ "foreign-types-shared", -+] -+ -+[[package]] -+name = "foreign-types-shared" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "form_urlencoded" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -+dependencies = [ -+ "percent-encoding", -+] -+ -+[[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.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-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-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-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-project-lite 0.2.9", -+ "pin-utils", -+ "slab", -+] -+ -+[[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.26.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "h2" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio", -+ "tokio-util", -+ "tracing", -+ "tracing-futures", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+ -+[[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 = "hound" -+version = "3.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" -+ -+[[package]] -+name = "http" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -+dependencies = [ -+ "bytes 1.2.1", -+ "fnv", -+ "itoa 1.0.4", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -+dependencies = [ -+ "bytes 0.5.6", -+ "http", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -+ -+[[package]] -+name = "httpdate" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" -+ -+[[package]] -+name = "hyper" -+version = "0.13.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "httpdate", -+ "itoa 0.4.8", -+ "pin-project", -+ "socket2", -+ "tokio", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-tls" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -+dependencies = [ -+ "bytes 0.5.6", -+ "hyper", -+ "native-tls", -+ "tokio", -+ "tokio-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 = "ident_case" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -+ -+[[package]] -+name = "idna" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "idna" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -+dependencies = [ -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "iovec" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "ipnet" -+version = "2.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" -+ -+[[package]] -+name = "itertools" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" -+ -+[[package]] -+name = "itoa" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -+ -+[[package]] -+name = "jni" -+version = "0.19.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -+dependencies = [ -+ "cesu8", -+ "combine", -+ "jni-sys", -+ "log", -+ "thiserror", -+ "walkdir", -+] -+ -+[[package]] -+name = "jni-sys" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -+ -+[[package]] -+name = "jobserver" -+version = "0.1.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 = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+ -+[[package]] -+name = "lazycell" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -+ -+[[package]] -+name = "lewton" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -+dependencies = [ -+ "byteorder", -+ "ogg", -+ "tinyvec", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.137" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" -+ -+[[package]] -+name = "libdbus-sys" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -+dependencies = [ -+ "pkg-config", -+] -+ -+[[package]] -+name = "libloading" -+version = "0.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -+dependencies = [ -+ "cfg-if 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" -+checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -+dependencies = [ -+ "serde 0.8.23", -+ "serde_test", -+] -+ -+[[package]] -+name = "linked-hash-map" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -+ -+[[package]] -+name = "lock_api" -+version = "0.4.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -+dependencies = [ -+ "autocfg", -+ "scopeguard", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "log-panics" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" -+dependencies = [ -+ "log", -+] -+ -+[[package]] -+name = "mach" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -+ -+[[package]] -+name = "memchr" -+version = "2.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 = "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 = "minimal-lexical" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -+ -+[[package]] -+name = "minimp3" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" -+dependencies = [ -+ "minimp3-sys", -+ "slice-deque", -+ "thiserror", -+] -+ -+[[package]] -+name = "minimp3-sys" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -+dependencies = [ -+ "adler", -+] -+ -+[[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", -+ "net2", -+ "slab", -+ "winapi 0.2.8", -+] -+ -+[[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 = "mp3-duration" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "native-tls" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ -+[[package]] -+name = "ndk" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -+dependencies = [ -+ "bitflags", -+ "jni-sys", -+ "ndk-sys", -+ "num_enum", -+ "thiserror", -+] -+ -+[[package]] -+name = "ndk-context" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -+ -+[[package]] -+name = "ndk-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.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -+dependencies = [ -+ "darling", -+ "proc-macro-crate", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "ndk-sys" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -+dependencies = [ -+ "jni-sys", -+] -+ -+[[package]] -+name = "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 = "netease_music_tui" -+version = "0.1.3" -+dependencies = [ -+ "base64 0.11.0", -+ "byteorder", -+ "bytes 0.4.12", -+ "chrono", -+ "config", -+ "cpal", -+ "dbus", -+ "dirs", -+ "failure", -+ "futures", -+ "hex", -+ "lazy_static 1.4.0", -+ "log", -+ "log-panics", -+ "mp3-duration", -+ "num-bigint", -+ "openssl", -+ "rand", -+ "regex", -+ "reqwest", -+ "rodio", -+ "serde 1.0.147", -+ "serde_derive", -+ "serde_json", -+ "serde_urlencoded 0.6.1", -+ "simple-logging", -+ "tempfile", -+ "termion", -+ "tokio", -+ "tui", -+ "unicode-width", -+] -+ -+[[package]] -+name = "nix" -+version = "0.23.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -+dependencies = [ -+ "bitflags", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", -+ "memoffset", -+] -+ -+[[package]] -+name = "nom" -+version = "4.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+dependencies = [ -+ "memchr", -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "nom" -+version = "7.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -+dependencies = [ -+ "memchr", -+ "minimal-lexical", -+] -+ -+[[package]] -+name = "num-bigint" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -+dependencies = [ -+ "autocfg", -+ "num-integer", -+ "num-traits 0.2.15", -+] -+ -+[[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 0.2.15", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+dependencies = [ -+ "num-traits 0.2.15", -+] -+ -+[[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.14.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "num_enum" -+version = "0.5.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -+dependencies = [ -+ "num_enum_derive", -+] -+ -+[[package]] -+name = "num_enum_derive" -+version = "0.5.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -+dependencies = [ -+ "proc-macro-crate", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "numtoa" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -+ -+[[package]] -+name = "object" -+version = "0.29.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "oboe" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" -+dependencies = [ -+ "jni", -+ "ndk", -+ "ndk-context", -+ "num-derive", -+ "num-traits 0.2.15", -+ "oboe-sys", -+] -+ -+[[package]] -+name = "oboe-sys" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "ogg" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -+dependencies = [ -+ "byteorder", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" -+ -+[[package]] -+name = "openssl" -+version = "0.10.42" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" -+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.77" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" -+dependencies = [ -+ "autocfg", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[package]] -+name = "parking_lot" -+version = "0.11.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -+dependencies = [ -+ "instant", -+ "lock_api", -+ "parking_lot_core", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "instant", -+ "libc", -+ "redox_syscall 0.2.16", -+ "smallvec", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "peeking_take_while" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -+ -+[[package]] -+name = "percent-encoding" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -+ -+[[package]] -+name = "pin-project" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" -+ -+[[package]] -+name = "pin-utils" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -+ -+[[package]] -+name = "proc-macro-crate" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -+dependencies = [ -+ "once_cell", -+ "thiserror", -+ "toml 0.5.9", -+] -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+ -+[[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 = "publicsuffix" -+version = "1.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -+dependencies = [ -+ "idna 0.2.3", -+ "url", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom 0.1.16", -+ "libc", -+ "rand_chacha", -+ "rand_core", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom 0.1.16", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "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 = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" -+dependencies = [ -+ "redox_syscall 0.2.16", -+] -+ -+[[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 0.2.16", -+ "thiserror", -+] -+ -+[[package]] -+name = "regex" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "reqwest" -+version = "0.10.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -+dependencies = [ -+ "async-compression", -+ "base64 0.13.1", -+ "bytes 0.5.6", -+ "cookie", -+ "cookie_store", -+ "encoding_rs", -+ "futures-core", -+ "futures-util", -+ "http", -+ "http-body", -+ "hyper", -+ "hyper-tls", -+ "ipnet", -+ "js-sys", -+ "lazy_static 1.4.0", -+ "log", -+ "mime", -+ "mime_guess", -+ "native-tls", -+ "percent-encoding", -+ "pin-project-lite 0.2.9", -+ "serde 1.0.147", -+ "serde_urlencoded 0.7.1", -+ "time 0.2.27", -+ "tokio", -+ "tokio-socks", -+ "tokio-tls", -+ "url", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+ "winreg", -+] -+ -+[[package]] -+name = "rodio" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" -+dependencies = [ -+ "claxon", -+ "cpal", -+ "hound", -+ "lewton", -+ "minimp3", -+] -+ -+[[package]] -+name = "rust-ini" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -+ -+[[package]] -+name = "rustc-hash" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -+ -+[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[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 = "schannel" -+version = "0.1.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "windows-sys", -+] -+ -+[[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.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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", -+ "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.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 = "0.8.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" -+ -+[[package]] -+name = "serde" -+version = "1.0.147" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde-hjson" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" -+dependencies = [ -+ "lazy_static 0.2.11", -+ "linked-hash-map 0.3.0", -+ "num-traits 0.1.43", -+ "regex", -+ "serde 0.8.23", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.147" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.88" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" -+dependencies = [ -+ "itoa 1.0.4", -+ "ryu", -+ "serde 1.0.147", -+] -+ -+[[package]] -+name = "serde_test" -+version = "0.8.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -+dependencies = [ -+ "serde 0.8.23", -+] -+ -+[[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 1.0.147", -+ "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.4", -+ "ryu", -+ "serde 1.0.147", -+] -+ -+[[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 = "shlex" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -+ -+[[package]] -+name = "simple-logging" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "log", -+ "thread-id", -+] -+ -+[[package]] -+name = "slab" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "slice-deque" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" -+dependencies = [ -+ "libc", -+ "mach", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -+ -+[[package]] -+name = "socket2" -+version = "0.3.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "standback" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -+dependencies = [ -+ "version_check 0.9.4", -+] -+ -+[[package]] -+name = "stdweb" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" -+ -+[[package]] -+name = "stdweb" -+version = "0.4.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -+dependencies = [ -+ "discard", -+ "rustc_version", -+ "stdweb-derive", -+ "stdweb-internal-macros", -+ "stdweb-internal-runtime", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "stdweb-derive" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "serde 1.0.147", -+ "serde_derive", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-macros" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -+dependencies = [ -+ "base-x", -+ "proc-macro2", -+ "quote", -+ "serde 1.0.147", -+ "serde_derive", -+ "serde_json", -+ "sha1", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-runtime" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -+ -+[[package]] -+name = "strsim" -+version = "0.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 = "synstructure" -+version = "0.12.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "tempfile" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "fastrand", -+ "libc", -+ "redox_syscall 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" -+checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" -+dependencies = [ -+ "libc", -+ "numtoa", -+ "redox_syscall 0.2.16", -+ "redox_termios", -+] -+ -+[[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 = "thread-id" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -+dependencies = [ -+ "libc", -+ "redox_syscall 0.1.57", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -+dependencies = [ -+ "libc", -+ "wasi 0.10.0+wasi-snapshot-preview1", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "time" -+version = "0.2.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -+dependencies = [ -+ "const_fn", -+ "libc", -+ "standback", -+ "stdweb 0.4.20", -+ "time-macros", -+ "version_check 0.9.4", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "time-macros" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -+dependencies = [ -+ "proc-macro-hack", -+ "time-macros-impl", -+] -+ -+[[package]] -+name = "time-macros-impl" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "standback", -+ "syn", -+] -+ -+[[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 = "0.2.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "iovec", -+ "lazy_static 1.4.0", -+ "memchr", -+ "mio", -+ "num_cpus", -+ "pin-project-lite 0.1.12", -+ "slab", -+ "tokio-macros", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tokio-socks" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" -+dependencies = [ -+ "bytes 0.4.12", -+ "either", -+ "futures", -+ "thiserror", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-tls" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -+dependencies = [ -+ "native-tls", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite 0.1.12", -+ "tokio", -+] -+ -+[[package]] -+name = "toml" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+dependencies = [ -+ "serde 1.0.147", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+dependencies = [ -+ "serde 1.0.147", -+] -+ -+[[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 0.2.9", -+ "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 = "tracing-futures" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -+dependencies = [ -+ "pin-project", -+ "tracing", -+] -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "tui" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" -+dependencies = [ -+ "bitflags", -+ "cassowary", -+ "either", -+ "itertools", -+ "log", -+ "termion", -+ "unicode-segmentation", -+ "unicode-width", -+] -+ -+[[package]] -+name = "unicase" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+dependencies = [ -+ "version_check 0.9.4", -+] -+ -+[[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.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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-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 = "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 = "vcpkg" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -+ -+[[package]] -+name = "version_check" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[package]] -+name = "walkdir" -+version = "2.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -+dependencies = [ -+ "same-file", -+ "winapi 0.3.9", -+ "winapi-util", -+] -+ -+[[package]] -+name = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.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", -+ "serde 1.0.147", -+ "serde_json", -+ "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 = "web-sys" -+version = "0.3.60" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-build" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-util" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "windows-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" -+checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -+dependencies = [ -+ "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", -+ "winapi-build", -+] -+ -+[[package]] -+name = "yaml-rust" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -+dependencies = [ -+ "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 90d645804b77b..4449a8907a204 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -11,7 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg="; }; - cargoPatches = [ ./cargo-lock.patch ]; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib openssl ]; diff --git a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh index b7ca4216ace5f..dc8a1bf3e4682 100644..100755 --- a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh +++ b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh @@ -1,20 +1,17 @@ -#!nix-shell +#!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils gnugrep git cargo # This updates cargo-lock.patch for the netease-music-tui version listed in # default.nix. -set -eu -o verbose +set -euo pipefail -here=$PWD -version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) +here=$(dirname "$0") +version=$(grep '^ version = "' "$here/default.nix" | cut -d '"' -f 2) checkout=$(mktemp -d) -git clone -b "$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout" -cd "$checkout" +git clone -b "v$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout" -cargo generate-lockfile -git add -f Cargo.lock -git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch +cargo generate-lockfile --manifest-path "$checkout/Cargo.toml" +cp "$checkout/Cargo.lock" "$here" -cd "$here" rm -rf "$checkout" diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index beb1264679354..de89f9aedead4 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; }; + postPatch = '' + sed '1i#include <utility>' -i \ + libs/JUCELV2/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 3574dc2f5ac92..71fc1f103b9b5 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -1,14 +1,14 @@ -{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3, nix-update-script }: buildNpmPackage rec { pname = "open-stage-control"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-6tRd8boVwWc8qGlklYqA/Kp76VOMvtUJlu/G/InvHkA="; + hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; }; # Remove some Electron stuff from package.json @@ -71,7 +71,7 @@ buildNpmPackage rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Libre and modular OSC / MIDI controller"; diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/applications/audio/open-stage-control/update.sh deleted file mode 100755 index 30f1b4c293f16..0000000000000 --- a/pkgs/applications/audio/open-stage-control/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p common-updater-scripts jq nodejs -set -euo pipefail - -# Find nixpkgs repo -nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" - -stripwhitespace() { - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -} - -nixeval() { - nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . -} - -vendorhash() { - (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() { - path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" - outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" - - if [ -n "$outpath" ]; then - path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" - fi - - echo "$path" -} - -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")" - -updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" - -if [ "$updated" -eq 0 ]; then - echo 'update.sh: Package version not updated, nothing to do.' - exit 0 -fi - -# Update FOD hash -curhash="$(nixeval "$attr.npmDeps.outputHash")" -newhash="$(vendorhash "$attr.npmDeps")" - -if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then - sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" -else - echo 'update.sh: New npmDepsHash same as old npmDepsHash, nothing to do.' -fi diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index f86595361b659..47d7a64e3c20d 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus, fetchpatch }: stdenv.mkDerivation rec { pname = "opusfile"; @@ -12,7 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; outputs = [ "out" "dev" ]; - patches = [ ./include-multistream.patch ] + patches = [ + ./include-multistream.patch + (fetchpatch { + name = "CVE-2022-47021.patch"; + url = "https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch"; + sha256 = "sha256-XThI/ys5caB+OncFVfxm5IsvQPy1MbLQKwIlYjPvTJQ="; + }) + ] # fixes problem with openssl 1.1 dependency # see https://github.com/xiph/opusfile/issues/13 ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ]; diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 357799a11226c..20fd355fa0bd3 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opustags"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z"; + sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw="; }; buildInputs = [ libogg ]; diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix index ccac79763114a..3dd43fe3044ca 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/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix index 59ed1ce21f5f6..81cdc29be7a49 100644 --- a/pkgs/applications/audio/oxefmsynth/default.nix +++ b/pkgs/applications/audio/oxefmsynth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix new file mode 100644 index 0000000000000..071a4468434c3 --- /dev/null +++ b/pkgs/applications/audio/pbpctrl/default.nix @@ -0,0 +1,34 @@ +{ rustPlatform +, fetchFromGitHub +, pkg-config +, dbus +, protobuf +, lib +}: + +rustPlatform.buildRustPackage rec { + pname = "pbpctrl"; + + # https://github.com/qzed/pbpctrl/issues/4 + version = "unstable-2023-02-07"; + + src = fetchFromGitHub { + owner = "qzed"; + repo = "${pname}"; + rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6"; + hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA="; + }; + + cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA=="; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "Control Google Pixel Buds Pro from the Linux command line."; + homepage = "https://github.com/qzed/pbpctrl"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.vanilla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 10362e04d5506..49ed6dfd98423 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; - homepage = "http://petri-foo.sourceforge.net"; + homepage = "https://petri-foo.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 308d5b65f3e5a..55ab6261aa9e7 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 0000000000000..e5848de03dac3 --- /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.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "azuwis"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE="; + }; + + 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/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index bd956963a4682..8f11ec809c3a4 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${SDL2.dev}/include/SDL2" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index df008d1cfb33c..553ceb8be95a3 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "9wkhSDn7kvj6pqCawTJDBO8HfYe8eEYtAR1Bi9/fxiOBXRYUUHEZzSGLF9QoTVYMuGGHeX35c+QvnA2VsdsWCw=="; + sha512 = "xGmE/ikL3ez0WTJKiOIcB5QtI7Ta9wq1Qedy9albWVpCS04FTnxQH5S0esTXw6j+iDTD8Lc2JbOhw8tYo/zRXg=="; }; 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/48"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/49"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 528cc18cbe46c..576124d968449 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,57 +1,59 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: +{ lib +, stdenv +, fetchFromGitHub +, electron +, copyDesktopItems +, makeDesktopItem +, makeWrapper +}: stdenv.mkDerivation rec { pname = "pocket-casts"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/felicianotech/pocket-casts-desktop-app/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-nHdF9RDOkM9HwwmK/axiIPM4nmKrWp/FHNC/EI1vTTc="; + src = fetchFromGitHub { + owner = "felicianotech"; + repo = "pocket-casts-desktop-app"; + rev = "v${version}"; + sha256 = "sha256-WMv2G4b7kYnWy0pz8YyI2eTdefs1mtWau+HQLiRygjE="; }; + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Pocket Casts"; + genericName = "Podcasts Listener"; + exec = "pocket-casts"; + icon = "pocket-casts"; + comment = meta.description; + }) + ]; + nativeBuildInputs = [ - dpkg - autoPatchelfHook + copyDesktopItems makeWrapper ]; - buildInputs = [ alsa-lib gtk3 libXScrnSaver libXtst mesa nss ]; - - unpackCmd = '' - # If unpacking using -x option, there is a permission error - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner; - ''; - installPhase = '' runHook preInstall - mkdir -p $out - mv bin $out - mv lib $out - mv share $out + mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps - cp $out/lib/pocket-casts/resources/app/icon.png $out/share/pixmaps/pocket-casts.png + cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts + install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png + install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png - runHook postInstall - ''; + makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ + --add-flags $out/opt/pocket-casts/main.js - postFixup = '' - substituteInPlace $out/share/applications/pocket-casts.desktop \ - --replace Name=pocket-casts "Name=Pocket Casts" \ - --replace GenericName=pocket-casts "GenericName=Podcasts App" \ - --replace Exec=pocket-casts Exec=$out/bin/pocket-casts - makeWrapper ${electron}/bin/electron \ - $out/bin/pocket-casts \ - --add-flags $out/lib/pocket-casts/resources/app/main.js + runHook postInstall ''; meta = with lib; { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index fb8bd527aa22e..a00f60e732867 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.03"; + version = "6.3.08"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-Fb16sx+LVoXuiFASeiaYUMoNgZJXqKTBrUHFd2YXEJ0="; + sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo="; }; configurePhase = '' diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix index da5a64f708eb0..8e039f05927f5 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/applications/audio/pragha/default.nix @@ -83,7 +83,7 @@ mkDerivation rec { CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ]; - NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 9e7795401aa3e..304585e2c0a0c 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -10,6 +10,7 @@ let categories = [ "Audio" "AudioVideo" ]; icon = "psst"; terminal = false; + startupWMClass = "psst-gui"; }; in diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 705820950b0da..128d5c59c78ea 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { # the file should be executable but it isn't so our wrapper doesn't run preFixup = '' chmod 555 $out/bin/puddletag + wrapQtApp $out/bin/puddletag ''; doCheck = false; # there are no tests diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 2be471650a6ed..2fc911222da9e 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.36"; + version = "0.9.1"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xEFjyVly1VyDz9ALtVwxxrEs856joP+pe/mappyKrPU="; + hash = "sha256-tu/qlrbTcUCIRF15x9ATKHH+LDy1OsGJpo5x+CerTKg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index cb190cabf54d5..5164692b30549 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { parallel. ''; - homepage = "http://qmidiarp.sourceforge.net"; + homepage = "https://qmidiarp.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ sjfloat ]; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index f013c338e7655..081b0c9288929 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. ''; - homepage = "http://qtscrob.sourceforge.net"; + homepage = "https://qtscrob.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.vanzef ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 6d5d1ca860d04..e78502eb23f75 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-effects processor emulating a guitar effects pedalboard"; - homepage = "http://rakarrack.sourceforge.net"; + homepage = "https://rakarrack.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 542e47cd16b70..72a0ac5209344 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -4,8 +4,10 @@ , makeWrapper , alsa-lib +, curl , gtk3 , lame +, libxml2 , ffmpeg , vlc , xdg-utils @@ -23,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.73"; + version = "6.75"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-omQ2XdL4C78BQRuYKy90QlMko2XYHoVhd4X0C+Zyp8E="; - aarch64-linux = "sha256-XHohznrfFMHHgif4iFrpXb0FNddYiBb0gB7ZznlU834="; + x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck="; + aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ="; }.${stdenv.hostPlatform.system}; }; @@ -69,8 +71,9 @@ stdenv.mkDerivation rec { # Setting the rpath of the plugin shared object files does not # seem to have an effect for some plugins. # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. + # Note that libcurl and libxml2 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc xdotool ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc.lib ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index fed5a2ea5e1da..0b2cab3975e58 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/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index d578a4f307840..e7efb7896be7c 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { ]; # gstreamer cannot otherwise be found - NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 9fce777906bb0..807a27e67e1ad 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -23,20 +23,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-N0ftIq0+sxkpo56IGHZYAK6MgRNW7T6C2jWEiJsYy/Y="; + sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-90JBN3cJKqIJX6DRq5FtEpIr5Isxf+jb1SlxGMbBwMQ="; + hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 558948ab4a0d9..aef561e692a61 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-CCifn9OEFM//Hk1PJj8T3MXIV8pXCTdBBXPsHuZwLyQ="; + sha256 = "sha256-dlK1xQQqst4VQjioC7MZzqXwMC+JfqtvnD5lrOqGhYI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index 38110df291578..d7b15ba0482a9 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -3,17 +3,25 @@ , appimageTools }: -appimageTools.wrapType2 rec { +let pname = "sonixd"; version = "0.15.3"; - src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw="; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; extraInstallCommands = '' - mv $out/bin/sonixd-${version} $out/bin/sonixd + 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 --no-sandbox %U' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 3ec2cda4280be..7a6399ff3c666 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Without it doesn't find all of the boost libraries. BOOST_LIB_DIR = "${boost}/lib"; # uses the deprecated get_generic_category() in boost_system - NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; + env.NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix new file mode 100644 index 0000000000000..2330d9c279722 --- /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.12.0"; + + src = fetchFromGitHub { + owner = "aome510"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio="; + }; + + cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ="; + + 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/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2c821ec6b4c88..a0a17a93e1faa 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -134,8 +134,8 @@ stdenv.mkDerivation { ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir + ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir rpath="$out/share/spotify:$libdir" diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 84376a1bbe9e2..2b72664347e60 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + sed '1i#include <utility>' -i \ + lib/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index d6e56c98125f1..db7851d9e1547 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.7"; + version = "7.5.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0="; + hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc="; }; postUnpack = '' diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 525a743965c27..c27e3864d27f7 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" ''; - NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\""; + env.NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\""; # tenacity only looks for ffmpeg at runtime, so we need to link it in manually NIX_LDFLAGS = toString [ diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index c26ffd7e64af5..85d829f765ebe 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -1,23 +1,42 @@ { lib , stdenv -, fetchCrate , rustPlatform +, fetchCrate +, fetchpatch , pkg-config -, alsa-lib }: +, alsa-lib +, darwin +}: rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.8"; + version = "0.7.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1RlG1/2+NuMO9zqFHQaEkEX1YrYYMjnaNprjdl1ZnHQ="; + hash = "sha256-ytAKINcZwLyHWbzShxfxRKx4BepM0G2BYdLgwR48g7w="; }; - cargoHash = "sha256-SYk2SiFbp40/6Z0aBoX4MPnPLHjEfsJKCW4cErm0D78="; + cargoHash = "sha256-yxFF5Yqj+xTB3FAJUtgcIeAEHR44JA1xONxGFdG0yS0="; + + patches = [ + (fetchpatch { + name = "fix-panic-when-XDG_AUDIO_DIR-not-set.patch"; + url = "https://github.com/tramhao/termusic/commit/b6006b22901f1f865a2e3acf7490fd3fa520ca5e.patch"; + hash = "sha256-1ukQ0y5IRdOndsryuqXI9/zyhCDQ5NIeTan4KCynAv0="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; meta = with lib; { description = "Terminal Music Player TUI written in Rust"; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 8905351da5333..93b8d3203534f 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/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index da149db075379..55883a4f70e95 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: tcextract-extract_pcm.o:/build/transcode-1.1.7/import/extract_pcm.c:36: multiple definition of # `audio'; tcextract-extract_ac3.o:/build/transcode-1.1.7/import/extract_ac3.c:337: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 5c9f31b750027..93922313ddfd7 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/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index ae96ea63cb0ba..71697ab38b981 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 = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pdesaulniers"; repo = "wolf-shaper"; rev = "v${version}"; - sha256 = "sha256-BREv0nQVysWdx/sVd0cdFji49xtLmHEL8b2jLtgjDfI="; + sha256 = "sha256-xy6ZebabTRLo/Xk2OMoR4xtxmZsqYXaUHUebuDrHOvA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index 21313b9c05930..d300737ae6d8b 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # taken from the debian yasr package meta = { - homepage = "http://yasr.sourceforge.net"; + homepage = "https://yasr.sourceforge.net"; description = "A general-purpose console screen reader"; longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/yesplaymusic/default.nix b/pkgs/applications/audio/yesplaymusic/default.nix new file mode 100644 index 0000000000000..aee0d1d192fe7 --- /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/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 218204d690a16..83ce36a595816 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # ld: CMakeFiles/ympd.dir/src/mpd_client.c.o:(.bss+0x0): multiple definition of `mpd'; # CMakeFiles/ympd.dir/src/ympd.c.o:(.bss+0x20): first defined here # Should be fixed by pending https://github.com/notandy/ympd/pull/191 (does not apply as is). - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libmpdclient openssl ]; diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index 797b4624b966e..f490e452b51c0 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Force optimization to fix: # warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = "-O3"; + env.NIX_CFLAGS_COMPILE = "-O3"; # Remove pre-built y.tab.c to generate with nixpkgs bison preBuild = '' diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index fbe09b8aac0fe..88b7b9fa5c5ed 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -4,6 +4,7 @@ , rustPlatform , substituteAll , desktop-file-utils +, git , itstool , meson , ninja @@ -18,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.4.2"; + version = "0.5.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-EiXu5xv42at4NBwpCbij0+YsxVlNvIYrnxmlB9ItqZc="; + hash = "sha256-d+VkKY14o1wwINSlVBsvWux8YhyXg77N9i2R61QLGqM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2IDkVkzH5qQM+XiyxuST5p0y4N/Sz+4+Sj3Smotaf8M="; + hash = "sha256-3MNwX8kB+bjP9Dz+k+HYmCOI1Naa9tDBe0+GKsEmqnc="; }; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils + git itstool meson ninja diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 0da9675d2503e..36bc0ebfb883d 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.8"; + version = "1.9.9"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1hwfchwqvflfzpv8n9wvj567a68fa4bch0hi8vk4pzmwxsx4z7g1"; + 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 393447834bba5..c65e04e3de409 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/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 69004bb73c3fa..9b88cf9ab4ba6 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.7.5"; + version = "1.7.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; + sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 8a05f8276b3f0..3193a302d1a67 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (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.All"; version = "1.4.20"; sha256 = "1vnzmczd4z25vbf987p4vp6sxc09fp6mvhrvq41iwj1ks5zcprlf"; }) (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.CLightning"; version = "1.3.25"; sha256 = "0172czzzlgsljgmhb5wh8cb1cl12ac54qyzmd3w18wbkxmr205qk"; }) (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.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; }) (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.Lightning.LNDhub"; version = "1.0.18"; sha256 = "0vnnnm9c5w8ag3a25fzmsjax028ykb7xr4fp7saq4si3bmzkjswp"; }) (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"; }) diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index 48a8d3ad93022..7d2dbe9208582 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # ld: cgminer-driver-modminer.o:/build/source/miner.h:285: # multiple definition of `bitforce_drv'; cgminer-cgminer.o:/build/source/miner.h:285: # first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "CPU/GPU miner in c for bitcoin"; diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix index d65eb37f3985f..59f927443b7b0 100644 --- a/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -36,13 +36,15 @@ python3Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ + anyio (toPythonModule chia) + pytest # required at runtime by the "test" command + pytest-asyncio pytimeparse ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook - pytest-asyncio ]; preCheck = '' diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 99fe1595def1c..a07a0ea1e2814 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; + hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index a39cbc341e894..80fa1e94589f3 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "22.0.2"; + version = "22.1"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-20Tem6CD7XAt1EDfkl46Nxhb+Vq3sCk/UqnLCAm85FU="; + sha256 = "sha256-HDV06O9k+TpYR0ZwLas2hvDwxvnfoa8VUzgvkXv/WV8="; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index e656843536429..ae1a60ec1db05 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.6"; + version = "5.0.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; + sha256 = "sha256-yxb8cMAokAv0tl9FSjjtdvHkJP/UKlZxLLu/+gx8kyQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index e81dc1813e524..e4823f1a66c3e 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.35.2"; + version = "2.39.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hGJ9SeUYACOuypTJmPnrv4f8ujjsUt3dZbwso+94g3M="; + sha256 = "sha256-HlAnuc6n/de6EzHTit3xGCFLrc2+S+H/o0gCxH8d0aU="; fetchSubmodules = true; }; - vendorSha256 = "sha256-lKzJLRCcyhQIV7y1XxqbvTINLlUwWFnflZgGQHYzBjY="; + vendorSha256 = "sha256-kKwaA6NjRdg97tTEzEI+TWMSx7izzFWcefR5B086cUY="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/ethabi/Cargo.lock b/pkgs/applications/blockchains/ethabi/Cargo.lock new file mode 100644 index 0000000000000..05e3f0fef1d92 --- /dev/null +++ b/pkgs/applications/blockchains/ethabi/Cargo.lock @@ -0,0 +1,677 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" + +[[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 = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bitvec" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +dependencies = [ + "either", + "radium", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "byte-slice-cast" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[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.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "ethabi" +version = "13.0.0" +dependencies = [ + "anyhow", + "ethereum-types", + "hex", + "hex-literal", + "paste", + "serde", + "serde_json", + "sha3", + "thiserror", + "uint", +] + +[[package]] +name = "ethabi-cli" +version = "13.0.0" +dependencies = [ + "anyhow", + "ethabi", + "hex", + "itertools", + "sha3", + "structopt", +] + +[[package]] +name = "ethabi-contract" +version = "11.0.0" + +[[package]] +name = "ethabi-derive" +version = "13.0.0" +dependencies = [ + "anyhow", + "ethabi", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ethabi-tests" +version = "0.1.1" +dependencies = [ + "ethabi", + "ethabi-contract", + "ethabi-derive", + "hex", + "hex-literal", +] + +[[package]] +name = "ethbloom" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + +[[package]] +name = "fixed-hash" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +dependencies = [ + "byteorder", + "rand", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hex-literal" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" + +[[package]] +name = "impl-codec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + +[[package]] +name = "impl-serde" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" +dependencies = [ + "serde", +] + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "keccak" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" + +[[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.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "parity-scale-codec" +version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" +dependencies = [ + "arrayvec", + "bitvec", + "byte-slice-cast", + "serde", +] + +[[package]] +name = "paste" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "primitive-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" +dependencies = [ + "fixed-hash", + "impl-codec", + "impl-rlp", + "impl-serde", + "uint", +] + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rlp" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" +dependencies = [ + "bytes", + "rustc-hex", +] + +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "serde" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha3" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +dependencies = [ + "block-buffer", + "digest", + "keccak", + "opaque-debug", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "typenum" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" + +[[package]] +name = "uint" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[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-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/blockchains/ethabi/add-Cargo-lock.patch b/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch deleted file mode 100644 index 57725d28288a3..0000000000000 --- a/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch +++ /dev/null @@ -1,683 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..05e3f0f ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,677 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" -+ -+[[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 = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bitvec" -+version = "0.17.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -+dependencies = [ -+ "either", -+ "radium", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+dependencies = [ -+ "block-padding", -+ "generic-array", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -+ -+[[package]] -+name = "byte-slice-cast" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -+ -+[[package]] -+name = "bytes" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" -+ -+[[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.33.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "crunchy" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -+ -+[[package]] -+name = "digest" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "either" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+ -+[[package]] -+name = "ethabi" -+version = "13.0.0" -+dependencies = [ -+ "anyhow", -+ "ethereum-types", -+ "hex", -+ "hex-literal", -+ "paste", -+ "serde", -+ "serde_json", -+ "sha3", -+ "thiserror", -+ "uint", -+] -+ -+[[package]] -+name = "ethabi-cli" -+version = "13.0.0" -+dependencies = [ -+ "anyhow", -+ "ethabi", -+ "hex", -+ "itertools", -+ "sha3", -+ "structopt", -+] -+ -+[[package]] -+name = "ethabi-contract" -+version = "11.0.0" -+ -+[[package]] -+name = "ethabi-derive" -+version = "13.0.0" -+dependencies = [ -+ "anyhow", -+ "ethabi", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "ethabi-tests" -+version = "0.1.1" -+dependencies = [ -+ "ethabi", -+ "ethabi-contract", -+ "ethabi-derive", -+ "hex", -+ "hex-literal", -+] -+ -+[[package]] -+name = "ethbloom" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" -+dependencies = [ -+ "crunchy", -+ "fixed-hash", -+ "impl-rlp", -+ "impl-serde", -+ "tiny-keccak", -+] -+ -+[[package]] -+name = "ethereum-types" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" -+dependencies = [ -+ "ethbloom", -+ "fixed-hash", -+ "impl-rlp", -+ "impl-serde", -+ "primitive-types", -+ "uint", -+] -+ -+[[package]] -+name = "fixed-hash" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -+dependencies = [ -+ "byteorder", -+ "rand", -+ "rustc-hex", -+ "static_assertions", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.14.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -+ -+[[package]] -+name = "hex-literal" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" -+ -+[[package]] -+name = "impl-codec" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -+dependencies = [ -+ "parity-scale-codec", -+] -+ -+[[package]] -+name = "impl-rlp" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -+dependencies = [ -+ "rlp", -+] -+ -+[[package]] -+name = "impl-serde" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" -+dependencies = [ -+ "serde", -+] -+ -+[[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.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -+ -+[[package]] -+name = "keccak" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" -+ -+[[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.94" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+ -+[[package]] -+name = "parity-scale-codec" -+version = "1.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" -+dependencies = [ -+ "arrayvec", -+ "bitvec", -+ "byte-slice-cast", -+ "serde", -+] -+ -+[[package]] -+name = "paste" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -+ -+[[package]] -+name = "primitive-types" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" -+dependencies = [ -+ "fixed-hash", -+ "impl-codec", -+ "impl-rlp", -+ "impl-serde", -+ "uint", -+] -+ -+[[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.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "radium" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" -+ -+[[package]] -+name = "rand" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -+dependencies = [ -+ "libc", -+ "rand_chacha", -+ "rand_core", -+] -+ -+[[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", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rlp" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" -+dependencies = [ -+ "bytes", -+ "rustc-hex", -+] -+ -+[[package]] -+name = "rustc-hex" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[package]] -+name = "serde" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.64" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha3" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -+dependencies = [ -+ "block-buffer", -+ "digest", -+ "keccak", -+ "opaque-debug", -+] -+ -+[[package]] -+name = "static_assertions" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "structopt" -+version = "0.3.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.72" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tiny-keccak" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -+dependencies = [ -+ "crunchy", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" -+ -+[[package]] -+name = "uint" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" -+dependencies = [ -+ "byteorder", -+ "crunchy", -+ "hex", -+ "static_assertions", -+] -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -+ -+[[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.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -+ -+[[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-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/blockchains/ethabi/default.nix b/pkgs/applications/blockchains/ethabi/default.nix index 49f34a68bbacb..eea4d546f14ba 100644 --- a/pkgs/applications/blockchains/ethabi/default.nix +++ b/pkgs/applications/blockchains/ethabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "ethabi"; @@ -11,11 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc="; }; - cargoSha256 = "sha256-Jz0uEP2/ZjLS+GbCp7lNyJQdFDjTSFthjBdC/Z4tkTs="; - - cargoPatches = [ ./add-Cargo-lock.patch ]; + cargoLock = { + lockFile = ./Cargo.lock; + }; - buildInputs = lib.optional stdenv.isDarwin libiconv; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; meta = with lib; { description = "Ethereum function call encoding (ABI) utility"; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 5b1d12634df5e..4f53eaf580ccb 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 = "3.0.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-JbNk1TF0N3tRYGfZfSBFk+t/8GA4yjqP9G6S0ktdur8="; + sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d64376aae18d9..5aee9eaee9feb 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.51.0"; + version = "2.53.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-qpgzGJsj7hrrK2i+xP0T+hcw7WMlGBILbHVJBHD5duo="; + hash = "sha256-RGeJWUMZagXM/8SHHOpTpcnsz+BShnGp2yvt31qo5lI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 7a5607d01c5e5..78c503e7ee5c9 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "3.4.0"; + version = "3.5.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-4auiM5+kj/HjZKu2YP7JEnwDNxHuL39XCfmV/dc5jLE="; + hash = "sha256-09EQr/ghgdcnek0dih0+TXyIh5qwGWmg+nhI8d9n3Jc="; }; - cargoHash = "sha256-ihfGwdxL7Ttw86dhaVBp5meb0caXjzgbbP27Io8zv/c="; + cargoHash = "sha256-NWG3yIgxfD1GkiQ6TyZF4lNPy9s/i/9TaTujlOtx2NI="; buildFeatures = [ "modern" "gnosis" ]; @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - CoreFoundation SystemConfiguration + CoreFoundation + SystemConfiguration ]; depositContractSpec = fetchurl { diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 8cb8ed147aaca..35271cf232e5c 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.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = "${version}"; - sha256 = "sha256-bwwypqaqlO+T/8ppKIHqGSzVerhQVl7YHrORyrpaa2w="; + sha256 = "sha256-ZyqE6xFNsOwTBbLLn14jwNp9UkagTRgAQS+SEl+POaY="; }; - vendorSha256 = "sha256-AiRbUSgMoU8nTzis/7H9HRW2/xZxXFf39JipRbukeiA="; + vendorHash = "sha256-Wsejz/vYaT/maN7dYcrXPTXg30jZaldaslXbHcgHlRs="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 08def5dd7917b..debf89c617c76 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.57"; + version = "2.3.62"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; + sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 4931ec51078c0..b58c6bddafa01 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.30.0"; + version = "1.30.1"; # 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-Co8896RojUf/R8ZiRn7zSO1AWH7x5rYom6TbGohH1KM="; + sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY="; }; - cargoSha256 = "sha256-M+vhLBXsd+R97Sh5s6jFzon/47XohJeQKh//9QP6PXw="; + cargoHash = "sha256-5Gs1sAzjuUO3IkwMX1NeA/Sbax0qtwvulyT66AQaNjs="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 883514b7da5bb..7a7e461b1a217 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.37"; + version = "0.9.38"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; + hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4="; # 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. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; + cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 8f3fd4b1c886c..9d984803d2196 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.6.0"; + version = "19.7.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; + sha256 = "sha256-VfaP4EIVsu5JTAV7AX0Ymo44/TD8eUB61CViwf6Hfqw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix new file mode 100644 index 0000000000000..f333fcd05dc77 --- /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 index 85041accbc4bf..657e5b0e3ffab 100644 --- a/pkgs/applications/blockchains/torq/default.nix +++ b/pkgs/applications/blockchains/torq/default.nix @@ -1,20 +1,42 @@ { lib , buildGoModule +, buildNpmPackage , fetchFromGitHub }: -buildGoModule rec { +let pname = "torq"; - version = "0.16.15"; + version = "0.18.17"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-ibrPq/EC61ssn4072gTNvJg9QO41+aTsU1Hhc6X6NPk="; + hash = "sha256-xiA66yGo8b1+zZ7jQ7SFOtNPmqbdna7fUCT21uibrIM="; }; - vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; + web = buildNpmPackage { + pname = "${pname}-frontend"; + inherit version; + src = "${src}/web"; + npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM="; + + # copied from upstream Dockerfile + npmInstallFlags = [ "--legacy-peer-deps" ]; + TSX_COMPILE_ON_ERROR="true"; + ESLINT_NO_DEV_ERRORS="true"; + + # override npmInstallHook, we only care about the build/ directory + installPhase = '' + mkdir $out + cp -r build/* $out/ + ''; + }; +in +buildGoModule rec { + inherit pname version src; + + vendorHash = "sha256-bvisI589Gq9IdyJEqI+uzs3iDPOTUkq95P3n/KoFhF0="; subPackages = [ "cmd/torq" ]; @@ -24,6 +46,11 @@ buildGoModule rec { "-X github.com/lncapital/torq/build.version=v${version}" ]; + postInstall = '' + mkdir -p $out/web/build + cp -r ${web}/* $out/web/build/ + ''; + meta = with lib; { description = "Capital management tool for lightning network nodes"; license = licenses.mit; diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix index d4224893ba487..61413a7bbcf1e 100644 --- a/pkgs/applications/display-managers/emptty/default.nix +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-iT7wdxHC+/3fvBbSrHHuqNYWiqwL48NYzFmtmgVaFik="; + hash = "sha256-CbTPJgnKMWMXdG6Hr8xT9ae4Q9MxAfhITn5WSCzCmI4="; }; buildInputs = [ pam libX11 ]; diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix index e0ebbb3bc4c26..77ddda9337102 100644 --- a/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; meta = with lib; { description = "GTK based greeter for greetd, to be run under cage or similar"; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 5c2a6d7c59b04..53f004c2a3671 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib ]; - postUnpack = if conf != "" then '' + postUnpack = lib.optionalString (conf != "") '' cp ${builtins.toFile "config.h" conf} source/config.h - '' else ""; + ''; buildPhase = '' mkdir -p $out/bin $out/share/xgreeters diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index bc74edf5261d8..3d96ebd8deabe 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 494a02f3041fc..664199553ddf9 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)" - sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; + version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1" + sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4="; }; betaVersion = { version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 22d15d54f1936..f56fe637f83f8 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ncurses based hex editor with a vim-like interface"; - homepage = "http://bviplus.sourceforge.net"; + homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 7af47c46485a3..9d22963ebff6e 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.176.0"; + version = "1.186.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-7J/FAcmZYmgbmYEFm2V3+RBUcLE+8A+yOiJd/xp2Aww="; + hash = "sha256-CzCPz/Bny57nkxR21ACXjhAoplVVm4TVSbH6De+fKfI="; }; postPatch = '' @@ -66,8 +66,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: '' - ln -s ${dep} ${name} + cp -r ${dep} ${name} '') deps) + '' + # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText + substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \ + --replace GTK2_IME_CODE _GTK2_IME_CODE + lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 4ae432b946a7a..842d32b50306e 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,8 +1,8 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2022.06.19", - "hash": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg=" + "rev": "2023.01.02", + "hash": "sha256-4/ih4sBDel2wm+YFpNcwHoOrK8AgHe3Jbqxl+CYrQFM=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.11.09", - "hash": "sha256-2Q1azfhThrk1t65Q+2aRr00V0UFrvR+z5oVMeW9c2ug=" + "rev": "2023.02.05", + "hash": "sha256-ZOnIhUnFd+7mBEz6YIhUOQkhBbCNeTFD0tfUILuC1x4=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.11.09", - "hash": "sha256-rgXVOWmmc1ap/fCiXCvn34rhUbNRoMHbTXXYtnxk2pQ=" + "rev": "2023.02.25", + "hash": "sha256-iTdb+eI1alS6chCn2rEbUAy9iVAgVvsNGURxds/2f7s=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,18 +26,18 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.08.22", - "hash": "sha256-o87V32HhFpCeSxhgkfKiL69oCcmpiReVmiNBPyv1kc4=" + "rev": "2023.02.25", + "hash": "sha256-09jTp0pFbiQ268xB/eDUj98t8WYjzGaTiHdFvWlmoR0=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.09.03", - "hash": "sha256-6xzYn9x5tZLUhLAT9mQ4+UmpEemg386tAjlWdK8j/Ew=" + "rev": "2023.01.18", + "hash": "sha256-SLZIDcrLwvhkJY92e/wtSsoY5SrjghcumbdpuVdK4iE=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2022.10.26", - "hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY=" + "rev": "2023.01.02", + "hash": "sha256-NnPrQAqmKg3Lh16Qp/LZVS4JRtAxXi3qRovLTbzUyYQ=" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.2", - "hash": "sha256-aGNKkLDbGTeFgFEhuX7R2BXhnllsanJmk4k+1muiSD8=" + "rev": "v11.5.3", + "hash": "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8=" } } diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 3c3102370d0e8..7773c1e75f233 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -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 @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { 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 eadd27124281a..a0b0fa56de159 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -20,6 +20,11 @@ let 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 { buildEclipse = callPackage ./build-eclipse.nix { @@ -35,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-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; + 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}; }; }; @@ -47,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-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; + 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}; }; }; @@ -59,15 +70,18 @@ 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-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + 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 = - buildEclipse.override { jdk = jdk8; gtk = gtk2; } { + (buildEclipse.override { jdk = jdk8; gtk = gtk2; } { name = "eclipse-scala-sdk-4.7.0"; description = "Eclipse IDE for Scala Developers"; src = @@ -75,7 +89,10 @@ in rec { 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 @@ -84,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-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; + 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-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; + aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw=="; + }.${arch}; }; }; @@ -96,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-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; + 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}; }; }; @@ -108,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-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; + 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}; }; }; @@ -120,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-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; + 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}; }; }; @@ -132,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-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; + 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/ed/default.nix b/pkgs/applications/editors/ed/default.nix index f5ed28cedf68d..b7b70eb501ea1 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (rec { pname = "ed"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; - sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08="; + hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index f2acd4be8518e..41329ec143e04 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -33,18 +33,19 @@ ada-mode = callPackage ({ elpaBuild , emacs , fetchurl + , gnat-compiler , lib , uniquify-files , wisi }: elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.3.1"; + version = "8.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.3.1.tar"; - sha256 = "09ji22823w59nnqcjr5524ylxs93c5javsxcvmgbiqlvx9gfrdkk"; + url = "https://elpa.gnu.org/packages/ada-mode-8.0.5.tar"; + sha256 = "00baypl9bv2z42d6z2k531ai25yw2aj1dcv4pi1jhcp19c9kjg4l"; }; - packageRequires = [ emacs uniquify-files wisi ]; + packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; meta = { homepage = "https://elpa.gnu.org/packages/ada-mode.html"; license = lib.licenses.free; @@ -185,6 +186,21 @@ license = lib.licenses.free; }; }) {}; + altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "altcaps"; + ename = "altcaps"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/altcaps-1.1.0.tar"; + sha256 = "15jfhn9v74zi779a0m0v5dx8h135pbsxx0rh472sl13q2ark97bk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/altcaps.html"; + license = lib.licenses.free; + }; + }) {}; ampc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ampc"; @@ -249,10 +265,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.6"; + version = "13.1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.6.tar"; - sha256 = "0pdinnhkv7vqib01a6vxq1iixs7sw72r0sxzryv78c9hxn2k4552"; + url = "https://elpa.gnu.org/packages/auctex-13.1.9.tar"; + sha256 = "0dvf7ajfpi68823qv9vav3r1k04gc9bfq2ys3g1rhga2glxn7q9r"; }; packageRequires = [ emacs ]; meta = { @@ -440,16 +456,16 @@ license = lib.licenses.free; }; }) {}; - brief = callPackage ({ elpaBuild, fetchurl, lib }: + brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "brief"; ename = "brief"; - version = "5.87"; + version = "5.88.22.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.87.tar"; - sha256 = "02z8fzzf1zsk2r0cnssz3i2nd4qwsnya4i2r4qi4ndc1xjlsvgwc"; + url = "https://elpa.gnu.org/packages/brief-5.88.22.2.tar"; + sha256 = "1i4sdm8kcrazzp22gb4hi1gd4lfq6hdh6pnldmi1zjjyhl1gbzn3"; }; - packageRequires = []; + packageRequires = [ cl-lib nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/brief.html"; license = lib.licenses.free; @@ -504,16 +520,16 @@ license = lib.licenses.free; }; }) {}; - cape = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "cape"; ename = "cape"; - version = "0.10"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.10.tar"; - sha256 = "1ykr01wb0mgs1z181fk9m65lcrv60as5qzbnd0cnndva7p3078lc"; + url = "https://elpa.gnu.org/packages/cape-0.13.tar"; + sha256 = "1rd4ja5dlg9jnh75h24a475cfn8v6icxljya190yfp44vwl5q9v0"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/cape.html"; license = lib.licenses.free; @@ -598,10 +614,10 @@ elpaBuild { pname = "cl-lib"; ename = "cl-lib"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.7.tar"; - sha256 = "0s1vkkj1yc5zn6bvc84sr726cm4v3jh2ymm7hc3rr00swwbz35lv"; + url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar"; + sha256 = "1pnsm335wi1lkg7vi0lnqxajm12rvyakzd5iccxhipbk3gz3r6my"; }; packageRequires = []; meta = { @@ -722,10 +738,10 @@ elpaBuild { pname = "company-math"; ename = "company-math"; - version = "1.4"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-math-1.4.tar"; - sha256 = "17p5ib65lg8lj2gwip5qgsznww96pch16pr16b41lls5dx4k6d6z"; + url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar"; + sha256 = "1inib2ywb4ycr9hxgrzyffqi0jnrpjsn52bkwlsqyzgfxr5n4qsw"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -752,16 +768,16 @@ license = lib.licenses.free; }; }) {}; - compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, nadvice }: + compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.2.2"; + version = "29.1.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.2.2.tar"; - sha256 = "1jymfbadvnbjfyml6lri7hc7gz4f97nadn7a7ifpcncm9mhi13bp"; + url = "https://elpa.gnu.org/packages/compat-29.1.3.4.tar"; + sha256 = "16j7b18iwsdynb2w4x2hficz0g060r52lsg5ly9kb20zfrq2yvw0"; }; - packageRequires = [ emacs nadvice ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/compat.html"; license = lib.licenses.free; @@ -771,10 +787,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.20"; + version = "0.32"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.20.tar"; - sha256 = "134yyjap69lm3j99q7719b3pgc71y0nl30v9gy0cycf7dp7p1ssx"; + url = "https://elpa.gnu.org/packages/consult-0.32.tar"; + sha256 = "1cbdy4ybc4l6wjqa41zqz66yh6kv2sfnkxaspzaghpjy99ykyagb"; }; packageRequires = [ compat emacs ]; meta = { @@ -812,16 +828,16 @@ license = lib.licenses.free; }; }) {}; - corfu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.28"; + version = "0.35"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.28.tar"; - sha256 = "0gayzzxac42nxj1612isc4f5xishrr0bnvycpcfmkm5pf41kq50f"; + url = "https://elpa.gnu.org/packages/corfu-0.35.tar"; + sha256 = "0h5l4q77i2agnr5rcy0121pvs4yx4q84n2yf7fysd859g4gsm2vs"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/corfu.html"; license = lib.licenses.free; @@ -921,10 +937,10 @@ elpaBuild { pname = "csharp-mode"; ename = "csharp-mode"; - version = "1.1.1"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csharp-mode-1.1.1.tar"; - sha256 = "096aj4np1ii60h1kxbff5lkfznd0l0x551x103m5i1ks82kxlv1l"; + url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar"; + sha256 = "16b9zp6psf32ds9kk7vwf57xppz2jvbk4wpr7mqbn75bx3qvl44m"; }; packageRequires = [ emacs ]; meta = { @@ -936,10 +952,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.21.tar"; - sha256 = "11f01lyz6i133njigg53r890cic8y13kz7dswc8mj7m60a316dmv"; + url = "https://elpa.gnu.org/packages/csv-mode-1.22.tar"; + sha256 = "1f9pny1hkhdfmkmfpsk6ayjmb9p5hdpxpnmcprf51nfbvmi7ssig"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1026,10 +1042,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.34.tar"; - sha256 = "06nxia4myhysiw12vsflgllrp9nyhmjnybrrcl1vyf4pw0fc6yrx"; + url = "https://elpa.gnu.org/packages/debbugs-0.35.tar"; + sha256 = "1w6y02ikjshfk12sdgbryfgj2z4yia2mpifa7g13ab7v9phpqpl1"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1056,10 +1072,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-1.1.0.tar"; - sha256 = "06fmxszw8y8r2sm1j45wx14zb22jg5k5l73k1znhx4gl4v3bl968"; + url = "https://elpa.gnu.org/packages/denote-1.2.0.tar"; + sha256 = "09xbyh22xll82ywqmlbsvqhxlqawfivaqydha0gs5qc4yn71kp0k"; }; packageRequires = [ emacs ]; meta = { @@ -1071,10 +1087,10 @@ elpaBuild { pname = "detached"; ename = "detached"; - version = "0.9.2"; + version = "0.10.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/detached-0.9.2.tar"; - sha256 = "00rbdcl56gqjqrlbmf5mfgakzl086bgs5xb15ic3jlm676j64gqh"; + url = "https://elpa.gnu.org/packages/detached-0.10.1.tar"; + sha256 = "1qfcxhzd3gc66kq58k77cvxy18cr371c40z3n4w4m4ngxmpk96hi"; }; packageRequires = [ emacs ]; meta = { @@ -1116,10 +1132,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.9.0.tar"; - sha256 = "00mqknqyibbqyfcvdvk1m7nwipfpsw3afbvipqmghh5zm2n7wjr4"; + url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar"; + sha256 = "1avpqwrxhbx8zxwghc8714rcdfhc15b5chq2ixb366ml8xdmvhck"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1311,10 +1327,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.16"; + version = "0.8.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.16.tar"; - sha256 = "0qldw0a346xbkq289mynvfz38n4yh2rfbvgs5f7ixfc014y3j3gw"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.17.tar"; + sha256 = "0d2csc7b4mhaqcj8g3v46j11f5xcvbvgx06wxxfq2w0p2nzz1sik"; }; packageRequires = [ emacs seq ]; meta = { @@ -1371,10 +1387,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20221108"; + version = "20230127"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20221108.tar"; - sha256 = "0va6jb57pyv21zvjaq99yi1275rl2bna7ci5zicqshiq2naxdqzr"; + url = "https://elpa.gnu.org/packages/eev-20230127.tar"; + sha256 = "12f8r1mymd73gjbha6w9fk1ar38yxgbnrr6asvr8aa9rhcwwgxqm"; }; packageRequires = [ emacs ]; meta = { @@ -1386,10 +1402,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-0.9.0.tar"; - sha256 = "1yhnpnnz3v4v54ha4sibdzp2af6jq5p55jm0g6k0viqv2qpjmh3l"; + url = "https://elpa.gnu.org/packages/ef-themes-0.10.0.tar"; + sha256 = "06af9hqal5j2wss9ndyfqnjk18fdwxmy1gsyrvkvd7bq2nsl6z3n"; }; packageRequires = [ emacs ]; meta = { @@ -1400,6 +1416,7 @@ eglot = callPackage ({ eldoc , elpaBuild , emacs + , external-completion , fetchurl , flymake ? null , jsonrpc @@ -1410,12 +1427,21 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.9"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.9.tar"; - sha256 = "1v6pyk3c680xmsv6lrq5xcj9x771z87i3b92in87zg841mw3b6as"; + url = "https://elpa.gnu.org/packages/eglot-1.11.tar"; + sha256 = "1ifnk4bznykj34s4yh0gq5nyzja7mlv60krxa47j842grpndq2hp"; }; - packageRequires = [ eldoc emacs flymake jsonrpc project seq xref ]; + packageRequires = [ + eldoc + emacs + external-completion + flymake + jsonrpc + project + seq + xref + ]; meta = { homepage = "https://elpa.gnu.org/packages/eglot.html"; license = lib.licenses.free; @@ -1501,16 +1527,16 @@ license = lib.licenses.free; }; }) {}; - embark = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "embark"; ename = "embark"; - version = "0.17"; + version = "0.21.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.17.tar"; - sha256 = "05r5z59sv0j4sawybd4353ziya87q6yzx4l8sjklybcn2mslpp1q"; + url = "https://elpa.gnu.org/packages/embark-0.21.1.tar"; + sha256 = "157km8r8lrvp81l90vqrhvisd794qf0rsqfazl5r47gg1ba7szv5"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/embark.html"; license = lib.licenses.free; @@ -1525,10 +1551,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.6.tar"; - sha256 = "1c8rx9ikazbnap293ab6s26djikdy85i7z330wdwwrgmipkfawaj"; + url = "https://elpa.gnu.org/packages/embark-consult-0.7.tar"; + sha256 = "12b8p2f1bpy43jzjz3ask9h38z23hq4nxkid5dljnpmvf31d8x9c"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1549,10 +1575,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.4.1"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.4.1.tar"; - sha256 = "0hf1gdz5kgvy64652h33iph3lrnmiv98lhar421m0grbh326xn95"; + url = "https://elpa.gnu.org/packages/ement-0.5.2.tar"; + sha256 = "053gmhlyiy86q1qla4j5fy9kx11r986syn41q9022cs6iqpyf6hg"; }; packageRequires = [ emacs @@ -1577,10 +1603,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "12"; + version = "14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-12.tar"; - sha256 = "048ijrpw6s4k7zr78fzc3ksjjri6mnyp6c47h5lp5nw5gvm4np7a"; + url = "https://elpa.gnu.org/packages/emms-14.tar"; + sha256 = "0525vmi397q604z8i35zld3c4fkwbvxwir5lf4f1ji1bbvkzqavc"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1713,6 +1739,21 @@ license = lib.licenses.free; }; }) {}; + external-completion = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "external-completion"; + ename = "external-completion"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/external-completion-0.1.tar"; + sha256 = "12pddwp5jby2icshj77w4kwxv75zi00jdxw18f721d7zx3l7q668"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/external-completion.html"; + license = lib.licenses.free; + }; + }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; @@ -1807,10 +1848,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "0.4.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-0.4.1.tar"; - sha256 = "0szj9ys7bkj6cwg2bmb7sniyzjzdy3f7qm9r90grrgs5iir3k2qa"; + url = "https://elpa.gnu.org/packages/fontaine-1.0.0.tar"; + sha256 = "1p34d84z87s2zsfxdc18bjpif21fdixfzv2k4b9g4i0pcr94nc4v"; }; packageRequires = [ emacs ]; meta = { @@ -1867,10 +1908,10 @@ elpaBuild { pname = "ftable"; ename = "ftable"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ftable-1.0.tar"; - sha256 = "1qi0fxw94hb7p2s8n2dzbziialbjbjxgpwx2m4mvrmicrq375r5p"; + url = "https://elpa.gnu.org/packages/ftable-1.1.tar"; + sha256 = "0ww2kl5gb2dkkz0dxinjjnd3qafr31qjcqp1x10r3vcfbp9cfy4b"; }; packageRequires = [ emacs ]; meta = { @@ -1938,6 +1979,21 @@ license = lib.licenses.free; }; }) {}; + gnat-compiler = callPackage ({ elpaBuild, emacs, fetchurl, lib, wisi }: + elpaBuild { + pname = "gnat-compiler"; + ename = "gnat-compiler"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.2.tar"; + sha256 = "1cwjv1ziw5hjnk493vwwg25bnvy98wcryy0c4gknl1xp5qr2qxdg"; + }; + packageRequires = [ emacs wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnat-compiler.html"; + license = lib.licenses.free; + }; + }) {}; gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnome-c-style"; @@ -1957,10 +2013,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.10"; + version = "1.6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.10.tar"; - sha256 = "0kwgpyydnzphlw8rwyw9rim3j1awd0njxssm47db76nwwyxl1ry3"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar"; + sha256 = "0724i8p1hywgbfk0czxvrcwlwigj8r7x6ww0ap3k2sg90531ymws"; }; packageRequires = [ cl-lib ]; meta = { @@ -1989,10 +2045,10 @@ elpaBuild { pname = "gnu-elpa-keyring-update"; ename = "gnu-elpa-keyring-update"; - version = "2019.3"; + version = "2022.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2019.3.tar"; - sha256 = "1zw65kag25abimg088m4h8vj2nd4y5nc4qal6fsda0dldckfv1w0"; + url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar"; + sha256 = "1kij50xw5km14x44zjsfc1cdkz4xq79nv7hgfjsz3pgypq672z5z"; }; packageRequires = []; meta = { @@ -2050,6 +2106,61 @@ license = lib.licenses.free; }; }) {}; + gpr-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , gnat-compiler + , lib + , wisi }: + elpaBuild { + pname = "gpr-mode"; + ename = "gpr-mode"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.3.tar"; + sha256 = "0m93szqyh9dd73z2pygvacg42n3siiy8pji3yzg1ynji859bc3b8"; + }; + packageRequires = [ emacs gnat-compiler wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpr-mode.html"; + license = lib.licenses.free; + }; + }) {}; + gpr-query = callPackage ({ elpaBuild + , emacs + , fetchurl + , gnat-compiler + , lib + , wisi }: + elpaBuild { + pname = "gpr-query"; + ename = "gpr-query"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpr-query-1.0.3.tar"; + sha256 = "13h8hl2g55mbaz95k9jfcvz718rv4vli9wccr3rr7cb7yfvn4c5j"; + }; + packageRequires = [ emacs gnat-compiler wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpr-query.html"; + license = lib.licenses.free; + }; + }) {}; + graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "graphql"; + ename = "graphql"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar"; + sha256 = "1mzgz4piszm0v18gdn63xb46zqd1r17fkh24rw863i0p1achl21m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/graphql.html"; + license = lib.licenses.free; + }; + }) {}; greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "greader"; @@ -2256,10 +2367,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.8"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.8.tar"; - sha256 = "0yrkm5bh2kczl5f642wx1xlnzry1xrw0yxhpm0hqwjrmgmbdb9m6"; + url = "https://elpa.gnu.org/packages/inspector-0.20.tar"; + sha256 = "1640zpxjylzcafr4957j7nxspqwmfwliac300lf7j5xsmchlwmgm"; }; packageRequires = [ emacs ]; meta = { @@ -2286,10 +2397,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.6.tar"; - sha256 = "1rbslnnwsikpnb07jhzyk0f83z8i581834hsq3i7gnz3a99wpkx7"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.7.tar"; + sha256 = "1dfjh4ya9515vx0q2dv1brddw350gxd40h1g1vsa783ivvm0hm75"; }; packageRequires = [ emacs ]; meta = { @@ -2396,10 +2507,10 @@ elpaBuild { pname = "jarchive"; ename = "jarchive"; - version = "0.8.0"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jarchive-0.8.0.tar"; - sha256 = "0xfl0gbfqjgbkd28r56j35kc8y6x8nd2zi8xqzxmqvcyv9sd731l"; + url = "https://elpa.gnu.org/packages/jarchive-0.10.0.tar"; + sha256 = "0hgxfz6kqammgbr6cx7l8bg9hmakamrkbzbsjycb4k0gbi4r567b"; }; packageRequires = [ emacs ]; meta = { @@ -2471,10 +2582,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar"; - sha256 = "0biwvkvd48xqvigzs00yz4mk847xzyzm7p0lkns58fxph9nkg4h5"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.16.tar"; + sha256 = "1fkbw20ghinj70dk2q58scqlrpr3fcqgvcbfh5jbg6mdf1m6svf9"; }; packageRequires = [ emacs ]; meta = { @@ -2501,10 +2612,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.7"; + version = "0.1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.7.tar"; - sha256 = "02imi2qj329yrqvs23d4z7fv8bbaz0fvya6zdswb38blpdri4cn1"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar"; + sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -2651,10 +2762,10 @@ elpaBuild { pname = "load-relative"; ename = "load-relative"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-relative-1.3.1.el"; - sha256 = "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj"; + url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar"; + sha256 = "1fwa51jp0sq5l69y98l2zyj0iq9s6rj1rnqrmvncif61smma8fd7"; }; packageRequires = []; meta = { @@ -2707,6 +2818,21 @@ license = lib.licenses.free; }; }) {}; + luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "luwak"; + ename = "luwak"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar"; + sha256 = "10jcblm0q5948l3ar911dfj6y9p5bggwz9nmq9d3prlgz5zczv34"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/luwak.html"; + license = lib.licenses.free; + }; + }) {}; lv = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "lv"; @@ -2737,16 +2863,16 @@ license = lib.licenses.free; }; }) {}; - marginalia = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + marginalia = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.15"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.15.tar"; - sha256 = "0sadz4c44pld9aqn49a7l80lqgv2ncv7aw401d740n2ja2grg6vb"; + url = "https://elpa.gnu.org/packages/marginalia-1.1.tar"; + sha256 = "1pldbgsjs9xsrp3y9rp8yz8p67xbhb3gy80sv5q215f6mwhphjqm"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/marginalia.html"; license = lib.licenses.free; @@ -2996,10 +3122,10 @@ elpaBuild { pname = "nadvice"; ename = "nadvice"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nadvice-0.3.el"; - sha256 = "0gi3csnxbs8h7iy0scsl35sic3gv90swa89hhdjwb7qvpirfdcgw"; + url = "https://elpa.gnu.org/packages/nadvice-0.4.tar"; + sha256 = "0ac7zxi04gzcd5hz81lib1db3c6a7xmwkb381ljxvaha1mlzp1k0"; }; packageRequires = []; meta = { @@ -3275,10 +3401,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "0.7"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-0.7.tar"; - sha256 = "0hvfqxpazan1djpn0qxh609r53jgddpcdih6chkn2zvx29mhdkgg"; + url = "https://elpa.gnu.org/packages/orderless-1.0.tar"; + sha256 = "0kslgrs857h3mm837hcb8v52ankbv0hm2pz0q136imckzj32m43s"; }; packageRequires = [ emacs ]; meta = { @@ -3290,10 +3416,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.5"; + version = "9.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.5.tar"; - sha256 = "13sykrkhb192vnmj5nlws5jc5a4fr7ynmyxpzanqlzx1gbdxv32p"; + url = "https://elpa.gnu.org/packages/org-9.6.1.tar"; + sha256 = "1kcv6aippv17az0dgikmx0w4dq2140ki3d19nvn01v0lk4kxpgri"; }; packageRequires = [ emacs ]; meta = { @@ -3335,10 +3461,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.5"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-0.5.tar"; - sha256 = "0fd5inaq094xhlv4cnd7p47hishlxlhjb17srk4cm1jdgaar3pnp"; + url = "https://elpa.gnu.org/packages/org-modern-0.8.tar"; + sha256 = "0j9ilivy6iyqmml4sxy88c99vpg3v00pglb62lpxc4sywia06dzf"; }; packageRequires = [ emacs ]; meta = { @@ -3395,10 +3521,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.3.1.tar"; - sha256 = "1v7i2i28500p4gvikcpp931qpks9zmvfpf6lfzrqdqppx2ix295q"; + url = "https://elpa.gnu.org/packages/org-transclusion-1.3.2.tar"; + sha256 = "02r48jzr5zivk11c3c3a9vj1cixfgf1wlmv1kjr5bxldayhg7aqb"; }; packageRequires = [ emacs org ]; meta = { @@ -3451,16 +3577,16 @@ license = lib.licenses.free; }; }) {}; - osm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "osm"; ename = "osm"; - version = "0.8"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.8.tar"; - sha256 = "1vvd149n4pa6jy7xk5dmhi0nfwcjd4rvxn283f1jxp5jvv47m202"; + url = "https://elpa.gnu.org/packages/osm-0.10.tar"; + sha256 = "1lpbc98ais0wrrpj9cmra3ha8jnja4d3pqzw1kdml91drhqifpmw"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/osm.html"; license = lib.licenses.free; @@ -3560,10 +3686,10 @@ elpaBuild { pname = "peg"; ename = "peg"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/peg-1.0.tar"; - sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl"; + url = "https://elpa.gnu.org/packages/peg-1.0.1.tar"; + sha256 = "0yxfwwwc6fck1p9smcm1dwnva42868xvavhy7j749vlxrgb3v94x"; }; packageRequires = [ emacs ]; meta = { @@ -3605,10 +3731,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.30"; + version = "0.4.39"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.30.tar"; - sha256 = "0gwdcfvp3564zmiaw1p0vfyw46n6kn14nh8qx0jwzwygy22v1jdq"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar"; + sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i"; }; packageRequires = [ emacs ]; meta = { @@ -3635,10 +3761,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.2.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.2.1.tar"; - sha256 = "01xa4vjbcdm37dya5d006k9p37kcm1g4yh4j7vh7hjfdz43j6y9s"; + url = "https://elpa.gnu.org/packages/plz-0.3.tar"; + sha256 = "19fzln4b6pp3c2as7a8wija120qykkxs27jrn637vqsvhi648xcd"; }; packageRequires = [ emacs ]; meta = { @@ -3646,6 +3772,36 @@ license = lib.licenses.free; }; }) {}; + poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "poke"; + ename = "poke"; + version = "3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poke-3.0.tar"; + sha256 = "08ajbhwj4sdph9ay7wbd807slzxg6360kpqkyyvhdzl8kqh67wc7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/poke.html"; + license = lib.licenses.free; + }; + }) {}; + poke-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "poke-mode"; + ename = "poke-mode"; + version = "3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poke-mode-3.0.tar"; + sha256 = "0xw50x3fx3ai3rsykh371hwlgkmyx4h37ps2583l69f7id7h2103"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/poke-mode.html"; + license = lib.licenses.free; + }; + }) {}; poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "poker"; @@ -3665,10 +3821,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.2.0"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.2.0.tar"; - sha256 = "06xk6z3b5mqgcskjiwkl9viccvzriflr8y51aclyfdamh5qb6kqb"; + url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar"; + sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b"; }; packageRequires = [ emacs ]; meta = { @@ -3680,10 +3836,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.3"; + version = "0.9.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.3.tar"; - sha256 = "15x6nbvyy592fwn36syxi9719sknvrm4bwnpyc16z9jn2xm62q3p"; + url = "https://elpa.gnu.org/packages/project-0.9.8.tar"; + sha256 = "0i1q9blvpj3bygjh98gv0kqn2rm01b8lqp9vra82sy3hzzj39pyx"; }; packageRequires = [ emacs xref ]; meta = { @@ -3695,10 +3851,10 @@ elpaBuild { pname = "psgml"; ename = "psgml"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; - sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; + url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar"; + sha256 = "12ndv9xj4zg0k2vas4bmpf2iwy71hy203zxfd7sfwskdd96kzjjv"; }; packageRequires = []; meta = { @@ -3740,10 +3896,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.2.8"; + version = "5.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.2.8.tar"; - sha256 = "1klarzr5lfga09ysq3c7gkgmzl6r08gpl4519x5damxd82x4r3y2"; + url = "https://elpa.gnu.org/packages/pyim-5.3.0.tar"; + sha256 = "0q0h705k1yymp1pqyycmq1zqvzawzkl4q2ckvflbncgrqh306xmh"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4020,10 +4176,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.9.0.tar"; - sha256 = "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x"; + url = "https://elpa.gnu.org/packages/rec-mode-1.9.1.tar"; + sha256 = "0f60bw07l6kk1kkjjxsk30p6rxj9mpngaxqy8piyabnijfgjzd3s"; }; packageRequires = [ emacs ]; meta = { @@ -4050,10 +4206,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.20.tar"; - sha256 = "0r20dim2r4a4bv0fmgbnq3graa7hhlai55h9qyknapqbr2j1v1h7"; + url = "https://elpa.gnu.org/packages/relint-1.21.tar"; + sha256 = "12453agy7y3ayqn32fi11ljlnk8ck3i1aljw5wzm0yyqp00m73x3"; }; packageRequires = [ emacs xr ]; meta = { @@ -4121,6 +4277,21 @@ license = lib.licenses.free; }; }) {}; + ruby-end = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "ruby-end"; + ename = "ruby-end"; + version = "0.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar"; + sha256 = "0b6hh31vpyv6j86v97migw4if2i9m95075p0bf5ai61cqb42crg4"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/ruby-end.html"; + license = lib.licenses.free; + }; + }) {}; rudel = callPackage ({ cl-generic , cl-lib ? null , cl-print @@ -4371,10 +4542,10 @@ elpaBuild { pname = "sml-mode"; ename = "sml-mode"; - version = "6.10"; + version = "6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sml-mode-6.10.el"; - sha256 = "01yf0s474r9xhj6nbs14ljn9ccxb5yy758i17c8nmgmqvm8fx7sb"; + url = "https://elpa.gnu.org/packages/sml-mode-6.11.tar"; + sha256 = "05vga709kphbx6jacqh57cq5gyicwrxxf81gask5lbq7vzfzlbfc"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4525,10 +4696,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.13"; + version = "3.1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.13.tar"; - sha256 = "006jr8yc5qvxdfk0pn40604a2b7a1ah6l6hi6rhxm3p5b08d9i5w"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.14.tar"; + sha256 = "079g5g3640hyqdikszkz8kmfqdnqdbkl8rwd6k3kkck39ng63zy6"; }; packageRequires = [ emacs ]; meta = { @@ -4536,6 +4707,21 @@ license = lib.licenses.free; }; }) {}; + standard-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "standard-themes"; + ename = "standard-themes"; + version = "1.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/standard-themes-1.2.0.tar"; + sha256 = "1prf89jk41cmd3bj51343jyz53k5bjbc871s54cqlhz3vvbgc4ww"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/standard-themes.html"; + license = lib.licenses.free; + }; + }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; @@ -4551,6 +4737,21 @@ license = lib.licenses.free; }; }) {}; + substitute = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "substitute"; + ename = "substitute"; + version = "0.1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/substitute-0.1.6.tar"; + sha256 = "0hdg6gv878bpb6yrav345a8479w50q48nmibvk4p04im7b7r1238"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/substitute.html"; + license = lib.licenses.free; + }; + }) {}; svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "svg"; @@ -4626,6 +4827,21 @@ license = lib.licenses.free; }; }) {}; + sxhkdrc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sxhkdrc-mode"; + ename = "sxhkdrc-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar"; + sha256 = "1vzb7ijx61rq31xj0d13yidlirp038841fwdvlqlv88hi6hb2faq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html"; + license = lib.licenses.free; + }; + }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -4706,16 +4922,16 @@ license = lib.licenses.free; }; }) {}; - tempel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.5"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.5.tar"; - sha256 = "0gx48p2kkwizxf30h8jq658ksp00ibf5azjxvcs1nj8hz2g3agjx"; + url = "https://elpa.gnu.org/packages/tempel-0.7.tar"; + sha256 = "05yhsrricaxlz67w1j0s1gbzpbsw4iqryfvks25v25pm95xrr7c4"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/tempel.html"; license = lib.licenses.free; @@ -4819,10 +5035,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.3.3"; + version = "2.6.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.3.3.tar"; - sha256 = "05w04qwk1lk50fzwl6fxyf6pb1jd2lx4as99zm1dpa858jab6w4a"; + url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar"; + sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8"; }; packageRequires = [ emacs ]; meta = { @@ -4924,10 +5140,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.1"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.1.tar"; - sha256 = "1b1qrrg60wx4ikl9nd8gmawj0pc0yysxq901l29336gwpbwj81y7"; + url = "https://elpa.gnu.org/packages/triples-0.2.3.tar"; + sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39"; }; packageRequires = [ emacs seq ]; meta = { @@ -5003,10 +5219,10 @@ elpaBuild { pname = "url-scgi"; ename = "url-scgi"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/url-scgi-0.8.tar"; - sha256 = "1837vyamwk5mp2nf3k477hyr5pq1xy6p7br7kl6h2k8jmxqy3mlj"; + url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar"; + sha256 = "0mfbqr03302gk38aamlg1lgdznd6y3blcc3zizfb72ppb87j78mc"; }; packageRequires = [ emacs ]; meta = { @@ -5018,10 +5234,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/use-package-2.4.4.tar"; - sha256 = "1hw73006l1xh0padqxyr0l3sjnr3fxyz619csz8ds6am86fdxvfp"; + url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar"; + sha256 = "09aimbmkcpyffrq1qnavzx6c4ccfawz7ndz2ac8md7qxilxx58yc"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -5160,10 +5376,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2021.10.14.127365406"; + version = "2022.12.18.181110314"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2021.10.14.127365406.tar"; - sha256 = "1v0ld310rs86vzmlw7phv1b5p59faqs9wg4p8jpbnb9ap9lwidnl"; + url = "https://elpa.gnu.org/packages/verilog-mode-2022.12.18.181110314.tar"; + sha256 = "0vy2lfscirj7as106m94yi88n8pwp4d2ngaclsf0axyrbcagzkjn"; }; packageRequires = []; meta = { @@ -5171,16 +5387,16 @@ license = lib.licenses.free; }; }) {}; - vertico = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.28"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.28.tar"; - sha256 = "0rkvfya674hy8g37hy40knwwppbygmx005cg04136kdlkmywb0l1"; + url = "https://elpa.gnu.org/packages/vertico-1.1.tar"; + sha256 = "0v5hpaysh7m7v2g77dyzy4hhnnv9v3wvpyfz6zi318sw96vmabhm"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/vertico.html"; license = lib.licenses.free; @@ -5195,10 +5411,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.5.4"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.4.tar"; - sha256 = "19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar"; + sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -5348,10 +5564,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.13.1"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.13.1.tar"; - sha256 = "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"; + url = "https://elpa.gnu.org/packages/websocket-1.14.tar"; + sha256 = "0g75kaw9bdk30apiyk09583amnw9458kkmgbbcl2myqfqspywnva"; }; packageRequires = [ cl-lib ]; meta = { @@ -5408,10 +5624,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "4.0.0"; + version = "4.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-4.0.0.tar"; - sha256 = "1w082nqzvzljm8m8gxja7va88g0lz264d4ir24ydak22rfr688bv"; + url = "https://elpa.gnu.org/packages/wisi-4.2.2.tar"; + sha256 = "041np2xssm4iv75wmwds25fwx0p2y3j6ph0j0pxmgcj9p028mbka"; }; packageRequires = [ emacs seq ]; meta = { @@ -5428,10 +5644,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar"; - sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar"; + sha256 = "05g2zn3p9r7rha20wv8jy1dwvllfyjjpzr6agkcm523rj639jh2b"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -5469,6 +5685,21 @@ license = lib.licenses.free; }; }) {}; + xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "xeft"; + ename = "xeft"; + version = "3.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xeft-3.3.tar"; + sha256 = "1jzas6qy0s686s0ghdrgcz2bfyp32s70qvkqw00sm3mm3jypiplm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xeft.html"; + license = lib.licenses.free; + }; + }) {}; xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; @@ -5518,10 +5749,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.5.1"; + version = "1.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.5.1.tar"; - sha256 = "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna"; + url = "https://elpa.gnu.org/packages/xref-1.6.2.tar"; + sha256 = "16vzjl2dv5nmb40xfw7mfrk8i64fac3cy4sf2d2hy832rwlg15q0"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index d3c3d58908585..7fbf06b9d114c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -177,6 +177,23 @@ let dune = dontConfigure super.dune; + emacsql = super.emacsql.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; + + postBuild = '' + cd source/sqlite + make + cd - + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + install -m=755 -D source/sqlite/emacsql-sqlite \ + $out/share/emacs/site-lisp/elpa/emacsql-${old.version}/sqlite/emacsql-sqlite + ''; + + stripDebugList = [ "share" ]; + }); + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; @@ -194,6 +211,13 @@ let stripDebugList = [ "share" ]; }); + epkg = super.epkg.overrideAttrs (old: { + postPatch = '' + substituteInPlace lisp/epkg.el \ + --replace '(call-process "sqlite3"' '(call-process "${pkgs.sqlite}/bin/sqlite3"' + ''; + }); + erlang = super.erlang.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ pkgs.perl @@ -259,7 +283,7 @@ let irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; - NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; + env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 58d425a825076..801148d32fe95 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "1.8.1"; + version = "1.8.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.8.1.tar"; - sha256 = "00rpaki0vf6aiwa4by1v3hba79jmx1g7c283q1gibp4ka7grxzc2"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.8.5.tar"; + sha256 = "0f5h9ymcg4n0zn3yaq1s0h5sfrq3pbcswda9875yhlcprzbrgyq7"; }; packageRequires = []; meta = { @@ -135,6 +135,23 @@ license = lib.licenses.free; }; }) {}; + auto-dim-other-buffers = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "auto-dim-other-buffers"; + ename = "auto-dim-other-buffers"; + version = "2.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar"; + sha256 = "0a7xdp25bny5ykf7808jwmziad8myf8yp01p07f20bsrl4m0bzz6"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html"; + license = lib.licenses.free; + }; + }) {}; autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "autothemer"; @@ -150,6 +167,21 @@ license = lib.licenses.free; }; }) {}; + bash-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bash-completion"; + ename = "bash-completion"; + version = "3.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar"; + sha256 = "19vs0rflqm1z4r17pv1qx6v60g03x4n2b7503rjr2d0ljrwkbpcp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bash-completion.html"; + license = lib.licenses.free; + }; + }) {}; better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "better-jumper"; @@ -195,6 +227,21 @@ license = lib.licenses.free; }; }) {}; + blow = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "blow"; + ename = "blow"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar"; + sha256 = "0z2y3vq8m4x9ihn84x7p2vgkxprrrvhavcgwll897gsc9khp1xda"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/blow.html"; + license = lib.licenses.free; + }; + }) {}; boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "boxquote"; @@ -214,10 +261,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.28"; + version = "1.29"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.28.tar"; - sha256 = "0gli1cxqiqg4adln7svplcc6rk718q4gn6idwxbzx8mgcwhmw75f"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.29.tar"; + sha256 = "0k9canfnxzhbk5m33z3bfxw7l2bvvhdiv9x357lf6gs8vg19158p"; }; packageRequires = [ emacs ]; meta = { @@ -225,6 +272,21 @@ license = lib.licenses.free; }; }) {}; + camera = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "camera"; + ename = "camera"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/camera-0.2.tar"; + sha256 = "1hdq24xy685wzjz3hfxwqmcmsvajcrkr4va4lmvgvdmkvmfk92cj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/camera.html"; + license = lib.licenses.free; + }; + }) {}; caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "caml"; @@ -268,10 +330,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.5.0.tar"; - sha256 = "0vggh2l92m8hm2wqzcyka439fs0kzbbfknfgyn79hf2f2f405534"; + url = "https://elpa.nongnu.org/nongnu/cider-1.6.0.tar"; + sha256 = "038wzwi4y0240wb5i03v89x308c07nzflfv3804zyldr44yk9qky"; }; packageRequires = [ clojure-mode @@ -291,10 +353,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.15.1"; + version = "5.16.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.15.1.tar"; - sha256 = "14j6v32cbj52n91f7ckbjlam60rszh05r09bwv579p1xs2m7s7q3"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.0.tar"; + sha256 = "1m0g7sqjs6phkkf3mx2dyxr62a48rqq69lp6r5bfa6kcbr2n4g2m"; }; packageRequires = [ emacs ]; meta = { @@ -434,6 +496,36 @@ license = lib.licenses.free; }; }) {}; + denote-refs = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "denote-refs"; + ename = "denote-refs"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar"; + sha256 = "1s2q9j2xg2g293ip7w2bq2kjk6pasaf6cmvzcbh0k00yx8aa2alp"; + }; + packageRequires = [ denote emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-refs.html"; + license = lib.licenses.free; + }; + }) {}; + devhelp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "devhelp"; + ename = "devhelp"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar"; + sha256 = "16zx748n24diqqk3jhgyz74s71kqzl7h7l6j9nkz40cpcn18ddiz"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devhelp.html"; + license = lib.licenses.free; + }; + }) {}; diff-ansi = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "diff-ansi"; @@ -509,6 +601,21 @@ license = lib.licenses.free; }; }) {}; + eat = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eat"; + ename = "eat"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/eat-0.6.tar"; + sha256 = "14174hra9x3l98nrpg0x9g499lwhlxr8qg51zdrlyky0k4v0x3iw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eat.html"; + license = lib.licenses.free; + }; + }) {}; edit-indirect = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "edit-indirect"; @@ -574,6 +681,21 @@ license = lib.licenses.free; }; }) {}; + engine-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "engine-mode"; + ename = "engine-mode"; + version = "2.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.1.tar"; + sha256 = "1m5i3pyi4y90jvwgypxzl3qwhq5j6gazwijalhjcgb6gnpsm81kv"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/engine-mode.html"; + license = lib.licenses.free; + }; + }) {}; evil = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "evil"; @@ -653,6 +775,21 @@ license = lib.licenses.free; }; }) {}; + evil-iedit-state = callPackage ({ elpaBuild, evil, fetchurl, iedit, lib }: + elpaBuild { + pname = "evil-iedit-state"; + ename = "evil-iedit-state"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar"; + sha256 = "1dsdlhi58xsdsgkdhpnlkx1gkwc4m5sks99ph8lbj179vd1gszn6"; + }; + packageRequires = [ evil iedit ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html"; + license = lib.licenses.free; + }; + }) {}; evil-indent-plus = callPackage ({ cl-lib ? null , elpaBuild , evil @@ -711,10 +848,10 @@ elpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "3.5.8"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.8.tar"; - sha256 = "0hrzwca24dy4g9h7v5csqpwvsfj1ns4gqlnlf1q5i0jqvhvklnj5"; + url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.0.tar"; + sha256 = "0709qlxhvmapdnl8bhqvg39cm6x4659mg0jzz5b9hmis5bpj1kiq"; }; packageRequires = [ emacs ]; meta = { @@ -752,6 +889,36 @@ license = lib.licenses.free; }; }) {}; + flx = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "flx"; + ename = "flx"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar"; + sha256 = "0xmxin1k758nskrxhmvi4m5vbcfi2ncfp5n9q18mlc1j45vwawpx"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flx.html"; + license = lib.licenses.free; + }; + }) {}; + flx-ido = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, flx, lib }: + elpaBuild { + pname = "flx-ido"; + ename = "flx-ido"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar"; + sha256 = "1jdk87v605m4brvf0pxfd6bz0j2r217cw9pmrpl38nrszbngh67l"; + }; + packageRequires = [ cl-lib flx ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flx-ido.html"; + license = lib.licenses.free; + }; + }) {}; flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "flymake-kondor"; @@ -777,10 +944,10 @@ elpaBuild { pname = "flymake-popon"; ename = "flymake-popon"; - version = "0.5"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.tar"; - sha256 = "1q1adxsrx8sjw6pffwxvk0yrgbz0rbrzi1g7g7zq5952vnz4dnn0"; + url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar"; + sha256 = "0vk20affwb7qcg7nm6n2ssrrgljisqn45a8jagrf947l2kgaccvd"; }; packageRequires = [ emacs flymake popon posframe ]; meta = { @@ -833,14 +1000,29 @@ license = lib.licenses.free; }; }) {}; + gc-buffers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gc-buffers"; + ename = "gc-buffers"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar"; + sha256 = "15zpg4j25bk7y2wgqsd57c4c6h3xvigf39hjnzh3g1hlrqk2lv0g"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gc-buffers.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.28"; + version = "0.28.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.28.tar"; - sha256 = "0qp732j16cdmkpqv4vjplh9kcdbb1s4gfwff2d7k1sg4wqi8sa95"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.28.2.tar"; + sha256 = "1d2g673zn59ggcr2sx9dsxibaqh6b456v4wbpg3wb5ph63rzrh8m"; }; packageRequires = [ emacs project ]; meta = { @@ -932,10 +1114,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.28.0"; + version = "0.28.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.0.tar"; - sha256 = "0nw77psyvl9lackyq5l60k84f1dyddn8y2sxm5b1z71gjkp481zi"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar"; + sha256 = "0imh2vdc757vimwxi7pjdv09f83js76nbk7dg861qg0bcqf21g3i"; }; packageRequires = [ emacs geiser transient ]; meta = { @@ -1054,14 +1236,29 @@ license = lib.licenses.free; }; }) {}; + gnu-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gnu-indent"; + ename = "gnu-indent"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar"; + sha256 = "0h2kj19k3b9sw1bp0fk37kmc4xwvd3ajlgfa8s13jnvggx77nn8a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-indent.html"; + license = lib.licenses.free; + }; + }) {}; gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gnuplot"; ename = "gnuplot"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.0.tar"; - sha256 = "1f27y18ivcdwlkgr3ql4qcbgzdp6vk1bkw2wlryrclpydbb1nya3"; + url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar"; + sha256 = "015b8ly4wmz03bcysbwy4d63r42sicwqa0j2j4aiis1kpy4lj3xw"; }; packageRequires = [ emacs ]; meta = { @@ -1129,6 +1326,21 @@ license = lib.licenses.free; }; }) {}; + gruber-darker-theme = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gruber-darker-theme"; + ename = "gruber-darker-theme"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar"; + sha256 = "0k2njsg7bwy4i7ll5d9dpqawylgkfvp74bany8g487xvspjscrji"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html"; + license = lib.licenses.free; + }; + }) {}; gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gruvbox-theme"; @@ -1256,10 +1468,10 @@ elpaBuild { pname = "hl-block-mode"; ename = "hl-block-mode"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.1.tar"; - sha256 = "08b2n8i0qmjp5r6ijlg66g0j8aiwhrczxyf0ssr9jbga43k4swzq"; + url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar"; + sha256 = "1qrq238arblk8v8nf98kcdckfhwzi27w5zbl31yvf36xz69l9y8n"; }; packageRequires = [ emacs ]; meta = { @@ -1267,6 +1479,21 @@ license = lib.licenses.free; }; }) {}; + hl-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "hl-column"; + ename = "hl-column"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar"; + sha256 = "00y4g912s341p30xnb0qgj0gmzsqm696v06kjgy9yva5qgw51f03"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hl-column.html"; + license = lib.licenses.free; + }; + }) {}; htmlize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "htmlize"; @@ -1286,10 +1513,10 @@ elpaBuild { pname = "idle-highlight-mode"; ename = "idle-highlight-mode"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.3.tar"; - sha256 = "05w2rqc71h1f13ysdfjma90s35kj5d5i2szcw54cqyky8rymx5dp"; + url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar"; + sha256 = "1j7y03b90gf3pl0xbfirm973k31l7nx90is69m3jrfai2f9qnflr"; }; packageRequires = [ emacs ]; meta = { @@ -1355,10 +1582,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.2.tar"; - sha256 = "09p9pny4p0bfw6lw5pf17spyd77jb0pliapp3mfn7r3w8l8wi8xc"; + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.7.0.tar"; + sha256 = "0wzzhr10q8mnai024g5nprsnl0bcdlqfrh4nxf8qq43paah28i6f"; }; packageRequires = [ emacs ]; meta = { @@ -1381,6 +1608,21 @@ license = lib.licenses.free; }; }) {}; + iwindow = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }: + elpaBuild { + pname = "iwindow"; + ename = "iwindow"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/iwindow-1.0.tar"; + sha256 = "076i0p9kq48hxkkwzzapnni6cpdr25hdrw9bs2cly8w4v5rmd6rj"; + }; + packageRequires = [ compat emacs seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/iwindow.html"; + license = lib.licenses.free; + }; + }) {}; j-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "j-mode"; @@ -1471,14 +1713,29 @@ license = lib.licenses.free; }; }) {}; + lorem-ipsum = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "lorem-ipsum"; + ename = "lorem-ipsum"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar"; + sha256 = "05zk11g0w3bnabxf5937hrkc3k58vlrh1bk61dar9gfbfdq3ijyg"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lua-mode"; ename = "lua-mode"; - version = "20210802"; + version = "20221027"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/lua-mode-20210802.tar"; - sha256 = "1yarwai9a0w4yywd0ajdkif4g26z98zw91lg1z78qw0k61qjmnh6"; + url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar"; + sha256 = "1irdlw77ny0a28msrbn4lm66ixrlf2grsj4izhpdm1n0yv66xvfc"; }; packageRequires = [ emacs ]; meta = { @@ -1598,6 +1855,36 @@ license = lib.licenses.free; }; }) {}; + meow = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "meow"; + ename = "meow"; + version = "1.4.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/meow-1.4.2.tar"; + sha256 = "1iwysqxmaw85k7g742nx8z9vr3nnmwaidwjmx5n96cyssf64hgkv"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/meow.html"; + license = lib.licenses.free; + }; + }) {}; + minibar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "minibar"; + ename = "minibar"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/minibar-0.2.tar"; + sha256 = "0idb91vp0pbichv2gfs314av6cgx5mkrn9w3yxwj81if1bvsmw0h"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minibar.html"; + license = lib.licenses.free; + }; + }) {}; moe-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "moe-theme"; @@ -1703,10 +1990,10 @@ elpaBuild { pname = "nix-mode"; ename = "nix-mode"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar"; - sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23"; + url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar"; + sha256 = "0zi7xmh777pqzgcv18jqwywvidpa984p0m705p6a9fns7dvv53j7"; }; packageRequires = [ emacs magit-section transient ]; meta = { @@ -1748,10 +2035,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.4"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.tar"; - sha256 = "05r7w0h9v1vfhv1dd2vaabq2gm8ra70s1cirlp75s343b0z28ca6"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.1.tar"; + sha256 = "0xhlsbqjj1zivlz44hdlkcwqalfjwds5fv2pcwn0rskfhr73xp9a"; }; packageRequires = [ emacs org ]; meta = { @@ -1885,6 +2172,21 @@ license = lib.licenses.free; }; }) {}; + paredit = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "paredit"; + ename = "paredit"; + version = "26"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/paredit-26.tar"; + sha256 = "08f8nm3qyk0b4x7mkgra0zjpn9mmfnpr5g7yrvdzvms38y919qlh"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/paredit.html"; + license = lib.licenses.free; + }; + }) {}; parseclj = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parseclj"; @@ -1954,10 +2256,10 @@ elpaBuild { pname = "pdf-tools"; ename = "pdf-tools"; - version = "1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.tar"; - sha256 = "0cjr7y2ikf2al43wrzlqdpbksj0ww6m0nvmlz97slx8nk94k2qyf"; + url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.0.tar"; + sha256 = "0p9q9a11s68s95z8n0i45x1w8mg476bpnrvijg6i83779dmrpxh0"; }; packageRequires = [ emacs let-alist tablist ]; meta = { @@ -2014,10 +2316,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/projectile-2.6.0.tar"; - sha256 = "0r0ylllx7vr903sjci1i6yf4xzn7k4azaw9l3azvc3mzrrjagvvj"; + url = "https://elpa.nongnu.org/nongnu/projectile-2.7.0.tar"; + sha256 = "1ibxsa1lv9aiplkfplamyn2wc2c6vfwfszyaicfx79aq2w9427bg"; }; packageRequires = [ emacs ]; meta = { @@ -2062,10 +2364,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20221118.122133"; + version = "1.0.20230209.92406"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20221118.122133.tar"; - sha256 = "0a2lpvkarcw5rlydm3va7ajjsyhfbj023h93n6n94pjvllhn2rp2"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230209.92406.tar"; + sha256 = "1gs70pba6jjix6hnph6z2a2yjs9ka6xnhjl6qi8jcwyamkbpjiry"; }; packageRequires = [ emacs ]; meta = { @@ -2137,10 +2439,10 @@ elpaBuild { pname = "rfc-mode"; ename = "rfc-mode"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.3.0.tar"; - sha256 = "1wdqp03rrx7ar21nvbnrb7518c3vgf41z00bav00pw8cdx5c4m10"; + url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.0.tar"; + sha256 = "0036ypsjm35x8vwrlm346wcqmh85kbjmw0813q65z6k0gvmnwldj"; }; packageRequires = [ emacs ]; meta = { @@ -2201,10 +2503,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "93.1"; + version = "93.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scad-mode-93.1.tar"; - sha256 = "0k9wqz2nd4j0wz2y300nn6rs8a9vpshnaa2hx6f8649k4y87bblp"; + url = "https://elpa.nongnu.org/nongnu/scad-mode-93.2.tar"; + sha256 = "0gp7ghmch5wkbby0avmlgj5kajiccbarjrx1szh9r3f3gi1ahawj"; }; packageRequires = [ emacs ]; meta = { @@ -2246,10 +2548,10 @@ elpaBuild { pname = "scroll-on-jump"; ename = "scroll-on-jump"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.1.tar"; - sha256 = "0y6r0aa14sv8yh56w46s840bdkgq6y234qz1jbbsgklx42cw6zgg"; + url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar"; + sha256 = "09yndis96ps18i252h66ins1hi3zn27410s5hahkj2989q4cqi1s"; }; packageRequires = [ emacs ]; meta = { @@ -2411,10 +2713,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.24"; + version = "1.0.29"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.24.tar"; - sha256 = "1x9w858pgyhd7hlvn85h379f8sfvf8ly3a9596q4jkqbcp9riymq"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.29.tar"; + sha256 = "0q2sfdypj929y4fllk97rsb2bxm9a1izjy1f0z2viz5hz0hpqp26"; }; packageRequires = [ emacs ]; meta = { @@ -2426,10 +2728,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.8.8"; + version = "0.17.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.8.tar"; - sha256 = "0h9vn4kc1f1vxvzxv14hbv24skjmishg408s4d8g39bylhj5c5s4"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.17.0.tar"; + sha256 = "0k51k77g1mivs3ijnkl0i51v9bfjmivwnbkqwza9kclxd4dwlvyy"; }; packageRequires = [ emacs ]; meta = { @@ -2486,10 +2788,10 @@ elpaBuild { pname = "systemd"; ename = "systemd"; - version = "1.6"; + version = "1.6.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/systemd-1.6.tar"; - sha256 = "1khfnx2qmg1i4m6axyya0xbzr3c9j136b8pzmqdnd6jamxh43wcg"; + url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar"; + sha256 = "0h6iwdi3j2ypgcwnyjs8rdlz5f8j25cya6z4v3n2phnkqbncmgx6"; }; packageRequires = [ emacs ]; meta = { @@ -2548,6 +2850,21 @@ license = lib.licenses.free; }; }) {}; + testcover-mark-line = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "testcover-mark-line"; + ename = "testcover-mark-line"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar"; + sha256 = "18nlkm7p6fmaziqqbb4jmhpypn0b6233qd0c19xp16kjbxpg7ifh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "textile-mode"; @@ -2642,10 +2959,10 @@ elpaBuild { pname = "undo-fu"; ename = "undo-fu"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/undo-fu-0.4.tar"; - sha256 = "15r0lkzbxgvnwdmaxgiwnik2z8622gdzmpxllv8pfr36y6jmsgs8"; + url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar"; + sha256 = "0akn8gw3wavsfhxa9m426jkjacsw3k8vaxymhqrzy18lpvg5hysw"; }; packageRequires = [ emacs ]; meta = { @@ -2657,10 +2974,10 @@ elpaBuild { pname = "undo-fu-session"; ename = "undo-fu-session"; - version = "0.2"; + version = "0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.2.tar"; - sha256 = "1vxyazcxw2gxvxh96grsff1lijsd5fh3pjzkbkj7axn3myavp374"; + url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.4.tar"; + sha256 = "1p9qr9hzqiv1kgnglskny7m7lh2f8r4l0cf53431nf8hrp806qah"; }; packageRequires = [ emacs ]; meta = { @@ -2672,10 +2989,10 @@ elpaBuild { pname = "vc-fossil"; ename = "vc-fossil"; - version = "20220707"; + version = "20221120"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/vc-fossil-20220707.tar"; - sha256 = "0l33y8mij6rw4h47ryqpjxr1i2xzis98rbi230izkvsc6w7qf89q"; + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20221120.tar"; + sha256 = "0ygacnq1w64iw8al2gcyjjwgvbnm2l97sw4lf5a2x6ms0fgnbdgk"; }; packageRequires = []; meta = { @@ -2702,10 +3019,10 @@ elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.5"; + version = "2.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.tar"; - sha256 = "0mqhm7xkxpzjk96n6qybqg2780kbjg1w7ash88zhnbp8kvy0rrwi"; + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.1.tar"; + sha256 = "1q2cimrcr4knh716cdnhs8nspk08w8x7bsbhx69s9hpzgr7mjq58"; }; packageRequires = [ emacs ]; meta = { @@ -2717,10 +3034,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.3"; + version = "17.3.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.3.tar"; - sha256 = "1ci28dfg6k4hwiqz85v9c24n7s52z29ghfyfjg971lq4mfqbx4yy"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.8.tar"; + sha256 = "0g163mgf1kc2bfkh8b2s9jl5cmzgcni2g25hxmyxb4rz3v30z4ca"; }; packageRequires = [ emacs ]; meta = { @@ -2748,21 +3065,36 @@ license = lib.licenses.free; }; }) {}; - wgrep = callPackage ({ elpaBuild, fetchurl, lib }: + wgrep = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wgrep"; ename = "wgrep"; - version = "2.3.3"; + version = "3.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/wgrep-2.3.3.tar"; - sha256 = "12w9vsawqnd0rvsahx8vdiabds8rl1zkpmspmcqn28jprbql734r"; + url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar"; + sha256 = "0vg23ydwkqrmhlll45gf2fjdxj9chx9bl9m0pgwrlkjw0ncxj3qp"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/wgrep.html"; license = lib.licenses.free; }; }) {}; + why-this = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "why-this"; + ename = "why-this"; + version = "2.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar"; + sha256 = "0hqvqix9hqaki23vw3xilkcr84ak2vz4lwczr54s87x13idrg4px"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/why-this.html"; + license = lib.licenses.free; + }; + }) {}; with-editor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "with-editor"; @@ -2793,6 +3125,41 @@ license = lib.licenses.free; }; }) {}; + workroom = callPackage ({ compat + , elpaBuild + , emacs + , fetchurl + , lib + , project }: + elpaBuild { + pname = "workroom"; + ename = "workroom"; + version = "2.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/workroom-2.3.tar"; + sha256 = "0c05pbxkrcgsjk7zcyxiacxrpxyvf85rf38nhaqhxbywh4j071fg"; + }; + packageRequires = [ compat emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/workroom.html"; + license = lib.licenses.free; + }; + }) {}; + writegood-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "writegood-mode"; + ename = "writegood-mode"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar"; + sha256 = "08b1650v6qsb3x1s5k4n5m2aqx1n26gc4wj822fm9s49k8vcpzl8"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/writegood-mode.html"; + license = lib.licenses.free; + }; + }) {}; ws-butler = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ws-butler"; @@ -2815,10 +3182,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "22.0.20221031102959"; + version = "22.9.20230207171612"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.0.20221031102959.tar"; - sha256 = "08i6y3ry0sp597vz0zl7c50lnp04fszydw6m1093sb5nlifbhrb8"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar"; + sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b"; }; packageRequires = [ emacs ]; meta = { @@ -2826,6 +3193,21 @@ license = lib.licenses.free; }; }) {}; + xkcd = callPackage ({ elpaBuild, fetchurl, json ? null, lib }: + elpaBuild { + pname = "xkcd"; + ename = "xkcd"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar"; + sha256 = "1yszrba4cvisiy7m16rzpj7plbnafj4c7bdgxvqwxwhsasfmh6ag"; + }; + packageRequires = [ json ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xkcd.html"; + license = lib.licenses.free; + }; + }) {}; xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "xml-rpc"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index b7f0666e20056..61557a95e1c74 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -474,8 +474,8 @@ }, { "ename": "ac-clang", - "commit": "ffe0485048b85825f5e8ba95917d8c9dc64fe5de", - "sha256": "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "08yaaiva6j98rqn9d4wfc0yrjh1nifbnj2rz342q863n76fybbxv", "fetcher": "github", "repo": "yaruopooner/ac-clang", "unstable": { @@ -1027,16 +1027,16 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200916, - 751 + 20210820, + 1000 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "7c023b9ced156cee03171e16c3dac6d26923042f", - "sha256": "0vaxha2f37bs634bl0122c09mkp1yyy2444pkikdavhjx9gzc55j" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -1055,8 +1055,8 @@ }, { "ename": "ac-php-core", - "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123", - "sha256": "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1589493bf371gwdljnk01q57qffn8y6xb55i7dl05jgdrl2vz54l", "fetcher": "github", "repo": "xcwen/ac-php", "unstable": { @@ -1251,10 +1251,10 @@ }, { "ename": "accent", - "commit": "86fe3baa514cf81f4b031ab55d94555fba2c1a55", - "sha256": "191mhb57gj7zcgcb4h99jv8ac08l90wzsmy4aq22pz8sw56bvzpa", + "commit": "f40f30810167b6851d17f7d400d2bd527871b29d", + "sha256": "17mhq2ba7ay986zz5cwg26d6v3j97m3vbl06l32jq8f5j9xss308", "fetcher": "github", - "repo": "elias94/accent", + "repo": "eliascotto/accent", "unstable": { "version": [ 20220202, @@ -1863,6 +1863,30 @@ } }, { + "ename": "adwaita-dark-theme", + "commit": "ae0fd31f1453e18ae4f5ff1da8b5719d30235d2a", + "sha256": "08vqjn7hgzxk0bfq5j3zgvg90b6gvfl8m2m4bv1042944i3pgspp", + "fetcher": "gitlab", + "repo": "jessieh/adwaita-dark-theme", + "unstable": { + "version": [ + 20230215, + 2027 + ], + "commit": "4792fed63a44a2337832644db909c1663100605e", + "sha256": "0nrvdx3lzkdaiy99mq9ramp4zd7fp4bhksbjb1mk3al6f9026kvg" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "40a375c8b86b58dddcd95e8dc654f127a6a3b910", + "sha256": "1gasg7dqz7vg544bnfnfzdfq50xq7jqwcigkmg2a6n8cm9wrjlh0" + } + }, + { "ename": "aes", "commit": "33ca3106852f82624b36c7e3f03f5c0c620f304f", "sha256": "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v", @@ -1893,25 +1917,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20221109, - 841 + 20230215, + 715 ], "deps": [ "consult" ], - "commit": "ff75fbe6f6b280815c33ed2d6694bf0ee74dd1fe", - "sha256": "01cza8ffx6djh1mign5bzkdvmcjrd69g3hwc3s0grpcidbqi0qic" + "commit": "69d9d05200dbf9058b3ae14e37f52944718374d7", + "sha256": "1p5hqlkhl1vi2m1wpjhzv38jbs5b1c4ji4nqsiyc37h3mp05nbbc" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "consult" ], - "commit": "ff75fbe6f6b280815c33ed2d6694bf0ee74dd1fe", - "sha256": "01cza8ffx6djh1mign5bzkdvmcjrd69g3hwc3s0grpcidbqi0qic" + "commit": "69d9d05200dbf9058b3ae14e37f52944718374d7", + "sha256": "1p5hqlkhl1vi2m1wpjhzv38jbs5b1c4ji4nqsiyc37h3mp05nbbc" } }, { @@ -1983,6 +2007,30 @@ } }, { + "ename": "age", + "commit": "50eee72024c2c915022c12c713cab3ac7e2c68f0", + "sha256": "1h3qc46z9lw62h2n501drx18kx2zm437vrfn33vg9la4fd3phl59", + "fetcher": "github", + "repo": "anticomputer/age.el", + "unstable": { + "version": [ + 20230115, + 1155 + ], + "commit": "9e82487234c53e0fab2314aeab6479e62c68f0c7", + "sha256": "1x1f224xbwaan4rc1589gipl5a7llr3rxxf85i4y8zz2vfl478dp" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "0c94618fc10105da751007f90b44075f6e5d61ba", + "sha256": "1dvpa4p1rbpnxh4bcg2zz5y3df40k7r16m9lj4grv926cf1i4hl9" + } + }, + { "ename": "aggressive-fill-paragraph", "commit": "982f5936f2d83222263df2886ca0b629076366bb", "sha256": "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja", @@ -2008,11 +2056,11 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20221009, - 1158 + 20230112, + 1300 ], - "commit": "f376cdc25de5c0f8c330f1e053557d95ca47a540", - "sha256": "1j2hgg7k1nhcwf5mrncmyc6babrlhks2wkcdhz8d1q8rpymiqq38" + "commit": "a437a45868f94b77362c6b913c5ee8e67b273c42", + "sha256": "0kaxwwnwj47j69zdiamxwlinvnbzw1ya62j91zg26ig2lj8082l7" }, "stable": { "version": [ @@ -2197,15 +2245,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20220928, - 1229 + 20230216, + 857 ], "deps": [ "flycheck", "s" ], - "commit": "8856871633ef961a0dd7cf019be44212cfe1add1", - "sha256": "1pmgp69w0vi14rzrrkxn8gwhvb1yfczcw73h5jfsawhislg2vq8a" + "commit": "723cf8e8d7e00c1498935553c46f459aa1d26135", + "sha256": "0634gsbbf6fwsh44lk6nblksl402yvy2cf9pcjvlbhrz7mkp2m8j" }, "stable": { "version": [ @@ -2228,20 +2276,20 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20221106, - 1409 + 20230216, + 1337 ], - "commit": "01f43a74591c4b0de34804e126b671990c7360b4", - "sha256": "167q6s32d78b6xywycfahpilpgp64bhcc6ydrjb07fbrbfjk96m7" + "commit": "3e43ca49804afb06477dbf7ff3d6e9824522be4b", + "sha256": "0vdwvrbj79ylaz5ffa2bpfy4kzi1s6hf6bxijvyw7h8y6bd196av" }, "stable": { "version": [ 1, 0, - 3 + 4 ], - "commit": "54a5557c05c63053fe31072905ba80d8231ce2f3", - "sha256": "02gr5scf50js00xa1chvd0j7agr8bys5madzk96fwg0s4gfdmyqa" + "commit": "3e43ca49804afb06477dbf7ff3d6e9824522be4b", + "sha256": "0vdwvrbj79ylaz5ffa2bpfy4kzi1s6hf6bxijvyw7h8y6bd196av" } }, { @@ -2330,8 +2378,8 @@ }, { "ename": "alectryon", - "commit": "4f7b6099b9167840602515f10ab02e70defbee1e", - "sha256": "0q1dsnrjak49dlmwkns79n996ip6zsdsv4k2ifgd9r8fd9yxki22", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0x0n8g6dx622drp591z8dp0dkbhdbdq0039zb4x1lni316gg81il", "fetcher": "github", "repo": "cpitclaudel/alectryon", "unstable": { @@ -2366,16 +2414,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20221110, - 1614 + 20221213, + 1619 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "730184b7923a65241fdff695485a3ad432caf201", - "sha256": "0xvb7rbfpwpkdqrbnnv0dy4q1gpy25lm849rf2gqqlrgdmywxafk" + "commit": "c762380ff71c429faf47552a83605b2578656380", + "sha256": "0c3x54svfal236jwmz2a2jl933av2p1wm83g2vapmqzifz2c0ziw" }, "stable": { "version": [ @@ -2508,14 +2556,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20221026, - 616 + 20221130, + 2354 ], "deps": [ "all-the-icons" ], - "commit": "4d8ae544ecf5414c7ddefcf15ca6c3de4f627ef5", - "sha256": "1cp5i01ln4j71gng38d03p2mdrvjgfcm29k4qjn5gzq6g4713wic" + "commit": "4da28584a1b36b222e0e78d46fd8d46bbd9116c7", + "sha256": "0b5m1djwhfbjakfda72ybqrw3rzmrq154yfpv4p8wgxknc5xjxfr" } }, { @@ -2636,15 +2684,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220914, - 934 + 20230129, + 1522 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "f5d27ebd729837daec1311e353dcfc850202a945", - "sha256": "144jjv75f82r4rnmpc93k0inv48qh184b1knn30k80czanak8bjk" + "commit": "bc10c105f07c752d82ec7dfd929e5182d3b4a18f", + "sha256": "141cxi9rhp2sa5pk1hq655f897hi893jvv2364h67amq6701l1yi" }, "stable": { "version": [ @@ -2841,15 +2889,15 @@ "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20221111, - 845 + 20230107, + 1433 ], "deps": [ "cl-lib", "pyim" ], - "commit": "3ff235a6204e224d47cb0c99368e6a0f21bf8dce", - "sha256": "03q5rndj0ywkg3gq91rhmzwb71y2qd4yc4x5x6vsi8kfxmbv73bs" + "commit": "4746c6adf81bedf8933faf912c4c65dafea9bb62", + "sha256": "15dr7l2zcs57hm0d2a8gs0pf5px4ibir3nf4ddxaj6aiz456sndm" } }, { @@ -3071,8 +3119,8 @@ }, { "ename": "angular-snippets", - "commit": "96a0ad5fdbc52f803846e580856fb9c58181c020", - "sha256": "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wpy5vf0l3mnsxv8521cdhx269853z83pms8hhri256p5b54lxk5", "fetcher": "github", "repo": "magnars/angular-snippets.el", "unstable": { @@ -3228,11 +3276,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20221024, - 1829 + 20230203, + 1756 ], - "commit": "479aa90fd6a4db69361339c0058190423fe839e7", - "sha256": "1rsb6chgcn3qyzdrajvmidax1gx13v5ngkp24fl1avrsf4kgbmjw" + "commit": "e433ec6803d773ad2fd92f88b1ffce41ee999c65", + "sha256": "0dr0y1arv0wjhv0rvyln7v9r0bnqb2m1mz8qqi83fgj4ald67a9n" }, "stable": { "version": [ @@ -3277,12 +3325,10 @@ "version": [ 2, 6, - 2, - 2, - 20221106 + 3 ], - "commit": "b00db9d927d8951c44ef2e80fd4941180e9f40e7", - "sha256": "17f1w71r4pbmssg40xx3nx2chk28f0nc8adhr4vnq3ijkw69v1c7" + "commit": "b499d12412bac32ab1af9f470463ed9dc54f8907", + "sha256": "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q" } }, { @@ -3345,8 +3391,8 @@ }, { "ename": "ansible", - "commit": "8e45bf58b980ff542a5e887707a6361eb5ac0492", - "sha256": "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "17pfdyfv5z7bw0xhh8apqww8wsmvb5p5y0xs8048gh427mgw5yrf", "fetcher": "github", "repo": "k1LoW/emacs-ansible", "unstable": { @@ -3430,20 +3476,20 @@ "repo": "xgqt/emacs-ansilove", "unstable": { "version": [ - 20220629, - 2339 + 20230210, + 1338 ], - "commit": "3e3f6e8baa2135b072855567e4a1fc599a2fc800", - "sha256": "18p448arf6b6hbqvcxfvw6p45zijfzi2rg91dh26xbzaa398p9bj" + "commit": "abd64819dc67e1ababd38d39c7c7f6a2459987c0", + "sha256": "05q548dyb620kg12mgkmw6jpwbr2y2aqs5p7314y2c37khvw5irg" }, "stable": { "version": [ - 1, + 2, 0, 0 ], - "commit": "7841c01c56026f2b4405228803f8a9d4746a5680", - "sha256": "18p448arf6b6hbqvcxfvw6p45zijfzi2rg91dh26xbzaa398p9bj" + "commit": "785f0bad0c73069e6c41ca543c29675785b614a8", + "sha256": "05q548dyb620kg12mgkmw6jpwbr2y2aqs5p7314y2c37khvw5irg" } }, { @@ -3564,8 +3610,8 @@ }, { "ename": "aozora-view", - "commit": "c6c13f8a0dd90c1c1f39711a5de69c1e0b785601", - "sha256": "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0y1gag2r10q1l8nznl78al9wwsw0r01wwzlxmpypa3n5ad9pab3n", "fetcher": "github", "repo": "kawabata/aozora-view", "unstable": { @@ -3648,11 +3694,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20221112, - 350 + 20230219, + 100 ], - "commit": "33d4542b58476d50f01464576664de1acea1f62f", - "sha256": "1gcsw3sfm4ixasfcmq2gjd878ap94sigkhis41l62y6kwzp9z63b" + "commit": "972b9906bf6d23f5a8e92129a4572a906bdfe45e", + "sha256": "1zjnhgkjhgg58c486k6a0p3kns9kap0lfk538059r65nrv4mkbzp" }, "stable": { "version": [ @@ -3723,17 +3769,17 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20220930, - 1134 + 20230209, + 2325 ], - "commit": "9b0ba33995172044068fa2609d97b1015f9fb513", - "sha256": "0ncp3aq5b2xmr3khy2c6hz8492k56j8v8lfkqqky7n028zy90nv5" + "commit": "3b641de4e34fb4a0594a461254f1454973b6b7aa", + "sha256": "166xs9m66s593p3wvkd6v81ib7rwwd1rhb59zkyz0jsprv70ki6h" } }, { "ename": "apples-mode", - "commit": "5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c", - "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0b3kiz3k9bdx2am1s5jb9dpwy8fxrh238yigwq7w44yswlb15mfk", "fetcher": "github", "repo": "tequilasunset/apples-mode", "unstable": { @@ -3808,11 +3854,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20221016, - 2248 + 20230117, + 2123 ], - "commit": "b7f0cfc44f53f61ff6494dfad84d685aac995ac6", - "sha256": "0qj06f4wngqnw08idx74l1wk1rr0lndwx2xzpr6411qf3rblriy9" + "commit": "1257880637e03efb885893afbcb88b7a8b20965a", + "sha256": "0z8gigwpz3ijqhqiclpaw8gmljbk01myay74c9afws2087s743fy" }, "stable": { "version": [ @@ -3970,17 +4016,17 @@ }, { "ename": "aria2", - "commit": "89a55e7c313066ae1bc0db0af5c289814c85fcb1", - "sha256": "1gsqdqs3q86k7q88rf7qamc0sp5ca00xn9kr1r717vf6qq6a0c3c", - "fetcher": "gitlab", + "commit": "d27e2275bb2fa1ff5e54898412b167cae2002c53", + "sha256": "0vwdrbwn8rda0zsi1n1i7pjwbpnvsxrw1hyq8xdx0346kvprl6fn", + "fetcher": "github", "repo": "ukaszg/aria2", "unstable": { "version": [ - 20190816, - 25 + 20230205, + 1008 ], - "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261", - "sha256": "00135gq4xfblv50dwxq02dd1y18xv29lrl7iir3caq4pr3nhrshg" + "commit": "cc1661525bdf5c908c94a9d891a62d9b2e313670", + "sha256": "1sz6ixhw4x6cqs43nfld0156gwx4xjyh2pzbhg3ai1mc2nnmlkif" } }, { @@ -4090,14 +4136,14 @@ "repo": "fizban007/arxiv-mode", "unstable": { "version": [ - 20220128, - 920 + 20230121, + 842 ], "deps": [ "hydra" ], - "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", - "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" + "commit": "06000ceb5a12b0f95bc7e89de03685f7ada4e8c3", + "sha256": "0dwgcwm0k4pbzbi2ab9607yxn41riqjpixy8fm2yalqh9l0sbasv" }, "stable": { "version": [ @@ -4120,14 +4166,11 @@ "repo": "lassik/emacs-ascii-table", "unstable": { "version": [ - 20201019, - 700 - ], - "deps": [ - "cl-lib" + 20221230, + 1244 ], - "commit": "4f68ad0b36c365c0652756691ab1703d0d46b4b4", - "sha256": "0f0ghwglxv2yil2cbzbhrvgk1p37jldfb974kpfwy6dg8m933rjf" + "commit": "c71f54b85edc6bd42abdc79dd82248958c8a24f9", + "sha256": "1hifgyadzsp4xl0w5fpsfshnf5605i475nbgaf43f3j0mx5q1lgx" } }, { @@ -4168,26 +4211,26 @@ "repo": "zkry/asm-blox", "unstable": { "version": [ - 20221112, - 2256 + 20221220, + 1716 ], "deps": [ "yaml" ], - "commit": "0234a9fe3e4bea7717e857f516209fcc00cf85c0", - "sha256": "184v0773cxggidk06wnsziib3kxkdhfr1j8hizmi75hnsrn1g2ya" + "commit": "5517efb1e186139197a2d348b7339a72dd379af8", + "sha256": "0f4nymkxk2x3jvkxfbgp5v8ap38j9sz1g6vnw6lrpvbgrdzazx6g" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "yaml" ], - "commit": "374d9703afd2976736abe6a73c4d4561a3238211", - "sha256": "1lgy0yrvf5cx9cw95kg8w3xdy3fniagny9pv7an1lydhbfh8nn9w" + "commit": "5517efb1e186139197a2d348b7339a72dd379af8", + "sha256": "0f4nymkxk2x3jvkxfbgp5v8ap38j9sz1g6vnw6lrpvbgrdzazx6g" } }, { @@ -4278,11 +4321,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20221103, - 638 + 20230216, + 559 ], - "commit": "10cedd8ac7173e92a6822317f1782550199d2d6d", - "sha256": "0pjfnza5iha7amy6wdd0zg0h02mfaj6xzimqhjrhi05hh6kakccb" + "commit": "71cc50f27ffc598a89aeaa593488d87818647d02", + "sha256": "1yl4bn62jfplb6a06lh9m65ync32p8fddpwn0s14p3951a0xmdv7" }, "stable": { "version": [ @@ -4499,16 +4542,16 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20221107, - 1434 + 20221204, + 803 ], "deps": [ "dash", "f", "s" ], - "commit": "7cf39d3227d2e99bb2d627bb47fdd90c10a7675a", - "sha256": "0b8pi351k8i7grwpj1h94ym49gq2kgi2bc50cji1f7cimwci3qim" + "commit": "c00f4cc9409dc2fa8c0924f425b2840534b09221", + "sha256": "041f1gdh972y514zdcrlprnpq26kvip81q94768d3ydwlidymky5" }, "stable": { "version": [ @@ -4694,6 +4737,30 @@ } }, { + "ename": "auth-source-gopass", + "commit": "317d42fb608f8fad137f582cf60667089c313ea4", + "sha256": "0awy5cpwclrsk1w31gv6yl8qml1gjdqga8mdcdda852i2zp5k938", + "fetcher": "github", + "repo": "triplem/auth-source-gopass", + "unstable": { + "version": [ + 20230109, + 1213 + ], + "commit": "6f7f0cc0d682f66d11f7fac4fa5c1e79904232da", + "sha256": "07n4bq64aja0f15mz18x45ncq0400fdxjlpc98hzycligihhz4fb" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "commit": "6f7f0cc0d682f66d11f7fac4fa5c1e79904232da", + "sha256": "07n4bq64aja0f15mz18x45ncq0400fdxjlpc98hzycligihhz4fb" + } + }, + { "ename": "auth-source-keytar", "commit": "4ba6f96ca2e20dcd75cf239370243bd8e484f851", "sha256": "1wizylkfzsbkavqr7m88vnwgrikj8hd6v01x06k1c5kpwdggvyqv", @@ -4701,15 +4768,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20220704, - 626 + 20221231, + 1654 ], "deps": [ "keytar", "s" ], - "commit": "fc6e221606e906a040c9df28e269bdc46dbfc9b3", - "sha256": "047zcr8m45y80hzggc0nw59a0wfv49nm8sndpw66mk4klz7w2mij" + "commit": "8fcd935ee131174a1ed7f132614257411ed441bc", + "sha256": "1xlg9zm59dymnwqqs4rcn5xiwvvz8345gcnbr7c2x3zxc75vkn1x" }, "stable": { "version": [ @@ -4814,46 +4881,43 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20220517, - 1501 - ], - "deps": [ - "compat", - "packed" + 20230117, + 1612 ], - "commit": "b204e2f85aaa4d41af4eb1819633c9613f5172bf", - "sha256": "0wqiypznwg7pcqb1qvf4ba2kx4f8x01ms8zxbxy134j9idm4g39f" + "commit": "4cbd304698a897baf438400c9a2b31d3dfb3a7f9", + "sha256": "16jjcd2qndfzp4zkscza1cayv1af41w8bvqmqb4127zim90jrs64" }, "stable": { "version": [ 1, 7, - 1 + 2 ], "deps": [ + "compat", "packed" ], - "commit": "3b4d94b020a2557e439233dbaa9d83fdea68f05a", - "sha256": "1zymk8kzw1mvkasf0dryy2sbwxdr8ppr0a4j5r69y108dmvplqwn" + "commit": "b31a175002e8a7f242c5ad4e971b6046f6217814", + "sha256": "1njnyilv6lxnbvi6yrgzg6qjhf6vgh4fpag4hav1j45718y6kd31" } }, { "ename": "auto-complete", - "commit": "083fb071191bccd6feb3fb84569373a597440fb1", - "sha256": "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "043igws6i97p9sc7rlrhvn7pqgz5daf6a6h3z76qmfhsxmqc7dyf", "fetcher": "github", "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20220105, - 439 + 20221231, + 1633 ], "deps": [ "cl-lib", "popup" ], - "commit": "57cb8f2ee32dff17ea1b4431fe5920272aa38d72", - "sha256": "185q90ibw17dh2nwdljapdw2747hzv32n4hkjfcfsgw5asy58r8z" + "commit": "59c11c453bfa0794302848a004d1be3b1684f17b", + "sha256": "1psd8i1s507kp4km8izqv244xqzmgffxmnbv1zds5mql6hmpfr3r" }, "stable": { "version": [ @@ -4951,10 +5015,10 @@ "unstable": { "version": [ 20130526, - 1514 + 1527 ], - "commit": "5eb63c8a1e4ca3af124baf0f8f801b949888f9b8", - "sha256": "09f8hqs9n13lkb7b352ig07b9xm1w0mbbnqfy2s5cw4cppmakf2n" + "commit": "a5114e3477793ccb9420acc5cd6a1cb26be65964", + "sha256": "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj" }, "stable": { "version": [ @@ -5052,16 +5116,16 @@ "repo": "aki2o/auto-complete-pcmp", "unstable": { "version": [ - 20140227, - 651 + 20140303, + 255 ], "deps": [ "auto-complete", "log4e", "yaxception" ], - "commit": "dc5c0af834d327dd686d74a4171e5d9170007a6c", - "sha256": "0ygak7hypc27d0wvciksnmg8c5njw2skf1ml60vs63a1krkax63i" + "commit": "2595d3dab1ef3549271ca922f212928e9d830eec", + "sha256": "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26" }, "stable": { "version": [ @@ -5080,8 +5144,8 @@ }, { "ename": "auto-complete-rst", - "commit": "4c948dc47f67aa47a1607cbdacdc95241d1a658f", - "sha256": "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0fp3ma17dinb1jxrdslx803bqsx5pwvf26gqsb582dkn44flmla4", "fetcher": "github", "repo": "tkf/auto-complete-rst", "unstable": { @@ -5136,11 +5200,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20221114, - 343 + 20230204, + 129 ], - "commit": "10a42b015e35e8c6a99a3fb5ceeb1db0f5893cee", - "sha256": "0gdmjmdzb1p21mrrsl6kv3fvzwmvmbkx9yydn7rylv19zfgj4iwh" + "commit": "ca90fc638cfaf70d5e0b82657d3d26cd0b289059", + "sha256": "1shjl1pck2m7ncpwjfz77ibddx3pz68gma1icccad7piz2c67zrj" } }, { @@ -5189,14 +5253,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20220919, - 548 + 20221231, + 1631 ], "deps": [ "ht" ], - "commit": "e10e4952fd23025f3f46edfde66e3ac2d7bdf069", - "sha256": "0yx8yx6vjqknrxrn24pggr4pzvb9k5is1iy2aisc7wrr5bndb8ly" + "commit": "ece5e2c722efa5c9ea32a809b484afc222ebebe5", + "sha256": "13v21zmcvnrc5a7ig08xs6nf2irdkah3nwgfjk4933ym8rff4sy9" }, "stable": { "version": [ @@ -5483,14 +5547,14 @@ "repo": "abo-abo/auto-yasnippet", "unstable": { "version": [ - 20220927, - 857 + 20230208, + 331 ], "deps": [ "yasnippet" ], - "commit": "7ef65b8e128bcf8afc52a702402c7943839abfb9", - "sha256": "01mdijgngh4bjngxcs81d7v8f6r28ly355gz4f87dbqaxvsdj92f" + "commit": "6a9e406d0d7f9dfd6dff7647f358cb05a0b1637e", + "sha256": "0ifzbwnm2axb8kmfp3jvg05wq02j121iwp2m64pi70c7mza0i886" }, "stable": { "version": [ @@ -5550,11 +5614,11 @@ "repo": "pkal/autocrypt", "unstable": { "version": [ - 20220827, - 1746 + 20221220, + 2359 ], - "commit": "9e393f869a276c7d7d52b89f0bab79a70455fefa", - "sha256": "15psbz4cwin3gxc0xj8hj4h3s6f1pjsdyx5d7sskzvf7kh0rg17l" + "commit": "1444f1861fd13367bdf75ec60a83a94dd1802a49", + "sha256": "1aqjl3l8ppv2z2k6fvza5idfr3bv1n680hf4z2ia3dq6xqy18fpn" } }, { @@ -5734,27 +5798,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220221, - 1638 + 20230130, + 1454 ], "deps": [ "avy", "embark" ], - "commit": "472586b9d40976efe9827399deff3954f1570c71", - "sha256": "09imcbj3g6jvvr43kglwdk85kbp3jngsf8nji0zb832wqkc67zbq" + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" }, "stable": { "version": [ 0, - 17 + 21 ], "deps": [ "avy", "embark" ], - "commit": "97270d725761ee02db461b45b18ec16ae31f203e", - "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" } }, { @@ -5929,8 +5993,8 @@ "repo": "cniles/axe", "unstable": { "version": [ - 20210816, - 1530 + 20230120, + 1915 ], "deps": [ "dash", @@ -5940,8 +6004,8 @@ "s", "xmlgen" ], - "commit": "3be04d03c1be88b3fb71f95164fb1971c2472c25", - "sha256": "0fy5lr7hvylf0h3vqnarcixvn6bca2dwyb96nkf86skm1hpjvh6i" + "commit": "5168d4f4c33861a071285df34f17fce92137d497", + "sha256": "1469w6rlnkf1wh5a4ar14snamrx61w6mvq6fwpkfmhpgc0fnwdg7" } }, { @@ -6073,15 +6137,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20220424, - 2212 + 20230212, + 2020 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "0d44408262080cdf998de5a52516f220e7e7c99a", - "sha256": "1l818vv2wh07jxc7wxmnidr8rcbj8526245fsflxp051hpilvan8" + "commit": "f6c235259052a69b70a1410d06f2f400eeb26a8d", + "sha256": "0631hqd877nfdmwys23rfybcwwzjwq8p2b4vm394p2w16g1km592" }, "stable": { "version": [ @@ -6306,11 +6370,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20221014, - 2302 + 20221218, + 105 ], - "commit": "29c469afa822ef24b38e4a4de33b1a638c5bcb5f", - "sha256": "1yja2j22z87nrb35k2d3hq32czwm93wm1vdklxjhv32w4qsvcghw" + "commit": "d113012e4b76bb3ced331480bce33d03241e56bc", + "sha256": "17vhmz5gy2m8m57mvpb9h2mgbci7iqyf2x8yvhxgb5sr4qfmcmbf" }, "stable": { "version": [ @@ -6329,20 +6393,20 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20220531, - 1104 + 20230208, + 1903 ], - "commit": "8e9c20dbfe01d8bf6c61db231593623a201c75c6", - "sha256": "1jq6nx5kpln15yv0k9njql8xl7id7yswdl7hkkbwha99i1cn0nqd" + "commit": "25611eed1e086c4e8cdd335dbd38b1d796be5b8d", + "sha256": "0hqqb7dprwbyhjmymknxcixwqk13fm6aninbjhlaxgwv93i2ghfb" }, "stable": { "version": [ 3, 1, - 0 + 1 ], - "commit": "d47edb9d4142a22746009c1f680df93a4fefd107", - "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4" + "commit": "a021468eec8ff8cacb74a9ea595d3587186e29ea", + "sha256": "0cly0m6msn8xv9857nv4syw8fldqzvsa4kciq7av40y26a61hvrh" } }, { @@ -6372,8 +6436,8 @@ "repo": "sasanidas/emacs-c64-basic-ide", "unstable": { "version": [ - 20200429, - 1104 + 20230118, + 1040 ], "deps": [ "basic-mode", @@ -6382,8 +6446,8 @@ "f", "flycheck" ], - "commit": "d1d25c35cf899d58ead9377bf678a553c835c719", - "sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h" + "commit": "e33036f838e61b647927165e81be5d5b855e0518", + "sha256": "1mfdkxwsj2mmpsxz0q68z7rs56qpd3dkvl2dkx1dp8n42zvifcxw" }, "stable": { "version": [ @@ -6410,26 +6474,26 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20221112, - 1533 + 20230213, + 1822 ], "deps": [ "seq" ], - "commit": "1d6cd9a3c400a3609ea2464103bb814b51d3d560", - "sha256": "177z5rmh4306zkadnpp0as3w51n972hnzsb15sxc4iccfb3zjap9" + "commit": "361dc1ea54bca3ab7a9ff36b64874dbe5c383382", + "sha256": "0lnj6vfg07yvlac7i4v6w7q86zbgqn10dblq992lhfidf6q909jd" }, "stable": { "version": [ + 1, 0, - 6, - 2 + 3 ], "deps": [ "seq" ], - "commit": "1d6cd9a3c400a3609ea2464103bb814b51d3d560", - "sha256": "177z5rmh4306zkadnpp0as3w51n972hnzsb15sxc4iccfb3zjap9" + "commit": "361dc1ea54bca3ab7a9ff36b64874dbe5c383382", + "sha256": "0lnj6vfg07yvlac7i4v6w7q86zbgqn10dblq992lhfidf6q909jd" } }, { @@ -6692,8 +6756,8 @@ }, { "ename": "bbdb2erc", - "commit": "04867a574773e8794335a2664d4f5e8b243f3ec9", - "sha256": "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "012vz1wq06yrrzzbyrk19jlscgb72q035nswkwjwdn42kphb22am", "fetcher": "github", "repo": "unhammer/bbdb2erc", "unstable": { @@ -6768,10 +6832,10 @@ }, { "ename": "beans", - "commit": "c458bd38ec9ec1de6717ea634b2d53f9083e3b23", - "sha256": "1sp43p1ajjh8zwrwkl09rhkkmxf01cw3i74ibqxn6m3hbdb3ry56", + "commit": "3d6b6320e55f2c38056e1d851eaeaa4d3e558bc7", + "sha256": "1zxb5rffdz8g0737rvc47fh6wikhppg591q066hm596kpk6lqzm4", "fetcher": "github", - "repo": "TheBlackBeans/emacs-beans", + "repo": "jthulhu/emacs-beans", "unstable": { "version": [ 20221114, @@ -6789,11 +6853,26 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220810, - 1529 + 20221210, + 1154 ], - "commit": "2a0b54afd9e8fe586d64f7c4977c36d22d3fa6e2", - "sha256": "0da4rf5d1snh2ni1pjp67qyl456wy9jv1sc4mi8850m08hnb33xh" + "commit": "badbf267fa488df1cb87809ed234ebd67786f2f8", + "sha256": "0l4vzzzx50sq4hvv76ng3mywz0715rdqdfv2ivr92zzb1kjdp5a6" + } + }, + { + "ename": "beef-mode", + "commit": "455133bb8d6d1c18400064961b8f6c65941bc879", + "sha256": "067dlbbzvrdd3zrmm5lqqkavm5qhwn0h4aq8lazk695bdjqaj3zc", + "fetcher": "github", + "repo": "thechampagne/beef-mode", + "unstable": { + "version": [ + 20221227, + 203 + ], + "commit": "20906b41630d74eba56504fbb9fabb79562e0d6e", + "sha256": "1mqwamw9rhz8sm8jwv6m70bllrglqgl5qknj08z4zchbr72ik8ah" } }, { @@ -6805,14 +6884,14 @@ "unstable": { "version": [ 20201227, - 1533 + 2024 ], "deps": [ "org", "seq" ], - "commit": "1f085b6bdf9138db8deb7cd3afd269e34a87e8cc", - "sha256": "14b9vzzfwrl49nxv5kk975jzddgx8zzqspr00myxxq110sa628ya" + "commit": "161d9c94c594614a01cb08219693d9e000af4f69", + "sha256": "0cfjrn4hkpxhmg07kdff6ifvv1aqaq6dah5bvdc0xhzlqznx72j4" }, "stable": { "version": [ @@ -6884,10 +6963,10 @@ "stable": { "version": [ 1, - 0 + 1 ], - "commit": "7a0f263282bbc86b01b662636306f22813082647", - "sha256": "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94" + "commit": "02435560415bbadbcf5051fb7042880549170e7e", + "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" } }, { @@ -6967,11 +7046,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20220116, - 2220 + 20221125, + 1725 ], - "commit": "db2d945c44e26f32a658e9e743dd4b7a0d84b2fd", - "sha256": "0mlga8kk09ir66lqs5xx0bkr51vcc89hxq3ax2vaq1zsvlddl5h2" + "commit": "a45aecec0cf223984bc8649cd1dc81a5004932b4", + "sha256": "04b1k057j3ydfsla4jj15j600xyf4p3ha3n3vpf9fj313ryx8b1p" } }, { @@ -7108,25 +7187,25 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20210418, - 406 + 20230202, + 1721 ], "deps": [ "biblio-core" ], - "commit": "368f45bf9a64450705a63598224c5af96160af76", - "sha256": "034vx4x0cj79n9gdxnwvmdz9ljdfsn9isda20x6gghjncb1dzsj5" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "biblio-core" ], - "commit": "a5a68fcf677f286f205f32dc7486f6c9f66aa6af", - "sha256": "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" } }, { @@ -7155,29 +7234,29 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20210418, - 406 + 20230202, + 1721 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b", - "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "a5a68fcf677f286f205f32dc7486f6c9f66aa6af", - "sha256": "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" } }, { @@ -7298,14 +7377,14 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20220422, - 1600 + 20230212, + 2019 ], "deps": [ "compat" ], - "commit": "298e33b4b02e499a61a68bb61ebef64cb7640b59", - "sha256": "0gv3hrwlns59jnxh2xzn2vf3a4jb2mm7gvq4jj77zr4di823r6qj" + "commit": "20f0637365a9bf0a899a7663b1f8caec609de19a", + "sha256": "074npqx189paal46g9dcr28i3lzm2gx8lyrk7v4v1hjhgmzhl1dn" }, "stable": { "version": [ @@ -7410,11 +7489,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221117, - 1610 + 20230203, + 2004 ], - "commit": "9090080b15486c3e337be254226efe7e5fde4c99", - "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" + "commit": "77945e002f11440eae72d8730d3de218163d551e", + "sha256": "1irr8a8r28n8c0c2x5w1flgv1f3z5jy2i5r5dknddiqa93b3rm84" }, "stable": { "version": [ @@ -7458,14 +7537,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20220429, - 2055 + 20221224, + 1132 ], "deps": [ "seq" ], - "commit": "5e11bc279850b623ebfde9a2278ea7c3ec2d7ac2", - "sha256": "0g0j4ccry7iyniiyiyhjyydknilhk01vsfidjjgv5c198yn8x1gp" + "commit": "828f2fd079769e5a2c50f8998e84d63a9a95e797", + "sha256": "1pa63y6ldm8gbzpx365i3hd147qglkyi10vlj52rcd3p8qvrg9gq" }, "stable": { "version": [ @@ -7505,6 +7584,30 @@ } }, { + "ename": "binky-mode", + "commit": "c83e9c76261a7de6a41ba93782a52f912120ea75", + "sha256": "0b6p43blrdb28czqxj4ykj8zbq6jix49g7rsig3c6dn7cj4rqzxv", + "fetcher": "github", + "repo": "liuyinz/binky-mode", + "unstable": { + "version": [ + 20230120, + 1708 + ], + "commit": "04f1132ea1945861da0081cb2ad08076d20cea57", + "sha256": "010yyhgn049nfmx3rbc3h4a0ypi6vgkn340rqfvsmml48ax75chn" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "e35a477e28e5ace70bbdb2a5d0c503639528fb5c", + "sha256": "1kvqrkm21g06q068jvf3a95299n0xd550lba1wlf0h6pc1jrg1fn" + } + }, + { "ename": "birds-of-paradise-plus-theme", "commit": "3932853232c269f158806aebe416b456c752a9bb", "sha256": "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m", @@ -7701,26 +7804,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220531, - 1900 + 20230113, + 2009 ], "deps": [ "posframe" ], - "commit": "330c0ac2e3bbc242c2e769655bb6b68555aada70", - "sha256": "1wmz3kp5k7n5xj2yx4rz7f7a5khvhll1jvda40b3c8x6mx9n416f" + "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", + "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "posframe" ], - "commit": "330c0ac2e3bbc242c2e769655bb6b68555aada70", - "sha256": "1wmz3kp5k7n5xj2yx4rz7f7a5khvhll1jvda40b3c8x6mx9n416f" + "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", + "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" } }, { @@ -7985,26 +8088,26 @@ "repo": "sergeyklay/bnf-mode", "unstable": { "version": [ - 20200323, - 1348 + 20221205, + 1451 ], "deps": [ "cl-lib" ], - "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814", - "sha256": "13178vnd8jscjqhdjvr06xxq00ymbjkaxpg2vvxb44gsyg75jg9n" + "commit": "dcdb422e219b29d53a9385e19083441c57f0beb3", + "sha256": "18fmka9hvdrz402kvjzz25437x3y36007d3vd439i1r6rj3axmg4" }, "stable": { "version": [ 0, 4, - 4 + 5 ], "deps": [ "cl-lib" ], - "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780", - "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv" + "commit": "a4fe013fc945d8396930bc6d0dcc1cf9d7102f41", + "sha256": "04n8aganyz44i1lhnlqraa4yk7i5dxjmskq8pp009ay33mjanj5l" } }, { @@ -8077,8 +8180,8 @@ }, { "ename": "bongo", - "commit": "692428769cd792dc0644641682c2793103dd00c6", - "sha256": "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0bswl59wmbvpkar6nk9qgjchv0gblwx732gxbrfpmq06fj0ia8pn", "fetcher": "github", "repo": "dbrock/bongo", "unstable": { @@ -8149,11 +8252,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20220708, - 211 + 20230116, + 1206 ], - "commit": "ccffde03b57d9b16fff59188d8e4090bf64d46d6", - "sha256": "1d4kbzgjdfkpjadbg070slir2v6sqlfw4jqlmpdg7pwc1c4j32rj" + "commit": "a1630443887c7fa190411c45269bde575f0807c5", + "sha256": "1va02c3mdaj04xx7r9h42ldiddl4i3ca68kywk66v59kxphdpzqq" } }, { @@ -8211,16 +8314,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20221106, - 2025 + 20230214, + 2035 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "106f842df7f68cbffbb2bb63f7f99f34fe7d3edf", - "sha256": "0pw2ig0hn9m62yv6j7snllzb9aanyjjfx3xzaif4bl0ili2zd78c" + "commit": "786cf085a9af60083279297c599d5ea0f744efba", + "sha256": "142gj7mxr8kg412y6xkicwicsy9y7jc3pjsmmnx3x4c7msh3hkqi" }, "stable": { "version": [ @@ -8244,15 +8347,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20221106, - 2238 + 20230215, + 1517 ], "deps": [ "epkg", "magit" ], - "commit": "032ddf33799dd0a2c89d1a3e9e04dc3cdc13320c", - "sha256": "19y7sc7d9qb926b5jv2l2jwhsgl3wm6php30w2r9jh5gspmh0ck7" + "commit": "15a89056ceccb611c28aed8943faabec0539494a", + "sha256": "1n32wiclnlqj8xr5rbzywqrras551hjcdk2mcc21xnqk22zf7mmb" }, "stable": { "version": [ @@ -8299,6 +8402,30 @@ } }, { + "ename": "boxes", + "commit": "525c1c64ccaeda21f8e30d8d7edcde318ba80ffa", + "sha256": "0sp9mpn0x7cljiaipvfh14sdk7jpmzi9pvvsxci7hz6mb2lskw0a", + "fetcher": "github", + "repo": "ascii-boxes/boxes", + "unstable": { + "version": [ + 20221213, + 2047 + ], + "commit": "380e7814acb7de490a3b5729c3b943f875bc6a73", + "sha256": "1qz31wq16p5lzk0bwnz0nbgp9v7ai94wbmafi9wlyi9sc1b9dp9y" + }, + "stable": { + "version": [ + 2, + 2, + 0 + ], + "commit": "7113961cbd139bd0c2122a92cc41331dbabf45a8", + "sha256": "0vv2gaav1m4z2xdk0k3ragmv4kcnzv7p3v97lkjl1wbfmk5nhz07" + } + }, + { "ename": "boxquote", "commit": "d2148f8f17b16154bfc337df69a5ad31e25a9b05", "sha256": "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s", @@ -8373,6 +8500,21 @@ } }, { + "ename": "bqn-mode", + "commit": "17711a1d747932e9be1ccd1d0a3adb64fa6cf1ef", + "sha256": "1hbwdd75dbbrgqnlj3mpx25nq2pb59xv5241dn55vzwd36a7434m", + "fetcher": "github", + "repo": "museoa/bqn-mode", + "unstable": { + "version": [ + 20230215, + 309 + ], + "commit": "6089e141dd693f809673c518fa07283ffeadb734", + "sha256": "0npbl9gph5g80r69g8vc9g23h867dwnny2g40yj85la9c28rg7fd" + } + }, + { "ename": "bracketed-paste", "commit": "6446db573d97ceb21cd39ce05fb39627113bbd74", "sha256": "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j", @@ -8437,25 +8579,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20220807, - 1438 + 20230217, + 1851 ], "deps": [ "fringe-helper" ], - "commit": "8f86b980d450e44cd29d24e66c30ff079c6b9982", - "sha256": "13jl2ppc8yn8nkwg0xix7cfmgfy34grw4rlask39mdis0jkwazk6" + "commit": "3f31b81204dc919cb178df556feed497f3a2a4f5", + "sha256": "1h2sgr4vck1x4p2clx2dcyd0g2l9s2bj1lfhx0xb09i17r80fk69" }, "stable": { "version": [ 1, - 23 + 24 ], "deps": [ "fringe-helper" ], - "commit": "8f86b980d450e44cd29d24e66c30ff079c6b9982", - "sha256": "13jl2ppc8yn8nkwg0xix7cfmgfy34grw4rlask39mdis0jkwazk6" + "commit": "3f31b81204dc919cb178df556feed497f3a2a4f5", + "sha256": "1h2sgr4vck1x4p2clx2dcyd0g2l9s2bj1lfhx0xb09i17r80fk69" } }, { @@ -8505,16 +8647,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20220908, - 1736 + 20230118, + 407 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "010639fc6bd6c710b56e0f095352da60c92473a3", - "sha256": "0ihbapxi99drdn191g7brx4pa5f1w0mskhb3yz7w3qsf0g9y9kn8" + "commit": "c020975a891438e278ad1855213d4f3d62c9fccb", + "sha256": "0g78l8jkwxmnpiwjk3yjbd7528mywwh26i3zzgy9a3904fv37rcw" }, "stable": { "version": [ @@ -8876,25 +9018,26 @@ "repo": "swflint/buffer-sets", "unstable": { "version": [ - 20221102, - 1813 + 20230220, + 2122 ], "deps": [ "cl-lib" ], - "commit": "e14026496655562ebd191ba25fad59ca8948c9bb", - "sha256": "0ljbb3zbm8kwasd4jxnq2mmw8ad7p6zxdpz8jz4wmjpskgya7nbn" + "commit": "ac40dc72ffd9073f8425e833fda7d29cbce581c4", + "sha256": "1wjzyj2hd63s575iirag04sa32sq9z9l50ik2zazggs81xlnw6ml" }, "stable": { "version": [ 3, - 5 + 7, + 2 ], "deps": [ "cl-lib" ], - "commit": "e14026496655562ebd191ba25fad59ca8948c9bb", - "sha256": "0ljbb3zbm8kwasd4jxnq2mmw8ad7p6zxdpz8jz4wmjpskgya7nbn" + "commit": "cdc66804b8a1ec7ddf94d99c7f24b801148b64df", + "sha256": "0lz7bjmxzxkri6mvqk6lrl6dp58as6py3i41hkfkj9zjmjvsl589" } }, { @@ -9290,8 +9433,8 @@ }, { "ename": "buster-snippets", - "commit": "67dabf33096113e68fe282309246094711751e1f", - "sha256": "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "17b9752lxmscrnvjdirm0ws33c0a9rkgj369bx44i6w0cbqds8lg", "fetcher": "github", "repo": "magnars/buster-snippets.el", "unstable": { @@ -9361,19 +9504,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20221026, - 2006 + 20230119, + 2337 ], - "commit": "eaa4b3ccd115a2bb25be98dc637950645d3adbae", - "sha256": "1dc8m5w26gi698d31xvh1q8mwf4a3wa1xrnyhqqxrmfr8b71clpk" + "commit": "07a52c99695845a0089e828d43da154c0ba0c178", + "sha256": "0xq92f5han0830h2fpqh49qxp2x7rqmq7743d2nfw49rhrns542i" }, "stable": { "version": [ 1, - 28 + 29 ], - "commit": "eaa4b3ccd115a2bb25be98dc637950645d3adbae", - "sha256": "1dc8m5w26gi698d31xvh1q8mwf4a3wa1xrnyhqqxrmfr8b71clpk" + "commit": "b3ea11826e2ca5d648d677c4ae27974ce8e7c7e3", + "sha256": "0a5wvm7nh4748wzvp2b9jll74ifqz22bicxkl5fwp4di4vrqpd47" } }, { @@ -9450,8 +9593,8 @@ }, { "ename": "c-c-combo", - "commit": "da105eab0e7a5a3a1fc562973d99cbbbe9019b5f", - "sha256": "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0z7qix1ir02rhpqsgz48wixncpyf375xf5767f971sxm8n46mdig", "fetcher": "github", "repo": "CestDiego/c-c-combo.el", "unstable": { @@ -9772,11 +9915,11 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20170320, - 1206 + 20170411, + 220 ], - "commit": "136dce009a26e7d8a8064af422c2cf8170e852c5", - "sha256": "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4" + "commit": "c538d3746449b4f0e16b16aad3073d4f7379d805", + "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" }, "stable": { "version": [ @@ -9833,11 +9976,11 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20150703, - 819 + 20170411, + 220 ], - "commit": "a67fa1023b3fddc1d1f38114c1d207376c8e6289", - "sha256": "0g8s3pgivqk1vqdgkndznkl48c4m5yiahkjxyqyv2781hdb4f6xa" + "commit": "c538d3746449b4f0e16b16aad3073d4f7379d805", + "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" }, "stable": { "version": [ @@ -9856,11 +9999,11 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20160303, - 258 + 20170411, + 220 ], - "commit": "e03ae470788778e7714b73520014eadc03a88abd", - "sha256": "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj" + "commit": "c538d3746449b4f0e16b16aad3073d4f7379d805", + "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" }, "stable": { "version": [ @@ -9879,8 +10022,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20220612, - 1131 + 20230118, + 954 ], "deps": [ "dash", @@ -9890,8 +10033,8 @@ "s", "transient" ], - "commit": "2f2cfc38f2d1c705134b692127c3008ac1382482", - "sha256": "11y8hiihs1jdf44pdxmylriqngwsxwsny29l6y3jp4mmhrrgz1m7" + "commit": "0ea8ccc41bbf4c6d105d9d2eddffa25d040f0e8d", + "sha256": "1dha52nv0gscy4bp1z5z40l15nzqbpl0frgjx08i7mbzf55a3nlv" }, "stable": { "version": [ @@ -9919,16 +10062,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20221103, - 240 + 20230220, + 226 ], "deps": [ "hierarchy", "ivy", "tree-mode" ], - "commit": "4a8206e0b8b8ffa073d35d132e0654068a3d425f", - "sha256": "0gb4m3jz7sm3iy2ipa1ijvkxbp1hwd3ka6p5i7jrhbs29hf1zamv" + "commit": "18a96dbabbedcd9e55817af7b6a0f303aea09faa", + "sha256": "1xdb2fiyavhxn7m5gg5b7vr8fydlzdriz0ckhsr95v19vjylkwg4" }, "stable": { "version": [ @@ -10000,11 +10143,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20220928, - 835 + 20230129, + 1145 ], - "commit": "a970f303065fe176a920db0466dacf3e2a20b56b", - "sha256": "1bd21fhcjgz7iadbz66yyzb7d88mlan7mkxm8zm0jnlkhdmixc9v" + "commit": "959a5a27bfdbaa43a9ff99be136d62e0798f5e01", + "sha256": "145y73lrrwwcl7xg12aq42a1zc1cwgvm7kg3gk18j5k40cy9x696" }, "stable": { "version": [ @@ -10023,16 +10166,16 @@ "repo": "kisaragi-hiu/cangjie.el", "unstable": { "version": [ - 20211201, - 2307 + 20230219, + 1150 ], "deps": [ "dash", "f", "s" ], - "commit": "87408d79b73a69194842a8848de6d7708e98c3a4", - "sha256": "1pafp5sqr1zb0fkci6i542s683vx4x14955rv51311s2y8xzgyqf" + "commit": "d6882e15f47fdde37e9f739dde604d77d25f11db", + "sha256": "0adi56w8lyxasry9z56pgxkz29my54q66rgyrzqbwba1qaky375g" }, "stable": { "version": [ @@ -10057,19 +10200,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20221109, - 839 + 20230215, + 717 ], - "commit": "4b32036a6c667b445dcc001fd70a01eee8baa924", - "sha256": "0kcnyzksj8yglk67g1130wxzscgipm7cz2hs8mvdqpcbz4i38jny" + "deps": [ + "compat" + ], + "commit": "3e796a862d42743d33cd56fca041b6f2194db095", + "sha256": "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya" }, "stable": { "version": [ 0, - 10 + 13 ], - "commit": "4b32036a6c667b445dcc001fd70a01eee8baa924", - "sha256": "0kcnyzksj8yglk67g1130wxzscgipm7cz2hs8mvdqpcbz4i38jny" + "deps": [ + "compat" + ], + "commit": "3e796a862d42743d33cd56fca041b6f2194db095", + "sha256": "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya" } }, { @@ -10090,16 +10239,16 @@ "version": [ 0, 10, - 2 + 3 ], - "commit": "2e88221d3dde22266bfccf40eaee6ff9b40d113d", - "sha256": "0dq23gghvsp71j75xiypbcafsf1if68fr96ihpzxx9fg0w47h6mw" + "commit": "a16468f296a9584f4068072efecdee8a9eb9c2ed", + "sha256": "0nj0s1n7a98kn1597lskv32piba6cy5ifgw102y52mphl0h55c22" } }, { "ename": "capture", - "commit": "bdfe43be6c5f77845e82745534a1b1a9eb190466", - "sha256": "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1zp9zcrj8jabvc3699azixfziqnvcj3skv1zp1787d41wzc1g5bv", "fetcher": "github", "repo": "pashinin/capture.el", "unstable": { @@ -10134,14 +10283,14 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20221002, - 1553 + 20230105, + 11 ], "deps": [ "bech32", "cbor", "emacsql", - "emacsql-sqlite3", + "emacsql-sqlite", "f", "helm", "readable-numbers", @@ -10149,8 +10298,8 @@ "yaml-mode", "yasnippet" ], - "commit": "5654cd04cf0ab482a7f92a206abf43762ef653f3", - "sha256": "1pw73csxkfr71piq5mjy54njd1s3vk5j9a1bfwvna33kqwcqjcic" + "commit": "6ce650972d949228b17dc03c6ff809f67f22f35a", + "sha256": "0j82a1267cgkj2kd2m3fb05hk7s4nlwxbfxa9r8hs9kzx48lkli2" } }, { @@ -10161,8 +10310,8 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220718, - 1434 + 20230105, + 11 ], "deps": [ "cardano-tx", @@ -10171,8 +10320,8 @@ "yaml", "yaml-mode" ], - "commit": "4250104458df65c69a8c4287be29840975addbf2", - "sha256": "1mb5a8jkww579y0nhyn2089g1hbws1q69iq4dyrsqmhgflc2bg01" + "commit": "6ce650972d949228b17dc03c6ff809f67f22f35a", + "sha256": "0j82a1267cgkj2kd2m3fb05hk7s4nlwxbfxa9r8hs9kzx48lkli2" } }, { @@ -10183,14 +10332,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20221025, - 810 + 20230125, + 1253 ], "deps": [ "markdown-mode" ], - "commit": "d2720c8dc7ac3b18ce112a886d3b8696797d01cb", - "sha256": "1qsva3ba3r883c8kr8ffsnzrd8fqf02yx4dxml3qzwhi74s1n5wq" + "commit": "225fdb846c702a193e58a98c1585bb3586a9aa86", + "sha256": "03wm1wq6jax1a30ix5hn3n8d95nn0hkc6l9mipy77ayfcawkd31h" }, "stable": { "version": [ @@ -10213,11 +10362,11 @@ "repo": "ayrat555/cargo-mode", "unstable": { "version": [ - 20210605, - 1003 + 20230213, + 401 ], - "commit": "96407fccbde5f2ccb02682f421910a6f4a17e30a", - "sha256": "0bagdch1n7lqr7vrc34gh1qkngqlg6jpgcypcckbs9sn0qngh9mc" + "commit": "6e128f08692aae5723122e039e8871a57141e868", + "sha256": "044bc09bmkzzrrd24niwsz5cr52kg3wbhs7qfmxmypyqzzdj3kcd" } }, { @@ -10228,11 +10377,11 @@ "repo": "peterstuart/cargo-transient", "unstable": { "version": [ - 20220730, - 154 + 20230120, + 1431 ], - "commit": "1755da9c1cedde6026a0a9e7fd0fe98ed2d30dbb", - "sha256": "1bidbpak7w16dw78sgwx8kb75kvib6s15cnl8akzxsdx69r9k207" + "commit": "f0295aee41404ffb2e8532948becf78d405e4ee9", + "sha256": "1x1nkcsc41niljpm9mf84r1lyiavy3nybpgzglhw8f7xwvr7b6x5" } }, { @@ -10428,11 +10577,21 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20221023, - 2331 + 20230221, + 737 ], - "commit": "b4be30de73aa295ab56a20c21dff07fba3dec05e", - "sha256": "15wdl02r6yjkqmzh5xg60hgcdvwr32vv6sw2mzjyh6g1wi6x134q" + "commit": "046358639b3b6948f0779a16bef51cec44c606c3", + "sha256": "01r3xpx55i4wwk2xzrl3y7ajckkwzpxlyx4ccpzn0l3rl8dbsw9c" + }, + "stable": { + "version": [ + 0, + 2, + 0, + -3 + ], + "commit": "785c9f57a43c4c90041290556d999db3d9da5be9", + "sha256": "1dzfashhjig06m9zs4w2ns64h3hzck93p4ddfwnr9zaxz0gmkp4s" } }, { @@ -10472,14 +10631,11 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220810, - 1600 - ], - "deps": [ - "dash" + 20221225, + 1909 ], - "commit": "5282753b9f4509468d391357147e13129859ccbe", - "sha256": "12qmbrkr16hh81hqjn3h4v4ypj08ii3yg9zibky9hpld5jidqx26" + "commit": "b369e8ac68c4cbabeb3a57f7db6bd44341523d72", + "sha256": "0ppzjha1cav84jgp2lvm60m4qxxa3cd9mbp66jdgzyjx3k7mi0l3" } }, { @@ -10520,15 +10676,15 @@ "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ - 20200820, - 308 + 20230111, + 1754 ], "deps": [ "dash", "lsp-mode" ], - "commit": "675a5704c14a27931e835a431beea3631d92e8e6", - "sha256": "0l4bhyr9d8ljz1f0cfg1s2cjcmh6fiwbk5mdlvc7rrwz5hxc21is" + "commit": "29d231590fad39b4d658d9262859e60669edb9b0", + "sha256": "09a4hs80577mliqlb9ahgz3kc3xvr9kpw9qvlv7cycd4x56ngy0k" } }, { @@ -10692,15 +10848,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20220926, - 1247 + 20230109, + 457 ], "deps": [ "cl-lib", "powerline" ], - "commit": "7d9fad0daa44ffb2acecf6525759e46e08e35f2c", - "sha256": "0la8fmwirspg7m453qhfb64sqryl59dxc1lfmjkh6mzf85nqbl1i" + "commit": "a2890d968d877b269a814a691356fc5877833c39", + "sha256": "1naimz0xazxlms20kz6v82vpmriinswq51bbqxcl6m8ic7wgii0w" }, "stable": { "version": [ @@ -11028,11 +11184,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20220930, - 907 + 20221007, + 1727 ], - "commit": "4d0fcdd3f9f33832af357928762d785d88b3d494", - "sha256": "0nh6lgwrd776n3chk3wyla95hf5jhkcmbmnz25d5lsk35nb2fwb8" + "commit": "a8a369f77d798bf65f65271256980a498fa43564", + "sha256": "0q6gac1ykkc332z4x88d1wn2mvkz92lwjy36dji93hvl9y3228af" }, "stable": { "version": [ @@ -11245,8 +11401,8 @@ }, { "ename": "chee", - "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8", - "sha256": "1sw84qaca2cwgrw332wfqjp3kg3axgi9n6wx5a6h2n3liq5yr1wj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0dk30kadpagz1in8jnj7550865hxa7wmyl15pb8ivz1llm3v85bf", "fetcher": "github", "repo": "eikek/chee", "unstable": { @@ -11363,11 +11519,11 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220310, - 2014 + 20230106, + 1716 ], - "commit": "781783c483bc8fcdba3a230bb774c3a8a5ebe396", - "sha256": "0il36mnf4c13336sa4hpbfypdc983va5fcd5shcsp7slb9zwm69m" + "commit": "0578f81ab01f5280e6c68d7a8a70ae4b4ba29755", + "sha256": "09qjp6030xfj27aswpi224czjq28ac32267k1y4gfp16gg4iimdd" }, "stable": { "version": [ @@ -11546,16 +11702,16 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20220604, - 344 + 20230203, + 557 ], "deps": [ "dash", "seq", "ts" ], - "commit": "dd2ffea506531ca621685bda5a4c30dfb43f5fa2", - "sha256": "1fqijm6gnmsljg6a5pswcnrclv0kan1y947lhl9j5sqk31dcpbp2" + "commit": "f131e996320715238e8403439a18dbc016b09520", + "sha256": "1p25way281k6ygkws1fmkz2z9imcj7p82n6zlrlfjz37192d8saq" }, "stable": { "version": [ @@ -11694,11 +11850,11 @@ "repo": "chyla/ChylaThemeForEmacs", "unstable": { "version": [ - 20180302, - 1658 + 20221213, + 1012 ], - "commit": "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a", - "sha256": "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596" + "commit": "b24d0379516857ccf75caff9ae1d00b820c9a6f6", + "sha256": "1rr33vxl3rihcygmd76ga4cg22kwfdld50firg0j5fgyg3kscj4f" } }, { @@ -11709,8 +11865,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20221109, - 2212 + 20230218, + 915 ], "deps": [ "clojure-mode", @@ -11720,13 +11876,13 @@ "sesman", "spinner" ], - "commit": "5064287ba71c4c8ede169b0f561d707f4a365c55", - "sha256": "01r53aclh5wf70l6kpzmnx64jm6ixx6x9c390hbdvjbif6mp8xbv" + "commit": "1ed5163433c991c00ea83fdd4447e8daf4aeccbe", + "sha256": "1r8arjpzl12fzd5j27xdgvqk33srs0cl0nrp9lm54zhqzxc7gbw2" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ @@ -11737,8 +11893,8 @@ "sesman", "spinner" ], - "commit": "700ded1d6c245e01fca7f364db1561ad1e1bb595", - "sha256": "1ih902n8p3pl1apprprkyrlnrp2dxli86y5k09zahy9mglfz2z5n" + "commit": "80408364f8e6870d8f5a33e0e096b86f1a7ef144", + "sha256": "1a3xbfn1id8dcy3178kmdnzcvh7lq2pdwwg4axhncw6jq9hqiqja" } }, { @@ -11845,9 +12001,9 @@ "unstable": { "version": [ 20160622, - 1430 + 1431 ], - "commit": "8023b45ec60961bf4c3a3d8a564727c463ed09d1", + "commit": "a78a88ca9a66a82f069329a96e34b67478ae2d9b", "sha256": "06p6hz6jrnvnlbxdr1pjgf5wh4n34kf6al4589qg1s88r2lf86bl" }, "stable": { @@ -11917,20 +12073,20 @@ "repo": "guidoschmidt/circadian.el", "unstable": { "version": [ - 20181024, - 1256 + 20221223, + 1734 ], - "commit": "e0547c1779f2653dac09192951a0756ce2e2ea89", - "sha256": "120b6wr2b4dmgaz5y3vpc5f68nqm1lfkgwpcxwxncspds7qb987j" + "commit": "9959e4b9d2ed9920b668fc229aab1f5fa5bd8584", + "sha256": "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "9894361dcd6ffb6d4629b4cbbabda2153699eb8e", - "sha256": "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic" + "commit": "9959e4b9d2ed9920b668fc229aab1f5fa5bd8584", + "sha256": "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km" } }, { @@ -11941,14 +12097,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20221022, - 2222 + 20221126, + 1508 ], "deps": [ "cl-lib" ], - "commit": "d0bd8113c23affe4f7bd9e19c498cee99e436f0a", - "sha256": "11hy7izabnngmbly279lhylznrjw1fmpkxrxbrr6lx53ybck0knr" + "commit": "57fe189d7c0b98b9b1b5a59767cea1c7e2c22b13", + "sha256": "1hnfbzf4inx541mw1gnb5hxv6igdcwnlhpm8qs6z630appf3yxnc" }, "stable": { "version": [ @@ -12019,29 +12175,61 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20221030, - 1200 + 20230218, + 2016 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "c37a4827d019eac76a297ebd2d6af04ffce42afb", - "sha256": "1zlw1na4i4gq9b1zdh4pzyvwrn2dzrjzx1a0541211i5c1h79xd9" + "commit": "5dac3d5bf287566f049b44465e415afb42f30ec3", + "sha256": "03ypp4kb6h0x2i3g22mq2vynybmd39qzfg0s31k9bx3dbxxf2j1b" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "a5c769011288d0b1656784931de6ba06e64b2dd1", + "sha256": "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry" + } + }, + { + "ename": "citar-denote", + "commit": "ebd380e47429788e990f8554adb3b8e146cc5685", + "sha256": "04vy8y8mhwnddjjv0wfcccflfgg83pb189qksm0jcgxh5wbkzv5n", + "fetcher": "github", + "repo": "pprevos/citar-denote", + "unstable": { + "version": [ + 20230211, + 528 + ], + "deps": [ + "citar", + "denote" + ], + "commit": "3f8082fa68effced61a364a1ced333ed4fe33060", + "sha256": "00zmhrj9hy84gq5vbjn25xmlax7ksfp7gghqv62rgl493vcvs5va" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "deps": [ + "citar", + "denote" + ], + "commit": "15b4ba4feae7659615a7478987831a681ae8b287", + "sha256": "1v8v01d6ywq20h4z7wniqqszgbz3n8wz4x7ca26cf52c1w11469z" } }, { @@ -12052,27 +12240,27 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220724, - 2250 + 20230216, + 1954 ], "deps": [ "citar", "embark" ], - "commit": "8475c1fd2b8d2171b7c9dd4318aa67d09c62b820", - "sha256": "1sh0hxx2a983czpnpihpr9zhi0321g7riv98lk2knz06xhqai0cy" + "commit": "a5c769011288d0b1656784931de6ba06e64b2dd1", + "sha256": "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "citar", "embark" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "a5c769011288d0b1656784931de6ba06e64b2dd1", + "sha256": "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry" } }, { @@ -12083,15 +12271,15 @@ "repo": "emacs-citar/citar-org-roam", "unstable": { "version": [ - 20220927, - 1834 + 20230211, + 117 ], "deps": [ "citar", "org-roam" ], - "commit": "27105d0a9578279560cd79cfad5871e7e603bc58", - "sha256": "192p4bfa49mj5iq70lazi828gzwd1z7dfmckg4xfmdsd58crygh3" + "commit": "0690a34c84f3f483c723a69cc54e6a141e199c99", + "sha256": "0k7ck0smvj57d1lvj5hx0x7m6x7hagkiqllipylaiixq3asd02bm" }, "stable": { "version": [ @@ -12114,8 +12302,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20221105, - 1054 + 20230125, + 1818 ], "deps": [ "dash", @@ -12126,14 +12314,14 @@ "s", "string-inflection" ], - "commit": "69536c8776dea383951538fd197333bee766d7c7", - "sha256": "1x95hr3w8ck3dhhnpj4yfrqfrh3mmfld8lqaqpijwmgjgf2gfivh" + "commit": "2623043b2546ee09a4bd86641870ca86332c0bcf", + "sha256": "1f2bcshnccfbvbnkhnynkdpszrs4zb3z82hqrrdp9hf3ig3h5750" }, "stable": { "version": [ 0, 9, - 1 + 3 ], "deps": [ "dash", @@ -12144,8 +12332,8 @@ "s", "string-inflection" ], - "commit": "406bd9964f1ce531fc45beddcf9ccc44d3456129", - "sha256": "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm" + "commit": "121efe540303ded2ebf486281e6fd472966e7cbe", + "sha256": "0md8pfmd0v9ipnxj1q13vv81hl90wf4rm46czbk1fdzkyf9js08m" } }, { @@ -12194,11 +12382,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20221111, - 1230 + 20230217, + 1202 ], - "commit": "244501472ddf31c91cc374231849a05c86dfb1fb", - "sha256": "1051lqy1wbcmzdwmyqx0320mqrq64wrafk70dymyki2q9y291782" + "commit": "4626ada80fabea6b62935567acc1cb8dad607016", + "sha256": "1bs66lk094g1bgk09zamv184j1nl64z8hvwjvf4w28kbjpvnxvsn" }, "stable": { "version": [ @@ -12350,6 +12538,21 @@ } }, { + "ename": "clean-kill-ring", + "commit": "a0df99a537f71b4b08bccdbc8272cc1cd7448c9e", + "sha256": "0kpjnaq6s4labn4avzih1xcsfrhr2ng6fvw0vk1d5fd8mjcfq3jg", + "fetcher": "github", + "repo": "NicholasBHubbard/clean-kill-ring.el", + "unstable": { + "version": [ + 20230115, + 2153 + ], + "commit": "d05fa7ee97e760d21d533261c7b63eecf223f612", + "sha256": "0s0r65byg66fq4q9jqral4m2d616sfxla5k75zrmyxx3h5152n4r" + } + }, + { "ename": "clear-text", "commit": "d2ae86a3001587ba753fcd0ca5137cb65d38910d", "sha256": "1cx2lbcbhd024pq9njan7xrlvj3k4c3wdsvgbz5qyna0k06ix8dv", @@ -12512,14 +12715,14 @@ "repo": "Fuco1/clippy.el", "unstable": { "version": [ - 20161028, - 1954 + 20230118, + 1924 ], "deps": [ "pos-tip" ], - "commit": "ad4b5dba4cede6d4b21533186303d3d3e9a2510f", - "sha256": "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm" + "commit": "85aec3129ff17f71ea4541cfadbb7b56b31a7474", + "sha256": "0zx45rlsj184v4gshnzpqzdmyl9g541z70jhhw0rj8im62pnnrbi" } }, { @@ -12590,8 +12793,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20221023, - 1644 + 20230202, + 637 ], "deps": [ "cider", @@ -12604,8 +12807,8 @@ "seq", "yasnippet" ], - "commit": "8300d5cab861668f313fbbbb3e2926e3e5130e86", - "sha256": "15ya7hp5d2kwh1ig55d75vlghm1vsq99jh44i8q8v25vfmzjp7gp" + "commit": "b5abe655e572a6ecfed02bb8164b64716ef76b8e", + "sha256": "1kkkfb8ixyh3yca1rgdi636xizq7c07k174d243ys3826730wz9w" }, "stable": { "version": [ @@ -12737,11 +12940,11 @@ "repo": "erickgnavar/cloak-mode", "unstable": { "version": [ - 20221031, - 431 + 20230130, + 613 ], - "commit": "e182ec462f486bb84d66780c9d27051e6921f9c7", - "sha256": "19xwhiiyjmlcwamzg562x2gd5hj7csnmdzc969d137ira03v40qa" + "commit": "ca0896dfd0a0ee549150233ebd96aa0f65b56afb", + "sha256": "1ih51q5sc2gri2lyy2qi3w6jijr5khcr4whnv8g34v8xq6pyrxys" } }, { @@ -12855,14 +13058,14 @@ "repo": "p3r7/clojure-essential-ref", "unstable": { "version": [ - 20200619, - 1653 + 20221215, + 1427 ], "deps": [ "cider" ], - "commit": "554594dc7ebb976e45632b8738b103ad048bf879", - "sha256": "1qjbf3w2j074b2kvrn2jkhlgzrcjd2g84xii83gz7v5darlni92y" + "commit": "6741bf65cf9b9bc896ab1cc3c384573e8ffe5f96", + "sha256": "0dib6krb49gi253vs3zqh83r9s3wdmlvbqwcq7gq28dbjsbpljcn" }, "stable": { "version": [ @@ -12885,16 +13088,16 @@ "repo": "p3r7/clojure-essential-ref", "unstable": { "version": [ - 20200719, - 608 + 20221215, + 1427 ], "deps": [ "clojure-essential-ref", "dash", "nov" ], - "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e", - "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md" + "commit": "6741bf65cf9b9bc896ab1cc3c384573e8ffe5f96", + "sha256": "0dib6krb49gi253vs3zqh83r9s3wdmlvbqwcq7gq28dbjsbpljcn" }, "stable": { "version": [ @@ -12919,20 +13122,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220928, - 557 + 20221214, + 915 ], - "commit": "414157c3e523e80cc44dca8f86f1853122ee5f6b", - "sha256": "1ldzbc7zrkqnkf3gm69q94ys4my984zps1gymw5sdx6gn9qc96iv" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" }, "stable": { "version": [ 5, - 15, - 1 + 16, + 0 ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" } }, { @@ -12943,26 +13146,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220715, - 1509 + 20221214, + 915 ], "deps": [ "clojure-mode" ], - "commit": "fee38d780f7d0b2a42a441e4d8bcfaa4fa672983", - "sha256": "1ck9d8jzs6m5qvg5bnx9i7d94icsfl4698p66vxsn3yqclhc8yzz" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" }, "stable": { "version": [ 5, - 15, - 1 + 16, + 0 ], "deps": [ "clojure-mode" ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" } }, { @@ -12999,8 +13202,8 @@ }, { "ename": "clojure-snippets", - "commit": "4898fc6746b30b0d0453b3b56d02479bfb0f70b9", - "sha256": "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "13v1xhagyzqdmvi2j1rqdwn13sa5w4bx58b1l00p0g5clprn4fi6", "fetcher": "github", "repo": "mpenet/clojure-snippets", "unstable": { @@ -13029,8 +13232,8 @@ }, { "ename": "clomacs", - "commit": "345f9797e87e3f5f957c167a5e3d33d1e31b50a3", - "sha256": "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1gl3zxhi0nm4y5ykr1qjs6k9hyij8q565pckj5h9x3jn3wgya9f8", "fetcher": "github", "repo": "clojure-emacs/clomacs", "unstable": { @@ -13070,15 +13273,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20221017, - 952 + 20230220, + 1944 ], "deps": [ "compat", - "emacsql-sqlite" + "emacsql" ], - "commit": "463b0f4d4c3e66acd5d30c6572cc45eaecc25633", - "sha256": "0kzi6h41iyz2rhz64f671p7swjnqrg9swlmfm7hr03z3hsghpz3w" + "commit": "b670b88c6f2785ddfdff91439ceb332b1bf8a8ce", + "sha256": "0hffljz4353id5y7ps2saw9gsclyj1ishpvfa4vclpc9kg7mw58n" }, "stable": { "version": [ @@ -13251,20 +13454,22 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20220823, - 1201 + 20230215, + 1434 ], - "commit": "5936d4f2adeec64e0ff748b2c6c34f0436b19a97", - "sha256": "1rjk2rhdg1wcga5iagaafghj15gy5h45aw0llkpxpnpvvwrh7g59" + "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", + "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" }, "stable": { "version": [ 3, - 25, - 0 + 26, + 0, + -1, + 3 ], - "commit": "13e46189c7f3b39a26e9ca689bc029b7061d26a7", - "sha256": "0h6fvq4xbb717p0n67afhiwih1zgjphl0wcl3y1wg8bg2cv8zvll" + "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", + "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" } }, { @@ -13332,20 +13537,20 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20221019, - 159 + 20230216, + 803 ], - "commit": "102f808e500715e0cfb80905110d1f42aa7b6069", - "sha256": "1vim429ikgsh7zvh521af39xgmm6qb3fc3pwb51458fj010gf8pj" + "commit": "4b1bbf854009992858e86a19de49b8dc91e924eb", + "sha256": "1sab7az9rqzylvay5ai8k2rg656hqd0ga4qwsy2plnmn0fx9iv24" }, "stable": { "version": [ + 1, 0, - 9, - 1 + 0 ], - "commit": "cbe1ddd49e33b790a568c55351146aa5b909f173", - "sha256": "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx" + "commit": "102f808e500715e0cfb80905110d1f42aa7b6069", + "sha256": "1vim429ikgsh7zvh521af39xgmm6qb3fc3pwb51458fj010gf8pj" } }, { @@ -13449,8 +13654,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20221111, - 1212 + 20221206, + 113 ], "deps": [ "a", @@ -13464,8 +13669,8 @@ "transient", "uuidgen" ], - "commit": "182c1cc6ebced5c161aa37d01142dfab7eb8e7b3", - "sha256": "0yi6i1ayfax5c1qmxx9xx318wg2ajp98k6r2rb8fwr8183flc993" + "commit": "a8bb63b53f2a1fd31302c110e668ad7b5c871b34", + "sha256": "1ks1s3vq8rwc14863dk929r42x52p9dqcd3qyjbkc9km2nkc1z5n" }, "stable": { "version": [ @@ -13688,14 +13893,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20220629, - 1800 + 20230210, + 2047 ], "deps": [ "dash" ], - "commit": "caed36cc21b6a7f659dda8a3ace1a607daa30f6f", - "sha256": "1s8qi4mbgmyqmmgwa6qdc40dvls0jy51wgpz8mz4rh7msmwxf17v" + "commit": "9fd09481bbcdb35712d974d5bc3667f5a5900ddb", + "sha256": "0rj860ypsr9w9i1bq8wf8ssj54yxb3kp0q5wp0b67nh27qycywx5" }, "stable": { "version": [ @@ -14269,17 +14474,17 @@ }, { "ename": "company", - "commit": "7eadfd36ae9b7bd241c38d09a7203873538983fb", - "sha256": "1wxadzsf7vrnxj7zhnwrz0vva9zgr99s0lb677dllrj1zdryixwx", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0imik54s3y0xwr4l207rrwc4v77m0hmfvmvk0qx98mpn65g4l1v4", "fetcher": "github", "repo": "company-mode/company-mode", "unstable": { "version": [ - 20221007, - 2145 + 20230209, + 134 ], - "commit": "48fea7a905b3bcc6d97609316beced666da89b1f", - "sha256": "17w9irn5aaxadsm5smz5cm1dxy0xb1hh0dnhwqclq3y5llrb21lx" + "commit": "2ca3e29abf87392714bc2b26e50e1c0f4b9f4e2c", + "sha256": "1z73yn7jyjxm4lf3d3r65rb549w8npjdba6iaxqawf2a8hkwjgy2" }, "stable": { "version": [ @@ -14449,16 +14654,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20220910, - 1354 + 20221230, + 1603 ], "deps": [ "company", "dash", "frame-local" ], - "commit": "79abd77f3357279c2726b74f8b20df27b71aa867", - "sha256": "0p60h0l62b1pdnc444j9nzya6c61dxwf8d6i76qh7h9bzzn6ikf4" + "commit": "766546b2668b5ef4eb4abbde632c9acd370c7788", + "sha256": "1ypk5lxgcmk4v0y2ch23267zg3acnafw7441a4zg26zvg68x7mx9" } }, { @@ -14519,8 +14724,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20220314, - 526 + 20221130, + 536 ], "deps": [ "cl-lib", @@ -14529,8 +14734,8 @@ "dash", "yasnippet" ], - "commit": "a6e349e0131f676a885bd14c908fd26054b2df42", - "sha256": "1qws0a0ia039d6bv2sbjsdl1ry28y9jrv98qnp5jcm7jfb2jmvsp" + "commit": "5affe7a96a25df9101f9e44bac8a828d8292c2fa", + "sha256": "1i18w7byz0x9l7cka6cs7bk0d3wcy7r0gw34zz45np4r84arwsjd" }, "stable": { "version": [ @@ -14693,28 +14898,28 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20210427, - 2151 + 20221208, + 2344 ], "deps": [ "cl-lib", "company" ], - "commit": "90594eb58b20fb937cfd4e946efcc446ee630e6f", - "sha256": "08dx812vg92bkwp0ham40rv3x9648x7y5bmbvphcc71s9knfgxcz" + "commit": "9e2816ce9b5795bd0066f92d4f80d15ccf94ef36", + "sha256": "1prcjdqm4djp5nr93m2axddhhdmn1s0y157px9zsk7g5yi36dn6q" }, "stable": { "version": [ 2, - 6, - 1 + 7, + 0 ], "deps": [ "cl-lib", "company" ], - "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", - "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" + "commit": "9e2816ce9b5795bd0066f92d4f80d15ccf94ef36", + "sha256": "1prcjdqm4djp5nr93m2axddhhdmn1s0y157px9zsk7g5yi36dn6q" } }, { @@ -14725,16 +14930,16 @@ "repo": "jcs-elpa/company-emojify", "unstable": { "version": [ - 20221006, - 557 + 20221231, + 1708 ], "deps": [ "company", "emojify", "ht" ], - "commit": "6856bdb187bf6f8c31965058e4408827f6ae178f", - "sha256": "0751hs1gdmn5f2nv607lh7pn01xnpczkkvivqn1nl5n2l45s0i8i" + "commit": "89652ee1a5488fbbe7b73c03ac316b895bb3fc19", + "sha256": "1kfy1jqsh90393yj2wvp2ccr0mvr7idq39033058i90f7md7gsmi" }, "stable": { "version": [ @@ -14829,16 +15034,17 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20221025, - 1115 + 20221231, + 1708 ], "deps": [ "company", "ht", + "list-utils", "s" ], - "commit": "3c8c960b4e5341f6806cf43aa794c0798051222d", - "sha256": "04gfcsj9fr989xgm2gagb61iiq9jgx5l8xxixs4ps524a7igl21v" + "commit": "eff3b5429d7e8d0eb2d62fb352ae843fe1a99ac2", + "sha256": "05f2lfn5ivg3pp1avllfy8z5j6q7i9mb143p5299kqwlfk83fcq2" }, "stable": { "version": [ @@ -15119,15 +15325,15 @@ "repo": "yanghaoxie/company-manually", "unstable": { "version": [ - 20200709, - 913 + 20200721, + 1903 ], "deps": [ "company", "ivy" ], - "commit": "0b696c268fc7ba3ef70c1b2c9ebe5dad0f4ec4a0", - "sha256": "0lzz36ifwxb30h0s5ihy85fvjys2ghi8y6gg0w0sd3mwfz1zjyn5" + "commit": "b922318da821fc3cf1d3155f21d543ea8470c881", + "sha256": "1s2bv040gg22qzjca39r32cz3qhairnvppk9wdp1hl52i6by57v9" }, "stable": { "version": [ @@ -15151,27 +15357,28 @@ "repo": "vspinu/company-math", "unstable": { "version": [ - 20210731, - 2019 + 20221227, + 1329 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "45778f5731c97a21a83e3b965cbde42018709afd", - "sha256": "0s3jnslsd2licgav26s0nawwhhs4yrmz9chl0ghkngplichnp9mk" + "commit": "3eb006874e309ff4076d947fcbd61bb6806aa508", + "sha256": "1pj10i7ml5d2spcmf8035ngcq5zc6rs3lqx09d0qj6bsghglr6j3" }, "stable": { "version": [ 1, - 4 + 5, + 1 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "a796053590012e6a15c8b527b521ffc15d137bd0", - "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" + "commit": "3eb006874e309ff4076d947fcbd61bb6806aa508", + "sha256": "1pj10i7ml5d2spcmf8035ngcq5zc6rs3lqx09d0qj6bsghglr6j3" } }, { @@ -15182,15 +15389,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20210520, - 2034 + 20220531, + 1847 ], "deps": [ "company", "maxima", "seq" ], - "commit": "f92eafd716ae6e36665bbf027309477c2efa336d", + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { @@ -15205,7 +15412,7 @@ "seq" ], "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" } }, { @@ -15340,15 +15547,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20220809, - 2027 + 20230115, + 1202 ], "deps": [ "company", "org" ], - "commit": "29a2edb35e18c2627dcfa0641852a55d9639263c", - "sha256": "14qvxypgc1cj6ijvkkybl7x5p00435v4rdaw7pvvlf58lc422492" + "commit": "aee601a2bfcc86d26e762eeb84e5e42573f8c5ca", + "sha256": "0zghjkny222wxkyr48njpwjkwk7gfrjm6n70drkwmjhhh88646fv" } }, { @@ -15501,28 +15708,28 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20221118, - 824 + 20230104, + 1229 ], "deps": [ "company", "posframe" ], - "commit": "ab58972c2cebc5ecf68c4cdd140c3aed2c68f42b", - "sha256": "0nqcqs3ngxmb946mg11b2im9sycwdykghzbv3sp4aans8q62ig6k" + "commit": "18d6641bba72cba3c00018cee737ea8b454f64a8", + "sha256": "03kj8yxd4y9aw86b6y6z5l9y76q5gjyiyhi5120nx1a8cwbd9g4a" }, "stable": { "version": [ 0, - 5, + 7, 0 ], "deps": [ "company", "posframe" ], - "commit": "86428bf9ce50a14326f38942b9f1467dd5b483df", - "sha256": "05ays6xkqbxcfplvx7wfc2slflmwc3aw7vkixvabk0ilvisndvgm" + "commit": "18d6641bba72cba3c00018cee737ea8b454f64a8", + "sha256": "03kj8yxd4y9aw86b6y6z5l9y76q5gjyiyhi5120nx1a8cwbd9g4a" } }, { @@ -15533,27 +15740,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221112, - 344 + 20221216, + 112 ], "deps": [ "company", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "company", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -15583,15 +15790,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20220825, - 1037 + 20221212, + 534 ], "deps": [ "company", "pos-tip" ], - "commit": "6660a1b380b9599af9ef1cc617168db83f24b9b7", - "sha256": "175zw6jnkr6cf3nl9gvyjj69pzv4w1p19gjid9dkhqy38wyslkr9" + "commit": "9505fb09d064581da142d75c139d48b5cf695bd5", + "sha256": "14sm431636k72pc9iz2kmxxrk0q0ijbwy4gnl0qxqh41p9pqm148" }, "stable": { "version": [ @@ -15609,10 +15816,10 @@ }, { "ename": "company-quickhelp-terminal", - "commit": "f5fa4121cd4e2a49adfd23929c73f385cf7d1264", - "sha256": "13pig4bkfhwvpak78v85dzmrv7hwqd3pz4s5y8cb7xa033i1v78s", + "commit": "ad9811a64dbb3196b5357be8ac31ca0fd165e5e8", + "sha256": "0hxdf6vwswq2ac3w43v801wp21rqd57bgqcj3jrqgkj330a5yxaj", "fetcher": "github", - "repo": "jcs-elpa/company-quickhelp-terminal", + "repo": "jcs-legacy/company-quickhelp-terminal", "unstable": { "version": [ 20220704, @@ -15753,29 +15960,30 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20221103, - 2107 + 20230106, + 1532 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "e55b9000192f82e96fdc0f7ca1e8a868e67762a8", - "sha256": "113h10n3yb3gb4qpmg1ji7fmzy912qcysq4c2v80gx4qqbn1qq5h" + "commit": "5f959a63a6e66eb0cbdac3168cad523a62cc2ccd", + "sha256": "0lrkvfg0z9gwfcj90yihanysg8icxpbqq3wqyb734bi5fpmgmzr4" }, "stable": { "version": [ 1, - 3 + 3, + 1 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "024c2172a0cc8f1b35f173e42fff5f2d938920fc", - "sha256": "06nfq2va9vwf5wiqdfrjziv3hjkj36w8p91bicfb92ggv1afg9ra" + "commit": "5f959a63a6e66eb0cbdac3168cad523a62cc2ccd", + "sha256": "0lrkvfg0z9gwfcj90yihanysg8icxpbqq3wqyb734bi5fpmgmzr4" } }, { @@ -15786,16 +15994,16 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20181117, - 1518 + 20200113, + 1721 ], "deps": [ "cl-lib", "company", "solidity-mode" ], - "commit": "d6c48a1cb64d3c8a825dc0d06c839f2cacd4d289", - "sha256": "14v71xf3z60s1fhpsz8b3l1v4na2ds0ddcp41y412fnrg4scbrhr" + "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22", + "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8" }, "stable": { "version": [ @@ -15935,18 +16143,17 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20210310, - 2247 + 20230216, + 817 ], "deps": [ "cl-lib", "company", "dash", - "s", - "unicode-escape" + "s" ], - "commit": "98e9e8b38b6ca289fbe265b0a7b62c7fe38ed0e2", - "sha256": "162ca70xwmdd8lsdawzpykd6kaqfljflaxy2nwjn8f89f80ih3fg" + "commit": "96d0c2c05450359ce90ee99a474991391988d2e6", + "sha256": "185c5s3ww3jdmahszmq7vfsyij9vf6jjjkq2a0y7jq45d9r61wzp" } }, { @@ -16230,17 +16437,15 @@ "repo": "emacs-php/composer.el", "unstable": { "version": [ - 20221111, - 1808 + 20221120, + 202 ], "deps": [ - "f", "php-runtime", - "s", "seq" ], - "commit": "6a6e3eb46b4ae380f9f56362d6525d6725fc1b0a", - "sha256": "0qf73cgy7jmchk8hvabg7v07wq0scfdm06vsbf1m2ds5zq8lcbnb" + "commit": "2299cd731205906350d615021f99a66d7a8905c2", + "sha256": "1s1wmvav83djcg6jgf5cjvwjm045y5fbwf0sqwgkfk8m4ka4473a" }, "stable": { "version": [ @@ -16266,14 +16471,14 @@ "repo": "daviderestivo/comware-router-mode", "unstable": { "version": [ - 20220108, - 2111 + 20230107, + 1624 ], "deps": [ "dash" ], - "commit": "cd8c74653c0e221e3dd1ca540496c4b4c7ee4617", - "sha256": "0k8i6b0z1y90z68qf8w00rkbr5znnvwkblqfrd7vfm407dz1b844" + "commit": "cc0c1937e02f84ca8182b2de3ce5cc0982308ab8", + "sha256": "0aig2bjfygk3zckfx361r0miz7v3gg0s9aln7m15vprc4xsryj39" } }, { @@ -16284,14 +16489,14 @@ "repo": "kiwanami/emacs-deferred", "unstable": { "version": [ - 20161229, - 330 + 20170601, + 435 ], "deps": [ "deferred" ], - "commit": "9668749635472a63e7a9282e2124325405199b79", - "sha256": "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq" + "commit": "d012a1ab50edcc2c44e3e49006f054dbff47cb6c", + "sha256": "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h" }, "stable": { "version": [ @@ -16314,8 +16519,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20221107, - 1742 + 20230221, + 1603 ], "deps": [ "dash", @@ -16323,8 +16528,8 @@ "pythonic", "s" ], - "commit": "2af92fead0e24b9cae7d0c5b446177694fc8a77e", - "sha256": "1khb36k2pqd9ych73lxwbg6r7r1h7krcybb6gx0m8h6lj1wzmkrz" + "commit": "28f51e49fd25abff14c1b46dea196a90a77ced64", + "sha256": "1wvlpsz68m4nq499nhyspg5xls2ib5sxcha3mf7vn13kyl994si6" }, "stable": { "version": [ @@ -16478,25 +16683,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20221117, - 807 + 20230218, + 1212 ], "deps": [ "compat" ], - "commit": "35b57c1996b0887d4940960f1cd7deb7a5f4a2d9", - "sha256": "13i6r3910w9i6zaawhxwmkrnck43qxl8j6acrqn6qjd9cyh2j8n5" + "commit": "ffaaf6da909dc9ff766e5a5f16eb265635aa6149", + "sha256": "16id9w0fiavr08g9lq5am0ary7ba7p900ilf4gnkizabgji0padi" }, "stable": { "version": [ 0, - 20 + 32 ], "deps": [ "compat" ], - "commit": "d5b328637255ad6e7da4190ca15f3da040bbb606", - "sha256": "1rm53sqfl8hnb1l1fr0s8kxgp03prc2ggywqs5ssiqx87vhyn70w" + "commit": "0759dd12bb2290480644a7ec34118f67718074ad", + "sha256": "00cgc3bzj37319ds027rpj60wfk0c10cgp5xish2g1cq5ny74q32" } }, { @@ -16530,6 +16735,38 @@ } }, { + "ename": "consult-codesearch", + "commit": "cfabc90cc2462f03126c367b482ff43658790e4d", + "sha256": "1zjfjwb2f97s4985hy2qx4i66nkk1zgnzhk4p6i9237scysdyfs0", + "fetcher": "github", + "repo": "youngker/consult-codesearch.el", + "unstable": { + "version": [ + 20230129, + 415 + ], + "deps": [ + "codesearch", + "consult" + ], + "commit": "7b666ab50d120b25272183d921d581e01e77789a", + "sha256": "08qrq565xpbwx4gc1ny2i6fw4i0pjzmfhr3fvaidcq9vsw8vwsc1" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "codesearch", + "consult" + ], + "commit": "7b666ab50d120b25272183d921d581e01e77789a", + "sha256": "08qrq565xpbwx4gc1ny2i6fw4i0pjzmfhr3fvaidcq9vsw8vwsc1" + } + }, + { "ename": "consult-company", "commit": "4d458d8e66f2ad14af59ad238505dbc0729058c8", "sha256": "1i7zah2lrmd95y8aqg3lv45z45br4bcgfghnwy02ak489xw1ylnv", @@ -16606,16 +16843,16 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20220409, - 1238 + 20230213, + 1359 ], "deps": [ "consult", "eglot", "project" ], - "commit": "0da8801dd8435160ce1f62ad8066bd52e38f5cbd", - "sha256": "1qxk1npxbf8m3g9spikgdxcf6mzjx6cwy3f5vn6zz5ksh14xw3sd" + "commit": "6504ccd2b7555452c61cc24a45965f7e2a37c44d", + "sha256": "1ynx1hvlkp1npi5pbbh38dpj77i95nxhlll35hhqw1jbf9w4kygq" }, "stable": { "version": [ @@ -16640,15 +16877,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20221109, - 842 + 20230212, + 26 ], "deps": [ "consult", "flycheck" ], - "commit": "7a10be316d728d3384fa25574a30857c53fb3655", - "sha256": "1xg46wynfabk4pd7z7lk7d8x8rwlqk8dxjg4aki5dv6il1swg4cs" + "commit": "c371996c571b7139ef4d9a8db142bf37a7ee826b", + "sha256": "0i8ihvj64vdgf4lrna09nys65srpg87fg3y45qpg89g6962m0wr8" }, "stable": { "version": [ @@ -16714,6 +16951,56 @@ } }, { + "ename": "consult-git-log-grep", + "commit": "331c40402b02dd11d84f76b041728c6a7556aa8a", + "sha256": "1q8sy39a5jh3abbzxp1h9q59zhbfyffff3mcw9wi491gkacx4p8m", + "fetcher": "github", + "repo": "ghosty141/consult-git-log-grep", + "unstable": { + "version": [ + 20230204, + 1753 + ], + "deps": [ + "consult" + ], + "commit": "30dfcad5745a6b9882d94fec75d38c345a1eff89", + "sha256": "144sz49k1jqbfmyg76pmmi9j5c77pfzn6mxamkl5vkvxqcs8z3ai" + } + }, + { + "ename": "consult-hatena-bookmark", + "commit": "7a14748b58bba3d89324fd3e3ed7e50963fffa52", + "sha256": "1km2wqy8jard8017a5qahrr5ghxgl0xshbycggfxdd2z6n6pxbyg", + "fetcher": "github", + "repo": "Nyoho/consult-hatena-bookmark", + "unstable": { + "version": [ + 20221125, + 109 + ], + "deps": [ + "async-await", + "consult" + ], + "commit": "b85484b11705ebd896878d3ac7fdb12bc8c9637a", + "sha256": "1xvi28wvagcabk1q6ckw4f97knm59rl86jd3pndz2ljv842rzbix" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "async-await", + "consult" + ], + "commit": "b85484b11705ebd896878d3ac7fdb12bc8c9637a", + "sha256": "1xvi28wvagcabk1q6ckw4f97knm59rl86jd3pndz2ljv842rzbix" + } + }, + { "ename": "consult-ls-git", "commit": "af90413953b4b6a4d6c1b9919835703035b565d7", "sha256": "0vrvcjyjq3f4zs2jdyfk82xhr4n8yw5mxhrsmmd0ljhcqp6zxbmf", @@ -16721,14 +17008,14 @@ "repo": "rcj/consult-ls-git", "unstable": { "version": [ - 20220501, - 1823 + 20230120, + 1500 ], "deps": [ "consult" ], - "commit": "f2398b354994e583ad22af324a129cf94d06009e", - "sha256": "1brvhnlw72vhxjf6d984pjf5sq6l7d6vpnhzq2swp3zz4a5sfqvx" + "commit": "7ba583abc16f70c497d038bfcbddbadd6894bd3d", + "sha256": "15v025rjd15rr0zm1m3vjw9q1hfvfaq1yxknpba782if7fa7j2gg" } }, { @@ -16739,16 +17026,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20221102, - 844 + 20230209, + 714 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "f6fff70edb3a27726f9c61d3d81849df85f7ccbe", - "sha256": "0jfwnzjpbk9bhrr7yifv650cq2i4z3j4dzw5kc34j192d05b90q7" + "commit": "f8db3252c0daa41225ba4ed1c0d178b281cd3e90", + "sha256": "0hbavrwxa8mhgijh0wn517fns07ng84q6vya9bvblcx8pq9qw6z0" }, "stable": { "version": [ @@ -16772,16 +17059,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20221108, - 1835 + 20230112, + 312 ], "deps": [ "consult", "dash", "s" ], - "commit": "92f54a5fe345d390a11acf9008661fe73ae28539", - "sha256": "0rc5cj6x4basnlvrndnwph0bk6drk07mh8chhrrh4pqlw9nv089f" + "commit": "4d92996f676cecfebea6519dadf8cf185621a18a", + "sha256": "0jkvv975ydcrr9k390zllrnbwzb6g0mnkjzvcajzwkhpayi8i0ka" } }, { @@ -16792,27 +17079,28 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20220929, - 2111 + 20221216, + 1701 ], "deps": [ "consult", "notmuch" ], - "commit": "29e9a3d0d4ed2e8bcefbf009103f7e5665b6c260", - "sha256": "18r47cj89qli534irah3lwwzsnik5bcf61clnrkhafqv9y51m67z" + "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", + "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" }, "stable": { "version": [ 0, - 8 + 8, + 1 ], "deps": [ "consult", "notmuch" ], - "commit": "29e9a3d0d4ed2e8bcefbf009103f7e5665b6c260", - "sha256": "18r47cj89qli534irah3lwwzsnik5bcf61clnrkhafqv9y51m67z" + "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", + "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" } }, { @@ -16823,15 +17111,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20221119, - 811 + 20230209, + 833 ], "deps": [ "consult", "org-roam" ], - "commit": "4f5e77d36fb8256818df9042ee699954566d81d5", - "sha256": "06xd014f03z8mzg2a7gln2bhv260rgq4zpcwxmkwn6kg5kcn5x0l" + "commit": "8f9f122627a6b4e1613401b06d707e3efdb3c2d0", + "sha256": "1wni3lsjlkhs76wx27np74qhs3k8hwq98yn6vfnkb9h4dg7d8ll0" } }, { @@ -17047,14 +17335,14 @@ "repo": "liuyinz/emacs-conventional-changelog", "unstable": { "version": [ - 20211212, - 1158 + 20230101, + 1656 ], "deps": [ "transient" ], - "commit": "40c2ee58364422b776e81dc153918205bfbeda86", - "sha256": "1zxs0sgrdhzlfixahss4m3a7jx2qdkaccqkg9jbyf4vsdm17im48" + "commit": "56f0e134f0edc1964965575dea259b186d34155a", + "sha256": "0jhn41p0fxg14c6jhi4kcfv3ws1pv1kkjx1glq26w854gzmf7z1q" }, "stable": { "version": [ @@ -17238,14 +17526,14 @@ "repo": "galeo/corfu-doc", "unstable": { "version": [ - 20220621, - 1554 + 20221128, + 1533 ], "deps": [ "corfu" ], - "commit": "da931367802d01e87e1e496ba5b51aa9126a705d", - "sha256": "08ql4fi06w1v4f2xx24ajym513pi8pzxhd7y5zwrnk0kq2p8dr4p" + "commit": "0e6125cd042506a048feb7b6446a5653eccfcff5", + "sha256": "1cpx9flv6m10h1rganjmbccc289c4hzss9kd9mw6krsxiik65xl7" } }, { @@ -17256,15 +17544,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 1427 + 20221216, + 112 ], "deps": [ "corfu", "prescient" ], - "commit": "680fefa4601586dd87d549d33f5ae6fda3212c35", - "sha256": "16k34jp07snzknyp2lg0g6vsb7pk96s0fplb9hdjq8w3n4kyirb1" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + }, + "stable": { + "version": [ + 6, + 1 + ], + "deps": [ + "corfu", + "prescient" + ], + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -17276,10 +17576,10 @@ "unstable": { "version": [ 20160502, - 701 + 948 ], - "commit": "8813288de240956641b37deafaaa4811548246df", - "sha256": "06l2imhxm6dijkqlhk9s0vsa5a0ghybpy7qk7wpkgv0dlm3k3w7n" + "commit": "e7ab6aa118e46b93d4933d1364bc273f57cd6911", + "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7" }, "stable": { "version": [ @@ -17396,14 +17696,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20220731, - 2354 + 20230116, + 951 ], "deps": [ "counsel" ], - "commit": "65a7244ad6342ac79c612fbc6e5ca54759ebaf03", - "sha256": "1vwn977gjjvk1jhcyzncv2ycr6dbyh64if0f2f87bwl1yf7hsf41" + "commit": "a84cc0e409325d051208c43dfcabcebaa0d98ba3", + "sha256": "1zycq0hvvi466rzfk240jzsi3gydgd8pgilsa49qnmrqf19fhb51" } }, { @@ -17514,16 +17814,16 @@ "repo": "dash-docs-el/counsel-dash", "unstable": { "version": [ - 20200103, - 1411 + 20221217, + 419 ], "deps": [ "cl-lib", "counsel", "dash-docs" ], - "commit": "370d5f6f14b5294d0eb717f7b2a6a8e93df1ed24", - "sha256": "1fn38vbz46ijarjvhgw7iy7dj9s2a2miy95fyy9f8b5sj8nrdfvz" + "commit": "04117bffc8badd85c9f4fdb17648fd56e83fe832", + "sha256": "1miajhrd4x15jvcw60rwndp427his1012009ims70ajc7xn1ggsx" }, "stable": { "version": [ @@ -17583,14 +17883,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220825, - 259 + 20221213, + 209 ], "deps": [ "counsel" ], - "commit": "e38b12771183fd43fb94c9fa562b20b5efeefc1b", - "sha256": "0r4mq4kxbj2kfg3nwni0canp1nvzl7j9jvpi523bj0apfrab1p9v" + "commit": "a65c03d2a82bae2571993b77b980f2f27c138ecb", + "sha256": "05wwy9rphwm753xxiab25dl3v9f4h59g9zydzpnrh7wpi3yldi68" }, "stable": { "version": [ @@ -17866,8 +18166,8 @@ }, { "ename": "counsel-test", - "commit": "5b21ac3eaacfff27ca4def04f6cf7b4888b7fcf4", - "sha256": "0604kmj0ydfps2si0wvgjw41x2ds7dmsd53x50219f65d4w44nqr", + "commit": "5d8c2c6662dc3cd0140bc039a1dca9c3e38673f4", + "sha256": "04zn7jds36dwhwqaxfqzc54i63ircvihj83ap3g3n1kzs7nr70bb", "fetcher": "github", "repo": "xmagpie/counsel-test", "unstable": { @@ -17891,26 +18191,26 @@ "repo": "masasam/emacs-counsel-tramp", "unstable": { "version": [ - 20210518, - 1153 + 20221228, + 1403 ], "deps": [ "counsel" ], - "commit": "76719eebb791920272c69e75e234f05a815bb5c2", - "sha256": "0pcymxi54b2jmr2k2cibak0nmcnr42spjwsavwr8598kgvkfk488" + "commit": "f63bf0bc765480676094102013218254ea17727f", + "sha256": "1ni6yhxzg945akjmqww6h31jqxydgjpf16i8g9jar3wa5wx6jnpl" }, "stable": { "version": [ 0, 7, - 5 + 6 ], "deps": [ "counsel" ], - "commit": "da451df4c5f0ba32056ec600e8eb6a2c7ca4df08", - "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr" + "commit": "aa5acfc95cdfcfc2005bee31d8003fd4ae1d319c", + "sha256": "02dhchmyaqv6855mafjxizzgpl32rmnwdmw0nbm6rkckr13cgjl1" } }, { @@ -18447,14 +18747,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20210811, - 436 + 20221121, + 859 ], "deps": [ "seq" ], - "commit": "6bfd212a7f7ae32e455802fde1f9e3f4fba932a0", - "sha256": "01727k1fxiq1v2q6slp23gc98yqhflp6dcy3yr0yn9ibqx3pi93q" + "commit": "f8789f67a9d2e1eb31a0e4531aec9bb6d6ec1282", + "sha256": "0bsyrp0xmsi1vdpgpx6n3vfrmh75bpp8ncync8srzx6clbl71ch4" }, "stable": { "version": [ @@ -18558,20 +18858,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20220819, - 1351 + 20221126, + 2005 ], - "commit": "6e9d1f6b9900d3b8aa4106abf84a89311dfed85f", - "sha256": "1shyv3lkilbglqlg0mzaz9aslx3xg9gjp63phdvhsgafvwzpi254" + "commit": "d8b058c9e9d0429ea7e81d121ce19b064bd7e0f5", + "sha256": "1d0pf236xi4c7fazv67a53yrac24lilnkzp9pb55xm88gig7rfmz" }, "stable": { "version": [ - 1, - 1, - 1 + 2, + 0, + 0 ], - "commit": "9917e1b97d6a374c8043124817142ea3419a649b", - "sha256": "0wfd4jdjsq8qp6pavf25y87dxvlnsqapfi4c4m3xj24baalr2dpq" + "commit": "d8b058c9e9d0429ea7e81d121ce19b064bd7e0f5", + "sha256": "1d0pf236xi4c7fazv67a53yrac24lilnkzp9pb55xm88gig7rfmz" } }, { @@ -18582,8 +18882,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20221002, - 1512 + 20230217, + 853 ], "deps": [ "dash", @@ -18591,8 +18891,8 @@ "multi", "shut-up" ], - "commit": "ceb29955f36e01b02effc66a5b13a23224e41b67", - "sha256": "0q7vmnw1liv2jcmjynvwm54j2wsmvsv7fak1bxib13l8jhvwn88z" + "commit": "a4dceb1febd3e7587e89158caf207d5da5624f51", + "sha256": "06z44mv9sg6nsi39yh9363nvzifj06ssdiimc79r0s1sd2fc7mb0" }, "stable": { "version": [ @@ -18931,11 +19231,11 @@ "repo": "cubicle-model-checker/cubicle", "unstable": { "version": [ - 20171009, - 1957 + 20221031, + 2122 ], - "commit": "9d108b900e0123236b4991c2d06b5061f34feee8", - "sha256": "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr" + "commit": "7679c8452051ed5c89f891c72c6ada76757fc935", + "sha256": "1lkf849g6zqkshzj2845n1w58q1bxgqb85lh6w7ssi1m653mxhd1" }, "stable": { "version": [ @@ -19233,14 +19533,14 @@ "repo": "ideasman42/emacs-cycle-at-point", "unstable": { "version": [ - 20221017, - 149 + 20230116, + 951 ], "deps": [ "recomplete" ], - "commit": "ef2c2dbbf6c7682d9a80eebc2ae721d5d93b1698", - "sha256": "0j6gphh61snmg8vhbs8rynw08llh67s91hzy1bcyqccn8wcwbqrx" + "commit": "3c1471362d6cb947daf6373e8def8169c21222fc", + "sha256": "0hc6x4s4sr8pi5w3ywfzfhp0m6mf0bxdb8j894r76mmksysmrak2" } }, { @@ -19317,17 +19617,17 @@ }, { "ename": "cython-mode", - "commit": "be9bfabe3f79153cb859efc7c3051db244a63879", - "sha256": "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i", + "commit": "85c1dbaebf1f21d2ac66633b73112e96cd0b2128", + "sha256": "00yi8crjvx71j5zcdd23g73rnf13qna0nk5zbwzga3lfhqrmlfn2", "fetcher": "github", - "repo": "cython/cython", + "repo": "cython/emacs-cython-mode", "unstable": { "version": [ - 20211111, - 1407 + 20221130, + 1257 ], - "commit": "b75af38ce5c309cd84c1835220932e53e9a9adb6", - "sha256": "1ry8axsxd8n55vvq015s6285fhjq03rd927m3yg74850xaa8grq7" + "commit": "3e4790559d3168fe992cf2aa62f01423038cedb5", + "sha256": "03kilbl9mp1hs7mpqb6vs6sbmhplpm4qg93sn1vhn34q710iccb0" }, "stable": { "version": [ @@ -19362,11 +19662,11 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20220601, - 1949 + 20220602, + 649 ], - "commit": "183af81eb534280d844405e8e7a6cc1deb3e6378", - "sha256": "19dwh92as70p7iv88li6h26mada115lcrmimxhrf6573082264dd" + "commit": "024aca97d07e72bf3500fb6bf0cdf50c4992a741", + "sha256": "0mwd412d2kha8avkyhvvkh8r7an859xk18f7phgx7kj989pr3xkr" }, "stable": { "version": [ @@ -19379,6 +19679,30 @@ } }, { + "ename": "d2-mode", + "commit": "79abbec271b1a148ab2c4a45e8a44eb776c60e35", + "sha256": "09gvyszpycar32j4pyq8nwkwmx0x225pvy8my12vym3jlw2rl19b", + "fetcher": "github", + "repo": "andorsk/d2-mode", + "unstable": { + "version": [ + 20230210, + 1130 + ], + "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89", + "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "ec3faea2deff52c2265e41a8a0674bffe2b7ab46", + "sha256": "0b551lji4mky1jgczg7mq8g12yy1d1r400p7m5nz4z8kwq7g0mhb" + } + }, + { "ename": "dactyl-mode", "commit": "72d503380511d2d6580b9522b6e0bd2d800bdebe", "sha256": "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm", @@ -19478,11 +19802,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20220316, - 1101 + 20221121, + 634 ], - "commit": "054c0b9bc9cefb53a4065096e66707d20885c461", - "sha256": "1bw9ng01d0y6ri67w42z8ql37kxxra59v4cnra94s00abc212lja" + "commit": "39ff00f8a40bcab96afd9450195124b57becd625", + "sha256": "0iqljbvl4rliaj2lkmwl7ls94kx5ig6gi9c8gddk8l61b7chrqyl" } }, { @@ -19534,8 +19858,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20221118, - 1707 + 20230220, + 1618 ], "deps": [ "bui", @@ -19548,8 +19872,8 @@ "posframe", "s" ], - "commit": "461f15f920c37ed06a53c1082287c5801a317b52", - "sha256": "1ny1agamc5iyh340gwrf59qyl9sp58nn62p6y8z6jsrxl08z4ipy" + "commit": "f5a8f240d85ec4cfe87314a5ac0c245b60a7dfe0", + "sha256": "08d815lfx89wd9dligy3q9j89jhjzkcy4fffmnq0xpjdfnvmjd5n" }, "stable": { "version": [ @@ -19854,14 +20178,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210210, - 1449 + 20210826, + 1149 ], "deps": [ "dash" ], - "commit": "0e975782086020aa12863fdb658d6a3cc748a10c", - "sha256": "190v264wj5cdm109ippzx2vc64hvfzmh5nbx4f2w09hn0hwfqipm" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" }, "stable": { "version": [ @@ -19884,11 +20208,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20221118, - 1318 + 20230220, + 1916 ], - "commit": "92106c5a39e703bf18efa67a9c7dc92260845788", - "sha256": "0vfkm1x8x0azifyafnj7pg6lalvhrhhsizwm9vjb500fkjjhkazr" + "commit": "221ee4b77db77199380c519c4ba52c06abc725e9", + "sha256": "19qkly4k0j326kd4979cn1z35jpjnnbbmycxdp4v2i5h7hp76954" }, "stable": { "version": [ @@ -19930,14 +20254,14 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20220704, - 633 + 20221231, + 1629 ], "deps": [ "dashboard" ], - "commit": "5ff42002b501cfb9b76b975d37c7a899f013292c", - "sha256": "0v3vcdg45dq1nwspyr8r1xdh30pzb2lqy24x7jhn4v2j5apxywnk" + "commit": "b24e0bcb87e20ffcc71efb83a97f9516255fa8e4", + "sha256": "0rmdfm2smk4cji9dljnrxlmpvx2pv96lljdlwqblk5z3klm0wjkx" }, "stable": { "version": [ @@ -20016,15 +20340,15 @@ "unstable": { "version": [ 20141129, - 105 + 1539 ], "deps": [ "dash", "log4e", "yaxception" ], - "commit": "3b0af9c49293fc4346078ed2e13a6ebf41bbe54e", - "sha256": "1skvkbbqvwbw58ahdbf2m1z7s0kfi5v7c0lavc9ifrs91pqpqx9z" + "commit": "11c9170d1f7b343233f7716d4c0a62be024c1654", + "sha256": "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w" }, "stable": { "version": [ @@ -20058,8 +20382,8 @@ }, { "ename": "datetime", - "commit": "91ef4352603cc69930ab3d63f0a90eee63f5f328", - "sha256": "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1qqfs13ja60hnppwcfv5h58zd9idd3dl91ycycnx0igy7xlfizid", "fetcher": "github", "repo": "doublep/datetime", "unstable": { @@ -20103,8 +20427,8 @@ }, { "ename": "datomic-snippets", - "commit": "4da8ec133ec5e1204966c1b12c9bc0ca1b50d643", - "sha256": "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wwh3hgz2iilcs7460knwmspn3k8pwlfplbavhs4rx0shg7xvf20", "fetcher": "github", "repo": "magnars/datomic-snippets", "unstable": { @@ -20123,8 +20447,8 @@ }, { "ename": "dayone", - "commit": "a7c34ae046b75994cf04d16642bf28d4645d1821", - "sha256": "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1zkdn9j88ankb4cdaql9vip93illwn1mhpj2b9zlvmdpfqi048p0", "fetcher": "github", "repo": "mori-dev/emacs-dayone", "unstable": { @@ -20226,8 +20550,8 @@ }, { "ename": "ddskk", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1bgjpr7dikl360famf7fnd610z8wgj00pg3s5z632wra0yg331yy", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0gw3k5hw2ndhjjvf86cpz8p2ww1pq3dg6xk2g4prnq5csv2dzhgh", "fetcher": "github", "repo": "skk-dev/ddskk", "unstable": { @@ -20282,16 +20606,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20221101, - 2055 + 20230201, + 2329 ], "deps": [ "dash", "s", "spinner" ], - "commit": "f687ca31f8d3bd8ebf05165b080b50ba724ce9bf", - "sha256": "0xvzchpwmiznfbrjqi5v3kxz625n117j4aa6ix8r6s9fhk8bm5j0" + "commit": "0d3e0725a7fe605978692076ab1d8f1870d8a269", + "sha256": "07n6f4axckxvl59ccmfsbzcn1qkaxw145274bs4izscc9x27ss07" }, "stable": { "version": [ @@ -20338,14 +20662,14 @@ "repo": "alezost/debpaste.el", "unstable": { "version": [ - 20160113, - 2347 + 20161214, + 2023 ], "deps": [ "xml-rpc" ], - "commit": "038f0ff7824f4e3dd455e2232eeca70fa8abcec5", - "sha256": "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb" + "commit": "6f2a400665062468ebd03a2ce1de2a73d9084958", + "sha256": "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq" }, "stable": { "version": [ @@ -20384,10 +20708,10 @@ "unstable": { "version": [ 20220718, - 1352 + 1357 ], - "commit": "7bd79983805a91fff00cfb9bc96df8cc98e358d3", - "sha256": "1pqs47xackh8vf7rsrx4vck5li8c26jqfh636if5dzk187jraj9a" + "commit": "cc67cd24791accd17a2656512d863e24ca3fd578", + "sha256": "0i28pgqw3rv4ak1rrf8zv5cbqil7gmdaycyir85lmry4axhcbmsc" }, "stable": { "version": [ @@ -20489,11 +20813,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20220731, - 2219 + 20230116, + 951 ], - "commit": "80380aa053c78b7126275e269e80d8988ba3f1e3", - "sha256": "07bvlb7n8gryjc205bfpx7k0liibx4cakv9aisc5nfifxqygmv1n" + "commit": "d52a31ba0860188ab27c58d1a3e2de62346700d5", + "sha256": "168rbyi3f5gp68qmlz4j57ly9f67wvfmjsw0r067k2vlgswqxcmq" } }, { @@ -20552,7 +20876,7 @@ "unstable": { "version": [ 20220713, - 744 + 750 ], "deps": [ "define-word", @@ -20563,8 +20887,8 @@ "s", "wiki-summary" ], - "commit": "82a3813097774289d68199fb47662af9f90f1741", - "sha256": "1gxvm99579lr91fc9sp145c1x0arh4i84libqz5xk7n8knlphbky" + "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", + "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" }, "stable": { "version": [ @@ -20586,6 +20910,21 @@ } }, { + "ename": "define-scratch", + "commit": "668ea73da74aad4cf024995850314d99fe2d0c5b", + "sha256": "1crphgs7rmkpaa2fl8mn2b62sv56pz6dx0xy5qbjs2gpy6rcmsbf", + "fetcher": "github", + "repo": "lassik/emacs-define-scratch", + "unstable": { + "version": [ + 20221220, + 946 + ], + "commit": "26cf11f801c2b5df0fbd56d2c4f7ac41b3ccd1c6", + "sha256": "1lanr3q1fbw1ivsssnykskviwnnpah2lpj9q32brgf1vqmm1z7g8" + } + }, + { "ename": "define-word", "commit": "e318b30d8b2b89981f4b89d78e5a46e77d3de412", "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a", @@ -20756,20 +21095,20 @@ "repo": "rclarey/deno-emacs", "unstable": { "version": [ - 20200520, - 1838 + 20230117, + 1117 ], - "commit": "c375eae3e046d1487a45203511a6870e9dd5d2da", - "sha256": "10q7g9vdi0jwb2b28mdmb5lrhdk5h9ybl5si2xi1m6j7vhh1bi9l" + "commit": "6378966f448a3b9b5ae98af58cd13a031bd26702", + "sha256": "0qc8y4z7z9x5ig71jxjsh3pnar8kgm73anxg7p0d31g1ndf62jqj" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], - "commit": "ccae334361b9f83b687f040bcdfdc2a58c78059f", - "sha256": "1fm2ym36gv4p4i27hln706dnwr6rvrkkfgggbcz9rqfbphrsfqyx" + "commit": "6378966f448a3b9b5ae98af58cd13a031bd26702", + "sha256": "0qc8y4z7z9x5ig71jxjsh3pnar8kgm73anxg7p0d31g1ndf62jqj" } }, { @@ -20865,11 +21204,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20220425, - 1834 + 20230118, + 820 ], - "commit": "2863dc3d66aed9052c8af39cc8c8c264be300560", - "sha256": "1cn17igd9dwbqrds7k3p8lkfg4gq5vh6rqkmmjyagnaklj793van" + "commit": "3b1fe3816ffaef16d210939dc74bd19e0024ff64", + "sha256": "06zkgm638gy3cpp5b40cjvws09lkyqdsqxjpj2yscdrmw45r623h" }, "stable": { "version": [ @@ -20936,20 +21275,20 @@ "repo": "niklaseklund/detached.el", "unstable": { "version": [ - 20221118, - 1226 + 20221129, + 1430 ], - "commit": "8c7a2e1129b254946d86a7b7ae1c8378afab7b69", - "sha256": "0fcvx4x9yzzl3qac8gh565jzb52w9j2xdbiw60xyqdxihljpqv6m" + "commit": "6b64d4d8064cee781e071e825857b442ea96c3d9", + "sha256": "1mlkpzxp58imwjmn50aslybj6clljjm7pji0ql4dj52kwv2zcvvh" }, "stable": { "version": [ 0, - 9, - 2 + 10, + 1 ], - "commit": "6415d90f8260b6c5f1da00e0028acf4be5b4053e", - "sha256": "0bcrqqim6is75d4zadswxp162m9gd34xmb2wxsx9rhvkwq0ln35k" + "commit": "fedb0df5b0fbba13c662107855fb07a922793096", + "sha256": "0dvvyqc0nw9has54vps10f5iv831cb29vqvbvx0m2djv9pacqp17" } }, { @@ -20975,11 +21314,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220811, - 703 + 20230220, + 2042 ], - "commit": "61ce83b79dc64e2f99d7f016a09b97e14b331459", - "sha256": "1dbffni30h8bx04j4hmia3a6xhzrgxx53yhhvymrrr7144x6i3ap" + "commit": "2988d4d201df16d72c3bea465d2b93b554dbddfc", + "sha256": "04ghf38mdb6829b81fb0j2l8z8i5d14m72x1h3sx1m1fihr7nlxv" } }, { @@ -20990,11 +21329,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20220917, - 1403 + 20230112, + 1554 ], - "commit": "badbb9cb57522cc0e002a32fe385f7ad1e929665", - "sha256": "0ny46r6cjq2ps2b67cmdbpxa4v762kajjnimq7ql9lhm58rqj6d5" + "commit": "c316c93306527fcb4069adde94402a48605d42d5", + "sha256": "0532pg1kz373n8g06bhlwwp7j9vkfyr26qcfk0bqf4cpa01vg3hf" } }, { @@ -21105,15 +21444,14 @@ "repo": "martenlienen/dictcc.el", "unstable": { "version": [ - 20220219, - 1302 + 20221231, + 1703 ], "deps": [ - "cl-lib", - "ivy" + "cl-lib" ], - "commit": "a938d4771e34a9e913262176a02498b8ac92373a", - "sha256": "0s3d7g2cxr07dzqzr1xci4hcxqgcmld2lm45r5a3w315msps2ck4" + "commit": "30b505759e5a97c2aaa8b0e8ea5e187fdf625c65", + "sha256": "0wwmmfyzdqaixsg75jlhwjy09cld0gvvdmnnl0951ivzsm0g0dy0" }, "stable": { "version": [ @@ -21192,11 +21530,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20220731, - 2329 + 20230201, + 134 ], - "commit": "c4f350da4302cd7d33343d83d5faaeae6795768f", - "sha256": "06k3ppgwng3b0234qpvpq7cvfcdc3fkwm813qpmddcwbg9b8m7fn" + "commit": "84446e315a163cecb7259858c9b01d2e6726775e", + "sha256": "0c1zkwqpv9qwfjhisci05ra3456wv08a3f8s2xdzmm6zk4va273h" } }, { @@ -21207,11 +21545,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20220708, - 211 + 20230116, + 951 ], - "commit": "b32a741d5967b38749039ceafec85062a45e6bcd", - "sha256": "17mivblmnnm2yy1154fvy5lf36rxn0vmcl2c94pn5rnrbndxpdrd" + "commit": "72079cd8143b949228a51529f897076ead61ff43", + "sha256": "1jqdg6v0pkzs8qmjg9fwh3b4zblql5rlg01k756kchwi9nscj95q" } }, { @@ -21222,26 +21560,41 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20221007, - 2147 + 20230218, + 2323 ], "deps": [ "cl-lib" ], - "commit": "68fb280b300c5d8460cc7b9183e29fb3ec604136", - "sha256": "1948r26zwk0aaw5n8rvl7frj3cjncwcbw64scfggb5s91m4isd7j" + "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5", + "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s" }, "stable": { "version": [ 1, - 8, - 8 + 9, + 2 ], "deps": [ "cl-lib" ], - "commit": "b8b4f43af73f109bf1af0453a076c274164488cf", - "sha256": "075klzf66z1rvhpxv4j694pdkmi7f4fpw6c8q4ncz0h4y5wdbl8w" + "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5", + "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s" + } + }, + { + "ename": "diffed", + "commit": "1f753648be0e01a962297b088ffe349f5a1da29b", + "sha256": "1dd5vdw2qgfykgr67kcx0qa786zgqw6rf1gfh43zrlpnkjr1zkd8", + "fetcher": "github", + "repo": "ber-ro/diffed", + "unstable": { + "version": [ + 20230208, + 1546 + ], + "commit": "f7dc37f13a4f1660212c41a6e9faba61eb8cc078", + "sha256": "0g1xjwby2sljmkf4nl0das45464162hwlsrjhbwzf4bp4i1c8gi9" } }, { @@ -21323,21 +21676,6 @@ } }, { - "ename": "diffsync", - "commit": "581413a6c017265568a89b08ad608bb0b4563123", - "sha256": "1kny243c3gy9wkyhc06mw12wwbmigsidicrhl7bzhrpbam7an4w4", - "fetcher": "github", - "repo": "ber-ro/diffsync", - "unstable": { - "version": [ - 20220502, - 1513 - ], - "commit": "3f8540ef0a677ea8c2b57aaf4a07937512bb148c", - "sha256": "0hgyi8s7f5r87y48a6x427xm8nkr2rms6fzsdjp840ma39pj7n2f" - } - }, - { "ename": "diffview", "commit": "0ea5dd4c9c114618ac20f565c878f509ce8d9872", "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k", @@ -21368,20 +21706,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20210129, - 1719 + 20221201, + 2332 ], - "commit": "e12b128023b7696a23545f812877e8c6531d261c", - "sha256": "17ja51xcwmiy66000k08z8c7za4rivsi1w8w650s8byd4v9nkc75" + "commit": "06795403c30f3b3c7b72d7cb5ca33c32d0aaee49", + "sha256": "13zri0mf1gn97nn8h79j82i7975dnzyvpbvw5kj69wn4mw2jf1y8" }, "stable": { "version": [ 0, 9, - 2 + 4 ], - "commit": "e12b128023b7696a23545f812877e8c6531d261c", - "sha256": "17ja51xcwmiy66000k08z8c7za4rivsi1w8w650s8byd4v9nkc75" + "commit": "06795403c30f3b3c7b72d7cb5ca33c32d0aaee49", + "sha256": "13zri0mf1gn97nn8h79j82i7975dnzyvpbvw5kj69wn4mw2jf1y8" } }, { @@ -21501,14 +21839,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20220422, - 1601 + 20230212, + 2019 ], "deps": [ "compat" ], - "commit": "f1a489414dd7d344ef791c30e43e4f4e61db7582", - "sha256": "1sawhg1x4rjwk1k3521x0i0plq727fjhv2x6mcq5cs6dy7j3dzsf" + "commit": "d9c2b592cef9dfbbebe066919a79d4ef9c31db80", + "sha256": "1da0wxva0kwa9nhj77fhrwkqhq2s8yr31iiqain7ba3fphcgh3aq" }, "stable": { "version": [ @@ -21528,14 +21866,14 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210329, - 604 + 20210613, + 1431 ], "deps": [ "dylan" ], - "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", - "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" }, "stable": { "version": [ @@ -21687,14 +22025,14 @@ "repo": "tilmanrassy/emacs-dir-treeview-themes", "unstable": { "version": [ - 20221106, - 2133 + 20230112, + 134 ], "deps": [ "dir-treeview" ], - "commit": "1d2e19c1df9f68186d7d0fe4529c92f7112136a2", - "sha256": "1h8kbr1swad0d84bqblg4c4gvm2pnq72n5hrbxjwahr45j8xrp1l" + "commit": "8e28c2501a978e6ff733fc9cf43a826fd8e7b87e", + "sha256": "16hmp0wp8a1ahhsqy2s7wkbz9fkjfdi5wa0hjrwc2rfg3xprf449" } }, { @@ -21713,6 +22051,21 @@ } }, { + "ename": "director", + "commit": "8a4158931df97d1e8bb65ca9468c52253fc8f025", + "sha256": "0w98xzqv246a6adwbjkpc3rrbsr046lqxmi541f7rc673dwnncv6", + "fetcher": "github", + "repo": "bard/emacs-director", + "unstable": { + "version": [ + 20230213, + 1201 + ], + "commit": "16afdbbd91b451fab44c68c8f7d0b810f5283f28", + "sha256": "14zgkzwjydahrpz2rz5iww13r4x4fdpf8im4g0nffvb3pqvsbz7f" + } + }, + { "ename": "dired-atool", "commit": "0fe7b0857828a041ee06b30edd2cd488cc3394c7", "sha256": "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w", @@ -21744,15 +22097,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20161012, - 1104 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "bef0c7eb03474defa02bbba5c15401a766c8ff7c", - "sha256": "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -21763,16 +22116,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20210403, - 1230 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", - "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -21905,8 +22258,8 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20191105, - 1404 + 20221127, + 1247 ], "deps": [ "cl-lib", @@ -21914,8 +22267,8 @@ "dired-hacks-utils", "f" ], - "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", - "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -21947,14 +22300,14 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20201005, - 2318 + 20221127, + 1247 ], "deps": [ "dash" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22097,15 +22450,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20181114, - 1723 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "c7184dc8f6ed3f2330db8d8f21f01c4b08056dd3", - "sha256": "1i5a6srd3fpqdvvhyv0swybznimx9ilpm3sd76ha3shispyij1x5" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22116,15 +22469,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180922, - 1113 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "a45737d3a5aaac6928ebd7af041e5603dffaca64", - "sha256": "1bhz0x7sa4a56f5ha8h9w36y5pirvzhkhczyfwf4z74j4z5z44sm" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22194,15 +22547,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20190722, - 1109 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "886befe113fae397407c804f72c45613d1d43535", - "sha256": "1cvibg90ggyrivpjmcfprpi2fx7dpa68f8kzg08s88gw5ib75djl" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22213,15 +22566,14 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180401, - 2206 + 20230118, + 1948 ], "deps": [ - "dash", - "dired-hacks-utils" + "dash" ], - "commit": "89af4f12ce4a0692c9c9824eacf56875ca86cb36", - "sha256": "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s" + "commit": "69185bc355c1a8968b8a2851304707e081402458", + "sha256": "1sgw0hpkr5wczi1l24gw3ldvmlwgvcagsa26qr7p5r2wmypchzsp" } }, { @@ -22279,21 +22631,21 @@ }, { "ename": "dired-rsync", - "commit": "ce9f41ad832cef527dde97f829a8b8339e6ac48b", - "sha256": "0lykj7nfpaspwn90macvr7iir4jlrx88i0s9spii7iic2fnm51ql", + "commit": "ec3a3b4d5f82d56a3fccb1f996081079c2771a1a", + "sha256": "0mz0yhns5dr5d1ha63p5gig8mckkvyql77miyvpzms597pvqffj2", "fetcher": "github", "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20220729, - 1031 + 20230126, + 1144 ], "deps": [ "dash", "s" ], - "commit": "7bdc1dd7c9e1217a20a4e1f26c3d1a3ed35f4a14", - "sha256": "1qwdc92rzqdzv96rz4q9davzs0myirmf1cyr0cly2wqxg4zmms18" + "commit": "5496bc00f7a32a9d3e54e395f29d44e9df771567", + "sha256": "1qzzpcrvgg7m3b8gdg9mpvhhjjzhmcrzaf72hvmdihs8n0x36nvf" }, "stable": { "version": [ @@ -22309,6 +22661,25 @@ } }, { + "ename": "dired-rsync-transient", + "commit": "ec3a3b4d5f82d56a3fccb1f996081079c2771a1a", + "sha256": "12k9zm6l1c9bk15zi01rcn8rjl7p7vixfy8g1y4y8dw1552dwpym", + "fetcher": "github", + "repo": "stsquad/dired-rsync", + "unstable": { + "version": [ + 20221214, + 1215 + ], + "deps": [ + "dired-rsync", + "transient" + ], + "commit": "c0e2168b80df00116ab9071bb214cf05ed943d73", + "sha256": "1bkq5n7ivvfjcry7iaq9gv9fjx62brq6bs73j989b6jm32l6w3ns" + } + }, + { "ename": "dired-sidebar", "commit": "30e15c8361b01195f198197e704828fbcac0e8d6", "sha256": "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc", @@ -22316,14 +22687,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20220618, - 237 + 20230216, + 432 ], "deps": [ "dired-subtree" ], - "commit": "f08bf15cb6cb3c44102731f50ffd812d8d68316c", - "sha256": "0f39j8d47ids6yr427hvvqk6wlsw9qz3knm4fdf478v0lkxmpxdc" + "commit": "5569d3b53585f5413cf87a694650d0fd6e040803", + "sha256": "1vkdaw09vdjm583b0cdql991d76cqb1wkis3vzfhdy22hmy38wh7" }, "stable": { "version": [ @@ -22370,15 +22741,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20210105, - 1127 + 20230118, + 1953 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "1f19e249bdc66163b10028271943fc7b87e936ae", - "sha256": "1hwscganzprihp7820j1dw758pv0nili1gzqdin5p64fcgm54av0" + "commit": "1382acb219c5e3b179662bcacd9c57463802718a", + "sha256": "0zpb8hj9qmsh09kkqx90fan2qqsnqzk9wdy6ryl76pycjghb0bn2" } }, { @@ -22661,14 +23032,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20221014, - 1236 + 20230123, + 1201 ], "deps": [ "transient" ], - "commit": "ec4100612b2e93d9e188e7eab4c144b45f3547ee", - "sha256": "0jqsg91qzbd1n7cg7y1484js8ykrysmxs17c0f4lvx7vxwkjhpyg" + "commit": "65954585a9e16a06f6ec1f0dec475b27ec4c218c", + "sha256": "1s1n1y3vgqhqbfrdhgkv24l36791p9823ijlbv6gg3hflsiqvgl2" }, "stable": { "version": [ @@ -23021,14 +23392,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20220323, - 1046 + 20230126, + 1017 ], "deps": [ "cl-lib" ], - "commit": "5230c18456ab034f2fb69acdbef62c1abae6a8cf", - "sha256": "161ykw5p6wxy3dlx7f6zxg1cwl8hh411b7clzc5zhdpmq1wnqy0b" + "commit": "5eeed9362fbeaf5a032bccd69b861b8a36877516", + "sha256": "0w23qcmlpy23v481nqikjpd3kgwpjapihlwhxdxmpd5h90khkj9j" }, "stable": { "version": [ @@ -23051,15 +23422,15 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20170105, - 1423 + 20181210, + 1200 ], "deps": [ "dix", "evil" ], - "commit": "1cfef0d3376a18c78dd1dfc1ac9ac3ad0e8c4475", - "sha256": "0p2cvr7mjpag86wacxm6s39y7p118gh2ccqw02jzabwxlfasfbw3" + "commit": "b973de948deb7aa2995b1895e1e62bbe3129b5a5", + "sha256": "1bjxyidcp7y309asbk4pfb4mzgb8j62fmp3w3zl2nahdgv1rja45" }, "stable": { "version": [ @@ -23223,8 +23594,8 @@ }, { "ename": "dkdo", - "commit": "2d4f75f6f6349b81ddbaaf35fb5d7ddeb4cde622", - "sha256": "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18szxqhn2jzy3y2x5f89nczvwq8m7z3sbr4xjywwvzi4x1p552sy", "fetcher": "github", "repo": "davidkeegan/dkdo", "unstable": { @@ -23347,11 +23718,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220731, - 2330 + 20230116, + 2310 ], - "commit": "02f2187d815b480e316238e2b8568bccc5e38fdd", - "sha256": "1i4lzq60d5i3yiibgf8nx97xfr477gkp4pyd5r2q1sykv9hjlr51" + "commit": "641c2c8bf55ec4a0f9da8dd99b95cd1464997a66", + "sha256": "0ihxhsnhlqjpnyy53vbxs089sanf3acxy5jbfl005lkv453jnz1d" } }, { @@ -23568,8 +23939,8 @@ "repo": "r0man/docopt.el", "unstable": { "version": [ - 20220319, - 1912 + 20230216, + 957 ], "deps": [ "dash", @@ -23578,14 +23949,14 @@ "s", "transient" ], - "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", - "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" + "commit": "21c575db68d4ccadb3125241a62136a0f8b76f63", + "sha256": "1g3q6ymw5cxlm91zmwf8rilsz38rcgp2kki29ynk37vxc84bij13" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dash", @@ -23594,26 +23965,26 @@ "s", "transient" ], - "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", - "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" + "commit": "21c575db68d4ccadb3125241a62136a0f8b76f63", + "sha256": "1g3q6ymw5cxlm91zmwf8rilsz38rcgp2kki29ynk37vxc84bij13" } }, { "ename": "docstr", - "commit": "97d68e8842fdfcda9c8865ccc53b1d0d7c42a7e7", - "sha256": "0zq6pm84l6cqa57198hn5pk596wlkcnk46g01q1072650i8bp58x", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1jyhs8gdy82jiz9p38wgarm7s7c24r1lgcdz2mdxwfvfnb72pwxl", "fetcher": "github", "repo": "emacs-vs/docstr", "unstable": { "version": [ - 20220704, - 630 + 20221231, + 1701 ], "deps": [ "s" ], - "commit": "8242fcb2798dedf15b935845b8d6fa16c8e15798", - "sha256": "1jsl6yyamc74rxfphv0j3l1ri7nkm5hxvkq04zz0yanyci3h4g3p" + "commit": "68a72e8a9abac28d8451769cab3846c342f657bc", + "sha256": "1rdl0hqif6awkyv6wsmpdk08hx7g851n19rzqchcpksdfq8dk7nr" }, "stable": { "version": [ @@ -23636,11 +24007,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220812, - 443 + 20230108, + 1507 ], - "commit": "506c22f365b75f5423810c4933856802554df464", - "sha256": "03a8z9cwfg87144b0g4ggilr925l561hgmgra9wchxwydixrlnml" + "commit": "69bfe30317c7fa7a5a51f2763515dfe9c989ebf1", + "sha256": "11a9lyhnwhza3my9hg5x7116y2v5s3d1z6207b7hhwky1b7m4pfj" } }, { @@ -23758,15 +24129,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20221111, - 711 + 20230219, + 1605 ], "deps": [ "compat", "shrink-path" ], - "commit": "440fd160b4dff530465938bed40094a0d413fc11", - "sha256": "0ablv6fyqb6mzzk7iyx24nj5xmmmhw7kqmi2xldjv0a7aplmxbqr" + "commit": "6125309c2caa3c98591a4c802e9b4dd2f7ea83e9", + "sha256": "1klyfazdqxy2kdb72mbaxy0ravpfikw030q61rbbhl47sp41yxrv" }, "stable": { "version": [ @@ -23809,14 +24180,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20221112, - 2247 + 20230221, + 610 ], "deps": [ "cl-lib" ], - "commit": "b5ff201f4bea4286e9ed015a2043cf2394182232", - "sha256": "04xq0v50rhikwfkzhwx2rzismipb2b57niks7s1svfp4jl1sg5fm" + "commit": "4c239dbe42232e81c28901000f435746de2a55ab", + "sha256": "1d4hi0gpal589gv2mhq73g928xwrykx075ivfqm2i875vb6yhy3m" }, "stable": { "version": [ @@ -24006,14 +24377,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20190824, - 2314 + 20230220, + 1635 ], "deps": [ "debian-el" ], - "commit": "b0de196d11a6730c21bb4be308fd8924d4a0eb7c", - "sha256": "182lp5f8qv1avvfz1gb6isbg7pf9qasl0z0rcyj6kvnsjy8c1fnv" + "commit": "af9aad721cb263e495e2f77df458e9496549c04b", + "sha256": "1vqmi32n3yz4chrbi0473hhh4klxsh63qbydcl44xa91g3ly3vp5" }, "stable": { "version": [ @@ -24059,11 +24430,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220821, - 1717 + 20230118, + 1201 ], - "commit": "fdf057f5e80037814098dc8bb67888886c89a761", - "sha256": "1v9p120aaa71x30xixxwglvgfwp7pf5y4503zd6rlj98rmidj96w" + "commit": "be1dd97ef3968bef25b9de89e7dc1251f5aaee10", + "sha256": "0y8qr8rcsqmlr48z3qn50im1vr6qnpqxa6yxdc349gq552mja2l0" }, "stable": { "version": [ @@ -24083,10 +24454,10 @@ "repo": "gaudecker/draft-mode", "unstable": { "version": [ - 20140609, - 1456 + 20160106, + 859 ], - "commit": "f059c04b044f62aec764c7698adddad301bfe89c", + "commit": "4779fb32daf53746459da2def7e08004492d4f18", "sha256": "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y" }, "stable": { @@ -24241,8 +24612,8 @@ }, { "ename": "drupal-spell", - "commit": "bb859d9755bde3fd852bc7d08f2fab2429ba31b3", - "sha256": "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0fj741608g9d98x3dg0hmx9z34qr2q8s4ypyrhyqzqcz5qzn938y", "fetcher": "github", "repo": "arnested/drupal-spell", "unstable": { @@ -24369,8 +24740,8 @@ }, { "ename": "ducpel", - "commit": "2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a", - "sha256": "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1jppm79d6b961ikm0w1hs4yj27dbqxd12581524pq2571hs2wcmw", "fetcher": "github", "repo": "alezost/ducpel", "unstable": { @@ -24468,20 +24839,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20220805, - 1652 + 20230217, + 1444 ], - "commit": "3df932f7f91ea68c3fee789f133b4aa8f9bea807", - "sha256": "19b71sg9q9yj00dkqdkq2q0j3ibvvgvf53qyjr8f3j60c5mc6hcv" + "commit": "d3d628f2eda2278bd2df6e37452d8693f367fcfd", + "sha256": "07gs70d46fg8dxm2fqwpgl1zi91smj0d9wxa3y3yax0vih5csyb8" }, "stable": { "version": [ 3, - 6, + 7, 0 ], - "commit": "c3b75bdfd3763b39aaac8baa5104312ac701d501", - "sha256": "0kgg5a2y1zxc6av2vmlh4vy46lsgnq2xvxjpv3m5i8pzgv0angsg" + "commit": "d3d628f2eda2278bd2df6e37452d8693f367fcfd", + "sha256": "07gs70d46fg8dxm2fqwpgl1zi91smj0d9wxa3y3yax0vih5csyb8" } }, { @@ -24552,10 +24923,10 @@ "unstable": { "version": [ 20210331, - 2246 + 2311 ], - "commit": "8a564b2e2f052830bfa5f59fc24220b43cb223ed", - "sha256": "0b3g69jl0mpsh35p1pnx1cv3z5m1ahpfjb2rfhgc9k8yzfxvr9vm" + "commit": "61c5718ba64ace4c9e29de18aa2690ecc3f0f258", + "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by" }, "stable": { "version": [ @@ -24575,11 +24946,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20221115, - 2354 + 20230209, + 2234 ], - "commit": "c6a84a93c687b6ada6ea297135125cff232520d9", - "sha256": "1krm1pn73wk1s3gvif4vk7q281nx0syh5dfai3lmkd6jwphwhzxj" + "commit": "078fb50b15cd024a9ce252ef69b58794df392be0", + "sha256": "1f49lhpmlz00pia4cs5i0hsijckc5ya39ibqnxlgmw9warcz1j9i" } }, { @@ -24590,14 +24961,14 @@ "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20221102, - 913 + 20230214, + 1027 ], "deps": [ "cl-lib" ], - "commit": "1fe61fa2e0145af434f3fa1c5077b973389d8651", - "sha256": "1swvwnbzp848ih41xmgvrvzii2s9qdxd7lfkcik4pm5br0njmx2m" + "commit": "13c0d391aa878a1609259a89fe3e6db8d21935e8", + "sha256": "04dpr4ayz5kcjfg9rfi4kwrw3qdkx422bwxwlxyfp60amf4ilib6" } }, { @@ -24890,14 +25261,14 @@ "unstable": { "version": [ 20140525, - 1047 + 2211 ], "deps": [ "e2wm", "plsense-direx" ], - "commit": "b72561b75e98961f05544a2159d83592c964ba1e", - "sha256": "1cx6kdxhq9ybwwvc1vpwcfy08yf1h4xacgimm36kp9xayvxsmq2j" + "commit": "7ea994450727190c4f3cb46cb429ba41b692ecc0", + "sha256": "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d" }, "stable": { "version": [ @@ -25253,14 +25624,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20221113, - 1408 + 20230211, + 2228 ], "deps": [ "parsebib" ], - "commit": "374400c99f600cfda703da4fb8d16898be48cb74", - "sha256": "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc" + "commit": "abe6ed461b334673001b930f7e30752aa8aff526", + "sha256": "03vn16nrsap8sdy4bindjr3sr1xqy8w9vffy5a970ksygfdv2j14" }, "stable": { "version": [ @@ -25298,17 +25669,17 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20220725, - 832 + 20221122, + 427 ], - "commit": "5b8bf34b8ea5d05f0b8dfc12bfea825f9cffbeda", - "sha256": "04733lqa6z3kmdjcgdi58q3wrqan2qib43rvjw51qc739fwmwb5y" + "commit": "0c6cf404a49bd68800221446df186fffa0139325", + "sha256": "09fkzmcvzdbdjaa167wiybj0kir7y12pcq2varjywshvq2l7niz4" } }, { "ename": "ecb", - "commit": "4db5183f35bedbc459843ad9f442f9cb6608c5fc", - "sha256": "0z61p9zgv7gcx04m4jv16a3mn9kjvnw0rdd65kpvbmzkgls0nk8d", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1vb66hangxa8p7khjxsk6if2n8hagl0zk6k20lr4qm41r8bl7iqf", "fetcher": "github", "repo": "ecb-home/ecb", "unstable": { @@ -25322,17 +25693,17 @@ }, { "ename": "echo-bar", - "commit": "86a702ef21febcfc227c1f2b64a7e795403a81c6", - "sha256": "1zi6qnqmbscl36iafblhshz5hrm5z1phzzb6swz1ryw23808skyr", + "commit": "dd401c96b14d281287df81decce60b11f745fd69", + "sha256": "09bnd9z053l4239ylv9f7hg18sad4mbd3r48aih61adwzl6zwb2p", "fetcher": "github", - "repo": "qaiviq/echo-bar.el", + "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20221101, - 2254 + 20230209, + 1350 ], - "commit": "d0a24635da51502bdda9f5451793966fffef92a8", - "sha256": "13j9hdlx2f5fvbghibkv43i7x7hih778fn8ybi8g4y1l350kr68m" + "commit": "03cae6d045636948d8b47979d85774e39556f9e1", + "sha256": "1431xpklnb5894mq3gxc7kvp2q5qa04bnlx8qcxv5l9g2rs0jiih" } }, { @@ -25391,14 +25762,14 @@ }, { "ename": "ecukes", - "commit": "14cf66e6929db2a0f377612e786aaed9eb12b799", - "sha256": "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "15z6ibcrgk5jaipg9xj5vyfkdyhh570mwn805nglyjj3rnvncqqr", "fetcher": "github", "repo": "ecukes/ecukes", "unstable": { "version": [ - 20220802, - 1502 + 20230220, + 456 ], "deps": [ "ansi", @@ -25408,8 +25779,8 @@ "f", "s" ], - "commit": "90e4c1d11b69e937f057864080f6dcc3f6acd2f4", - "sha256": "1dr084ksy2454r39g205yg7wvv9nfcykpx1nj0zwk4201df1vfyk" + "commit": "6bc1feb33d44bda7a7ccf06f8748050ffa1dc23c", + "sha256": "0wcc2rygz6l496fbh6azlbphdk3qn9hfdmcnq7wrcjy35b5f0cbw" }, "stable": { "version": [ @@ -25431,8 +25802,8 @@ }, { "ename": "edbi", - "commit": "238a11afa52d2c01d69eb16ffd7d07ccd6dff403", - "sha256": "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0m325rcwm6n2pi1gki780hbwlnfiqwffy8jxp9fs1dj0n3wzjp6q", "fetcher": "github", "repo": "kiwanami/emacs-edbi", "unstable": { @@ -25658,8 +26029,8 @@ }, { "ename": "edit-color-stamp", - "commit": "2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f", - "sha256": "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1a7bjp0x024xd9h4lhdn7kzrga9n5g8msmfw97qfp8idgd1xhr11", "fetcher": "github", "repo": "sabof/edit-color-stamp", "unstable": { @@ -25790,15 +26161,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20221107, - 300 + 20230212, + 617 ], "deps": [ - "cl-lib", "nadvice" ], - "commit": "3352e487809dda4a0366314e30c9efa431b61f79", - "sha256": "1v8x649r9b0ihnhddkkfb8ck21z2hr3swgczwgzwdk0ys6pl89my" + "commit": "2d13945c8d4c0ceee1c9310a2c1c4375f88a3b1e", + "sha256": "12v6jj6nlql00xn76x080y3cb3331zr7k83pk04v67l6wlh9l813" }, "stable": { "version": [ @@ -25938,17 +26308,17 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20220404, - 2105 + 20221201, + 1624 ], - "commit": "d1a3c37235dd87e0bce6ffc75f5568218d6d83b4", - "sha256": "19k9mi6phdny1ihxf5apkxfv67cvyihl0za7al29dvim6172km4y" + "commit": "bf17d22fa9bd1711709d84bb75ad49f746bfc9b7", + "sha256": "1gwffd5c25vh1h7fjj79gpmqvlb3b664zh8pwp530hprk9sb89hr" } }, { "ename": "edts", - "commit": "2932e874ab3adbb022fa4793ea18376c34c9405e", - "sha256": "1gas7y5f94y1b5z9dgl8wpv1q8sf5341hlynmvpskmg0g1y1yy4s", + "commit": "949da8f16687bad96f53714ccbde895587d439ff", + "sha256": "0nabh5xfpskxjm2fvhg5blvh8xlnalfvq0qs57lraqc42699f8pk", "fetcher": "github", "repo": "sebastiw/edts", "unstable": { @@ -25971,17 +26341,17 @@ }, { "ename": "edwina", - "commit": "050188e81b045bdadf722db552a42864121d9b81", - "sha256": "1581cwgfnrlcmbmrnfj57w9hb9jx9sinz6zw6zy2yk7g1r9vgbzl", - "fetcher": "github", + "commit": "cb6cf7e2af2800ad0e295db6116a63009ba8eea0", + "sha256": "0aqbf4xw5v5c32f9wmhvzfxrcvxpj0fwkwxlvf0s7qj29dp01lh1", + "fetcher": "gitlab", "repo": "ajgrf/edwina", "unstable": { "version": [ - 20200113, - 1714 + 20221206, + 1610 ], - "commit": "c5368716a504c93407fd8cb4ef925a8d8eb62698", - "sha256": "0rsi1v9rr76crbgb7f13g31rfq5bjk0hchqr356h97xlqr39168y" + "commit": "f95c31b1de95df7e83338a5d4daf3363df325862", + "sha256": "196lsw2kygxb5bli9f87mc5hghv45kcqlv6y686lq9ryvnb5ksbr" }, "stable": { "version": [ @@ -26001,11 +26371,11 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20220530, - 1412 + 20230216, + 1213 ], - "commit": "bcf74e57031bb700c0e8b0a49c6e4583112b7eda", - "sha256": "1mfv5v120d49gsxf01imj4m71d7ijrvzi0h9nsfpd9yn93i8sraf" + "commit": "78618a6cd9fe7d46c3728db3589d1fe50f7c1c6b", + "sha256": "1dl7nfsg6ya1lvn1mjvask75x73vinxbpg5hxiqmif27gdi68qc1" }, "stable": { "version": [ @@ -26137,11 +26507,11 @@ "repo": "egison/egison", "unstable": { "version": [ - 20200107, - 2333 + 20211218, + 1115 ], - "commit": "1ec6e8fedcda1bc2a6517cdbd8b1a85a1401a8f1", - "sha256": "1flj67z99mfgvxwwp4614cackfv4nmb8rvy2bw5pfis1qrphk81g" + "commit": "dbb395b41a4e4eb69f3f045cbfbe95a1575ac45b", + "sha256": "14g0dpn8j7kh3iiq7qlhaa1wdk6xvl60hkl3j87ncjwkh6h4imcg" }, "stable": { "version": [ @@ -26200,16 +26570,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20221027, - 1923 + 20230219, + 1511 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "f8873096d24cac7b30419854347220f37345e780", - "sha256": "1mny0dr231bm2pz0rnkzr8kbv1f7sk34qdxxd6q7wssgif5rcxvq" + "commit": "09fec6c91f9c18173f145e28c55d6f21be678231", + "sha256": "0p1y1y3g9qxkgn38fd34wkjkxplg3aphdqgisx556maig69ki789" }, "stable": { "version": [ @@ -26233,15 +26603,15 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20221102, - 2300 + 20230213, + 218 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "10d0b3b65adf83fbd939f973cafc5b5122536bb4", - "sha256": "0f3vclq7hhim46njd5lw78g6v60aa3f3jvvmml99vxmxmd36a7gf" + "commit": "ff0f9515d78f94b8dfe158bf9a2c4f52216504c0", + "sha256": "1m64ddix0h4s22mfbagwkn0q69ck12hvzzpmdr134k7k8ryals6c" } }, { @@ -26252,28 +26622,30 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20211208, - 359 + 20230117, + 1243 ], "deps": [ + "cl-generic", "eglot", - "julia-mode" + "project" ], - "commit": "2e35cf9768d97a0429a72deddbe30d6d7722d454", - "sha256": "15d4pym6dv08jp6iki00xpf1i4vc92yd2rcjv21k64h6fc862gps" + "commit": "2e04597223553a369dd5b6520b6365b41e6ea508", + "sha256": "1zr5f5hvrj2i7a2yzrgbhdhzfwf6fxhj3p4ws85r0mgvk2kwwlll" }, "stable": { "version": [ 2, - 1, - 2 + 2, + 1 ], "deps": [ + "cl-generic", "eglot", - "julia-mode" + "project" ], - "commit": "2e35cf9768d97a0429a72deddbe30d6d7722d454", - "sha256": "15d4pym6dv08jp6iki00xpf1i4vc92yd2rcjv21k64h6fc862gps" + "commit": "3e66d604b66a35290c686194de7cb39b113ab20a", + "sha256": "0n9cf3cpf55f4n4nmfl4m2pai1b8hznyivr0vzvf9p56iyfnx98g" } }, { @@ -26300,17 +26672,17 @@ }, { "ename": "eide", - "commit": "aaf337a7843c79b463b66b1e96a3a044c8cea4f6", - "sha256": "0ir02p1qrkxsh6b2v2aagkxzzzbd8hysxhr5zpbp11gv6sw4harj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1fpi389bylw9f5v1b0qn71gnnjv4yvhwzz8j7dk5xix9yxiksnjl", "fetcher": "git", "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20221101, - 2045 + 20221204, + 2104 ], - "commit": "e0a5deb627da9cf70f02229601a1ebe6d78cabc8", - "sha256": "03yj94kw9n32bsjb7mxsq7acb8x915cgw5c11112mb56qjsz6203" + "commit": "ccddbb7b893c9b2439c19832aeb2c4d7dd8f5d90", + "sha256": "1wgdjrzz53y8gchp9vayb177y42w1ih8abq2rk1l9injhj8y0q4j" }, "stable": { "version": [ @@ -26393,17 +26765,16 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20221101, - 922 + 20230219, + 605 ], "deps": [ "clomacs", "dash", - "direx", "spinner" ], - "commit": "83f39df28f9812773bf89d7af1caf5e7950fb84e", - "sha256": "1yfb0lv1p5l8c3idr8ya1c26zbl781f61358k9y301mn8hf8j090" + "commit": "c9a602efd4b3a1b607c630e55e3124d4a63048fb", + "sha256": "0pnkg8m4ba8nmxc77lcb316hnjhl205jsdfr29gls8qidlfhxwwn" }, "stable": { "version": [ @@ -26437,6 +26808,24 @@ } }, { + "ename": "ekg", + "commit": "88d93c97bc861885f5fd4bf4dd169b1914bb643f", + "sha256": "16cwh8ry4gka5f808jvm0xwii7m100kfpdlaw2fmabqv425pipnm", + "fetcher": "github", + "repo": "ahyatt/ekg", + "unstable": { + "version": [ + 20230221, + 602 + ], + "deps": [ + "triples" + ], + "commit": "cb3dfbf8c6faa0aa95f603b855eb37260acdc89d", + "sha256": "1za8smby0sshl0icfjqwh6rlwvjzj0mflhf4pwnhynf5n7p3jdjg" + } + }, + { "ename": "el-autoyas", "commit": "cc4845343dbb8f8294394f6850788e4f1fe6b99b", "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c", @@ -26461,26 +26850,26 @@ }, { "ename": "el-fetch", - "commit": "97761f51eec22d45a64f6fcc9765b7ac924e56ef", - "sha256": "0mk9zyrx1bs9mii748vjvsj1h4frhqac7hda7jp6xyxlr6n4ys88", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0dkynd8wp687vddjdggsafqfxmpm51gwhr92v9n6w9zqgvhcn2k7", "fetcher": "gitlab", "repo": "xgqt/emacs-el-fetch", "unstable": { "version": [ - 20220622, - 2008 + 20230210, + 1311 ], - "commit": "15f6af6035ad1f159ac931268ec3431ce4cdf2ec", - "sha256": "0d8w9m8rm6b2m86m6mq2sz5nfh9m3dizxcryn5qwwlv8hrlpir14" + "commit": "0142f58f075ea39aa6cc7ed35dd599afc4b6b450", + "sha256": "0d15zpbymi8k5bacgl6iyy60vzx2783qqn72cd7gszyxf6kz2695" }, "stable": { "version": [ 3, - 1, + 3, 0 ], - "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5", - "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv" + "commit": "0142f58f075ea39aa6cc7ed35dd599afc4b6b450", + "sha256": "0d15zpbymi8k5bacgl6iyy60vzx2783qqn72cd7gszyxf6kz2695" } }, { @@ -26500,17 +26889,17 @@ }, { "ename": "el-get", - "commit": "1c61197a2b616d6d3c6b652248cb166196846b44", - "sha256": "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0vfimgla3bfxy3hc08a1ia711wz81d5cpgwipdj4i7gvqbpjxima", "fetcher": "github", "repo": "dimitri/el-get", "unstable": { "version": [ - 20211224, - 959 + 20230101, + 1231 ], - "commit": "24d73f555cb4d557182b1e8488477ada4d9bf0e3", - "sha256": "1y30gdhr1iz2s9255bg1nrpwnjr8z2nlz15v13yc484fxibpcwdj" + "commit": "3969e02b2755d11224b80d2db9d2b8fc5ae73711", + "sha256": "06dg7yfnqfs96702p61015988jcsmfvixfv8kwkj0r0jjmn7l24g" }, "stable": { "version": [ @@ -26623,11 +27012,11 @@ "repo": "radian-software/el-patch", "unstable": { "version": [ - 20220509, - 2253 + 20230219, + 214 ], - "commit": "156c61b72c1c9c61bd886b5931b8a382153f52fa", - "sha256": "043m4lpm7m7mbprnb5igx0rz2r6c425vl33m7is5j47pm1ysvp31" + "commit": "ad8b18578d224cf8ebb1cce9a3b1b5a3d93a0e69", + "sha256": "0w97dqmn5imqpnwrsp442k23bssx07s5r29xspp00rwp4kjdggwa" }, "stable": { "version": [ @@ -26646,15 +27035,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220422, - 2005 + 20220426, + 1905 ], "deps": [ "hercules", "org-ql" ], - "commit": "cc63663ff77b30c0eaf7b2724ddcd035a6b29d16", - "sha256": "1l86442xwjc9ahlm1hfdjc3817x7panprb8jccw5ggs3ffjdd049" + "commit": "575396ca689065188ad0f90c379d9bcf7ff6fc0b", + "sha256": "07kdwl4wr777ncidlv1v3jllfhimbkkhhimz9zgskmbfgrxw5sxn" } }, { @@ -26703,15 +27092,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220426, - 1905 + 20220428, + 1058 ], "deps": [ "el-secretario", "notmuch" ], - "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", - "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" + "commit": "c4e21ac5a9be2b2ea6cf7c153a6fae48c78a61b9", + "sha256": "0jnr75fzhi2m1b65z72q2m970nk52rkvzwkkv27rzbprd43hxnzd" } }, { @@ -26905,11 +27294,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20221031, - 1726 + 20230203, + 101 ], - "commit": "d0c9ace493d088bc70f7422705ff27dfcf162cca", - "sha256": "0czilbq6cwwxd1hbrjh5jb7jlxz6rz8kzx2n7g26rbr16sk0mdl4" + "commit": "43ae6c375811754e640b0bae4678bf33e72988e9", + "sha256": "03ljcpy7bf08l0zdrq27h2h2mf92rwc8yv26w8bl4gam83ypkk1c" } }, { @@ -26948,26 +27337,26 @@ }, { "ename": "eldev", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1rhaldvfjz6ai3574yigidnlnbjy5xmv35kwaf87dbcwv8bpydz6", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1grpz4nf77bhxbzfl7b14wj1kxj759y0qbs6kwqpjgyzadfgar88", "fetcher": "github", "repo": "doublep/eldev", "unstable": { "version": [ - 20221117, - 2048 + 20230121, + 1404 ], - "commit": "2ddf8cbe9bb4f973ecfa6012870af23b030ad6f6", - "sha256": "1f649vm59kkwiwc3pwzvw6phnc9id8vm6jfyg05j716k2pa4q0n4" + "commit": "a1ea1a3df7602ffab30c15348365d2e6a75063b7", + "sha256": "0l5i1wylprwag087c21m51k0xwjna8y4hv7dwc9i3cy3f541jmp8" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 1 ], - "commit": "659f4d9c97a44cf29ded5594b3f5de8da99ec973", - "sha256": "0d6wbfim0q81sm5m45fjc6n0v6nk32qrgas5nzrs0vslym4bfxna" + "commit": "870ca147d26a4da76828c50b5f4a3d82b51fe43f", + "sha256": "14rrh5ycwd3r5k3df8aif4jii645m5jgplxky3hrjgr8vxd951h8" } }, { @@ -26978,11 +27367,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20221117, - 2216 + 20221205, + 638 ], - "commit": "3021dcd85764b6a918e1689bf649c16918c339da", - "sha256": "14blf7as7j6k7g8ry8a45c5zpgjca79axwr4b3yk3hcp9q9rvzfk" + "commit": "5c067f5c195198ffd16df2f455da95e46cc8ce02", + "sha256": "12vl8a5xqz1cbi9bg3i7h7rjb1kgwdbfin6pn7zvzajfmg0pi2qf" }, "stable": { "version": [ @@ -27119,11 +27508,11 @@ "repo": "acdw/electric-cursor.el", "unstable": { "version": [ - 20220108, - 2052 + 20221221, + 438 ], - "commit": "92f77b05fec80c5440a8b800b33345dabca13872", - "sha256": "1f1z672z21yd2zwldrb95v739kgsgiq5ckh2ffskqcrh1k5dya8j" + "commit": "bc09aa8c5d3cc32e3e6452cbf8018fc1ea772b73", + "sha256": "15v62nqncs85pxvh96gmn5nsyxqc7s2c2gac08zy511d39ysqq2f" }, "stable": { "version": [ @@ -27461,15 +27850,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20221117, - 841 + 20221210, + 1349 ], "deps": [ "elfeed", "magit-section" ], - "commit": "125e0f059d9f186efa2a04e317b59245963d6f11", - "sha256": "1lrzrf759qqa329yi7hx81b12lli530ih10p2jghxbhqgzqndssz" + "commit": "ccbaf85d9ea442203027e784a42b21686f3a87d8", + "sha256": "124cadn3b0l5lyc0vv3wz581nhad0pa0fn82wcnjvihx5p7fg7j1" }, "stable": { "version": [ @@ -27524,15 +27913,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220814, - 42 + 20220816, + 2223 ], "deps": [ "elfeed-tube", "mpv" ], - "commit": "d0140f24c7274fca6a357a33ba77dddf70837ba7", - "sha256": "1gg4lnh54yhxa3hshknfgljjc04p8nx0bbf1f9ygp2f9smw19vf8" + "commit": "7e1409e41628d61d8197ca248d910182ae4fc520", + "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" }, "stable": { "version": [ @@ -27640,6 +28029,21 @@ } }, { + "ename": "elisp-autofmt", + "commit": "6d5d559e92ade81b24d313da12520896de964a46", + "sha256": "1cij8nh8lldpm46v7m3pc2x2z9gkh1g26qk7in9hn3lx0nwdxavc", + "fetcher": "codeberg", + "repo": "ideasman42/emacs-elisp-autofmt", + "unstable": { + "version": [ + 20230221, + 1124 + ], + "commit": "153785d7e7d392ae07fe0f91a8ba3af6dd6d7df6", + "sha256": "1q1xbgwbsd2ma7axlajhkq20z446wk5x9an60wynsxshnsjxrlfy" + } + }, + { "ename": "elisp-def", "commit": "1f027b844efdc5946d2ad80d7052a8f3b96aac3d", "sha256": "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz", @@ -27894,6 +28298,24 @@ } }, { + "ename": "elixir-ts-mode", + "commit": "dbc1afa79eb2b9b50c9aed1a33f7eacd8cc5754d", + "sha256": "1fkm5f8hflfajgfn412pr94g82ml4y8pnkljxgnjxhyx8fm8xs35", + "fetcher": "github", + "repo": "wkirschbaum/elixir-ts-mode", + "unstable": { + "version": [ + 20230219, + 1338 + ], + "deps": [ + "heex-ts-mode" + ], + "commit": "9a397f8135468a9ec853a869033946a08d57a1c0", + "sha256": "05rdxs363fxcfiaxqfijxcz2mxvm2amd7dwnygz3zjqp8v48wbzk" + } + }, + { "ename": "elixir-yasnippets", "commit": "6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c", "sha256": "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579", @@ -27950,8 +28372,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20221025, - 1514 + 20230102, + 1737 ], "deps": [ "f", @@ -27959,8 +28381,8 @@ "s", "seq" ], - "commit": "2c5184beea35ef92485710647b378bd8c881745b", - "sha256": "056a7xzv7pv6hhqjqcrxra2kpr5r715wj2jrivbcqvmmxrq1vs2v" + "commit": "5797500d74dd8544a89938c09d3cd5cdf7b5d7bc", + "sha256": "06dh14frkh3fnw3xb04z7cjxckrwz13prqyc0m2kwy96pcmnz8rk" }, "stable": { "version": [ @@ -28078,10 +28500,10 @@ "unstable": { "version": [ 20210904, - 7 + 1340 ], - "commit": "7cfc932d590287a80278f330e4ca71cb5702ef80", - "sha256": "01336d4h2pmjcbr3jd4749464rqhwak8ag3bpx28a43mfppph97j" + "commit": "4b42a90610fdb05ac1a2811da5acd55493715795", + "sha256": "1nj310mnckf5mpqici67jzdydbby50la6g6vq7qdaji0c98c335b" }, "stable": { "version": [ @@ -28095,8 +28517,8 @@ }, { "ename": "elnode", - "commit": "987a93afa134fdda466fbdc6dd9c48a572b0be61", - "sha256": "11avrs18cjlk6v2y4y202ay38375pdzh49lizy7w1w2mwy0q40am", + "commit": "a560fc2dbcfd37485890faf5243fbdb653ecaf99", + "sha256": "0g4awkf4akvbxh3f50mkcbsqs1m6031hlkidy8h6w9grrvypywn6", "fetcher": "github", "repo": "jcaw/elnode", "unstable": { @@ -28126,14 +28548,14 @@ "repo": "lujun9972/elog", "unstable": { "version": [ - 20160724, - 2255 + 20221207, + 643 ], "deps": [ "eieio" ], - "commit": "a67237d9813c7591614d95e2ef31cc5e5ed3f31b", - "sha256": "0alg5nbmq56zsc032pvah92h5fw155fbfjc275k9vbh915hs6y0w" + "commit": "e171d0ff0a21011124204d77111e5992b50b7007", + "sha256": "0ikaf8cak6m9rm78hnfd4bh3hx6vrm1307dggxxsz3862kcwj5aw" } }, { @@ -28144,15 +28566,28 @@ "repo": "youngker/elogcat.el", "unstable": { "version": [ - 20151121, - 41 + 20230121, + 459 ], "deps": [ "dash", "s" ], - "commit": "cafe9bd5c0d6561d72066c70a55c246453693efd", - "sha256": "117vb19z006hjs0717r5l90h4rv6rciw3cijlgg006f4qqj3g9s5" + "commit": "f2f19d7ab6b77b8fec55cb67524df629fe967891", + "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "dash", + "s" + ], + "commit": "f2f19d7ab6b77b8fec55cb67524df629fe967891", + "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn" } }, { @@ -28201,20 +28636,20 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20211205, - 1237 + 20221201, + 1227 ], - "commit": "03d8e2af55dfb34ab9da1f9385079a995383b2ea", - "sha256": "19rlqr4w9hkxxwwyfz02vvs96dx92c1gxy5cn1m1v2a5sdfdz1yq" + "commit": "1d130c251690f24c23b77a4e4570157fca881d8f", + "sha256": "0swcpvlh08mrw27yv7a5wbsvlxv72yr5gbzzap9x2bjd839d3ndf" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "03d8e2af55dfb34ab9da1f9385079a995383b2ea", - "sha256": "19rlqr4w9hkxxwwyfz02vvs96dx92c1gxy5cn1m1v2a5sdfdz1yq" + "commit": "1d130c251690f24c23b77a4e4570157fca881d8f", + "sha256": "0swcpvlh08mrw27yv7a5wbsvlxv72yr5gbzzap9x2bjd839d3ndf" } }, { @@ -28243,20 +28678,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20220526, - 1512 + 20230208, + 1148 ], - "commit": "fecb74e8b5ce1562df2951dbbed158d75a21aa7f", - "sha256": "1kalmp2gm0blgyd0mn2iq2nykvb0ix651by7by1zv2yirpqszmbr" + "commit": "9d7cfbf72ef8c7cd014c91e5bb3d8fbebda56140", + "sha256": "0lw018bn5a6z8pxzqscs196l8k18m1m9p0p6amr3n27qmf6fp3vw" }, "stable": { "version": [ 2, 2, - 0 + 2 ], - "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", - "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" + "commit": "9d7cfbf72ef8c7cd014c91e5bb3d8fbebda56140", + "sha256": "0lw018bn5a6z8pxzqscs196l8k18m1m9p0p6amr3n27qmf6fp3vw" } }, { @@ -28392,18 +28827,18 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20220223, - 2021 + 20230220, + 2011 ], "deps": [ "cl-lib", "dash", "f", - "seq", + "lsp-mode", "trinary" ], - "commit": "21ed4f46e2d02ffb48b3ae377b0c93732ccf3f4f", - "sha256": "0pfwi4xddxphanh83xzvbj3a04wv7x55xjs796i1h820hm7zhidq" + "commit": "2776cd0c0617f99cac2da3da764d2f221f62ff2a", + "sha256": "12f7svl0nikgqja87xwqhm5xw47sqwmx86f9lx90yadacw8v71qw" } }, { @@ -28631,14 +29066,15 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20221013, - 1037 + 20230212, + 2019 ], "deps": [ - "compat" + "compat", + "llama" ], - "commit": "6f8894a7c7dde11679d38526f8d5717d009a1bd3", - "sha256": "1nk4f0161zzgg4v278x9p3hgyzggmzda1f0s9qs2r0vj5964yvvp" + "commit": "9daf56b1b11ca267f263f70823ade6f1a92d307c", + "sha256": "1yz8vkjbdlqgx1rnad9rr3mavcf8gn9c2wx9khjwf499yl7i3ln9" }, "stable": { "version": [ @@ -28706,17 +29142,17 @@ }, { "ename": "emacsql", - "commit": "f7e6b437ceaaba30f84580656fcaee728332bece", - "sha256": "02f0667nhs4prl2zyzy2x9nz6n30g5kxmkv92zkpirxy3bh95f0h", + "commit": "4872ef038dbbf67008bfa7951574ee372d6ff68d", + "sha256": "0mip1v0mrp7b538i949q9jrqlk9sl3i0qxa4jmm99llrs82mmdj0", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28736,14 +29172,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221013, - 1512 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "ec4f3d091b8e2c60ee305a63a6f45f0ea5996ed6", - "sha256": "0wl3zs33lk61dnk2km7qyp5vzl973iq1zlriqy7qf40pxykmzbbv" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28766,15 +29202,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221013, - 1512 + 20230221, + 1532 ], "deps": [ "emacsql", "pg" ], - "commit": "ec4f3d091b8e2c60ee305a63a6f45f0ea5996ed6", - "sha256": "0wl3zs33lk61dnk2km7qyp5vzl973iq1zlriqy7qf40pxykmzbbv" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28798,14 +29234,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221013, - 1512 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "ec4f3d091b8e2c60ee305a63a6f45f0ea5996ed6", - "sha256": "0wl3zs33lk61dnk2km7qyp5vzl973iq1zlriqy7qf40pxykmzbbv" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28828,14 +29264,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28858,14 +29294,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" } }, { @@ -28876,15 +29312,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], "deps": [ "emacsql", "sqlite3" ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" } }, { @@ -29015,25 +29451,31 @@ }, { "ename": "embark", - "commit": "a33cbf1d5cb58d2bb7dc535391bb1e1b0e718261", - "sha256": "1pwcgxgmf1pzq76gi4nhb3pq93v0bv48qnn0djdsxkk1snh3v5ni", + "commit": "9468051dcf3ef5b5eb7370168a84b3b9141233f0", + "sha256": "0ylnrfbyy66cx5vny21xxjpkd832pxinb5zh3qfqjm0nr121sw3b", "fetcher": "github", "repo": "oantolin/embark", "unstable": { "version": [ - 20221111, - 143 + 20230219, + 1700 + ], + "deps": [ + "compat" ], - "commit": "2aba953bf11f01b8ac9b2f44d151335eaf09802f", - "sha256": "0fd3x4f5dbm4bhqq3g2z03w6fb2zrrlvw6zxl39ldmq5gmparfbn" + "commit": "8e7c53a8ec6969a8d54a22c7cb76f15e2e7fa3f9", + "sha256": "0dj0qds3mqc7bi4z945519q260mc0jrkmwjh6cz74dlw4csd0c1a" }, "stable": { "version": [ 0, - 17 + 21 ], - "commit": "97270d725761ee02db461b45b18ec16ae31f203e", - "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" + "deps": [ + "compat" + ], + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" } }, { @@ -29044,27 +29486,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20221023, - 1636 + 20230218, + 2048 ], "deps": [ "consult", "embark" ], - "commit": "f2a83a6db4fbbf171692ca751ff7175daec62cff", - "sha256": "0gi2bin3kx2hf6v5lj6ijnwna0s9h6xpq1pmyjn5rdg331r408di" + "commit": "0cc29e67784cff6315ac068bc97b28dc30e6409e", + "sha256": "00hrajfmq2c8xhwzl2y09bcp891cz6mv2lj99yi71dpbmnrir9hv" }, "stable": { "version": [ 0, - 17 + 21 ], "deps": [ "consult", "embark" ], - "commit": "97270d725761ee02db461b45b18ec16ae31f203e", - "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" } }, { @@ -29075,16 +29517,16 @@ "repo": "elken/embark-vc", "unstable": { "version": [ - 20220913, - 914 + 20230212, + 1920 ], "deps": [ + "compat", "embark", - "forge", - "s" + "forge" ], - "commit": "316ed8d6c9e3ec7af069efbf2391a977852f067d", - "sha256": "1d2d5sjpaqi3l911b66idjw1nsr4wl626ivr97fvn4lxlqqlhsy4" + "commit": "070666b0de8fc2832aa2510b9ba492565cb5e35e", + "sha256": "17hlwxxp5waz0n2bgn4755jc5c8z8xkx0y0ln9hkg565d35ms5wc" } }, { @@ -29220,28 +29662,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20221006, - 1511 + 20230206, + 1841 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "d9f67eeb1ce68c228fcbe02596318c6452b6292a", - "sha256": "0mafdjgyn7f6yzzl8pxasmanrz57xr385n00xyzg0p9dl7xrb2rd" + "commit": "43c61412492229eb641fe572c89c826d8fcf64d9", + "sha256": "1v6hvfhzz8vxm25w5kk4dfkml1mkq6h849qw9qffhd7v6abyfvl9" }, "stable": { "version": [ - 12 + 14 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "88cbd8c8fae985f077418647a5cb1b69f8b6d18b", - "sha256": "1kk4fqhj1rsahd5zn7ngs7si9blx1cvp75ch651r4a549mjbad83" + "commit": "ecd49294fdec8c7741a342acaf89cd408f0abf13", + "sha256": "08wlrylv486pr8jyc3837qhlxck2hrjrywmlacmhshgha4w8sdxc" } }, { @@ -29330,8 +29772,8 @@ }, { "ename": "emms-player-mpv-jp-radios", - "commit": "09ba6da5057061f055d4a3212d167f9666618d4f", - "sha256": "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1i11jbzpr9r8sz1dn2lrdr4rkfwqncwg95h5xqj3bmgbcaqz3hpn", "fetcher": "github", "repo": "momomo5717/emms-player-mpv-jp-radios", "unstable": { @@ -29437,13 +29879,13 @@ "unstable": { "version": [ 20200202, - 1404 + 1412 ], "deps": [ "helm" ], - "commit": "d445e9cf907e2d1dd3b4dd98c98cfc00626e4ac8", - "sha256": "0yl98qa74ajrnwi85vac5hv08x9bn4njd7c5w1hdg06ncdfrnd51" + "commit": "ffcc84d7060dfa000148e7f8be4fd6701593a74f", + "sha256": "1na7mn9pgnwf9a1fbpb5k36aczzc7506ld5xm7mqpqgwshdxk0hq" }, "stable": { "version": [ @@ -29531,8 +29973,8 @@ }, { "ename": "emoji-recall", - "commit": "8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016", - "sha256": "06cahk2h6q3vlw2p4jmjrpzycxpm884p31yhbp77lagkqhs2fzbk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1ahkzyqnyyci634sq1al7b8a9v7lihlkymyy4imsr14ab43wjr8k", "fetcher": "github", "repo": "lujun9972/emoji-recall.el", "unstable": { @@ -29609,6 +30051,30 @@ } }, { + "ename": "empv", + "commit": "34c97584afc6a2acb35a037f9594494fd7ee11b6", + "sha256": "0lxmggxpdzqq4pcyzwwzfbjkmpx1na07sky0dfh8g9iw7r061c90", + "fetcher": "github", + "repo": "isamert/empv.el", + "unstable": { + "version": [ + 20230203, + 2159 + ], + "commit": "a45a2a01a7e629c9126b444d952fe71bcc9a262f", + "sha256": "04hndxiq5k3zgh0wq8xcn8dzf65fg9zjqb9gav9w53dq3l236h81" + }, + "stable": { + "version": [ + 2, + 1, + 0 + ], + "commit": "5f06e038a98aeadf5e309b95c2bc0ec94355e7e3", + "sha256": "15svjgilmzlk2dpb81mm9w7226hzzz96k8ajrg1bdg1p1s3b8vb4" + } + }, + { "ename": "emr", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", "sha256": "02a7yzv6vxdazi26wk1ijadrjffd4iaf1abhpv642xib86pgpfd6", @@ -29723,32 +30189,32 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20220519, - 1916 + 20221217, + 2101 ], "deps": [ "cl-lib" ], - "commit": "d99f9b4ab266b2b777f3f323f766687970456fa9", - "sha256": "1rmfdjg35an5s1grhja7vms10ngk3b980s4zhiszkayvyy61kpx0" + "commit": "a5f1ae2b087109f37a704c496942cec9d9f48698", + "sha256": "11ls3wrvfmcz61pps438x772nk06rqff91s3xi5rzc3n2hkl1ayb" }, "stable": { "version": [ 2, - 1, + 2, 1 ], "deps": [ "cl-lib" ], - "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989", - "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i" + "commit": "a5f1ae2b087109f37a704c496942cec9d9f48698", + "sha256": "11ls3wrvfmcz61pps438x772nk06rqff91s3xi5rzc3n2hkl1ayb" } }, { "ename": "enh-ruby-mode", - "commit": "cd1ac1ce69b77b11f34c4175611a852e7ec0806c", - "sha256": "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "07l7i1q08pixd215vq2qgwbsndvvvf13igw3mp7nkq77bnygsifk", "fetcher": "github", "repo": "zenspider/enhanced-ruby-mode", "unstable": { @@ -29857,15 +30323,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20221118, - 1647 + 20230105, + 719 ], "deps": [ "inheritenv", "seq" ], - "commit": "c54bf9e6972c563d345e20571ffd44d7bfb56974", - "sha256": "0nfk85qai1nfr7ls2vhrwnvqfrvf69gsfj4py2rk503wgxabchbx" + "commit": "1954e8c0b5c8440ea9852eeb7c046a677fa544f6", + "sha256": "0vjk8k5k9xsngk50nf611c4j0bikqn9l1y3m35s8y3knwqw22ii0" }, "stable": { "version": [ @@ -29888,8 +30354,8 @@ "repo": "youngker/eopengrok.el", "unstable": { "version": [ - 20200205, - 624 + 20230114, + 1413 ], "deps": [ "cl-lib", @@ -29897,14 +30363,14 @@ "magit", "s" ], - "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", - "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" + "commit": "83b1695774f8bdc322e528ade9dffe9b2e93f32a", + "sha256": "16q6la89xmd084h520nf9f7306x28n60yfsngcb6pg6nz62qwvfk" }, "stable": { "version": [ - 0, - 6, - 0 + 1, + 7, + 42 ], "deps": [ "cl-lib", @@ -29912,8 +30378,8 @@ "magit", "s" ], - "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", - "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" + "commit": "83b1695774f8bdc322e528ade9dffe9b2e93f32a", + "sha256": "16q6la89xmd084h520nf9f7306x28n60yfsngcb6pg6nz62qwvfk" } }, { @@ -30002,15 +30468,17 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20221118, - 2249 + 20230220, + 1945 ], "deps": [ "closql", - "compat" + "compat", + "emacsql", + "llama" ], - "commit": "40bb1f5e0c4fe155d34dc6f7b002fd2560c51013", - "sha256": "1lrpg2xwk8rs8zk125fs78w5nfs210r1qq1gbmi0zvyy2xz4jfrv" + "commit": "576ba9fedc360d2f7dfb724f9f767cc4688e5b7f", + "sha256": "1ghx8y814wi09zi3fa19nmxw7b0v6fp4mb49ibf46608k0vndq0y" }, "stable": { "version": [ @@ -30033,16 +30501,17 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20220511, - 1942 + 20230212, + 2018 ], "deps": [ "compat", "epkg", + "llama", "marginalia" ], - "commit": "ee784211346c7c374accec2bda78788cc68fa641", - "sha256": "0pl4qwh3fhrj306qrhkfgp8w3yv2hbz2y88gsx1ifsipq22n2343" + "commit": "4f3a66946b1be11c40d1635b60ea21941c882e8f", + "sha256": "1kj720jfbrcss8p1rcinxa4rkqgjdh6xp9m5b754l1n73vx9gkin" }, "stable": { "version": [ @@ -30137,8 +30606,8 @@ }, { "ename": "eproject", - "commit": "d7e82668617a9b599f8994c720f3f123ba1e008a", - "sha256": "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1fjiw0lhxgzgd4xag48ispwc5vxyj2nii8qyd6apwhzm3q8922py", "fetcher": "github", "repo": "jrockway/eproject", "unstable": { @@ -30597,20 +31066,21 @@ }, { "ename": "ergoemacs-mode", - "commit": "02920517987c7fc698de9952cbb09dfd41517c40", - "sha256": "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0lsbf3bk4v99zdns9kdvsn6d4rkrcfcd6sw2cvdl02gfxa1id296", "fetcher": "github", "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20220411, - 338 + 20230207, + 1551 ], "deps": [ - "cl-lib" + "cl-lib", + "nadvice" ], - "commit": "9cd89eef490f6c9f4af273bb3dd2c68d5ed2de61", - "sha256": "10p8pi5hlaka2pbrrzfcxjsrv142394k17z8hdx1fq0gvjcycrpl" + "commit": "c2a918c6ab13e29dba2caf2bd06496babd0dfca6", + "sha256": "0lbdxc1gwn7lgphkvwfr6jqzs1nwf60wly3n4xiyzjlw6v0ilxd4" }, "stable": { "version": [ @@ -30663,36 +31133,67 @@ "version": [ 2, 6, - 2, - 2, - 20221106 + 3 ], - "commit": "b00db9d927d8951c44ef2e80fd4941180e9f40e7", - "sha256": "17f1w71r4pbmssg40xx3nx2chk28f0nc8adhr4vnq3ijkw69v1c7" + "commit": "b499d12412bac32ab1af9f470463ed9dc54f8907", + "sha256": "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q" + } + }, + { + "ename": "erk", + "commit": "4bcf4535681f284b16b6e80bd3c31fab4376085b", + "sha256": "0pk0yfn3d86x26j0lia1b2k81al7h64p312b4k5jxapavjnm19jf", + "fetcher": "github", + "repo": "positron-solutions/elisp-repo-kit", + "unstable": { + "version": [ + 20230120, + 622 + ], + "deps": [ + "auto-compile", + "dash" + ], + "commit": "6ca1aabc6c60c8722bc5dca4aedbc033b1d9fff5", + "sha256": "1rmynn992wd1138zy9dd5m4qi69hz1k7k27lgv19nawjyrf4ny2l" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "deps": [ + "auto-compile", + "dash" + ], + "commit": "008494af28ef37ecc60571e7b2212e44767db862", + "sha256": "0z5h709w01sss69g97608hrjf5zkqvijqafgq8v2p6a9nf6k3ymc" } }, { "ename": "erlang", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1v3iq8wg71g5qf0ypz9h89pq1z02v5clp4sfpcsqppz0x5wp7dr2", + "commit": "4eda604708e52f417e30d284538aa02847de7f19", + "sha256": "1bmqwjq6lkj3a6szc2x0f25674a43674gfz8xg5r07d7z9xks5xa", "fetcher": "github", "repo": "erlang/otp", "unstable": { "version": [ - 20221019, - 643 + 20230215, + 909 ], - "commit": "1da7d9bc5ec5c30c34435aee72601f44c4e7e38d", - "sha256": "1vj3g17mgh8brfy7j0c76yn7s0hcd9hgmilnyhcplz8x76w96w4l" + "commit": "127026003180a834e9fa5d5919c824a184faeb92", + "sha256": "19ziz87sny9sck7ydp54mbp831r0g8sp8pznj9ak64rhbkc1nacq" }, "stable": { "version": [ - 25, - 1, - 2 + 26, + 0, + -1, + 1 ], - "commit": "38ad8e28421c745c06ef9bd55f6e6204cd1f15ef", - "sha256": "0fn6zyqrgyiznyghkhygak524f3clc3kz91rarq8cqn3r920dmg9" + "commit": "127026003180a834e9fa5d5919c824a184faeb92", + "sha256": "19ziz87sny9sck7ydp54mbp831r0g8sp8pznj9ak64rhbkc1nacq" } }, { @@ -30703,14 +31204,14 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20220617, - 2049 + 20230202, + 1955 ], "deps": [ "dash" ], - "commit": "a4a30f74e48894ccfdefc073a9e1b005ee632017", - "sha256": "132w9xbdc6r7sa03wpyd0vpn0z12pgawv4r21ihpgqpqmk4srrj3" + "commit": "b0fa450da826b7b9fcfe9b0b209955735830eb38", + "sha256": "03p9cdmagr0ifvlq2z2c3c09s1airhgnpr2f9zr8q405r6l3ds61" }, "stable": { "version": [ @@ -31359,14 +31860,14 @@ "repo": "iostapyshyn/eshell-vterm", "unstable": { "version": [ - 20220506, - 1212 + 20221229, + 1328 ], "deps": [ "vterm" ], - "commit": "4e8589fcaf6243011a76b4816e7689d913927aab", - "sha256": "0hsby6ardi9g37agh181sgvsdvjmvi1n6jsqp34mwslwx7xxjvbv" + "commit": "e96c30ad5e7d63b778fc3232e81b090b63b13277", + "sha256": "0zgf2yv85awlxc44cqbnyrzbkygxqp6hdqfskyg8qqjbm56cycvy" } }, { @@ -31551,16 +32052,16 @@ "repo": "ecukes/espuds", "unstable": { "version": [ - 20160905, - 1300 + 20230218, + 910 ], "deps": [ "dash", "f", "s" ], - "commit": "ef854367d469c6eff459d24a544addd21a4fbd23", - "sha256": "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q" + "commit": "57c18a48f1a01d8174298eaab4fcf3b2c6549291", + "sha256": "00m4v31ig5nvnnfl2ahz3dw40njvrxzfnch3ly6asvf2b17spa9i" }, "stable": { "version": [ @@ -31631,17 +32132,17 @@ }, { "ename": "ess", - "commit": "30182a89f9f9396f4b3ab8ee0722d99f2fedb221", - "sha256": "0flvvnyrym5dl095sm9r0cj5lgqrb4whl4zrzg0l124kwk5v9h50", + "commit": "c1cca9d0b5a701d542f37f21748eb4be00af3b4a", + "sha256": "1caxv38inm5sgd39162c3jc0d5myaimn7wx044r1krj687as5lx6", "fetcher": "github", "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20221108, - 1714 + 20221204, + 1348 ], - "commit": "7ec23bf341c23445c98f5e1faf6a1369b92f2e9f", - "sha256": "0g0gp2f5a1p4vh60yispyq4ilq744j5qa3bds362f9cwcf32q7cw" + "commit": "b6aefb9ca231c3cbb1a6532b8afa4022c2678f81", + "sha256": "0xjj842cxqg6lka9h4a0qamdjc0iifnhcddpdafarbssh2qaxiys" }, "stable": { "version": [ @@ -32010,8 +32511,8 @@ }, { "ename": "eterm-fn", - "commit": "a1955059915511fd16c2d671c262dde47adf724a", - "sha256": "1v4kpix16a07i95lcryj65ln0l31vs9k7jfnmdyrpsf7q2mw7z0j", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18rn0mhq9fmpj2cdr6i499n9p8r51pj6h5k0wa8kz52fjgf07l73", "fetcher": "github", "repo": "oitofelix/eterm-fn", "unstable": { @@ -32247,11 +32748,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20220412, - 921 + 20230105, + 507 ], - "commit": "b3f8339f9564a1926bd8b71c163fa7660cc3b1f4", - "sha256": "17lbrcgddrxw111a8al3i5cgnksmkv1qi0wzqzmvvggq073mvmqr" + "commit": "1b7dac779501dcd988552aa6455a5be89e8b0562", + "sha256": "0hpv7a7jjs0shs7cda8q1bigwjb31miqbf8f4wr2swmjhh15w7h8" }, "stable": { "version": [ @@ -32270,15 +32771,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20221115, - 1255 + 20230220, + 1805 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5ce46a1fc175a8f13507ce2b6ec4c3618923f093", - "sha256": "19mkwjnsq04mldc70mimkl7bc9mqigc619rpzc9dl7z65z7fgk8c" + "commit": "22d76a4080e40381aae194c94f3bc16ba67a330a", + "sha256": "110gdl73jfy0r28vs34bipyq692h2v1wfinrgkpak1s09zwcmnd3" }, "stable": { "version": [ @@ -32394,14 +32895,14 @@ }, { "ename": "evil-cleverparens", - "commit": "e3b3637d6527b16ea0d606fd87b01004be446b09", - "sha256": "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799", + "commit": "e00f4c64711143d30e754f48b1f38937aec9a5ef", + "sha256": "0wwav0094drn3wx2rdpafvjqb2458ni5nzw9c4aigsrih9qghhzq", "fetcher": "github", - "repo": "luxbock/evil-cleverparens", + "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20170718, - 413 + 20230216, + 2148 ], "deps": [ "dash", @@ -32409,8 +32910,8 @@ "paredit", "smartparens" ], - "commit": "9bce7cc5e2ab80adeafb0f1a579eb27bdb7a8d2f", - "sha256": "1wplh9lk0cplkpik088lk5am5b8ks0rs8bp3b6wn0bn1r0l3jcxg" + "commit": "8d92bd47f07ca2dcf15835cfc3cb6e3a29c6146d", + "sha256": "1kp1n8x9xbqxjba2aizpnvv2236mv8831ahf2a7wah269i0z2fpv" } }, { @@ -32421,15 +32922,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20220222, - 1856 + 20221230, + 1443 ], "deps": [ "evil", "evil-snipe" ], - "commit": "66648de206a7368013f28c0d053b1b32c3efe6c6", - "sha256": "1h9d9jicvc8kdw8yfpsasl038h7s6zpfh1gjfcxn3lwgfmfnjkh1" + "commit": "ea519b962f051cabced8aadaf6ed0134b861225c", + "sha256": "10gk3gi1g35xjkg6qfs3k83p9z8bz5pbi4av7g4ibj5f8h70gxzi" }, "stable": { "version": [ @@ -32471,15 +32972,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20221031, - 1942 + 20230214, + 1800 ], "deps": [ "annalist", "evil" ], - "commit": "c3611aefc36d2236de1f085720c4c017ac0eb4cf", - "sha256": "0hbrvvb4h34w5fh4hplg3z3if13jqzll0lbsfg8ic1l61nicky4q" + "commit": "aaf3e0038e9255659fe0455729239c08498c4c0b", + "sha256": "1791240px7n98k18cxsi2shdbjiayn80r20y86qdmb8j82rpdqcn" }, "stable": { "version": [ @@ -33019,11 +33520,11 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20220927, - 220 + 20230205, + 420 ], - "commit": "ec3dd819983b2d824142efddd46ef29b46a7c454", - "sha256": "00yclv8fky3czwnp3qfvcbbadqagqzyf6cxq50vyhmvjhnf9xspi" + "commit": "2218356f05ad19efc9476d0bd10051843d2306da", + "sha256": "06vwfb7qn488i7mai30g5x9wa5yjwi7725i6ngnz5i7j9xn4hx93" }, "stable": { "version": [ @@ -33148,20 +33649,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20221015, - 245 + 20221207, + 1245 ], - "commit": "9609fb170da00aeca1716b022d93e1cb68464a34", - "sha256": "0xrbmz9mx4aclqgjyjaq7vj9xf4291rw4nxaz2nvqblv8yylqbr0" + "commit": "8c0f23d46a3927b9f83c1c2c4590be53d0b740db", + "sha256": "1v2iwci0yc1sld1sidrwdnqriyhs78ba3gp4d9az0af48grl7x1w" }, "stable": { "version": [ 3, - 5, - 8 + 6, + 0 ], - "commit": "9609fb170da00aeca1716b022d93e1cb68464a34", - "sha256": "0xrbmz9mx4aclqgjyjaq7vj9xf4291rw4nxaz2nvqblv8yylqbr0" + "commit": "8c0f23d46a3927b9f83c1c2c4590be53d0b740db", + "sha256": "1v2iwci0yc1sld1sidrwdnqriyhs78ba3gp4d9az0af48grl7x1w" } }, { @@ -33187,14 +33688,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20220731, - 2346 + 20230117, + 53 ], "deps": [ "evil" ], - "commit": "7bd9bb0bce2ed61fa256952fbf37fc5259928925", - "sha256": "0z8rma0h615lybvbx67apcddy7jfm4lbrg6hr5k4hmll3q7b594r" + "commit": "8724645c84dc310f6155eec452913bb79c0c44b3", + "sha256": "0dxw2d85zxnh7rgfq1vn9b71nrn48j5c7fwbzb02m74qddcjnjg0" }, "stable": { "version": [ @@ -33491,14 +33992,14 @@ "repo": "porras/evil-ruby-text-objects", "unstable": { "version": [ - 20200323, - 1552 + 20221130, + 1832 ], "deps": [ "evil" ], - "commit": "8f8085b3088b2d17e4f2ed1a61a97dbb27a19c3d", - "sha256": "1y8gji67drk45h05ijjcqsjr9hbwj8fnfbhrgdmvmfv80b6f8khj" + "commit": "41c8b3eddb610206626a8a03e69857f903209e86", + "sha256": "1gakixp64ds35vfykp0niy9gdxymr1rlx2hphlbic1952dinvx9c" }, "stable": { "version": [ @@ -33644,15 +34145,15 @@ "repo": "ninrod/evil-string-inflection", "unstable": { "version": [ - 20180313, - 1755 + 20200524, + 1402 ], "deps": [ "evil", "string-inflection" ], - "commit": "5512db7e0e5fd28c881cc278add50ffae1f121f0", - "sha256": "1114yacpb0a0lp7kz0lb1mb7s1adhk370i3kj78a911i72c9szi1" + "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218", + "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5" }, "stable": { "version": [ @@ -33676,14 +34177,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20220504, - 802 + 20221229, + 1650 ], "deps": [ "evil" ], - "commit": "c9e1449bf3f740b5e9b99e7820df4eca7fc7cf02", - "sha256": "1ghc10rsrfvmd7m5qf7695gz241v9m5c2fg2mflwy8pw0h2l9nki" + "commit": "f273821f575ace519066fb106ee45a5b8577475f", + "sha256": "10d6q25m5wly4iysyybkha9y8mlfikqb2smra1zy6xvkxyx5mclr" }, "stable": { "version": [ @@ -33794,15 +34295,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20221021, - 1344 + 20221127, + 2033 ], "deps": [ "auctex", "evil" ], - "commit": "97616a81fb88ad558051b57d899fdaba56d8d7fa", - "sha256": "1v80bx3gq7ld03gzafbnsj2nkzc6zd7v7lsmdcp9qdpnnz88i3ky" + "commit": "3e0a26b91a1a56b0f35cbd450d01431057551750", + "sha256": "0bkr7hgwf0zi359l77r79dns2zx8xnb8l9h79hk20bn00d0dlg7v" }, "stable": { "version": [ @@ -33973,15 +34474,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20221024, - 351 + 20230219, + 400 ], "deps": [ "evil", "tree-sitter" ], - "commit": "087c3c3ce249515446d01f4a98d9fadc2bc41666", - "sha256": "0jds213935jf84fq6ks0fcd6ilc14xzfs1rdmhr4kajalkl8127w" + "commit": "02f8253034042d8f171bc0ef93e3538b71a29153", + "sha256": "0r2wfs1762jnh1svypyzgc00f8la4vjlaxz1bifbds11ac6g4726" } }, { @@ -34033,13 +34534,13 @@ "unstable": { "version": [ 20150103, - 650 + 653 ], "deps": [ "evil" ], - "commit": "79b47a9f444ddaa289c66e8995ee116941429c24", - "sha256": "11hiaxiqc2f522y7rgfr6bjnmx4nrssq1q9g96w4rsb10627qvsf" + "commit": "909273bac88b98a565f1b89bbb13d523b7edce2b", + "sha256": "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2" }, "stable": { "version": [ @@ -34099,15 +34600,15 @@ "repo": "roman/evil-visual-mark-mode", "unstable": { "version": [ - 20190116, - 1557 + 20230202, + 318 ], "deps": [ "dash", "evil" ], - "commit": "ac5997971972a9251f140b5542d82790ca4a43b4", - "sha256": "1gh5614l4zf15109zc64pnnc5rp5ilah9mavgr2rbv2874k3vs4n" + "commit": "2bbaaae56ae53e68a8bcc7bc2cfe830a14843b4d", + "sha256": "1ggxifiz2qm26v2fw8m9ccjp3jbmhyhb8wv93m8k1pnyh8b7la2m" }, "stable": { "version": [ @@ -34294,14 +34795,14 @@ "repo": "cyruseuros/ewal", "unstable": { "version": [ - 20190911, - 1315 + 20200301, + 839 ], "deps": [ "ewal" ], - "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", - "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ @@ -34324,15 +34825,15 @@ "repo": "cyruseuros/ewal", "unstable": { "version": [ - 20190911, - 1305 + 20200301, + 839 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "7b3d4160413f9649866f5cac033b5f932ca436f3", - "sha256": "1mx3zb0iajrhnph62m9q5dbdwnbhrpafbf5mcpyyd75p933qlhra" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ @@ -34403,14 +34904,14 @@ "repo": "ninrod/exato", "unstable": { "version": [ - 20180305, - 1042 + 20200524, + 1319 ], "deps": [ "evil" ], - "commit": "39c08f56483243c28a39886a7218039a138e5f63", - "sha256": "1q0jjaw5k9bql7bk5idin724vbcgx0iwn2dm4mg1c51cczqsd2rg" + "commit": "5e7b5721bf48aa49c6cdb5d41b908ef7d513b2a8", + "sha256": "0xia8dvpz294pqc3zdr0knhdlw251dhkdm69v1005674kd15259w" }, "stable": { "version": [ @@ -34488,8 +34989,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20221030, - 2058 + 20221220, + 2047 ], "deps": [ "a", @@ -34501,8 +35002,8 @@ "s", "transient" ], - "commit": "22b270047541a8173467d0e929e318b9f8606c3c", - "sha256": "1z0plm622dn5ybqlmagiy91wqj956qrlyys6557yw1l1rqvjc3ds" + "commit": "a8248e1afdae9155992227611cf134ec49fdd489", + "sha256": "1zh00fk9s9xbrm6h6d3jz3qj0vccyhibghibb4lxv56c0mvav0bj" } }, { @@ -34721,11 +35222,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20221113, - 1021 + 20221210, + 407 ], - "commit": "c790489635a497cdb8f4277a982677c95479ffb0", - "sha256": "08sh4j4hd09r9ahrr19g1lky14s7sqqpyjhjwn3lv0mbs971zhgn" + "commit": "a9ceb6c2e12df460ce1686d47cafd88f212d0291", + "sha256": "1sdnzdph6gck2ghmafad10xc99avj7i01ad2r9r6iixhpa5qbpb9" } }, { @@ -34925,16 +35426,16 @@ "repo": "tumashu/exwm-x", "unstable": { "version": [ - 20210419, - 950 + 20230119, + 624 ], "deps": [ "async", "cl-lib", "exwm" ], - "commit": "2ab026f407b011a8e8380c889990e85e69cb3a4e", - "sha256": "05jilbhpbbqbgpxhy11yadmal4gsh8bh1fffxkz8b5k8dpajc634" + "commit": "1e2bbfca872ad76eaa8f1c00d17762bed256881a", + "sha256": "1cwbdik88qw365avw2977snlj9wajyixhidlbncj2y022s5f9y2m" }, "stable": { "version": [ @@ -34970,6 +35471,26 @@ } }, { + "ename": "eyebrowse-restore", + "commit": "57869beea37deae6869554a8e4f8a17d8e20238b", + "sha256": "11whdav4wpmvqy29zpl8s9wq8jvjca06qr2qz8331w9flbxmzzz9", + "fetcher": "github", + "repo": "FrostyX/eyebrowse-restore", + "unstable": { + "version": [ + 20230122, + 1510 + ], + "deps": [ + "dash", + "eyebrowse", + "s" + ], + "commit": "77f171de019586a66481bcde6ab11f3689e97bc6", + "sha256": "1klsdbx7063p46ipq8k7z37vd4x6kg46lrjic7qdz4x7qi35ipp3" + } + }, + { "ename": "eyuml", "commit": "b09a8d723e357da67441e65047759ccfa9cb7ef6", "sha256": "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx", @@ -35020,25 +35541,18 @@ } }, { - "ename": "eziam-theme", - "commit": "4e0411583bd4fdbe425eb07de98851136fa1eeb0", - "sha256": "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb", + "ename": "eziam-themes", + "commit": "d63e2c2812b3b0932d16bb945da13d4498cc59fe", + "sha256": "1f0wakas4fqf9bmx9w17i0a3k5w698jrx13faydd12kdz7kwbwdr", "fetcher": "github", "repo": "thblt/eziam-theme-emacs", "unstable": { "version": [ - 20221003, - 1256 - ], - "commit": "5bec687a692331f7d8e1fe012817d66c40234bad", - "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" - }, - "stable": { - "version": [ - 5 + 20221121, + 1609 ], - "commit": "5bec687a692331f7d8e1fe012817d66c40234bad", - "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" + "commit": "7fba717293072d0afdbd1c45351ddf47b26b3064", + "sha256": "14v23aqyl971yaw00xmqymlmw6abkx1biflqy1q0908q6fzg170n" } }, { @@ -35049,15 +35563,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20220911, - 711 + 20230116, + 1032 ], "deps": [ "dash", "s" ], - "commit": "d50dca48929575642912bb5bbb2585709ba38f82", - "sha256": "0mr0i823m9fs8n0qf1cj7lvlbyjspk8kblhk9br2hk7hnxk470xz" + "commit": "8a70ba3002197e3c6421181492b60b37d4d4af7b", + "sha256": "1lg0mkcvr4x399m2cp8ryzwv9vqwv0bgkc59af43xz6ry26mpgbh" }, "stable": { "version": [ @@ -35286,11 +35800,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20220725, - 2313 + 20230109, + 536 ], - "commit": "6d98cf908b0bbd6286a55e6bf11905010468a006", - "sha256": "0b4c8wr8r1ch0g8s7whpxxfj3gsysaay4n1xznas36157v9d4135" + "commit": "889e77c899cbf28673915b7b0161d45734bfdcb7", + "sha256": "1zxynjsa6h0nvlkrvbdrzvqkxq10sggsg62lpaf1gzx1wqshhfq4" } }, { @@ -35743,11 +36257,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20221025, - 1830 + 20230215, + 1641 ], - "commit": "da958db7a6fdeeaf202cd8fdca630e85dbf6a455", - "sha256": "13ycnl5js9j8208cawm3vpkcqzw6nfjf097hihy3nsn9x1wszlkl" + "commit": "52da9715b0d046597cb322d3a98cb27ae6e5719e", + "sha256": "1vkzgmxmghbsb7mk0dc3cl07f7isvbgc36vw7v16rmfr1av3z1lz" }, "stable": { "version": [ @@ -35807,6 +36321,25 @@ } }, { + "ename": "ffmpeg-utils", + "commit": "b96e8296708e27ec51b5a084a924bdb86d07ae5d", + "sha256": "1b58yf8q8sflsyxxjklxarb5xs337577h01kv03hgap1s4cxwm84", + "fetcher": "git", + "url": "https://repo.or.cz/ffmpeg-utils.git", + "unstable": { + "version": [ + 20230212, + 55 + ], + "deps": [ + "alert", + "transient" + ], + "commit": "7ae311d235514b7b5bf12dc2c214856856c2c411", + "sha256": "002f7s6dncmlzv40v2ngp7165fkxyb1rc5malfx57jf4y5cs9vp6" + } + }, + { "ename": "fic-mode", "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f", "sha256": "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c", @@ -35852,6 +36385,37 @@ } }, { + "ename": "file-info", + "commit": "85c92093f85d5545fab608b5eff1adef190c95a1", + "sha256": "0ig5qjnz03v37xci361sygb1ysq09gwq1gp40fcnrn78x05m9b94", + "fetcher": "github", + "repo": "Artawower/file-info.el", + "unstable": { + "version": [ + 20230214, + 1955 + ], + "deps": [ + "browse-at-remote", + "hydra" + ], + "commit": "0c7717796ed84629145387b4b9ef60b600c3efc0", + "sha256": "1xs5y96adwg2b0qdm7icgw5ma9nn51ikzchwy7kwswhx054ad9pa" + }, + "stable": { + "version": [ + 0, + 5 + ], + "deps": [ + "browse-at-remote", + "hydra" + ], + "commit": "d598b5cf6d9cb14e83c3a406eb48d262e12b6c0d", + "sha256": "0hlap2an8s6qiy504vy4bgksf1dc2g9q1z6mq05349yya5kni46f" + } + }, + { "ename": "filelock", "commit": "bda76dfbf37eaa17bebb4b8c34006704862db433", "sha256": "13ra697y0fhkjwsaqqlphcyfqkaiix5z59qw4q6rgix4k8ypj8db", @@ -36172,11 +36736,11 @@ "repo": "thisirs/find-temp-file", "unstable": { "version": [ - 20200117, - 2254 + 20221119, + 1350 ], - "commit": "2bfcdba0d6a8a0e6faa080cb04ff0f7ed06491ba", - "sha256": "1fr48mkrwxmpjk5lrznrr6nhnj8h6d3v984261nm44c0rzziq7vj" + "commit": "601e39b052c66df4cd928cf7e308dd6a54769a99", + "sha256": "0mlzrwiv9m8404lx576gkig8icmp7v2fk36x7z1zw2r4vi6r0qc1" } }, { @@ -36232,8 +36796,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220722, - 1932 + 20230116, + 1124 ], "deps": [ "async", @@ -36244,13 +36808,13 @@ "s", "transient" ], - "commit": "cb4ed363d2ada2bff621c6b6586fe0c3342331b6", - "sha256": "0600b0f5m6s38r1m5z21gzl1pp29sircm89y5rf6imqgwasnx9gd" + "commit": "286bea5b4f27d906aa7fe71baa35c8f2bf55c286", + "sha256": "0g8sg0d1d6p9lwxnb0agj3cjnhqwyxgddqpvpi271l2hvvdaq7y0" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ @@ -36262,8 +36826,8 @@ "s", "transient" ], - "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", - "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" + "commit": "5e20777922aafb6afc2ddac8f4a62cd0c1ed987d", + "sha256": "1hpp2raw4ga0z8ydjg1j8pmkzks2j5qp2p8wxzcr6bnisgh1k5b8" } }, { @@ -36660,11 +37224,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20220522, - 1657 + 20221204, + 939 ], - "commit": "1679983d22a3b213262e09b3b25db75818a9d37a", - "sha256": "1ikkr45bdkajg1s3slq00wwrk06iyly2rnrigzm5vnbw6b5ildn4" + "commit": "553167d27725d078f5c66ed7a31ca8ec9376dfd0", + "sha256": "1d7ffaa90r9n89xx79f0mkmg40p96f415n1lg603vfy6dls1dfmb" } }, { @@ -36759,27 +37323,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20220729, - 145 + 20230116, + 1638 ], "deps": [ "buffer-manage", "dash" ], - "commit": "07d0e124712f50dfe86a597cf4c7c794e7cdc69e", - "sha256": "03la8jd4n15gx92xl7z5b29xjly2if0pva2bfzqvsm88njp4wgaw" + "commit": "791e297048e02ef1649ad17a5a2bd9d78e766c03", + "sha256": "0dn0jqx3wrkh0hbqdxvaw6nbr37snxbaf3hgam4fgb8s25m7d0a8" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "buffer-manage", "dash" ], - "commit": "c1c696433a650b0273f28da4f57bde7960395386", - "sha256": "0ls1ghh7j0lmp3l03d5pmczqs54rxwd8p5wpf28mvy0w28vw2m33" + "commit": "791e297048e02ef1649ad17a5a2bd9d78e766c03", + "sha256": "0dn0jqx3wrkh0hbqdxvaw6nbr37snxbaf3hgam4fgb8s25m7d0a8" } }, { @@ -36799,21 +37363,21 @@ }, { "ename": "flim", - "commit": "94faf56ff9bf94f51ef5253e4c4244faec5eecfd", - "sha256": "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0s1xjvizn3jwn9h5iq83vdmw6lgmpfk7dhvlj2ayb59q7bmf4xla", "fetcher": "github", "repo": "wanderlust/flim", "unstable": { "version": [ - 20221103, - 353 + 20230205, + 1423 ], "deps": [ "apel", "oauth2" ], - "commit": "57c6b868aa314717f40a520daed7249665e8d992", - "sha256": "1mf8r5mf3bd0719fnhifb6lfvl7n4m552crcdhkbkkif8srrl6df" + "commit": "2cf5a7891090faca8de725b1d3743dcedf233ea2", + "sha256": "1wsnipyl3blldcl8ynmpj1mxfvl7kjmxd8gapl83vqd3r0l9cr6q" } }, { @@ -36973,11 +37537,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220526, - 1214 + 20221225, + 944 ], - "commit": "49506681cd2d80713af5a04a2d33b8e6d89e3b96", - "sha256": "0hpq7yxk6wvnhfrbxs90wkncgyvygr7yfjzfqv719q5dag5mk5b4" + "commit": "684f15ea19c4a7947eda945cb6e58a67baec8e90", + "sha256": "0nqzy8b27nxfpg7gh5wdh1h3dbsapa4nh4gs0yx2x1a4r3v2lh0v" } }, { @@ -37025,14 +37589,14 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20211101, - 146 + 20221213, + 542 ], "deps": [ "cl-lib" ], - "commit": "e3b3f0533e44c5250ce73d728b59a7e96c692b5d", - "sha256": "0sgs83gn6ms90yk68ygvcib8k5k94ql6s23qzllas07qzmx0cn48" + "commit": "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2", + "sha256": "18vzjsscm9hsxxnacqfaskwayxhlg258rj8m7m8kim12nndgkzcy" }, "stable": { "version": [ @@ -37055,15 +37619,15 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20180117, - 1519 + 20221213, + 542 ], "deps": [ "cl-lib", "flx" ], - "commit": "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835", - "sha256": "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad" + "commit": "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2", + "sha256": "18vzjsscm9hsxxnacqfaskwayxhlg258rj8m7m8kim12nndgkzcy" }, "stable": { "version": [ @@ -37106,8 +37670,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20221112, - 1552 + 20230218, + 2135 ], "deps": [ "dash", @@ -37115,8 +37679,8 @@ "pkg-info", "seq" ], - "commit": "ab93e2db1dd8333e86f8aeeafbf1e2a0e5f0be38", - "sha256": "10q5jlkbg0hvm96n2xr8k16ykwdvchb04h79bzhhm4x3zd99q4p7" + "commit": "55614401a955e73f5c0f05c0e098d9e717e3116d", + "sha256": "1ywsdyzagwzrj0mjifn4yzyv5xxgaxrr865rxrp6dj474h054dnj" }, "stable": { "version": [ @@ -37465,8 +38029,8 @@ }, { "ename": "flycheck-clojure", - "commit": "c9c642a234f93ed4cf5edcf27a552a8916984946", - "sha256": "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0xfhgnn6ixypvaqysr2zc3lcqz5j6xsm2s5kb4id2xnl7s1pp0b3", "fetcher": "github", "repo": "clojure-emacs/squiggly-clojure", "unstable": { @@ -37523,15 +38087,14 @@ "repo": "flycheck/flycheck-color-mode-line", "unstable": { "version": [ - 20200528, - 416 + 20230106, + 1829 ], "deps": [ - "dash", "flycheck" ], - "commit": "575b604cfe21f65fb07c134392c382c163c87739", - "sha256": "04wc61my2p6zbq22nh6yvap5aww9lfr5zgd7mf0l1chbvi9scdn0" + "commit": "df9be4c5bf26c4dc5ddaeed8179c4d66bdaa91f5", + "sha256": "0hrpljkq5djgpz9llk7hmqfym9svq3l8nhlbd27bhpv95bdp58w9" }, "stable": { "version": [ @@ -37706,6 +38269,36 @@ } }, { + "ename": "flycheck-deno", + "commit": "cbf839b7120e52fdd09f9f8ccbcaa7d8a4c590c2", + "sha256": "1bsnms8ccf4qh9g0gzr8cs82azbq1c2ajk2ahdyrsv8ngr8c2r4b", + "fetcher": "github", + "repo": "flycheck/flycheck-deno", + "unstable": { + "version": [ + 20230212, + 1754 + ], + "deps": [ + "flycheck" + ], + "commit": "e7cd15a6a05be73d1f83a16d2efa6b49a105a9cd", + "sha256": "12xy90xlzgrcb4kwh9xlnav7c8kdszf9i4qrk0klkj3p0xbpj0qd" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "ea7a5330535bdb25edb1c147f4d6d426abb1e097", + "sha256": "1vvhzidnpzf25z5qn85zx7cpwaavd22vsds4q9y5mpmf8hi526l6" + } + }, + { "ename": "flycheck-dialyxir", "commit": "fa49551b8f726c235e03ea377bb09a8be37b9f32", "sha256": "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c", @@ -37828,6 +38421,25 @@ } }, { + "ename": "flycheck-eglot", + "commit": "ead6dfff6183385b6792bae4637bcaec76d87428", + "sha256": "0awm312r8my2fy7b2zchhfsf12mv7ad24d4wx85f9p5dalgi2340", + "fetcher": "github", + "repo": "intramurz/flycheck-eglot", + "unstable": { + "version": [ + 20230202, + 1844 + ], + "deps": [ + "eglot", + "flycheck" + ], + "commit": "31905ad676d67fb2967a3b6d907312380696615f", + "sha256": "1zkwb0w5rp0b53r4plvckwild717crv51ymfmhcdqdrjlv9qpzca" + } + }, + { "ename": "flycheck-eldev", "commit": "170b59e0f97ea8a27910efc1de3c82ee188a3fe5", "sha256": "0z83w4gd34g4kgdfc46c5zkhm0awa1hhi9p600k3sd4n8ac2ms4m", @@ -37904,14 +38516,47 @@ "repo": "emacs-elsa/flycheck-elsa", "unstable": { "version": [ - 20220523, - 1105 + 20230217, + 1640 ], "deps": [ + "flycheck", "seq" ], - "commit": "39c486096d76344f3045e69620b277ee34b6e5e8", - "sha256": "1i7r9k28d0x4gsr4if2xx6karny8f5jrbxvi5529sh8sacl6dyfh" + "commit": "d60db9544d0c4213f2478bcea0fd0e668e31cf34", + "sha256": "1ig9dc7ch3cdxp4p24v21h7hrdph9y5jy9421bfww6agymbj8i85" + } + }, + { + "ename": "flycheck-falco-rules", + "commit": "17600e84166aea88b8447b8dfffecdda6d8723f8", + "sha256": "137svv88rha39pp5k68bf3rkm4fh9vgn48b5pi2ykkrcs29vj5gz", + "fetcher": "github", + "repo": "falcosecurity/flycheck-falco-rules", + "unstable": { + "version": [ + 20230213, + 1603 + ], + "deps": [ + "flycheck", + "let-alist" + ], + "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", + "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "flycheck", + "let-alist" + ], + "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", + "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" } }, { @@ -38074,25 +38719,25 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20220822, - 2307 + 20221216, + 1904 ], "deps": [ "flycheck" ], - "commit": "314de13247710410f11d060a214ac4f400c02a71", - "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" + "commit": "68c5087c8b31cf10fb9df77478edd24200fb4108", + "sha256": "0m9bf2hflnf9z2iphzq0hgvyk204gpq6bzc1kjds1bwbx468jabi" }, "stable": { "version": [ 2, - 1 + 3 ], "deps": [ "flycheck" ], - "commit": "314de13247710410f11d060a214ac4f400c02a71", - "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" + "commit": "68c5087c8b31cf10fb9df77478edd24200fb4108", + "sha256": "0m9bf2hflnf9z2iphzq0hgvyk204gpq6bzc1kjds1bwbx468jabi" } }, { @@ -38103,16 +38748,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20221116, - 1127 + 20221231, + 1654 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "c9ed648745cb94dc3420d622f84456decd0d0aeb", - "sha256": "0mggj1jma9r3sg6qc9zjbll7a9yklsyjf8kyg3g2vha7qchwaml3" + "commit": "d4a788acc3875a1ffdd7460ab3377a887413c582", + "sha256": "1mg6x85dmawfjmxc5vcq546ykz3m3qby2l3hnaagh7srwvvz09cy" }, "stable": { "version": [ @@ -38161,8 +38806,8 @@ }, { "ename": "flycheck-haskell", - "commit": "6ca601613788ae830655e148a222625035195f55", - "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1pnggwx7b9rqg3rap8lck3cdqwn7lymrdyyfgmbsrlbw5fnldip8", "fetcher": "github", "repo": "flycheck/flycheck-haskell", "unstable": { @@ -38502,14 +39147,14 @@ "repo": "whirm/flycheck-kotlin", "unstable": { "version": [ - 20210406, - 1148 + 20230111, + 1907 ], "deps": [ "flycheck" ], - "commit": "bf1b398bdde128806a0a7479ebbe369bbaa40dae", - "sha256": "1dr2y8imd6blxkpwbpds7mzn5abqpfzl8nh5zrxykrkalq2px7f2" + "commit": "a2a6abb9a7f85c6fb15ce327459ec3c8ff780188", + "sha256": "1cpcxh40ia52bmz5jv38lk55g9rwb65wqvbr2gc4p8xapvp1g6nw" }, "stable": { "version": [ @@ -38531,26 +39176,26 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20220731, - 2301 + 20221231, + 1658 ], "deps": [ "flycheck" ], - "commit": "53b3e46d47a0e70fd2e5c49fea9134ee9aa41793", - "sha256": "1di51jp20ymqkp777rsvwkqzr9vpnpi90b8bd4db5v2ji46xrkjf" + "commit": "1fe838c8678a9a101935ce4a4f3183a731e38f01", + "sha256": "0jlb3l49l555av869khf80z9y8jfab8anzag5578macwwxrl3ism" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "flycheck" ], - "commit": "b6d0b1515418e5821241ac04143a12997c3bb240", - "sha256": "1klwi2ssjnjc5cirq201wl643w8cb32r42nmjhvxv4dgad14i659" + "commit": "8f488c0d765c3d42e84612561530c5ba925e8c9b", + "sha256": "0zynqp7r1k3ycgrk93mkwg3ycl14gny1sspgaxb1z3gsc54ya7sv" } }, { @@ -38809,14 +39454,14 @@ "unstable": { "version": [ 20210509, - 2323 + 2325 ], "deps": [ "flycheck", "package-lint" ], - "commit": "30362dddca2a5f02d5e611e8fe802b528c610e10", - "sha256": "09d7ryjxnjk3ym6hblf3pjp8ycblfwkb3liljg2j1dw5mq07ng8m" + "commit": "ecd03f83790611888d693c684d719e033f69cb40", + "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" }, "stable": { "version": [ @@ -38858,15 +39503,15 @@ "repo": "ksqsf/pest-mode", "unstable": { "version": [ - 20200317, - 1503 + 20200710, + 2327 ], "deps": [ "flycheck", "pest-mode" ], - "commit": "fc575223d1e4de00e03c80258c7359cb4c415517", - "sha256": "10gwd9d1c32mbi0ds5rb88ip2flgznq1lcw9mv549xcvp7zphjgj" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" }, "stable": { "version": [ @@ -38940,16 +39585,16 @@ "repo": "Wilfred/flycheck-pkg-config", "unstable": { "version": [ - 20200409, - 501 + 20230119, + 1721 ], "deps": [ "dash", "flycheck", "s" ], - "commit": "b76b24ea1f4800f5fb96ce9c6c4788e0e63133d3", - "sha256": "01wzzrpfgh3z28qsynxvkfm92xy98vyvkkv31qh53kxxdicnzlh0" + "commit": "c4e4028f6621187365b7362566ac2786206765a1", + "sha256": "1i0pk4nzw5jl3d67k71h6iwiw5xmqa6qns3q2x0mwdk5kylb91n9" } }, { @@ -38980,13 +39625,13 @@ "unstable": { "version": [ 20210118, - 1326 + 1327 ], "deps": [ "flycheck" ], - "commit": "5d804b08c89ec492a220d3aa8a43801431f0fa09", - "sha256": "1kc8nhd5s52mv9prp7gw24caddl257y3pw27bjymmmz84vy6pl6n" + "commit": "22787cf8223ca9ec309e30a42c20a8e706d8bfbe", + "sha256": "1dpxhljgw0k6y7973ssqfnmc7vp4fv87ajsq1bm8g4m04vj4127q" }, "stable": { "version": [ @@ -39386,16 +40031,16 @@ "repo": "liblit/flycheck-status-emoji", "unstable": { "version": [ - 20180330, - 2325 + 20180516, + 229 ], "deps": [ "cl-lib", "flycheck", "let-alist" ], - "commit": "61e93ac41847d27b8eea3a334ced2d1783687b77", - "sha256": "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr" + "commit": "4bd113ab42dec9544b66e0a27ed9008ce8148433", + "sha256": "0ldy9lhh6mirjz02pnrf7z235jz55k4sdysbqxjhfidsszvp9v6w" }, "stable": { "version": [ @@ -39448,26 +40093,26 @@ "repo": "GyazSquare/flycheck-swift3", "unstable": { "version": [ - 20210910, - 1244 + 20221227, + 1307 ], "deps": [ "flycheck" ], - "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", - "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" + "commit": "14cb83c71a03bb7ae0952ee1707783219fda980e", + "sha256": "1yg1sfzp4w164rfkqvdw7qfkixmb5bdq0pidncznfa9rdxz0i9j3" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 0 ], "deps": [ "flycheck" ], - "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", - "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" + "commit": "14cb83c71a03bb7ae0952ee1707783219fda980e", + "sha256": "1yg1sfzp4w164rfkqvdw7qfkixmb5bdq0pidncznfa9rdxz0i9j3" } }, { @@ -39663,14 +40308,14 @@ "repo": "krzysztof-magosa/flycheck-yamllint", "unstable": { "version": [ - 20170325, - 1735 + 20170326, + 1309 ], "deps": [ "flycheck" ], - "commit": "110d310fae409e1869b82c34e60936bd3783dc69", - "sha256": "0xfmnwmc26wzfw1r4q70yxzm9qqvcpxx953pvssavrxfyg3bdgf4" + "commit": "aa211b1243168a4f752888c0014c5b9d2da178b1", + "sha256": "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm" }, "stable": { "version": [ @@ -39747,11 +40392,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20221025, - 1844 + 20230107, + 748 ], - "commit": "6efe0ae2d82ba83c563e117b290cb22ae91d2f58", - "sha256": "1y0skf7vnym6qn3q9gkzb0pzalpcsqzaa6vprr6alr73yh59vz2n" + "commit": "1c7fb66f6cb325ee1123094263a8def9bc071768", + "sha256": "0wh2n3bb4l13qqbrdihrwrwlcil80kv0nkpripj1jw89gnvgrnfz" } }, { @@ -39791,15 +40436,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20221113, - 1 + 20221231, + 1240 ], "deps": [ "flymake", "let-alist" ], - "commit": "274e5ec3e614e73fd0d7c3e1ffc652461bf5b5f3", - "sha256": "18mwz6i84y1wdw8zq13rmx8jsax6fkiqvlbngix7sp2vy8mqgv5c" + "commit": "a030c282e95d709bbb67a7fc115dde1f0d500ae9", + "sha256": "0pin1z7g2yw45lwp77nn3vns8xrcqyqn1hxik4spg0rxfhan7afs" }, "stable": { "version": [ @@ -39816,6 +40461,21 @@ } }, { + "ename": "flymake-cspell", + "commit": "21be553488cfe36423a7d15d1c7a90ccd934d4ea", + "sha256": "03i1kfmlswypzsfam1liwnhpwy2mvwm31lz9d4gwg9ka6q067k8m", + "fetcher": "github", + "repo": "fritzgrabo/flymake-cspell", + "unstable": { + "version": [ + 20230208, + 2155 + ], + "commit": "c68bf7eef99ddb2fbd780f175e869df2db5d768f", + "sha256": "05k8aiiik2ws3hdppg6kv8avq2dc7mvn08hs28brrzm3d8h6ma65" + } + }, + { "ename": "flymake-css", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5", @@ -39912,11 +40572,11 @@ "repo": "purcell/flymake-easy", "unstable": { "version": [ - 20140818, - 755 + 20141022, + 1828 ], - "commit": "09deafbcb5f094de8465c2bbfe270ba0f517f515", - "sha256": "1ld0g3hrbplmw3xgg6jg032hncnlxyc3hid4vn38lkcj3y7ls61b" + "commit": "2a24f260cdc3b9c8f9263b653a475d90efa1d392", + "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c" }, "stable": { "version": [ @@ -40103,15 +40763,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20221116, - 1127 + 20221231, + 1655 ], "deps": [ "grammarly", "s" ], - "commit": "e3ed1a8bcb80a002a29fcc82e205d010bd9f3505", - "sha256": "0nf7y37livrhj3dapwzbpal5jclc0arr2hwvhhzyck5mg1q6vi5r" + "commit": "078edd6e083067f2ad3b3beaa0098c16cebe3994", + "sha256": "1496hmwbp2jyy7mn4yrjrxsr3r662s8815vh6w6dj730d9kqr2mq" }, "stable": { "version": [ @@ -40366,14 +41026,11 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20221116, - 1917 - ], - "deps": [ - "s" + 20230122, + 1609 ], - "commit": "b4b4d9f041dbc887f3adfb61600e9df4e51f9917", - "sha256": "0vyqh5h5rc12hk8w801wqi1nrcq5m6r5swak9vca7fh0rihjimz6" + "commit": "ad8c724147d5a3a9f6ee59e0c7581e68fba4a2f8", + "sha256": "1h1c0anbch18i66qr6vjb0lf1ygx7y06inqy9r6wss51261l2cly" }, "stable": { "version": [ @@ -40477,8 +41134,8 @@ }, { "ename": "flymake-perlcritic", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1i0bc81cby2nsala2mhghzv7clhbf1gpp54vdxiq2wdanqy25vmk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1h19mnx91g0jy6mpkzqx9szix8vibqvxy3s7q7sp9i5xpyjk21l4", "fetcher": "github", "repo": "flymake/emacs-flymake-perlcritic", "unstable": { @@ -40513,14 +41170,14 @@ "repo": "ksqsf/pest-mode", "unstable": { "version": [ - 20200317, - 1503 + 20200710, + 2327 ], "deps": [ "pest-mode" ], - "commit": "fc575223d1e4de00e03c80258c7359cb4c415517", - "sha256": "10gwd9d1c32mbi0ds5rb88ip2flgznq1lcw9mv549xcvp7zphjgj" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" }, "stable": { "version": [ @@ -40572,14 +41229,14 @@ "repo": "flymake/flymake-phpcs", "unstable": { "version": [ - 20140713, - 631 + 20210213, + 732 ], "deps": [ "flymake-easy" ], - "commit": "a4d383474e055e554aaf1cd617055d5d7181aa50", - "sha256": "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi" + "commit": "f947ba3066c1fa903d2ec69d67bf84413f51eb3f", + "sha256": "10qaw7dhklxqzimfsj87clb297y7rnd3bpn061bh04cwnayjn2hr" }, "stable": { "version": [ @@ -40771,6 +41428,21 @@ } }, { + "ename": "flymake-ruff", + "commit": "6a2eeb6245f91c35a7f0671f5fd43cdd562b57ac", + "sha256": "143c035vd6xrbx77rccs564s8mwmn5a6a6wr3wb8hgw6xc4kw3ms", + "fetcher": "github", + "repo": "erickgnavar/flymake-ruff", + "unstable": { + "version": [ + 20230128, + 1739 + ], + "commit": "1567685414c81a24303058631d6ee81fb78eee73", + "sha256": "10lhdxxphjryr8dqqx6njmb0hv3a9bhkfzrajnqfgk1zwhpnvykg" + } + }, + { "ename": "flymake-sass", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d", @@ -40869,11 +41541,11 @@ "repo": "erickgnavar/flymake-sqlfluff", "unstable": { "version": [ - 20221116, - 729 + 20230129, + 2035 ], - "commit": "8ce6b40ebcb3a90e23621e2e1b85e3d06bed5e76", - "sha256": "1jfhwr4a3imi1n8akarxakdxv90d4icx1r1yjfsjj9hvlgxads4s" + "commit": "f7921a5b762eb0675b8fca7cfb00273a76eaee5b", + "sha256": "0yvf3bq04aljx93p9c3l8jgiwpmbwvkknx06zzscd1fn5n3kfava" } }, { @@ -41570,11 +42242,11 @@ "repo": "usaoc/elisp-for", "unstable": { "version": [ - 20221017, - 634 + 20221218, + 1023 ], - "commit": "7b5d13eae258c5299a6525cb32a3bb69fb7f652c", - "sha256": "1ax6wpawa6zlizbdcvgklyq7nz6jiwdmlz7ln9aq81m4qzap44ql" + "commit": "3556d3693288a552a0962ee01ad7ec71caeb0dc8", + "sha256": "1ghq4h1yk57q2rggkawiglk8ryrdqjdmjwd99j17yqzg5mnijlid" }, "stable": { "version": [ @@ -41602,8 +42274,8 @@ }, { "ename": "foreign-regexp", - "commit": "d05514013948a520cf0dcaf1dc2ef2300dd55e98", - "sha256": "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "15mjvw177n8f6xxs7cg4xb7xwaagmh36isr849296mnk8mbl084i", "fetcher": "github", "repo": "k-talo/foreign-regexp.el", "unstable": { @@ -41674,14 +42346,14 @@ "repo": "magit/forge", "unstable": { "version": [ - 20221025, - 1208 + 20230220, + 1945 ], "deps": [ "closql", "compat", "dash", - "emacsql-sqlite", + "emacsql", "ghub", "let-alist", "magit", @@ -41689,8 +42361,8 @@ "transient", "yaml" ], - "commit": "45b06b80137e981bca268b800469dada0ef7acb0", - "sha256": "0pv5bd3x074sl23x2ryfs8rbbvrmvc7pmaiqf6dxmns9rzy14jfy" + "commit": "3164739dc70ee5ecf05d87dba9dc803d62a89adf", + "sha256": "01mxlikyxjl9q4gc5bp0i5vy2jvg7fc9ramilajgx37yf7nf5gn2" }, "stable": { "version": [ @@ -41745,15 +42417,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20221008, - 1655 + 20221210, + 1608 ], "deps": [ "inheritenv", "language-id" ], - "commit": "c237c4cdf70a93c2d975b418314af33a210a5740", - "sha256": "17y2paxygi4akwndjmnzj7ngg814nq0ylxsrihkni0grxv5b76ww" + "commit": "c156ffe5f3c979ab89fd941658e840801078d091", + "sha256": "0h6sv36psl9rp1xvg5xzz4w2c7xlrz5iykivf7cfnq5g48aqsihs" }, "stable": { "version": [ @@ -41839,8 +42511,8 @@ }, { "ename": "fortpy", - "commit": "73b277e19f5f9f6605f3e9b7afac95152dac0599", - "sha256": "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1napc40chs3m2lhv4ig45i3v94jmw20nycfap41zkscihv9mvf21", "fetcher": "github", "repo": "rosenbrockc/fortpy-el", "unstable": { @@ -41890,26 +42562,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211223, - 405 + 20221225, + 1016 ], "deps": [ "seq" ], - "commit": "594d0b97fede90a01ed341bb3fc42ac51f31e1c4", - "sha256": "14m6vbiwapd33nmffvimr3y98mw2x1v6a4540csq4v83qjpfb1nx" + "commit": "bfbd41a126f12abb4c0f279b087816d7dd483ff9", + "sha256": "1i9x3jd0phrm4a1jgngpvnmjs5j3y4sfy5yzjv5wwbcp9b8hmidl" }, "stable": { "version": [ 3, 6, - 0 + 2 ], "deps": [ "seq" ], - "commit": "205d7caeb65766e7787d827a80cca893747a09cc", - "sha256": "14cb4r23pn98sxzh0qwjwpvm7k7q9hhpks8avydccwssm69x1s1w" + "commit": "1a0482e03e9cf05e481a57c057cf9b985c6ca4d5", + "sha256": "0mml0in6xxhfv4mdb7rl9k8m6xwmrjl5bb301p8d56sfng982pdl" } }, { @@ -42050,14 +42722,14 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20220509, - 2010 + 20230212, + 2017 ], "deps": [ "compat" ], - "commit": "db75e7b903d0202ba75e64a5a85eac720a30c3c2", - "sha256": "0iqc9sg5l4zjzwzpf3pnkk6qzl1n2kfjfw5dj8y1d2jp7w4741vd" + "commit": "96f2cc9a0cb672b1989022caa290218c8024a376", + "sha256": "01z4n2j8sc6fdyqglhnbq6pszkjjnikqj868p4lfnrzb3nxj4a05" }, "stable": { "version": [ @@ -42203,8 +42875,8 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200527, - 830 + 20200828, + 1218 ], "deps": [ "cl-lib", @@ -42212,8 +42884,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", - "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" + "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", + "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" }, "stable": { "version": [ @@ -42272,16 +42944,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200527, - 830 + 20200828, + 1218 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", - "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" + "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", + "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" }, "stable": { "version": [ @@ -42336,11 +43008,11 @@ "repo": "pdo/frimacs", "unstable": { "version": [ - 20221113, - 1231 + 20221127, + 910 ], - "commit": "ae3870ebced2fb92f7fac1aa0051f7e46b30d55b", - "sha256": "0r18cgi4hycif9r53vn1cakajkbrqpaziz240bq5yw2wnyvmkgfx" + "commit": "2aa343d743e70fa90ae06927fa2c7dabeca04fa2", + "sha256": "1rvhxyzljpdv4h1mwi767jyz4ql61806vq6q9681ixvm9jzxs8p4" } }, { @@ -42459,11 +43131,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20221106, - 2050 + 20230219, + 1511 ], - "commit": "cfd3f8827e8ec9cbf4d23653c4b05db4c01a5947", - "sha256": "0nxicqypwpksq9nc1b6v25j984ssqg8nb53wdpynsc422g2sqs0h" + "commit": "09fec6c91f9c18173f145e28c55d6f21be678231", + "sha256": "0p1y1y3g9qxkgn38fd34wkjkxplg3aphdqgisx556maig69ki789" }, "stable": { "version": [ @@ -42482,8 +43154,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20220725, - 2139 + 20221214, + 1220 ], "deps": [ "company", @@ -42493,8 +43165,8 @@ "quick-peek", "yasnippet" ], - "commit": "60489e75c6f26417068bf861b6db2935e72c38fe", - "sha256": "17j66xilzv0dv91jzk7v224hwpm0mlyxcsz7qf0ip8379ax1jb8g" + "commit": "ab0697b9474f36942a12a4b2a75251c247c18e9e", + "sha256": "02cyd5jl3xgzyiq4bbppnx8vhvw9h7i51776p3ld7m4shck7qyhz" }, "stable": { "version": [ @@ -42518,14 +43190,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20221108, - 1757 + 20230120, + 1737 ], "deps": [ "cl-lib" ], - "commit": "8c9bb02fe3c958d657857117825a83548cdfe2f0", - "sha256": "1gjbz95nzv348qnj76pxgmc3515sv4zw59axkhbp841cfjkd091g" + "commit": "25236d56df9b39c607a6af75d4e16273201031bd", + "sha256": "0rd0hgcxafbji2gs7lwxbcchcq8qai1yrrh6rld3cfwi83qkm3jn" }, "stable": { "version": [ @@ -42707,20 +43379,20 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20221025, - 843 + 20221223, + 1440 ], "deps": [ "cl-lib" ], - "commit": "6d89758828c6ebdce0d28c334c618bfd1d45e8d1", - "sha256": "0r91yw867h1z592rcw744616sfzqak7mrgpkc1p7qzb77d3fxqf4" + "commit": "942450534547e2081a3ce6c13b6ccfbb4d6c05f4", + "sha256": "01jnr1i2bj70jrhvyis2k0fljb1lwf1wns6xgs1ad3ndvgyi3c42" } }, { "ename": "fuz", - "commit": "2d3139563902bb1cb8aa48a517747f12a1ca1746", - "sha256": "0xmi3r7mhxc38rjmx2p0lhsn0gch21hhbr2s0gxy1h29mhgvy3sb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18jjk2aqvs7sjc9alxzbl3cr01swfag07mmnzmvd6ghi2y8v6px9", "fetcher": "github", "repo": "rustify-emacs/fuz.el", "unstable": { @@ -42749,11 +43421,11 @@ "repo": "auto-complete/fuzzy-el", "unstable": { "version": [ - 20211231, - 1837 + 20221231, + 1634 ], - "commit": "f63d6279a781cf9f33dd2f22826788d98d475961", - "sha256": "11dj0qg2411r2nby2nzi1i4s2v5wnz4594cl5c8gq9hws7cmp6q2" + "commit": "fc7ca5bc81f1798596bc1d254d74a5ea95edc432", + "sha256": "0i0wpsbr3d2bv9pjkdx6a5188csw2vi53rprk1j05bv0wcm81ark" }, "stable": { "version": [ @@ -42796,20 +43468,20 @@ "repo": "theBlackDragon/fvwm-mode", "unstable": { "version": [ - 20160411, - 1138 + 20230214, + 2149 ], - "commit": "6832a1c1f68bf6249c3fd6672ea8e27dc7a5c79e", - "sha256": "03zmk4v259pqx7gkwqq95lccn78rwmh7iq5j0d5jj4jf9h39rr20" + "commit": "574c0370f6199c9a1492923bf0d35fdd26738d24", + "sha256": "100al4f4jchg9mmq6in2dv948msx0j56qd3qzjmb5az7hy19ncnj" }, "stable": { "version": [ - 1, - 6, - 4 + 2, + 0, + 0 ], - "commit": "d48a309bb7db21f5404b6619c6ee861fe0457704", - "sha256": "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv" + "commit": "574c0370f6199c9a1492923bf0d35fdd26738d24", + "sha256": "100al4f4jchg9mmq6in2dv948msx0j56qd3qzjmb5az7hy19ncnj" } }, { @@ -42820,29 +43492,32 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20220422, - 1610 + 20230213, + 1143 ], "deps": [ "compat" ], - "commit": "b2661943ff3e2ad8d6db2158c173ca04221790a1", - "sha256": "0vpv7qwf849qxhzv23x7l1fd2zgvs9p4nx5rd9mpbai9w5sgf7m1" + "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", + "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" }, "stable": { "version": [ - 1, 2, + 0, 0 ], - "commit": "1143188080e33afd3330f540c7e7df48898a4777", - "sha256": "032ykl67f5x1f98gm8s9jiynlvip16r4lkl64a7xn36g32a4g4x9" + "deps": [ + "compat" + ], + "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", + "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" } }, { "ename": "fxrd-mode", - "commit": "796eb6b2126ec616c0de6af6abb7598900557c12", - "sha256": "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1cyniw1bzqvllcacisbg9ksmx1va348kk2lkcj0wsxn9q40kfr4j", "fetcher": "github", "repo": "msherry/fxrd-mode", "unstable": { @@ -42891,11 +43566,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20220726, - 2216 + 20230114, + 403 ], - "commit": "21912ebc7e1084aa88c9d8b7715e782a3978ed23", - "sha256": "0gdqjh8996hb06bnnyhi94k69mjfrzyfgq00a9s4wwagv28sqmkj" + "commit": "1d80e76df0899e26196aea150c29fba95fc73ed6", + "sha256": "075v5ypn4clkgg9jb4jd9xrw3ldy7sz5f2vryf5kniwm8zhs85yi" }, "stable": { "version": [ @@ -42948,19 +43623,19 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20220512, - 222 + 20230214, + 1359 ], - "commit": "937b2223259fb102bd6991fe46f509897e4f6cba", - "sha256": "1d11w3mgni0i75in9zi27glmx8vjyab9fqr8bp3pxp1skishx3a1" + "commit": "a50a290e5559e9f099e2bbbcecacac9e484ef4d9", + "sha256": "0k1icyhyqa71d651vdb8mb9vg37nx50l3xs13whv3mq1kcbp0hxp" }, "stable": { "version": [ 6, - 9 + 11 ], - "commit": "1964d9a52693f3aa9279eed8864bc317ee5c6dc4", - "sha256": "070qmshqn6gz4av3rzbjihlw6psx5c61kbcwdymswzfzmhg5dyn6" + "commit": "2bc1ae508b2e5c0ac377b012ca41eb6be73f9705", + "sha256": "0n1xqsk7086b6dx43djy1aliriidfksafh77f7ng4596sxnphrxz" } }, { @@ -43040,11 +43715,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20210522, - 1025 + 20221205, + 116 ], - "commit": "1f83845af4102efc5e5856b55bd5ad165b2f0cdd", - "sha256": "0lrsnl08npknif66chs3spy6pnblx3mbxxw1dii8a7zcj2s0ripv" + "commit": "3b17b5ba85e5a05dac79b15b5231ad41f0a0fce5", + "sha256": "1i515clygcknp3f1rcf5kl63cx29vmqqkmfg4gk78s1pdika06qi" } }, { @@ -43109,15 +43784,15 @@ "repo": "ahungry/geben-helm-projectile", "unstable": { "version": [ - 20160611, - 59 + 20170524, + 334 ], "deps": [ "geben", "helm-projectile" ], - "commit": "14db489efcb20c5aa9102288c94cec3c5a87c35d", - "sha256": "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l" + "commit": "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b", + "sha256": "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04" }, "stable": { "version": [ @@ -43156,25 +43831,26 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20221115, - 2228 + 20230120, + 1738 ], "deps": [ "project" ], - "commit": "15dfe0fceea4d3508cd22a05fee18b617f84df2f", - "sha256": "10f048rkcw0rnn03dq9v5bgg61zclznnsl6hl9sqjanb16vhs5lp" + "commit": "e54d5e6dc659c252d10c4280f4c4d78d38623df5", + "sha256": "13q78d6pgmv7nmv0c4nfggbf29l624q73sycz3gr6hqng6kdlsvb" }, "stable": { "version": [ 0, - 28 + 28, + 2 ], "deps": [ "project" ], - "commit": "04dbdacfeca0190856abad859360da4bb873f9dd", - "sha256": "0dd20cq3nz4jjysaqx2aiqqaxvkfkbj2x4zm2mz3pd4rmydckj2y" + "commit": "bfc9cce54b7ac1cb036911965198b5cbe2f43f4c", + "sha256": "01sif1pw3shhdzcg9vidc2j5cqmrgjh5kynicf5mh3kmlvvsg9k6" } }, { @@ -43237,8 +43913,8 @@ }, { "ename": "geiser-chicken", - "commit": "cfc698ce9f759b5664217a4866a91605c11c13f6", - "sha256": "0pmy5gxsvp33m3dd5fnanxbjmds2vvaq649hp0nrjixykqhg9gf4", + "commit": "a2ad985f3b2b3e9192b6a8525483f43f52df9a10", + "sha256": "1hq3qk8vbspycvm9fv5s9d07gn0m55gwcvgv4ycvyf8gmi2j3xdy", "fetcher": "gitlab", "repo": "emacs-geiser/chicken", "unstable": { @@ -43328,28 +44004,28 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20221115, - 2230 + 20221205, + 1425 ], "deps": [ "geiser", "transient" ], - "commit": "961c9630f90733f517a9124750e72da55b569f10", - "sha256": "1hhn4nrhwnkrks1kij27dza0zlj0z6jpw9k9nqqswb3h9qll3nvz" + "commit": "24ce15de235c105daf5ecfb818200dae1c9815ee", + "sha256": "178anfklxk7wnbwnbjnc1nhg54b2s07z66g6gybd4imacn09f1az" }, "stable": { "version": [ 0, 28, - 0 + 1 ], "deps": [ "geiser", "transient" ], - "commit": "f5e82dc0f5a076335f201885a7edbefaa1ad435f", - "sha256": "13qxg1npm0pmnml5q268k5xk1clyqldp8v200ihrqwqlc3ga7f36" + "commit": "f57bfd5039ce158de95d2ef2933e64fb16def4f6", + "sha256": "0gp8xbfm7y2gabjyys8jylfy1pkkglqas32xxrbqxfh1hv0cfh2f" } }, { @@ -43476,11 +44152,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210909, - 1442 + 20221127, + 1619 ], - "commit": "60bd07b3a1e532c950c132673777ceb635c9960d", - "sha256": "1dj6bmlrqkqvykasdav9f4jw8aykqj6c0jr09r9x4sb2w0pcd9ik" + "commit": "a7dd7c6ea4e036d0d5ecc4a5d284874c400f10ba", + "sha256": "1pvlk56mhh4xh4gwzqldfk79jsjbcpivv5scd9811pv3afc30gsx" } }, { @@ -43522,8 +44198,8 @@ }, { "ename": "genrnc", - "commit": "dd2d908ba5fa96d90643091573939e54d9165aaa", - "sha256": "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18x7zmgrgwwsqc19vkqy44l9xq771wcfhsb6jxlfyp8d68b8yfys", "fetcher": "github", "repo": "aki2o/emacs-genrnc", "unstable": { @@ -43650,16 +44326,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220928, - 227 + 20230102, + 1714 ], "deps": [ "dash", "magit", "s" ], - "commit": "38e53dfa782d65c7f93db8368b0c49f619c1f09e", - "sha256": "0rjrv7y4zkzry2fbsi55ccrnmasd0l8cpd0rapf0sskwc1wldymi" + "commit": "76cc426d62f1b4964159706eafa8f5b50b8427ea", + "sha256": "0wzb4z4hqx7n5nn7jsgzvjqxd65w9s6fnasz9mpkh9vfvv3zngjg" } }, { @@ -43769,8 +44445,8 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20220302, - 549 + 20221204, + 1817 ], "deps": [ "cl-lib", @@ -43778,8 +44454,8 @@ "marshal", "pcache" ], - "commit": "27ccc892e94f7e747e5b879eec71119965d9ed6e", - "sha256": "0biljpqw14kjv0njyrahfdgglaphghva0kpfjhiprfwbd0rmmi1k" + "commit": "e1423a54fc97924e75d1fde27911c3c678a7d6c3", + "sha256": "1fr4pikcjasqy41g86pjwhz3alky42m2z7ziag051xhcd8nlm51s" }, "stable": { "version": [ @@ -43819,15 +44495,15 @@ "repo": "anticomputer/gh-notify", "unstable": { "version": [ - 20211126, - 638 + 20230117, + 317 ], "deps": [ "forge", "magit" ], - "commit": "8937f64092ea3b7e2cea2d61c12fde8e0f5e7917", - "sha256": "1amqyv0xdvl1ghy2pv2kvp2lc2q250p71mq3qdf50v87png57d9p" + "commit": "e1afdd49deb8ddf1a988e8d3fa699b06dfa92f5f", + "sha256": "0vx77b54hyx1f6qq1n57x7sn2080fdb67678jiw3c152jai99kx3" }, "stable": { "version": [ @@ -43950,16 +44626,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220918, - 2022 + 20230212, + 2209 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "f07790b36beb563d5b87be896efbd3b8533f2acf", - "sha256": "132b5b1jdk0r68rklmf05avnmgm39rawl2ak4cinwis5p5m0hw2n" + "commit": "47b7dc9bb299d50647cd24efebaf41dbc07d9e90", + "sha256": "0k9zx62cwcb3pribmj1s4f7v7d4rg3msnscv1y2pjf2x740a1vj9" }, "stable": { "version": [ @@ -44157,11 +44833,11 @@ "repo": "wavexx/git-assembler-mode.el", "unstable": { "version": [ - 20210207, - 1545 + 20221205, + 1014 ], - "commit": "1243bdc1a9cdc79802ece05c90731ee14e4f92c9", - "sha256": "1rc8z2r8lxzx836j7nk61snps8r0szzifg0inzfv3nb2z8bsiw0b" + "commit": "e88d69d1fd93f166d8b31e02790a1d241fea44aa", + "sha256": "1lvhgs57848jiqsv4nhr3y65jh2zx8fwjh301v7cc162l66bny56" } }, { @@ -44317,16 +44993,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20221106, - 1128 + 20230220, + 1901 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "161ab485209ecd0f304e16ca95f8a145327e7ffe", - "sha256": "0dm68s284ybcqr626d2fhfc6icyb1c0yrbmmdbwr0vdlc0zv1iha" + "commit": "76fe46c098498deab54b6c5b11731e970040a52b", + "sha256": "0jbf10w7v7bni8wvn6l8ml05hfxljjb8ns16z20f7hn9zvmgdb26" }, "stable": { "version": [ @@ -44610,11 +45286,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220613, - 135 + 20230216, + 300 ], - "commit": "fe2e8aa92dd8f1a9fb3f471658701487ff21f22b", - "sha256": "1pbzcvv4hd6hkbqaln4gmdqmbv46b0556d35m3zkg0hvrrspp7bi" + "commit": "d3ba912079e0ca5fd727b1f617791c6ae1e0da82", + "sha256": "14czzi9gi1zms1nnpjabn4b7cyahjj0xz8y4jxr6pn6gp20zzp0n" }, "stable": { "version": [ @@ -44663,11 +45339,14 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20220422, - 1611 + 20230212, + 2212 + ], + "deps": [ + "compat" ], - "commit": "845d333732ad9c8d65a28f12af645c6682db6f45", - "sha256": "1616z9jvwcxs9pfsycbp0n4nss7gai9d0yx915l1mx9ksp631pf4" + "commit": "f0a0154bf48dd1c0c587596cf4cfd3c90f673a05", + "sha256": "0bgjdmrdw5jfr7lsjar45m0hdb2cawv3y73czbbh8qid2ajm6shl" }, "stable": { "version": [ @@ -44921,10 +45600,10 @@ "unstable": { "version": [ 20220313, - 2033 + 2040 ], - "commit": "0f0f0b52ee55a5c9305ebf5abb7bcf480f98db0a", - "sha256": "1xyrixgmmlb25km9ya20hqh3g89y070xsjqnhgzspa3938bcyzhn" + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" }, "stable": { "version": [ @@ -45222,8 +45901,8 @@ }, { "ename": "gitlab", - "commit": "1d012991188956f6e06c37d504b0d06ab31487b9", - "sha256": "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0ax1773qf1kpmpkfqkaxr5v69b6w7vy7gfbp53f4ff7rfiag2mp8", "fetcher": "github", "repo": "nlamirault/emacs-gitlab", "unstable": { @@ -45577,11 +46256,11 @@ "repo": "hajovonta/glue", "unstable": { "version": [ - 20221114, - 1120 + 20230112, + 2159 ], - "commit": "abfad405f240d9a89f792aae36efb3c2af43021f", - "sha256": "08iyb35mpcdca9raq636m06gdis6p3n67wqhzq612p71gpx9l4bl" + "commit": "dcdf8a69db87acea4fa61d4b4b9b1265c7e025db", + "sha256": "0n5834ghphb37780f6vs3hvh39m5a7hs7xx352bwwskrv522ik01" } }, { @@ -45810,11 +46489,11 @@ "repo": "akib/emacs-gnu-indent", "unstable": { "version": [ - 20220515, - 1719 + 20221127, + 2112 ], - "commit": "ff3e10edbdf9b919747ec2ba3434d5858f5cc9fa", - "sha256": "040vlkzhgi7mhp6m4nrqz2srh8fr8xgpgbiqm8mbcs7py41smkg0" + "commit": "f31dbe60478b6270bb57b6b05998df8eec56f801", + "sha256": "06b02s78ln9bxrh924952w2kvzgiqw422p70cf102wwmrqknlqlf" } }, { @@ -45825,20 +46504,20 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20221112, - 2049 + 20230218, + 1717 ], - "commit": "fe7ce76d797b34214178ac8e470f2fa9a63b2520", - "sha256": "06avd1bpk6n8d3yc2427f6z24f3d6dlbfhw6gg39mja06n4a2jh3" + "commit": "663a89d263d4f26b996796d01b6a3b783449e0f5", + "sha256": "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb" }, "stable": { "version": [ 0, 8, - 0 + 1 ], - "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", - "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" + "commit": "663a89d263d4f26b996796d01b6a3b783449e0f5", + "sha256": "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb" } }, { @@ -45908,8 +46587,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20210207, - 1010 + 20221206, + 616 ], "deps": [ "async", @@ -45920,14 +46599,14 @@ "org", "s" ], - "commit": "1457bba34b40d5197aa14dbf0856925f83025ae1", - "sha256": "01jm2maa8q0zjpqa95c84k9b9jx5rgwvvhaqbwvw8ccz883mcdjm" + "commit": "9996b382c5c7b4f944a716baac69b556ef181462", + "sha256": "0m34dxxmhcsxmlx5ci9zzlhfm4jgp4ind5fhaj1ycyi1grwk92ca" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "async", @@ -45938,8 +46617,8 @@ "org", "s" ], - "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", - "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" + "commit": "249e1471d586e0b3679a4b1ac4070e9f5c4516d2", + "sha256": "0jn8g4zw5f06nxfxl7iffyf4jdza3wq9zwa3mj36ir012jrn5xbm" } }, { @@ -45950,11 +46629,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20220902, - 658 + 20230104, + 1924 ], - "commit": "ebaa2389d20bc5fe1796f895f1faedcfc99026d0", - "sha256": "06qxc9hhbpc4k1disashc347x589f2hhjs85vrsvr73kphv05b7k" + "commit": "5a4a28710dedef939dd8f1a743c5626e40271842", + "sha256": "1a0baimrynhng3d2ywdb66vzyvrrpv4fb30b9qibwp0gn2ds6g2q" }, "stable": { "version": [ @@ -46029,14 +46708,14 @@ "unstable": { "version": [ 20140610, - 731 + 2156 ], "deps": [ "log4e", "yaxception" ], - "commit": "c2c8c5e94ac94f4c40e023452119c088ac59eac9", - "sha256": "0gf418ri69yzi9cbxdyna9kxjsniyw72xix2r94m439k1axpwa3f" + "commit": "978bdfcecc8844465b71641c2e909fcdc66b22be", + "sha256": "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril" }, "stable": { "version": [ @@ -46293,14 +46972,11 @@ "repo": "s-kostyaev/go-gen-test", "unstable": { "version": [ - 20210816, - 1215 - ], - "deps": [ - "s" + 20230127, + 1422 ], - "commit": "35df36dcd555233ee1a618c0f6a58ce6db4154d9", - "sha256": "1r0cdpfrrz3lgkd7xzkw77c48w11l9maydm32rz27zpjgzgpakdp" + "commit": "f84f4177af7fcbe10ce2116d5417ad5f0485034b", + "sha256": "1bxa3870vr2hyaj4isvhzfhhs56qyrp9lngapsggxhdq1r9vwqra" } }, { @@ -46329,15 +47005,15 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20181012, - 330 + 20220114, + 2239 ], "deps": [ "cl-lib", "go-mode" ], - "commit": "120fb911f1d8038f828da85eed8aaad977dabd8c", - "sha256": "18qx1mf4fgrzm8g89c4y7zvwl3djrbbkhar242zl5ab5218dsp0s" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" }, "stable": { "version": [ @@ -46429,11 +47105,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20220727, - 115 + 20221228, + 1706 ], - "commit": "08aa90d52f0e7d2ad02f961b554e13329672d7cb", - "sha256": "1zdyhjg3crvcw093zw2nv3kzs583i26ba6pbs8jyhqnnysl7llfc" + "commit": "166dfb1e090233c4609a50c2ec9f57f113c1da72", + "sha256": "0vahf3gbdw8b7k28zicm1xi686b2lrzdx8nkzhwk9z25brw86jj8" }, "stable": { "version": [ @@ -46468,28 +47144,28 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20220106, - 1618 + 20221127, + 1342 ], "deps": [ "go-mode", "gotest" ], - "commit": "d2eb9ee18a7934c8f5395bdeedf52cb0f62f8aa2", - "sha256": "02p99180nqsy78g9xwqx2rvyxxv1bq95b09vwz0k1vz8xf6lqfbf" + "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", + "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" }, "stable": { "version": [ 1, - 7, - 1 + 8, + 2 ], "deps": [ "go-mode", "gotest" ], - "commit": "d2eb9ee18a7934c8f5395bdeedf52cb0f62f8aa2", - "sha256": "02p99180nqsy78g9xwqx2rvyxxv1bq95b09vwz0k1vz8xf6lqfbf" + "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", + "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" } }, { @@ -46547,14 +47223,14 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190805, - 2101 + 20220114, + 2239 ], "deps": [ "go-mode" ], - "commit": "13e9f22957df5a819b711994a4933927823fa14a", - "sha256": "007ky80h53r0kmk35cn0j6gk1rg2dwg6f4rbiszagm79hxf1dxnq" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" }, "stable": { "version": [ @@ -46601,8 +47277,8 @@ }, { "ename": "go-snippets", - "commit": "ca9f3022e7f4d5391be394cd56f6db75c9cff3b6", - "sha256": "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "08cif7lra3vmkraa5j44irjqap748rm8xysrc1hh6n80fklkxb4v", "fetcher": "github", "repo": "toumorokoshi/go-snippets", "unstable": { @@ -46640,26 +47316,26 @@ "repo": "brantou/emacs-go-tag", "unstable": { "version": [ - 20180227, - 411 + 20230111, + 651 ], "deps": [ "go-mode" ], - "commit": "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40", - "sha256": "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2" + "commit": "33f2059551d5298ca228d90f525b99d1a8d70364", + "sha256": "1nmxw99xqhr9sg5lafqjs7x033br8xz9106zc96gxf07v6zgbxy2" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "go-mode" ], - "commit": "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40", - "sha256": "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2" + "commit": "33f2059551d5298ca228d90f525b99d1a8d70364", + "sha256": "1nmxw99xqhr9sg5lafqjs7x033br8xz9106zc96gxf07v6zgbxy2" } }, { @@ -46670,19 +47346,19 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20221119, - 627 + 20230112, + 1532 ], - "commit": "8746d229474958dc4456ef9ba4b0a258acff8e56", - "sha256": "1znqj87xgb880aqqd10mxq5r3walhasvldmm3mvmvnywg91rrdyj" + "commit": "e8343e7d41af67f55c2da9231fb275a93382a4c8", + "sha256": "0f8d96pz676bl1b8rh2wxhdw1incaf691rkdlwzyzsar51c11dj9" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "8de1c3b660602b6739444ceed3e48214c417fe38", - "sha256": "0b8jbcs848ck0zbl6rmyyac3mbhx58zq04l7wvi7paficg9lphj9" + "commit": "923d117ab399a0598a496d3fab84188c6f460dae", + "sha256": "1bhfd41x3i2gabvf50pdpmnvcdqg69ygslyjcg7jvf486b44gvfk" } }, { @@ -46708,20 +47384,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20221109, - 707 + 20221230, + 708 ], - "commit": "49c1a1753188e5b2788b8c1f1f9fbd1264460bab", - "sha256": "0h1kfvr4zahk8ihvri1r16b2nkg3dg3524ic64c6w0jing2gr37c" + "commit": "607aff10a7b27a8aa0c1a15c2c39337ab17cfda7", + "sha256": "032c82cgf8dafc3w951f2n2a1327rxz9126ri8vz9n3fblwdizj5" }, "stable": { "version": [ 2, - 17, - 3 + 18, + 0 ], - "commit": "a72feb2fe8b1a8993c472995d83d9c4718f7a7c1", - "sha256": "1wsc04l5j5a9y5439qx85pcchxjnjgcgwbffw3l30q9zlblvc58b" + "commit": "c7754eaadaeabae2df94e23317b4a04d19b3f9e0", + "sha256": "1njln47w25ix9w0xjv02110ngr8d8ma3w7db0x4xcxhihbl65zly" } }, { @@ -46756,19 +47432,19 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20221011, - 1137 + 20230218, + 1710 ], - "commit": "f0e80d3be9f5195682f8edf903ded9cdc947683a", - "sha256": "1ca5gwa2r1nya84w0dkvmplbqfyksqbgfcl595fc1z5mysg09yzh" + "commit": "b715ff51e4b80c3c5487e7be6deadb1bb1497af6", + "sha256": "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "6023ca87b28fa05ebad320c8b9c5887c6dd0f51b", - "sha256": "15bqjmwfdqp2np6fln6xjyw59c5iddvzsyga0lvb8raa753cdh2k" + "commit": "b715ff51e4b80c3c5487e7be6deadb1bb1497af6", + "sha256": "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx" } }, { @@ -46829,8 +47505,8 @@ }, { "ename": "golint", - "commit": "34f22d829257456abbc020c006b92da9c7a7860e", - "sha256": "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1g3rpp8h911jrmkwhlpb6c6bsx8ig3ms1y6y7jpq1k40pb4zrxm2", "fetcher": "github", "repo": "golang/lint", "unstable": { @@ -46997,20 +47673,20 @@ }, { "ename": "google-translate", - "commit": "ec8e444027703ac04575a670b6ab806e8a290d15", - "sha256": "0rj3cybs603c8fy3yxgmhdvraiqwk4nj1pdjryqi4xaddj5glzzb", + "commit": "c7050f5197fbc7e70d13a6f290d4c61f4684c85b", + "sha256": "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47", "fetcher": "github", "repo": "atykhonov/google-translate", "unstable": { "version": [ - 20220920, - 35 + 20220921, + 245 ], "deps": [ "popup" ], - "commit": "f893b680311fedb1dd735bf5b3be7af1ed1583be", - "sha256": "12c6yj7bjradzgl0xjvv7xg8xii9imppb6d9ij0v4q2cfw7v8ihn" + "commit": "e60dd6eeb9cdb931d9d8bfbefc29a48ef9a21bd9", + "sha256": "07w3vcinb4wzcancfmhi7ips6dr2lg6va1xlm74kvk5n8vqafp8a" }, "stable": { "version": [ @@ -47092,30 +47768,28 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20220728, - 750 + 20230221, + 945 ], "deps": [ "f", - "go-mode", "s" ], - "commit": "2ec82dcc70d5f6aa22f66b44f8b537be33bd7903", - "sha256": "0jm4i5axw19451z8m79iv1zqlhqpr8mn4r9mcli5j9hrvb7wczrd" + "commit": "490189e68d743a851bfb42d0017428a7550e8615", + "sha256": "19lpr9wa73415jmdl1acijz54h5sdsj95wxigigbiqdhq6pd301p" }, "stable": { "version": [ 0, - 15, + 16, 0 ], "deps": [ "f", - "go-mode", "s" ], - "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60", - "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12" + "commit": "490189e68d743a851bfb42d0017428a7550e8615", + "sha256": "19lpr9wa73415jmdl1acijz54h5sdsj95wxigigbiqdhq6pd301p" } }, { @@ -47150,11 +47824,11 @@ "repo": "emacs-vs/goto-char-preview", "unstable": { "version": [ - 20220704, - 630 + 20230111, + 1525 ], - "commit": "507bd498457cf755d3500209ec0c2a4625a96584", - "sha256": "1m4bnx34wf7gh99fqp0gigvafij20awx3ya2yfcxymshk9vx73ii" + "commit": "feee79f83194155e67f5b16ca57b51b2d941b2ee", + "sha256": "19qnf1x0kysxjfx4dkl13f7cfv6s1cqmcjbnmmjvk7x8mah88qx2" }, "stable": { "version": [ @@ -47237,11 +47911,11 @@ "repo": "emacs-vs/goto-line-preview", "unstable": { "version": [ - 20220704, - 630 + 20230111, + 1531 ], - "commit": "ee1cb651c021d1cab1a9f2577fa76d54da894037", - "sha256": "15s47jpvbanymd9kn5xfzprr1yaiv7hzsq8wqs4pzxnciv3bira7" + "commit": "c6db484cf401351f7f2f57496b0466b774435947", + "sha256": "0wzc5vaw461lzwhs1d9b479ns8wgil528np6xs5rqr3czsm61k44" }, "stable": { "version": [ @@ -47261,8 +47935,8 @@ "repo": "vmware/govmomi", "unstable": { "version": [ - 20220509, - 1455 + 20221216, + 1712 ], "deps": [ "dash", @@ -47270,14 +47944,14 @@ "magit-popup", "s" ], - "commit": "72c2000c01b73c884f1f94df52765762e187b1de", - "sha256": "1jbgqwjncw4xwdjjsn738j4mmmccfb32g6iznlm97qgpyjl0sg81" + "commit": "c82a709c50c0cd1ae560dd4c8da2d5b266114c50", + "sha256": "1a9x8x45ylr3q87ryfrm3d4s5pahqvwrymvn9db194bx1wxj7mp6" }, "stable": { "version": [ 0, - 29, - 0 + 30, + 2 ], "deps": [ "dash", @@ -47285,8 +47959,8 @@ "magit-popup", "s" ], - "commit": "69ac8494c2bead55022dcd1dc18f9ca8b159ccd2", - "sha256": "04lsqq8ik8mgxhnxma24lkwn7qnjwr9djwrq0j0h3pw8bfbk4m29" + "commit": "9078b0b4399930876c766d4dff04935c523a7e18", + "sha256": "1w0rfzaa27xlns23y0aakz5wq7fpz79wvmj8wmim64p2pfggbpi6" } }, { @@ -47329,6 +48003,21 @@ } }, { + "ename": "gpt", + "commit": "0064e7b747b695a213c233480c962233d10b7bb3", + "sha256": "1yd2fiaq21bk6pnx3gdl5mrj0n0i3jbxfagdrawsfs9i3ys7m7vf", + "fetcher": "github", + "repo": "stuhlmueller/gpt.el", + "unstable": { + "version": [ + 20230204, + 433 + ], + "commit": "a5eb9ce9cced47c26ecac5fa6bee044054ef948e", + "sha256": "1vg4sc6j0i03riwzvj8pg333fihj4g2nwd3pgahjfkxps7fbmlqv" + } + }, + { "ename": "grab-mac-link", "commit": "e4cc8a72a9f161f024ed9415ad281dbea5f07a18", "sha256": "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3", @@ -47497,16 +48186,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20220704, - 624 + 20221231, + 1655 ], "deps": [ "request", "s", "websocket" ], - "commit": "284acc680a68ffeeed958e62a568b49b0d9e0551", - "sha256": "18f8hvjmsy517nz9r5nv6h7x1bczkg4y00fz1rmkdjn656apcgam" + "commit": "0d9fbee337cb8dd316e5dcf0bff91e44c115dd0d", + "sha256": "1ljlfnvlp7lpr6sc89xnp8jy5m0n5sfrcs43y60b0wnvxxj4w1k9" }, "stable": { "version": [ @@ -47628,11 +48317,11 @@ "repo": "vermiculus/graphql.el", "unstable": { "version": [ - 20221029, - 1808 + 20221128, + 1106 ], - "commit": "4575642c3213593abe5972510c418ebb11bf1d99", - "sha256": "1apbnxbxzk6ngigdpbjkn52cli9axwxlkv2fhksyqsqvxrg8f119" + "commit": "b57b5ca5d2d0837e1fb4a4f30c051d5f3e643f0f", + "sha256": "18k2c2b7y5qgc7qpkqjmz1nv61w470ja3vwprmy5dlkzficzqsvf" }, "stable": { "version": [ @@ -47699,11 +48388,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20220309, - 1336 + 20230213, + 1945 ], - "commit": "6e96a89762760935a7dff6b18393396f6498f976", - "sha256": "04p8x4lwbp2qwlsr5xlzjn3a25bg0rsnk3nqfvvz66zv0srz62mn" + "commit": "a3cbfa969051dd638a993e1962e2b965067896f6", + "sha256": "01f0p4gkbr2n57qkr4hxgwqm7rsflqp3y806ab4l66g42xn1lp5j" }, "stable": { "version": [ @@ -47930,11 +48619,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20221003, - 1518 + 20230206, + 323 ], - "commit": "e1e8ee952f75cdca93327b6e7dcd79244ca66bc0", - "sha256": "008iyd67l69zk4zdzzkjjjja54z81w88l71rsbp054ggsvy6qq0a" + "commit": "bdee160db6ab8c988bb0de95ad306ff8b793ec67", + "sha256": "0mnwpng1zhq4piaxnbrqpn6di4jhnh7dhf2vrgmqiw66c16vz9hx" }, "stable": { "version": [ @@ -48007,8 +48696,8 @@ }, { "ename": "groovy-mode", - "commit": "3fe318b4e51a280a55c01fa30455e4a180df8bd6", - "sha256": "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1q2zxx6glqp3z0ipsy4ry5fn4wrsz0slr5i36hxfhd8d1lrfn7ca", "fetcher": "github", "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { @@ -48044,11 +48733,11 @@ "repo": "rexim/gruber-darker-theme", "unstable": { "version": [ - 20220107, - 1815 + 20221122, + 1143 ], - "commit": "72278089c440d45c00fb8afcd53af82fd30f451b", - "sha256": "15akxpc1zgdbhzcjc1cs8w1wm4yjgnxicgmqjrcgcqc8g0zhagcf" + "commit": "6de7a37d7b18cf3f0ec51db799f4f2aa6e3e89ff", + "sha256": "1bqjn67s0kcnf86qjxz0ayaash4rbwfwqsppqyy7p9qfc00cjix2" }, "stable": { "version": [ @@ -48067,11 +48756,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20221001, - 1525 + 20230121, + 1825 ], - "commit": "d03ccd6314d474f3e6beadc69c0b6ce32af62f07", - "sha256": "1s5xig6pbkbnb0xn7rp3a02ig0pzdwxqj54f3bjda0c37ch0l1cj" + "commit": "088f26330be161cfad4835e155595ec60dcb335a", + "sha256": "094kwvm136nw3p1l2bxkbp97qnsg46g0b3mgskm323bcdggj1g12" }, "stable": { "version": [ @@ -48123,13 +48812,13 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20220909, - 241 + 20221213, + 25 ], "deps": [ "autothemer" ], - "commit": "3177b458dcbd5db6135a8d57fd5b765131e4da6a", + "commit": "736729265bfe5e247cf1b48bcf996e56516b0d89", "sha256": "0dgjf86i8179l1nsjyc20chysqmy8yhphpd5lzv2ypx79l4z3jka" }, "stable": { @@ -48306,8 +48995,8 @@ }, { "ename": "guess-language", - "commit": "6e78cb707943fcaaba0414d7af2af717efce84d0", - "sha256": "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1sbvvzzdb76wf9km9sp6p6yp6cc3irvajz4fz78y90iw3dka2w6q", "fetcher": "github", "repo": "tmalsburg/guess-language.el", "unstable": { @@ -48388,14 +49077,14 @@ }, { "ename": "guix", - "commit": "b3d8c73e8a946b8265487a0825d615d80aa3337d", - "sha256": "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9", - "fetcher": "github", - "repo": "alezost/guix.el", + "commit": "f01c0af156ac4f89ebb706c93085f46f1740f212", + "sha256": "17gd0farvxs38l0a8v20cc1d6h1ri7nmdjl7i1mnwfb410rijvhy", + "fetcher": "git", + "url": "https://git.savannah.gnu.org/git/guix/emacs-guix.git", "unstable": { "version": [ - 20210608, - 1653 + 20221011, + 1244 ], "deps": [ "bui", @@ -48404,8 +49093,8 @@ "geiser", "magit-popup" ], - "commit": "c9aef52121b458297e70bb50f49f7276b4a8d759", - "sha256": "00xdxadbi9fxpfp60zah9190rcz3w08vl1blbhmaiy7c1hd2gi39" + "commit": "cf5b7a402ea503c3dcda85a86b9a6c6dd01896e0", + "sha256": "0wxiipgv91rlk9bhspx370rykywi52rxg5m1f7680vzs3ckc7nyd" }, "stable": { "version": [ @@ -48447,11 +49136,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20220831, - 2055 + 20230115, + 2105 ], - "commit": "008e8fdec489a28e8cf807b3b511a9561c64268c", - "sha256": "1n5fdi328fvcnq5vb421d7mafkwidn4arah67difxkl6aq7g54jp" + "commit": "0ada8c575d4e94b4f3edb0092239cfa835b17726", + "sha256": "0jq43w12j6sf6qammahfyhmzcq78y2w00lmaxr2mjqdmq435vhah" } }, { @@ -48509,8 +49198,8 @@ }, { "ename": "gvpr-mode", - "commit": "ab25afcf4232082dc0e48706734f141a308912a7", - "sha256": "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "07c5l9n3337nqzijkr3sz4q0mwf429i5jpyiqmnqrkdpwkbh26h3", "fetcher": "github", "repo": "rodw/gvpr-lib", "unstable": { @@ -48546,6 +49235,21 @@ } }, { + "ename": "h5dump-mode", + "commit": "5c5d429299615aaf1917f9602eda7fa6f3d1a4f9", + "sha256": "04vl82x9zi1sjjzg85q4w9pj98lj7jr0a88xr93x2g82s4p9gkfg", + "fetcher": "github", + "repo": "berquist/h5dump-mode", + "unstable": { + "version": [ + 20221128, + 1935 + ], + "commit": "3c9e4608112da91db76bf316417023bed0422ef3", + "sha256": "17qqvl99vyfcxa90wkpqd2r7b2s05nnp4jnf3lhflx8s3dzmnpzy" + } + }, + { "ename": "habamax-theme", "commit": "77386484ad0b31c2818fae52cd312821c4632cb8", "sha256": "1rmir9gc1niwkshxg1826nkh8xxmpim5pbhp61wx1m273lfn2h69", @@ -49018,20 +49722,20 @@ }, { "ename": "haskell-emacs-base", - "commit": "5daff329a96a6d10bca11d838bbc95d1c8bcfbd9", - "sha256": "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0lfn13vgp0jpqhgsxg6qhcr408bpfhnfr0dccs7c5i9rlk8xn0cv", "fetcher": "github", "repo": "knupfer/haskell-emacs", "unstable": { "version": [ - 20150714, - 1559 + 20160904, + 2026 ], "deps": [ "haskell-emacs" ], - "commit": "7f91f65254902b8ff04fdb679bc569b2f6a51637", - "sha256": "17i9l6wgrvmp31ca4xrax31f7bjnn0vn2figycxhfaq9f6vxgkkn" + "commit": "a2c6a079175904689eed7c6c200754bfa85d1ed9", + "sha256": "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam" }, "stable": { "version": [ @@ -49054,14 +49758,14 @@ "repo": "knupfer/haskell-emacs", "unstable": { "version": [ - 20150713, - 1416 + 20160904, + 2026 ], "deps": [ "haskell-emacs" ], - "commit": "cc240612740fc3fd6e3c3d8cdfe486a89954f5d1", - "sha256": "09g6b1ad7qi9k58ymgmssgapwapxcwf30qhmfl2w8sl045ngzlkk" + "commit": "a2c6a079175904689eed7c6c200754bfa85d1ed9", + "sha256": "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam" }, "stable": { "version": [ @@ -49101,8 +49805,8 @@ }, { "ename": "haskell-snippets", - "commit": "b5534e58ea66fd90ba4a69262f0b303c7fb85af4", - "sha256": "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1pif4wv1d9gjhkxg57c5byg58gdlf0cpd8a4jjbkwlqqz1z7zgf5", "fetcher": "github", "repo": "haskell/haskell-snippets", "unstable": { @@ -49138,11 +49842,11 @@ "url": "https://git.spwhitton.name/haskell-tab-indent", "unstable": { "version": [ - 20200513, - 1950 + 20200514, + 1424 ], - "commit": "e332562b67b2611ef3f97d6a0bc395c6aeb70c7b", - "sha256": "0g06rs9lmpawbk02yiyq7gxrsfb6ps7vq0ghija9h97n47arxczb" + "commit": "1127f46eca40a48be9cd2380df2cfc5f0b694e63", + "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" }, "stable": { "version": [ @@ -49184,26 +49888,28 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20220813, - 1717 + 20230116, + 2220 ], "deps": [ - "request" + "request", + "websocket" ], - "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", - "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" + "commit": "033d11b07e0f8bb68b348a12d5ae13fabea56c73", + "sha256": "09jh1awga10jys9sj5szrx9jmgdjr33ahb8dqkryxykxm8527g6c" }, "stable": { "version": [ - 2, - 2, - 3 + 3, + 0, + 2 ], "deps": [ - "request" + "request", + "websocket" ], - "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", - "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" + "commit": "033d11b07e0f8bb68b348a12d5ae13fabea56c73", + "sha256": "09jh1awga10jys9sj5szrx9jmgdjr33ahb8dqkryxykxm8527g6c" } }, { @@ -49387,22 +50093,37 @@ } }, { + "ename": "heex-ts-mode", + "commit": "dbc1afa79eb2b9b50c9aed1a33f7eacd8cc5754d", + "sha256": "1c1d7ji2j0y99qnv2qwj5jf3vij56ja3pf0jzxxwmm9ka9scb3rj", + "fetcher": "github", + "repo": "wkirschbaum/heex-ts-mode", + "unstable": { + "version": [ + 20230216, + 554 + ], + "commit": "3eecf4dad47a4cb6d92d730021e72cefda267539", + "sha256": "19rpjhyd1k7qp3gvl3hq2ah72m7a8da0h0a93smfpkkkz3j4n5dz" + } + }, + { "ename": "helm", - "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", - "sha256": "032ypri8p6q1xz65imd89xizm4gzxkg62zaqyyv5pb2kbbv1y2b0", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "01h2k8xb4r98xxyff8cg53fzv3xc4nq7gl3qhghn03vla2l9hzpq", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20221117, - 1800 + 20230221, + 819 ], "deps": [ "helm-core", "popup" ], - "commit": "8de5444df2bafd1b3a91acd0e00cf1e0ee81682b", - "sha256": "09dk0dz8fkigi3zbinq76310nnnw29z4pca0ypsn2z6l0l3hg7zb" + "commit": "fb3df89c7b0a68c79d6725beb20d3dc6ccd348a1", + "sha256": "189d1ldhaw83ahvjpi1l5q6v1agglvbll9qimfyv8g2h4nj50730" }, "stable": { "version": [ @@ -49718,8 +50439,8 @@ }, { "ename": "helm-bibtexkey", - "commit": "d35a2e5cb5232d16d5c98168706d8b6426fcfb44", - "sha256": "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1rz9140miy9qnx2nhzhaqjggv8dp9kh0x6sr5m4a1z0j3720ql0a", "fetcher": "github", "repo": "kenbeese/helm-bibtexkey", "unstable": { @@ -50199,8 +50920,8 @@ "repo": "youngker/helm-codesearch.el", "unstable": { "version": [ - 20190412, - 1153 + 20221219, + 1219 ], "deps": [ "cl-lib", @@ -50208,13 +50929,13 @@ "helm", "s" ], - "commit": "72f1d1de746115ab7e861178b49fa3c0b6b58d90", - "sha256": "1qxpx8jmkvg59k4rx99bn9asnh4nl5rwkjvbhprdlqaicglm153q" + "commit": "bd5a7e3ece98f2940cb09be56d3e56da97d4c865", + "sha256": "12lay84wys9hwry68nyxfa0visjv6bhndc3nyhggwd44i30wvx8c" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -50223,8 +50944,8 @@ "helm", "s" ], - "commit": "a6bac6b8a063b91b444a72318b163b266742db9b", - "sha256": "0xmplh7q5wvrkfha8qc9hx7sjyc8dsms0wrvj2y7zg35siw1561l" + "commit": "bd5a7e3ece98f2940cb09be56d3e56da97d4c865", + "sha256": "12lay84wys9hwry68nyxfa0visjv6bhndc3nyhggwd44i30wvx8c" } }, { @@ -50300,14 +51021,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20221113, - 1706 + 20230217, + 602 ], "deps": [ "async" ], - "commit": "51b28e8c5ba63aa891d5d05aca08ac2688701971", - "sha256": "10xicmc6h0qlxahnf7zd70jg40i2mcz9m7vr1b28wpjgi1rmf8ix" + "commit": "dfd6403947c5cd9f32afcd6bc92a1756cc958c82", + "sha256": "03rw1j7cs7glwcnwxp69zl0csfj138csyzcg6g2yj1vsm31mx2mn" }, "stable": { "version": [ @@ -50501,14 +51222,14 @@ "repo": "masasam/emacs-helm-directory", "unstable": { "version": [ - 20170706, - 402 + 20170709, + 1103 ], "deps": [ "helm" ], - "commit": "caa013b820b5263bf1c6446debfea0766dae8ab8", - "sha256": "15ljhz7cik7qzbh69l28c9mcvls5zgk42lp5bm9kl9fg6m6aasvq" + "commit": "2c6d45404506ba744888dcdb65e9f63878f2da16", + "sha256": "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h" }, "stable": { "version": [ @@ -52200,14 +52921,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20220920, - 1200 + 20230102, + 1148 ], "deps": [ "helm" ], - "commit": "b9865a3a8ba8af572fcf12d975ea04dc9437c1a2", - "sha256": "1x9z790chc4ia5ipb30fza5bjybp6xp1194z5wbb1fn7hnyxa5z4" + "commit": "2422f57ed40d998ac6f085f93b24223c91cefaf7", + "sha256": "1j6avadq1jn5bib1nr8sj08qn4f67psb39jdcn314n6r84xf4gam" } }, { @@ -52399,8 +53120,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220318, - 1529 + 20220527, + 703 ], "deps": [ "dash", @@ -52408,8 +53129,8 @@ "org-ql", "s" ], - "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", - "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" + "commit": "115500c8a0a3190ec6a69d1120fe81944d819125", + "sha256": "0iamqv5j43ngj1xdqr36rkgk9lqpk9bg8y531jsldnvwzrp3srpf" }, "stable": { "version": [ @@ -52769,16 +53490,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20220820, - 826 + 20221215, + 613 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "5813f7286533990783546c9c39c184faa034d1f1", - "sha256": "1qrdms3lmr7wspqhd0ygqmyznlc6spy2lnn1n8p4v495nzdygzdh" + "commit": "35a2111d00c0c0c9d8743280d3f1243bb217118a", + "sha256": "0gd170h3v5i1886f7pvb5h5licy797djhjrigwfj2wa7i5q1avxv" }, "stable": { "version": [ @@ -53293,8 +54014,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20220704, - 634 + 20221231, + 1632 ], "deps": [ "f", @@ -53302,8 +54023,8 @@ "s", "searcher" ], - "commit": "27a6cfc7f9b3c988b4c7c6f1b3954760a9701dc0", - "sha256": "13pb0rcwp7jaj30d98lhi0jyk4dxlgk8pg64s5bnxf492hjzsk4x" + "commit": "225480fa89d73eb53478576610f48d035b77cda9", + "sha256": "0xmjccgym52fdryggr8lpamxy5d39jxr5mrl76r11n30dr46r1qi" }, "stable": { "version": [ @@ -53806,26 +54527,26 @@ "repo": "masasam/emacs-helm-tramp", "unstable": { "version": [ - 20190616, - 125 + 20221228, + 1444 ], "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "10711393c05272112e1585dca87ebeb0ea5b114d", + "sha256": "0rijcx9qsj76yf5lwmjicq94r6knaqh9v0xiq2i4gr48gf3j7irv" }, "stable": { "version": [ 1, 3, - 9 + 10 ], "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "10711393c05272112e1585dca87ebeb0ea5b114d", + "sha256": "0rijcx9qsj76yf5lwmjicq94r6knaqh9v0xiq2i4gr48gf3j7irv" } }, { @@ -54136,10 +54857,10 @@ }, { "ename": "help-find-org-mode", - "commit": "572003398d1bba572fa9f6332b25ade9306bf718", - "sha256": "149rd61bcvgrwhnhlqriw6fn6fr4pwr4ynmj2bwcp558nwf0py0b", + "commit": "7ea0e06818d5bf0f48da5e491b39891c78744d67", + "sha256": "12yqgl2sm4kys6ar9sgxc6myixr0shdraxdh41702bn2chlxvkcc", "fetcher": "github", - "repo": "EricCrosson/help-find-org-mode", + "repo": "emacsorphanage/help-find-org-mode", "unstable": { "version": [ 20181204, @@ -54166,8 +54887,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20221108, - 2042 + 20221209, + 1743 ], "deps": [ "dash", @@ -54175,8 +54896,8 @@ "f", "s" ], - "commit": "dc4e356b55212f67c7022f3aec4f5986a23d5d5e", - "sha256": "18dy3nxdnxz3wyr4hza9jcv4agsyyqf82jp6jdqcj13kncfl9gn5" + "commit": "94c25337b2de2f9da60914a7c0c6cca9584c0231", + "sha256": "09da3d3kx4c8im58kwfv59zpwda70yvwnjk01w7r6lra1ww8d3yx" }, "stable": { "version": [ @@ -54276,11 +54997,11 @@ "repo": "kuanyui/hexo.el", "unstable": { "version": [ - 20200416, - 1410 + 20221130, + 1642 ], - "commit": "d600b6c2d51959f1331c8abf3953365544322afa", - "sha256": "07w6jlq3z5y019n5kplqn38gw60ffk2yx4vchp6qgif98lhcjiyr" + "commit": "709c069ec0f9ffd8bc2f8fff18a66d80bc205f6d", + "sha256": "14jsanf2wc6k7rqiy3l2i8nzhlasknjvdmq7mh7q680ajj8hry7d" } }, { @@ -54380,17 +55101,17 @@ }, { "ename": "hiccup-cli", - "commit": "524a84be8692bd29b93e4897467e2e798be5fa53", - "sha256": "0xv6bq2ryz71lqqm1z6wg0lf1qmqwydg17zi614dsajsa5xhrjkb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0b79709x1lj050jicwklp0bx3v0j9d5ymdzp5niqsnww5z81q0bb", "fetcher": "github", "repo": "kwrooijen/hiccup-cli", "unstable": { "version": [ - 20210208, - 652 + 20210211, + 2127 ], - "commit": "863aa81c30d747e88cf53b3922169f8196d18a97", - "sha256": "0j1zw88frqlzhr94b5550ljlm8wlqqxjb2gjysi1g1k7kqha868b" + "commit": "cfbb957a1f86bc1d28e778bfdffdeaaa2ae79286", + "sha256": "0f3b7wsq9b0xswvj4073ykkcc36kybz16bz4q068qziig22d9szb" }, "stable": { "version": [ @@ -54833,11 +55554,11 @@ "repo": "fgeller/highlight-thing.el", "unstable": { "version": [ - 20220726, - 2237 + 20230217, + 728 ], - "commit": "cdf429c41c13c22d25fe43493cc5d85cc480dba6", - "sha256": "1p3q0s96f2pgmf327zzwx11sdy24im3dy9qv53bk2nb5zysvklzm" + "commit": "ad788d7a7ee9eb287a8cca3adb21510b89270dca", + "sha256": "1p829ydpc1qhqabwi0xaa9yy4rqz9wbkphq7kdly6qiz59jasdq1" } }, { @@ -54884,19 +55605,19 @@ "repo": "dantecatalfamo/himalaya-emacs", "unstable": { "version": [ - 20221007, - 1816 + 20230209, + 1545 ], - "commit": "1735b55e4dd60c63fe3900e959655f1f8b961590", - "sha256": "19w5vjx0zlfvfldblb7fjd4vzhbsi9y0plj1a6avplk8jypjdr7r" + "commit": "712bb410afd4cd43d3a8e9bcf2b1930dcde7000c", + "sha256": "136fdjb033dx1k94580ygglldhii6smcf7hvqawb4x1z6i80p8jq" }, "stable": { "version": [ 0, - 1 + 3 ], - "commit": "1735b55e4dd60c63fe3900e959655f1f8b961590", - "sha256": "19w5vjx0zlfvfldblb7fjd4vzhbsi9y0plj1a6avplk8jypjdr7r" + "commit": "712bb410afd4cd43d3a8e9bcf2b1930dcde7000c", + "sha256": "136fdjb033dx1k94580ygglldhii6smcf7hvqawb4x1z6i80p8jq" } }, { @@ -54907,26 +55628,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20210201, - 148 + 20230221, + 619 ], "deps": [ "cl-lib" ], - "commit": "89b8f857a1e706f723de27063a8d9f870efa0169", - "sha256": "1yvrkwv3cdbz9y526zqsc9764x27l7ih5vcyh8lqmy4w93akh151" + "commit": "a9c2898b9ac8f13e57092e3d5287e05b942d4539", + "sha256": "05ss0601jqyvxqr6pblpjwlq2hl0yq3abdlvxjhdx4br4mgi3sgq" }, "stable": { "version": [ - 5, - 3, - 4 + 6, + 0, + 0 ], "deps": [ "cl-lib" ], - "commit": "68d5211b2737c2ba31bbceed9b1abbb36bb83e39", - "sha256": "0qkrgar7blirhx85p0m4pjvwwh5rcs9ypy49hyg9bah1dgrnm88b" + "commit": "a9c2898b9ac8f13e57092e3d5287e05b942d4539", + "sha256": "05ss0601jqyvxqr6pblpjwlq2hl0yq3abdlvxjhdx4br4mgi3sgq" } }, { @@ -55119,11 +55840,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20220731, - 2352 + 20230201, + 130 ], - "commit": "a9e8e8cfd83972a448bdbb0a9967989d0aa1d05a", - "sha256": "0bdn9d28g2nmbxq0jhjrcpxadl18q0z231ciyqw2cvcc60i4n4rq" + "commit": "352686955b6e73c6353c640c7d3bc09487c9de69", + "sha256": "1xqrd6z015ka42b1j1kakym3qvv1m5ip450fiffkv8gmfnxi7mkj" } }, { @@ -55170,11 +55891,11 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20221016, - 508 + 20230116, + 2310 ], - "commit": "fa2f0f28ad869e83ae3c77d8d936dde5a1e45f24", - "sha256": "1lygcap8fk25cqqnvsdrkhhvca22c62vf02xq75ccx2aic9dnshh" + "commit": "5e806bfedd01bf82e4fda27e4b9809662318c287", + "sha256": "1xj2xaxff7qan8mmndzr88kx0b80bva1myy37si5jw2d6k3z8scf" } }, { @@ -55185,11 +55906,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20220731, - 2353 + 20230201, + 140 ], - "commit": "6d419cc36936f3bb3c9c63a6f77cc88a80b0db9c", - "sha256": "19k1g8g0z9sllqjq2arp2fdcpn9xs8d73d7nx7bn12s1kpa7viv6" + "commit": "a573977f9734b1786a4691c9fb8e5031159027f6", + "sha256": "0wnf62vlpa46nb0ziabn3c95i59x7b0sxjwkmkhmcgzqfa8g86jd" } }, { @@ -55222,14 +55943,14 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20221011, - 1032 + 20230212, + 2213 ], "deps": [ "compat" ], - "commit": "c699c9beb2f878ad3803c91bd0bd7c1a5e1c9690", - "sha256": "1bmvcr72ch94kdqnzysx98kswlv9r6al6kwv7bxrkbq922shqf11" + "commit": "13034b2709b22631772ef24d08f8a16bfa06bc34", + "sha256": "1dmzw1nin7h9ns7md9lgkfcdxja1vlxh03mp9ggn2n79cv6abjkf" }, "stable": { "version": [ @@ -55395,14 +56116,14 @@ "repo": "Boruch-Baum/emacs-home-end", "unstable": { "version": [ - 20180817, - 855 + 20190109, + 541 ], "deps": [ "keypress-multi-event" ], - "commit": "211914c5e7b25f35f02626575a9b10536f81ba1d", - "sha256": "1ppjm0sb4svarnqcv6j581sqnjjsps27ghx63759v9wkylqyi995" + "commit": "30676ceec0d4ad84038cd0d65ee45ae810ab185c", + "sha256": "0czvnk74988p6gqz5jz83gkvvqdrdmzn4qz6cc8dmbyxk1zg6l8y" }, "stable": { "version": [ @@ -55536,11 +56257,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20221017, - 1506 + 20230221, + 844 ], - "commit": "05330fc7208c654631e7484c3c7c441716901237", - "sha256": "0s38pip10k4sfjffcx96pbjvrjlx7ijjgs4plr9axxdvdgnjwjvy" + "commit": "90d95663f9ff667786b71071a039502d873ef4aa", + "sha256": "1bllfjj4s4lqdb7r9r4nmwb31qdlcrswbxxyfwzyv0ygw7cmaz76" } }, { @@ -55642,20 +56363,20 @@ }, { "ename": "howm", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "0jc585z0whcph644k2iic41xvjgzln3w2kdibrmr8lpcifbfr5qk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1i2lcgxcqbpdi5mh2684m0sqyvmw59pmd9rpx1kmpy17a9972b87", "fetcher": "git", "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20220815, - 1125 + 20230218, + 818 ], "deps": [ "cl-lib" ], - "commit": "9982e74e212014bc8ed67bbe780eb6ca55dc5298", - "sha256": "05dfd8sqvv51miwkr82hym5z7byiiv38zsx47b7sqr8kkqj9jcf5" + "commit": "ffc1e7da1f02f750094a9f0fe8a0aa837743193b", + "sha256": "1hhphdczwqiwb96d4wi0bxv4cjph4sb4pgb4wjihy2805b0dj9ar" } }, { @@ -55684,14 +56405,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20221031, - 705 + 20230214, + 1632 ], "deps": [ "dash" ], - "commit": "ef768ccdeb8159814628ab0e2714e7dc8d9674fa", - "sha256": "1ckkjb9nl9vfphj6c2zdc5jjsv44b00l8p8kn6dzihazjcip7f4m" + "commit": "3c1677f1bf2ded2ab07edffb7d17def5d2b5b6f6", + "sha256": "0nbmdh0ba89hr617kk0ak78blj7birrxi8rpn9ps38a5x41l46a4" }, "stable": { "version": [ @@ -55728,11 +56449,11 @@ "repo": "rejeep/html-script-src.el", "unstable": { "version": [ - 20120403, - 1815 + 20130807, + 918 ], - "commit": "0efeed7ab948e48128e6f1a7ddff17ef2951e1c2", - "sha256": "11zffiy5s0zqwi8hxwa87j2k8n2lm54v8knnbwa5zafhqpb53znm" + "commit": "ed5e686ab604c81222c7e50b27c5d874c5687db7", + "sha256": "0rrm1azjgclidb8js8qvkhgnlmz9ivbjw69p6z25h5p0rxfx3jnj" }, "stable": { "version": [ @@ -55752,15 +56473,15 @@ "repo": "plexus/html-to-hiccup", "unstable": { "version": [ - 20211129, - 944 + 20230120, + 1416 ], "deps": [ "dash", "s" ], - "commit": "97ecc8cce11f577ad4406da0367aa5eeec1bd8c6", - "sha256": "0i96m9wpgwlxp8b6lw7a8lsjbxb7q9m12p8yra33q7q3ilav4g8p" + "commit": "12f12fe3165eebbcf17e6209693c8e7251ffa04c", + "sha256": "0k25rd75j37dl19h1w03i1sbjdhwczpw5bb9ynarr6xxfk73iaaj" } }, { @@ -55807,8 +56528,8 @@ }, { "ename": "htmlize", - "commit": "075aa00a0757c6cd1ad392f0300bf5f1b937648d", - "sha256": "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wmsgvqyag03qq6rqiqkg2vmzv3rql7h7k090280lp1khgs4xyhk", "fetcher": "github", "repo": "hniksic/emacs-htmlize", "unstable": { @@ -55894,11 +56615,11 @@ "repo": "hassy/http-twiddle", "unstable": { "version": [ - 20160801, - 1911 + 20221203, + 1351 ], - "commit": "46da2dbc40209925aa88ab19014ca982bcf9ac70", - "sha256": "03fdpl64lgwlz8yc29ia9scbh0s5xh7g7jbyfvvp6hcy2f0yiyx7" + "commit": "c07e8620183ec710623db35e26dd839b84c56007", + "sha256": "1r8lb9qzrvpkh8qjba7pjmq4jw2na6grjckydm3s2m65lq618vjg" } }, { @@ -56270,11 +56991,11 @@ "repo": "vifon/hyperlist-mode", "unstable": { "version": [ - 20200515, - 2209 + 20230119, + 28 ], - "commit": "00af994deda061fa95ad0046510eb6a2672c99aa", - "sha256": "1l99h6m1h01iz0fq5nn56lxx8wnvci7jm0iwqyyjrgll808z1ji7" + "commit": "480dbf33ca72e7b5fade952aaf0d5a5eb43acb1d", + "sha256": "0rjlhqrr4plgx8fw8sbj8mv05w9gdc0ac34igm6lxgb4amkrvs00" } }, { @@ -56425,6 +57146,30 @@ } }, { + "ename": "ibrowse", + "commit": "f40df0797df7ac0721debf139418f91dc7e82333", + "sha256": "185z9yqf6qp4q93mzmgz8mr3azbhwgs4gzqrqlv75fk332rpdl96", + "fetcher": "sourcehut", + "repo": "ngraves/ibrowse.el", + "unstable": { + "version": [ + 20230123, + 737 + ], + "commit": "b42685528d7bb2ca968fbf536d8745838e633828", + "sha256": "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya" + }, + "stable": { + "version": [ + 0, + 1, + 8 + ], + "commit": "b42685528d7bb2ca968fbf536d8745838e633828", + "sha256": "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya" + } + }, + { "ename": "ibuffer-git", "commit": "d341da1b9bac782c75ab931fd53a9525a85c702e", "sha256": "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z", @@ -56532,11 +57277,11 @@ "repo": "svend/ibuffer-tramp", "unstable": { "version": [ - 20151118, - 1739 + 20180127, + 2122 ], - "commit": "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4", - "sha256": "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq" + "commit": "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3", + "sha256": "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f" }, "stable": { "version": [ @@ -56556,14 +57301,11 @@ "repo": "purcell/ibuffer-vc", "unstable": { "version": [ - 20221025, - 1411 - ], - "deps": [ - "cl-lib" + 20221215, + 1752 ], - "commit": "813d2dec32bd7ecbb1ecd781c2a63046f71d0dd3", - "sha256": "04h6p5vfxm3pgkjc29wvb58csg7wh31gj9wp4x8i8hpma5gkm07l" + "commit": "9204001d1c5ca39409485c1574fd315b0e137a92", + "sha256": "1xf9brpimdpalrwfd8h9233ssw6b2s6wszissw1836f6x76cx5lj" }, "stable": { "version": [ @@ -56653,15 +57395,15 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210612, - 1340 + 20210630, + 1606 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "5ca5bd6b1bf307953b5fe7be1967c38cc879ad8a", - "sha256": "0xv4lridnzqalgaqg99a715fv15rknznjy3fw4b1jpkjl49rb398" + "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", + "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" }, "stable": { "version": [ @@ -56762,11 +57504,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20220731, - 2354 + 20230208, + 359 ], - "commit": "b3eed5553fe8d7b28bd95b5093e4174d859695ca", - "sha256": "1wp6mcj7j7hdwhdg29d6csma2v02g1w5z5kv5aa9lwmb3w7pfdq6" + "commit": "215d6612b4f8f412c14f9f456106bfa4c5df3d2f", + "sha256": "1wxfry0z7k9xx5yrns127yj5vfbsh2ldm6ajlqz4bxx476zwwwdk" } }, { @@ -56807,11 +57549,11 @@ "repo": "katspaugh/ido-at-point", "unstable": { "version": [ - 20151021, - 757 + 20151113, + 1508 ], - "commit": "6b267f202dc3d3d924c904fbd894e9a209f231de", - "sha256": "1bj8k5fq6x3s5qmr02bnkcls7sndmg4wjjjrsd3fr6yl8c4jcy3k" + "commit": "e5907bbe8a3d148d07698b76bd994dc3076e16ee", + "sha256": "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp" }, "stable": { "version": [ @@ -57180,15 +57922,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20221118, - 1026 + 20230210, + 2150 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "67e06eccbd063078df9671169c60ed5bb941d9cf", - "sha256": "1hc6f24l8z8nz0sg5dz14wrxsi40x5dzx9a4plldcfdh743lsvp6" + "commit": "788f53520db8042fb6dbc56779a9439da0dd6693", + "sha256": "00apzc6n80hwf0g64mzq3pm9jbqw3k3i8ffr0hfjdp1c0777cwiy" }, "stable": { "version": [ @@ -57434,14 +58176,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20221022, - 2233 + 20230212, + 2016 ], "deps": [ "compat" ], - "commit": "d9b5cb5c0a5483e663cc3c345df7659ddf08b61e", - "sha256": "0b53y83w1ksy96h10vnbn0f3is4g5nb3dxmh0v8plrchkwxb0pq3" + "commit": "e8c0f88fa56e3b73307f50a21ab664a4b1bb59eb", + "sha256": "15ldjmvrxlwl0bfwjyw7f9ms3k6asm735la3h6ywkj5231yxfn1x" }, "stable": { "version": [ @@ -57462,10 +58204,10 @@ "unstable": { "version": [ 20180318, - 2027 + 2222 ], - "commit": "5e842a8c60ba98f344edf1b1e65f5a480ed938ed", - "sha256": "16k7cxzdjbblzckp5qppw1ga0rzdh3ww2ni7ry1h43p9cfna0kcx" + "commit": "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea", + "sha256": "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9" }, "stable": { "version": [ @@ -57627,20 +58369,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20220519, - 635 + 20230219, + 1703 ], - "commit": "e022d1a2fdc899b4c22254ebcf8997f5690d7c60", - "sha256": "0knpyh0ci777g6h83lr4pvy7w1syf068gy1p409rg3ssnwjnkxnl" + "commit": "20417eaf6f349b3707e515d5d7817896243a8ad1", + "sha256": "1xymssi0kyipgy9dyda931795xpvr1afnisaccl9yq53rzibwxfx" }, "stable": { "version": [ 0, 9, - 0 + 1 ], - "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", - "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" + "commit": "2b2fe48234e73b447e3578fd211627ac4e78d070", + "sha256": "0r6m8jdn0lknhrivba27c7y54lysiab5nq5lm2i6bybzvc13ism5" } }, { @@ -57684,8 +58426,8 @@ }, { "ename": "impatient-mode", - "commit": "aaa64c4d43139075d77f4518de94bcbe475d21fc", - "sha256": "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "11z0b8992k14jnpshbprsnhhgq1nsrpz3mxak9gz0wh6hi449f7j", "fetcher": "github", "repo": "skeeto/impatient-mode", "unstable": { @@ -57842,11 +58584,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20220818, - 1845 + 20230111, + 2012 ], - "commit": "16ee00e35e9ee82bb06c6feafb148d98165f822f", - "sha256": "1ghwrg7w9b3xhfj2yjxzd9ysbgrb81pkg6gqhiq3n2zsia18i87p" + "commit": "936575500f733c2428ba878f9400f3eef8c9645e", + "sha256": "16zd5bk7s1h9yrrsk0ngpzb4cfyj4gkmq70m0ijsc94az7m9rlx3" }, "stable": { "version": [ @@ -58135,11 +58877,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20221013, - 2100 + 20221120, + 2028 ], - "commit": "0eaea59f20889b3d0048719377e5a05a2e7fea1a", - "sha256": "1swiw3yih4xbgrh4dx7sqxrz4d7jjkhnjfirjdcds0c6mjg0cvzp" + "commit": "6fbb0867b586ad1bf8adc09cc55f33dfa72db833", + "sha256": "0gwg2hjz0s6gkyifvni3mghrp7174prwrl46sbxx5pi9s435djpm" }, "stable": { "version": [ @@ -58174,11 +58916,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20221016, - 2238 + 20230122, + 246 ], - "commit": "c6192178941b46754fdb50405f344481c8ef2fd1", - "sha256": "1rmhqwhyp7756z0zl313clv4wkv1zxvyhlznqjpjwqajcjbz1ib4" + "commit": "0ce7f4049edcae188b4643b3163e5301f9ef09cc", + "sha256": "0ygm4y0iwvh1mz883x9727jlw0pnf0xgl4b1xysbvsyg6gplf0xv" }, "stable": { "version": [ @@ -58459,11 +59201,20 @@ "repo": "Lindydancer/ini-mode", "unstable": { "version": [ - 20170424, - 909 + 20230211, + 1512 ], - "commit": "2194cfa2fd13196a37350ec20b3f00dcf6162b7c", - "sha256": "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk" + "commit": "5472abc94e564edc6b469c48d2324519a044a77c", + "sha256": "1k2xscd9dhxd4znsxn3ryvds8g9yrd82bz4jdx5p2km9czpjrj88" + }, + "stable": { + "version": [ + 0, + 0, + 7 + ], + "commit": "5472abc94e564edc6b469c48d2324519a044a77c", + "sha256": "1k2xscd9dhxd4znsxn3ryvds8g9yrd82bz4jdx5p2km9czpjrj88" } }, { @@ -58571,11 +59322,11 @@ "repo": "ideasman42/emacs-theme-inkpot", "unstable": { "version": [ - 20221029, - 2301 + 20230110, + 950 ], - "commit": "7b723a7c9c6381d09cc1c267fb067c055cfeab72", - "sha256": "1wrb6m7i180pxa2mg3737vhamzmrrwki0ii44iakp5588qyn7y3c" + "commit": "fa0746d927ad205b2f17589e67703c18f42aacf4", + "sha256": "1q8mqz8635fgg1jsp0gypngjicymnfw1ba50hvvzd4nigg107xhz" } }, { @@ -58712,11 +59463,11 @@ "repo": "lassik/emacs-insert-random", "unstable": { "version": [ - 20220622, - 1653 + 20230212, + 1710 ], - "commit": "049567eeca639017ac2db786cefaf38af7273654", - "sha256": "0ml5sig9c9q3s51wk32njwnfnz6s8jpbmj43ni1l33dlvyc10jl7" + "commit": "a13827fd68457f939e46f95a662752f6f344107c", + "sha256": "1jlbi6hv7f5aar5mf5zqa3pr6m7qss9hfsi5glgjg26m7633pv7d" } }, { @@ -59113,8 +59864,8 @@ }, { "ename": "irony", - "commit": "d2b6a8d57b192325dcd30fddc9ff8dd1516ad680", - "sha256": "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a", + "commit": "c1cca9d0b5a701d542f37f21748eb4be00af3b4a", + "sha256": "06x7b26vkdfjw6jk27s45hgaff7p4xjdmpncdgcgjvwyy2wbw1j6", "fetcher": "github", "repo": "Sarcasm/irony-mode", "unstable": { @@ -59310,14 +60061,14 @@ "repo": "pythonic-emacs/isortify", "unstable": { "version": [ - 20190315, - 2004 + 20221121, + 1816 ], "deps": [ "pythonic" ], - "commit": "4d8ecfcadf58ea51368e66ecf6f2a95a95953fcf", - "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z" + "commit": "2751fb23eea4a40437e7d9bca77cbc9c06b44f3d", + "sha256": "09j042cl7mvhbp1r1fzxl17qc9z5ba0s6h5nwjx1yph7x1f7gmcf" } }, { @@ -59423,8 +60174,8 @@ }, { "ename": "ivariants", - "commit": "ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38", - "sha256": "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1krll431c0jzy1g7w16b70lqa49is5pp9axaagn9nfv9l3hck8a6", "fetcher": "github", "repo": "kawabata/emacs-ivariants", "unstable": { @@ -59909,16 +60660,16 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20220309, - 605 + 20230121, + 1934 ], "deps": [ "ivy", "migemo", "nadvice" ], - "commit": "f31a2b314b81e328ce0222d8796b808230ddaa0e", - "sha256": "07l6x4aysxzrwlva7df5mdmb8kir1w9jpk7jqc5823zd00dmd6hf" + "commit": "6022b24e72f073a7b5599f2dea611da3a1282378", + "sha256": "1qg60wgykxzhngzg7lw1fdmji8qrdigak9w40qrhsh70vlyssha5" }, "stable": { "version": [ @@ -60066,27 +60817,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221112, - 344 + 20221216, + 112 ], "deps": [ "ivy", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -60374,13 +61125,13 @@ "unstable": { "version": [ 20131027, - 1629 + 1657 ], "deps": [ "grapnel" ], - "commit": "47632caf925fbb3cc8633834d2d619032d039336", - "sha256": "1j6axmi6fxcl2ja4660ygxchggm2dzjngi0k3g6pimawykvgxs3n" + "commit": "498dac674f4f1910d39087b1457c5da5465a0614", + "sha256": "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a" }, "stable": { "version": [ @@ -60438,6 +61189,29 @@ } }, { + "ename": "jack", + "commit": "87a205d634c117b81f3e982ee75ebb9a0cbd0d08", + "sha256": "1f0a7nsmigw5qk7s6r80n3a7gi8bq2khsd96i3j58xd12mvnp38m", + "fetcher": "github", + "repo": "tonyaldon/jack", + "unstable": { + "version": [ + 20221122, + 632 + ], + "commit": "3b4ea97fcc107d0ffd201ea695129af52f390113", + "sha256": "1cizszj62ic41zc97glf2mdvm1kd95vdfg2dip3n2p2g0nlk2hjf" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "7e4b1a1c732fdc8ccda4bb78c0aa8697bdf43491", + "sha256": "0w89qgjry3gp3mclnpglma1pvq8cdxbk074153v38scpw3ankp2h" + } + }, + { "ename": "jack-connect", "commit": "c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85", "sha256": "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q", @@ -60753,8 +61527,8 @@ }, { "ename": "jdee", - "commit": "a6d2c98f3bf2075e33d95c7befe205df802e798d", - "sha256": "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4", + "commit": "5d8c2c6662dc3cd0140bc039a1dca9c3e38673f4", + "sha256": "0a0p01w1azqxjalmij2prqapwrzq9wf3iwrhbkrjp2464z3mbb2f", "fetcher": "github", "repo": "jdee-emacs/jdee", "unstable": { @@ -60962,14 +61736,14 @@ "repo": "john2x/jenkinsfile-mode", "unstable": { "version": [ - 20220428, - 1113 + 20221124, + 30 ], "deps": [ "groovy-mode" ], - "commit": "fa5545be1329df3067dcfd81749bbd99df070d6b", - "sha256": "1cg1k3c4k21im499i09yajqhh20igmd2riyia8y65swvvksnzyrc" + "commit": "1d90c1ff8edc7ea88844af92a206e7c5f083b568", + "sha256": "0l51r96vyk8wq8d6jmbchna2ckv47qzm290k4mpybxp85phvajzj" } }, { @@ -61011,6 +61785,36 @@ } }, { + "ename": "jet", + "commit": "964d3110aee413dacb5b303229eba62da5a0b2df", + "sha256": "12hpl5m2qhzdcivdd1xff4dh9fyqpn2y8v9n6khv4qh7d6x014gq", + "fetcher": "github", + "repo": "ericdallo/jet.el", + "unstable": { + "version": [ + 20230213, + 1615 + ], + "deps": [ + "transient" + ], + "commit": "90fcdec479d2b1755a1410ae65d53d421f7683c9", + "sha256": "05xc3pxr0wa3asrlkga7kdw8k81lgd7l42pqd222692apvd2j33g" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "transient" + ], + "commit": "90fcdec479d2b1755a1410ae65d53d421f7683c9", + "sha256": "05xc3pxr0wa3asrlkga7kdw8k81lgd7l42pqd222692apvd2j33g" + } + }, + { "ename": "jetbrains", "commit": "00dd4626e261d9831fc62d866d50b7257ee418c4", "sha256": "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7", @@ -61172,11 +61976,11 @@ "repo": "ideasman42/emacs-jit-lock-stealth-progress", "unstable": { "version": [ - 20220905, - 41 + 20230117, + 117 ], - "commit": "ebcff242ab90e7562f9873c946a9b067459da779", - "sha256": "178hy00mjaanxry23prnpl3fzzx6v7pl6ma6qrszry7wiyavh7pf" + "commit": "0a6881b887f846f224c939c598bf0807bde2018e", + "sha256": "1m57j6m9f1x79bgffgh86f9ffpmvk06vph2shk0ap1is4qbbckqx" } }, { @@ -61202,11 +62006,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20221117, - 1441 + 20230220, + 341 ], - "commit": "be47c70024dff044322b281ebbcea38de6d5b50b", - "sha256": "0n1hhq7vmj9a7lww8vfwq96lmsdsj5hngb18gid2qav7kf32dlw3" + "commit": "4f14058229855c0a92bab19d76a295dfdcb35f10", + "sha256": "08fgd6l5k6fh3pjc2vgbj919g6d3cvvbsblxki5mix94g0g1bvyh" } }, { @@ -61237,10 +62041,10 @@ "unstable": { "version": [ 20221119, - 901 + 1653 ], - "commit": "c902ad94c2d043f620a44e4c9b1bd7f4d6f22229", - "sha256": "0xp149ibvjxr04pnlfl75gfcjwa91wxvk59dr6fa6761j6phc98j" + "commit": "baaffdfd22a19afb1997ec3715d063186b80d3f5", + "sha256": "0kjzgz8kzvyh7kqjcd9r2cfrhldv90v3yjkpd41vnzbb29b46d4h" }, "stable": { "version": [ @@ -61381,8 +62185,8 @@ 20180807, 1352 ], - "commit": "59caa137c4beec4dec4a7d7ebf8bcb6af44d72f0", - "sha256": "10xxg8lc4g9wdl4lz7kx6la23agpbq4ls1mn5d4y364j8nfcxf9g" + "commit": "29d245b4d126a5fc5153a4d8f17396be4165b4a6", + "sha256": "1d0q59rk44jf87ppnn5bwr14p2vgcnfdr7pf6hdqkhb8gzr8bh7c" }, "stable": { "version": [ @@ -61417,11 +62221,11 @@ "repo": "redguardtoo/js-comint", "unstable": { "version": [ - 20200117, - 615 + 20221201, + 1150 ], - "commit": "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6", - "sha256": "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka" + "commit": "30e521ada5806ab780f68e09529715acb88f32cd", + "sha256": "1khxry9rvmcwh1mzqlxa5alfcwh2cqi2afz8b6yya3ahxfal5i5q" }, "stable": { "version": [ @@ -61474,16 +62278,16 @@ "repo": "jakoblind/js-import", "unstable": { "version": [ - 20210105, - 829 + 20230131, + 1900 ], "deps": [ "dash", "f", "projectile" ], - "commit": "941091b3ab074c482a5920194d61f50e9b50d503", - "sha256": "1p18lg3apmhcmvkwldnygy35s1kjj68sgv81lyyf0csvc0pxbcpk" + "commit": "9f8b6bc4f080c7146ce7ee5dd5a6572aeb6f1cc7", + "sha256": "1nlcfqy4wciai7g9zdjy4lx50dipv6yq74fladgsw7yq98hpg501" } }, { @@ -61903,10 +62707,10 @@ "unstable": { "version": [ 20220205, - 1503 + 1504 ], - "commit": "dcbe7cc6eadf5b6ef0cadb6ec5111af2b541e73a", - "sha256": "1mr0k7gyw82gsrr26pvz08zfwvb29caf8gyv3kvnqh6pcnla05sb" + "commit": "349e1f4722474bf1f75dbc8eb9d9c59d790b8083", + "sha256": "11911dk8nkacml6p29m5kpcxhjyas5ymarjsi802s426gpn8wj94" }, "stable": { "version": [ @@ -61950,11 +62754,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20221119, - 518 + 20230117, + 2212 ], - "commit": "1e8103c281bf7781bf3246d2049165d8966710c6", - "sha256": "0xv5lsl21h0jg5iryg89j6qf4c97v2rw7rh5ja8bbch3s21bv69c" + "commit": "d0583a890a8e43845935c31de9f069192011451e", + "sha256": "1ccp7fm9cdq51p00b70plyxwfqp0j4241airxa0hd868m4vi08pz" } }, { @@ -62080,11 +62884,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20220418, - 809 + 20230119, + 1840 ], - "commit": "adf4029be778c5983c436873b8a78bc72a6b09f8", - "sha256": "0z6vx541vskgzb1dmlcijbch4z84lrz5fm2ay0n15sypvxfp2yks" + "commit": "7aafa8e77df64a47fa4729a0c1ea572b5bc8e30e", + "sha256": "1agk2jf76ardqxm28nw341jb92sl6ylkr8yfibsp5vaid9dlq6bp" }, "stable": { "version": [ @@ -62103,14 +62907,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20221026, - 833 + 20230112, + 1929 ], "deps": [ "s" ], - "commit": "6625e95c3d0561c6966a13c2565d35d2ae6c07ca", - "sha256": "0iymb4zmgcxpyxdrpw5icqmmw711p85c2s593kqf3wxcbx8acv45" + "commit": "57a15dfafed680ad7d81f779d414e8cb6717417c", + "sha256": "1bpp7216j1a3agwfsidikf65mmym0xyhq2yn6s9ipsk25n6vac1s" }, "stable": { "version": [ @@ -62183,6 +62987,24 @@ } }, { + "ename": "julia-ts-mode", + "commit": "fd6521584f31c6d349aead6647b58fddbc1529c9", + "sha256": "1m6hm69pc1m47bk09cwlv544bkqy552nqg95w3shch18kslgli8n", + "fetcher": "github", + "repo": "ronisbr/julia-ts-mode", + "unstable": { + "version": [ + 20230124, + 1427 + ], + "deps": [ + "julia-mode" + ], + "commit": "d78307d95a2a97abc54c918eb8feffa62b26673b", + "sha256": "0psvglckx4ryav0bjadn7s0zbxiddq7z03bkr0fkhr2gsdga69zq" + } + }, + { "ename": "julia-vterm", "commit": "401185621fd57899b314a205ea1ffd9765e570c8", "sha256": "1992mnbpiw9pr2vy8ad4hmb4q02va4ha5995dwqyc2h9hzld35qa", @@ -62238,16 +63060,16 @@ "repo": "eschulte/jump.el", "unstable": { "version": [ - 20161127, - 128 + 20210110, + 2237 ], "deps": [ "cl-lib", "findr", "inflections" ], - "commit": "9519c675e8a650f6afade7d870e925d0fb50f112", - "sha256": "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -62343,8 +63165,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220419, - 1852 + 20230214, + 215 ], "deps": [ "cl-lib", @@ -62352,8 +63174,8 @@ "websocket", "zmq" ], - "commit": "7d20c0aee2f9c896215f35232905b23532ef04c5", - "sha256": "0lrg43xas5dx1qlhzk7irq5hwgpfpxkv27zgcrcy0sbhd9y8dad6" + "commit": "eebeef1293287075f65d27f5442bb151bf27d92a", + "sha256": "188xkmvl8qz2bkvgy57w8xpnfbif7adrnj0jyqhgl5xhxv40l0gz" }, "stable": { "version": [ @@ -62403,29 +63225,29 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220903, - 901 + 20221222, + 1650 ], "deps": [ "f", "s", "transient" ], - "commit": "c1995b1a2ea09d7a2af69edcc2a47f5b6d217d5f", - "sha256": "0qa8q5asnjwl4b3ljgpl3ckahfrr1vbmbqha4paq5b63aiblgm2g" + "commit": "141daaa4b0dc07fe25423609dcd14441a9f2613e", + "sha256": "01z86a5bfpgsczy4xbzl6wwg5wwcjnjb7za7xsdv8lvam1s4868n" }, "stable": { "version": [ 0, - 10 + 11 ], "deps": [ "f", "s", "transient" ], - "commit": "c1995b1a2ea09d7a2af69edcc2a47f5b6d217d5f", - "sha256": "0qa8q5asnjwl4b3ljgpl3ckahfrr1vbmbqha4paq5b63aiblgm2g" + "commit": "141daaa4b0dc07fe25423609dcd14441a9f2613e", + "sha256": "01z86a5bfpgsczy4xbzl6wwg5wwcjnjb7za7xsdv8lvam1s4868n" } }, { @@ -62460,8 +63282,8 @@ }, { "ename": "k8s-mode", - "commit": "44085c3f730315a5fc2a9a003ffa16d5df9f9a52", - "sha256": "14m4s0l61a2h38pdq6iczva24cl3mqdkw99k1q0drisdrvy57f33", + "commit": "949da8f16687bad96f53714ccbde895587d439ff", + "sha256": "1xxz2y3wnlqy70d3d68icrblz7832yqhdlzc5h027c61j9p1pg07", "fetcher": "github", "repo": "TxGVNN/emacs-k8s-mode", "unstable": { @@ -62496,14 +63318,11 @@ "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20160128, - 1008 - ], - "deps": [ - "cl-lib" + 20230212, + 743 ], - "commit": "d087075cb1a46c2c85cd075220e09b2eaef9b86e", - "sha256": "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9" + "commit": "d62b18e888d69d27b0b74cf47224a1ac204dfb0b", + "sha256": "060zskrrr0m9bfccskl06knlly3zwy1s9dzyzn9l4n8rr487fqqq" }, "stable": { "version": [ @@ -62526,14 +63345,14 @@ "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20160128, - 1008 + 20230212, + 743 ], "deps": [ "kaesar" ], - "commit": "d087075cb1a46c2c85cd075220e09b2eaef9b86e", - "sha256": "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9" + "commit": "d62b18e888d69d27b0b74cf47224a1ac204dfb0b", + "sha256": "060zskrrr0m9bfccskl06knlly3zwy1s9dzyzn9l4n8rr487fqqq" }, "stable": { "version": [ @@ -62556,15 +63375,14 @@ "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20160128, - 1008 + 20230212, + 755 ], "deps": [ - "cl-lib", "kaesar" ], - "commit": "d087075cb1a46c2c85cd075220e09b2eaef9b86e", - "sha256": "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9" + "commit": "48b7160a817cb1e430726e1d2243d921c3f0508f", + "sha256": "0kxd9pl5d4nlbwpvyv0mnp2hd14z65b1mfksr24s1gih5df8ii2l" }, "stable": { "version": [ @@ -62617,16 +63435,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20210220, - 1858 + 20230206, + 2037 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "c39f278811945dbf0958ca8cf81d7b03c39efbcf", - "sha256": "0ajh4nk8brwi41rsbd9dn5gbf7i2mkaxm3aal09r2wgmgxigsiqp" + "commit": "b39c5605e896c55ea246f755c46171bd6d0768a8", + "sha256": "00581hhj6rw2p4d3kjfifd1xylacjsgjcg29f2svd412xlmhkm2j" } }, { @@ -62693,11 +63511,11 @@ "url": "https://hg.sr.ht/~arnebab/kanban.el", "unstable": { "version": [ - 20170418, - 810 + 20230206, + 2131 ], - "commit": "dd11d722b20ae720f29b8aa93a3b1cad87650b33", - "sha256": "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb" + "commit": "9b588f94efb5a784c9bc10ad66f424b253c5fe5e", + "sha256": "18ywrhj74v7vlcfz84ld90qs9axc2p61x05q27hv2fhzmv3pc72b" } }, { @@ -62751,21 +63569,21 @@ }, { "ename": "kaolin-themes", - "commit": "043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4", - "sha256": "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0f498cqs1an5d9spfl0581ycbv1kw4skqpjnvjbnlspldcqcqrx9", "fetcher": "github", "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20221025, - 812 + 20230126, + 2302 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "c24665044f1bced33b6df4e36e55495f05050c78", - "sha256": "0qryc82d5s314bm1ijxn7hk5fpm1qclr2hc630sh3ppkgayrlp48" + "commit": "e69a183c1173f7f9ee19ad06ab109ade3811ae77", + "sha256": "0csiglvggxqliakgx94dmy5bifgj72dal6w6shrg1q1abq2ra995" }, "stable": { "version": [ @@ -62884,10 +63702,10 @@ "unstable": { "version": [ 20211030, - 948 + 958 ], - "commit": "c45e0854041b94e5ad8bc512474b0e3e286f72fc", - "sha256": "0mp0msh8ppdy6x1lbi1f772b5xr9v3i6pscsdd5wfgafkq2wlsvl" + "commit": "f432bb60f9f3bd027025140d723906dcabeefaef", + "sha256": "0wrzbcd070l8yjqxg7mmglc3kfgy420y3wnykky198y83xsv3qy2" }, "stable": { "version": [ @@ -62930,6 +63748,48 @@ } }, { + "ename": "kele", + "commit": "cebfd6d6356a70955f518c785ec9258305de9415", + "sha256": "1s0jgh5ajx93wgs5ycdfay8bh46bw2ycys2fvj5zqwmb0anhadqn", + "fetcher": "github", + "repo": "jinnovation/kele.el", + "unstable": { + "version": [ + 20230205, + 1814 + ], + "deps": [ + "async", + "dash", + "f", + "ht", + "plz", + "s", + "yaml" + ], + "commit": "8faeb28bcef6d4a3d314364f1b7252e7e6f916a8", + "sha256": "03an3n9hnaz8sz34gmdyl5hav1cms3i73ywzsn1y9idybbmdy3k9" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "async", + "dash", + "f", + "ht", + "plz", + "s", + "yaml" + ], + "commit": "8faeb28bcef6d4a3d314364f1b7252e7e6f916a8", + "sha256": "03an3n9hnaz8sz34gmdyl5hav1cms3i73ywzsn1y9idybbmdy3k9" + } + }, + { "ename": "kerl", "commit": "166afdc776689b0da93576dbeaa71ff6dfb627db", "sha256": "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss", @@ -62952,11 +63812,11 @@ "repo": "Boruch-Baum/emacs-key-assist", "unstable": { "version": [ - 20210722, - 758 + 20230122, + 718 ], - "commit": "8e5cd089e0b2fedec57c55eeff74cdb6121441aa", - "sha256": "0lg8v6lsa62zhnlrz47hlda65ra6yfqijgz4jcl5vxcx2hgks8g8" + "commit": "41a958ca6b038586bfdcf01045bb8b9d379248fe", + "sha256": "099g9y3ky8hmgrq68idcjwa3452jdkggblgz397824kj13d7z02b" }, "stable": { "version": [ @@ -63096,14 +63956,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220422, - 1611 + 20230212, + 2016 ], "deps": [ "compat" ], - "commit": "0c37db482ca98e729430121209d70dd093082a5e", - "sha256": "1i4l145k9jrl8dv5wkcg3nbm6s0as1myz8vzh4k9rdi2ra6lkajr" + "commit": "cabb3fac1ccf2980ff3bcdbc1648d2a15ebe7cb1", + "sha256": "0zvq7i3v3ycki695ah7iim134qmg8m9dcblj3srrr1k8kp63ywq0" }, "stable": { "version": [ @@ -63196,26 +64056,26 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20220918, - 2243 + 20230213, + 1152 ], "deps": [ "compat" ], - "commit": "e4ef3c5fb46b1f749c9d838d2eba709e164402e2", - "sha256": "19vf6rmydf0ayns9cllj2skq79xjfdn343csijmy3vb6hp3zq869" + "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", + "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" }, "stable": { "version": [ - 3, - 2, + 4, + 0, 0 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "753fa7b5bdb761a1eb9a7b09db50c0bee3ae5241", - "sha256": "0604l1rxvxq88i2pnb4q0jaf9i3pmf3756nkrivvaj1l4v6nswlk" + "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", + "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" } }, { @@ -63331,11 +64191,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20220704, - 626 + 20221231, + 1655 ], - "commit": "9d232decb1dee73b1b60480eb9c7ab6750ea90e1", - "sha256": "05wxrpp6758anp88n25fizc9qwjcf0df7b1mdfi7a4hljzq15z0n" + "commit": "51c8f2f1f207cc67af4e67731ee056860e107811", + "sha256": "067gmril73ri1zsakh284vxaw8sqmyr9vflmsh7a3033p4gabw4w" }, "stable": { "version": [ @@ -63388,20 +64248,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20221008, - 1456 + 20230122, + 1139 ], - "commit": "fce18763a07769f2dbbb84eb20490aabbf612b66", - "sha256": "1w951a7czw5f62d9336lvrrsw57pym27vscfby1pz6n6ld44ybsl" + "commit": "fbd4b4d6ae8f152140674e843ed7d82d223d52fe", + "sha256": "025c12im3yvxb37a5y5x7zwdwll50lzx5nzsh54ipacrzhc0fyn5" }, "stable": { "version": [ 0, 1, - 8 + 9 ], - "commit": "bc919e40ce9afbc1cc160d86c27f73b1cb9f5b50", - "sha256": "1w951a7czw5f62d9336lvrrsw57pym27vscfby1pz6n6ld44ybsl" + "commit": "fbd4b4d6ae8f152140674e843ed7d82d223d52fe", + "sha256": "025c12im3yvxb37a5y5x7zwdwll50lzx5nzsh54ipacrzhc0fyn5" } }, { @@ -63435,6 +64295,36 @@ } }, { + "ename": "khoj", + "commit": "2d2fb91173b05871a0bf56d09f264ca44ae27c06", + "sha256": "0jcjn8va5hqx7pgpz42g3djbrfji3b8nmp2mc1v2zss124nx715w", + "fetcher": "github", + "repo": "debanjum/khoj", + "unstable": { + "version": [ + 20230218, + 231 + ], + "deps": [ + "transient" + ], + "commit": "61b6ee2857b92721fc2c7e1329ae476a8d41f040", + "sha256": "16rcjgyaqkncfxy8zihn339rj1dxc55pcr4h1m1z1hpq7dnk895a" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "transient" + ], + "commit": "47c2cc63e166543447d9604d5c462b90e7342fc3", + "sha256": "1ngnvf788bgfamcp0d3chim1ka04pb0629xkv30z6bg96p88lhpn" + } + }, + { "ename": "kibit-helper", "commit": "f7fee551ca9ed226f1285dffe87027e1e1047f65", "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s", @@ -63465,6 +64355,21 @@ } }, { + "ename": "kill-file-path", + "commit": "bbb76c99758c378c1cf26046a4e25e0933dfd947", + "sha256": "0gif8qrrgqj0vgffznqwxwia9c750nkpnwdszcavn2xfyrj67vf8", + "fetcher": "github", + "repo": "chyla/kill-file-path", + "unstable": { + "version": [ + 20221205, + 1119 + ], + "commit": "88de62d038d7e6e0e0a217c4773a1871549c7c3d", + "sha256": "0dry8wlci74qwpaaw8fic54hack71qhsybgbqvv48ly6a811rcpi" + } + }, + { "ename": "kill-or-bury-alive", "commit": "25016ed09b6333bd79b989a8f6b7b03cd92e08b3", "sha256": "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8", @@ -63587,11 +64492,11 @@ "repo": "kivy/kivy", "unstable": { "version": [ - 20210318, - 2106 + 20220306, + 810 ], - "commit": "db86b06b9b72e514c122e3f54a0bce74adad44c5", - "sha256": "1v14gsk1fal8xqpy8myk02n7s0f0yzpcmgf8a0mizh858y1sbxxv" + "commit": "023bd79b90f9831b45bb8eb449346648aa5fe5f8", + "sha256": "0q0hn1q5l1pg3ma2x922m93vpfax7x9cmm8psy3qw7b5pf4cillk" }, "stable": { "version": [ @@ -63656,11 +64561,11 @@ "repo": "WammKD/emacs-klere-theme", "unstable": { "version": [ - 20221101, - 805 + 20230214, + 213 ], - "commit": "6f63bbf71653ec94ccc3693141f031eb6902b25f", - "sha256": "131az3gfpspzg8xlhmcryzkz83nfxzh1jcd4aa0fzcixxz59kqcl" + "commit": "61d2cd649a1cf57ce61063f76b395f21f358372e", + "sha256": "006130dd83h5d3qxj7x8j64pxq05mq0rcyx68i5n2lfwj94k6sv5" } }, { @@ -63687,10 +64592,10 @@ "unstable": { "version": [ 20160208, - 2304 + 2305 ], - "commit": "ab8cf84ad8031ff85b983c528ebb7117dc784aad", - "sha256": "19qky551arnb7gl7w0yp54kkdls03m9wn9bxnr7hm5nv1bml2y64" + "commit": "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7", + "sha256": "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k" }, "stable": { "version": [ @@ -63792,11 +64697,26 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20220527, - 1646 + 20230123, + 1859 + ], + "commit": "fddd747e5b4736e8b27a147960f369b86179ddff", + "sha256": "0wbv3pjanmf97wchhg1w8ahvpxn8kgpnl45pmwqg019xj9yfpgpb" + } + }, + { + "ename": "kotlin-ts-mode", + "commit": "33ccef52aa0d6df974c1128ab2ba8febb9187877", + "sha256": "088b87mmcalkjqz1m1p53v3d9jldvrsbc0rcfvypsid9gpaisv25", + "fetcher": "gitlab", + "repo": "bricka/emacs-kotlin-ts-mode", + "unstable": { + "version": [ + 20230119, + 1153 ], - "commit": "99499e1500034b5fd5fdce9bfef367d90c61b5ce", - "sha256": "067m5idlnfz01aiynmnxh3x3vv4c2nkkldskv7g1cssxqaxagnxj" + "commit": "28eb29a99a5f334e7e7c0e2f2ada23159f114bc5", + "sha256": "19q4gvrccc1yfwg46wb82fs5qj6ml9qkgjf8sb00nwbnb0jb48k7" } }, { @@ -63859,6 +64779,30 @@ } }, { + "ename": "ksp-mode", + "commit": "b979d0d2f3007d166d595ecf7140d78585efdd6c", + "sha256": "169grixvkchz8h8jp3ns1jnqi861la7rgsm58kbmdf6pigi729zy", + "fetcher": "github", + "repo": "youngker/ksp-mode.el", + "unstable": { + "version": [ + 20221220, + 1136 + ], + "commit": "89b91b8ed6753867e30aa494e5d80325dfe25569", + "sha256": "1pw40a7acs0xxabmyfn359b2zcgmb5c1fv98q1x0276ws0hh0jzw" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "89b91b8ed6753867e30aa494e5d80325dfe25569", + "sha256": "1pw40a7acs0xxabmyfn359b2zcgmb5c1fv98q1x0276ws0hh0jzw" + } + }, + { "ename": "kubectx-mode", "commit": "e1a9badd46f8900a1d6355cb2c703788ed66e8fb", "sha256": "0g73yf3kl1f1c40p1na29hli4q0ligy0dh0lxc21k9mj57dbnzyg", @@ -63905,8 +64849,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20221112, - 240 + 20221123, + 241 ], "deps": [ "dash", @@ -63914,8 +64858,8 @@ "transient", "yaml-mode" ], - "commit": "ca6c3f84cefaf1287e432f2f3b4bdf630edd3bac", - "sha256": "0y3f1c4fbzy0yb5n986bzmgkkaxhgw06wxjvla4mkln6hccnxdia" + "commit": "5962d566db17ddfa25ac3120b4591df1d741e979", + "sha256": "1mi5xp573ww0agscjd4qxvnxgsrqgk23f7kiy406p4cm2h2s7cfl" }, "stable": { "version": [ @@ -63940,15 +64884,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220318, - 2124 + 20220909, + 2028 ], "deps": [ "evil", "kubel" ], - "commit": "79b0624293a76c19ddc5f6e0f9848af7aa3fd91f", - "sha256": "115hdaav9ik55s4vjm15q7y20wh4w15m6z5v1hz0v0854hvzhgsl" + "commit": "1b405d8756ffc7c8f1e11450d6f07ffde38fe351", + "sha256": "1a724p9xcl1x50bxrhyyriza3wmcm1q9ljflf9ba5fgl2vrvcw5h" }, "stable": { "version": [ @@ -63971,8 +64915,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220715, - 1717 + 20221229, + 1519 ], "deps": [ "dash", @@ -63983,8 +64927,8 @@ "transient", "with-editor" ], - "commit": "8163fd38015cbde0485f6eaab41450132bf6e19d", - "sha256": "06p5qz4h5ar86vv4nzpw08x18fjvs2zg5brx55h80hjdgr89b771" + "commit": "099004511670c7fd52a619c5758047bb3172ba36", + "sha256": "113c490gp69pkq9rnw5s7vfkr8pw14q7lv205gwx8awg129frnpn" }, "stable": { "version": [ @@ -64045,14 +64989,14 @@ "repo": "abrochard/kubernetes-helm", "unstable": { "version": [ - 20210902, - 2232 + 20230221, + 1438 ], "deps": [ "yaml-mode" ], - "commit": "95cf92600436f67bd7bfe650763e68635f5ecc8e", - "sha256": "0k1kk472yianf5sn05hxqfpza5yxm9lmr917wmw3mca17758hsgm" + "commit": "f70e2efa6ef869143ccb2f158f4ab7df91dcc58f", + "sha256": "1nsjnfabg4nqvy5z2pbxjcsqykk9as12frq5lgrypiax42rx2wp0" } }, { @@ -64081,26 +65025,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20220830, - 1620 + 20221213, + 124 ], "deps": [ "s" ], - "commit": "553e852e19b01015f84846568d96cde9ef670ba2", - "sha256": "18csg7y73bwvdimsj1kjzkzbsh925yd2p3jjh2wcixqykxlqx3kr" + "commit": "ac67ceba85839ab1ced96fad605bf023b697263f", + "sha256": "0xi330md4av8qczm5973ps2qvmx4fc0z28547viq5as3v897psn2" }, "stable": { "version": [ 1, - 6, - 2 + 7, + 1 ], "deps": [ "s" ], - "commit": "553e852e19b01015f84846568d96cde9ef670ba2", - "sha256": "18csg7y73bwvdimsj1kjzkzbsh925yd2p3jjh2wcixqykxlqx3kr" + "commit": "ac67ceba85839ab1ced96fad605bf023b697263f", + "sha256": "0xi330md4av8qczm5973ps2qvmx4fc0z28547viq5as3v897psn2" } }, { @@ -64158,36 +65102,6 @@ } }, { - "ename": "l", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "0ggbgbpskdbywyqh0mpyfq5jlcwlqpv8fbi7jcdmyzmsyfjwhbgd", - "fetcher": "sourcehut", - "repo": "tarsius/l", - "unstable": { - "version": [ - 20220422, - 1612 - ], - "deps": [ - "seq" - ], - "commit": "e7c4cbd930fed4a4a183e473ad2598610de00e21", - "sha256": "0m0ck78d8pkm5hd9gicc33x3gcqjcnvlafny6cncl38kc33gv47a" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "deps": [ - "seq" - ], - "commit": "5e2c05478868e9e5fac909ac1bee535ffc5c6695", - "sha256": "11fmcqn9xpq8hqwf914yd715xrbfyymki95iq5y3r4x42gl30q7s" - } - }, - { "ename": "laas", "commit": "db04bf3e4da0a51cbbab7db4c6070f1d06053c90", "sha256": "1cpd9zflk57fb70xjlkfwr9ghv11xmvad5px0fzb6gf51gqh3g6x", @@ -64243,11 +65157,11 @@ "repo": "ksjogo/labburn-theme", "unstable": { "version": [ - 20200822, - 2153 + 20221208, + 1611 ], - "commit": "4ef2892f56c973907361bc91495d14204744f678", - "sha256": "1kpin7r1a1la9s4khrn6rwhgkbib9j7lgyqk9b48fzjhp1h25mgq" + "commit": "bd0de2fdcf285d981f32e3e5ebc56fe3c9b589a5", + "sha256": "0nj61wqszm6wi4hvvc640iy1b65k8cwfggcys49p30f6f6jk6hlm" }, "stable": { "version": [ @@ -64267,19 +65181,20 @@ "repo": "zakudriver/lacquer", "unstable": { "version": [ - 20220811, - 649 + 20230206, + 756 ], - "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", - "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" + "commit": "8a4e7dc1827862ad025f2af5354ca377cc660939", + "sha256": "05h8ycdmqds016m17hz86v4xnlsy060lmfrjddy3cazwzgs1a4s1" }, "stable": { "version": [ 1, + 2, 2 ], - "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", - "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" + "commit": "ebdb531f5b7cb691751e468942e28921a9dcc98f", + "sha256": "1xfvf21g2p2zh5g5wih37nrk6z8fpxsy4hw8sfsmrk2fx2cw5sj2" } }, { @@ -64305,30 +65220,30 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20220909, - 1444 + 20221228, + 1622 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "8752043f903acc7f4c54bc9ea18b9cec83beee70", - "sha256": "1y28dbw1n4mw0abdb628111h1z7mz2jc2jnyskpw9hv4mbnaq5b9" + "commit": "1f4e1a024bb0b0f3a0fdd8b5428e737adf1a68d7", + "sha256": "086mqschzr420kad5x7ibjwz3b7ckfkkqv7486pn5pmbkqrb2iwg" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "33348d8325916da440a4e96490fd20b0f6d313c5", - "sha256": "0aqqrmg5hj0323412l3qb566j1bcgff39ll7bzy4ghlrz14n6rm7" + "commit": "4939b93c2721c8aa4dc88a7b8190dd43e3badfdc", + "sha256": "0zw7r60r2plg73g9n42yn46zbrx4gzjyf3rqwpkvqvinx43bp4dz" } }, { @@ -64381,32 +65296,26 @@ }, { "ename": "langtool", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "1vsxdkq8qdjn446rf7gjcnr1hwaasqrp0ibv4nsvnib7n85ldl7s", + "commit": "a3bddbf96a3bdcfb9bc32720eb371f2b4a5a570d", + "sha256": "0s9420v9q3ab9glmvbflc9hmcx3mv1v4yi4vibbp1jd67cw7l0fs", "fetcher": "github", "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20200529, - 230 - ], - "deps": [ - "cl-lib" + 20230207, + 950 ], - "commit": "8276eccc5587bc12fd205ee58a7a982f0a136e41", - "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" + "commit": "fc6c046af1c5e4e55331414387865f65afb1bd3c", + "sha256": "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9" }, "stable": { "version": [ 2, - 2, - 1 - ], - "deps": [ - "cl-lib" + 3, + 7 ], - "commit": "0fe79567244ca719448c55a89082505596a2359a", - "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" + "commit": "fc6c046af1c5e4e55331414387865f65afb1bd3c", + "sha256": "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9" } }, { @@ -64428,6 +65337,38 @@ } }, { + "ename": "langtool-popup", + "commit": "a3bddbf96a3bdcfb9bc32720eb371f2b4a5a570d", + "sha256": "09d73saz5wz1g8w6pzfrdwr3i6w48h8gpy6rss4ipf2lyaf0mfm4", + "fetcher": "github", + "repo": "mhayashi1120/Emacs-langtool", + "unstable": { + "version": [ + 20230207, + 319 + ], + "deps": [ + "langtool", + "popup" + ], + "commit": "25b23a2dc592cdfe498740af87d975f7ef23a854", + "sha256": "0hbvkynasz54scd1avsskxav9nlb3z571wrmz2z10kyx3z6rnr9a" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "langtool", + "popup" + ], + "commit": "e0666f000c11571f96582f0a1dd75d6e29e74703", + "sha256": "1jjiq22wn7npgzmszy3hpi8a1wqij4s74p73vqav7c15w1a8pfrm" + } + }, + { "ename": "language-detection", "commit": "ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765", "sha256": "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51", @@ -64453,11 +65394,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20221025, - 541 + 20230214, + 710 ], - "commit": "40ceb1f23d4419e8fdb2808c2c71dd46e541c4c4", - "sha256": "15719hkfnkn15bal2ppcxqaddhqhxg3wb9i8kzac5g81mfs79agb" + "commit": "302533245972d9bc7722328742247d2b2b225e01", + "sha256": "0c38d7vvm3gx2fdi1qm6kzl3x58fksfk2qnzf32np5vy2vwi8ira" }, "stable": { "version": [ @@ -64476,26 +65417,20 @@ "repo": "PillFall/languagetool.el", "unstable": { "version": [ - 20220514, - 309 + 20230122, + 121 ], - "deps": [ - "request" - ], - "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce", - "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6" + "commit": "57af28a0c370866945988461a259b6551a1c4074", + "sha256": "094ndmybj0g2v75zc21644q0b4kpkff8lhj2bw0rg8q8lg5ha5kp" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "deps": [ - "request" - ], - "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce", - "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6" + "commit": "57af28a0c370866945988461a259b6551a1c4074", + "sha256": "094ndmybj0g2v75zc21644q0b4kpkff8lhj2bw0rg8q8lg5ha5kp" } }, { @@ -64562,14 +65497,14 @@ "repo": "slotThe/change-env", "unstable": { "version": [ - 20220710, - 933 + 20230220, + 637 ], "deps": [ "auctex" ], - "commit": "4e6f75f678b207b3bb5031c8b2e31f8d577df445", - "sha256": "1bggvbs9q9yq1p8v188h2hgnhg405n8zjxg8az6h30kpkw8nz04g" + "commit": "748cdbb4bbf29a2e5053cf3d965e95cc7db67fac", + "sha256": "1kca90skv4pp7j08jgbhhkmvr5aiwp88gpdx869g53nqy8ssishh" } }, { @@ -64658,9 +65593,41 @@ } }, { + "ename": "latex-table-wizard", + "commit": "798041b4fe72da6a57224e909cd8a0312318d9e2", + "sha256": "0fiin25f4w3cs7mjkk34hw8g28hh8pg1psaj3dbfsxq6d8lavwfy", + "fetcher": "github", + "repo": "enricoflor/latex-table-wizard", + "unstable": { + "version": [ + 20230103, + 2241 + ], + "deps": [ + "auctex", + "transient" + ], + "commit": "61fb455a1e6a28b93512e63c609ca7ad7dd5bec5", + "sha256": "07fvyjm0invlw190iiy6v1zj772vr7y6lkqmhyng175xvhy3i62p" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "deps": [ + "auctex", + "transient" + ], + "commit": "61fb455a1e6a28b93512e63c609ca7ad7dd5bec5", + "sha256": "07fvyjm0invlw190iiy6v1zj772vr7y6lkqmhyng175xvhy3i62p" + } + }, + { "ename": "latex-unicode-math-mode", - "commit": "9c021dfad8928c1a352e0ef5526eefa6c0a9cb37", - "sha256": "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1z1f5fz08rghlfyczkyjp2yh5xijmkgy0r41vfb0lz4zxc12rmk0", "fetcher": "github", "repo": "Christoph-D/latex-unicode-math-mode", "unstable": { @@ -64713,8 +65680,8 @@ }, { "ename": "launch-mode", - "commit": "876755fff14914b10a26d15f0c7ff32be7c51aa3", - "sha256": "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0686fb547lqzf9ngw3ln0lgh06qjamg4mvdbv9smwqkiqwm19l04", "fetcher": "github", "repo": "iory/launch-mode", "unstable": { @@ -64794,10 +65761,10 @@ "unstable": { "version": [ 20160816, - 540 + 630 ], - "commit": "e5b0b6ca6c5feeb2502d66a760ddf5bb590d04c4", - "sha256": "0i58qz4l5rzwp9kx4r9f818ly21ys71zh1zjxppp220p3yydljfq" + "commit": "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a", + "sha256": "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk" }, "stable": { "version": [ @@ -64846,14 +65813,14 @@ "repo": "AnselmC/le-thesaurus.el", "unstable": { "version": [ - 20220920, - 1924 + 20230112, + 1604 ], "deps": [ "request" ], - "commit": "4dbe929aeaef7d38e75d52844cf9022244fc94ae", - "sha256": "1wbbp4ypph2kvgslwmcnigs6aag0sz3d9wx7dzkn5avj19ym78ci" + "commit": "83e8df8957a3b8167cc2bf97849a1eca555ce9a6", + "sha256": "00phb69hn8w5zl47k5l8gqlxqjm5ig7rz0v4g47hx7xlnhcsfvj4" } }, { @@ -65012,8 +65979,8 @@ }, { "ename": "lean-mode", - "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", - "sha256": "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0rwb4ca079myvipzq938mry5d0fvq5p7cj40fnjfx1cflwwfxbj8", "fetcher": "github", "repo": "leanprover/lean-mode", "unstable": { @@ -65118,17 +66085,17 @@ }, { "ename": "ledger-mode", - "commit": "1549048b6f57fbe9d1f7fcda74b78a7294327b7b", - "sha256": "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf", + "commit": "ae67bc440aa7bb9e7e97edbd0eaf06ceb4d9e661", + "sha256": "1239j3r9cvaklh25v2kq0z9vp3bm6cx9al4jh7pxri6dl21vcixy", "fetcher": "github", "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20220623, - 1125 + 20230106, + 1610 ], - "commit": "8bad528d43007e0310b5e72e6e021b502b30495c", - "sha256": "11s33ajzjhqjqxilwn06v79vndl3x61z35c0cr5s641h5lxlj442" + "commit": "4b32f701736b37f99048be79583b0bde7cc14c85", + "sha256": "17653pz69nmzg7452zq7pcj31dk86vssj94i9al28lgfv02h07l2" }, "stable": { "version": [ @@ -65231,17 +66198,15 @@ "repo": "phillord/lentic", "unstable": { "version": [ - 20210727, - 1247 + 20221201, + 47 ], "deps": [ "dash", - "f", - "m-buffer", - "s" + "m-buffer" ], - "commit": "36861bdf9c1d88492648da553f66529e3a879880", - "sha256": "0cj19czxmrxw1id1ym1ai3k7sv9shl3lz4fqj8qyg73j4kj1gbn0" + "commit": "6af878392e127e75409ae0f4bc08837a8f591d88", + "sha256": "134rk1kcfkqnzhn51c0vvkj4839d5lbn0g61bqfpkgsvfpn05wh4" }, "stable": { "version": [ @@ -65361,20 +66326,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20220922, - 1545 + 20221228, + 2143 ], - "commit": "1dbd4bda6045080d5a293d56e686af5b4f7fdd9d", - "sha256": "112vd01kd8gr2ybw9x83qcaf283z05cdazz3b7k20jlck633qxi8" + "commit": "2bbffb0555f49fd67a92a48415caca894109cbb6", + "sha256": "086q97268s2j9cc98v0i44vl08iskqkav7hywz26girf5ca9dfsr" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "c72db2d5aeb5ed8e4ca066c803ae8d30e7540f79", - "sha256": "1mv5lv98b3351cwkiw51bq8xx4hmnvk93sx6lkdmq0sciw2qz22i" + "commit": "2bbffb0555f49fd67a92a48415caca894109cbb6", + "sha256": "086q97268s2j9cc98v0i44vl08iskqkav7hywz26girf5ca9dfsr" } }, { @@ -65458,11 +66423,11 @@ "stable": { "version": [ 2, - 0, + 1, 1 ], - "commit": "c09b9aebaa659f5c2d0c152d8401fd6924144ce9", - "sha256": "0a5cfnk3021idvv4bv2lvnksjy9d0yyd13bnj793ks86j5f3hdv5" + "commit": "b969afb9b5928d33dcaef636ed9020e620858190", + "sha256": "14bffvmyq6czfhvmcw332a7y4cyr27f75kzk46qlhlqs6l3rahqx" } }, { @@ -65503,14 +66468,14 @@ "repo": "DamienCassou/libelcouch", "unstable": { "version": [ - 20200923, - 1836 + 20230129, + 1000 ], "deps": [ "request" ], - "commit": "5ae35266c9a2eb33f0c708bc8c0687339cee9133", - "sha256": "0vk7m8napg3ss4d9cgsrhkycb5k07q440lspxihy047556l6q3cm" + "commit": "595697f4199519dd018fe489e885f237c54b0675", + "sha256": "0a3mykx9xmbl8scpz08349lyxi0ism8bv01a4aw770649vnqz86j" }, "stable": { "version": [ @@ -65533,11 +66498,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20220928, - 845 + 20230113, + 556 ], - "commit": "2217883b0ca3b308de4e2c670a0ac8c767fd633e", - "sha256": "0s0fsjs52x4v1h04j711fd2w7dmx55dc1chfd0s3czf1r5vr7hc3" + "commit": "cc9eb9812fd6f68e78ed6a0c0a85da7a18765753", + "sha256": "11c2wj00wwbdxqkzl60sd77cp43rja5v8hrvhrvhg75v62kawva2" }, "stable": { "version": [ @@ -65595,20 +66560,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20220706, - 1952 + 20221229, + 916 ], - "commit": "c27c08949a742a888eb9921a8528882b2aec6137", - "sha256": "1lp3ld38x0s982zvpgj1hfky3wsdfwjii1yp5j7rq5n6si97aw7i" + "commit": "e7d35ba9254ead1516133f182a01f6161ae26388", + "sha256": "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4" }, "stable": { "version": [ - 1, - 3, - 1 + 2, + 0, + 0 ], - "commit": "8cf3512a437251863d56ba4933a8dd53988b1d6d", - "sha256": "0fsg2si7afrnsz91i0ziza6nbc4ds9kpnr2z71wf6896zb1afhfx" + "commit": "e7d35ba9254ead1516133f182a01f6161ae26388", + "sha256": "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4" } }, { @@ -65716,6 +66681,24 @@ } }, { + "ename": "ligature-pragmatapro", + "commit": "c0dfe32d78143bd9cee66db92aad6c3caa29fe4a", + "sha256": "1by34q3nc4dkc96snks25gyyx4ix53lfnnxp43wsb0b0xc8i6hf4", + "fetcher": "gitlab", + "repo": "wavexx/ligature-pragmatapro.el", + "unstable": { + "version": [ + 20221127, + 2252 + ], + "deps": [ + "ligature" + ], + "commit": "85f7b15a5cf5f2ee843bc0469e03602a0251c275", + "sha256": "1818lwncgx6iayvxpdmlwv1irbj1vdcmwipf464pvz7dmgfnz8hh" + } + }, + { "ename": "light-soap-theme", "commit": "053be1123bb934d80b4d6db0e7e39b59771be035", "sha256": "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk", @@ -65738,11 +66721,11 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20221031, - 1737 + 20230130, + 541 ], - "commit": "d3c28b3f98a12af5f68abe729d378a597b26ecd9", - "sha256": "0fa01mgsj21cvd7isgy0fli5qpczbzy8dd2bdn5f6m23b9z1j1hy" + "commit": "fa63e64ff3de4de78f74c2d270c0c0f000abec8f", + "sha256": "1gxpdr7ssdzmax4g7fcn15l3rr4m4zm2gv695iywa5x48k4syzn8" }, "stable": { "version": [ @@ -65762,8 +66745,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20221017, - 747 + 20230104, + 1211 ], "deps": [ "fringe-helper", @@ -65771,8 +66754,8 @@ "indicators", "ov" ], - "commit": "501b4739e422ca4859f47b9226e2ea292ecb6800", - "sha256": "1kgkjr5gh0agibc0jbj2z7bab9cnjrwkxsdfs2b7p3jkcmfdd2qg" + "commit": "41a22589ebc3843f6736669a4517014800f09e16", + "sha256": "052viq2qjm8x1ah1hkba0pqafdmbm63dlp1mw3l5kzjrn8rv308m" }, "stable": { "version": [ @@ -66148,8 +67131,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20221114, - 2013 + 20221225, + 1927 ], "deps": [ "ace-window", @@ -66158,8 +67141,8 @@ "swiper", "zoutline" ], - "commit": "f35eadf8c1be43a395e196463314b17ea3b4e16f", - "sha256": "01k73h33njx01v0rylrrgxw5q4dzkiiygn68gilx1lkndcg17kyx" + "commit": "097dd66e662c3eee90d112d88bac5345d26e508f", + "sha256": "1cf0nk0c9k78y3gbz6y4bqqdjscs46kb56xkd0lp641gawsa0kls" }, "stable": { "version": [ @@ -66255,11 +67238,11 @@ "repo": "purcell/list-unicode-display", "unstable": { "version": [ - 20181121, - 2316 + 20230216, + 958 ], - "commit": "62fbf84dbf0b9a4cbbbeede69d5392fe2774391b", - "sha256": "0397inzyqssy8j1yz1j5mgjnwyx559f82hy4w8kz1hv3mhih8lp0" + "commit": "57b4384ebe0c5d10890ee0dfcf66d0b16e5f5060", + "sha256": "0182irm3vai6ngl2xlqpj94qzx673rygzik36amrcw2ji9ssf4f9" }, "stable": { "version": [ @@ -66305,11 +67288,11 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20220802, - 2128 + 20230204, + 1357 ], - "commit": "f3e9748b3417184c36e301a381ec20ef4a88e511", - "sha256": "04y51ifjdnkczsvmv70py15p41gc8mhg6f568k3xwdg1791qhwr5" + "commit": "b256c254f670ebaf50134655fbe430025fff41ab", + "sha256": "151wn6g49w15bjnqbnq12ig7f9zdi5d1j21yadp0jvb9jjzk6jg1" }, "stable": { "version": [ @@ -66329,11 +67312,11 @@ "repo": "HectorAE/lit-mode", "unstable": { "version": [ - 20141123, - 1736 + 20141205, + 441 ], - "commit": "bfecbe898223393f34340ca379977be753ee497a", - "sha256": "1sjyb5v3s9z128ifjqx7a1dsgds2iz185y82581qxakl7ylmn15k" + "commit": "c61c403afc8333a5649c5421ab1a6341dc1c7d92", + "sha256": "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd" }, "stable": { "version": [ @@ -66449,14 +67432,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20220215, - 1814 + 20230127, + 153 ], "deps": [ "s" ], - "commit": "f5133e65d8ffdab918cdfc269ac0c067a0de5e9b", - "sha256": "0gvha2fl5macpwsp4fpa9nv14sg0yqr90s3v92f6imx89ll0rcya" + "commit": "900bdd12c0a6e6874f60b0df99a72fd329873ea1", + "sha256": "1kbx1i977pyv5ckg6d5c5p806nlrl6y06jmcjwi90yri8l0bia5y" } }, { @@ -66608,20 +67591,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20221118, - 341 + 20221203, + 38 ], - "commit": "388cb12be5f1e225449cf34bf8c0b18b718d932c", - "sha256": "1fbkz6j545sy33xqkg9kgkr83147yg7g1f7brr796hmc474f5h1k" + "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1", + "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p" }, "stable": { "version": [ 4, - 8, + 9, 1 ], - "commit": "b10020b0414f15990f4139c363910b58c7ca0852", - "sha256": "0lch1m9xw5xq71sllkhiaxls8rbq9gdj24pyi66p7g6026n5fc21" + "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1", + "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p" } }, { @@ -66722,14 +67705,14 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20220428, - 1405 + 20230107, + 1517 ], "deps": [ "seq" ], - "commit": "5d1da6dc68a1f76f52b7acc808ee430b72fb98ae", - "sha256": "18wzgwyqinsy75cg0hcgxicd40a8n65n6lyparf66aljlm9bq0qm" + "commit": "f76fd445966e3671bb59ba7a0a575f3b2ff59c33", + "sha256": "0pvg2fhidi5br97ppd58jqkpb583yra0wwqmjkng0cqa0x3i002a" }, "stable": { "version": [ @@ -66775,14 +67758,14 @@ "repo": "daviderestivo/load-bash-alias", "unstable": { "version": [ - 20220108, - 2103 + 20230107, + 1737 ], "deps": [ "seq" ], - "commit": "968f037eff48ceca15fd135738051c48ab14cfd6", - "sha256": "03xsgjihp0y62jc6q8fihxvh3siwsvs5kj36wfxp0hpc753ib31g" + "commit": "68cfd70c339c5213c513f7b802b6b50598c9a159", + "sha256": "1gmwrg82vdwdh04zp5nigrn8k8ba2rg61x5rg2lf31q03r7fv2ry" } }, { @@ -66808,20 +67791,20 @@ "repo": "rocky/emacs-load-relative", "unstable": { "version": [ - 20201130, - 2202 + 20230214, + 1032 ], - "commit": "ff2a827144353d29d70392fd95c14c15df207011", - "sha256": "1g8awvbn4f3g611svi58n9sk188skkn7a9jng6nbxbi9diiy3vvz" + "commit": "b7987c265a64435299d6b02f960ed2c894c4a145", + "sha256": "1jmi1j8fkvwfawd9q8b6yhqbg8frckjxsgf9jwgiqw9cvakz6wbf" }, "stable": { "version": [ 1, 3, - 1 + 2 ], - "commit": "5055bfd80644e306aef4e7a7e3e9e5d765b691a4", - "sha256": "1w2xvnihk607vnmlmqz7zsjksd3mscjx2igdadxsfz398bjwl0qd" + "commit": "b7987c265a64435299d6b02f960ed2c894c4a145", + "sha256": "1jmi1j8fkvwfawd9q8b6yhqbg8frckjxsgf9jwgiqw9cvakz6wbf" } }, { @@ -66847,11 +67830,11 @@ "repo": "rocky/emacs-loc-changes", "unstable": { "version": [ - 20200722, - 1111 + 20230214, + 1036 ], - "commit": "2db42905675e1740305f9884613bc48582601b8a", - "sha256": "0dqk8m7j14c0n5sh7jgjwlrlqxxncfi3x9sagv0hx4sc6900mmnd" + "commit": "622371e432f50626aaac82f8ee2841f71685b0fb", + "sha256": "1kfgmpnj26h8y063rqs39k4c98yy840mkj2pblm7vm0s1fhddj1f" }, "stable": { "version": [ @@ -66939,11 +67922,11 @@ "repo": "dykstrom/log4j-mode", "unstable": { "version": [ - 20221112, - 1509 + 20230219, + 1433 ], - "commit": "a878589fbbd291d0aa27f56c582ab900a03ca063", - "sha256": "04jw2zfbzw8qblkmxg5c4dm31i5kk8d9r3l1bqa1bld8s7pdxnp4" + "commit": "5c31af49bfbb2f387fa505ba4aeb2004b249af2c", + "sha256": "05y2qvagcc4r3q594gvlabd37ljw51482wdhw8d49ls624fdcwyl" }, "stable": { "version": [ @@ -67111,28 +68094,27 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20220916, - 2058 + 20221206, + 1843 ], "deps": [ "datetime", "extmap" ], - "commit": "3b0b544b69759f4c119d4460f98263b6e739e7de", - "sha256": "04sr8byk7q04vrk673kk9fk1lxawin5ysqkp7mhnxc1ib9535lp9" + "commit": "9bf89f7e628f947f3c0c47fe557bb1878843644a", + "sha256": "0j7qma1lff809d3yynd283jnml0s4nhiq76scxprv9waf3pp39sj" }, "stable": { "version": [ 0, - 15, - 1 + 16 ], "deps": [ "datetime", "extmap" ], - "commit": "617d5d20662c0ab5e2e120609b11cb7b7ced0220", - "sha256": "1khri5632pjirj191x3ps94s4pyrwapf1pbrkmqqp0d26b50d3s2" + "commit": "155df70c7e4aa496f34a85e480c794f679651bfa", + "sha256": "0vw6brs76z7fkvlazakwhhgdcydjc099j150c7503kwi2hmmp0p8" } }, { @@ -67244,11 +68226,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20221111, - 1517 + 20221126, + 1556 ], - "commit": "a4f161f9ab582ac7cd92e8621530f3a30a59372e", - "sha256": "0kxgkrw7bfk484qa3plh7y0acj8z8byrf2pfq7n8f0k1mcfd71wa" + "commit": "dadc3fadc68b13501c4dbe89109f30deb0d3441a", + "sha256": "1qjifn3rzqs0k7j2mfc98vkni7mzszc4pqd0i5zz9xald61di1dc" }, "stable": { "version": [ @@ -67268,28 +68250,29 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220821, - 1746 + 20230129, + 151 ], "deps": [ + "compat", "map", "seq" ], - "commit": "bb817524a6cc623e1496fb53c044b738c7dc69ab", - "sha256": "143grcv2md8fcj8hdg0w2br76wafzxc7xp10jscs8p83q1wij9xn" + "commit": "85b817f000d922c8e98865bb621b7432dfc0e938", + "sha256": "05vg4w5j9zs4g2z0i0884p8grnh9pahhicp8dva28cg3jmxny625" }, "stable": { "version": [ 0, - 10, - 1 + 11, + 0 ], "deps": [ "map", "seq" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", + "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" } }, { @@ -67300,28 +68283,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220330, - 127 + 20221125, + 2001 ], "deps": [ "dash", "loopy" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", + "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" }, "stable": { "version": [ 0, - 10, - 1 + 11, + 0 ], "deps": [ "dash", "loopy" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", + "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" } }, { @@ -67332,11 +68315,11 @@ "repo": "jschaf/emacs-lorem-ipsum", "unstable": { "version": [ - 20190819, - 2042 + 20221214, + 1857 ], - "commit": "da75c155da327c7a7aedb80f5cfe409984787049", - "sha256": "04h97vnd758gsdfg30wkrhnh4hz7k63xbrw178dxfcwsylq32wi0" + "commit": "4e87a899868e908a7a9e1812831d76c8d072f885", + "sha256": "10l0dmnp1kjyca5jqbf4j98xchcbf9grlv0nv3ygf167vps40il6" } }, { @@ -67407,8 +68390,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20221108, - 1242 + 20221226, + 1829 ], "deps": [ "dap-mode", @@ -67420,8 +68403,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "cc6c51b1e7887736c08260dbbcd28215c019a67a", - "sha256": "1cq730i2nnj1xyxr2f9kc0y2w7abmnhn6ga05f57wzy2bnx5vhi5" + "commit": "3db9f93c83052d6a8976c92d67d2b24473930760", + "sha256": "0sfcdmzsnasgickp9ikmkzvi3czads3ik7msyaldyj0al2cf2mqg" }, "stable": { "version": [ @@ -67451,18 +68434,19 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20221025, - 1659 + 20221226, + 1000 ], "deps": [ "dash", "f", "ht", "lsp-mode", + "s", "yaml" ], - "commit": "3ffd7729cdd748586734135e36713517e14a1578", - "sha256": "0jvflkqgrvy5nadw0vdygcdfss1hnl11j4fi47wk0hnhlanvlj67" + "commit": "1e1f33ed729c220485c16e6597738d8e416f31b7", + "sha256": "1s1j34y70lf2lxa6ywd2xg2j3411nxlmq4ixrbk9374kp5ml98xq" } }, { @@ -67505,8 +68489,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20220916, - 441 + 20221231, + 1655 ], "deps": [ "grammarly", @@ -67515,8 +68499,8 @@ "request", "s" ], - "commit": "eab5292037478c32e7d658fb5cba8b8fb6d72a7c", - "sha256": "1sx47y9w8cqdrw54acply48wibsmc963i896ncmf8z7mfly7cb9x" + "commit": "6d111728f9d062d723bb88bd462b6eafe5cafe3f", + "sha256": "05gqsz3jdvh1ni11jkvzy6qghz9nwr25yr21dabqcmc2zxld0j6n" }, "stable": { "version": [ @@ -67543,14 +68527,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20220809, - 2129 + 20230104, + 1508 ], "deps": [ + "haskell-mode", "lsp-mode" ], - "commit": "485c1148ce4d27030bb95b21c7289809294e7d31", - "sha256": "0ygyvam8h59bhx785rwf4hs30d95xk5kb48inr1gs4313qc2lil2" + "commit": "3249cde75fb411f95fe173c222b848182fd0b752", + "sha256": "06n16v278wzzh1iq4lp0k508dnynrz5c0qbv86hksm7sa4a4w4s7" } }, { @@ -67612,8 +68597,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20220825, - 450 + 20221227, + 1331 ], "deps": [ "dap-mode", @@ -67625,8 +68610,8 @@ "request", "treemacs" ], - "commit": "13b92b097f91f9296ca65a1dc3eda992315c67ea", - "sha256": "1dzcrlwdsnvm1l0jiwqn2q48nzx792dhrvab5jhfqlva4ivw5h0x" + "commit": "dbe448a886e2f4fb5d3a616f4499adbe643ba7a5", + "sha256": "1brp8giavxh71frf920h7r4qa8ndf046aaf4kgrpzgw39ywyka68" }, "stable": { "version": [ @@ -67737,26 +68722,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20221020, - 159 + 20230121, + 1846 ], "deps": [ "lsp-mode" ], - "commit": "ee4df225b59992946c19d8523e940944f76661c4", - "sha256": "06xzx79b39ykr4afmcpgqhw71mkpn6rk37kf7h392ras9mf17vvc" + "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", + "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" }, "stable": { "version": [ 3, - 0, + 1, 0 ], "deps": [ "lsp-mode" ], - "commit": "94c4536579c18e17e87f2441810968a153c3bea1", - "sha256": "1myzjgx2hq70aa9vb0vmgh2jdd25c5b7x580ccb9c0p40rzjjpbr" + "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", + "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" } }, { @@ -67767,14 +68752,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20220916, - 442 + 20221231, + 1658 ], "deps": [ "lsp-mode" ], - "commit": "ab485b8dca64922c024cb1a7ee95231d68883bca", - "sha256": "1b9z01snd1avpvn3zff4bmca96yhs6xgsqrz0jjdmkh64xvnr4l0" + "commit": "d1a599c8ec3748c2b81899d5831b6e7158255479", + "sha256": "1y6l7wi216s6vpahp3wsmjrfafny2gsf043hx9rwiijwq324ilq3" }, "stable": { "version": [ @@ -67843,19 +68828,20 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20221118, - 815 + 20230221, + 1558 ], "deps": [ "dash", + "eldoc", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "b4e8aac32d28dfe0f73e0981387c5b20249f385c", - "sha256": "0pim03m7czfy6jphzmw9y38jxhagmffy02d0q95glwxxiz7m6h6r" + "commit": "e6293251a65554fa23f87d0e883d121b4f0aed4e", + "sha256": "1gkn3zw9h2kgpcmmpsadnh9aazgyyp9lmxkl6i7wd7gx5mg6fp49" }, "stable": { "version": [ @@ -68002,16 +68988,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20220614, - 1545 + 20221201, + 1501 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "b7d6e5bbf2141d2a1efb469ad3451ecc12ddb1cd", - "sha256": "1z6yhv8ks48wi0m03nb0x5wx2f1fiq4d312amcca7j9mkwf41lqs" + "commit": "4cd2adbb32287278d9d9da59a3212a53ecdf8036", + "sha256": "0ys76xd1bg9r0hkgq1h3aq6wxsjxqplxmk7cfwazzh9nwmgp9s22" }, "stable": { "version": [ @@ -68117,16 +69103,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20210820, - 2044 + 20220510, + 1802 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "3af97828f9c08d782fb2086e3a73bda5759e6788", - "sha256": "1d1yfgvdyas6vbg992f5s4sayaxjxs33gh13z629x67hx6p22n3r" + "commit": "a429be2aea7797369a3c751ef54e3554733117be", + "sha256": "11rgfn9sdwxsncc4xrchiqn9dbqi3zirjvbz91kc5rvjv436077b" }, "stable": { "version": [ @@ -68169,15 +69155,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20221102, - 1343 + 20230215, + 1425 ], "deps": [ "f", "lsp-mode" ], - "commit": "6e5addff47bac15f99d8efcff2191818dd71d7b4", - "sha256": "0y2j1rp66h2vxf1q553a74mr7a9m6a7c7hrvzwx1wv19wz7ayb1n" + "commit": "563c1dddb26c82b82dcac0b436594b17375a1480", + "sha256": "137fd4xrzr2ggh872qv9rm4lbi4gs0g1nhxw7fr4gd2gfbbkljcl" }, "stable": { "version": [ @@ -68236,16 +69222,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220924, - 850 + 20230116, + 2024 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "3cd7cc61273341023b863dcf45906ac9142fd1aa", - "sha256": "10x4wf046b12kiayd1bhh95kvynpl2wynyrza6zp4c1qnn7mn5gb" + "commit": "295d8984da06a745b0a36c56e28ce915bc389adb", + "sha256": "1s3vc0rpwwck1g61gh55nq6sqaf7rq16yqg5ayj45z3gd4gd29xf" }, "stable": { "version": [ @@ -68270,11 +69256,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20220801, - 503 + 20221218, + 605 ], - "commit": "d17a00ca50aee197cd017d573b83367eb241cc44", - "sha256": "0jib46v4g5f6p5whj45fmhr5q0a9472gzp3ys6az13q9qp6y149d" + "commit": "ad639c62e38a110d8d822c4f914af3e20b40ccc4", + "sha256": "1p653jbijnjfcgv66k2gjzcg6flqhzfyab8l7b0sf89zwbmkil3r" }, "stable": { "version": [ @@ -68310,11 +69296,11 @@ "repo": "lurk-lang/lurk-emacs", "unstable": { "version": [ - 20221114, - 2218 + 20230120, + 2226 ], - "commit": "568fdce7b80a3d71d09369318b18f86de2372105", - "sha256": "03d2xlyw9bqd9wpxxim63c43jpdnjnxi2xyp16359zhxs2np9src" + "commit": "59a3f956944a5ddd43cfd57deeff6b647fc46554", + "sha256": "1g64jc7fy5229jv8x25rj4fj344kfbrnrvc9wxgsxv7lfvb770kv" } }, { @@ -68418,26 +69404,26 @@ "repo": "montag451/lxc-tramp", "unstable": { "version": [ - 20200414, - 1445 + 20230119, + 1251 ], "deps": [ "cl-lib" ], - "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", - "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" + "commit": "57559701334bb5635b82a252bd00298d06d794fe", + "sha256": "0pv45p6yvsivchqkfg6wirf2vcdfmzymjyqr8n201k2c75qjkgdx" }, "stable": { "version": [ 1, - 0, - 0 + 1, + 1 ], "deps": [ "cl-lib" ], - "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", - "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" + "commit": "57559701334bb5635b82a252bd00298d06d794fe", + "sha256": "0pv45p6yvsivchqkfg6wirf2vcdfmzymjyqr8n201k2c75qjkgdx" } }, { @@ -68595,14 +69581,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20221113, - 1020 + 20230215, + 142 ], "deps": [ "transient" ], - "commit": "78898be20e3fffef67b3f1eb812347df89cd151f", - "sha256": "1312gd7f02frc26c899cpdbdsxafqgw459i1lwxnnssck48m30vz" + "commit": "e7b16e8b78db6d7fcc17eb05fa3a2a4ed439f2f2", + "sha256": "1kzxq9qcsn63lqx22d21zd4c8wm80d4nhqfsvh5m3p88as9ff29q" } }, { @@ -68765,20 +69751,20 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220926, - 1228 + 20230103, + 1503 ], - "commit": "0ae427be02275054ec08cd6fc5259f38473120b3", - "sha256": "068wylr06qq2mgpn786lb2jb4cfp28h8aqiqzdhnq1sdcrqmxb1c" + "commit": "a2ddc7cad487e6165c2e2ac26acec62b1f7bbeca", + "sha256": "007lprnl9ylzk0246yh885nikhbwxxrghismsqrwiiair758hrv6" }, "stable": { "version": [ 0, - 0, - 3 + 1, + 0 ], - "commit": "d280836c77fd263ee404273d7c21f47395a657f9", - "sha256": "0ibasyhqc6zgvzvkfyfvx7g6f18z4n7hy2lqjvyckh40cqpzpwj0" + "commit": "05290e30f57379adc73cfd932b728d792039a42f", + "sha256": "0lym5wgb3jbs3bzc77y4i2d6577kyw10973l2h3apbhfnj69gpfj" } }, { @@ -68789,8 +69775,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20221113, - 2221 + 20230221, + 648 ], "deps": [ "compat", @@ -68800,8 +69786,8 @@ "transient", "with-editor" ], - "commit": "05b0d99d714350d51676b86da9f5daa2f6b7fa3e", - "sha256": "043y2fzvm7b9626qyaljab5zcgwflalw5vi9sln72q3pyx8zk8rw" + "commit": "97a95f70079b6613bf98d2306279d3e03fe51234", + "sha256": "1mm13lpq2ank0pnnf6q4qfpaw4k6fw3zjd1qgdi73l4lw8rrbvrx" }, "stable": { "version": [ @@ -68880,14 +69866,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20220809, - 625 + 20230214, + 1821 ], "deps": [ "magit" ], - "commit": "9367f7e4038792073f090b2c881cdbde1ab47f40", - "sha256": "16cn28730q52fwfhv1x9z7ky9qngf4jr761qdn8pxi6b8x92c6xf" + "commit": "6ed61986ae28c01d0f8c4f2bcff8ab70707488df", + "sha256": "1fhz29rsyggfqjb140v96i52p7vmxqs0wcxiqjhpjmim4ks3kq31" } }, { @@ -69225,14 +70211,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20220313, - 1229 + 20221209, + 123 ], "deps": [ "magit" ], - "commit": "96936d2bd92c8bbf87f65bc293f3246014bc2764", - "sha256": "1k0674f9c0h468nl791nrvngymgbdljnsrwapnki5b3zvaxglckc" + "commit": "fd259cf6ce270a21df2f00b1e031193c8595a7a9", + "sha256": "01h07bg1w1gg33saa86ph6ma1y0vn18dbkhhxqnm3x1m1kq9ssi5" } }, { @@ -69311,15 +70297,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220929, - 1014 + 20230213, + 2018 ], "deps": [ "compat", "dash" ], - "commit": "cfe5a1260bf19191adab837e90acc1004529a0c9", - "sha256": "04lfwy494bv1acmr9jhr4w46jrpi4hyjmg5wjsxf547vx666q6vd" + "commit": "deb10e984e16201182b0569f7df7d30ec3b8afa9", + "sha256": "0qh8170mb2bm2zmncpzd7zz11s7bvbw9pzpwf52cbai3qk90b544" }, "stable": { "version": [ @@ -69479,14 +70465,14 @@ "repo": "greenrd/magit-topgit", "unstable": { "version": [ - 20160313, - 1954 + 20161105, + 1623 ], "deps": [ "magit" ], - "commit": "243fdfa7ce62dce4efd01b6b818a2791868db2f0", - "sha256": "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2" + "commit": "11489ea798bc88d0ea5244bbf725285eedfefbef", + "sha256": "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q" }, "stable": { "version": [ @@ -69977,8 +70963,8 @@ }, { "ename": "mandoku", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "00w246svp3lmbhq7cak2p7fmabnl6dbbsa3cx7wbiwq0f4hpjiaw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0nhh8m9kyz1kh3c9iwv73q6m91lb9f2ra64vf430rfmn9p4ilr95", "fetcher": "github", "repo": "mandoku/mandoku", "unstable": { @@ -70121,19 +71107,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20221016, - 1017 + 20230217, + 2050 ], - "commit": "cc7a086cd7816ad41ff004c61c41bdd26ec3ea0b", - "sha256": "0ncdyczalvl677nim0iha003xway7rwxw8y35vcvkgsdk4vzv848" + "deps": [ + "compat" + ], + "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16", + "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q" }, "stable": { "version": [ - 0, - 15 + 1, + 1 + ], + "deps": [ + "compat" ], - "commit": "cc7a086cd7816ad41ff004c61c41bdd26ec3ea0b", - "sha256": "0ncdyczalvl677nim0iha003xway7rwxw8y35vcvkgsdk4vzv848" + "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16", + "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q" } }, { @@ -70160,13 +71152,13 @@ "unstable": { "version": [ 20201219, - 231 + 232 ], "deps": [ "choice-program" ], - "commit": "b012270ea7780ed02ddf61d884b96cdc4fc01594", - "sha256": "0wmbrv5b4y1qq28w7glxqysrqfycp9gcs6cb3cjjlil74m1lcvc9" + "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", + "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" }, "stable": { "version": [ @@ -70241,11 +71233,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20221105, - 236 + 20230212, + 1208 ], - "commit": "c338cdff80012893e64ba62a199281f430db7021", - "sha256": "0glmrn96aji78jf3nvj5w0bkwswd0kyazfnm1jszgyy7h01am9rm" + "commit": "c765b73b370f0fcaaa3cee28b2be69652e2d2c39", + "sha256": "1i9qw8pyf44zvdfc8nh5gjpiihhafvjjqwgc6z7r6jl2gn4bmyri" }, "stable": { "version": [ @@ -70487,20 +71479,20 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20220704, - 753 + 20221230, + 1008 ], - "commit": "14f490b8683bdce53a6272fcc28a9b4137f86a24", - "sha256": "0vkf98hbcla6gl4xvy0wln87msjh5wf9dhnyscbqavgwql6m07k9" + "commit": "1fee5bbec486d0755954f5cafda67f342dc7daa1", + "sha256": "1i5ysf6sh8ziaqwg3bk80psig6gi4psl6xqjna59hdi0xnb4nly8" }, "stable": { "version": [ 0, - 0, - 9 + 1, + 0 ], - "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", - "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" + "commit": "1fee5bbec486d0755954f5cafda67f342dc7daa1", + "sha256": "1i5ysf6sh8ziaqwg3bk80psig6gi4psl6xqjna59hdi0xnb4nly8" } }, { @@ -70571,16 +71563,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20221117, - 1357 + 20230219, + 2053 ], "deps": [ "persist", "request", "ts" ], - "commit": "98276c45f29d4e45955ad7649758619453423cb4", - "sha256": "1sikn8jbq06k2z3qssrgh393hadrvmf667k6w3xd02sbas3zpk5d" + "commit": "4f9a7be4926dbf3f33a717fcbed12de78c22b331", + "sha256": "0grgilbfzn1fhmzriq5wynxm119dlav8d975inhr2gi49sg8bx1d" }, "stable": { "version": [ @@ -70640,7 +71632,7 @@ }, "stable": { "version": [ - 4, + 5, 0, 0 ], @@ -70649,8 +71641,8 @@ "json", "s" ], - "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0", - "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0" + "commit": "dd41b03c64eca324558e6139699cacccfdd0efd2", + "sha256": "04sd9147ll28zabi1kr4qbg1z04svgfix1rxh151sz6jmars7qj0" } }, { @@ -70678,8 +71670,8 @@ }, { "ename": "math-symbols", - "commit": "d7b0799bddbbbecd12bc1589b56a6250acf76407", - "sha256": "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "05m9sd93llbfl15nx0zbj03vggjfqh4i0j1rgx5nlqmrix6r3caq", "fetcher": "github", "repo": "kawabata/math-symbols", "unstable": { @@ -70699,15 +71691,28 @@ "repo": "enricoflor/math-tex-convert", "unstable": { "version": [ - 20220918, - 1850 + 20221210, + 1937 ], "deps": [ "auctex", "math-symbol-lists" ], - "commit": "91a9588f0d2d145f1695a531cc8bba8ec0adee3b", - "sha256": "1n6pizx5rnjrmr3xm98mwsq95xa50xagpg8k01k7vqwi472g7f3h" + "commit": "8b174d05e8e5269322a1ee90f94cf1ed018d4976", + "sha256": "0y8mk22jklj0bappvfjmkz8cf9j9ppsbgp770fvc6m62xf544jlx" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "auctex", + "math-symbol-lists" + ], + "commit": "8b174d05e8e5269322a1ee90f94cf1ed018d4976", + "sha256": "0y8mk22jklj0bappvfjmkz8cf9j9ppsbgp770fvc6m62xf544jlx" } }, { @@ -70718,11 +71723,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20221008, - 1623 + 20230120, + 1938 ], - "commit": "e0d127935c7a45b1178182a43ab000f41a9f73d7", - "sha256": "1nwpqbbfabcjryqg41fkdailhq2m5f55yxcz7z75s07y15xl1c5y" + "commit": "4cf540990f1f568c513162a0103b2b00c3d1ae43", + "sha256": "0ypm3kl67025wr7wfvgl9l9ig00kz0kpr9544g4dw92yq4wp5504" } }, { @@ -70795,20 +71800,20 @@ }, { "ename": "maxima", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "1vb9r501r1l4j721ybhl2pl90m2qzq0ky01dv2zipzph0gdx5q0a", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wmnw3rwxfg2pha18b67qdk745w0hn0apsvs1p84mapkjl8cmw9l", "fetcher": "gitlab", "repo": "sasanidas/maxima", "unstable": { "version": [ 20220531, - 1751 + 1847 ], "deps": [ "s", "test-simple" ], - "commit": "8f0f64740928def955762780c801ef682dabd562", + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { @@ -70822,7 +71827,7 @@ "test-simple" ], "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" } }, { @@ -70833,20 +71838,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20220921, - 1904 + 20221201, + 1855 ], - "commit": "74fd873981b0fdc35518e4cfdd52527b6f95cdf5", - "sha256": "1ha890bvbcc2b4nvx35idsi3q244d30jg8vkzvwcw26ic5sjr03r" + "commit": "a6e5209a3569857836c5f6e58eb33ec98a9f6700", + "sha256": "0rypc37pr2v57fqkr50aaqrp2159lxw8llmvflkxl9zk3fwnrm80" }, "stable": { "version": [ 0, - 10, + 11, 0 ], - "commit": "74fd873981b0fdc35518e4cfdd52527b6f95cdf5", - "sha256": "1ha890bvbcc2b4nvx35idsi3q244d30jg8vkzvwcw26ic5sjr03r" + "commit": "a6e5209a3569857836c5f6e58eb33ec98a9f6700", + "sha256": "0rypc37pr2v57fqkr50aaqrp2159lxw8llmvflkxl9zk3fwnrm80" } }, { @@ -71059,15 +72064,15 @@ "unstable": { "version": [ 20220101, - 501 + 505 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "4582818c4795cbe231665ab4c0f38ccfa650ce8b", - "sha256": "15119yjrsqy2hdga2p2y3nd0zqxy1xqjywfiwiyr28gw6v50sk3a" + "commit": "59c46cabb7eee715fe810ce59424934a1286df84", + "sha256": "1azjp340wxv25c7bg1y5m8gwmgsdfvlxxcisczz44v87v8jbjhyw" }, "stable": { "version": [ @@ -71092,11 +72097,11 @@ "repo": "baaash/melancholy-theme", "unstable": { "version": [ - 20221017, - 43 + 20230204, + 212 ], - "commit": "42b89124dd400d81b81d871d853ed8f11abfe01c", - "sha256": "1d44ry85qxfm6jkmwjgr2i74lni0f8g0r5k777s5lvfq3yirmjw6" + "commit": "c29f9c70787f75749a8f5af4b1a650eec5bbf689", + "sha256": "06hag53si17sjbqj0679jcg302nl2shivxb5wrdbiqv1f5j83sr5" } }, { @@ -71212,8 +72217,8 @@ "repo": "skangas/mentor", "unstable": { "version": [ - 20221030, - 1607 + 20230103, + 1146 ], "deps": [ "async", @@ -71221,21 +72226,22 @@ "url-scgi", "xml-rpc" ], - "commit": "291ba7fd29aabcadb584feddc0b3ae4120713209", - "sha256": "1yijc61x6c8g6azm3bj7miqzymx5n25pjx0b5850i5jddqd2sjvz" + "commit": "f51dd4f3f87c54b7cc92189924b9d873a53f5a75", + "sha256": "1jmgq8n6lf2gkxx1f2nv56dvs335zhcq4kgvmsrdiaay4v4j9pgi" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "async", "seq", + "url-scgi", "xml-rpc" ], - "commit": "4ce024e17bf8ae079b2cd67af475b3e636c82be1", - "sha256": "0bs5zlf8f5pil0z5bcq1p5vxrhlnlki1khfsmif56msxhsf0m6wc" + "commit": "480602f2ec5467aa2418ee98b328fb85d3b58d0c", + "sha256": "1yjlv14wab2a39bi5v1p5mkri696fq22j1fnac1k83qc3s67m4hi" } }, { @@ -71246,11 +72252,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20221027, - 28 + 20230213, + 200 ], - "commit": "4ad1a11d14c8bc0ba4137900c7833fbdacf7bdb3", - "sha256": "0dnz5kd2swk7jn661nchj2sjhl7ydf4zks2vfxcyr7npgkxw78cf" + "commit": "1e69067c1647ea634c87c021c5acf4a81152f4b2", + "sha256": "125g3ya4n7whj88ja80gl8pfg3zwnkbmizkxyvs1hfwla1xr559p" }, "stable": { "version": [ @@ -71270,21 +72276,22 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220630, - 1249 + 20221222, + 1239 ], - "commit": "2e006714bbd000e2e4ad8d67469254ca2988def6", - "sha256": "11d6x988mjpcbkrj812w9rv0j24hnhlxkk6g5fbcji19pxqrz3xn" + "commit": "41cd949106fbf0769c97e3a56808e4d99fc42c6f", + "sha256": "17fvs379xqdr3lhpqvj36vrdp12swnaz3hgnf312bjni15gpyiyi" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71295,29 +72302,30 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210615, - 1208 + 20221123, + 1408 ], "deps": [ "auto-complete", "merlin" ], - "commit": "aa9a385e7b610b855911c4e544371725dd83511e", - "sha256": "159hsnjdkjhldn19vw43fnv2yzfb17yg3p8x41vs8wq3rw6msc7j" + "commit": "8bcab034a680f57ddf58092fda6288dc4caddd2a", + "sha256": "18pp8rjdf0lbdppnp0yxb77hpl9bvxbxkk05yf4flbpa101q74cj" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], "deps": [ "auto-complete", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71328,29 +72336,30 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210615, - 1208 + 20221123, + 1408 ], "deps": [ "company", "merlin" ], - "commit": "aa9a385e7b610b855911c4e544371725dd83511e", - "sha256": "159hsnjdkjhldn19vw43fnv2yzfb17yg3p8x41vs8wq3rw6msc7j" + "commit": "8bcab034a680f57ddf58092fda6288dc4caddd2a", + "sha256": "18pp8rjdf0lbdppnp0yxb77hpl9bvxbxkk05yf4flbpa101q74cj" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], "deps": [ "company", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71361,14 +72370,14 @@ "repo": "Khady/merlin-eldoc", "unstable": { "version": [ - 20190830, - 517 + 20230213, + 555 ], "deps": [ "merlin" ], - "commit": "db7fab1eddfe34781b7e79694f8923b285698032", - "sha256": "1c13cgmi8z69b5imd9zlagfgrsdl3qv73n24wgc4ih99w1c7sc08" + "commit": "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8", + "sha256": "01k9hnhv9wbshwkrhzmy1d6dw1dps0amjpdcjhzyzz3d97kwnjws" }, "stable": { "version": [ @@ -71390,29 +72399,30 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220330, - 1736 + 20221123, + 1408 ], "deps": [ "iedit", "merlin" ], - "commit": "b94e980b7d10830a83b73794a90b7b9ad04239dc", - "sha256": "0iymv5kvybfbp5q0mkvy8nx5988nd9yh5p7xrbfmk3ds62gjwa35" + "commit": "8bcab034a680f57ddf58092fda6288dc4caddd2a", + "sha256": "18pp8rjdf0lbdppnp0yxb77hpl9bvxbxkk05yf4flbpa101q74cj" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], "deps": [ "iedit", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71423,14 +72433,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20220716, - 1705 + 20230131, + 1601 ], "deps": [ "f" ], - "commit": "a98a9e733b1da1e6a19e68c1db4367bf46283479", - "sha256": "1xhvjng4av3k9n96p3gi0v9i47ya23rz02pwzgp7xxvhflbas4ph" + "commit": "f0c9b5202d70bce783494a971d3c67d4700cff53", + "sha256": "14kfsni9x7ds7zw16kln2mkzqkrkd7vakc575s1c36c9zgvqk2nb" } }, { @@ -71464,11 +72474,11 @@ "repo": "alexmurray/message-attachment-reminder", "unstable": { "version": [ - 20200428, - 124 + 20230124, + 520 ], - "commit": "02d7e66e55729d294f92881530f58a6a7364a78c", - "sha256": "02cqbxdhncnd48nnm3ya5fwkzhq7ax2z277biv7z2nhmx52dwcds" + "commit": "975381d6e7c6771c462e73abd3398a4ed2a9b86b", + "sha256": "1frh5kksypp8lwp3hsfh6fxbm4hbylkq2ll8g9nvq84kaq9m1k84" } }, { @@ -71682,17 +72692,17 @@ }, { "ename": "mew", - "commit": "362dfc4d0fdb3e5cb39564160de62c3440ce182e", - "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0yh1z3y58mrl053biy3awrawy4k94vz3gp0bl5h4mbxwkdvpjz65", "fetcher": "github", "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20221117, - 1310 + 20230209, + 1231 ], - "commit": "7e4dd83a1896f44e1b6c820263c850e3b33eec50", - "sha256": "0zjnqnrz4gy1rikrgg8smg62wy3m50w0gpsq644606s24hvf7kwc" + "commit": "2f9143f5865cdbd31701be58093961b41def0edc", + "sha256": "0535p05iggc20p168lniy42c5zlvj5j7gpny4yfm75b8b8h6zk11" }, "stable": { "version": [ @@ -71726,19 +72736,20 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20220821, - 2242 + 20221206, + 2219 ], "deps": [ "cider", "dash", "geiser", + "parseclj", "parseedn", "projectile", "s" ], - "commit": "43b2061f907dda533abd3136dccdb1ce467ec6c0", - "sha256": "0jrqxk0sf6360sm7b78cbmdkhi4ihgdjsyxgw5qn8xl81n41xas1" + "commit": "493e652b8fffcbed226f69a2ea82e6f9fc51ab08", + "sha256": "1k5r4k2l31vxn7cmfl2ijzlay4klyr66ljzp3c779mz967f0sf5h" }, "stable": { "version": [ @@ -71775,8 +72786,8 @@ }, { "ename": "mhc", - "commit": "d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba", - "sha256": "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0d5k7sfacf6158qfck9b10pblsrna7wl1a1r1vk4m73sq4hsk0b9", "fetcher": "github", "repo": "yoshinari-nomura/mhc", "unstable": { @@ -71804,6 +72815,30 @@ } }, { + "ename": "mic", + "commit": "5a37253a8a1b2f107705c2f323f104c091f39204", + "sha256": "0grjdymn8qy5lyg0l98ayz7w5rjdmzqmhc03r8690zsfh9sk8f6w", + "fetcher": "github", + "repo": "ROCKTAKEY/mic", + "unstable": { + "version": [ + 20230123, + 944 + ], + "commit": "7d0a31ace0b801cb8b58a7bb61a981b67508208d", + "sha256": "1gz6fbj7l0pm6ghv40665iaik2rw3qmbrbccb84jjky2a3d6vcch" + }, + "stable": { + "version": [ + 0, + 36, + 0 + ], + "commit": "fcb51a8171354d1d912c29095488ed8536b89bb0", + "sha256": "1j15s74klkhmmav6s1ga1kxvwq633gqix4vbddxvwkv80bwp9bvf" + } + }, + { "ename": "mic-paren", "commit": "6f0e54eac31fbbce9a778fb654f07e11aaaa46ca", "sha256": "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07", @@ -71961,14 +72996,14 @@ "repo": "pft/mingus", "unstable": { "version": [ - 20220825, - 1103 + 20230206, + 618 ], "deps": [ "libmpdee" ], - "commit": "aca914bfd81e18a37b2cc91f8ad219719a46c108", - "sha256": "11lfdvjjg0bdyach78dw7hi8whc0500w2339pr17dmwks4qyzdcl" + "commit": "f4d1df06f537ae88830a040eea5e23768a0ebd5b", + "sha256": "1gpiyh694qnipg33w90riwmf6717lkbabdqm6ybjbcn6d7k60b6y" } }, { @@ -72178,14 +73213,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20220422, - 1615 + 20230212, + 2213 ], "deps": [ "compat" ], - "commit": "b0427eea174adb494efc9fa212c22021861d3f76", - "sha256": "0jzmyf9x9nq4jw8a0b5lisam0wz6vy3f8sxn4dj3anawjivn6ml0" + "commit": "c5e8b65620558409a79766e86e3e8263cef765df", + "sha256": "1prs6zr924smh1kiq1rljz0vim4rl2ngi5rj7lrq60k0hq1vyddl" }, "stable": { "version": [ @@ -72283,8 +73318,8 @@ 20221031, 411 ], - "commit": "df81e04668de74740e252ddb0f34569b351b92b4", - "sha256": "0lsafb7jciqll2f3mr7jnf4ydrhlvqi1pjyr5snsjk98q0yigskj" + "commit": "7bb0f9946f5833eada199e880fdc4efa6df09e0b", + "sha256": "0fwxhkkhvbwdxrg9j9pjgkh864fa8rvc6dcr46a69spyjja3rw90" }, "stable": { "version": [ @@ -72400,20 +73435,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20221101, - 1715 + 20221204, + 1608 ], - "commit": "101821ad61222e318d924aaebac091650ec2a047", - "sha256": "1nh0bh8q2n02ys0jvvpgba8k188v20d4dvnnl71vfwkm2b17kpmw" + "commit": "de9f84531ca4db6e54a2ca7201638decc0ccadd4", + "sha256": "04gqvlqb00jmkxj4wv4yr3hyvyal4vp2i2x0r338144bhwcxmi71" }, "stable": { "version": [ 0, 1, - 1 + 6 ], - "commit": "5811cb564727f74eb0c8b8b075e6dc982e6ac5f6", - "sha256": "1wj71kz9zdp1rb2lmxrfrrwjg7wb4yjgsaqmhv2l4hyq97pzr0nm" + "commit": "aca5dc9b1be2e38d051c098cf5bc3412cec1ccee", + "sha256": "0k8v6wnscwm5bn6ksr0sbd9cj559ddcbqj7vhh0w67sfy9lgvriz" } }, { @@ -72453,14 +73488,14 @@ "repo": "dgutov/mmm-mode", "unstable": { "version": [ - 20221027, - 2340 + 20221228, + 1931 ], "deps": [ "cl-lib" ], - "commit": "3c2071347a48a5aa172671687b0a3972381dc7d7", - "sha256": "02gcv9rxxl278sx5kw1w1zgj0yi2rscr2dk93l58yggwc4pxnai5" + "commit": "171bf6395b8a95a2d08d41fa38cc1799025d3916", + "sha256": "1m6nqkjy04s5c4v3a952gx79dnc3ihc5w5vj6lg26ps9syzk3b0b" }, "stable": { "version": [ @@ -72585,8 +73620,8 @@ }, { "ename": "mocha-snippets", - "commit": "93c472e3d7f318373342907ca7253253ef12dab8", - "sha256": "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0kv2qcxga1fpdvyd898sjg1c64gj7d83fyjs5b24zx4yysxfp04z", "fetcher": "github", "repo": "cowboyd/mocha-snippets.el", "unstable": { @@ -72722,14 +73757,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20220422, - 1615 + 20230212, + 2015 ], "deps": [ "compat" ], - "commit": "4e9e4d774c69a694ff1c781ec2c9215b2f2dc643", - "sha256": "0p23hvan3snpdizlgx4221nnzgj631b0fhd6w13cq1fcrvis3a9w" + "commit": "d6148f6819e8500c907271ef82c4604ee416f941", + "sha256": "10l1gm4bma6cwmcx7b00hzd8zpaxl60lql71qrx4bcad076n3afz" }, "stable": { "version": [ @@ -72749,11 +73784,35 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20220731, - 2355 + 20230116, + 951 ], - "commit": "11877416ef391dffa38eb1433ce2f337405c7ddc", - "sha256": "13vaxj7hy7zp7zy2g5vfgd4mrkhw6r3bi4hfn1h1h2ijf9hln3am" + "commit": "be393eb5c60382ed297b59f69292917bfc9bf60f", + "sha256": "1n391gvk7gzcvkwlhwid0lhlbva2a4pghb7r8mrnf8pm1imzydjf" + } + }, + { + "ename": "modelica-mode", + "commit": "7c490aa852043e71eb5d3bb8e8b36160e0ac888b", + "sha256": "1jq8jsm7ap14r7vrhbicsrcq9g07yv8adl733c3fil02db6aipfm", + "fetcher": "github", + "repo": "modelica-tools/modelica-mode", + "unstable": { + "version": [ + 20230109, + 1000 + ], + "commit": "291f1bb8147693e21054722757f1e2cef4b27d12", + "sha256": "1dswgjsza688v17cmcyw5w58dywz346bq4v0msvyrm3rhv2xbwrz" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "291f1bb8147693e21054722757f1e2cef4b27d12", + "sha256": "1dswgjsza688v17cmcyw5w58dywz346bq4v0msvyrm3rhv2xbwrz" } }, { @@ -72869,20 +73928,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20221117, - 1155 + 20230220, + 1859 ], - "commit": "30b622807601d3c1722347717f998d6d5a0146f3", - "sha256": "0iis4lc2sxbzf5syp23zqpy451avv7k1hwjc5d3y0lrnp4ivchln" + "commit": "f4282839d880a88062acaafbd8acea2708d3932b", + "sha256": "0nn5mkm2pn59l1bchxaz59zsl9xhvjxmqc5vizrgl77y9mjkws96" }, "stable": { "version": [ - 3, + 4, 0, - 0 + 2 ], - "commit": "0bf4095918281f50f27ff3174482678c84c645d7", - "sha256": "1468y1ra4w4ihq68mfvddyijppj5sz143aawzg2nxdzphy9a84l2" + "commit": "ca4d92aa0dd2046a06821281b12201bcaa95bb1d", + "sha256": "05wl0310va5irc2f72d2mxq19xafxswmgc0a048mah0aam8lsv2f" } }, { @@ -72893,11 +73952,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20221107, - 255 + 20230110, + 422 ], - "commit": "b7960f079e6f2b82468b4ca2afd4edf8bbdb6fdb", - "sha256": "1g8n3k5dsaib17jksbbbyg7sm82fskxgb6zv8jysrj4zv3yll7h3" + "commit": "171d76b0c69e42a9d7b62c5c472944951cb2be6c", + "sha256": "0g4dci8r0p69vmhbp5djrjvqv7z90xw7pznzapgxy8dqmbvc14k0" }, "stable": { "version": [ @@ -73013,8 +74072,8 @@ "deps": [ "scrollable-quick-peek" ], - "commit": "e72472d3c490c8e3ffc5ca7bf8e535e15bd867a7", - "sha256": "0xzj9jqnzyzkbjfj2rfg4fzaprprqzy3xqnacfnmavr2l68vigih" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" }, "stable": { "version": [ @@ -73031,8 +74090,8 @@ }, { "ename": "monky", - "commit": "9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc", - "sha256": "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "17cipbdbksr3aqd5slk8i0xf86kz7gw757mnl24dnc0j2z4a3c96", "fetcher": "github", "repo": "ananthakumaran/monky", "unstable": { @@ -73168,20 +74227,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20211003, - 2113 + 20230126, + 917 ], - "commit": "ef1c752679a8f92faa7b4828adbbb300b6942f22", - "sha256": "0z6s80j259xf8nxjxcsmp7wyvpcg5wyx58brlrbwg1aa9hl3fxga" + "commit": "58e85c815092ac93d02dab584fe537fd1be3828a", + "sha256": "0davxbpw2a15n1wcza3qszdvmyzypffz8rdkizlq6xhccdyk0rvd" }, "stable": { "version": [ - 1, 2, - 5 + 2, + 0 ], - "commit": "ef1c752679a8f92faa7b4828adbbb300b6942f22", - "sha256": "0z6s80j259xf8nxjxcsmp7wyvpcg5wyx58brlrbwg1aa9hl3fxga" + "commit": "d6369af8228921b5ffa328e671c7446a2733fe43", + "sha256": "0davxbpw2a15n1wcza3qszdvmyzypffz8rdkizlq6xhccdyk0rvd" } }, { @@ -73192,20 +74251,20 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20220613, - 114 + 20221222, + 1214 ], - "commit": "033910aaf1bb41f384d1b5b96d55975d1378a34b", - "sha256": "0ban8p3nnxnds3yscdi4h9v3ni9l0diwd4y9cy52xp0kkl4jxayg" + "commit": "dfbc81900737d3382a340feeed24d2bcd9bdedb0", + "sha256": "0scraadlync08zsn84f66jb1s6jch3pr6asgvfm9cms8fsnfmrbs" }, "stable": { "version": [ 1, 2, - 1 + 2 ], - "commit": "42e402a89473458f55a71c5bbe785575e9a927ba", - "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8" + "commit": "dfbc81900737d3382a340feeed24d2bcd9bdedb0", + "sha256": "0scraadlync08zsn84f66jb1s6jch3pr6asgvfm9cms8fsnfmrbs" } }, { @@ -73216,14 +74275,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220620, - 844 + 20230212, + 2015 ], "deps": [ "compat" ], - "commit": "a798096ee4ccf66ef2aa7016c00c8531bd63d27a", - "sha256": "0xqv6wd7zyka0dn5hrk0rq6ym04qn3sfza7cqr7i4fvpdkxlv7iv" + "commit": "4c7171cbe39adcf2ab1ae5290bdb0ecfd7d669d1", + "sha256": "0kp7inp55xbchwm1s16rwq6a99731yinylv39hds24y6fbc09zpi" }, "stable": { "version": [ @@ -73340,14 +74399,14 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20220422, - 1616 + 20230212, + 2015 ], "deps": [ "compat" ], - "commit": "9cb24413291beb1f4204765c77d65e78dcf83a3b", - "sha256": "1qffgvz3dk668907kk6y35q6j1i5qcywjspdfv37qccn51jw8fpr" + "commit": "674354d41bd2bccf0590467851796db6d4595873", + "sha256": "1kwmgvy2w3spqs4bjrh9c3va3yd2j67lgj09i3wyglnic34zjlkp" }, "stable": { "version": [ @@ -73367,8 +74426,8 @@ "repo": "themkat/mos-mode", "unstable": { "version": [ - 20221007, - 1641 + 20221209, + 1353 ], "deps": [ "dap-mode", @@ -73376,8 +74435,8 @@ "ht", "lsp-mode" ], - "commit": "396abaa4afbca895fe27bc0570491fb005fc7693", - "sha256": "02br0xi6cqpj196f581c3gsl1j81wf7gqb2ras7v5f4c1jh3icw0" + "commit": "770f49417e8ad7dbf382c8691f6f689d793b9314", + "sha256": "0g3hk4s3wirrdr2j0hivyqkw0hzbibp62abbwy2q04svr9yyw6dj" } }, { @@ -73412,10 +74471,10 @@ "unstable": { "version": [ 20200808, - 931 + 1353 ], - "commit": "40cfe032281611f69d804006d15bef46f93261b7", - "sha256": "1pb26h8yxq0nknpbdcl1as0igs2ach5kv2i17jclhj0mlqncc74f" + "commit": "90c09da92b30c6497e9141f0edfe7842440c4d53", + "sha256": "0bcqg5p7v6wi3g68c9qpv3rvi9lh6427dd0gmmnwvs1qysz28f1b" }, "stable": { "version": [ @@ -73488,6 +74547,29 @@ } }, { + "ename": "move-mode", + "commit": "d492e6f0532df9c1d5966e1a61160ab8535be4e4", + "sha256": "1krki5spb8r9ajzaawrgz1y8kzfljwvpx9cfhml39izq7yi03kh4", + "fetcher": "github", + "repo": "amnn/move-mode", + "unstable": { + "version": [ + 20221205, + 1433 + ], + "commit": "fa34fbe977d62c8297abc3547b9cfb25802e033c", + "sha256": "1qxnkdvn0d2ybrkwm57wn0k5y1nr6sc82i9n3s2306anyflvn868" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "87aabaac939b69bfd4cd23704e3b67f59c461358", + "sha256": "0sdb783i0rg1fgcs38xxn59z7mzkc43m9cgdx9vzb2ymzzfgg0z9" + } + }, + { "ename": "move-text", "commit": "82bfd0f41e42eed1d4c2361ec1d1685edebbac1b", "sha256": "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy", @@ -73519,11 +74601,11 @@ "repo": "retroj/mowedline", "unstable": { "version": [ - 20161122, - 235 + 20171218, + 237 ], - "commit": "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d", - "sha256": "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4" + "commit": "c17501b48ded8261d815ab60bf14cddf7040be72", + "sha256": "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g" }, "stable": { "version": [ @@ -73543,11 +74625,11 @@ "repo": "google/mozc", "unstable": { "version": [ - 20210306, - 1053 + 20221214, + 1435 ], - "commit": "b8dc3b676c0443853bf55c3ab5b73db54132441d", - "sha256": "0d9r2rn64wc53s6jq5nr3fas59bq6vqlnrvm45y4qs4siscw6lm1" + "commit": "cebb883f5d7d8d6dec05c6e2ed4096d0e8ff8c9f", + "sha256": "19i9ab311zk6fa7zbqaaiqkqhlx364d1zgd8zafmh5fqcwrbns7x" }, "stable": { "version": [ @@ -73673,28 +74755,62 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20220706, - 1952 + 20230103, + 1924 ], "deps": [ "libmpdel", "navigel" ], - "commit": "be954f3722d4f28718748eeb5dc859b04d3fefeb", - "sha256": "0aqg6lzih3v9fik370l9q1ans678zng258vnr36f9jj0wayi60z5" + "commit": "365b2661e56165c53eadd28d3e0a5f9d594412c7", + "sha256": "00ajjb9iawva3g7i1y6bz4d4ny3cv5rby6vgkwiy2xkprzxi8900" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ "libmpdel", "navigel" ], - "commit": "0a06789e9f74bf6bb23f9097dd8072fb7c545d96", - "sha256": "1wg48z0g6qqsd38r2ydba8dp7cq72cnkzshmhj6900xak6f5ywfd" + "commit": "365b2661e56165c53eadd28d3e0a5f9d594412c7", + "sha256": "00ajjb9iawva3g7i1y6bz4d4ny3cv5rby6vgkwiy2xkprzxi8900" + } + }, + { + "ename": "mpdel-embark", + "commit": "a97575c3154a1b011989f312d085cd8a68b7c09f", + "sha256": "0da3fp3b64abixai1f624lq5l4rz0l7a3d4xmhzsz5ghb8kn1rnz", + "fetcher": "github", + "repo": "mpdel/mpdel-embark", + "unstable": { + "version": [ + 20230103, + 2021 + ], + "deps": [ + "embark", + "libmpdel", + "mpdel" + ], + "commit": "31d91a62b680fb4472ec34c04ac6af80bb3cf4b8", + "sha256": "129ay53zrq4gzqf2vh41q3yp613vzi9b57jlzyl8jnbn0wfbjx65" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "embark", + "libmpdel", + "mpdel" + ], + "commit": "31d91a62b680fb4472ec34c04ac6af80bb3cf4b8", + "sha256": "129ay53zrq4gzqf2vh41q3yp613vzi9b57jlzyl8jnbn0wfbjx65" } }, { @@ -73706,13 +74822,13 @@ "unstable": { "version": [ 20210904, - 35 + 2048 ], "deps": [ "elmpd" ], - "commit": "6694fef890ae3ed4faf6a6bf671f3ef197bcc9c1", - "sha256": "1a7dg0mdcsn3cfclfgjyxdf2xn03bbxwa4y3d790f8mr2qb60vjz" + "commit": "66031a8993a2a704bdfaa9c63ec590dd0c5a2eea", + "sha256": "0n4b1klaf1jwd8bj9gqjy5p9yabgkgj9zai1cmsbnb4174h0719q" }, "stable": { "version": [ @@ -73848,8 +74964,8 @@ }, { "ename": "msvc", - "commit": "69939b85353a23f374cab996ede879ab315a323b", - "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1j88a2nnrqjhq5avs665486l3xp20fc9789zh2izmf3msrxqimns", "fetcher": "github", "repo": "yaruopooner/msvc", "unstable": { @@ -73977,19 +75093,20 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20220704, - 1920 + 20221213, + 2206 ], - "commit": "c5938a4f4ed23cf543f73d24e0a6f53272bdcd4a", - "sha256": "1lzmrryyqmvshcbnf2i3jji97bvp5faxh7kybdv8ks2v2lgnjgl2" + "commit": "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0", + "sha256": "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7" }, "stable": { "version": [ 1, - 0 + 2, + 1 ], - "commit": "2f903099073a863fb9b827d3d10c439237925548", - "sha256": "03szkxv565pdkam60wxcfqv0bcxjbidww53diid6w42b9y8ks54r" + "commit": "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0", + "sha256": "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7" } }, { @@ -74015,14 +75132,14 @@ "repo": "wavexx/mu4e-jump-to-list.el", "unstable": { "version": [ - 20211030, - 2307 + 20221202, + 1023 ], "deps": [ "cl-lib" ], - "commit": "4d362a668be4ae624ee96bf7806b25505b4bdf5c", - "sha256": "0jqnmzaa2vf4gxy9yzrvhijm3s4zaip4qxgxjlb240fr9ray6rgf" + "commit": "cf19684d2333cb0cda7f6b62c7607144baa49310", + "sha256": "02kyqd4ihliahkhirqqy7a8fi7s8haf9csaq95xi2hc9zkbd2nx5" } }, { @@ -74059,14 +75176,14 @@ "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20220714, - 1405 + 20230107, + 1504 ], "deps": [ "all-the-icons" ], - "commit": "5e8dab1f07fca183f29e310c208ecb0086ff3222", - "sha256": "1ss36wgxjy3c9gci8xf1wyyl0156cr6p0g395b2rdb9jj1xdk96d" + "commit": "6d6a0b4a7f6bbec34bc58c6704b7c199c8f1a751", + "sha256": "07cc9973ahl2i57grqbr99f82j8191d0hm88hvrwphrmg3fw10kc" } }, { @@ -74141,6 +75258,27 @@ } }, { + "ename": "mu4easy", + "commit": "10f16723cf6565a0ae0284bf178322b6148b8090", + "sha256": "1s20ygmdcxf0kzbj2an557lmcgk5qs9809l7068x9q8920g7hxld", + "fetcher": "github", + "repo": "danielfleischer/mu4easy", + "unstable": { + "version": [ + 20230207, + 2042 + ], + "deps": [ + "helm-mu", + "mu4e-alert", + "mu4e-column-faces", + "org-msg" + ], + "commit": "34565ddb9fc74675b28ce19694485cf2e91eba20", + "sha256": "134w5sgzicbn1ycf0dq1v4g4ph6jygzqvvgniygy6rgw1gs1gmx7" + } + }, + { "ename": "muban", "commit": "167ddaca39085bd570bb9392408ae31e58509793", "sha256": "13p1xbz90q055iczyclwcw0bkwwphq3c9bgy1ykr84jhfhvpm80a", @@ -74416,14 +75554,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20220821, - 932 + 20230113, + 835 ], "deps": [ "cl-lib" ], - "commit": "1e4842d1297241a5277bfd5c7bfab9e8711da60a", - "sha256": "0qrkgbihbax422x0y0hhdx9aflplp4cbc089ry3dbzyl09s7mwfl" + "commit": "16223efc2d6dece2d43bbccc189d7a4bab6de571", + "sha256": "14girixq6xjipvxdmnnah8fczvs5asb7zv7ng5slrlcrsqi11izx" }, "stable": { "version": [ @@ -74685,19 +75823,19 @@ "repo": "NinjaTrappeur/my-repo-pins", "unstable": { "version": [ - 20221115, - 1729 + 20230120, + 1105 ], - "commit": "e6d7d6c21c53d9120e54d5f68a6277f49acbe3bc", - "sha256": "0a1d5z8ma5b8mjkaiibblcf1x2rnlbr5zc0nxjnhv2lw569iv3ql" + "commit": "e6fe3864e244e6db74b668d24857c04472b2d475", + "sha256": "1r9mw4jbpi4i7lvd0gg5li0ia16s9pcfxl71c8l9qvqp73hvr51b" }, "stable": { "version": [ 0, - 2 + 5 ], - "commit": "3a85c415b2fd6c9146de9de6cc99fe5de629cd07", - "sha256": "1ndn17jqlcgp7k7qwli67i23hvbcvgp0jyj967hfisbd553x9964" + "commit": "e6fe3864e244e6db74b668d24857c04472b2d475", + "sha256": "1r9mw4jbpi4i7lvd0gg5li0ia16s9pcfxl71c8l9qvqp73hvr51b" } }, { @@ -74723,20 +75861,26 @@ "repo": "redguardtoo/mybigword", "unstable": { "version": [ - 20220715, - 615 + 20221219, + 1033 ], - "commit": "6c35dd44369930b039a37f6174617bb6ab93be27", - "sha256": "04kljxzzja1hb2lr45vik8x7v3l32xmbyl5vq85s0p74qmm5pcxi" + "deps": [ + "avy" + ], + "commit": "b070c907455e4edd129d3471f338172a5868cc04", + "sha256": "1l9km7rgidz1ppqrkrnxqzm1c4gjhdp9sxphxv45rqlz9xxllk53" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 4 + ], + "deps": [ + "avy" ], - "commit": "4c1386252444df2ade734e02078069a06f3f0f97", - "sha256": "0gbynsf84dgsg2m6h2m2xj54ph0a7kiz9njd33j4xp7r36d268f8" + "commit": "b070c907455e4edd129d3471f338172a5868cc04", + "sha256": "1l9km7rgidz1ppqrkrnxqzm1c4gjhdp9sxphxv45rqlz9xxllk53" } }, { @@ -74920,11 +76064,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20221004, - 1251 + 20230215, + 623 ], - "commit": "81ede3eb8f0fb4854ec3a9d2350f98dfd03163d4", - "sha256": "0686qrzwrjinp69hnqn76gdydxk8plgdcc3ymwbbbvzfwb466933" + "commit": "508bf3505e9bf60163b68056b89c084df97b48aa", + "sha256": "0x1n41c8bvi1ynsa9ka8wz7plk0a04c18ynyswcff3shrzayyr7d" } }, { @@ -75054,11 +76198,11 @@ "repo": "Malabarba/Nameless", "unstable": { "version": [ - 20190429, - 1202 + 20230112, + 1259 ], - "commit": "a3a1ce3ec0c5724bcbfe553d831bd4f6b3fe863a", - "sha256": "0pxfn81bc8smik0qksfjbrdjkzy0cbjzbc3ik47zl2i9blmx5krv" + "commit": "e468f3eea4518b9827419611868c897dce20453f", + "sha256": "1cyri78rlv5i9a8ryn4s0s83wd80366nsv2nkp4i6nrsxffkrrkq" }, "stable": { "version": [ @@ -75078,14 +76222,14 @@ "repo": "Malabarba/names", "unstable": { "version": [ - 20180321, - 1155 + 20221227, + 1825 ], "deps": [ "cl-lib" ], - "commit": "d8baba5360e5253938a25d3e005455b6d2d86971", - "sha256": "11wyha2q8y7bzqq3jrzix8n97ywvsibvddrahqcps1a1yqk4hzfz" + "commit": "45a272fae915148d9a74d4cb3c39917b272ee9c3", + "sha256": "1pzf5hkcvcqljl0kymjfg763nn4i5f94ywl1jrr3iwd72nqp0yp0" }, "stable": { "version": [ @@ -75462,8 +76606,8 @@ }, { "ename": "ncl-mode", - "commit": "2eea3936b8a3a7546450d1d7399e0f86d855fefd", - "sha256": "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1ddirhz98j55f2c44dprkwkg32n6nmcw6f00ycs7vsbap2nx47yy", "fetcher": "github", "repo": "yyr/ncl-mode", "unstable": { @@ -75522,20 +76666,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20220514, - 2039 + 20230217, + 957 ], - "commit": "fbbf920514f8277947ec967d2b5ac5cc081e51aa", - "sha256": "10v7imy28lwakigvqisaf8vpnifw92lsn216893rk5zjk9xlrj9w" + "commit": "abea182499897eda40088d24b647e66099ef94ed", + "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" }, "stable": { "version": [ 0, 1, - 47 + 56 ], - "commit": "4515ec26790aa93af6463bca926ad614a1bc94b6", - "sha256": "0nygv1qd7a73z401gpwmkflhm6nhfn61js34f281x8kg7l2lihby" + "commit": "abea182499897eda40088d24b647e66099ef94ed", + "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" } }, { @@ -75959,11 +77103,11 @@ "repo": "th994/nikki", "unstable": { "version": [ - 20210227, - 1707 + 20210228, + 428 ], - "commit": "894bb6060018cb523abe43a7d3b2bf5691dda5e8", - "sha256": "1sav5biq26c5xi4bc7n3n3f3a1q16n47pa1nlnmm6jyilv8fh3zi" + "commit": "b2ea20d04a061df88d72bd8dd0412a6e7876458d", + "sha256": "0a4kv2zb6wmacfjsihzr1ac6rsynay30zl2qiyzv21js6wmrwn9c" }, "stable": { "version": [ @@ -76031,26 +77175,26 @@ }, { "ename": "nimbus-theme", - "commit": "fc0e6b456b76e2379c64a86ad844362c58146dc6", - "sha256": "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18", + "commit": "9801e3d79078edc2210bbf7d8091b3273fb67408", + "sha256": "0b70hjj07dh6hgq0a63y3lp1vx67ihakxbysh9mgsf22v48khbig", "fetcher": "github", - "repo": "m-cat/nimbus-theme", + "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20221003, - 1934 + 20230219, + 1337 ], - "commit": "3afc9b9d5288f4125f19176888f7639c3ae64500", - "sha256": "0fbv3dpm3a50vaprs15zz92x4wygds2q52x8c11xssmnmsydnzy9" + "commit": "b28256c3a3d3d316d09e63a1fdd0817db110c3ce", + "sha256": "11cxg4n95kw1824mcaifgz2w6akhq37cy00xmrz2b94fwpnf3dml" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "5ae0bee99d005e62c3b18e793a81405a1a3ca0e5", - "sha256": "15fhim7cj7inc2kyl0xgv18a8p4lygnpkxgbq34nl567y9374vs4" + "commit": "178557148f2e132c79be25429d04c5b89f6535dd", + "sha256": "09lcyxd4nds79m8bpk5pq5p5brb8c6czzvniarn8njzj13lcy2g6" } }, { @@ -76163,24 +77307,28 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20221109, - 17 + 20230210, + 1540 ], "deps": [ "magit-section", "transient" ], - "commit": "127d76202f10973e5af760fdb7804cc55cf51152", - "sha256": "1vaw5mc551ikgfqrww2v4njh16nxka9jacymga3v1mhzfw5gmqjk" + "commit": "c18a24e9ac569a221e88ba9d74d52c7b02b6eb77", + "sha256": "06prys01afi5f2n9lpasmybwg8v434yi19zm0dm4j59ziiknpn0l" }, "stable": { "version": [ 1, - 4, - 5 + 5, + 0 ], - "commit": "471a90ac96f4c94a717e5138fb0b03a167cfbf26", - "sha256": "1bqlhkxg0faddhvxx909dq46dxdxk4mdyhdpww92dmzgxdpq38sx" + "deps": [ + "magit-section", + "transient" + ], + "commit": "54e5626829168e22126b233e079f04dff3c71b90", + "sha256": "1xvrnpk7cnjm55ja6j7bdnszkzj914gmyzb12r89jh0z25r09crq" } }, { @@ -76460,14 +77608,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20221027, - 346 + 20230220, + 1519 ], "deps": [ "compat" ], - "commit": "cb277b8a84ca5857b607b3ff6132ee3663a57953", - "sha256": "1x6jcsndmlxvj9ncrg2nam5zqvcs0a5jjjm7ij3q929rdn5fl3kc" + "commit": "b1ba75ab9296ada356219ff8ae26333a79871c61", + "sha256": "0v1p6zwxkjfbk52l927wnlflnj0r25z7jyf2pjc1c39p9yg6gwl5" }, "stable": { "version": [ @@ -76803,11 +77951,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20221115, - 1134 + 20230221, + 1455 ], - "commit": "5ba7684445b9338ab289d502d4688d9aff3d8803", - "sha256": "15f6f4wm0k99ipzd7q3iv4w1ch534wyrnm0vhqa25k0sz2skzssr" + "commit": "48d774bbf4dc6e442e1be96aab712947b408fc5a", + "sha256": "1wl88x1h275f4lbmxq00r85qs3rkc0lviwn1k4ajmgwfhx591f3d" }, "stable": { "version": [ @@ -76826,15 +77974,15 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20220422, - 1618 + 20230212, + 2014 ], "deps": [ "compat", "notmuch" ], - "commit": "d0a91745a4643fab65358d237fb1ef9ee6cff159", - "sha256": "1n99mn9mz4algz5a2cq55rbag7lgknhvbmshfdzjc2rkqlpm5mnn" + "commit": "fc00a3aac925d082b8f263e2a6d64b67535f5731", + "sha256": "18cckfdf3hbb4r33cg8gs1z4b3mpvvzcc42vd769gwfjchs0ws2m" }, "stable": { "version": [ @@ -76916,15 +78064,15 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20220422, - 1621 + 20230212, + 2014 ], "deps": [ "compat", "notmuch" ], - "commit": "1d2a160acd0f37a2d93909dc057cbf8f853758e8", - "sha256": "1nbb6qw5mrmxgs5nmgjg2gjnsn54dgfld26xwpqvp8pj91hbr70h" + "commit": "0d8f1534691e834f26e1899dd54df2db7f810669", + "sha256": "1x91rz8xf3i72y618ff3h1zizrsjdqv2im1ffmxrs7sq7xn52d58" }, "stable": { "version": [ @@ -76947,15 +78095,15 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20221028, - 1344 + 20230212, + 2014 ], "deps": [ "compat", "notmuch" ], - "commit": "757ee082a2228e70151468f049eee2f14ed1e8d2", - "sha256": "0l3bpqcd10fi7ggalgxak5fy5dx70ag3acbki7w38q9100gzl3rd" + "commit": "9d1fa80be0656e712a3f86079ea0abba0542dd88", + "sha256": "1yy5hxkqjwm3l6nfnl9vky3jly36bagrsqp58yxn9ryz8b18spq9" }, "stable": { "version": [ @@ -77048,14 +78196,14 @@ "unstable": { "version": [ 20220428, - 839 + 927 ], "deps": [ "jest", "transient" ], - "commit": "d0ba171f311e84a5c3e125f982a8d2718e49b662", - "sha256": "1ijm0k2fi57l3f194h84yjxrimp00sxgl282q5ah2i3ry9wj2y4m" + "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", + "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" }, "stable": { "version": [ @@ -77123,13 +78271,13 @@ "unstable": { "version": [ 20140807, - 1554 + 1557 ], "deps": [ "cider" ], - "commit": "9506238562c2e0c0df744e0d81edff4c74322a7d", - "sha256": "1si5pfczk3iypdx2ydhirznx2hvp6r7sq2hy64gn3mn4r68svlfi" + "commit": "471a08df87687a3eab61b3b8bf25a2e0962b5d5b", + "sha256": "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy" }, "stable": { "version": [ @@ -77832,11 +78980,11 @@ "repo": "mzimmerm/ob-dart", "unstable": { "version": [ - 20170106, - 1624 + 20221201, + 633 ], - "commit": "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf", - "sha256": "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3" + "commit": "f6d5664d5cc8b15e002f6899f8adedcb10ced5f1", + "sha256": "0zlr12sk2821fsjblhxgj6l5wwrb75w7asdqvc0d92jcjjhjl7r6" } }, { @@ -78163,8 +79311,8 @@ }, { "ename": "ob-ipython", - "commit": "557c36e86844c211f2d2ee097ce51ee9db92ea8b", - "sha256": "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0f2zxi0wl0d8g2fqr2q3xjypnf1ins750j9pjjjpclsafgm6119q", "fetcher": "github", "repo": "gregsexton/ob-ipython", "unstable": { @@ -78274,14 +79422,14 @@ "repo": "lurk-lang/lurk-emacs", "unstable": { "version": [ - 20221107, - 1338 + 20221122, + 2058 ], "deps": [ "lurk-mode" ], - "commit": "b341ffbf5959bbbc7dd33b35e207ce8b7bfbf565", - "sha256": "1hs4msdqi1m74ypgqrzag49x868i2vxf6wybb6kcc26kb9f36pwp" + "commit": "bd7cf661ccb31bfbfab542018c361bd79064d4f4", + "sha256": "0nrh517q7czfdr637qkv2j5mifd7wrdj0fzkfvbn8pz6s8fj0av1" } }, { @@ -78349,11 +79497,11 @@ "repo": "pinetr2e/ob-napkin", "unstable": { "version": [ - 20200816, - 1245 + 20200817, + 1259 ], - "commit": "a2e7e77706a326c00eb6a441de1e920fba676ee0", - "sha256": "122zwxhxsm08k8c4sgz61299dbdbjlgl0paqxi8vshbl9fqawqfj" + "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", + "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" }, "stable": { "version": [ @@ -78384,6 +79532,36 @@ } }, { + "ename": "ob-nix", + "commit": "5e5a469f50f4f8099243450333d88722f581d61f", + "sha256": "0didm1mc0pghrh6pnskwls681zafvwdl65irfvwizy87hxpg78c4", + "fetcher": "codeberg", + "repo": "theesm/ob-nix", + "unstable": { + "version": [ + 20221224, + 334 + ], + "commit": "76d71b37fb031f25bd52ff9c98b29292ebe0424e", + "sha256": "1m9xxw8kncbifr3g9spqnp16iqmcfa1rblk01d3rwiricd9agb7n" + } + }, + { + "ename": "ob-p5js", + "commit": "7df9edede9c67c88acbd446742960cd5d75bdd3d", + "sha256": "1iglav8iii01xgv05q35xl82vljqcihfxgxcjcdr52abfbbvsn48", + "fetcher": "github", + "repo": "alejandrogallo/ob-p5js", + "unstable": { + "version": [ + 20230103, + 1356 + ], + "commit": "c9f89c8b588cdb0c021a875b8f9fc91be7e39de8", + "sha256": "0rs8c4dlxawm4sclgrc2bi6z43dhalbac91hgxa7kw6vssfgibbp" + } + }, + { "ename": "ob-php", "commit": "efb4e6d8540e6ca38c3aa0997116f5995ba1ea83", "sha256": "09j53drzi2pkfzpjasmpfijsdlirh919vkg9yv9nhls2x3vgmrjb", @@ -78535,8 +79713,8 @@ }, { "ename": "ob-sagemath", - "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", - "sha256": "1xb8s4xm9wzfpdlhj5rym2lh4naz3h13v4sjqh71zxw6hy82gba3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "099crpv8367zhzrm7wxwbwinr9k97ngh6xmhf84zq44l22y5x65n", "fetcher": "github", "repo": "sagemath/ob-sagemath", "unstable": { @@ -78736,15 +79914,15 @@ "repo": "xenodium/ob-swiftui", "unstable": { "version": [ - 20210618, - 856 + 20221231, + 1941 ], "deps": [ "org", "swift-mode" ], - "commit": "31cfe991eb171bb0d2f53cf621be1b9d91573ac3", - "sha256": "1l2n4ijf3sfgj05xzvnb1cd9k24ynh2cg36yj386bq7kadamympc" + "commit": "0b453efeb8310311d7f722a0f2dce41c14d4090e", + "sha256": "0y6yafam7zdhc89c4q76ipb8jmlw9rhvps4zp6l0wppdkyb520yf" } }, { @@ -78950,11 +80128,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20221029, - 2302 + 20230112, + 636 ], - "commit": "a86b744d3baa4b6888e36d9109675853e0b3b9b8", - "sha256": "0zjzjp3g38kcp0x5imyk09pn4qylzzxrdj6b6h27jiff08jcbi3w" + "commit": "751687dd6163593fca2b21bb06a75ac2597de055", + "sha256": "124zsjcy3bs68gdcwqb0x7qhhz6lk1pvhaq11yskgyik7ig1ydzi" } }, { @@ -78965,8 +80143,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20221115, - 1143 + 20221228, + 1142 ], "deps": [ "dash", @@ -78975,14 +80153,14 @@ "s", "yaml" ], - "commit": "95bf7624e26adb29925e4609dd0aeacdb29c5bc5", - "sha256": "17ymp9z735cisb7bjdcmqmhv88n2vhzg3l7708jcj6a588i3sbf3" + "commit": "d9fdc5e2b7ee6602ac99511d670a382c5586f14c", + "sha256": "0h3503m4qygjshzmhijs9agpfgf1xyp412bp77sgpijyspln9mpn" }, "stable": { "version": [ 1, 1, - 9 + 10 ], "deps": [ "dash", @@ -78991,8 +80169,8 @@ "s", "yaml" ], - "commit": "95bf7624e26adb29925e4609dd0aeacdb29c5bc5", - "sha256": "17ymp9z735cisb7bjdcmqmhv88n2vhzg3l7708jcj6a588i3sbf3" + "commit": "d9fdc5e2b7ee6602ac99511d670a382c5586f14c", + "sha256": "0h3503m4qygjshzmhijs9agpfgf1xyp412bp77sgpijyspln9mpn" } }, { @@ -79018,11 +80196,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20220707, - 751 + 20220718, + 1147 ], - "commit": "384bdf4327a25a1b47f5b24dfe7d9706750396fc", - "sha256": "0ib0jf4k94qsbll2rwa3h8psg60m4n7dlfy5rvz1afk9mv2vvazv" + "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", + "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" }, "stable": { "version": [ @@ -79096,8 +80274,8 @@ }, { "ename": "ocodo-svg-modelines", - "commit": "5b9651865f4f8009c9b31fa1e5561de97a5ad8de", - "sha256": "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1j9cvs9wr71jgg51f8cbx8v5qnwvm8kk6jsgkydi7lwb042xs4vn", "fetcher": "github", "repo": "ocodo/ocodo-svg-modelines", "unstable": { @@ -79209,32 +80387,32 @@ }, { "ename": "oer-reveal", - "commit": "7c4e4d7c68548415413d4ad972b2c804e7d867f8", - "sha256": "04rwyhq500c8wcgfhg2xmb246az9sc6s2y45ichxhvvhvqgxjib3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0bhcqgq8jv7rxwllpjksibp1zi4wvb2cavgj8gsl1fv6x57w822r", "fetcher": "gitlab", "repo": "oer/oer-reveal", "unstable": { "version": [ - 20221005, - 1718 + 20221229, + 727 ], "deps": [ "org-re-reveal" ], - "commit": "a5a292c5a5f3757e01bdd13bbd57bbf7b55bda0b", - "sha256": "1b3anr0mm9ikk0sjckhm77ih5ahf40wpgjf3n7zax632a70aaq0k" + "commit": "a2dde292e464bfb9b4d8ab470bb9a6a37b5cb6b9", + "sha256": "0nr63m4wka7q48hll0fhq8ijw7dw6g7m80r81xn62yfd7j7mfwk4" }, "stable": { "version": [ 4, - 8, - 0 + 10, + 2 ], "deps": [ "org-re-reveal" ], - "commit": "a5a292c5a5f3757e01bdd13bbd57bbf7b55bda0b", - "sha256": "1b3anr0mm9ikk0sjckhm77ih5ahf40wpgjf3n7zax632a70aaq0k" + "commit": "68c3b97812a638b63e846c788041ec9cda129e53", + "sha256": "0nr63m4wka7q48hll0fhq8ijw7dw6g7m80r81xn62yfd7j7mfwk4" } }, { @@ -79267,14 +80445,14 @@ "repo": "conao3/oj.el", "unstable": { "version": [ - 20200811, - 517 + 20230212, + 148 ], "deps": [ "quickrun" ], - "commit": "2dd65324ac9833e07eaed5fb04acebafc6d5cbd2", - "sha256": "00lxjl1i6kcvj9lym2m59xb5hrx2gcdpvsvq972d8iczp2jmcfxr" + "commit": "6d586cb108c642bc166c64df113e03193f4d1495", + "sha256": "0xjm365zd6jiv3aqa2cknb7b813d6pq854qj73hkffkp6dm0yxih" } }, { @@ -79285,16 +80463,16 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20220428, - 1337 + 20230212, + 2013 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "744399e054ef3a19f66418fdb98ef9ad139cc3b5", - "sha256": "0mxhnh64arm8dlna88ml9x9grm0v4fh1zbk1pfav957fxwx9l9dm" + "commit": "ee3646627e47312a0c6ab0a5f6eba3baf8b20cb6", + "sha256": "0522szjhl61a5sgq1gnv71swnznz72m0dsws0cb061p3n4k4cnmw" }, "stable": { "version": [ @@ -79311,6 +80489,24 @@ } }, { + "ename": "ol-tmsu", + "commit": "0d546d03d27303217a083f1a18f21098d5102387", + "sha256": "0cqb77impg5c51hincl65w72242qw89hjnmv6l8ink0zb4f2rr15", + "fetcher": "github", + "repo": "vifon/tmsu.el", + "unstable": { + "version": [ + 20230207, + 1457 + ], + "deps": [ + "tmsu" + ], + "commit": "9672d193a51f2848696445528de757aa21b2b686", + "sha256": "04xx7kbhfvh0m3ghgs6cngrzsz6dl5a0w3fyfqs1ypvnsgbnpv17" + } + }, + { "ename": "olc", "commit": "1e21abd021d72c491ed1503146c51761e18c56c4", "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r", @@ -79620,8 +80816,8 @@ }, { "ename": "omtose-phellack-theme", - "commit": "478b1e07ed9010408c12598640ec8d154f9eb18d", - "sha256": "0aj0sw611w13xryn762ws63dfalczxixa5rv3skglmfy9axg3v3b", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0bc7cdxycginrzhimfi5nz9mp78rjdxsz42d340gmqb8h5k6ysp9", "fetcher": "github", "repo": "franksn/omtose-phellack-theme", "unstable": { @@ -79741,8 +80937,8 @@ }, { "ename": "open-in-msvs", - "commit": "09a462fac31a7ceda4ee84a8550ff1db6d11140f", - "sha256": "0cng0brxjdriyhwsbn85pfrgqg56chzk24lvkx91rzgz15fbpnv5", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0q2rscnw9hzlh37i4v2h5f3kpmkdbl6wlrxh7wz13jfn5xdj6420", "fetcher": "github", "repo": "evgeny-panasyuk/open-in-msvs.el", "unstable": { @@ -79822,8 +81018,8 @@ "cl-lib", "request" ], - "commit": "ab75048b1073fb1b1452dabae94ab55e0cfb57c4", - "sha256": "00kh8m23jzwb0wipwjdm2wad08xqrlcg00vzc4vzijgrapz0da3h" + "commit": "c384f67278046fdcd220275fdd212ab85672cbeb", + "sha256": "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h" }, "stable": { "version": [ @@ -80008,19 +81204,19 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20221113, - 1719 + 20230219, + 1648 ], - "commit": "2debd96da6f75703ccbca6d852ad994ce84fa529", - "sha256": "0ppwlp6a105m5ic5k2xgxz4c5wwsq025vhclzgvbnk73lmmg2c0v" + "commit": "e6784026717a8a6a7dcd0bf31fd3414f148c542e", + "sha256": "0rd6ajsjqjbfkxnbfnbpacwwwka5z49l2am54rpk0w49jk8gsidm" }, "stable": { "version": [ - 0, - 7 + 1, + 0 ], - "commit": "92008e762b30cb445a2227e458cbb9a5e1b1d4e8", - "sha256": "0m9nyz80j0qnn14drbgk8vn5yr7sv0z6yiz8w95ahcw2qwlgyjs7" + "commit": "847694e78c12d903d5e3f6cb365a5d3b984db537", + "sha256": "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4" } }, { @@ -80170,30 +81366,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220817, - 655 + 20230117, + 727 ], "deps": [ "dash", "promise", "request" ], - "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", - "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" + "commit": "f10feec7bd70916808a3cd8b4c3e3c7f65764acf", + "sha256": "0k1yhicja53qnnd0498pj6lp06pd47ph0h39qjvgb95w8qzng6nn" }, "stable": { "version": [ - 1, + 3, 0, - 5 + 0 ], "deps": [ "dash", "promise", "request" ], - "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", - "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" + "commit": "f10feec7bd70916808a3cd8b4c3e3c7f65764acf", + "sha256": "0k1yhicja53qnnd0498pj6lp06pd47ph0h39qjvgb95w8qzng6nn" } }, { @@ -80497,14 +81693,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20210706, - 1519 + 20230217, + 1908 ], "deps": [ "org" ], - "commit": "46ca9f766322cff31279ecdf02251ff24a0e9431", - "sha256": "0bj08f5mg9v0xm2awbv1fxv98jj9scvqss6fmw0lzix6s3112z25" + "commit": "2bad7732aae1a3051e2a14de2e30f970bbe43c25", + "sha256": "03g9khz168pl23q3l822ri0h2605nrq6b0vxl5278lmpcwxbqf93" } }, { @@ -80539,14 +81735,29 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20200510, - 2030 + 20230205, + 2235 ], "deps": [ "org" ], - "commit": "8569941a0a5a9393ba51afc8923fd7b77b73fa7a", - "sha256": "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g" + "commit": "cc1b820773ccab9e3d8f584e96c14cdbb22cdb16", + "sha256": "0ffpnpn4x8g41k3clc5i5jfdxpxr8nyq44pzq5xqwpc8472h0jk8" + } + }, + { + "ename": "org-calibre-notes", + "commit": "5596b73bc4e8a61d90fa8e306d52983d17bab2d9", + "sha256": "0xcpf8c9m6bmshds5xjxg119zz5slpwvvqywsb7r87j4w1yih4gy", + "fetcher": "github", + "repo": "bpanthi977/org-calibre-notes", + "unstable": { + "version": [ + 20221202, + 1657 + ], + "commit": "3120797ecbcb58827b91e3610e65579593d9a402", + "sha256": "0kamfmh2zkamzg72kw51p4cvj7p1bx3k8vk1dssv62r2kq7j349k" } }, { @@ -80566,8 +81777,8 @@ }, { "ename": "org-category-capture", - "commit": "6760daac1ef9d9d7ba07e2fc9668873020f901f1", - "sha256": "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1sl5kxnvzhd5xzfr75spyk9334n8njd253j653d9xky7ipl2fhdg", "fetcher": "github", "repo": "IvanMalison/org-projectile", "unstable": { @@ -80635,14 +81846,14 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20220515, - 849 + 20221124, + 2304 ], "deps": [ "org" ], - "commit": "9201db80862d144459f1316d571842f5389a47eb", - "sha256": "010wl014dh8sipfqnyasxy1rq5q726bgxm50v4fyqlqkpc6r07d2" + "commit": "9d21d3a5ba2f8656aa23b8cb557017440f1b74e8", + "sha256": "187mccgv555phchmbn8622l0why6qf7h0scwvncdzc37g8jkpdi2" } }, { @@ -80684,11 +81895,11 @@ "repo": "inickey/org-clock-reminder", "unstable": { "version": [ - 20211010, - 2139 + 20230217, + 728 ], - "commit": "9f9b88348ffbc6628f2286dcb4c064b520d0a638", - "sha256": "1dm1q2adgbdb3q0aqacd9nmqxb1dzsrc5gmz7ap2lf0g02b8nwqa" + "commit": "fd3d2ca9d5ca1a804c0e70193f89f650c69a8dc1", + "sha256": "119ad38hnj4i1wbsp9hkl5sa3s8z17aqly2y5ml37dbfid05w0ps" } }, { @@ -80761,14 +81972,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20220910, - 436 + 20221221, + 431 ], "deps": [ "org" ], - "commit": "217ba04c9d638067a6ccb0829cf1885f54c1d568", - "sha256": "0f0vjdvx0hffj2xvyrya8yfl77djmzmpxdxsx58ym4lmdvwyb6x3" + "commit": "bb4032eb12c20d34555a4e670f28696cf31a7b54", + "sha256": "149s34d4j68f8crp66xmscd22svwkar1a6zifznxlyhvszg0zl27" } }, { @@ -80828,15 +82039,15 @@ "unstable": { "version": [ 20210212, - 139 + 142 ], "deps": [ "dash", "s", "seq" ], - "commit": "bb3e28841ebc4b87a34a642a40662316234601c4", - "sha256": "11x26d4qq04yxncgllvsydaxm67fycbwxa1jmppf7918j8xcc9vw" + "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595", + "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b" }, "stable": { "version": [ @@ -81284,8 +82495,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20221119, - 0 + 20221212, + 1817 ], "deps": [ "aio", @@ -81296,14 +82507,14 @@ "request", "request-deferred" ], - "commit": "86faad251d3109a900661d40001f214cf51bc635", - "sha256": "1ygl4c6x7h1wlwhh92b75wiqf5hkmi3q5j4q9klvicn2hb1hfgaa" + "commit": "9bb3720525ad1c45823abab8ce910dd1225e7dcd", + "sha256": "0b7i1xc21vsjcvbkakkgzhidnypc5anmb9mdkh9mab09d7kxkbc7" }, "stable": { "version": [ 0, 4, - 0 + 2 ], "deps": [ "aio", @@ -81314,8 +82525,8 @@ "request", "request-deferred" ], - "commit": "86faad251d3109a900661d40001f214cf51bc635", - "sha256": "1ygl4c6x7h1wlwhh92b75wiqf5hkmi3q5j4q9klvicn2hb1hfgaa" + "commit": "3cc48a989ac859a97d25964c28874317a6e1672a", + "sha256": "11whjprc6h7knapjg29wz85mw338mvmyjwcmdai65m25pplxr25i" } }, { @@ -81409,8 +82620,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20220213, - 41 + 20230221, + 1602 ], "deps": [ "f", @@ -81419,14 +82630,14 @@ "org-edna", "transient" ], - "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", - "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" + "commit": "05689a73f9e4841818948e97ecec431b8ca39948", + "sha256": "0f7c799xnp8abk70my8yc6kpbyy48dmkzbzxf2hnakgdpnpkdgin" }, "stable": { "version": [ 2, - 0, - 0 + 3, + 1 ], "deps": [ "f", @@ -81435,8 +82646,23 @@ "org-edna", "transient" ], - "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", - "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" + "commit": "ed8528d70c17471f24f6acb9ffc466fff5bee1d4", + "sha256": "0d9r7ywr0k03s12yj6nmi4n565klmm8l9k2s0rb0p98l3yn9r34x" + } + }, + { + "ename": "org-habit-stats", + "commit": "dd9fbd4b21685225c2dedafd7eee40fa58910cb1", + "sha256": "1qr60hlv4n4wrzri3n9i516lvksg6rrn0vyaa1hqj5fm9vs7al5s", + "fetcher": "github", + "repo": "ml729/org-habit-stats", + "unstable": { + "version": [ + 20230210, + 1859 + ], + "commit": "0e28b1c1ba330d7d07064a7272104f7e793be4ce", + "sha256": "0mybc4vghyicvn1gmnhw9ljny56cbhmyk21mia5q478pin6krscl" } }, { @@ -81527,6 +82753,39 @@ } }, { + "ename": "org-incoming", + "commit": "1f63ea5ac2c7ce864172effa33ea8387095f23f4", + "sha256": "05cxa22vj8rm4xy57scwcgkrypjbc0c5zh9127c35pmqzab3wbad", + "fetcher": "github", + "repo": "tinloaf/org-incoming", + "unstable": { + "version": [ + 20230209, + 1509 + ], + "deps": [ + "dash", + "datetime", + "s" + ], + "commit": "5c5a5cc034a0b9ed808e5cbbf4876d489a6c7d28", + "sha256": "0fr1q5i29irxdng3b3r854sap66mhdrccb7i5w6vdkgvqdnp8dwn" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "datetime", + "s" + ], + "commit": "0eca164ebc45eb85962eef092f72151e8090d348", + "sha256": "13vdclmjfayhypw4wzzr2yahvrai64i8k9qwiq8zpdqwdc0mi3h2" + } + }, + { "ename": "org-index", "commit": "35763febad20f29320d459394f810668db6c3353", "sha256": "092q92hwvknwm3v2shp8dm59qdamfivx9z9v23msysy7x2mhg98f", @@ -81534,30 +82793,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20220801, - 928 + 20230103, + 1720 ], "deps": [ "dash", "org", "s" ], - "commit": "9ca02c4e7a38c788b70a1f5364ab505695335bd3", - "sha256": "0j7c775vx9a25qh3485xlnd3j070cq4d9yyrlq1d6j5r6i5iwhjj" + "commit": "d919b9e2ef8c0f814455b82ffea080e872b89c72", + "sha256": "0191fph92aizhvydx3viswqmq6b2cc7x5wwnwifkgmw05lra5z6s" }, "stable": { "version": [ 7, 4, - 2 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", - "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" + "commit": "d919b9e2ef8c0f814455b82ffea080e872b89c72", + "sha256": "0191fph92aizhvydx3viswqmq6b2cc7x5wwnwifkgmw05lra5z6s" } }, { @@ -81620,8 +82879,8 @@ }, { "ename": "org-iv", - "commit": "e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342", - "sha256": "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx", + "commit": "56c38111ad4b7e9f015122ff3151e15cfefff274", + "sha256": "1nphccwfl87yz72vj7xf8g4xn8zp7m9p8a35bi7cjz89hk5whx2b", "fetcher": "github", "repo": "kuangdash/org-iv", "unstable": { @@ -81639,6 +82898,25 @@ } }, { + "ename": "org-ivy-search", + "commit": "fbc5475f597b5456a35dd864936588b0444f33fa", + "sha256": "0bwbm3cf8dcv49spfq2l8jmgf8szn37ms7vlckj8akgfiii457p4", + "fetcher": "github", + "repo": "beacoder/org-ivy-search", + "unstable": { + "version": [ + 20230220, + 812 + ], + "deps": [ + "ivy", + "org" + ], + "commit": "e7170ff613734f24edace3309d69e23ef73f4b0f", + "sha256": "0sp6qpzj69n1hir9widxdbhz3781ld5hg1h98s23v1lqqxa6ddk9" + } + }, + { "ename": "org-jira", "commit": "e0a2fae6eecb6b4b36fe97ad99691e2c5456586f", "sha256": "1sbypbz00ki222zpm47yplyprx7h2q076b3l07qfilk0sr8kf4ql", @@ -81680,14 +82958,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20220920, - 1514 + 20230109, + 1217 ], "deps": [ "org" ], - "commit": "1ea9e3b672ed384922ede6af96598446f3691873", - "sha256": "0qkdy6vf9pallr21hz9blj1ac08i5q832rz9fr0gajizadf4g3b1" + "commit": "c84f1a771933d662695c20b73832a6415b7d3603", + "sha256": "0djypcb09iwx42mrnwq3nr381qmz0ssavwmsvzmq4rfpdj3gh5ly" }, "stable": { "version": [ @@ -81725,16 +83003,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220815, - 1604 + 20230105, + 1937 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "c7db858aef69501b2878a7c2aed4ad0447842b4e", - "sha256": "142wrq9k494aks4lxbq80pkm39nqkbdpfw69mlh33skmwvsfzzsf" + "commit": "dfb3b2d583ceb7ad9fbc8ac23ab6316ae172e9fb", + "sha256": "0nfk2kb0jii0v51al115n9i13dp6mw2964d2plgbxdd7yqwhwkrj" }, "stable": { "version": [ @@ -81827,20 +83105,20 @@ }, { "ename": "org-link-beautify", - "commit": "acd9bcc86c90e507fcd76f16e7ab57d64114f8b4", - "sha256": "1k1rczs3w3cxh9fryd1qr1dnr5v2hhxad1vcyjrqvyqpbm1dqnlh", + "commit": "2cbc9e1af903ffc900be7ec0ed1050ae9ad81011", + "sha256": "1h4ppxc9giii3rg5hvpf2dm4c9w0wwd56ivmqyx0q4b9fi69lswa", "fetcher": "git", "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20221117, - 1124 + 20230221, + 1311 ], "deps": [ "all-the-icons" ], - "commit": "f4d9c343c75dc0bbda5375d5315cdee8c819a61e", - "sha256": "0vxw5f8fcx6n6gkmzxh0vd0gmpzjaczsa3a9ig1hxz6zw46q1vzi" + "commit": "370535e4259888f686cb6cedcabb79c5b389e6bb", + "sha256": "113q1axrhl1y5lq5pf799nlh0i7vinrikphb90fwmx35y0gkpgj7" } }, { @@ -82080,19 +83358,19 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20221020, - 749 + 20230215, + 718 ], - "commit": "59b2e3c94756b4e37b2cf7b9f81028c6d4758672", - "sha256": "1n5csrj560crc66iqpfsx60055cgzh817v169s6jqkqzrzdigzvy" + "commit": "42fdbd2d27f5a8652593577a200eeea96555d018", + "sha256": "09i85yfg8knkf3z2yrx2wzj1fqsy8f8hxz184zjdacaj4xygpzj6" }, "stable": { "version": [ 0, - 5 + 8 ], - "commit": "ed9d67d00f26148019acd67b4aac0e26360a33b1", - "sha256": "1gny2p3w6ck5sarv6vap2y1lj6h9qaxbh7r7bzszb9qj8rhapk6q" + "commit": "42fdbd2d27f5a8652593577a200eeea96555d018", + "sha256": "09i85yfg8knkf3z2yrx2wzj1fqsy8f8hxz184zjdacaj4xygpzj6" } }, { @@ -82127,6 +83405,24 @@ } }, { + "ename": "org-mpv-notes", + "commit": "65be49ab5f7680f4b65b657d62c4de337425484e", + "sha256": "0rd91dc19b38q0s4vgsa0habg1par395b8kwyv4qb1vl64f7zblp", + "fetcher": "github", + "repo": "bpanthi977/org-mpv-notes", + "unstable": { + "version": [ + 20221202, + 1657 + ], + "deps": [ + "mpv" + ], + "commit": "8c123996044cfb87101da6c5f16634188f019cca", + "sha256": "1nr4n74c5l2azgyv3w828g6n8p3bjfrs8s6b37j87v9vscc24mic" + } + }, + { "ename": "org-mru-clock", "commit": "b36bf1c1faa4d7e38254416a293e56af96214136", "sha256": "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm", @@ -82134,11 +83430,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20220902, - 654 + 20230104, + 1922 ], - "commit": "2d3374a1b758a04f08f75b2a5fe05e99989077c1", - "sha256": "0kcbfs334rkr337kqdds5wpjzs7g1jl36avw6mf4q5iajc8z0pvm" + "commit": "be90bc9084b384d8a728d68f69da09171ca26d3c", + "sha256": "0ssbfq12g85i41p5wp84ii6wd10sjhf96fcvdn16g3vvi2nj8f2h" }, "stable": { "version": [ @@ -82158,14 +83454,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20220809, - 1736 + 20230127, + 520 ], "deps": [ "htmlize" ], - "commit": "e0174324ac37a63ed36869c7632dd7139f1b2419", - "sha256": "1ks5hcadgzaa81ii71flnna8kbchk8x3kf7dz3h31yk95hx3jjf8" + "commit": "7b1dfb96d558f6e5626e96d4f4a5150d55cb7eb2", + "sha256": "0dvq8dg8ga6bx9kd4bk5im87nmwkac6h0pcxyvcm2pk60id8xar7" } }, { @@ -82401,8 +83697,8 @@ }, { "ename": "org-page", - "commit": "80c4f9e9f3e398dd6d230068ae2a42b060bd84cd", - "sha256": "0pf7rjdaiz9y1kr8sc3bb2bz3bzmd4msziya5h4cfkmzx6pq8a3n", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0a3ijqaiw6m8sbf3hpzfnbsgfv8ian71jfqi1a5i22phk8w86zv6", "fetcher": "github", "repo": "emacsorphanage/org-page", "unstable": { @@ -82664,8 +83960,8 @@ }, { "ename": "org-projectile-helm", - "commit": "6760daac1ef9d9d7ba07e2fc9668873020f901f1", - "sha256": "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1zs3f4g5pn2l1gz1yfbbldm6d8ypzn8581ppgzbw3mvhcxxz23bj", "fetcher": "github", "repo": "IvanMalison/org-projectile", "unstable": { @@ -82728,8 +84024,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20221007, - 2334 + 20221225, + 2351 ], "deps": [ "dash", @@ -82743,8 +84039,8 @@ "transient", "ts" ], - "commit": "5f70636556bffca92d8ef8297ba3002a4ab5b52d", - "sha256": "1fyqsl8ybx3x413p04cywzj0gdwwpidqw1ja2433ij21vvmph1vj" + "commit": "29533525c39e0e243912bb3c807412e4bc3e804e", + "sha256": "01zc2mrlr197r0h2xjgzg88fy74lqbw0hv60jw08ihs0yw7n56y7" }, "stable": { "version": [ @@ -82859,28 +84155,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20221007, - 1714 + 20230220, + 848 ], "deps": [ "htmlize", "org" ], - "commit": "941aa4b94f4eb13cea23013126e84f335059dead", - "sha256": "1jzr7xlzinhfb0197anbkrr5zrs13f7kyznr5q3zyxdndhg6a53n" + "commit": "611d6bd1f66eedf5ee2590426990efd4ca990076", + "sha256": "1l8qjzijgbjzy4skhy9n0z05bczqlyh9lxwsd98f83mv956ghbkd" }, "stable": { "version": [ 3, - 16, - 1 + 17, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "941aa4b94f4eb13cea23013126e84f335059dead", - "sha256": "1jzr7xlzinhfb0197anbkrr5zrs13f7kyznr5q3zyxdndhg6a53n" + "commit": "91cdd82c47b86990b5eb41fe34446a042194cc83", + "sha256": "1bp3kz2awy2mizs59qsa2yl7wfa0197fklnramzifz6z2zv5kbrx" } }, { @@ -82985,31 +84281,34 @@ }, { "ename": "org-recur", - "commit": "cbdf8c9a3c7c289ce13542a12769a7f3d7f53d72", - "sha256": "0qlpwia2dg4l00jahc3si0mi27gv6zlvkbdx0rq37dh61dabgkiq", + "commit": "9801e3d79078edc2210bbf7d8091b3273fb67408", + "sha256": "12rh3qpjdcar2m473fi61i3l4k20sr7iq8p731k9vzm5888dl0sr", "fetcher": "github", - "repo": "m-cat/org-recur", + "repo": "mrcnski/org-recur", "unstable": { "version": [ - 20211007, - 238 + 20230124, + 1532 ], "deps": [ + "dash", "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "628099883a63d219f76cd9631cc914fe6ec8a3e3", + "sha256": "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6" }, "stable": { "version": [ 1, + 3, 3 ], "deps": [ + "dash", "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "628099883a63d219f76cd9631cc914fe6ec8a3e3", + "sha256": "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6" } }, { @@ -83035,8 +84334,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20221015, - 1308 + 20230131, + 1743 ], "deps": [ "avy", @@ -83051,8 +84350,8 @@ "parsebib", "s" ], - "commit": "25fddfc5c4d700cba4600ae114a8c12603ae1649", - "sha256": "01rd5acrn7s5ihqzh1fqzciflj1mhdqcgykqfiwcsrm31kmzwm83" + "commit": "4c691f7b4cafbd9bf8c9608fe9d590f7c4894d67", + "sha256": "01yym610ffmf38vp3m3h9vc00y9gfx46pn83js6zwksq2rf6n96l" }, "stable": { "version": [ @@ -83128,28 +84427,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20221119, - 1134 + 20221203, + 259 ], "deps": [ "dash", "org" ], - "commit": "b6d6b7179019e87b13dfdfeef28037821ed4d01f", - "sha256": "0yibkc1mh8z15lpjws92d71d8vxr6svcbdnlxi9rpr1c108vqqkg" + "commit": "fca95cd22ed29653f3217034c71ec0ab0a7c7734", + "sha256": "15jymjfdsmbcr5l03c605kbi68afcnwandhpgkcn912add9iqczr" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "dash", "org" ], - "commit": "f1fcb0c6391f8e38c94a18f7c2a19124196e4862", - "sha256": "07yv157ci814ndzwrynmys80w5iiq9k43qvv4hajn5x7c467vm97" + "commit": "6e5240f54423a3b98167e2fb7bbe51a1f15b7f75", + "sha256": "09xvkw2h7i702wr4k5zqcd91sc4jwqzawwqsxf13qiwdm4kfxfk8" } }, { @@ -83160,11 +84459,11 @@ "repo": "brabalan/org-review", "unstable": { "version": [ - 20220411, - 1205 + 20230119, + 1706 ], - "commit": "466f7d8f183f226f1e665cf806cb094471903d9c", - "sha256": "122l2n1qz5qps3jphimp1dd743ckbqcvnjdwc5zcdzp9x70yy3nh" + "commit": "77211e40db8a9558b866f5660c7127922b459e6c", + "sha256": "1izm9aj8cqni8sjsxmlk5bbl4nn90476pa339jfxh812v5will1y" } }, { @@ -83199,8 +84498,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220908, - 1625 + 20221231, + 2122 ], "deps": [ "dash", @@ -83209,8 +84508,8 @@ "magit-section", "org" ], - "commit": "d95d25615e69e7cc847641800c1886366336c97e", - "sha256": "0k9wfmjpkzbzsqd4npn8vxs0xch42glnmmh28a55rzkyc2bh8n1r" + "commit": "74422df546a515bc984c2f3d3a681c09d6f43916", + "sha256": "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9" }, "stable": { "version": [ @@ -83237,15 +84536,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20221104, - 2139 + 20230201, + 1834 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "3810ddcd9d69ab27a40d5ba88b553df8db1b4884", - "sha256": "0l22sdq5gg8ih9ir6djd1yfql3yy00c24g2sjyxhswsv83q6j2k8" + "commit": "c87acc2d5685ba2608e2bd1f128e723f1de9d837", + "sha256": "15a9b8b7xqrjyqbddqb05b1fqf2xcwxqfj9hfjvkqzk9rwgz3sir" }, "stable": { "version": [ @@ -83340,11 +84639,11 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20220512, - 1927 + 20230120, + 140 ], - "commit": "d60aac9519e15fde8b2dc1de08e90856d5e02b42", - "sha256": "0m9j3nmki0cn8i19d8z14f5wc7c353n3j6g9k5fhd85abw5mjphx" + "commit": "be8218d66493c122a60049ff5e6bd41abfaabbd8", + "sha256": "0m0myd3akf61lng518s6i9mgy01g2xrw0lmmina40l2fc8nwzwd6" }, "stable": { "version": [ @@ -83582,15 +84881,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20201202, - 144 + 20220326, + 1106 ], "deps": [ "org-starter", "swiper" ], - "commit": "9a394099e42dff255ec1609e2b1358d32c7ca4de", - "sha256": "04szyrr7vadwmh4g0qphw5m3wm3cclif1xipddwxf6ygs941x6dm" + "commit": "cd9c5c0402de941299d1c8901f26a8f24d755022", + "sha256": "07z17r2ny9m4cddr87v636vgvcfgv1j5qkvhckms0xnfh9wcs9j3" }, "stable": { "version": [ @@ -83614,11 +84913,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20221024, - 605 + 20230204, + 1000 ], - "commit": "f830e027986df120be4f199f4f36b8f2948f3247", - "sha256": "1vz9zjwk3m03yvx28p14jx0a075wc2b11xilldsaqvq8srijim16" + "commit": "99ee0c8261267a89708e3a9dd0e0d865e894f96e", + "sha256": "00xcyarsg2pmsr1085yrq75s7n7llc2dinzy8qlgw1xxkxb2b55r" }, "stable": { "version": [ @@ -83704,14 +85003,14 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20210915, - 1934 + 20230116, + 1358 ], "deps": [ "org" ], - "commit": "03be6c0a3081c46a59b108deb8479ee24a6d86c0", - "sha256": "0w97xqvbgh57227qq750b8rxlkkdd61j9frz7wc9f9x1mya305j2" + "commit": "29dbbc48ac925f36cc1636b36b4a3ccb3588e17f", + "sha256": "0bk7c1hlkdrfhah18i13yi3819m4wv5b5lwpnyg292b4k25p39nj" }, "stable": { "version": [ @@ -83854,15 +85153,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20221031, - 326 + 20221211, + 941 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "1c0600d10e513aebd6a991d0acde9ccea4122909", - "sha256": "1gkc3d6xgaimlxcw3bw2zgyi290z379vlqm0md8lc1jzay7xzls7" + "commit": "5eb75d86c143c1801c71b54fe0da832affc3adc3", + "sha256": "17hq54v6f1b4cbjf9dsxq7f72ls5bal8lmhfjd27kkbhj2h5ky1w" } }, { @@ -83916,8 +85215,8 @@ }, { "ename": "org-tfl", - "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf", - "sha256": "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "05rxa0anf1kv2akidjdvdr1kkzah37ji3ywxfxkzvx2dkjb3by1i", "fetcher": "github", "repo": "storax/org-tfl", "unstable": { @@ -84335,11 +85634,11 @@ "repo": "amno1/org-view-mode", "unstable": { "version": [ - 20220218, - 2106 + 20221208, + 327 ], - "commit": "7061ae94d20b6a047f424f35dc3d229824bfd60f", - "sha256": "1vbcx61qrplcmvara8y1nssdkxwzrqln7i5nlba0rl9b4prhwkia" + "commit": "014f96acb7093ffae93c62aabff750e63c3babc5", + "sha256": "1m9jv6nssf2nqkav8nx1748wwc8i5338bc2brxlqajcy4dcz3fbg" } }, { @@ -84351,10 +85650,10 @@ "unstable": { "version": [ 20220929, - 1407 + 1415 ], - "commit": "71d57ca126ccb5441b87aa052903fa6ad59b62f3", - "sha256": "1xl9v42isszx6svdnsnlfs5ksczyzwh14bzh5szkw041gfmy9k0r" + "commit": "afa4b6f8ff274df87eb11f1afd0321084a45a2ab", + "sha256": "125db5gyyc4xyrr0n06ch5rrai3zcxbr3rm3i3b5gyki8wjw0ydk" }, "stable": { "version": [ @@ -84427,16 +85726,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20221107, - 1009 + 20230211, + 2354 ], "deps": [ "alert", "async", "dash" ], - "commit": "544df8a78090411479495494f9de724c350649ac", - "sha256": "1xwx3q18kl5za2qzq596v1ibhggnrmn7b3r8sd77c7kffjd8k6ib" + "commit": "4bbf7e90886122b1320ee793a00ef6a27a797c25", + "sha256": "07fnpzsasdvpb30qbg45nby9nnxjr3jyxhdwlywayb55cbmd2b38" }, "stable": { "version": [ @@ -84512,32 +85811,32 @@ }, { "ename": "org-zettelkasten", - "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", - "sha256": "1fhjbg3jjcinnja96fzcsxnjxg0x4vnsw84g1q63c325sv4xv2mw", - "fetcher": "github", - "repo": "ymherklotz/emacs-zettelkasten", + "commit": "e5b341b5faae8c563c2a18010f410f3552b17c39", + "sha256": "023pdv194pfbaslvgjw2j64zsp4hrgh79ldivd0ksadd9alp296c", + "fetcher": "sourcehut", + "repo": "ymherklotz/org-zettelkasten", "unstable": { "version": [ - 20220819, - 2335 + 20230108, + 1326 ], "deps": [ "org" ], - "commit": "c1f3ca9368a43638de7a0e78a0dceaa0f8943c37", - "sha256": "0ii50lxmvgz48knfq42da9w9wpnxk120vkna5sq1f296y6sn9z35" + "commit": "8002c96d94cb89a0f5af03974f6d1eaea45e1e41", + "sha256": "1j9iqpx88gkhc6nb1fvn3ri5qzakfc77q7vvkaagsda2gphabf7i" }, "stable": { "version": [ 0, - 5, + 7, 0 ], "deps": [ "org" ], - "commit": "f470db20ad0a7e591daa73c903524ac267ae7236", - "sha256": "0xjhcc4xsfgp55mr73cv7nhl3a8ccy1khsnsvrwfbxnhxxi40pnr" + "commit": "e8a4d435e1d33344a1be192b6816a67394d91307", + "sha256": "0rx3sv3hg5f9b18nr3yiqd5zbmf778qa0fm2l5nzsgb4zlrhm6vp" } }, { @@ -84548,8 +85847,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20221118, - 536 + 20230113, + 309 ], "deps": [ "htmlize", @@ -84558,8 +85857,8 @@ "writegood-mode", "xml-rpc" ], - "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", - "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" + "commit": "1b2c10d1332390750e76a140b8c55f884ae1b3c4", + "sha256": "1yn7kvl5y2ykydkwblp23r50qzwcmkppzkfj2sf2zajdyrrw6qx0" }, "stable": { "version": [ @@ -84716,11 +86015,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20201216, - 2240 + 20230121, + 1815 ], - "commit": "0ed99a9c0cf14be0a1f491518821f0e9b7e88b88", - "sha256": "1l70vvyv8walqjk96jgr8047fi0yiqz0lm3r0vh6xrh6phna5mcd" + "commit": "7ca93a1c42bba1bcced181bd8cc34cb57be39537", + "sha256": "1fa27522nb3jqswbii9qsi1csjqw5p6a7lsrylhw2vll8w9v4mma" } }, { @@ -84799,16 +86098,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220425, - 1157 + 20230212, + 2013 ], "deps": [ "compat", "magit", "org" ], - "commit": "6dc4d4bfffd6c11550952203a51346b13e120165", - "sha256": "1xpkwp3qk2jr1rphrcxdmld498prh3cds12y2a9cln27yfg8lkql" + "commit": "fc40397f7b36fa513d41f3119b7430cb236de9dd", + "sha256": "0a2fmhs18d2f3xgksw4z8zf10k35xjz105ccl1h8gj79n0jgnkpf" }, "stable": { "version": [ @@ -84832,8 +86131,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20220422, - 1625 + 20230212, + 2013 ], "deps": [ "compat", @@ -84842,8 +86141,8 @@ "org", "orgit" ], - "commit": "0ffae0b325824372e5e6b1451e5e863e170cdef3", - "sha256": "0cbxz5hsyyl8p9zzgi9kinr0x9hjmwdj9fc5flw3c1ir8gwvmcrp" + "commit": "6f424ff3a2df7d9c00c217011949c1367cc15227", + "sha256": "1zym7mnqvh8rs7qpsy1yqjhlpz0xm1f73q18dnfz6r29nkkginx5" }, "stable": { "version": [ @@ -84869,16 +86168,16 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20220422, - 1626 + 20230212, + 2213 ], "deps": [ "compat", "org", "seq" ], - "commit": "6b2ac90af9f36e99aa2d4f56ffb237a80341beb8", - "sha256": "0qww8k9s7ra9bcjx7mw8vwm9llib8bcd98kl4nci7m2czmmr6asz" + "commit": "168d46a33476c4c8ce56818faa6183421b16d211", + "sha256": "0iyfn1px0svlr7ng7x6hh0ixyicvgi04jxd4vn6qy1524f9cga56" }, "stable": { "version": [ @@ -84941,19 +86240,20 @@ "repo": "tgbugs/orgstrap", "unstable": { "version": [ - 20220715, - 16 + 20230202, + 235 ], - "commit": "55ee428cd53c8de2a6b2a2ab32eb9f613a4617ec", - "sha256": "1f1r0mgq2bh07b7hj16qfh1s0mmyc2dfczaigjbaw8vhfc8lnvqg" + "commit": "3cf0fec936fc0dc72bd7bd970fa91d445e763af4", + "sha256": "1kljqbwjz102igpygijxnrs0cmiwn1xnyxn7fxqblfb1l7s29dkw" }, "stable": { "version": [ 1, - 5 + 5, + 3 ], - "commit": "55ee428cd53c8de2a6b2a2ab32eb9f613a4617ec", - "sha256": "1f1r0mgq2bh07b7hj16qfh1s0mmyc2dfczaigjbaw8vhfc8lnvqg" + "commit": "3cf0fec936fc0dc72bd7bd970fa91d445e763af4", + "sha256": "1kljqbwjz102igpygijxnrs0cmiwn1xnyxn7fxqblfb1l7s29dkw" } }, { @@ -84964,11 +86264,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20220928, - 1944 + 20230205, + 836 ], - "commit": "068973339af3714ea015501f0fcc35014f255c1a", - "sha256": "03h0g2pr1yxbvvp7bj0k00p16dp3g5h4jgqjp28d4pllcpfwspmy" + "commit": "4f9fcb4f7380b247d628b899135df23c8fc8b6f1", + "sha256": "1b17c8g3x5k94yn76cl1h40hf9hka3w3cfjyybmcnrm92mg8g1cw" } }, { @@ -84979,11 +86279,26 @@ "repo": "tbanel/orgtblasciiplot", "unstable": { "version": [ - 20200411, - 711 + 20230122, + 816 + ], + "commit": "4160128045b271bc1aef3d14dbf0c5b53ae58bd2", + "sha256": "1zhhppk05av94i77s16mrjbbc55gvcsm8sk6l7rdfrsfaislabmw" + } + }, + { + "ename": "orgtbl-fit", + "commit": "0c6b5087c69dbf444ebc6a0f56c44d7943ea673a", + "sha256": "05qhkgjv719cl96a6vhiwmfxjvvd9xs0gzkaczqfrryj76mkpk6c", + "fetcher": "github", + "repo": "tbanel/orgtblfit", + "unstable": { + "version": [ + 20230110, + 1544 ], - "commit": "59618630205fc8c0fcc74fb34c4581d9712a5181", - "sha256": "1qx6la70cdxr556d2kna4ra76kdliaqkwm97jahd20nhs2izvpl1" + "commit": "5bde4902187b2578dc39ee3a02cd7c84c4470b8a", + "sha256": "0hy6i6m38k3ad2yr22jrr5i3af9v3k0106bilqxklv8jv6i4x284" } }, { @@ -84994,14 +86309,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20220928, - 1946 - ], - "deps": [ - "cl-lib" + 20230127, + 2133 ], - "commit": "8ce207b7100dc9cde071099b56cebb87924aaafd", - "sha256": "07mp1kgp9jkajs1lwwzl051gaygi8wqmnkp52pddw4xfcni9i6va" + "commit": "257bd101a142aaad2fc3993f7752fe839d1663e0", + "sha256": "15f8zrzrpl967x7pq5833vclvrpj07n936gyhpslxlpd1shjnwg7" } }, { @@ -85012,11 +86324,11 @@ "repo": "DamienCassou/orgtbl-show-header", "unstable": { "version": [ - 20141023, - 837 + 20141031, + 1547 ], - "commit": "2f13391f56cf94f8fe1dc79d6eccb662198f9b69", - "sha256": "0s3pf18n7vh67am1pjaa22gh645088dbz2rgxixr9avpfyalaycj" + "commit": "f0f48ccc0f96d4aa2a676ff609d9dddd71748e6f", + "sha256": "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x" }, "stable": { "version": [ @@ -85121,8 +86433,8 @@ }, { "ename": "osa", - "commit": "df18def95ae792387da2e21f1050cfc25af772fb", - "sha256": "1knzkwvdq9wwy2x7kgl1nf0p564247l2y82ms77r0j5vfqhsfd9s", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1kdhrslsjcdndbi1cf4r53zj4imd0zw2a5ishw3xf0x0rfda2b9m", "fetcher": "github", "repo": "atomontage/osa", "unstable": { @@ -85136,8 +86448,8 @@ }, { "ename": "osa-chrome", - "commit": "b9c83566892095706033869da370a12e8eccc590", - "sha256": "1spihfihcd5iblsl1xp19ayk65mn9ik32jlqn2pg15jwhyfmvyfs", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0ha4n12298p9splvvc2j6g9l19wp7mxshhs5y28hwjyfscasxfpw", "fetcher": "github", "repo": "atomontage/osa-chrome", "unstable": { @@ -85160,19 +86472,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20221021, - 1152 + 20230220, + 1723 ], - "commit": "5b24ed076c9998be627c19549d403d5b219b7b28", - "sha256": "1c0wymsrfdjsapwyhkp1a497hw96pkps7j5fkf0rd2sp9c4fln7y" + "deps": [ + "compat" + ], + "commit": "6c0054004174840be106b3627a4b704a197bad6a", + "sha256": "1wak2nif0mwvvfyswjhs6cdymhxvhdr1c5l0brhavla62npnzbah" }, "stable": { "version": [ 0, - 8 + 10 ], - "commit": "563d9646b1f8df37cefcec5d51d20249eba407da", - "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j" + "deps": [ + "compat" + ], + "commit": "c3fbc813f2e76c71056bf6e28ae3a997f33718d1", + "sha256": "07caffh30sgmcbhxqk3wfpml3310ldvwkqbh19czq7nx4llynixc" } }, { @@ -85299,8 +86617,8 @@ }, { "ename": "osx-org-clock-menubar", - "commit": "cade09308a6b8c998800f2ad2592ad6ea79f65ca", - "sha256": "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "018g269qp9qv0ddxdhmmk7p4d5i9c800zg7h0gsvbym7kphqz05m", "fetcher": "github", "repo": "jordonbiondo/osx-org-clock-menubar", "unstable": { @@ -85424,16 +86742,16 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220810, - 1617 + 20221229, + 1731 ], "deps": [ "bech32", "cbor", "dash" ], - "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", - "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" + "commit": "fb7d4deee41816bf6d79004b2301a1275fa87402", + "sha256": "142425jyi4r5brihds514dsjymgw01f4p19pmblp07hsl3g2zhsy" } }, { @@ -85459,14 +86777,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20220720, - 1144 + 20230212, + 2012 ], "deps": [ "compat" ], - "commit": "9cc3fed195e0a1f960a971880287856c148b4861", - "sha256": "1k3nislsc47k7sf24vyv4krj2nldcibxwq0j33bzq5sxg8q2rz8i" + "commit": "2404f29d376fb14f9f38eb09be8f0574f3ca19ac", + "sha256": "1qh5j67cn2cwpjrp5kl80j3qg3by9wq744z5xbc4rn897hz4516n" }, "stable": { "version": [ @@ -86166,20 +87484,20 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20221030, - 716 + 20230215, + 2020 ], - "commit": "32e0bd1f19b4e6b80b88272f7ec00dc34e52c544", - "sha256": "1l4psldwd4jkd6nbh55m78czyicssrnrqdn2gbgqpdxjfvwzw6qn" + "commit": "2c06d5441e9e67c3ce419bc84b1d4612f64ff40b", + "sha256": "0azg5c7q3dl8v8162x9nmanh55f9drfkclmrhawmnjbk0m2sj8la" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "32e0bd1f19b4e6b80b88272f7ec00dc34e52c544", - "sha256": "1l4psldwd4jkd6nbh55m78czyicssrnrqdn2gbgqpdxjfvwzw6qn" + "commit": "2c06d5441e9e67c3ce419bc84b1d4612f64ff40b", + "sha256": "0azg5c7q3dl8v8162x9nmanh55f9drfkclmrhawmnjbk0m2sj8la" } }, { @@ -86261,29 +87579,29 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20220705, - 1036 + 20230128, + 1219 ], "deps": [ "dash", "ht", "org" ], - "commit": "1beb7c04d1879d72a2e95aaaa59d7ef4e75b7c9d", - "sha256": "0118kphc2z8j6bf9imivvdsyn96h52vhv5s6y291yd5n5kjppga4" + "commit": "66c32cca4f6047dd7e0f77f10bd565a2d83d4729", + "sha256": "0ciihyhmn32kl2iicr90xrzx5nrlcqniq38qpxq0vj6kxwm2gxg3" }, "stable": { "version": [ - 1, - 150707 + 2, + 0 ], "deps": [ "dash", "ht", "org" ], - "commit": "035f1d60a0139349232c382cfd23a96902b7003d", - "sha256": "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29" + "commit": "824d3707bb51e31249a7550a3e759e5fbb5207e5", + "sha256": "0sh8l18lc2hngbmb1vv99xb8cp4sfy90j9cbf7b09l82jmnlqmk1" } }, { @@ -86312,11 +87630,11 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20210826, - 1425 + 20221127, + 702 ], - "commit": "8a6e14416ba8865bb6e254754fefd8570b4ff403", - "sha256": "0sf9v0nzq97k3mv5mp5hkl866bl7cfia0rbkx59yl9g1fslpk218" + "commit": "026e4bd227589b3500294a56c2eca43b3405f992", + "sha256": "0s0wnssc2ky4w7hjp3s4c8acw8c1g6rx356ddzx8ih8f8khl868q" } }, { @@ -86356,14 +87674,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220627, - 1539 + 20221127, + 814 ], "deps": [ "org" ], - "commit": "8567d2b1118bde343980b878af9a38f14d85ffcd", - "sha256": "0prxa7rijhxha3z4y1vyy7y0pr8wzavj7gq1aqaw42rvlpnbdv84" + "commit": "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0", + "sha256": "1ck8v9qwk434w4ib9bmlmpqmiv8k1is5bcr5h7pnswgmgma68dka" } }, { @@ -86415,6 +87733,24 @@ } }, { + "ename": "ox-rss", + "commit": "0cc83cda4df36ceb9584d02c36392b6c1fcce4d0", + "sha256": "0ngc4v5gg7py623nxl56wm6qrijryvsrbasjgxpn74cx3lblw8m4", + "fetcher": "github", + "repo": "BenedictHW/ox-rss", + "unstable": { + "version": [ + 20230129, + 1538 + ], + "deps": [ + "org" + ], + "commit": "81e2eea65e0654e9022f3f732b6cf9dc942423d1", + "sha256": "076v8bri7zdqpgij7hxsyplpgaay463w6fvrcl5ylcd7nzgq2v83" + } + }, + { "ename": "ox-rst", "commit": "85770d6e235217e98dda9d8b9f027a4ba3ebba96", "sha256": "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n", @@ -86459,14 +87795,14 @@ "repo": "lorniu/ox-spectacle", "unstable": { "version": [ - 20181211, - 953 + 20230210, + 113 ], "deps": [ "org" ], - "commit": "9d3ec9a6326289074d8620e97d65e3105307ff51", - "sha256": "1gm8wwpsq10cfppzl104g3x2g9bha1209p2n8mj9azv71b9mszqx" + "commit": "0bca84ff6d3c49e4ca1bf5c3922ed261aafa3635", + "sha256": "1fnyywr4zhnb4wgimz9md0y1p4wlb6g1h4520jlb6yxlcpkng7gl" } }, { @@ -86832,19 +88168,20 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20221113, - 1600 + 20230221, + 1303 ], - "commit": "9190f3d21b7cd1c0e7c26f4c1cf6b4a07f7ab8fa", - "sha256": "02r5bs5ifm95j0lcdkaqkn77wdwvdmd2f6r6b4b5ynyx3rlp9003" + "commit": "9199271d78dc0f4f85047d6daef0e9721a6e63cd", + "sha256": "0vr9v826yypa3zsycs6j7l4kw3ydvdv2ih16lqlj16ici6h2gy8w" }, "stable": { "version": [ - 3, - 2 + 4, + 0, + 0 ], - "commit": "b40825a1ff83fb1adfaa61ea91d99a85bc52ea85", - "sha256": "02ngllr9lilpjsgdpk4628kdp0nwdlrkxj78bvi4jlhnbk4chh1c" + "commit": "0598e92cd61aa5196f78576fac7675bcff4ab217", + "sha256": "165gbrc1h1yj764kn3qq2y1551y04lqnklfa0k87gqgd38q5v985" } }, { @@ -86901,14 +88238,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210530, - 319 + 20220212, + 825 ], "deps": [ "package-lint" ], - "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", - "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" }, "stable": { "version": [ @@ -86999,29 +88336,32 @@ }, { "ename": "packed", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "19bqa1j2g453gk9h0k4pvi1mgpyx9f9rh7ang28sq13hzd9c8mjb", + "commit": "f7cc44a1b339829cf7ee9b0cb4b2f113befd2c0d", + "sha256": "166s0kff4jn38xi1ygcalpqd90y124zscjvf5szqwxyjrrpqhdx8", "fetcher": "github", - "repo": "emacscollective/packed", + "repo": "emacsorphanage/packed", "unstable": { "version": [ - 20220422, - 1626 + 20221130, + 2228 ], "deps": [ "compat" ], - "commit": "2d4ed03032b3ddc008182f48bd3b81dbda0cbefc", - "sha256": "0fchl8gkh8x6mj787gbnclb2y0h6szaw5b0sfbxyydn4pgmm699j" + "commit": "169064f7acfe198cc7dd43d02518b773691e1314", + "sha256": "1y3dbyaxr5smw9zxvy0cgfcg1i3ciq7r40njf8dkra4080ibxdnx" }, "stable": { "version": [ 3, - 0, - 4 + 1, + 0 ], - "commit": "51f22a68e23b87626d162c58a0afbc21ad22f210", - "sha256": "1gpv2vaci0m48fzn0sy7iwl1mnkkqc30bf05jjrqlpn9kpbjyf1p" + "deps": [ + "compat" + ], + "commit": "c0d075fa02424b39bd5a3492167f914b8522f686", + "sha256": "0i2j5yk6xhv4rh3317f241y9llwf4wk18a6a4lkqrvbjpvi9yvn0" } }, { @@ -87306,15 +88646,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20220907, - 2117 + 20221128, + 2034 ], "deps": [ "dash", "hydra" ], - "commit": "0e1a50717599e813e2b872f2af9f40b2272793fd", - "sha256": "1qjwpxjnqnf0pxmsdqwpa7wxs173mivdj4prahjpykknvb0v7z36" + "commit": "8f955abec9c1d75acd9b03389b90a276ec4e2137", + "sha256": "0jpjd3vhwc85vrp050qr7gmxm661m248pv3mndjq5w6z4862annm" }, "stable": { "version": [ @@ -87360,11 +88700,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20200510, - 5 + 20230124, + 2301 ], - "commit": "3ec6350d77d3e6d67066839513994a5351dd5755", - "sha256": "1lj6y8yms3dl2dwv0xcmlp5sgb7yxiwsfj67lhhnx5a6avmjxc4s" + "commit": "c5c3761b1edbb8afe24425d8610aa368a762ff63", + "sha256": "1s9anxa8p3q1imas29lgfh2jiffmsh4csrmypq2s7sp93d2fwdhl" } }, { @@ -87375,16 +88715,16 @@ "repo": "atgreen/paperless", "unstable": { "version": [ - 20220819, - 226 + 20230204, + 1815 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "f230acbc01588bb2ec99426832099b7fb7bad6c0", - "sha256": "1glxxmm28w7yklr86m743mg068k24hbnvfx6xyb48d3fq568r2d0" + "commit": "e524e31350d74f13319968d24b7326a4a412e105", + "sha256": "1dba7n6ws6f8y5j6qvy8ildjrlz5ahzzpfqcjnvynpycxj54vjs1" } }, { @@ -87425,20 +88765,20 @@ }, { "ename": "parchment-theme", - "commit": "f2302f512053b22e5abbd6a654cf94e4d5c7f5ca", - "sha256": "1dkl1f0zmnkw8xd89m5kd42rk4pg6a6wnm52g4p1b4yqqq27h6zm", - "fetcher": "github", + "commit": "cb6cf7e2af2800ad0e295db6116a63009ba8eea0", + "sha256": "0f2h41rj96779pbfd78j9pcq5byv328j1wdcmhr1khkqhzflvzsg", + "fetcher": "gitlab", "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200910, - 2310 + 20221206, + 1541 ], "deps": [ "autothemer" ], - "commit": "95e8248edbdb01fedc7db4472bcce90d2d872106", - "sha256": "13rcajw03sbddks5wgzznvrz7ibd7m0jx8mcw1amfk97ghs57h7s" + "commit": "07c9887be6e7d94a8546db625c7d62c54d2e5923", + "sha256": "0hr2dmxz7iv2vd7x17ndx4j7hzl52j46x6gnx8m2mnwviipgriq1" }, "stable": { "version": [ @@ -87461,18 +88801,18 @@ "url": "https://mumble.net/~campbell/git/paredit.git", "unstable": { "version": [ - 20220709, - 916 + 20221127, + 1452 ], - "commit": "42500e5d450c88a3b249b548be447577d8549b17", - "sha256": "1phyyqnmdjxyx60k6ngyypgc9bl723sj1s1ws19h2pnpycr3ymhd" + "commit": "d700549d8aad684f1fabcfff565a9ad8b468199b", + "sha256": "0lx0l07psdm4dypvfadgdsx2wsjd7xpsdlagfbr7jr2nbgjkxzy7" }, "stable": { "version": [ - 24 + 26 ], - "commit": "82bb75ceb2ddc272d6618d94874b7fc13181a409", - "sha256": "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm" + "commit": "72cc1f6055321a53021186b86d2f825167b81478", + "sha256": "1hwl2jhv1fhsdrspfhprq77n763i4zsj350q024ajy0m2kaql6ws" } }, { @@ -87545,14 +88885,14 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20220422, - 1627 + 20230212, + 2012 ], "deps": [ "compat" ], - "commit": "7117d73a4d006be8a1e6730bb167d691e284c78b", - "sha256": "06xx3bx6fv41iz82d60civlvrimnyy08i0498wklvmnjw050b1bm" + "commit": "ff95d3cba363a1a0f60bf3088e8ec3170fe83e85", + "sha256": "14k3r320zkh4kc37pizbdwji37h0sm9vsr1sblf5i1ag35zchy02" }, "stable": { "version": [ @@ -87595,11 +88935,11 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20210413, - 2 + 20230204, + 1915 ], - "commit": "c2c1bbec6cc7dad4f546868aa07609b8d58a78f8", - "sha256": "0az4qp118vsqzgsl87wgszzq91qzqkpabifd8qrr2li3sizsn049" + "commit": "332c7f47426f0519dc5c24dda82afdb1aa8b61ee", + "sha256": "12rx37js82lxq80bq2rpzgw8miw7ni0hx9xhxa775c67idyppjzv" }, "stable": { "version": [ @@ -87845,26 +89185,26 @@ "repo": "pjones/passmm", "unstable": { "version": [ - 20210109, - 8 + 20221204, + 1927 ], "deps": [ "password-store" ], - "commit": "d78d1bf4f397180d2256248df589f33aafb4c8b4", - "sha256": "0r2nj2p6kx40lhmsv06xsyylj5b9lqji32rc4ipr1biaai52w2b6" + "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8", + "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n" }, "stable": { "version": [ + 1, 0, - 4, - 1 + 0 ], "deps": [ "password-store" ], - "commit": "b25a92048c788a8477cc5ffe14c0c4a4df19d79a", - "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw" + "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8", + "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n" } }, { @@ -87905,16 +89245,15 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20220906, - 1855 + 20221226, + 1528 ], "deps": [ - "auth-source-pass", "s", "with-editor" ], - "commit": "47f8d950c58949733862813f29856480a9e232c7", - "sha256": "01267lb9ixrb3255n536k6klkp2d7gj08n9vzcdczbz5b69ybv18" + "commit": "26d2dae04bb76a87be6960861c10432820cd5d55", + "sha256": "1pkx6pgkkpddxrshzq3x8ilfwqjw9gawnbbskcbssxc88wrpbcjb" }, "stable": { "version": [ @@ -88022,11 +89361,11 @@ "repo": "kiyoka/pastehub", "unstable": { "version": [ - 20140615, - 620 + 20140627, + 1319 ], - "commit": "3cc5dcb87104f3b4320a6d7fa20fa7340e6b7026", - "sha256": "0wbb5689n9k351gf3s9mqr3bi00lpajk0h1k9gx1b2mdbb7lq7xd" + "commit": "37b045c67659c078f1517d0fbd5282dab58dca23", + "sha256": "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n" }, "stable": { "version": [ @@ -88279,8 +89618,8 @@ }, { "ename": "pcmpl-git", - "commit": "6a51c16bed8d0a2fecad0ae9580d58cd44cc8930", - "sha256": "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "078ajwsalirr9xkqfbbbmc5z3fdh9n5jckc6z7r90g899cxwcyzz", "fetcher": "github", "repo": "leoliu/pcmpl-git-el", "unstable": { @@ -88390,11 +89729,11 @@ "repo": "mhayashi1120/Emacs-pcsv", "unstable": { "version": [ - 20150220, - 1131 + 20230207, + 757 ], - "commit": "798e0933f8d0818beb17aebf3b1056bbf74e03d0", - "sha256": "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af" + "commit": "4b5e801d213a460a6cb3cb2997a0a6cd33c7bc58", + "sha256": "160lnkslvmm6dzlb5fxdy7zsjz0pcg6x6lmx43xz95sq99kz679v" }, "stable": { "version": [ @@ -88444,29 +89783,28 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20221007, - 1404 + 20230117, + 632 ], "deps": [ "let-alist", - "nadvice", "tablist" ], - "commit": "d6980bc3273e1cf1a73feee6bb523d1568405685", - "sha256": "1a0l76k183fmkd7wjw86lf0mwcvkvd0gsyyh3p49z56094srxjar" + "commit": "bc2ba117e8c3196ff9adf0da4fa1e63a8da3d7c8", + "sha256": "1v732z5zrvh4k21m6g35xalfx09ixnnvyk88418nrizc72lx1pvr" }, "stable": { "version": [ + 1, 0, - 91 + 0 ], "deps": [ "let-alist", - "nadvice", "tablist" ], - "commit": "2f5a1b939369657eb56d4cfa4bdf0b5c11aacb1d", - "sha256": "07ixspgn4s1jg66w7m2f3sh43giakz9srhp7rpw389z32g57i1rx" + "commit": "1885cefc24883c220cdd4acafdf1d14f290a6979", + "sha256": "1idazz46zx2q84di4p73770l4bcnai2a03q95psg827ykdnmjwij" } }, { @@ -88525,11 +89863,11 @@ "repo": "ArneBab/pebble-mode", "unstable": { "version": [ - 20221009, - 2113 + 20230123, + 1801 ], - "commit": "b256cebef2911021f0241364b4642357d5efd201", - "sha256": "02hcii6kywn6vxpgkjm0xw6zppq5ra3kds7w34g15abi9xdmkhxh" + "commit": "bcbc76aa89196338f12a8ddfe4486edf83c19c5e", + "sha256": "0djax1yaab8mpjih1ggc1hvvzw7bjwl5bfr2kmixj90scgh9r42b" } }, { @@ -88702,20 +90040,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20220620, - 408 + 20230113, + 318 ], - "commit": "92f540e7d310ec2e0b636eff1033cf78f0d9eb40", - "sha256": "1hl4xac1zsvpbibahp54phf1b1srhnm2nh30vzmh96aynnf38vqd" + "commit": "f9c1361ad69073af8133174f9e37b594df9be361", + "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" }, "stable": { "version": [ 0, 3, - 7 + 8 ], - "commit": "92f540e7d310ec2e0b636eff1033cf78f0d9eb40", - "sha256": "1hl4xac1zsvpbibahp54phf1b1srhnm2nh30vzmh96aynnf38vqd" + "commit": "f9c1361ad69073af8133174f9e37b594df9be361", + "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" } }, { @@ -88790,11 +90128,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20220909, - 836 + 20230110, + 1045 ], - "commit": "67be9feeb02613ea97f0de9eb5b792b193f073bc", - "sha256": "1wwcck650wxmgmc8kxpixfhiqzxk6qkkb1rpz77prbl068d3sl3v" + "commit": "df95ea710e2a72f7a88293b72137acb0ca024d90", + "sha256": "0jf4wsq13bjdr0wdm9jv702xxyhadfglxhvf9f7ahh3g4izjfqyr" }, "stable": { "version": [ @@ -88915,30 +90253,30 @@ "repo": "SqrtMinusOne/perspective-exwm.el", "unstable": { "version": [ - 20220125, - 1939 + 20230218, + 1358 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "541946caa0359c14c90da58196bec7baed122a46", - "sha256": "0mcrvv9mhg0cfkcp64hkdd9wh9j04hw0d9dz1ghafa4h6hf3azfl" + "commit": "01d51f5c92a30b65e8346582ed1ce6513570bb0a", + "sha256": "06lnmbimjj5kyr0mixjagcv903fbn00wvp63wlni2g8c3bhx1p48" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "ebe6f50be216d55ff2aea878aaf4b7c2c1032bdc", - "sha256": "0drjfyfmhil20pv96af8s4w3xzm3pqx095n89r0aqzp2falvrvpw" + "commit": "01d51f5c92a30b65e8346582ed1ce6513570bb0a", + "sha256": "06lnmbimjj5kyr0mixjagcv903fbn00wvp63wlni2g8c3bhx1p48" } }, { @@ -88975,11 +90313,11 @@ "repo": "ksqsf/pest-mode", "unstable": { "version": [ - 20200321, - 504 + 20221231, + 15 ], - "commit": "e71e2f2730e926ee936ff7be15d912de27547e9e", - "sha256": "1rmqw21mlq2dpg3fr6z30hxincmhhw1k1bz61y4hqlqy70zfi20m" + "commit": "8023a92ce59c34dcd1587cbd85ed144f206ddb89", + "sha256": "0hbbwnamhbg295iva3ffp1al7cyjmc7nb2ilh1zqb4kvz6zyqhxj" }, "stable": { "version": [ @@ -89053,19 +90391,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20221111, - 756 + 20221210, + 1215 ], - "commit": "3e79c965063bc15d1e2ed9a1c152ba603b84e68a", - "sha256": "1g3qh1xvdri2vp652jzihzvfnn39wbpy79sscaav09lkbc4phgb5" + "commit": "f91d546a35ed3479cdb656b17525285e11565892", + "sha256": "0a38rvl5rwfb77p4xxmjhrs6s67pfkzjfm0pdxvf0b6xh7h404kh" }, "stable": { "version": [ 0, - 16 + 20 ], - "commit": "11f27360086f27936401e1f4b196f73dbd11d880", - "sha256": "1jdnslpgdm16klaga02p33g7c8bjzg164kxz3jd7gs5v9gqa6ppz" + "commit": "f91d546a35ed3479cdb656b17525285e11565892", + "sha256": "0a38rvl5rwfb77p4xxmjhrs6s67pfkzjfm0pdxvf0b6xh7h404kh" } }, { @@ -89085,8 +90423,8 @@ }, { "ename": "ph", - "commit": "f62ca074ca2df780ab32aac50b2b828ee6a9934c", - "sha256": "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0xrg7d1mqgvv3s0l4biyyccn3bj1khs496rdwih91bazs634g2y4", "fetcher": "github", "repo": "gromnitsky/ph", "unstable": { @@ -89398,8 +90736,8 @@ }, { "ename": "php-eldoc", - "commit": "7af452f42847a947e87edd6aa559f807d08920c1", - "sha256": "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "14kgydh5vm5kqsigs6z9bnkzjh53syq4a43j9gdkbvsisibjl5iq", "fetcher": "github", "repo": "sabof/php-eldoc", "unstable": { @@ -89419,11 +90757,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20221112, - 1616 + 20230212, + 731 ], - "commit": "d01cfc9cd51706e076bf7e5cbf0cfa7ee885efb4", - "sha256": "13lkzvamr86409whr8as4721gx9xrlfkmxvv941775mryliqk6j6" + "commit": "fb11df8268b7099766264cd53836ef159746adbd", + "sha256": "083nsw65d1zvknxyvwnxw8n8fjc566w940x5lgxz937afy6qxvfq" }, "stable": { "version": [ @@ -89629,8 +90967,8 @@ "repo": "nlamirault/phpunit.el", "unstable": { "version": [ - 20220704, - 1554 + 20230124, + 743 ], "deps": [ "cl-lib", @@ -89638,8 +90976,8 @@ "pkg-info", "s" ], - "commit": "02020d4b3e5ae9fdb82be9203fa6d330adcbc0eb", - "sha256": "14x4cmwc8m787dv49kpaw285109d85zv95dlkcxza8g8f493mdw1" + "commit": "4a36906344c0abc11f48cc08cd8d50a9f46963f8", + "sha256": "03a9brby841kqyjqpyxxxvh60hcqa0ly4yc4flawbvnvm7rm7bv3" }, "stable": { "version": [ @@ -89734,8 +91072,8 @@ }, { "ename": "pig-snippets", - "commit": "a0d7c07d28e2f229b281201a781ebaceed6465ed", - "sha256": "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1g983r0jj7ziysdsxv94ikdncpagdl16a23xzshlvrx4qyfyl4pn", "fetcher": "github", "repo": "motus/pig-mode", "unstable": { @@ -89803,25 +91141,25 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20200630, - 1544 + 20230101, + 850 ], "deps": [ "cl-lib" ], - "commit": "d426f9d2ebec5f907c8a89d6b38ccbcb13750d4f", - "sha256": "0jganb5ws2qlzyncyhaw1hldqbpxm44ddzzy17hmriy8n5701fyv" + "commit": "112e903b489fed3f71b3165447ba6f21ee5675e6", + "sha256": "0yj5jzv3vdydn0hhdbikjxjfb9kqsqsjgb4524ghxn8nh2r40avm" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", - "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" + "commit": "112e903b489fed3f71b3165447ba6f21ee5675e6", + "sha256": "0yj5jzv3vdydn0hhdbikjxjfb9kqsqsjgb4524ghxn8nh2r40avm" } }, { @@ -89895,8 +91233,8 @@ }, { "ename": "pinot", - "commit": "f75cd89811b4bb668c1e7a93246b93fbcf5d9c47", - "sha256": "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0gw6xzaw60vp89jk035pvl7k13w9anvf371wrpxp49y49bg4qjy1", "fetcher": "github", "repo": "tkf/emacs-pinot-search", "unstable": { @@ -90418,10 +91756,10 @@ }, { "ename": "playerctl", - "commit": "6db0d82c2eef7c5bef5f9f2c15969da4c404b62d", - "sha256": "1pix3hcsg6ymzajiixwcq4v3clvadpkl0rhplkhachv6wmci327x", + "commit": "d866d72f544ca6833b142ec2731afec142952ddc", + "sha256": "0nvd3290lbw8c6r3z5famyl47pzlg3iz7rpndv8hs0mb54q8mpz0", "fetcher": "github", - "repo": "thomasluquet/playerctl.el", + "repo": "thomas-louvigne/playerctl.el", "unstable": { "version": [ 20220714, @@ -90454,15 +91792,15 @@ "repo": "twlz0ne/playonline.el", "unstable": { "version": [ - 20200317, - 642 + 20200318, + 758 ], "deps": [ "dash", "request" ], - "commit": "7f20037688d92e6af67384d99abf7f9671326cd1", - "sha256": "0p2iwd7iq5z4r5i14qq0jki68h0f0skk1bvxigybxx3ckggga5y7" + "commit": "463a94fc01112817d1e6e0209ea85385efcb1329", + "sha256": "14x2x4k7h172l660h1z0j44ar5m08gghxa1yhh5d4sgnzqvx6viz" } }, { @@ -90511,11 +91849,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20200427, - 405 + 20221130, + 524 ], - "commit": "59e682d77569b04e9fc80af9c4b05e4a997dbcec", - "sha256": "10v9j7sv5q9ywq8bdj2g1j262ggsy3hwqybn6rnrcim5v1f7a51r" + "commit": "3a0ec9741ae7ca67852022c6fa85519fcb4b69ba", + "sha256": "1lfn6bylpsam2la8r1k0gb3aik1fbbvpln37zc0hmdj3k0w4clci" } }, { @@ -90830,24 +92168,6 @@ } }, { - "ename": "poet-client", - "commit": "a0b003773edaa728ed49f0de2ca64a00cb60d13a", - "sha256": "11yj57915ly8j2byp5c395lip73iv1chrzxdlxilhnll1brvmaw0", - "fetcher": "github", - "repo": "wailo/emacs-poet", - "unstable": { - "version": [ - 20190403, - 708 - ], - "deps": [ - "request" - ], - "commit": "38a9635cab4799224153f89ff47cf1b060fb3939", - "sha256": "1h8svmh2pmg822jpag33ahmhpvdc77fbxxn205kx8p3vk362vbvi" - } - }, - { "ename": "poet-theme", "commit": "40bbe29dee56f7989d8e87c03f4842e2b191acc3", "sha256": "0pllyp4spj30g6ihzc91hzvnrvcg2zb49adj8wcmbzvq3hxnvls1", @@ -90906,8 +92226,8 @@ 20170421, 1632 ], - "commit": "f4126b64567a81e7f22058f09d56c63b2ff06632", - "sha256": "1sbwz9kxvnd5r24q9x6bhcjajjnm2z8q6khgqs4gl4ycs60kn0s6" + "commit": "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68", + "sha256": "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp" }, "stable": { "version": [ @@ -91076,15 +92396,15 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20220117, - 2351 + 20230202, + 1210 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "81d648ce623c05727836dbee5cbd1dfe6fe850f1", - "sha256": "0i28ml09a8c1n8frqa8zrpsv7b1d2fzz2j2hai222wldxs79hqpa" + "commit": "98695eb7ca4ca11dcec71a1cab64903bbf79b4d3", + "sha256": "0x22ablv7qc7h0llqkp6n42cg1nlwlx305ssigijcxbi99dyf3pz" }, "stable": { "version": [ @@ -91384,8 +92704,8 @@ }, { "ename": "pony-mode", - "commit": "a1fd64317610fb6ef5b14e8bf15e727680d5ff09", - "sha256": "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0yzkin6akmdmwdyjsc65clj40j8m8vwzgzkpcx3i3p2pg0d8nlxh", "fetcher": "github", "repo": "davidmiller/pony-mode", "unstable": { @@ -91526,11 +92846,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220711, - 836 + 20230120, + 751 ], - "commit": "d7560f18350faaee8362aee16481268de3cc6457", - "sha256": "12br7pnn01k7hwbcrx9c0dppp2jly7xhif3jrkg1v7mh8cj6sccs" + "commit": "da70c8296a3b3b69626b11f2d202a38075f00c7b", + "sha256": "02lls6fh0fyxq3hwnwb5kih26q29fgl9g4isq1qk6j7bvv53gb04" }, "stable": { "version": [ @@ -91549,11 +92869,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20220927, - 1610 + 20221231, + 1634 ], - "commit": "20ce6cbd2f06423be35b3b700c698f0e109e880c", - "sha256": "13ww7hld5pa32myj9krr6prmc99s7hnpsw8mw9krpxffykkblj2f" + "commit": "71cede0588c10526f88dd0375bce776ec2eed05e", + "sha256": "07rnncg8x1a2kk158pnqazj3hiqf1rf3bmwlhadajqbfb0vv96hv" }, "stable": { "version": [ @@ -91791,20 +93111,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20221118, - 614 + 20230212, + 808 ], - "commit": "48b7130ca3b5c98bdb21bf99b64a3536acf2b0eb", - "sha256": "1v8jkrgfkj2a08m82dz7vrlyjw3wrk3nd33wi4c166agssznlmih" + "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", + "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 3 ], - "commit": "48b7130ca3b5c98bdb21bf99b64a3536acf2b0eb", - "sha256": "1v8jkrgfkj2a08m82dz7vrlyjw3wrk3nd33wi4c166agssznlmih" + "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", + "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" } }, { @@ -92154,19 +93474,19 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 307 + 20221216, + 112 ], - "commit": "a000de747515aa7e7ad1ea0eab711864a4be0ab5", - "sha256": "1d1d4msmkc0cvd6vva0pfq72i07p0my9wj2s8zvj60pvah620yl0" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -92216,8 +93536,8 @@ }, { "ename": "prettier", - "commit": "e9992d6d5ed3bd677976262d8a887e5c0a4f4914", - "sha256": "07zhjbb40jl6xkfdzavqg33z17z8s4nyrv3qjh8c0m3si8abh6zb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1b6kmx72c19l1z74lbs3k0w4yj20xq8692mc4hnkz0hivwb6f3fy", "fetcher": "github", "repo": "jscheid/prettier.el", "unstable": { @@ -92917,20 +94237,20 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20221118, - 1035 + 20230219, + 647 ], - "commit": "5703797bb2a400e962479e670086aca4241a77b7", - "sha256": "0xm6792q1z90mjmxrp54vw2yh34hzxisdxz5dl5df78ckkgbxsww" + "commit": "fd257811c46f89f53143dd0ccbc134fc9459d6bb", + "sha256": "0rawixwdya1cva40r0ppq8c22ifdlprgyz6nw1a99w3bgny284zn" }, "stable": { "version": [ 2, - 6, + 7, 0 ], - "commit": "e3bae8c91bb69c501dcc2e74f9ea14e89cf0a09c", - "sha256": "0xs52fv4scb6389fzd0mp1qjh695z3b7n7116bb0mn50kjws6447" + "commit": "14beeaee7a77601aee4d4982811f6a27f696403c", + "sha256": "0ybd41iss8vd56qv6czpxqq7a99s4h7i3a2r4khy4rf5blj5zdqi" } }, { @@ -92991,8 +94311,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20220403, - 1621 + 20221231, + 1643 ], "deps": [ "dash", @@ -93002,8 +94322,8 @@ "projectile", "rake" ], - "commit": "f7877971cfe266d3d91b3a72012855e12a0112df", - "sha256": "0rlqrrndzlv96siyjcy47rwbd14sfk30rj0pqkv62rdy94m2wxay" + "commit": "701784df7befe17b861f1b53fe9cbc59d0b94b9f", + "sha256": "14lmasn46v4gsqciiqr2dr3xq73y0skdinmjsarlhjd0syw66sk4" }, "stable": { "version": [ @@ -93218,8 +94538,8 @@ }, { "ename": "projmake-mode", - "commit": "df23138073d2416fa6522beca86b7a62eb4d42e3", - "sha256": "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1hsw13lpnwxdi4h1vwd9inkv6fakx5f5s24hfqk276cnmjf53ms4", "fetcher": "github", "repo": "ericbmerritt/projmake-mode", "unstable": { @@ -93323,11 +94643,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220930, - 1309 + 20230130, + 1024 ], - "commit": "ef18ee4d6ffa160fe563307561f2cad12e9478b5", - "sha256": "12sy38s3ys1jyvbfrbq9xwhdvvdmhcj3bymnqfvgqlhi7p3frrp8" + "commit": "8416875696cb0c4283e96fe721d343277882ecea", + "sha256": "1wbs3vjiai0k1ywa45yc487d5rhfy360yfd0rprfp4ihc6xx3591" }, "stable": { "version": [ @@ -93394,17 +94714,17 @@ "repo": "ksjogo/proportional", "unstable": { "version": [ - 20200309, - 1556 + 20221205, + 1417 ], - "commit": "0e4537af7ba2bc9dbb449c38350bce012b382f51", - "sha256": "0k4kwmyja5nb6rmbbq71vzxw7nnxr0w8f9vzws14an28niwr4s8p" + "commit": "6b675694292a5dbebb52b6196e8ccee6e3a73042", + "sha256": "098252kjmq2cadz2rnjla9f8636ak8n6qj0axp4l7h4wvf618pzi" } }, { "ename": "prosjekt", - "commit": "6d359ec827573dd8c871c4f23df5d1737f1830e7", - "sha256": "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0qhg86p7dndj0sm5nys6207hsylrir4yvv1nl85b39gzwxlgq8ni", "fetcher": "github", "repo": "abingham/prosjekt", "unstable": { @@ -93427,19 +94747,43 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20220303, - 1716 + 20230216, + 1713 ], - "commit": "5f632bef3827a1d95d95bce92c5a3a1f903b6679", - "sha256": "1y86rqs7zzzyakc565zgknx9ykfb02yjb9pdzqybp2f7zla50wln" + "commit": "a847a8dc4ba1d99e7ba917146c84438b4de7d085", + "sha256": "0amfrjww7gl8myc60a3srs4h1d72pwlbmp8ra163g7v6ih4nq8gk" }, "stable": { "version": [ - 21, - 9 + 22, + 0 + ], + "commit": "a847a8dc4ba1d99e7ba917146c84438b4de7d085", + "sha256": "0amfrjww7gl8myc60a3srs4h1d72pwlbmp8ra163g7v6ih4nq8gk" + } + }, + { + "ename": "protobuf-ts-mode", + "commit": "ef4f38a4e91870ebfd8fcd4cfaf3463f77ac31e1", + "sha256": "0kpp1sqwbvipwac95gj873w1zvmsrwdcz3qangqz8bck2f48pvv6", + "fetcher": "git", + "url": "https://git.ookami.one/cgit/protobuf-ts-mode", + "unstable": { + "version": [ + 20230207, + 341 + ], + "commit": "3076f25bd5ce05f4a4a5840506c3a5a2c0e839d9", + "sha256": "04zqi7anmwzrsgg5clbvilbmi7hg0m29gyr4cym871q73xgi2vmr" + }, + "stable": { + "version": [ + 1, + 0, + 1 ], - "commit": "90b73ac3f0b10320315c2ca0d03a5a9b095d2f66", - "sha256": "0g904h7z2nb8vx0529zzq3gm0jal9w4l5ch0zl1q9i1g0n3q1dfp" + "commit": "3076f25bd5ce05f4a4a5840506c3a5a2c0e839d9", + "sha256": "04zqi7anmwzrsgg5clbvilbmi7hg0m29gyr4cym871q73xgi2vmr" } }, { @@ -93582,15 +94926,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20220318, - 1129 + 20230105, + 503 ], "deps": [ "async", "cl-lib" ], - "commit": "328c64804c4c9e15b373c7ba3bc82bfdfb27971a", - "sha256": "1mmn5qmjn77jh0zjfgl6w87yxxq116cb7rj3an0svmaabqsmwpjj" + "commit": "ca5bed69f803aab71851c46b0118b66f58455b8a", + "sha256": "0j2bgcy803qnwbrxqr9f26g593vwzjznnwbsy4r2s7nilgcy3anq" }, "stable": { "version": [ @@ -93681,8 +95025,8 @@ }, { "ename": "ptemplate-templates", - "commit": "3207d42ba3c5d9c2f2e7621934e95ad2755ca1e0", - "sha256": "0i1zipjdcwclrkcs0n7g8n64ggd2lfbndbas6aqpnww4b3kdzdxv", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1cmf8q02532hz0m2zacdkbzvc6mg2qcmhy3kwww0082ck9vwvz95", "fetcher": "github", "repo": "nbfalcon/ptemplate-templates", "unstable": { @@ -93754,14 +95098,14 @@ "repo": "xFA25E/pueue", "unstable": { "version": [ - 20221105, - 1230 + 20230219, + 1558 ], "deps": [ "with-editor" ], - "commit": "5ad6979a0129c7cddc69f71c9084e4356f450fac", - "sha256": "1jcy8gv7zg0hr2p1vcdx0wy2gh6wmrxp6j3g4idsa9sa1kbm6dj0" + "commit": "386e43d46cbf68470d040b422061ac2ba1629749", + "sha256": "0bjshh7k21s14cbbq10ra7dnxw8df8y3447z1icw554jqzmgxm9v" }, "stable": { "version": [ @@ -93808,17 +95152,17 @@ }, { "ename": "pulseaudio-control", - "commit": "7964f226e12c3a27ff856e28f4b030ebf304aea2", - "sha256": "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0", - "fetcher": "github", + "commit": "4fa5695bc55b40eb57ff925ab4af354b789d5224", + "sha256": "0ry55jvf3v7yy9lxwxb37wkn0hhp0kbkcri4vy9vmmf10sv2rx89", + "fetcher": "sourcehut", "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20220418, - 742 + 20230109, + 246 ], - "commit": "22f54ae7282b37eaec0231a21e60213a5dbc7172", - "sha256": "0y87i8qpf1fvz37zly9srss1y9hpn4jjj8gsikc72c4qs9n0ljv0" + "commit": "34a6114357dbbc6b6720aa013e0f8a48f3739403", + "sha256": "0wm312pqp0i5i6qh6g3nacnnvsrad58927cl2g42gxzrzlb3slv5" } }, { @@ -93883,26 +95227,35 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20221016, - 427 + 20230214, + 1156 ], - "commit": "af8dfe1f5a3e5c4ba650fd15716ae707f29b33f8", - "sha256": "1pdghwwcx28f056w0v26d21da6l3nwh8nsmw7lf8zrn43b259yas" + "commit": "a39a4ecac7279bed1a150a895bbc80baa7272888", + "sha256": "0z10k70rh1lscrmwvrirngl841sf785r0by6166jx3bbsahw72n4" } }, { - "ename": "punpun-theme", - "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", - "sha256": "10mgyrxz2habhaqyg1g4c5kn13q425j0xpkkdlg10cdfvxfl9d1s", + "ename": "punpun-themes", + "commit": "41af65d99ccf3d366a9fd7c857aba3063d074805", + "sha256": "1hjrcqq80m7045g3s0qxcwqn8c4av6xpv5f3qz3nqkz30cmdcs7c", "fetcher": "git", - "url": "https://depp.brause.cc/punpun-theme.git", + "url": "https://depp.brause.cc/punpun-themes.git", "unstable": { "version": [ - 20210508, - 1635 + 20221121, + 1018 + ], + "commit": "6a7e04de1ad9f7ba9074b7206bffc9241c33349c", + "sha256": "0661rhlh3nbbrjdg118y9nk7kmshb5p0jzgfpnqvqmf7j6p6rpg7" + }, + "stable": { + "version": [ + 0, + 0, + 2 ], - "commit": "7026684cd568cb691af3ced5de14c375fe6f5a1a", - "sha256": "1nwvlp93l5lj259mchd1a2glq3jxd0h1vazsbjqfi07hsg86xjp0" + "commit": "6a7e04de1ad9f7ba9074b7206bffc9241c33349c", + "sha256": "0661rhlh3nbbrjdg118y9nk7kmshb5p0jzgfpnqvqmf7j6p6rpg7" } }, { @@ -94067,11 +95420,11 @@ "repo": "ideasman42/emacs-py-autopep8", "unstable": { "version": [ - 20220802, - 1154 + 20230115, + 633 ], - "commit": "4e5a8d5ddd77b45841f0e55d7c5326854f565830", - "sha256": "1k1yvf5n5ygzf170bfb6wjhw3jrk3wsycb9bf39k53p8gzanh435" + "commit": "d0486c22c0a92ad7911714026021fe4ad276b7c9", + "sha256": "1xa25sfdmc6srys0ymhdj07kss4ixnw3sqq5grjix7acifdmrbj9" }, "stable": { "version": [ @@ -94244,6 +95597,26 @@ } }, { + "ename": "pyconf", + "commit": "835c996cefd39c06768790b33d0a0823765c98ef", + "sha256": "0z0d3dy0vp9gq49qkqj66n0w4zd0ci4y1c0vay4nym4xy8mjz01h", + "fetcher": "github", + "repo": "andcarnivorous/pyconf", + "unstable": { + "version": [ + 20230127, + 2046 + ], + "deps": [ + "pyenv-mode", + "pyvenv", + "transient" + ], + "commit": "f78e7f269210c7d7e06001752d87c8fbfd8b9084", + "sha256": "019c1hcdfr9cnpcag2qyg2lkf1scg1m6aw0nllwn31cwa8mvyyga" + } + }, + { "ename": "pycoverage", "commit": "eb0310bbe8427abdcba2b30414ec26475b0b7440", "sha256": "1jaanmpnawk0r6zfzx18crqml7lv412l2l0iabp345xvfvsh8h1m", @@ -94266,11 +95639,11 @@ "repo": "statmobile/pydoc", "unstable": { "version": [ - 20220531, - 1457 + 20221222, + 1426 ], - "commit": "c8b667e17bfe3e63221f822c5c4d58c8fb4fea90", - "sha256": "082ar5w28dknaa63mf587vdzr78xlnvh8lbxqq3hk6qa2c72akam" + "commit": "c9d8b5249c1b3814da062ed9976e4137d6e8d869", + "sha256": "1ifyhdcvj25rnrvq78qjma3dg826hpj3x5ic1sydrvj0yb13jhim" }, "stable": { "version": [ @@ -94375,28 +95748,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20221107, - 41 + 20230201, + 203 ], "deps": [ "async", "xr" ], - "commit": "93fab3c9e8c2490687781d45c1cecead0bd3ecf2", - "sha256": "1rlfic87ibbxd86fj0x4cryhz41yggpzy94p3h9xk8j3y74sab9r" + "commit": "295a95067eb00a1a8506991ef9a67e3b8d3317f5", + "sha256": "1scqkl0l7r2g43fp5yz4ymmwyc3md4sqfk880phj4ax22zgla0ry" }, "stable": { "version": [ 5, - 2, - 8 + 3, + 0 ], "deps": [ "async", "xr" ], - "commit": "93fab3c9e8c2490687781d45c1cecead0bd3ecf2", - "sha256": "1rlfic87ibbxd86fj0x4cryhz41yggpzy94p3h9xk8j3y74sab9r" + "commit": "20b633aab16a31ffd1ca642ebaf329f0ad7c79d7", + "sha256": "1han97zb4jp4b4x52x5wzc6z4ndvq6n84cijlgzc9jqahlas18cn" } }, { @@ -94425,8 +95798,8 @@ }, { "ename": "pyim-cangjiedict", - "commit": "a82ac773bb9bc36727314d1eb5a75610ec9ca694", - "sha256": "0ma99y1ijpdqrmypmj108ny7bfj9ylryav7hj7dnp9gj4b1bhxhh", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0n3qp5i23p6vgahhlhvzmb03sxnfsn0g45jjv4nk4a81np277ddx", "fetcher": "github", "repo": "p1uxtar/pyim-cangjiedict", "unstable": { @@ -94443,8 +95816,8 @@ }, { "ename": "pyim-smzmdict", - "commit": "8bad2e8162f5a44bdbe1117efa31133ae7814489", - "sha256": "104kxd8d2b7rch0pfsdz5w98rskx1sl6fx0lqspcilir9k9my1cc", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1j0cdg13n1nhayaagf4zd1simbsknzk9589i103b1zg5fp2rlryz", "fetcher": "github", "repo": "p1uxtar/pyim-smzmdict", "unstable": { @@ -94479,13 +95852,14 @@ "stable": { "version": [ 0, - 1 + 3, + 0 ], "deps": [ "pyim" ], - "commit": "114489ed97e825ae11a8d09da6e873820cf23106", - "sha256": "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc" + "commit": "2766bf0dd8514226cd8aac1ab9402af603b96d06", + "sha256": "1fzzib53b8f0145wih3pbxpngap3xgdqrslgpc7hmm9a0z3v52kn" } }, { @@ -94543,11 +95917,11 @@ "repo": "it-is-wednesday/pyinspect.el", "unstable": { "version": [ - 20221118, - 1014 + 20230216, + 1121 ], - "commit": "a6f9a47327b2465dde106307e5dd8e84cb3321d9", - "sha256": "1lqgv9xbl3fvgkz60rwq7awmzhkpfd70bhl1fbz8v4cl4fhbl1p7" + "commit": "4437dc589d0c1eb0ca80bf0d005ee27d15cf69fc", + "sha256": "1fdgsbd1rz54y18m43dyrpz6ir57p1dqgbnd24sx9zj85mn1z3fa" } }, { @@ -94575,8 +95949,8 @@ }, { "ename": "pynt", - "commit": "fdb297084188a957a46dcd036e65d9d893044bea", - "sha256": "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0dklikclzaxp2d0mq2k9731is6gmv3rzglqs1j3gzj6v7vg2qrfh", "fetcher": "github", "repo": "ebanner/pynt", "unstable": { @@ -94616,15 +95990,15 @@ "repo": "dakra/pyramid.el", "unstable": { "version": [ - 20210427, - 1032 + 20230114, + 1049 ], "deps": [ "pythonic", "tablist" ], - "commit": "66f54f4a9cc9fa81edf768ab433d5b3c5517363c", - "sha256": "0sijy6nk46yw21j49x5n93za2zjzqqrfmjm7dz3z3gj7jknk27i9" + "commit": "c8a8b36725d85664e74f59600fe5d18d06ea907d", + "sha256": "05q9bqxnv2b1d9g7j86pc36mfn8d7x5piz95lc38cqwv492ivrbx" }, "stable": { "version": [ @@ -94659,8 +96033,8 @@ }, { "ename": "pytest-pdb-break", - "commit": "4ed7d5d5e81818dad55edda73fbeca8c5021b932", - "sha256": "0dxn53y9zjlip0bjynjql984wrf39pmg5fsx1qgsrj1bw78xqw26", + "commit": "949da8f16687bad96f53714ccbde895587d439ff", + "sha256": "13kbs1zcnjsp6ysdklwd0l1kby68ripp0cvaz4fvalc3lgy1866q", "fetcher": "github", "repo": "poppyschmo/pytest-pdb-break", "unstable": { @@ -94884,20 +96258,20 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20221003, - 1451 + 20230218, + 2131 ], - "commit": "398ba92372cc37bae5d63e4d4c42e65edf7db74b", - "sha256": "0mdlqmdwv6kz8dqlzwv46rwz4qkr53a05kh8wgz5mln1x77rwax7" + "commit": "7d0167ecd71b8a2b9cedc08a490107c36b9ada43", + "sha256": "1z4kgzw3al8mldzm0h697r2dig0fia5kicd5r1fv7j32wmp5qxcf" }, "stable": { "version": [ 0, 1, - 4 + 7 ], - "commit": "398ba92372cc37bae5d63e4d4c42e65edf7db74b", - "sha256": "0mdlqmdwv6kz8dqlzwv46rwz4qkr53a05kh8wgz5mln1x77rwax7" + "commit": "945f19455ae60e9b30910980142f67da91d9f001", + "sha256": "1fmzc5y6994mwd97dbgsmj154q9ci1d6d0w5p6a43hxfmgpnv3w5" } }, { @@ -94908,11 +96282,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20221031, - 1030 + 20230209, + 731 ], - "commit": "d0fd742a28e051b99490e48971dafd9766064553", - "sha256": "17jzl1njx420aram9p2kki1f1drwrnr0n6zglc8sv8azli0nxsq4" + "commit": "d00e9ffe3a7c450362d453e00b4adcb826bce464", + "sha256": "0gr7nb350mqdij12mwfvym4ivjm2ml0ckh262w1bb1yk4w6ciqzm" }, "stable": { "version": [ @@ -94998,16 +96372,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20220602, - 2108 + 20230117, + 1408 ], "deps": [ "cl-lib", "folding", "python" ], - "commit": "fef5162af9dfc1225339098ae00e053a2e16b799", - "sha256": "17nyjvbydclp2v2nrmdayxic2mj7j0frksc359ad999r05qq0nv7" + "commit": "744924e7468200f3e8ac7ad60a496ad9d080308e", + "sha256": "127ddg5i31v40calvnd9r4d48my34wnaanaii70mr5jh1w6gw13v" }, "stable": { "version": [ @@ -95085,14 +96459,14 @@ "repo": "nryotaro/pyvenv-auto", "unstable": { "version": [ - 20220315, - 1606 + 20230106, + 415 ], "deps": [ "pyvenv" ], - "commit": "59ece8554bf249f30984c81c103a5704d2fb27bf", - "sha256": "1f599q5bd89k68s0m9mq08a2f3465j00hklnmbyv0cm3j0majwzm" + "commit": "b4365e60e3ba747a5fec8ca909f64fe8c73d8db2", + "sha256": "11js0zkf35vxbbvrxghv4c0i1j4ma6agdfl24qcvchd2wsnmf7mn" } }, { @@ -95103,11 +96477,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20220306, - 1629 + 20221224, + 2024 ], - "commit": "3eac36d23131088e32057716a3241407fa8dc041", - "sha256": "1wlgkyh8ci03448n5fm0p4z7jkhbrvrd3s8rbxvbdbl6ll1d9x15" + "commit": "e18a7b40e876a5502d9d2d6d16a356295c555fab", + "sha256": "0p5m2hxmf7r9hr00kjhjgpvl2ddk4hwaw9s0m6rlpg9x24bmnzqs" } }, { @@ -95141,11 +96515,11 @@ "repo": "ruediger/qrencode-el", "unstable": { "version": [ - 20211010, - 1334 + 20230129, + 1750 ], - "commit": "76de0de6449031ef5dd3e73ea4ab820e0d58a0e2", - "sha256": "1b7z3nxwrgkw1p7dp6ibsvhvpyl2m881w9yr9qcmdrkf78cqlpvx" + "commit": "449befdf160c62a40961cd97f02bada75ffda5d8", + "sha256": "14fb0jbv3badgvrgav650n4islm3zqwcrfm1djsh06z88a4mc7hz" }, "stable": { "version": [ @@ -95158,10 +96532,10 @@ }, { "ename": "qt-pro-mode", - "commit": "e9af710be77ccde8ffa5f22168d2c8a06b73dd6a", - "sha256": "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf", + "commit": "9f7e0dfaed647cdfc77101f1f3ab98293a736cbd", + "sha256": "1w1ydl2dqdvj7hgnm7l426ifdssr59f3vxxdm81jr38w7lqfmwzb", "fetcher": "github", - "repo": "EricCrosson/qt-pro-mode", + "repo": "emacsorphanage/qt-pro-mode", "unstable": { "version": [ 20170604, @@ -95262,11 +96636,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20220928, - 919 + 20221220, + 1136 ], - "commit": "37962e3b264795b7a3593109c7f14dbf57d9b77e", - "sha256": "1xdqr73y8lpxhmgp1yrap3bw5pf8lhaw2v3jib1pka6aj40vi2di" + "commit": "79651cd0de497a8db18d79e7598eb01a4eec4f09", + "sha256": "1d5w4yq9ps65i82767h0jqybgpj2m9p3zryb0816d32h0bqyhxk6" }, "stable": { "version": [ @@ -95285,15 +96659,15 @@ "repo": "quelpa/quelpa-leaf", "unstable": { "version": [ - 20220704, - 635 + 20221231, + 1618 ], "deps": [ "leaf", "quelpa" ], - "commit": "dadbc96a3c806e1c2dd7614a44ccffa3ee673568", - "sha256": "08kqbpm9ns60v50viiwicmks960aaya8cw3kg8a0smkj9qlljc8k" + "commit": "296ef97c29d7540316441715b92f6d15430f3579", + "sha256": "1mcl6ziqqw1dh4kdz1ha8llk4yzljg0r5zrspyw6jw9c4dw4dwxg" }, "stable": { "version": [ @@ -95349,11 +96723,11 @@ "repo": "renard/quick-buffer-switch", "unstable": { "version": [ - 20201027, - 2307 + 20221220, + 1142 ], - "commit": "da82555f286588f171eed1de151325bbdd8cbd91", - "sha256": "1d84zk9a42lcxv95z6izvx30vrniccc88fbd5nmjcp58mq5xh2fn" + "commit": "280f67f1a5e02533573b45d585c222c937f11f81", + "sha256": "122wsgx0wrhk3c5jf2pwns11i686l6c1bcqaqb9qixg0d7l1cg2f" } }, { @@ -95428,14 +96802,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20221015, - 1114 + 20221215, + 828 ], "deps": [ "ht" ], - "commit": "548b64c3679ff058d80d0080c06d736e25611563", - "sha256": "1nbvp4vwiz3hd962db1gh4c19r4xj0p0rr6jbm34mbnm3bm0lgyz" + "commit": "7a89313c07a21eae9cd69a1a98e2a134d559e04f", + "sha256": "15z8ix2wi452zkh5qz1qlsvq8bnwjw8014k51i6rvw8aczm344lr" }, "stable": { "version": [ @@ -95593,11 +96967,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20221118, - 1721 + 20230209, + 1424 ], - "commit": "28d19dee861354d92108692dd80d9f18b2db0c46", - "sha256": "08blxg2ibf9nr2m1hhrw9l232a1zly44sw8xrzbznipv6s9388w1" + "commit": "947d9806ee27ef241643f978c7901fd1f9e10c98", + "sha256": "0szcdddfcifawm0b2yvc7rb5w4w1w7znpvi65yg5p2hnwgninqmy" } }, { @@ -95660,11 +97034,11 @@ "repo": "thegeorgeous/railscasts-reloaded-theme", "unstable": { "version": [ - 20190308, - 759 + 20201130, + 903 ], - "commit": "c6a1cf13a164f22b026b0959527c3b98c2b1aa49", - "sha256": "00clkjrp2nfchhznilxjb56bcdv1an50cawnz6747ck22x0ycbfn" + "commit": "1c3850568e60a555d59cbb57bf2b6aa06e99d454", + "sha256": "1z6nyn2galkp9c06n6k431rqm12wla24pa0bmwqjbbhz4jz5dxf2" }, "stable": { "version": [ @@ -96092,8 +97466,8 @@ }, { "ename": "rcirc-alert", - "commit": "735aa2256660efffdaf6ecbd61a3e2818a48327f", - "sha256": "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "03ysdgfki2yn4cn85kmxrhrrlrzjd9s26p93zh46llghgwa12qrd", "fetcher": "github", "repo": "csantosb/rcirc-alert", "unstable": { @@ -96433,15 +97807,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20220419, - 2006 + 20230201, + 948 ], "deps": [ "load-relative", "realgud" ], - "commit": "19a2c0a8b228af543338f3a8e51141a9e23484a5", - "sha256": "1yyh945w13qh8isj5p0v8sjwzmvzh330szd2hdy3fgc3d58r7sym" + "commit": "74d442abc8469bb6277702f9c60fa479848009b2", + "sha256": "150p7yk0x4apszvkh6sv9iwjv5amzjvlj9ydk9w46bxfypxr29p1" }, "stable": { "version": [ @@ -96754,13 +98128,13 @@ "unstable": { "version": [ 20210930, - 159 + 207 ], "deps": [ "cl-lib" ], - "commit": "42cad906652a82c8c932b90fa04593702ae6f0ac", - "sha256": "1zrb9hix19363z1z4fvnc79wq4lh6f6q92df6dn7szb12xs4vhq6" + "commit": "94b31f6bf1dab6af942948fec975e37424938a62", + "sha256": "06kx2aykxzj60axsxjvqx2j8z3p19k47i0prbqfg78cjgv7fdwy6" }, "stable": { "version": [ @@ -96802,11 +98176,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20221017, - 37 + 20230109, + 536 ], - "commit": "44d4e57a2bfb401c282e4a460db755680e896de9", - "sha256": "191mw99sk027jzhp6gn9g4mx6a318bycfyjdmgsdhms21lxjz0j0" + "commit": "837965094aa55bbba9a62f9612e59c5440cbfc71", + "sha256": "1kzfc4c9iibacrlqp1fzm5cgpl0xpxcrsf56hi2g27cgspj9r5ya" } }, { @@ -96893,11 +98267,11 @@ "repo": "ROCKTAKEY/recur", "unstable": { "version": [ - 20211108, - 219 + 20230121, + 1836 ], - "commit": "cac3120451482516b6e4416b47dea9980f145889", - "sha256": "1pawb3gzqc8dafrqzi4c96gpx9qzibfqh0gpx6cm0glpxqir8mag" + "commit": "043b3267125cb9fa273d0f0afee0dda1fc60c507", + "sha256": "1wn4ayb1f186k1h0c4p893gpc3ldlslrj5wh1jqrv1ffqlnn4lw9" }, "stable": { "version": [ @@ -96917,19 +98291,25 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20221016, - 1015 + 20230215, + 720 + ], + "deps": [ + "compat" ], - "commit": "ba3cc0765af966e8acc27f6606c8918f442e37e9", - "sha256": "1rq2c5jvs0v9z7zvvs6vynchmaxaznw8jw00qbw5y8hq0alifi3g" + "commit": "31b67c17467fd8808efdc9875c9e8115f7b4b534", + "sha256": "1j3q99hlzr6is7w0062mfryqkw3nld3md0qwqgbklzhxngy3vpfi" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "ba3cc0765af966e8acc27f6606c8918f442e37e9", - "sha256": "1rq2c5jvs0v9z7zvvs6vynchmaxaznw8jw00qbw5y8hq0alifi3g" + "deps": [ + "compat" + ], + "commit": "31b67c17467fd8808efdc9875c9e8115f7b4b534", + "sha256": "1j3q99hlzr6is7w0062mfryqkw3nld3md0qwqgbklzhxngy3vpfi" } }, { @@ -97361,11 +98741,11 @@ "repo": "DamienCassou/related-files", "unstable": { "version": [ - 20221101, - 1909 + 20221125, + 1824 ], - "commit": "4085ed9c235983e530da24cb1fbe33a5b7928ab3", - "sha256": "1nnhggbxgvl9h5k796kq3ni2jvv61kki68f3yk54s6yc9h2sgn6p" + "commit": "0c2e38d0bb0db45a50a082d3e8362c07fc60a1f2", + "sha256": "0n87x3ilnn7kc607pa5zffrkpbnkv4xa9hlzyx8ga8xj756zk558" }, "stable": { "version": [ @@ -97385,14 +98765,14 @@ "repo": "torgeir/remark-mode.el", "unstable": { "version": [ - 20210504, - 1238 + 20221123, + 2127 ], "deps": [ "markdown-mode" ], - "commit": "9f15285445fdb53e720ffe72f5cf05231d340906", - "sha256": "0mgkcdagj4n47nahsxnk7l1b4v15cbwqaac4fr8809jvis1rfx5g" + "commit": "5a2a702d2af8fd007ae02237d5824356d0c1acc6", + "sha256": "0b6gk1r90m4wrmn0aimlz4xmpk7jnfm38ri80vpikm3alds5wp7d" } }, { @@ -97453,11 +98833,11 @@ "repo": "karthink/repeat-help", "unstable": { "version": [ - 20220718, - 1742 + 20230118, + 24 ], - "commit": "bdc21d9a8846b4adf63dd9317860666da5ade478", - "sha256": "1bvgq9amnawyv3k1vbalvlfw2r2z1yqilwllcsanlrdcz95awcv2" + "commit": "41dea6fba2edd6ac748d0ca7a6da4058290feede", + "sha256": "1lnwb2z8y9cjah545n27j62a5pdksid0rah2bzws9xi8c7dgavkm" } }, { @@ -97682,11 +99062,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20221115, - 1450 + 20230127, + 417 ], - "commit": "eb66f05fe37f22228f470882b04a6362683975e1", - "sha256": "0g6n9bajgs7mgw9qlx0kin109br92wfn5py5zby674khxvppxdf8" + "commit": "01e338c335c07e4407239619e57361944a82cb8a", + "sha256": "1arhjsybb1nhq14p06jzbvp25pyp1pddq1ldyq25vj1qrsh81rjq" }, "stable": { "version": [ @@ -97857,11 +99237,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20220909, - 1233 + 20221203, + 1808 ], - "commit": "1fb570643b08ba66eb70831b6f874f52546917f1", - "sha256": "0npij1p1yw4p1f1yrx6bl8q18nav5p2xvbp7qhzhn7lb2fdn5jqv" + "commit": "0ba72816f92f3d5906cdf76f418fd0a3ee72809b", + "sha256": "16npyzj4d9qaby1nw8dhs5llqkl2jdy1gmxjayjvn0chkjlidq9x" } }, { @@ -98033,14 +99413,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20221103, - 2351 + 20230125, + 1846 ], "deps": [ "seq" ], - "commit": "542a3f7742d2f7878f1509bd193d137b5bba8e7b", - "sha256": "1j3sca85q5kd9b2h0iyy2pml1md6jx0q36c3y948svdil11hxv92" + "commit": "83c639756357c6b154842997b86e63c583ff8ff4", + "sha256": "08nnm6kvndsvnk7l1zr0zmbc0f6wsrfq284n80m2sxhx428k5jwh" }, "stable": { "version": [ @@ -98066,8 +99446,8 @@ 20141205, 145 ], - "commit": "13d0821a4ec5ece7e6a81f50d2a1a7e7ad21394d", - "sha256": "1sfl0rm4sxjkcjki0hmkkcicr24qr2q7gmficg9bi5q6vlrid1pn" + "commit": "3105c950bcb51c662c79b59ca102ef662c2b0be0", + "sha256": "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h" }, "stable": { "version": [ @@ -98086,11 +99466,11 @@ "repo": "ideasman42/emacs-revert-buffer-all", "unstable": { "version": [ - 20220731, - 2351 + 20230109, + 536 ], - "commit": "c07996fcf3e8f7ee156055327522586f32582ce1", - "sha256": "16288519g1q07rkg8j3kmxv6lssjl04kw7ni4mj44jfgzimm6vn6" + "commit": "08e90d2d75f5d5900ca2a0d2670592bcf2b2d68f", + "sha256": "0yiki0vlxa7xkw19c4gwf5cxl32bhd2nm6ibpfamsh145gq4i8g7" } }, { @@ -98131,23 +99511,20 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20221013, - 1342 + 20221123, + 1643 ], - "commit": "93208d44516e1f4c6e181ee5d374f2dbd7199d0c", - "sha256": "0rxsmxk3kdlywmyaw2nrq26hqb84l46cj56l1f15b98c3m0pzxzg" + "commit": "53ec006aa6aa4fae9c6c64004692aa3d01b38275", + "sha256": "0qfl774796wpplzsv8ns31472615sb6hh6r7z2mvqhm3i0a5d35z" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "deps": [ - "helm" - ], - "commit": "02546beecf4c495940885e7b7b911d84b12646ef", - "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875" + "commit": "73bb2a18bb34136c9eeddef5f138840872ece752", + "sha256": "1b4wd9ny6rmlw0cr2kvhs0kn33gx0zq4hv6vgr91a9wwj5y33lav" } }, { @@ -98158,15 +99535,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20221024, - 1631 + 20230201, + 1819 ], "deps": [ "transient", "wgrep" ], - "commit": "3880e8c734c976a2d393aeacf60d510f56d8217d", - "sha256": "10rbfncv2baz28zls0zcqbz5gahbvdi3ixab4cm6gfm13xbgwvf7" + "commit": "e7afc1573922dd6ec8e8ccd178e054ff8c99e5bf", + "sha256": "0cng9kra880gma19jl9c8wwrsz94qcha7ymjrw279zq3244750j1" }, "stable": { "version": [ @@ -98386,8 +99763,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20221112, - 1341 + 20230212, + 1425 ], "deps": [ "cl-lib", @@ -98395,8 +99772,8 @@ "popup", "posframe" ], - "commit": "74f3dff40e66c65388a9471eecbc1d9aca5612f7", - "sha256": "1bqhn6pvsgs1x882q7y5p372aify2jmyfmgmx99nzakxbfkb0yqp" + "commit": "6438abacace7d94f05fabc45b82d619677fc5fca", + "sha256": "0fyv92lfz7c98l79valrh9wr78b4303bhnqjgycbz33p9m2hply0" }, "stable": { "version": [ @@ -98465,6 +99842,21 @@ } }, { + "ename": "ring-mode", + "commit": "7e72e31f9f7ce02c68560e6ce3a0eab27f0897de", + "sha256": "1nhc1zn9rgkpz0z076b1r45d7mvxp7layc9jbq1qlj7vj0w8gr4d", + "fetcher": "github", + "repo": "thechampagne/ring-mode", + "unstable": { + "version": [ + 20221226, + 1159 + ], + "commit": "4e38dd5ca374d7d40fd1eeed1e83ef935efd387a", + "sha256": "0972ngw1qybxh3vs2vfbpy1wq8bircvgxqfg6pyg3ynhfnjzmfvj" + } + }, + { "ename": "rings", "commit": "113118947e33ab0c8004dbe9b188eba2ea282356", "sha256": "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7", @@ -98556,14 +99948,14 @@ "repo": "felipeochoa/rjsx-mode", "unstable": { "version": [ - 20200120, - 1446 + 20200224, + 2149 ], "deps": [ "js2-mode" ], - "commit": "014c760138dac5ae47ed3eade62f4a9f765f52b7", - "sha256": "1ahipwncifvbyv9x9gn35zkc1q9y41j0zqgsf9s31825zczgwrb7" + "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8", + "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i" }, "stable": { "version": [ @@ -98601,14 +99993,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20221115, - 149 + 20221207, + 225 ], "deps": [ "inf-ruby" ], - "commit": "c29b47f588715b911da4588a59f3a5245f844138", - "sha256": "05b60l9pn4hh3fdxlk0q98qi2w283a62x7jw02v958y33p030bqd" + "commit": "4ddcc847542ffbba41339e83e462c7d9aaaac860", + "sha256": "1srd3rlvm0bg0i592zw41nbf73w4c92mcsv0isih62686237gnzi" }, "stable": { "version": [ @@ -98772,14 +100164,14 @@ "repo": "Dragoncraft89/ropgadget-el", "unstable": { "version": [ - 20221006, - 1105 + 20230107, + 1225 ], "deps": [ "transient" ], - "commit": "03305f2d73d7092adab495c45b15c8f16f292c8f", - "sha256": "0h141q39ij5bggvs4nq8532vdji29pxaaxszahlhabz5rz44wrf6" + "commit": "10e9d6f66de1ee805d871c59f4acc078b66747a3", + "sha256": "1dxslv3akgv60i45d6i4s4140v6n2jxbn4yhsqf59z0dxdpskkgc" } }, { @@ -98790,11 +100182,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20221031, - 2003 + 20221212, + 1047 ], - "commit": "3c4be0ec8dc14d69f2f0b5f46521edf60535b12d", - "sha256": "1srrm2i0yff0dns6rk5wzj8s1hnnbki6ijvih6gn6pfqz3ndvpn6" + "commit": "b437e46bee8f64eec1b8e61f86476977dab6cdb4", + "sha256": "0vbadwr5gmr7px40mhphm4v11ix302bj9f4m8mw7h5mwm8y84skb" } }, { @@ -98868,15 +100260,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20221018, - 1123 + 20230201, + 2008 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "4437a243b2042585db994d77e6b7c85864a8d11a", - "sha256": "1ynvrly22v4jzydr168534xl5kxxnbxg7wm15zj4bjiiq1b47b5z" + "commit": "62853a428b416e6a5fd3d8f57ff83a1798188a3f", + "sha256": "09jmyym1jrr6mj2y2fwgmx5bcbmpgyr1msqnjpsn9qxg24jalzdb" }, "stable": { "version": [ @@ -99030,14 +100422,14 @@ "repo": "jimeh/rubocopfmt.el", "unstable": { "version": [ - 20221024, - 2139 + 20230204, + 1110 ], "deps": [ "cl-lib" ], - "commit": "9b0023158cf2517fc07938f678fac8b67f1c6da3", - "sha256": "1gscj8k82gx3qrq38wvg29jqd8kk2b1qdg2n5s31dcs2sycb5fxi" + "commit": "1c6f4f1da755c9e60eb475eb9530320726904341", + "sha256": "0ng8j835cyzb18izl3syjllh739mkv2cb53zrkjkm81wi1c3ws92" }, "stable": { "version": [ @@ -99113,11 +100505,11 @@ "repo": "rejeep/ruby-end.el", "unstable": { "version": [ - 20141215, - 1223 + 20230205, + 115 ], - "commit": "648b81af136a581bcef387744d93c011d9cdf54b", - "sha256": "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds" + "commit": "1c87e214de6a75936b89ab50ee5fe522b87b009e", + "sha256": "1y22hn1id6akgx7n295rjlj58qid76vwanhwv58l30g8phg8ysf7" }, "stable": { "version": [ @@ -99321,10 +100713,10 @@ "unstable": { "version": [ 20211205, - 635 + 636 ], - "commit": "8d7a0b2195111713d227f2a9c52343a0251cd06b", - "sha256": "1qi4iv88kz4p78br5rp917h1gzgfb876yp36zh8psj7pw1qb46i7" + "commit": "99b53f7679e3eb868e4b4585085bbed102e5fce7", + "sha256": "0n16al1nx7r98wbwgrq89yfs581wp6nbbhkns1z5qlqmc21brcqr" }, "stable": { "version": [ @@ -99359,11 +100751,20 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20220821, - 1421 + 20230131, + 907 + ], + "commit": "e44bc5fb9712303150906f05ce7dd41c8c184aea", + "sha256": "0msbyy92gm75r1g70vg5901n1q5y4p7qnhfhgdnid5q59gd5z5dr" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "0ac25bc1acae652ffb58c48a3853cd1dcd7b40a4", - "sha256": "0c455f4jv0c2mmvk37s3cs56gbxbw3h6lbc53q76xnm16hg8b0nv" + "commit": "e44bc5fb9712303150906f05ce7dd41c8c184aea", + "sha256": "0msbyy92gm75r1g70vg5901n1q5y4p7qnhfhgdnid5q59gd5z5dr" } }, { @@ -99374,16 +100775,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20221023, - 1807 + 20230202, + 1326 ], "deps": [ "dash", "f", "run-command" ], - "commit": "ca44efc45b906bd377871b876171476f977e9fc1", - "sha256": "10i801x33ld4x7gyfc6fvmhc292hd9dn20qqvyjf1wiqijb1nddc" + "commit": "60e6fdbe6e8bea3871674a0e5779324ed5dbd318", + "sha256": "0ngdxnjz3mvxyzmg00rs9mxy6b2zg86nsplhn0vmbxln133p73jr" } }, { @@ -99394,11 +100795,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20221009, - 2235 + 20230115, + 633 ], - "commit": "984e5219adbee369487768a3ad6a408515e15446", - "sha256": "0k4m4rab3dqcsww3c9wz9d3ms7z93nvm97s94gy6i27xw3na5hca" + "commit": "40ac5b62ee655dbba779488d96d844d929a1b6cd", + "sha256": "0yn0mdj4f06v79w4nwq0y48iqr7kgy4qrpk6ws4pjsvcbxqa2nz3" } }, { @@ -99410,10 +100811,10 @@ "unstable": { "version": [ 20160524, - 743 + 1048 ], - "commit": "e7394d7c9e886788a656a7085b4cf963d6fc318f", - "sha256": "0gpfszp6bqr3vdr32vr6l0nq9hnic31vnins68hc5hknli91bpsq" + "commit": "a211d57ddc600410d07a8b534920ba905b093d87", + "sha256": "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b" }, "stable": { "version": [ @@ -99463,6 +100864,21 @@ } }, { + "ename": "russian-techwriter", + "commit": "23dba361611cc1325d79e307e0b94c3e5178a3f9", + "sha256": "07nrdj1gyc2gry32l8q6n6k5nbpiqcfpr8yv02lgrdhhz2mf4sy4", + "fetcher": "github", + "repo": "dunmaksim/emacs-russian-techwriter-input-method", + "unstable": { + "version": [ + 20221229, + 822 + ], + "commit": "1d86134d04ecf2305969c7546ead7ad425cd7243", + "sha256": "1d170cjlrpabivqy5xdlq9hykhr6gxmghvhacp1sj8288jv63jjs" + } + }, + { "ename": "rust-auto-use", "commit": "a9584d883934e36400ec1924755df34149ad2f9f", "sha256": "0jdg8xgxry0h9nbb9m446gpw54rymw3152n84lvsg5bv51861114", @@ -99485,11 +100901,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220919, - 1051 + 20230112, + 27 ], - "commit": "1d24ca2e6c18cd036f00e930cca64f44db04fb67", - "sha256": "0wmsrmrbqkd8wfysqkxxks613v9ar31vqkk5zsjdjyc7a6j1xw3s" + "commit": "c12348e40531fc7e7325368621a0e5f8031d99b2", + "sha256": "0sy7v0j81qd1mdq862zm0a4nf3g3wyyjjy3kjlmd9kb3l3f5rh0q" }, "stable": { "version": [ @@ -99532,8 +100948,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20221119, - 1151 + 20230130, + 912 ], "deps": [ "dash", @@ -99547,8 +100963,8 @@ "spinner", "xterm-color" ], - "commit": "1dfa9b5dfbab261bda7555e675ab2b6db13d0be2", - "sha256": "1lara2q3m2mxfxk8bjhal58gqwkaj1rmh9v2racydzp32hjwk6xg" + "commit": "a5fc66c8167a827a57c4426e4b8dbe717b3be43c", + "sha256": "1kg1brqy6bv8z2qw4q3f70az3mcz26pb387qrjlx2ik027zyr0ih" }, "stable": { "version": [ @@ -99622,11 +101038,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20220103, - 940 + 20221221, + 1355 ], - "commit": "0a61eed4d2917422d6401b6abe2037c26dab658a", - "sha256": "1w47wr1hkq6ghw3h9vxw74amnlzpji35ji5250l8gk9k7nr366ss" + "commit": "b9e6a0f33b9e2aeb6088accd23ed312083d8f707", + "sha256": "1kk3szdiqk3860wfjdfzv8l0fc303gr8gqnj2ynplpq0jp16lviw" } }, { @@ -99883,6 +101299,24 @@ } }, { + "ename": "sas-py", + "commit": "57e899a387de8d66bb9135bb8f66b2b03cfb2585", + "sha256": "0sckayc7yix5vq8nphw31rrvy6g70lbf23i5vmq5nhsqh7hk1mr9", + "fetcher": "github", + "repo": "ShuguangSun/sas-py", + "unstable": { + "version": [ + 20230131, + 523 + ], + "deps": [ + "ess" + ], + "commit": "76a2226eb49ec37f211904c6395ee066bd440560", + "sha256": "0fgb5pd9zmc5n9x3aqkylpv57bdv6ck8bcrw7sj0xyzz2333pvc5" + } + }, + { "ename": "sass-mode", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800", @@ -100081,19 +101515,22 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20221114, - 559 + 20230218, + 2025 ], - "commit": "188c9708e06f59c580866e4b9ead81513dc92df0", - "sha256": "08l9kxxzzm3apfrrwvkqsxyscal8357b7w87c3aagbbwvmxc3zfw" + "deps": [ + "compat" + ], + "commit": "3be01e4213f6828234e73c1f7ec66c0fb594abef", + "sha256": "1pppds3zbyhxqqwslar9bb9l7arcia2igajchxpaf9l8yxf8kw3c" }, "stable": { "version": [ 93, - 1 + 2 ], - "commit": "efcc16b1af3c3e2262fe75e9eb0f2ed30547da3f", - "sha256": "1785fyahlqs7fshvcsa2vpvdi2q1qza03iii984xc260dc4wqv5v" + "commit": "749b11df1d3041aa0a90542cba0fe5d9563c3a1f", + "sha256": "0m87rjmr4990vhakb7jg4nkkn7lp7kiva446j2z5pq7mmhlyxdbc" } }, { @@ -100229,8 +101666,8 @@ }, { "ename": "scion", - "commit": "faf180d15c3847fc6f832866338494dd99b6654d", - "sha256": "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18nh0bch29ikd2ang7w36n95a5sf3halvlz0dh7sh4zxcpp00n2s", "fetcher": "github", "repo": "nominolo/scion", "unstable": { @@ -100264,8 +101701,8 @@ }, { "ename": "sclang-snippets", - "commit": "680e5757e074c16efd31084a7dc5dcea339597f5", - "sha256": "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0d01grpq2zqqdpgh8jwn2428h3xinfkx1cl4lbh0nv6m9pbrvzbb", "fetcher": "github", "repo": "ptrv/sclang-snippets", "unstable": { @@ -100288,14 +101725,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20210223, - 1902 + 20221125, + 1731 ], "deps": [ "htmlize" ], - "commit": "4ec352fb9fe261ffb8b78449dea986dc34d337b3", - "sha256": "0219jzj3rwcx4k6f4grzrarq0v05jgmmracis3jb25rv0cln3i9r" + "commit": "56c67ef63be86ef1f03e15a62ad17c3983e1e5dc", + "sha256": "1ndfcb4zj4vangav1n5g6mbf7ys3a5kw1q4a7dnr36f2n2f6rnb4" } }, { @@ -100383,11 +101820,11 @@ "repo": "thisirs/scratch-message", "unstable": { "version": [ - 20211221, - 1527 + 20220209, + 2207 ], - "commit": "efb2db33e52e5d4a4f1bafbd8b459a3b91c3c87a", - "sha256": "117a3v3s94jra3dlsaafgg6594gw6gbdmh1ay5zar5yjy7q6pi2f" + "commit": "0d4198f6effd8f118bf03ee4979f566041ef6a9b", + "sha256": "0xh67x7pkmppbiacpw3wqipji3na0plnlswvnd355kz2gjab3hhp" } }, { @@ -100465,11 +101902,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20221030, - 2303 + 20230201, + 128 ], - "commit": "a11a242b085f6a4bd64c2846aeed220528572956", - "sha256": "07210wrnxzyq9q5kzsv3gaz9cm9cy8aqbaawhsrqr47jhyngzklp" + "commit": "12101b8cae16ef7d22013aa131d8d7c2808b5f48", + "sha256": "1mak69rlv9v882mi7n94sp7aw1la00qxn74xdf20wahlgrjr9l20" } }, { @@ -100480,11 +101917,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20221029, - 1138 + 20230201, + 141 ], - "commit": "b0525ea8812579b11428f3bd0cebc41dcb192ef0", - "sha256": "1qvv36hmm7yb5m2khlv115rfh8m0s9lhg6jda0dwgs3nifhgxf8v" + "commit": "220e4a8f21cc0b430c693a3ecac08156da2602c1", + "sha256": "1dr41gbk4rg5fa288bp5vnyzmyxrjvvlvn1syp5sjh31ypbw6jkz" } }, { @@ -100575,10 +102012,10 @@ }, { "ename": "sculpture-themes", - "commit": "408a269ccf0d938c3248880c5220b5b0b979f271", - "sha256": "1zyiki3raldp4wnhjsnfc5rzs6pycbagfp7qjjjxz1qgqig36wbw", + "commit": "cd55f4fb3501225f722103953ac1ac9adc42d52b", + "sha256": "06p5mpi018nb9xpf3kdn4lqm8nbak4x3afzgbnk2bp1aiz38qk7n", "fetcher": "github", - "repo": "t-e-r-m/sculpture-themes", + "repo": "precompute/sculpture-themes", "unstable": { "version": [ 20220601, @@ -100870,17 +102307,17 @@ "repo": "Kungsgeten/selected.el", "unstable": { "version": [ - 20220509, - 1810 + 20230219, + 1328 ], - "commit": "81cb32521a05ff2a9125e001b83608e108e480f6", - "sha256": "0zk5fnjw5czq71z3qgi7kl9r5y3cw5mx1hswyhli7xhxzjpldxp4" + "commit": "1ca6e12f456caa1dc97c3d68597598662eb5de9a", + "sha256": "11xjv861mx15fhvv8g67ahri5p8mplnhq9sf30c825bk1f0h7xzy" } }, { "ename": "selectric-mode", - "commit": "08922071b9854142eab726302e75f1db2d326ec5", - "sha256": "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1ih3n2b867p09r1hnia22f4cj46iqfkdqlpmphix241d9zph6r30", "fetcher": "github", "repo": "rbanffy/selectric-mode", "unstable": { @@ -100932,27 +102369,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 307 + 20221216, + 112 ], "deps": [ "prescient", "selectrum" ], - "commit": "a000de747515aa7e7ad1ea0eab711864a4be0ab5", - "sha256": "1d1d4msmkc0cvd6vva0pfq72i07p0my9wj2s8zvj60pvah620yl0" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "prescient", "selectrum" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -100997,15 +102434,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20220720, - 1346 + 20230104, + 1321 ], "deps": [ "apel", "flim" ], - "commit": "ac3e726ca94ed245c25881ec8d7177d0d834ea6a", - "sha256": "1bg07y6svvg1mmlr455x3j1anjp3wbv27s6b2inp294rbwprm41n" + "commit": "7d8df0ef2f483e2dc063a72099295f467e6bc2c8", + "sha256": "01dn91xjcl7p5rnbgyh5l4kdlqx31s0gw5vh7hhcapbiq8rihmjd" } }, { @@ -101149,15 +102586,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20221117, - 642 + 20230201, + 752 ], "deps": [ "dash", "edit-indirect" ], - "commit": "91a41ff8044e7cbeb82159f6c595393606e5e744", - "sha256": "0bl6wvw1z5bax4msmdahxi0y4cp85nb4s90j32r8vzn41s3pyabz" + "commit": "03e356f1a645a884921975890899fb47acf7d00d", + "sha256": "131n9w1xjgxska2zmf96px05ll4s3bh0mbrw52r07iaqrr8jhskg" }, "stable": { "version": [ @@ -101283,8 +102720,8 @@ }, { "ename": "serverspec", - "commit": "5a4f4757d8886d178a85d4bc8ac9399a99d8c4d4", - "sha256": "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0avyii5xif5dxipmrgf1slp09g8j73565bkc1a1j07p08vrap9c5", "fetcher": "github", "repo": "k1LoW/emacs-serverspec", "unstable": { @@ -101650,11 +103087,11 @@ "repo": "qhga/shanty-themes", "unstable": { "version": [ - 20220816, - 1830 + 20230123, + 2111 ], - "commit": "9ddd8ccd94b51ad5b19ee7097dcfccb3588b5eef", - "sha256": "0j0vf6v4cw9v661zk1hcm3cnxl0lgfk5bpd7xwdah8v38mb02k8w" + "commit": "3f678d953771c4a109bd16f6d7def6bd9bbc811d", + "sha256": "067py5xhlq7qpps39r0wbxlc61br84bgfgad3cm54j2z1kyd1msz" } }, { @@ -101680,14 +103117,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20220510, - 2001 + 20230129, + 1827 ], "deps": [ "transient" ], - "commit": "8020a5da0327f9a18b4bdab474bf8d81c1b38ea7", - "sha256": "0nby923h8hprxqyx48592q5584p8rmq3zvi12g2fbglabff76bmp" + "commit": "496e90e337cb09329d85a6d171c0953a85e918fe", + "sha256": "1a8x6mywxkhcc34lv0s5gq48vnhnq0cir0841zbkdjp1fviyx7j6" } }, { @@ -101867,28 +103304,28 @@ "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { "version": [ - 20200513, - 1206 + 20230207, + 250 ], "deps": [ "cl-lib", "s" ], - "commit": "fa69f67b6229fad3f31d936955ca8d1982009b77", - "sha256": "0ma5j74vkwax9ha945dcgbmf3r4gajj4nvl63pbfyvxvy6svn84r" + "commit": "178d78d08e94b273b23ab1a32c5be509fdfe2286", + "sha256": "1dqdh2rd0v136ckj4wp00g3gsq0lrzicwl1c60xacy548amdxq07" }, "stable": { "version": [ 0, - 0, - 5 + 2, + 0 ], "deps": [ "cl-lib", "s" ], - "commit": "1d40c73969347586906ca1dde2adb50afcd73b1b", - "sha256": "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax" + "commit": "178d78d08e94b273b23ab1a32c5be509fdfe2286", + "sha256": "1dqdh2rd0v136ckj4wp00g3gsq0lrzicwl1c60xacy548amdxq07" } }, { @@ -101937,11 +103374,11 @@ "repo": "deech/shen-elisp", "unstable": { "version": [ - 20210530, - 349 + 20221211, + 1313 ], - "commit": "dabb829d0d86f454ceb3b0846cdfc11af1f91cc7", - "sha256": "1h7v3bbljkw7lsxz4ijvw47c6fj070j0p268v4il2xh2mzw1nhjm" + "commit": "957ab44654fc7a7cc1b78181d244fa25166f9b09", + "sha256": "0xfs48fryqjaiy9w7rwxsi9g950gbjq6haacah1lf8h59pa9ff2w" }, "stable": { "version": [ @@ -101960,20 +103397,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20220808, - 604 + 20230116, + 805 ], - "commit": "25903d642e81f33abea84573979af2a373f5b5b0", - "sha256": "197gs31nb8aa47q1jv6zfrrbbi09n4kbjsdlvi7zviy6xi2723c7" + "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", + "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" }, "stable": { "version": [ 0, - 0, - 9 + 1, + 1 ], - "commit": "25903d642e81f33abea84573979af2a373f5b5b0", - "sha256": "197gs31nb8aa47q1jv6zfrrbbi09n4kbjsdlvi7zviy6xi2723c7" + "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", + "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" } }, { @@ -102055,11 +103492,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220823, - 543 + 20230127, + 612 ], - "commit": "e185b54d13fb7eac7d045daf6a83731d9ef79231", - "sha256": "0mbv68g1q98dysjvhdxwf3gcwwmihy6ni3b4r4kz6klyfr2jwqim" + "commit": "e556f82247918bdc33acf01b29917314b8b9e22b", + "sha256": "100qw0wfqy0ff7c2k4lbwcanvqg42ai7q0h0c8y4xx2snidfm4zv" } }, { @@ -102400,11 +103837,11 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20220424, - 2124 + 20221224, + 2230 ], - "commit": "db82bd1452928a1151badf7a28ace9d68b265532", - "sha256": "1bpzcwsc5rjgdrkripifgw1bwd8xpj7xyw8kpxjhnz29j39xflfl" + "commit": "b99d16f36bc278d668d8428c4bc9af77064c336a", + "sha256": "1wkqnc5n8if8fsh7f3bdr5nzn6dbj1nzdxlmnz8nflmx4g32fp6v" }, "stable": { "version": [ @@ -102508,11 +103945,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20220921, - 501 + 20230109, + 536 ], - "commit": "4175fe207de8530474c4ec368d4507ddf97dc412", - "sha256": "04abaql2l8y8na0rcl8hhpc7bjyiv2bylvvikcpzazdj75zgjcni" + "commit": "882923811e9de84c8ebc2f9fe65e9673d7d1f469", + "sha256": "0xba64lgfvybnmbzvlp5b7hlx5s7aw7i51g3ydb2zbmibbi11405" } }, { @@ -102523,11 +103960,11 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20220922, - 508 + 20230216, + 843 ], - "commit": "0bfdb6274cda0c19424c78804086ed93df96b4bb", - "sha256": "0qmva8bhanlrm3s46kmamx4zcais1hxm26gjq4d3q2z598bq46a5" + "commit": "0441f2c308eb9316f01d721a949ba73b6df8c4c7", + "sha256": "0jgkq8x0p291j8rig2hp1hcxiyf8ln9nh8jdbnhiijk229v3wka2" }, "stable": { "version": [ @@ -102547,15 +103984,15 @@ "repo": "emacs-sideline/sideline-blame", "unstable": { "version": [ - 20220629, - 801 + 20221231, + 1636 ], "deps": [ "sideline", "vc-msg" ], - "commit": "6e9fb45caea9031554e6e2110e39e219a407779e", - "sha256": "00a75fl7akwvn04icz79zhl4bk940y2hc6yvm2977r4y9wqbhjj0" + "commit": "1a1d80a71bdabe77fe2a33cd681b7188f193acfc", + "sha256": "1w05825diivgbbbggval1drhnipi4iib1hv5ccr74rpwyixvm4hr" }, "stable": { "version": [ @@ -102579,16 +104016,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20220629, - 752 + 20230216, + 859 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "a1fd5368acbc8cd15e00d23a0bf6f19d24f5c061", - "sha256": "0wmzrhp1947xi52m6fvr2vzpvi38nxlxzqgkm2ay7kyf9czkkvdr" + "commit": "1f2f82d4383718a8dd2aff40cffafce4a8d0aca1", + "sha256": "0ksjjd2j377c8hrf378z6x5v8mn2s0q6fifx58l0zz3sw7y649l7" }, "stable": { "version": [ @@ -102612,14 +104049,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20221009, - 1555 + 20230216, + 914 ], "deps": [ "sideline" ], - "commit": "e1e1f5cbdfa9ac352e884de97d68da4ea41cc060", - "sha256": "0y3adfvi7d28xkaxa539ys9i1rndn2c9ahs221vlmyf0g9ijxcxh" + "commit": "e92fa5ca861ff5a54273aecde319974fe4aa9dda", + "sha256": "13h4bzqqcvygza2c8x7aalc1cpy3mv0g2rbh2r1991qksddyqvcx" }, "stable": { "version": [ @@ -102642,8 +104079,8 @@ "repo": "emacs-sideline/sideline-lsp", "unstable": { "version": [ - 20220629, - 757 + 20221231, + 1636 ], "deps": [ "dash", @@ -102652,8 +104089,8 @@ "s", "sideline" ], - "commit": "8833cc33383ef3cc1b003be239cd5092b565ac34", - "sha256": "1vi48804bhgvn4b784670xh9mpmqxankgyww37sn0m5v53ywpkr6" + "commit": "38ba700db1769de216989fb9217795934147d160", + "sha256": "01dhnfcc0mig98l7vzc0nfdhz2y041d19jv2r9qp1l6cklimpzfd" }, "stable": { "version": [ @@ -102837,15 +104274,15 @@ "repo": "semenInRussia/simple-indentation.el", "unstable": { "version": [ - 20221113, - 1645 + 20221127, + 1232 ], "deps": [ "dash", "s" ], - "commit": "77685b3dd802dade7d60817fc0e24e60c101776b", - "sha256": "0dsrqip19pjdbdg039pq56wqynx271h5f25wx13k0y08smgpylnm" + "commit": "74efe02aa6c1612ae9b32b88f97b7d6d309726b2", + "sha256": "03dmq63cqymj37mnqxgm4qxmvv6vcxbj5kanr0qwdv1nzkh16dgw" } }, { @@ -102966,6 +104403,24 @@ } }, { + "ename": "simplecov", + "commit": "51858a06108af5a73e92803c3a52e5ea44f81465", + "sha256": "1fvgzlmx99026bpkn7hn32vvfnpbns1bykfbc4i58mh6w9871cdy", + "fetcher": "github", + "repo": "zenspider/simplecov.el", + "unstable": { + "version": [ + 20221206, + 350 + ], + "deps": [ + "dash" + ], + "commit": "215f2bdc5d2ef9b4439779ba4d3129210c9f34ab", + "sha256": "1rr4w0wvx07w62md3y1qj0cp7grn8z7116babvr76iigdcc0mzkz" + } + }, + { "ename": "simplenote", "commit": "8c1c3189da03541e3bee44847ac5d02c2a56ef98", "sha256": "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j", @@ -103096,8 +104551,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20221013, - 1729 + 20230213, + 1152 ], "deps": [ "compat", @@ -103105,8 +104560,8 @@ "llama", "magit" ], - "commit": "64860faa0eba4bac8c794af4e8969c9458deb550", - "sha256": "1km8xsl6l1ydc0gj4slwlmchbi4g1svq2spv0b7bj3wwn8knk9mf" + "commit": "1e6fd5ae0fb5384063e8b59d053bc5df7630cf5c", + "sha256": "0r0mvkd7i9n7d92lv4cjd69nprzva6zhn509i4zjdn4dapcqw6z9" }, "stable": { "version": [ @@ -103123,9 +104578,24 @@ } }, { + "ename": "sixcolors-mode", + "commit": "05204862ed7a9513e7f6a8771292efe47ec63699", + "sha256": "15wmasn7m8nij77szxhsqwx0xhsdh1v4l2r3g1ydjdn56cndjym6", + "fetcher": "github", + "repo": "mastro35/sixcolors-mode", + "unstable": { + "version": [ + 20221127, + 1208 + ], + "commit": "fbcf57749ebc74d7b77d148da6c021b1a8e0f650", + "sha256": "072jcm4da8b9vjss4jyb3bs18qdrjdd6mlgp4xwy097ypfdyijm3" + } + }, + { "ename": "skeletor", - "commit": "1e63aefc869900c2af6f958dc138f9c72c63e2b8", - "sha256": "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0gbd7x8vy73dzngw2rk6n712wfm1fbcpy8l9xvz7ykj35zvv4g2v", "fetcher": "github", "repo": "chrisbarrett/skeletor.el", "unstable": { @@ -103186,11 +104656,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20220404, - 1741 + 20230210, + 1507 ], - "commit": "8a609ec8fbf12231ba67aab9fcbb6b3ad0420359", - "sha256": "1mfy1vzdsli5qrdbbpm0bkhmvq8qp0692za5ykp7fbq9sxmqd65c" + "commit": "5534254232f1a556ec20952c75b5506625573049", + "sha256": "1r82sl0qvvcjdqrygbdk787dvnjycr20p32qn7z0fzim76nvlbjz" }, "stable": { "version": [ @@ -103232,8 +104702,8 @@ }, { "ename": "skewer-mode", - "commit": "10fba4f7935c78c4fc5eee7dbb161173dea884ba", - "sha256": "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1kh0gnzzh4jik737fwv0rwq3jbk41fhy30x5m9wv2crmrh4bsdw2", "fetcher": "github", "repo": "skeeto/skewer-mode", "unstable": { @@ -103399,33 +104869,33 @@ }, { "ename": "slime", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "06f005f7q6wk6n6kyiamw5zgp1hx5mca45n06y8798f1dwwnq9wl", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "117h3zymami8yxgv919l6fzg4wjyd1m5kdwa5nykgxs4mkfdp3xy", "fetcher": "github", "repo": "slime/slime", "unstable": { "version": [ - 20221003, - 936 + 20230215, + 2125 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "f41e5590e28a1dff1fc07111b43841eb1692de94", - "sha256": "083yr0gy4id40yy2ny50y047p6b0pz8xyc07i7dpqw9l830bsjwq" + "commit": "5e8fc7cad5ae7dc19b434c559ebaee3185d80b98", + "sha256": "1jllc6zk1vmh7g2zq9y1a5kihclawjf9zkizqz8kzs4hsyp6racs" }, "stable": { "version": [ 2, - 27 + 28 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "cf30941e5858e93eb91574ad91499075222a447b", - "sha256": "0wrq7s39lwca9wi01fj0wa2z6n0yyrv17c471kdkxxqppl4whi8m" + "commit": "a4f3471487db48f7289dc0ea019611d093e5ee7f", + "sha256": "155y3xld9snkfm7xhn7gz655xxxr6g7qv45znbg25k6y1lczmy4z" } }, { @@ -103499,14 +104969,14 @@ "repo": "augfab/slime-repl-ansi-color", "unstable": { "version": [ - 20200712, - 1226 + 20230214, + 1453 ], "deps": [ "slime" ], - "commit": "e38c7958d9657e41c426b4e96938b3f604238795", - "sha256": "0rbg6ndi59ycw54s2c21a3c2cr0wlymrpp4qr33yxv1ik00n5n5p" + "commit": "9e8af90490332217e45d7568f1690df3f4e25d4b", + "sha256": "0jsanbz7n8ss6hpgh5wid5lrvq7s2x4yphrgna9zpmgf4b0c3xss" } }, { @@ -103526,8 +104996,8 @@ }, { "ename": "slime-volleyball", - "commit": "853f47f469e372bdbae40f3cea60d9598e966fab", - "sha256": "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "12vcs97wlvwchg1lifl20av8f6mawq6js0c8flyr682j9by2nq15", "fetcher": "github", "repo": "fitzsim/slime-volleyball", "unstable": { @@ -103644,11 +105114,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20221108, - 2234 + 20230216, + 1140 ], - "commit": "992e3f3c1a599a8a10af12323d547b35ce70362c", - "sha256": "0krbfrb304b1v3ps2kiy60bb5d7iw9xx2k1qdxc7x4m6smimbrhi" + "commit": "fa70fc8ab1bc1f1c21661d672834e41b1d0abd39", + "sha256": "1bfigrb4nnx4sv50jsx15jsyh2yfbb72g5nhjbhcpmv8apkq4818" } }, { @@ -103659,15 +105129,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20220707, - 5 + 20221119, + 2235 ], "deps": [ "popup", "sly" ], - "commit": "3180921efdc19a2195960e1d601b2a6f31a6feea", - "sha256": "0gncp8xv33s4wx594bgd35vr1455bcggv1bg28qv75mhv41nzw97" + "commit": "6f9d751469bb82530db1673c22e7437ca6c95f45", + "sha256": "0bxan0h12xqdsfr3bpk7n8zj7d5xvp4v3wg4fbcf2xw63j02m810" }, "stable": { "version": [ @@ -103965,14 +105435,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20220108, - 2110 + 20230107, + 1731 ], "deps": [ "smart-mode-line" ], - "commit": "8ce6cca51b19395ccdd8f33a54419fa539f837f0", - "sha256": "0bvm98n2d4wsjz57g65gv567bmrdkibyimwwwq67bpl5qrf6ca8v" + "commit": "5f2056d7c24e9c8964f700ab6ec6f00ba4315eb8", + "sha256": "1klzgsvl4vnj14azdng7c3dz3r8mw3il9p56gf9dpm5xr8w4mwbl" } }, { @@ -103983,15 +105453,15 @@ "repo": "Malabarba/smart-mode-line", "unstable": { "version": [ - 20160706, - 38 + 20211005, + 233 ], "deps": [ "powerline", "smart-mode-line" ], - "commit": "558251e200cc555df137e60326295f2bd640fd6a", - "sha256": "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167" + "commit": "abcb0ab6f7110a03d6c7428bae67cf8731496433", + "sha256": "1h5w5lrgrmhpaqwppg5msylh7z78mvwy9mm8xiiv8w4wxvncxxl2" }, "stable": { "version": [ @@ -104144,15 +105614,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20220623, - 1523 + 20230219, + 1728 ], "deps": [ "cl-lib", "dash" ], - "commit": "8b6a3c3b31afd5b3f846e09859b5fc62eb06e7c1", - "sha256": "1bifalcx0v9h28q9mdnbad4mrxzr58f4l0wfnw1jhg5khgx4kgl2" + "commit": "f0c863268d296e38d4b5374f4c165cf9a823cd8c", + "sha256": "0f65wwjz4nxk2v49qmqck14xlyv1hfqnzjsf8ny1dv82l0v1by4s" }, "stable": { "version": [ @@ -104316,6 +105786,27 @@ } }, { + "ename": "smilefjes", + "commit": "000639475be669ae606fc37b3d124f616236020b", + "sha256": "1n3fx26givwfr407776f4cmhh4873cy5k50iww0s7kc0q8wkdqdp", + "fetcher": "github", + "repo": "themkat/smilefjes.el", + "unstable": { + "version": [ + 20230129, + 2110 + ], + "deps": [ + "dash", + "helm", + "ht", + "request" + ], + "commit": "52ec05240efba2d5d4666aabf773a1aa63bb3f1a", + "sha256": "1s34jsj3hqjp3mfs35xcsyf8vf3k0sjiz0r5vckhzg52kcrvvksd" + } + }, + { "ename": "smiles-mode", "commit": "67901d48323deba9311b32100574972c7476ad7b", "sha256": "1j3dpq5yw1g3cdalgrbnsw5429r64jiz4krh19zr1w86lh148pdr", @@ -104502,8 +105993,8 @@ }, { "ename": "smotitah", - "commit": "326c213450fc515573b963e794584b7b5ac995fa", - "sha256": "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0fwzm88v7shl997zlwd1fgryb4zkvl7ay03x5p551mjhd84sahyz", "fetcher": "github", "repo": "laynor/smotitah", "unstable": { @@ -104596,6 +106087,21 @@ } }, { + "ename": "snap-indent", + "commit": "a4b390ba55dae9c22ea33abf0cc2b4443d2ae323", + "sha256": "1x861zlxrmawdqp6xwp92106r30jq622n6rn907clr81vzppv7ra", + "fetcher": "github", + "repo": "jeffvalk/snap-indent", + "unstable": { + "version": [ + 20221220, + 1908 + ], + "commit": "6020a1784015ba28f439f41d4d8c261c3481079f", + "sha256": "0ph6xfylfxpkdsa1bipfj1x36b5rblr8v33kkgl9kjrp69v7fyb6" + } + }, + { "ename": "snapshot-timemachine", "commit": "69376b802f0687227a78838877d89163b2893c5b", "sha256": "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p", @@ -104649,14 +106155,14 @@ "repo": "weijiangan/emacs-snazzy", "unstable": { "version": [ - 20170823, - 1832 + 20170828, + 757 ], "deps": [ "base16-theme" ], - "commit": "8729d10b5c1edf1053800170dab1ffd820b6fff2", - "sha256": "1c07yggr6cnbca2iag1rjjsp1hiaccix222wzybxrphb72fn93wq" + "commit": "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd", + "sha256": "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v" }, "stable": { "version": [ @@ -104691,8 +106197,8 @@ }, { "ename": "snitch", - "commit": "8d08307e483c328075bbf933b2ea0c03bffe8b7c", - "sha256": "1zck9r251jj3q6q1glxj20812yhkv630qnd2y7q1kkjgp68gby7g", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0jh7cs89gwck5589mhswx52wkfs2pbmrwlivk7qzdxisdkyb0vf8", "fetcher": "github", "repo": "mrmekon/snitch-el", "unstable": { @@ -104751,11 +106257,11 @@ "repo": "alphapapa/snow.el", "unstable": { "version": [ - 20210813, - 1902 + 20221226, + 2238 ], - "commit": "4cd41a703b730a6b59827853f06b98d91405df5a", - "sha256": "0c770mgxav92j562knmzxdjlabvyhvhqjrgnk3pa13c5rs08800h" + "commit": "be17977677fa29709a726715a1a1cba1bd299f68", + "sha256": "0fh1hmwpszm9frvnqr2b8rlfx33dy9jm5r82hldgxdbhlv8dq4d0" } }, { @@ -104781,14 +106287,14 @@ "repo": "md-arif-shaikh/soccer", "unstable": { "version": [ - 20220905, - 740 + 20221127, + 1534 ], "deps": [ "dash" ], - "commit": "4bd4131c452f46f47b029bf38c7d98a2d3337b8f", - "sha256": "0772ld106dq1bqk6xib9a4ml2jsqqikfrjgz4bz0dc039yw34cp1" + "commit": "49d0db4f6274f1bd39c58255be069f79e310f465", + "sha256": "1br5dzz3k9ng58v8s64dp9g35j0871jpf1ax23nadq87n6m4q58k" }, "stable": { "version": [ @@ -104979,11 +106485,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20221024, - 220 + 20221119, + 1735 ], - "commit": "929ce58ff0d42cf1109f9fb0655c787ee58cc2da", - "sha256": "0yy9bdbab8k84csskq6lq6vgrzpm3zjj8a9gxbnwxc4ksarm1npg" + "commit": "ddb4a901c33bd29ba2eefff3b7f7461849c6e833", + "sha256": "1hppvvh9mq7yg129490b66bmdnnx6c03acbml03ipbcrfc6950y0" }, "stable": { "version": [ @@ -105061,6 +106567,30 @@ } }, { + "ename": "soong-mode", + "commit": "bac368b425fb24140528cf70a8787b00f6871bfb", + "sha256": "01xwwlrr5nj54z8n2vrapnn45pqpqi2m23lsf8j919p88c4gfa47", + "fetcher": "github", + "repo": "bobrofon/soong-mode", + "unstable": { + "version": [ + 20221217, + 1243 + ], + "commit": "bf3dc1070b368b413958f54fbe9bcc2aaf77b56f", + "sha256": "037dk71xdar01bpggvmw0jnagjfbh60g1s8lkv0nm24yhafbrlkm" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "bf3dc1070b368b413958f54fbe9bcc2aaf77b56f", + "sha256": "037dk71xdar01bpggvmw0jnagjfbh60g1s8lkv0nm24yhafbrlkm" + } + }, + { "ename": "soothe-theme", "commit": "6f26b8281f9bd05e3c8f2ef21838275711e622c9", "sha256": "124akv3a4q4vrmprdcjmq7rq6x73mz4wqxvnlczglh9vjl39ndbk", @@ -105116,11 +106646,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20220127, - 1004 + 20230102, + 1459 ], - "commit": "2db1859743fe9fc58eab4e6f6c1e37825ad7b69c", - "sha256": "0vikil31dwpmnd5iv3iwb8wrnny2xibydvc2mlgsvxjqjw7d40ng" + "commit": "7669770034f773bd96a71bb5e0cde93a8f0495e9", + "sha256": "05n2fjvs94s8023xmnbcrdbpqa25mh5j8l7naw4xhlggzynjfvan" }, "stable": { "version": [ @@ -105562,14 +107092,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20220824, - 1323 + 20230104, + 1113 ], "deps": [ "cl-lib" ], - "commit": "15960092e8ce8ebe6a6afd82202ccf47cb306e76", - "sha256": "1wlwn2f6r00fj7wk1pymrha2rpfrd3b2ggmcjsz74f7ixc0y4c2k" + "commit": "1f6196094ec6626722c6e03a13f6844c68f62703", + "sha256": "031n56bsicrw99ls49rwg4padgbh5adb97lb9gxg852x57hilivr" }, "stable": { "version": [ @@ -105592,11 +107122,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20221030, - 1131 + 20230115, + 633 ], - "commit": "4dd8a164f35affa322c67d9e65af8eda21f99775", - "sha256": "1k8r70j9cqv60pxn8mdy9ixx7l5wbkxs445l7fl9v9h5msav2w7c" + "commit": "11f281ae16b541ede9b4fadf96200e1728eb6ed0", + "sha256": "1wl8fvm9v3gsbdn0y9xzwnfh4ak5cdn0xdp0g816q5y3r5dyiywp" } }, { @@ -105607,11 +107137,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20221117, - 127 + 20230220, + 118 ], - "commit": "9364053159df98809996f3dce622b192638e40ee", - "sha256": "046vfbz6capsymqniclbsyhx6zc1l25z6391709kchyl4as2qlp7" + "commit": "7ae6710a95a02c90b0f13486e8f20be3a746bee2", + "sha256": "159hxs3pa9pmjbhm9i3c2271zllvajw68g8sdcggx6lf3mp5w402" } }, { @@ -105664,11 +107194,14 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20220815, - 1458 + 20230206, + 1330 + ], + "deps": [ + "compat" ], - "commit": "304cb8cd6c30d07577d7d864fd32858a29a73dba", - "sha256": "0n7rcb0bfw5d22fmy0kb14i4z88z0p4k23zxq5i23srcskihbkl8" + "commit": "4f8553632d71e827b4da6e091143779d2ad970a8", + "sha256": "1qf68jqkc4v8i0rbia2hyy9srn5paymz5bbv5s222rbjzc66n5hv" }, "stable": { "version": [ @@ -105732,11 +107265,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20221015, - 431 + 20230205, + 309 ], - "commit": "d9078002221609bf69dfb420fea3623d2f534b12", - "sha256": "1splj1g8cjk3vlwzzhr8s889s80nbxgfld55y4nm303m4hm91xr5" + "commit": "d6c170fa971856f0755c1750e66deadd58a5465a", + "sha256": "1sf43zzdcgn3ayq36dwj3xnfb9yhybmx0xs9f6yk29sw1ca7rd0g" } }, { @@ -106181,13 +107714,13 @@ "unstable": { "version": [ 20210305, - 209 + 212 ], "deps": [ "reformatter" ], - "commit": "7db76e74b7d1e2abfd13670c91bbdc12c6cb4fa9", - "sha256": "0jml6jhyvb7claf8754gar40m8ppzvfkgjgcx0c1mxz5fg7ab7gi" + "commit": "0cdb882874ba0853f4f831a07a85b511258472b2", + "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify" }, "stable": { "version": [ @@ -106340,11 +107873,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20221116, - 52 + 20230205, + 2247 ], - "commit": "689d27ed94254e3a3ce5a104057acc525e68a2ff", - "sha256": "0d14p5ijhs3aii7bzlbkaj7wwsbky2ar8mw55qqvz247b0zr4061" + "commit": "7e92ae3b4c4a7f3386bf1d7d620e5cd29e6e3b37", + "sha256": "0apccq1hj4sydkd7sa5iziavpi6swzaj6w7gckp5n8pjzibnqlx8" }, "stable": { "version": [ @@ -106369,8 +107902,8 @@ 20180715, 1959 ], - "commit": "b1eb7b109bc1c616dbf027429a90dc3b1a4263f1", - "sha256": "05kp8ajbqk7vxzkv23akyk2m7yg81pbrxpl3dsw67101sjazsybi" + "commit": "714387d5a5cf34d8d8cd96bdb1f9cb8ded823ff7", + "sha256": "1a8pqhdi7m3lis5ad2f74s1sy8zpxlwvfsvd80lw746235x2v06z" }, "stable": { "version": [ @@ -106472,19 +108005,20 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20220126, - 658 + 20230129, + 903 ], - "commit": "9311f9b4f8d25ce54fb7da9bf59d955fed366a4d", - "sha256": "1wgm4q46nja71grwbdnacnlazj3cgfr6r1glpkyx8y3dn9amdhip" + "commit": "94b56c0428fa0c788578161edc9e7992b13cd400", + "sha256": "1rg1hzhv8q1gfgfhd4pm22vx6mk5zkkkdq3zyg0dqb49r5skrbss" }, "stable": { "version": [ 3, - 1 + 1, + 14 ], - "commit": "20a87ab053b1d56fdb102b75b1c90658df756505", - "sha256": "1m0fav34wvak4k3ki92z5nvsyw6jdxnmhn5xzjiialgz9c3936v8" + "commit": "94b56c0428fa0c788578161edc9e7992b13cd400", + "sha256": "1rg1hzhv8q1gfgfhd4pm22vx6mk5zkkkdq3zyg0dqb49r5skrbss" } }, { @@ -106616,11 +108150,11 @@ "repo": "SFTtech/starlit-emacs", "unstable": { "version": [ - 20221107, - 1632 + 20230209, + 21 ], - "commit": "5f0e9deecfa95e241e4b3957e976b2471ba219f1", - "sha256": "1ly7c72yhacbcapvfilm7vrfdm6sxkfyf73cxnzixd7jyjymfzv1" + "commit": "f910112a76f0ec62f7150a3a2d4f1337a1809ff7", + "sha256": "1zcdbg69aicwsr53h6sbsms7cwq3l6zdhlb0fm8jy6r1rn9clwv8" } }, { @@ -106683,8 +108217,8 @@ }, { "ename": "status", - "commit": "dca8976de7060fcfc37a1623280869e0cef7b0a2", - "sha256": "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "01qjh4bqv9aqc85c2pavdx01q2h8k641d7ra3i02qwy1cglkkf49", "fetcher": "github", "repo": "tromey/emacs-status", "unstable": { @@ -106775,20 +108309,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20220822, - 1637 + 20221212, + 1619 ], - "commit": "ac42629f954e4885ef079a9bdb367a6d4aabc2d9", - "sha256": "0ncjcl8fb1mg5vqh5f8rkrlcjvpfhsnn5z3258w5wc1ibq1pnavw" + "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", + "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" }, "stable": { "version": [ 2, - 0, - 2 + 1, + 0 ], - "commit": "7c0fb7928fa691df68107a8473d1970cd6909945", - "sha256": "1pr4asqm2ql29jg3z5racp2z7nl56rj13bzy5jx5rd31gyaqi69f" + "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", + "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" } }, { @@ -106807,6 +108341,21 @@ } }, { + "ename": "sticky-shell", + "commit": "8e0e00197932ecea0963ea4c2c450d9b60c346d4", + "sha256": "1zmksmckz320yj1hw0ng4iii8xqjhz4am7nkrqqqipd82s1whrzv", + "fetcher": "github", + "repo": "andyjda/sticky-shell", + "unstable": { + "version": [ + 20230207, + 1454 + ], + "commit": "030535451b7c12eea3a94dfc1a439b8baa96944b", + "sha256": "0l1kmrkhykqbsmasjrrffgwahycdpi2jdpl4hn5y3p3xv16yhcwq" + } + }, + { "ename": "stickyfunc-enhance", "commit": "e24454febf90ec18a587b2c187a2bd2101e1b7b5", "sha256": "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks", @@ -106829,11 +108378,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220906, - 643 + 20230209, + 1359 ], - "commit": "4ff97e9d781df9a33dfaf3724d97b072d5c1f55a", - "sha256": "1h8qngjsnq4ghdm64vncnjfa6a85ssk5zy9g5hscmxnxbjv5483q" + "commit": "518b7ad3b6b8234d5a34dca1301f218f786e0a1c", + "sha256": "0066ddnw8ijxbh3snqkkysalf84qj0r5rk4d5zpvzbsals6dhcr3" } }, { @@ -106863,15 +108412,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20220523, - 1424 + 20230105, + 503 ], "deps": [ "async", "dash" ], - "commit": "14fe70fcce24a045f34e42617432a2d830906b98", - "sha256": "0854qx7vfycf8dfr8amksb0iv4nydbqn0g5357s3dfwmpj6rvvzk" + "commit": "327488e0f1232616bf33ab1a69da1a53aca25371", + "sha256": "14rqxr2w6jcz9vaq3v0mpm3jxv4dyl95y4c5pvgvh8h97gxjb16x" }, "stable": { "version": [ @@ -107091,17 +108640,17 @@ }, { "ename": "stumpwm-mode", - "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", - "sha256": "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf", - "fetcher": "git", - "url": "https://git.savannah.nongnu.org/git/stumpwm.git", + "commit": "270e13913999312a4e8ae16cfb0bb8aad0068043", + "sha256": "0mildw327qgj6sgx0m0ks6vmvzg1h8mmyw1hmrfqrp2xsk2zb0g8", + "fetcher": "github", + "repo": "stumpwm/stumpwm-contrib", "unstable": { "version": [ - 20140131, - 216 + 20171027, + 214 ], - "commit": "a920d31bac148e7f6afa98c05f98920135de8b89", - "sha256": "0hg2dhgph1fz8z6c79ia2j36wnbqgi6a7fjiz3wngslhbwy28xq7" + "commit": "333d210cacc7ebac76e14dfc8c0139f0e399c9a7", + "sha256": "1nbk1sqfnyn65mkmgaiyznyqbihrxmlr9nn36p8152dfia71rjnz" }, "stable": { "version": [ @@ -107509,19 +109058,20 @@ "repo": "tlikonen/suomalainen-kalenteri", "unstable": { "version": [ - 20220804, - 657 + 20230102, + 904 ], - "commit": "8a41d16371ffaface70739ec861709f674b4a94a", - "sha256": "0rpkwns05aa4d5ix0ffkh2gzag75dvqb78gqhihq560jb83qhc5z" + "commit": "95d8b7f9b404c749831d7b4e0e396c76bd822015", + "sha256": "107fzsz7c1cl92ryl6dg198bi5jpkl99rlgw544my2yw728bwnfk" }, "stable": { "version": [ - 2022, - 8 + 2023, + 1, + 2 ], - "commit": "8a41d16371ffaface70739ec861709f674b4a94a", - "sha256": "0rpkwns05aa4d5ix0ffkh2gzag75dvqb78gqhihq560jb83qhc5z" + "commit": "95d8b7f9b404c749831d7b4e0e396c76bd822015", + "sha256": "107fzsz7c1cl92ryl6dg198bi5jpkl99rlgw544my2yw728bwnfk" } }, { @@ -107646,14 +109196,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20220525, - 1752 + 20230110, + 1824 ], "deps": [ "svg-lib" ], - "commit": "6e52f7c17e92c83476d6278869bf3f55d91ac9c9", - "sha256": "0zx81qjbxm0xzl2whs103py4pd2lqnrj46v50kh90nzz9yz5hxrl" + "commit": "9f5c2cb862fcba96f247b85fdd1b7dffff7af93a", + "sha256": "10gy0pa0147phgx75hh21kgpg4j78v5dcl7alfq6apsximjz8w9f" } }, { @@ -107768,25 +109318,26 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20221101, - 2243 + 20221211, + 1439 ], "deps": [ "dash" ], - "commit": "6268291a29da9c6165432f9bbdebf6bab13c72f5", - "sha256": "0cbk44ldrimb9aai1az5vq63m32qcpapc1hsy13lxwnwi2ixcr6w" + "commit": "117eb40691e7a4d2dcd6b5a7fd9f803c7d42c32c", + "sha256": "08jjwh2d1hjbbv493qgaznxjhjhm7ama27wcnaag6mics7ivn59n" }, "stable": { "version": [ 0, - 4 + 6, + 1 ], "deps": [ "dash" ], - "commit": "8a3487115eec5893d317254b423f2ce058f5f795", - "sha256": "1vsz6jdkqh2haphdlyxj7zxaj8bngy1wiljlwv8snci65g9n4479" + "commit": "117eb40691e7a4d2dcd6b5a7fd9f803c7d42c32c", + "sha256": "08jjwh2d1hjbbv493qgaznxjhjhm7ama27wcnaag6mics7ivn59n" } }, { @@ -107880,14 +109431,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20221119, - 910 + 20230117, + 1113 ], "deps": [ "seq" ], - "commit": "6d7093fb4a0b81686ffeff7e39f76027d83b7eb2", - "sha256": "0x27wj5kc77qwnvzm905np37w8rn96i1d104pa882z6pd4bx46ps" + "commit": "778e9e6f35b41fd171bd9f42fd7b89c1001e2a82", + "sha256": "0fxlplpbigbzjis6qdfi51l9a4rxvgmjx60qyfjvhv0gvxl9f9hj" }, "stable": { "version": [ @@ -108201,14 +109752,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20220304, - 917 + 20230117, + 1227 ], "deps": [ "seq" ], - "commit": "c439b73a5f9713bb3dce98986b589bb901e22130", - "sha256": "0n2yknbhwbgbrvmgxk2j2hm5gkdh6m9p5y8vpq758bxf5xk6npzm" + "commit": "ed007230378b03f384b5a2b643dd857010ef21d3", + "sha256": "0hls2qfxrhzdvsfa28brj5yml6zl5djg8kc9m4wk3yx18cas5gvy" }, "stable": { "version": [ @@ -108271,8 +109822,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20221111, - 2236 + 20230119, + 1943 ], "deps": [ "evil", @@ -108282,10 +109833,11 @@ "lispy", "paredit", "seq", - "undo-tree" + "tree-sitter", + "tsc" ], - "commit": "32f4d28fd115c0ba417f48afafef62a6cc0c264c", - "sha256": "0ppcadpl7mrrv84n8vqym6g8b9srg9nhclbzlcjx0mqksa6p6mlr" + "commit": "cddb1644ce1fff6724280cc5eae7f6ed1597ae80", + "sha256": "1p3h9qlkvzjniq599awhjz3gy65nz8hwjq5fx9gbgda37v3fag71" }, "stable": { "version": [ @@ -108438,14 +109990,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20220618, - 817 + 20230221, + 937 ], "deps": [ "cl-lib" ], - "commit": "28410740e42ad9bb84416164406269b177fb49fa", - "sha256": "0mxnnrrqkpyjqps6fs7bwy6n4jvl0glwkmzk1fbcy1cmkl1pxm80" + "commit": "830fc4d4fb5d31a018d32319c6e0d2dc29e3de34", + "sha256": "01i3vc0a7jngfwa16yp4knlyiwnak3srxp4lxjnw5fdq2hvgwhz1" } }, { @@ -108627,11 +110179,11 @@ "repo": "holomorph/systemd-mode", "unstable": { "version": [ - 20210209, - 2052 + 20230201, + 302 ], - "commit": "b6ae63a236605b1c5e1069f7d3afe06ae32a7bae", - "sha256": "0q1f5mnx6npr6c94x93lyza87kxjy08v7x4by13wp23fxaqxgzaf" + "commit": "8742607120fbc440821acbc351fda1e8e68a8806", + "sha256": "1cf63r0f8mg4zl6min48f8wby2k7g4v60lyw6j8gsjz8ppww8gx2" }, "stable": { "version": [ @@ -108868,14 +110420,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20221114, - 1744 + 20230212, + 531 ], "deps": [ "project" ], - "commit": "f25bb670c0f7b3f7555634d19fcdd3eb979ac7c0", - "sha256": "0y32r7p4mh56zjhmd5pfkgic3gx0xlwabay690pxzl9sqjpnai4p" + "commit": "6975c51a2154604db70fd38eba27cf784cc3c4a6", + "sha256": "0i01q1fv6kdpf3fmhdagh7wlhycy3c6lmqkjkhiah55h7xymr8rk" } }, { @@ -109035,11 +110587,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20221108, - 9 + 20230111, + 1606 ], - "commit": "632e735c70b16828b3f50bd415b5e218e9780ead", - "sha256": "1h1lskg0nysp3xpzpqn90p05fzvix1dpws5fmrklfbd7m7nzbn2a" + "commit": "5525e49357d066c0dca4ccc12ca69804e46577f2", + "sha256": "0vcvhksiwc2gpz90gl5911nmds4rqgdhk1v3gbpj7cbhi1imrfx5" }, "stable": { "version": [ @@ -109101,14 +110653,14 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20191108, - 1346 + 20210528, + 1710 ], "deps": [ "cider" ], - "commit": "079028b7547743a36384650981ea068849aac53e", - "sha256": "06sjr4fv8p8y56a35pzghn89r1nzr2h5h3m98h0296bgnz8jgyg2" + "commit": "5da72b601cb9f052f35e88c41f1a18b326c03791", + "sha256": "1hhwyh4qkmhc303sf4qsarpczyqihh45z2xb96m2ra5zlqnklcpp" }, "stable": { "version": [ @@ -109166,8 +110718,8 @@ }, { "ename": "tc", - "commit": "9fddfc79ed2c614c33e90ba80f300912fdab88a3", - "sha256": "05lnsaizlh4wqjkp0wqcm1756r9ia46as8zf01k8qsi0mm452g6q", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1l73y78k3snx2174kz3zv5gv74f3sm4jfy14l35kgyq8ddw3zfkg", "fetcher": "github", "repo": "kanchoku/tc", "unstable": { @@ -109250,15 +110802,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20221105, - 1528 + 20230212, + 1547 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "870fe3201c14f828cfec0529aa78c110958e9aae", - "sha256": "1xrcgkrz8x24wb6k9f5jss6dixdzng1lsyw3jby5r19xsi742fc6" + "commit": "37e7eb805bc247ecc644308f1f2a4ed9a6d30624", + "sha256": "0bc0v7ix59cq269raxl6pdq12qd4rnq7012mix55rmy6llb17jb4" }, "stable": { "version": [ @@ -109371,19 +110923,43 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20221016, - 1017 + 20230220, + 1700 ], - "commit": "7d7adf155760d33b8c391fbf1e99c5be85bab85a", - "sha256": "1za73zszj373r8pxf89cwwfrwsf8dy6nxciw11adcccrm92xwdsz" + "deps": [ + "compat" + ], + "commit": "51773e54224bc3f5631105bf6e29cd1b4b5e41b3", + "sha256": "1qwnr6n7h05vi8jpayrrhzn6s7jn03gdl0dkc54x4nhflxx1f3f6" }, "stable": { "version": [ 0, - 5 + 7 + ], + "deps": [ + "compat" ], - "commit": "7d7adf155760d33b8c391fbf1e99c5be85bab85a", - "sha256": "1za73zszj373r8pxf89cwwfrwsf8dy6nxciw11adcccrm92xwdsz" + "commit": "66e4763087f3e851956b9a77a00527b440737d03", + "sha256": "1qhy9rp0k74hbqns67iwyzk86x7rriqyd4l48j5qqmfvr3v5sg1m" + } + }, + { + "ename": "tempel-collection", + "commit": "f5771cd6a865393c809adb1d9b3d58daa32cd146", + "sha256": "15syfqr46d5dx7ikdqr1jj74mb6rcij66v5ihhxdhk9acdianzl3", + "fetcher": "github", + "repo": "Crandel/tempel-collection", + "unstable": { + "version": [ + 20230103, + 2244 + ], + "deps": [ + "tempel" + ], + "commit": "7ef22ea7aaf699632a1d02d47a9a505ae8bc52c3", + "sha256": "0gvvxkgmj84ivnav0v98m6nhas6mbkhxqqj1ba5gj334h7gxyl4n" } }, { @@ -109436,16 +111012,16 @@ "repo": "kostafey/temporary-persistent", "unstable": { "version": [ - 20200201, - 1719 + 20230115, + 1425 ], "deps": [ "dash", "names", "s" ], - "commit": "0080879b0257d350aeba1c4d6901613d7dc534de", - "sha256": "1np9xh6gqynp96rby2shh4w40r14vsvpvwaibq0c1wr1ydwggm9i" + "commit": "edbde738769e79ac212ae84ae7898ffd5f19e0f1", + "sha256": "0v99azfslg8p6wxs3yf3qq3dzy0f6n9dw5ydj94jrys2ka5gbw1s" } }, { @@ -109771,15 +111347,15 @@ "repo": "ternjs/tern", "unstable": { "version": [ - 20181108, - 722 + 20191227, + 950 ], "deps": [ "cl-lib", "json" ], - "commit": "40a0c74db3888b997a9115720ff91c399bb1b146", - "sha256": "0dh0bfs0knikzn4gvjh9274yhbg3ndw46qmj4jy0kxh7gfl2lpkh" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" }, "stable": { "version": [ @@ -109803,16 +111379,16 @@ "repo": "ternjs/tern", "unstable": { "version": [ - 20170521, - 1935 + 20191227, + 950 ], "deps": [ "auto-complete", "cl-lib", "tern" ], - "commit": "d545bbdd8482c231211f9521c688fc06632e745e", - "sha256": "0ribzvl5gs281chp2kqaqmjj9xji7k9l71hsblfw1vj2w9l7nw2m" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" }, "stable": { "version": [ @@ -109837,15 +111413,15 @@ "repo": "jacksonrayhamilton/tern-context-coloring", "unstable": { "version": [ - 20161218, - 747 + 20170102, + 2253 ], "deps": [ "context-coloring", "tern" ], - "commit": "db0466c650ed4f7e6621a48dfdc53eaf5e127be9", - "sha256": "093mdq97gc0ljw6islhm7y1yl3yf7w4gf205s96bnsnb1v952n63" + "commit": "3a8e979d6cc83aabcb3dda3f5f31a6422532efba", + "sha256": "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y" }, "stable": { "version": [ @@ -109893,15 +111469,15 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20221117, - 409 + 20230130, + 2153 ], "deps": [ "dash", "hcl-mode" ], - "commit": "80f0433358b79ed4ba88c51829c7359baa1af8b1", - "sha256": "0gcxsd9zv47hzq1d5xqblyzgcf7vk215743s7x7ciiiwlg5xndnw" + "commit": "39d2fd5bfc86c6bf1c7bc38e6f0016d714f2d79d", + "sha256": "1ancpn3v176lzxd95xshbsna307y55idirbqjsfhpivhvcq6y9g7" }, "stable": { "version": [ @@ -110050,14 +111626,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20220508, - 642 + 20230117, + 1746 ], "deps": [ "auctex" ], - "commit": "bcceb82971c10b8c0b058b77b3764669900392aa", - "sha256": "1awlh7z18wzp2mppn21chbylqf3fmjlq8v4105kwg9mmw57xjyb7" + "commit": "6df9044c3d6bbb2a104f2c9b78ad10aa3cdf9506", + "sha256": "1qwp9nb0dswjr7alsrcwbjym0k56ncd0k5plhcsz8liz5886qfdy" }, "stable": { "version": [ @@ -110095,11 +111671,11 @@ "repo": "juba/textile-mode", "unstable": { "version": [ - 20210912, - 906 + 20230112, + 1030 ], - "commit": "a49d9bf42166584cca395a92311e9d0a199efc46", - "sha256": "0b7vbqy2ryp5c0jz7gb5ddpa3mlqmkd7jlf94hdb0d0ffapspqsv" + "commit": "8f8c09ef097a95a713307fdb5c92b9778dfbc1fc", + "sha256": "0x8ib6cm7rp6hf44348nnc937w98v5q0fv9r650jjvkfl9rkbm7b" } }, { @@ -110429,21 +112005,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20200212, - 1903 + 20230220, + 336 ], - "commit": "37a3d2d055bc741b183679647b40b28585a71bd2", - "sha256": "1n6j8kaajqi31n0crv6qr4qbdagx5iscqmm1cyll8sdmfr20xrcl" + "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", + "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" }, "stable": { "version": [ - 2022, - 11, - 14, + 2023, + 2, + 20, 0 ], - "commit": "68ba6854cce62923446c15e7f638417a8d7da7c8", - "sha256": "06nf0cs5cyi69d15471j4mnwbkkli80jnffpkwb23173q2n10h81" + "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", + "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" } }, { @@ -110493,26 +112069,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20221001, - 2224 + 20221223, + 1759 ], "deps": [ "haskell-mode" ], - "commit": "aa5f3a976567552de57090e1b67b537cd08b4367", - "sha256": "0rjpg4ig1wjc6k9dicb2nyc2bvxhwlrj4mb0agpy434j1f1xdm2z" + "commit": "14064165cd5b6719af4605087d6e81332920ad60", + "sha256": "11siqw72q7bjhnyd92k35v7ssaxa845v5ax8nlnc3li7bi2vv0gq" }, "stable": { "version": [ 1, 9, - 2 + 3 ], "deps": [ "haskell-mode" ], - "commit": "32479866eab79466d479d6565d7c06a374d6d2d7", - "sha256": "003858lbdkf1liafgnpvn8pi6f7bnkff4k44x890dbbkczyi924i" + "commit": "14064165cd5b6719af4605087d6e81332920ad60", + "sha256": "11siqw72q7bjhnyd92k35v7ssaxa845v5ax8nlnc3li7bi2vv0gq" } }, { @@ -110523,18 +112099,17 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220514, - 614 + 20230129, + 1346 ], "deps": [ "cl-lib", "dash", "flycheck", - "s", - "typescript-mode" + "s" ], - "commit": "96bfc5da11a9b83b32368c38e933a405270652de", - "sha256": "1py0z8nrkgh3lzsmgxq62bi2nbdx3c97194frjyb5wl81kh4pbbp" + "commit": "29475d9eee26f4101322209e9b6b199df5386094", + "sha256": "05pp0sijyw1q2vfgpir76vmm102k3lhpz6gynqz3ha98xir5j7yj" }, "stable": { "version": [ @@ -110596,26 +112171,26 @@ "repo": "swflint/time-block-command", "unstable": { "version": [ - 20221102, - 1811 + 20230210, + 136 ], "deps": [ "ts" ], - "commit": "5e2c7c050378307e25f3964e082c5ee531ae00b2", - "sha256": "00akh3fcm335glr4lm3nwxhlxf363f6ipk2a7x31sclmwd6jn5fj" + "commit": "e0dcf6eb13871df41b081b9cdaadced722c3ba54", + "sha256": "0vywwr45ylrdaakvc6ilbq0kwsgqvyx8xpfp21n7kprqgnigal2g" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "ts" ], - "commit": "5e2c7c050378307e25f3964e082c5ee531ae00b2", - "sha256": "00akh3fcm335glr4lm3nwxhlxf363f6ipk2a7x31sclmwd6jn5fj" + "commit": "e0dcf6eb13871df41b081b9cdaadced722c3ba54", + "sha256": "0vywwr45ylrdaakvc6ilbq0kwsgqvyx8xpfp21n7kprqgnigal2g" } }, { @@ -110769,6 +112344,52 @@ } }, { + "ename": "timu-caribbean-theme", + "commit": "ab002b78cc839615ea53342250d185438ab16ae7", + "sha256": "03yqh3kx1irz68bxbs0zl1sply4b3ikhbpaa088kza1dgdc2nvn5", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-caribbean-theme", + "unstable": { + "version": [ + 20221226, + 1556 + ], + "commit": "af60151fe35bd1c780b7c4a37032699989ee6162", + "sha256": "0x74vnxkwl1jvkl2fizdkg0v73qjmx2dk68cs49k0b8z0n61w8l7" + }, + "stable": { + "version": [ + 1, + 5 + ], + "commit": "af60151fe35bd1c780b7c4a37032699989ee6162", + "sha256": "0x74vnxkwl1jvkl2fizdkg0v73qjmx2dk68cs49k0b8z0n61w8l7" + } + }, + { + "ename": "timu-macos-theme", + "commit": "326e7cad6877d42bc1809b549503332c98547dcb", + "sha256": "0bxlxjn7fivv72pxchs164941g3y3bylhhzsssik0gwrsyd7x8ay", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-macos-theme", + "unstable": { + "version": [ + 20230201, + 2203 + ], + "commit": "665c6e409c7d6a37575b3e64961b17ae3db18cb8", + "sha256": "17rr28amksxsz2djz0gwdmr3xki7229pcgm841k5dp109l6n9bip" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "bd15dd91086943c7c025895f5f921e1f8253e478", + "sha256": "17rr28amksxsz2djz0gwdmr3xki7229pcgm841k5dp109l6n9bip" + } + }, + { "ename": "timu-rouge-theme", "commit": "5062b3e2d0d1b3bdbde2d0f58ca42952e90a9acf", "sha256": "148k7anayfvvff5nw5jyjnwcwjag5q57kp4knfxfpb2v1nszpp1n", @@ -110776,19 +112397,19 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20220717, - 2158 + 20230102, + 1925 ], - "commit": "bbfc8bbba01e5caa9d11628f0bc2276605c75901", - "sha256": "0r2647yll9yx9i5i1j2gqr8ammxll5pc367prs9jz8il6nd4irpa" + "commit": "87117f15ea5fcfacbbad23ea6f345d18c2ff0009", + "sha256": "1w67jy0vqmdqq1k2jj60nya8jiwy4kadzyyq534ic9iy9gb4rjan" }, "stable": { "version": [ 1, - 4 + 9 ], - "commit": "02281cde75ab7e5bb624003dc0de035dc14f2469", - "sha256": "1xv0cjiwl86hvyb9f8awjwx14b158qpnlmfxlxn7f0z3lzim9d7x" + "commit": "87117f15ea5fcfacbbad23ea6f345d18c2ff0009", + "sha256": "1w67jy0vqmdqq1k2jj60nya8jiwy4kadzyyq534ic9iy9gb4rjan" } }, { @@ -110799,19 +112420,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20221007, - 1029 + 20230102, + 59 ], - "commit": "278ff2d30f3c2f657c0a828d177ecb37837386d5", - "sha256": "0c879srhnn6fqmsnh9mjfdbrilwrymh8x2wn0w3jw0pp7x3brp65" + "commit": "0d0d977c2149f695de0e4de55ae64a672c34bfac", + "sha256": "0j4p7qckrywpph63m140l4d713c9kx91didyflfpnr1wgy6pzq3v" }, "stable": { "version": [ 2, - 1 + 6 ], - "commit": "d8db5dceb95144ad50c1dc3577196eef7a10d5b3", - "sha256": "14r325a9qq9xigqbp03dbblc8lnw3hz7hbnmj9d58jshd6avdcnc" + "commit": "0d0d977c2149f695de0e4de55ae64a672c34bfac", + "sha256": "0j4p7qckrywpph63m140l4d713c9kx91didyflfpnr1wgy6pzq3v" } }, { @@ -110965,6 +112586,21 @@ } }, { + "ename": "tmsu", + "commit": "0d546d03d27303217a083f1a18f21098d5102387", + "sha256": "12n4p74y4qpcvah9819incwykl3q0y7zbvd9dlk7b7qffqx5h08p", + "fetcher": "github", + "repo": "vifon/tmsu.el", + "unstable": { + "version": [ + 20230207, + 1438 + ], + "commit": "26fb81d2667c88bef4f571c87bd9842d1be21234", + "sha256": "0lkvsqgp5cwi39n37b32dfjrdsk21j6r3q5lx4px84w2sqhm5gg1" + } + }, + { "ename": "tmux-pane", "commit": "8bc165e115a2c457e44ac2762cf6a9f07f1b99c4", "sha256": "0mv5y367i1wmk5kp8ms09xhrwvb4cwa08p39qy6mkakdhiby5m9q", @@ -111030,16 +112666,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20221101, - 1418 + 20230120, + 2208 ], "deps": [ "dash", "org", "transient" ], - "commit": "bfd496dad20bd34ffb0c2301c004a195262718c1", - "sha256": "0xc7pdb347cp82kyhsm448qy6xrgl91ji9bzb19bflp3ic9fmjjl" + "commit": "d79b4ea4ea4891635966bfc2c769484d2916be80", + "sha256": "15hpayv41bb7gfy1s1mc0zmd8r1h8h5xmb18sgc4v6l1k4x17z1j" } }, { @@ -111143,11 +112779,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20221003, - 1909 + 20230220, + 1320 ], - "commit": "adef847adc38b9346ccb83df61ebc51e44776dc5", - "sha256": "078g924qvkg2bmm456n7ami14sl7lq51ssv2v0vlyd3wzmd637d7" + "commit": "4dd1efcab11576c0989c52f67c89759a43e07f0b", + "sha256": "0s4bamim86y42ahg529hj2sf7654lab1p0fb06srn1gqj8zapndj" } }, { @@ -111400,11 +113036,11 @@ "repo": "juergenhoetzel/emacs-totp", "unstable": { "version": [ - 20211018, - 1743 + 20230102, + 1707 ], - "commit": "680b2c969823b91e0b35afbe2a35a610cb2fa26a", - "sha256": "17ylcrz7gw1hyq9ls5anz7ycd5y6f3j06jxr6i80hj5ccylzy82c" + "commit": "a5e059b8475b32bc7f5ddadda248cf84449ed722", + "sha256": "0b76fxk9r3n9zii75q1957ivb6ap5px5h87kagxz083nl77jky7a" } }, { @@ -111415,11 +113051,11 @@ "repo": "chmouel/tox.el", "unstable": { "version": [ - 20160810, - 1555 + 20170404, + 1059 ], - "commit": "27a074b21238855ce3c33d22e42d69e2c2921205", - "sha256": "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk" + "commit": "7655eb254038d5e34433e8a9d66b3ffc9c72e40c", + "sha256": "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki" }, "stable": { "version": [ @@ -111484,8 +113120,8 @@ "deps": [ "w32-ime" ], - "commit": "41a9751b8cec1f8d88f51240140bc85e0d29205e", - "sha256": "0h0q5xmcm98sb28my07xnrfly5i55g8d90c2h570499gadg777sv" + "commit": "87f0677220b755f947fe5f373b6a34e1afb82f3c", + "sha256": "1xvhagynkhx4l0smbg9lz1kas7y25jpg66m1q5b32z3aagm90sb1" }, "stable": { "version": [ @@ -111550,11 +113186,11 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20210713, - 1609 + 20220421, + 1956 ], - "commit": "054adb71f685f96cef6cb28381c0080af22e729a", - "sha256": "1cqpyvv1ywywr3gd13yhn7wpysi9c429v2x9a7ddlqn03zfyhrkl" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" }, "stable": { "version": [ @@ -111657,14 +113293,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20221118, - 1443 + 20230220, + 1425 ], "deps": [ "compat" ], - "commit": "804c27f1f585c05a777c288fbcfa1c16a3c0cd45", - "sha256": "1krw6rhgc6qvldb83zg021n13gg22l5afddnzpas5z7c0p154dm9" + "commit": "0204a2432862aa187745995f1c378e6d875b35cb", + "sha256": "06qbc8ad3s4z5vihbpvyl8xdlppxkhvprnhxq0kxsasy7psfqdns" }, "stable": { "version": [ @@ -111684,14 +113320,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20220425, - 1331 + 20221225, + 1630 ], "deps": [ "transient" ], - "commit": "7b6e70fb49b9d18106748202011863ebc39b864a", - "sha256": "1qph3ffpvrx02a423hpmdfp15g9yqdd38bnmsa735cnnhqm3yshd" + "commit": "cb5e0d35729fc6448553b7a17fc5c843f00e8c1d", + "sha256": "03mk0rvi3mn2wbx817swqd5y784k446yh8l4vv892rjb81fchl2g" } }, { @@ -111745,14 +113381,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20210705, - 2152 + 20221130, + 212 ], "deps": [ "let-alist" ], - "commit": "a03a6f5c7b133e0a37896b6d993dd6d6d4532cc2", - "sha256": "1znpl4ps0ah6lmrlyha6wbkbvnx90qkvksp5xp87apfb61zqzqwz" + "commit": "243d5dc15917df2611fd0c9f288faea17a00a396", + "sha256": "1dp1ypz0vwcggp09rwr1d7dh34d05vlxz0mvry9p44g58dc99cz0" }, "stable": { "version": [ @@ -111815,10 +113451,10 @@ "unstable": { "version": [ 20220921, - 827 + 831 ], - "commit": "e4a1fe564224bce61fbf72ad6f12805078cbf8db", - "sha256": "0yiwm91i6mqgz56pl38nlg862djahl21bm54j3ldgz43xyzmw8x4" + "commit": "ed0156a98b6fce94da9045bdffe369f390b70c0c", + "sha256": "13q9mm76pp2h3jhp5kyc3gynzzzzaiczhkc1lvwq1zmrca9bavr2" }, "stable": { "version": [ @@ -111898,15 +113534,15 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20220422, - 1628 + 20230212, + 2011 ], "deps": [ "compat", "transient" ], - "commit": "0ff79f738fbff38520d329aa93d59678cfc0e55f", - "sha256": "0kbkxvyf6i105bwllkzdg09rkq52v9bjr4hivp2mfvy5h8k3z4n0" + "commit": "15b0faa8fede31887598b8dd64b69362c10e8a8e", + "sha256": "0gw24wajmnwm8zhcsfvvwzn1rc20a2hyi42c2rpdkxfbw308b1x0" }, "stable": { "version": [ @@ -111998,15 +113634,15 @@ "unstable": { "version": [ 20221012, - 640 + 855 ], "deps": [ "ess", "tree-sitter", "tree-sitter-langs" ], - "commit": "9eb7c35a11d917bc417d8b7b109ed336d58bea53", - "sha256": "15lax4f8jdjsk4ba8f9x8is56qisg9p7cvwlragqdf38bkc29ynx" + "commit": "9669c00f3d3463e6769725af74c392891e269eed", + "sha256": "083m21lqgic910fqbxc104fai0vh2hrb7s2nlln43l7hlb8939b4" }, "stable": { "version": [ @@ -112061,14 +113697,14 @@ "repo": "erickgnavar/tree-sitter-ispell.el", "unstable": { "version": [ - 20221105, - 713 + 20230205, + 533 ], "deps": [ "tree-sitter" ], - "commit": "6d486371d641a809f44df21921e64ef381844e83", - "sha256": "1a1hgxd9f8b5n49bbyqlcswjwbyazjq7p75ng481mlkvb9hac1ic" + "commit": "d8c33c05f689c2cab36b8a9856811f18a4ab7c59", + "sha256": "19i2hv6zy9797dz4b6xrwlkci5fdq4v2mxd55li2bpd6sgga28ns" } }, { @@ -112079,26 +113715,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20221114, - 1054 + 20230205, + 2032 ], "deps": [ "tree-sitter" ], - "commit": "df7d7d1a46b5145d4101f6b313d22e815e4f42b4", - "sha256": "0a34032r6vdnyg4akvil559q1jx091sbmzaq5l59a20pz8jxw349" + "commit": "d8f8ac4faeb4564fbb61e94a631b4672523d84a9", + "sha256": "1i8lhv404ijj52jjxrmljnrhby9jlrdgpymn2jfs4kml0x7qhsna" }, "stable": { "version": [ 0, 12, - 5 + 16 ], "deps": [ "tree-sitter" ], - "commit": "df7d7d1a46b5145d4101f6b313d22e815e4f42b4", - "sha256": "0a34032r6vdnyg4akvil559q1jx091sbmzaq5l59a20pz8jxw349" + "commit": "d8f8ac4faeb4564fbb61e94a631b4672523d84a9", + "sha256": "1i8lhv404ijj52jjxrmljnrhby9jlrdgpymn2jfs4kml0x7qhsna" } }, { @@ -112145,8 +113781,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20221107, - 2105 + 20230104, + 1319 ], "deps": [ "ace-window", @@ -112158,8 +113794,8 @@ "pfuture", "s" ], - "commit": "b19060f25e55514f3d798d9f5af2dcd5b94a6026", - "sha256": "12qq84hnilpgw5rvvbcabi7cj42n73abk07iqaf89b78qkl15vr3" + "commit": "9986d6cd3d2822db7ae0e6d8a275db7057f3e828", + "sha256": "0s9i5amc4bx223d3abikyr8cdkzpzbirfb3x6m26l6i430j8zsal" }, "stable": { "version": [ @@ -112195,8 +113831,8 @@ "all-the-icons", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112226,8 +113862,8 @@ "evil", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112320,8 +113956,8 @@ "persp-mode", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112353,8 +113989,8 @@ "perspective", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112385,8 +114021,8 @@ "projectile", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112409,15 +114045,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220221, - 2038 + 20220911, + 1427 ], "deps": [ "dash", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112440,11 +114076,11 @@ "repo": "volrath/treepy.el", "unstable": { "version": [ - 20220919, - 759 + 20221205, + 2224 ], - "commit": "de1a2ddc3fd7152d0bfbd9e14312ff8a4864ab2b", - "sha256": "15dm6ccwr4k8dir384417hn7cg3alczrpx7xqf1sfady7q85xcv4" + "commit": "7c4a0d21322506a4d4b2301b4274ec955b429b47", + "sha256": "1q5wcnr3lnbk6rcwbjxnvhi11d57g4497pkm059714ca5pflvmlr" }, "stable": { "version": [ @@ -112457,6 +114093,30 @@ } }, { + "ename": "treesit-auto", + "commit": "a6c7df76503fe374132544679ec326b85a2605f0", + "sha256": "0dzvj7dic978drhkiw0smykchn597ha1j911wb1ncf92dq5mp92x", + "fetcher": "github", + "repo": "renzmann/treesit-auto", + "unstable": { + "version": [ + 20230220, + 1438 + ], + "commit": "ed809a73b3bc418942efee7b682ea4cbd4605844", + "sha256": "13w74467yxhqf87cfmyl9hji3mvn1924m8l5bnkb9fms8m7r5p09" + }, + "stable": { + "version": [ + 0, + 5, + 4 + ], + "commit": "2d3f9d9680f8481945e87ed99210efbb9875c13c", + "sha256": "0xzrx8h3ciwwkyv7m5mnncm3mpz80728hjhbhknk1jwhx2dn3bwr" + } + }, + { "ename": "treeview", "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52", "sha256": "18df7xpz42z408784w0s39hwp5pxrramzrbk7zfbr4qrnxnk0bva", @@ -112499,11 +114159,11 @@ "repo": "emacs-elsa/trinary-logic", "unstable": { "version": [ - 20180904, - 2313 + 20230213, + 1217 ], - "commit": "886232c6d7e92a8e9fe573eef46754ebe321f90d", - "sha256": "10h6p2dwl2k2p35pi3n8y85qh5y0zrr9nhfr4sviwzj1nbqdrvdr" + "commit": "4268556d89831889a722302241c0de680de3731b", + "sha256": "17a9asi08vi6baagmhlm8qmsh8sbb52gphyg9jdydn1hji0qlk40" }, "stable": { "version": [ @@ -112523,11 +114183,11 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20220610, - 1746 + 20230103, + 617 ], - "commit": "72655ce5ea0580cc23966821d2813e4d5e961f93", - "sha256": "1ba7abw53qmn0d1swxcvgdx6xgrx79ql0mri5mm7nxf7abifskxp" + "commit": "710c5ef80835cc2f6fb40e51f782ab531048f86e", + "sha256": "10y4wp5c7ycj1sr938gw1zyqyzd307lzn5wv5qmv6z8r6xbh6vcs" }, "stable": { "version": [ @@ -112666,8 +114326,8 @@ }, { "ename": "tsc", - "commit": "f07a741d1a14f99a634041cc9b4c200e75461ae5", - "sha256": "03g9wyna387bcmqcb1z4g5ybmlsxh3vg24i0x3ynvkm8knj8nl2v", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1vcsha1r99kmcb8zvfabkkd3h1yzq04na0chjxi5c793rx5nl6n7", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { @@ -113044,11 +114704,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220815, - 1954 + 20230116, + 1533 ], - "commit": "d79551c67ff5f2bd5f651eb411cdc66ceeb787e3", - "sha256": "0r57nxcwdpjckpv6lrk310p3hjivnlyfvqpfg9jd86y37bbaw8fa" + "commit": "4fcb4594819caf472ae42ea068a1c7795cf07f46", + "sha256": "12vw5mjl8d4cfv0z46180llmwdwfqrfp88p1fvgp2viizwmw03ym" }, "stable": { "version": [ @@ -113188,11 +114848,11 @@ "repo": "md-arif-shaikh/tzc", "unstable": { "version": [ - 20220513, - 434 + 20220520, + 557 ], - "commit": "8fa2aa5636448a3c3e7b59ea3fe38e80a268537a", - "sha256": "0qdh1y0jfm8w5xz1z3xy55jy3f7vdjg5gv6w451yszf33092sddc" + "commit": "f4e2273b65ace1ea56c9824c3bdb97925c98c8ba", + "sha256": "0aij1425cwj7423nls1dywxsr2xvzbmz0y6b2rargicxl066swrf" }, "stable": { "version": [ @@ -113259,16 +114919,16 @@ "repo": "rolandwalker/ucs-utils", "unstable": { "version": [ - 20150826, - 1414 + 20230119, + 2237 ], "deps": [ "list-utils", "pcache", "persistent-soft" ], - "commit": "cbfd42f822bf5717934fa2d92060e6e24a813433", - "sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m" + "commit": "91b9e0207fff5883383fd39c45ad5522e9b90e65", + "sha256": "18yqzy8w4icp60z25ckbrx6wradm3m26vic35kmzr88msc0qdsva" }, "stable": { "version": [ @@ -113309,12 +114969,12 @@ "unstable": { "version": [ 20210929, - 1258 + 1301 ], "deps": [ "projectile" ], - "commit": "f0726b5aa3268a00794ca3380c0f0e15d0b72674", + "commit": "7819d5b78e5b52a09b36c634ce404dc8bc3711ef", "sha256": "0rl71y6mzfcfymkimin18pnfhsa1wb906jywr5jx8b0nwkxk227n" }, "stable": { @@ -113423,8 +115083,8 @@ "dash", "shut-up" ], - "commit": "bd52926ccf0b578ed7ef6667707634c5a8878936", - "sha256": "1ss671fhf4r0hrh67kfv9alp057bbnicp3s9s8bmssln25nln3gm" + "commit": "1d3587f1fad66a747688f36636b67b33b73447d3", + "sha256": "0qmvyy3xg5qi7ws8zcs934d6afsappr1a6pgfp796xpa9vdr4y6j" }, "stable": { "version": [ @@ -113519,11 +115179,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20221015, - 433 + 20230109, + 2256 ], - "commit": "9a7a297e98114deed6c66f7569b7d0ee4aa2ee0a", - "sha256": "1a0w645a79z74g2zh8yffmsjyf4vd1niaw8cq4r5wk8zlgg6dqqn" + "commit": "d59bba01de48a808a42d6e29e011ef641cdb6a77", + "sha256": "0bnwhcybvcb60wh3q71fy2jsprzy00g2ipcksnjdpqcwaqvjwdl8" } }, { @@ -113534,11 +115194,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20220731, - 2356 + 20230205, + 310 ], - "commit": "48544cb102fd3d761acf92598076b20bbb4075f9", - "sha256": "1qyb9ssglg0wnrrpkaqdkrc01f88i976c9fg7hyd7pknfjg7glrf" + "commit": "7b3fd0647dd1fbd02101eec61440e6d44953bcd9", + "sha256": "1vjpr2d9fdpc3slk8gav7vlld9v5nvz6wfs5fhig6m2icklvwhyq" } }, { @@ -113595,10 +115255,10 @@ "unstable": { "version": [ 20210106, - 220 + 222 ], - "commit": "8fbbd43fb95058a3f3452c6eb2bcc1559e93a86b", - "sha256": "01svn5hnnarq0sj35xkp92zigfs03n76mr783bh214p6sssyz3k3" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" }, "stable": { "version": [ @@ -113699,15 +115359,15 @@ "repo": "kosh04/unicode-escape.el", "unstable": { "version": [ - 20160614, - 1234 + 20230109, + 1222 ], "deps": [ "dash", "names" ], - "commit": "04c7f22f90c96e93f998f084089ab08dc7f4fdd6", - "sha256": "01i5cq7yan9z1kr6pvp4bwzsnxs0bpqsaglfbvy7v6jfp923bvdm" + "commit": "afbb09c774571eefd4e639fc6163280476484363", + "sha256": "0svv3ncdh9h5cv1i0pkhghq8dfh6bjnwkv7908g0x827p4c2sglv" }, "stable": { "version": [ @@ -114055,10 +115715,10 @@ "unstable": { "version": [ 20220129, - 2013 + 2022 ], - "commit": "cb892d614df659783246393c4223ddd8b2d39cb7", - "sha256": "183v9kwva703s1bflsl6ypmxjy4syghkphl2s3yfyp2ra0fxmnrg" + "commit": "9095a3f870aa570804a11d75aba0952294199715", + "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8" }, "stable": { "version": [ @@ -114254,14 +115914,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221117, - 1610 + 20230203, + 2004 ], "deps": [ "bind-key" ], - "commit": "9090080b15486c3e337be254226efe7e5fde4c99", - "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" + "commit": "77945e002f11440eae72d8730d3de218163d551e", + "sha256": "1irr8a8r28n8c0c2x5w1flgv1f3z5jy2i5r5dknddiqa93b3rm84" }, "stable": { "version": [ @@ -114284,8 +115944,8 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221116, - 1928 + 20221117, + 1610 ], "deps": [ "bind-chord", @@ -114293,8 +115953,8 @@ "key-chord", "use-package" ], - "commit": "41bf2aaf8854973d06f79ef69a638d0ef3ccf2bc", - "sha256": "0jji4lydv80dl9brbjhf2vyrsf52564nkvlqdrf0xbgaxjh34bnk" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" }, "stable": { "version": [ @@ -114349,15 +116009,15 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221116, - 1928 + 20221209, + 2013 ], "deps": [ "system-packages", "use-package" ], - "commit": "41bf2aaf8854973d06f79ef69a638d0ef3ccf2bc", - "sha256": "0jji4lydv80dl9brbjhf2vyrsf52564nkvlqdrf0xbgaxjh34bnk" + "commit": "bcf0984cf55b70fe6896c6a15f61df92b24f8ffd", + "sha256": "0pmz5x7ghwsjyr4lhaqa53c7190bjqxaczljpsr62s60bn55fdsi" }, "stable": { "version": [ @@ -114440,11 +116100,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20220930, - 1951 + 20221201, + 751 ], - "commit": "105577c6290934119978e23b168f0b97c9d586ba", - "sha256": "143iy63rlibxlyrzxj2qfh3vjwsdgzypimazs7vd6x7l4p45xzrj" + "commit": "3ae1dd908c822e98e017ada034181ad3ffebc1d6", + "sha256": "0f0gbhv6gi9spfsfwg9bjlz90029r9whzgfaba5qq8f9rs390c35" }, "stable": { "version": [ @@ -114464,11 +116124,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20220710, - 1024 + 20230201, + 143 ], - "commit": "32994d27771f77a384b246e69a621c4d26e27f4f", - "sha256": "1zjb0sr4z0qpdivzdpskidxcdl3c6y6f80yim7yfs1bhdd049kld" + "commit": "b5cdcc022dfe248f1fe7d85e735dd7d9434d200a", + "sha256": "135zfgjb4acf57yincpdgjckg1dzv9axm9h7izpalqn4y546kpp8" } }, { @@ -114479,26 +116139,26 @@ "repo": "diml/utop", "unstable": { "version": [ - 20221103, - 1446 + 20230105, + 1430 ], "deps": [ "tuareg" ], - "commit": "c596ac7b88ce0686bc8bf82dfa77fc055cdbfbef", - "sha256": "1nl18rshaw0f93i67n53s7f9x9ykn49bik14432zmr00kcddmn4q" + "commit": "595002e6f07e6a3c6abc6e94a1b2448006115f1b", + "sha256": "0a3imki76pz68s6s495wdw0ig5j8hiwrgbm2lj3ddsm5w2cxxi12" }, "stable": { "version": [ 2, - 10, + 11, 0 ], "deps": [ "tuareg" ], - "commit": "e56a75d2826fbe0ba3bc27a6d19fe08e02c3216d", - "sha256": "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3" + "commit": "595002e6f07e6a3c6abc6e94a1b2448006115f1b", + "sha256": "0a3imki76pz68s6s495wdw0ig5j8hiwrgbm2lj3ddsm5w2cxxi12" } }, { @@ -114547,11 +116207,11 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20221022, - 49 + 20230110, + 153 ], - "commit": "188d74cb279537f476c6f35b4e4f966d38884314", - "sha256": "16idjqc6bdqg60mv2h3bgip38j1mpfwpffckpg5vzan9ylsivxxx" + "commit": "6b66376b9d7053eb9c23449a601d24511a0b44e6", + "sha256": "1rkxsnxzgcqmhvll156ipncpcc252j2y1m2jbh7yq8h5m1sz1az9" } }, { @@ -114562,11 +116222,11 @@ "repo": "non/uxntal-mode", "unstable": { "version": [ - 20220502, - 154 + 20230131, + 235 ], - "commit": "3fa793964f287d448e3e2b53fd812803c5f5890e", - "sha256": "149nqrih95b2jvvj8nsl0msah646m8zrfgww8piwil1x16dy43a5" + "commit": "aaaa7a7ac24eb142c68f691185166327ec1e4520", + "sha256": "1bba89vw937rzcm1lr2ym9kkyd56wkgpzhc7dxz73nh74wwh4mf5" }, "stable": { "version": [ @@ -114655,8 +116315,8 @@ }, { "ename": "vagrant-tramp", - "commit": "baea9f16e245aec3f62e55471358c7208f61372d", - "sha256": "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0yqy8nz4501wvzb9bqj2i2aimdkp04bnk40p33cwqakrkprg1gfq", "fetcher": "github", "repo": "dougm/vagrant-tramp", "unstable": { @@ -114751,8 +116411,8 @@ }, { "ename": "vbasense", - "commit": "8e7dd1e985d55149f48e4f93a31fb28ec01a4add", - "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0p9kc10xbbjlk9li1ch9589jykn290npq423xvb7zvj0bgjnfhzh", "fetcher": "github", "repo": "aki2o/emacs-vbasense", "unstable": { @@ -114851,11 +116511,11 @@ "repo": "venks1/emacs-fossil", "unstable": { "version": [ - 20220607, - 617 + 20221120, + 908 ], - "commit": "8ce6113aa272583130e5f929fefd67115c8f572a", - "sha256": "087na2g22dnyw52cwaxkzdgbl13p2ldvby7lmqg05bm02cmsv9c2" + "commit": "e059ca466cc8914757c6bdb26fa9cc6b0820a9c1", + "sha256": "0bsb1wv581cwkl46vqm6r726fikv701rvzgx2nqr2ws07p9y4v99" } }, { @@ -115314,6 +116974,35 @@ } }, { + "ename": "verilog-ext", + "commit": "0f5390a1b25d0f370ef11d310f292eda3a3a77f9", + "sha256": "02dccbf38imvg92zv6hdhw8ibc9rahrb1ppbvy3ngk346789l0dj", + "fetcher": "github", + "repo": "gmlarumbe/verilog-ext", + "unstable": { + "version": [ + 20230220, + 1852 + ], + "deps": [ + "ag", + "apheleia", + "company", + "eglot", + "flycheck", + "hydra", + "imenu-list", + "lsp-mode", + "outshine", + "ripgrep", + "verilog-mode", + "yasnippet" + ], + "commit": "6872a42791c5105bfe1de1d63abae537559c7ca9", + "sha256": "15p160yrlxxdlby2fr5aavsxzagdc31wrb2902frgix9zr2z3igx" + } + }, + { "ename": "verona-mode", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", "sha256": "0qkrfgf9mpf3jphspzpw9sk3d0x9nfx1rcf7ff3s6m470vmg7xbr", @@ -115375,8 +117064,8 @@ }, { "ename": "vertica-snippets", - "commit": "d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56", - "sha256": "0044qcf6dyxp2h14ij6w19zs7ikx9xalfrz6jqbl8sy35wcihmhn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1d39q0i1nzmcc36pmiavz10q2fi72mxmgn454qasl07lgsqyg795", "fetcher": "github", "repo": "baron42bba/vertica-snippets", "unstable": { @@ -115399,15 +117088,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 1427 + 20230221, + 1257 ], "deps": [ "prescient", "vertico" ], - "commit": "680fefa4601586dd87d549d33f5ae6fda3212c35", - "sha256": "16k34jp07snzknyp2lg0g6vsb7pk96s0fplb9hdjq8w3n4kyirb1" + "commit": "822481e722502081deedbe6b1a9776eda0ca7bfe", + "sha256": "1h9chc5bipvmn6vqzr150dk91hfcj6yzdn3ylb4lgk70x8if4xvn" + }, + "stable": { + "version": [ + 6, + 1 + ], + "deps": [ + "prescient", + "vertico" + ], + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -115455,6 +117156,29 @@ } }, { + "ename": "vhdl-ext", + "commit": "addd32ea66e8834de5b14a7d8493f34c8bba62b9", + "sha256": "051p2kx9vxn7di2qzi96hx53kqlwkg93w7jcpa3rjp114nk2f41s", + "fetcher": "github", + "repo": "gmlarumbe/vhdl-ext", + "unstable": { + "version": [ + 20230221, + 1447 + ], + "deps": [ + "ag", + "eglot", + "flycheck", + "hydra", + "lsp-mode", + "ripgrep" + ], + "commit": "6b9cbfeedc4914b08b65e498fb3213bba3221155", + "sha256": "0dkl6h4v6gs7mp14597jd0wdli8jmcfyl4wfmnw7lvzwmah1mjal" + } + }, + { "ename": "vhdl-tools", "commit": "b1a3336bff4d677b3bc7fbb8ef230ffc7b78e268", "sha256": "0xdq9sicwpv3qzy833fqhvi4yllqmqgd4p9lbgq7dn1g8qz2gakn", @@ -115767,19 +117491,20 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20220519, - 1959 + 20230102, + 1830 ], - "commit": "453d698d7fc243a547665f8ba43c55eee574e0db", - "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6" + "commit": "695a59789209c42fa08a5bce92963ee32f4455be", + "sha256": "0006x7vbwrx4w3b51aajzds0qaw3zb3b2wmj0c3j0anlrmyb37yz" }, "stable": { "version": [ 2, - 5 + 5, + 1 ], - "commit": "453d698d7fc243a547665f8ba43c55eee574e0db", - "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6" + "commit": "695a59789209c42fa08a5bce92963ee32f4455be", + "sha256": "0006x7vbwrx4w3b51aajzds0qaw3zb3b2wmj0c3j0anlrmyb37yz" } }, { @@ -115957,11 +117682,11 @@ "repo": "k-talo/volatile-highlights.el", "unstable": { "version": [ - 20160612, - 155 + 20230220, + 1415 ], - "commit": "9a20091f0ce7fc0a6b3e641a6a46d5f3ac4d8392", - "sha256": "1dsa6769lphyyv7yg92vkkpk395w52q4m7hdn8xy7s6lh5c6a955" + "commit": "513c8b73cd3bc06cb9936a100468c227f649851c", + "sha256": "0a2r492plzxcl5sl2n75xqywk6yjkgj07xzbkcabvibj33bf1mz7" }, "stable": { "version": [ @@ -115995,11 +117720,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20221024, - 1544 + 20221231, + 1702 ], - "commit": "94694257af1831359e645ae87a88437457d2fc49", - "sha256": "0cdywisdy3696qk5861gckd7pnkca7asnxnp2f24y384g2gjhpnp" + "commit": "636f4db45aa4dac1cda09b54757fdc3584ce6697", + "sha256": "1kyzlhhz70d228xpy8qjliyfxv68rgdn468jix9nfgj5i8q2xxhz" }, "stable": { "version": [ @@ -116018,11 +117743,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20221024, - 1546 + 20221231, + 1702 ], - "commit": "344a4dc59ecb25be772b5a15f07b448f3eb339b9", - "sha256": "0xskb48klafspqwymfy9x708lxsgymd3r054nmalnl2z4q1wvh7s" + "commit": "988b649dcb9074719c7fd0ad3f289cf2995d7635", + "sha256": "0frmgyj71glsng83ila9kb7691kfxyblxjgy5dvilzwjc9a0g8p2" }, "stable": { "version": [ @@ -116056,11 +117781,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20220320, - 530 + 20221121, + 1846 ], - "commit": "cec18a9d816fef372a4e70f6ad1e16a42aa93b06", - "sha256": "1byssa2rv2j9s3m10v7ihi1avqkjc5wqj62393wkp85k73z9v3dq" + "commit": "f33e1f92f6b34bbd7ecc81cb4c6d48f9cab393d9", + "sha256": "1s2jp3s6vnhdhdv53sp4qkpg19pxfjgwgpch9xc5nqb7ljk22fqx" }, "stable": { "version": [ @@ -116089,17 +117814,17 @@ }, { "ename": "vterm", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "0dd1fcpkhmk7c0r0bl93sack68iyfnnzmii40ixjhm7ma5ms0lnz", + "commit": "a560fc2dbcfd37485890faf5243fbdb653ecaf99", + "sha256": "196vad9hh44pc8r1qd7pv92wr4wa0ni92gjb8bd066a6aagxr6s7", "fetcher": "github", "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20221118, - 1354 + 20230217, + 228 ], - "commit": "f14d113ee4618f052879509ec378feb9766b871b", - "sha256": "0alvh18agp815g5r2cwvyhfpspjfjz5gi84bg1xsi085g1wvgmbl" + "commit": "3e5a9b754b8e61850bb7d1b63b090b9fbf6687f3", + "sha256": "1px5nnwlnpiqry7s99ykvjf2hqryixnl6qvv9wj3808qkls6wykk" } }, { @@ -116238,8 +117963,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20220714, - 1856 + 20221128, + 633 ], "deps": [ "dash", @@ -116247,8 +117972,8 @@ "org-roam", "s" ], - "commit": "8070a599583f0126a089f386e35df62451e51a91", - "sha256": "1zwgsg8p1xghzzim1kpzijin098p707skhwm38cgv258hp4sgw22" + "commit": "bee9bda6a17657155d233e375a2cae693fbe8676", + "sha256": "1j075p8716kfqd68rlfcax3rv8a2aggmz0m8hw3kic91q7psnb7m" }, "stable": { "version": [ @@ -116353,11 +118078,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20221116, - 2331 + 20230119, + 418 ], - "commit": "b1642c87fe83700a929aebb774c89071e23c84e0", - "sha256": "1qblbxv4zbyv2ax1m42wfh1nx6bpl7snixx0whg8jiiqmk9sy6rb" + "commit": "d7f99ea4561004f7f15e8d17f5f7a084d04f3925", + "sha256": "15dpxppfpwrkpfrvjpq6cwkkkkmywvv3rf3pn8psykc48qg1ri95" } }, { @@ -116612,22 +118337,22 @@ }, { "ename": "wanderlust", - "commit": "426172b72026d1adeb1bf3fcc6b0407875047333", - "sha256": "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "03lv7fzwh3s87m8sf0jj69c7nsagj0bkiysjdn8l2vgh5br0pvzs", "fetcher": "github", "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20221117, - 1230 + 20230120, + 904 ], "deps": [ "apel", "flim", "semi" ], - "commit": "f5cb2f0cf5e2c893acf2e669fd549836828dfdfc", - "sha256": "1ijs57wv1vrh33vn311hgkp42vlmjyi998nc4qdrqi7yy9j8hl1h" + "commit": "77662986fd91cff991f502b19262227227740d52", + "sha256": "19iwyzvlidkxldyalppscfhpxj5cqgcn15gp8105xh9bwpwshfkz" } }, { @@ -116768,14 +118493,14 @@ "repo": "ruediger/weather-metno-el", "unstable": { "version": [ - 20150901, - 107 + 20230129, + 1540 ], "deps": [ "cl-lib" ], - "commit": "bfc7137095e0ee71aad70ac46f2af677f3c051b6", - "sha256": "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z" + "commit": "58b3aa479d85b4b38eb233ac2fbac40faf906f4c", + "sha256": "1r82arsrl7s4gvkfrkbjmwhg198f6r5gqbf7wq3z8m1wxapypsza" }, "stable": { "version": [ @@ -116835,8 +118560,8 @@ }, { "ename": "web-completion-data", - "commit": "604f155a3ce7e5375dcf8b9c149c5af403ef48bd", - "sha256": "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "07bz8gkyqg4clifnrxqgwn2h3rd73607m6w86ni8vzni02s24wqd", "fetcher": "github", "repo": "osv/web-completion-data", "unstable": { @@ -116864,11 +118589,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20221012, - 800 + 20230206, + 1654 ], - "commit": "4b8a695825fda366927894e498421f35fce1cbb9", - "sha256": "0m8fhy3vgczgl051l05lycydpybki2b5gi63i134h2xmgm2m5rvq" + "commit": "df97ab62c94826a84adbde060a4111ca91deda8e", + "sha256": "1nvw1wrvh97gjrk72skp00r4dbdz0a1jsaxgxia3jgbmm6aa5l6l" }, "stable": { "version": [ @@ -117019,8 +118744,8 @@ }, { "ename": "weblogger", - "commit": "e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2", - "sha256": "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs", + "commit": "ed9e52d5ddfca4fe7f139eff949596ad76c21002", + "sha256": "1r7xi5bm4b3b2zrcfk5k6lhbkp6bwl4zi08bzndywnz0bd5j15si", "fetcher": "github", "repo": "hexmode/weblogger-el", "unstable": { @@ -117105,20 +118830,20 @@ "repo": "xgqt/emacs-websearch", "unstable": { "version": [ - 20220823, - 42 + 20230210, + 1321 ], - "commit": "9336601462ce29822e6aa14db01d923a4bd1c6ef", - "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" + "commit": "aa0d7899e032e330e2980aa4be34ed872395883b", + "sha256": "1z4y9clvpmgflfq13jmb1j4gy8ly93sfcjwmyf3sn25gld6dmnpi" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "a39858c0b81817e3defd7b02583287a4d020bc25", - "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" + "commit": "aa0d7899e032e330e2980aa4be34ed872395883b", + "sha256": "1z4y9clvpmgflfq13jmb1j4gy8ly93sfcjwmyf3sn25gld6dmnpi" } }, { @@ -117129,14 +118854,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20210110, - 17 + 20230129, + 1601 ], "deps": [ "cl-lib" ], - "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", - "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" + "commit": "2c576b6cb8e7b868e09e09c8e9cb6cf66f427bad", + "sha256": "0khrk3q88py4bcb0ir41cjyrclyqn864d4yknssflx5ppalcgyz1" }, "stable": { "version": [ @@ -117261,6 +118986,21 @@ } }, { + "ename": "wfnames", + "commit": "a62d25c944bff5563303fdc4736697d9144d8eb7", + "sha256": "1y749nxrs6a7z81s91ggiax4r4dkvicf23xngab5yasj4ppsi6s8", + "fetcher": "github", + "repo": "thierryvolpiatto/wfnames", + "unstable": { + "version": [ + 20230117, + 729 + ], + "commit": "0804263fa22bf77fcdb65017ddedc168905f3228", + "sha256": "1mzi55hnnkx6xrl41vmp87bsxc2mjrb1r8cpbkf9si2pw9ldghlw" + } + }, + { "ename": "wgrep", "commit": "9648e3df896fcd97b3757a727108bc78261973cc", "sha256": "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4", @@ -117268,20 +119008,20 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20210322, - 2207 + 20230203, + 1214 ], - "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", - "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117292,26 +119032,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200128, - 109 + 20230207, + 1125 ], "deps": [ "wgrep" ], - "commit": "088c04e2ca44eac7e7221f91668ce074915d2f4e", - "sha256": "1a2jvj00yk5wz7djbqaw8xnsappd66ld1liv6zsvv2qa6fnzvlka" + "commit": "edf768732a56840db6879706b64c5773c316d619", + "sha256": "1v4kh00vv7ccs8j46gyp0ikb6v3ppb1na2azdmxwyb6n2acvy4qx" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117322,26 +119062,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200217, - 1028 + 20230203, + 1214 ], "deps": [ "wgrep" ], - "commit": "253f93d2764b16a877ae83ecdba692c88eaded24", - "sha256": "15wwrzhaf6iycfwn7p0d6kd32axfpa7wvd72wahzaxx58v4kl8cz" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117352,26 +119092,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20210322, - 2148 + 20230203, + 1214 ], "deps": [ "wgrep" ], - "commit": "4c2f345b9b6b46a2257544acb8c4d92d418f443c", - "sha256": "0arlh6da9z0dp22aydzw642287i9gf895bv24p3y3pv752smxbq3" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117382,26 +119122,41 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200128, - 109 + 20230207, + 1125 ], "deps": [ "wgrep" ], - "commit": "088c04e2ca44eac7e7221f91668ce074915d2f4e", - "sha256": "1a2jvj00yk5wz7djbqaw8xnsappd66ld1liv6zsvv2qa6fnzvlka" + "commit": "edf768732a56840db6879706b64c5773c316d619", + "sha256": "1v4kh00vv7ccs8j46gyp0ikb6v3ppb1na2azdmxwyb6n2acvy4qx" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" + } + }, + { + "ename": "wgsl-mode", + "commit": "4861b04693f404acadecf938117a27aa6e7f3f2e", + "sha256": "12k311nsv57mrxwhfc0lmp4f8avhy2b23blyqydnrmijl841a0zy", + "fetcher": "github", + "repo": "acowley/wgsl-mode", + "unstable": { + "version": [ + 20221127, + 2129 + ], + "commit": "e7856d6755d93e40ed74598a68ef5f607322618b", + "sha256": "0344db2kx1hw1gr971iqxhwy7qzn2vfkjgg8ccla9zsf22nlqxk3" } }, { @@ -117610,11 +119365,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20221103, - 1110 + 20230201, + 1408 ], - "commit": "ce6bbe7f106f11840443fd94cc3161f67ffc9f61", - "sha256": "143xzj9mm3r8acfl71msw2n4ajw4qhkcvgn6a5x98mf53i110z6f" + "commit": "eae090d48f7942f58231be71683865ba3cd56c24", + "sha256": "1mmsk9fsr30a4n1185828sa8jjzfwdcjgq491q027ly5kh4kqc7x" }, "stable": { "version": [ @@ -117662,11 +119417,11 @@ "repo": "akib/emacs-why-this", "unstable": { "version": [ - 20221014, - 1653 + 20221129, + 817 ], - "commit": "258f010001b4d3da89eea56b329f9f24bed0f6ce", - "sha256": "1pcfcbh55a26si8hb2hbgax7iww7nhcgy9m93ncikxhwrk8s8k37" + "commit": "5203d9379afaf6703746823a580c804e1dd98e08", + "sha256": "0ng6z0w6qx4bhgndg14qiabv8qh1vgxdqqzgf0ngidyrm4n43rpp" } }, { @@ -118163,10 +119918,10 @@ "version": [ 1, 0, - 7 + 10 ], - "commit": "3c9e708df324289f39ada9f1f8beae7e7a84f326", - "sha256": "0fxngiy8dmryh3gx4g1q7nnamc4dpszjh130g6d0pmi12ycxd2y9" + "commit": "072fb89d39e33418cb48fa5d25d50545b03f4db0", + "sha256": "13xlagkjmnzv0fn6bwb3vrqn6arxx1g2m1b4wg2rzm7dadlpgmpn" } }, { @@ -118207,14 +119962,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220810, - 1159 + 20230212, + 2214 ], "deps": [ "compat" ], - "commit": "14a958d4f2fc932db1c1af30ca405e6570d60e24", - "sha256": "1m5cw9z4jl3rhfsf31g8k27bj8yvhll2lm0hk3l3djgqz0ay612r" + "commit": "59867aebe16454be4d8c0c858f3b00b8a34f3f61", + "sha256": "1jrkr58xn0lpxxq0mlar6jpxd7ylnqma4scb148dpfimav1qz3lj" }, "stable": { "version": [ @@ -118314,9 +120069,9 @@ "unstable": { "version": [ 20210527, - 2320 + 2337 ], - "commit": "41f4547339927aec16ede71d1bff7837f5ff49ed", + "commit": "ee4d2b75fd99bac3de40675b0a0e03529718f59f", "sha256": "0n8h84whsh0aph8xhn9plprix9f6bysgvarz2anz7kwns19js6s4" }, "stable": { @@ -118421,8 +120176,8 @@ }, { "ename": "wonderland", - "commit": "ed02d5e4cba10023ebc7c26f90ba8d1e8ee32a08", - "sha256": "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0vjbhj2c80lkbdqm4cpwb31jcd8agk75js5ca0dn6jijg9amcw2j", "fetcher": "github", "repo": "kurisuwhyte/emacs-wonderland", "unstable": { @@ -118461,11 +120216,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220508, - 1745 + 20230109, + 1407 ], - "commit": "d37187bb5abb2fe4a8ba120fad9e52dd74cc220e", - "sha256": "0527j2ldfiaqlblk00abdl0s0l0wmxac74i4qa899mlqq5sp7kyy" + "commit": "77999d75c5eae29e22b8e3f8859b62c6e30aa65f", + "sha256": "0nz0nl0xs71xaa5cq46skfsyszaq622i9zcrz8z9p48hx57dz04m" } }, { @@ -118521,14 +120276,14 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20221114, - 1300 + 20230214, + 1735 ], "deps": [ "s" ], - "commit": "31d5c2c06f07a695d41212760726bd5036297405", - "sha256": "1q5g5j63z2j43zfiyr76gq12mkslp194mhnmljsnfv4c0gbgihwj" + "commit": "8ccda3422fc30fba23602327cc8e7de9f53bfa1d", + "sha256": "12lhaqhri3yh2l010a2kajzys5jvvad1yg0rcwiyn6hlr6wsg60a" } }, { @@ -118607,8 +120362,8 @@ }, { "ename": "workgroups2", - "commit": "4f9cfb740cce05a6805d9a047e4c1380305da4df", - "sha256": "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1dr0sx92mm9gybdn3gq64lkr3gsphdxazp09vkiyaabvk2hwv4ng", "fetcher": "github", "repo": "pashinin/workgroups2", "unstable": { @@ -118640,14 +120395,15 @@ "repo": "akib/emacs-workroom", "unstable": { "version": [ - 20221114, - 350 + 20230123, + 1630 ], "deps": [ + "compat", "project" ], - "commit": "b81e76e0a39937b7544bf77cbff16cc8c239b58f", - "sha256": "137nc6zm8fnj1ymvmrmkm7y41132cpfr6i8akzj7sj8jmvayzv98" + "commit": "360420501a239f74bff60941d28052fc19a92bce", + "sha256": "13d1qmkls8dbrm2wagrvrffyis87pyy2l2hsmnxrp2mqzk0vx541" } }, { @@ -118721,16 +120477,16 @@ "repo": "dangom/writefreely.el", "unstable": { "version": [ - 20221024, - 221 + 20221221, + 1456 ], "deps": [ "org", "ox-gfm", "request" ], - "commit": "ef22839e590ea62f8ec9510bf03fba8fa3aef4c4", - "sha256": "1pb8gmbqj40m1xqbhaa8k8j29zl39bfsib74m6rcwlzbn2fk5gdg" + "commit": "db70444eb5fbe0820754574d70b1ae44967607dc", + "sha256": "1570vi25pwsws8dskmgclnxc6hjwma44wwvddnnmp8jy8a4fsa3l" } }, { @@ -118956,17 +120712,17 @@ }, { "ename": "x509-mode", - "commit": "27145423eb4e68e006ef96868a35b99d119a3099", - "sha256": "15k3pxj3a2vaf64cl2xrzzlvzbqzqc29qyfd8brhq6yc69snr0vj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1i3sv9m5kzxchdbdwv87jn7iillw7bk8vh1dzy4j4cxwl17gkfb0", "fetcher": "github", "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20221115, - 1401 + 20230119, + 838 ], - "commit": "814114b3dfe44ac477831c8ca5da0050a9d0fdf1", - "sha256": "0p0l8q1m3mj9lfss2sjbglpcp4dxzf46zjl9c2vzqf2v7hxlps2a" + "commit": "0118ac433f5aa0c4a7ea51709ba9da51388d644d", + "sha256": "0gp0s2xwq384lm80lrdxsghhld5vz6dmxqfacxbp4nk5fqp9xgll" } }, { @@ -119212,13 +120968,13 @@ "unstable": { "version": [ 20191011, - 1148 + 1159 ], "deps": [ "reformatter" ], - "commit": "670ba3d69e702f76a687f81e079addfc7c66075c", - "sha256": "0b21g6kzikg3gbm840dadk0a04j7rhzrgmi849znz6jg6cy6vqrg" + "commit": "2861c4e33e18b077112efa072316b031bca4236c", + "sha256": "1g0v5ir6nwpamnwvq509d1s1s60n0s5p2lvqqm0n0rk9r753cqkh" }, "stable": { "version": [ @@ -119256,11 +121012,11 @@ "repo": "xml-rpc-el/xml-rpc-el", "unstable": { "version": [ - 20221027, - 1812 + 20221228, + 2346 ], - "commit": "de58ee692a459d7e0e8d3df004eda2686f749d3f", - "sha256": "1whvbw91hjkc85wdrxrfvkw8nm8w3c3cpcqf3i0dk5479idv160l" + "commit": "8272789df8a4deab4de7d50e63b73b7d0543bc7f", + "sha256": "1l57q1gskkdjfhnl3jil1gblj2jz6j1l0njwnz5bs76dajhlmjpj" }, "stable": { "version": [ @@ -119427,11 +121183,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20220710, - 1033 + 20230116, + 1300 ], - "commit": "e1dd4439e535185a0cd195bb392f70982cf5aadc", - "sha256": "0snl51bnm69zwb8wm8yr0xr263m2sr6f2b1d30p1yp0p0jv40i33" + "commit": "0cc7fadd4698bd5b51ce2a52fcb4de41c7f030f2", + "sha256": "1ilb0zyan6bl4smr1m3c9fhh6r3l8py6lmsg177jasyzdb9bsycr" } }, { @@ -119442,11 +121198,11 @@ "repo": "martenlienen/xresources-theme", "unstable": { "version": [ - 20190108, - 1851 + 20221208, + 2015 ], - "commit": "5239acb51aa2dfa89a207e57012108d8fcf60562", - "sha256": "13pls0f85n5rpbrbqcmrmcznv9hxiaglrnwpzivrli33cba92fpm" + "commit": "76532fc4330e9e31accc580708514b83b15d70a7", + "sha256": "1ilvjdz7j2s1flq4ivn7lcq47d4lshn24sn9qmzj7nln2qz63r7n" }, "stable": { "version": [ @@ -119483,8 +121239,8 @@ }, { "ename": "xterm-keybinder", - "commit": "656f8e27b4e6055a634249f134a4fc0667fa0e95", - "sha256": "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "13bgkmdl3ijm5i6ks5rgld6a73b8plsr7s7njp7daiy6krckd98a", "fetcher": "github", "repo": "yuutayamada/xterm-keybinder-el", "unstable": { @@ -119635,6 +121391,30 @@ } }, { + "ename": "yabaki-theme", + "commit": "149f2219404fddc58a94d0ff4aba7fdc7043d814", + "sha256": "1dzh6ry23x5dbw40jiyj97r5clrd2kzdmj89z9x0ijm7alqycsjg", + "fetcher": "github", + "repo": "seamacs/yabaki-theme", + "unstable": { + "version": [ + 20230117, + 2312 + ], + "commit": "5b0aaaf352384f24b0104065b5c600e8e6fab707", + "sha256": "0rvhcbdhj0ha41mkyjccrhpjb75svk01dl33vdkkplqf8rx19p1s" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "5b0aaaf352384f24b0104065b5c600e8e6fab707", + "sha256": "0rvhcbdhj0ha41mkyjccrhpjb75svk01dl33vdkkplqf8rx19p1s" + } + }, + { "ename": "yabin", "commit": "cc44b28e32ff9b35f60744a175c2d1e3036db8bc", "sha256": "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17", @@ -119759,8 +121539,8 @@ }, { "ename": "yaml-imenu", - "commit": "71e7c2df9e34093ad2634d5a56133fa30126fb5c", - "sha256": "03r7020gyr96m1z7p947nb7z8szzlkqv21g1hm10sqa8qp7k0qli", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1w3kl28lvcq8y80gxx7kaarb715434xah5z1i9n5nav1fg89r37z", "fetcher": "github", "repo": "knu/yaml-imenu.el", "unstable": { @@ -119819,26 +121599,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20220919, - 1312 + 20230115, + 427 ], "deps": [ "yaml" ], - "commit": "36d340b27a008478466e0158c8ef4098230bfe49", - "sha256": "1m8vkhr4yqwkgmd0inlmmc6bv9x065q9anv0gy2vl15lss1cyljk" + "commit": "5b8c236e1a45b4f6e2d32e10b69868634c8152bf", + "sha256": "0644ibfymf6favv0bx2g542vp4al6276lsi236d7353v3f22f94d" }, "stable": { "version": [ 0, - 2, + 3, 2 ], "deps": [ "yaml" ], - "commit": "36d340b27a008478466e0158c8ef4098230bfe49", - "sha256": "1m8vkhr4yqwkgmd0inlmmc6bv9x065q9anv0gy2vl15lss1cyljk" + "commit": "5b8c236e1a45b4f6e2d32e10b69868634c8152bf", + "sha256": "0644ibfymf6favv0bx2g542vp4al6276lsi236d7353v3f22f94d" } }, { @@ -120086,14 +121866,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20220713, - 1234 + 20230220, + 1659 ], "deps": [ "yasnippet" ], - "commit": "cd665c9cba4bab646f6d50ac098bee63573a4ca5", - "sha256": "113yn1imk8pffn3vyqbjmg7j64x0y0dgqx56jss8wbf17nzck17w" + "commit": "9580874944cce78b3bb2296ae10de1443b0a57e8", + "sha256": "0ig8ywpw1ql49fp1nlxrgaiadd6zxf2npxnpiv09vj6vij0pank4" }, "stable": { "version": [ @@ -120144,19 +121924,19 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20220929, - 123 + 20221216, + 904 ], - "commit": "923a6c0183be469fb4f94b1258527f2ca1cc5b79", - "sha256": "0f5xgzid2bl0qy803vzy1dn8hiq022rbdq2lnj4zxjcvz9jd5cm7" + "commit": "c11261c0960fe44c8664aa017924475dde9d7f71", + "sha256": "1q1m1lap3h32i4j09n1c326d71l18ky4k75mdmcxr1r8z3agsfjz" }, "stable": { "version": [ 1, - 82 + 83 ], - "commit": "4dad5f91b26cb44a8caa888fe8aa0aad1f1f10bb", - "sha256": "0dww4ycfsqskxvnw7yh1a1rylq5d2wgjf75j22pn36nng0zkb7b6" + "commit": "157aa7974191bbb4707d26b05ce830282ad70ef5", + "sha256": "0k23snhqj9vqzrv8mbyjfqv1q3riv67dmphbdrpxprfm0k6bd3ds" } }, { @@ -120168,10 +121948,10 @@ "unstable": { "version": [ 20150105, - 1452 + 1540 ], - "commit": "21a36020c6a5319ea6461f4524aa3a0589df3bbd", - "sha256": "06fnm2c17hmlfp40mq8lxk1blmcy10z0xxdpy8ykyv1r1r6syjf8" + "commit": "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875", + "sha256": "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8" }, "stable": { "version": [ @@ -120249,11 +122029,11 @@ "repo": "jacksonrayhamilton/ydk-mode", "unstable": { "version": [ - 20170113, - 921 + 20170114, + 223 ], - "commit": "3de9ef27dbdf5887f05092895e4ba93e7659e0ec", - "sha256": "1kc1qsblfxfxrbgv3ksqf87gzic463136k2v7ryaj3x2r9mc0j3l" + "commit": "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e", + "sha256": "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi" }, "stable": { "version": [ @@ -120522,11 +122302,11 @@ "repo": "mmcjimsey26/yuck-mode", "unstable": { "version": [ - 20221024, - 146 + 20230113, + 2304 ], - "commit": "b1f76283d435812d08a616db36dc17d949464487", - "sha256": "1x6l7wr5pgs9k0d7s2b884dpqg4g4jza4p0mhrr4lhdx4bjbyxmp" + "commit": "e084416fa3e7f91bb429edbf7ff1585aa5674367", + "sha256": "1ilwn7ml5wbwgwbhqp2nc0v9xvxrax5g3lvxajdjcpx5cipa601h" } }, { @@ -120868,14 +122648,14 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220626, - 1100 + 20220702, + 1527 ], "deps": [ "zetteldesk" ], - "commit": "171fefe91fc616c94b2ec29826fa6893f5816c00", - "sha256": "07awg6zrnckjbvndmlsmcy5l99f7rmf03zfghzwgdmg7bfyfwxbq" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" }, "stable": { "version": [ @@ -120898,16 +122678,16 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20221009, - 2122 + 20221121, + 1811 ], "deps": [ "hydra", "major-mode-hydra", "zetteldesk" ], - "commit": "7d99ea13b8187cea1cc6c44fc70100a2fdd8ed15", - "sha256": "178dvb1ais0p87xf7lqnvax9fs066zdlxw0hsaplyrfwlb6p3k4a" + "commit": "b3e1479286932c59d951c68682675137acd834f9", + "sha256": "1plph3ha1prq7p5cf75d9nm6l1sv0mhd5hl3b6v15jk54mfxj7hw" }, "stable": { "version": [ @@ -120932,15 +122712,15 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220619, - 2028 + 20220702, + 1527 ], "deps": [ "bibtex-completion", "zetteldesk" ], - "commit": "cac8fb90596d7d2573ef42e2a4a7de0cf49107b9", - "sha256": "1vnknrihhm54khmbawpiavl3k225prgi00y481pfjg2dvvrl3zsx" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" }, "stable": { "version": [ @@ -120964,15 +122744,15 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220626, - 1100 + 20220702, + 1527 ], "deps": [ "org-remark", "zetteldesk" ], - "commit": "171fefe91fc616c94b2ec29826fa6893f5816c00", - "sha256": "07awg6zrnckjbvndmlsmcy5l99f7rmf03zfghzwgdmg7bfyfwxbq" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" }, "stable": { "version": [ @@ -120996,14 +122776,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220819, - 2351 + 20230108, + 1724 ], "deps": [ "s" ], - "commit": "505fd41dea012e743962c3a376c1e63e7a1e127e", - "sha256": "13pf2ygyizqk3axfl7s246an9w1ih38jq1knzy5f4qn2pf5k2zjs" + "commit": "cc4d69c302a46b8f802a1871aae091df1f3398ba", + "sha256": "16an3pym99r0w6810zw1m1jydb7zvk01mw55zxl64kjc37zdlckr" }, "stable": { "version": [ @@ -121058,11 +122838,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20220521, - 1148 + 20230121, + 1229 ], - "commit": "dbc648f5bca8f3b9ca2cc7827f326f5530115144", - "sha256": "0hwkkwhc5b2pzyqa2h0xw8wxijsrp1fk70fhyv8hx19shzlc4la3" + "deps": [ + "reformatter" + ], + "commit": "3cf8ccb55156677b77e0cafbafee8f63dcebfd49", + "sha256": "0bsinwy2nh4gwm7r8m6w4v6ksxrcmhbk62rm4fzp7mj2k7hg2584" } }, { @@ -121073,8 +122856,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20211117, - 2000 + 20230211, + 1650 ], "deps": [ "dokuwiki-mode", @@ -121083,8 +122866,8 @@ "link-hint", "pretty-hydra" ], - "commit": "aa906931f22c34d77c65bed31121edfef714e4e2", - "sha256": "071xw635ik9jqlgmrzg11d826d3fsjgzyyj60jq6142jr5a0jpqb" + "commit": "cf3d5a0dfb53d6cba8d7d35420ec18bf81b5bf2f", + "sha256": "194wcyz1zwwkizpblq4pwixigpjyy3br7psiaj0p7fmrcicdfmlv" } }, { @@ -121113,11 +122896,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20221104, - 1238 + 20221121, + 1252 ], - "commit": "509b84e2eabb42f951e3a0a4f94218c285e3ac0c", - "sha256": "01pd24m95cdygnwzqqfz3k4jx7h0ibkjlsagalqckri2vpp1q03i" + "commit": "afddac4018c8cf8d8088b4ca128adb01a872e741", + "sha256": "0xmxfkrkijh0n73g0gpynb9rmrxf4mhmk0pwmf2q53wmvpvyn6bm" }, "stable": { "version": [ @@ -121155,14 +122938,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20221107, - 1204 + 20221209, + 1331 ], "deps": [ "zk" ], - "commit": "8cc0ca548f8fc1930bbc14b273b8a30df0c6327c", - "sha256": "0akqvgvlkfv05dl2d11gkb3ym38l1apsdp3d7l8sli7jdwqrhiaf" + "commit": "34fb7d2efffe3f0a9318da3fd3a055e805518b3d", + "sha256": "1sq1mvnnh0ynq7yn9q35dw188mlg5kzb0afd2fc10mirwryimwqi" }, "stable": { "version": [ @@ -121184,15 +122967,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20220820, - 1643 + 20221210, + 1227 ], "deps": [ "zk", "zk-index" ], - "commit": "304536486ccae8129dd681265d199062f2026891", - "sha256": "1b4nmf7dicp11hn7sp0p1j5wg5fix9fg32wky29wgr8p3qsnr9wl" + "commit": "d797ce0a143e3bf40d767fa47dee914dd3a2645a", + "sha256": "1kqc6v3c3wkisz8b95727r1qj6gh9yqc9s45gfqc0n4nlh63lz15" } }, { @@ -121218,14 +123001,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20220510, - 1820 + 20230214, + 36 ], "deps": [ "cl-lib" ], - "commit": "af5299d80715b1083a18145e9c84ef9563020676", - "sha256": "1jn1jkkl0pg2psncrf0rx9csp95pg9wm1pcmy1cb3kbqla9x27p4" + "commit": "4e1355a0fbaa4581c9c7822cee7c671b6bf15eab", + "sha256": "1a2n0gr4gvyn1n7dhyaqmlpi27zmh16nbxagn1r9mj0s9whx78q2" }, "stable": { "version": [ @@ -121293,14 +123076,14 @@ "unstable": { "version": [ 20150304, - 1448 + 1702 ], "deps": [ "cl-lib", "haskell-mode" ], - "commit": "03b8d3635f65dbf38f9a19b5d1a8dfdcb38ba423", - "sha256": "0rp615k41v5v9m9g3ydyzgwr6a7wqrmsdkz3pc2frl1zij8jpjm4" + "commit": "9e99d444a387dd1634cab62ef802683f5bf5d907", + "sha256": "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz" }, "stable": { "version": [ @@ -121414,11 +123197,11 @@ "repo": "emacsorphanage/zoom-window", "unstable": { "version": [ - 20201205, - 1038 + 20221228, + 407 ], - "commit": "474ca4723517d95356145950b134652d5dc0c7f7", - "sha256": "0syr88kqzh27ap57v97prk2z0l9wkaysqf1263j7nn9pl4jswppd" + "commit": "093dd7a5d60141812762eba40b021c76ff41f83d", + "sha256": "0i3ch9r8rnk3j6qzfnhj5svdqyas1j85aggn0way6ra3png4r40d" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index feed7ba5b41e1..499da2a8f93e1 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -60,7 +60,7 @@ assert withPgtk -> withGTK3 && !withX && gtk3 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (lib.optionalAttrs nativeComp { +(if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { @@ -69,7 +69,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation patches = patches fetchpatch ++ lib.optionals nativeComp [ (substituteAll { - src = if lib.versionOlder version "29" + src = if lib.versionOlder finalAttrs.version "29" then ./native-comp-driver-options-28.patch else ./native-comp-driver-options.patch; backendPath = (lib.concatStringsSep " " @@ -241,7 +241,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation passthru = { inherit nativeComp; - pkgs = recurseIntoAttrs (emacsPackagesFor emacs); + pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; }; }; @@ -269,5 +269,4 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation separately. ''; }; -}); -in emacs +})) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index dde5083d9c8d0..5472b28b62b9f 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 337370a6ddb7a..d04e2507c9174 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.4"; + version = "43.6"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw="; + sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k="; }; patches = [ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 156e8eaac7e76..e0b7bc9524fd0 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 = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; passthru.updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 55135c255bfb1..5c450e21748c3 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/lib cp -r runtime $out/lib installShellCompletion contrib/completion/hx.{bash,fish,zsh} + mkdir -p $out/share/{applications,icons} + cp contrib/Helix.desktop $out/share/applications + cp contrib/helix.png $out/share/icons ''; postFixup = '' wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 9adce387f4077..715693770c550 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ]; patches = [ # gcc7 compat (fetchpatch { diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 2f1ea40359d50..42b3f1495a317 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { patches = [ ./gcc7.patch ]; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; meta = with lib; { description = "File editor/viewer/analyzer for executables"; - homepage = "http://hte.sourceforge.net"; + homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 913ef7570eeea..c04e215b99084 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -62,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 diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 5d54b1150bcc1..0dc6e8297c6bb 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,50 +3,50 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "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.3.2", - "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", - "build_number": "223.8214.62" + "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 RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "566eada40511cd06727d69047e8a6a1e75b06ebade93d1ea78262fc2715c8a38", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz", - "build_number": "223.8214.59" + "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.3.1", - "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "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}.tar.gz", - "version": "2022.3.1", - "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "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", @@ -59,101 +59,101 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "222e8cf974f70a77c92f03b34c38645bfe72a2dd4da20d7154f40375db54709b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz", - "build_number": "223.8214.64", + "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.3.1", - "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", - "build_number": "223.8214.53" + "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.3.1", - "sha256": "4d2adb310b14fb38afcaa2da5c254c2fc0bede109e597eed6d3c36837497591f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz", - "build_number": "223.8214.60" + "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.3.1", - "sha256": "d78bd6494cced51fe77d87c07040fa3a29e8af917317399036af161c56afd927", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", - "build_number": "223.8214.51" + "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.3.2", - "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", - "build_number": "223.8214.62" + "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 RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3.1", - "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "296d5da052b59a00b0930cf6eea07eb2e5ed4eb1417ee505b013c6d83ffda2e1", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.dmg", - "build_number": "223.8214.59" + "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.3.1", - "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", - "build_number": "223.8214.52" + "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.3.1", - "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", - "build_number": "223.8214.52" + "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", @@ -166,101 +166,101 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "a2ea7d0f1fd9810a46a3f3fea5f47475fe8b325514488f46ee4dace474388fa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.dmg", - "build_number": "223.8214.64", + "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.3.1", - "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", - "build_number": "223.8214.53" + "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.3.1", - "sha256": "3b23165c3ea9ef3d87233a64005bee4fbf98c99df5d60410a1418e022ce032d6", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.dmg", - "build_number": "223.8214.60" + "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.3.1", - "sha256": "ea2fb464cf8ba0bf553115cd0f006cb4dab729cbde941de2fc86588024abe8b9", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "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.3.2", - "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", - "build_number": "223.8214.62" + "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 RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "5873200406e91ca64df50470eb20f907c568f5d95b7488cb4c3b3d3eb8353df4", - "url": "https://download.jetbrains.com/go/goland-2022.3.1-aarch64.dmg", - "build_number": "223.8214.59" + "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.3.1", - "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "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.3.1", - "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "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", @@ -273,51 +273,51 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "7658bcf3433d8f6b983136cc3f3edae5c02053d6983a59c273448f246ea3bcef", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.64", + "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.3.1", - "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "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.3.1", - "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", - "build_number": "223.8214.53" + "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.3.1", - "sha256": "d0ec036ed67146beb46059a6ec9aa07d8caa2225e141183fe1d47e27170ad71a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1-aarch64.dmg", - "build_number": "223.8214.60" + "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.3.1", - "sha256": "f63d2708cccc57bd404b782137f11e5dabf012df0c18aabf900743c4f02daa97", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "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/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 953c95c472483..a37c90fb99d37 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"; - }; - 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"; + owner = "andreyorst"; + repo = "smarttab.kak"; + rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e"; + sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9"; }; - 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 a6cae7a4505b3..b856308c78310 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.py b/pkgs/applications/editors/kakoune/plugins/update.py index dd8765db28a43..49662a0e8e2e2 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/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index b49fbc14fad9c..41c72cc51eaa3 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # the linux config works fine on darwin too! buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; - NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + env.NIX_CFLAGS_COMPILE = "-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 23734f3f23cd6..83d6796e68478 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-eqiH/K8w0FZNHLBBMjiTSQjNQyONqcx3X+d85gPnFJg="; + hash = "sha256-ItJ8aX/WUfcAovxRsXXyWKBAI92hFloYIZiv7viPIdQ="; }; patches = [ diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 29749c35db1fa..8a4e86ef6551b 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -9,8 +9,6 @@ let inherit (neovimUtils) makeNeovimConfig; - packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - plugins = with vimPlugins; [ { plugin = vim-obsession; @@ -47,13 +45,6 @@ let nvimAutoDisableWrap = makeNeovimConfig { }; - nvimConfDontWrap = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - wrapNeovim2 = suffix: config: wrapNeovimUnstable neovim-unwrapped (config // { extraName = suffix; diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 05037eafcb871..125fae66f7f7e 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -89,6 +89,8 @@ let python3 = withPython3; ruby = withRuby; }; + # as expected by packdir + packpathDirs.myNeovimPackages = myVimPackage; ## Here we calculate all of the arguments to the 1st call of `makeWrapper` # We start with the executable itself NOTE we call this variable "initial" # because if configure != {} we need to call makeWrapper twice, in order to @@ -131,6 +133,7 @@ let builtins.removeAttrs args ["plugins"] // { wrapperArgs = makeWrapperArgs; + inherit packpathDirs; inherit neovimRcContent; inherit manifestRc; inherit python3Env; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 9146b526262f8..65517d43bbf0e 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { binaryBytecode binaryNativeCode ]; - maintainers = with lib.maintainers; [ sander rszibele asbachb ]; + maintainers = with lib.maintainers; [ sander rszibele ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 8f4bcfd672634..fba050a040cfc 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -80,13 +80,13 @@ in stdenv.mkDerivation rec { moveToOutput share/vim "$out" ''; + # Prevent tclPackageHook from auto-wrapping all binaries, we only + # need to wrap poke-gui + dontWrapTclBinaries = true; + postFixup = lib.optionalString guiSupport '' wrapProgram "$out/bin/poke-gui" \ --prefix TCLLIBPATH ' ' "$TCLLIBPATH" - - # Prevent tclPackageHook from auto-wrapping all binaries, we only - # need to wrap poke-gui - unset TCLLIBPATH ''; passthru = { diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix index 9fc91fbe19771..6960ecb3d34e3 100644 --- a/pkgs/applications/editors/qemacs/default.nix +++ b/pkgs/applications/editors/qemacs/default.nix @@ -1,15 +1,46 @@ -{ fetchurl, lib, stdenv, libX11, libXext, libXv, libpng }: +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, which +, texi2html +, enableX11 ? true +, libX11, libXext, libXv, libpng +}: stdenv.mkDerivation rec { pname = "qemacs"; - version = "0.3.3"; + version = "5.4.1c"; - src = fetchurl { - url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; + src = fetchFromGitHub { + owner = "qemacs"; + repo = "qemacs"; + rev = "216b3ff8b77ff138aec22045522d5601b7390e58"; + hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k="; }; - buildInputs = [ libpng libX11 libXext libXv ]; + postPatch = '' + substituteInPlace Makefile --replace \ + '$(INSTALL) -m 755 -s' \ + '$(INSTALL) -m 755 -s --strip-program=${stdenv.cc.targetPrefix}strip' + ''; + + nativeBuildInputs = [ which texi2html ]; + buildInputs = lib.optionals enableX11 [ libpng libX11 libXext libXv ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + ] ++ lib.optionals (!enableX11) [ + "--disable-x11" + ]; + + makeFlags = [ + # is actually used as BUILD_CC + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $out/bin $out/man diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 71633c8c8e4a9..2d8b3c2bb09c6 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 [ diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 0697497d43db9..234d3a06901ff 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.139.0", + "version": "3.150.0", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage", - "hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-x86_64.AppImage", + "hash": "sha512-qDjZ/WQdxXCoTA2PVRiSrIukO+N6gB9UdK7Fed5cvd+xFGteSmfPpP7R6wbvTkxkAe4gkH57taeWg+Tt1jW+nA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage", - "hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-arm64.AppImage", + "hash": "sha512-KxK5Z3x611kp2TU5MTxwBfPirlPRbe8zSbF4mjMGDuzmTK3beqHhIGUh4Lud5opMyvUlbVxQf4SxslMxh7uvmw==" } } } diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index e52d95f837df4..82dd13920b026 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -27,18 +27,18 @@ rec { postPatch = (if tex == null then '' gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) - '' else if extraFonts then '' + '' else lib.optionalString extraFonts '' gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if chineseFonts then '' + '') + + (lib.optionalString chineseFonts '' gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if japaneseFonts then '' + '') + + (lib.optionalString japaneseFonts '' gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if koreanFonts then '' + '') + + (lib.optionalString koreanFonts '' gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) - '' else ""); + ''); meta = { diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 693362f95f688..d4bfdebd6a552 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; nativeBuildInputs = [ pkg-config poppler qmake ]; - NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; + env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; qmakeFlags = [ "DESKTOPDIR=${placeholder "out"}/share/applications" diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 96fb32e80f368..d162261116c0b 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.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-3w9JKX0tT5J3tJthIxJ+ZMlG8+gEeQAl9Gn+Zyjhmt4="; + hash = "sha256-QBPWelCqh8Ggp0IjH37QGYGu5Ya2fpsiSEkKh3Ee7PM="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 67374b9b40b00..4f1544eeb46a5 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -1,28 +1,48 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, qtscript, poppler, hunspell +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, hunspell +, poppler +, qt5compat +, qttools , withLua ? true, lua , withPython ? true, python3 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "texworks"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "sha256-v0UukFM5brPtgq+zH5H1KfUc0eL0hjTC9z0tVQRqu2Q="; + sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtscript poppler hunspell ] - ++ lib.optional withLua lua - ++ lib.optional withPython python3; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; - cmakeFlags = lib.optional withLua "-DWITH_LUA=ON" - ++ lib.optional withPython "-DWITH_PYTHON=ON"; + buildInputs = [ + hunspell + poppler + qt5compat + qttools + ] ++ lib.optional withLua lua + ++ lib.optional withPython python3; + + cmakeFlags = [ + "-DQT_DEFAULT_MAJOR_VERSION=6" + ] ++ lib.optional withLua "-DWITH_LUA=ON" + ++ lib.optional withPython "-DWITH_PYTHON=ON"; meta = with lib; { + changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS"; description = "Simple TeX front-end program inspired by TeXShop"; homepage = "http://www.tug.org/texworks/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 66369c266d604..27a92ac659ba1 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.0609"; + version = "9.0.1275"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-UBj3pXY6rdekKnCX/V/4o8LLBMZkNs1U4Z4KuvisIYQ="; + hash = "sha256-WDnlYi9o2Kv/f3Fh1MHcfTlBTe1fxw4UyKJlKY04fyA="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 98d7a8db2f4d0..92813ed4637e8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-01-19"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "dac83f630fc6aafd256b149a2c2ae0d4466ec85e"; - sha256 = "1ny56csbrk2kzfqr9a3m858j4vi4iwpmx8w71fr9k6ncychk9pip"; + rev = "3f6fd348df53b9d15aa0a58709562cf0a3b4636a"; + sha256 = "1dyxlam666wvydhmpxvyli3j7immifmw8yb1fyxhdrllivnrkd00"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-12-30"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4ba9154caafe707c95d438681da4eb4774380024"; - sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh"; + rev = "9aefe2af9230e8e5aa43ed1faade069da0721b66"; + sha256 = "0pl7qnzxxnzlyzvjwa0p828wx1m69b3qmixdzl18ix4c3g1wakf4"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -101,12 +101,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2022-09-19"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "70a9516a64668cbfe59f31b66d0a21678c5e9b12"; - sha256 = "1np58km2jq26d23rq1szi7v3xnfw63r6hwk263fnf38sr2q6v9cg"; + rev = "1900f89dc17c603eec29960f57c00bd9ae696495"; + sha256 = "0p7xh31qp836xvxbm1y3r4djv3r7ivxhx7jxwzgd380d029ql1hz"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-12-18"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "43433aa8dad1601acf923d3c25fa3325799508aa"; - sha256 = "111nhw85v6hkyjzfs8jx566s44i89mihvlcnwdgwc08pnmnm7fci"; + rev = "0f9606ee3e7c0e2d3437b88b6aad77ed82609e97"; + sha256 = "0kks1rlblniwimzxdjjqypz4s7l6c6lv0bxhsgkyhl2vw978n2xx"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -197,12 +197,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-12-21"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "a2e7d6ebd26e647469135d4096dfa89da4f070e5"; - sha256 = "0jli6pba08n20n97h0wh6h36pkca9bwq93h9dipmb0q4a2zqb37m"; + rev = "91d86506ac2a039504d5205d32a1d4bc7aa57072"; + sha256 = "12hsdwj4jqbkh8z3hcr1c660jmh44c0j4rzlchnc326gcbrayarv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -257,12 +257,12 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover.vim"; - version = "2015-08-14"; + version = "2022-09-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "efa491f6121f65e025f42d79a93081abb8db69d4"; - sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s"; + rev = "e61319bce3cd1004e5b695933296d8f267dd65a3"; + sha256 = "0hnww4a0vffgpj72qdhhsr28xdh219haldr6jd6my8mqy1rg3yq4"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-01-17"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "8ec6e1b030d933cba9a207a78c2f24333641fb2c"; - sha256 = "1cqhg2mp2qjpi28yq7pj9qlyry9vlyjw30nvwm0sd02pkjal0m0j"; + rev = "a4798a9fb5fd3ac8e132065597b397cab347d3ca"; + sha256 = "0al1dri6yv3n7a0xdf5lln6dvq4h5zqlxmyc1lgii260kk7zirgq"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,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 = "2023-01-17"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "25e2819b0e6ad38f51c918ea09e159c8a09bbdc3"; - sha256 = "15s0ndfpji3zms2fbijm7ys40x5p8994cdir3a0ya1nksf3yb9jj"; + rev = "6333a123c8681415ae141edc0943d0f7b377e619"; + sha256 = "0f2nbcjcsi993c5lf8mvm5ma80clm793iqhwdq4amjmxxqsdipxp"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-01-17"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "50379d35ddc38ee3651f568d080442d5e4cb4a3a"; - sha256 = "0s830zxirqbw880xv7ddza8m988i4ljrd4vgdk1yxaifid2zx8yg"; + rev = "9a5eb4443e8a990698daa99da512d0fd7aed0f32"; + sha256 = "1fazaiax65fgijm1i5k6n0zazbwhr35bwlagafcv5l4hydrxidqx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f"; - sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh"; + rev = "faadebfd77f176bd8acfab8bc9decac4abba26b0"; + sha256 = "0jzbapmrca4pqxl5nwra4wm29hgfcq5v0zng2a5hivbbjqrk7zzs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-06"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa"; - sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy"; + rev = "c3f9bccb8c04b01d5d0712b8691658af0b0ddb16"; + sha256 = "15bpbm0w9crw8pgxfynlvp9ccqzbjibgk4p1pj5fix7vzlhchh2w"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-11-29"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb"; - sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq"; + rev = "b3eef69e95674905bf26c7740dd4bbb09b355494"; + sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-01-04"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "76ce329f419d615f52335e2c18153674a4598276"; - sha256 = "0l4g18d86wibsl4jmnm4kmjrgnk1dfzr2x7xwhx0s2dqkm2g1rqc"; + rev = "7c1be58365428ef18c3621bacc5aaf188f8a4b9e"; + sha256 = "196km3z2pl0zbk8sy7c8z82a7wicla15ylfdraxpxh362sry8ayq"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -775,16 +775,28 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-12-13"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "c8b2f4048f846387361bd04cc185bf1aa7d2e3d1"; - sha256 = "0z02981n9gd5migx774cs4gnwpq9ksd4ava53f4xn973gc8jf4jn"; + rev = "04ccdac802200ecc363b251cf922b2b022bb515c"; + sha256 = "02xvdvy0jakpbgkp33ll21rcqpiybngwgxjsvvw6wg4wqg8dzykv"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; + autoclose-nvim = buildVimPluginFrom2Nix { + pname = "autoclose.nvim"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "m4xshen"; + repo = "autoclose.nvim"; + rev = "08b362ba12af1053871b192614b627bcb3c5299d"; + sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k"; + }; + meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope.vim"; version = "2011-01-28"; @@ -835,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-01-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c1b5d351ccd8f88fd2729b90ade2ef5d333463de"; - sha256 = "1cwkkg57mga200kyvd9j02xi82mbq95i5nj0lkpc7r2lxds70qbr"; + rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0"; + sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "ab0d20b2d48551340b52b3cbe8922462caa06950"; - sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j"; + rev = "55eb481d2554c7e612e52b68aa23be2090dc58cf"; + sha256 = "1fff73c663z6pcvkic9ngr9hs9vn6fpxw72x2ivwwiz7d983i93q"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -907,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-01-09"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; - sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; + rev = "5cd64c0afb82688748d415710d0187df5bdb96f9"; + sha256 = "0l7nrvk9v1ky0nx1raxmp1ah1qh54glwg18grv6mdg4iksd27kib"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -979,12 +991,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-12-04"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4"; - sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521"; + rev = "8933abc09df6c381d47dc271b1ee5d266541448e"; + sha256 = "1f2kv77273hgjmkwvsrxmpsdj2gpz8y72fz1nxgawd6h9w9ly7kf"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1015,12 +1027,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-12-24"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "c7492a76ce8218e3335f027af44930576b561013"; - sha256 = "18vfx8mq2gsv2hqy0c0vgbmx5mhr63bb8ixrmzmjgvbx2djz1jdb"; + rev = "cbb798dd2db7841550cd2c6c6dde12dfda055928"; + sha256 = "0wy8cdrsirk94il9qyv1c29mcysr41mjrr8f595pkb5zyd45lb34"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1039,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-01-14"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "8d4ab7a8d9120a3538216056047d10df3947789b"; - sha256 = "0v6d2kiww9ky0m0b94c66kfvxwmv11rkpxqyfv62pigirs8x3a82"; + rev = "691d7d9eeed574bbc6ee70bf5329ccb55a5e1f81"; + sha256 = "0mkcyaxzfjbzm7lnkfv2wwy5wg1jaaalfdnzng7q47yld4gabijn"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1123,12 +1135,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-11-28"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "91ae7e0ddf95e1984528cf3129879f4841bcbc82"; - sha256 = "0wmy9h2m4zdqaw7cmg1dz5w8l0x5269is0r8bb3ns7clilrknjhm"; + rev = "06357817f6944de132f0a58ee5c1486e4dcc6dda"; + sha256 = "1rvbz9m02vmjs5dg9yhnzzdr46ck1rqdrc7a94sybj8qvw3l5nq1"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1147,12 +1159,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-01-02"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "a5c3c8390dfb342d630bdc25941a4d8f433510be"; - sha256 = "0picfypj5by4zmq37h0dmszwk8vzj5dq04q2jy8lb9p5n36rkwya"; + rev = "722ee39d4c1b309bef4a6c2da1749c3e3358757f"; + sha256 = "1wdni05s0d1p5wmzr30sazqm3fi8n178jf1fdwwlbjpvalgjn5kp"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1219,24 +1231,24 @@ final: prev: cmp-clippy = buildVimPluginFrom2Nix { pname = "cmp-clippy"; - version = "2021-10-24"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "vappolinario"; repo = "cmp-clippy"; - rev = "9f8dd021f7b9326407a439105b0c646983191a49"; - sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n"; + rev = "eb501c9fa429c5852f8f420e71a9f565f4852c8f"; + sha256 = "1l07fvfc37sp531rjzpajf90dprcnylrkj9prr6qrgr1xlxqsvwh"; }; meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-11-27"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063"; - sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7"; + rev = "8fcc934a52af96120fe26358985c10c035984b53"; + sha256 = "1bhhna3f1xzf6y7q6iq9v2369w0jrgnh0hngnw84wh79pknqsgb3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1303,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2022-11-23"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "b7c0629e10c8a3a10311aa4ad952d207509d5e67"; - sha256 = "1hs3pying86zbrk3vnrpv4nfa8nl8b2ify5wks8675x5rc9z8iyh"; + rev = "fb3fba41fe14f4e96551e46ec74dfd1d46fb864a"; + sha256 = "10axz30ix4kxix8yw3qqamp28d07jb95sq2ry79q9vawmjfpz648"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1351,36 +1363,36 @@ final: prev: cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; - version = "2022-11-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-buffer"; - rev = "471949d19b1246f069eaf50729b39231eab3221b"; - sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5"; + rev = "5da5f20b2b459671c207599404ef8fe3fa0f60f0"; + sha256 = "08q6i73pp7h03ghd3fpdlfxhz85hrgg5s4cp4f2j4h87sssi5mzw"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-11-29"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "28735cebc314f0b080a41350adae8612b6fc7814"; - sha256 = "0jwr9xb0axs1i3xk0z773jrp77jy1a274pwwd09lradm4rfa052q"; + rev = "0caa34810c03a94ef01a57c3758fcaeab3130cf3"; + sha256 = "1axr13kw7g3jmk29s20nyqv153qxfjd4jajwcxw9m184p27nb74z"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-01-09"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; - sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; + rev = "191ec4788656c3d1ad59c9edc3d96e132f93e039"; + sha256 = "0ln32vw0kqjfc8m4qn963f656hivg3v275dj0xqis25pcdwqpidg"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1399,12 +1411,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2022-12-08"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a"; - sha256 = "093wj6kfln2lsgcijnwjj924lbgld0vhfvx8w0kfhlhpv5fr5dfz"; + rev = "165fb66afdbd016eaa1570e41672c4c557b57124"; + sha256 = "19hrj03b1l6n981h0rjy6y98fach7hj64hh3l787w1wkhq3pirxj"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1435,24 +1447,24 @@ final: prev: cmp-npm = buildVimPluginFrom2Nix { pname = "cmp-npm"; - version = "2021-10-27"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "cmp-npm"; - rev = "4b6166c3feeaf8dae162e33ee319dc5880e44a29"; - sha256 = "0lkrbj5pswyb161hi424bii394qfdhm7v86x18a5fs2cmkwi0222"; + rev = "e5753b6103ce4cf887233142fa9f31b2d13b42f2"; + sha256 = "1hcl7ch38pnjsjnpvrqmfghikaps80aykxbn63xm8wrdqa7rxph3"; }; meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-11-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "59224771f91b86d1de12570b4070fe4ad7cd1eeb"; - sha256 = "1m8xs7fznf4kk6d96f2fxgwd7i5scd04pfy2s4qsb5gzh7q2ka9j"; + rev = "0e6b2ed705ddcff9738ec4ea838141654f12eeef"; + sha256 = "0gpwwc3rhfckaava83hpl7pw4rspicblxs7hy3y57gb560ymq6hg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1471,12 +1483,12 @@ 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/"; }; @@ -1603,12 +1615,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-12-27"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "ee1341c53e7b82f55c6e83287828f652c2ac35e1"; - sha256 = "0x61dhbx1wvbnf1pjz1an3zhmp25xy07wshw8dw5yf46qi623l09"; + rev = "1b1c0235c54e3fc9e77504ed8d36028f64e6f48d"; + sha256 = "12ivpbxpqvxb6c2p0snpr65d45ppx57l8aylnb3l39ciabknjhdm"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1735,24 +1747,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-12-24"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "4f8d072df2609219b8d79b67641a9753e3d7fff0"; - sha256 = "1nsv5ag13yzcffq404darfk0vz4sbchj941bcf960znnlynlcya0"; + rev = "5fae5a15497750483e21fc207aa6005f340f02f2"; + sha256 = "1r9jhdxm3y1lpdmwmlk48skihf7jxdm2sxirzyd1kwb88nvn4c3r"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-01-17"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "e74d1173689dccde72fdccaabae19cbe93d2f1be"; - sha256 = "0pmx80b4s0nvdz5ps0jrlgrsir00q0s4ighjl7598gfh59ic8jhl"; + rev = "bf9bde0a86022c494c995778a5bf7210f2420601"; + sha256 = "0fyyq22f33q949v5cabjynbj311279cxfm4wb3mi6v1agzpxh8lb"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1795,12 +1807,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2023-01-21"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850"; - sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6"; + rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043"; + sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1819,12 +1831,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-12-02"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "6537ba677a0c7c6c796b195f29077b57fad33716"; - sha256 = "01rk4i212zcas64hk3d2a15qvn8rxwlkghzci2cd1n79ywj0q9xd"; + rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; + sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1879,12 +1891,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-01-18"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "eab2c83a0207369900e92783f56990808082eac2"; - sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd"; + rev = "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43"; + sha256 = "1c3qrbjzz0kl1k1gjkgil0ni944ac80ps76rdhs9jd7chbn7l0sb"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1951,12 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-01-19"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "c9ce6476e4b481c64d13939c6696043b8e21dd43"; - sha256 = "0mqb300w663xb4yfxkijbn8ixzgj8azgywmhg7qjskds7w8af15z"; + rev = "26009c1d6265a6b6e86d8e74a81a235892f67e87"; + sha256 = "0g2b0mxssx6sjmn2iqlipwj50jmw8hfq648xcg3f78phmn03b4s4"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2083,48 +2095,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-22"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "6ca9b4b3eda9138406291493750a6890c927dbfa"; - sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l"; + rev = "5304ea7079f38df200f4357401f1510fd00560a8"; + sha256 = "12gnvz8634d0bx1fxcl2lq7w76cs795bz11p3r21vggznbzpgvs4"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-01-18"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "8c8416488ef21483dd5d2922ea194c05e9a3baaf"; - sha256 = "08zs24jqwv6z5fih1701wxlpbb2bjp5zlj0incw7vyi87zk2i3va"; + rev = "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b"; + sha256 = "0jzk1hd8kvh8bswdzbnbjn62r19l4j5klyni7gxbhsgbshfa3v87"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb"; - sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic"; + rev = "eba0531cea9fe292059dbecf677d36a07f9c28b2"; + sha256 = "059p1rjjhk4i2fxi9zgd923j7ksj9cfx4f9smhnqdqgmkm57lnwd"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555"; - sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy"; + rev = "531faab60ba9418eb180a4a127a661bed98b46a2"; + sha256 = "0lkkyd9iz89lnalvf2i8yz9ssiwiavvnmavxzn0siw7p69x2fkr2"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2143,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "25232d23926c28c34f462dd9a57847d90b1af969"; - sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr"; + rev = "272a39c8f483c0bf6137dd382363639aab83a23e"; + sha256 = "0yy9lyh9wx7wa4s6ishqg3g0lb0z3c6hhywghpvyd16kldf6lrd9"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2179,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-01-13"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "707ed7d6f8927a5ec0c241aa793f694f1b05f731"; - sha256 = "1nd7n871vlp5hdgl5xap09kn596rx99i11ccn7nr4abl56q2dp2s"; + rev = "3fc7ddac13ddf65914a733ef074317c4c72ef05b"; + sha256 = "1gyhh32v40c9cndyg3jxpyhaaxh392xl93la3aplpl4xwaphhzbv"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2215,12 +2227,12 @@ final: prev: csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; - version = "2022-11-23"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "fb159987bb430bb61e07928d132e4487e54a82ef"; - sha256 = "1c6fas33baabdfsm95icbi8n84ica2hysyvkprx4zpz5zn2b8rk5"; + rev = "0f6900bf1d0f2ccdbe59ed246db4a82e5cc16e78"; + sha256 = "0yi9r665xsvp2043mwc58wljfnsp38pzab7j14mb0fcs787r0kq4"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2287,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-01-10"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "f7d623457d6621b25a1292b24e366fae40cb79ab"; - sha256 = "17vwcqajvxhbvifg562zxvzwln0llb3gzyih3k61yssdp5akcfl0"; + rev = "0d5e201629a85617fb7efef61c3212fb4529f31a"; + sha256 = "1jylspgsfana9chd5ywx3ylk54fkgj5r2jhy5x7145k1zmwq49qv"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2661,24 +2673,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-15"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "dbcfd4510d31884d444ec33a4453d0f06ad4a5eb"; - sha256 = "1qcwchka11gaphb36njcwa7qdw4hbp0x36w7mhsdm8p4i5xw3161"; + rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; + sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-15"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "5bbcf162d03287296fe393f88da6065db3cf9fd0"; - sha256 = "0lmqvm2sdj5mpq8hd03wyvmxgm6y286f0b7kr820znh1swlky3z1"; + rev = "11827d46e939b4748dbdb7e0df4982a63bd59d26"; + sha256 = "101l5v8a0ya7cz230rd85gwc06b4hxnilbydf0zcxy85dq5j8wq7"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2721,24 +2733,24 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-01-19"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "a0b129d7dea51b317fa8064f13b29f68004839c4"; - sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j"; + rev = "798274ba3c454a9aa3cd71f95a86ea55cbbbb142"; + sha256 = "156g08ab9jghi580b1k88si3bc6h72d77avlpn34dnnn5481anvh"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-12-13"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c"; - sha256 = "1iwxqfqp3x09wz3rnvli3y80n38rw149cmjj9pmbkhiqgsm9p461"; + rev = "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe"; + sha256 = "00k2gpmikkp2bcpg8jg6pcjwvd806garficbjiv2k9ibzpbvc4xl"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2757,24 +2769,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-01-14"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "5064f59094c42911e2ce57e1b59acda546c3905b"; - sha256 = "1gssj61d8lma9kbadmdwgpa3i4343srlfnzjc3br527dhw7ihcqm"; + rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; + sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-22"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff"; - sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71"; + rev = "1d54632f7fcad38df8e428f349bc58b15af4b206"; + sha256 = "1692rzbv64332wi0cmyf0g5m8k039vvrijxmryrqnxaf15493mbw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2843,12 +2855,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-01-03"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "62408f6cb189606bc4b16832ada29be3ae33515f"; - sha256 = "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w"; + rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; + sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2891,12 +2903,12 @@ 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/"; }; @@ -2927,12 +2939,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2023-01-15"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "4841c8830f0354808952fd4f64869383413c194f"; - sha256 = "0jmv0wqx0234dz0xlqjf1rhn7y4hnd4vxxqfr0f166nz678fld05"; + rev = "1856f0390b1ae15d446b94dc47ccf5b967537ad1"; + sha256 = "06c54lhn30ibn721l6vh5gx4kdyrk39w2kkcwrlhskpx6dipava5"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2951,12 +2963,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-11-27"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "44585a0c0085765195e6961c15529ba6c5a2a13b"; - sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l"; + rev = "688b4fec4517650e29c3e63cfbb6e498b3112ba1"; + sha256 = "16j8c13jyqr9f8lw8sxcvcv0p60qpa4apdcqcz3ll6r6pb1413vz"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2975,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-01-09"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810"; - sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q"; + rev = "dca3e56021cb5c39f401c9d83531743416c3365f"; + sha256 = "0hrkidscljbggsvkajvmqn1x79raa1bpjbwiqjgp3b1vckhyzz3h"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3000,12 +3012,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2022-10-14"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "be110f9814a45788d10537fd59b3c76d956bb7ad"; - sha256 = "1innhwy2izcw2w7qhp6x7s3q07zy0zxfwqmlqskgl6c75r4akqyn"; + rev = "980e80e8fe44caaeb9de501c8e97a559b17db2f4"; + sha256 = "1aw5455gin4ki3sn2ml38acqi2w94mhbx37pkajfbb5bfagdpdb0"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3048,12 +3060,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-01-01"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "ae0be3cef35c0cb41d6c7f814a19b3402d50fd7a"; - sha256 = "0ynidizghmbrapcm2wrn6cjmn28gvzkxc1ia9s8nmh63574prfrv"; + rev = "d67caa7dd17eccb89bfda1c0657d0723e339ef60"; + sha256 = "1rgl6kaa0rv7hx6fslrmm8glw9gfpl7yqpf31zj5lazw82k5wk1c"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3084,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-01-19"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "046e4d3491baf664e0eef5231d28beb49333578b"; - sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc"; + rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5"; + sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3180,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 = "2023-01-15"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "292de730ebbd3834e87f864c8c4115dc1035db37"; - sha256 = "068rwvq5q264lpfxgg4gw259rsy4wp6n6bf4877azk19f1b4j0ys"; + rev = "b15ef042f7006827e7413baad89a0e8541079c9e"; + sha256 = "0svjfw6nsczqpfqic1zvpnz3bn9iivzp81i5kkq7vqgks11ji0w9"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2023-01-16"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99"; - sha256 = "0xjbnvyp0qnfnvz0grhyfcmzn7m90v3d3pfqfvivis3x1vws883q"; + rev = "dc71692255b62d1f67dc55c8e51ab1aa467b1d46"; + sha256 = "0h8yq3rxm6dfryjlh57n13bylwg4f4c4skc9z0krgl200v39ard0"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3240,12 +3252,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-01-02"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "9e4f5360b69558799c6974ed72248b86d09c6549"; - sha256 = "1pv64p2g385h4awapg99m39r3qipkpwg4rkicvdsc0dsnamqmis3"; + rev = "8340095e5a8263494abadf5a81970ff92091e004"; + sha256 = "0glp8nnj9jsps465srn59bdc6g5pnyrs3n9kxghp0wzf8hrx2zic"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3288,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-01-14"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "5ddf157139ecfc0d2161f00c2cce4874578dc355"; - sha256 = "0d4caahrnqgy06mvqvxhhcr2li2hvk44hwqvw9dkxh9g6hyfjj87"; + rev = "17840d01f42ee308e1dbbcc2cde991297aee36c9"; + sha256 = "1ldc2lnabz5hr18xgiwrr83w93rnqidhycwkkhi4bc0hmabacsix"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3336,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 = "2023-01-20"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca"; - sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2"; + rev = "f388995990aba04cfdc7c3ab870c33e280601109"; + sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3372,12 +3384,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-01-10"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "611478d2b36beb3c416c92f77e7c116d7bd25ee6"; - sha256 = "0fhxg27yq2lfwfwgpg2zf28hrb6kfa6nffrm6bzajk192z1zbak0"; + rev = "bbded06ea23faad779297122e93b1c0dcdb2a770"; + sha256 = "0sirrb5s3g93a65ygc2s8g481vfgp205vyvsrghml5r93pddvzkc"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3396,16 +3408,28 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-01-14"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c88184a0bbd3e32e0274ad8c3782aba718f1053c"; - sha256 = "0b1yqy0j7akgqal1zq8h3zgrk0asvyffxrad81s2wv4r0dcg8csr"; + rev = "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac"; + sha256 = "0k6wrlzn5i7c1gfhs077aivvgy1qbjrjr79j1m6y3n8jgdzk1f6z"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; + go-nvim = buildVimPluginFrom2Nix { + pname = "go.nvim"; + version = "2023-02-21"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "go.nvim"; + rev = "7a6c02dd199f62e4c87c4e9641b0963c6b0ad81f"; + sha256 = "1jzl73fxpa370jxh9i134jpgnm9badim3i581h5n5id8qgfnibng"; + }; + meta.homepage = "https://github.com/ray-x/go.nvim/"; + }; + godbolt-nvim = buildVimPluginFrom2Nix { pname = "godbolt.nvim"; version = "2023-01-02"; @@ -3516,24 +3540,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-01-14"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "30e9f4b0fa24c25980df1690a8c47c36e40b6673"; - sha256 = "0nzrjrkfvckhzmxpwmn5qr62zfhkidmccfwj7iaaa3f4mi2ya5mb"; + rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; + sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-01-04"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "e863942494d7c72a7c8d2c54cf651f28fc5a76ab"; - sha256 = "0xh1y64bn274f7rm597gqgqjrra5fafydqcm127ikdiqsa948psy"; + rev = "73f009df5ed929a853244c413bb52c1d02c117ce"; + sha256 = "1q8lxhw9fcvgx6km4l32571c2qq7fid460h69c8j4wxz3a16y1n4"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3576,35 +3600,35 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-10-10"; + version = "2023-02-10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; - sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; + rev = "75874719e1aee0171a0f06d1508ff9a116f6ac75"; + sha256 = "0n2rh59nnp0fv4jxvx30arrrqpfbagix6a94rxq3100n8kszr218"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-11-23"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "21d0d1bfa3000e4384740bfaefa0ebc51c773786"; - sha256 = "16idy8a2ar2gc7kdr888wwlyw4m48kbw2yzflz16fbdg56krb43d"; + rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; + sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "6ac15db045393cb40c484b19f3903d89acf2b125"; - sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi"; + rev = "f95c5b019777768c0498bef05e1ee095f7d9398f"; + sha256 = "0pz4xma58zwzi1705lmv7q6ijjqcrgydip47cbp6h7si1sl42kl4"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3645,6 +3669,18 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + heirline-nvim = buildVimPluginFrom2Nix { + pname = "heirline.nvim"; + version = "2023-02-19"; + src = fetchFromGitHub { + owner = "rebelot"; + repo = "heirline.nvim"; + rev = "b69415d912d466db17b8ee1eb777cc7f776a9286"; + sha256 = "0pv320i23wwp58xy3lpiy4j90y6fl8frmw19nk0c8dy9c10pdg6s"; + }; + meta.homepage = "https://github.com/rebelot/heirline.nvim/"; + }; + hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; @@ -3659,11 +3695,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2022-10-09"; + version = "2023-02-15"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; + rev = "64fb17067cf5dbf5349726b9ed1b1b38065cdb82"; + sha256 = "13d5vs35bmzr4dj2anj2k7scmx647ddsyz941sjaajsyff37bvsv"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -3718,12 +3754,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-12-02"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e"; - sha256 = "0cbw07w65kmp1w2l2k4vbnv10vhpj30ija14mdn8mfbqwbp8pb2j"; + rev = "9fd5d6e341861c776ec9c69a2fc524deae67b541"; + sha256 = "0cysw3852wgnaahw1fwbmq72m0pi4yqf9r1kqi4gzim1fva7sy61"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3742,12 +3778,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2023-01-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "d00274f05363c13f29ed1fa571026a066a634cce"; - sha256 = "1scf9pmwch081l2rvfm0np6cjd4kj3kzpzkjlbc7zjw4gbbrbr9s"; + rev = "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0"; + sha256 = "1dwhi2543drbncrqx80nsi5hw48d6my4wbsp71gx6m0clkp4469h"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -3850,16 +3886,28 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-12-08"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7"; - sha256 = "1kanfs0c1rbi23dm0vkmyzg4qkxq18hc2jc2izvyqiklbpi49x06"; + rev = "018bd04d80c9a73d399c1061fa0c3b14a7614399"; + sha256 = "1ncpar0n8702j5h4a2bv8zx9kcg7gwfhs52qqrcg1yfsgjzb86bl"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; + indent-o-matic = buildVimPluginFrom2Nix { + pname = "indent-o-matic"; + version = "2023-02-13"; + src = fetchFromGitHub { + owner = "Darazaki"; + repo = "indent-o-matic"; + rev = "f4138581fe4575b720eae2d123cbaed0d86c94cf"; + sha256 = "1n4vdpfhy8lga2d508ixi7mwa12rd8zk37ms43d4vrjff0v35nd5"; + }; + meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; version = "2022-09-07"; @@ -4127,24 +4175,24 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2022-11-02"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9"; - sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga"; + rev = "d22d54c7558415faf6f518db1e00d995d595a99d"; + sha256 = "0v7j8bjd5naf5qbr362r82nqa4grwj2r9wk68s5dv9zg576ybm0p"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "cab4682d22a0451bc36a648694235621b5dd808e"; - sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh"; + rev = "8077428e63feb0f3bf795d53b23ba1695b28ab0e"; + sha256 = "12bq0ppdm7frjgd336lvp3crw9ivsl5lj33f7fjvpqgsib7gy87r"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4199,24 +4247,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-01-19"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa"; - sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z"; + rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; + sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-01-06"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3008ed68c8f309ced07587684c8af53884791d35"; - sha256 = "113y46yf33ymb53wpqnc9glzv2m3lfsnxsmnxn3cpk016zy9fp3z"; + rev = "9e38951df410c6d65fa2b932832d201d7cd6ca62"; + sha256 = "14sw0xaf7qr9896hcl9vb5ivmc6w15p1np0gqnyhjqbmcqj20yp8"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4235,12 +4283,12 @@ final: prev: lessspace-vim = buildVimPluginFrom2Nix { pname = "lessspace.vim"; - version = "2019-09-12"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "thirtythreeforty"; repo = "lessspace.vim"; - rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; - sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; + rev = "2f3e60d79501026b78b593e8a12749ef1220dd61"; + sha256 = "1ggm78rrql668xl3ggybmi14i31a4jxcvq9bncm79mx1by2n694n"; }; meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; @@ -4283,12 +4331,12 @@ final: prev: lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-08-18"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "aa8e8f270c1d3be4fbe6b153827a191a5fcaa0d7"; - sha256 = "0lgpxgg2696pbfdgnr2zcapvhfk6d1qwvci223h69rvg0fh853rz"; + rev = "02764e0e87f85fa13e0d6a0e38ac6605f806d560"; + sha256 = "0d4hs4qh4fm393f1k6085l1f8yvqjpr2wdh7ia26k9839s4k2pn0"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -4391,12 +4439,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2023-01-15"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "937e882c169d572a8a73dfcb71137a264c6369b2"; - sha256 = "00aw82ymjqh729mi38l3nx0fhpp6rciqyqv0ar4g0v1qlq4gyp4l"; + rev = "1aa871f20637eccc4e1e26b0fbcf9aafc9b6caf7"; + sha256 = "0vwlp8b4kj0201abq5rh470kf4lsk2pr1207qhjd2ay1wp69ywiq"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4475,12 +4523,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "750d59b643865b906996028147675e9af216ea95"; - sha256 = "1i5qn1npa9zil3xql7yavx3p7w9xa26fz2lxw9ks23mpgdplk9gs"; + rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; + sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4511,12 +4559,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-12-04"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "12f5468781d2d1d3feb6ad7459de764fc33898fe"; - sha256 = "1lxsg05qv87v2imhsfwa9mqfib4332cvhflivpzkamg1acs6bc9j"; + rev = "d371137c6d2c942c1ad4fe400f536c2ebf0792bd"; + sha256 = "184ybjs9c6xn6079i4gw411j06kxsmf3gqxz8c6rcj0hiv87wsn2"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4547,12 +4595,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-19"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "0b312c34372ec2b0daec722d1b7fad77b84bef5b"; - sha256 = "095n5sq850b66cpbqfbqkz5xzd2klyv5ijknffrbdrx0gwjh561l"; + rev = "674a60c7d4f2a90c75d66fe98603d7ca708939dc"; + sha256 = "1iha7i85bsamnb7gqnnhh784xycfwfg8vbyc93d42wpsksm7yjzr"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4582,12 +4630,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-01-21"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "b86f249cba85ec2f0f74c62b65898bade00b4413"; - sha256 = "0kbcws9dwsvjg6psfax4azd6j46n05jhkkdgsc1c4wjhyg74jas9"; + rev = "6f6252f63b0baf0f2224c4caea33819a27f3f550"; + sha256 = "01913fb3g3f8291fw48a3rlsr4wkn6imljpk0h60vg65d2xc15l3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4642,24 +4690,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2023-01-11"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0050b308552e45f7128f399886c86afefc3eb988"; - sha256 = "12c6f3xcj38zbiya3m4glwr5pkh0fq51gmch994i2mg5xy1ni3yw"; + rev = "e99d733e0213ceb8f548ae6551b04ae32e590c80"; + sha256 = "01v3612yplmgwbdiz7pgrc3a660q4z3v3g554nzxd3wn39cmd2wq"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7"; - sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5"; + rev = "92276ba735056dab04b0508e421a6a5d729e3f81"; + sha256 = "1vfkra9xygdm6ffdlkdca636i97hazhv1l66zpn3lwlliyqi1pzv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4727,36 +4775,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-22"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "d7ff61a828d59bc593ea3e2020508c114048d790"; - sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1"; + rev = "93e58e100f37ef4fb0f897deeed20599dae9d128"; + sha256 = "1d6ym8g3fix2m6412485kbm43mb61wdb3ggm3q6ddqxxvh06n41c"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2022-10-29"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "27f61f75a71bb3c2504a17e02b571f79cae43676"; - sha256 = "0zhmffjqssfqjbx69j7ambzr4dz52r4sgl6xhmzf9qxr8xlkhvny"; + rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576"; + sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a"; - sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz"; + rev = "b8a6632a0f2d263199d5d480ca85477fe0f414ab"; + sha256 = "0622x0k1xi5z6jdz2bpqvym34ysk38axfyjq45m6hhl6qcy0ysxg"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4787,12 +4835,12 @@ final: prev: material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2023-01-12"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "ec5a2cecee50ea2074e6f19bd1c98e7d868a52c7"; - sha256 = "08s8k9nwnmyqzlpvfz2pp1j8dhip1syhkilrrzbj723xknclxyzf"; + rev = "b47e7f884cb606c19a20e8e520dfa10c3b3a52f9"; + sha256 = "1abhf71ap9cs03ibi3qm8lw8kdynb86x85didnhlhb673xg0kbcz"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -4823,12 +4871,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-21"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349"; - sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc"; + rev = "369f16f29559cb15931d3d5acfcf253969f74066"; + sha256 = "00r3jd76rnfijxli66m24qhjfgjy2mazy8qr15i7vadhdnr1za2p"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5159,12 +5207,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-01-12"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "8238865e1d9c61f1a260c290653f2c419503e0a9"; - sha256 = "18rndx83magknmjyihl02vjnqjra2x6y5d9wzz5qkhhacl8jhhbb"; + rev = "245cf1e68840defcc75a16297740f6203f5a045d"; + sha256 = "1w933phd5p0jdgmcdxcsv6ddhs7zx11amp5ziixzfh91a845shmf"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5183,12 +5231,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-22"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "0d4a5197def6019f125444c3870aa5a8f251a2db"; - sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg"; + rev = "ca85eea7841f043671ebd6c784771f08b9d34231"; + sha256 = "0pf44ydg6m70haban92fl7yvl3755jqw6h1icaglci8p198gsvln"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,36 +5255,48 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-21"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93"; - sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50"; + rev = "a81e749d0fe8429cd340b2e40f274b344bef42ac"; + sha256 = "0k3b71by64gh2bfqsp3rlgg5w6w86jdyq8166abddfzbs24r4v5i"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-01-11"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "ec601d38a2e9309109f405ce038c5a6ce774f1a9"; - sha256 = "028xycbvjhs7mvnzlismjipibgqdhjm9s0asmjpg3g7y2qhkw3ix"; + rev = "16bd62efc3fcdcd0f6682ea47f1f6070850f9963"; + sha256 = "1d5bqxfdg01hnx239v7bi301325ihvdypy0p4b1ay5py5jckld9h"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; + neogen = buildVimPluginFrom2Nix { + pname = "neogen"; + version = "2023-01-16"; + src = fetchFromGitHub { + owner = "danymat"; + repo = "neogen"; + rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06"; + sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3"; + }; + meta.homepage = "https://github.com/danymat/neogen/"; + }; + neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-01-20"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "30265e7a1bdf59361b37e293cdcecc167851c602"; - sha256 = "0fk29ggvncc26zx8zxdbyhqydxmvw3k71nf7ipp7pcxgkgm4zj4s"; + rev = "bde758e658c1cdc794293afbde698b5aaa93c5de"; + sha256 = "093gg1k7z0afhg8m2zvpkbf6aqb2ggjz50lrrf3wq0j25qsj1f4i"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5255,12 +5315,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2022-03-19"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "0556893d7fbc1948ac1a82cd0f41023d76a234b2"; - sha256 = "0dw6miyxbbi71na8qb7nqk20vni1q46lmg51r0h354xcnxn4hyms"; + rev = "584f882b9f991245374e7e7d7d1f78bae90b7a35"; + sha256 = "0wywd9s5x70zw7yrid6nvlq1hz406j5j47y011jxan4ra4r9ixvy"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -5291,12 +5351,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-01-16"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4a9a5fe13cd454692fc4db0b27783cd005e6be56"; - sha256 = "15a8az9xlcc0h0pw7s8kmd4zm5nx7d0q0j4d192d62mkdqc685mh"; + rev = "93c40f2e38a0770e9ce95787c8363320344a87c3"; + sha256 = "1gh7nlnm41vkqc0yvmb7jni6w4q3f690705f2dqdgh2frfssqi3r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5351,48 +5411,48 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "6676edc3078b8936df989df639900dc9a70dfc8a"; - sha256 = "1rhh775mm7byxcazl63hwdz8yjlz4fghd7yxaysv49s3rbrka1z1"; + rev = "0d17889ce740c83c18577487498a1a8fea144b0b"; + sha256 = "1p0yfglnmsvlr7lk0pylzm1d50yg49g82pp0wv2cgm6w240y27sk"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-01-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0bf23c10e4e72c7f21a2bb4cb8d8a28ac93f6f5f"; - sha256 = "0gwwm402lgnnk4zcsydbfx9iw4sndmc1xg1yfsab04mna8560bg6"; + rev = "83c0c173725cb028bd3d62affe771ad8a45a81b7"; + sha256 = "0rw08nzmbz4jjnpg7r6qv5qzrxk337y406k47haj2d0rx144lppx"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-01-07"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; - sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; + rev = "0eb91afe11f1763a477655965684269a545012e1"; + sha256 = "1nhayyl8lr22j0qrf64h1sjq9z650sxwgcqi8an1b6g6nhqwc329"; }; 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/"; }; @@ -5423,12 +5483,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-11-09"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58"; - sha256 = "0s8czq77lsf10b2fsw6mhavirc1ivby1a9c5y49zj9fva876h968"; + rev = "d069f7fb562fb9eb6911fe23cda7aca2a387043e"; + sha256 = "0ir2cghjcz3wr1sp1fzvdjnwqrjy82n3zlhrcz7cs41n8f2wich7"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5483,24 +5543,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2022-12-31"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "99694458062e4e1d138bd022b10432a05612a2db"; - sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5"; + rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42"; + sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "97e66dfaaecdc81f1dd7da00f8d4a6033f3bf6b2"; - sha256 = "01q3qlazc6m39rn67qpz03prrs2x9wqf71xi5s4a82vp53ha1fjv"; + rev = "be5e53df21c8f41790d25c56cd16cda90137dc63"; + sha256 = "08gk1rga3w5fkjg37618g3mpkpba43rb0r5ckj9wpdgpvmm436y8"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5531,12 +5591,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-22"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "26fb0c6c5653b0bda95f29eae638305bab351123"; - sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi"; + rev = "cbe9ee8184e46311efbce79d9806f3ee803a2521"; + sha256 = "16jv396s6mpk6w9fhrkh1wgc484647x1vs05y05j6smgi5h1hrlg"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5565,14 +5625,26 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; + no-neck-pain-nvim = buildVimPluginFrom2Nix { + pname = "no-neck-pain.nvim"; + version = "2023-02-20"; + src = fetchFromGitHub { + owner = "shortcuts"; + repo = "no-neck-pain.nvim"; + rev = "c97c44bc86522ceead8c9c9b775b2e1215549158"; + sha256 = "03zyfnzqj20yv9cy6pvh8r5j5v0mgcay7jv4lmgi3gsp0z4qa8ia"; + }; + meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; + }; + noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-01-17"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "16b60455867dec069bf41699d690fa01261b4bf6"; - sha256 = "1fsngf0lf45csr5w6691xkdnkjbmp82xr4q65fnc5p0931q1yl7x"; + rev = "d8a1f3056ad713b5d471048f8d029264828e22c0"; + sha256 = "0m6058yy4bn66bdr47na91g4pnm27y3msr386hj0hss975iaicwq"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5627,24 +5699,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-01-16"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "b99e6cb13dc51768abc1c4c8585045a0c0459ef1"; - sha256 = "0fgwi68ks7qalr2nn1pzf3jdzyx5scmziz2dhp3yyw7mc1nq3fi1"; + rev = "d147222a1300901656f3ebd5b95f91732785a329"; + sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-20"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "33cfeb7a761f08e8535dca722d4b237cabadd371"; - sha256 = "1lna5833nvk8db5jv549147078m6mzgzqvc42gqby8ma54rn6dq3"; + rev = "689cdd78f70af20a37b5309ebc287ac645ae4f76"; + sha256 = "1fja54wrmqafqww1ifkpmidwq52r246sana9j57dm92j3l39fv5q"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5673,6 +5745,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"; @@ -5687,24 +5771,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-21"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc"; - sha256 = "1jiwwmm87d2i76jgimk40mydsg2jddpl7q9axy94g6411hkdq261"; + rev = "bde7a1b4534e0a4c2451a738379cd628ba65eba7"; + sha256 = "0axmm6qj1vklkg7czcw0pqkd2gbzcj7z2llhvyf4fnqr4fwbi8y0"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-01-11"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "cf8252058c8fc486bc565a815083a2eb390f7621"; - sha256 = "1hcj0k8szin32b2ki6mkqwpckinyca8vpwvd3rmaf597qnk0bv5h"; + rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44"; + sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5723,24 +5807,24 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-01-17"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d15b59d7429d45f0b057aa63a0266989adc95715"; - sha256 = "0fsb8ybymxppkbdg45f7vr5vys2nl7b45nw6dprarh8bwp2qnkcr"; + rev = "b71e6bc220ea2ef8f09d5e6b39d52609a965f322"; + sha256 = "0kl2p55vrq1qwbk4r7mrly0gmw794h6nxivb17f4zn8lmvvcbmjc"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2022-09-20"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "a60b3531e5bd56f8602acb4ba7f5b2eeb782d54b"; - sha256 = "1yyxcnnh560gilkrqadpiwx3kpql4msw0as2v9i2v8m4z5yw36bd"; + rev = "2f55e78c62b45df5404b9ea522e82e8de1483c66"; + sha256 = "0jpr544daap2swnanaczz3hf0if32y3r3wiyvbwqd256896rdad2"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -5759,12 +5843,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-01-06"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "11a95792a5be0f5a40bab5fc5b670e5b1399a939"; - sha256 = "178r1v9p7mcwg8xgl3jr4ibjsh9wiq0y81mps0nhx8q2dgnx8cyz"; + rev = "8202df9561b90102b41dbc1ad71945534ef4ea39"; + sha256 = "15mpzg05x36vnbq9gs5q71fw9hin8b635r5lf42v6crdqw8wghmf"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5867,60 +5951,60 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c64a6627bb01eb151da96b28091797beaac09536"; - sha256 = "1nf48ns1zfmpizmki9545w4m8ndmkh76aadlmjpzn7y4draq5asf"; + rev = "049eebe3a1609547a5d2db5ba99585212836adf5"; + sha256 = "080bwr5cl1qy331caaq7j587bqpnqsqxigyvhi3hgyhsv2w5lbm1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-01-04"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "6f045a72a05a78e4071dd0880f08214a2bb1461b"; - sha256 = "153dxjwq93wg1079485hqpvq81mai1yzqjmc9qybda09zra5wlk9"; + rev = "b4ded7de579b4e2a85c203388233b54bf1028816"; + sha256 = "188w0n42gzvc4c1j6i5i48j60zxx9lrc3nq2z8ly0m7l6lc88vx9"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2022-12-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531"; - sha256 = "1glhxrv57gc3g60i876d5p3429z4kl6mhkbvrf41kvcqqb8m21m0"; + rev = "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8"; + sha256 = "1ald7spnfqbyiqz4kgp21wxwqm3zr53d4ajxls0rsy6mkqq6b2jl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-01-11"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b80227ea56a48177786904f6322abc8b2dc0bc36"; - sha256 = "11a9jn4m1db2zlkfvwym98h15l46idf14gaddczf1njxhms52nm1"; + rev = "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a"; + sha256 = "0fxvxlp27dm0jmch4k46pyh2lbkabqvc00gmdgyr4iwnkywr0596"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2023-01-16"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "191345947a92a5188d791e9786a5b4f205dcaca3"; - sha256 = "05rhpr34qsjczcv5kjd8664629308k3nazd8ksgfrpkjbg0ifjq9"; + rev = "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c"; + sha256 = "0763sssfznv7l1mpgrkyd26avbmpza41iaikq4b65g0y56j318ix"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -5999,24 +6083,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-01-03"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "718f09fc3ee6381d881863a817e44935bf41b1ab"; - sha256 = "1i2s8a6bgvm65iynbhhbyii72sr0f4wsnpvpxxyh3fnr2vlf61wc"; + rev = "dbd396e7729ad35c9c238f9e20fe3c701d63bb3d"; + sha256 = "07l52iv763rjzwkwl9avd8p7kb8wf0ir6nvayi0pl38dfphb2qhm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2023-01-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "fc83bd515c21c7912a6b9f97088e0492e923dfe0"; - sha256 = "03wpjgr8ziw9dllngh06l7wkf39vd9z96ivbyhzvdq801v0lyyw7"; + rev = "5e3e9088fba7508cee3612ee50b14dfdd3ab19af"; + sha256 = "1ih4zkb025wvns0bgk3g9ps9krwj5jfzi49qqvg5v3v707ypq2kj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -6035,24 +6119,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-01-20"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; - sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; + rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; + sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2022-09-21"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "24d3e0228aec27280e091d09ff65593e99d4d564"; - sha256 = "06zp3hffwjgq3c30d7h3a3bnx7vw77xwz4g3kcb54rxffvhjwwvj"; + rev = "4c4082cf94ccd32f5780859c875f91ddef763694"; + sha256 = "0clqgq8whvcnpxlqhyw721kyljhsyvmx8mqfq8qaxys8b6cf8fwy"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6095,12 +6179,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-21"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd"; - sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh"; + rev = "9e3b261583a39b47facfefd181a233bfd68b9af0"; + sha256 = "19xg67i22kzy1f0f1mlgb0dkllf955m0rxy606sfyqv2nj93g4zl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6119,12 +6203,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17"; - sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83"; + rev = "b5db147e28337319331d516a826b00976f3584de"; + sha256 = "14hjgk0g81mn26xwd3hspzi2jqiy1viiyc6pz3zqnmn66g958bfl"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6167,12 +6251,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-01-14"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "c552c96b837ce8b1318cf3eccbda41a73760cb21"; - sha256 = "1fqi33clnjsyx0fkdajl9vyrpmbdry11dm38nmm5d83a4zyb4qax"; + rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; + sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6191,12 +6275,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-12-11"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c"; - sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4"; + rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6"; + sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6215,12 +6299,12 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2022-12-22"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8"; - sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227"; + rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16"; + sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -6237,6 +6321,30 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; + nvim-nu = buildVimPluginFrom2Nix { + pname = "nvim-nu"; + version = "2023-02-18"; + src = fetchFromGitHub { + owner = "LhKipp"; + repo = "nvim-nu"; + rev = "ebacb8363ed3c21ffd4e47e277dde8f34609585b"; + sha256 = "0wd9ddyllmrisdcbp6mxl7nhcxs449k0rbwm0vshk3wig1wz4gdi"; + }; + meta.homepage = "https://github.com/LhKipp/nvim-nu/"; + }; + + nvim-osc52 = buildVimPluginFrom2Nix { + pname = "nvim-osc52"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "ojroques"; + repo = "nvim-osc52"; + rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; + sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; + }; + meta.homepage = "https://github.com/ojroques/nvim-osc52/"; + }; + nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; version = "2022-11-16"; @@ -6251,24 +6359,24 @@ 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 = "2023-01-12"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "6a2065fbcd032075a06d2ab54508b69842bc4496"; - sha256 = "0i6kg4lw7v9fggi7j13lyb7ncchk1w10qdkzdgxn2cani2clwx9s"; + rev = "75210c554e935740448cfb532d8a671ae544bb1b"; + sha256 = "03wv5bswh3mm0ci5qdqgvxknwx3pd7qsxygyl9jdnffiwgw3qdb5"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6287,12 +6395,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-01-19"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "97df9b3e7da6f9a7325cb5c32649dddc48bb1630"; - sha256 = "188gr37y77l74dlzsp8wgccglx5c67gpdb3fmrn34cbw7id7fj7d"; + rev = "80104ebd1e77d019f736bee46de2f1dbfe36f8af"; + sha256 = "144vv4yggmhsdrzqfrazj9cxm0pqcxlyqc7h535ss8cg0wqgx9bp"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6311,24 +6419,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-01-11"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "24275beae382e6bd0180b3064cf5729548641a02"; - sha256 = "0rw2g0a1sdd92ac22rgmvb4yk17ps2c760g03pbdwfca14d50fnh"; + rev = "ce73d505fdc45f16c1a04f6a98c1c1e114841708"; + sha256 = "1g315gnirzi885i7yg4j3nz57r793grqv9xj213yahg0b3y1akii"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-01-01"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; - sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; + rev = "9739e85547cb97d2f0497d2aedbab7d6f5c6654d"; + sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6359,35 +6467,35 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-21"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "96506fee49542f3aedab76368d400a147fea344e"; - sha256 = "137gwzb6xq32mwkbzwqiw2i3bgjz07nd1xx7d6ys825a9akkddcn"; + rev = "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c"; + sha256 = "1qdz4ark1xjwc3xkcc3dm9cxinnfhd8mi0kawb8qjy87gw73i9mz"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-22"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7bef1d53302f1087a07f83a4321582d835f44d4f"; - sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7"; + rev = "ba35d094c1dfffa652e9c20971c51bd5271c1d25"; + sha256 = "0kvp7wd14q4z7a4y7yscbl3ksbjqzwm10f79jfwigfxgd7f0h5r3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-01-06"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "cacee4828152dd3a83736169ae61bbcd29a3d213"; + rev = "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41"; sha256 = "0d9j5wz1fqk8ipf2x8vym0m3zpydslivwsnha8h1qz6yp6zyq5hc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; @@ -6419,12 +6527,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-01-17"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "2fb97bd6c53d78517d2022a0b84422c18ce5686e"; - sha256 = "0wwzmkkdw3n2agxsclaniblwfjaqwav7vyd5w0fjcqvqjim4jd9d"; + rev = "2f3583001e2bf793480f38cf0d055571787b0259"; + sha256 = "1hdccjwj8wyfi5nramzyj3jpdb6xf7kmkm5l0j7q9jqil34phx6v"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6455,35 +6563,47 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2023-01-09"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "aa83e4967bf78f85ffd9a11e159900c7ea7e423b"; - sha256 = "09x3bq4j9398avmzix78gm1qam0m34r9ifz7rb6l5rcqw7lhvr5q"; + rev = "496ff7ea19cdd4e4b7cf2aeeb6780d015f3f9fa5"; + sha256 = "0li2mcxppk37dqxpln6py056i7mzwf541f7mcd037h1zy14075bs"; }; meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-01-19"; + version = "2023-02-20"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "2e0e2167f173df2f075fd52add2a0d6c66a2344a"; - sha256 = "0z5w6y6ynv4q8rjcrfi2vklf9l9h5azda73ragqbfijkx9ggniyy"; + rev = "99768947820b969bcd99c4252c6166a984f99be4"; + sha256 = "0swhhj6algx9j9020rcwbra8qw0nxk5c2pan0vjv4g18byya7i2y"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; + nvim-ufo = buildVimPluginFrom2Nix { + pname = "nvim-ufo"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "nvim-ufo"; + rev = "b70c9ef0f8e2673a11387a39185ff249e00df19f"; + sha256 = "1fx3w2mlc23m55whvvrs1g648yg862i50100wfxxljmfkvnc12yv"; + }; + meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; + }; + nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-21"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "13d06d74afad093d8312fe051633b55f24049c16"; - sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs"; + rev = "4709a504d2cd2680fb511675e64ef2790d491d36"; + sha256 = "0b3h95x2xhrhwspfazibpknxrli70vjahbf52h74yda4ji0n2x4a"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6514,12 +6634,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-09-14"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "31436f34f3f95e4e70853cd653fdf78246cb0e85"; - sha256 = "1i018fmglfyqd8q762vks8yhh2kwg754ysf7d6d3hq2sb7w7kzwn"; + rev = "e592a9142fbfe0878ce886cd0d745963604c61d2"; + sha256 = "00gwdnmsc0dlc0p8j6b6jld1vh78zf57dmk2arw3f0xpwirgkkxx"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -6562,24 +6682,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-01-18"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "52b2c9702fb9e219cd4182ed29daee644ec535f6"; - sha256 = "0inw57p02ad644f7fjfwsvk0lap6kpwrriz43kpp2x7wypkj8jxi"; + rev = "f336322f865cfa310ae15435c6bec337687b6b20"; + sha256 = "1gyf9avw82fpdw8cvn611xzl0kq140b4ik7b4cc7mblmk6xmdqwp"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-22"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6"; - sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6"; + rev = "f1ea6e0ad03e1d7b1acad4d0796d39c4a82b3463"; + sha256 = "0s9c7cdqs8rf8pzrw68ynh9q76rqzwq5kc96dlgip4273s38x25j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6587,12 +6707,12 @@ final: prev: 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/"; }; @@ -6611,12 +6731,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-01-19"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "f0a70e0993acbb348c32a52a88058cc60c160992"; - sha256 = "0mscpy6949zvcwfdp18nn4bkzrp9r5iyw4h2v310p5mr8gd3fjpv"; + rev = "1fe908fb4acdcee26573e9ccde0de94ec77e5e84"; + sha256 = "03n2109p1jpl1gjznjci8wi84b2lminvw0avxx6dx6sv5b8z2x67"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6635,12 +6755,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "2aeceb0f0700ba57c8248aa36b3a900e58f5820e"; - sha256 = "0nslv7dxsxfjh2xlkh5w10gpi29c65g3mf9m7zyrbj3s0m5pldgg"; + rev = "828d1af53c466a2cf4940e8dc920b1ea026a455a"; + sha256 = "1sv3cpdm3wb930vnm2v9wlhflzjc4a4m358i7cq7yrilmclhblfn"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6659,12 +6779,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-01-07"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b"; - sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1"; + rev = "71bdcdf105a8feb16cd5248b40e44c88832f75ca"; + sha256 = "0pflq1p48rd3s5vfi2bk04ick2iyl8fg1a25qpawm8wb1ds10ln4"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6695,24 +6815,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-12-13"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7"; - sha256 = "19bp9mbjldxi2qzsa364rw86zp450zr2ajnnflp2sr0hhdvg620f"; + rev = "313ce5a04e7fc3d677ad906a94fc49c1f54d1572"; + sha256 = "1d9a7ddyd09ym53nvijiy5z67mj79a93fqsm35jxfv4wkcraq9xd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-01-10"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "b58812cde84df6ec0c2f54e602d608d94a78ebef"; - sha256 = "0gk2j9dkdjdiagz49wxj0skm9w50fifl0xg2496rcdarvhh5lny7"; + rev = "0dcf03dc2d9c96166d20b82875ce7eea484b5fdc"; + sha256 = "1qvwcfid1vs9a0k3xn2ki5iiwgv246qkdzsl2pndsrv04gk42j07"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -6801,6 +6921,18 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; + pest-vim = buildVimPluginFrom2Nix { + pname = "pest.vim"; + version = "2020-04-20"; + src = fetchFromGitHub { + owner = "pest-parser"; + repo = "pest.vim"; + rev = "ebeeea5e0757adee037135cf3b8248589b22ae16"; + sha256 = "159h9f96x127w1i0cj0cwb8cr2k0fbb9l3vsyky60h344p8amcbi"; + }; + meta.homepage = "https://github.com/pest-parser/pest.vim/"; + }; + pgsql-vim = buildVimPluginFrom2Nix { pname = "pgsql.vim"; version = "2021-12-08"; @@ -6839,24 +6971,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-01-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6"; - sha256 = "13h5w5f9ywigi33g38ij5k24kyyz2nafwhzs5zqn8mngnvh7h0km"; + rev = "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56"; + sha256 = "11h0fi469fdjck318sa4fr4d4l1r57z3phhna6kclryz4mbjmk3v"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2023-01-10"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826"; - sha256 = "12hp9a2q80hg93ynfa97v03fmxqwv4d6f1yb92bi6ih3kbjyjsji"; + rev = "253d34830709d690f013daf2853a9d21ad7accab"; + sha256 = "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6900,12 +7032,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/"; }; @@ -6946,6 +7078,18 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; + promise-async = buildVimPluginFrom2Nix { + pname = "promise-async"; + version = "2023-02-01"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "promise-async"; + rev = "7fa127fa80e7d4d447e0e2c78e99af4355f4247b"; + sha256 = "12d7l5b79fj4lpd3gfjqrmy6ffh06cxsr13vaw29rjif57wf0f53"; + }; + meta.homepage = "https://github.com/kevinhwang91/promise-async/"; + }; + psc-ide-vim = buildVimPluginFrom2Nix { pname = "psc-ide-vim"; version = "2021-05-31"; @@ -6960,12 +7104,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2022-12-07"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "7af25a840d38dc6767c85edd1f35c1f835618071"; - sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9"; + rev = "82348352e6568fcc0385bd7c99a8ead3a479feea"; + sha256 = "14729v7rndi3l8fpnbzapgwb4dj7537fik54g6frm1r1724f5cr2"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -7129,24 +7273,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-01-19"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "ee63338cfb9151018afb243f5af5262c1686b280"; - sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim"; + rev = "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a"; + sha256 = "0w4gw09b94dhxbbkyl0zhwxl5m370qp8la6frbjcan06bqh85xcv"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-12-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "667ae447d2c7efb64461a2c58f5311d1248cdb5f"; - sha256 = "0j2mp8kan6gf1ynv90pkwghjpsqzhxdfxs1v0kh55vmld2r31r56"; + rev = "2d08fffeb8533d3678bd796010c13c7fa2534263"; + sha256 = "060rh1a4cdbs8w28l3lkgk8r7k80pd44dqczdb2bpnhyvc7mckn1"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7165,12 +7309,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "090e253c114b6d5448bac5869a28a6623c195e3a"; - sha256 = "0qdxm9rcbq78yh0s3cvsbpnjjfd772fhkdrzwg1gc7k8p4ppnm1q"; + rev = "0fdb69f328529b34a2279c14be63b3325dc52740"; + sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7189,12 +7333,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-12-08"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "64579c485812867bbd7890a55ca93884beb440b6"; - sha256 = "0yzy3mq7b7hnnb04z45m4r3hcpf11djv5zxhsyk60pnyvlwrdl7k"; + rev = "cd0311d65cb3b8f8737b52f3294eb77d2fcec826"; + sha256 = "08n5ri9d9zm8r7mss6wxfjpyzsdvgrb18795ngvgyg34c10i0pcg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7249,12 +7393,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2023-01-08"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f"; - sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv"; + rev = "71d2cf67b5ed120a0e31b2c8adb210dd2834242f"; + sha256 = "14vma4r8v20r2ddkhwxs5zhp5lcqa51sxayxdri1z21gvaykzs8a"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7403,6 +7547,18 @@ final: prev: 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"; @@ -7454,16 +7610,28 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2022-05-09"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "cba9910aaad90dd5f1cd508ad98adebe2271069c"; - sha256 = "16zxvwrgiv5fafwm0b75ici35c630466mxdk4dww978152bxahzn"; + rev = "48f21d04dc7f9732d04ffec101dfcf17b7f515cb"; + sha256 = "01dkvxkh3xpv45cbc4sylw5a1dsipd3841x88cc32nrarafsmgfn"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; + smart-splits-nvim = buildVimPluginFrom2Nix { + pname = "smart-splits.nvim"; + version = "2023-02-13"; + src = fetchFromGitHub { + owner = "mrjones2014"; + repo = "smart-splits.nvim"; + rev = "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c"; + sha256 = "16wsgb62xcps24xickrly8hqwdvdc5kiylq965xq0q5g74kiz9jh"; + }; + meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; + }; + smartpairs-vim = buildVimPluginFrom2Nix { pname = "smartpairs.vim"; version = "2018-01-01"; @@ -7502,24 +7670,24 @@ final: prev: solarized-nvim = buildVimPluginFrom2Nix { pname = "solarized.nvim"; - version = "2022-12-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "solarized.nvim"; - rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; - sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + rev = "fe02ed49cc017cc93657bd6306a2624394611c69"; + sha256 = "185drqdf6qcwbjvs2f5gnz660w45d4pwqal40mbf1p3gd32il6qa"; }; meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-01-14"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "e2e89497f178bec568a0a43cda651f0429ec8ec1"; - sha256 = "0dh5dsn8znhxsdr9plxa2mchlnfbgrvalc5pnz2wdsc2adz37521"; + rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; + sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7634,12 +7802,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-09-04"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "956d67c88512b91c2938da3a9e0aeeea2b82cd0b"; - sha256 = "0dlsdb42j4d9q1fcw7jfwks6w516xi8ap1v7kip831bh4p6jyl1w"; + rev = "cdc1eb05496c2ecdeea7c7bf7ab0b6ab5b421f24"; + sha256 = "0rm8ml6nxkl0sgwbhsp5xjjjn45dq2pdg8amaywp0vjdnjcq9pi5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -7647,12 +7815,12 @@ 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/"; }; @@ -7803,12 +7971,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/"; }; @@ -7827,12 +7995,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-01-18"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "9aa594704eb63b81477bf7547342a5cc4012ef80"; - sha256 = "058nwj9rin11p9ifcl50i6ys5fv4v80kml4gnxqq89cd52sz07mh"; + rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a"; + sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -7840,12 +8008,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/"; }; @@ -7864,12 +8032,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-12-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "187b604da1a6452c700ce21fdf340ffbea956298"; - sha256 = "0b61qmqzl8vqryy58p9688vhxwhfby6qsygi3720hvvgizxk9jka"; + rev = "9065c65138b59ea8182024216a5bbcf0d77baebb"; + sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -8033,24 +8201,24 @@ final: prev: telescope-cheat-nvim = buildVimPluginFrom2Nix { pname = "telescope-cheat.nvim"; - version = "2021-12-05"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-cheat.nvim"; - rev = "8a169767c19db2f2ef2fb3fffe6adbac5a630282"; - sha256 = "0x68zb1x1v7dkrbgz88wh9ffij0ngjr23k5axxhhi07ppynmhvag"; + rev = "5549dfe9207b06eb28bff74af977f078376f9762"; + sha256 = "0wxdv266fn83yh1dy05pw5xgd0j7gndngk3s3g7lljbj7y0nzy5m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; }; telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-12-08"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "878c8ac14f809f7a1247a090408f7c23fa075470"; - sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh"; + rev = "a1aaabdb3b546f63d24f1fd156dfb1ddc0bc03de"; + sha256 = "1i76sjlw8irvk52g2sj90f9b3icdjvzp0zdc72fsbfjxd2kwr926"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -8069,36 +8237,36 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-31"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; - sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; + rev = "6eb6bb45b7a9bed94a464a3e1dadfe870459628c"; + sha256 = "0b96wrjvy9mp9qpjhi4jb1mrzsfwww21lahjhgx8kk9y4ml503dg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-12-28"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "62cbd4e7f55fb6de2b8081087ce97026022ffcd2"; - sha256 = "1mmwag20ljszzy9x1vfgxly20pkiwciq7n7cv5d6d6d20xjr7v06"; + rev = "e5696afabd8753d772987ea48434d9c0d8b0aa6b"; + sha256 = "1zcw5lm97kil8jk722xfcnxy9vqlffbrsfhk2f53hwxnabbkl3qq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-12-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "fab3e2212e206f4f8b3bbaa656e129443c9b802e"; - sha256 = "0paiaag3aazfv8rr0i43maq34pn3iga3lkjyllhfysqvdm8jk50f"; + rev = "580b6c48651cabb63455e97d7e131ed557b8c7e2"; + sha256 = "1yjdn4729syz80radl90f2bsh7jl73rxq5ss0yp2qjj7aj8hkhm6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -8166,24 +8334,24 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-01-14"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "55f73d0743d8597ca9c7bfbebe286e0b5bbe6138"; - sha256 = "1jgl3qb92x4wnkvjwzpqbkcmw22hc4m7nmp1dpj8cy30z5yawg54"; + rev = "28c0100c90dc200dd42471003d458fa8a2b71428"; + sha256 = "0sd914iybjxrvfmakzw8wb6k97sjvw1nnmfli7a0wvrrbak562rk"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; telescope-media-files-nvim = buildVimPluginFrom2Nix { pname = "telescope-media-files.nvim"; - version = "2021-10-21"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-media-files.nvim"; - rev = "513e4ee385edd72bf0b35a217b7e39f84b6fe93c"; - sha256 = "1ap3ijh64ynyxzbc62ijfkbwasv506i17pc65bh3w4dfpzn6rlpy"; + rev = "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a"; + sha256 = "0bvvnflzz1x511fk891mimsfahw843kk4v90l6h4yy1bi9a10qps"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; }; @@ -8202,12 +8370,12 @@ final: prev: telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols.nvim"; - version = "2022-04-17"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-symbols.nvim"; - rev = "f7d7c84873c95c7bd5682783dd66f84170231704"; - sha256 = "1yw09d2snma0vy36nfdswm1snf21w183aji7f6y8jnkx47g6gc37"; + rev = "f2060117d965df4a626f068a4ebbd8ee051aa076"; + sha256 = "1g9pj2g8l2rkz6szrijw56l1hd7lfac8i3g4fyvhi3x4xqjnml3h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; @@ -8236,6 +8404,18 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; + telescope-undo-nvim = buildVimPluginFrom2Nix { + pname = "telescope-undo.nvim"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "debugloop"; + repo = "telescope-undo.nvim"; + rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f"; + sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7"; + }; + meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; + }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; @@ -8262,24 +8442,24 @@ final: prev: telescope-zoxide = buildVimPluginFrom2Nix { pname = "telescope-zoxide"; - version = "2022-09-12"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "856af0d83d2e167b5efa080567456c1578647abe"; - sha256 = "10cybnf6lzi3vqbigphjgx45naqfg9b3sz6sbmf8hb960h6f8jz8"; + rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; + sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6"; - sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx"; + rev = "a486ac3e8fb2198f3636da1927ed57a28836fbd8"; + sha256 = "1a2qdqxvp3d1i1wlc7gac1vqfbp0idcnk6y78vmjgziksamj4579"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8298,12 +8478,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/"; }; @@ -8322,12 +8502,12 @@ final: prev: term-edit-nvim = buildVimPluginFrom2Nix { pname = "term-edit.nvim"; - version = "2023-01-21"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "eb9a18b77fa54d0416e315dc0f9793f480930419"; - sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j"; + rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8"; + sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -8428,6 +8608,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; }; + tint-nvim = buildVimPluginFrom2Nix { + pname = "tint.nvim"; + version = "2022-09-27"; + src = fetchFromGitHub { + owner = "levouh"; + repo = "tint.nvim"; + rev = "f6a259861ba8c0d88afc2ef05140ddf345eb0296"; + sha256 = "0ffbi9nrmr1hrlkvh09xvcdqrxfi66msm9g4xg8ja3zj3gqvi3z0"; + }; + meta.homepage = "https://github.com/levouh/tint.nvim/"; + }; + tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; version = "2022-07-22"; @@ -8466,12 +8658,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "077c59586d9d0726b0696dc5680eb863f4e04bc5"; - sha256 = "1gvglhdwaqrm3anaz7wyq3k1bjikjq7nqrdaszd9nnp3n4yarmhr"; + rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; + sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8503,24 +8695,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-01-13"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "a54e6c471ce1cd8ef8357e34598a28a955297131"; - sha256 = "07q90impvavl0vv2c89ckqm2g6b7yk5n4z8n1864pz1j6442vhda"; + rev = "ecf9dacccbcf0d66d9aa9074fdbb5ed51575399a"; + sha256 = "12x47qf98lxwvc6hpw60vwax9aw7wnh21y9j2kxzndzjxi7v6lik"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-01-18"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "4071f7fa984859c5de7a1fd27069b99c3a0d802a"; - sha256 = "0l4ibd0bi2msj2camxls039n6pw008ll50mf5r8888265hmqzkfw"; + rev = "a0abe53df53616d13da327636cb0bcac3ea7f5af"; + sha256 = "1laa7fwg9sy6d83j7p8izij677d29iq6ih2x9jg2blhsc9bp6ds6"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8551,12 +8743,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-20"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "15a2262dfcd7848fbafa5afea8adec3941b83c12"; - sha256 = "1jv13wvg6jcca3cw5swirna0jq5m3mj0pq7q113cpy11hd74bzh7"; + rev = "7d397fddf9eb15e5d8e8cb0539beb6f6312a768e"; + sha256 = "14mp801plz90yhf3cdpwhlpndgz724b4a9lykawdnc02jaw5vs5w"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8587,12 +8779,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-01-19"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "b2a0afac2c319a481f0f0318963a74d672ba5766"; - sha256 = "0wjhwzk4drm1phvndbkjjcax3q1gmh9akl5i7fwd8635w8dpc9fs"; + rev = "3b754285635a66a93aeb15fa71a23417d8997217"; + sha256 = "0bgm93g4yh5f84nf7h2w9gb3glaffk2dl2p5b0cp38x033lz1yk9"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8635,12 +8827,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "8bb7fa7b918baab1ca81b977102ddb54afa63512"; - sha256 = "0bqd24cv0mb288qppah5hpmjlik37hbfifgbclfjkkb7irf1va8y"; + rev = "9410252bed96887ca5a86bf16435a3a51a0e6ce5"; + sha256 = "17mw3zqlviz4jsmjfsvddjd60xgkfihc60jv391rinl1w36l79ld"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -8659,40 +8851,52 @@ 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-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e"; - sha256 = "00r0jnsrqdfns08ndj3xhwfx3yf65dgsin9pihad64gj9fmwvbv3"; + rev = "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0"; + sha256 = "0jrsqq1k2rvxv85ijhrvc3p0jihwdpg2qvc7rflfzf2rblid1vgw"; }; 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/"; }; + unison = buildVimPluginFrom2Nix { + pname = "unison"; + version = "2023-02-17"; + src = fetchFromGitHub { + owner = "unisonweb"; + repo = "unison"; + rev = "6c6fb53b70da614491210bd26c604b47adfb8927"; + sha256 = "1fmadrmxnzdpnb33b52yc9x7cafdmi2z1vh2j94d7x7g6ifxfwki"; + }; + meta.homepage = "https://github.com/unisonweb/unison/"; + }; + unite-vim = buildVimPluginFrom2Nix { pname = "unite.vim"; version = "2021-02-06"; @@ -8767,24 +8971,24 @@ final: prev: verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog.vim"; - version = "2022-11-20"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "5bf36012ecd4f82a987acaee1c8504cbc8711aeb"; - sha256 = "1v2d2jyp9h2mjrmkmya879ilmsjbwdbpms1lfhiw7gx8bzb5qa62"; + rev = "b47a3c0e5ace979f67326b82702b9da5acd7efb9"; + sha256 = "1ig8m86pbvjqvykgi0xm45c0q3h5ibwqjmr3scpqkz2ah6wahpvb"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-21"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "a9488d0803020e8d99ed13b95fd9def82941c978"; - sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88"; + rev = "c28c3fd97b25776038f51b8062790395bc2dae21"; + sha256 = "1npfs6dy0k89wf848wsjx48mkaphswxwlmwhvddxkqfwmld26xgp"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8863,24 +9067,24 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-01-06"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "aa3428b734ddbd0105615832843f619774a6871e"; - sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da"; + rev = "c164cac033087d73b3a94650c02f6c092ee56115"; + sha256 = "0n3gj93ankh8nwiwsmydgg0v8vz4bxbymbh551kgj4aigpivip01"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; vim-addon-actions = buildVimPluginFrom2Nix { pname = "vim-addon-actions"; - version = "2020-05-03"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-actions"; - rev = "6d350ca6075779af32016f0a0bd3e3521ec4a9eb"; - sha256 = "1098jc4amwfvcrfjfa5hgmyrjrbl680c3s56h7grvyl3i6n4hj34"; + rev = "f6ea95cfcc13fa6338302daff5ebafa9c936336c"; + sha256 = "06rjzdbk1x3hwkz7kfggsyv76jqzbar8vv96yj63dfncmyw2bsji"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; @@ -8971,12 +9175,12 @@ final: prev: vim-addon-manager = buildVimPluginFrom2Nix { pname = "vim-addon-manager"; - version = "2022-06-29"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "984320ed46ef6612a1c232bb44f5e51f92d12e7e"; - sha256 = "1p7ads4rg2rcgh4rf2p5qy7bf5yrnvnx6nri90bfinzfsyddb00l"; + rev = "be43aaaa70cf7c08c93f66051612d24de4c9daf8"; + sha256 = "10gsrs69gcjvjcn4hjrqlpsnlqm67gygzlzld6c3cbav1gfbsq08"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -9115,12 +9319,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-22"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c7460aa8836bcb05cf32331cc751739ba9392ae7"; - sha256 = "1w2r5vwll0mfmviz7s9r6n00lr0b1fav7qmkj7zbvxh8hrf2z80b"; + rev = "038e3a6ca59f11b3bb6a94087c1792322d1a1d5c"; + sha256 = "0m59sij2y38sgcmzic3jxw08bwkycywkjxn906xgfkwn2rvhv8cv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9511,12 +9715,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-22"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5a6ff035e16c57874fbf68951b1206535733827d"; - sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj"; + rev = "ee44975ea9797d932de737a770ab6b743b5aa5db"; + sha256 = "14dsjy49jngi8r851casmyg1swwlx0kmhnalkfqs59jkda7bkg33"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9571,24 +9775,24 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-12-16"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "48d44707a821f962f56c3d0553144c77211749fa"; - sha256 = "0pgrmcq79jbj68zw1s9wfa5lq133xn34gx3zd2r1dllp2ybqf62a"; + rev = "080b38a0fd14d14e21cf85fc26b18415303c3c5e"; + sha256 = "10734wy3j3ffkrc5ifm04kh4vk0axpl1isxdryak1ai90wxr3xhz"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "64ffe0761b9499f15ea8b56b153644c488b5bf74"; - sha256 = "1apym7104z3pxx57srb7ih1qsyidf421f3d6rzfs8nc2vvgdd061"; + rev = "1b76987b6719bee259ba8d1e03a1e7f624a3615f"; + sha256 = "0542dzzixavsfbpdm4qrsnv639gpl70grvv5jhllm2kq4dqyhjil"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9775,12 +9979,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-27"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; - sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; + rev = "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f"; + sha256 = "09ly10yclzkg8p4p0d50bznss76h3252jvpi9wj3qar48jgpmng1"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9799,24 +10003,24 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2023-01-06"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; - sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; + rev = "caf45f54dad6150970331ac115e531524e418c7c"; + sha256 = "1x1qvn245lz8q0a7v6l0s6fr9pjrm8ar9gf72hd1iiskzly28ax0"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2022-12-11"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52"; - sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9"; + rev = "fcfd4ec32d681745d6c1855097b30b988053fc2f"; + sha256 = "1y97fcmz8lvpj9z0cq46x6m6ac2ck8syfdgyjj62x2m1j40sv63m"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; @@ -9895,12 +10099,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2022-01-14"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "00e77d90452e3c710014b26dc61ea919bc895e92"; - sha256 = "1ind8lyghdizgs0q59k3svwdmnq8l88b8ns1qq1xvz47rh836c6w"; + rev = "6cc2691576f97d43f8751664d1a1a908b99927e5"; + sha256 = "151fxvhz6pi021rg9bc2g564a13lvbcwh3lpa4vl3g5w9j95pmv3"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -10051,12 +10255,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/"; }; @@ -10243,12 +10447,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0"; - sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb"; + rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; + sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10291,24 +10495,24 @@ final: prev: vim-fubitive = buildVimPluginFrom2Nix { pname = "vim-fubitive"; - version = "2022-11-11"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-fubitive"; - rev = "318b5ec47f8f1a65b11aae4d11736420a8d3604e"; - sha256 = "19g1iqcpbgy0kqzp3av8xr7djwkv79443ghwfjckhi6ws40hbvgr"; + rev = "f522e7c1c958d099438b375f38576f0f2f5100d2"; + sha256 = "1qd9pka3wrmwq1y33i4bzm2qs6l0lx8g1174aa0g4kcawwf21m7j"; }; meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-01-17"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2febbe1f00be04f16daa6464cb39214a8566ec4b"; - sha256 = "0njzhsn5xlwjcgr6nkm8pds4rby46dldl0b25dwj2bj6nyydaa23"; + rev = "62f42f013d866139fa23068ac2651b3f7e05a56f"; + sha256 = "1hbkhdfrg18zzxn2hqz070ns0nzydjj853i2dkz9d59s23bcyrql"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10447,12 +10651,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-01-15"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9e64fc1ab60b2e97d39410482b64289dbbaf4eda"; - sha256 = "01vj5c89g6fblrybx2f95ji9blcdjyqrr120qwbq9kawbgja1giy"; + rev = "b8a41085bfd67fee97ad075c6df65590ce7417a7"; + sha256 = "0m477wpyjxx0g7gdrcwnnhp6s8z23wlb7nljd6lrjkf1lqphb5i7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10748,12 +10952,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-01-11"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "da80f3877896adcf77f59fb0bf74e9601615d372"; - sha256 = "129r4jrdffy18yklk18gbplgxf7dkngda8cgssf9xfawizyg739v"; + rev = "49062ab1dd8fec91833a69f0a1344223dd59d643"; + sha256 = "15456qlblskafaq3x92kp8n8hdfzdfv1hzs9yb4k4aqps1bj2plf"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10832,12 +11036,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2022-04-03"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "5467e00e26f15680b0a7998f8aa20d5a7dd44cd5"; - sha256 = "1wi379l8d793v6hjx11v0dhgdn8a9ihx64gv51v9wpmjlvp9xbzd"; + rev = "8ca306a9484d6d184de8921a9cab03c63ee9aa79"; + sha256 = "0hrvsq95rqwp0kfsdiid5qv0bfx1i7wc5yn7qmdqc660s7abwqxs"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -10941,12 +11145,12 @@ final: prev: vim-jsonnet = buildVimPluginFrom2Nix { pname = "vim-jsonnet"; - version = "2022-10-25"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-jsonnet"; - rev = "f27e1d67dff34ac9cf9c83ea2f2f814e53aa409c"; - sha256 = "05zlsn7344zffwjsx4f65rp85jrgfm4wi40iqjj137x11jhwb9a2"; + rev = "4ebc6619ddce5d032a985b42a9864154c3d20e4a"; + sha256 = "1z2zk2wqfv58qxd8pa4hrpyhi5nlgf8m4gqb9f31pdnb78ci860a"; }; meta.homepage = "https://github.com/google/vim-jsonnet/"; }; @@ -10989,12 +11193,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-07-25"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "e48aae3c7e3136682b3f4c6cfd85867b392f7f1a"; - sha256 = "06caj10yw71rbksf0cjdxak3c1qm7qcby7jrc26llk5qhfpwgh2a"; + rev = "98cf55a5074695e3fca1ccace66ab5563e35111e"; + sha256 = "1kavcc0vpzgzly39qpbcb6a1kmp456c0jz6jc3vmw3sql8c070fa"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -11061,12 +11265,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-01-10"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "653fb20b4c0eedabdc5486719b571813d5c8878c"; - sha256 = "1y6hzjx4qknwvilqxshqgl8q6wy7ycabmlzy2kgww7257cxsan1x"; + rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536"; + sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -11133,12 +11337,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/"; }; @@ -11181,12 +11385,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-01-15"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3244bed52220bee01515eb6dbc7da29a66998fec"; - sha256 = "0rh5pz0m4nbhx8dw2nqvswyapyh9s8racwlqxgykaxlni89m1g23"; + rev = "65628c3b0affacd0f36a6e294b1c1f96c6fe2455"; + sha256 = "0qkxw3n59a9w74vawyp7b288pfvkjww1d61ipcg3z9bvcv2xf0gz"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11290,12 +11494,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-01-18"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "959e0e79ea240cdee29efbdd0d2e2e718931ccec"; - sha256 = "0fyh7894fwnf8hxp8y9016blzmw7qv99izhy62bg11rhdjcgz4n8"; + rev = "3a48818a8113a502f245c29d894201421727577a"; + sha256 = "1hxsjs83i2rjkmhvsxrxk1y6as9xi8b5ji9abvwvb90p2a765987"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -11386,12 +11590,12 @@ final: prev: vim-monokai-tasty = buildVimPluginFrom2Nix { pname = "vim-monokai-tasty"; - version = "2022-11-25"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "55dcb855be754178967b860b0fa63621c319ce0a"; - sha256 = "0yll7qm014ydfa2svx3zaskv8g65scw6mw8m5fsjsi9g2v3369g8"; + rev = "8c1052347dd204a83ef72f7af36bdf2fa6861e0b"; + sha256 = "12wri9qj8klvksn9n7g2jvnnsa41vn4ij44wsyc3g44630p2d7x9"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -11602,12 +11806,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-12-15"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "8d30ed73ce7583b31224ab206ec158f547dd25db"; - sha256 = "041wv3n3w1bfabgwpswwvpc4rsnmib3520cv7rkrvw7dqpywk7dn"; + rev = "4c907ef607810662c42795098d42f23a224fe6e7"; + sha256 = "1355c0kf6g0v0q6sb5xnl8rssm4hjkpkjqwbi9yb0r9sj8z7zx96"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -11770,12 +11974,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2022-08-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "7dbda1c885c4c5dd3f865aa29e1b82167663aeec"; - sha256 = "0f4bkz619lp0fr1966njm3m5587vq2mbmahy2ya5d8nnqs5f770p"; + rev = "9f406d964ca70d959b7867f1b5cee3d4884d4d3c"; + sha256 = "0r0w4pr6jdh7ww08301h69xfih2gsqqbswfx4fzm10xx8y4csrfv"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -11986,14 +12190,14 @@ 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 { @@ -12476,6 +12680,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"; @@ -12526,12 +12754,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-01-14"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "1049d2425b6d270621b48e110de37d5467a2a621"; - sha256 = "083h0dzi60p9hv2g9daydalrrpzngbw0lgyapbn1xzh3idb0hqhx"; + rev = "68dfbccbe97b87ec9c80fa6d5ee144befc3f3a3b"; + sha256 = "05x30vn156x5r57pz4p0ha44riwbprxph4rc98fl507229mnmp60"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12598,12 +12826,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-12-12"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "cb4c112b9e0f224236ee4eab6bf5153406b3f88b"; - sha256 = "1n1m27vvqcik4c9f80d0blqggyh29s8h20jn3v7gy1fx94bi2n2w"; + rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834"; + sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -12779,12 +13007,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-01-10"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ca2502545a8c563e15f556d0eb8a59e0f74d2864"; - sha256 = "1ijfdhnsr3dlp5bw3xarp2nxkavab59lnk563gvjcw74889alip9"; + rev = "c63b94c1e5089807f4532e05f087351ddb5a207c"; + sha256 = "1czd0k91im222ljz6jbggj5k4v2wvb6r1gql1w4ri56s07hc3rbx"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12899,12 +13127,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/"; }; @@ -12959,24 +13187,24 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-01-01"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "86f37afec5cefd75baaebf8900889dabb9789a2c"; - sha256 = "133vfipflvalyp373lmqza5p8dhh2qnnvlh5y2bsxh5abjk1jml1"; + rev = "2b61cd2726d2f2cab5ab66761732143268f78b5c"; + sha256 = "07z5sialjki7w8qipqplpg67jgshgbckv9nmp83x40vrjypsiml9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2022-10-07"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "907174052a504e60e9b915f5c083ee5f6e067080"; - sha256 = "07jsgsv4j1zcxizl9wflib68rrp61zpxzy89yzak4b1lyxnl66s9"; + rev = "41f24890005f6bce34b1603e7c0d530fd70bc2da"; + sha256 = "1ms54fyxwxh4albrdgxpv99k3rwdbb1wy5ss95l585hmk9hfr27q"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -13031,12 +13259,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-06-18"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "c93eb128332f8245776b753407ab6c4432c4c556"; - sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; + rev = "b06bc8715cbcb4aa0444abfd85fb705b659ba055"; + sha256 = "0k69hqaxgbhjwq7wf30l8i1b6xv5qhzm4mbg6hydil5rj6zwf7xv"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -13113,6 +13341,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"; @@ -13173,14 +13413,26 @@ final: prev: meta.homepage = "https://github.com/posva/vim-vue/"; }; + vim-vue-plugin = buildVimPluginFrom2Nix { + pname = "vim-vue-plugin"; + version = "2023-02-02"; + src = fetchFromGitHub { + owner = "leafOfTree"; + repo = "vim-vue-plugin"; + rev = "58ac69b2c8a98a9bd2a95fbaa7b5f0fe806bad0f"; + sha256 = "0x8a66r1wlyashyqxmdpz3wnqhgfmscs42m2r82g5ic6a7n6f36l"; + }; + meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; + }; + vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2023-01-10"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b487cccc0e920e4fdf84f72d2fc1c86ef8dc3bdc"; - sha256 = "13741pp29f2pqr44sslh9fl49aw7a19l3ff78k1qm4i97ms4r0xc"; + rev = "62113bb063aa1923146e59270d71563441ceabe5"; + sha256 = "1n5d7jz5d3iamq030dmvb67w06b8ap1nvmj03shbx03i189kp2g1"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -13475,12 +13727,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-01-04"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "475d75a32e368dbfc700b580b16b351face72129"; - sha256 = "10r0n4dz8r4jbv9j583r77pp25q4yb4zd5gbrb8svxr873fja33n"; + rev = "4deaffdec34508621934fa4532748ee9deb1f55c"; + sha256 = "014kcjwab8jy89r0rcgci5ih8isbyz4v29q5nv6d2prld100p72f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13488,12 +13740,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-01-19"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd"; - sha256 = "0cdc8qs1jyzxphqs11nwib0xxv4lsaiqi7w580jhg7an7w484kn0"; + rev = "8bbd3b0308ba8238c4d00a24d68a6074e19ccc0a"; + sha256 = "10ahwp0nzz34iq4i8rv1lx45c87zp87wvwg0fn3rwy9hd35gpnn9"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13596,12 +13848,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-12"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "e4fa445065a2bb0bbc3cca85346b67817f28e83e"; - sha256 = "1gj1qkq1zxn9by6zxwg46rplpks51wvv3pmdjh8qr0ldkxk9yavy"; + rev = "5224c261825263f46f6771f1b644cae33cd06995"; + sha256 = "1r16iz5yhp56bb2rqi40qsis5yqnfkdq7x5ibwafv5xsmk7nrlgj"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13777,24 +14029,24 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-01-04"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "4313a5828e4d48c5f2f135f29d46f769a59dcfdc"; - sha256 = "05wn6p90ymwg0y3941c6v7zpxhkd2zn4xqg2qvvl4wyyhn4rl4wp"; + rev = "3c92f503823088862ca2a7809d1c7edc90fb92fa"; + sha256 = "1l4dg11bdnkncdscmz3j1wsx9qnllwpsz5pm1a1c96v3s4wlmw0p"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-01-20"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "13ed6d0493a1d5140995c4456ced54d0aa984f6a"; - sha256 = "1k894mxc7v4fp5zr80wbfk18zd5shcfik0j7mv1cs8c950xmahjl"; + rev = "910b8c240c6aaf5263db038db81c538602c766c3"; + sha256 = "1r84wgz4p9zvpnz247xk0svq6r92ir3pgdlsbzf73qjwgph94q7k"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13825,24 +14077,24 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-12-31"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "c8caa9ab97334ca5af2d69900108bb4af20933c5"; - sha256 = "0mpzlxbf9dclgs4r9pffhc31hri09c78dk9lpij8fr089srgcp5i"; + rev = "a0d9adedafeb1a33a0159d16ddcdf194b7cea881"; + sha256 = "0qcjwms102cpdbjamda3cbdwbqdk4zj5zrvr9dlj2lmwkdjqqfdz"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-12-19"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "2fd9f9f29270bb28477e000100625276ec2a2377"; - sha256 = "1b8w280yivsb34547y7kdcsvgcil41sfj8kvyvs6d24yrxbqs20w"; + rev = "0413c52500cd0133b0cd8e7e7d43084855ac1760"; + sha256 = "0yw7fi9z4rlb2vpm2qp6sm118hjz5vzix6nl7h654vp12zzqrs0g"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -13873,12 +14125,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-21"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e"; - sha256 = "1d1bb9js2i58qn2b8zjhqbawlrbjk3sn91cpkjaw43wldgm3samj"; + rev = "22e55672793be043a5ce9790e7617322ef4ab445"; + sha256 = "0smpk37fiwq4rmgiy2b3f3yyhkwynfy6i70hrxblqn9as5kk7cjc"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13897,12 +14149,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17"; - sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc"; + rev = "ea91862411d16f4e4bed9c6fef452b8c1b2a662f"; + sha256 = "0fm3kkfvr816n90pl07wyy8mhzpz4rn93xy61hys7cj53q99fngq"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13921,12 +14173,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-09-12"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "96fdfff7dac84dda937d843a0aceb1c39acba761"; - sha256 = "1yms82s3iwis6lk5h1kapa9vlhlhbk1kqxlywlvvy6kz7d1iyvjj"; + rev = "d724faa9bfcd37f1995071e678e30af2229eb1a1"; + sha256 = "0ibcifqm3vrdvq2dzm4qyh7y0i134653irq33jg3kmqijxzzrb58"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -13945,12 +14197,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7"; - sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955"; + rev = "73380b25ec27e9df788752174703cfdad98e66dd"; + sha256 = "0z50c074bk2jsvsglwdw532i8zp0w8yb2sfk5izgm9hk02n2niys"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 2f2dd0416f276..3ed61e541d90e 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,16 +1,16 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }: +{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }: { ada = buildGrammar { language = "ada"; - version = "e9e2ec9"; + version = "42cc2eb"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; - hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg="; + rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba"; + hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "c473c09"; + version = "257efff"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; - hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ="; + rev = "257efffa387da3283a37816b71dedfecf4af5222"; + hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -60,23 +60,23 @@ }; bash = buildGrammar { language = "bash"; - version = "4488aa4"; + version = "7f9506c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; - hash = "sha256-QkH5rI9/7x6L7e3YIwDMdSbBHOGhhC6LTHfasS7wX9U="; + rev = "7f9506c34ab6a0f4e3e052b7a49cbeef91f71236"; + hash = "sha256-D9FesfedHnHWUcCIPGs72fpgeBO3xZ2rWTRDewa4qzM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; beancount = buildGrammar { language = "beancount"; - version = "4cbd1f0"; + 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"; }; @@ -115,15 +115,37 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "a29bac0"; + version = "5b6c4d0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "a29bac0681802139710b4d3875540901504d15cb"; - hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; + rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610"; + hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; + capnp = buildGrammar { + language = "capnp"; + version = "cb85cdd"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-capnp"; + rev = "cb85cddfdf398530110c807ba046822dbaee6afb"; + hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; + }; + chatito = buildGrammar { + language = "chatito"; + version = "3baf22e"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-chatito"; + rev = "3baf22e7e507cedf15d1dbc03df8afa50a625586"; + hash = "sha256-NsdkvMkrHfVakeYxPJfr4HOg5BlLB6OPFQeMseQQL/k="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; + }; clojure = buildGrammar { language = "clojure"; version = "262d6d6"; @@ -137,12 +159,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "a322653"; + version = "399605a"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; - hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y="; + rev = "399605a02bcd5daa309ce63a6459c600dce3473f"; + hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -181,12 +203,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "2d2c4ae"; + version = "56cec4c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; - hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs="; + rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; + hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -203,12 +225,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0091006"; + version = "a02c214"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; - hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc="; + rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85"; + hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -249,23 +271,23 @@ }; diff = buildGrammar { language = "diff"; - version = "1d63cd4"; + version = "f69bde8"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "1d63cd49529ef3153393cf8f620718b274bba715"; - hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk="; + rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f"; + hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; dockerfile = buildGrammar { language = "dockerfile"; - version = "09e316d"; + version = "8ee3a0f"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; - hash = "sha256-FffwAt9FJurxFJajLTsQe5tLeZty3nSbXBRkgdjNOJ4="; + rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62"; + hash = "sha256-I73T3NuN/K9+R3itIJrNVjlyVr/432UT3HEf6LND+0c="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -282,12 +304,12 @@ }; ebnf = buildGrammar { language = "ebnf"; - version = "ef241bc"; + version = "8e635b0"; src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; - rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; - hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI="; + rev = "8e635b0b723c620774dfb8abf382a7f531894b40"; + hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg="; }; location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf.git"; @@ -325,6 +347,17 @@ }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; + elsa = buildGrammar { + language = "elsa"; + version = "0a66b2b"; + src = fetchFromGitHub { + owner = "glapa-grossklag"; + repo = "tree-sitter-elsa"; + rev = "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"; + hash = "sha256-zahi5hOXzad6R1+mqmYBFfn2X+SejQUIQzbabgCIJ8w="; + }; + meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa"; + }; elvish = buildGrammar { language = "elvish"; version = "f32711e"; @@ -338,23 +371,23 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "a130858"; + version = "203f7bd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; - hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo="; + rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"; + hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "f0e2f78"; + version = "2422bc9"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; - hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90="; + rev = "2422bc9373094bfa97653ac540e08759f812523c"; + hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -371,12 +404,12 @@ }; fish = buildGrammar { language = "fish"; - version = "6675b56"; + version = "f917690"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "6675b56266b3f615fb112205b6b83a79315309c4"; - hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A="; + rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"; + hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -393,12 +426,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "edcb337"; + version = "67cf1c9"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; - hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; + rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a"; + hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -413,6 +446,17 @@ }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; + func = buildGrammar { + language = "func"; + version = "f161cfe"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-func"; + rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f"; + hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-func"; + }; fusion = buildGrammar { language = "fusion"; version = "19db2f4"; @@ -426,23 +470,23 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "a8fa839"; + version = "31ebb7c"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; - hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo="; + rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc"; + hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; git_rebase = buildGrammar { language = "git_rebase"; - version = "127f5b5"; + version = "d8a4207"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; - hash = "sha256-4XGQTrflV+txVjXbgaQSd6rFES8TkuiXEurJLBdg59E="; + rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; + hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -459,12 +503,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "190d288"; + version = "f71b93f"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "190d288a1746bddb4abe96b597fb7d17b76e5522"; - hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y="; + rev = "f71b93f399c9c2b315825827c95466e7405ec622"; + hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -493,12 +537,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "c0bfd26"; + version = "40cfb72"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; - hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE="; + rev = "40cfb72a53654cbd666451ca04ffd500257c7b73"; + hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -547,6 +591,17 @@ }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; + gosum = buildGrammar { + language = "gosum"; + version = "14da5c2"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-go-sum"; + rev = "14da5c2a34861eb2d97ed89f39324156031e8878"; + hash = "sha256-PP8uj8tFMIBZtFuOQbEi25Yz/UEy5cRiEklbrlS5J+Q="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; + }; gowork = buildGrammar { language = "gowork"; version = "949a8a4"; @@ -582,12 +637,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "aee3725"; + version = "3bdba07"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; - hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c="; + rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"; + hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -615,12 +670,12 @@ }; help = buildGrammar { language = "help"; - version = "9dee68e"; + version = "8f75ef3"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; - hash = "sha256-6XYEC+wKrCbPtcdjFH1O0EdX84M+NpPfTO2tXGFkwtk="; + rev = "8f75ef3ec86bc315d5fdb939899b397289389181"; + hash = "sha256-zzD899bOSVn0/RCki6i8wHEQgaIrCurRw4AxnN3J+VA="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -637,12 +692,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "bd0d463"; + version = "8e2f090"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; - hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g="; + rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; + hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -703,23 +758,23 @@ }; java = buildGrammar { language = "java"; - version = "09d650d"; + 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 = "7a29d06"; + version = "15e85e8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "7a29d06274b7cf87d643212a433d970b73969016"; - hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4="; + rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; + hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -780,34 +835,45 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "505f5bd"; + version = "fdc7757"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; - hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI="; + rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2"; + hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; - version = "0412178"; + version = "e2f449e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "041217800bf423099015e1654c9a4fdd75310bb1"; - hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU="; + rev = "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"; + hash = "sha256-ZXnEvHtheP8rI/lwPf94lVCF5S5rw38bewuZ0GHxjr8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kdl = buildGrammar { + language = "kdl"; + version = "c3c4856"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kdl"; + rev = "c3c4856464842e05366b1f3ebc4434c9194cad43"; + hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; + }; kotlin = buildGrammar { language = "kotlin"; - version = "b953dbd"; + 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"; }; @@ -835,12 +901,12 @@ }; ledger = buildGrammar { language = "ledger"; - version = "47b8971"; + version = "f787ae6"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; - rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; - hash = "sha256-Doz561oVrWkmUAL3VUTjraO+F0aDuahhBB+xXevTrkg="; + rev = "f787ae635ca79589faa25477b94291a87e2d3e23"; + hash = "sha256-9Sc22IYWhUUzCslna3mzePd7bRbtWDwiWKvAzLYubOQ="; }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; @@ -890,24 +956,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "16d0b5e"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "16d0b5e"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -947,12 +1013,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "092e901"; + version = "d6c7eeb"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "092e90142667482996880044d2c04837d3d1c266"; - hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE="; + rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56"; + hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -980,12 +1046,12 @@ }; norg = buildGrammar { language = "norg"; - version = "6348056"; + version = "1a30509"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; - hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI="; + rev = "1a305093569632de50f9a316ff843dcda25b4ef5"; + hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1060,12 +1126,12 @@ }; php = buildGrammar { language = "php"; - version = "973694f"; + version = "f860e59"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; - hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; + rev = "f860e598194f4a71747f91789bf536b393ad4a56"; + hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1091,6 +1157,17 @@ }; 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 = "eca2596"; @@ -1115,23 +1192,23 @@ }; pug = buildGrammar { language = "pug"; - version = "26f6ac8"; + version = "884e225"; src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; - hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; + rev = "884e225b5ecca5d885ae627275f16ef648acd42e"; + hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; python = buildGrammar { language = "python"; - version = "9e53981"; + version = "528855e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "9e53981ec31b789ee26162ea335de71f02186003"; - hash = "sha256-D2++Xg7dRfjGM2r4cxaXGQnBOAX5JBREcEAJeNa7Y9M="; + rev = "528855eee2665210e1bf5556de48b8d8dacb8932"; + hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1181,12 +1258,12 @@ }; racket = buildGrammar { language = "racket"; - version = "dc9c334"; + version = "1a5df02"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; - hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; + rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b"; + hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1234,6 +1311,17 @@ }; meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; + ron = buildGrammar { + language = "ron"; + version = "ce6086b"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-ron"; + rev = "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"; + hash = "sha256-4ZKhJ3qvKWwINQIWJLqgPwfnDvQBWzeZb2dZY7imYfc="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; + }; rst = buildGrammar { language = "rst"; version = "25e6328"; @@ -1247,12 +1335,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "7a1921b"; + version = "206c707"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; - hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo="; + rev = "206c7077164372c596ffa8eaadb9435c28941364"; + hash = "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -1269,12 +1357,12 @@ }; scala = buildGrammar { language = "scala"; - version = "067ee61"; + version = "2275b75"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; - hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI="; + rev = "2275b754360de8539e02e84106fa38f7cb6de275"; + hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1313,14 +1401,25 @@ }; smali = buildGrammar { language = "smali"; - version = "d7f535e"; - src = fetchFromGitHub { - owner = "amaanq"; + version = "5a742af"; + src = fetchFromSourcehut { + owner = "~yotam"; repo = "tree-sitter-smali"; - rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; - hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4="; + rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5"; + hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM="; + }; + meta.homepage = "https://git.sr.ht/~yotam/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/amaanq/tree-sitter-smali"; + meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; solidity = buildGrammar { language = "solidity"; @@ -1346,12 +1445,12 @@ }; sql = buildGrammar { language = "sql"; - version = "9d98029"; + version = "3a3f92b"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149"; - hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0="; + rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380"; + hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1391,12 +1490,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0fe0de5"; + version = "0c32d29"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; - hash = "sha256-tU6UTyTR5biS6qBG0z6NbjJQUtZItzzscAKftUAzLq0="; + rev = "0c32d2948b79939b6464d9ced40fca43912cd486"; + hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1426,12 +1525,12 @@ }; teal = buildGrammar { language = "teal"; - version = "1ae8c68"; + version = "2158ecc"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; - rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2"; - hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc="; + rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2"; + hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E="; }; generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; @@ -1450,12 +1549,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "999a27d"; + version = "e0c3e50"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; - hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw="; + rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba"; + hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1472,12 +1571,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "d3ef05e"; + version = "6d2ec89"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "d3ef05eec4473094e2d691243aa243ce63de6406"; - hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU="; + rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3"; + hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1505,12 +1604,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "faad909"; + version = "5d20856"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1539,24 +1638,24 @@ }; typescript = buildGrammar { language = "typescript"; - version = "faad909"; + version = "5d20856"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; v = buildGrammar { language = "v"; - version = "0b03983"; + version = "136f3a0"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "0b039830a33e759f0c9ee978b47ad10b82d37349"; - hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk="; + rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69"; + hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1585,23 +1684,23 @@ }; vhs = buildGrammar { language = "vhs"; - version = "8a0df32"; + version = "54fe7c0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; - hash = "sha256-bWI/MW7U5ht7jmL3BSm5HwD1BMDNGwkBShJIpRlhonI="; + rev = "54fe7c05dfa2b9e100572496531e15c9bec86343"; + hash = "sha256-xP0pHuK0Gc8huTWaZY/DMfWzm6Jw/oVCx1huYL8Vwx4="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "55ff1b0"; + version = "e39a7bb"; src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; - hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA="; + rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590"; + hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10="; }; meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; @@ -1662,12 +1761,12 @@ }; zig = buildGrammar { language = "zig"; - version = "d90d38d"; + version = "6b3f578"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; - hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; + rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8"; + hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d02431e8bfdfe..c21444afa003f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -68,6 +68,9 @@ # nvim-treesitter dependencies , callPackage + # sg.nvim dependencies +, darwin + # sved dependencies , glib , gobject-introspection @@ -113,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"; @@ -484,8 +487,8 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { - dependencies = with self; [ lush-nvim ]; + harpoon = super.harpoon.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; }); himalaya-vim = super.himalaya-vim.overrideAttrs (old: { @@ -506,6 +509,10 @@ self: super: { }; }); + jellybeans-nvim = super.jellybeans-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -697,6 +704,10 @@ self: super: { callPackage ./nvim-treesitter/overrides.nix { } self super ); + nvim-ufo = super.nvim-ufo.overrideAttrs (old: { + dependencies = with self; [ promise-async ]; + }); + octo-nvim = super.octo-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim plenary-nvim ]; }); @@ -744,6 +755,34 @@ self: super: { ]; }); + 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; @@ -910,6 +949,10 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; }); @@ -960,6 +1003,11 @@ self: super: { ''; }); + unison = super.unison.overrideAttrs (old: { + # Editor stuff isn't at top level + postPatch = "cd editor-support/vim"; + }); + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. propagatedBuildInputs = [ gnome.zenity ]; @@ -1052,7 +1100,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28="; + cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw="; }; in '' @@ -1162,7 +1210,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; }; in '' @@ -1304,6 +1352,15 @@ self: super: { dependencies = with self; [ vimproc-vim ]; }); + vim-trailing-whitespace = super.vim-trailing-whitespace.overrideAttrs (old: { + patches = [(fetchpatch { + # https://github.com/bronson/vim-trailing-whitespace/pull/30 + name = "fix-add-dynamic-TerminalOpen-for-both-vim-and-nvim.patch"; + url = "https://github.com/bronson/vim-trailing-whitespace/commit/99ef803ebdc01d62b418a3e9386d5f10797bfac3.patch"; + hash = "sha256-cyanHUKxhbY8c6EkAbpUq7QcEBQABCwZ6NoEUOpd2F8="; + })]; + }); + vim-zettel = super.vim-zettel.overrideAttrs (old: { dependencies = with self; [ vimwiki fzf-vim ]; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1cd0de9f12495..d4557f0e4d293 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -64,6 +64,7 @@ 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/,, @@ -284,6 +285,7 @@ https://github.com/gregsexton/gitv/,, https://github.com/DNLHC/glance.nvim/,HEAD, https://github.com/gleam-lang/gleam.vim/,, https://github.com/ellisonleao/glow.nvim/,, +https://github.com/ray-x/go.nvim/,HEAD, https://github.com/p00f/godbolt.nvim/,HEAD, https://github.com/roman/golden-ratio/,, https://github.com/buoto/gotests-vim/,, @@ -305,6 +307,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/,, @@ -323,6 +326,7 @@ https://github.com/nishigori/increment-activator/,, https://github.com/haya14busa/incsearch-easymotion.vim/,, https://github.com/haya14busa/incsearch.vim/,, https://github.com/lukas-reineke/indent-blankline.nvim/,, +https://github.com/Darazaki/indent-o-matic/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, @@ -439,6 +443,7 @@ 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/,, +https://github.com/danymat/neogen/,HEAD, https://github.com/TimUntersberger/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, @@ -468,6 +473,7 @@ 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/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, https://github.com/arcticicestudio/nord-vim/,, https://github.com/shaunsingh/nord.nvim/,, @@ -478,6 +484,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/,, @@ -525,6 +532,8 @@ https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, +https://github.com/LhKipp/nvim-nu/,HEAD, +https://github.com/ojroques/nvim-osc52/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/petertriho/nvim-scrollbar/,HEAD, @@ -545,6 +554,7 @@ https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, https://github.com/mrjones2014/nvim-ts-rainbow/,, https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD, +https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/kyazdani42/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/roxma/nvim-yarp/,, @@ -572,6 +582,7 @@ https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, https://github.com/andsild/peskcolor.vim/,, +https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, https://github.com/motus/pig.vim/,, https://github.com/aklt/plantuml-syntax/,, @@ -584,6 +595,7 @@ https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, +https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, @@ -622,11 +634,13 @@ 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/,, @@ -691,6 +705,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, +https://github.com/debugloop/telescope-undo.nvim/,HEAD, https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, @@ -707,6 +722,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, https://github.com/vim-scripts/timestamp.vim/,, +https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tomtom/tlib_vim/,, https://github.com/wellle/tmux-complete.vim/,, https://github.com/edkolev/tmuxline.vim/,, @@ -729,6 +745,7 @@ https://github.com/leafgarland/typescript-vim/,, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, @@ -1047,6 +1064,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/,, @@ -1101,11 +1120,13 @@ https://github.com/hashivim/vim-vagrant/,, https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, +https://github.com/bronson/vim-visual-star-search/,HEAD, https://github.com/thinca/vim-visualstar/,, https://github.com/ngemily/vim-vp4/,HEAD, https://github.com/hrsh7th/vim-vsnip/,, https://github.com/hrsh7th/vim-vsnip-integ/,, https://github.com/posva/vim-vue/,, +https://github.com/leafOfTree/vim-vue-plugin/,HEAD, https://github.com/wakatime/vim-wakatime/,, https://github.com/osyo-manga/vim-watchdogs/,, https://github.com/jasonccox/vim-wayland-clipboard/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4235aa5e929e0..44ad9295e2849 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -317,8 +317,8 @@ rec { lib.warnIf (wrapManual != null) '' vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`. ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual." - else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only." - else ""}'' + else lib.optionalString (wrapManual == false && name == "vim") "Set `standalone = true` to get the *vim wrappers only." + }'' lib.warnIf (wrapGui != null) "vim.customize: wrapGui is deprecated: gvim is now automatically included if present" lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null) @@ -330,7 +330,7 @@ rec { else throw "at least one of vimrcConfig and vimrcFile must be specified"; bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } '' vimrc=${lib.escapeShellArg vimrc} - gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} + gvimrc=${lib.optionalString (gvimrcFile != null) (lib.escapeShellArg gvimrcFile)} mkdir -p "$out/bin" for exe in ${ @@ -363,7 +363,7 @@ rec { vimGenDocHook = callPackage ({ vim }: makeSetupHook { name = "vim-gen-doc-hook"; - deps = [ vim ]; + propagatedBuildInputs = [ vim ]; substitutions = { vimBinary = "${vim}/bin/vim"; inherit rtpPath; @@ -373,7 +373,7 @@ rec { vimCommandCheckHook = callPackage ({ neovim-unwrapped }: makeSetupHook { name = "vim-command-check-hook"; - deps = [ neovim-unwrapped ]; + propagatedBuildInputs = [ neovim-unwrapped ]; substitutions = { vimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; @@ -383,7 +383,7 @@ rec { neovimRequireCheckHook = callPackage ({ neovim-unwrapped }: makeSetupHook { name = "neovim-require-check-hook"; - deps = [ neovim-unwrapped ]; + propagatedBuildInputs = [ neovim-unwrapped ]; substitutions = { nvimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2db88fa26f9fe..739b0b687fbd2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -546,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; @@ -624,8 +624,8 @@ let 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"; @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2022.12.604"; - sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng="; + version = "2023.2.2804"; + sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1307,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."; @@ -1351,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; @@ -1375,8 +1375,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.220"; - sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; + version = "0.0.224"; + sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs="; }; meta = with lib; { license = licenses.mit; @@ -1504,8 +1504,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.4.4"; - sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; + version = "9.7.0"; + sha256 = "sha256-Y1KoCOoOJ8CZ3IReDoyzF404CBy1BAWaZSr48EP7bz4="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1520,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"; @@ -1555,8 +1555,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.23"; - sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; + version = "1.5.0"; + sha256 = "sha256-anIZxqO4pK77FmhUamRnJVN2q8FifH6ffqRE2eFwyWM="; }; meta = with lib; { license = licenses.mit; @@ -1741,6 +1741,23 @@ let meta.license = lib.licenses.mit; }; + matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "caddyfile-support"; + publisher = "matthewpi"; + version = "0.2.4"; + sha256 = "sha256-7D7fNlI55MxD6M8ml/dzBAMwCGCEkC+9aKhreZCVMv4="; + }; + meta = { + description = "Rich Caddyfile support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=matthewpi.caddyfile-support"; + homepage = "https://github.com/caddyserver/vscode-caddyfile"; + changelog = "https://marketplace.visualstudio.com/items/matthewpi.caddyfile-support/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewpi ]; + }; + }; + mattn.lisp = buildVscodeMarketplaceExtension { mktplcRef = { name = "lisp"; @@ -1790,8 +1807,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; @@ -1865,8 +1882,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.2"; - sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; + version = "1.23.3"; + sha256 = "sha256-0qflugzWA1pV0PVWGTzOjdxM/0G8hTLOozoXCAdQnRY="; }; meta = { license = lib.licenses.mit; @@ -1929,8 +1946,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.11.0"; - sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; + version = "2023.1.0"; + sha256 = "sha256-OiVb88BGvzsPTzKU1rGLGSMQSwKV4zI9FthOmutz34U="; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; @@ -2146,8 +2163,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.14.2022120303"; - sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw="; + version = "1.15.2023021403"; + sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas="; }; buildInputs = [ jdk ]; meta = { @@ -2226,8 +2243,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.22.0"; - sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; + version = "4.24.0"; + sha256 = "sha256-hJy+ymnlF9a2vvN/HhJ5N75lIc2afzkq+S0Cv/KnD3M="; }; meta = { license = lib.licenses.mit; @@ -2580,8 +2597,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.14.0"; - sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; + version = "2.18.0"; + sha256 = "sha256-HwexlpPW15sXoxPQXDHWcQ8Yvz/5KMtZO4A34rXoXQ8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2737,8 +2754,8 @@ let mktplcRef = { name = "pdf"; publisher = "tomoki1207"; - version = "1.2.0"; - sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; + version = "1.2.2"; + sha256 = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps="; }; meta = { description = "Show PDF preview in VSCode"; @@ -2941,8 +2958,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.24.1"; - sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv"; + version = "1.24.3"; + sha256 = "sha256-4fPoRBttWVE8Z3e4O6Yrkf04iOu9ElspQFP57HOPVAk="; }; meta = { license = lib.licenses.mit; @@ -3089,6 +3106,22 @@ let }; }; + zhwu95.riscv = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "riscv"; + publisher = "zhwu95"; + version = "0.0.8"; + sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; + }; + meta = with lib; { + description = "Basic RISC-V colorization and snippets support."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv"; + homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support"; + license = licenses.mit; + maintainers = [ maintainers.CardboardTurkey ]; + }; + }; + zxh404.vscode-proto3 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-proto3"; diff --git a/pkgs/applications/editors/vscode/extensions/lua/default.nix b/pkgs/applications/editors/vscode/extensions/lua/default.nix index 529428de6702f..6c9c72ca60942 100644 --- a/pkgs/applications/editors/vscode/extensions/lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/lua/default.nix @@ -1,6 +1,6 @@ { lib , vscode-utils -, sumneko-lua-language-server +, lua-language-server }: vscode-utils.buildVscodeMarketplaceExtension { @@ -14,7 +14,7 @@ vscode-utils.buildVscodeMarketplaceExtension { patches = [ ./remove-chmod.patch ]; postInstall = '' - ln -sf ${sumneko-lua-language-server}/bin/lua-language-server \ + ln -sf ${lua-language-server}/bin/lua-language-server \ $out/$installPrefix/server/bin/lua-language-server ''; 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 e713ba29e84bd..7089f9e3d39dc 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -1,14 +1,11 @@ { lib, vscode-utils, jq, moreutils }: -let - inherit (vscode-utils) buildVscodeMarketplaceExtension; - -in buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.11.1003381023"; - sha256 = "0cbnr52pq0yw6i4yzyrifyrz186l482m9s01h4l7d74fby9ska8h"; + version = "2023.2.1000411022"; + sha256 = "sha256-gMK/t/rLXYN3rlHxxVeW0W/FWEP0ZCiEwzM8DY14vYg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index f7765e6ceb1a6..0a62a5b02daad 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.19.13351014"; - sha256 = "1562f4b0v76p1wfbljc5zydq7aq7k5hshxzm2v1whb77cjskiw8s"; + 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/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 6559bc370baff..eff075c493983 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -19,13 +19,14 @@ let dontPatchELF ? true, dontStrip ? true, nativeBuildInputs ? [], + passthru ? { }, ... }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { name = "vscode-extension-${name}"; - passthru = { + passthru = passthru // { inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; }; diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix index 7c58a4bdfb342..818cca51772a8 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix @@ -25,8 +25,7 @@ }: let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile - then import mutableExtensionsFilePath else []; + mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath); vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 1b4f4508fbf0b..c2036566b3844 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -135,6 +135,9 @@ let # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg + + # see https://github.com/gentoo/gentoo/commit/4da5959 + chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper ''; inherit meta; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1d684f3ee3f3b..9fde08c747aa8 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 = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5"; - x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4"; - aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6"; - aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk"; - armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7"; + x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h"; + x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0"; + aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5"; + aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x"; + armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx"; }.${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.74.3"; + version = "1.75.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -42,6 +42,9 @@ in inherit sha256; }; + # We don't test vscode on CI, instead we test vscodium + tests = {}; + sourceRoot = ""; updateScript = ./update-vscode.sh; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 08219714061d4..cd89ab7d783d2 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 = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg"; - x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj"; - aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz"; - aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim"; - armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla"; + x86_64-linux = "1qayw19mb7f0gcgcvl57gpacrqsyx2jvc6s63vzbx8jmf5qnk71a"; + x86_64-darwin = "02z9026kp66lx6pll46xx790jj7c7wh2ca7xim373x90k8hm4kwz"; + aarch64-linux = "1izqhzvv46p05k1z2yg380ddwmar4w2pbrd0dyvkdysvp166y931"; + aarch64-darwin = "1zcr653ssck4nc3vf04l6bilnjdsiqscw62g1wzbyk6s50133cx8"; + armv7l-linux = "0n914rcfn2m9zsbnkd82cmw88qbpssv6jk3g8ig3wqlircbgrw0h"; }.${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.74.3.23010"; + version = "1.75.0.23033"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 09bc1793818a6..b5e524ea529e1 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 = "1503"; + version = "1504"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; + sha256 = "sha256-EUDkuCMhBz/Gs4DW3V6fqU583MzqXy1r08WDnUN76cw="; }; installPhase = '' diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 404ece153b1c0..12c13bb9ae87d 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -5,8 +5,15 @@ , 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.2.0"; @@ -33,49 +40,57 @@ stdenv.mkDerivation rec { ]; 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"; + 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/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 36d2dfe1ff332..9914e6e691c3d 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { "-C desktop-ui" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; meta = with lib; { homepage = "https://ares-emu.net"; diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix new file mode 100644 index 0000000000000..b7c357ca2709a --- /dev/null +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchgit +, alsa-lib +, gtk3 +, libGL +, libGLU +, libX11 +, pkg-config +, upx +, xcbutil +}: + +stdenv.mkDerivation { + name = "c64-debugger"; + version = "0.64.58.6"; + + src = fetchgit { + url = "https://git.code.sf.net/p/c64-debugger/code"; + rev = "f97772e3f5c8b4fa99e8ed212ed1c4cb1e2389f1"; + sha256 = "sha256-3SR73AHQlYSEYpJLtQ/aJ1UITZGq7aA9tQKxBsn/yuc="; + }; + + buildInputs = [ + alsa-lib + gtk3 + libGL + libGLU + pkg-config + libX11 + xcbutil + ]; + + nativeBuildInputs = [ + upx + ]; + + postPatch = '' + # Disable default definition of RUN_COMMODORE64 + sed -i 's|^#define RUN_COMMODORE64|//#define RUN_COMMODORE64|' MTEngine/Games/c64/C64D_Version.h + ''; + + buildPhase = '' + runHook preBuild + + # Build C64 debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_COMMODORE64" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger c64debugger + make -C MTEngine clean + + # Build 65XE debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_ATARI" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger 65xedebugger + make -C MTEngine clean + + # Build NES debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_NES" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger nesdebugger + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d "$out/bin" + install -d "$out/share/doc" + install -m 755 c64debugger 65xedebugger nesdebugger "$out/bin" + install -m 644 MTEngine/Assets/*.txt "$out/share/doc" + install -m 644 MTEngine/Assets/*.pdf "$out/share/doc" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/c64-debugger"; + description = "Commodore 64, Atari XL/XE and NES code and memory debugger that works in real time"; + license = with licenses; [ + gpl3Only # c64-debugger + mit # MTEngine + # emulators included in c64-debugger + gpl2Plus # VICE, atari800 + gpl2 # nestopiaue + ]; + mainProgram = "c64debugger"; + maintainers = [ maintainers.detegr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index f8e585501289a..91f6cb0de1a60 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-22"; + version = "2.0-26"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-ZQfJHQnT5mV6GC3dO6QV1fGsnyZMYqXiVdBSsimL5yU="; + hash = "sha256-+y+PJE2biRvuxIwrFVMjmkZyD8/zhHVMw6vzNKlsOZE="; }; patches = [ diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a628..202d49c19add5 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 2b3deaba653b0..63ebe07202870 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -6,6 +6,7 @@ , agg , alsa-lib , desktop-file-utils +, wrapGAppsHook , gtk3 , intltool , libGLU @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + wrapGAppsHook desktop-file-utils intltool libtool diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index ad9c470bf4279..b9ef4682e87d9 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,126 +1,190 @@ -{ stdenv -, lib -, fetchpatch -, pkg-config +{ lib +, stdenv +, fetchFromGitHub , cmake +, pkg-config +, wrapQtAppsHook +, alsa-lib , bluez +, bzip2 +, cubeb +, curl +, enet , ffmpeg -, libao -, gtk3 -, glib -, libGLU +, fmt_8 +, hidapi +, libevdev , libGL -, gettext -, libpthreadstubs -, libXrandr -, libXext -, readline -, openal -, libXdmcp -, portaudio -, fetchFromGitHub +, libiconv +, libpulseaudio +, libspng , libusb1 -, libevdev -, wxGTK30 -, soundtouch -, miniupnpc +, libXdmcp +, libXext +, libXrandr , mbedtls_2 -, curl -, lzo +, mgba +, miniupnpc +, minizip-ng +, openal +, pugixml +, qtbase , sfml -, libpulseaudio ? null +, soundtouch +, udev +, vulkan-loader +, xxHash +, xz + + # Used in passthru +, common-updater-scripts +, dolphin-emu +, jq +, testers +, writeShellScript + + # Darwin-only dependencies +, CoreBluetooth +, ForceFeedback +, IOKit +, moltenvk +, OpenGL +, VideoToolbox }: stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0"; + version = "5.0-18498"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = version; - sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; + rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7"; + sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU="; + fetchSubmodules = true; }; - patches = [ - # Fix FTBFS with glibc 2.26 - (fetchpatch { - 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 FTBFS with GCC 8 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; - name = "03_gcc8.patch"; - 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="; - }) - ]; - - cmakeFlags = [ - "-DENABLE_LTO=True" - ]; - nativeBuildInputs = [ - pkg-config cmake + pkg-config + wrapQtAppsHook ]; buildInputs = [ - bluez + bzip2 + cubeb + curl + enet ffmpeg - libao - libGLU + fmt_8 + hidapi libGL - gtk3 - glib - gettext - libpthreadstubs - libXrandr - libXext - readline - openal - libevdev - libXdmcp - portaudio + libiconv libpulseaudio - libevdev - libXdmcp - portaudio + libspng libusb1 - libpulseaudio - wxGTK30 - soundtouch - miniupnpc + libXdmcp mbedtls_2 - curl - lzo + miniupnpc + minizip-ng + openal + pugixml + qtbase sfml + soundtouch + xxHash + xz + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + bluez + libevdev + libXext + libXrandr + mgba # Derivation doesn't support Darwin + udev + vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + CoreBluetooth + ForceFeedback + IOKit + moltenvk + OpenGL + VideoToolbox + ]; + + cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" + "-DUSE_SHARED_ENET=ON" + "-DDOLPHIN_WC_REVISION=${src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_BRANCH=master" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + "-DUSE_BUNDLED_MOLTENVK=OFF" + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + "-DSKIP_POSTPROCESS_BUNDLE=ON" + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we dont need to disable it there. + "-DENABLE_AUTOUPDATE=OFF" + ]; + + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--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://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 \ + --replace "if(NOT APPLE)" "if(true)" \ + --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin ''; + passthru = { + tests.version = testers.testVersion { + package = dolphin-emu; + command = "dolphin-emu-nogui --version"; + }; + + updateScript = writeShellScript "dolphin-update-script" '' + set -eou pipefail + export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} + + json="$(curl -s https://dolphin-emu.org/update/latest/beta)" + version="$(jq -r '.shortrev' <<< "$json")" + rev="$(jq -r '.hash' <<< "$json")" + update-source-version dolphin-emu "$version" --rev="$rev" + ''; + }; + meta = with lib; { - homepage = "https://dolphin-emu.org/"; + homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; + branch = "master"; license = licenses.gpl2Plus; - 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" "aarch64-linux" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ + MP2E + ashkitten + xfix + ivar + ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix deleted file mode 100644 index 7f68b58214953..0000000000000 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wrapQtAppsHook -, qtbase -, bluez -, ffmpeg -, libGL -, libXrandr -, libusb1 -, libXdmcp -, libXext -, openal -, udev -, libevdev -, cubeb -, curl -, alsa-lib -, miniupnpc -, enet -, mbedtls_2 -, soundtouch -, sfml -, minizip-ng -, xz -, hidapi -, fmt_8 -, vulkan-loader -, libpulseaudio -, bzip2 -, libiconv -, pugixml -, xxHash - - # Used in passthru -, testers -, dolphin-emu-beta -, writeShellScript -, common-updater-scripts -, jq - - # Darwin-only dependencies -, CoreBluetooth -, ForceFeedback -, IOKit -, VideoToolbox -, OpenGL -, libpng -, moltenvk -}: - -stdenv.mkDerivation rec { - pname = "dolphin-emu"; - version = "5.0-17995"; - - src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = "8bad821019721b9b72701b495da95656ace5fea5"; - sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; - fetchSubmodules = true; - }; - - patches = [ - # On x86_64-darwin CMake reportedly does not work without this in some cases. - # See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765 - ./minizip-external-missing-include.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - cubeb - curl - ffmpeg - pugixml - xxHash - libGL - libpulseaudio - openal - libusb1 - libiconv - libpng - libXdmcp - hidapi - miniupnpc - enet - mbedtls_2 - soundtouch - sfml - minizip-ng - xz - qtbase - fmt_8 - bzip2 - ] ++ lib.optionals stdenv.isLinux [ - libXrandr - libXext - bluez - udev - libevdev - alsa-lib - vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit - VideoToolbox - moltenvk - ]; - - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DUSE_SHARED_ENET=ON" - "-DDOLPHIN_WC_REVISION=${src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${version}" - "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" - # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. - # Note: The updater isn't available on linux, so we dont need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" - ]; - - qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--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 \ - --replace "if(NOT APPLE)" "if(true)" \ - --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Only gets installed automatically if the standalone executable is used - mkdir -p $out/Applications - cp -r ./Binaries/Dolphin.app $out/Applications - ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin - ''; - - passthru = { - tests.version = testers.testVersion { - package = dolphin-emu-beta; - command = "dolphin-emu-nogui --version"; - }; - - updateScript = writeShellScript "dolphin-update-script" '' - set -eou pipefail - export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} - - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu-beta "$version" --rev="$rev" - ''; - }; - - meta = with lib; { - homepage = "https://dolphin-emu.org"; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; - branch = "master"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ - MP2E - ashkitten - xfix - ivar - ]; - # Requires both LLVM and SDK bump - broken = stdenv.isDarwin && stdenv.isx86_64; - }; -} diff --git a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch deleted file mode 100644 index 7da013ecd8f69..0000000000000 --- a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 5e0cb8066fb1653399c54e93e42375295c2562bd -Author: Ivar Scholten <ivar.scholten@protonmail.com> -Date: Fri Sep 9 14:27:55 2022 +0200 - - Externals/minizip: add missing include to CheckFunctionExists - -diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt -index c3d7c5512e..f59f8b295c 100644 ---- a/Externals/minizip/CMakeLists.txt -+++ b/Externals/minizip/CMakeLists.txt -@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H) - target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H) - endif() - -+include(CheckFunctionExists) - check_function_exists(fseeko HAVE_FSEEKO) - if (NOT HAVE_FSEEKO) - target_compile_definitions(minizip PRIVATE NO_FSEEKO) diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index c1820646dc62c..baa283d1178e2 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -1,39 +1,42 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_net -, alsa-lib +{ alsa-lib , copyDesktopItems +, fetchFromGitHub , fluidsynth +, glib , gtest +, lib , libGL , libGLU +, libjack2 +, libmt32emu , libogg , libpng +, libpulseaudio , libslirp +, libsndfile , makeDesktopItem , makeWrapper , meson -, libmt32emu , ninja , opusfile , pkg-config -, libpulseaudio -, glib -, libjack2 -, libsndfile +, irr1 +, SDL2 +, SDL2_image +, SDL2_net +, speexdsp +, stdenv }: stdenv.mkDerivation rec { pname = "dosbox-staging"; - version = "0.78.1"; + version = "0.80.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; + hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; }; nativeBuildInputs = [ @@ -46,11 +49,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 - SDL2_net alsa-lib fluidsynth glib + irr1 libGL libGLU libjack2 @@ -61,11 +63,16 @@ stdenv.mkDerivation rec { libslirp libsndfile opusfile + SDL2 + SDL2_image + SDL2_net + speexdsp ]; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2_net}/include/SDL2" - ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-I${SDL2_image}/include/SDL2" + "-I${SDL2_net}/include/SDL2" + ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index b597abc7b0693..f1874d62fba45 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -5,25 +5,36 @@ , pkg-config , makeWrapper , alsa-lib -, libX11 +, curl +, egl-wayland +, libao +, libdecor , libevdev -, udev +, libffi +, libGL , libpulseaudio -, SDL2 +, libX11 +, libXext +, libxkbcommon , libzip +, mesa , miniupnpc +, udev +, vulkan-headers , vulkan-loader +, wayland +, zlib }: stdenv.mkDerivation rec { pname = "flycast"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "v${version}"; - sha256 = "sha256-vSyLg2lAJBV7crKVbGRbi1PUuCwHF9GB/8pjMTlaigA="; + rev = "V${version}"; + sha256 = "sha256-PRInOqg9OpaUVLwSj1lOxDtjpVaYehkRsp0jLrVKPyY="; fetchSubmodules = true; }; @@ -35,13 +46,24 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - libX11 + curl + egl-wayland + libao + libdecor libevdev - udev + libffi + libGL libpulseaudio - SDL2 + libX11 + libXext + libxkbcommon libzip + mesa # for libgbm miniupnpc + udev + vulkan-headers + wayland + zlib ]; postFixup = '' diff --git a/pkgs/applications/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix index 0fbd12fc36511..66c4eb8ada23a 100644 --- a/pkgs/applications/emulators/gens-gs/default.nix +++ b/pkgs/applications/emulators/gens-gs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Work around build failures on recent GTK. # See http://ubuntuforums.org/showthread.php?p=10535837 - NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; + env.NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = with lib; { homepage = "https://segaretro.org/Gens/GS"; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 084bf07454298..ac5f0f5ce0346 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -39,14 +39,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.251"; + version = "0.252"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA="; + hash = "sha256-snef00pTbukiLQp8eAMfuIqNV3l0wP1+KlpFnS3iKFg="; }; outputs = [ "out" "tools" ]; @@ -117,6 +117,10 @@ stdenv.mkDerivation rec { --subst-var-by mamePath "$out/opt/mame" ''; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=use-after-free" + ]; + desktopItems = [ (makeDesktopItem { name = "MAME"; diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix index 4e2f01ade369a..4a0ed1d519f9d 100644 --- a/pkgs/applications/emulators/np2kai/default.nix +++ b/pkgs/applications/emulators/np2kai/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # TODO Remove when bumping past rev22 - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; buildPhase = optionalString enableSDL '' cd sdl2 diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index 1c0fba3df1c56..88a058865ead8 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile'; # LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; dynarecTarget = if stdenv.isx86_64 then "x86_64" diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index b300dc08268ae..7713c145948cd 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -7,94 +7,96 @@ , ffmpeg , glew , libffi +, libsForQt5 , libzip , makeDesktopItem , makeWrapper , pkg-config , python3 -, qtbase ? null -, qtmultimedia ? null , snappy , vulkan-loader , wayland -, wrapQtAppsHook ? null , 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; + inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; 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.14.4"; +# 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-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; - }; + 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 +110,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/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index b68b70c0ac440..529dce536430b 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,41 +11,63 @@ , 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 ]; + patches = [ + # Fixes compilation on aarch64 + # Remove when version > 0.110 + (fetchpatch { + url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch"; + hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg="; + }) + ]; - dontUseCmakeConfigure = true; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; - enableParallelBuilding = true; + buildInputs = [ + ffmpeg + libGLU + qtbase + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libX11 + libXrandr + ] ++ lib.optionals stdenv.hostPlatform.isBSD [ + sndio + ]; - configureFlags = [ - "--prefix=${placeholder "out"}" - "--without-opengl-nvidia-cg" - "--with-ffmpeg" + 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 = nix-update-script { }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c72ff4929b22e..ed6b75ad406a3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -734,6 +734,7 @@ in picodrive = mkLibretroCore { core = "picodrive"; + version = "unstable-2023-02-15"; dontConfigure = true; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; meta = { diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e4198184edc2f..08c65a7dbff2a 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -352,8 +352,8 @@ "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "62873cab5366999207c197e9f55987daee10be4a", - "sha256": "YErmanNczeh6BeanCGllwOoTjXO+9At8l/o4UhIek4o=", + "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043", + "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=", "fetchSubmodules": true }, "play": { diff --git a/pkgs/applications/emulators/rpcemu/default.nix b/pkgs/applications/emulators/rpcemu/default.nix new file mode 100644 index 0000000000000..9befb172fe4bc --- /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 93d7a58e3cf4d..f6aa0f9c526a4 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git +{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , sdl2Support ? true, SDL2 @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14599-d3183708e"; - rpcs3Version = "0.0.26-14599-d3183708e"; - rpcs3Revision = "d3183708e81ba2707d39829cc1c0cb226dd9e50e"; - rpcs3Sha256 = "0lx9v614r9afmfknw9qdwawwayg3z0fj6chbhnfghm2j2zgqqbpi"; + rpcs3GitVersion = "14757-3388c8ed0"; + rpcs3Version = "0.0.26-14757-3388c8ed0"; + rpcs3Revision = "3388c8ed090afb216f40c1d00361c6f6f1e7a9ba"; + rpcs3Sha256 = "0w2qsk91dxp0lxy6bdz4yyf79wqfnzyxswrg1kxwm0s7iwwch2pj"; ittapi = fetchFromGitHub { owner = "intel"; @@ -21,7 +21,7 @@ let sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; }; in -gcc11Stdenv.mkDerivation { +gcc12Stdenv.mkDerivation { pname = "rpcs3"; version = rpcs3Version; @@ -82,6 +82,6 @@ gcc11Stdenv.mkDerivation { homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 6f3409ec0637d..b0cae68ed2180 100644 --- a/pkgs/applications/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Workaround to build against upstream gcc-10 and clang-11. # Can be removed when next release contains # https://github.com/simh/simh/issues/794 - NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; diff --git a/pkgs/applications/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix index bde706e23040d..c9ba0067ee746 100644 --- a/pkgs/applications/emulators/tilem/default.nix +++ b/pkgs/applications/emulators/tilem/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ]; - NIX_CFLAGS_COMPILE = [ "-lm" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; meta = with lib; { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index aeceb0dc6f841..105729f628298 100644 --- a/pkgs/applications/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: bsdsocket.o:(.bss+0x0): multiple definition of # `socketbases'; main.o:(.bss+0x2792c0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; LDFLAGS = [ "-lm" ]; meta = { diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ae38f5d3326fd..ed9e24a910f61 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -4,7 +4,6 @@ autoconf, hexdump, perl, nixosTests, supportFlags, patches, - vkd3dArches, moltenvk, buildScript ? null, configureFlags ? [], mainProgram ? "wine" }: @@ -71,7 +70,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus - ++ lib.optional openalSupport pkgs.openal ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 @@ -82,7 +80,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional saneSupport pkgs.sane-backends ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional krb5Support pkgs.libkrb5 - ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio @@ -91,7 +88,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional usbSupport pkgs.libusb1 - ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav (gst-plugins-bad.override { enableZbar = false; }) ]) @@ -101,7 +97,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security - ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon + ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 37953f73c5dcf..d3b285f36d78d 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -18,7 +18,6 @@ gstreamerSupport ? false, cupsSupport ? false, dbusSupport ? false, - openalSupport ? false, openclSupport ? false, cairoSupport ? false, odbcSupport ? false, @@ -30,13 +29,11 @@ saneSupport ? false, gphoto2Support ? false, krb5Support ? false, - ldapSupport ? false, pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, vulkanSupport ? false, sdlSupport ? false, - vkd3dSupport ? false, usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", @@ -49,12 +46,12 @@ let wine-build = build: release: wineRelease = release; supportFlags = { inherit - cupsSupport gettextSupport dbusSupport openalSupport cairoSupport + cupsSupport gettextSupport dbusSupport cairoSupport odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport + v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; + sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; }; inherit moltenvk; }); diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index 3b5aa19658ceb..2672e75580cbe 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -5,14 +5,11 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); - vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; }; - vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { pname = "wine"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; monos = [ mono ]; @@ -22,7 +19,6 @@ in with src; { pname = "wine64"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; monos = [ mono ]; @@ -35,7 +31,6 @@ in with src; { inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; geckos = [ gecko32 gecko64 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; monos = [ mono ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0e8f129f91f64..0d7ac403ad198 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -1,17 +1,17 @@ { pkgs ? import <nixpkgs> {} }: ## we default to importing <nixpkgs> here, so that you can use -## a simple shell command to insert new sha256's into this file +## a simple shell command to insert new hashes into this file ## e.g. with emacs C-u M-x shell-command ## ## nix-prefetch-url sources.nix -A {stable{,.mono,.gecko64,.gecko32}, unstable, staging, winetricks} # here we wrap fetchurl and fetchFromGitHub, in order to be able to pass additional args around it -let fetchurl = args@{url, sha256, ...}: - pkgs.fetchurl { inherit url sha256; } // args; - fetchFromGitHub = args@{owner, repo, rev, 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; +let fetchurl = args@{url, hash, ...}: + pkgs.fetchurl { inherit url hash; } // args; + fetchFromGitHub = args@{owner, repo, rev, hash, ...}: + pkgs.fetchFromGitHub { inherit owner repo rev hash; } // args; + fetchFromGitLab = args@{domain, owner, repo, rev, hash, ...}: + pkgs.fetchFromGitLab { inherit domain owner repo rev hash; } // args; updateScriptPreamble = '' set -eou pipefail @@ -24,27 +24,27 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "7.0.1"; - url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz"; - sha256 = "sha256-gHyqeBIbFiUPJA0oKKB8pOPGCXOeVSTvD0z4muSagWw="; + version = "8.0"; + url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; + hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; + hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; }; gecko64 = fetchurl rec { version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; + hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "7.0.0"; + version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA="; + hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; patches = [ @@ -54,14 +54,14 @@ in rec { updateScript = writeShellScript "update-wine-stable" ('' ${updateScriptPreamble} - major=''${UPDATE_NIX_OLD_VERSION%.*} + 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 # <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>. 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")" + set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" fi autobump stable.gecko32 "$latest_gecko" @@ -72,27 +72,27 @@ in rec { }; unstable = fetchurl rec { - # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.20"; - url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-dRt58itan3LJ7BX3VbALE9PtBz6RaMPvStq9nbN9DVA="; + # NOTE: Don't forget to change the hash for staging as well. + version = "8.1"; + url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; + hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; + hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; updateScript = writeShellScript "update-wine-unstable" '' ${updateScriptPreamble} - major=''${UPDATE_NIX_OLD_VERSION%.*} + 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}")")\"" + set_source_attr staging hash "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" } autobump unstable "$latest_unstable" "" update_staging @@ -105,7 +105,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-yzZE06FBoPL65+m8MrKlmW5cSIcX3dZYAOY9wjEJaJw="; + hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -115,12 +115,12 @@ in rec { wayland = fetchFromGitLab rec { # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "7.20"; - sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY="; + version = "8.0"; + hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk="; domain = "gitlab.collabora.com"; owner = "alf"; repo = "wine"; - rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1"; + rev = "2f80bd757739f2dd8da41abceae6b87d2c568152"; inherit (unstable) gecko32 gecko64; @@ -135,7 +135,7 @@ in rec { 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_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" set_source_attr wayland rev "\"$latest_wayland_rev\"" fi @@ -146,7 +146,7 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases version = "20220411"; - sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; + hash = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh index 8192d3b5ab588..8be2645415792 100644 --- a/pkgs/applications/emulators/wine/update-lib.sh +++ b/pkgs/applications/emulators/wine/update-lib.sh @@ -14,9 +14,9 @@ set_source_attr() { sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@") } -set_version_and_sha256() { +set_version_and_hash() { set_source_attr "$1" version "\"$2\"" - set_source_attr "$1" sha256 "\"$(to_sri "$3")\"" + set_source_attr "$1" hash "\"$(to_sri "$3")\"" } get_latest_wine_version() { @@ -39,7 +39,7 @@ autobump() { 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}")" + set_version_and_hash "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" [[ -z "$more" ]] || $more "$version" "$latest" fi } diff --git a/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix deleted file mode 100644 index 249cb2730404f..0000000000000 --- a/pkgs/applications/emulators/wine/vkd3d.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: - -#TODO: unstable - -stdenv.mkDerivation rec { - pname = "vkd3d"; - version = "1.5"; - - src = fetchurl { - url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw="; - }; - - nativeBuildInputs = [ flex bison ]; - - buildInputs = [ vulkan-headers spirv-headers ] - ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; - homepage = "https://source.winehq.org/git/vkd3d.git"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ maintainers.marius851000 ]; - }; -} diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix new file mode 100644 index 0000000000000..482ea9e06fd58 --- /dev/null +++ b/pkgs/applications/emulators/xemu/default.nix @@ -0,0 +1,131 @@ +{ stdenv +, fetchFromGitHub +, lib +, makeDesktopItem +, copyDesktopItems +, pkg-config +, python3 +, ninja +, meson +, which +, perl +, wrapGAppsHook +, glib +, gtk3 +, libpcap +, openssl +, libepoxy +, libsamplerate +, SDL2 +, SDL2_image +, mesa +, libdrm +, libGLU +, gettext +, vte +}: + +stdenv.mkDerivation rec { + pname = "xemu"; + version = "0.7.84"; + + src = fetchFromGitHub { + owner = "xemu-project"; + repo = "xemu"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY="; + }; + + nativeBuildInputs = [ + pkg-config + python3 + python3.pkgs.pyyaml + ninja + which + meson + perl + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = [ + glib + gtk3 + openssl + mesa + libepoxy + libdrm + libpcap + libsamplerate + SDL2 + libGLU + SDL2_image + gettext + vte + ]; + + separateDebugInfo = true; + + dontUseMesonConfigure = true; + + setOutputFlags = false; + + configureFlags = [ + "--disable-strip" + "--meson=meson" + "--target-list=i386-softmmu" + "--disable-werror" + ]; + + buildFlags = [ "qemu-system-i386" ]; + + desktopItems = [(makeDesktopItem { + name = "xemu"; + desktopName = "xemu"; + exec = "xemu"; + icon = "xemu"; + })] ; + + preConfigure = let + branch = "master"; + commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; + in '' + patchShebangs . + configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") + substituteInPlace ./scripts/xemu-version.sh \ + --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" + # If the versions can't be obtained through git, the build process tries + # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) + echo '${commit}' > XEMU_COMMIT + echo '${branch}' > XEMU_BRANCH + echo '${version}' > XEMU_VERSION + ''; + + preBuild = '' + cd build + substituteInPlace ./build.ninja --replace /usr/bin/env $(which env) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp qemu-system-i386 $out/bin/xemu + + for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512 + do + mkdir -p $out/share/icons/hicolor/$RES/apps/ + cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://xemu.app/"; + description = "Original Xbox emulator"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix index fdb4ad9fa139b..c11edd325d33e 100644 --- a/pkgs/applications/emulators/zsnes/2.x.nix +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ # Until upstream fixes the issues... "-Wp,-D_FORTIFY_SOURCE=0" ]; diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index b9dd0f77a4ff4..1583777a058f7 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here # Use pre-c++17 standard (c++17 forbids throw annotations) - NIX_CFLAGS_COMPILE = "-fcommon -std=c++14"; + env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14"; preConfigure = '' cd src diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 003b07cb97594..c4c2d9e6528b5 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.9"; + version = "1.10"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jrP8V1EhHldliZEjiX55TJujc82ub46aWi1boJYDVTg="; + sha256 = "sha256-kXnI8a1nGKBDc+isv9RYvputKk+/FHmM9j+G4UnI5Z4="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 3a20726b9b428..069e6f63cc223 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.2.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VQTZj2BCdV2TnXrYRaJqrf9sR35zsojmeoe7t+I3kyQ="; + sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; }; - cargoSha256 = "sha256-jH2BaPiGanBOlOU7JQZ0c0ObCaVURpjvmx2m92Fbdm4="; + cargoSha256 = "sha256-xqWDWN3xkzBwgW0f64QhYHfsOS3Ed50jlQFuHG81/KY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/applications/file-managers/lf/ctpv.nix new file mode 100644 index 0000000000000..7f5e2a6e089e3 --- /dev/null +++ b/pkgs/applications/file-managers/lf/ctpv.nix @@ -0,0 +1,41 @@ +{ lib +, pkgs +, file +, openssl +, stdenv +, fetchFromGitHub +, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.isLinux +}: + +stdenv.mkDerivation rec { + pname = "ctpv"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "NikitaIvanovV"; + repo = "${pname}"; + rev = "v${version}"; + hash = "sha256-0OuskRCBVm8vMd2zH5u5EPABmCOlEv5N4ZZMdc7bAwM="; + }; + + nativeBuildInputs = [ + file # libmagic + openssl + ]; + + buildInputs = with pkgs; [ + ffmpegthumbnailer ffmpeg + ] ++ lib.optional waylandSupport [ chafa ] + ++ lib.optional x11Support [ ueberzug ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Image previews for lf (list files) file manager"; + homepage = "https://github.com/NikitaIvanovV/ctpv"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.wesleyjrz ]; + }; +} diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 8b54d79622a42..a61b0980d8515 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -6,7 +6,6 @@ , gpm , file , e2fsprogs -, libX11 , libICE , perl , zip @@ -17,6 +16,7 @@ , openssl , coreutils , autoSignDarwinBinariesHook +, x11Support ? true, libX11 # updater only , writeScript @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { gettext glib libICE - libX11 libssh2 openssl slang zip - ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ] ++ lib.optionals x11Support [ libX11 ] + ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -66,12 +66,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/filemanager/ext.c \ --replace /bin/rm ${coreutils}/bin/rm - - substituteInPlace misc/ext.d/misc.sh.in \ - --replace /bin/cat ${coreutils}/bin/cat ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index d9ff3b15c798a..befbffb46e74c 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 334228f98ead1..1cab33edb9449 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here # TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772 # or equivalent is merged upstream. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 - ] ++ (if ifuseSupport then [ ifuse ] else []); + ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/file-managers/vifm/default.nix b/pkgs/applications/file-managers/vifm/default.nix index ad326e459775d..ab7da2deac897 100644 --- a/pkgs/applications/file-managers/vifm/default.nix +++ b/pkgs/applications/file-managers/vifm/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, makeWrapper +, perl # used to generate help tags , pkg-config , ncurses, libX11 , util-linux, file, which, groff @@ -17,9 +18,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-j+KBPr3Mz+ma7OArBdYqIJkVJdRrDM+67Dr2FMZlVog="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ perl pkg-config makeWrapper ]; buildInputs = [ ncurses libX11 util-linux file which groff ]; + postPatch = '' + # Avoid '#!/usr/bin/env perl' reverences to build help. + patchShebangs --build src/helpztags + ''; + postFixup = let path = lib.makeBinPath [ udisks2 @@ -28,11 +34,11 @@ in stdenv.mkDerivation rec { wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}"; in '' - ${if mediaSupport then wrapVifmMedia else ""} + ${lib.optionalString mediaSupport wrapVifmMedia} ''; meta = with lib; { - description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}"; + description = "A vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}"; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/applications/finance/denaro/default.nix new file mode 100644 index 0000000000000..84a76e21f2b5e --- /dev/null +++ b/pkgs/applications/finance/denaro/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenvNoCC +, buildDotnetModule +, fetchFromGitHub +, fetchpatch +, dotnetCorePackages +, gtk4 +, libadwaita +, pkg-config +, wrapGAppsHook4 +, glib +, shared-mime-info +, python3 +, desktop-file-utils +, gdk-pixbuf +}: + +buildDotnetModule rec { + pname = "denaro"; + version = "2023.2.2"; + + src = fetchFromGitHub { + owner = "nlogozzo"; + repo = "NickvisionMoney"; + rev = version; + hash = "sha256-B84uzJ+B7kGU+O2tuObrIFCvgUfszLd1VU7F5tL90bU="; + }; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + + projectFile = "NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj"; + nugetDeps = ./deps.nix; + executables = "NickvisionMoney.GNOME"; + + # Prevent installing native libraries for all platforms + dotnetBuildFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + dotnetInstallFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib # For glib-compile-resources + shared-mime-info # For update-mime-database + python3 + desktop-file-utils + gdk-pixbuf # Fixes icon missing in envs where GDK_PIXBUF_MODULE_FILE is not set + ]; + + postInstall = '' + sh NickvisionMoney.GNOME/install_extras.sh $out + desktop-file-edit $out/share/applications/org.nickvision.money.desktop \ + --set-key=Exec --set-value=$out/bin/NickvisionMoney.GNOME + ''; + + runtimeDeps = [ + gtk4 + libadwaita + glib # Fixes "Could not retrieve parent type - is the typeid valid?" + ]; + + meta = with lib; { + description = "Personal finance manager for GNOME"; + homepage = "https://github.com/nlogozzo/NickvisionMoney"; + mainProgram = "NickvisionMoney.GNOME"; + license = licenses.mit; + changelog = "https://github.com/nlogozzo/NickvisionMoney/releases/tag/${version}"; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/applications/finance/denaro/deps.nix new file mode 100644 index 0000000000000..d6762f6bbe7af --- /dev/null +++ b/pkgs/applications/finance/denaro/deps.nix @@ -0,0 +1,117 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.3"; sha256 = "00rdsirs32vlqpa1hri3f1m368b05d4r0k95wv5n2y0xi5i8lml6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) + (fetchNuGet { pname = "QuestPDF"; version = "2022.12.1"; sha256 = "0nbbk43jr73f0pfgdx3fzn57mjba34sir5jzxk2rscyfljfw002x"; }) + (fetchNuGet { pname = "ReadSharp.Ports.SgmlReader.Core"; version = "1.0.0"; sha256 = "0pcvlh0gq513vw6y12lfn90a0br56a6f26lvppcj4qb839zmh3id"; }) + (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 = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; }) + (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"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Globalization"; 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.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.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (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.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Requests"; version = "4.3.0"; sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; }) + (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.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (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"; }) + (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.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.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (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.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.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.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (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"; }) +] diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a3d3fda59122f..a2e01303970af 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.14"; + version = "3.22.16"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-VT85cVeKuHQCGQokID9yrbents7ewHK1j7I17oFTvlo="; + hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 929a40d6daab3..18603e38ec532 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.28.2"; + version = "3.28.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ndwDN/DH+Y+dc8aNa45cSIM8yQUmIWq0jx6xWsZo4rk="; + hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; }; passthru = { diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 59794b88a4fd3..d535625c717a7 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.5.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0="; + sha256 = "sha256-JnZ0m0GAgfz3BbiKxqLoMoa4pX//r5t+mbhMCdAo9OE="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index e09de1b250234..a433cc6516dea 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -21,6 +21,7 @@ , libde265Support ? true, libde265 , fftw , ApplicationServices, Foundation +, testers }: let @@ -33,14 +34,14 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; version = "6.9.12-68"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; }; @@ -109,12 +110,35 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://legacy.imagemagick.org/"; changelog = "https://legacy.imagemagick.org/script/changelog.php"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; 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 d5d64aef6d86c..1d7863df05e87 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, python3 }: assert libXtSupport -> libX11Support; @@ -44,15 +45,15 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.0-57"; + version = "7.1.0-62"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = version; - hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8="; + rev = finalAttrs.version; + hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -122,15 +123,19 @@ stdenv.mkDerivation rec { done ''; - passthru.tests.version = - testers.testVersion { package = imagemagick; }; + passthru.tests = { + version = testers.testVersion { package = imagemagick; }; + inherit (python3.pkgs) img2pdf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ erictapen dotlambda ]; license = licenses.asl20; mainProgram = "magick"; }; -} +}) diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 0e61da0041b60..a780fc039a142 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/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index c26b2f46e7f63..5c5745646b59d 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.8.10"; + version = "20.8.16"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626"; + sha256 = "sha256-FBnyogqf5BHLRInjJzC2dENnAwFcWMHDvJ+F0I3ffVg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawio/headless.nix b/pkgs/applications/graphics/drawio/headless.nix index c70511fa6528c..34959da67b46e 100644 --- a/pkgs/applications/graphics/drawio/headless.nix +++ b/pkgs/applications/graphics/drawio/headless.nix @@ -21,7 +21,7 @@ writeTextFile { # Drawio needs to run in a virtual X session, because Electron # refuses to work and dies with an unhelpful error message otherwise: # "The futex facility returned an unexpected error code." - XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@ + XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run --auto-display ${drawio}/bin/drawio $@ ''; meta = with lib; { diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix new file mode 100644 index 0000000000000..8df8b76801396 --- /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/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 41999239af1ae..d088f633c3f3b 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.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = "v${version}"; - hash = "sha256-sDrMIryVFkjMGHbYvNDmKb1HyJNGb3Hd+muxUJKhogE="; + hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mztc44hHdqzR3WbG6tkCL38EfgBajRLlpMC8ElpXnlo="; + hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An easy-to-use color picker and editor"; + description = "A powerful color picker and formatter"; homepage = "https://github.com/FineFindus/eyedropper"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 535b177bd7bd2..971ce42c03f9c 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 { @@ -77,7 +57,6 @@ stdenv.mkDerivation rec { "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 b19ed9c2cbc7b..b44327520e654 100644 --- a/pkgs/applications/graphics/fluxus/fix-build.patch +++ b/pkgs/applications/graphics/fluxus/fix-build.patch @@ -1,5 +1,10 @@ -diff --git a/SConstruct b/SConstruct -index 32cb644..650333a 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 @@ -6,7 +6,7 @@ @@ -11,16 +16,15 @@ index 32cb644..650333a 100644 MajorVersion = "0" MinorVersion = "19" -@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix': - ["asound", "alsa/asoundlib.h"], - ["openal", "AL/al.h"]] +@@ -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.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') -+ - ################################################################################ + 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'): @@ -33,7 +37,7 @@ index 32cb644..650333a 100644 # detect ode precision if not GetOption('clean'): try: -@@ -240,27 +245,27 @@ if not GetOption('clean'): +@@ -240,27 +241,27 @@ if not GetOption('clean'): if isinstance(ode_str[0], str): env.MergeFlags(ode_str[0]) except: @@ -65,7 +69,7 @@ index 32cb644..650333a 100644 Exit(1) if not conf.CheckFunc("dInitODE2"): -@@ -334,7 +339,7 @@ if not GetOption('clean'): +@@ -334,7 +335,7 @@ if not GetOption('clean'): ]) if raco_status != 0: @@ -74,7 +78,7 @@ index 32cb644..650333a 100644 Exit(1) -@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules: +@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules: app_env['LIBS'].remove("pthread") app_env['LIBS'].remove("dl") @@ -85,7 +89,7 @@ index 32cb644..650333a 100644 # now go through the rest of the libs, removing them from # the environment at the same time -@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs, +@@ -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: diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index e8fd0364808c2..b16025e8829c0 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2022-11-02"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk="; + sha256 = "sha256-sPIXLZdtVK3phfMsZrU8o9qisOC5RKvHH19ECXMV0t0="; }; postPatch = '' @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index bcc504effec2a..7ed9cc865d237 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -39,7 +39,7 @@ , soqt , spaceNavSupport ? stdenv.isLinux , swig -, vtk +, vtk_8 , wrapQtAppsHook , wrapGAppsHook , xercesc @@ -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 c69c9af184b00..def7e3e9dd867 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8 ''; - NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing"; meta = { description = "Open source panorama viewer using GL"; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 3ce6c56d94bb2..8ffc0a0424e5b 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -154,7 +154,7 @@ in stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ae44b47643cd6..2077fabc35dfe 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -109,7 +109,9 @@ in /* menu: Video */ - name = "gap-2.6.0"; + pname = "gap"; + version = "2.6.0"; + src = fetchurl { url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; @@ -228,11 +230,13 @@ in /* menu: Filters/Enhance/Wavelet sharpen */ - name = "wavelet-sharpen-0.1.2"; + pname = "wavelet-sharpen"; + version = "0.1.2"; + # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; src = fetchurl { url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; @@ -271,7 +275,7 @@ in gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; - name = "gimplensfun-${version}"; + pname = "gimplensfun"; src = fetchFromGitHub { owner = "seebk"; diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 7ae618736ca19..3e365d299f9ad 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -65,6 +65,12 @@ clangStdenv.mkDerivation rec { LIBCLANG_PATH = "${libclang.lib}/lib"; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" + ''; + meta = with lib; { description = "Scan and Generate QR Codes"; homepage = "https://gitlab.gnome.org/World/decoder"; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 0ac22106b989c..b90735d850837 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; - NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isGNU "-Wno-error=catch-value"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=catch-value"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 325d1bcf083dd..8236af42956d3 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=format-truncation" + ]; + NIX_LDFLAGS = "-lpthread"; buildPhase = '' diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 3dbd1e0d77bf2..847fa9ea5f686 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; meta = with lib; { description = "A fast image viewer"; - homepage = "http://gqview.sourceforge.net"; + homepage = "https://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 48e97e7dbb3b9..db297f70095a8 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of # `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preInstall = '' mkdir -p "$out" ''; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index a82c6ec2f78d6..ecb09e539b3e4 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , gnome , pkg-config , meson @@ -40,6 +42,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU="; }; + patches = [ + # Fix build with libraw 0.21, can be removed on next update + # https://hydra.nixos.org/build/209327709/nixlog/1 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; + sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; + }) + ]; + nativeBuildInputs = [ bison desktop-file-utils diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index b0e346331bce8..d690f5e0671a9 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -46,6 +46,11 @@ mkDerivation rec { url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; }) + (fetchpatch { + name = "support-libraw-0.21.patch"; + url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff"; + sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk="; + }) ]; desktopItems = [ diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f4d424b3fc30d..204cfa387dd39 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' for p in $out/bin/*; do diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index b904dec085699..5d56dbe86d702 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M="; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; meta = with lib; { description = "It's like cat, but for images"; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index f78a4f6068154..30a8a24e3bc27 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/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index bd4a580cc4621..b8cf63b188743 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # gcc-10. Otherwise build fails as: # ld: src/util.o:(.bss+0x0): multiple definition of `progname'; /build/ccBZT2Za.o:(.bss+0x20): first defined here # https://github.com/danielgtaylor/jpeg-archive/issues/119 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 951bb9d7d8943..ff00d565f47d3 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.1"; + version = "1.5.2"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; + sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index a05dbc28be022..45688725c2afc 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://hexler.net/kodelife"; description = "Real-time GPU shader editor"; diff --git a/pkgs/applications/graphics/kodelife/update.sh b/pkgs/applications/graphics/kodelife/update.sh new file mode 100755 index 0000000000000..992f7c2bf4349 --- /dev/null +++ b/pkgs/applications/graphics/kodelife/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix curl libxml2 jq + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +attr="${UPDATE_NIX_ATTR_PATH:-kodelife}" +version="$(curl -sSL https://hexler.net/kodelife/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)" + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash +} + +nixeval() { + if [ "$#" -ge 2 ]; then + systemargs=(--argstr system "$2") + else + systemargs=() + fi + + nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r . +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}" + +pkgpath="$(findpath "$attr")" + +if [ "$version" = "$oldversion" ]; then + echo 'update.sh: New version same as old version, nothing to do.' + exit 0 +fi + +sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath" + +for system in aarch64-linux armv7l-linux x86_64-linux; do + url="$(nixeval "$attr".src.url "$system")" + + curhash="$(nixeval "$attr".src.outputHash "$system")" + newhash="$(narhash "$url")" + + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +done diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index cfb63e0e3f7cb..e8e6a2cc9f867 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.4"; + version = "5.1.5"; kde-channel = "stable"; - sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs="; + sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index a9b0001847181..4adedcaffe793 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -2,7 +2,7 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl , openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -26,15 +26,15 @@ mkDerivation rec { buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 xsimd ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] - ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + env.NIX_CFLAGS_COMPILE = toString ([ "-I${ilmbase.dev}/include/OpenEXR" ] + ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"); # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. # Patch the PYTHONPATH so python scripts can import sip successfully. diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index d0cf9af97d214..97d889c285c62 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn"; }; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ qtbase qtdeclarative qttools qtwebengine eigen diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b1c4f2258f0b0..54f956981ee96 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchFromGitLab, fetchurl -, boost, cmake, ffmpeg, qtbase, qtx11extras +{ lib, stdenv, fetchFromGitLab, fetchurl +, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras , qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper -, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL +, ninja, mpi, python3, tbb, libGLU, libGL , withDocs ? true }: let - version = "5.10.0"; + version = "5.11.0"; docFiles = [ (fetchurl { @@ -26,7 +26,7 @@ let }) ]; -in mkDerivation rec { +in stdenv.mkDerivation rec { pname = "paraview"; inherit version; @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; + sha256 = "sha256-WvkKGl5lG+apX6m4ULVZZVtDsSUjEVXe/seh95b+LmI="; fetchSubmodules = true; }; @@ -68,6 +68,7 @@ in mkDerivation rec { makeWrapper ninja gfortran + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index c3207eb6c57c2..4e9f33621ffd2 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; - NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; + env.NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; meta = with lib; { description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 1cbbaf8ffe3bb..ddbeb4caa42ee 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.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-s4mJNPzrcg5UT8JC3D5ipaM8IvNFAK7e3V0TjVGeRdM="; + sha256 = "sha256-p51FlCeViDRNGUDN//IT4bLJpP2kU0CC67BCAlm0rYk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b59f17278e08b..f38a9a9dcfe12 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -10,7 +10,7 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.1"; + version = "2.1.1"; nativeBuildInputs = [ intltool @@ -36,7 +36,7 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-hugV4I13wZhPnVTUlGlaVxdjpGRvWDnfRVXgV+oy+sE="; + hash = "sha256-sdSGBf/dk+3Oy/aCfmIDuymwXQZwnth923Wdggir/Q0="; }; # https://github.com/NixOS/nixpkgs/issues/38991 diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index b6e03baace817..9cf2e50ea3b27 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/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 0075abc0f6f00..96ec02294ffdc 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/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index f9120ca0ee482..706992e2961d6 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,24 +1,24 @@ -{ lib, mkDerivationWith, fetchurl, python3Packages +{ lib, mkDerivationWith, fetchFromGitHub, python3Packages , file, intltool, gobject-introspection, libgudev -, udisks, gexiv2, gst_all_1, libnotify +, udisks, gexiv2, gst_all_1, libnotify, ifuse, libimobiledevice , exiftool, gdk-pixbuf, libmediainfo, vmtouch }: mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.18"; + version = "0.9.34"; - src = fetchurl { - url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "15p7sssg6vmqbm5xnc4j5dr89d7gl7y5qyq44a240yl5aqkjnybw"; + src = fetchFromGitHub { + owner = "damonlynch"; + repo = "rapid-photo-downloader"; + rev = "v${version}"; + hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw="; }; - # Disable version check and fix install tests + # Disable version check postPatch = '' substituteInPlace raphodo/constants.py \ --replace "disable_version_check = False" "disable_version_check = True" - substituteInPlace raphodo/rescan.py \ - --replace "from preferences" "from raphodo.preferences" ''; nativeBuildInputs = [ @@ -28,9 +28,15 @@ mkDerivationWith python3Packages.buildPythonApplication rec { # Package has no generally usable unit tests. # The included doctests expect specific, hardcoded hardware to be present. - doCheck = false; + # Instead, we just make sure the program runs enough to report its version. + checkPhase = '' + export XDG_DATA_HOME=$(mktemp -d) + export QT_QPA_PLATFORM=offscreen + $out/bin/rapid-photo-downloader --detailed-version + ''; - # NOTE: Without gobject-introspection in buildInputs, launching fails with + # NOTE: Without gobject-introspection in buildInputs and strictDeps = false, + # launching fails with: # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ gdk-pixbuf @@ -46,7 +52,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec { udisks ]; + strictDeps = false; + propagatedBuildInputs = with python3Packages; [ + ifuse + libimobiledevice pyqt5 pygobject3 gphoto2 @@ -57,15 +67,19 @@ mkDerivationWith python3Packages.buildPythonApplication rec { arrow python-dateutil easygui + babel colour + pillow + pyheif pymediainfo sortedcontainers - rawkit requests colorlog pyprind + setuptools + show-in-file-manager tenacity - ]; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; preFixup = '' makeWrapperArgs+=( diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index c1f78b1807f00..85bbd1414cd92 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,29 +1,66 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook -, lensfun, librsvg, gtk-mac-integration +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, makeWrapper +, pixman +, libpthreadstubs +, gtkmm3 +, libXau +, libXdmcp +, lcms2 +, libiptcdata +, fftw +, expat +, pcre +, libsigcxx +, lensfun +, librsvg +, libcanberra-gtk3 +, gtk-mac-integration }: stdenv.mkDerivation rec { - version = "5.8"; pname = "rawtherapee"; + version = "5.9"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik"; + hash = "sha256-kdctfjss/DHEcaSDPXcmT20wXTwkI8moRX/i/5wT5Hg="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + postPatch = '' + echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake + substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ + --replace "/Applications" "${placeholder "out"}/Applications" + ''; - # This patch is upstream; remove it in 5.9. - patches = [ ./fix-6324.patch ] - # Disable upstream-enforced bundling on macOS. - ++ lib.optionals stdenv.isDarwin [ ./do-not-bundle.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper + ]; buildInputs = [ - pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata fftw expat pcre libsigcxx lensfun librsvg + pixman + libpthreadstubs + gtkmm3 + libXau + libXdmcp + lcms2 + libiptcdata + fftw + expat + pcre + libsigcxx + lensfun + librsvg ] ++ lib.optionals stdenv.isLinux [ libcanberra-gtk3 ] ++ lib.optionals stdenv.isDarwin [ @@ -33,12 +70,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; - CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result"; + CMAKE_CXX_FLAGS = toString [ + "-std=c++11" + "-Wno-deprecated-declarations" + "-Wno-unused-result" + ]; - postUnpack = '' - echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/RawTherapee.app $out/bin + cp -R Release $out/Applications/RawTherapee.app/Contents + for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do + makeWrapper $f $out/bin/$(basename $f) + done ''; meta = { diff --git a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch b/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch deleted file mode 100644 index 8c3257e888c57..0000000000000 --- a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0a55ca6d5..68c059aa5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -233,6 +233,6 @@ if(WIN32 OR APPLE) - endif() -- set(BUILD_BUNDLE ON FORCE) -+ set(BUILD_BUNDLE OFF) - endif() - - if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR) -- if(APPLE) -+ if(FALSE) diff --git a/pkgs/applications/graphics/rawtherapee/fix-6324.patch b/pkgs/applications/graphics/rawtherapee/fix-6324.patch deleted file mode 100644 index fa324c2c9389b..0000000000000 --- a/pkgs/applications/graphics/rawtherapee/fix-6324.patch +++ /dev/null @@ -1,356 +0,0 @@ -See: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://github.com/Beep6581/RawTherapee/commit/2e0137d54243eb729d4a5f939c4320ec8f8f415d - -diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc -index 6274154cb..98c743dad 100644 ---- a/rtengine/canon_cr3_decoder.cc -+++ b/rtengine/canon_cr3_decoder.cc -@@ -662,7 +662,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x) - #endif - - struct LibRaw_abstract_datastream { -- IMFILE* ifp; -+ rtengine::IMFILE* ifp; - - void lock() - { -diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc -index 812f122b3..5da696af2 100644 ---- a/rtengine/dcraw.cc -+++ b/rtengine/dcraw.cc -@@ -2025,7 +2025,7 @@ void CLASS phase_one_load_raw_c() - #endif - { - int len[2], pred[2]; -- IMFILE ifpthr = *ifp; -+ rtengine::IMFILE ifpthr = *ifp; - ifpthr.plistener = nullptr; - - #ifdef _OPENMP -@@ -3380,7 +3380,7 @@ void CLASS sony_arw2_load_raw() - { - uchar *data = new (std::nothrow) uchar[raw_width + 1]; - merror(data, "sony_arw2_load_raw()"); -- IMFILE ifpthr = *ifp; -+ rtengine::IMFILE ifpthr = *ifp; - int pos = ifpthr.pos; - ushort pix[16]; - -@@ -6394,7 +6394,7 @@ int CLASS parse_tiff_ifd (int base) - unsigned sony_curve[] = { 0,0,0,0,0,4095 }; - unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; - struct jhead jh; --/*RT*/ IMFILE *sfp; -+/*RT*/ rtengine::IMFILE *sfp; - /*RT*/ int pana_raw = 0; - - if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) -@@ -6958,7 +6958,7 @@ it under the terms of the one of two licenses as you choose: - fread (buf, sony_length, 1, ifp); - sony_decrypt (buf, sony_length/4, 1, sony_key); - sfp = ifp; --/*RT*/ ifp = fopen (buf, sony_length); -+/*RT*/ ifp = rtengine::fopen (buf, sony_length); - // if ((ifp = tmpfile())) { - // fwrite (buf, sony_length, 1, ifp); - // fseek (ifp, 0, SEEK_SET); -@@ -7264,7 +7264,7 @@ void CLASS parse_external_jpeg() - { - const char *file, *ext; - char *jname, *jfile, *jext; --/*RT*/ IMFILE *save=ifp; -+/*RT*/ rtengine::IMFILE *save=ifp; - - ext = strrchr (ifname, '.'); - file = strrchr (ifname, '/'); -@@ -7292,7 +7292,7 @@ void CLASS parse_external_jpeg() - *jext = '0'; - } - if (strcmp (jname, ifname)) { --/*RT*/ if ((ifp = fopen (jname))) { -+/*RT*/ if ((ifp = rtengine::fopen (jname))) { - // if ((ifp = fopen (jname, "rb"))) { - if (verbose) - fprintf (stderr,_("Reading metadata from %s ...\n"), jname); -diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h -index 89c1fcaff..f25157088 100644 ---- a/rtengine/dcraw.h -+++ b/rtengine/dcraw.h -@@ -73,7 +73,7 @@ public: - - protected: - int exif_base, ciff_base, ciff_len; -- IMFILE *ifp; -+ rtengine::IMFILE *ifp; - FILE *ofp; - short order; - const char *ifname; -@@ -125,7 +125,7 @@ protected: - int cur_buf_size; // buffer size - uchar *cur_buf; // currently read block - int fillbytes; // Counter to add extra byte for block size N*16 -- IMFILE *input; -+ rtengine::IMFILE *input; - struct int_pair grad_even[3][41]; // tables of gradients - struct int_pair grad_odd[3][41]; - ushort *linealloc; -@@ -278,7 +278,7 @@ void parse_redcine(); - class getbithuff_t - { - public: -- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} -+ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} - unsigned operator()(int nbits, ushort *huff); - - private: -@@ -288,7 +288,7 @@ private: - DCraw *parent; - unsigned bitbuf; - int vbits, reset; -- IMFILE *&ifp; -+ rtengine::IMFILE *&ifp; - unsigned &zero_after_ff; - }; - getbithuff_t getbithuff; -@@ -296,7 +296,7 @@ getbithuff_t getbithuff; - class nikbithuff_t - { - public: -- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} -+ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} - void operator()() {bitbuf = vbits = 0;}; - unsigned operator()(int nbits, ushort *huff); - unsigned errorCount() { return errors; } -@@ -309,7 +309,7 @@ private: - } - unsigned bitbuf, errors; - int vbits; -- IMFILE *&ifp; -+ rtengine::IMFILE *&ifp; - }; - nikbithuff_t nikbithuff; - -@@ -378,7 +378,7 @@ void parse_qt (int end); - // ph1_bithuff(int nbits, ushort *huff); - class ph1_bithuff_t { - public: -- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} -+ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} - unsigned operator()(int nbits, ushort *huff); - unsigned operator()(int nbits); - unsigned operator()(); -@@ -412,7 +412,7 @@ private: - } - - short ℴ -- IMFILE* const ifp; -+ rtengine::IMFILE* const ifp; - UINT64 bitbuf; - int vbits; - }; -@@ -430,11 +430,11 @@ void nokia_load_raw(); - - class pana_bits_t{ - public: -- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): -+ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): - ifp(i), load_flags(u), vbits(0), encoding(enc) {} - unsigned operator()(int nbits, unsigned *bytes=nullptr); - private: -- IMFILE *ifp; -+ rtengine::IMFILE *ifp; - unsigned &load_flags; - uchar buf[0x4000]; - int vbits; -diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc -index 1fb1d2e1b..951df2248 100644 ---- a/rtengine/dfmanager.cc -+++ b/rtengine/dfmanager.cc -@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std - - int DFManager::scanBadPixelsFile( Glib::ustring filename ) - { -- FILE *file = fopen( filename.c_str(), "r" ); -+ FILE *file = ::fopen( filename.c_str(), "r" ); - - if( !file ) { - return false; -diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc -index 842766dcf..2321d18bb 100644 ---- a/rtengine/myfile.cc -+++ b/rtengine/myfile.cc -@@ -70,7 +70,7 @@ int munmap(void *start, size_t length) - - #ifdef MYFILE_MMAP - --IMFILE* fopen (const char* fname) -+rtengine::IMFILE* rtengine::fopen (const char* fname) - { - int fd; - -@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname) - return mf; - } - --IMFILE* gfopen (const char* fname) -+rtengine::IMFILE* rtengine::gfopen (const char* fname) - { - return fopen(fname); - } - #else - --IMFILE* fopen (const char* fname) -+rtengine::IMFILE* rtengine::fopen (const char* fname) - { - - FILE* f = g_fopen (fname, "rb"); -@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname) - return mf; - } - --IMFILE* gfopen (const char* fname) -+rtengine::IMFILE* rtengine::gfopen (const char* fname) - { - - FILE* f = g_fopen (fname, "rb"); -@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname) - } - #endif //MYFILE_MMAP - --IMFILE* fopen (unsigned* buf, int size) -+rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) - { - - IMFILE* mf = new IMFILE; -@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size) - return mf; - } - --void fclose (IMFILE* f) -+void rtengine::fclose (IMFILE* f) - { - #ifdef MYFILE_MMAP - -@@ -207,7 +207,7 @@ void fclose (IMFILE* f) - delete f; - } - --int fscanf (IMFILE* f, const char* s ...) -+int rtengine::fscanf (IMFILE* f, const char* s ...) - { - // fscanf not easily wrapped since we have no terminating \0 at end - // of file data and vsscanf() won't tell us how many characters that -@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...) - } - - --char* fgets (char* s, int n, IMFILE* f) -+char* rtengine::fgets (char* s, int n, IMFILE* f) - { - - if (f->pos >= f->size) { -@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f) - return s; - } - --void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) -+void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) - { - f->plistener = plistener; - f->progress_range = progress_range; -@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub - f->progress_current = 0; - } - --void imfile_update_progress(IMFILE *f) -+void rtengine::imfile_update_progress(IMFILE *f) - { - if (!f->plistener || f->progress_current < f->progress_next) { - return; -diff --git a/rtengine/myfile.h b/rtengine/myfile.h -index 423edea9a..c655696e6 100644 ---- a/rtengine/myfile.h -+++ b/rtengine/myfile.h -@@ -30,8 +30,6 @@ namespace rtengine - - class ProgressListener; - --} -- - struct IMFILE { - int fd; - ssize_t pos; -@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f) - - int fscanf (IMFILE* f, const char* s ...); - char* fgets (char* s, int n, IMFILE* f); -+ -+} -diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc -index 9da601e2a..097b9e711 100644 ---- a/rtengine/rtthumbnail.cc -+++ b/rtengine/rtthumbnail.cc -@@ -1922,7 +1922,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname) - - Glib::ustring fullFName = fname + ".rtti"; - -- FILE* f = g_fopen (fullFName.c_str (), "wb"); -+ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); - - if (!f) { - return false; -@@ -1965,7 +1965,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname) - return false; - } - -- FILE* f = g_fopen(fullFName.c_str (), "rb"); -+ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); - - if (!f) { - return false; -@@ -2191,7 +2191,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname) - return false; - } - -- FILE *f = g_fopen (fname.c_str (), "wt"); -+ FILE *f = ::g_fopen (fname.c_str (), "wt"); - - if (!f) { - if (settings->verbose) { -@@ -2214,7 +2214,7 @@ bool Thumbnail::readEmbProfile (const Glib::ustring& fname) - embProfile = nullptr; - embProfileLength = 0; - -- FILE* f = g_fopen (fname.c_str (), "rb"); -+ FILE* f = ::g_fopen (fname.c_str (), "rb"); - - if (f) { - if (!fseek (f, 0, SEEK_END)) { -@@ -2242,7 +2242,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) - { - - if (embProfileData) { -- FILE* f = g_fopen (fname.c_str (), "wb"); -+ FILE* f = ::g_fopen (fname.c_str (), "wb"); - - if (f) { - fwrite (embProfileData, 1, embProfileLength, f); -@@ -2257,7 +2257,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) - bool Thumbnail::readAEHistogram (const Glib::ustring& fname) - { - -- FILE* f = g_fopen(fname.c_str(), "rb"); -+ FILE* f = ::g_fopen(fname.c_str(), "rb"); - - if (!f) { - aeHistogram.reset(); -@@ -2280,7 +2280,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname) - { - - if (aeHistogram) { -- FILE* f = g_fopen (fname.c_str (), "wb"); -+ FILE* f = ::g_fopen (fname.c_str (), "wb"); - - if (f) { - fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f); diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 8da308ba61756..0af4a3909825e 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII="; + hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ="; + hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 007483fb5e260..cd64c7b8d44e4 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/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix new file mode 100755 index 0000000000000..ca58271425d94 --- /dev/null +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, lib +, fetchFromGitHub +, jdk11 +, makeDesktopItem +, makeWrapper +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "structorizer"; + version = "3.32-11"; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "Structorizer"; + desktopName = "Structorizer"; + genericName = "Diagram creator"; + comment = meta.description; + icon = pname; + exec = pname; + terminal = false; + mimeTypes = [ "application/nsd" ]; + categories = [ + "Development" + "Graphics" + "VectorGraphics" + "RasterGraphics" + "ComputerScience" + ]; + keywords = [ "nsd" "diagrams" ]; + }) + ]; + + src = fetchFromGitHub { + owner = "fesch"; + repo = "Structorizer.Desktop"; + rev = version; + hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk="; + }; + + patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ]; + + buildInputs = [ jdk11 ]; + + postPatch = '' + chmod +x makeStructorizer + chmod +x makeBigJar + + patchShebangs --build makeStructorizer + patchShebangs --build makeBigJar + ''; + + buildPhase = '' + runHook preBuild + + ./makeStructorizer + ./makeBigJar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/share/mime/packages + + install -D ${pname}.jar -t $out/share/java/ + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}.jar" + + cat << EOF > $out/share/mime/packages/structorizer.xml + <?xml version="1.0" encoding="UTF-8"?> + <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/nsd"> + <comment xml:lang="en">Nassi-Shneiderman diagram</comment> + <comment xml:lang="de">Nassi-Shneiderman-Diagramm</comment> + <glob pattern="*.nsd"/> + </mime-type> + </mime-info> + EOF + + cd src/lu/fisch/${pname}/gui + install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png + for icon_width in 24 32 48 64 128 256; do + install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Create Nassi-Shneiderman diagrams (NSD)"; + homepage = "https://structorizer.fisch.lu"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/applications/graphics/structorizer/makeBigJar.patch b/pkgs/applications/graphics/structorizer/makeBigJar.patch new file mode 100644 index 0000000000000..2090a7b35a45a --- /dev/null +++ b/pkgs/applications/graphics/structorizer/makeBigJar.patch @@ -0,0 +1,31 @@ +Reason: Running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.class, only the jar. + +diff --git a/makeBigJar b/makeBigJar +index 25547020..c34d0d9c 100644 +--- a/makeBigJar ++++ b/makeBigJar +@@ -75,9 +75,8 @@ jars="bsh-2.1.0 \ + freehep-xml-2.1.1 \ + freehep" + +-# Apple specific stuff is only used if it exists and the compiled class is available +-if test -f ../bin/lu/fisch/structorizer/application/AppleStructorizerApplication.class -a \ +- -f AppleJavaExtensions.jar; then ++# Apple specific stuff is only used if the jar is available ++if test -f lib/AppleJavaExtensions.jar; then + jars="$jars AppleJavaExtensions" + fi + +@@ -114,12 +113,3 @@ echo "Done" + # remove the jar-directory + rm -R jar/ + +-if test -n "$start_compiled"; then +- # execute the archive +- echo; echo "Running Structorizer from all-in-one jar" +- if test "$start_compiled" = "s"; then +- java -jar structorizer.jar +- else +- java -jar structorizer.jar & +- fi +-fi # start block end diff --git a/pkgs/applications/graphics/structorizer/makeStructorizer.patch b/pkgs/applications/graphics/structorizer/makeStructorizer.patch new file mode 100644 index 0000000000000..b08ec0f30f6fe --- /dev/null +++ b/pkgs/applications/graphics/structorizer/makeStructorizer.patch @@ -0,0 +1,54 @@ +Reason: There is no StructorizerApplet.java anywhere in the source, no .cgt files and running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.java, only the jar. + +diff --git a/makeStructorizer b/makeStructorizer +index 99a5e8d3..e954be13 100644 +--- a/makeStructorizer ++++ b/makeStructorizer +@@ -117,18 +117,6 @@ echo "Done" + echo; echo "Compiling Structorizer..." + javac $str_javac_opts -classpath "$str_classpath" Structorizer.java + echo "Done" +-echo; echo "Compiling Structorizer Applet..." +-javac $str_javac_opts -classpath "$str_classpath" StructorizerApplet.java +-echo "Done" +- +-# OS specific classes +-if test -n "$do_apple"; then +- echo; echo "Compiling Apple specific code..." +- javac $str_javac_opts -classpath "$str_classpath" lu/fisch/structorizer/application/AppleStructorizerApplication.java +- echo "Done" +-else +- echo; echo "Apple specific code skipped" +-fi + + # copying some other files to binary tree + echo; echo "Copying resources..." +@@ -147,7 +135,6 @@ cp lu/fisch/structorizer/gui/*.txt ../bin/lu/fisch/structorizer/gui/ + cp lu/fisch/structorizer/gui/*.xml ../bin/lu/fisch/structorizer/gui/ + cp lu/fisch/structorizer/locales/*.txt ../bin/lu/fisch/structorizer/locales/ + cp lu/fisch/structorizer/generators/*.txt ../bin/lu/fisch/structorizer/generators/ +-cp lu/fisch/structorizer/parsers/*.cgt ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.egt ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.grm ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.xsd ../bin/lu/fisch/structorizer/parsers/ +@@ -155,20 +142,5 @@ cp lu/fisch/structorizer/parsers/*.nsd ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/*.properties ../bin/lu/fisch/structorizer/ + echo "Done" + +-if test -n "$start_compiled"; then +- +- # changing into binary directory +- cd ../bin/ +- +- # run the application +- echo; echo "Running Structorizer from compiled class files" +- if test "$start_compiled" = "s"; then +- java -cp $str_classpath Structorizer +- else +- java -cp $str_classpath Structorizer & +- fi +- +-fi # start block end +- + # move back into the folder where we started + popd >/dev/null diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 16365674706ed..bf19d0f77eb6f 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -3,15 +3,23 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "3.05.00"; + version = "3.05.02"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc="; + hash = "sha256-28osuZnVwkJpNTYkU+5D5PI8xtViFzGCMScHzkS2H20="; }; + # leptonica 1.83 made internal structures private. using internal headers isn't + # great, but tesseract3's days are numbered anyway + postPatch = '' + for f in textord/devanagari_processing.cpp cube/cube_line_object.h cube/cube_line_segmenter.h cube/cube_utils.h ; do + sed -i '/allheaders.h/a#include "pix_internal.h"' "$f" + done + ''; + enableParallelBuilding = true; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 36c4c694a16a8..aecdf58186d05 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -3,26 +3,20 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE="; + hash = "sha256-sV3w53ky13ESc0dGPutMGQ4TcmOeWJkvUwBPIyzSTc8="; }; - patches = [ - # https://github.com/tesseract-ocr/tesseract/issues/3447 - (fetchpatch { - url = "https://github.com/tesseract-ocr/tesseract/commit/dbc79b09d195490dfa3f7d338eadac07ad6683f7.patch"; - sha256 = "sha256-lGlg0etuU4RXfdq1QH2bYObdeGrFHKf9O8zMUAbfNIQ="; - }) - (fetchpatch { - url = "https://github.com/tesseract-ocr/tesseract/commit/6dc4b184b1ebf2e68461f6b63f63a033bc7245f7.patch"; - sha256 = "sha256-DwIX3r5NmeajI6WgIVHDbkhLH/ygJIjPO5XrbzWQhSw="; - }) - ]; + # leptonica 1.83 made internal structures private. using internal headers isn't + # great, but tesseract4's days are numbered anyway + postPatch = '' + sed -i '/allheaders.h/a#include "pix_internal.h"' src/textord/devanagari_processing.cpp + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index 757bf7cb7b53b..e9b24e4c61f10 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -23,32 +23,38 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; + sha256 = "sha256-lyljfJ4RZETEED4bofC/Rq88PMNhoHO1kgHmmaXPuhM="; }; - buildInputs = [ - vulkan-headers - vulkan-tools - vulkan-loader - glslang - glfw - libjpeg - pkg-config - rsync - cmake + strictDeps = true; + + nativeBuildInputs = [ clang + cmake + glslang llvm llvmPackages.openmp - pugixml - freetype + pkg-config + rsync + ]; + + buildInputs = [ exiv2 ffmpeg - libvorbis + freetype + glfw + libjpeg libmad + libvorbis + llvmPackages.openmp + pugixml + vulkan-headers + vulkan-loader + vulkan-tools ]; dontUseCmakeConfigure = true; @@ -60,5 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanatos/vkdt"; license = licenses.bsd2; maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 2ba96fda3f0b9..e79f322be5e4c 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/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index dcea56f16d76a..a2e90571e93d5 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.12.1/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/kalendar.nix b/pkgs/applications/kde/kalendar.nix index eb5649a32252a..1bf6f3d1e1396 100644 --- a/pkgs/applications/kde/kalendar.nix +++ b/pkgs/applications/kde/kalendar.nix @@ -13,6 +13,7 @@ , qqc2-desktop-style , kirigami2 +, kirigami-addons , kdbusaddons , ki18n , kcalendarcore @@ -59,6 +60,7 @@ mkDerivation rec { qqc2-desktop-style kirigami2 + kirigami-addons kdbusaddons ki18n kcalendarcore @@ -97,7 +99,7 @@ mkDerivation rec { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; homepage = "https://apps.kde.org/kalendar/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ Thra11 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index f96e8cf6b677e..468e264915c81 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/kdevelop/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix index 86d3de9eb39a9..c73f2bba7b508 100644 --- a/pkgs/applications/kde/kdevelop/wrapper.nix +++ b/pkgs/applications/kde/kdevelop/wrapper.nix @@ -1,7 +1,7 @@ -{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: +{ lib, symlinkJoin, kdevelop-unwrapped, plugins ? null }: symlinkJoin { name = "kdevelop-with-plugins"; - paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); + paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins); } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 8262febad7afb..65213fa15afb6 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/print-manager.nix b/pkgs/applications/kde/print-manager.nix index 2ea662419b17c..5fa200978353c 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -22,5 +22,5 @@ mkDerivation { outputs = [ "out" "dev" ]; # Fix build with cups deprecations etc. # See: https://github.com/NixOS/nixpkgs/issues/73334 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 70a00826dc3de..81ae24b71c833 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1875 +4,1875 @@ { akonadi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-22.12.1.tar.xz"; - sha256 = "1kb0hf705jqsbv075ja7pfh7yyfnxp5cigcgrdw4i0wh94rr1c3d"; - name = "akonadi-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-22.12.1.tar.xz"; - sha256 = "07pk2ivfmf4pcmhafs17bvh63rqq70pybrv9qj2p6lih52a9021g"; - name = "akonadi-calendar-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-tools-22.12.1.tar.xz"; - sha256 = "144k1isdb805zp6mrmpx8n8xww4kv0xd6kp4cziwnbwm46iipwqa"; - name = "akonadi-calendar-tools-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-contacts-22.12.1.tar.xz"; - sha256 = "1hzgc1bljjf6ac40fsgv5rgndq7s2hl5kn0hc7lb8vkbaab0zmni"; - name = "akonadi-contacts-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-import-wizard-22.12.1.tar.xz"; - sha256 = "1hlpsnh2v2f5asi07b46n18rhzqcc176n308503xnpmf33iw6dan"; - name = "akonadi-import-wizard-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-mime-22.12.1.tar.xz"; - sha256 = "0gz7xn1pkiidmhiwnha6a9ffkyihv8dxvdym2k8amsvabp08nxa8"; - name = "akonadi-mime-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-notes-22.12.1.tar.xz"; - sha256 = "11m38nc3prfar3430makyg9fa3xc2bflyw99lxbfamvh5sk2miv5"; - name = "akonadi-notes-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-search-22.12.1.tar.xz"; - sha256 = "0hmd6jl3asv4dkicpn05friic61xx0cjz87qznkmknrrlh1hwd8n"; - name = "akonadi-search-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadiconsole-22.12.1.tar.xz"; - sha256 = "1jgmds3qy74hwcxqnrg9nyndpdp5g9ys83jkjgbf61xzzw83fvgl"; - name = "akonadiconsole-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akregator-22.12.1.tar.xz"; - sha256 = "14fm2qcc87wawhskc31np9s3i87bmjwy2blzzl4430l6jpgqv0q7"; - name = "akregator-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/analitza-22.12.1.tar.xz"; - sha256 = "0wjry2ls7fpi6jdcar4wr9ric5vgzbwqgjyjz2xkgd54l9sqbllv"; - name = "analitza-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ark-22.12.1.tar.xz"; - sha256 = "033y3dcxxvkbfqq9ncv0wxnyqdkbg988jn500hvkgzg87ddj8317"; - name = "ark-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/artikulate-22.12.1.tar.xz"; - sha256 = "1j7lmvds5lq2g97llszy05khwsjw0ypsay49551pm7awk2hhx38h"; - name = "artikulate-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/audiocd-kio-22.12.1.tar.xz"; - sha256 = "0m6ik4p3pfw8sdmqiac42v4mi4mrgmx7dsj0n4zzpfa7nn4iiaz5"; - name = "audiocd-kio-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/baloo-widgets-22.12.1.tar.xz"; - sha256 = "1s2a7rsm6y5z0p0cp49bv0868di45qrzrkl7s76cnm56bssyrrnw"; - name = "baloo-widgets-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/blinken-22.12.1.tar.xz"; - sha256 = "1myn9g04dk43gqsahbgqcg5b5vd8yfwaijxyw0pfqllanj7vjlpa"; - name = "blinken-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/bomber-22.12.1.tar.xz"; - sha256 = "01d07xi012lq9prs3lr68l5v4m0z31ddmm5rdldxzrx6vwf1233l"; - name = "bomber-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/bovo-22.12.1.tar.xz"; - sha256 = "134bcjfd4sz2d96nd4yad9hz72nymphgsdkgm81p7w29dmyk8bz3"; - name = "bovo-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/calendarsupport-22.12.1.tar.xz"; - sha256 = "1yz95mlqjac9db7v7k953b4zky5369d9yhrr6f2m8950205xdab3"; - name = "calendarsupport-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/cantor-22.12.1.tar.xz"; - sha256 = "0yi2pqh2jarcbx979vgbpm415rbpn5p5q3b6n2276mxq6x338hl6"; - name = "cantor-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/cervisia-22.12.1.tar.xz"; - sha256 = "0v2shjgc8jpzpll00apv2d6lqp08a277pv674skq4fc770aviaxk"; - name = "cervisia-22.12.1.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.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/colord-kde-22.12.1.tar.xz"; - sha256 = "0ky3dr60szvg8fq6zlk7gsx997zql6hsfqv8navri3c3nra26r4y"; - name = "colord-kde-22.12.1.tar.xz"; + 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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dolphin-22.12.1.tar.xz"; - sha256 = "1slcv108h2i5s9i2hlyiskfpmrc0r4awm3riyw0wa3h902h4lsbz"; - name = "dolphin-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dolphin-plugins-22.12.1.tar.xz"; - sha256 = "03bj0jf92s5xb8nzzrh4wkcwm1zp101yg2r624r20djl8rkysivj"; - name = "dolphin-plugins-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dragon-22.12.1.tar.xz"; - sha256 = "1rk00h91dhs78h3n97zxj8qxkvs7m94544xhs37qpnm735fdbkv0"; - name = "dragon-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/elisa-22.12.1.tar.xz"; - sha256 = "1ywi1v2pz9gi3qgdrkcxivcx9sc82swckm1ipaf6x4ygbi5g0r5f"; - name = "elisa-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/eventviews-22.12.1.tar.xz"; - sha256 = "1bvlnaknn3jcjwwx9gfsqhq7vywjqbji3zfrmab4hv4v1bp5hgs9"; - name = "eventviews-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/falkon-22.12.1.tar.xz"; - sha256 = "14wngik0hlvj49x0vx2ndyswk3yvh3jc0g21lfrnsvbxsppjvskx"; - name = "falkon-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ffmpegthumbs-22.12.1.tar.xz"; - sha256 = "0xf54rzard24az08mb6z9p23173nxsgmyfkriil5f87k67f7cf28"; - name = "ffmpegthumbs-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/filelight-22.12.1.tar.xz"; - sha256 = "1ww6h0p0y9phara8m2l6jbwr6vbhi1zid7xdrhfbg0vwz0ql42sz"; - name = "filelight-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/granatier-22.12.1.tar.xz"; - sha256 = "17qjf35dzsykn7l5483ccihzqc4wz9p3bn2l3s5yrgizsrgbir0c"; - name = "granatier-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/grantlee-editor-22.12.1.tar.xz"; - sha256 = "11s7kwm0sdcvzf27fx177n2ynklwlkxy8vl4hh42xh9563v9gw67"; - name = "grantlee-editor-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/grantleetheme-22.12.1.tar.xz"; - sha256 = "1xx09jaxg6cwn84svh6wkvxx46qv18rk1dr58dfyxgi3vl3nzihp"; - name = "grantleetheme-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/gwenview-22.12.1.tar.xz"; - sha256 = "12i7zri7mxhjfbykb1nhsh5acppcql3gkmjif92qp4f4d7fqrgsb"; - name = "gwenview-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/incidenceeditor-22.12.1.tar.xz"; - sha256 = "1agqkqcksqf992albppijysddyhfgc6l1zxg6qyyvw9iag6p509x"; - name = "incidenceeditor-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/itinerary-22.12.1.tar.xz"; - sha256 = "1fmsfnjywa0vy91dg2z093x36fcv50gc5xp8hqlrjx4q7hqja13n"; - name = "itinerary-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/juk-22.12.1.tar.xz"; - sha256 = "066ll1lbmgy9l9bpv7iw75gknjdb92dbaqpsir0a2j4llj40yym1"; - name = "juk-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/k3b-22.12.1.tar.xz"; - sha256 = "0lg8jfgs73j5bfx00g6lbgmmw98l2m5c5g8mkdw5ayr9wg5iwzhl"; - name = "k3b-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-integration-22.12.1.tar.xz"; - sha256 = "0avy1ld72z5sx7nd78lar54x7a7zb7pa7p62bmxyhkmrvvlj6zjk"; - name = "kaccounts-integration-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-providers-22.12.1.tar.xz"; - sha256 = "16acbba803i24psyax9xbb82gs0wqwhpml1hrd3nwkdf7irngdna"; - name = "kaccounts-providers-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaddressbook-22.12.1.tar.xz"; - sha256 = "100rrb6q63p1qawp9ww9dif06q1f9w02xgfrlhki3xvgdkpfy92r"; - name = "kaddressbook-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kajongg-22.12.1.tar.xz"; - sha256 = "0zc08cgpw0pwbjhrs186m4l5rp61gjbqzh4xh9yg24i3k4yn8z6g"; - name = "kajongg-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalarm-22.12.1.tar.xz"; - sha256 = "11h0a1jgp7p0zkyqfd2vmv24nnv02jfcqw1z1pi6qr0ywgn8ba9i"; - name = "kalarm-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalendar-22.12.1.tar.xz"; - sha256 = "1r4r2pa5p0951vvcvw1gyrs1k41xd4495lb72qkv0nhvvb6lp2aw"; - name = "kalendar-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalgebra-22.12.1.tar.xz"; - sha256 = "0iai8anpxb3qxp927vhz294c3qh2h3fn84l5viry7rsi9wkyckwf"; - name = "kalgebra-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalzium-22.12.1.tar.xz"; - sha256 = "0jnhhy9xilkafmzbbgxp4l3hx6qsrkkwm7yxf2i7jw5wzax98s1y"; - name = "kalzium-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kamera-22.12.1.tar.xz"; - sha256 = "0sxms7m9mxadf9qcxdlvnrav7lvapgbs3q48c2pydgyszrq54b54"; - name = "kamera-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kamoso-22.12.1.tar.xz"; - sha256 = "024j6ijmgxkdjavach6qi6n81g728kd3qs6r6kkm36j3cl19xnpf"; - name = "kamoso-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kanagram-22.12.1.tar.xz"; - sha256 = "0ir8xa826mvnk8s38mb5p61kfx7hfrxzifacv4hpwn7wqgb37986"; - name = "kanagram-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kapman-22.12.1.tar.xz"; - sha256 = "1qjg13vnwdrkfj7p88rlq1b3vhyxsgd7x6amqwd65qhbiiall732"; - name = "kapman-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kapptemplate-22.12.1.tar.xz"; - sha256 = "0ixgfv3q6a1qiggr0r1fnl2frdblb602p3g98mh4yj824ssh950y"; - name = "kapptemplate-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kate-22.12.1.tar.xz"; - sha256 = "0r7smfmdfhsfqr102w5di8xx1smbk5z9q6a9fhlplrdxkfckmw33"; - name = "kate-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/katomic-22.12.1.tar.xz"; - sha256 = "15sdvyzy36bw6dwj4v2i02qjw7r4m4xfqk16l8sphw67071vppch"; - name = "katomic-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbackup-22.12.1.tar.xz"; - sha256 = "12ms38wv9skzn3dbpdqr1b1rrr2skni4k226sh14l8rlh1phrwx3"; - name = "kbackup-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kblackbox-22.12.1.tar.xz"; - sha256 = "0fs2gdlzxf0xmbvf7l833w053s9rhib0cb9iqg9l1kb83j2x0nfa"; - name = "kblackbox-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kblocks-22.12.1.tar.xz"; - sha256 = "1aq68p5g0khsa3ci6lw1cm2rmrl2lmx7vwyw8idgbpb18b6w211w"; - name = "kblocks-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbounce-22.12.1.tar.xz"; - sha256 = "0w9p2f3x1jmw6l0im4l3grbm2329rrhs1caf60rzdprkk7xpi5v7"; - name = "kbounce-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbreakout-22.12.1.tar.xz"; - sha256 = "1x5gda3ilsxbsnwgj7mmf20i5i8bw2nnnf8n5wbhi2sqlh05xmpy"; - name = "kbreakout-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbruch-22.12.1.tar.xz"; - sha256 = "1jf4gv7yihfm9djxqxlp90g49zp6j3nxvlgkh3r31ki11a993nha"; - name = "kbruch-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcachegrind-22.12.1.tar.xz"; - sha256 = "01ign21xhl5xypxry5jfmay456m64kmsb5292xqrd91kwk56z3ns"; - name = "kcachegrind-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcalc-22.12.1.tar.xz"; - sha256 = "17msfxjzyjiq4lfl4p3kxndgplc8q3ghjbvfx8z09r0a0bqd52wl"; - name = "kcalc-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcalutils-22.12.1.tar.xz"; - sha256 = "077k3wppnzvpwwzf4n9r81rm996x750npsri4acn94ff7wp98r0r"; - name = "kcalutils-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcharselect-22.12.1.tar.xz"; - sha256 = "0c5hswy8vjsbacac3la6n11rf4hr2g79w96qqha4dgjzzparaf4y"; - name = "kcharselect-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcolorchooser-22.12.1.tar.xz"; - sha256 = "1kkhp7m69jcskpqrf6maw0b3k5wjfham54iwngyzgznz195cmad4"; - name = "kcolorchooser-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcron-22.12.1.tar.xz"; - sha256 = "0i5pnqb39mgllzxqdyp4pa0109i1q59lx3q0b6445r4lbgxmdd8a"; - name = "kcron-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-scripts-22.12.1.tar.xz"; - sha256 = "0544cjxk8l1hwfzi93xvs0w6fv47dw2s45r5fdzragna3w8nbh9l"; - name = "kde-dev-scripts-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-utils-22.12.1.tar.xz"; - sha256 = "0vk9ziz4dim55h93v6bfszr7nanxs6hxap059rmq3y5vd4cv5fys"; - name = "kde-dev-utils-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdebugsettings-22.12.1.tar.xz"; - sha256 = "0fmxh38vc28hjv7brp5khj8mn3k83rwkyjlm6kfxnnxwyp7h3n0a"; - name = "kdebugsettings-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdeconnect-kde-22.12.1.tar.xz"; - sha256 = "17yzqibcbab3h1vy88m7wd52gc76j0g5an8mr2xw7nrjl6q7mfm7"; - name = "kdeconnect-kde-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdeedu-data-22.12.1.tar.xz"; - sha256 = "1rfgpb2fa3ivhcicqdb2yvbslgmpw0k1gyrd76awaigymv9hd7l8"; - name = "kdeedu-data-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-mobipocket-22.12.1.tar.xz"; - sha256 = "13iijl2gagnpx55h65mlvq1g2iy8m2d8w5aj1wx3496nxcj0fyl6"; - name = "kdegraphics-mobipocket-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-thumbnailers-22.12.1.tar.xz"; - sha256 = "172lv6ysp3b13ks9548iw1s8nw7wi1vxnxsaf97bsirq1by4f42a"; - name = "kdegraphics-thumbnailers-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdenetwork-filesharing-22.12.1.tar.xz"; - sha256 = "0mwczjnj3nsnlsk5y0v26fszs5gfq8g3yki8xgan7hgc14p4ncik"; - name = "kdenetwork-filesharing-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdenlive-22.12.1.tar.xz"; - sha256 = "1pfp00gkvxmm578fj6a86la1p2iypfgx2j1zk72qdj9kczsnw7mg"; - name = "kdenlive-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdepim-addons-22.12.1.tar.xz"; - sha256 = "1zxs8n28yl8a1kbm4ndljs4giyj473alkqlzkjgc60cz6g2fq58k"; - name = "kdepim-addons-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdepim-runtime-22.12.1.tar.xz"; - sha256 = "0vghpf5lnl0mfwdac1mghr48bfvqg16az090w6msn0rs77ai1q2s"; - name = "kdepim-runtime-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-kio-22.12.1.tar.xz"; - sha256 = "1rzcq0v0faa2ix596c209p108wsrj8p8mnvrgkkz6s5gwswqvi0z"; - name = "kdesdk-kio-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-thumbnailers-22.12.1.tar.xz"; - sha256 = "1w09rpri600k6v4z0srw0nfrg0dhqhsvxzj3vmgkksw2rllq7gm2"; - name = "kdesdk-thumbnailers-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdev-php-22.12.1.tar.xz"; - sha256 = "0jna5b9c4ir9x622iivbbz2h6bmp9hbvyxa99h791inpfcgbkxh0"; - name = "kdev-php-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdev-python-22.12.1.tar.xz"; - sha256 = "064897836jgrfwqssk0fkxpc5bw61d41l0wk1qqavzv0bd22ljn8"; - name = "kdev-python-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdevelop-22.12.1.tar.xz"; - sha256 = "0qlhjdaaisjqmf1ss1nwrj8ppqy6z7aq9vzh18sb924y439bnc7k"; - name = "kdevelop-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdf-22.12.1.tar.xz"; - sha256 = "11hh03mhccwqj141xrpkiz72lg1rwzixr3lsdbkjvx8b7mc2f5rc"; - name = "kdf-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdialog-22.12.1.tar.xz"; - sha256 = "1wlmq01a78rw3lkv26wjmbyr56y1k945sdwvl521pz5bzanl2ppa"; - name = "kdialog-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdiamond-22.12.1.tar.xz"; - sha256 = "1b0ybhryxkr2p0vbs03pn70w16cpgbps3n1gmf4iqsg4xh86hhcc"; - name = "kdiamond-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/keditbookmarks-22.12.1.tar.xz"; - sha256 = "0djcm96hcj7fawyyxg39rnwq01p84c1w7hyrsz6c8cha8875lbr1"; - name = "keditbookmarks-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfind-22.12.1.tar.xz"; - sha256 = "1li89qvfj7d6q3m8clk1sgzlwrgki966yvbvsjj6q49c463gjfla"; - name = "kfind-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfloppy-22.12.1.tar.xz"; - sha256 = "0kxx2h4wxpdjzg4nzfj2ws6vs1jbq1l2r1n1zsllbaj7bxy7rif0"; - name = "kfloppy-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfourinline-22.12.1.tar.xz"; - sha256 = "0gag64zbm22mwsqkzip7q2lzwc40vqma6cxlf5m40zxin1p0nk7s"; - name = "kfourinline-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgeography-22.12.1.tar.xz"; - sha256 = "0xfyvzkzy5pp1321iyyvjy35ayav0adbyfym00np3a0sglpmb007"; - name = "kgeography-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kget-22.12.1.tar.xz"; - sha256 = "18z2nsr07m4d9ybi4jdv1hvxnf0cpvbyy39znba7r3psr3q9j9sz"; - name = "kget-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgoldrunner-22.12.1.tar.xz"; - sha256 = "1yrz6iafk01sm4mhjgkz8gsphsaxmrgf0zjjyzqqz4blzhi0fm8w"; - name = "kgoldrunner-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgpg-22.12.1.tar.xz"; - sha256 = "081g3ib0cd9zyg7vlkj1c99z1x5a1r3v3ck2f7xhlq1vgh6b610m"; - name = "kgpg-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/khangman-22.12.1.tar.xz"; - sha256 = "19yqlin45fwf6n9a94cd3h5101cw50rvxsvcx02y9cm405pdnx6l"; - name = "khangman-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/khelpcenter-22.12.1.tar.xz"; - sha256 = "1cwn1mp79lps764vdilrprj99b9vxmqfxz81zk2vsyywnfyq3nly"; - name = "khelpcenter-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kidentitymanagement-22.12.1.tar.xz"; - sha256 = "0zvp52kmg9mmgfjw01il0j9656gqi854i3dvir0djhqrqfv8ivb0"; - name = "kidentitymanagement-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kig-22.12.1.tar.xz"; - sha256 = "1mcb98r6j5byvx6bi2rhr3d6c9xdkf9cwnz2wy3v69xsi29var80"; - name = "kig-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kigo-22.12.1.tar.xz"; - sha256 = "1nl0i1qdbfpjp1vmy71zwa6f2yp9vlzvfdfb4rdsqdz23x4irbzg"; - name = "kigo-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/killbots-22.12.1.tar.xz"; - sha256 = "0lmd3cr087jjd4h557rsbjqr15j47wwr2is7vv4l3idl3hn3izak"; - name = "killbots-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kimagemapeditor-22.12.1.tar.xz"; - sha256 = "1shpkn79ag1invsmizz9amz5sbphpasp2a9l86mkzm8bwsrqjihb"; - name = "kimagemapeditor-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kimap-22.12.1.tar.xz"; - sha256 = "03fgi82l8zq1r13akvchlymlzc2ivxhw9br75i5j93v3jvfhindx"; - name = "kimap-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-extras-22.12.1.tar.xz"; - sha256 = "0g1is8hgy9zjzm7l3msg6shcjvrl0x6wf5gji0c34hkrr5axd0gv"; - name = "kio-extras-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-gdrive-22.12.1.tar.xz"; - sha256 = "1p3q17c7f6i7q5k3k5rxckl1wdr8bs9z9v8zz2jwnky3licfhgk8"; - name = "kio-gdrive-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-zeroconf-22.12.1.tar.xz"; - sha256 = "0qhl2yygs2bs56nd3ybwhcd4ry0qls2qzhh3lb8y9xqiakz669sn"; - name = "kio-zeroconf-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kipi-plugins-22.12.1.tar.xz"; - sha256 = "1jgjnc0svjyq3ffgiksxcxk140lk3bligh8501jv5q7sy6flcwba"; - name = "kipi-plugins-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kirigami-gallery-22.12.1.tar.xz"; - sha256 = "1drbqhcjx6ilqj49y8pghg94hwdwnj08wfl33j9ssn59wh6s282h"; - name = "kirigami-gallery-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kiriki-22.12.1.tar.xz"; - sha256 = "1ad71h5fy6c5826hhdfbzr4x9gbl5z28vqwc9kjhyjvl9x24h264"; - name = "kiriki-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kiten-22.12.1.tar.xz"; - sha256 = "0cz5whrmzj6yflqw5cfvazmdf66qcgm1wz94h8f283nnglc4vz49"; - name = "kiten-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kitinerary-22.12.1.tar.xz"; - sha256 = "0i9mbfm5f57hac9rj50474ck05hrdv4m2qdaqi4jm2dr737wmigh"; - name = "kitinerary-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kjumpingcube-22.12.1.tar.xz"; - sha256 = "0cyq25cmcirw7kx6yln1nn0l5va9q7a8ngcldggknlnpap3y5m4q"; - name = "kjumpingcube-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kldap-22.12.1.tar.xz"; - sha256 = "1dyn01jxlh5qidlnhd989c88id6vxfazn9flhlhsklgcaywf73y8"; - name = "kldap-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kleopatra-22.12.1.tar.xz"; - sha256 = "0vg311c1qbvbajb0n46fhy90yafq5rgrh107z172snbvd1v42bj9"; - name = "kleopatra-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klettres-22.12.1.tar.xz"; - sha256 = "1jad7waik1agaih98x9bm6apmm6plz9kpsy3zfcll80vl0p6g8vs"; - name = "klettres-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klickety-22.12.1.tar.xz"; - sha256 = "004hj4dbwxy9yyjcgc8awjwc45x9gsh5jfs5w8261l0qj4zinj8l"; - name = "klickety-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klines-22.12.1.tar.xz"; - sha256 = "0jsb5842qmi0ll23x6rmmiv91zwyijnvmq6bvk9fs66i0fczgkj7"; - name = "klines-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmag-22.12.1.tar.xz"; - sha256 = "09vq93jab8hv918fabz3i50311n6vglpig5nrgdzv72mvy5y86bk"; - name = "kmag-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmahjongg-22.12.1.tar.xz"; - sha256 = "0103p982wih0niqpzk464m2nwyfxinzl783qj7liwavrgsv1fkfy"; - name = "kmahjongg-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmail-22.12.1.tar.xz"; - sha256 = "02qgsyxs4y37ry2xwwc2x541l4l7gfbhq1gmankn1gp6128p9zhi"; - name = "kmail-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmail-account-wizard-22.12.1.tar.xz"; - sha256 = "0ncwmhz69fja35fg90a7q8m1vv94cbxapr5n69vgb4xlypf9sd38"; - name = "kmail-account-wizard-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmailtransport-22.12.1.tar.xz"; - sha256 = "19b6hhgdvnh23v5yl6rz6c0i742lavmmx1xkkkza69ha0nfaphw2"; - name = "kmailtransport-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmbox-22.12.1.tar.xz"; - sha256 = "1g01n0nvvjpds8bh8zg2r97s3xddhcvlxs6hvb2m7xck0x0w0rnq"; - name = "kmbox-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmime-22.12.1.tar.xz"; - sha256 = "196sipqw1w4v3va4qy3y4369hyd6zgi8w36fqfkismc1z5lbhhi5"; - name = "kmime-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmines-22.12.1.tar.xz"; - sha256 = "1n0wbgxjah0n2mik4x1fkb1n3bq7zkkiklj2qn7l64qszdxjmzq4"; - name = "kmines-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmix-22.12.1.tar.xz"; - sha256 = "00nq47v6h452wymj5bv3h0ava8wx1vg3w5kc43bnw7rfgh1ikpm9"; - name = "kmix-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmousetool-22.12.1.tar.xz"; - sha256 = "0z7ph40zld45pzyyh8naczqzvccra7rjcy9d12phcdmii2x05njw"; - name = "kmousetool-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmouth-22.12.1.tar.xz"; - sha256 = "0gkq6m3ylcghqsdwv8i8372dsia8cd61s8jfwnw94v41zbi5l6md"; - name = "kmouth-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmplot-22.12.1.tar.xz"; - sha256 = "0vvqh5nikfd4lx90c41va6y66iad4dgzcgp1kxwshwlzlkpnd783"; - name = "kmplot-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knavalbattle-22.12.1.tar.xz"; - sha256 = "195vqwp3k7dpgkbg43pl5y7vlm6858y1p6wqdz54dam1gcg7185g"; - name = "knavalbattle-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knetwalk-22.12.1.tar.xz"; - sha256 = "0jf2jk1i3awww6yalb6k5p4c31d323m4f6dj76r5nnalpj81jkiv"; - name = "knetwalk-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knights-22.12.1.tar.xz"; - sha256 = "106kq9ahr000nnakiq9n8by06qq2av4pnlh23y4n0z52rbhq866w"; - name = "knights-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knotes-22.12.1.tar.xz"; - sha256 = "180g0j1fhhixm4qm61whbik3z1pvijw33v2pb4jjzzhbxn439xcm"; - name = "knotes-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kolf-22.12.1.tar.xz"; - sha256 = "1v5xkjh6xdfmll7bcqsv1218bvr6q3z3ac1367gd824bcxv5j5np"; - name = "kolf-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kollision-22.12.1.tar.xz"; - sha256 = "0ksq4inaq5a74jxxhsajwxnpgr7wnjgpm70kj0layxvryqjlzmkj"; - name = "kollision-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kolourpaint-22.12.1.tar.xz"; - sha256 = "0m1p1xdi8ax8zanqgmyqndzz1bngz4bxdv4lxjx4nqimgjjrbmj8"; - name = "kolourpaint-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kompare-22.12.1.tar.xz"; - sha256 = "0g6qw3ajgb71rj99f2sni64i7sqdq586i71pj66pj18kx51m4zsn"; - name = "kompare-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konqueror-22.12.1.tar.xz"; - sha256 = "1nyhrnl0ry5439r75974fy7mks78knxs6m8zg8y24glbmjnb1d0m"; - name = "konqueror-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konquest-22.12.1.tar.xz"; - sha256 = "0nmrxylx1spvp9m3xwy9xgw2nxrv4k68zanr7q7cxlc95wlxdrk6"; - name = "konquest-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konsole-22.12.1.tar.xz"; - sha256 = "1jyfl6ibcpxphgh5by3501vk519fkvr5y9jhl1wzx6dh4vw7zh9l"; - name = "konsole-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontact-22.12.1.tar.xz"; - sha256 = "1m943xcg4csjvcfm9py7h7cr3f2k3xvlidr75ri4sbwnhkl7494k"; - name = "kontact-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontactinterface-22.12.1.tar.xz"; - sha256 = "13l44jm0rfin0vbm4znjn25igfmgkifi993qcq5pq6fy96cj2g8l"; - name = "kontactinterface-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontrast-22.12.1.tar.xz"; - sha256 = "0vbqxn73p4d0wlv70gv39pz72lrwc92png14vfwi3ka23751mqai"; - name = "kontrast-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konversation-22.12.1.tar.xz"; - sha256 = "12246dlhwak7hxj2p2i1wksijqx0a8iwrk7qyh1543hcjm4mkyyv"; - name = "konversation-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kopeninghours-22.12.1.tar.xz"; - sha256 = "198m55gwvv5ig28hibk7gib6wj7rxahngw6ryshqgr0yhrir1bha"; - name = "kopeninghours-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kopete-22.12.1.tar.xz"; - sha256 = "0x7ya19n2wfd7h4h71sqa9kp02qh2sc0r8wy9njjn6basc6cj7yd"; - name = "kopete-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/korganizer-22.12.1.tar.xz"; - sha256 = "11gqa0bxpwra5ml8yb7pp7x4jbn3rndi8c66jhmi89gb33qyfnzh"; - name = "korganizer-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kosmindoormap-22.12.1.tar.xz"; - sha256 = "1fb7hbndys6yji6xmdi6qildzr5s5wknr3mzckjc093sqb5q1dv2"; - name = "kosmindoormap-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpat-22.12.1.tar.xz"; - sha256 = "0c0sr0lyskhqvyrhjb4x1hwpp4b5d1kxc6lnxz9w2qlgng8mr73l"; - name = "kpat-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpimtextedit-22.12.1.tar.xz"; - sha256 = "10r1gmsqf2bd2f0x3x0nwdzwyp3b6zg32fq0jkgwd1j1zyxipmaf"; - name = "kpimtextedit-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpkpass-22.12.1.tar.xz"; - sha256 = "1hp5d7yzklyi9fy1d3dn39xiaxrhvxskchdrpjs83q91l8c49750"; - name = "kpkpass-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpmcore-22.12.1.tar.xz"; - sha256 = "13dpp7fm2750qbnwrp4rpj9kp9skpqkpq5jkj1s40b6267v7p7b4"; - name = "kpmcore-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpublictransport-22.12.1.tar.xz"; - sha256 = "1f8imxkdayyp8p30ld80jl5v2wlnajmxl03cysx016lckqzds60l"; - name = "kpublictransport-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kqtquickcharts-22.12.1.tar.xz"; - sha256 = "1ys904z1c104zyi1184xj63nzhpgwraakmsgw6wfbfxpw6sjy293"; - name = "kqtquickcharts-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/krdc-22.12.1.tar.xz"; - sha256 = "1d8lm41i7mwcg5xd9hl9p32kajxz8iv26696f33z9kb5lhh8wv26"; - name = "krdc-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kreversi-22.12.1.tar.xz"; - sha256 = "1aq7qnnmpkkb41znzxvhbfnxr0c60irlirkw7jv2jf7rqlqhahls"; - name = "kreversi-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/krfb-22.12.1.tar.xz"; - sha256 = "04bjybi15bar21334q9zpscw626fih5vnh1ndrz0q95sgyrcpd4z"; - name = "krfb-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kross-interpreters-22.12.1.tar.xz"; - sha256 = "1h97d5gn63r34h9hhn37zmwri1z63c1h30ridahqn45sn2pqigz7"; - name = "kross-interpreters-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kruler-22.12.1.tar.xz"; - sha256 = "18mp51hpqkc9wiwv1zdnx99xjjz58rvk7camz6fj8n4ns1j5q2g1"; - name = "kruler-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksanecore-22.12.1.tar.xz"; - sha256 = "0cx4n1hdbdfwd86b29risbgg2fijyvjcf29k3qky9gk1c7cfil5d"; - name = "ksanecore-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kshisen-22.12.1.tar.xz"; - sha256 = "0phzfzvy8g5dcid92pbx288ix6ri3b9jx6slbqm2wv4p3r96l6hl"; - name = "kshisen-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksirk-22.12.1.tar.xz"; - sha256 = "13ykkkygs0xaxd907xq3a9di61p7pnxdggsfmfpz8zk5xawavx2q"; - name = "ksirk-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksmtp-22.12.1.tar.xz"; - sha256 = "0vbwp2r90fxkmw51fjvphigqjj9lhk0dprb2wnfi9ik08iqc1dk7"; - name = "ksmtp-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksnakeduel-22.12.1.tar.xz"; - sha256 = "16pismxhrygwcbsricmli91sj86w623wkmbblns3yjw7bxy6gg2m"; - name = "ksnakeduel-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kspaceduel-22.12.1.tar.xz"; - sha256 = "0qlc3a05ppny6y2kzxqx817qcjmy5zal78bhhxlykn5l4m8hlis4"; - name = "kspaceduel-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksquares-22.12.1.tar.xz"; - sha256 = "1z52c6m7lx9vg8v7kxnblcpag9l3m0r97rv87s7m2g2d3rw4rfib"; - name = "ksquares-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksudoku-22.12.1.tar.xz"; - sha256 = "00zylx2gla7c264csyix9z8k1h5zy2l0s9mrb2fds0i7i70gwcsw"; - name = "ksudoku-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksystemlog-22.12.1.tar.xz"; - sha256 = "0y7xjf8z8myg3yv7rcdrqj15hj74vibn6myhspb2cn300z617rhr"; - name = "ksystemlog-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kteatime-22.12.1.tar.xz"; - sha256 = "0w7kvvs5w6zhahr1gq8gqv5sljfnp1bwznjammvc1hnqy1f4pj3n"; - name = "kteatime-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktimer-22.12.1.tar.xz"; - sha256 = "0mid32qr2jgn048vsv7j1jljxzwa87lfh0ybxp94c29z2nkxbxnp"; - name = "ktimer-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktnef-22.12.1.tar.xz"; - sha256 = "0pcl7iaq1ipab5gg60w9wczkj8q7mnk62na2kajbgrmaw61slnj0"; - name = "ktnef-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktorrent-22.12.1.tar.xz"; - sha256 = "093dc7gd9g05v78l5xq3c4k6kqx3x6c5n4w24mzq88x9ilf19jfw"; - name = "ktorrent-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktouch-22.12.1.tar.xz"; - sha256 = "1zw6fkf8kcf1wc63bnc3f2i1ahq7y5vr3068yf49rxvd6dkmwxaw"; - name = "ktouch-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-accounts-kcm-22.12.1.tar.xz"; - sha256 = "00sc1jwrqwvia9mylb1xizq0nvkb2zzh72vh9ycpxbxc59x3jdpa"; - name = "ktp-accounts-kcm-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-approver-22.12.1.tar.xz"; - sha256 = "1s26y6wmn1m65rk8v1hd511qk21ll52p62hqp39gy4k2wivs1w5y"; - name = "ktp-approver-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-auth-handler-22.12.1.tar.xz"; - sha256 = "0qcklfnr5nm8c5x5p52nyjkkl2xjw5jzsnn5wsav8bzcm7pfrvp8"; - name = "ktp-auth-handler-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-call-ui-22.12.1.tar.xz"; - sha256 = "1v60czwgiad0psas4ky7psyba75bxlg1xry26qrh3xp0r67a2gg3"; - name = "ktp-call-ui-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-common-internals-22.12.1.tar.xz"; - sha256 = "0j48s6dk8a0925c84iwwk9j3vyw5lnx7mc9jfwaw523qi3pdhc60"; - name = "ktp-common-internals-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-list-22.12.1.tar.xz"; - sha256 = "09dhr3vclymbkhl1zcd1gqpln5gdb6x4pa3as9gygqfiginnzbqc"; - name = "ktp-contact-list-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-runner-22.12.1.tar.xz"; - sha256 = "0d8fj2lf2h1bi36mv2yakc1nz8wmqd2znjx4vjmj7cf49jpr9jlk"; - name = "ktp-contact-runner-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-desktop-applets-22.12.1.tar.xz"; - sha256 = "1wiwflsavbq971mrycn2qrb5xngd6kmph0xwmxj001r3vj6wmxvx"; - name = "ktp-desktop-applets-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-filetransfer-handler-22.12.1.tar.xz"; - sha256 = "0wklr4k2ybbpla0ybnqcj8ms46r14v47ldgy6pkba3lcvydn7zs3"; - name = "ktp-filetransfer-handler-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-kded-module-22.12.1.tar.xz"; - sha256 = "123kvzn2cp2gkpgs3wqigzdmxval39jr0xwwr9mrfnbsdyf9cqs1"; - name = "ktp-kded-module-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-send-file-22.12.1.tar.xz"; - sha256 = "190gv19fzarj9mm8xp282sqag85hpam9sjiggcixqzcdmwp509z0"; - name = "ktp-send-file-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-text-ui-22.12.1.tar.xz"; - sha256 = "1zdxjf2qvi4cg0hk9x9dv91gay4sqpp6h92vy8pi2fids98b5qa6"; - name = "ktp-text-ui-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktuberling-22.12.1.tar.xz"; - sha256 = "0y7rf74pqd9cjh59w5hz59lixzx8l3qxaaqjyrbrrhal90yxq1g7"; - name = "ktuberling-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kturtle-22.12.1.tar.xz"; - sha256 = "0w3kki02z0hhldalyf08nnvplska10v7d01bkgx5syrlnq9rvafb"; - name = "kturtle-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kubrick-22.12.1.tar.xz"; - sha256 = "0azr8j3070j6h7c3alkb559i2b8zb4kvazn6dqavj9bpwmymlpnk"; - name = "kubrick-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwalletmanager-22.12.1.tar.xz"; - sha256 = "0anas3gnkhk1zinjjpixmlcj00bl2q3s5xb21mk1b4wzyz15w20g"; - name = "kwalletmanager-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwave-22.12.1.tar.xz"; - sha256 = "0cvlyrhfw7mc58c25y9cic6c39jc42h3kygdy0v1fp8bg93xzzg3"; - name = "kwave-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwordquiz-22.12.1.tar.xz"; - sha256 = "1xzs0rkmk1mnlss31qhcbwmm6ss9f7my64wsiyfp67rchz9gbl31"; - name = "kwordquiz-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libgravatar-22.12.1.tar.xz"; - sha256 = "0dpvcw5793fsmr23zvnwn2kr194bq880pb3xpq77z9b00yhm6i26"; - name = "libgravatar-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkcddb-22.12.1.tar.xz"; - sha256 = "0w6d2qn4xzxywqj3khbzz3g9lgq5bvimvwqjs1p7i6hak5y4aa0f"; - name = "libkcddb-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkcompactdisc-22.12.1.tar.xz"; - sha256 = "1lv94pzyyh90ga18flky096jdbjnf2rl1wn0p17w4lqlhm2n6d40"; - name = "libkcompactdisc-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdcraw-22.12.1.tar.xz"; - sha256 = "1sv5mkpf9r7vicyn7kxiaa7ykr81c39hnzh45in95m3ygy9p22lb"; - name = "libkdcraw-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdegames-22.12.1.tar.xz"; - sha256 = "0agyf6zvr24h550jagpngndmag6xmkjc7m0qmc9mjjk2yg6ildcm"; - name = "libkdegames-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdepim-22.12.1.tar.xz"; - sha256 = "1n6v9k1gwgvwjw0fqyj4vq9hw5kzy75dl3h6fmh4cyww9hjrjibl"; - name = "libkdepim-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkeduvocdocument-22.12.1.tar.xz"; - sha256 = "08svz6c2w9lyax0x6gj8zxikz3nzna0r2l1s41b3bhpjs3y3jkf4"; - name = "libkeduvocdocument-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkexiv2-22.12.1.tar.xz"; - sha256 = "1rxrw0m3wxdjzlc0plh0l0qpia6ipbx562m5dq9b9w2ppyxk8213"; - name = "libkexiv2-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkgapi-22.12.1.tar.xz"; - sha256 = "0i6ip7vrgvfzx27mjr2hyny6yfi622b5q0gp7kpzs95gnfc2f60i"; - name = "libkgapi-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkipi-22.12.1.tar.xz"; - sha256 = "01xyglfzlk6aczxqcg51yx723p6i0m6d91kwixbj0nzkmjaafza2"; - name = "libkipi-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkleo-22.12.1.tar.xz"; - sha256 = "13flblvkglj25af4jhn9qd0w2krmmmc9icgrppxi8cnlrjyb579y"; - name = "libkleo-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkmahjongg-22.12.1.tar.xz"; - sha256 = "1x64iv0c0b1hpn0aj6scq1dz22w95fr1ikq317zvb3vff6wwrbwm"; - name = "libkmahjongg-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkomparediff2-22.12.1.tar.xz"; - sha256 = "16bs5ifvprwjk0gkgp3vgqn2mgvzjkv4gm338xn58ziiisk0wq0m"; - name = "libkomparediff2-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libksane-22.12.1.tar.xz"; - sha256 = "03kp3jq6y8ia2jshxrq74knazmb2v7i8q5pjv2w11v3gl5m9j0kw"; - name = "libksane-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libksieve-22.12.1.tar.xz"; - sha256 = "0wc505rphvywvixclh17abqla6nnyx8i8j4aysisfzjxkfwi1lsk"; - name = "libksieve-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libktorrent-22.12.1.tar.xz"; - sha256 = "14kk8r67v6wssijqlj6p8sah89cxjgn8420pj4m0cvb4bhkf3vjd"; - name = "libktorrent-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/lokalize-22.12.1.tar.xz"; - sha256 = "1mkqk6azf2253z0ifj9y0wf8wdbxwhvn4k659cy3hcdfzd9a73nd"; - name = "lokalize-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/lskat-22.12.1.tar.xz"; - sha256 = "0srx44k6zlsskl2mh0xrprxzhfm98ywlvc1br8l639vvr5mx2ms9"; - name = "lskat-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mailcommon-22.12.1.tar.xz"; - sha256 = "009cgafhq26nqf1km4lcmypw1y0dig06wmy9rby4pis1f3ikvg5w"; - name = "mailcommon-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mailimporter-22.12.1.tar.xz"; - sha256 = "1cgpxavsla32081mynmc4jj6xyg1ahwvqpwvllzdgw060m190r5n"; - name = "mailimporter-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/marble-22.12.1.tar.xz"; - sha256 = "1hhsfzcqg7pzj02j56zgz0n36ps7y8rkpnpbnn14c8l1xvic9x2v"; - name = "marble-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/markdownpart-22.12.1.tar.xz"; - sha256 = "1c8hacz0rqgawmvg2vk0m9sbz14s9z4h0fxxbism1pn3xs7nxdhm"; - name = "markdownpart-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mbox-importer-22.12.1.tar.xz"; - sha256 = "1wy46bkm69hpv2rl0mcq1xdklr54clnqvskadny58pj8g9krjcnr"; - name = "mbox-importer-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/messagelib-22.12.1.tar.xz"; - sha256 = "09w2n3wvs5fdbq5nbr9fdigjsxqrsi2dx6zxpgd9jf1m1bmcfd7y"; - name = "messagelib-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/minuet-22.12.1.tar.xz"; - sha256 = "0zyrbccs2knzj19gh9ykqcyn5j8z9lxnwy15lb2f7h95hqqkn1xy"; - name = "minuet-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/okular-22.12.1.tar.xz"; - sha256 = "0w0agchkh0fszhvshqkvxs4z0i3q1vnaijqkzm119y1pjwynfkaw"; - name = "okular-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/palapeli-22.12.1.tar.xz"; - sha256 = "0r26nlh26f0wwwg19ppq99ljsb0mfpi034h4g7fix5cq5ps0nyk5"; - name = "palapeli-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/parley-22.12.1.tar.xz"; - sha256 = "02gqylb3liynnjq1vl67y3zkcadnpixaz3zlfx7j8zxz2p2zlxlb"; - name = "parley-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/partitionmanager-22.12.1.tar.xz"; - sha256 = "06ja3qnxshcg0hxczh6z6wc76dcsm41in8np07ch4l13d6nkpqpj"; - name = "partitionmanager-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/picmi-22.12.1.tar.xz"; - sha256 = "06bhkxqhwmk7hpmcsn0s9bql4anlk260dz63g6bcx4c93ln01ypq"; - name = "picmi-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pim-data-exporter-22.12.1.tar.xz"; - sha256 = "1cijyd6qscghppcspimdc7kdvv4la6mbk57z9sj5agx2i05xsda6"; - name = "pim-data-exporter-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pim-sieve-editor-22.12.1.tar.xz"; - sha256 = "1nx1vahgxr175fplm4rv7frlr53fqn50xmfsaph42idi7nnqcrl4"; - name = "pim-sieve-editor-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pimcommon-22.12.1.tar.xz"; - sha256 = "128nqsxw275zi6dn3v1pnip9nhraz6pqjlzklkqm5qljfs5z6wk1"; - name = "pimcommon-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/poxml-22.12.1.tar.xz"; - sha256 = "0rs0bl0vg8qjaxgxbhlv90rgc7y13xg47j9k6v1q1v0gz07l8ms6"; - name = "poxml-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/print-manager-22.12.1.tar.xz"; - sha256 = "09y1x6if1cxsb6xh9b9alfxrfpnzymm71v6hjc0b13jalg7bha1b"; - name = "print-manager-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/rocs-22.12.1.tar.xz"; - sha256 = "032jd0r7wyl33y24wnb95vz70kciyw132ph355ln6vrkkymmfy7w"; - name = "rocs-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/signon-kwallet-extension-22.12.1.tar.xz"; - sha256 = "1pvm1046mp0dlal9ffr455yhvv0689c4iaiv2vkdz7p2lf3745wh"; - name = "signon-kwallet-extension-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/skanlite-22.12.1.tar.xz"; - sha256 = "1j00z785ajqj61qsdbq7pwnw5pjsfkqpk52s7li2kkmikmfhqsq8"; - name = "skanlite-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/skanpage-22.12.1.tar.xz"; - sha256 = "0wnkw2ybd4x35c1jfx6rmdj4iz4gh9bpfdc5ydri790l7c2zz1w4"; - name = "skanpage-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/spectacle-22.12.1.tar.xz"; - sha256 = "05pihywsbml6ncvzd9wih9bm0bwdxvlps9678vai9rdxks7apa78"; - name = "spectacle-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/step-22.12.1.tar.xz"; - sha256 = "1k8s8cyfz895sx5b0w4a71nrsx89zkxk7c8a8fr6jxybgf9gnxz2"; - name = "step-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/svgpart-22.12.1.tar.xz"; - sha256 = "08ffgwm7s8r8yc6j956j08y8dikmgssv0h0xlmk6wlxl0bryb4fr"; - name = "svgpart-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/sweeper-22.12.1.tar.xz"; - sha256 = "0an6md9nk8sv2bmjcvghjxydpdz0rf4bhianym22gzsyxxi0bccj"; - name = "sweeper-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/umbrello-22.12.1.tar.xz"; - sha256 = "1d72808jwgjwzjkj5kw7wvkfvk05x8w0x2abzsbzhl9qf06jgn1h"; - name = "umbrello-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/yakuake-22.12.1.tar.xz"; - sha256 = "0qh48y2jj7lxn0lqyff5s93s4csyw12da6jcixbmcmnm3z33p09l"; - name = "yakuake-22.12.1.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.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/zanshin-22.12.1.tar.xz"; - sha256 = "002smc57r54fs4c2ngk8k20wjjk3khmyfpjlw6hmxbn1hnzl609w"; - name = "zanshin-22.12.1.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/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 3c08f1d8a9dac..ef9c234bb76fd 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.10" else "8.9.12-4.BETA"; + version = if channel == "stable" then "8.10.0" else "8.10.1-19.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-aoa00W5zvZQeHKd2Eqyrxl5Z1PwLMHc5lkMUskLiD74="; + sha256 = "sha256-mIplIW1XGb7EVlPIHgzL16zvVa/3ypfwTMtVSiSvYYE="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-Zt64UGKI3+DayS6XP7jTE+pxv52tUUZbUHiuzjcm1JI="; + sha256 = "sha256-xjbqZ/+sw3jBzbqhzd/mP7CZOCLYYi6KpX8Ypy/8/Es="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-sx9eASpMcgkIH1GRzJMqSQa5Y5GJlYU/20CZFyFK+OU="; + sha256 = "sha256-06wOSKzxZ7xVAUyIa4Fv48Z6nbMsQ/o74mEyVkmgkJs="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-Z1cEynO9iWZra542CVGmefrTNerMe13OcTAzWXNi8jI="; + sha256 = "sha256-zDu3PBj6kvDVpiFuoOuNlmyiSK4ZVuUWX3rBBwlwEvo="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-/WXaLINqLFLft+wrmr+fV0kM9qS5w4etFiGltnzoVdo="; + sha256 = "sha256-F/dnA9mqtXXp5vx6OQ5aPrdeEBMg9g6nozzMMNAZWHk="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-Zv9uHkFCZ0flBMAwQBjNhqFWhAXKyHBfZk733hbSag4="; + sha256 = "sha256-u8ktPt7W4teCJoXq1eEdKZCEsKxjhep/7DMHSMtuFBA="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-Vryk6nMQY+0NIgwJkZ2j3vrxyhrzxbe96jbyoNbPIR0="; + sha256 = "sha256-dZ1Vv4oocDYlw2sibnokUyAKcZ2W7zKofTX2ELamilI="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-74iOaNkuPRKUsTNNd7UTpy5ahjoMmxiNT84Op5ztRGk="; + sha256 = "sha256-JA2U/PfW2+qHPjqIGQL5gWIdqtd5G1lL3+hecYh2lcE="; }; }; }; diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh new file mode 100755 index 0000000000000..aab589fd37ea5 --- /dev/null +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq +#shellcheck shell=bash + +CURRENT_HASH="" + +print_hash() { + OS="$1" + CHANNEL="$2" + ARCH="$3" + VERSION="$4" + + if [[ "$OS" == "linux" ]]; then + if [[ "$ARCH" == "x86_64" ]]; then + EXT="x64.tar.gz" + else + EXT="arm64.tar.gz" + fi + URL="https://downloads.1password.com/${OS}/tar/${CHANNEL}/${ARCH}/1password-${VERSION}.${EXT}" + else + EXT="$ARCH.zip" + URL="https://downloads.1password.com/${OS}/1Password-${VERSION}-${EXT}" + fi + + CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash') + + echo "$CHANNEL ${ARCH}-${OS}: $CURRENT_HASH" +} + +if [[ -z "$STABLE_VER" ]]; then + echo "No 'STABLE_VER' environment variable provided, skipping" +else + print_hash "linux" "stable" "x86_64" "$STABLE_VER" + print_hash "linux" "stable" "aarch64" "$STABLE_VER" + print_hash "mac" "stable" "x86_64" "$STABLE_VER" + print_hash "mac" "stable" "aarch64" "$STABLE_VER" +fi + +if [[ -z "$BETA_VER" ]]; then + echo "No 'BETA_VER' environment variable provided, skipping" +else + print_hash "linux" "beta" "x86_64" "$BETA_VER" + print_hash "linux" "beta" "aarch64" "$BETA_VER" + print_hash "mac" "beta" "x86_64" "$BETA_VER" + print_hash "mac" "beta" "aarch64" "$BETA_VER" +fi diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index e7f094844b9a0..cbfde434e1eff 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.13.0"; + version = "2.14.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-B9XVejPge8wxWAoxj974rLz0dfaZEAaGn2mUcPeqFIo=" "zip"; - i686-linux = fetch "linux_386" "sha256-kLW9PmhCNDosKn1nmtzo8tBjBOaUyzqlLad332UACio=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-jbvkTlIuAm5tHzGm42kO+jykUffKwfOVSOh33i0URtM=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-kA+NjXrNcX0dKh+gNJT82vbQGKFOU8zPvGPqBtuBqOA=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-Pmfdz6jGWuRS76/35/+Al5gAbJ7rFyQQLB9tQr1Ecv8=" "zip"; + i686-linux = fetch "linux_386" "sha256-UQfoof5yuSiMjIWcbSuE45dhJ41MionPcMn8uAwP6I8=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-sx3wgAvazgWjSQMQxVE0irDXCNnDAPBivKQTUC3bZ08=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-pFoOoE329jSzshaHo/XFTIirKsxfdz1yOA0Ljb9VNkY=" "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 ec699d668923a..61b46e7081be0 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.4.1.11"; + version = "5.4.2.13"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-t4azVZVvAJmCCsg/2o+ZWroEmCLfdPYn2iWwVwdhIZw="; + sha256 = "sha256-4DaqIsHfijA0hkhlsC6qQ1n+HC0zwdMtXiswOPOVpM4="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 4b177bf5815ab..d5bbfee0b6f9e 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -58,8 +58,8 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (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.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) @@ -93,12 +93,12 @@ (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) (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"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; }) - (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 = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.5.0"; sha256 = "1160r9splvmxrgk3b8yzgls0pxxwak3iqfr8v13ah5mwy8zkpx71"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 2d9b681a2e469..dfea7f1ffd4e9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "a4617d145756f6dcf1f5729e5a60689aa484403b"; - sha256 = "178ip280bqyqd36rka9g2jx7b7wdf3zh56sahg53yxr55zwq5bcp"; + rev = "22692a1f115e8ca86f83fa17be55d9b20985570f"; + sha256 = "0k0msk1r7ih092cwjngy1824bxkbjwz0d5p3k2r2l67r2p9b3lab"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 6ee3318e15010..b93726e1b979b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; }; - "@babel/core-7.20.7" = { + "@babel/core-7.20.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.7"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz"; - sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.7" = { + "@babel/helper-module-transforms-7.20.11" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.7"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; - sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; + 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" = { @@ -913,13 +913,13 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.7" = { + "@babel/traverse-7.20.12" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.7"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz"; - sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; }; "@babel/types-7.20.7" = { @@ -940,13 +940,13 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.4.0" = { + "@eslint/eslintrc-1.4.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; - sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; }; "@fortawesome/fontawesome-common-types-6.2.1" = { @@ -985,13 +985,13 @@ let sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw=="; }; }; - "@fortawesome/vue-fontawesome-2.0.9" = { + "@fortawesome/vue-fontawesome-2.0.10" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; - sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz"; + sha512 = "OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg=="; }; }; "@humanwhocodes/config-array-0.11.8" = { @@ -1606,13 +1606,13 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; - "ajv-8.11.2" = { + "ajv-8.12.0" = { name = "ajv"; packageName = "ajv"; - version = "8.11.2"; + version = "8.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; - sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; + sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; }; }; "ajv-8.8.1" = { @@ -1732,13 +1732,13 @@ let sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; - "array-includes-3.1.4" = { + "array-includes-3.1.6" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.4"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz"; - sha512 = "ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"; + sha512 = "sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="; }; }; "array-union-1.0.2" = { @@ -1759,13 +1759,22 @@ let sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; }; }; - "array.prototype.flat-1.2.5" = { + "array.prototype.flat-1.3.1" = { name = "array.prototype.flat"; packageName = "array.prototype.flat"; - version = "1.2.5"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"; + sha512 = "roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA=="; + }; + }; + "array.prototype.flatmap-1.3.1" = { + name = "array.prototype.flatmap"; + packageName = "array.prototype.flatmap"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz"; - sha512 = "KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg=="; + url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"; + sha512 = "8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ=="; }; }; "asynckit-0.4.0" = { @@ -1777,22 +1786,31 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-1.2.2" = { + "available-typed-arrays-1.0.5" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + }; + }; + "axios-1.2.6" = { name = "axios"; packageName = "axios"; - version = "1.2.2"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz"; - sha512 = "bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; + sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; }; }; - "babel-loader-9.1.0" = { + "babel-loader-9.1.2" = { name = "babel-loader"; packageName = "babel-loader"; - version = "9.1.0"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.0.tgz"; - sha512 = "Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz"; + sha512 = "mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA=="; }; }; "babel-plugin-polyfill-corejs2-0.3.3" = { @@ -1957,15 +1975,6 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; - "call-bind-1.0.0" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; - sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; - }; - }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -2425,13 +2434,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; 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-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "del-4.1.1" = { @@ -2650,13 +2659,13 @@ let sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; }; }; - "es-abstract-1.19.1" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.1"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz"; - sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; "es-module-lexer-0.9.3" = { @@ -2668,6 +2677,24 @@ 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"; + 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"; @@ -2713,13 +2740,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.30.0" = { + "eslint-8.33.0" = { name = "eslint"; packageName = "eslint"; - version = "8.30.0"; + version = "8.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz"; - sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz"; + sha512 = "WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2731,40 +2758,40 @@ let sha512 = "xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig=="; }; }; - "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-module-utils-2.7.3" = { + "eslint-module-utils-2.7.4" = { name = "eslint-module-utils"; packageName = "eslint-module-utils"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"; + sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; }; }; - "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-vue-9.8.0" = { + "eslint-plugin-vue-9.9.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.8.0"; + version = "9.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz"; - sha512 = "E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz"; + sha512 = "YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ=="; }; }; "eslint-scope-5.1.1" = { @@ -3028,15 +3055,6 @@ let sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; - "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"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - }; "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; @@ -3091,6 +3109,15 @@ let sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; + "for-each-0.3.3" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + }; + }; "form-data-4.0.0" = { name = "form-data"; packageName = "form-data"; @@ -3154,6 +3181,24 @@ let 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=="; + }; + }; + "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=="; + }; + }; "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; @@ -3163,22 +3208,13 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "get-intrinsic-1.0.1" = { + "get-intrinsic-1.1.3" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; - }; - }; - "get-intrinsic-1.1.1" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; }; "get-stream-6.0.1" = { @@ -3253,6 +3289,24 @@ let sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; }; + "globals-13.20.0" = { + name = "globals"; + packageName = "globals"; + version = "13.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; + }; + }; + "globalthis-1.0.3" = { + name = "globalthis"; + packageName = "globalthis"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; + }; + }; "globby-13.1.1" = { name = "globby"; packageName = "globby"; @@ -3271,6 +3325,15 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; + "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.9" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -3316,13 +3379,13 @@ let sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; - "has-bigints-1.0.1" = { + "has-bigints-1.0.2" = { name = "has-bigints"; packageName = "has-bigints"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; + sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; }; }; "has-flag-3.0.0" = { @@ -3343,31 +3406,31 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.0" = { - name = "has-symbols"; - packageName = "has-symbols"; + "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-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; }; - "has-symbols-1.0.1" = { - name = "has-symbols"; - packageName = "has-symbols"; + "has-proto-1.0.1" = { + name = "has-proto"; + packageName = "has-proto"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-tostringtag-1.0.0" = { @@ -3505,13 +3568,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-duration-3.27.3" = { + "humanize-duration-3.28.0" = { name = "humanize-duration"; packageName = "humanize-duration"; - version = "3.27.3"; + version = "3.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.3.tgz"; - sha512 = "iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw=="; + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz"; + sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A=="; }; }; "iconv-lite-0.4.24" = { @@ -3604,13 +3667,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "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-2.2.0" = { @@ -3640,6 +3703,15 @@ let sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; + "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-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; @@ -3667,31 +3739,22 @@ let sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; - }; - }; - "is-callable-1.2.4" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.4"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; + sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; - "is-core-module-2.8.1" = { + "is-core-module-2.11.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; }; "is-date-object-1.0.1" = { @@ -3739,13 +3802,13 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; - "is-negative-zero-2.0.1" = { + "is-negative-zero-2.0.2" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; }; "is-number-7.0.0" = { @@ -3757,13 +3820,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.6" = { + "is-number-object-1.0.7" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; - sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; + sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; }; }; "is-path-cwd-2.2.0" = { @@ -3829,13 +3892,13 @@ let sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; - "is-shared-array-buffer-1.0.1" = { + "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; - sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; + 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-stream-2.0.1" = { @@ -3856,15 +3919,6 @@ let sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; - "is-symbol-1.0.2" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; - sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; - }; - }; "is-symbol-1.0.4" = { name = "is-symbol"; packageName = "is-symbol"; @@ -3874,13 +3928,22 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-weakref-1.0.1" = { + "is-typed-array-1.1.10" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; + sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; + }; + }; + "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz"; - sha512 = "b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ=="; + url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; "is-wsl-2.2.0" = { @@ -4027,13 +4090,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "json5-2.2.2" = { + "json5-2.2.3" = { name = "json5"; packageName = "json5"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; "kind-of-6.0.3" = { @@ -4063,22 +4126,22 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkify-html-4.0.2" = { + "linkify-html-4.1.0" = { name = "linkify-html"; packageName = "linkify-html"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.0.2.tgz"; - sha512 = "YcN3tsyutK2Y/uSuoG0zne8FQdoqzrAgNU5ko0DWE7M2oQ3ms4z/202f2W4TvRm9uxKdrsWAullfynANLaVMqw=="; + url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.1.0.tgz"; + sha512 = "cQSNN4i5V1xRjdSUEnXgn855xsl+usD7zBSsNyMSFBf4NlaZFocn7cExJA217azxODeqea79b6fDPXLa7jdkcA=="; }; }; - "linkifyjs-4.0.2" = { + "linkifyjs-4.1.0" = { name = "linkifyjs"; packageName = "linkifyjs"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.0.2.tgz"; - sha512 = "/VSoCZiglX0VMsXmL5PN3lRg45M86lrD9PskdkA2abWaTKap1bIcJ11LS4EE55bcUl9ZOR4eZ792UtQ9E/5xLA=="; + url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.0.tgz"; + sha512 = "Ffv8VoY3+ixI1b3aZ3O+jM6x17cOsgwfB1Wq7pkytbo1WlyRp6ZO0YDMqiWT/gQPY/CmtiGuKfzDIVqxh1aCTA=="; }; }; "loader-runner-4.2.0" = { @@ -4108,15 +4171,6 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "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"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -4495,22 +4549,13 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-inspect-1.11.0" = { + "object-inspect-1.12.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; - sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; - }; - }; - "object-keys-1.0.12" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.12"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"; - sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; "object-keys-1.1.1" = { @@ -4522,13 +4567,13 @@ let sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; - "object.assign-4.1.2" = { + "object.assign-4.1.4" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.2"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; + sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; "object.entries-1.1.5" = { @@ -4540,13 +4585,13 @@ let sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; }; }; - "object.values-1.1.5" = { + "object.values-1.1.6" = { name = "object.values"; packageName = "object.values"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"; + sha512 = "FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="; }; }; "obuf-1.1.2" = { @@ -4621,15 +4666,6 @@ let sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; }; - "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-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -4648,15 +4684,6 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; - "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"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; - }; - }; "p-locate-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -4693,15 +4720,6 @@ let sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA=="; }; }; - "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"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -4747,15 +4765,6 @@ let sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; }; }; - "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"; @@ -5179,6 +5188,15 @@ let sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; }; }; + "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"; @@ -5251,13 +5269,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.22.0" = { + "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; "resolve-cwd-3.0.0" = { @@ -5350,6 +5368,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-regex-test-1.0.0" = { + name = "safe-regex-test"; + packageName = "safe-regex-test"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; + sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -5629,22 +5656,22 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "string.prototype.trimend-1.0.4" = { + "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + 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.4" = { + "string.prototype.trimstart-1.0.6" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; + sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; }; }; "string_decoder-1.1.1" = { @@ -5872,6 +5899,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-assert-1.0.8" = { name = "typed-assert"; packageName = "typed-assert"; @@ -5881,13 +5917,13 @@ let sha512 = "5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g=="; }; }; - "unbox-primitive-1.0.1" = { + "unbox-primitive-1.0.2" = { name = "unbox-primitive"; packageName = "unbox-primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; + sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; "unicode-canonical-property-names-ecmascript-2.0.0" = { @@ -6070,13 +6106,13 @@ let sha512 = "XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw=="; }; }; - "vue-multiselect-2.1.6" = { + "vue-multiselect-2.1.7" = { name = "vue-multiselect"; packageName = "vue-multiselect"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz"; - sha512 = "s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w=="; + url = "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.7.tgz"; + sha512 = "KIegcN+Ntwg3cbkY/jhw2s/+XJUM0Lpi/LcKFYCS8PrZHcWBl2iKCVze7ZCnRj3w8H7/lUJ9v7rj9KQiNxApBw=="; }; }; "vue-resize-1.0.1" = { @@ -6268,6 +6304,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-typed-array-1.1.9" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; + sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; + }; + }; "wildcard-2.0.0" = { name = "wildcard"; packageName = "wildcard"; @@ -6368,10 +6413,10 @@ let sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.20.5" - (sources."@babel/core-7.20.7" // { + (sources."@babel/core-7.20.12" // { dependencies = [ sources."debug-4.3.4" - sources."json5-2.2.2" + sources."json5-2.2.3" sources."ms-2.1.2" sources."semver-6.3.0" ]; @@ -6407,7 +6452,7 @@ 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.20.7" + 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" @@ -6494,7 +6539,7 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.20.7" - (sources."@babel/traverse-7.20.7" // { + (sources."@babel/traverse-7.20.12" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6502,7 +6547,7 @@ let }) sources."@babel/types-7.20.7" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.4.0" // { + (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.3" sources."globals-13.19.0" @@ -6513,7 +6558,7 @@ let 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."@fortawesome/vue-fontawesome-2.0.10" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.3" @@ -6603,27 +6648,17 @@ let sources."anymatch-3.1.2" sources."argparse-2.0.1" sources."array-flatten-2.1.2" - (sources."array-includes-3.1.4" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."array-includes-3.1.6" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - (sources."array.prototype.flat-1.2.5" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."array.prototype.flat-1.3.1" + sources."array.prototype.flatmap-1.3.1" sources."asynckit-0.4.0" - sources."axios-1.2.2" - (sources."babel-loader-9.1.0" // { + sources."available-typed-arrays-1.0.5" + sources."axios-1.2.6" + (sources."babel-loader-9.1.2" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" @@ -6659,7 +6694,7 @@ let sources."browserslist-4.21.3" sources."buffer-from-1.1.1" sources."bytes-3.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camel-case-4.1.2" sources."caniuse-lite-1.0.30001399" @@ -6715,7 +6750,7 @@ let sources."deepmerge-4.2.2" sources."default-gateway-6.0.3" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" (sources."del-4.1.1" // { dependencies = [ sources."pify-4.0.1" @@ -6747,24 +6782,15 @@ let sources."enhanced-resolve-5.10.0" sources."entities-2.2.0" sources."envinfo-7.8.1" - (sources."es-abstract-1.19.1" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - sources."is-callable-1.2.4" - sources."is-negative-zero-2.0.1" - sources."object-keys-1.1.1" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.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."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.30.0" // { + (sources."eslint-8.33.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6774,16 +6800,11 @@ let sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" - sources."find-up-5.0.0" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.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."supports-color-7.2.0" ]; }) @@ -6792,24 +6813,27 @@ let sources."semver-6.3.0" ]; }) - (sources."eslint-import-resolver-node-0.3.6" // { + (sources."eslint-import-resolver-node-0.3.7" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - (sources."eslint-module-utils-2.7.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-import-2.27.5" // { dependencies = [ + sources."debug-3.2.7" sources."doctrine-2.1.0" + sources."ms-2.1.3" + sources."semver-6.3.0" ]; }) - (sources."eslint-plugin-vue-9.8.0" // { + (sources."eslint-plugin-vue-9.9.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" @@ -6875,15 +6899,15 @@ let 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."pkg-dir-4.2.0" ]; }) - sources."find-up-2.1.0" + sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -6891,20 +6915,12 @@ let 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-intrinsic-1.0.1" // { - dependencies = [ - sources."has-symbols-1.0.1" - ]; - }) + sources."get-intrinsic-1.1.3" sources."get-stream-6.0.1" - (sources."get-symbol-description-1.0.0" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."get-symbol-description-1.0.0" sources."glob-7.1.3" (sources."glob-parent-5.1.2" // { dependencies = [ @@ -6913,24 +6929,24 @@ let }) sources."glob-to-regexp-0.4.1" 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.9" sources."grapheme-splitter-1.0.4" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-bigints-1.0.1" + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" - (sources."has-tostringtag-1.0.0" // { - dependencies = [ - sources."has-symbols-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."hash-sum-1.0.2" sources."he-1.2.0" (sources."hpack.js-2.1.6" // { @@ -6956,7 +6972,7 @@ let sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.4" sources."human-signals-2.1.0" - sources."humanize-duration-3.27.3" + sources."humanize-duration-3.28.0" sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."ignore-5.2.0" @@ -6973,55 +6989,40 @@ let 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."pkg-dir-4.2.0" ]; }) sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."internal-slot-1.0.3" // { - dependencies = [ - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."internal-slot-1.0.4" sources."interpret-2.2.0" sources."ipaddr.js-2.0.1" + 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" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) - sources."is-callable-1.1.5" - sources."is-core-module-2.8.1" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.7" + sources."is-core-module-2.11.0" sources."is-date-object-1.0.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" + sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.6" + sources."is-number-object-1.0.7" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-obj-3.0.0" sources."is-plain-object-2.0.4" - (sources."is-regex-1.1.4" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) - sources."is-shared-array-buffer-1.0.1" + sources."is-regex-1.1.4" + 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.2" - sources."is-weakref-1.0.1" + 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" sources."isexe-2.0.0" @@ -7043,15 +7044,15 @@ let sources."kind-of-6.0.3" sources."klona-2.0.5" sources."levn-0.4.1" - sources."linkify-html-4.0.2" - sources."linkifyjs-4.0.2" + sources."linkify-html-4.1.0" + sources."linkifyjs-4.1.0" sources."loader-runner-4.2.0" (sources."loader-utils-1.4.0" // { dependencies = [ sources."emojis-list-3.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" sources."lodash.debounce-4.0.8" @@ -7094,28 +7095,11 @@ let sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" sources."object-assign-4.1.1" - sources."object-inspect-1.11.0" - sources."object-keys-1.0.12" - (sources."object.assign-4.1.2" // { - dependencies = [ - sources."has-symbols-1.0.2" - sources."object-keys-1.1.1" - ]; - }) - (sources."object.entries-1.1.5" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) - (sources."object.values-1.1.5" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."object.entries-1.1.5" + sources."object.values-1.1.6" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -7124,16 +7108,15 @@ let sources."open-8.4.0" sources."opener-1.5.2" sources."optionator-0.9.1" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-map-2.1.0" sources."p-retry-4.6.1" - sources."p-try-1.0.0" sources."param-case-3.0.4" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" @@ -7180,6 +7163,7 @@ let sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.15.0" + sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" @@ -7192,7 +7176,7 @@ let sources."renderkid-3.0.0" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" - sources."resolve-1.22.0" + sources."resolve-1.22.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."retry-0.13.1" @@ -7200,6 +7184,7 @@ let sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" + sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."sass-1.57.1" sources."sass-loader-13.2.0" @@ -7230,12 +7215,7 @@ let sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - (sources."side-channel-1.0.4" // { - dependencies = [ - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."sirv-1.0.17" sources."slash-4.0.0" @@ -7255,6 +7235,8 @@ let ]; }) sources."statuses-1.5.0" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" @@ -7287,12 +7269,9 @@ let 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."typed-assert-1.0.8" - (sources."unbox-primitive-1.0.1" // { - dependencies = [ - sources."has-symbols-1.0.2" - ]; - }) + 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" @@ -7328,7 +7307,7 @@ let sources."vue-hot-reload-api-2.3.4" sources."vue-loader-15.10.1" sources."vue-meta-2.4.0" - sources."vue-multiselect-2.1.6" + sources."vue-multiselect-2.1.7" sources."vue-resize-1.0.1" sources."vue-router-3.6.5" sources."vue-snotify-3.2.1" @@ -7378,12 +7357,8 @@ let sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" - (sources."which-boxed-primitive-1.0.2" // { - dependencies = [ - sources."has-symbols-1.0.2" - sources."is-symbol-1.0.4" - ]; - }) + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."wildcard-2.0.0" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index 48541402d4bca..4142814cf0219 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.33"; + version = "0.10.33.post1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; + sha256 = "sha256-+vrVQ4sItCXrSCzNXyKk6/6oDBOyfyD7iNWzmcbE/BQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index ae4a49d7e3a42..5ec64fc0a55e3 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.29.1"; + version = "0.30.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-NyIAOkOX9s9dN6m/5hfMhy4tSENPCDk2w/F8z+J6qqk="; + sha256 = "sha256-LifJc5mLbnt5wBXGM1n1uice0B6mCY80LYf3kEFJy90="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index d7dde2a77ff51..78d353ce2a85c 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i"; }; - NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index d91f769e95450..ac3e9c7c5a1d5 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An offline thesaurus based on WordNet"; - homepage = "http://artha.sourceforge.net"; + homepage = "https://artha.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index e90ac480eb19f..45a5227404ce4 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An audio resampling library"; - homepage = "http://soxr.sourceforge.net"; + homepage = "https://soxr.sourceforge.net"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index c34872de4cc59..8617e3454239b 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -42,7 +42,14 @@ stdenv.mkDerivation rec { # Relative paths. "BINDIR=/bin" "PERLDIR=/share/perl5" - "MODSDIR=/lib/" + "MODSDIR=/lib" # At runtime, AMC will test for that dir before + # defaulting to the "portable" strategy we use, so this test + # *must* fail. *But* this variable cannot be set to anything but + # "/lib" , because that name is hardcoded in the main executable + # and this variable controls both both the path AMC will check at + # runtime, AND the path where the actual modules will be stored at + # build-time. This has been reported upstream as + # https://project.auto-multiple-choice.net/issues/872 "TEXDIR=/tex/latex/" # what texlive.combine expects "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? "MAN1DIR=/share/man/man1" diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 94775b97baee7..97bd2a1f21ca1 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; # error: 'regparm' is not valid on this platform - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-D__STRICT_ANSI__"; meta = with lib; { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 429097842630a..01374737f585d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -87,10 +87,10 @@ stdenv.mkDerivation rec { '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' '') + - (if hipSupport then '' + (lib.optionalString hipSupport '' substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"' substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"' - '' else ""); + ''); cmakeFlags = [ @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { "-DOPTIX_ROOT_DIR=${optix}" ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 7fcd3e37481f0..4f7052f9156fc 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -29,13 +29,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "50.2"; + version = "51.5"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-+r/r3vExnvYQIicKAEmwZ+eRSep6kWte5k7gu9jC67w="; + sha256 = "sha256-8VF/CD0Wu2eV6wOpj/M6peKDthFWlcg+1NzzTSIH4S8="; }; patches = [ ./vulkan_icd.patch ]; @@ -60,6 +60,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + pathvalidate pycurl pyyaml requests @@ -72,7 +73,6 @@ python3Packages.buildPythonApplication rec { chardet certifi idna - pillow orjson icoextract ] ++ [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index acfe1d9284e53..8a031a220068f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -22,6 +22,7 @@ , qtbase , qtwayland , removeReferencesTo +, speechd , sqlite , wrapQtAppsHook , xdg-utils @@ -57,8 +58,6 @@ stdenv.mkDerivation rec { prePatch = '' sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ setup/build.py - sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \ - setup/build.py # Remove unneeded files and libs rm -rf src/odf resources/calibre-portable.* @@ -121,6 +120,7 @@ stdenv.mkDerivation rec { regex sip setuptools + speechd zeroconf jeepney pycryptodome @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.interpreter} setup.py install --root=$out \ + ${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 2c369e64b5d23..9576ee2ebc6c7 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # avoid build failures like: # ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of # `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' mkdir $out/{bin,share} -p diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 598138ee3de43..77e42cda4d235 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-1uxgiVJGdTE8R0gEQ515zxoKXSs5lTGAURNlgJYMuMI="; + sha256 = "sha256-lTjpvh0bl4Fk+d3mcDvVQY3Ef6UYE23qoS60nltVcsU="; }; - vendorSha256 = "sha256-ouqA4Rg03M9dAUu2Uxmvez7LJTcrqYvqPNVQQmqwoFQ="; + vendorSha256 = "sha256-TNxAtx+fT6CEpa2g/tNl9sCwt3kAmNq7G870TPt2MQ4="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 954d16ce3e73c..a66b4cec245eb 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. platforms = platforms.linux; + mainProgram = "copyq"; }; } diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 408838a0a284d..fb3e149bc8e84 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { name = "cotp"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg="; + hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs="; }; - cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k="; + cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 343848e673db5..2d719e321fe65 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -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/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 4da0af251d5aa..7ec45226785f6 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 3912e8d221e91..3b2473795088f 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 = "3.0.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; + sha256 = "sha256-67augXXZsriXdndrCFUFWZbL+rVKgTPAyqlbZua2Ul4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 04b1af9bc2aea..a20b8ab72625b 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "darkman"; - version = "1.4.0"; + version = "1.5.4"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - sha256 = "sha256-Q/pjQmlyREl32C0LiwypEz1qBw2AeBOZbUIwNP392Sc="; + sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc="; }; - vendorSha256 = "09rjqw6v1jaf0mhmycw9mcay9q0y1fya2azj8216gdgkl48ics08"; + vendorSha256 = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index cbcebae31237f..8e627af02872c 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -6,16 +6,22 @@ python3.pkgs.buildPythonApplication rec { pname = "dbx"; - version = "0.7.6"; + version = "0.8.8"; format = "setuptools"; src = fetchFromGitHub { owner = "databrickslabs"; repo = "dbx"; - rev = "v${version}"; - hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I="; + rev = "refs/tags/v${version}"; + hash = "sha256-nx6fz+atlnB/KxdznnZArHpyv41cuBDQauG0irq1Zyc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \ + --replace "rich==12.6.0" "rich" + ''; + propagatedBuildInputs = with python3.pkgs; [ aiohttp click @@ -34,6 +40,19 @@ python3.pkgs.buildPythonApplication rec { watchdog ] ++ typer.optional-dependencies.all; + passthru.optional-dependencies = with python3.pkgs; { + aws = [ + boto3 + ]; + azure = [ + azure-storage-blob + azure-identity + ]; + gcp = [ + google-cloud-storage + ]; + }; + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ @@ -43,12 +62,6 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); - postPatch = '' - substituteInPlace setup.py \ - --replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \ - --replace "rich==12.5.1" "rich" - ''; - preCheck = '' export HOME=$(mktemp -d) export PATH="$PATH:$out/bin" @@ -73,6 +86,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CLI tool for advanced Databricks jobs management"; homepage = "https://github.com/databrickslabs/dbx"; + changelog = "https://github.com/databrickslabs/dbx/blob/v${version}/CHANGELOG.md"; license = licenses.databricks-dbx; maintainers = with maintainers; [ GuillaumeDesforges ]; }; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index fa6825bf9d62a..866ed16d44bd9 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/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 97feebefa5d34..ad85c9c79d1d2 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; - homepage = "http://djvu.sourceforge.net"; + homepage = "https://djvu.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Anton-Latukha ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 02455cf8f20e1..541b18914bf12 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://eaglemode.sourceforge.net"; + homepage = "https://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; changelog = "https://eaglemode.sourceforge.net/ChangeLog.html"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40b4569d11f51..40f67c02c7522 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.3"; + 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-40GfOKBTAi8RAsAVrG9rv1Jr5IqM+1yro6YYRsSULxw="; + 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-NPXGfbEjT9l88ZnGbDcE3+oGxThTzW7YfesBzssGsbc="; + sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; }; postUnpack = '' @@ -125,20 +116,7 @@ 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 = "Lightweight Bitcoin wallet"; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index 8828b6e38e187..6beae458d2930 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://eureka-editor.sourceforge.net"; + homepage = "https://eureka-editor.sourceforge.net"; description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index e4a5e3dd914b5..fef4f8ce78773 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.35"; + version = "6.4.36"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE="; + sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 27e3ea0aced37..9b12b9bbd520e 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.23.0"; + version = "1.23.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis="; + sha256 = "sha256-dSlpCmVtF4H9d2DcOBkybrQz39QRlBCTTuGPA9yH8is="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix deleted file mode 100644 index c6ed7bc1ad3ff..0000000000000 --- a/pkgs/applications/misc/foxitreader/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ mkDerivation, lib, fetchzip, libarchive, autoPatchelfHook, libsecret, libGL, zlib, openssl, qtbase, qtwebkit, qtxmlpatterns }: - -mkDerivation rec { - pname = "foxitreader"; - version = "2.4.4.0911"; - - src = fetchzip { - url = "https://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/${lib.versions.major version}.x/${lib.versions.majorMinor version}/en_us/FoxitReader.enu.setup.${version}.x64.run.tar.gz"; - sha256 = "0ff4xs9ipc7sswq0czfhpsd7qw7niw0zsf9wgsqhbbgzcpbdhcb7"; - stripRoot = false; - }; - - buildInputs = [ libGL libsecret openssl qtbase qtwebkit qtxmlpatterns zlib ]; - - nativeBuildInputs = [ autoPatchelfHook libarchive ]; - - buildPhase = '' - runHook preBuild - - input_file=$src/*.run - mkdir -p extracted - # Look for all 7z files and extract them - grep --only-matching --byte-offset --binary \ - --text -P '7z\xBC\xAF\x27\x1C\x00\x03' $input_file | cut -d: -f1 | - while read position; do - tail -c +$(($position + 1)) $input_file > file.7z - bsdtar xf file.7z -C extracted - done - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cd extracted - - cp -r \ - CollectStrategy.txt \ - cpdf_settings \ - fxplugins \ - lang \ - resource \ - run \ - stamps \ - welcome \ - Wrappers \ - $out/lib/ - - patchelf $out/lib/fxplugins/librms.so \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so - - # FIXME: Doing this with one invocation is broken right now - patchelf $out/lib/fxplugins/librmscrypto.so \ - --replace-needed libssl.so.10 libssl.so - patchelf $out/lib/fxplugins/librmscrypto.so \ - --replace-needed libcrypto.so.10 libcrypto.so - - install -D -m 755 FoxitReader -t $out/bin - - # Install icon and desktop files - install -D -m 644 images/FoxitReader.png -t $out/share/pixmaps/ - install -D -m 644 FoxitReader.desktop -t $out/share/applications/ - echo Exec=FoxitReader %F >> $out/share/applications/FoxitReader.desktop - - runHook postInstall - ''; - - qtWrapperArgs = [ "--set appname FoxitReader" "--set selfpath $out/lib" ]; - - meta = with lib; { - description = "A viewer for PDF documents"; - homepage = "https://www.foxitsoftware.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ p-h rhoriguchi ]; - }; -} diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index f570a044309e6..4e215f30fc312 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 883ebc7970538..4da566bcfc82b 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.4"; + version = "1.24.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10="; + sha256 = "sha256-P71JiGI9PpWMAlgk5TwQa/h3AUEZSEZ6/MahY+IIy9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix new file mode 100644 index 0000000000000..14bc6ad012e06 --- /dev/null +++ b/pkgs/applications/misc/gcfflasher/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libgpiod +, cmake +}: + +stdenv.mkDerivation rec { + pname = "gcfflasher"; + version = "4.0.3-beta"; + + src = fetchFromGitHub { + owner = "dresden-elektronik"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-m+iDBfsHo+PLYd3K8JaKwhIXcnj+Q8w7gIgmHp+0plk="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'main_windows.c' 'main_posix.c' + ''; + + buildInputs = lib.optionals stdenv.isLinux [ + libgpiod + ]; + + installPhase = '' + runHook preInstall + install -Dm0755 GCFFlasher $out/bin/GCFFlasher + runHook postInstall + ''; + + meta = with lib; { + description = "CFFlasher is the tool to program the firmware of dresden elektronik's Zigbee products"; + license = licenses.bsd3; + homepage = "https://github.com/dresden-elektronik/gcfflasher"; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix index f443618c685ac..5ba67ecddcdb1 100644 --- a/pkgs/applications/misc/genxword/default.nix +++ b/pkgs/applications/misc/genxword/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection pango gtksourceview3 ]; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 6ac5f2327f023..dd091563fde34 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = builtins.toString ( + env.NIX_CFLAGS_COMPILE = builtins.toString ( [ "-Wno-error=deprecated-declarations" ] ++ lib.optionals (!stdenv.cc.isClang) [ "-Wno-error=format-truncation" diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 47d56288ed2fa..363e6fadee41a 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/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 953aad85ae863..a8465538b50ad 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { # ld: gmtp-preferences.o:src/main.h:72: multiple definition of # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here # TODO: can be removed when 1.4.0 is released. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preFixup = '' gappsWrapperArgs+=(--add-flags "--datapath $out/share"); diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index 2aebbf5194a21..c1cd58a50e47d 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.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0="; + sha256 = "oplypNSj028cVBn+eJxNm5pJltp7Cw5Oto/L39pI0vA="; }; nativeBuildInputs = [ 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 f8f725f7f6807..f410d0f18b2bf 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 <poncho@spahan.ch> -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 <leaf> SYMBOL PYTHON + // Symbol can be meta, metric, variable or function name + %token <string> 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 7f796a2bb0c25..ee25c5e8cc0f3 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/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix deleted file mode 100644 index 8c68f8672c3b5..0000000000000 --- a/pkgs/applications/misc/gometer/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: - -stdenv.mkDerivation rec { - pname = "gometer"; - version = "5.2.0"; - - src = fetchurl { - url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; - sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; - }; - - nativeBuildInputs = [ - rpmextract - wrapGAppsHook - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - rpmextract ${src} - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - mkdir $out/share/applications - mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop - substituteInPlace $out/share/applications/gometer.desktop \ - --replace '/opt/goMeter/' "" - - makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ - --add-flags $out/opt/goMeter/package.nw - - runHook postInstall - ''; - - meta = with lib; { - description = "Analytic-Tracking tool for GoLance"; - homepage = "https://golance.com/download-gometer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 888672b5fa013..60a1e40a614ed 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Floating point behavior on i686 causes nmea.test failures. Preventing # extended precision fixes this problem. - NIX_CFLAGS_COMPILE = lib.optional stdenv.isi686 "-ffloat-store"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store"; doCheck = true; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index a03107c2aff2b..e71daa754ab68 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.11"; + version = "11.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-5kT1vcbCc0Fa3ylrcQetth50IQu57upiWRRpub93jlE="; + hash = "sha256-W35KBPYvTKrSi7UnzcUz8MsUwoq8rY5g/+hL1/gVpbI="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 051fee4f6fb62..59f71a3f88c29 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/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 7c32cec721927..53873af2b07a3 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index c3571e01dbcd8..970ddf7660bee 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - hash = "sha256-hKVBPSWIbKXMEmk9C7k+3NBqLwYybN6Jql9qigIx4jE="; + hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 5a9c5122acc36..3508ff0122593 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.6.0"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 85c65a0eeb4a1..327457a017b31 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/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 09f9b85e4b71b..49798c843231c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { # Without patched plugin shebangs, some tests like t/rst.t fail # (with docutilsSupport enabled) patchShebangs plugins/* + + # Creating shared git repo fails when running tests in Nix sandbox. + # The error is: "fatal: Could not make /tmp/ikiwiki-test-git.2043/repo/branches/ writable by group". + # Hopefully, not many people use `ikiwiki-makerepo` to create locally shared repositories these days. + substituteInPlace ikiwiki-makerepo --replace "git --bare init --shared" "git --bare init" ''; configurePhase = "perl Makefile.PL PREFIX=$out"; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix deleted file mode 100644 index d923dc9bfedbd..0000000000000 --- a/pkgs/applications/misc/imag/default.nix +++ /dev/null @@ -1,61 +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 rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; - nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; - - 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/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 4a3262efa4b1b..e117313861f57 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -1,37 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, meson +, ninja +, pkg-config +, cli11 +, hidrd +, inih +, microsoft_gsl +, spdlog +, systemd +}: stdenv.mkDerivation rec { pname = "iptsd"; - version = "0.5.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-du5TC3I5+hWifjdnaeTj2QPJ6/oTXZqaOrZJkef/USU="; + hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + cmake + meson + ninja + pkg-config + ]; + + dontUseCmakeConfigure = true; - buildInputs = [ systemd inih ]; + buildInputs = [ + cli11 + hidrd + inih + microsoft_gsl + spdlog + systemd + ]; # Original installs udev rules and service config into global paths postPatch = '' - substituteInPlace meson.build \ - --replace "install_dir: unitdir" "install_dir: datadir" \ - --replace "install_dir: rulesdir" "install_dir: datadir" \ + substituteInPlace etc/meson.build \ + --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ + --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/udev/50-ipts.rules \ + --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" ''; + mesonFlags = [ "-Dservice_manager=systemd" "-Dsample_config=false" - "-Ddebug_tool=false" + "-Ddebug_tools=" + "-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ... ]; meta = with lib; { + changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ tomberek ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tomberek dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4cec4a97fe06c..68e03b8902de3 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.9.17"; + version = "2.10.4"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-kdmxSXKHIyVdvVNEoZkSIQlOkTt97bpAdrV0sxhL1Ug="; - x86_64-darwin = "sha256-o3Q5foEuBi4OTHr6mP0ZXOxkkUw/c/jXaZOtztQf0gM="; + x86_64-linux = "sha256-KEEPPtWxaY6+Nu/CE+AVAnaVZ30zmASWiIYaJt4a+3E="; + x86_64-darwin = "sha256-8Rkj1pV6tJygznbfELnAhzhh7ImnTm9dxCxCjYlWdnU="; }.${system} or throwSystem; }; @@ -35,7 +35,7 @@ let Markdown format. ''; homepage = "https://joplinapp.org"; - license = licenses.mit; + license = licenses.agpl3Plus; maintainers = with maintainers; [ hugoreeves ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9890ea9ad8db6..360c97d4a2978 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18622"; + version = "18646"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-AtV7Lj+z1GOCEl8xUaumYcN848pMsLIfMGmBXved6WU="; + hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-q3Kr0YWe6Jm6wO6h7fMANKLCWKfU0zDpBZjRH662eSg="; + hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 34ee81a2dd047..28451b3c2e4fb 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.14.60923"; + version = "0.15.75988"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-9R2eml0MpOZQn8SIs8gN1d1ddQdKmTsPBEWqHCvW8yo="; + sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc="; stripRoot = false; }; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix deleted file mode 100644 index 69092b3acd5b3..0000000000000 --- a/pkgs/applications/misc/kanboard/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "kanboard"; - version = "1.2.26"; - - src = fetchFromGitHub { - owner = "kanboard"; - repo = "kanboard"; - rev = "v${version}"; - sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/kanboard - cp -rv . $out/share/kanboard - ''; - - meta = with lib; { - description = "Kanban project management software"; - homepage = "https://kanboard.org"; - license = licenses.mit; - maintainers = with maintainers; [ lheckemann ]; - }; -} diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix new file mode 100644 index 0000000000000..a0034d203ce35 --- /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/default.nix b/pkgs/applications/misc/keepass/default.nix index e062c35e80a67..022eba1fd6cb8 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.52"; + version = "2.53.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; + hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix deleted file mode 100644 index 86bd7d0849ec4..0000000000000 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: - -stdenv.mkDerivation rec { - pname = "keepassx2"; - version = "2.0.3"; - - src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz"; - sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libgcrypt qt4 xorg.libXtst ]; - - meta = { - description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = "https://www.keepassx.org/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix deleted file mode 100644 index 0fad28d94d3f3..0000000000000 --- a/pkgs/applications/misc/keepassx/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: - -stdenv.mkDerivation rec { - pname = "keepassx"; - version = "0.4.4"; - - src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry"; - }; - - patches = [ ./random.patch ]; - - buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta = { - description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = "https://www.keepassx.org/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/applications/misc/keepassx/random.patch deleted file mode 100644 index 0a0b26f6e8c95..0000000000000 --- a/pkgs/applications/misc/keepassx/random.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/lib/random.cpp 2014-01-21 21:15:55.829312723 +0000 -+++ b/src/lib/random.cpp 2014-01-21 21:16:36.752535839 +0000 -@@ -28,6 +28,10 @@ - #include <wincrypt.h> - #include <QSysInfo> - #endif -+#ifndef Q_WS_WIN -+ #include <sys/types.h> -+ #include <unistd.h> -+#endif - - #include <QCryptographicHash> - #include <QCursor> diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassxc/darwin.patch index 1ec7db5863635..1ec7db5863635 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassxc/darwin.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassxc/default.nix index bf386c116d484..3c74b6e917514 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , qttools -, darwin , asciidoctor , botan2 @@ -25,6 +24,8 @@ , wrapQtAppsHook , zlib +, LocalAuthentication + , withKeePassBrowser ? true , withKeePassFDOSecrets ? true , withKeePassKeeShare ? true @@ -48,11 +49,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" - ]; + ]); NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; @@ -110,7 +111,7 @@ stdenv.mkDerivation rec { readline zlib ] - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optional stdenv.isLinux libusb1 ++ lib.optional withKeePassX11 qtx11extras; diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index c2162b6f0c469..2c8a31acc18a6 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,11 +1,11 @@ { fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "5.5.1"; + version = "5.5.2"; pname = "keystore-explorer"; src = fetchzip { url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip"; - sha256 = "2C/LkUUuef30PkN7HL0CtcNOjR5uNo9XaCiTatv5hgA="; + sha256 = "sha256-mDi/TSYumCg2hAnMOI2QpdAOSlDMpdJPqzatFotAqUk="; }; # glib is necessary so file dialogs don't hang. diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0386b25ee422e..2e98be7b558dc 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.28.3"; + version = "0.28.5"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; + hash = "sha256-fjKxQ3oVtnFwzLeeE6kN0jKE5PIfBZubTF54KO+k/DE="; }; postPatch = '' @@ -45,7 +45,7 @@ mkDerivation rec { mv $out/lib/klayout $out/bin/ ''; - NIX_CFLAGS_COMPILE = [ "-Wno-parentheses" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ]; dontInstall = true; # Installation already happens as part of "build.sh" diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix new file mode 100644 index 0000000000000..d42025a643bc0 --- /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/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index b1d3a5c0d6fce..443a03c2ad229 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; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index ea855f3d30be6..f0ed6a07e53c3 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,18 +2,18 @@ , stdenv , fetchurl , appimageTools +, appimage-run , makeWrapper -, electron , git }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.16"; + version = "0.8.17"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; + hash = "sha256-z7v59wXvSIDC7f4IMT8bblPgn+3+J54XqIPzXqWDses="; name = "${pname}-${version}.AppImage"; }; @@ -30,30 +30,23 @@ 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; { diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index eceb9308fc0af..b46c6ea2afa3c 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; desktopItems = lib.singleton (makeDesktopItem { name = "lsd2dsl"; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index d1a19eeccc5e3..921ae570bca0b 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -11,6 +11,12 @@ mkDerivation rec { sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng="; }; + # Needed with GCC 12 + postPatch = '' + sed '1i#include <iterator>' -i src/lyxfind.cpp + sed '1i#include <cstring>' -i src/insets/InsetListings.cpp + ''; + # LaTeX is used from $PATH, as people often want to have it with extra pkgs nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 7c27b3b971461..ce8ebef16a894 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -33,6 +33,14 @@ mkDerivation rec { sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY="; }; + patches = [ + # FIXME: backport GCC 12 build fix, remove for next release + (fetchpatch { + url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff"; + hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo="; + }) + ]; + buildInputs = [ at-spi2-atk at-spi2-core diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 582d3186eaad2..89179b88a8a00 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mediaelch"; - version = "2.8.18"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "sha256-9kwU9j8YNF/OmzrQaRAlBpW+t/tIpZJw5+pfEoTmCBA="; + sha256 = "sha256-hipOOG+ibfsJZKLcnB6a5+OOvSs4WUdpEY+RiVKJc+k="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 0fa9ad5e7f0ab..c0958cd235375 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Heuristics-driven menu generator for several window managers"; - homepage = "http://menumaker.sourceforge.net"; + homepage = "https://menumaker.sourceforge.net"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index efa10faf2a0f1..8d88612b728b5 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.4.0"; + version = "2.5.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs="; + hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 1525fb86f8285..f51d9a329cd15 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.00.1"; + version = "1.01.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; + sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; }; outputs = [ "out" "udev" ]; @@ -40,7 +40,7 @@ mkDerivation rec { ''; homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; - maintainers = [ maintainers.kirikaza ]; + maintainers = with maintainers; [ kirikaza hughobrien ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix deleted file mode 100644 index b1118cfc59770..0000000000000 --- 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: <mps_youtube. ...> - 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/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index bc6a4817087c1..b4c169b36d8b0 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -46,11 +46,11 @@ let inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.30"; + version = "8.0.32"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185"; + sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI="; }; patches = [ @@ -140,8 +140,16 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.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" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=maybe-uninitialized" + ]); cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index dbc57794eeeca..728463dba609b 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.7"; 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-5sIlLPfcoX5I4TBGKR8+WAo/xC6b9RP6ljhyTil1xJM="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 52ced3b41753a..067af7a081617 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.2.0"; + version = "1.3.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - hash = "sha256-e/KZrBnep5LbzgNnIoZlS5AMxhx4KlmdYDzdldMGVwg="; + hash = "sha256-l4ev47ofBZeUqjJjdhQOHX+mNL9nIHH0mfYdqZW1LMs="; }; postPatch = '' diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 4a3025cec55c4..31adb54ac71fe 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = with lib; { description = "Network UPS Tools"; diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 28e736b008fb4..0d96b3cdc78f7 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.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; - rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"; - sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58="; + rev = "v${version}"; + sha256 = "sha256-XeRQhDQeobO1xNThdNgBkoGvnO3PMAxrNwTljC1GKPM="; }; patches = [ ./fix-paths.patch ]; @@ -17,7 +17,7 @@ buildGoModule rec { substituteInPlace tools.go --subst-var out ''; - vendorSha256 = "sha256-dgOwflNRb+11umFykozL8DQ50dLbhbMCmCyKmLlW7rw="; + vendorHash = "sha256-EewEhkX7Bwnz+J1ptO31HKHU4NHo76r4NqMbcrWdiu4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 2bb14c1b2988c..23edd6e2742f8 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4="; + sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; }; vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 7724976ebabf5..a7d35325c39f1 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.7.11"; + version = "0.7.17"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Esr1OPyQCCQIOfgkl6RIn93ZaJkF0O2RM9ObIgBlPi4="; + sha256 = "sha256-HGbPBHf5PIjbuMSd/2fFSCLQ/7s1Xbys+KoGXctQOvM="; }; # No tests @@ -56,6 +56,6 @@ python3Packages.buildPythonApplication rec { description = "GTK3-based panel for Sway window manager"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ berbiche ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 51841f9852a57..ba618219bc522 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.1.9"; + version = "1.1.15"; 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-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; + sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao="; }; icon = fetchurl { @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ + 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 diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 89260c09f7893..4ca54221c2fca 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 + ''; }; } ) @@ -202,6 +233,9 @@ let passthru = { python = self.python; updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) octoprint; + }; }; meta = with lib; { diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 357f4fcd87e56..313f61e28ce02 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -117,9 +117,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; - NIX_CFLAGS_COMPILE = lib.optionals (!stdenv.hostPlatform.isx86) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (!stdenv.hostPlatform.isx86) [ "-DSQUISH_USE_SSE=0" - ]; + ]); postInstall = lib.optionals stdenv.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix new file mode 100644 index 0000000000000..05cdd0ce5cc3a --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, openal +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-effects"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBEffectsPlugin"; + rev = "release_${version}"; + hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg="; + fetchSubmodules = true; + }; + + patches = [ + # Add install rule + (fetchpatch { + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch"; + hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rm -r OpenRGB + ln -s ${openrgb.src} OpenRGB + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + glib + openal + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"; + description = "An effects plugin for OpenRGB"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix new file mode 100644 index 0000000000000..539c203325fbe --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, libgtop +, lm_sensors +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-hardwaresync"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBHardwareSyncPlugin"; + rev = "release_${version}"; + hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo="; + }; + + patches = [ + (fetchpatch { + name = "use-pkgconfig"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch"; + hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw="; + }) + (fetchpatch { + name = "add-install-rule"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch"; + hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rmdir OpenRGB + ln -s ${openrgb.src} OpenRGB + # Remove prebuilt stuff + rm -r dependencies/lhwm-cpp-wrapper + ''; + + buildInputs = [ + qtbase + glib + libgtop + lm_sensors + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin"; + description = "Sync your ARGB devices colors with hardware measures (CPU, GPU, fan speed, etc...)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ea81b58a2098c..bd1664e85ff51 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }: +{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools, symlinkJoin, openrgb }: stdenv.mkDerivation rec { pname = "openrgb"; @@ -25,6 +25,29 @@ stdenv.mkDerivation rec { HOME=$TMPDIR $out/bin/openrgb --help > /dev/null ''; + passthru.withPlugins = plugins: + let pluginsDir = symlinkJoin { + name = "openrgb-plugins"; + paths = plugins; + # Remove all library version symlinks except one, + # or they will result in duplicates in the UI. + # We leave the one pointing to the actual library, usually the most + # qualified one (eg. libOpenRGBHardwareSyncPlugin.so.1.0.0). + postBuild = '' + for f in $out/lib/*; do + if [ "$(dirname $(readlink "$f"))" == "." ]; then + rm "$f" + fi + done + ''; + }; + in openrgb.overrideAttrs (old: { + qmakeFlags = old.qmakeFlags or [] ++ [ + # Welcome to Escape Hell, we have backslashes + ''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${lib.escape ["\\" "\"" " "] (toString pluginsDir)}/lib\\\""'' + ]; + }); + meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/applications/misc/opentrack/aruco.nix index 2c28d0e8d397c..dddbfe78beabe 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 -O3"; + env.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 7be07093cd1d8..b4c455c0ce043 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 -O3"; + env.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 29cdac6b8d163..d88c4f549d319 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/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index ffb62dd6c1997..a7366d6136ffe 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -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 f9f880050ed68..545ea498002a1 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"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; + env.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/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 9f416ff75a3c6..bb1c725dff8b3 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -10,21 +10,26 @@ , libzip , libpng , libcotp +, protobuf +, protobufc +, qrencode +, libsecret +, libuuid , zbar }: stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.5.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; + sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA="; }; - buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; meta = with lib; { diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index c06713c98a66e..ec1ea90cd47ce 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/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 3d6e42bd628d6..ba8324a02fb34 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.11"; + version = "0.2.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; + sha256 = "sha256-J+3wi1nqkxR3ZDfR+F3rvFjUz1DJ7/jhjmcvFdMzWYc="; }; - cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; + cargoHash = "sha256-oQPCUm/X2vt6wN5AKhtgq8tzQQrp0H42bBK7Az+I9BE="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index cf8e9978c9112..917476023cf78 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.3.4"; + version = "5.0.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-DYCiK5DgWTu1cm4TRsGDCB3LzVCGVkVzSlG3Jeo2WVI="; + hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k="; }; unpackPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; preFixup = '' - gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}") + gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}") ''; installPhase = '' @@ -40,14 +40,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://github.com/torakiki/pdfsam"; - description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.agpl3; - platforms = platforms.all; - maintainers = with maintainers; [ _1000101 ]; + homepage = "https://github.com/torakiki/pdfsam"; + description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index f1ce2219ba891..6162207693bed 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -8,10 +8,11 @@ # - year identifies the year portion of the version, defaults to most recent year. # - pname is either "pdfstudio${year}" or "pdfstudioviewer". -{ program ? "pdfstudio" +{ lib +, stdenv +, program ? "pdfstudio" , year ? "2022" , fetchurl -, libgccjit , callPackage , jdk11 , jdk17 @@ -49,7 +50,7 @@ in sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk11; }; @@ -62,7 +63,7 @@ in sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 237e229fc54d6..ca2d75eac8536 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-beta1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw="; + sha256 = "sha256-SlAYl2x1qdBBwLboO59h1uifF7Q71oX3JyhWwUogdb0="; }; - 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/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix new file mode 100644 index 0000000000000..ca4a1742e1e1a --- /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 b45854a6d180f..2af5e9d692db4 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,9 +1,13 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39, fetchpatch +, python310, fetchpatch }: let - python3' = python39.override { + dropDevOutput = { outputs, ... }: { + outputs = lib.filter (x: x != "doc") outputs; + }; + + python3' = python310.override { packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; @@ -25,6 +29,15 @@ let sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; }; }); + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { + version = "2.5.1"; + format = "setuptools"; + src = self.fetchPypi { + pname = "Flask-SQLAlchemy"; + inherit version; + hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; + }; + }); # Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708 werkzeug = super.werkzeug.overridePythonAttrs (old: rec { version = "1.0.1"; @@ -44,6 +57,19 @@ let inherit version; sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; + patches = [ + # python 3.10 compat fixes. In later upstream releases, but these + # are not compatible with flask 1 which we need here :( + (fetchpatch { + url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; + sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; + }) + (fetchpatch { + url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; + sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; + excludes = [ "CHANGES.rst" ]; + }) + ]; }); # Required by jinja2-2.11.3 markupsafe = super.markupsafe.overridePythonAttrs (old: rec { @@ -84,18 +110,62 @@ let nativeCheckInputs = []; doCheck = false; }); + # Requires pytest-httpserver as checkInput now which requires Werkzeug>=2 which is not + # supported by current privacyIDEA. + responses = super.responses.overridePythonAttrs (lib.const { + doCheck = false; + }); + flask-babel = (super.flask-babel.override { + sphinxHook = null; + furo = null; + }).overridePythonAttrs (old: (dropDevOutput old) // rec { + pname = "Flask-Babel"; + version = "2.0.0"; + format = "setuptools"; + src = self.fetchPypi { + inherit pname; + inherit version; + hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + }; + }); + psycopg2 = (super.psycopg2.override { + sphinxHook = null; + sphinx-better-theme = null; + }).overridePythonAttrs dropDevOutput; + hypothesis = super.hypothesis.override { + enableDocumentation = false; + }; + pyjwt = (super.pyjwt.override { + sphinxHook = null; + sphinx-rtd-theme = null; + }).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; }); + beautifulsoup4 = (super.beautifulsoup4.override { + sphinxHook = null; + }).overridePythonAttrs dropDevOutput; + pydash = (super.pydash.override { + sphinx-rtd-theme = null; + }).overridePythonAttrs (old: rec { + version = "5.1.0"; + src = self.fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; + }; + format = "setuptools"; + doCheck = false; + }); }; }; in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.4"; + version = "3.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo="; + sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; @@ -104,17 +174,7 @@ python3'.pkgs.buildPythonPackage rec { defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt - ]; - - patches = [ - # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes - # `Exceeds the limit (4300) for integer string conversion` in the tests, - # see https://hydra.nixos.org/build/192932057 - (fetchpatch { - url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch"; - sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ="; - }) + pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno ]; passthru.tests = { inherit (nixosTests) privacyidea; }; @@ -128,6 +188,7 @@ python3'.pkgs.buildPythonPackage rec { # Tries to connect to `fcm.googleapis.com`. "test_02_api_push_poll" + "test_04_decline_auth_request" # Timezone info not available in build sandbox "test_14_convert_timestamp_to_utc" diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 36e95ee8f098d..67c1c7e815c16 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.29.7"; + version = "0.40.2"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU="; + hash = "sha256-+09gLeifEFwG2Ou1tQP29hYHhr0Qn0hOKj7p7PB8Jfc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-fL12Rx/0TF2jjciSHgfIDfrqdQxxm2JiGfgO3Dgz81M="; + vendorHash = "sha256-g82JRmfbKH/XEZx2aLZOcyen23vOxQXR7VyeAYxCSi4="; doCheck = false; diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix new file mode 100644 index 0000000000000..dab36aaeefd20 --- /dev/null +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -0,0 +1,33 @@ +{ appimageTools, fetchurl, lib }: +let + pname = "protonup-qt"; + version = "2.7.7"; + src = fetchurl { + url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; + sha256 = "sha256-eDi13DYS4Rtj3ouuhRoET1Ctc4D7p50khqXNOSBIvto="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + mkdir -p $out/share/{applications,pixmaps} + cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=net.davidotek.pupgui2' 'Exec=${pname}' \ + --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' + ''; + + meta = with lib; { + homepage = "https://davidotek.github.io/protonup-qt/"; + description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; + license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "protonup-qt"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michaelBelsanti ]; + }; +} diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index c0a1e7e0217d2..702a7769200dd 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { # Disable compiler warnings that clutter the build log. # It seems to be a known issue for Eigen: # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 - NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; + env.NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; # prusa-slicer uses dlopen on `libudev.so` at runtime NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 27f4afb435f83..8e4d5cdc0a557 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, Libsystem , SystemConfiguration , installShellFiles , libiconv @@ -9,20 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "2.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag="; + hash = "sha256-5xHY8DOQnOdYqNyfAS2kMuW2vxAuoSe6RaOItnAJCkQ="; }; - cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk="; + cargoHash = "sha256-3IOtx1aeth6QBjY6aILtzxhjZddovD7KIKzNhVCabfU="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ]; buildInputs = lib.optionals stdenv.isDarwin [ + Libsystem SystemConfiguration libiconv ]; diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 793e5291d5b58..0220778277c13 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 index f32f60bac1ac2..6d63ccd05eec5 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { # 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" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { description = "A simple and elegant pipewire graph editor "; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index dcf941cf03aa0..c630ce06b59b7 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.8.7"; + version = "3.27.9.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec="; + sha256 = "sha256-RpyckKXU8WN/bptKp6G5gNVSU3RzNFYnM0eWLf3E2Yg="; }; patches = [ diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 9096a56a42119..e27f2a0bdcae9 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { qmakeFlags = [ "INSTALLROOT=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; postPatch = '' patchShebangs . 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 1fbf5ec3f1015..0000000000000 --- 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 <QList> -+#include <QPainterPath> - #include <QtPlugin> - #include <QWidget> - #include <QVector> - diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 9480a32aae3d3..7987208b885a4 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -10,23 +10,25 @@ mkDerivation { pname = "qt-box-editor"; - version = "unstable-2019-07-12"; + version = "unstable-2019-07-14"; src = fetchFromGitHub { owner = "zdenop"; repo = "qt-box-editor"; - rev = "75a68b466868ba41ba2886caa796057403fe1901"; - sha256 = "0zwsyy7cnbhy5aazwlkhd9y8bnzlgy1gffqa46abajn4809b95k3"; + rev = "cba2929dabc6c715acd1a282ba161fee914c87f6"; + hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4="; }; buildInputs = [ qtbase qtsvg leptonica tesseract ]; nativeBuildInputs = [ qmake ]; - # remove with next release - # https://github.com/zdenop/qt-box-editor/pull/78 + # https://github.com/zdenop/qt-box-editor/issues/87 postPatch = '' - printf "INSTALLS += target\ntarget.path = $out/bin" >> qt-box-editor.pro + sed -i '/allheaders.h/a#include <leptonica/pix_internal.h>' src/TessTools.h + + substituteInPlace qt-box-editor.pro \ + --replace '-llept' '-lleptonica' ''; meta = with lib; { diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 2a00cb92b9d1b..e5900a050efc5 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -11,18 +11,19 @@ , ninja , gobject-introspection , gsettings-desktop-schemas +, desktop-file-utils , pantheon , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "regextester"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; rev = version; - sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3"; + hash = "sha256-5+gU8DeB99w2h/4vMal2eHkR0305dmRYiY6fsLZzlnc="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index d19d27153fa01..9616790ba7cfe 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/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index ed80e5d5af0ea..d9824ca9977a6 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -2,20 +2,19 @@ , stdenv , fetchFromGitHub , makeWrapper -, rofi-unwrapped , bluez }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-bluetooth"; - version = "unstable-2021-03-05"; + version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "nickclyde"; - repo = "rofi-bluetooth"; + repo = finalAttrs.pname; # https://github.com/nickclyde/rofi-bluetooth/issues/19 - rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2"; - sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss="; + rev = "9d91c048ff129819f4c6e9e48a17bd54343bbffb"; + sha256 = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { install -D --target-directory=$out/bin/ ./rofi-bluetooth wrapProgram $out/bin/rofi-bluetooth \ - --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] } + --prefix PATH ":" ${lib.makeBinPath [ bluez ] } runHook postInstall ''; @@ -38,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MoritzBoehme ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 28602cf0240e9..d6e820e06fc09 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,19 +1,20 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }: +{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }: buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs="; + hash = "sha256-5K6tofC1bIxxNOQ0jk6NbVoaGGyQImYiUZAaAmkwiTA="; }; nativeBuildInputs = [ setuptools + poetry-core ]; propagatedBuildInputs = [ configargparse ]; @@ -24,7 +25,7 @@ buildPythonApplication rec { description = "Rofi frontend for Bitwarden"; homepage = "https://github.com/fdw/rofi-rbw"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ equirosa dit7ya ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 22356ac1a8dbe..5e2381ccfabc7 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir locale ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; + env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with lib; { homepage = "https://dushistov.github.io/sdcv/"; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix new file mode 100644 index 0000000000000..1429aabcd8068 --- /dev/null +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +, poetry +}: + +with python3.pkgs; + +buildPythonPackage rec { + pname = "shell-genie"; + version = "unstable-2023-01-27"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dylanjcastillo"; + repo = pname; + rev = "d6da42a4426e6058a0b5ae07837d8c003cd1239e"; + hash = "sha256-MGhQaTcl3KjAJXorOmMRec07LxH02T81rNbV2mYEpRA="; + }; + + nativeBuildInputs = [ + poetry + poetry-core + ]; + + propagatedBuildInputs = [ + colorama + openai + pyperclip + rich + shellingham + typer + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + description = "Describe your shell commands in natural language"; + homepage = "https://github.com/dylanjcastillo/shell-genie"; + license = licenses.unfree; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix new file mode 100644 index 0000000000000..5b1332a91d739 --- /dev/null +++ b/pkgs/applications/misc/shipments/default.nix @@ -0,0 +1,49 @@ +{ desktop-file-utils +, fetchurl +, gobject-introspection +, gtk3 +, lib +, libhandy +, meson +, ninja +, pkg-config +, python3 +, stdenv +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "shipments"; + version = "0.3.0"; + + src = fetchurl { + url = "https://git.sr.ht/~martijnbraam/shipments/archive/${version}.tar.gz"; + sha256 = "1znybldx21wjnb8qy6q9p52pi6lfz81743xgrnjmvjji4spwaipf"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libhandy + (python3.withPackages (ps: with ps; [ + pygobject3 + requests + ])) + ]; + + meta = with lib; { + description = "Postal package tracking application"; + homepage = "https://sr.ht/~martijnbraam/shipments/"; + changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}"; + license = licenses.lgpl3; + maintainers = with maintainers; [ michaelgrahamevans ]; + }; +} diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 6c809ef2af2c9..df2c7b77aee82 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -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/ diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index 3682325cafff6..a62812a73d17d 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DwxWidgets_LIBRARIES=${wxGTK}/lib" ]; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "Doom editor"; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index d336d460d7c57..1df734af5e009 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DwxWidgets_LIBRARIES=${wxGTK}/lib" ]; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "Doom editor"; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 9c96cb2444b1d..ac8170ed551ce 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,24 +1,34 @@ -{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: +{ lib +, stdenv +, fetchgit +, pkg-config +, writeText +, libX11 +, libXau +, libXdmcp +, conf ? null +, patches ? [] +}: stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2019-02-16"; + version = "unstable-2022-12-19"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "b14e039639ed28005fbb8bddeb5b5fa0c93475ac"; - sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; + rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; + hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + '' + makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) + ''; inherit patches; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ]; - - makeFlags = [ "CC:=$(CC)" ]; + buildInputs = [ libX11 libXau libXdmcp]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 90aab7987b389..b6198a9095985 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -5,21 +5,22 @@ , patchelf , makeWrapper , openssl +, libxcrypt }: stdenv.mkDerivation rec { pname = "snowsql"; majorVersion = "1.2"; - version = "${majorVersion}.21"; + version = "${majorVersion}.23"; src = fetchurl { url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; - sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn"; + sha256 = "16zx30l3g5i5ndgxsqlkmkrfzswbczpb3jcya3psq5170i8cfm8f"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; - libPath = lib.makeLibraryPath [ openssl ]; + libPath = lib.makeLibraryPath [ openssl libxcrypt ]; buildCommand = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 48eb65d8e18cd..acd1337a6693f 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.3"; + version = "2.16.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7bCl8VfkMhoTBnr+O+oBYQeSV2sRwlP/qUkNkYerZdU="; + sha256 = "sha256-Pq8HjmWSfBgieSJejrlw+FiRdq9NxryYPcw++Pdjsuk="; }; vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 1d6373592fbf5..c840bbfe5b845 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 6b23e2d492c51..6a97654818121 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,21 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M="; + sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo="; + cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; + + checkFlags = [ + # Fails for 1.6.0, but binary works fine + "--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output" + ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix index 546b365b3684e..71d15aa065843 100644 --- a/pkgs/applications/misc/swaynag-battery/default.nix +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/m00qek/swaynag-battery"; description = "Shows a message when your battery is discharging "; - maintainers = with maintainers; [ asbachb ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 11273fd14d8ec..5d583181ce65e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { # Hence we use a C definition with NIX_CFLAGS_COMPILE ./use-nix-path-in-autostart.patch ]; - NIX_CFLAGS_COMPILE = "-DEXEC_NIX_PATH=\"${placeholder "out"}/bin/syncthingtray\""; + env.NIX_CFLAGS_COMPILE = "-DEXEC_NIX_PATH=\"${placeholder "out"}/bin/syncthingtray\""; buildInputs = [ qtbase diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 401d4e00db168..90fbdb87fc899 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ]; # Silences many warnings - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1afb5117a4bf7..9738b273de292 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/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index d2978ec7bd321..ec2ded975fed3 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; + broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately }; } diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index af8a538a822bd..d732fdde136a3 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.5"; + version = "3.4.6"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; + hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko="; }; postPatch = '' diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 57dbf849a3ae0..8e4a671c4a640 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.5"; + version = "24.0.10"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-6pXbHkLdJw0+G9lep/tGkbSGAf8AobkQQgvw6gPYlro="; + sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 765462d78acf9..7ade0b042dc99 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.5"; + version = "4.5.6"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; + hash = "sha256-h7k/zAYqpCAGn2dW+a3gOF/BN5ywjy/2Yx6THK9zk6k="; }; - vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; + vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 68dc30c900808..b28a740501ba3 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.6"; + version = "0.14.8"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-tsPCx/4ap2udfZHRK5ebxRYEBYw2W6EgnDI6P3riV04="; + rev = "refs/tags/v${version}"; + hash = "sha256-8q/dL1Pv25TkL7PESybgIu+0lR0cr6qrK6ItE/r9pbI="; }; - cargoSha256 = "sha256-xpUI8IflLqBrwsU5YccGzQlPUJT46GJa5AdsIv9qfjU="; + cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk="; nativeBuildInputs = [ perl ]; @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; + changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/applications/misc/tilemaker/default.nix index dd05604501e99..a158badc8843c 100644 --- a/pkgs/applications/misc/tilemaker/default.nix +++ b/pkgs/applications/misc/tilemaker/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"; - NIX_CFLAGS_COMPILE = [ "-DTM_VERSION=${finalAttrs.version}" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ]; postInstall = '' installManPage ../docs/man/tilemaker.1 diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 916dacd5e52af..eebe42890da36 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-+V6nV2L1lE5QEkZcDMg9WE3iiBuZN/QTMR+XX/IdjmA="; + hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e7a693b4ca49b..50e8a2ea10d8b 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { postFixup = '' 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/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 6f6151d1ea295..6edae3b2eed76 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.33.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c="; + sha256 = "sha256-5LTd3FPodYxMm4zZJsAfO0O1Y0AXUxaz+ZtEh6b5Etw="; }; nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 5791efb9a995a..ff20f89574be4 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "translate-shell"; - version = "0.9.7"; + version = "0.9.7.1"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "sha256-OLbGBP+QHW51mt0sFXf6SqrIYZ0iC/X10F148NAG4A4="; + sha256 = "sha256-ILXE8cSrivYqMruE+xtNIInLdwdRfMX5dneY9Nn12Uk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix new file mode 100644 index 0000000000000..9f098efef8a08 --- /dev/null +++ b/pkgs/applications/misc/ttdl/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ttdl"; + version = "3.6.3"; + + src = fetchFromGitHub { + owner = "VladimirMarkelov"; + repo = "ttdl"; + rev = "v${version}"; + sha256 = "sha256-IR0cDXQHnMDI71Vg50atS98YorqAQKc95EF1+m9cxFY="; + }; + + cargoSha256 = "sha256-658mN3R3opjvqfnIDcbh11ZSOTDbpYnhCgGGx46Mrrc="; + + meta = with lib; { + description = "A CLI tool to manage todo lists in todo.txt format"; + homepage = "https://github.com/VladimirMarkelov/ttdl"; + changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + }; +} diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix new file mode 100644 index 0000000000000..e3daca956c44b --- /dev/null +++ b/pkgs/applications/misc/tuckr/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "tuckr"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "RaphGL"; + repo = "Tuckr"; + rev = version; + sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0="; + }; + + cargoPatches = [ ./update-cargo-lock.diff ]; + + cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM="; + + doCheck = false; # test result: FAILED. 5 passed; 3 failed; + + meta = with lib; { + description = "A super powered replacement for GNU Stow"; + homepage = "https://github.com/RaphGL/Tuckr"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mimame ]; + }; +} diff --git a/pkgs/applications/misc/tuckr/update-cargo-lock.diff b/pkgs/applications/misc/tuckr/update-cargo-lock.diff new file mode 100644 index 0000000000000..45fe445042fbc --- /dev/null +++ b/pkgs/applications/misc/tuckr/update-cargo-lock.diff @@ -0,0 +1,49 @@ +diff --git i/Cargo.lock w/Cargo.lock +index 5f5dd43..d7c8370 100644 +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -107,9 +107,9 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.1.4" ++version = "4.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" ++checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" + dependencies = [ + "bitflags", + "clap_derive", +@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + + [[package]] + name = "hermit-abi" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01" ++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + + [[package]] + name = "inout" +@@ -319,9 +319,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.17.0" ++version = "1.17.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" ++checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + + [[package]] + name = "opaque-debug" +@@ -597,7 +597,7 @@ dependencies = [ + + [[package]] + name = "tuckr" +-version = "0.6.1" ++version = "0.7.0" + dependencies = [ + "chacha20poly1305", + "clap", diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 198ea65001077..16d091aa7b1aa 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-Oypl80UsYRRSIMvHDPSS6rrvzjlxZ/UKDNDGc2Yan+w="; + sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM="; }; - vendorHash = "sha256-qeYgkF9sIJ0slRarXbCHZ+1JmtZwXDnrJIpRKGOoW5Q="; + vendorHash = "sha256-gPF4XrUqDDJCCY1zrUr3AXDG0uoADR8LBxRP4yolcug="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix deleted file mode 100644 index 690dd9d64ad69..0000000000000 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: - -let - desktopItem = makeDesktopItem { - name = "tvbrowser"; - exec = "tvbrowser"; - icon = "tvbrowser"; - comment = "Themeable and easy to use TV Guide"; - desktopName = "TV-Browser"; - genericName = "Electronic TV Program Guide"; - categories = [ "AudioVideo" "TV" "Java" ]; - startupNotify = true; - startupWMClass = "tvbrowser-TVBrowser"; - }; - -in stdenv.mkDerivation rec { - pname = "tvbrowser"; - version = "4.0.1"; - name = "${pname}-bin-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz"; - sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/share/java/${pname} - cp -R * $out/share/java/${pname} - rm $out/share/java/${pname}/${pname}.{sh,desktop} - - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - - for i in 16 32 48 128; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png - done - - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ - --chdir "$out/share/java/${pname}" - ''; - - meta = with lib; { - description = "Electronic TV Program Guide"; - homepage = "https://www.tvbrowser.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; - }; -} diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix new file mode 100644 index 0000000000000..afc810003932c --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/default.nix @@ -0,0 +1,87 @@ +{ lib +, fetchurl +, stdenv +, fetchzip +, ant +, jdk +, makeWrapper +, callPackage +}: + +let + minimalJavaVersion = "11"; + + newsPlugin = fetchurl { + url = "https://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar"; + hash = "sha256-5XoypuMd2AFBE2SJ6EdECuvq6D81HLLuu9UoA9kcKAM="; + }; +in +assert lib.versionAtLeast jdk.version minimalJavaVersion; +stdenv.mkDerivation rec { + pname = "tvbrowser"; + version = "4.2.7"; + + src = fetchzip { + url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.zip"; + hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI="; + }; + + nativeBuildInputs = [ ant jdk makeWrapper ]; + + buildPhase = '' + runHook preBuild + + ant runtime-linux -Dnewsplugin.url=file://${newsPlugin} + ant tvbrowser-desktop-entry + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname} + cp -R runtime/tvbrowser_linux/* $out/share/${pname} + + mkdir -p $out/share/applications + mv -t $out/share/applications $out/share/${pname}/${pname}.desktop + sed -e 's|=imgs/|='$out'/share/${pname}/imgs/|' \ + -e 's|=${pname}.sh|='$out'/bin/${pname}|' \ + -i $out/share/applications/${pname}.desktop + + for i in 16 32 48 128; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/share/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + + mkdir -p $out/bin + makeWrapper \ + $out/share/${pname}/${pname}.sh \ + $out/bin/${pname} \ + --prefix PATH : ${jdk}/bin \ + --prefix XDG_DATA_DIRS : $out/share \ + --set PROGRAM_DIR $out/share/${pname} + + runHook postInstall + ''; + + passthru.tests.startwindow = callPackage ./test.nix {}; + + meta = with lib; { + description = "Electronic TV Program Guide"; + downloadPage = "https://www.tvbrowser.org/index.php?id=tv-browser"; + homepage = "https://www.tvbrowser.org/"; + changelog = "https://www.tvbrowser.org/index.php?id=news"; + sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ]; + license = licenses.gpl3Plus; + mainProgram = pname; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau yarny ]; + longDescription = '' + TV-Browser shows TV program data arranged like in printed + TV programs after downloading it from the internet. + Plugins are used to download program data + and to provide additional functionality. + ''; + }; +} diff --git a/pkgs/applications/misc/tvbrowser/test.nix b/pkgs/applications/misc/tvbrowser/test.nix new file mode 100644 index 0000000000000..b5d12ac6bad99 --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/test.nix @@ -0,0 +1,40 @@ +{ lib +, xvfb-run +, tvbrowser +, runCommand +, writeShellApplication +, xorg +}: + +let + testScript = writeShellApplication { + name = "tvbrowser-test-script"; + runtimeInputs = [ xorg.xwininfo tvbrowser ]; + text = '' + function find_tvbrowser_windows { + for window_name in java tvbrowser-TVBrowser 'Setup assistant' ; do + grep -q "$window_name" "$1" || return 1 + done + } + tvbrowser & + for _ in {0..900} ; do + xwininfo -root -tree \ + | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ + | tee window-names + echo + if find_tvbrowser_windows window-names ; then + break + fi + sleep 1 + done + find_tvbrowser_windows window-names + ''; + }; +in +runCommand +"tvbrowser-test" +{ buildInputs = [ xvfb-run ]; } +'' + HOME=$PWD xvfb-run ${lib.getExe testScript} + touch ${placeholder "out"} +'' diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 91ad479f450e1..e28eb1e2ce358 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -43,7 +43,6 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; buildInputs = [ - gobject-introspection gtk3 libappindicator-gtk3 libnotify diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 95c3153eeb084..839b100383f57 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.5"; + version = "0.13.9"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU="; + hash = "sha256-hcAwwu1bp7QJLt+mrUZYK6YeX/uRmfRa8JnUfrTzf3k="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg="; + vendorHash = "sha256-BehI6O+WpCcgMGabTFMCpYHN3CIo3Zb5rBQuGLsWRc0="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index a3af42c0fb847..5d9965c0d14a8 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -21,13 +21,13 @@ python3.pkgs.buildPythonApplication rec { pname = "variety"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; rev = "refs/tags/${version}"; - hash = "sha256-Tm8RXn2S/NDUD3JWeCHKqSFkxZPJdNMojPGnU4WEpr0="; + hash = "sha256-Uln0uoaEZgV9FN3HEBTeFOD7d6RkAQLgQZw7bcgu26A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index fc66c908be70b..a86ddda288bea 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -1,25 +1,24 @@ -{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }: +{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, chromium, makeWrapper }: buildGoModule rec { pname = "vhs"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; + hash = "sha256-62FS/FBhQNpj3dAfKfIUKY+IJeeaONzqRu7mG49li+o"; }; - vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; + vendorHash = "sha256-+BLZ+Ni2dqboqlOEjFNF6oB/vNDlNRCb6AiDH1uSsLw"; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ttyd ffmpeg ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ chromium ffmpeg ttyd ]} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ @@ -33,6 +32,6 @@ buildGoModule rec { homepage = "https://github.com/charmbracelet/vhs"; changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ maaslalani ]; + maintainers = with maintainers; [ maaslalani penguwin ]; }; } diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index d133331a0a7b9..5d28029213414 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image ]; - NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; + env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; meta = with lib; { homepage = "https://brlcad.org/~erik/"; diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index 6cd7be52d5ec5..d7d497174342d 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchFromGitLab +, fetchFromGitHub , pkg-config , gtk4 , libadwaita @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.3.0"; + version = "0.4.2"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - sha256 = "sha256-HyH+9KMbdiJSmjo2NsAvz8rN3JhYKz1nNqfuZufKjQA="; + hash = "sha256-UHlHfDFTQapQcETCvtch72DqelfBYMymMD/zODFtr1c="; }; - cargoSha256 = "sha256-HvuxKPIVwVrcsTKgPwNosF/ar8QL9Jlldq7SBe2nh6o="; + cargoHash = "sha256-QYw/am5cMVbRdx/XQ+lZv2Jo9Aiwd2ypUlo854sm7i4="; nativeBuildInputs = [ pkg-config @@ -46,7 +46,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "PineTime smart watch companion app for Linux phone and desktop"; - homepage = "https://gitlab.com/azymohliad/watchmate"; + homepage = "https://github.com/azymohliad/watchmate"; + changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chuangzhu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 9ae1b348e3d47..499f1b44db4fb 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; + hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index 7541b759e06c3..30ca1836b7405 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line calculator"; - homepage = "http://w-calc.sourceforge.net"; + homepage = "https://w-calc.sourceforge.net"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index e7a871a171dfb..f743fefc04106 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto="; + sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY="; }; - vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps="; + vendorHash = "sha256-f82ibPnauUOuZ5D6Rz3Yyt0jiAXvjN8Or3gud+ri6FA="; doCheck = false; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 16c6bfac7ed0f..32b53a663d073 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.33"; + version = "1.35"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; + sha256 = "sha256-ZJvlllhF7KPz+v6KEVPyJjiz+4LHM2Br/oqI54a2Ews="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 5fffac0c7772b..823d17ba3664e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj"; }; - NIX_CFLAGS_COMPILE = "-O3"; + env.NIX_CFLAGS_COMPILE = "-O3"; patches = [ (fetchpatch { name = "fix-libmicrohttpd-0-9-71.patch"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 7635a9ea7e497..05f5b3139026d 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -1,38 +1,69 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl, hwloc +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libuv +, libmicrohttpd +, openssl +, hwloc , donateLevel ? 0 +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; +in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.18.1"; + version = "6.19.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-aTyJhPVqq3jGNVozD39RJ4n0FmAKAtPttW9ecoanEzg="; + hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl hwloc ]; + patches = [ + ./donate-level.patch + ]; - inherit donateLevel; - - patches = [ ./donate-level.patch ]; postPatch = '' substituteAllInPlace src/donate.h + substituteInPlace cmake/OpenSSL.cmake \ + --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" ''; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libuv + libmicrohttpd + openssl + hwloc + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + CoreServices + OpenCL + ]; + + inherit donateLevel; + installPhase = '' + runHook preInstall + install -vD xmrig $out/bin/xmrig + + runHook postInstall ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ kim0 ]; }; } diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 538bf3507a7bd..0a513fc70581b 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,21 +2,20 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.18.1-mo1"; + version = "6.19.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; + sha256 = "sha256-+J6gl/R9Yi8V2nYNuIH/oyplWi8vzfdamELHjp6iS7c="; }; meta = with lib; { - broken = stdenv.isDarwin; description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ j0hax ]; }; }) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 1040451efae09..461af3ca669e1 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,27 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libuv +, libmicrohttpd +, openssl +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit; +in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "sha256-3Tp0wTL3uHs0N4CdlNusvpuam653b6qUZu9/KBT4HOM="; + hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl ]; - postPatch = '' - # Link dynamically against libuuid instead of statically - substituteInPlace CMakeLists.txt --replace uuid.a uuid + # Link dynamically against libraries instead of statically + substituteInPlace CMakeLists.txt \ + --replace uuid.a uuid + substituteInPlace cmake/OpenSSL.cmake \ + --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" ''; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libuv + libmicrohttpd + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + IOKit + ]; + installPhase = '' + runHook preInstall + install -vD xmrig-proxy $out/bin/xmrig-proxy + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index a664aec45e1f1..5248ed2f60401 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; - NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); + env.NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); patches = [ ./parse.patch # Fixes compilation error by avoiding redundant definitions. diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 9440c23681007..078d6abccf501 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 0000000000000..c7dc0b6071b04 --- /dev/null +++ b/pkgs/applications/misc/yewtube/default.nix @@ -0,0 +1,48 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "yewtube"; + version = "2.9.2"; + + src = fetchFromGitHub { + owner = "iamtalhaasghar"; + repo = "yewtube"; + rev = "refs/tags/v${version}"; + hash = "sha256-5+0OaoUan9IFEqtMvpvtkfpd7IbFJhG52oROER5TY20="; + }; + + 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-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index bac11b6899b37..dde9f3b69862d 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -10,19 +10,19 @@ }: let vendorHashes = { - x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8="; - aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ="; + x86_64-linux = "sha256-Upe0cEDG02RJD50Ht9VNMwkelsJHX8zOuJZssAhMuMY="; + aarch64-linux = "sha256-lKER4+gcyFqnCvgBl/qdVBCbUpocWUnXGLXsX82MSy4="; }; in flutter.mkFlutterApp rec { pname = "yubioath-flutter"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k"; + sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 0840aad4f2f06..9034d6d2f6a56 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.9.0"; + version = "0.11.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE="; + sha256 = "sha256-iva66tN7pMW0LAvhTbL0Tmsvsdq1+96VciTlaNoVywI="; }; - cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ="; + cargoHash = "sha256-xAA11Og5odn8eNbFNKiRUqLG/MLWPw1WSeNR9zGHs0U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index f776c2c0388dd..bcd0e1f88b2fc 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.0.3"; + version = "6.1.2"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM="; + sha256 = "sha256-nTQDQxXWMHkHgKlr7mIlazH7kW3HJqNLrUATo4s0N1g="; }; # just patch interpreter diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index b1b3a57819725..f2e8a5d3b82c1 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY="; + hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM="; }; - vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8="; + vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7a05c9f9b18d0..b5528c31b4305 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.47.186"; + version = "1.48.171"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI="; + sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 2f39e82f3b240..1eea3e8962f80 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,9 +90,7 @@ mkChromiumDerivation (base: rec { 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"] - else []; + hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 413db2cf985c1..0da93d03624fc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, libffi , libepoxy # postPatch: , glibc # gconv + locale @@ -149,6 +150,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy + libffi ] ++ lib.optional systemdSupport systemd ++ lib.optionals cupsSupport [ libgcrypt cups ] ++ lib.optional pulseSupport libpulseaudio; @@ -258,8 +260,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}/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 @@ -293,11 +293,9 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - # 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; + # To fix the build as we don't provide libffi_pic.a + # (ld.lld: error: unable to find library -l:libffi_pic.a): + use_system_libffi = true; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; @@ -326,7 +324,7 @@ let # Don't spam warnings about unknown warning options. This is useful because # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %). - NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; buildPhase = let buildCommand = target: '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c4f2257d1b2a2..2179722a6e872 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_14, ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand , lib, libkrb5 @@ -178,7 +178,7 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 libkrb5 ]; + libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 gtk4 libkrb5 ]; in with lib; '' mkdir -p "$out/bin" diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 752bde8992489..09417129199b5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,27 @@ { "stable": { - "version": "109.0.5414.74", - "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", - "sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx", + "version": "110.0.5481.177", + "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", + "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } }, "chromedriver": { - "version": "109.0.5414.25", - "sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg", - "sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71", - "sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0" + "version": "110.0.5481.77", + "sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20", + "sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00", + "sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn" } }, "beta": { - "version": "110.0.5481.38", - "sha256": "0y3clfzqnbyz0v53w3ha1kx4jb9skdf22ihs09i8b568dj1m9mwj", - "sha256bin64": "0gvxsgw0ywq8d689g8790fymhksqg744m3j7kg4hcnmiyqdajl0n", + "version": "111.0.5563.41", + "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay", + "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w", "deps": { "gn": { "version": "2022-12-12", @@ -32,32 +32,32 @@ } }, "dev": { - "version": "111.0.5545.6", - "sha256": "0c5v7w0fbhrgqialncx0adyyah2026icwrxjwywridah1jrbm90a", - "sha256bin64": "1m3s40hibs3f1j3g2asq102iijjd59xrqqz7iv82za1slnrcbfg5", + "version": "112.0.5596.2", + "sha256": "03s6phrqv3a6vdkig9npkvnpgc8hcfb6fqgxlmlcmhrf9cszvycg", + "sha256bin64": "1an3gmxcfkzfx30ympli8r7p3xp93i8zmvrayvgddvb8xszrbc3c", "deps": { "gn": { - "version": "2022-12-12", + "version": "2023-02-07", "url": "https://gn.googlesource.com/gn", - "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", - "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" + "rev": "edf6ef4b06b42c58292faea78498aff76bdf68ed", + "sha256": "1l3wz5rxg6q4923gxwx7hrrbx8123i7iniw8ihajp7v4qz27xbcp" } } }, "ungoogled-chromium": { - "version": "109.0.5414.87", - "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8", - "sha256bin64": null, + "version": "110.0.5481.177", + "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", + "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" }, "ungoogled-patches": { - "rev": "109.0.5414.87-1", - "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j" + "rev": "110.0.5481.177-1", + "sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n" } } } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index aff0042ded30e..ab79c1bd8f986 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ "--enable-ssl=yes" ]; diff --git a/pkgs/applications/networking/browsers/dillong/default.nix b/pkgs/applications/networking/browsers/dillong/default.nix index 7fc7cc07121df..41c72fddef4ca 100644 --- a/pkgs/applications/networking/browsers/dillong/default.nix +++ b/pkgs/applications/networking/browsers/dillong/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Fork of Dillo, a lightweight web browser"; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 138af6cc511c8..7bf6fdfe0bcb4 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/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 79afc0ac17d6c..c8a8a85c3724c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,1005 @@ { - version = "109.0b9"; + version = "111.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ach/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b948a55f78d7b3a84abc982f2b98ed587111a9e00c4ed170058d1a85bb439374"; + sha256 = "1ee70baaef25a9e412c3c4b57f86bd6875390dc5e342a74aa42a1a8ed6317340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/af/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4d228b9199b9d4a1741196925c17d83a7d32e14556878a7d73cd108197a7c762"; + sha256 = "20c8f0710d6bebcb51fe27e3969048a61e1957a680843751ed9c526668932e5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/an/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "7f0986afc8a5bfe255014e47ed9e2bb7b92ce07941eae599b28a0acc6d3fe54e"; + sha256 = "3eb9397dfbc37bb54ed8193c3c28eafcf85e3c439b50470a171a591c0ba14049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ar/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8e016f41a7e3ed8b56c93593fce6f947903d292eafd72d5ca6518fbd2afb8bcc"; + sha256 = "eaa2b0a1177b476a6e4da80ca11c4719872e649f7bec0ac1006bd347e6b627cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ast/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0ec22faedfdaa353bb17ea80b3d467fb126b0e85f2c1a0b99907b89d6b56da07"; + sha256 = "637676aa8418dc6f1d3061d2dc2f6a19b80df26b5aa5b04d2fea697c417c75fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/az/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "03661f5d49915da64adf9b0b5fdd1612c3b718b91610586159936c5c365cc906"; + sha256 = "2e1b4ad6c88cfb4369299b952ee7c1d1ddf97461c82d496b1687a6558d008518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/be/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90ec691576893aecef562eeae9b0c1bdbefdfa6cad6aed8bae8a69aceed96079"; + sha256 = "6d3fac5c4402889a9fab97747e397082a75de3651c450ffde52e61b6a105d09e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bg/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a009214ab8dba8ebb423b6cd6a06551f21fd6786ab1ea1f8d3c2ff985ec6e4e1"; + sha256 = "8c0a04a1d4aa8c27a1afd33251dc6b789b82c8cb2a946a4314032ee211a50d62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0e6fa43647b071edf3deb6ecf3866919e81fa2fbfa96e4192393e7161730c853"; + sha256 = "fe5a611afd91bd0724d03ba65acdc5bdef79693771c769bb7ea25ead33d8a61e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/br/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f039c42dec5c42a823d87c9e75080625574c6b39d2f77c639f7c9acb0b8fe00a"; + sha256 = "10beb0d6cfa7a384090e42827b200eea2bd53454aef1dd9f1a4a49f43d4d82b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0e05f64d31c83b932d64a9deda1f96316140f554a5394d0af3e128f3ba1ec4f6"; + sha256 = "ec8a5e0ca3484c3d422d87a09f014ab9efc0b0c0e11785233d6da72b649d24e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca-valencia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "684bbc73582247a088d318148f5af484b005ef8b976cc0b9964cd661e9d1a797"; + sha256 = "15a12109eb1a129fdda1171102aec0bf2e5483d10b0ca3739ec26d6433fe0d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c457bab76716e4bb2ae68ba65bdee46a4bf158e63c8ea48706426cff947bd689"; + sha256 = "71025d3cb8b72f0110cdf0243164115f188c1a4bd864f6ff17304f2e58190cfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cak/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "35f0afc76c474c1441d53f6c0efde1cfa81082a14d4376bb793a54ca7f336e15"; + sha256 = "1a0eaad50ef10bafcfeba322950fe2d8872c3ea8d2e09146c1cb1c245bc2ddd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "07b58e331695a32ad0aec8a2ebcde5d188687735024ea324e2ca93c6211bc465"; + sha256 = "06a5f8b14a92d611bb9977f7c574e498b1cf83b4a7ccf7c0517bef8cc1b5c4c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cy/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "54160bb1974a1a96e7ea857dc3becc2b09983ae49776e22458b4f7bfc6e29dd7"; + sha256 = "fff902bed4909de9044a6e4217b1525a791a854ea148b0f31f0c7ab06efad667"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/da/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "65ad803f63edd0ee806f06f18f4d2c18c1c906057a212c56f8884844e5347f2b"; + sha256 = "172fbee0184cb829755b0c681593de7f146156f01b8b5fa1c093549d66b091d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/de/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "82e167ce22d058d86cde56ad0b3d9fc309f85a535846451d9816e009b78c40b5"; + sha256 = "4f4734b7b68fc3002250cfe3b78cb27925a7267553be5b4c86aaeefea3666f29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/dsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8c69525da6122eda1ff2444bd7338fd14d8294a656fee2619832a66342a9c971"; + sha256 = "a29da2c2bbe243fa1b5080962b68b77260d91ea3d16b68c4033c4c683f49d929"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/el/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "09a0576ccdb7e9388a8d1b107e93df85cb070fcefce70edc7ff0e42f0ad705bf"; + sha256 = "d0aa992170821e77222daaace13d059bb077e53ff38bda23a1218a99e2a4f994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-CA/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9ed6cb1595ac81b78f0aa80eb0a71043ae564071a81b23f0f685c9c27a7b4d47"; + sha256 = "b0e00806bb1d55a0c911b7e022282f3d066158401192fd432bb47e968c9a980c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-GB/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "18e07a151303426b4439ff475e0fe9893d281318ceda35203be77d14c841fa5b"; + sha256 = "891ca73ee7608902b4a2a0311c615bad9aff1d6514983597202c1baad26b6477"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-US/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "42666b7ce609193259d3e8dec2552afdab0d5986159760480801152967751c3e"; + sha256 = "1b8650ac822e3176ef2f47e32a6deca53bb53193289dc1b63562831fad2e70a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eo/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ba38a011874ad940dbc8d1ffb6f691eb3fb4f14e15d0c707929af82b55c676cf"; + sha256 = "0a8b46212f36890f4e7671f97a400a0a3a18583bd5fc6a112e6bdadc360a910f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-AR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "593cae822d499c7afde80ffb3503489f5292b4c69f6e14da82e264d920b06ebc"; + sha256 = "9e3df1097dec9dd8e624d974bf2266a48ec064f2b1ea3cffd6a7f6fa99672cb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-CL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "eed80c73022ac75364b95556f72177462c381fcdcc66f4e9d2a9cc202e6d22a8"; + sha256 = "f2f91fb924b27f9449cf58439a5216e313f77b1ee607a57ed3ba64473b2c8a9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-ES/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "20c4e5cd93c63117d472d982df1282212fe8ff894ad90bd7ba32c2fcf43afc9c"; + sha256 = "0a6eeed4f58e19f62ba6a35d4ee59190ee3bff0c4a6194c6ce3c2a3b6d75aa74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-MX/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "437680ccf9a74365dbef29f1414920f0bea138e7628d1eac1fc3a774d667173a"; + sha256 = "b10f6abce1f7e9bb7a2bd0977d2fa4d76b587c868e7636b49f95da5e1e502a94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/et/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6952c27c55ef99c82c99b684ba56919f053d6a4fdfca929c0251259f92ce3b01"; + sha256 = "72478742a27db5ba63b06b4f26edc3a03b1719227cb2bb177b965c2805628d25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9bdb71d4663e2ddfdf1d48965fd6657f905bb939f14910c7675a36743ac6c52e"; + sha256 = "9a232a430c8108bd944395dfaceb1d3f350482cd10f1f3f54e30f86691c52e65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fa/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7d6fe01c0be2fb3d2f4370a7388db7e9081483697e5a1e3a4daedf58c4e86881"; + sha256 = "180da12ee212d6a4d387f8d365998de80910727d8999a84d3cd23357289af485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ff/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3ecba2eb326f8ab4b60bd1d338c70a10d96f193dfa8a580ce1981f4e478ed66e"; + sha256 = "892750a511be03e2e30e4cc7bb9da509f0ee027b08a7480d01f7d84f912ea648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2faf7574da2d14635dcec25ac9ed9af011d587a41cfdca710162233453019918"; + sha256 = "da3f23947dd3796dd3011dad46bde701f151a777e23290ac1519f9e06b72ec35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "934a037d582e5a54a7abced26eb13378b44bf7d17c40634c1bbb7ea96d077703"; + sha256 = "9db563609d6d740e60606d1d1abff553c04ae2d8ad7873ec375fd15f6a2e1cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fy-NL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-x86_64"; + sha256 = "e8fefc8bbd9f489b5eaa14c14d8c1456557b1c85fdb9188fc2ec14f7b7a53794"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "068a82e5be65d8260450b28f09444d6272d657c36cbf8b5fb60400be79c14233"; + sha256 = "5067b3002fbcdb76b42b452d200d1fcd9cc3cedcab81d4b97aa39541fa93dc65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ga-IE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "63577e9e3696105c7d2d3290510c2732d002930cbfe4ede75513e3cb4d9ec26a"; + sha256 = "29ad1bb43e2cf17510fe94a9bbb0f6b03149ae997ecf362cf40a74586787734a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gd/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "663373cb3a0d15ffb883ac0018f3d50af393986ffde005028a5c599524f4f25e"; + sha256 = "5096da1af9fc8dc358d86512f4ec416e114df0eac1d6f4a0bbae5b2a9bc37906"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "48e0c828735a0fa9802eed9e49629d8cb95407c3608db18b25d6adf60d3e8e7e"; + sha256 = "e3e68af4c1c4e6a2c5c2328584af7fbac6b1160cbe20face8d02ae713cab735f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "da30951c841bd55f3a6cf5ec0226b900b9b0db4b1217278ff87bf15f61dcbdcb"; + sha256 = "713b63f6c31f620f2d079147a1c547e3622b31cde6bbb77ac6ab764145a3624f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gu-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c5a3b0697142ea33df51451177992a10a4ab5d1b44ae53838b50f7be9e4d8d24"; + sha256 = "b2b5390fad804c3708f1a4931cfc2d182e4ae27df47fef552a44099119c6b0ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/he/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "196a01669604ff24673cf986d3abe0f925553f46af63dc70d2dfed097cb11e8c"; + sha256 = "c3287d8e8c3b4431f9b3a1da523d482372f2b461146fc5146e387176f11122bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hi-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "dd386d0889f1a2cdc2604faf7cb41a93b377dfcca220c1e0c46dfc3a1f17c378"; + sha256 = "af1f514e8014a808659b7f01ec5274db11e5a682342dfabd69ba5338732af465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1b2b58f0492c890b988164dafca86311de1e94ef6e429ecc2e998353eb042da1"; + sha256 = "6039e0b4c76e1a86d0e76eb64682c6e57588b0f385249e2b88cbd280f712c5f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "66431f173a0b5864650a45266f75df36d21f36915e0986d2496181ce0586a9dd"; + sha256 = "2bc580b09cb87a8bee5f19ad25da43db92c61ee76d68f94ed75ba750f9074c1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "38d281c815cff7d248c132613c24bb99e7bd20ac19f53aff525fdd39da08e5ba"; + sha256 = "9f9b0381fe4c044020e9fc1c66203d9d521156b1050ea6ef9b9fd32197333974"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hy-AM/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "57310d44addb0911ef0d8e7d4c038f9758d51909fb4a9e4e82883a8a70c76075"; + sha256 = "ab640bb474b99f786546fb198439f3ec9216ca7a1e9d9ff829fe9edc869d5ad8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "17371ff0b7d5140dcda675f877eba8b7ba83eca4f189bd7d60700bdca5de37f1"; + sha256 = "6146c01a30e33f05b8e33e9cb296b98c3564a413f4360bf657bd13c1e875a89f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/id/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a41418278b8d8e6a222d0566448d0c330d025edb9926edb6539c5a21fb91140f"; + sha256 = "58d8cfd0ff22c434aa897d709b7b6d9dd631448b348021641443b50c05116a24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/is/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "772075ad183f5a6914561f69f9ee8d09972af6f05017282255386791f31200e7"; + sha256 = "ae41be247d71227f68f419b81b547a71625a10ff21e93271598fc38de528d696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/it/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cbc0a9a027bfc8f0e6b184f9614d3d38fd18a13459d3f5b5b7f60105d6ee963c"; + sha256 = "2ce9ca925b47853ae07efe2370bac839b270c867dd650578461f37ffb109a08a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ja/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8a3729c31bf4e24044a3b1186ecae173a964f2aa8a7631cd6e3abdded7d0b824"; + sha256 = "36798fe697913dd15c8831fd9ba287c6e9a1ff9bfa7d57ae518055ff5f097ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ka/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0e2e1c2854bf995321533457ae0fd2832f0b0546c6dc48cfa52c628d5d657928"; + sha256 = "74e394513597d01ab3eb9ea373ed1eabe081b7ff3d14a486b5133e05784ee212"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kab/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b1ac75c09a4478caa7511c35df3f91f45d3c8047d5dabeade6f29edddbf6ea7d"; + sha256 = "f20b4c48e5864a32c9b44068618cbf0eaec0f157398a735ef5bd66738c546995"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4ddd63e75296b907e1518d099da9334545e8d12e19c63e757f0c4a4b504b8e2b"; + sha256 = "e144c1a15cfa846be6cbf5c0bd2130c515ee36cc5f4748bcc705facd40f812a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/km/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "84f17f62677718f562ab88948ad3778da1a43c41b8b55210a493cf66f3f0f90d"; + sha256 = "85a71e0baf24a1d0dd856f20b9cba5e03db6acdde4e4d19f4958c37bfdd82b6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5aa037120a0f3060460e04d0eb2d20fbb280f55de268b6cdc0aaceafd6c3791c"; + sha256 = "744e378a3a3006ddf00aacbb9ca635ca4e7bc98b1b2d63af51a3c9c2f4bf23c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ko/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7f30d2f69dac635c5424e8b9077eebb1dadc0e56a45f9641160d4ab396669e7b"; + sha256 = "100a1f77b83d80c319021a185eade6cb21e95036c57290ae7f0c8326c1195b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lij/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "8d0f18632e52509377261d8c2e818d7db39b0fcbabcbf7d192f6e7d4a276cd88"; + sha256 = "e9006a9e8ecdb35b473b34f43088609507e8e5c23656ceb1071ddf7e30254a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lt/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "652d793fae33d4ab5f4928bc3110eb8a3efa785212f37987df12c3a70f1c5632"; + sha256 = "4d1da84d06562f7d81f0a7911ec5b0cf01f59dfa88862602cd8c554bcb8dbde9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lv/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c26444347b52d226f125bd079fe3669bd931eda59e4734859140ad527f907bbf"; + sha256 = "6b0251405bfde6ec7ce719143d56f74ec0557f5603e491ec78048e2409322c79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "086fb00bcab4ebbc59aa3b703c3e52f2456d0312d33980e1d19c041d8cd84b22"; + sha256 = "100d05845b95841cc7c084cc2657602e1c0520a7e6ae9073c9b8f33dcfbbbc67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "83d9fb93e771c8b70fd3a00c401ce2fbefe0b7ce353622615790d56a9eb723c5"; + sha256 = "b2fd3304bb6a6f0ac370177d244ee14d973abd088152b861b4e583d9a02cd600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ms/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ee1db3faa7d2b7d082b025f93961d7081bb13da59d024d8e6019ccae25b702ce"; + sha256 = "0b235d44c0c77bdff0c3a5d24d16c0231145099d36a382c3e25c08f2607f6005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/my/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "dfa95a578db544259328fd04596a3259d807f949bc91aa8b795556b17dafc204"; + sha256 = "413625b9d9a7795db98b1597146afbb634405ac1865a56c9eda5c1c0c8ba8a74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nb-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d7938fcc2cb97e530aeb061e4426aa73a3b1e180053d208644354df351058733"; + sha256 = "223101645d322985b119597bf750cb811856ec081ca0109736cee556549a4a76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ne-NP/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b24984604d50e957451dac478147b5ea1805510c2333d42d8e3434c5fce06215"; + sha256 = "fd664ec6f9f3c7d01c27dd3a538bdceded371a995cc2b4f3f5754014ee50af30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f391dc89c6bbeecdcca4f7fe214f3711f97ab2796ac21e82c785e33eeb5f6e1"; + sha256 = "a9c71bbc38faf6485292c989a47b35ffdee930f112809c06396359107f2928fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nn-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4a041204cb01998b671a5cac77c468a72149d02d018ec1f5ace7ad9e0132c655"; + sha256 = "67f72c9bfde8f68720e52eb96a986195edcb0fc36eb5b122ac460a6c5506f0be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/oc/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2b1152fdb3af68d9faa76d9c6d3d8fede128bf1688fd69a50b98b7bc0300ac67"; + sha256 = "0bc28ca44d311a409fde1f628fc4f511875d7e56aebc8b234599b755a06f7d1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pa-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d185ddb3497ae946fe87b808f843db7acf8645833ef3b54ea948197acb3f3885"; + sha256 = "28b367b1b201486bde7ea970ca1e124a1abacf99715b103e79bda7dc779aca02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "163119ad361e157566be68baf959b62ecee6de303348a8466818826de9b25e64"; + sha256 = "41ccdb0645ca0010dcd96659eaf7cb87eb9ae9fef24f701f196bc9f92c6b1f76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-BR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ff99006fbc8266a69c270cecb50c56dda5d891517ea9b137b0c76ed288d04f02"; + sha256 = "6ae80689d049c3dbc3b86ba8478815dcc68805f3f9a61afa286d76a4243de66b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-PT/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2674cfaf4febe771a9a00d292503dc18a296e29b42eacef4ce4e78107190bd1f"; + sha256 = "4f4533b7e443b8cde10baee0a68b3db9cab9762344c4f9376c9ff2aca34c2813"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/rm/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "830700c530eef545dee9f7badcd49671c3a0d97581deabea5c909e46950056cf"; + sha256 = "aa5e0cd6774e03884683394450abd7172180058ec02c706ba986ecbe67f387eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ro/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "864d7cbfde7574d2bd737c40695142f3e40219c0154962b18284cf3d5a2c2427"; + sha256 = "0f73dc37b643df022b3d914f5f544fcbadcbf1bdf85f4abb6d186cdd2ef6b730"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ru/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "32f3ad6dcfb15e3fd4c6a98ba231e302f8fb71c6edd29b4d820ca93a161ed126"; + sha256 = "bfc9c8fe82bced904268c3cfce53c1b34066879f298ee45944812639eb8cca99"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-x86_64"; + sha256 = "fbb01fa4b75d25004cc5a79d21ca2013ab0833bd394f42867fba70c0a7091e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sco/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "29ec16d715e6272e282df71f4a95738bd3cf0f2060c991665540d77eba73f65c"; + sha256 = "d73b8c6bf55b42e58410205a99d15af98bdbfec550434cd5815451955bd8598a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/si/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3adb3fbe6a22d63a9c78b30025c5d938b078327d20c1267dfa43fd5204e81c8c"; + sha256 = "f5d030c94c6f9a074ebbd97f18a6c14eeef9b00f73d11421614d1cf7e4b05efe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "fd2c585fc89c3a7bdad4bb9a14071f6316371482e6c69c916b4c6ecb45b8af18"; + sha256 = "8c6b3810988ba862c2419e583f3d14dd9722dfbf7c1a55d7e72b9d09cd2d46d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "37f12d5dc272bd897670882400b74e23dbf5905a874ec3c0d0fad971cbdae5ae"; + sha256 = "8aa97c4ce2484735a009399ebeeadc8270fbce1806890ae17e5d42b6bf69338d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/son/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6161d139b125a0c5af7b06c1b17f95dd9847b06eed4b256d94a1dee5ea62df74"; + sha256 = "57018f57ba6721ff11b5944e6b1d1825894ddd5b422b6bb3c1730be31437aedd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sq/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "be76d77a806f97e566ffcf1bcea54dc502d1447d34811ea47b9decd7bc49a243"; + sha256 = "48f5b50ad9f7d96ddc26b091f70c195e7f1abcce1347de74cc994364a47e045b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bf9cb5c2d17a00351ea9cb5918625bf4c97ae2497c4452c6c214988e6c1f701f"; + sha256 = "d69e319133bc57559273111e85d573389151e841bc4381b909fa767a4b7fa634"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sv-SE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a551c2dd59af31bd26129a4260ad8c2e79c1af2d2983a5119a6524ab2a56d11e"; + sha256 = "1e06f9e2071c846aa703ee1da367512ba27f5854237e041b6c1f03ef2d8b3c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/szl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "5bf1dc480db4aef779d2ff6c5fb05170bace4154661928384039d3d34b058c3f"; + sha256 = "ffbec68627bb7660a2a5e55982e4405d74d48d56912506aca96ec42198e82337"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ta/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "90679166c06545d56b086a33eea9882b36e86ff4208be6bbbe469e7aaf651e79"; + sha256 = "add9451aaa5c20c3b963fda1cc0e75eb4ba4b84311f10ba405c10b8392d78ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/te/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "55005551552b1d516db54a0fb27e59f58c478204745355bf249938661ac356ef"; + sha256 = "da0772a5156e0ec08a5ce30c6ee7dc9cefe51cfd72790cbc53d6f2f3eb25a8e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/th/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9f2f26564759d6a97a9315c367301fece20b809363deb64c32e97819ae38157b"; + sha256 = "604d1b9e09334a639164dbbf5c3b974cbdfd0607d0823cb154381a406e43997d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9054a8d512665615a66d9855cc69fdf168508b1bd226237d088eea8dcf004a06"; + sha256 = "2e1469c867e54ad1c6ba8504cf594ebb2f7167f619dce35073bc19c42f0db52f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b90beedd15614b07c24702875e56d2648c6b703fa19bb0a1785282c6034af068"; + sha256 = "3310fcff33e6e6c93a17f73ef9a4c7557245e6881b87fef89fba61e24cf18aa6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/trs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "40e41ad2dcf06f8143f5b7f27a0e20d7fe32a01e99dcf1d44e183bddb2f81131"; + sha256 = "e9efa109578943b4779a89206ff2d096c4067bc996789d1a5a28885978a9acd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "923a92d67ba1beae95e8af40f734be94dc48aa052672e21e051295d2a04ead60"; + sha256 = "b83faddf077b8c346b5ca76c7e78c23bdcaabd7b2edef2747a89de5eff19179b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ur/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "2316371eb6946ec9e108d391a45455cecd38d7795e26133c37b4172ea1977fde"; + sha256 = "610732c62364f6c4a5873ba4003d549011eb424e312795749d76c58fe90c85ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uz/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5d32a7c3165d177b2986534c133dc376a6c588febd0abe69b111c09a4d990f75"; + sha256 = "d0da17dac024d6cc3e636408f4736f586fc6695dd6b6614166ce4d6cf9321761"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/vi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fb02c22efce62374a11450a08dd344e0ab1a0ddd74060a79c39a6246668ca5e2"; + sha256 = "e90b17a36ea6dcd9189e1c6b0d8f152b0d56a852922ddf9e4ca9abf3bed724dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/xh/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd91b4dcfc2e067f299b066345960af90d57eb3bd7523b8680b155f285287ff6"; + sha256 = "5d8fd0e91d7c8e3930a4be87560d6293680bd17f7e275ab619b23b772093ec95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-CN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "52ef6c7d5c1ac6f63033d9d2d36ccab1c28029d1d0150dc6cb6eaaf90e8b984e"; + sha256 = "e67450564d27eeb7e605b673ccebd86924195a76d6eb7aa52603f1d8e3198f57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-TW/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "29272c5953ffb2a6726c7da9c73b86ff64094628504270a45f3619f8cbe45f48"; + sha256 = "7822b37160091511fc120ab7c6d11ebaab8cd601e1c4c89931140917a28f6e6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ach/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c283396e76a59a009a06b28f8e9f71b2dea929f7fbe3111cc59f75d1e986f6aa"; + sha256 = "67c634da5c832ad7d39088b397d0e34c69837e0e6c36604ffef4ada917df9341"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/af/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "64e8e61908f821b4157e33ff06e763b89c66e8482d4526c11711957133de7205"; + sha256 = "c08af1538f18f6c19eaad1c830b115ae168db2b5554e223f5be985e57e156e6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/an/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "bce6d2f4afe2aa8210f495b438786d73c647e2e54625d9cfdc4a93bfa1d4d922"; + sha256 = "922d7f8217b29e2bd22c237b47db29fe510a33587df0281cbc55ed75da17dac3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ar/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8d1c08f96238565a2c78e626b5e3916897a2b7146eee6cbcb7fd7a54862e2e5c"; + sha256 = "68f64732c29def431f7d87fc90d35e3fcc74f8e284c30ec959f2ef8a5fce4445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ast/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "fb02bce602d5122aabf80daaee3a790b90cd1ce553a871ea6e44da4d2283e882"; + sha256 = "423ffa467fd8001614882e36aa26857dcaa9466fdd3a819decd7cd5816ae7ffc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/az/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e021af60171b998c37d531c082df022a2c0cf99acb841c2c7235ece8093137c1"; + sha256 = "5d349b29dca8f2e3f8b7f3815811c87e2bdea47c0686dd6bb2272546d4c94586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/be/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ad2130cad5b7d216ca6b06be19f8ba906e1d44f30ccb9675656a972e93797618"; + sha256 = "8c9d2818217257bfeca1aff0250530fdaad569436f1c9218fa8ff839bbeb42fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bg/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cab9bea6be83af82ae2d293e03db5164081f438fa026067ee26b1748c89d2eb3"; + sha256 = "1ea72a0bc20a3c5a986ae5d2ec43e6347b0631f21e98ef9d2e5847e76e6686b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "cbb0ba2805be954bb894a35bb6e119643992d8bbd7fb4933773c119de73225a9"; + sha256 = "895b803948074af1c6b4fcc12a17594179a5af35d58b3a85ece79e40cea6d56b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/br/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f8c07354ffb8c865dafa1828e62ee7c0a1e89b1c9e8203e871660368ed68d0e9"; + sha256 = "87c6538c14fb8e51c464df8e3b6999f0fc8cd20ac3b1285d5a0856271f9fd1fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "11a71957066c42418902ea53687303844f9451218768551b23fc3828e74170ba"; + sha256 = "7085d95b9d9afdf17becec98b86a76d815cddb3fe43cbae15831156daeda337d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca-valencia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "61e8f1b65322fce46cde4d9208c88008578e017c94c1eb5f91630f95b4acd521"; + sha256 = "251524d2ec9988ca5d72128cc4de2ad0aa4a80c576a1517dc27081fe158c99b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d2a6295eb35514e2bd289f280fab59148b18f349a6ef0d7d4cbe69247b6c89d4"; + sha256 = "ef87a4bb863140d72542e7cc02172028bac7781f806d0f52d51339acc7d49efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cak/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "336c24aaa28ab1accf2f3ae9195a3ac753f2c3a2ceb3378d04822e866979b530"; + sha256 = "37d34d26264da9ce96829d5c2cb7ab1156c9420043a3d6cea7ef4e87256b9417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2d81cca9b20dc40358d4b6b482440bd803ad3e3282197ce8e8b46c046fb22fa9"; + sha256 = "463e68256aa98781f77c8a2467f58c40a89ff43ba38d728fba648b4f76da0850"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cy/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8359257b1a67702cd150922f2e27bfc409ddd54ef66f736449c9317c96bc9056"; + sha256 = "a479727e6546452cd4ad14f90fbb48136f336734abf0dc0e92a56065ed4679c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/da/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "09b338b9d805571611dffe140f950ed5451d1abe9c0b43d2c5b8a3cf2f454adf"; + sha256 = "a39b122fbef49420cbe7c12b0cfda10a061ba644aba36e77971b08bfaa213862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/de/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1ef1a33e292e27f75604ab017fdcbd57fd91e6b63070b83dbb11048575bf7015"; + sha256 = "e653f75cb2e7616389e93737a2bba59c7422a11ca7cf7f670fc9c868fc089be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/dsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "937742961306039bffd669c360e5bd3813530ba1eaec3d463b5d7507208caef7"; + sha256 = "d9b02475bf5146d232f8fb2e96b4da93142c2a4090addb9fc8f636d38de021b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/el/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "eadd17f96c9a20914740700436720c7383ea040cfd49dbee313c9f63cd543e9c"; + sha256 = "dfdc5682800de16e0327549b1f444eff08bf6a4cf5a38d9cb7a6909207afd324"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-CA/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "246c8c7e12287762e824227396c310295ca44af147102d434bcdadb34a674868"; + sha256 = "81e9791af2c7a896c38a752178b9fbff6da0f95ae84ae0fc0a0b315161b4b8f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-GB/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1bc4b65e27ac9ed36670cb30f906125e5ed6416f1e74cce4c27ad66174e268dc"; + sha256 = "59083c9ba66dbd20079d96f24e94fb44d9152dcc973f4e283574de0ca3818dee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-US/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f2f74d4ccaa6d1836cfe35f2066600811669afa661e75923f5efa463f6419b35"; + sha256 = "6fb7a30e23479614dc4f77b728af3736bac41af0a9f45a43ad776d5c0b22e260"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eo/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "03aea5c221f43a03266bfb6dcfa47b1adab597781a7eeb76d97a38addbe01e7e"; + sha256 = "5af5000ff60d6c647317d9026bfe75b2af93fa7078414d9ca7e33d078e894b5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-AR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f33ae2b6c29d3b2d0c3654511791acd8af5d5510b32b5d88cd43986a190f1dfa"; + sha256 = "ec88b3bb69c589cac44b07194904c73dd77b6ccb6cf4f0df5b3d668f70a96968"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-CL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cad86c57d5bf9b8e29da7b445f2ceb6bfbaaf4cd4d4f10fc17cf636251f96ab8"; + sha256 = "9b459d0782b0e2d7efe60a23bb3f81d546978f5bc8e230644de8fe3618231c06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-ES/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fa77b1256964d833ef2441f7d96849e0b71e3fe46018433798099878c04f0309"; + sha256 = "35f382b4387d8f4b89fd9ea9dd73da1765098f00942714e5de39ff51230a54f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-MX/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f89936ecc46e466ce51523551fa36e56b9d5fb60869b36f0df50e558897ab35c"; + sha256 = "90d90cb11ca58f16018b270608882754ffcf89503811f4d17ca14645e1935284"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/et/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03c8b27bd364f62a76f1c77ea440a5c2e15b7a9fcb494fb2472fec3f9c3ddadc"; + sha256 = "92ee0798472b4c17c0d30145ec4db414ba0f641b1f58904d43726d6cad826149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b830123c80c92dbcc6068fb119255558c33781d7a6455cb5632f1d881cc283b6"; + sha256 = "76fb6ee46121973a20a8edc737781980e04ced07761418e0d9d9121eb0209585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fa/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ab9b9cb6040d1f2cb8c383f54b86c16e4f3bf0c43fd81e69b926061eea752942"; + sha256 = "ebf40f448c55b455da214a4822c83b55f6a7010101167eeefa0ee7b554802f66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ff/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "5d35b634780ff8a467cee0a5c9d6a629a82e445822f60d1dac150d4f40af8164"; + sha256 = "861bc300603dae711b152cf20b8be1f6a6247c8e1c87b92dd44c30e71f5437a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dfea0b395fcfa9b6bb20c00fc3522cfa0f52dc398b3344090a2f717fb5305b74"; + sha256 = "4fdd7c7eda0730a168d913f437435dd0f46e3e97a69bfa7b7e3abd3817e81edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f75c35f0ed8cbd6c45c93774f5031b0555465473fa85a3b12501b3e91701cbd8"; + sha256 = "3b17ff465c8956ab8baaa71ee3eb7fac5ff12daca655629ed7d50b0ee0500253"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fy-NL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-i686"; + sha256 = "efdea88bba602a91e2935f6dd53f874f8ef1fb33ccba045b5392c25650a85637"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4fae4df1046e30117ebcab39f930f2b5e4e4e702a8a786b39d840725885be2e1"; + sha256 = "8c75c2bb5f61b94f9a44027293340532e104b5899f7e4555b27a00d3bb2ad4fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ga-IE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2853ab5a94565fa23097331c3c2ca491b7aac8c52a921a07e3c62fb45ddcfedf"; + sha256 = "21853766ad4f9cb09fe2a5919353dc3ec71e99b1034ded1c82725dfa0d489720"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gd/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d4249520b4ad65de6914342ef8fcb37b3d7f5e9a4d1de333a280156735d89fbf"; + sha256 = "86dca0143ddfef6fec63cf70d5dfa5322cca8561f4270cfef936340eec8dd4ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "193cc568dc201ac86e66c6badb73dff2f00479900fbf3e1f3df0a29c46f7ac5d"; + sha256 = "0bc4e3af051329405f2b660319f8f984c136133b86f54594d96523ad148d98a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "288aa3ab090e369696f87f2d266b55b6b604611d48de5b0323a8dcf6b8131081"; + sha256 = "d5308fe2d705d127496097e627e0943feae7b6068642733c36d5ef9dfb812678"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gu-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8751c272912bd68d0ba4a4329e31848916794171e76ecf1ec480d9bba87143a8"; + sha256 = "674d7f3f9af1bd63f0ac5bf690c23fb051461259baa4c5fe49f914804291cbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/he/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6263e6a44cffe19c7b3ac15f4c2ec024a9c4ddd6713607db80789fc5f4ef77ec"; + sha256 = "bba2bc622a90f1051ad4ceb74f502580ec30a1b5df56a27d7ed6e3a0fa6797b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hi-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8d42e30626c4a2921bdda59511ec26adf9f7fdd669df49c75dfd32ec09203bd9"; + sha256 = "b2dcbbfd89a03fd0408ca292fcf40f879a5df920823aae5a9ee13f57fe22ea01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9f145d7adc51f2b266d67ec5774451d04727fe86070fbcd7d78c869c4121618e"; + sha256 = "ec0e866ccde7b96ed65f4d0f06bab2e232319a20edd38fcaa19bce650635a4e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "366403587328bcd5f6554513d0884deebc305597f2f294238afb16c2db4c0bd2"; + sha256 = "d14f7c7b93034f8f2ee6807e64de7f73f600b3071744ec6d5cf1b996ae56b357"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5d0cc99b99d43a7ab939cca744b92826d5199b2000a32c5cf34a65341043fa1c"; + sha256 = "6c6fcc5fa0333a589f8a897fdb05957b93016e4afc0c476995ceb148df6454c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hy-AM/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cb5f333b84d36446104a72bd49caec3d43e202464694f9e78337d3e607e1f4a3"; + sha256 = "a3c967dbf2f276a6a2e60e60c5e225211d6372619fc052e11ee4b0132e174cd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ad48fd8343c13624284798179424c2b954740e165c86b62f8c0555a27445e955"; + sha256 = "16f6e527fc617738e7e153b9bc7c012c4bc0b6c242f641465d2db01d48ff89fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/id/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3729410ceae83654259e8c1f9af7aa6bc1cfa8c96d44a981ca0555b915b54cbb"; + sha256 = "7e27cd38b5defe430189554f929f43be72278c0d5ed010c5ac78920d52993934"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/is/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b16f8b5d8188167a676f9a4356d7b8fe3430d495957a5b5ee38505752e08aeb7"; + sha256 = "c7faad118878aa68078c850730ebc0abc4d4f199625af975eecc76900e920f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/it/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "366dc68de5e29e5ce6777ab654a67c25fbf5681ee42b3cfff68dfc4119d65dd7"; + sha256 = "5b30917c8f689882813f9f25870ea104d780fc476329231cb37b9358ce2c1bc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ja/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7ee29129e13769d3ef0b4491c24c3dfff8f483d6f56d1e8ab7524c64579be466"; + sha256 = "a3916d54ad28297316294065b41cfe99237acf29752b9bf8a6ea886ea77000e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ka/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1e1a51f53eed441d028eb880a364da796746c2d95951d521820480ba3af19cbd"; + sha256 = "65ca0ebc62d144c0a5f7a8f29544de601487523628544ad8050b8367d02e1f31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kab/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b97d20a23d560195218be01ea0ba5e54ffc01d0a297e920b755ea8e717c3b819"; + sha256 = "af9939e9f2be3b7aa823649e285e027565275d602148f7049001176f2bf3cd56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7fc9e69c16e0c01a31b4e9cc6c7542891537bb3e0033297e6792b4962c540a71"; + sha256 = "536481db78eecb11c9b5dd7e9cdf5cea0fae6593b373aeb6774dc55b97e9e749"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/km/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "6ca48c5868342eeb3ebad49a36e5e478df83b44a5fa0a5fec3ccc9efb6213207"; + sha256 = "181d1bd71d1cb96370e54bfe678deb50d3884b9042b0b7fb901e65faeee9e3c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "62c44308be90402c05e573103acd768e93439ae1c058610282838677c553e564"; + sha256 = "2c52d62b7a45259460a1198fbc176bafda3c826a5e30d085ec9fae622100fd5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ko/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2cbe9806e77b05098177fb3e700f74f489395cfb6894737643ddaa820b4cc6b8"; + sha256 = "7cdc34f750e7fcdf68c07169cbd23dfd5225a77a325ab4e5056a5e75be488536"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lij/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6ae2818eacd6353ce0104a41e1a02487bcc852ae650079f17b9c3d24bfa32246"; + sha256 = "dcf20c70faa4fc6434b86418f49658b564a312d7c05045e9d7bbbe08e3412b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lt/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7d5f0a3b857e3b4927f79f6467efb05d362df1849fb696918ff498b0ec5ec493"; + sha256 = "a0f837de6a7ea9ae287b2bd8aa8d07d3e495489a4a4e25877547ecbd1aa635de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lv/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5972f0d493c1048f81c3d2e771543649685c436699733e010ca0352720441652"; + sha256 = "29bd052f0fc211f15b0449104047359f0e54a7395b615d1bc0f25a3a1e2f747e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8b926b986211014b183c2b431a601cff6d41546d0c52164d800590377ca33ffe"; + sha256 = "6cae243bcd0f790ca156f7aa9c6602a0dcf9e482e2fd98890b741729be27c63f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0db18d1f1b5603160d310bb71037586cd3f850ce547551588715323b8a4591e0"; + sha256 = "42adf4de407edb938b98ed3a27b1491dbe463d42fdf3e63c60a7ce83eaab1d7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ms/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6d29e0e308485c5b9ccc561c1ff73dcdd3449d5ec172e87eaa1d4c6414ea562f"; + sha256 = "f1e3e7db826643527896e7d1568a9040ac534327858bad653953e1be9c960e52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/my/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "69e7e315a8910daa7325007b5deb83cf43fb29ffac66d7e0a8e3eb8a372d771c"; + sha256 = "b1a51f7770ee6c3a23859c90fab894aaa3c2aa36f49c3fb9d520542a9492e044"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nb-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1cedc730d9a71fafd39268f343ede8c4e09f4c70e6f3798e4cc6a62e20bac38"; + sha256 = "9688da318359cbb4e0f37ff0dd7a9ec727dbb9e997ab1c0247cfbfffbb8820f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ne-NP/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8d04cad68f00675081fa86461b638e566a3e93b113ec824d147ff858d0488f75"; + sha256 = "e5fc128298e297d2d7b6fc788ce1566bfcdf868962441dd4ee11af3acbafb7d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "da982c4645969987b5233313f867cc0201db446c38ef6fd3e3dddd1c21cfea6e"; + sha256 = "53e10046449208e44acd8f9cc11d2500cb0be0e0fabc2dc7883cc8347a436aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nn-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ae24268f96885e4b5153a8ada3cf66bb7059ef006d54c3c69a6cf6a9599bceca"; + sha256 = "a36cbe8b97febd8ad1fdcedace1a0a087dfde07586e207ae92a9f4f7b6fa7538"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/oc/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f764ebc811b12637c081483260f091421afee5af636689b4c99e41c5e8482767"; + sha256 = "46db41b7ae8c30a889131c7f9e1f6adf2af8fe13d872d951134b06a3591e5e27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pa-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2d4ac283513a21017f8cdd1a2e7d2914dc1f6b44bd7d1f3cb692d897283fc491"; + sha256 = "b07dfb59d5bdd02ea2e55ab0684bd2d4192e888578670e536b847823f49e7b1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "385e1993424817038268e41b4c82e5b7676977bbe66f15cadb4de94e02a17d7a"; + sha256 = "1bd366a3ebf1eecc4eeb30e6f43852fe55c00d0db330607d90647fac00cff9fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-BR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e43c68826c2d2e86122f610465a71de7ddf86d4e87e438639c28816c6e7215a"; + sha256 = "99cfa9de6bc60f84b5cb44a4e139d3a609cab4f1bec126b4cd6c6c6b287dfbed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-PT/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6129db67a61679e1836b09e515481ba64d1c8e4fc81df7216749282a071243f3"; + sha256 = "352fcdad76adf69d708638e81468add5542fe6298ec3b13ba500f8dd7d2a7907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/rm/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "9964cd8d26a4e828d383f179337ad64c7d757f9765adfd8a79b4e7f3b644570c"; + sha256 = "24015a6e677171ea1609cf551e038f10606f34d5c8fdc9f28263e83d219442fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ro/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f7586714053c133eb2acd5a299354ff919bfdf1a6e92804df130959140979ace"; + sha256 = "f3fcb0597580ec67a33aee155bc9ad626fd01b40ca8aee9bbd51b372361f09fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ru/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "33e547e99de3cd5ed363ee9e66c54fddcb52af677b21f2ff8929e3c42732e0ba"; + sha256 = "5fe26295471bf18171b64eb9a5204453556459763b439b7ea0a5afc5b2115b5a"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-i686"; + sha256 = "295ce6d814f4b7b356ea01da7fd0c83ac443614a21d45da89c0691f0dc914705"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sco/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "df707abfcabef24d9af77f658b8e01627c69bf242fa57d258cc6d390e858c9e4"; + sha256 = "a1b85d136a2a1086da69592739d8fc1429e34aa7f180c56f3b270630fee8a6a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/si/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1959ec07d6db26b4f0846588ec074d24b5543285186fceb32ecbe057acc1b245"; + sha256 = "eed2e61f123ef88c71d2d9a1f0fa6019856c2c0e7cc5d3de760091785741f897"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a9c235d177001657460acb0adacc3a7d8b30fabefb96680f09002562c9d78718"; + sha256 = "66d6ed76a9e659703b2d586b97a76ae8b7af22dac3a01d4d902cd5747ee3735b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "da573b4345abf16f193984c5480083c13a65fe2ccb72be245f92e4852dc9a7b1"; + sha256 = "24644a2feda81a5e5f2ad70d420a018a4d36507130699f0175d0e3a9837d3e9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/son/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "147060d1b9dd3c4c0a31e67303cd08b38caba1b495d2c33e172b1b0480993871"; + sha256 = "a1b5d23e4c1cb67cbdc9842e2ea5878f4b6be9b9899bfa59d0e5689d589f3e0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sq/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "411c287d77eb774e52ca4bb528852ce4c38f86c5147c322371633277436e5c66"; + sha256 = "879c5b1f90b6fa51a648417e70a770479f844f5fc4cc124b0b7ea68eb458dbe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d62d2956beb460c1c6a07429ca18dda1b470d93eecc5bf233712b399155dc670"; + sha256 = "94f19f7e0ef54acbf79d16b1228367704c968aebd10d3b8afaa0379f503ccd4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sv-SE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e22d8628bf6cb94f139efdd16fe52bef13179611943c047e5802d46ba396e9e5"; + sha256 = "2efa5241fdf5211e8452e5b8c6d07a989fc3585a7ee00b0a60fccdac140ab531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/szl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "60f54f251a528e69d9de932a1aa9af16b29c118b021fb6578a6d679f19f35d24"; + sha256 = "8a18cbed900564fcaa0cf52d6be461f3e7e6146841568006f409fcc8f5241bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ta/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "cd521c26658fb537c36f21283e28be09b79198733c2c10b44a0e8e5a56630d5e"; + sha256 = "ef901fe934af0978089b7463f743f583e9f2c46c617234b2206cc5e0c31daaaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/te/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "93d8363e822e23ea4afe3c649fe92b958f9066d7fc7789f604af99b6f435d693"; + sha256 = "6847dca8150ba6dac5f7082ae518b9fcba129320e93909b9340ce5adeae6540f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/th/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "bb0d863cf8bbd3bc03d5e4f51af437c5a55736f347998ee1be1e5c0a115d3ce9"; + sha256 = "ac72b502b1fc8cea75ec2b878b957d52fa8fcc29663b7003c334ec6932e5ece5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "66ae66674078504c2d67a5405c407076eab99fea1d5eca0bf4567bf3aa822e15"; + sha256 = "1f2ef4a9dd341c3151c7e66c8d9fc1e0f62f33ec397e3ff399bb56dee89532a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1c0b9d7368c4f9cb61d713d677408482219febc302ec4d8317e20d5f1d1075e6"; + sha256 = "6026af884fb2f1c899fbd28f99d383ca34fd4e6540c37e08904155df3d6e2907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/trs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "67fae3d8b9a6759f0bee55b97a8846afda2281e94c9ea35f9de9eb427d5398aa"; + sha256 = "36f70f8275de2201ee29387c2724f908ae92a22d8e1c830f5e4572f2d8a8838b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "330897b83e0aaab964f0ddf3a07240ed2e4e5f9dd59595b2b3462c258981cab7"; + sha256 = "f46da613145e3ecbcaff8334fe54e340dbce9b0c4fffa0121958abd6fd1e1445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ur/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "6eebf5cccd785a0eb3d14fccb756cc6b9653dc01f3e48c6a1e4956d4329d1d4b"; + sha256 = "048b6285f5600b2c09a63f5c90c2b8fde0159e6c3bc7f282482bf4e3b0581e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uz/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "97b82f8be3b0450646a7fb68c6b5cc9812e3618a1f4a26a339b7e9f672cee114"; + sha256 = "21da3f9a45abb3156ca14c399c2b6329801135d37c3e969b0e7f615311649a72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/vi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "28b48033d6e698b643783433b948e8033d06322a6f164facd3bc6dec64e967aa"; + sha256 = "e0e6509645516ae50f044755da40a30685edf2d33ee38d213000507db3a25d34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/xh/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "dea53c99e972e709483027174697536f300b1debeea03b653189be61b860a668"; + sha256 = "b8904a816b1f6f3290bb2b9d79e2bbe92d01dd5fef059c7ebe4a70cdcdd4cc74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-CN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "dec3dcb0645e170ca312c38f8d91c6f5391316158ad6c0ac2b9eff1d34ff7788"; + sha256 = "307a472ac7ca779883e162a5dd780cc9ef69cd1e09f8aa03f33cb0501960bc32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-TW/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ea01a8b6dc57617d3006b5f24a21206da765abf93eabec4afa50dbad1f7f9b95"; + sha256 = "ffc5c9f740ef19167a463de5b5a85d75aa9cdad85f0d476734b01350c48de9e3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 0ad125beb53e1..052e0e149a8ab 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "https://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index de77cd97f8e46..c5e43821d0b49 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,1005 @@ { - version = "110.0b4"; + version = "111.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ach/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "79aef93220d4ac9765eb2b16dde0a10cb375e08b3d0e94397c17a446801aa95c"; + sha256 = "79343be6d57fc75312eac2f0b56066afe6a46ff8b39a7f5324f69343a3528960"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/af/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "fa1d27a73425be89b34f3bfcebe71b5b29c300b297266b4afe764a7660dfed0d"; + sha256 = "e12e16fc1a4117ae38323fe20a36105ca6ad9abab65835d400c88a1216243ce7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/an/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3d67d3eb19a9b6f2f8893734e7386e6725b6e5eb70aad4957e1809228b960ed0"; + sha256 = "fdde843fc3836ff1aaba4045c332c0cfd50106d94450e5afabdd2216f83cc00a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ar/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "e8177c8011a467d24537de69c0f246f21e2cb4a24384fb1072ab64cfdee7cdab"; + sha256 = "bd122fb367bfa26eccdbceb2253849f1027d35c059ae0b218b76914e9cd0c484"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ast/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1c135b7c3ea17d4b9b87e7d12f1f7dfa9c85d71678d001d9cd078708d59e8d34"; + sha256 = "9069477aef9136231df4aa5cd73ff0b7b5deff3b965534c617bea59db55c82e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/az/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e1355d18563990ceda932955fdb06bdaef4280630e03a16e2498ac244ba2bafd"; + sha256 = "dc9c51569e18fd6c6eefb6d4347fe9cb0ce2daead07bba8e41ee765ea537ed2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/be/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bcd3643714d6ef6b1dd2da4804ad72f06ae5cf91262caf2fc3980d833d280bf6"; + sha256 = "58d45cab0096a7b8d8bf141583daa5e6c2c96e2167b1001441c4cb2002886eb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bg/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "40937098cdb307fa3375038691c41ea25bdeda96ad1ce403d71ece9a9a11d4c2"; + sha256 = "363ca30356f6ed2671763dce44651f5fb291cac071af236e05f52a344f0c9009"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5eef8728e7e992deb4e8d1189e33c082145d500ea138166839b02a09ae58294d"; + sha256 = "bd5448800faff26eb63b4943b81fd161e4c4c129631cbc576b617640821bfdd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/br/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c8c947898ddb8ddbd0c7410e9c8835d883b7bfb10d0789a8df0002843f1b9d65"; + sha256 = "d2b3cecda429f65f8503035c14f4394355428d30f4e5362dabb5bdc7b3b15c2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f7b50052bd7786cfe339dd7524d6245ed50aacef08e1a398668880edddcb7682"; + sha256 = "a8ef2fa0412450583f42b5878f41cbea376e415d84ec3b3d46c2c90f7eb23a8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ca-valencia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9473df4fbaf27848ac09b20d944e40cba52b8af327560c55641f3b0e9a0db317"; + sha256 = "10d1ff2fc9db8f87ec05bb5d57cbb62579bad4fac9f51c5e98e83b0fc5259518"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ca/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1bd644d485d8d9b50f0a57873f99a631c799ad2b75d54544ef1e7fbf589a37f6"; + sha256 = "b2fbf0dc80d2e4ff2f6c50c23cb2ed7c42494324011ef3b87b1cb8e05b755949"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cak/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "94be93e482c2de595a89ecedbe163d97b8d2cad246f309da18490010f4218bdd"; + sha256 = "2e20e0d97aca5d0bc2b316b91bb0f3404cd9f776fd6ec22ddc8d1223a414345d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7a383065cc61d3afb38a53cebbcd1380c76fe8c2677471cd2f4c5205aec1d0e3"; + sha256 = "cc0a7c0bb47cd73bb9e55049d5f0d26efcdabdf39defc0cf02cce99ecbbab4c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cy/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b3852c149fbbc7dd90f3316e1375f2a56e4488ec89bda2f1c5d29fb8dc01ea00"; + sha256 = "e09ea03a0f0304f784f949c643eeca8013a235bc8545d22bf0373cda7e392540"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/da/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "290e82778a26c99a0cb21272a75ddd0a30fd99c9326d7e182a354999da17f368"; + sha256 = "a5dca2e0bc640c0007d4dd7d1810fb26b6dea2d5e6c569f948eef34d92a40690"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/de/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6ab2b19451f60318aef65715af7154ce17197fb596810a572d8721e1de39dd13"; + sha256 = "5d0ed39636c08783529b355617170be7490e4782bc59c2a8eaddaf9e9ec32022"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/dsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bd820c0b5485ffaeb8b978e662c5fa3f1b8c9c17cea49a26338160a6e7a4ff3a"; + sha256 = "c64902738be1493e4e5e7cdb4dc1e323bfbcdb2a301f5a8683f72baa2610cc17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/el/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "532b738bd86ebf327b06ee00e0b375ad45bf75459c0bcafc093d7cbb73136c12"; + sha256 = "daeeee563649f9ebc62f9c3534bfaabebd16c76db0d3f5d1c190cb19cf80c96a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-CA/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5a4c77cb687383b5448879387027f6bc5a40e7eccab58997cd8b9020111a180"; + sha256 = "bf7e35bc0307d76e5fe1f797743c38169556aad60e9e3bcb50feaaff4b9c5699"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-GB/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c872cd171dbe3db7ac2e8b0d8d2dde43a80ba6fce99e8f2508ec0f215ca873cf"; + sha256 = "f529cfad9db2850cc516283ad5fb51fb656372cec8f5ca6363eb6089feb88584"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-US/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "716d742eafe2ef95d13021e5cfa1df9f24650522fd988addd9a3d3c8a1f78a52"; + sha256 = "33021304cf1015164faf22ce81b5bc4730c5fdcafcc656a3032f6344e4620920"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/eo/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7fcda871328d6bff9454c2749aa29e05db0cca0a6d42457f9dc55d31993bddf3"; + sha256 = "857ee8a8e47b45cf91808f10bf7135292b3647f0cf5a13496e77a931adf9a194"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-AR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d50d47f0f26b11deaeb0aae9f190a89de6118f5dc281ffbb66488e2056f6dc9d"; + sha256 = "d91cb861456f3acaf1ab0ffa2dcbb62afe3505df231f9ecb6d4b1be57ab807c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-CL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b5d4b2d40776fe3df72f8ee9da7772056e81d875115b9e839e228f32214b2f7b"; + sha256 = "f5f45002bb81ee81683d6aaeae09d0c06dcbe745697b92e9334394f89cfc3439"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-ES/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3ca3254daef1ac127c3665e841914963c12b846a70babe73bc67706aebd31132"; + sha256 = "d5d5d9de061ea450eee4f1cc9b1a27d1531de39b40d034d35c6981fb3a2df8ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-MX/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3cbdb1b4a493753b95d0c15bf77711c7c9a2521fa0f5bb5398b4a21aa3fd1ca6"; + sha256 = "886fd74d5a3e4658486391e418b686d42af2de969561c871a86c5b7aa650aea3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/et/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "db979aba962b4b28c1d9c992496f535f8dd49fc53592cbad9d5868095ce3f57b"; + sha256 = "1e81adba235f1dbbd345f43964fdfc1e04ea28b7f2e1ee190613abaf5cfb9ea8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/eu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8b7941e539d773a82f934047d6d1a961a13ad5a3481dbf4f1a6379e42a0b7f07"; + sha256 = "89505fd1c7eb8343114bc75ac08500ecbf3c5124609325eec64d3466ba004963"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fa/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "85f6ecb803f35a8832bb5a175875d6e50f79c84ee3e0acf7396c9335a513398d"; + sha256 = "8a84e1e596b21be617bbe9a781d5ce719dbdf1b0826930be2eaa45acf4bff138"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ff/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "11205063e7496360a48ed320d240454175448a02fc720cb7f716a72c48998697"; + sha256 = "e4714ded6ed8c3cabc444fc9ef4cd26105f43acd5fa324f8845508ed4bf01be2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e00863c7a2e3aaee23591a762c49fb522d1b1dad56a4ad51efd742d999e277a0"; + sha256 = "1e0b577bd51c7f9ea167c3d9cf17fe426e183a558b1b7b01bbb9e525129270a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ba0784ac17f95eaf177a265c5657f43397321d3380eab2187b1d4435114be006"; + sha256 = "b5c0ae7f542b4dc5c84ff6db36c5da6f351e102dc9c558837d53bbd789362988"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fy-NL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-x86_64"; + sha256 = "d92e9bd09c3cd9ad14b5950747b4bea427c553ec0bf9d698fddb9aadfb062a31"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e6e333da9a6b874c31905da2b9466988d8d94cd0eac7098f3cc816cfd36b6bf9"; + sha256 = "900f98acd992f6f1f9dbf8273ea42fb87a7931b45d1e42530b4bafb440d42010"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ga-IE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c684a8628360647bfb582da7506201acb7c655d42a69ab48d2f45b91a235f544"; + sha256 = "603ed695e70f53beb4504f925ea1e3eb6bcfb374c97bb8d47680c1c0bdbe0052"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gd/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bcec9bcaf9f5ea21d4bdb2b8cf2d1b479bcf4678349eda4ab8015f6a43d0e11e"; + sha256 = "df12f377572508d2fed19002ec2d176ff5f6756b3830c843622e54ad1b5bd400"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "80eb1934b2e90ac41736324cf21241ec303839c13f000cb1e9d1365a70709255"; + sha256 = "75956eb1451453a2b379269725e182f5fe2ca8cde6a705629093e999c6a4fb5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1f2307c7856c83d0dad1ae3675cc08809616c928373e9adafb5a46083fdbb262"; + sha256 = "81fd5b91ca7e3037d65f91a258a74d3af094164ed50df207fde9bfb9a0868cde"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gu-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e04ba6865ad2c2a618c3dce13b0c66b4be4a47629d92a79780fd8946eaa4c029"; + sha256 = "87a60246afd5c848c980512dd304e6ab2ea57443514a82c2a3b5616db89702b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/he/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f502e8823a4b1017dfc1a5786333f68f82704a27c6e87f3a97978a3fb6d5f1eb"; + sha256 = "d00ba776fcc39ed915eff0969e0a0d739e5050fa90941fa7c32a8d33ee714418"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hi-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "0756e68ebb357dc4c2d0367923e3e6f77da4d0e873d1f7889a79f8ebd0cf527d"; + sha256 = "2febc04c7c53c69d22c502432d2f7b00b1704d11b10f7d0c11e57e6ae01b1523"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "19d55919ccf2bbe9a6d651fce8e126c0cffb4a0b254b0635512fb3c82a191b05"; + sha256 = "b3f156e24d2260337e82dfb2fc1d32deca06ef5c8c34507385c7f583ddc78307"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2005925a8b0da8e28fff97cca8acf979eb4236100fbd0e6138a2cb4f75a2aff9"; + sha256 = "ef5ee36cffb75ecb0e599b86ff6ee0d2cd776ab1f89384a96d0e6d1248ab6f37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "45e01f13ff46efcc43fb059107104a1b0ba39126530774d2dd19381e5f6ca5bc"; + sha256 = "0705bc2374fc6cb67e7054d518d08bd201bebd4c3988d753c63d0d9e867020a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hy-AM/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "624c487076433db825419dcc9f7ee5e45b0995350835ac43e276e0a616d8d862"; + sha256 = "7f4aec0a342481472413fd269378ce2eae3e7612b600696cfcf3754a31cc5e8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "600b3303131b986656e5f6c06a01430010a940763b4a2d38c521cb640cfc36f6"; + sha256 = "3bb51c475cc2884c3c5f42396b08b08519c2515f8b2464d555dda75860ddadf5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/id/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "272f9cd916ba70711f94f09afe3caad5d7b25c9b31bc50a7f6dc07a52074e6cd"; + sha256 = "6af8db5d1f13513a6752c9e2967f4bbc70108001440ce51c8a924953dd24eebd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/is/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d45d8343dc3c65c7d7561f17b8cb2c9f4eccd5b8eb242a4a53696e38ed05159f"; + sha256 = "6fd7028fa5f9b1e84da90238e7da72e22d69b69b4351c0cd9f904c3ecb437a76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/it/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "32be61fa1d7061c5012147f58626b1ceb2dcce9daa1ecb71dd573aef00bb32f7"; + sha256 = "f38532bbc0c1bbc24826239e4fdfab68c41ac7ca0f4562723e2e614762768177"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ja/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a01627875673579adf0f5c9819d33c0b901558034a6878b2871d91b9ebaa31c3"; + sha256 = "214563479cf1b06883bb06da594f2bd32168e3c95152d3476752a2e5a84fa800"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ka/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b2c0a63cfdc32afe89ef513674316435f176b1657f2f6f6abfc7f0527cac07a5"; + sha256 = "145366e2f23bdc7ee3b953fcab4a6b9e7d019261dc874789ec0686493b6e89e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kab/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "6bedeafafb5c746f39fe97bbd383d258d03275b842e14aa80c087d628540717f"; + sha256 = "3f05363b352da502d06bbfb508a14a342b92cdaf27d27769a05eb8568d83c069"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "aa82ec6a68e1a3ba17947f38d8c8244403587afb81d3624fa35ade0b9143ee28"; + sha256 = "afc2a37ddfd6861f0c47708a5f355f72ab4b725bc4da656d4a86068c7cb6f0b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/km/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2ab1e3a97061736126616e74465f0c0c3008806957bec58047c808bf3cbc99dd"; + sha256 = "00bf51d9206e5d75e7480727ca4d1fb5e1ced0a4e6cb060ccb3dc0353b5e2374"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f495b6252bdd160aff2c79478c4845b7968b298200f348d20a10e815fe022816"; + sha256 = "6990e205998640d462f12ede43a136ee4b4af00adb629322d1ff3624cf82b524"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ko/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d98f599ee71646eeee3007be682f74a52bcaeb77684c217d06ea6d0743dcbd4e"; + sha256 = "7fa30c8d668a7daaf7ea92a8d3c27d62f5e54ee0c025f93326ae7296b807fc87"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lij/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "d95e2cc6209c050528247404b65c0269c74a49d0aeb667eeb0c54cc892e1e7a6"; + sha256 = "d2737c1d051b5a21cfdd2d2cd0b72fdff2303256147544fd6de477c04f0db126"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lt/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cfbc237a6b1a3ae245bcadb4a7dfc6424d1033d7bbc4c30e131c1a4297bd39ab"; + sha256 = "4aaa6e8a0018f90ddd78c20180e9bee8f5996d05a2363a953f4b847d837108ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lv/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "706220e213b96ef2dcdbdb115b1f53c8f2c125955603bb55b4a36163b9f2abd3"; + sha256 = "129583618dde24e4dfe87dd1f3a93f8d798b2747303e9d8a4f8799d6ecb25626"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/mk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c1897fc0f200c7d4a359da03bc3770938d1b4f1bf815b9c3a2f5fabe85a82c95"; + sha256 = "56ac9ea05833f5751622ca7237ebf7a2afd431935714139c13878951d3a1601f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/mr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "cf3114bc3188480ebbe0413e7330dbe59f62776bcccdef3b5b793956cc11f5f5"; + sha256 = "67abd72132d0a822651d61ece861f0f2cafb628eef752f36a4e89ee66a763fe4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ms/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6b8a2c7ccbb27c582531eec4592713032eb5166ad96ddfe3e5c684704e8eee28"; + sha256 = "4bdf399a5197427d6418b7b3ca3ea027bf18c44a5b3993b2656740ff503590c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/my/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "571d0b56beaf78209e1996fa0fbe4aa2653ebc5e8edcdb47addd154a9219c959"; + sha256 = "1b369804d91cc6db02d8999586f9733e4aeea5aaaa9d9770098a17123511639d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nb-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b0a0d1126cb0213b2d22a786fb838b39eed5cb8b56e372f641b365941c1f8454"; + sha256 = "748b1a7d23e077628a555b01fe1f06aea3b96c60bbfcc6c1fc61f8d4be3c1297"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ne-NP/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a6baf499beebf302ad6dc519bca3d65c4fff689630bd99322a1f03c83d2f2b04"; + sha256 = "7fc566570e5ff2a2e12e3d196aedd65e7f95852799d4db95bccfa7a0fe58795a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "793a35069d829db2fd1bcdaa5ded586ce9feeb3ca56ba1fd6e858f1213de6322"; + sha256 = "a261f3d0c217c8c363f7ea49c07ac3b12461cb1803f76246b5f4ae09d8f8eed7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nn-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ea1582727d42c5b6f6da3d94ca1219c12dd5af0de9f99edd95045370e1dcdb0f"; + sha256 = "5ddb517b3b179cbb47821da4633c1f1307d79bdcad953674b913aee489a17ac7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/oc/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a168cab442c45ba88d47d9987c0daf24b88ba30d24296aa4676bda707e42c31c"; + sha256 = "81cf6660ffbc86871f8e379e06397ddedb13beaae7f3ee1e455b707460dcc68c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pa-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "809f5ccdce6b742700efde23f94ddf2cfea24269bda990bdaf6693f9fbfe91aa"; + sha256 = "22cb3dff379c19f0c5bc4c0ba3d1ed9a8e554b56f8456349362275702b3a7a73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "846738b0c957cf70d4fc6867aa6b0a40dad339369ec83ad9c5df973d7ebfe536"; + sha256 = "47319b8dd806721e0a3adab372e305bf93086db1e403b73fa9b4fd35173bf729"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pt-BR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5ca2253640fde7a7a20975e6e83ba3ff089d484effb8999dad84cde861f93742"; + sha256 = "029042b4288567ca90c94d2c305c16257c9cfccc24414546e1b464add69fd3bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pt-PT/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9bfbc283ac2e353f5b06c6b4156b84f9c7bc761a394369d21487ca25dc62897a"; + sha256 = "af9a793b0088891f57a0c4af492ea751e8cb8331f1581571c577991ac1342e5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/rm/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f0f2e77eb84222e0c0e562dae0be17fd64b3fc7980d84092bdb3e8174979ab7d"; + sha256 = "82763824851dde5e65d2b1775d00ae5d18fd8978157d49d3f08226229947ed93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ro/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "14e789655e9ee9e55d57c102740c51d1144047c2e8b6822f827be65d89f29ca8"; + sha256 = "04a87d15c7aef1329cd3aef77dce903e27f0293fa2523a102352d7a0adbc05b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ru/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7460a7604204d6a126bffa083c23db82ce6cf926e51c3b602c2571926d2d7183"; + sha256 = "4223743e19623f30bd6e7e6c1700ee1a40c8e14946f54fb72b8ece58b2e2833d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-x86_64"; + sha256 = "48ade5b272075fe71c6d5610468f4982eba7af8d6374eec2679ff51aa42b210f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sco/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "cc20511f344395da551848e7b8622af33b4c2ba22670332b8334da753edd9ca3"; + sha256 = "23ad580377f7269b2066bc96bb5085f3ef0358b0d83d3c067bfc342848856643"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/si/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fcd5ff2aca96ae655ea60d453195037aa75c6622d2786c477414e8483e7d7c46"; + sha256 = "c1cce239a1336c350ff17ee6db6ff4b6cd3677003f243d66c9a9cca093987b92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1925a202a2f280884f0b7e25dc3e88816cd2f4903d3047da6696bd207513150c"; + sha256 = "e358778984f0060f6898b25a2826d8952b6a1268a7fe4918399d7718b991960d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "072e1818082dfbc677743accbce10e68d9e480561459906bff7720317edd63ec"; + sha256 = "0900f59d1162b2567416dfb4acfa4ce5aae8673d84317ba7c8eef1d85e901351"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/son/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e722a643ab7819b96f44e64cdaa7aba66b71556493a7afd18764dea7a67bb7ec"; + sha256 = "c4df1db9499c01e5553cad8c30aae0bbc40b541fcce550e8be9672b2b0bb0748"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sq/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "74ed35e88aba30f23a4184ad16f31fd5907afe97e3705367e2710b7c666712e7"; + sha256 = "644bdddbe422309d7d7fda840a6e741d5c9348921f3597e55b718dbfc6fa7fc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "18c3454af47dabc69eaf96fc9223c9d97f7702e0ad4783508a29898d43087c24"; + sha256 = "c96dbe075b9dccc0c306b50789d53e83044936107daa1f84ea44251d8ef1bbcc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sv-SE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c9328ac05170f9d2de8228e7396f567f873514b9402d8e3e54dfec8b6dd17bf5"; + sha256 = "caa1b01d79d99ba970a8dc2bc1e6ac8a8213a3bbc4aa90357cfbedb3a715ab90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/szl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2272695f8f355115c8e98e9c7d08bf875736dd32df3287a5a876dc48da942342"; + sha256 = "440bafb42b2ec3d884cd16941e05002fcb02dd026087f138c38636834c408342"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ta/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "32a7ffbf1e08cffdc7a2dda2ca80c3e4760eda205a15870168c628d0b4991757"; + sha256 = "8d71745bcfd45edf58dc37d1dd624a5151725d332e393826485626e14d0b7d2f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/te/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "de8e18e7722184f95ba294fd0b425a341a2d91956a7e20ff06664485b8dafd35"; + sha256 = "c1ab0e55c0d8bf854558250f644582fa48dc28cc5cd9276d4ce7a13fb1231ab1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/th/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cebb719fc885dd17c9d1d66abc8760647b53b27e8d478ebab33f8983a83f644d"; + sha256 = "82dbd5a6984419d1e912bd9d79bd7bfee178cf6029277b49cf766b23ba0476a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/tl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "08fc5f815505c637625f9b74786347dd439dec29e658df5a66c003ad0f86b4a4"; + sha256 = "312f1a7f80158f929cb7d953529ade1a415ad1d890024445fc64861478b8e07d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/tr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d581cbae7f241af8a186b6cb18f3410c6eaba6eb45142ea1ae1441aee41f242f"; + sha256 = "e20cbce0d4e26a8584330c9b1176783acc9b060118b980cd0a527bc03b5bdeca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/trs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b4b65c806e520a0a330dffc95a3ce2a6cd66dee21c51e1920c4206bd6c536f55"; + sha256 = "0a4a71d39c3530fbc5582637514f2638e8ba18148654f85c84b29e3d40d5d386"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/uk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f892034091072a6d5f2a188231ddf1916d07043d23e5f939c0f49b7cac5507e5"; + sha256 = "b83b8a0d8f1e0c5f56103c927e87d6d75b2710c141e38b04c29c07dba4994d6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ur/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "2694b8f790584bb95c922193fdb427d7734d451a24ebd8317ce95e042bc69e6a"; + sha256 = "87c09a71bd3ea30b4ae9c4f7ddf403bbf2739f8012411ab0ae9470ed57ea9ff6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/uz/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e5e6fa9a717b11c8b0058920509f04b6192cd4cd4e3d0ebbcfb333425f2ea712"; + sha256 = "20da141cec9223c21403701179e7953a90ce78853287238f98d72b302dfb4b85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/vi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "988d9b206b1429fb3702ad90839c5744b81d517578ae73a289f63ad64caf8528"; + sha256 = "62238b0170466e28d618bc5b77034e9debfa56722a334eeb94dbc4915f7465e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/xh/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b441faabb6cb56d8c95217ab04e9c01d56beefd6f93782354d5d6f1cf9883f87"; + sha256 = "43c3b26c5d3869910daeae378386bf2db9082d4b4c2234b057b6a5098f387f91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/zh-CN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bae64efd20a0d663646cda2622c9eb2a7202cfd5d889456f4b5d050c21e57940"; + sha256 = "3437f410734870f2debb1560c435c1f8f8c6856f25947575404744e8e81a0e4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/zh-TW/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "118b3fc9452d3cd11b3808b554561a29802922f22cb9484f45ad7717234623bb"; + sha256 = "804de772fd007aa9327f3271f78f44c4f0589258edbf091d994a9a37e9f12dcf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ach/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "26f7fd835de5984a40baac0811cd4a5953b302d3f2432032b0e5ba6b60d914e8"; + sha256 = "cc0592a1a93c09e61d7e4cf3b02d83d9d629163d3be6ff0ab84c614764a01adc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/af/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bfe3928a795da58b373a13e0f586e6f845193c85bc124a1d6b53cb6e42b2255c"; + sha256 = "b6f8fd79fbc2f6f69213a603097baa3d21875052eee5c6a58cd5c28429eec74f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/an/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "264e9cbe27578446119afa5b6ad393fa63f61404a0e2045101979674e4f129c6"; + sha256 = "d3b38d8b5e76f5ed89934d6b07255e394371c47e4adaa2878386d8458f2093b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ar/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e15f110344582c732182d17615975825ad1abd67a0b65dbf6fd5f2aa1869ce5b"; + sha256 = "db513dd13874625b440f580a01faf76a04044fbb275c298329151db69992ea2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ast/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "71d88036fd99b8407a10572035ee69f1aad922a96899ee8a6ff82fb87e561474"; + sha256 = "eb7b6b37507d81eb5e593911a224b59b194297c5eb35b1d2abbf3e5d42bd340c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/az/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "8ee11b4f3b9f705497ba4e8cf91f9a97afbb37f7bed9e84e832af7e617c65f3f"; + sha256 = "610c52d1b951716ebd296e9d6149c9a47bb2080f81aa5a6c5b2cefa827477ac0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/be/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fe3c0070de7156dfed3bd8d83c2a7932edd8e917ecd525784206c740da0360b8"; + sha256 = "8640e059847b22cdde3c9010ac99da1803d6cf914360860ee4de1999b2e518cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bg/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8ca7a4c913b560ed79596f2013eb94b8a3a0ba6fe264175f19066d92b890c42e"; + sha256 = "48f7705d3ea308746d0f84ccdebabfd0a2f4f9a29dfec70377f25d990dedc7ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "4e99ade8b0c5c9387103cf1a252d4b198a48d8611e50cf5f9d295c1df550dd1e"; + sha256 = "981596b4573b7d8fdcd0bcf5fefbe78fa0ef2042400bed905242cd4d3db66cdb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/br/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "09d02313cc51b119ebac24db153638431f62ab1d49ce9ae3e9c1e72d457016fb"; + sha256 = "2cc8253034247002cea8713ce7f6a367aff752e015df2199168aa9675a5cd207"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3d6faba008adb139cc3c260faead8555d38ca1ce59f4f4b900b6d3edeb185827"; + sha256 = "e5e5ba20a264ad19533e74f2fc261729a9c0daba889ce8c9935f65b38dbf1b4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ca-valencia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "9203b546400fc902c856eb9d0e9ca6cc5dc0fd937f5afd6110f5d86f5ca59f1a"; + sha256 = "ba3c38118de6973649cebb8ad12ed1f373d5417191a22c3f912e2fd2c295cf74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ca/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8b153a22185fa8bf3910d077e2baa2221c5b813b299949db2eef1530c6d6a7bc"; + sha256 = "acf63847c815d4668e105ffaa7cf296b54d314302ec35e3b6d743c129a06e487"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cak/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "335bc9e0d6fa9136019d7140d342040a59055af9d3276c0dd101aefadbfdc557"; + sha256 = "6447926a0db5e176252efbe1bed5e765fa72092e95603df54dcaa9aa303fdfeb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5dcdc99962152ab687eb91c1e94b516b6572bd8dc0bc65ba5edb63e17e27f2df"; + sha256 = "a142e681421675b53a1a839a6f24a62dcf9ca31b7ede9bb849e38f4f5a9b9c74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cy/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "875d60739f3b52f79107f87069df8d0fa2a2fe369fe55b2db606b894329457a9"; + sha256 = "bf5bf19df4edaf68da1332c41c97f5605f4de36ae721c2ec4bd12675ee013b4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/da/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "99c92de7946b369c144d9a1a830749406e1896fe103eda023b8615f02eb27c5d"; + sha256 = "585c4063feec1179f240252c1904f6e61ea70bb421254d108e5771a5b86fef18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/de/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d9c83d5cf21d6f1f3dfbac933b08284d222ca9dce6ee7f0dbe7edc3bec484f5b"; + sha256 = "a11d1d3ffc768c85c3ac6a7b7757560dbc44a9f206f0c7f97edc74c4c391d06b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/dsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bd3adfa6b436ff003029c5f636d71e9ec6efd9d3f12884d496e18fc49d0f749a"; + sha256 = "83bfb2f657311646df9cd42c3ca7b25a9d72db8b76befc2a69786dae33a3dcf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/el/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "2d58bf194720337581ef39d9304dd25c76d868c559188b483e5b7bcccff594fd"; + sha256 = "a41c08d523d155046653d428aea6bee17bbfc50ecffa72a6fd2dbc988d594d51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-CA/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "46e49ee6bc243047cbfc6caed78ac7229ce1c25f3454d773b001ab53b70ddf25"; + sha256 = "5e5f0fabffd0bc09b47c0e6707717c6fa4d1169831d98dc3b1aefae791845208"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-GB/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ed4727ebf052500046bfd0bab3194322715e26b346e3becc1bbc35d6b5cc32f6"; + sha256 = "5595d2f62405cfc38c1e2f9396f42540a483915ec8029ca53f41053d6283f82a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-US/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9f198ea55c49042b411e0dad2e14deed9a83f49139338baed49105238ebc0cf8"; + sha256 = "1c22effc418f1ee60d0cef4f3ebaf2a9c36da85042cee02ccc98d767d78b1306"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/eo/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8c940f0f4d47bd4bcaa06274c882bdb9ab079927c32e40e121edb14d629c80c2"; + sha256 = "1d40421e514e17482b2bd192e8adc74a2746135ad0d3ec030c1ec251c954b982"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-AR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2252094fef1422b9ed6d184898c1bcbeafd6b80401d03a052a4ddfbaee8cb0d1"; + sha256 = "bbc37bc6f1e0a743525f1106a2a4162b065d93403a8189f99862e8cea7ae2fc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-CL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "61d5d2884cbf7e95dfb642eaab6ff89b51b04c51378e665b45f4bdaed41b9d70"; + sha256 = "0dbb5a2058a3cbf0909ee2394cb593eda3e290439c086b69288efffa84ab6dbc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-ES/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e6babf0af3a058112125b6f576cc089f08e7d93562728c65199a5888413d99ba"; + sha256 = "9227330d8647cb165775f23c0b2b14ef254cf14551ec0ac7734599dd525aafb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-MX/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "c6f51f853aba37d03a3ec86ae8897485571d3f1cfd70fe0c571c68e601631fed"; + sha256 = "1659aab100b94e28db451b3b56dddc76475c2ac1e53baf768df78083afbf20ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/et/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b5d2ae763e2b504fe9a5179087571dc38d859b66548ccb4bbdd9cede046c650a"; + sha256 = "245ae592f77b7065a120580e9f95c61c01019ce7c0338bd1a92fa13a0a2f8f19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/eu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9f61c73b8eb62d64317f28e21e0d9afe638e91193137ed1253ebea0f21ef492d"; + sha256 = "2f6266635f5259d63b2ea59cc825e58ed84f6fa3f336378fd826ee6aec3f7e52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fa/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f1907dcaecef5f91467bf483fca9c35d22511fe873deb08885e7155f79340a48"; + sha256 = "8c1b84563fc3ba29c588ee75f5bdbd0569c9a44cccf80e994cd2120af23a768e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ff/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "74e1fd6a903afd7c80e779f7c4beea9fc14b7f439ecade22fa13aeff00867457"; + sha256 = "8d5e55cad6d93767c08f0b8e1b6b0e730643822d961b4be573b18fd693226d51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "86e8148af4544ad449e68b89e684b9ed7ea988fb2ffba3e7e1973e6431a96210"; + sha256 = "7e15c2b0fd26b0a86259528a0be427c86a5ebc5815c22823030d027dfcf8c32a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b91d34fa10d4f5a2415d823a04197042108a6b61c881148995831554cc40019d"; + sha256 = "26559303acce00f7baa88cd1be2d232aea8b21225ed7a7c828809510c2d5cd45"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fy-NL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-i686"; + sha256 = "2e80ac7c9b1b63e7f45695e81c61fc7a1893d1121f576d61a9bf4d932ce973ea"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c78946f87c910f940b837611e681c718732afe43e801093e49f4fd573a09534b"; + sha256 = "ac9cce1dd985eb6f57af9e9c24e8d685777f50e95a76b4f9bd6810804eef2c55"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ga-IE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b804ea25d35a9e5c85e32e7ff282313b0da74e892d7f1c3dcb771cb8a7099a32"; + sha256 = "856125d0e3a2f173bc9582c266f102d6536982192fb8ee236ce91b2b8c36710c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gd/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7937b23dd5fa96f029e2044ed43eacaa8ac8a709c89edb1f978fd2fdb87b7d93"; + sha256 = "461c838e5b3822ddb9d2d6c554d9ec56bbbaef0a01e935e63b87499e9a140615"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6c4455ced369da61a3182e2ef28fc6d3364e5da6c7a694463bf122e488522b4f"; + sha256 = "800da758f85822c265f4154089f0cb5cc33706ebd6215fc927ed4a1a0303ae81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ef3c41617b962333bdc85bf3e3c5c6b798bf8b87dc42c0b3a7fc8efd03baa6e7"; + sha256 = "76eef892b853205c9657c7f428993b1e9c31e15b417ba11cb9ed5ac117bc40a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gu-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "ff25c34e72cd93436c0a6c82a48cc1c7bf7c0885e46ea3b75c246536a932c981"; + sha256 = "ce7105246b34f4d58d42aa474648249e5417abf79b4bf71ecbcd1a04e6f15203"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/he/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6a216279106adb13ddf196a7bc7e05c61e8984f82ab811fe465abd7cf0af2ad9"; + sha256 = "973037041ae440e3cedecd740079741ca3ef28ca57a9d6ca6adbdfbe77f59ea4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hi-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "778dd4a7a0f589368dd618fc2d4c7513a97fa209347d30e4f53f54862b52e35f"; + sha256 = "c430d14bff26fee1e1e38fd1892316d2fa70ca82c5f5031c710dee23ceea7ea5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3b5e213b6dd09f9b1b1cfb6fccc57a60f9ac6bcdeb45286964afa3b11ef58ce8"; + sha256 = "dbd5114205347c96ada2397d413dcd152ca4dbe50c1a4969e1e5ca9560d1e199"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e49fb0f6487ef29d7848a185316908f28678650d17146af852382a7315687462"; + sha256 = "9c7c650697f4ad5fb5143b78c4070959a03da11d7ecb8a5aee5269893437299c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7dfe91a7c668f58aedc8a42b4988ecc6f3d37d3e8a152c6ab6c79f994e4c4944"; + sha256 = "6725cab5997bfdcc618370d58d8f0445998d4e7db56891c768bbb2fb86cf3956"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hy-AM/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "613100fd8c421975fc1abf3a0e08ebf973c0e1af167a98274293b776a5a7fd6c"; + sha256 = "5486dda2bd14885336a57534330520402e046968eb262d8affb18e2d222f7573"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "6f38ac594c8fd12372e7db61f3ea5937b84ab39fa2ee30212d9748af4c260194"; + sha256 = "73021b42678989df0b2525d80cb852546ac550d42de20300bd5e35d735ff3929"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/id/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fbdb547f865b873b3eac4069a4992b4b7b4ce6c3ce5202f50462c45870ebae25"; + sha256 = "da324b07488ae557a258bf8c4340ce78309f3bf13fe2ace98163ee04b83673d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/is/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "20eede127ff7c6ccf5905f8c1b7dbad4a1a6921465ef9a20f17dcb1b11f31013"; + sha256 = "b89b53f9879588c37f7b4720c91ade14fc8b08fc37e3754036edc02c066ddf54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/it/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f4cdf1e8a584ea7bf36ba7f4e9455fc603a44ada003630f31030d2248f599ed6"; + sha256 = "2bc7859eaa028eaa7099a92f12b5ec492252717960d3de1fb4ca78424d5da3c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ja/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9365b6cda1c107cda840c254b4e0be1eea113e1ba0a7310c81a9c1e4ac720b59"; + sha256 = "06ca63f5e6ce74feb421159ea20d378ef6a8e96e78ef090aba3e61d584d10b0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ka/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "20a350dc82e3aa8dddcb08374a5f114dd50bac7c6179b9f1e2e1192edda756fe"; + sha256 = "b2db2a1d19b6134fc5c0d1dbd32d9c0e3576bf636a9dc88d24729f8b437bd117"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kab/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c2a7b9b1153fe0f06d619f291b8810f8fe6a18f8e38ba261ae7cbad30419f866"; + sha256 = "24363282e96614d4c2466fd71a318a69059949fdd9700e5edccb417b1d9c8144"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f01ce34e338c1eef4316724b9c219907152e0d866aefc05d3ca7a17687f065b9"; + sha256 = "9104db786b41ebcc8ef305c77f87c8c3a622e7dcfe6442880d219f675d5162bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/km/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "5324ef86098f6560f26c7623d15cd6fda4232bbabe5bce4c49121e502eb58cc5"; + sha256 = "254d1baf50fd9ef66d0a871fa90a270dc0790694ced5583d9f554c7b2340768b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f4912e59d13c357daa5ebf6b97069c2888cb20a4873e98939aac3a1f44c6ae16"; + sha256 = "76d8e13f6034014e6ab0666faa197c2fb561f7435b6bf2a5e0586fd922c3b136"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ko/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1478a5a23115ee17de5f00ea86e3b5ddefbfbb6727460155cf0dda414d2171b2"; + sha256 = "98268e5399a66006b0e28f95cfcb0fecb51329e48bb11bf2d98a3c4b6345eda5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lij/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "95878f7c9e74b22cf7ea68878ca2e289c31dc44d711e510564a2c1c0ea8e3784"; + sha256 = "866e7095b9585c411881fd36fdfde2e8b375f14f7d57de9c84b5b4294b7379c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lt/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f65214a0493764ec597572ff4985d9df7a71000a33d048777c1ea7b990f84902"; + sha256 = "add6c3b62d8ce003b628dc665233fec7659483ea7506d8d7c08df73468aaa171"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lv/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "429a92b27a4c5d86c7466bdc383fba97ded97220ff30420497867ab1083d7d29"; + sha256 = "08b81972d6d1f5db1e52eb2ff923bd8fd6f37654cfb17f9db85b81d5433b920c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/mk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6cbbcc0ad8f7df2e433c7c5723cf4470c3dde25bad61db319feea04985a28f00"; + sha256 = "7a0b191e649f8188630f4eed27ff447c47379efff5499ba6e81c89a84fbce238"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/mr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "00e78268a3130629a49c79be6f35493418b8ba5e0a14e45f194c6be6282eda1c"; + sha256 = "61a81bf0b03a65c64e8c3dc2c123fa105e9884273a3da5889a1020742810a126"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ms/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e1df53a27e4364c3f4c537a96e9e94a648bc9cf5fbce958a53a943d62f33967d"; + sha256 = "f875b9a324ff37e2a013b3bd99c62a5399f3bb6d3c91168584cc659b4738e864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/my/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f1231e62c3ed74684496d8db44810a5444ee632fdffb0d4c80253449194a35ca"; + sha256 = "873d367a690abc8ba470d92d695fb45704009014bdd5177079df551f6ba3ffdd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nb-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4e13da7c18494f325918c86aab947a97dcc9dba3fb4fc33c49c8e608a0c6de41"; + sha256 = "ab03b377984f1c293439539349d0a9d5ace131c4947b70c28cb27cd473eef9d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ne-NP/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "294aaa8041e0936ff098089c377f2df4506a4a28bfcdc494f78fc377f457c145"; + sha256 = "7831c3e07973cb44b7d8452040feaf7f5e36de39c5b1ccc6a2543b73e4f31000"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "02dbb54651a0cb71803984b210bd18575b959d27cb669a2cb50a3c0b3df6c259"; + sha256 = "9d73a2a81983f2b55e240520e928bf9f1672846898550986a328841176156e46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nn-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "68f072244742c48a8a4ee3e5b473b30a40e6bda1a9cb56351ca0f1d50b323120"; + sha256 = "b1a908878115fe602212ce14b7f2b5db5fb3629134ad9b66fd5502169d05502d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/oc/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "e3ce7d08716d48669bbe10edd2b8c7089888d9c830fd301bd0f4d8c51298db85"; + sha256 = "f3f3829a2c291ff4ed30265fdd32a75388e288505c3433711d8c3386d4181bc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pa-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fbbe7aa90a13fe8ebfcaaa28d2860e32d8c9615c9ebda3edca516b0096993b06"; + sha256 = "a09a72b0c47b691b78716150ee7219b7f64a6c2359dacd122bd020550ebe1fc0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6a628f50313c1ece6121b3cc291fb82599f0cdd21505db8942dac9df9a3e03d9"; + sha256 = "77ff06b63ab9a92e0f3d3649491cb16e0227509860aefb026798b08644ac36a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pt-BR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "598913c0a04f7fccf94a28a8bd93ff7de55878b8c17c4157be2e9fbe0b1e6605"; + sha256 = "7b5f6f0e171cf9ff0c476154388ea4f4386e0590eaca597e0f40a7cf6bf76f5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pt-PT/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8efa1fedf51bb6013e3865f6f2607f137c783c540b3e21a78a5a5706f2e60fb3"; + sha256 = "dfe82a1301acfdc2cb10d12965e2055a7452114860d05afd50455c95d788feaa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/rm/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "49b8163f40ee7be5feac33d06520ee3e3ec9a346099eee5d9f87a4d9f46335ca"; + sha256 = "08eb21e55b897c53feef910b884feae0bb507cb8f961a47fca311e56c2aa9e08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ro/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "196c42630e0da49d4f29c7c5b50bc8cd59d26690fa9bb492f0b187fa41998d18"; + sha256 = "07aeac3acf174b117478af10f06d8d3c4a453ba9b2b244a4829c869e0d7b6c67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ru/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fad3db3181124aa604547b2e4ec2322f6777b8076a83dc40c51a405ade162eb9"; + sha256 = "e555e083ea108eb66fcefa41058ff0fd6afc1b4fde2ed507045aaa0a015e64a2"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-i686"; + sha256 = "1a407fb487c6d8f87f0fc6105bed0e0f3ee30e239b05e5b0407e3fa20d7483df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sco/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "c7f0825a39bc1745940f85d9f372a83f510dde41d0a1a751c6d8d21136c47e23"; + sha256 = "5f7430a9b3ca0039dc93deb9a7f1e4cf1b2c3361584637b13834274d943095ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/si/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "fda14e47f8152999bf16d3089efea7bbcbc76de01f6f040a95e154ece3763940"; + sha256 = "bcf927095c6ff70ef74f9cb1eeddcc74192dfe6b14c58aa1039991b24f835cc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7f4182ba5331880955d62103e5fc1aa39b31b59403de94851c5a9b19be940b8f"; + sha256 = "24f1f1256bb28bdd0e4fcd88d9e6699dba8dbca203eb0526770e4111ec292c51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "92fc2a31da871010c757efa47e2b6d02516d6a7725e19f06a91379dc95575d69"; + sha256 = "c0fa38495df722a0bcdb486b0a7b339a9c96d882d33dca78961fcde02305ef5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/son/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d4e5627ce9ba22726722e7f3f0b74fd33e36cdfaef47d0d32ca8de29efd01a5e"; + sha256 = "e81863dc6202eae255326e900d90e68fd534e959da8a42e8384cd789425e18dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sq/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "bc2bd9e3a379778fa86cfa360ab2d61582dd1a05418ce38e65153969071e4a00"; + sha256 = "1d1da4eabd23111fcf9e114d89a5d10c7a1a31dc59a51a0f2404c72a2404b7eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5e9da54d468b2e28b7027be3106449d3c40908a438e90926f71db5f7c33eddf9"; + sha256 = "3b6b42e62602fedb1f2d247830ebd2ff3c2d5d2f9e57448958874097e6ae050b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sv-SE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1775502f9436ba19919c2842e368c4dd3e153beed73c95dae630d954948a2808"; + sha256 = "2f222d4ca19c55cffe9eecba8241ac9b8e82ce2e3b967b94cb0257597a4e2e76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/szl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "e7ca52cf7bbce1b8f44e9a75aa3f90e69549807675ab4a0ee14cc0e39e5c9fb8"; + sha256 = "5eec7d31cdd6e4af3aa55ce362a0add47d2710c31797ae8ee913498bd70690ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ta/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c9aaed5d80d601a682d9333bc065705f03e9cd16857890284f3028c921a19d1c"; + sha256 = "a20d5928bdcf61db47ebb0ef87d7931bb93cafe006aea7ac21b4605775e0e4d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/te/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5d23b2ef116c84a498a5df6ab8c5367d950de698f16af592a4fe57894329481a"; + sha256 = "e2ce41c3a9d17cb09add1c1865706c32ca759d38ec812ab902c1216ca20be207"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/th/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "58ba6486512c2d5504e9e1b0deb15a75922dd12ddef9207e5313ada949b14014"; + sha256 = "cedc49181da6aef9ba2cb15c182765a0f95d8bcd3d9801366f4a9cd4f78d1bb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/tl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5bda9db0b83da8d38aa47411714445a3c4c1d39c82a71a10035dc83a7f8462cc"; + sha256 = "db68656eaed16609962bbd4ed8136db81f550e96e2b0aeac55674d1de58fd20c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/tr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fb17e91526bd4aee9f646352861a2d08a07c16db36f50e0a06bb236901990a17"; + sha256 = "1e35e69f2fe162de0d45adfb66403b9c71f4df9715bd9510299fa719b0b139cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/trs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "853f318e84a5c9b9fb8d67c30ca4c7f3ce9c3fb6250d13aefd69e1873926e8d3"; + sha256 = "80787de8668a5f9942c340f757b87704ed52140ca6509fd743e8ddf0ba5c4fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/uk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "801ea66692410438c30178b609f432ac59322668e890718f0be9a1c127f6b885"; + sha256 = "b8d55172c4faf291b9d9a3af8ee02f47fa6d19a8b7bd335387005977e98eafa8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ur/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4083fd7d3d30c5d7684fdffc5387d2d0aa202db418f8340e3bdb717b1fa99585"; + sha256 = "644286a0d8374580973ce154af28a4cd951ccc10a10745c93bcc15a2c262e717"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/uz/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "94d2658cb0f05f4e47d5aa99a98550617e7ba11c5c17de11d8038d8527faaed9"; + sha256 = "475353fc6b49fb9d1c49e9e426dca565c873d9259cb06a41ef2d5c10b8723c5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/vi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cdd6fdec6c904148d9a7928fd5206fac05111acb5981298cdbeb49c83f774d89"; + sha256 = "653b40dc5b26b3461ef870b8aee13baf21ac80f93ae7a84f0643b57e2396ada8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/xh/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "a4d5f861d320453ccb77144d28d0e18c425b1570609ac986f1a8ef1884d1ec3b"; + sha256 = "997abd4257f3fa096f5c58d942ef3e80df6659ca2d805c6aa339a42582cb2548"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/zh-CN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "beff59117070337fa0a86b1871bb9a563a009ffbf02f805bae2af87f15c24119"; + sha256 = "4f1faf36434d8e05eb1b051f093838ed25ee0ce33d4cf80f3e476125346ece00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/zh-TW/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b6775bdeb79f400781dde1773ec008cc7b2f1696006facf5498b2c0c440392a9"; + sha256 = "3b44f459506d34dc47e0636e758add6df20283c717af386b24ab6776525d7eeb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5996ef9363fa7..74c92744434e2 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 = "109.0"; + version = "110.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ach/firefox-110.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "062f6070782a197d5509b8bc046db13f72260eb45f78a3a33b166c29af2c6438"; + sha256 = "c72ce8417550e30d74ce76385e5261f55f3c1ae62c334e728d16ca75e8a8412f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/af/firefox-110.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "56fb07597494f85547b279e65222263d103ac2bc78901c3722c59f12d769c47c"; + sha256 = "3bffb9826cbc942c7ca42c09941dd38f5b52200a7f55203a333275e017debd44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/an/firefox-110.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ad460c6b6b64401562359f6ac7664dae5c87bc51ff5b5f9db95b117ec41b77d2"; + sha256 = "7f25dcb3f0a4adbfabfd445ce08845925ff349c01f4afe3f79a259c6d9eae9cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ar/firefox-110.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bdc967b1d2da7e49f0313710a2062a62ffd14a0e3ab8613049909c9a07a3980a"; + sha256 = "41314e2e91927f9489e51607266beac834c844e364ab959673dc4ab21f40c490"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ast/firefox-110.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b44fe9c2a93d68fd6a20e9f6000eb81635d9bcf78b0f97c526e3e7f216b2e249"; + sha256 = "164934479c770e028dcddbe73396085d216b31d9b3001de76210e3c82f836921"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/az/firefox-110.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d9f78c078b1d34928ed6c18a3c0413c6f079979545a381e001a851cc792f75fb"; + sha256 = "2cab918f71127f01a1256f0d5bcaefc14c468cdffa212a9af3f9341d77737ba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/be/firefox-110.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "87f5fa2f8560d9f68d8d4d77d16fb3bfb20287c87769065625cd319941cede8f"; + sha256 = "70b301bba2286c9cf9393b62f1e6fd7a9a5958c69ad0070c91928b1ad428f9a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bg/firefox-110.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "106d7c1fa3d37b16eaff03503e03dac0bc503d56ce49fc3718417ca3bfe1ab85"; + sha256 = "f1b4d07e3e983fa80216845a9c236a57c0b8cca2d3a343d16d5cd44c38059381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bn/firefox-110.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bc9be31ae2e0c36417df8c86d85f69e22c17ea1b193b214f75137de31fef6aee"; + sha256 = "c5363c0d810c34e4669742b114b1c95c62e5ee9f89158a0e37d2a30d8bfa02c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/br/firefox-110.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "664fff02c73dd60df2c49ebdc4cdea3a09e999f956dcaef502561dc33f6b4ac2"; + sha256 = "21fef420a858a6e2f3cbe145a274d2660dd59a486dda5fbfd8dc2da1bcd6b6bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bs/firefox-110.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "547a8e9b82c014ac7098a1eda0900cd3725f5fb185d66ba2beceda1d97e79fa8"; + sha256 = "93ac6bd8c45004f0a6768df878b3274d42ac6124e4fa4abf3fd851a360d7c5b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ca-valencia/firefox-110.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b995776faa868cd21b1dd7c8bc2e8e6f17a7c9f032c63c3c259b967d3192ea4c"; + sha256 = "fdff415877cb7a38f293bed3a876cfeff083eccf50408afded0288276a097758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ca/firefox-110.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4adbf820fb10f4982294840549ce98e87ec2d65e5b2c693e6d05c0c330167d8b"; + sha256 = "1504757a058e3a634fe633a5fc768bb4240ad15949d6769408fe0bff71a5c17f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cak/firefox-110.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b6d11e53a0163e23e3d6519d411b63476cb4cba693df7b41214ca60c813bc575"; + sha256 = "8e791f14a2191c48a0ae92773f8653ab90f54faecbbf81dabc065e608f92a511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cs/firefox-110.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4163fb90255d52d860c17f72f7787642c6ff054c169aa6f2e9c6293e0cde109f"; + sha256 = "dd6aa73a0770070b26e9ff9a27f0aa2579b32cfd195f0d65b728c92f63a4c559"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cy/firefox-110.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dac9739e42d38bbca3627591aa2bfbc6655dcc2347a6696d96f040362f56fe68"; + sha256 = "896b82fe251ab1471f4bc9f5c37f1651a9bd38cfb994b03f34a984b46a2fc29c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/da/firefox-110.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "793ad841ed9da31087e42363878af022fff237a6281a711736a70e732b588de4"; + sha256 = "1a402341c4d8247af3197cd566e07eb367cb7016c85f49e96be0228e22d1a65f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/de/firefox-110.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e408d6f72760e031122fec82f3d8dc21b622128650f1fc8ff811c3c696e3c48e"; + sha256 = "94b9783c4b13ee4eab1e8abab2a534582b01463d6661df0d9a56d29448910a10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/dsb/firefox-110.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ed4e02c2c324ed25cac1d6cc654d62b5b22670be82dbb3e415783af0e7a7feec"; + sha256 = "a1444709346d8383c512ab3143d4e41fb73cda71cf37aa61ad996f6ba2d074b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/el/firefox-110.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3396a7d6d938cc7793bc876e313dd6f57c60042f93883f7bd3bbd79ef97e7e3f"; + sha256 = "d317b8a632f0d2c085d11458744301664d2b0e4d386df9194b7f6ab3b4c7ed24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-CA/firefox-110.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "40eb2e205a353daec0e0f07f12633c2aba09cee6372e8e3ed78cceed96611cba"; + sha256 = "3d955a100439458b7a668062d75cb79bc0e9543cf51f21fa4c5690865e19ee85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-GB/firefox-110.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "947b937d27c138ebf79377f17ac9cb5fe89bb59abe123a45ca1c050d13e439ee"; + sha256 = "14debdcb282b095b127d1575c6b205a925ffd08ec0e1980146d51afb037391fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-US/firefox-110.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f19775cc6adecc529003ba0239bd46e94ca70a866f19b071a367905184f6d4f2"; + sha256 = "3b3b615829a5adfaa9c9d7cbad4f1460e317650c73d2efa54823bfe99fa0f7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/eo/firefox-110.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6a868b2c8d4d544d69c8d3544927b2ed5f478d14d38f00854ef7d7fe3c1b29b0"; + sha256 = "93dd3e6467dfa466138b92e2890bd95d253d780092e9cde155ce93fa4901f4b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-AR/firefox-110.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "81d80d069e36f108191f1072392b438ea5eca11205b9a50d6fb1d2f550c569cf"; + sha256 = "aa7c81d1420dae03592d75d68f7d3d761cd1d2e34e55ab20ad08f4a94229935f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-CL/firefox-110.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "57e2647d0d3b5e3e7b593a0cbb260b1927475cb7ec1f401b0f39e772aaf76570"; + sha256 = "dae84fc91b87bd08f19a33ba0c398c33e54b9c0d64cd77ee3c37500e5e5b9f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-ES/firefox-110.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6958018e306b9d64a2f23db4f2ff9cb111123573e6bdcacb8789221dee7e269e"; + sha256 = "55deec771fbb3a6e8653250a2d578df7bee9cf20ad3dd326ddd7833627917f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-MX/firefox-110.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bc69b78e261368d51034daee9d374e38241e228102889710b59af48afe0c9aec"; + sha256 = "ba20aadf9c0137a3832466d3de9183685d37c25bc13de3fc64ee9407ddb92226"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/et/firefox-110.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7746ef524a271ed1095c1352b4da1edfc65a66a7f14fb164d90771fd5622d1d5"; + sha256 = "9c58581144a916ae7dcfac8f621a9e406d1a889d007e13ca7f32e969a8da6a4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/eu/firefox-110.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "321e106491e39a0cbb9f0221a11db8cca1792d3f6135fc52766dc7e4a1adc243"; + sha256 = "39b91be1655603dbf4034766319b0224b20f198f66a6fe43c3ff98c438336f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fa/firefox-110.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "23adbcfc211c0c16a23c5cbd89e0d42845c566a5c3736e82d2a5ff67ac0b6e11"; + sha256 = "3819f09ab89abfc79a8ae4a9d676f778e19f3cfc120d839e8ccd1ef6ece49373"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ff/firefox-110.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3c7205f0be5a6018c7fd80bab737233d3c73f9013f2cfe819f4ef9633a264c7d"; + sha256 = "653ecdea0b79d7d489328cea7412dd669d9b25b896746d4a60a9415364923d87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fi/firefox-110.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "11ce6ca3943c70c8d4f66fc600ad0fa16486739894c5e0621b660067daf06f25"; + sha256 = "10fd36e7667d50cc5ba894e1fdc3ac56162740b29a4534e548ef4a4e1f310ecc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fr/firefox-110.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f39b2aa077f059c63901f530d54bea442dec7ad28cecda60571f9266b48e63a"; + sha256 = "ddfae62fa495609806dca19019fa238a0598509f9655bfc0a8c93d182f15da59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fy-NL/firefox-110.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9240fcf0840dc078a9076082dabb46bc16ff02e37de948e9176b6301b4b95bb3"; + sha256 = "1f7caf327e63404450d46ab22500020038db953a0465b5b79773e43220329085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ga-IE/firefox-110.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "92e6e5a5b1635aedf7be819e0ff31746e9b3b18ea1f7c37dc149f78d806c466b"; + sha256 = "3384a63147182c194e695d806220aa32af8061425ecb37a02fbd7e492110a355"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gd/firefox-110.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ff0607125dc57c5c5dffd89dfadfda99ac9a4274c4db2fd69f99bdf238bdef12"; + sha256 = "33bb81bf197174ed0adb11de55b48ca9d14babdcebe95f18cc2b80a3946e1f8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gl/firefox-110.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b1555fe9a0fd4fd9cf0d492628f88390bed5e1f97ef7debd8ef9fbd934bb2e48"; + sha256 = "a4a0f1b2dec71806eb3e7ad6ba4512453e7c2525996ead9ca60e5394850933fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gn/firefox-110.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "61cf8d06dc696fff4d2702c9e051e2b6139b74befe8531320898112e6791e350"; + sha256 = "42da1455925d9f4159e418f3af8c4ec6ff339a9b0fdc25de2d88df4b54509efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gu-IN/firefox-110.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3d81bfc292238dd2f47562f97f5712520d3d48dee7a87f97214015920885c44c"; + sha256 = "3f18fecd672dd5c06b2a2513686e07bfc9e52f063b5a00a42dbe984bfdb88069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/he/firefox-110.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f7f8650b94144ac7aca761df3f89f817b58f514f711c42c4d4f56b7a5ab0f028"; + sha256 = "312892d542a391d9bd0b25895ee4db021f0178925972e9a5a5c453d42587dcd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hi-IN/firefox-110.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "67d8a5d54a07a27d0929d2a1f71780b7d80c44bb5e0ff6e5ffb05f10f112d5f0"; + sha256 = "bc1a49fe3a05d92108757072532fb557bd0e9947ff7c01f57cad8f01a06503b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hr/firefox-110.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "856bcf27f0c2b0c01b91898624836a24fc649e8dea105c3d3d86da14d18a9f68"; + sha256 = "3d8ce1cbb3ebf2ca895f970ee1be35b8c02b177cf9cb7f2493e40666080c6ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hsb/firefox-110.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3843d0d353d7514af25c16509584ecc317233d69b02ce542961797143ef92417"; + sha256 = "4e99600d501be843252a7a1f494b7f1c70d4ce464ce04a0a4fe7ece35629bbd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hu/firefox-110.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0e3b6e9849ff77d992868f02fddc44f88da5c15025ffa060a77eec6cf9fe9224"; + sha256 = "bb6367b61be3cc6db54e004f01582a1ff20277dc34eb79a5a5cae38aa84b0ab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hy-AM/firefox-110.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5b506130d90add811cfd56f8fee26348aac2d6f93a2807a47126afc5472628b3"; + sha256 = "086e6a14870ac92b5b31b61afb8797d5ff3cfa42ed0d70efe7c8950a1a3ee4a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ia/firefox-110.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "98859afffcbdc36a712fd6cb8cbd4bc12e9b61948fd5b4cee719656973326f42"; + sha256 = "46cfd327083006a11f2d483a6dc8bb1cd70cce447b4e0cbe400bd2c0bbe96590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/id/firefox-110.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "98b6fe2329be9c4fc275980672f31ae9d61483d7e2ef850856ebd3fc6e90fa10"; + sha256 = "32f23f73a9e531bc477f853c897641b3539dc39e53d5a718bc89a955ff7f9791"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/is/firefox-110.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0f699d8558b08864174fa7aaf5beb0ad01cda7362b9cc86594283ef9ca4b0138"; + sha256 = "7b9f2dabf39e68da0e7027d177bd717f5d59f7567b5c3ad77803a32273bf1b7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/it/firefox-110.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2c113a10dd45abd677a7abb2b1c64a574d19845c71761e65d44870ae2f593c5c"; + sha256 = "f1a54314f7ffc8ba0371fe2f1f4b178e748a32928f056a36b24757d4faaaf858"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ja/firefox-110.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a6d1ee0307afbf5fcb6f0ec0c899a2ea1ba67cf548f98c2d508d54c72a88e7d5"; + sha256 = "2fa4839150382a59f80e72ae9939c41a5ec5be262be2816bf1986e644e326603"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ka/firefox-110.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7edbcda348b7d51378320d7681d591930cd963c00fcc2b80c22e4902cb30787c"; + sha256 = "453f380f21f68665138c2d45cf5aac474a20aad2739d81b58ebffa54069422f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kab/firefox-110.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "74aada0320298c54f607b3096a607fffc8aa7de0015b353cffc1e3b27582c4cc"; + sha256 = "6521279e7a1a6c1b0dfa40cc16a32318fe1321593493b5c3360aeccc0d3d317b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kk/firefox-110.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4188205963323b35fc89ba17e0fccefe3df50810d7954201a973262f303f5ce2"; + sha256 = "f2230f6e952f55ab1ee9883a9310ac64280b28d9602b09a5a09837c5b7507230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/km/firefox-110.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f1a92901fb0c7835ef9112f53f4109b6b82dbd0a571fcf021e791a12f38f6a93"; + sha256 = "1c7d9fbd2bf87cf33655b6fb52615f4014e1737cd130fd71bd669357774693c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kn/firefox-110.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "47a348c1e5590ba65773fc586d95516c108eebd44a597875a76a4b8d32a4e075"; + sha256 = "e591b6c5bc5235551379bcc99b2ac24a85a9d4da5c10a6561fe3812ade7f6f77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ko/firefox-110.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ec61b0e9f07146b797a7f224fb83a1e50751b875be0331dade5386eb916fd3ef"; + sha256 = "8b72677509748f44c45b176005545d5f601c4bde2259134fd7049c864b772005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lij/firefox-110.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2652857e6007ddbb127aeed33fe6a4bdba8ed44888aafe764b81e8e150511bc3"; + sha256 = "796a16bd6443b729e0158d6b628e03a92b144f742d4d4fdb0bb1410a31a6fcb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lt/firefox-110.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9163745ad65e5be8d030eae894c6f9d27960abe6203649f3f18add16cbd298a9"; + sha256 = "83cb607213879da84e38930b4f1cb24f9cdc89819a4d88bd47521d8833afe9f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lv/firefox-110.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "87ab351a62968471dd16fa4949f0e8fe269223ae03511c03e99b4abe03d6df72"; + sha256 = "0498de6084df452c66f05f3171d42628f41da08772646cc99c32e8672697f3b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/mk/firefox-110.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "533a3f586cc7c4ca38d4fc8c88c16b9595d859e8d3972387677b55cee603aec1"; + sha256 = "0d876b466dec448a88b5b500ce1ff8cbc644e914ea9fe90f1e3dc06a97a403f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/mr/firefox-110.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "298f5d07eea30a8dfa5e16b08151c459f72e24a0c17d6a2f8baa842483a78ee6"; + sha256 = "cbee1c85c3c01b9fc6a7a919ccc6c8dbd3dd0e895e4db6031df55d6ac32af9bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ms/firefox-110.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07802a9e8c4d9ca8e2a83eecf29979d1c3123ba5f0c280017d0030696477e605"; + sha256 = "3623b41cb35d37c1e197e67d86952b4a16a3d272559fe4e3ff369573fad8b44f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/my/firefox-110.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "077ad784cbcd2a3663e4c614deaf921d66681ec5b21d5c5e759fb074de17b259"; + sha256 = "26d6639caae14b3232a04984d43e5625e421c022c374380edff1048cd86d5af1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nb-NO/firefox-110.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "51d7c62bef495e4ff9e6261fd15001539a104041716d4a97f3195ecae479b233"; + sha256 = "26e90b20bc065c55a18575b48fa1259b6389070de5d0d858820d8db8b95f2afa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ne-NP/firefox-110.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2fcb5b5b2c7deaa17ec65878243345fcebb26b38b8d267ee3881f366829f86da"; + sha256 = "4723431192b87bd47b3a2af545b106fce88025a16e9035307fde91215d21d161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nl/firefox-110.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4412f358192301406602aecf7341e64ae1e4909b4a0e80701fd73c0a561ba092"; + sha256 = "f0b6bb64108c1166655cafbe152100305b24717d5c197cdef9b9dc18bac40fcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nn-NO/firefox-110.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8116120da4d557d412100fe5029cc338073f5070d90cdb3e0f9b49242f66c668"; + sha256 = "bfdf81ec059be8e95434c4fa50882fa8be785bd6fcb7af5c33b864bfaf0adbb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/oc/firefox-110.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6e4115e51ec23a42ccb7f6f10caac0040d72d4448141cac68ae8f24b1ad90504"; + sha256 = "7c1361df3ce4c84340d3561d931d1e567599a65f97022b33dc83af2c9db17c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pa-IN/firefox-110.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "640c20ccdeded7f2a25ea0ab72214a4b6f4aa2d937de24853886653684d26b8f"; + sha256 = "0917326d1b70fd5cf3b759f1374eda0d69d538f92fd571df06df4075341dc633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pl/firefox-110.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9ac0462dbb62901a5678bda5360b417a56bbe74003e912323ed1a29661cff1b1"; + sha256 = "d754df80e43a6d00309c867e3b926e173ae895d652ee629d6646cb4481531190"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pt-BR/firefox-110.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "593fbf46826fb0726b25cf1469129d7c3db274e2137966e49c904ee27109e0bd"; + sha256 = "d06263b565d014ee2d71c00fe4b4a4d020efc47a2a8d6dc9687b983e19b8752f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pt-PT/firefox-110.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b96d176444864c0a4814936fa5b0d67fee05739339a5ac01d76735bcee9aeb92"; + sha256 = "72c66f0db72dc4e631a9d9a56e5b4e2d03779326deb501ee42011199148a52e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/rm/firefox-110.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "93d375449f6f70b4043790cc66377559d85c5c6039570701e8435cbc76038e72"; + sha256 = "a1e5e8f6d47aa06e9c1d9f55a014a9a117658fed802302d3d9baada236f2807e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ro/firefox-110.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fd032aed6dcf2afee5185c68e4661077b12fff708ce47147b8b297886525fb9d"; + sha256 = "977766174f16b7f1173f671d9ac3b13c49cd4a3ac4446796322c94e533148c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ru/firefox-110.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "828c606c289b7ce94417626cdf114fed256a0cb247b3f06c46152db777324805"; + sha256 = "c592b9ebf9158496d7c53f010c30934b05f6c24c8ab975bde5cd982e40131666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sco/firefox-110.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0a400cefa3363f357c53ede79d9538fe01ee03b1e6d1a6c9ae67b3ad32207ca7"; + sha256 = "c44f03fb44368f2084ee4fa19b16fb2e2c886ed8289888fbc0a8ac81ae157e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/si/firefox-110.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e414f9004ee3ea08c7f7b39817188fe3e3dec51b2cc258b2a8ea28cf273097e3"; + sha256 = "fc7af71d586bcd77b9773d8d945deb0a8c461d0d244d3a9117c4d6a9eb16748f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sk/firefox-110.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "97da979bde015cf37c7eb45c78e3abdcf7ca7d92b56c322982d8574c1652b9f9"; + sha256 = "f6ca007bf45d7dfd671fd5de3b161da2dd664552d78734024700fc54b396450d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sl/firefox-110.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "016347c5c91e3ff2ceb53782121d8cefa2913464b3876d351cba418bdfe2b30b"; + sha256 = "f79577182cdb35fce6089a54c3773369400d611466dab19355ff52bf705f1053"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/son/firefox-110.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7a82c207a3ad9b1a23e3885d94c7844714a59e74ca8441894da6e3873184cc46"; + sha256 = "221a3f12335129f3bbb8674b723041154b144b00f752680dd8f1ebc98c2a37f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sq/firefox-110.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e89444502f35cba552f7ba907fe2ab0aefc9e32cfc9f1d1c826242b131c0a1df"; + sha256 = "86a093a33be1a5f626455012a43c4a50632bbc6ec990a114979da7f3baa38e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sr/firefox-110.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0d6ac85cd35ee3dff23a7f0d1b973acda106516ef81d6b6e1fc7b6065a61c03e"; + sha256 = "38f947d02fc34c94dcd6cedd38cbfde231ec1131a5dd6faeb34abccd960f1570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sv-SE/firefox-110.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "617d72496a921013702ac3a72c6fbedb8fcb1da2a07f674c7ecfe984816fd783"; + sha256 = "707c1ee6d11af079ba860ad86f1f2b54a78c70442e9588d3d2ad807271914bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/szl/firefox-110.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "44bb46f6e244f9ea94458ad84dd37545f4d5ddf3b1d7c345e61f256a1a9c8a6a"; + sha256 = "991af9e776cbffdcfd88b4e2ff30660af04a16a0bdedc747d2d95bdf81162267"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ta/firefox-110.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7a36826a160d9de16d87a18dcbd7ac8106dca32d584d79a3eb8c0ba93a06c345"; + sha256 = "b59fb2732574a1c44047ae8258597585661229dd2222fb53a485d3a219170cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/te/firefox-110.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "34fd96347fa0ccda294a2194a4da6f570fe04f3afb19f99369c150273be59fa0"; + sha256 = "9d9266c5a8c2988d7db74677e4d921d26c6b38445580be6caf6baad95ab1fe6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/th/firefox-110.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "13e4cb908566d2a0a928df5832f704e4f5d9159bf187b919de05e2ef7dbab6ea"; + sha256 = "6392a911799bed85022b659d14cfefc9a28d10fcad968316a888a11d78ef7e00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/tl/firefox-110.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "67c3fa7c129d81b16ebbbe422361406f63160f5eb0a896237bc2f2b0b2f314aa"; + sha256 = "cac97ac6f2f6eec124219479fca50a0cd9730a3fd6d501285f4a03b1d4f2a9d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/tr/firefox-110.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bba8a0982c65fec9dfc86bc8103b01f5a120c199bcb22ecf904106c270686d40"; + sha256 = "19874a19ed49e6320ca5f65a9ac9f30352abb0c417b6d637548e48ba4e4c67f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/trs/firefox-110.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "452654c105453ff942cbb5a893b411d494fe51cd96a08aaf7a034b12859dfdd3"; + sha256 = "15a541c0b28a8af82ce1b736798850016ccf830fcdf3ccb80198e929613c39e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/uk/firefox-110.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8f4f152b50df0a968fcaf0d9275b5dcf05efa98133133797874cbdeef1fb6b48"; + sha256 = "4afda83040c0353244f55d3e3a498680a1d2b96cc36b97d2b96097d29a87ce1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ur/firefox-110.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "152ae600ea8afc8314eef375436eca52045f0db788ba19142f07f330a4a13445"; + sha256 = "ea702e1ed8c412631b5c2e8996bead1a11eb54d865eb1891a7e5346d332c5af0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/uz/firefox-110.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad7863d60cd8cbdb5eba0eed7d982db15e92a426ea2e403cb002c71b14cf540a"; + sha256 = "6173fe2d74b1b5f776a8d1fad92b8a629888a7e7a267d49a9296a4728f46c456"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/vi/firefox-110.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "32cee9d8f484735a3bad323b2a37fb2fc55dad88a4a493eef777473b56aff922"; + sha256 = "88eaa69fea116db05aa2adf3e0b89b2f5707bd83373f7fcbc72f758ca293a0ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xh/firefox-110.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "00a6d3877213685e35d175df3684b3024a3e0fbc7b284b1cff8ea25a1ee4cb00"; + sha256 = "8869898fa3895eaf2749b414a518f2e281e813771505c1715b077c155ef7c6c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/zh-CN/firefox-110.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "75241d745d714ee885d73c802900be3606d236aa08683b4ec56887b918555a2a"; + sha256 = "c400f7deba6435524ec1857da4c8824de621270060441721e4d63bb4152c414f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/zh-TW/firefox-110.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c0ecc79ebb0a989ee976f5c2c9fba5c4d63bf65706635663e2cb83667f7b8a38"; + sha256 = "3d0153abdbe3ff6e6a63d748ebad7974c869b8b862719aa141b5ab3527e7dd85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ach/firefox-110.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "319dcfcd2957576f02bfd28a192daf0ce87bea110c782890c4f1c7dec05d591e"; + sha256 = "a497c0580b1b85875528ec193d2a784c264b27bb0f386b95b491d12ef6793dc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/af/firefox-110.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "14214ec48f3aef6381b3a55827d589505236fd9120df43486a39775aaaeba43d"; + sha256 = "4c4ef321fb862c8ed35ae41e3d9997f304059bfda060b1d6cafb4a5cb9d3844f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/an/firefox-110.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5694505371af1b4589abc4038f7cefe2650b9eb78ef546db83f886ef3ccd6a77"; + sha256 = "3af27b88ac940b664df13283d34a02d8f673a6474642a1c1665af249d6249c19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ar/firefox-110.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ad21038b033aa55b7c520712f4aab50471deecc681454c7a1cc97f7604444878"; + sha256 = "cd533794dd488430858c800f81adc2d0ca11b6c9c882d6b00eea77cf65d59818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ast/firefox-110.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7f7ea232c8249535b4f1a4f0443627f115740a39755c43e3b296da494c1705ef"; + sha256 = "94859669edd14bf395d298872ab4aa6e75d763c893304c1e97908baa8f84cbc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/az/firefox-110.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a37020472cd15d7ecff01ab0a732d26557a3ee665465c54f1e6d623a213f3685"; + sha256 = "5f97dece71f45eea49b09f67d86e42f8a32e4c46f2e6028a3f9570fd976458e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/be/firefox-110.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dd7b9fd2d267b503171d3894c238db5cbbbb003bcde623700abd8ce0d81fb8a7"; + sha256 = "c0d5aee80966ba91f56c9d4c5378ff8dcb49ecf1f39734a892aff19d48d1f618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bg/firefox-110.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c4de3366f58998129beb1def4283fb28bc3b90464a090e3f71198862a8b4af7c"; + sha256 = "427ed2a9c099cad19730f749fadd78a875f36e90e21967664db0d0d78791d821"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bn/firefox-110.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "30e97ca633178bdd4ef10103c5b7795b0f7f5bc97cd3b3d4e2fd01138ad79fb0"; + sha256 = "b447ceb654fd80ac6f02ec6100d9b05a8e4db3b88ccce18dd73b568f4a8a79bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/br/firefox-110.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f4ed775564c26f45ec26fa7d1b440b30cca17849f144031929cbe1526f7c630b"; + sha256 = "97c29e25546631441e8e91f5101ebe6b38580baba951ab0cadefef6da100121f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bs/firefox-110.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d568367dfa066d2b5eb7ab920fd16f0a66de02468cc548df8883baab27ba4e5c"; + sha256 = "80515bddf58da59418d3cb4c815deb27a32db94d29087ffa2abafcde0d8cb697"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ca-valencia/firefox-110.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b33df0c70b943f857df218064db9f20ca21381f1217322dbfe4e6fd4f2902d95"; + sha256 = "c72c6c12bdbdbf438565e417dac62ce2fbbd10a69218d63f424a8241186e1277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ca/firefox-110.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "78b1e2ed95ac41994e35e94d3df2a61306e24268be86c587f6a7cadb5c62b65e"; + sha256 = "42829bdbf409d8e96c1feae1283fc81d892a8c8c6b7ec9a22eceeceed9c75f60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cak/firefox-110.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2b9210305ad57917402d0a1eabfb188b70f582c44fbc67b84d09d1c23e18988a"; + sha256 = "e304b4f56407efedc4ba830f8a8baa4ecdf1ca597c85be6cf03ef7208a420c63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cs/firefox-110.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9e4ce61151c0ca0610c83d734bb619d4dce26d40efcf6efb54e42d467a5ae2f1"; + sha256 = "1d8c649087ddb30988b8efaf94d12f287ae6670ea67c3e5602414ed296d01b5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cy/firefox-110.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5cb9864ef458ef304b7a6b40ad71d8131f1ff3c3a215cfeca4e811e14b362927"; + sha256 = "3594d93aa8b4cea7ee5783a2ac7c8d2d19a2b7a75a8f10b5e647564583e4af85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/da/firefox-110.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e6ea695300e68b8b6385e6a5e4022e645133ea1205c7d902ce898d59c913cc9"; + sha256 = "e5358082beb94c367025047503ed28e6fc9daa51b581613e680af561fecb3e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/de/firefox-110.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8ff84702ee8f877d9628d96d828e51e7e9cd333307df8ddb2bbf58d5d8805b78"; + sha256 = "c57baa7af49f8b07b9fe3cb74d3e6110d217c1f0c3fc8c061a7ca6259bd0db85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/dsb/firefox-110.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efe721496f5d5567d7ac62d19b0510814c20b6e503c15c1740d50e7fb1a41d44"; + sha256 = "4bd06a4df2243e392c0f9ed7976c38b85ee9cb413e50cafaebdcf48008a1b7c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/el/firefox-110.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "95a87e1447dccf05fbab815dcebeaa213501a81c8dca244a2f63a1da300cc22a"; + sha256 = "0e322fcf17bc6abd90c135237c199ce9a6979954df947d07fdc926a90e0f751d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-CA/firefox-110.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1d3e2f468c8c0776151a7776d6201e39beb37ff845825b1a031b2cf1a04a0da"; + sha256 = "8b4770349802e264d61b228f64db1d2c4200ddde513b6e88277e14c4dce3a5c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-GB/firefox-110.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0952eb1ac27fa387678f1d9f6e64a718462652d823bd630ccb1ef39f26369270"; + sha256 = "f36879cb02a912b6b7023a55474a99edc1cbcaa3174c02a23f5c861d91945c25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-US/firefox-110.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "793fbbb013c18956806e9e5d1f67de94a649c3cd8d10b3a75bd388b87ddae916"; + sha256 = "b9c800d918231e74e6ddcf6f5ebf54e94440f03ede36221b061de65e9a7ef1f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/eo/firefox-110.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0cbe5fa5f994171a57ac84a4edb9d63adec71bb13709256c99e2b259458eadbc"; + sha256 = "93a77d6696d8825e1a16eec1c757f7b35434976980dab488ddde7096e3b19efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-AR/firefox-110.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e6b717709cf8cc3a5dab27b0c1b9082f6d71da77faabeb13248574790a42e1fa"; + sha256 = "cb41a835bf688d08ca346e6bdc12549d63741acc87e2c3d7fc9f11fbaf8f9c32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-CL/firefox-110.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e2c6016a7e50035e8478fb0eadedd67801f0ded948171fc13586ac46d49bc914"; + sha256 = "622933f73c63dd4da300677ca1aba7729b615ccaad3f820eb66ec5241ffbe4f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-ES/firefox-110.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2c41f6d48b07e054514aba80b3a396b70316f0fefff8c31301e5f44e3de74209"; + sha256 = "0659f2594b695a7be000d0b1901e50b58a9d561f57f0ae31ca4c4b3c374f8d3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-MX/firefox-110.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b51ed9a76071d56cace6e7aece52efeeefa26dc26e1233fc0e2ad64317c9f4ad"; + sha256 = "ce894eae045e3b09c9c6dfa2754c5a03a6e737bc4a3b54a78d48226cd5376048"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/et/firefox-110.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8094ece309d8c55bf9432425f2a79f29eee565f7d6dc8080986b088007cfdda5"; + sha256 = "dda98cfd2833dad0ce35be8bfdaa34facb3fe6a68117303f373b099fa65c2b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/eu/firefox-110.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "07ed9c2af5a7e5ce0452e4fa4da38daf3d20f5f4f6f059dcfb4ac3b7ffc657b8"; + sha256 = "44c0a2d50e10d826617399abf3d036619576b2f5fa3e97b5443c38736cdaabe9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fa/firefox-110.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0dc870f5bcd2e3411fa6006aed8e2b295d99f6e47e7a3e4a88860d7001401b5a"; + sha256 = "f3e2b415e88ecc7f1b39652ea08d217a6450dbb8c7991ac2fc21012c6bf485fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ff/firefox-110.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c319ac17fba19833d16c96f848e0a1e6ddf717922648a7d3776524dc94140b88"; + sha256 = "fa72b60e44b74aef447c491bc3d5691293765d6d29f0226b8cc703ad683924cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fi/firefox-110.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98e907dd0d23b45c5f8360e39642e9df062d6c89cb84dea1cd62f70dae2d4d62"; + sha256 = "be6cd6db910aed81fd5ee10f96ec9726b64dcc90301e747f2881acdf04693c21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fr/firefox-110.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b56c5b71df91ed86b10a66a30d24ae02ae84d75972ce367c288a27b171082b6"; + sha256 = "813fafbe4ff568297f58a2a6f98274681c643953ecc27266bb91cd83435eacfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fy-NL/firefox-110.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5edaf14de80f9cdcceea8e2f291425a74f714bac482fd83d046ffab6e5ff4530"; + sha256 = "ceed0527d8176a1e04622e7a0d342890591619bb0907eff75f9eae6f8ca912d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ga-IE/firefox-110.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ea2815b2ed95be115252e25d0a1893a5d9f6865c16e7b8f0acdb6f05e9447f9d"; + sha256 = "26be4251150549246fe36db06dda749aa7f653086c8a3d789f296b638013b49b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gd/firefox-110.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c4da99ff08acd9f6af5975223f8fdc675fca53138b1dd089ce1e5d98641624a2"; + sha256 = "abf2fe88921b3b84390e1cb85e0e7dbd0bcfe4f9c3fa20ebf4dac0a3b673caba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gl/firefox-110.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e77e5c5e23dd7cfe8d6310b30c4a1e3302ce0d8e5a7ea332eacf5f8735107ff9"; + sha256 = "630ade818c30b683eb68a9da6b56b38f5463aa44ccb2cca0c2fd095a18e5ef32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gn/firefox-110.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "97fec0c7a9caa8f598ee28b149e8010f39d649c7beffccaeab56757c0d4312d5"; + sha256 = "8765e1a9cb4d63d9488567e9b899576127e58635a2129f31511d00c776ac159e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gu-IN/firefox-110.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7d303a03ec303693f627604e3b419d949a8cf7f903ae813d18c2c5449d9480ac"; + sha256 = "29661684a641a49ad8eca9a2966cd8164ed81a13c17f8308f629730216a1a067"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/he/firefox-110.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7f64f45a8654aaf4fd8b29f980b01d0746d205baf498734416667cee3ac3e70c"; + sha256 = "213c1c59fe3d12769e6cc059aae34e00f6427538e0995bba8bfae888ee18c967"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hi-IN/firefox-110.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17446de5dbf9c6fdf7b7967f36c329ffeef97faa1fc4c2fdb64f932da30c759c"; + sha256 = "bab8dd86b381dcedfa0d2cf63415c978b89f2575fb2714de8b99057f4b74b9d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hr/firefox-110.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2059f6e3a10f0bc2f1cff8179d294c75476dbe21b31c5830a7da933a7cd60bb7"; + sha256 = "ae3cd7d66386008e46c23d407e3bb4139161afb4bf7e502f75a13cb04a351ccd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hsb/firefox-110.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "273f47c51638cd3f7dbce9678b52e6a99fba46502bc56587a0eec1b1cbc858ff"; + sha256 = "6e5dd5938957ee83fbd44a2b2ef611a5fa721f310ae2ccee51ec2d58dff3c34d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hu/firefox-110.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d00e86d775419bb5ac5e9016dd839d41dd8fc9ac73cbef71ac01e9f40b1fd752"; + sha256 = "6e3eda91a7fdecbcd7b0f3e26a08e76363c874349995c4d345fbcdb2ef1137a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hy-AM/firefox-110.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e8e877347b98c65294ab695f1074995aa54067b97ab655dcb794b66bff84b7df"; + sha256 = "85ef0cda129576fc12ff3a8ca33fc7ff2094d17ca61598d867118c95149d7b60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ia/firefox-110.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "0cdf2c81a5dc30155c67ae1decf3f36377e732f2a8b0529554241a16e9e7a125"; + sha256 = "1a20c3717c92654cbcd7991f4406c731ccfaac0e65abfbe57fa45e71b5de32b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/id/firefox-110.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "92604c3f8e4691bfde59cc9f2f22cb1828d0de5efd5ce58bd2e140016116cfb2"; + sha256 = "fc12f3ebed4f5d94cd5477aea7c55d163ea3dbbadfb32882c2ac16e3e756b2bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/is/firefox-110.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d4cd9389342f390786d4045dfff5e81d6a06cbc3d008c3d0e7fe38ad285111c6"; + sha256 = "3cbd23cdf2489e0675df0c01a35e989157a4643469c9807000a7ae8119f41d84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/it/firefox-110.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c8d102823192b2b4ebed1b587c87067738227392df6629f865f5294070018c45"; + sha256 = "9944036094f2fcfc6b48dee59c002df040e9d2a0dfe34287863ffc1e7cfee2c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ja/firefox-110.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e00c6bc9778d92618ed4349f8006667d249f2d621496a7002853ec51064c0b6c"; + sha256 = "37b65e4303424552276b17f132fba8856cab8c45a523946417a07585398266c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ka/firefox-110.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c0116995e70225b71ca02ace86a571944fe998a748ae6e0c628a2e2525c3d4a6"; + sha256 = "4c2124df9437ba640a31aee0aa24a7ce4e4e65b612784dfc38143ac017e391de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kab/firefox-110.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6c4a7a503ff8c136b7c0dff132b3ae63326aa8c4271dd85f8c10f09755d7c23"; + sha256 = "b6359d6ec95b88a9dfac977bce81dbc1ff2dcdb843ba668dd370169f73897d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kk/firefox-110.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d5b185c6676eb01aa6c10e2b604d385cd2bab24ad19a8f561606b46cae1d90c5"; + sha256 = "258253a0de7ec38faf51bc89d941b96e4cf0cfb7d68a57b02e0da95032868fe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/km/firefox-110.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2e3565182881dab53c55af1f02f09fb77f2c60949f7a7c7fa5d43dd69f3d47b9"; + sha256 = "3ab3aaf86d3d6dda5b8ac5e9752a34505eb9952695c1725ba95f6653da9d0563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kn/firefox-110.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "696ad3222dd83d3e5f2351a6b062fde5e6f756403593a37396f95de5db3f6aa2"; + sha256 = "d0f13f2b126600635f2a5302bd4578db4d85cbfac4ff3d9321b2501d78525501"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ko/firefox-110.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "fe249e81f407cf7bfffd6bd13d828bfddb805a5ce06a0ee8ea7cb1e9273011cd"; + sha256 = "d7954ae5ea973112f82a59b3d0f6c35a1438b015eaecbd1a42c74c9728449dfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lij/firefox-110.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a1f8cba2592421e82d4d5a13052d2f48bc3217d91d68cd7699182c40a42c49a4"; + sha256 = "0d0dbdc0ddbfcd2ca27d14926c43418b0f6e6b2b5ecfbdeadcab583188fb9626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lt/firefox-110.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "56810f8dcfaf802e9d93f23294d713fd867c48cfd9baf1400a93e0c9dbe09b6e"; + sha256 = "a7e90f262b1b5a4e73fcdc72d773d35d364f440ade826f6dff54f96a6fa0e5b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lv/firefox-110.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "47d4b1517b101e62e4aa1e39da57ce53792e024fd0ea2ab06e06182cc83636ed"; + sha256 = "31208554497ba51184aff83c3b269418673199641fcaec355e11c6f39ac77355"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/mk/firefox-110.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "95644ffb52b917a82b5cfa3a15fa8540f310342fbf840aad367f7b7ba2eb2865"; + sha256 = "2f7ea63676a91811e56c8da29ce0db293b3d79a2cbe1cb1900f485cc952f78d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/mr/firefox-110.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5dd79eef34d39d828e0bde386b0a7bc2e34ff65b6e2c84c19c50affd560be86f"; + sha256 = "d4c5b8e644e0d01806c33bef3f56bac5c7d9d7ca10fc89cdb7532d63cf09fb1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ms/firefox-110.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1c34352dd995aa5593826ec6509a9a571fef56c7cc5492091037797a264c9079"; + sha256 = "e586b747712997f37e1084b1ab552455a7b7d8a5e236986ce497f076111864b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/my/firefox-110.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b6a8f8c5ad88ecb6225f7f1a084d207773cf55cfad23ab75bda3b6de2e1a5b8a"; + sha256 = "4492749d9845e7d64257958b3f7be90e21bfaafdf47de0bde3026ee1c1a4397b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nb-NO/firefox-110.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2bf5f1181ee86090e75679a08e361556facf8c07b06501e8f3c6029798b3334c"; + sha256 = "512de585211758713b9017d999f1bd389c7e8f64791cbbbb8b77b0dec708cc2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ne-NP/firefox-110.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3021f8bf36270a7bc708ed790d628ea624daca8f0023d5abdfb5843b83b0573a"; + sha256 = "b1bbd534b48fcf82c68db58ac4d631206f9628b4885313eb2e41304f61133521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nl/firefox-110.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f1928dfca113a782f085890bf9dfafaa9baaef79ed8162ceccd6c90cf38990b7"; + sha256 = "890f5d8c186d70b7a74c706a22db62752d698eca7f8bb493b464a21878059685"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nn-NO/firefox-110.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fcc01179902449f16d6724179378d8d8c251fa4dabec4ca78506b750bf7a157f"; + sha256 = "4789bbc6d1f9d34e9f77f6f467012543b641c6551e3b905b67674888eb73f258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/oc/firefox-110.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ad48b0b59681fcd32ec5d889c4ccd12c9015a446077baf18516b038d4267ca55"; + sha256 = "7a89251628584edded3b81577bac9de3784000bb2378fa9f33c86a5217472381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pa-IN/firefox-110.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "44e54441e9d082a44eb1b1e3a29d65d75658afbf3b4b04fbea427c4d621fb630"; + sha256 = "5c45e48fef737bd3d440bbd9473f663e86bc48fdf7e8f9e20f7b957e0effc03c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pl/firefox-110.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fbd8bef9474e6bff05cea3d434b48caacf24b7d74fb7289372cd0ce4d6b3455d"; + sha256 = "18328281d621f732e523e6b6b1c031c8f5cdcf2e5014410609a36a4ea2e816ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pt-BR/firefox-110.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dcb42a3248e7bdfd6de2325f0aa287e94f6a78705fb8d42d0b94213df4aafd7d"; + sha256 = "5c2b4415d07437df8c56bb21f745b07e9881bd735bf03eebf9f3d59b69451e41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pt-PT/firefox-110.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "95f41a8bd3c7954664fbb42a23d5f5022e36a853d2152ce268f32fb08bc25566"; + sha256 = "97c06bcc8d88e455a050944ee4da28e43c1462679819cfec8c6301e89b92d420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/rm/firefox-110.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8164d8494080384dc4f78823b777e3d2b8a09b163d5e7847304b7edcf421b94b"; + sha256 = "986dabad36bc830580605acf550c5d80671307a55507edf570105d6a98a9b73b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ro/firefox-110.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "28269a8aa45459cb0774d1ec859bab026075bc7353f4363b4808c12dac731c35"; + sha256 = "e904d820874191c2f4bbcacdaba2db0265e56a7dc94c719956e916d6af109727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ru/firefox-110.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c1f3f0fd7ad91593ed1ceb34d54225e3c1c16f57017c5a406bd1b91b6f9e321f"; + sha256 = "5a33442f83896abe9bfe09294fb4d649a50dd63f8504875ad1687efe2e45fa90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sco/firefox-110.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9724c6631121e21d9488fcbaa4ae86ea521b5a61dbb0de2e26bf6af9a9b7c68b"; + sha256 = "ac0c1b81bc2f9943b18acc858a7d9130fa85894c3f4501c49261896da172bbaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/si/firefox-110.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "33ff8d8ffd16893f068772c98c115389b0a4286d390709495a811dcef01fb8a8"; + sha256 = "ffbb6c83e6c954a210326346b5149fd9ea119e61039c6ba723c1875e57126e21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sk/firefox-110.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cc34d8293b7166eb96ab4d96cb9bba7e5aa7d4f15f04ddf2d34704c207f48949"; + sha256 = "e4ce32c3d815a986c3e9f2c6884bc921939cd1aeacc618e4c2fb8a6d056b99fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sl/firefox-110.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1cec19b6eba4aad9aa75ea747bb750333b9a0f335adc125eeef95e5b6fa767be"; + sha256 = "3c368ef7fe1098ab0b92061018bc126a0ca729efcf8036ddcdf9f4f8f2ef9107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/son/firefox-110.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6b4765482ac58f176a52643df225df8b3458003e14a47cbf18cbb36c7e1f34f6"; + sha256 = "155991f47cf0cfee2845450c39d2904ab457e57f764dc72af1f7d719d8ab7321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sq/firefox-110.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "817fc0345699467e3f4fb1fdbd850361c66ff5c82aaf93ea9a33d1075f72632b"; + sha256 = "34695ecb1e007a3b35c147b2b69d804a2475f9a57ee897dc5707a17990113b81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sr/firefox-110.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "708c949b5f1bb394b493b990bdf1da3cf9bfebcaa6aba549bcd5858b20e8c1f8"; + sha256 = "a40a83bca5981c89bddc9e8643dd200578cd9369bc840fd043b63b59cb0b53d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sv-SE/firefox-110.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "39c2407ff8b0bc638ab884faa1f6d86bfe071fb143a63fb81229e5312142213b"; + sha256 = "df03c928121add9d788b981b47a48a4dfe4c81ac24d5eb5d8b79d30fd6e588a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/szl/firefox-110.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "15fd363256e36bdfab2bad4d1544c191d74a8d4d4a180c9a7d12b5e64a0f0d8f"; + sha256 = "c26f1897068d86b3e43a74000830c23286a4242c33514aa76140e6da45a1eedb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ta/firefox-110.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "548693e96ac123f33e12c3016dd7b0e7fbb9f3a403dab9682d4498a6d82a00ee"; + sha256 = "1cab202847e085f7b417e3a799fcfb1503d5bf58013c7ac775f919c4cfb65f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/te/firefox-110.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e01a856488bf18c4d345db891909fe8813649f463bbf1171c2099de03556ba7a"; + sha256 = "e9bfefccb6684c96ec1e30eaf5975995cd41be87b90d36de1e8c03ccecd161d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/th/firefox-110.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c2320b7f67f35778049023cbef382b208b68a0e18ab133fd806b4081a8c49a3a"; + sha256 = "88bfa631eccc7ddcb5de325fe581c0d6757e7e11022d525c1c7641064113c0de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/tl/firefox-110.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca5fae50ed972e07a340fd575ff72fb6908e1cf5810e3302fe6de286f2354040"; + sha256 = "18dc381b87a5a9bacbb81fe9ada9d9a73eaed5831b651dd55744ba8414f6fe8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/tr/firefox-110.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b8d9d4c422db8378d3df478dace847e2ce9c7c7a9250fb9f7f10dc3890f33dba"; + sha256 = "44945fc8f6991017765c5646f572fb7df9ec36b54eab6515e04b835b25ed81eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/trs/firefox-110.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b40b8f0c453b6ac332b8869491fa201ef015aeac0d1675dd75e4cdffcb8c406c"; + sha256 = "20ba4a1b995d16e14f86f8c8a6c35c50b1634167872e3f2d742c0f950943da72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/uk/firefox-110.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d0fcdf9bc345bb37906805c123b9f262b14624cf19ff2f25714246d0330818cf"; + sha256 = "933bc001d37e9487a78e11d8eeaa778adc14848083759ce332a21928cf28e034"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ur/firefox-110.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e5a34fc5bf63aa6e5ce478204dfd5f598b7ae1af64a52b9b07803b6ab49ece5c"; + sha256 = "3ada62bc4d49378d5d987cfabfdb6c43ed7e7a1f507f2f99ada27a1585479486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/uz/firefox-110.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dfd51f2d04a3cd1686a7e07860c39d01fe351d8dca6a6952386fd453b8cbc08d"; + sha256 = "fcc2c6a1fccd58cf2a0e4492578f46fc98f57d187816e3c33c4575555b83923a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/vi/firefox-110.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "338973416fc1724a46ea35725620f0fab14a816914b6d5e1ab6da8cf3edd6733"; + sha256 = "38fd1714da803f7e771937381e0b91ca0bac263a22f9ec5d5680425833493f7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/xh/firefox-110.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8bdb1fb5e397edc1a66d74306cbaf3eb9ef6bdc547ee77543d9615438f6630a4"; + sha256 = "db3ab9606ae8d4bdd8ad741d42676f6aecc5d299c89ff4386543dcaa67e98822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/zh-CN/firefox-110.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9f9a94fd32c7ab92f2ccf149ee6f3422d159151b48451b245eebd5fcf46d1632"; + sha256 = "c443537f9d38ccdcc4d9b6ebfea0517aa7950b730a7ad069208baea5f6793e2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/zh-TW/firefox-110.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a0b5b5d3774fe3d2717271fdaac2fca1723e20340af4ee93e90e8fe32a8eb6a5"; + sha256 = "d71958a211006cf884e69f012ad7628919b23a706f747caaaa86ae6eec13f9ba"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index e5284c4097c9d..60d86d745f1fb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -1,5 +1,6 @@ { pname , channel +, lib , writeScript , xidel , coreutils @@ -46,7 +47,7 @@ in writeScript "update-${pname}" '' grep "^[0-9]" | \ sort --version-sort | \ grep -v "funnelcake" | \ - grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ + grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \ tail -1` curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e8deb9fcd9cc7..948b321724894 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,6 +471,7 @@ 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 @@ -524,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 de0ac8eb7a1dc..97087ef1da30d 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 = "109.0"; + version = "110.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7"; + sha512 = "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9"; }; meta = { @@ -29,11 +29,11 @@ rec { firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.7.0esr"; + version = "102.8.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b"; + sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 378fe1f4039b0..6b89e4cd70000 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 @@ -30,7 +31,7 @@ let (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName - , wmClass ? null + , wmClass ? applicationName , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true @@ -60,7 +61,7 @@ let smartcardSupport = cfg.smartcardSupport or false; nativeMessagingHosts = - ([ ] + [ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native @@ -69,7 +70,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts - ); + ; libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg_5 @@ -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 ]; @@ -96,7 +98,7 @@ let usesNixExtensions = nixExtensions != null; - nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); requiresSigning = browser ? MOZ_REQUIRE_SIGNING -> toString browser.MOZ_REQUIRE_SIGNING != ""; @@ -112,7 +114,7 @@ let throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" else a - ) (if usesNixExtensions then nixExtensions else []); + ) (lib.optionals usesNixExtensions nixExtensions); enterprisePolicies = { @@ -166,10 +168,10 @@ let inherit pname version; desktopItem = makeDesktopItem ({ - name = applicationName; - exec = "${launcherName} %U"; + name = launcherName; + exec = "${launcherName} --name ${wmClass} %U"; inherit icon; - desktopName = "${desktopName}${nameSuffix}"; + inherit desktopName; startupNotify = true; startupWMClass = wmClass; terminal = false; @@ -401,7 +403,7 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = browser.meta.description; + inherit (browser.meta) description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 01cd54cf8ee20..cd770b18b71a7 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups -, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core +, dbus, gtk3, gtk4, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, libglvnd, mesa , libxkbcommon, pipewire, wayland # ozone/wayland @@ -68,9 +68,9 @@ let libxkbcommon pipewire wayland ] ++ lib.optional pulseSupport libpulseaudio ++ lib.optional libvaSupport libva - ++ [ gtk3 ]; + ++ [ gtk3 gtk4 ]; - suffix = if channel != "stable" then "-" + channel else ""; + suffix = lib.optionalString (channel != "stable") "-${channel}"; crashpadHandlerBinary = if lib.versionAtLeast version "94" then "chrome_crashpad_handler" diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1bba399997f46..da5f183867964 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,28 +10,25 @@ , nixosTests }: -let serenity = fetchFromGitHub { - owner = "SerenityOS"; - repo = "serenity"; - rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5"; - hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8="; -}; -in stdenv.mkDerivation { pname = "ladybird"; - version = "unstable-2022-09-29"; + version = "unstable-2023-01-17"; - # Remember to update `serenity` too! src = fetchFromGitHub { owner = "SerenityOS"; - repo = "ladybird"; - rev = "d69ad7332477de33bfd1963026e057d55c6f222d"; - hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E="; + repo = "serenity"; + rev = "45e85d20b64862df119f643f24e2d500c76c58f3"; + hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; + sourceRoot = "source/Ladybird"; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" + # https://github.com/SerenityOS/serenity/issues/17062 + substituteInPlace main.cpp \ + --replace "./SQLServer/SQLServer" "$out/bin/SQLServer" ''; nativeBuildInputs = [ @@ -47,14 +44,15 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DSERENITY_SOURCE_DIR=${serenity}" # Disable network operations "-DENABLE_TIME_ZONE_DATABASE_DOWNLOAD=false" "-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") [ + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + # error: use of undeclared identifier 'aligned_alloc' "-include mm_malloc.h" "-Daligned_alloc=_mm_malloc" ]); diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 0a0eb47b0a192..b91e5b05b6256 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.14.2"; + version = "1.15.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-9onjQ7fRLlL5/1vMtNHjBBcB7Fyk1ERaHg5IwtwbJQg="; + hash = "sha256-NUgDaBRcgYGLKJhSJLT17VZj/mU0w6ySahIYnud5M6Y="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index fe510c7fb9d48..009569f9c5c3c 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "109.0-1", + "packageVersion": "110.0-1", "source": { - "rev": "109.0-1", - "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs" + "rev": "110.0-1", + "sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p" }, "firefox": { - "version": "109.0", - "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7" + "version": "110.0", + "sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9" } } diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index 7777bb243fa62..db5a39f22856b 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE= [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index 318885bd27214..6a2918fa7d950 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 92afe2f4baa07..e4730e1869f81 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 = "95.0.4635.37"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; + hash = "sha256-NQv9EVaBPfHygr76neYGACuk8A6Oc1GXAgizMa+jngw="; }; - 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/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix new file mode 100644 index 0000000000000..1f650a2fdd589 --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -0,0 +1,183 @@ +{ stdenv +, lib +, fetchzip +, alsa-lib +, autoPatchelfHook +, copyDesktopItems +, dbus-glib +, ffmpeg +, gtk2-x11 +, withGTK3 ? true +, gtk3 +, libXt +, libpulseaudio +, makeDesktopItem +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "palemoon-bin"; + version = "32.0.1"; + + src = fetchzip { + urls = [ + "https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + ]; + hash = if withGTK3 then + "sha256-CSAsZTMIeInuvN7mddiMDtzzNKuYST2zp1XczKAP1mQ=" + else + "sha256-bvdy4tqnuoUxVVz/8zp7VwfS3wH51eKCzXDqgDWMb3A="; + }; + + preferLocalBuild = true; + + strictDeps = true; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + wrapGAppsHook + ]; + + buildInputs = [ + alsa-lib + dbus-glib + gtk2-x11 + libXt + stdenv.cc.cc.lib + ] ++ lib.optionals withGTK3 [ + gtk3 + ]; + + desktopItems = [(makeDesktopItem rec { + name = pname; + desktopName = "Pale Moon Web Browser"; + comment = "Browse the World Wide Web"; + keywords = [ + "Internet" + "WWW" + "Browser" + "Web" + "Explorer" + ]; + exec = "palemoon %u"; + terminal = false; + type = "Application"; + icon = "palemoon"; + categories = [ + "Network" + "WebBrowser" + ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/xml" + "application/rss+xml" + "application/rdf+xml" + "image/gif" + "image/jpeg" + "image/png" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + "x-scheme-handler/chrome" + "video/webm" + "application/x-xpinstall" + ]; + startupNotify = true; + startupWMClass = "Pale moon"; + extraConfig = { + X-MultipleArgs = "false"; + }; + actions = { + "NewTab" = { + name = "Open new tab"; + exec = "palemoon -new-tab https://start.palemoon.org"; + }; + "NewWindow" = { + name = "Open new window"; + exec = "palemoon -new-window"; + }; + "NewPrivateWindow" = { + name = "Open new private window"; + exec = "palemoon -private-window"; + }; + "ProfileManager" = { + name = "Open the Profile Manager"; + exec = "palemoon --ProfileManager"; + }; + }; + })]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/palemoon} + cp -R * $out/lib/palemoon/ + + ln -s $out/{lib/palemoon,bin}/palemoon + + for iconpath in chrome/icons/default/default{16,32,48} icons/mozicon128; do + n=''${iconpath//[^0-9]/} + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $out/lib/palemoon/browser/"$iconpath".png $out/share/icons/hicolor/$size/apps/palemoon.png + done + + # Disable built-in updater + # https://forum.palemoon.org/viewtopic.php?f=5&t=25073&p=197771#p197747 + # > Please do not take this as permission to change, remove, or alter any other preferences as that is forbidden + # > without express permission according to the Pale Moon Redistribution License. + # > We are allowing this one and **ONLY** one exception in order to properly facilitate [package manager] repacks. + install -Dm644 ${./zz-disableUpdater.js} $out/lib/palemoon/browser/defaults/preferences/zz-disableUpdates.js + + runHook postInstall + ''; + + dontWrapGApps = true; + + preFixup = '' + # Make optional dependencies available + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + ffmpeg + libpulseaudio + ]}" + ) + wrapGApp $out/lib/palemoon/palemoon + ''; + + meta = with lib; { + homepage = "https://www.palemoon.org/"; + description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; + longDescription = '' + Pale Moon is an Open Source, Goanna-based web browser focusing on + efficiency and customization. + Pale Moon offers you a browsing experience in a browser completely built + from its own, independently developed source that has been forked off from + Firefox/Mozilla code a number of years ago, with carefully selected + features and optimizations to improve the browser's stability and user + experience, while offering full customization and a growing collection of + extensions and themes to make the browser truly your own. + ''; + changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; + license = [ + licenses.mpl20 + { + fullName = "Pale Moon Redistribution License"; + url = "https://www.palemoon.org/redist.shtml"; + # TODO free, redistributable? Has strict limitations on what modifications may be done & shipped by packagers + } + ]; + maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "palemoon"; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 2101306e420fb..231a858ef4fcc 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 = "32.0.0"; + version = "32.0.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-0N63Xo8cRIHwEXkT8eeot0DgZU7aPirmVq/iHJjlGRw="; + sha256 = "sha256-lz9Ok8i95pVfl4UHy2zWFe9vwJocUvDbueiWdZuz4Bo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js b/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js new file mode 100644 index 0000000000000..50b8a79f627a9 --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js @@ -0,0 +1,7 @@ +/* https://forum.palemoon.org/viewtopic.php?f=5&t=25073&p=197771#p197747 */ + +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +pref("app.update.enabled", false); diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 87dc7dcb1d019..40c7fda9dbadf 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "10.0.1"; + version = "13.0.3"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q="; + sha256 = "sha256-wMWO8eRH8O93m4/HaRTdG3DhyCvHWw+s3sAtN+VLBeY="; }; 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 43865f051ba24..f89fdf4177049 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -26,6 +26,7 @@ , pulseaudioSupport ? mediaSupport , libpulseaudio , apulse +, alsa-lib # Media support (implies audio support) , mediaSupport ? true @@ -57,6 +58,7 @@ let libPath = lib.makeLibraryPath libPkgs; libPkgs = [ + alsa-lib atk cairo dbus @@ -85,9 +87,9 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.8"; + version = "12.0.3"; - lang = "en-US"; + lang = "ALL"; srcs = { x86_64-linux = fetchurl { @@ -97,7 +99,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-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0="; + hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0="; }; i686-linux = fetchurl { @@ -107,7 +109,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-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc="; + hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk="; }; }; in @@ -291,13 +293,9 @@ stdenv.mkDerivation rec { # TBB will fail if ownership is too permissive chmod 0700 "\$HOME/TorBrowser/Data/Tor" - # Initialize the browser profile state. Note that the only data - # copied from the Store payload is the initial bookmark file, which is - # never updated once created. All other files under user's profile - # dir are generated by TBB. + # Initialize the browser profile state. + # All files under user's profile dir are generated by TBB. mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default" - cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \ - "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html" # Clear some files if the last known store path is different from the new one : "\''${KNOWN_STORE_PATH:=\$HOME/known-store-path}" @@ -325,6 +323,9 @@ stdenv.mkDerivation rec { # chance that TBB would continue using old font files. rm -rf "\$HOME/.cache/fontconfig" + # Workaround a bug in 12.0.X that Tor directories are not cleaned up and tor gets confused where its socket is + rm -rf \$XDG_RUNTIME_DIR/Tor* + # Manually specify data paths (by default TB attempts to create these in the store) { echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");" diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 5441c7a58cbdd..5a0e81f4a4b80 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,14 +1,17 @@ { mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: +let + srcInfo = builtins.fromJSON (builtins.readFile ./pin.json); +in mkYarnPackage rec { pname = "vieb"; - version = "9.5.0"; + inherit (srcInfo) version; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-SWHjzrEvRlTn4HJnT81Le4KsFDypN3QH3F/z7zZ8p3E="; + inherit (srcInfo) sha256; }; packageJSON = ./package.json; @@ -52,11 +55,13 @@ mkYarnPackage rec { distPhase = ":"; # disable useless $out/tarballs directory + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://vieb.dev/"; changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner fortuneteller2k ]; + maintainers = with maintainers; [ gebner fortuneteller2k tejing ]; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index d9ce8e30269c8..28704db5c9e55 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "9.5.0", + "version": "9.5.1", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -25,9 +25,9 @@ "funding": "https://github.com/sponsors/Jelmerro/", "license": "GPL-3.0-or-later", "devDependencies": { - "electron": "22.0.0", - "electron-builder": "24.0.0-alpha.7", - "eslint": "8.29.0", + "electron": "22.0.3", + "electron-builder": "24.0.0-alpha.10", + "eslint": "8.32.0", "eslint-plugin-sort-keys": "2.3.5", "jest": "29.3.1", "jest-environment-jsdom": "29.3.1", @@ -37,13 +37,13 @@ "webpack-node-externals": "3.0.0" }, "dependencies": { - "@cliqz/adblocker-electron": "1.25.1", - "@cliqz/adblocker-electron-preload": "1.25.1", + "@cliqz/adblocker-electron": "1.25.2", + "@cliqz/adblocker-electron-preload": "1.25.2", "@mozilla/readability": "0.4.2", "darkreader": "4.9.58", "highlight.js": "11.7.0", - "jsdom": "20.0.3", - "marked": "4.2.4", + "jsdom": "21.0.0", + "marked": "4.2.12", "picomatch": "2.3.1" } } diff --git a/pkgs/applications/networking/browsers/vieb/pin.json b/pkgs/applications/networking/browsers/vieb/pin.json new file mode 100644 index 0000000000000..5efefe840559a --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/pin.json @@ -0,0 +1,4 @@ +{ + "version": "9.5.1", + "sha256": "dUHjhJt0MarRNmDxs989aBTprjt+DUoYd3U05ELc0Tw=" +} diff --git a/pkgs/applications/networking/browsers/vieb/update.sh b/pkgs/applications/networking/browsers/vieb/update.sh new file mode 100755 index 0000000000000..3efc252358919 --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash wget jq yarn yarn2nix nix-prefetch-github + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +if [ "$#" -gt 1 ] || [[ "${1:-}" == -* ]]; then + echo "Regenerates packaging data for the vieb package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="${1:-}" + +if [ -z "$version" ]; then + version="$(wget -O- "https://api.github.com/repos/Jelmerro/Vieb/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +SRC="https://raw.githubusercontent.com/Jelmerro/Vieb/$version" + +tmpdir="$(mktemp -d --tmpdir update-vieb-XXXXXX)" +pushd "$tmpdir" + +wget "$SRC/package-lock.json" +wget "$SRC/package.json" +yarn import +yarn2nix >yarn.nix + +popd +cp -ft . "$tmpdir/"{package.json,yarn.lock,yarn.nix} +rm -rf "$tmpdir" + +src_hash=$(nix-prefetch-github Jelmerro Vieb --rev "${version}" | jq -r .sha256) + +cat > pin.json << EOF +{ + "version": "$version", + "sha256": "$src_hash" +} +EOF diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 135587f6b47ef..d238d1428baf5 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -23,29 +23,29 @@ "@babel/highlight" "^7.18.6" "@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== + version "7.20.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" + integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== "@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== + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== dependencies: "@ampproject/remapping" "^2.1.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/helper-module-transforms" "^7.20.11" "@babel/helpers" "^7.20.7" "@babel/parser" "^7.20.7" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" + "@babel/traverse" "^7.20.12" "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" "@babel/generator@^7.20.7", "@babel/generator@^7.7.2": @@ -95,10 +95,10 @@ dependencies: "@babel/types" "^7.18.6" -"@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== +"@babel/helper-module-transforms@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" @@ -106,7 +106,7 @@ "@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/traverse" "^7.20.10" "@babel/types" "^7.20.7" "@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": @@ -273,10 +273,10 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@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== +"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" + integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== dependencies: "@babel/code-frame" "^7.18.6" "@babel/generator" "^7.20.7" @@ -303,45 +303,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@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== +"@cliqz/adblocker-content@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz#8835d7307c7829e85a2e38e7e3bfd161024ae4d7" + integrity sha512-Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.25.1" + "@cliqz/adblocker-extended-selectors" "^1.25.2" -"@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== +"@cliqz/adblocker-electron-preload@1.25.2", "@cliqz/adblocker-electron-preload@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz#67263683cce7cd036dbc0c37761c4f5eed6508ad" + integrity sha512-d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g== dependencies: - "@cliqz/adblocker-content" "^1.25.1" + "@cliqz/adblocker-content" "^1.25.2" -"@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== +"@cliqz/adblocker-electron@1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz#1b0ec106cc395f5826d97fcfe8fbe4c333d39695" + integrity sha512-GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ== dependencies: - "@cliqz/adblocker" "^1.25.1" - "@cliqz/adblocker-electron-preload" "^1.25.1" + "@cliqz/adblocker" "^1.25.2" + "@cliqz/adblocker-electron-preload" "^1.25.2" tldts-experimental "^5.6.21" -"@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-extended-selectors@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz#77256c148b1f0a6792c1adad9e8b246cde65b37d" + integrity sha512-acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ== -"@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== +"@cliqz/adblocker@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz#f2bd7c48afa650f887ac59a9950bfb220ea8cc52" + integrity sha512-wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw== dependencies: - "@cliqz/adblocker-content" "^1.25.1" - "@cliqz/adblocker-extended-selectors" "^1.25.1" + "@cliqz/adblocker-content" "^1.25.2" + "@cliqz/adblocker-extended-selectors" "^1.25.2" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.197" + "@types/chrome" "^0.0.206" "@types/firefox-webext-browser" "^94.0.0" tldts-experimental "^5.6.21" @@ -359,9 +359,9 @@ 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== + version "3.2.3" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz#f598db50061ae5f90ad651f0255366b4e818000e" + integrity sha512-wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg== dependencies: chromium-pickle-js "^0.2.0" commander "^5.0.0" @@ -438,10 +438,10 @@ 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== +"@eslint/eslintrc@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" + integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -458,7 +458,7 @@ 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": +"@humanwhocodes/config-array@^0.11.8": 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== @@ -871,12 +871,12 @@ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@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== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" + integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" "@types/babel__generator" "*" "@types/babel__template" "*" "@types/babel__traverse" "*" @@ -913,10 +913,10 @@ "@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== +"@types/chrome@^0.0.206": + version "0.0.206" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz#ad1fd9799f368b5993d7c240492d4adaf5efbd8c" + integrity sha512-fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -944,12 +944,7 @@ "@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": +"@types/estree@*", "@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== @@ -987,9 +982,9 @@ "@types/node" "*" "@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== + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== dependencies: "@types/node" "*" @@ -1053,15 +1048,10 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*": - 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@^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/node@*", "@types/node@^16.11.26": + version "16.18.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz#cbb15c12ca7c16c85a72b6bdc4d4b01151bb3cae" + integrity sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA== "@types/plist@^3.0.1": version "3.0.2" @@ -1104,9 +1094,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@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== + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz#107f0fcc13bd4a524e352b41c49fe88aab5c54d5" + integrity sha512-eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A== dependencies: "@types/yargs-parser" "*" @@ -1384,10 +1374,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@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== +app-builder-lib@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz#244803adf93a6279dab09bc8d278c06ebc4f91b4" + integrity sha512-gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -1398,12 +1388,12 @@ app-builder-lib@24.0.0-alpha.7: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.8" - electron-publish "24.0.0-alpha.6" + electron-publish "24.0.0-alpha.8" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -1631,25 +1621,25 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -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== +builder-util-runtime@9.2.0-alpha.2: + version "9.2.0-alpha.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz#771a2787b247a15297377de23a916e9fc91050e6" + integrity sha512-MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ== dependencies: debug "^4.3.4" sax "^1.2.4" -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== +builder-util@24.0.0-alpha.8: + version "24.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz#501de9052228ca8f87d43b53c01009dd069ad466" + integrity sha512-18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg== 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.1.2-alpha.1" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" @@ -1720,9 +1710,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== 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== + version "1.0.30001446" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz#6d4ba828ab19f49f9bcd14a8430d30feebf1e0c5" + integrity sha512-fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw== chalk@^2.0.0: version "2.4.2" @@ -1762,9 +1752,9 @@ chromium-pickle-js@^0.2.0: integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef" - integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog== + version "3.7.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" + integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== cjs-module-lexer@^1.0.0: version "1.2.2" @@ -1888,9 +1878,9 @@ commander@^5.0.0: 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== + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== compare-version@^0.1.2: version "0.1.2" @@ -2074,14 +2064,14 @@ dir-compare@^3.0.0: buffer-equal "^1.0.0" minimatch "^3.0.4" -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== +dmg-builder@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz#74b3e03c220486ad8a04ad9b8aac6ca6074ceef3" + integrity sha512-kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg== dependencies: - app-builder-lib "24.0.0-alpha.7" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + app-builder-lib "24.0.0-alpha.10" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -2133,17 +2123,17 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -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== +electron-builder@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz#1713da06493bffd02e76a6809b1e7147e0a4339c" + integrity sha512-10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA== dependencies: "@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" + app-builder-lib "24.0.0-alpha.10" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" - dmg-builder "24.0.0-alpha.7" + dmg-builder "24.0.0-alpha.10" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -2151,14 +2141,14 @@ electron-builder@24.0.0-alpha.7: simple-update-notifier "^1.1.0" yargs "^17.6.2" -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== +electron-publish@24.0.0-alpha.8: + version "24.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz#d2326a33938ddc73bab83f149dbd9bab67b85804" + integrity sha512-DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" fs-extra "^10.1.0" lazy-val "^1.0.5" @@ -2169,10 +2159,10 @@ electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -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== +electron@22.0.3: + version "22.0.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz#44806cd053ea2ed35bffefd92143d3fc69d7337d" + integrity sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^16.11.26" @@ -2319,13 +2309,13 @@ 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.29.0: - version "8.29.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87" - integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg== +eslint@8.32.0: + version "8.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861" + integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ== dependencies: - "@eslint/eslintrc" "^1.3.3" - "@humanwhocodes/config-array" "^0.11.6" + "@eslint/eslintrc" "^1.4.1" + "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -2344,7 +2334,7 @@ eslint@8.29.0: file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.15.0" + globals "^13.19.0" grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" @@ -2480,9 +2470,9 @@ fastest-levenshtein@^1.0.12: 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== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -2634,9 +2624,9 @@ get-caller-file@^2.0.5: 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== + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -2684,9 +2674,9 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: 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== + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2711,7 +2701,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0, globals@^13.19.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== @@ -3471,9 +3461,9 @@ jest@29.3.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== + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" + integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== js-tokens@^4.0.0: version "4.0.0" @@ -3495,7 +3485,39 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsdom@20.0.3, jsdom@^20.0.0: +jsdom@21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" + integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== + dependencies: + abab "^2.0.6" + acorn "^8.8.1" + acorn-globals "^7.0.0" + cssom "^0.5.0" + cssstyle "^2.3.0" + data-urls "^3.0.2" + decimal.js "^10.4.2" + domexception "^4.0.0" + escodegen "^2.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.2" + parse5 "^7.1.1" + saxes "^6.0.0" + symbol-tree "^3.2.4" + 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" + +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== @@ -3557,10 +3579,10 @@ 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.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== +json5@^2.2.0, json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^4.0.0: version "4.0.0" @@ -3732,10 +3754,10 @@ 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== +marked@4.2.12: + version "4.2.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" + integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== matcher@^3.0.0: version "3.0.0" @@ -3797,9 +3819,9 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: brace-expansion "^1.1.7" 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== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -3874,16 +3896,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@2.1.2: +ms@2.1.2, ms@^2.0.0: 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" @@ -3900,9 +3917,9 @@ neo-async@^2.6.2: 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== + version "3.31.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355" + integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ== dependencies: semver "^7.3.5" @@ -3924,9 +3941,9 @@ node-api-version@^0.1.4: 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== + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== node-gyp@^9.0.0: version "9.3.1" @@ -4234,9 +4251,9 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== querystringify@^2.1.1: version "2.2.0" @@ -4331,9 +4348,9 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" + integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== resolve@^1.20.0: version "1.22.1" @@ -4463,9 +4480,9 @@ serialize-error@^7.0.1: 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== + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== dependencies: randombytes "^2.1.0" @@ -4740,17 +4757,17 @@ 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== -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-core@^5.7.104: + version "5.7.104" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz#4313a9663e4085332750a5fb04bfa0b0d91b826d" + integrity sha512-8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ== tldts-experimental@^5.6.21: - version "5.7.103" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz#a0b15a05c2cec7f0d4935de18dc9ad3fcbe0276f" - integrity sha512-oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ== + version "5.7.104" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz#f23e526240f674039857b653361f5da549dae758" + integrity sha512-GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA== dependencies: - tldts-core "^5.7.103" + tldts-core "^5.7.104" tmp-promise@^3.0.2: version "3.0.3" @@ -5094,9 +5111,9 @@ write-file-atomic@^4.0.1: signal-exit "^3.0.7" 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== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== xml-name-validator@^4.0.0: version "4.0.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 413a387f14cca..eaf66d689df8e 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -26,19 +26,19 @@ }; } { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; + name = "_babel_compat_data___compat_data_7.20.10.tgz"; path = fetchurl { - 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_compat_data___compat_data_7.20.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz"; + sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; }; } { - name = "_babel_core___core_7.20.7.tgz"; + name = "_babel_core___core_7.20.12.tgz"; path = fetchurl { - 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_core___core_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; path = fetchurl { - 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.20.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; + sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; }; } { @@ -290,11 +290,11 @@ }; } { - name = "_babel_traverse___traverse_7.20.7.tgz"; + name = "_babel_traverse___traverse_7.20.12.tgz"; path = fetchurl { - 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_traverse___traverse_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; } { @@ -314,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; path = fetchurl { - 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_content___adblocker_content_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz"; + sha512 = "Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; path = fetchurl { - 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.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz"; + sha512 = "d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g=="; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; path = fetchurl { - 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.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz"; + sha512 = "GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ=="; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; path = fetchurl { - 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.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz"; + sha512 = "acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ=="; }; } { - name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; + name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; path = fetchurl { - 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=="; + name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz"; + sha512 = "wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw=="; }; } { @@ -370,11 +370,11 @@ }; } { - name = "_electron_asar___asar_3.2.2.tgz"; + name = "_electron_asar___asar_3.2.3.tgz"; path = fetchurl { - 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 = "_electron_asar___asar_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz"; + sha512 = "wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg=="; }; } { @@ -418,11 +418,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + name = "_eslint_eslintrc___eslintrc_1.4.1.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 = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; } { @@ -810,11 +810,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.20.tgz"; + name = "_types_babel__core___babel__core_7.20.0.tgz"; path = fetchurl { - 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=="; + name = "_types_babel__core___babel__core_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz"; + sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ=="; }; } { @@ -850,11 +850,11 @@ }; } { - name = "_types_chrome___chrome_0.0.197.tgz"; + name = "_types_chrome___chrome_0.0.206.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=="; + name = "_types_chrome___chrome_0.0.206.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz"; + sha512 = "fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg=="; }; } { @@ -882,14 +882,6 @@ }; } { - 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"; @@ -938,11 +930,11 @@ }; } { - name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; + name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; path = fetchurl { - name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; - sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; + name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw=="; }; } { @@ -1026,19 +1018,11 @@ }; } { - name = "_types_node___node_18.11.17.tgz"; - path = fetchurl { - 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_16.18.10.tgz"; + name = "_types_node___node_16.18.11.tgz"; path = fetchurl { - name = "_types_node___node_16.18.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz"; - sha512 = "XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="; + name = "_types_node___node_16.18.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz"; + sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; } { @@ -1098,11 +1082,11 @@ }; } { - name = "_types_yargs___yargs_17.0.17.tgz"; + name = "_types_yargs___yargs_17.0.20.tgz"; path = fetchurl { - 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.20.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz"; + sha512 = "eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A=="; }; } { @@ -1426,11 +1410,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; path = fetchurl { - 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 = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz"; + sha512 = "gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg=="; }; } { @@ -1674,19 +1658,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; path = fetchurl { - 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_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz"; + sha512 = "MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ=="; }; } { - name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; + name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; path = fetchurl { - 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 = "builder_util___builder_util_24.0.0_alpha.8.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz"; + sha512 = "18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg=="; }; } { @@ -1738,11 +1722,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; - sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; + name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz"; + sha512 = "fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw=="; }; } { @@ -1794,11 +1778,11 @@ }; } { - name = "ci_info___ci_info_3.7.0.tgz"; + name = "ci_info___ci_info_3.7.1.tgz"; path = fetchurl { - 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=="; + name = "ci_info___ci_info_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz"; + sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; }; } { @@ -1962,11 +1946,11 @@ }; } { - name = "commander___commander_9.4.1.tgz"; + name = "commander___commander_9.5.0.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 = "commander___commander_9.5.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; }; } { @@ -2218,11 +2202,11 @@ }; } { - name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; + name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; path = fetchurl { - 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=="; + name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz"; + sha512 = "kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg=="; }; } { @@ -2274,19 +2258,19 @@ }; } { - name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; + name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; path = fetchurl { - 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_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz"; + sha512 = "10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA=="; }; } { - name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; + name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; path = fetchurl { - 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_publish___electron_publish_24.0.0_alpha.8.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz"; + sha512 = "DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ=="; }; } { @@ -2298,11 +2282,11 @@ }; } { - name = "electron___electron_22.0.0.tgz"; + name = "electron___electron_22.0.3.tgz"; path = fetchurl { - 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___electron_22.0.3.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz"; + sha512 = "eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g=="; }; } { @@ -2490,11 +2474,11 @@ }; } { - name = "eslint___eslint_8.29.0.tgz"; + name = "eslint___eslint_8.32.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.29.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz"; - sha512 = "isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg=="; + name = "eslint___eslint_8.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz"; + sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; } { @@ -2634,11 +2618,11 @@ }; } { - name = "fastq___fastq_1.14.0.tgz"; + name = "fastq___fastq_1.15.0.tgz"; path = fetchurl { - 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 = "fastq___fastq_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; } { @@ -2802,11 +2786,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.0.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_intrinsic___get_intrinsic_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; } { @@ -2858,11 +2842,11 @@ }; } { - name = "glob___glob_8.0.3.tgz"; + name = "glob___glob_8.1.0.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=="; + name = "glob___glob_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; } { @@ -3578,11 +3562,11 @@ }; } { - name = "js_sdsl___js_sdsl_4.2.0.tgz"; + name = "js_sdsl___js_sdsl_4.3.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=="; + name = "js_sdsl___js_sdsl_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; } { @@ -3610,6 +3594,14 @@ }; } { + name = "jsdom___jsdom_21.0.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz"; + sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; + }; + } + { name = "jsdom___jsdom_20.0.3.tgz"; path = fetchurl { name = "jsdom___jsdom_20.0.3.tgz"; @@ -3666,11 +3658,11 @@ }; } { - name = "json5___json5_2.2.2.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -3866,11 +3858,11 @@ }; } { - name = "marked___marked_4.2.4.tgz"; + name = "marked___marked_4.2.12.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 = "marked___marked_4.2.12.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz"; + sha512 = "yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="; }; } { @@ -3954,11 +3946,11 @@ }; } { - name = "minimatch___minimatch_5.1.2.tgz"; + name = "minimatch___minimatch_5.1.6.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + name = "minimatch___minimatch_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; } { @@ -4050,14 +4042,6 @@ }; } { - 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"; @@ -4082,11 +4066,11 @@ }; } { - name = "node_abi___node_abi_3.30.0.tgz"; + name = "node_abi___node_abi_3.31.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=="; + name = "node_abi___node_abi_3.31.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; } { @@ -4114,11 +4098,11 @@ }; } { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + name = "node_gyp_build___node_gyp_build_4.6.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_build___node_gyp_build_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; } { @@ -4474,11 +4458,11 @@ }; } { - name = "punycode___punycode_2.1.1.tgz"; + name = "punycode___punycode_2.3.0.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 = "punycode___punycode_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; } { @@ -4602,11 +4586,11 @@ }; } { - name = "resolve.exports___resolve.exports_1.1.0.tgz"; + name = "resolve.exports___resolve.exports_1.1.1.tgz"; path = fetchurl { - name = "resolve.exports___resolve.exports_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz"; - sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; + name = "resolve.exports___resolve.exports_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz"; + sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="; }; } { @@ -4762,11 +4746,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + name = "serialize_javascript___serialize_javascript_6.0.1.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 = "serialize_javascript___serialize_javascript_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; + sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; } { @@ -5090,19 +5074,19 @@ }; } { - name = "tldts_core___tldts_core_5.7.103.tgz"; + name = "tldts_core___tldts_core_5.7.104.tgz"; path = fetchurl { - 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.104.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz"; + sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; }; } { - name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; path = fetchurl { - 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=="; + name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz"; + sha512 = "GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA=="; }; } { @@ -5482,11 +5466,11 @@ }; } { - name = "ws___ws_8.11.0.tgz"; + name = "ws___ws_8.12.0.tgz"; path = fetchurl { - 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 = "ws___ws_8.12.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz"; + sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; }; } { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ec1e55e3389de..0238fc61bcfaf 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -21,11 +21,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.6.2867.58"; + version = "5.7.2921.53"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-eRHQaKztf66o9FoCNSRyXS5Ht6d51GTilNO5DxItUCw="; + sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 3657a1e38e7f8..6475480b2191d 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" ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { xvfb-run ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; mesonFlags = [ "-Dgtk_doc=true" diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 0afe9466b4cb5..4dab874fd8484 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.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; + hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo="; }; - vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; + vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix new file mode 100644 index 0000000000000..96c3a5a2f25f9 --- /dev/null +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, wrapGAppsHook +, autoPatchelfHook +, openssl +, webkitgtk +, udev +, libappindicator-gtk3 +, libayatana-appindicator +}: + +stdenv.mkDerivation rec { + pname = "clash-verge"; + version = "1.2.3"; + + src = fetchurl { + url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; + hash = "sha256-uiw9kcXJ4ZEu+naUbUrgN/zBYE2bSWVPmMQ+HiAP4D4="; + }; + + unpackPhase = "dpkg-deb -x $src ."; + + nativeBuildInputs = [ + dpkg + wrapGAppsHook + autoPatchelfHook + ]; + + buildInputs = [ + openssl + webkitgtk + stdenv.cc.cc + ]; + + runtimeDependencies = [ + (lib.getLib udev) + libappindicator-gtk3 + libayatana-appindicator + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv usr/* $out + + runHook postInstall + ''; + + meta = with lib; { + description = "A Clash GUI based on tauri"; + homepage = "https://github.com/zzzgydi/clash-verge"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3Plus; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index e2cc376af297b..518a442329600 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.12.1"; + version = "2023.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-FXN/UUlzG3+AYYZeKJ6XUG4rD3cPWIx22h3zZpvZhiM="; + hash = "sha256-vhcz/uk1sBt7XytXQYcPreoPfNz7fdPVE+j+FTH7tPc="; }; vendorSha256 = null; @@ -56,6 +56,11 @@ buildGoModule rec { # 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" + + # Workaround for: manager_test.go:197: + # Should be false + substituteInPlace "datagramsession/manager_test.go" \ + --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; doCheck = !stdenv.isDarwin; diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index ce0f07f9ec103..cc79ae5d59fec 100644 --- a/pkgs/applications/networking/cluster/acorn/default.nix +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-IzjCYVQ9RhuAmgloue421F43ARviaHW7mTkLhLW/VPM="; + hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk="; }; - vendorHash = "sha256-z2ya/CgH9AcxHe73Yt9XWbJqH4OrZWt0bRDsna5hYeo="; + vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6d13063bd0560..fb9b6a1d11acf 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU="; + hash = "sha256-qNSnO+wtAKyUJwjIMZaiBUfgaoDFVttp04kTxr4H6po="; }; - vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw="; + vendorHash = "sha256-75l4YCYC38uX63Uv/MA7HciQ+wumWhTuimL+ctizBCs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index fedf499d481e4..3ee68ba8283f4 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.10"; + version = "0.4.12"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-DUWJDWqB+jyp3/2/eFP1ss2grNtrvUuvGWK0FYTXObc="; + sha256 = "sha256-YYUOW3QWJx+XdrZTaPEGs5TJH2lVUJGPcPYYehR3V0M="; }; - vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; + vendorHash = "sha256-p8Q+oQFbkulcDFdHUoQ1qdO1zsi7XmU/IjnScZogz2g="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 034af9a07e5bc..86af4aef10653 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.7"; + version = "2.6.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-hEfPiDbEdmuD/IHM9Tfy0kUkKDpbTZ0HzMjIt/ifcPk="; + sha256 = "sha256-H/jrjU3iIlO75eN2Av/zuGe2G5KbJw9Xj6MCbWgTFEs="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; + vendorHash = "sha256-c4KvsHN+2QXk/+MJgRIm5L6LtRe5juUF8rw84aVot38="; # 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 9b0d76a5ac145..11ee9a8b3568e 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.56"; + version = "0.9.0"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI="; + sha256 = "sha256-0o6keMr+bAAZ3gmaDhsU2r3T8hRxpkbqCnNVLqWvK+k="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck="; + vendorHash = "sha256-WuBZj6W3/E9HbvWTBegmJdY+aw43CYyuw1hXF7RXd3A="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 2fbbc9ad1d24f..a1335641e34e7 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.45"; + version = "1.0.48"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; + sha256 = "sha256-KoW+XKEFoe2QNJPu97MYYZnxbU0Wat8slJjQm/vtmew="; }; - vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; + vendorHash = "sha256-QzTu6/iFK+CS8UXoXSVq3OTuwk/xcHnAX4UpCU/Scpk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index b4c2d6c304e4b..7ff0a0101c970 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.5.0"; + version = "8.6.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU="; + sha256 = "sha256-SApjp6rdyOyZD6onE0aZ1AeiR6XyPUT9SVJJe/ROEQQ="; }; - vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w="; + vendorHash = "sha256-xydewlruZvtWHm0IvVWuvv31+Z7/PLVC9gTZcQLaowk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index fb755ac679372..3f614815f7a59 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk="; + hash = "sha256-bkjtJidG+UHma15axlLcXtqtWTqesOdHHmH4db5hoAY="; }; - vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; + vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c="; subPackages = [ "cmd/clusterctl" ]; @@ -39,6 +39,7 @@ buildGoModule rec { }; meta = with lib; { + changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}"; description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/applications/networking/cluster/crc/default.nix index ed4e2b0583f80..c47062fdfc414 100644 --- a/pkgs/applications/networking/cluster/crc/default.nix +++ b/pkgs/applications/networking/cluster/crc/default.nix @@ -10,22 +10,22 @@ }: let - openShiftVersion = "4.11.18"; + openShiftVersion = "4.12.1"; okdVersion = "4.11.0-0.okd-2022-11-05-030711"; - podmanVersion = "4.2.0"; + podmanVersion = "4.3.1"; writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; in buildGoModule rec { - version = "2.12.0"; + version = "2.14.0"; pname = "crc"; - gitCommit = "ea98bb41e24ad81a319d0aa6c6e1286bc1334c1b"; + gitCommit = "868d96cd4f73dad72df54475c52c65f9741dc240"; modRoot = "cmd/crc"; src = fetchFromGitHub { owner = "crc-org"; repo = "crc"; rev = "v${version}"; - sha256 = "sha256-0e62mQ01pt0kClrEx4ss2T8BN1+0aQiCFPyDg5agbTU"; + sha256 = "sha256-q1OJJTveXoNzW9lohQOY7LVR3jOyiQZX5nHBgRupxTM="; }; vendorSha256 = null; @@ -55,7 +55,6 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; - passthru.tests.version = testers.testVersion { package = crc; command = '' @@ -69,6 +68,6 @@ buildGoModule rec { description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes"; homepage = "https://crc.dev"; license = licenses.asl20; - maintainers = with maintainers; [ shikanime tricktron ]; + maintainers = with maintainers; [ matthewpi shikanime tricktron ]; }; } diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index d05b34cd7de94..381cd1d456b53 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck; + inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck; pname = "docker-machine-hyperkit"; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 9ef43bed2eec8..a35cfab16cd7e 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck; + inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck; pname = "docker-machine-kvm2"; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 97fff7f9bbb3e..a10761578c487 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.38.3"; - sha256 = "15sx743gbmlmww7jmi56r5nlajg33xmzacyd69hmp46jjxqdckmh"; - manifestsSha256 = "1dmp7gdnwbg4jjc3dq1wp2jn3z3g6lm296b1nf24ndcfmjja58cz"; + version = "0.40.2"; + sha256 = "00rzd9i9dd13wsr2f8y6b7q5zphrfx3bgigfinmzcfdinydv3bm4"; + manifestsSha256 = "05bkqkhyb3mgd68w2zr9bav6dfibfzfw65anzkz269wqrkf0d86k"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-IuOivH9K7e5vNpK44NKegzIEVHS+ihkX89++4DJC+8Q="; + vendorSha256 = "sha256-crFBOWRjgFIm4mrX3Sf9ovodG5t8hhJUbMr2qpIt7LQ="; 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/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 2d25eee6f347e..8c80ef9fda344 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -38,7 +38,9 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then if [ $# -eq 1 ] && [ "$1" = "git" ]; then git switch -c "package-fluxcd-${LATEST_VERSION}" git add "$FLUXCD_PATH"/default.nix - git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}" + git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION} + +Release: https://github.com/fluxcd/flux2/releases/tag/v${LATEST_VERSION}" fi else echo "fluxcd is already up-to-date at $OLD_VERSION" diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5f8781665f4c1..6f54aba1f0fd3 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.13.3"; + version = "1.13.8"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-nxClmCY/joLJw87IQx9DvAZLv5LgOLGlp9Unh37OKgg="; + hash = "sha256-mflLB+fdNgOlxq/Y2muIyNZHZPFhL6Px355l9w54zC4="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 60f6c3ddb5ea2..12868dcc5afcc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }: buildGoModule rec { pname = "kubernetes-helm"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-Pes1p7rTO17Bef6qacsQWJkhb1CWilzmVYQe886EepU="; + sha256 = "sha256-TrjPpKFHMF+dPz9AqXVkYPUNWeWEeH8bA37Dpxr7b8s="; }; vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI="; @@ -20,12 +20,13 @@ buildGoModule rec { "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}" ]; + __darwinAllowLocalNetworking = true; + preCheck = '' # skipping version tests because they require dot git directory substituteInPlace cmd/helm/version_test.go \ --replace "TestVersion" "SkipVersion" - '' + lib.optionalString stdenv.isLinux '' - # skipping plugin tests on linux + # skipping plugin tests substituteInPlace cmd/helm/plugin_test.go \ --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ --replace "TestLoadPlugins" "SkipLoadPlugins" @@ -41,6 +42,12 @@ buildGoModule rec { installShellCompletion helm.{bash,zsh,fish} ''; + passthru.tests.version = testers.testVersion { + package = kubernetes-helm; + command = "helm version"; + version = "v${version}"; + }; + meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 64fa0f35e543b..c08e12a4de8e2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk="; + sha256 = "sha256-JeQP2KXoLxkyRZVFcd6Rrz5xyJd+F3plzznAVP3Um8g="; }; - vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg="; + vendorSha256 = "sha256-d5NSqCJrk9QhV5gVOKUG/uJxuvt8X8hiQd8yJEoXPL0="; + + ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 7d9135045f179..39a03eceacaaa 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.8.3"; + version = "4.2.2"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-FpF/d+e5T6nb0OENaYLY+3ATZ+qcAeih5/yKI+AtfKA="; + hash = "sha256-aqRgny1vU+dxpZpzwL4aSbYfTGrZbRffQy81mMBvnJk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { # NOTE: helm-secrets is comprised of shell scripts. dontBuild = true; - # NOTE: Remove the install and upgrade hooks. + # NOTE: Fix version string postPatch = '' - sed -i '/^hooks:/,+2 d' plugin.yaml + sed -i 's/^version:.*/version: "${version}"/' plugin.yaml ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2a9b047723342..b80c9c81d5d74 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,29 +2,30 @@ buildGoModule rec { pname = "helmfile"; - version = "0.145.2"; + version = "0.151.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; + sha256 = "sha256-hzsxuvHzdjNRqTk4yEBZhT/j1fVCAk+843kY4MsN0AM="; }; - vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; + vendorHash = "sha256-f0K3/xF+nJvlhtLAyLOah2RaZbaEqD8C28cPCLyaCXI="; doCheck = false; subPackages = [ "." ]; - ldflags = [ "-s" "-w" "-X github.com/helmfile/helmfile/pkg/app/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X go.szostok.io/version.version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd helmfile \ - --bash ./autocomplete/helmfile_bash_autocomplete \ - --zsh ./autocomplete/helmfile_zsh_autocomplete + --bash <($out/bin/helmfile completion bash) \ + --fish <($out/bin/helmfile completion fish) \ + --zsh <($out/bin/helmfile completion zsh) ''; meta = { diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index fb268db1810a7..b09d167c24afb 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.16.1"; + version = "3.16.4"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko="; + sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM="; }; - vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE="; + vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index ec4c1b8a04b4e..a45002e34b704 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.16.1"; + version = "1.17.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-IYmNmrUdlp0V+gsAwivkF73VcBBMDcA5QWSnJ+6qKks="; + sha256 = "sha256-6YoznN/wqgmNzBV0ukySwSQvnF4qQeH52uXlEgZTpig="; }; - vendorSha256 = "sha256-yCdCuwiAAdyeLtu4zE7d8RLbqM6FuH9sw0EqDZohQxg="; + vendorHash = "sha256-9A4Du5expdbFKFIrcPTADyRINhiPpsboqsbszg638LY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix index 8c40604d0f1c6..8c40604d0f1c6 100644 --- a/pkgs/applications/networking/cluster/k3s/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix new file mode 100644 index 0000000000000..3abe8c6755398 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -0,0 +1,328 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, ipset +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, k3s +, 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 +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# 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.23.16+k3s1"; # k3s git tag + k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version + k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk="; + k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ="; + + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/manifests/traefik.yaml#L8-L16 + # 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.16%2Bk3s1/scripts/version.sh#L54 + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw="; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L47 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "sha256-1Br7s+iMtfiPjM0EcNPuFdSlp9dVPjSG1UGuiPUfq5I="; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L9 + containerdVersion = "1.5.16-k3s2-1-22"; + containerdSha256 = "sha256-PRrp05Jgx368Ox4hTC66lbCInWuex0OtAuCY4l8geqA="; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L19 + criCtlVersion = "1.22.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl 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 + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/build#L123-L131 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/k3s-completion + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + ipset + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.23 + # passthru.updateScript = ./update.sh; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_24/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_24/chart-versions.nix new file mode 100644 index 0000000000000..8c40604d0f1c6 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_24/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/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix new file mode 100644 index 0000000000000..2ff642f351115 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -0,0 +1,326 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, ipset +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, k3s +, pkgsBuildBuild +}: + +# 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 +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# 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.24.10+k3s1"; # k3s git tag + k3sCommit = "546a94e9ae1c3be6f9c0dcde32a6e6672b035bc8"; # k3s git commit at the above version + k3sRepoSha256 = "sha256-HfkGb3GtR2wQkVIze26aFh6A6W0fegr8ovpSel7oujQ="; + k3sVendorSha256 = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM="; + + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/manifests/traefik.yaml#L8-L16 + # 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.24.10%2Bk3s1/scripts/version.sh#L56 + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw="; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/version.sh#L49 + 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}'` + # https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/go.mod#L10 + containerdVersion = "1.5.16-k3s1"; + containerdSha256 = "sha256-dxC44qE1A20Hd2j77Ir9Sla8xncttswWIuGGM/5FWi8="; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + # https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/go.mod#L18 + criCtlVersion = "1.24.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl 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 + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/build#L123-L131 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/k3s-completion + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + ipset + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.24 + # passthru.updateScript = ./update.sh; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch b/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 0000000000000..115fd6824772b --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp <euank@euank.com> +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/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix new file mode 100644 index 0000000000000..5b5fc097e77da --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -0,0 +1,330 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, ipset +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, pkgsBuildBuild +, k3s +}: + +# 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 +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# 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="; + + # 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"; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "1.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"; + + # 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"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl { + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = traefikChartSha256; + }; + # 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 + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + patches = [ + ./0001-script-download-strip-downloading-just-package-CRD.patch + ]; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + ipset + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.25 + # passthru.updateScript = ./update.sh; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix new file mode 100644 index 0000000000000..8c40604d0f1c6 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_26/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/1_26/default.nix index 02a65328cfd8f..1b8b5a1b2a645 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -4,6 +4,7 @@ , socat , iptables , iproute2 +, ipset , bridge-utils , btrfs-progs , conntrack-tools @@ -45,10 +46,10 @@ # 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.26.0+k3s2"; # k3s git tag - k3sCommit = "f0ec6a4c127b2c671b271974a2f21783f0e3c525"; # k3s git commit at the above version - k3sRepoSha256 = "0yc2k45s321hjir3c2wabqihk96wbjxp274dpbh9kv3471j89lkm"; - k3sVendorSha256 = "sha256-ptC39SgzCA4CULA+VmcMGlPG8KsLRbWlVI/jQrrF/RU="; + k3sVersion = "1.26.1+k3s1"; # k3s git tag + k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version + k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848"; + k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994="; # nix generated by update.sh # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 @@ -65,8 +66,8 @@ let k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; # taken from ./scripts/version.sh VERSION_CONTAINERD - containerdVersion = "1.6.14-k3s1"; - containerdSha256 = "01zs2xbpmww6hdh248px4dlh1n7xy9gzj2b8afyfmv3c2m2alf5p"; + 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.26.0-rc.0-k3s1"; @@ -75,7 +76,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 ]; + maintainers = with maintainers; [ euank mic92 superherointj yajo ]; platforms = platforms.linux; }; @@ -249,6 +250,7 @@ buildGoModule rec { socat iptables iproute2 + ipset bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 @@ -319,7 +321,14 @@ buildGoModule rec { passthru.updateScript = ./update.sh; - passthru.tests = nixosTests.k3s; + passthru.mkTests = version: + let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); + in { + single-node = nixosTests.k3s.single-node.${k3s_version}; + multi-node = nixosTests.k3s.multi-node.${k3s_version}; + }; + passthru.tests = passthru.mkTests k3sVersion; + meta = baseMeta; } diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/1_26/update.sh index 651d54adc1d5c..651d54adc1d5c 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/1_26/update.sh diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index de9dd27b52646..7c57feacfb782 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.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-TshUQJIwGSqVP+YUJvSHSczvnvzr1kX761oIbfQzVzw="; + sha256 = "sha256-oUn9qQG4rpunfeHgSlY9THkYv1aGWrVmdTZoEWeZJTs="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-W0yU5rMUuO2JtKRZpexsCqIUy3h+2hSDRcq/lp0UHX8="; + vendorHash = "sha256-sQ3D4JUK9epRkDZ7DC+IH+iMaLN+uKM2hZkhqji+0Zc="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix new file mode 100644 index 0000000000000..6bae7297917b0 --- /dev/null +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoModule +, installShellFiles +, testers +, kaniko +}: + +buildGoModule rec { + pname = "kaniko"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "GoogleContainerTools"; + repo = "kaniko"; + rev = "v${version}"; + hash = "sha256-sPICsDgkijQ7PyeTWQgT553toc4/rWPPo7SY3ptX82U="; + }; + + vendorHash = null; + + ldflags = [ + "-s" "-w" + "-X github.com/GoogleContainerTools/kaniko/pkg/version.version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; # requires docker, container-diff (unpackaged yet) + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + for shell in bash fish zsh; do + $out/bin/executor completion $shell > executor.$shell + installShellCompletion executor.$shell + done + ''; + + passthru.tests.version = testers.testVersion { + package = kaniko; + version = version; + command = "${kaniko}/bin/executor version"; + }; + + meta = { + description = "A tool to build container images from a Dockerfile, inside a container or Kubernetes cluster"; + homepage = "https://github.com/GoogleContainerTools/kaniko"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jk superherointj ]; + mainProgram = "executor"; + }; +} diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index bf35eac948d43..88967da07e784 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.11.5"; + version = "0.11.7"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-xVYhZT4yqbSmxGH5DaarXzrGYMS1BuTaQ2T+huWYLBw="; + hash = "sha256-sXiv+aCYuN6GJB+6/G4Z1Oe/fB3OO+jhSvCAFUaiD3g="; }; - vendorHash = "sha256-rlvAQ99/3+3VotyYAR2TgWG8ZdTKUT2XRv4hTF+QFpI="; + vendorHash = "sha256-9yCT9GspX2Tl6dISF8qvDF/Tm2mfwuDH+DrouFmxpj8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index aefcef2bacccb..6a02127405d3a 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.18.4"; + version = "2.19.0"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw="; + hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao="; }; - vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg="; + vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 7e7bba1d37b39..be8834d05f531 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; + sha256 = "sha256-zf6e8+jkgJns1c71QLL1gd0zK34X7gJo1gS38A1DPJo="; }; vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 7fd5175e1e481..461b29aed69c2 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-5IaF7q9Ue+tHkThxYgpkrnEH7xpKBx6cqKf2Zw2mjN4="; + hash = "sha256-41hctulZdFSBc+Yw4p2haR2VNIpa0bwntPCz3WUJyZg="; }; - vendorHash = "sha256-Fh8QlXZ7I3XORjRhf5DIQmqA35LmgWVTN+iZDGaYHD8="; + vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 031fa0c21b779..995125d250334 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/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 45f0ee66f61e6..474a27238f205 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.25"; + version = "0.0.27"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; + sha256 = "sha256-yC0J6uXL0W00o0BGIrrZ9WjThSgIu5fEgQdyH2vZESs="; }; - vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; + vendorHash = "sha256-QGzaKtku7fm14ijmE68nqgqoX86IgmEsemlQltZECI0="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 96e0e4894ec66..3d569d4bdca80 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-PdrU3kKuoT4MP5N2t4E1PIKZOMu8D0ZbUyMTIi/KZ7g="; + hash = "sha256-u0ievi2Zj5kerTQWhNPkT3HFdLYVwHOigkvWk6Zc3go="; }; vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index a97054a9071fc..0fefba4f5d3de 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.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; + sha256 = "sha256-giCFea4uZNztWxQhsYSdh2KtFE0uU0hf/lhGnY9OsIE="; }; - vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; + vendorHash = "sha256-i8MpQsqD1SBf+qPwYTFDTYDE4mvLdpKUoKML+u1027U="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix new file mode 100644 index 0000000000000..c7abd03ccd7ed --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubeshark, nix-update-script }: + +buildGoModule rec { + pname = "kubeshark"; + version = "38.5"; + + src = fetchFromGitHub { + owner = "kubeshark"; + repo = "kubeshark"; + rev = version; + sha256 = "sha256-xu+IcmYNsFBYhb0Grnqyi31LCG/3XhSh1LH8XakQ3Yk="; + }; + + vendorHash = "sha256-o04XIUsHNqOBkvcejASHNz1HDnV6F9t+Q2Hg8eL/Uoc="; + + ldflags = let t = "github.com/kubeshark/kubeshark"; in [ + "-s" "-w" + "-X ${t}/misc.GitCommitHash=${src.rev}" + "-X ${t}/misc.Branch=master" + "-X ${t}/misc.BuildTimestamp=0" + "-X ${t}/misc.Platform=unknown" + "-X ${t}/misc.Ver=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + checkPhase = '' + go test ./... + ''; + doCheck = true; + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + installShellCompletion --cmd kubeshark \ + --bash <($out/bin/kubeshark completion bash) \ + --fish <($out/bin/kubeshark completion fish) \ + --zsh <($out/bin/kubeshark completion zsh) + ''; + + passthru = { + tests.version = testers.testVersion { + package = kubeshark; + command = "kubeshark version"; + inherit version; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + changelog = "https://github.com/kubeshark/kubeshark/releases/tag/${version}"; + description = "The API Traffic Viewer for Kubernetes"; + homepage = "https://kubeshark.co/"; + license = licenses.asl20; + longDescription = '' + The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network, + Think TCPDump and Wireshark re-invented for Kubernetes + capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters. + ''; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 53da8b9be29fd..7af197a9992de 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.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws="; + sha256 = "sha256-i8uKhzvU9ftlzgzU4ViYg6z+OUNNHGbiFhFAwDKwtnw="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g="; + vendorHash = "sha256-BGIh1wzHIk1kSvk/sQ/tDBhGIOOx0o6Dk4LbK9Z1FAQ="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 896c2ac5a0164..7ac3f68b35ee9 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.3"; - sha256 = "01vnqhn5lc4pv1rgwmmzzf7ynqc4ss0jysqhjq0m5yzll2k40d8z"; - vendorSha256 = "sha256-7CkeWbgiQIKhuCrJErZrkkx0MD41qxaWAY/18VafLZE="; + version = "2.12.4"; + sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd"; + vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 4e31f689dd7de..9f3169b88b4eb 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 = "23.1.1"; - sha256 = "159myaz0zh0j8vdknxshyvkl1khxbznvls2mk5wyssxqll8b3j32"; - vendorSha256 = "sha256-7+ppFmM+NVnMU6pg2FcaSGqcq429EmrPYgAZfHANtEg="; + version = "23.2.3"; + sha256 = "0lqbsh3237hh1rifi7w3h1mq4m6cnpxvb1h3dxghv5sblyivqfz9"; + vendorSha256 = "sha256-gZ9t10Lj0wXeVBfmxKax9FYrcNL+ZEJOqhQfYw9Qwzw="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index f21ee96ecd33b..a4aec900a4848 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 997b52434b829..e05e7847cfd48 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 e508ee0006f81..bc57c87b2f87c 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.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i178AN8LDm1SmCx3G8uLmW1+/F3B8DQsrkawSBoefGw="; + hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU="; }; - vendorSha256 = "sha256-0EWrFc55I3EmrAmmIYdsYtvO6xqDHbo5Uo6XC+NezZI="; + vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index e7bd82971014e..36e86df5626e8 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -75,8 +75,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/lukebfox/nixops-hetznercloud.git"; - rev = "c00533400506d40940f7c1f67bf3973db37d9dd9"; - sha256 = "1xfwhiyay7x1r3q6rxn2f3h0llgwf73vl8fxp0ww13rgny2w0dgj"; + rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; + sha256 = "0vhapgzhqfk3y8a26ck09g0ilydsbjlx5g77f8bscdqz818lki12"; }; } ); @@ -85,8 +85,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51"; - sha256 = "06bcxchjgmgfvhg9dzlcdnr4ak0h1rdpfpgbix3z2via2gad8bvj"; + rev = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991"; + sha256 = "1mklm3lmicvhs0vcib3ss21an45wk24m1mkcwy1zvbpbmvhdz2m4"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 3f7ce6a1a49e8..9c65bfd661830 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -29,18 +29,18 @@ files = [ [[package]] name = "boto3" -version = "1.26.45" +version = "1.26.79" 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"}, + {file = "boto3-1.26.79-py3-none-any.whl", hash = "sha256:049de631cc03726a14b8eb24ac9ec2a48b0624197796f36166da809fdc9b9a7f"}, + {file = "boto3-1.26.79.tar.gz", hash = "sha256:73d7bd1f16118ef0dfe936e0420cd76b02d1aedb75330ebda51168458ab752ac"}, ] [package.dependencies] -botocore = ">=1.29.45,<1.30.0" +botocore = ">=1.29.79,<1.30.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -49,14 +49,14 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.29.45" +version = "1.29.79" 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"}, + {file = "botocore-1.29.79-py3-none-any.whl", hash = "sha256:5f254f019e8641f8b2ba6dddc1f7541e8c6d25d976802392710b2fc4bac925b1"}, + {file = "botocore-1.29.79.tar.gz", hash = "sha256:c7ded44062bed3b928944cfb09e1578ed3fed0e4c98de4f233f3c2056a8d491e"}, ] [package.dependencies] @@ -65,7 +65,7 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.15.3)"] +crt = ["awscrt (==0.16.9)"] [[package]] name = "certifi" @@ -158,19 +158,102 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.1.1" +version = "3.0.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" +python-versions = "*" 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"}, + {file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"}, + {file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"}, ] -[package.extras] -unicode-backport = ["unicodedata2"] - [[package]] name = "cryptography" version = "3.4.8" @@ -212,30 +295,18 @@ 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" +version = "1.18.2" 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"}, + {file = "hcloud-1.18.2-py2.py3-none-any.whl", hash = "sha256:fcd73c7aab1d6e729333697e5214b26727775eccdbfb50effd1863c3424caa59"}, + {file = "hcloud-1.18.2.tar.gz", hash = "sha256:37bd5ba56387e3c491c5babd3e08ab91d5f0390cd5e880e4dfea19e21681bc9e"}, ] [package.dependencies] -future = ">=0.17.1" python-dateutil = ">=2.7.5" requests = ">=2.20" @@ -296,13 +367,13 @@ testing-libs = ["simplejson", "ujson"] [[package]] name = "libvirt-python" -version = "8.10.0" +version = "9.0.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"}, + {file = "libvirt-python-9.0.0.tar.gz", hash = "sha256:49702d33fa8cbcae19fa727467a69f7ae2241b3091324085ca1cc752b2b414ce"}, ] [[package]] @@ -454,7 +525,7 @@ resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" [[package]] name = "nixops-hetznercloud" -version = "0.1.2" +version = "0.1.3" description = "NixOps Hetzner Cloud plugin" category = "main" optional = false @@ -463,7 +534,7 @@ files = [] develop = false [package.dependencies] -hcloud = "1.18.0" +hcloud = "1.18.2" nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} typing-extensions = "^3.7.4" @@ -471,7 +542,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/lukebfox/nixops-hetznercloud.git" reference = "HEAD" -resolved_reference = "c00533400506d40940f7c1f67bf3973db37d9dd9" +resolved_reference = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3" [[package]] name = "nixops-virtd" @@ -479,19 +550,19 @@ version = "1.0" description = "NixOps plugin for virtd" category = "main" optional = false -python-versions = "^3.7" +python-versions = "^3.10" files = [] develop = false [package.dependencies] -libvirt-python = "^8.0" +libvirt-python = "^9.0" nixops = {git = "https://github.com/NixOS/nixops.git"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-libvirtd.git" reference = "HEAD" -resolved_reference = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51" +resolved_reference = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991" [[package]] name = "nixopsvbox" @@ -605,19 +676,19 @@ requests = "*" [[package]] name = "requests" -version = "2.28.1" +version = "2.28.2" 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"}, + {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"}, + {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"}, ] [package.dependencies] certifi = ">=2017.4.17" -charset-normalizer = ">=2,<3" +charset-normalizer = ">=2,<4" idna = ">=2.5,<4" urllib3 = ">=1.21.1,<1.27" @@ -686,14 +757,14 @@ files = [ [[package]] name = "urllib3" -version = "1.26.13" +version = "1.26.14" 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"}, + {file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"}, + {file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"}, ] [package.extras] diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index faec094807740..ba7f86e9e7d62 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,6 @@ { lib , buildGoModule -, buildGo119Module +, buildGo120Module , fetchFromGitHub , nixosTests }: @@ -47,24 +47,24 @@ rec { nomad = nomad_1_4; nomad_1_2 = generic { - buildGoModule = buildGo119Module; - version = "1.2.15"; - sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; - vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; + buildGoModule = buildGo120Module; + version = "1.2.16"; + sha256 = "sha256-fhfUpcG91EgIzJ4mCS7geyIJyTSHS2e8t4yYiI3PqpQ="; + vendorSha256 = "sha256-kwCDsGFw+25Mimgt/cTK/Z2H7Qh5n4rjr3kIBvjcPL8="; }; nomad_1_3 = generic { - buildGoModule = buildGo119Module; - version = "1.3.8"; - sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; - vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; + buildGoModule = buildGo120Module; + version = "1.3.9"; + sha256 = "sha256-xfoIzLDG/OfqAPQqeLvQZ11uESWFNyOyLP6Imi+S96w="; + vendorSha256 = "sha256-kW0goicoM1lM1NEHPTfozg2EKR1daf33UxT/mVabyfY="; }; nomad_1_4 = generic { - buildGoModule = buildGo119Module; - version = "1.4.3"; - sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; - vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; + buildGoModule = buildGo120Module; + version = "1.4.4"; + sha256 = "sha256-mAimuWolTJ3lMY/ArnLZFu+GZv9ADdGsriXsTcEgdYc="; + vendorSha256 = "sha256-QtP7pzsIBd2S79AUcbOeVG71Mb5qK706rq5DkT41VqM="; passthru.tests.nomad = nixosTests.nomad; }; } diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 9933e8056670a..705b10753ca45 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 - ''; - - 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 + ldflags = [ + "-s" + "-w" + "-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}" + "-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}" + ]; - 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 ce363080f4599..029e23330335c 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew="; + hash = "sha256-Gm/aUkwEbWxj76Q6My1Vw2gRn3+WVG6EJ7PLpQ1F130="; }; - vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs="; + vendorHash = "sha256-MVcbeQ4qAX9zVlT81yZd5xvo1ggVNpCZJozBoql2W9o="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index c9af58b1a8a85..768a01b3de83e 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.12.0"; + version = "5.15.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; + sha256 = "sha256-qCWKmn0buITZo86hQncXWuEDQq0rITrCz/aRVR1+Zt4="; }; - vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; + vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 75f14c69bca77..c65c795a173bc 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE="; + sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE="; + vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4="; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix new file mode 100644 index 0000000000000..73fb42ee373b6 --- /dev/null +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pv-migrate"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "utkuozdemir"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-M+M2tK40d05AxBmTjYKv5rrebX7g+Za8KX+/Q3aVLwE="; + }; + + subPackages = [ "cmd/pv-migrate" ]; + + vendorHash = "sha256-3uqN6RmkctlE4GuYZQbY6wbHyPBJP15O4Bm0kTtW8qo="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + "-X main.commit=${src.rev}" + "-X main.date=1970-01-01-00:00:01" + ]; + + meta = with lib; { + description = "CLI tool to easily migrate Kubernetes persistent volumes "; + homepage = "https://github.com/utkuozdemir/pv-migrate"; + changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}"; + license = licenses.afl20; + maintainers = [ maintainers.ivankovnatsky ]; + }; +} diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 877dddfa1e2b2..5ef93e307cfba 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "3.73.1"; + version = "3.73.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; + sha256 = "sha256-5MMSQy7SUFZhUycv1Kfkz46aY2tMldNZOH63wlQjq6o="; }; vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 7459bba1697b8..ee045f5782a9a 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.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo="; + sha256 = "sha256-tqp2H8aWPBgje1zIK673cbr+DShhTQL9VQ0dEL/he7s="; }; - vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w="; + vendorHash = "sha256-ud07lWHwQfAHgVenUApwrfxmTjJKVm+pOExdR9pZFxA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 255ec944c8dad..4c8cbda6945bc 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.3.2"; + version = "1.3.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY="; + hash = "sha256-LXAQSz39dtfSN6ks6UYJtXiTjcVz/a+f+JIsgC3MXic="; }; - vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk="; + vendorHash = "sha256-ctkeEGrh8tzWvEsVhcc2Cl3rAMkYQtcxD1b27ux1QDM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 010527121e573..29727e0a697df 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/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index f806a1d35ae84..a78aaf4b56da5 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.2"; + version = "1.18.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - hash = "sha256-QID0VtARbJiTIQm2JeaejQ5VpJsAIHfZtws7i2UN8dM="; + hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig="; }; - vendorHash = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; + vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 0b1077443a493..9fe3edcbb99c8 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "temporal"; - version = "1.17.5"; + version = "1.20.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-u8GyaXpiVZdPDoPAqIa+TY+JQFZeSGOLrUy+e3E4kig="; + hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE="; }; - vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; + vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8="; + + excludedPackages = [ "./build" ]; CGO_ENABLED = 0; @@ -26,6 +28,7 @@ buildGoModule rec { install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool + install -Dm755 "$GOPATH/bin/tdbg" -T $out/bin/tdbg runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f03732f4c72ce..6e858269bd775 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,24 +1,22 @@ { "aci": { - "deleteVendor": true, - "hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=", + "hash": "sha256-rgPqf8PopvzXiIOjng7DNOv920MPI81EVMUu3DaS8o4=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", - "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.6.0", + "rev": "v2.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E=" + "vendorHash": null }, "acme": { - "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", + "hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.12.0", + "rev": "v2.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-L8d2Y4gSmqqmg24lULWrdKSI+194rRTVZyxJAEL+gqM=" + "vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -30,29 +28,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-8kTT1tD88UZc/ZbunFDF+SlTYM5E3jyQgaBcRBULYlY=", + "hash": "sha256-ahqp63zzO4+TvdXk2e4r3r0VG7Cys3lhE+wkEkjN+vI=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v3.11.0", + "rev": "v4.0.0", "spdx": "MIT", - "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" + "vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk=" }, "akamai": { - "hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=", + "hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.2.1", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" + "vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y=" }, "alicloud": { - "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", + "hash": "sha256-Cf3plUhdewlq3MvOqZGcICP0j9R3vg0nZdBMrk/Et7k=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.197.0", + "rev": "v1.199.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -84,23 +82,23 @@ "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-BlMYx6Ockk8YpiA0wCu2tBwhUIznFJ9b4knSeKA6M/g=", + "hash": "sha256-3hAfDzK7iO4D68OsCvuXQx5Gk0VOtoBiw21tBJjDJtQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.42.0", + "rev": "v0.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OhtomdRIjKxELnSQGbZvrHAE1ag4VAyuSOMrZvZ5q0s=" + "vendorHash": "sha256-UP9A0lcW5QbTuur1MMjKMlvC8S3nenqs0WjpoqvwEQI=" }, "avi": { - "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.2", + "rev": "v22.1.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" + "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", @@ -112,29 +110,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=", + "hash": "sha256-qopoHOcCdOAkgpZq3AvCnsq00sjvNSFdUKzn7SQ0G5k=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.51.0", + "rev": "v4.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8=" + "vendorHash": "sha256-OBWwMNDpeoPR6NLIgsjiYGQdePEWDMWGN1Y0nHsecYs=" }, "azuread": { - "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", + "hash": "sha256-vfkheaRQoDpItMEFzuDkkOOoVvj07MyCkAaybef71nc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.33.0", + "rev": "v2.35.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-dD2o0b5JQ1bZIBFshe+JkfkO5C0a3OvUwfrO2dgIiO8=", + "hash": "sha256-fCs03D+Z/90w9Hup9Cppcx6irsP+oA0HK72tgVm+ZmA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.40.0", + "rev": "v3.45.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -148,39 +146,38 @@ "vendorHash": null }, "baiducloud": { - "deleteVendor": true, "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", "rev": "v1.19.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" + "vendorHash": null }, "bigip": { - "hash": "sha256-VntKiBTQxe8lKV8Bb3A0moA/EUzyQQ7CInPjKJL4iBQ=", + "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.16.1", + "rev": "v1.16.2", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=", + "hash": "sha256-FrKNPpwPCpL7GuPkjYCPqHit/VPJG5Fe0Ew4WMzp1AI=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.30.0", + "rev": "v2.30.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" + "vendorHash": "sha256-rtPbHItqsgHoHs85QO6Uix2yvJkHE6B2XYMOdcJvoGc=" }, "brightbox": { - "hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=", + "hash": "sha256-YmgzzDLNJg7zm8smboI0gE2kOgjb2RwPf5v1CbzgvGA=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.2.0", + "rev": "v3.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, @@ -213,22 +210,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-S4iXhss4ASM4FJdBgElH/3IwpPFjUMy57BXG7C7p5+0=", + "hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.22.1", + "rev": "v1.23.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, "cloudflare": { - "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=", + "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.33.1", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8=" + "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo=" }, "cloudfoundry": { "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", @@ -240,13 +237,13 @@ "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { - "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", + "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.2.0", + "rev": "v2.3.2", "spdx": "MPL-2.0", - "vendorHash": null + "vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s=" }, "cloudscale": { "hash": "sha256-DQ7yIqA9gII0Ub1C8DEa1AMhQbzRFvsng8TMBGz+qzg=", @@ -286,13 +283,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=", + "hash": "sha256-gZdjbW2yz3TmnGfCLiveUpTcMeKBUUSV6CnugnkdoZ8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.20.0", + "rev": "v3.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM=" + "vendorHash": "sha256-6aBwtm4p/sJyH9jT7wT+utHIlOSgOilOk0AZSI9RzD8=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -304,11 +301,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=", + "hash": "sha256-ZTt/lfHWD9G/SbZ7mLKPjJAsva5bgRqvvX8Lh1Ci+ts=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.25.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -322,22 +319,22 @@ "vendorHash": null }, "dns": { - "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "hash": "sha256-qLKlnw0vnPvxJluvUiBERu1YdtrRklocVw314/lvQT4=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.2.3", + "rev": "v3.2.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" + "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.15.0", + "rev": "v0.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" + "vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw=" }, "docker": { "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", @@ -358,21 +355,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "hash": "sha256-aah3f/5Bd+IgXbyJpDhcyklIYHlK3yy16UkYlOprh0c=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.11.1", + "rev": "v1.12.0", "spdx": "MIT", - "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" + "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { - "hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=", + "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.43.0", + "rev": "v0.46.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -386,11 +382,11 @@ "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-SaihRh+DuMY9Mcx+PBAUPv0vrWeKGqx437ayLT3kdjI=", + "hash": "sha256-oaBVVbeJdmzkx3hphW9Llh/ZUujo8QNeZd6guDkBiCY=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.4", + "rev": "v3.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -415,51 +411,51 @@ "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { - "hash": "sha256-mQ4L2XCudyPGDw21jihF7nkSct7/KWAe/txnbtuJ8Lk=", + "hash": "sha256-eVSMjXSYRedig93Tm2ZLpbuJhG3wKSBwfLli7OWs3dU=", "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.2", + "rev": "v2.2.3", "spdx": "MPL-2.0", "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-o/kJwByQDXgbazZPoYW4YeV7BK4Bb3pwQhnWMhW4klE=", + "hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.16.0", + "rev": "v5.18.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", + "hash": "sha256-nBmb+wHl6FEHIH/P9SsDCtvDKVHzcL4/iaQwtuSjbVg=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.8.0", + "rev": "v15.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" + "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM=" }, "google": { - "hash": "sha256-R104jYttXER/Pzd3ePHh9ZOvpcziuVQK0JcFqdbWtG0=", + "hash": "sha256-my7vlk1EBQizQy2i+77Sf4OyOh+64GSDruzCfOc1QTc=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.50.0", + "rev": "v4.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" + "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E=" }, "google-beta": { - "hash": "sha256-OrotSvDNK7PC6nyHEAvmTOYgdYFiHEE8YwfWcOAbPsk=", + "hash": "sha256-uZuoWORRK0Y+r6OM6KhAts7/yPWJDkOtMwELFV/2hYE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.50.0", + "rev": "v4.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" + "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -471,13 +467,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", + "hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.34.0", + "rev": "v1.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" + "vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", @@ -498,20 +494,20 @@ "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { - "hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=", + "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MPL-2.0", "vendorHash": null }, "heroku": { - "hash": "sha256-UGA01N4ToEb3eSKCI2raI3ZXFeRm0MVVXVWgAc7im9g=", + "hash": "sha256-HRwG8VNl13HdibczNDWiCS74vrRImM/g3zn4MgQQx3s=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.10", + "rev": "v5.1.12", "spdx": "MPL-2.0", "vendorHash": null }, @@ -544,11 +540,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", + "hash": "sha256-oZUPfhndpht9EuBiltLknblGaMX2M/dD1iOiwDJKgWY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.44.1", + "rev": "v1.44.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -571,13 +567,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=", + "hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.49.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY=" + "vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -643,22 +639,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=", + "hash": "sha256-4TUUejEKbnsRmqwdQVhHF+QWW8kReq+ZQQvpcT+YhsQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.17.0", + "rev": "v2.18.1", "spdx": "MPL-2.0", "vendorHash": null }, "launchdarkly": { - "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", + "hash": "sha256-7m5+Fu9UjmGWL4PgYCpI9vMStfmU4oQ1cx+7wAirEbQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.9.4", + "rev": "v2.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" + "vendorHash": "sha256-j8Lit22aWeLvYrq5ao0nIdcVZDSxaAKaW+bxQ/JCSgE=" }, "libvirt": { "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", @@ -670,13 +666,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v1.29.4", + "rev": "v1.30.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" + "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -697,14 +693,13 @@ "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" }, "lxd": { - "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=", + "hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", - "proxyVendor": true, "repo": "terraform-provider-lxd", - "rev": "v1.9.0", + "rev": "v1.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" + "vendorHash": "sha256-RVELewqJtH4tuHJWfcLcMH7cM0dr7Yse+UnqrLaNyCc=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", @@ -734,22 +729,22 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=", + "hash": "sha256-zfnldsJcr36RMwEcmoDiwko1f+VR9tlPVUe/OVgX4Bc=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.10.0", + "rev": "v1.12.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw=" + "vendorHash": "sha256-MLhHRMahJjTgQBzYkSaVv6wFm6b+YgpkitBHuj5B6po=" }, "mongodbatlas": { - "hash": "sha256-jYEeJoMqYo5BCsr8pZlowwUPdW/QrCoHiSpDrEGK9QQ=", + "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.7.0", + "rev": "v1.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9m+eukHaSdSstWBtjxpgYkgyQVXx0jmKfEz3D9YROO4=" + "vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -770,13 +765,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-lWjXsIeYpe07+kIHr8qS8SmChs0tnfzxWy/K1KNJ5oo=", + "hash": "sha256-ReVP0droWSP+NWV0kQznfCllL/jx0uQKmaGr+CyR8iQ=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.13.0", + "rev": "v3.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ptjd4A/P2pZL5wP8IGHN385jngfS56w7FN1g/EpknRw=" + "vendorHash": "sha256-aFjsUhdGboN8Hfu2ky6djG0hC/Z9MU2tOWDFXekOGNQ=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -807,31 +802,31 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.7.1", + "rev": "v1.8.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", + "hash": "sha256-6UVsSOAh/JigJkiK+RbHsv7t/IuejouaRL+o8F0ndAo=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.105.0", + "rev": "v4.109.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", + "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.40.0", + "rev": "v3.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" + "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -843,11 +838,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=", + "hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, @@ -861,38 +856,38 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=", + "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.3", + "rev": "v1.33.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" + "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64=" }, "opsgenie": { - "hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=", + "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.19", + "rev": "v0.6.20", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=", + "hash": "sha256-d/G2o1G0cdb5shSv1WG7YBbhNift2sKjUd/Cz9XgvJ8=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.26.0", + "rev": "v0.28.1", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-0gEuIvgiFntP7dHmpkB3IRGMrAI8JbWG0zxiyNdFAiM=", + "hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.9.2", + "rev": "v2.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -969,13 +964,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=", + "hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.9.1", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng=" + "vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -987,13 +982,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", + "hash": "sha256-gZiDFcrQZsOE0R74LYwoitAjuPqPZCPLTEL3giom+c8=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v3.9.0", + "rev": "v3.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" + "vendorHash": "sha256-+Duf/wdjmw6NBhmy1KmNRJ+ZEjjwtJoXXQCw2lJzxS4=" }, "sentry": { "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", @@ -1014,13 +1009,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=", + "hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.20.0", + "rev": "v6.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ=" + "vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1032,13 +1027,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", + "hash": "sha256-nNv2lo7I5+eFmw+BvRB/DmgNE6iuR3Aq0kxyOeQdiqU=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.55.1", + "rev": "v0.57.0", "spdx": "MIT", - "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" + "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", @@ -1050,22 +1045,22 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=", + "hash": "sha256-mbO0APaGWLHowhs5tDvloUBYKt4+pvx3qqN2gtrAzGY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.96.0", + "rev": "v1.101.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI=" + "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU=" }, "stackpath": { - "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", + "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", "repo": "terraform-provider-stackpath", - "rev": "v1.4.0", + "rev": "v1.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" + "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U=" }, "statuscake": { "hash": "sha256-PcA0t/G11w9ud+56NdiRXi82ubJ+wpL4XcexT1O2ADw=", @@ -1077,13 +1072,13 @@ "vendorHash": "sha256-0D36uboEHqw968MKqkgARib9R04JH5FlXAfPL8OEpgU=" }, "sumologic": { - "hash": "sha256-4M8h1blefSNNTgt7aL7ecruguEWcZUrzsXGZX3AC2Hc=", + "hash": "sha256-1BwhcyEJs7Xm+p2ChA9K7g+qBzqoh3eyAT9qKMfHB1g=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.20.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" + "vendorHash": "sha256-dpMa+XnfavXO0lXiBZOsU+O+5/3a/IMkfzpQcnD/sSw=" }, "tailscale": { "hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=", @@ -1094,30 +1089,39 @@ "spdx": "MIT", "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, + "talos": { + "hash": "sha256-Uj4UlxPvI80og/wJPtQgyrejXLcfc6R4IJfsXiVNm+Y=", + "homepage": "https://registry.terraform.io/providers/siderolabs/talos", + "owner": "siderolabs", + "repo": "terraform-provider-talos", + "rev": "v0.1.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" + }, "tencentcloud": { - "hash": "sha256-CLXW1takpsySUo8lpDe6DzRFczts1zRriHZge5uCb3A=", + "hash": "sha256-aqi6lEGVj0PhIMwUfU/4lu5uGgbU4+R42UhINbHgMjY=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.6", + "rev": "v1.79.12", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-YhsAKyD3YYYWfxIHcAgMxdQc//0WQvXTsa+fVhSCG6U=", + "hash": "sha256-eFyRa4T+CqIeOcEYj4DQP6ypR7AROYrGDYuYSqBfKr0=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.41.0", + "rev": "v0.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-LgCS7W6mGGlX4vEhlPYL+Wo/urHv7aiopXWEBoEyL1c=" + "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU=" }, "thunder": { - "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.0.0", + "rev": "v1.1.0", "spdx": "BSD-2-Clause", "vendorHash": null }, @@ -1159,30 +1163,30 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-S0pSri0NfxxaYfifUEUVAoEIRPE8y2/sCNdXCLIDGh0=", + "hash": "sha256-Rh1X4AboPlHWikL/PIWTAf0f2/i3vSVsxzDp1kRuNiA=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.34.0", + "rev": "v1.34.1", "spdx": "MPL-2.0", "vendorHash": null }, "utils": { - "hash": "sha256-B2FdeukUD+xuJHBT1Yv9G2txjX/OmkxAGXDUw2HItig=", + "hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.6.0", + "rev": "1.7.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" + "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { - "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", + "hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.12.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, @@ -1214,29 +1218,29 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", + "hash": "sha256-J+lhKDl8CGpDgdfuv0uWd7yDNiwrWAzoXCxkEidqJH4=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.6", + "rev": "v3.0.7", "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { - "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "hash": "sha256-VScIcK4bInS9yhIYkYRsU8Hhzex9iyVkPiyjnnjshkI=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.2.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" + "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { - "hash": "sha256-DfiJgN1R7qW3c13hBabsMizY3mYamIq8AGms1q9kdVU=", + "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1250,13 +1254,13 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-g3BdCQKBuxrTn/sScJtRMyL2EoiOF5MpMXMM6I++dEg=", + "hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.84.0", + "rev": "v0.85.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-q9Rs2yJtI7MVqBcd9wwtyqR9PzmVkhKatbRRZwFm3po=" + "vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 4865ca4901cb8..6a722b80b834c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -12,18 +12,18 @@ }: let - generic = { version, sha256, vendorSha256 ? null, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ]; + generic = { version, hash, vendorHash ? null, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "version" "hash" "vendorHash" ]; in buildGoModule ({ pname = "terraform"; - inherit version vendorSha256; + inherit version vendorHash; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; rev = "v${version}"; - inherit sha256; + inherit hash; }; ldflags = [ "-s" "-w" ]; @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.7"; - sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; - vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; + version = "1.3.9"; + hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4="; + vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index bfe34115719ab..d683fc520a106 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY="; + hash = "sha256-6LL/ipDqNoiNWR/H5WzJVsJcgorYx6+jo+TjlfifsDo="; }; vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index 8719ebebb7681..c8f2fb070fbad 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1300"; + version = "0.13.1308"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-btvoFllCfwQJNpRWdAB05Cu4JYmT1xynJxDbzO/6LDs="; + sha256 = "sha256-EyA7LwfL3vCNzd2wpyUbrUnvkM0/f7/cQp+jcAcGZsg="; }; - vendorSha256 = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; + vendorHash = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 19aaa36c7eb69..ebb28798f55ed 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.13"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; + sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index bc4f1959eaace..dcb4dd9eb08d4 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.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-PBCTVws5N42q68rKcMLW7GgZvdsQgmdlsKMpJ5bCF00="; + sha256 = "sha256-jN45chUeoGJGJWD6Rj6duNE36/QCzPqci8V3h1OHtw4="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-5Po8TRCE6VP+RcaIJImYjElTMHHS/2JwbrHreeWLxio="; + vendorHash = "sha256-mvVwf4w/65L+F6aiTNf2jmJtaT1EpWCQJ6r9NHUUUqQ="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index e6f6bc1511756..d13e13ca2420b 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.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oUzWBFoBRwQynWubBzR9xNIyqRXTsH0R+OCyIDz0a9s="; + sha256 = "sha256-FI6QXQ0n/vvzUJTBbPDh9nMyAdcfTzpX79RxQEbFDUs="; }; - vendorSha256 = "sha256-rmDxO1tfpCUh5TXsSmf3DMIqB0NQHuCyizZmnaoZox0="; + vendorHash = "sha256-t8PzimNW7JWvWU3lZHo+b5K3R6he35HhBQPu1hxK51U="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index cad2c936a3316..13d097c5b4bf9 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.197"; + version = "1.2.202"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-cRpXdV/aHxVxMd54nmf9bMogiC9V8ryvCtSe+6Vx/Hk="; + hash = "sha256-jBsANHQ+l5zD3Liq7V/y+WzFQxRWzOC43UN5ES6D7PE="; }; - vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; + vendorHash = "sha256-SzqGcbfDtBfgnu6CRPyk2tPdwNDhM1RfteKTXVvivw4="; proxyVendor = true; @@ -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/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 243b0d16a25fa..76464c0d980ac 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-Me+kmEfvSJs8EPU4D7MwkEyHQuvDmQCSIATxygXws5o="; + hash = "sha256-PMjgEZ7D1peoW5ubOB/QrnmKVZs4/ToIBKH9zBT1J10="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-jI01tdAVdJOj/ocpwCiaANdyYKSLw00bV7ZtU7HvslA="; + vendorHash = "sha256-Ne3+NJsEJKjvkLShJxiiOq/UoORF7ggv/j7ltPgrSfQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 6b3b7f2843021..ceeeae75a18f4 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -1,17 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-zT8RRg+Ver7dYtJL9htrZ8nXoD0V7IvdIqHTKDmbZ7c="; + sha256 = "sha256-54iNbMZ+j6ioBTb/okyWZqqe4p6IyapZwc6VdtiAkLs="; }; - cargoSha256 = "sha256-N+w1OiCy3scahFdYI49GpL301t1qNd/X4fdLMoQE/2s="; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoHash = "sha256-stpJNDC+dQQNZdZTihbQWZ66wgdQ+oz8s3Ogb1wxnxY="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 2a1bb79b655ed..3e66621b57195 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.24.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+fOcFu52f2PiynF0B8r3zAW/ANypXx9inLnf4ZtwI2M="; + sha256 = "sha256-wkPBMFsPLJFfilKuA3bGNn7NtC+wsnXZf+qkVpF2fWc="; }; - vendorSha256 = "sha256-+43UegjFjh86vXjH1A4jbORk8xTDZaJRc41RhFPcESk="; + vendorHash = "sha256-U7RQPrvByTADC2/8O0cvcf0nmDgIeVkuyRGV0fpSCPk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index a5debadc8005f..57cf5e20bcd5a 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.7"; + version = "4.3.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-X5hZspl9IekhC8XXpZS285cmVZek2oxIV3tYOz/ZBec="; + sha256 = "sha256-2h9fVah0WZ8X0GsCLtiUWRan1Gkl4WBxuEQ3gx4FFBo="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 1cd83cda77a96..af2dbd1a9a4f9 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,18 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }: +{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }: stdenv.mkDerivation { pname = "rsstail"; version = "2.1"; src = fetchFromGitHub { - sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; - rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; - repo = "rsstail"; owner = "folkertvanheusden"; + repo = "rsstail"; + rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; + sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - nativeCheckInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" @@ -21,7 +20,8 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - doCheck = true; + # just runs cppcheck linter + doCheck = false; meta = with lib; { description = "Monitor RSS feeds for new entries"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { RSSTail is more or less an RSS reader: it monitors an RSS feed and if it detects a new entry it'll emit only that new entry. ''; - homepage = "http://www.vanheusden.com/rsstail/"; + homepage = "https://www.vanheusden.com/rsstail/"; license = licenses.gpl2Plus; maintainers = [ maintainers.Necior ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f14433b6c1799..fbb73dbd968bf 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.21"; + version = "3.5.27"; 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-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; + hash = "sha256-EeQs7WcNpnz2KrgUel9OF9pwW7WzKJrv5pvsZkV4RVg="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 5ef5feb3a16b0..b7e7ab2986552 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -14,13 +14,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.29"; + version = "12.1"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-UQ+CWqtcTwMGUTn6t3N+BkXs4qxddZtxDjcq7nz5F6U="; + hash = "sha256-KA3Bn8skJ2gMmihmwlUmN6jXZmfoYY/f4vqbKwvxwgw="; }; # Patches from ROSA Linux @@ -57,7 +57,7 @@ gcc12Stdenv.mkDerivation rec { wxGTK32 ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ # Undef g_object_ref on GLib 2.56+ "-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_54" "-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_54" diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 287e83ffa0500..60c928e0b9cc9 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.62.2"; + version = "3.63.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI="; + hash = "sha256-TgtcD3n0+LykuiHnE7qXuG1bRcRyPeZ7nBDSO/QXo38="; }; configureFlags = [ diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index b62bda3c469f9..20ef4e682c7e9 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/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 7e268e27f1a0f..ec9ca385e1ef8 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.18"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA="; + sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI="; + vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; 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 81062c1eb7c55..2367f847d1073 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/applications/networking/gossa/default.nix new file mode 100644 index 0000000000000..4a14571b23ffe --- /dev/null +++ b/pkgs/applications/networking/gossa/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + name = "gossa"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "pldubouilh"; + repo = "gossa"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-eMO9aoI+otGQcvBUJtxciQ7yhUidYizLrDjMVchH3qA="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + # Tests require a socket connection to be created. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/pldubouilh/gossa"; + description = "A fast and simple multimedia fileserver"; + license = licenses.mit; + maintainers = with maintainers; [ dsymbol ]; + }; +} diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 46394c107dec0..9a6dd217e5de7 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -3,19 +3,19 @@ }: stdenv.mkDerivation rec { - version = "2.9.18"; + version = "2.9.20"; pname = "snort"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; + sha256 = "sha256-KUAOE/U7GDHguLEOwSJKHLqm3BUzpTIqIN2Au4S0mBw="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 49b88c9fd680c..bf7626759b365 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.8"; + version = "6.0.10"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-JTzjzA35Z62TcdbqjU7tkexZPfPtBOCCKcfPhXgMkaM="; + sha256 = "sha256-Wb/Rv12cFZYib6SBW/dmQ85ZaYhmwQeiYmnEgfElxNc="; }; 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/ids/zeek/avoid-broken-tests.patch b/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch new file mode 100644 index 0000000000000..4784e6790fc3f --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch @@ -0,0 +1,16 @@ +diff --git a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt +index bafbabf1..0579f20a 100644 +--- a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt ++++ b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt +@@ -188,11 +188,3 @@ install_headers(include hilti) + install_headers(${PROJECT_BINARY_DIR}/include/hilti hilti) + install(CODE "file(REMOVE \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_INCLUDEDIR}/hilti/hilti\")" + )# Get rid of symlink. +- +-##### Tests +- +-add_executable(hilti-toolchain-tests tests/main.cc tests/id-base.cc tests/visitor.cc tests/util.cc) +-hilti_link_executable_in_tree(hilti-toolchain-tests PRIVATE) +-target_link_libraries(hilti-toolchain-tests PRIVATE doctest) +-target_compile_options(hilti-toolchain-tests PRIVATE "-Wall") +-add_test(NAME hilti-toolchain-tests COMMAND ${PROJECT_BINARY_DIR}/bin/hilti-toolchain-tests) diff --git a/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch b/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch new file mode 100644 index 0000000000000..07b95960ef857 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch @@ -0,0 +1,75 @@ +From 889ee4dd9e778511e2fb850e6467f55a331cded9 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sun, 13 Nov 2022 19:06:00 +0100 +Subject: [PATCH] Fix include path in exported CMake targets + +--- + CMakeLists.txt | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e22b77aa..77a15314 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,7 +209,6 @@ if (CAF_ROOT) + else() + find_package(CAF REQUIRED COMPONENTS openssl test io core net) + endif() +- list(APPEND LINK_LIBS CAF::core CAF::io CAF::net) + set(BROKER_USE_EXTERNAL_CAF ON) + else () + message(STATUS "Using bundled CAF") +@@ -243,22 +242,18 @@ endif () + + # Make sure there are no old header versions on disk. + install( +- CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")" +- CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")") ++ CODE "MESSAGE(STATUS \"Removing: ${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")" ++ CODE "file(REMOVE_RECURSE \"${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")") + + # Install all headers except the files from broker/internal. + install(DIRECTORY include/broker +- DESTINATION include ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + FILES_MATCHING PATTERN "*.hh" + PATTERN "include/broker/internal" EXCLUDE) + +-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) +- +-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) +- + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.hh.in + ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION include/broker) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/broker") + + if (NOT BROKER_EXTERNAL_SQLITE_TARGET) + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) +@@ -360,6 +355,11 @@ if (ENABLE_SHARED) + OUTPUT_NAME broker) + target_link_libraries(broker PUBLIC ${LINK_LIBS}) + target_link_libraries(broker PRIVATE CAF::core CAF::io CAF::net) ++ target_include_directories( ++ broker PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + install(TARGETS broker + EXPORT BrokerTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -373,6 +373,11 @@ if (ENABLE_STATIC) + endif() + target_link_libraries(broker_static PUBLIC ${LINK_LIBS}) + target_link_libraries(broker_static PRIVATE CAF::core CAF::io CAF::net) ++ target_include_directories( ++ broker_static PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + install(TARGETS broker_static + EXPORT BrokerTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.38.1 + diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix new file mode 100644 index 0000000000000..cb10e43933aa7 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, callPackage +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, caf +, openssl +}: +let + inherit (stdenv.hostPlatform) isStatic; + + src-cmake = fetchFromGitHub { + owner = "zeek"; + repo = "cmake"; + rev = "0b7a543554622600bc0a42b57a22f291a4fbd86c"; + hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY="; + }; + src-3rdparty = fetchFromGitHub { + owner = "zeek"; + repo = "zeek-3rdparty"; + rev = "eb87829547270eab13c223e6de58b25bc9a0282e"; + hash = "sha256-AVaKcRjF5ZiSR8aPSLBzSTeWVwGWW/aSyQJcN0Yhza0="; + }; + caf' = caf.overrideAttrs (old: { + version = "unstable-2022-11-17-zeek"; + src = fetchFromGitHub { + owner = "zeek"; + repo = "actor-framework"; + rev = "dbb68b4573736d7aeb69268cc73aa766c998b3dd"; + hash = "sha256-RV2mKF3B47h/hDgK/D1UJN/ll2G5rcPkHaLVY1/C/Pg="; + }; + checkPhase = '' + runHook preCheck + libcaf_core/caf-core-test + libcaf_io/caf-io-test + libcaf_openssl/caf-openssl-test + libcaf_net/caf-net-test --not-suites='net.*' + runHook postCheck + ''; + }); +in +stdenv.mkDerivation rec { + pname = "zeek-broker"; + version = "2.4.2"; + outputs = [ "out" "py" ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "broker"; + rev = "v${version}"; + hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k="; + }; + postUnpack = '' + rmdir $sourceRoot/cmake $sourceRoot/3rdparty + ln -s ${src-cmake} ''${sourceRoot}/cmake + ln -s ${src-3rdparty} ''${sourceRoot}/3rdparty + + # Refuses to build the bindings unless this file is present, but never + # actually uses it. + touch $sourceRoot/bindings/python/3rdparty/pybind11/CMakeLists.txt + ''; + + patches = [ + ./0001-Fix-include-path-in-exported-CMake-targets.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl python3.pkgs.pybind11 ]; + propagatedBuildInputs = [ caf' ]; + + cmakeFlags = [ + "-DCAF_ROOT=${caf'}" + "-DENABLE_STATIC_ONLY:BOOL=${if isStatic then "ON" else "OFF"}" + "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" + ]; + + meta = with lib; { + description = "Zeek's Messaging Library"; + homepage = "https://github.com/zeek/broker"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch b/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch new file mode 100644 index 0000000000000..18aef601325dc --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch @@ -0,0 +1,26 @@ +diff --git a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt +index f154901c..76563717 100644 +--- a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt ++++ b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt +@@ -69,7 +69,7 @@ target_compile_definitions(hilti-rt-objects PRIVATE "HILTI_RT_BUILD_TYPE_RELEASE + # Build hilti-rt-debug with debug flags. + string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) + target_compile_options(hilti-rt-debug-objects PRIVATE ${cxx_flags_debug}) +-target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") ++target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") + target_compile_definitions(hilti-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") + + add_library(hilti-rt-tests-library-dummy1 SHARED src/tests/library-dummy.cc) +diff --git a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt +index 20e7d291..9712341f 100644 +--- a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt ++++ b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt +@@ -48,7 +48,7 @@ target_link_libraries(spicy-rt-objects PUBLIC hilti-rt-objects) + # Build spicy-rt-debug with debug flags. + string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) + target_compile_options(spicy-rt-debug-objects PRIVATE ${cxx_flags_debug}) +-target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") ++target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") + target_compile_definitions(spicy-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") + target_link_libraries(spicy-rt-debug-objects PUBLIC hilti-rt-debug-objects) + diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index ddeb03698e953..0bacf8ce03c4c 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,10 +1,13 @@ { lib , stdenv +, callPackage , fetchurl , cmake , flex , bison +, spicy-parser-generator , openssl +, libkqueue , libpcap , zlib , file @@ -16,46 +19,69 @@ , gettext , coreutils , ncurses -, caf }: +let + broker = callPackage ./broker { }; +in stdenv.mkDerivation rec { pname = "zeek"; - version = "4.2.2"; + version = "5.1.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw="; + sha256 = "sha256-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU="; }; + strictDeps = true; + + patches = [ + ./avoid-broken-tests.patch + ./debug-runtime-undef-fortify-source.patch + ./fix-installation.patch + ]; + nativeBuildInputs = [ bison cmake file flex + python3 ]; buildInputs = [ + broker + spicy-parser-generator curl gperftools + libkqueue libmaxminddb libpcap ncurses openssl - python3 swig zlib ] ++ lib.optionals stdenv.isDarwin [ gettext ]; - outputs = [ "out" "lib" "py" ]; + postPatch = '' + patchShebangs ./auxil/spicy/spicy/scripts + + substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" "" + substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" "" + ''; cmakeFlags = [ - "-DCAF_ROOT=${caf}" - "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages" + "-DBroker_ROOT=${broker}" + "-DSPICY_ROOT_DIR=${spicy-parser-generator}" + "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" + "-DZEEK_ETC_INSTALL_DIR=/etc/zeek" + "-DZEEK_LOG_DIR=/var/log/zeek" + "-DZEEK_STATE_DIR=/var/lib/zeek" + "-DZEEK_SPOOL_DIR=/var/spool/zeek" ]; postInstall = '' @@ -70,6 +96,10 @@ stdenv.mkDerivation rec { done ''; + passthru = { + inherit broker; + }; + meta = with lib; { description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; diff --git a/pkgs/applications/networking/ids/zeek/fix-installation.patch b/pkgs/applications/networking/ids/zeek/fix-installation.patch new file mode 100644 index 0000000000000..6360a11730517 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/fix-installation.patch @@ -0,0 +1,28 @@ +From f8c42a712db42cfd00fca75be2ce63c3aad2aad1 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sun, 13 Nov 2022 21:48:36 +0100 +Subject: [PATCH] Fix installation + +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b65efd..d8b0be169 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,11 +81,6 @@ if ( NOT ZEEK_LOG_DIR ) + set(ZEEK_LOG_DIR ${ZEEK_ROOT_DIR}/logs) + endif () + +-install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR}) +- + configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) + execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + "${CMAKE_CURRENT_BINARY_DIR}/zeek-wrapper.in" +-- +2.37.3 + diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 0c43ffbeea916..6926035588042 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -33,11 +33,13 @@ , systemd , xdg-utils , xorg +, wayland +, pipewire }: stdenv.mkDerivation rec { pname = "armcord"; - version = "3.1.4"; + version = "3.1.6"; src = let @@ -46,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k="; + sha256 = "sha256-xCwAkRtsFmGOIyCftjNqUsaw7/PcxSgWGqW/D1NhC5M="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928="; + sha256 = "sha256-ka8hwHhMVTXNS1rktTs3yXfXnyxSmRt41IE8z/ftUVc="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -97,6 +99,8 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver xorg.libxshmfence xorg.libXtst + wayland + pipewire ]; sourceRoot = "."; @@ -114,9 +118,9 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - "''${gappsWrapperArgs[@]}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} # Fix desktop link substituteInPlace $out/share/applications/armcord.desktop \ diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index f9756594c5cce..f76a4c984d5ed 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -107,7 +107,9 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index 67edd3d1b2748..8613a2585e2c8 100644 --- a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.3.1-beta"; + version = "0.4.0-beta"; src = fetchurl { - url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar"; - sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d"; + url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar"; + hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw="; }; dontUnpack = true; @@ -58,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/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index da4e41bed5852..1c5c35248d590 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.7.0_rc5"; + version = "0.7.0"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-5V0ApHxsJaQ0MBhMlv1IxnD9Vq+Yw85jFvlvghhFxNI="; + hash = "sha256-e3lYzQjQx1ndomq4mJ8TmwXoUG3Bjl9JrLuTmjXmRCs="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index d0679a07e024c..142bd5e38272f 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.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-siEAIZ9cCIJZTkeZkvT5yrPjRGoOl7vjU98AUrhgJNw="; + 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 e9ae4556588f8..807444696f08f 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.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE="; + 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 bd3d75bd66bbf..f4eb47428b5bb 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_18 +, electron_22 , buildGoModule , esbuild , fetchFromGitHub @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.106.0"; + version = "1.107.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; }; }); esbuild' = esbuild.override { @@ -48,16 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.2"; + version = "1.34.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco="; + hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E="; }; - npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M="; + npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U="; nativeBuildInputs = [ makeWrapper @@ -105,7 +105,7 @@ in buildNpmPackage 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 @@ -129,8 +129,6 @@ in buildNpmPackage rec { ]; }); - 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/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh deleted file mode 100755 index f31279cf4f0ea..0000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps - -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) -hash=$(prefetch-npm-deps $src/package-lock.json) -sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 72e546286bf5a..d9288c4a44645 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,37 +1,48 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking -, xorg, libXdmcp, libxkbcommon +, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking +, libadwaita , libnotify, libsoup, libgee -, librsvg, libsignal-protocol-c +, libsignal-protocol-c , libgcrypt -, libepoxy -, at-spi2-core , sqlite -, dbus , gpgme -, pcre +, pcre2 , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing - }: +, srtp +, libnice +, gnutls +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-vaapi +, webrtc-audio-processing +}: stdenv.mkDerivation rec { pname = "dino"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s="; + sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ="; }; + postPatch = '' + # don't overwrite manually set version information + substituteInPlace CMakeLists.txt \ + --replace "include(ComputeVersion)" "" + ''; + nativeBuildInputs = [ vala cmake - ninja + ninja # https://github.com/dino/dino/issues/230 pkg-config wrapGAppsHook gettext @@ -40,40 +51,45 @@ stdenv.mkDerivation rec { buildInputs = [ qrencode gobject-introspection - glib-networking glib + glib-networking # required for TLS support + libadwaita libgee - gnome.adwaita-icon-theme sqlite gdk-pixbuf - gtk3 + gtk4 libnotify gpgme libgcrypt libsoup - pcre - libepoxy - at-spi2-core - dbus + pcre2 icu libsignal-protocol-c - librsvg gspell srtp libnice gnutls gstreamer gst-plugins-base - gst-plugins-good + gst-plugins-good # contains rtpbin, required for VP9 + gst-plugins-bad # required for H264, MSDK + gst-vaapi # required for VAAPI webrtc-audio-processing - ] ++ lib.optionals (!stdenv.isDarwin) [ - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon ]; - cmakeFlags = ["-DBUILD_TESTS=yes"]; + cmakeFlags = [ + "-DBUILD_TESTS=true" + "-DRTP_ENABLE_H264=true" + "-DRTP_ENABLE_MSDK=true" + "-DRTP_ENABLE_VAAPI=true" + "-DRTP_ENABLE_VP9=true" + "-DVERSION_FOUND=true" + "-DVERSION_IS_RELEASE=true" + "-DVERSION_FULL=${version}" + ]; + + # Undefined symbols for architecture arm64: "_gpg_strerror" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; doCheck = true; checkPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a6d7bf7276e38..8777bd2495456 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.24"; - ptb = "0.0.38"; - canary = "0.0.145"; + stable = "0.0.25"; + ptb = "0.0.39"; + canary = "0.0.148"; } 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 = "sha256-SG+34ft0mTqtg9rFiI60N6JIONyqF8c8SlnRcn5a4Xc="; + sha256 = "sha256-WBcmy9fwGPq3Vs1+7lIOR7OiW/d0kZNIKp4Q5NRYBCw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s="; + sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU="; + sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 362d7a096bfb2..6e462ef24dbe1 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo -, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: +, pkg-config, libsecret, xcbuild, Security, AppKit, fetchNpmDeps, npmHooks }: let pinData = lib.importJSON ./pin.json; @@ -15,39 +15,26 @@ in stdenv.mkDerivation rec { sha256 = pinData.srcHash; }; - nativeBuildInputs = [ nodejs python3 yarn pkg-config ] + nativeBuildInputs = [ + nodejs python3 pkg-config + npmHooks.npmConfigHook + ] ++ lib.optional stdenv.isDarwin xcbuild; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; - npm_config_nodedir = nodejs; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - sha256 = pinData.yarnHash; + npmDeps = fetchNpmDeps { + inherit src; + hash = pinData.npmHash; }; - buildPhase = '' - runHook preBuild - cp ${./yarn.lock} ./yarn.lock - chmod u+w . ./yarn.lock - export HOME=$PWD/tmp - mkdir -p $HOME - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - node_modules/.bin/node-gyp rebuild - runHook postBuild - ''; - doCheck = false; installPhase = '' runHook preInstall shopt -s extglob rm -rf node_modules - rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/pkgs/applications/networking/instant-messengers/element/keytar/pin.json index fa2e95d4e1a07..dc7420ab45435 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/keytar/pin.json @@ -1,5 +1,5 @@ { - "version": "7.7.0", - "srcHash": "sd6h+vDJGvmXFhOm4MDAljb4dAOMBB8W1IL7JSfJWyo=", - "yarnHash": "1m75hvl06mcj260hicbmv75p94h73gw5d24zpm5wxwc0q8v8wzfl" + "version": "7.9.0", + "srcHash": "Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", + "npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY=" } diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index d18cc7d0e8bf8..0ddfa02472639 100755 --- a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn +#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the keytar package." @@ -22,10 +22,8 @@ SRC="https://raw.githubusercontent.com/atom/node-keytar/v$version" wget "$SRC/package-lock.json" wget "$SRC/package.json" -rm -f yarn.lock -yarn import +npm_hash=$(prefetch-npm-deps package-lock.json) rm -rf node_modules package.json package-lock.json -yarn_hash=$(prefetch-yarn-deps yarn.lock) src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256) @@ -33,6 +31,6 @@ cat > pin.json << EOF { "version": "$version", "srcHash": "$src_hash", - "yarnHash": "$yarn_hash" + "npmHash": "$npm_hash" } EOF diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock deleted file mode 100644 index 5a3abec6ded8c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock +++ /dev/null @@ -1,2531 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -abbrev@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" - integrity sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8= - -after@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - -ajv@^6.12.3: - version "6.12.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" - integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== - 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" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - -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" - -ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - -anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" - integrity sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw== - -are-we-there-yet@~1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c" - integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.0 || ^1.1.13" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -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== - -array-index@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" - integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= - dependencies: - debug "^2.2.0" - es6-symbol "^3.0.2" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= - -assert-plus@1.0.0, 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= - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" - integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0, babel-core@^6.26.3: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= - -babel-plugin-transform-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" - integrity sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.10.0" - -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.24.1: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e" - integrity sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4= - dependencies: - babel-runtime "^6.22.0" - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^1.0.1" - -babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -big-integer@^1.6.17: - version "1.6.48" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" - integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -binary@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - -bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bl@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== - dependencies: - readable-stream "^3.0.1" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - -bluebird@^3: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -bluebird@~3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI= - 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" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== - -buffer-indexof-polyfill@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" - integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== - -buffer-shims@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" - integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= - -camelcase@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= - -camelcase@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chai@^4.2.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49" - integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^3.0.1" - get-func-name "^2.0.0" - pathval "^1.1.1" - type-detect "^4.0.5" - -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= - dependencies: - traverse ">=0.3.0 <0.4" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - 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" - -chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= - -chokidar@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cmake-js@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz#6d72014269a5d23a754a6d170cde9ed2d75eb411" - integrity sha512-/HLhzoBEOLKGdE1FLwH5ggzRt67AWTb4IErg4rm+bTC+R0DKUobojDyp17dSswDVPosdoPmHXjKxbJiyBZfQeg== - dependencies: - bluebird "^3" - debug "^4" - fs-extra "^5.0.0" - is-iojs "^1.0.1" - lodash "^4" - memory-stream "0" - npmlog "^1.2.0" - rc "^1.2.7" - request "^2.54.0" - semver "^5.0.3" - splitargs "0" - tar "^4" - traceur "0.0.x" - unzipper "^0.8.13" - url-join "0" - which "^1.0.9" - yargs "^3.6.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -color-convert@^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.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@~0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" - integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@2.9.x, 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.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz#175ad4b9317f3ff615f201c1e57224f55a3e91df" - integrity sha1-F1rUuTF/P/YV8gHB5XIk9Vo+kd8= - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU= - -core-js@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" - integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4= - -core-js@^2.5.0: - version "2.5.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" - integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw== - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -d@1, d@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" - integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== - dependencies: - es5-ext "^0.10.50" - type "^1.0.1" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -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@^4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - -decamelize@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== - dependencies: - type-detect "^4.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -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= - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -duplexer2@~0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= - dependencies: - readable-stream "~1.1.9" - -duplexer2@~0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= - dependencies: - readable-stream "^2.0.2" - -each-series-async@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" - integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU= - dependencies: - jsbn "~0.1.0" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== - -es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" - -es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" - integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== - dependencies: - d "^1.0.1" - ext "^1.1.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-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== - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= - -execspawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" - integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= - dependencies: - util-extend "^1.0.1" - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== - dependencies: - type "^2.0.0" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extsprintf@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" - integrity sha1-4QgOBljjALBilJkMxw4VAiNf1VA= - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@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@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - -fs-minipass@^2.0.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= - -fsevents@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.10: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~1.2.0, gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -ghreleases@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" - integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== - dependencies: - after "~0.8.1" - ghrepos "~2.1.0" - ghutils "~3.2.0" - lodash.uniq "^4.5.0" - simple-mime "~0.1.0" - url-template "~2.0.6" - -ghrepos@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" - integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== - dependencies: - ghutils "~3.2.0" - -ghutils@~3.2.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" - integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== - dependencies: - jsonist "~2.1.0" - xtend "~4.0.1" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -glob-parent@~5.1.0: - 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@3 || 4 || 5 || 6 || 7", glob@7.1.6, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - 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" - -glob@5.0.x: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2, graceful-fs@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== - -"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= - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -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-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -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== - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -hyperquest@~2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" - integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== - dependencies: - buffer-from "^0.1.1" - duplexer2 "~0.0.2" - through2 "~0.6.3" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -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@~1.3.0: - version "1.3.7" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" - integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== - -invariant@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" - integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A= - dependencies: - loose-envify "^1.0.0" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-iojs@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz#4c11033b5d5d94d6eab3775dedc9be7d008325f1" - integrity sha1-TBEDO11dlNbqs3dd7cm+fQCDJfE= - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -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= - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsonist@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz#c1377311e8fc857abe7aa3df197116a911f95324" - integrity sha512-8yqmWJAC2VaYoSKQAbsfgCpGY5o/1etWzx6ZxaZrC4iGaHrHUZEo+a2MyF8w+2uTavTlHdLWaZUoR19UfBstxQ== - dependencies: - bl "~3.0.0" - hyperquest "~2.1.3" - json-stringify-safe "~5.0.1" - xtend "~4.0.1" - -jsprim@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" - integrity sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg= - dependencies: - assert-plus "1.0.0" - extsprintf "1.0.2" - json-schema "0.2.3" - verror "1.3.6" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - -listenercount@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" - integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= - -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.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4, lodash@^4.17.4, lodash@^4.2.0: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== - -log-symbols@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== - dependencies: - chalk "^4.0.0" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg= - dependencies: - js-tokens "^3.0.0" - -memory-stream@0: - version "0.0.3" - resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz#ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f" - integrity sha1-6+jdHDuLw4wOeUHp3dWuvmtN6D8= - dependencies: - readable-stream "~1.0.26-2" - -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== - dependencies: - mime-db "1.44.0" - -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - -"minimatch@2 || 3", minimatch@3, minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minipass@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== - dependencies: - yallist "^4.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - -minizlib@^2.1.1: - 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-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mocha@^8.0.1: - version "8.3.2" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" - integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.1" - debug "4.3.1" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.1.6" - growl "1.10.5" - he "1.2.0" - js-yaml "4.0.0" - log-symbols "4.0.0" - minimatch "3.0.4" - ms "2.1.3" - nanoid "3.1.20" - serialize-javascript "5.0.1" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - wide-align "1.1.3" - workerpool "6.1.0" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - -node-abi@^2.2.0, node-abi@^2.21.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48" - integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg== - dependencies: - semver "^5.4.1" - -node-addon-api@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239" - integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw== - -node-cpplint@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-cpplint/-/node-cpplint-0.4.0.tgz#35827fe7b95ccceff0cd7f46ede4cba44b8ef88c" - integrity sha1-NYJ/57lczO/wzX9G7eTLpEuO+Iw= - dependencies: - colors "~0.6.2" - commander "~2.2.0" - -node-gyp@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" - integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.2" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.1.2" - request "^2.88.0" - rimraf "^2.6.3" - semver "^5.7.1" - tar "^4.4.12" - which "^1.3.1" - -node-gyp@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - -node-ninja@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" - integrity sha1-IKCeV7kuLfWRmT1L8JisPnJwYrY= - dependencies: - fstream "^1.0.0" - glob "3 || 4 || 5 || 6 || 7" - graceful-fs "^4.1.2" - minimatch "3" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2" - osenv "0" - path-array "^1.0.0" - request "2" - rimraf "2" - semver "2.x || 3.x || 4 || 5" - tar "^2.0.0" - which "1" - -noop-logger@^0.1.0, noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-path@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" - integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== - dependencies: - which "^1.2.10" - -npm-which@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" - integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= - dependencies: - commander "^2.9.0" - npm-path "^2.0.2" - which "^1.2.10" - -"npmlog@0 || 1 || 2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -npmlog@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6" - integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY= - dependencies: - ansi "~0.3.0" - are-we-there-yet "~1.0.0" - gauge "~1.2.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -nw-gyp@^3.6.3: - version "3.6.5" - resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.5.tgz#ccce42182229e44e7689da70675b4b8dd0ab0ab3" - integrity sha512-vYrOIYJEKpq9CfaHuiqEjV1rBYgr6uaUrPhPRiznb91LujkAUqGhQ5QqDC1bLdd+zo9jf2H0Zkl2M5zQB7+CuQ== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@0, osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^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" - -path-array@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" - integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= - dependencies: - array-index "^1.0.0" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -pathval@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -prebuild-install@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.1.tgz#6754fa6c0d55eced7f9e14408ff9e4cba6f097b4" - integrity sha512-M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.21.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.1.tgz#9d46a00f42b60ad1718479cc5e3d1ef4882b7f33" - integrity sha512-x0CkKDmHFwX49rTGEYJwB9jBQwJWxRzwUtP5PA9dP8khFGMm3oSFgYortxdlp0PkxB29EhWGp/KQE5g+adehYg== - dependencies: - cmake-js "~5.2.0" - detect-libc "^1.0.3" - each-series-async "^1.0.1" - execspawn "^1.0.1" - ghreleases "^3.0.2" - github-from-package "0.0.0" - glob "^7.1.6" - minimist "^1.1.2" - mkdirp "^0.5.1" - napi-build-utils "^1.0.1" - node-abi "^2.2.0" - node-gyp "^6.0.1" - node-ninja "^1.0.1" - noop-logger "^0.1.0" - npm-which "^3.0.1" - npmlog "^4.0.1" - nw-gyp "^3.6.3" - rc "^1.0.3" - run-waterfall "^1.1.6" - tar-stream "^2.1.0" - -private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - -psl@^1.1.28: - version "1.1.29" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" - integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -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" - -rc@^1.0.3, rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26-2: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.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" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== - dependencies: - picomatch "^2.2.1" - -regenerator-runtime@^0.10.0: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - dependencies: - is-finite "^1.0.0" - -request@2, request@^2.54.0, request@^2.88.0, request@^2.88.2: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - 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" - -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= - -rimraf@2, rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -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" - -rsvp@^3.0.13: - version "3.6.2" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" - integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== - -run-waterfall@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz#ae368b549b2f5171f86c2924492cab3352a6e9c5" - integrity sha512-iFPgh7SatHXOG1ClcpdwHI63geV3Hc/iL6crGSyBlH2PY7Rm/za+zoKz6FfY/Qlw5K7JwSol8pseO8fN6CMhhQ== - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - -safe-buffer@^5.1.2, 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.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -"semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^4.3.3: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= - -semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -serialize-javascript@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== - 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 sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -setimmediate@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-mime@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" - integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - -source-map-support@~0.2.8: - version "0.2.10" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" - integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w= - dependencies: - source-map "0.1.32" - -source-map@0.1.32: - version "0.1.32" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" - integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -splitargs@0: - version "0.0.7" - resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b" - integrity sha1-/p965lc3GzOxDLgNoUPPgknPazs= - -sshpk@^1.7.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" - integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg= - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - safer-buffer "^2.0.2" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -string-width@^1.0.1, string-width@^1.0.2, "string-width@^1.0.2 || 2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-json-comments@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -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" - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.0, tar-stream@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" - integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== - 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" - -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - -tar@^4, tar@^4.4.12: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - -tar@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" - integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== - 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" - -through2@~0.6.3: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= - -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" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -traceur@0.0.x: - version "0.0.111" - resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz#c04de74d14696c3373427de4fc08ecaf913fc3a1" - integrity sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E= - dependencies: - commander "2.9.x" - glob "5.0.x" - rsvp "^3.0.13" - semver "^4.3.3" - source-map-support "~0.2.8" - -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-detect@^4.0.0, type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" - integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== - -type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== - -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== - -unzipper@^0.8.13: - version "0.8.14" - resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b" - integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w== - dependencies: - big-integer "^1.6.17" - binary "~0.3.0" - bluebird "~3.4.1" - buffer-indexof-polyfill "~1.0.0" - duplexer2 "~0.1.4" - fstream "~1.0.10" - listenercount "~1.0.1" - readable-stream "~2.1.5" - setimmediate "~1.0.4" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== - dependencies: - punycode "^2.1.0" - -url-join@0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" - integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= - -url-template@~2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= - -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= - -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= - -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -verror@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" - integrity sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw= - dependencies: - extsprintf "1.0.2" - -which@1, which@^1.0.9, which@^1.2.10, 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.2, 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" - -wide-align@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - integrity sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w== - dependencies: - string-width "^1.0.2" - -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= - -workerpool@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" - integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -"xtend@>=4.0.0 <4.1.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== - -y18n@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== - -y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== - -yallist@^3.0.0, yallist@^3.0.3: - 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.4, yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^3.6.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.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/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index cc0578f71fec9..bf1458c264ebf 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.20", - "desktopSrcHash": "mlB2UvRYzaJ6FWGDOqyZY6NTY7QoWCiCvmFDyWTPuMQ=", - "desktopYarnHash": "0ccwsy9ma7sn6d5f9jfv40dhj0y6aax8msx9bihjdmx989nkkh2m", - "webSrcHash": "55oLS89Pmy4d7DhBQc4i6boQIH2LgujE7kl6QwcKltw=", - "webYarnHash": "1aiq5wvb8cz2a5rc0h11s16fnyak0p9zhzbqwhf1rs6c1gav7777" + "version": "1.11.23", + "desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=", + "desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=", + "webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=", + "webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU=" } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/pkgs/applications/networking/instant-messengers/element/seshat/pin.json index fdb5afe67a25b..78d5156f54a4b 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/seshat/pin.json @@ -1,6 +1,6 @@ { - "version": "2.3.0", - "srcHash": "JyqtM1CCRgxAAdhgQYaIUYPnxEcDrlW1SjDCmsrPL34=", - "yarnHash": "0bym6i1f0i3bs4fncbiwzwmbxp7j14rz1v4kyvsl02qs97qw1jac", - "cargoHash": "sha256-EjtH96SC2kgan631+wlu9LStGKm6ljCR4x3/WpCTS0E=" + "version": "2.3.3", + "srcHash": "HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", + "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp", + "cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU=" } diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index b02e1d022393e..976b6cb0ba8fc 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/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix new file mode 100644 index 0000000000000..a30bfa2dcb02a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, protobuf +, libsecret +, libadwaita +, rustPlatform +, desktop-file-utils +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "flare"; + version = "0.6.0"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "Schmiddiii"; + repo = pname; + rev = version; + hash = "sha256-wY95sXWGDjEy8vvP79XliJOn5GQkAvDmOXKmRz0TPEw="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-J3MGQlPYGjhZKH599vfW2WhkXx+Tdr53PviiVpye4R0="; + }; + + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + libadwaita + libsecret + protobuf + ]; + + meta = { + changelog = "https://gitlab.com/Schmiddiii/flare/-/blob/${src.rev}/CHANGELOG.md"; + description = "An unofficial Signal GTK client"; + homepage = "https://gitlab.com/Schmiddiii/flare"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ dotlambda tomfitzhenry ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index 9203850b63882..360234ba3c699 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # 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" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { description = "Matrix group messaging app (development version)"; diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix deleted file mode 100644 index f76d9ee9f12a2..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/client.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ version -, src -, jami-meta -, lib -, stdenv -, pkg-config -, cmake -, networkmanager # for libnm -, python3 -, qttools # for translations -, wrapQtAppsHook -, ffmpeg-jami -, jami-daemon -, libnotify -, qt5compat -, qtbase -, qtdeclarative -, qrencode -, qtmultimedia -, qtnetworkauth -, qtsvg -, qtwebengine -, qtwebchannel -, withWebengine ? true -}: - -stdenv.mkDerivation { - pname = "jami-client"; - inherit version src; - - sourceRoot = "source/client-qt"; - - preConfigure = '' - echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h - ''; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - cmake - python3 - qttools - ]; - - buildInputs = [ - ffmpeg-jami - jami-daemon - libnotify - networkmanager - qtbase - qt5compat - qrencode - qtnetworkauth - qtdeclarative - qtmultimedia - qtsvg - qtwebchannel - ] ++ lib.optionals withWebengine [ - qtwebengine - ]; - - cmakeFlags = [ - "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" - "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" - ] ++ lib.optionals (!withWebengine) [ - "-DWITH_WEBENGINE=false" - ]; - - qtWrapperArgs = [ - # With wayland the titlebar is not themed and the wmclass is wrong. - "--set-default QT_QPA_PLATFORM xcb" - ]; - - meta = jami-meta // { - description = "The client based on QT" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common deleted file mode 100644 index 0aac24e24bb67..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common +++ /dev/null @@ -1,156 +0,0 @@ ---disable-everything ---enable-zlib ---enable-gpl ---enable-swscale ---enable-bsfs ---disable-filters ---disable-programs ---disable-postproc ---disable-protocols ---enable-protocol=crypto ---enable-protocol=file ---enable-protocol=rtp ---enable-protocol=srtp ---enable-protocol=tcp ---enable-protocol=udp ---enable-protocol=unix ---enable-protocol=pipe ---disable-demuxers ---disable-muxers ---enable-muxer=rtp ---enable-muxer=g722 ---enable-muxer=g723_1 ---enable-muxer=g726 ---enable-muxer=g726le ---enable-muxer=h263 ---enable-muxer=h264 ---enable-muxer=hevc ---enable-muxer=matroska ---enable-muxer=webm ---enable-muxer=ogg ---enable-muxer=pcm_s16be ---enable-muxer=pcm_s16le ---enable-demuxer=rtp ---enable-demuxer=mjpeg ---enable-demuxer=mjpeg_2000 ---enable-demuxer=mpegvideo ---enable-demuxer=gif ---enable-demuxer=image_jpeg_pipe ---enable-demuxer=image_png_pipe ---enable-demuxer=image_webp_pipe ---enable-demuxer=matroska ---enable-demuxer=m4v ---enable-demuxer=mp3 ---enable-demuxer=ogg ---enable-demuxer=flac ---enable-demuxer=wav ---enable-demuxer=ac3 ---enable-demuxer=g722 ---enable-demuxer=g723_1 ---enable-demuxer=g726 ---enable-demuxer=g726le ---enable-demuxer=pcm_mulaw ---enable-demuxer=pcm_alaw ---enable-demuxer=pcm_s16be ---enable-demuxer=pcm_s16le ---enable-demuxer=h263 ---enable-demuxer=h264 ---enable-demuxer=hevc ---enable-parser=h263 ---enable-parser=h264 ---enable-parser=hevc ---enable-parser=mpeg4video ---enable-parser=vp8 ---enable-parser=vp9 ---enable-parser=opus ---enable-encoder=adpcm_g722 ---enable-decoder=adpcm_g722 ---enable-encoder=adpcm_g726 ---enable-decoder=adpcm_g726 ---enable-encoder=adpcm_g726le ---enable-decoder=adpcm_g726le ---enable-decoder=g729 ---enable-encoder=g723_1 ---enable-decoder=g723_1 ---enable-encoder=rawvideo ---enable-decoder=rawvideo ---enable-encoder=libx264 ---enable-decoder=h264 ---enable-encoder=pcm_alaw ---enable-decoder=pcm_alaw ---enable-encoder=pcm_mulaw ---enable-decoder=pcm_mulaw ---enable-encoder=mpeg4 ---enable-decoder=mpeg4 ---enable-encoder=libvpx_vp8 ---enable-decoder=vp8 ---enable-decoder=vp9 ---enable-encoder=h263 ---enable-encoder=h263p ---enable-decoder=h263 ---enable-encoder=mjpeg ---enable-decoder=mjpeg ---enable-decoder=mjpegb ---enable-libspeex ---enable-libopus ---enable-libvpx ---enable-libx264 ---enable-encoder=libspeex ---enable-decoder=libspeex ---enable-encoder=libopus ---enable-decoder=libopus ---enable-decoder=flac ---enable-decoder=vorbis ---enable-decoder=aac ---enable-decoder=ac3 ---enable-decoder=eac3 ---enable-decoder=mp3 ---enable-decoder=pcm_u24be ---enable-decoder=pcm_u24le ---enable-decoder=pcm_u32be ---enable-decoder=pcm_u32le ---enable-decoder=pcm_u8 ---enable-decoder=pcm_f16le ---enable-decoder=pcm_f24le ---enable-decoder=pcm_f32be ---enable-decoder=pcm_f32le ---enable-decoder=pcm_f64be ---enable-decoder=pcm_f64le ---enable-decoder=pcm_s16be ---enable-decoder=pcm_s16be_planar ---enable-decoder=pcm_s16le ---enable-decoder=pcm_s16le_planar ---enable-decoder=pcm_s24be ---enable-decoder=pcm_s24le ---enable-decoder=pcm_s24le_planar ---enable-decoder=pcm_s32be ---enable-decoder=pcm_s32le ---enable-decoder=pcm_s32le_planar ---enable-decoder=pcm_s64be ---enable-decoder=pcm_s64le ---enable-decoder=pcm_s8 ---enable-decoder=pcm_s8_planar ---enable-decoder=pcm_u16be ---enable-decoder=pcm_u16le ---enable-encoder=gif ---enable-decoder=gif ---enable-encoder=jpegls ---enable-decoder=jpegls ---enable-encoder=ljpeg ---enable-decoder=jpeg2000 ---enable-encoder=png ---enable-decoder=png ---enable-encoder=bmp ---enable-decoder=bmp ---enable-encoder=tiff ---enable-decoder=tiff ---enable-filter=scale ---enable-filter=overlay ---enable-filter=amix ---enable-filter=amerge ---enable-filter=aresample ---enable-filter=format ---enable-filter=aformat ---enable-filter=fps ---enable-filter=transpose ---enable-filter=pad diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux deleted file mode 100644 index 6c40e8d2ea994..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux +++ /dev/null @@ -1,18 +0,0 @@ ---enable-pic ---target-os=linux ---enable-indev=v4l2 ---enable-indev=xcbgrab ---enable-vdpau ---enable-hwaccel=h264_vdpau ---enable-hwaccel=mpeg4_vdpau ---enable-vaapi ---enable-hwaccel=h264_vaapi ---enable-hwaccel=mpeg4_vaapi ---enable-hwaccel=h263_vaapi ---enable-hwaccel=vp8_vaapi ---enable-hwaccel=mjpeg_vaapi ---enable-hwaccel=hevc_vaapi ---enable-encoder=h264_vaapi ---enable-encoder=vp8_vaapi ---enable-encoder=mjpeg_vaapi ---enable-encoder=hevc_vaapi diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 deleted file mode 100644 index 2043aa3ee2d3c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 +++ /dev/null @@ -1,10 +0,0 @@ ---enable-cuvid ---enable-ffnvcodec ---enable-nvdec ---enable-nvenc ---enable-hwaccel=h264_nvdec ---enable-hwaccel=hevc_nvdec ---enable-hwaccel=vp8_nvdec ---enable-hwaccel=mjpeg_nvdec ---enable-encoder=h264_nvenc ---enable-encoder=hevc_nvenc diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches deleted file mode 100644 index 28f884e66769d..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches +++ /dev/null @@ -1,7 +0,0 @@ -remove-mjpeg-log.patch -change-RTCP-ratio.patch -rtp_ext_abs_send_time.patch -libopusdec-enable-FEC.patch -libopusenc-reload-packet-loss-at-encode.patch -ios-disable-b-frames.patch -screen-sharing-x11-fix.patch diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix deleted file mode 100644 index 131ca7b913c06..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ src -, version -, jami-meta -, stdenv -, autoreconfHook -, pkg-config -, perl # for pod2man -, alsa-lib -, asio -, dbus -, dbus_cplusplus -, ffmpeg-jami -, fmt -, gmp -, gnutls -, http-parser -, jack -, jsoncpp -, libarchive -, libgit2 -, libnatpmp -, libpulseaudio -, libupnp -, libyamlcpp -, msgpack -, opendht-jami -, openssl -, pjsip-jami -, restinio -, secp256k1 -, speex -, udev -, webrtc-audio-processing -, zlib -}: - -stdenv.mkDerivation { - pname = "jami-daemon"; - inherit src version; - sourceRoot = "source/daemon"; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - perl - ]; - - buildInputs = [ - alsa-lib - asio - dbus - dbus_cplusplus - fmt - ffmpeg-jami - gmp - gnutls - http-parser - jack - jsoncpp - libarchive - libgit2 - libnatpmp - libpulseaudio - libupnp - libyamlcpp - msgpack - opendht-jami - openssl - pjsip-jami - restinio - secp256k1 - speex - udev - webrtc-audio-processing - zlib - ]; - - doCheck = false; # The tests fail to compile due to missing headers. - - enableParallelBuilding = true; - - passthru = { - updateScript = ./update.sh; - }; - - meta = jami-meta // { - description = "The daemon" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ea898c0da8c9d..1c9f581d463b3 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,99 +1,95 @@ { stdenv , lib -, callPackage -, fetchFromGitHub -, fetchzip -, fetchpatch +, pkg-config +, fetchFromGitLab +, gitUpdater , ffmpeg_5 -, pjsip -, opendht + +# for daemon +, autoreconfHook +, perl # for pod2man +, alsa-lib +, asio +, dbus +, dbus_cplusplus +, fmt +, gmp +, gnutls +, http-parser , jack +, jsoncpp +, libarchive +, libgit2 +, libnatpmp +, libpulseaudio +, libupnp +, yaml-cpp +, msgpack +, openssl +, restinio +, secp256k1 +, speex , udev -, qt6Packages -}: +, webrtc-audio-processing +, zlib -let - version = "20221220.0956.79e1207"; - - src = fetchzip { - url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-AQgz2GqueFG+yK42zJ9MzvP4BddGt0BFb+cIoA6Fif8="; - - stripRoot = false; - postFetch = '' - cd $out - mv jami-project/daemon ./ - mv jami-project/client-qt ./ - mv jami-project/COPYING ./ - rm -r jami-project.rst jami-project - rm daemon/contrib/tarballs/* - ''; - }; +# for client +, cmake +, networkmanager # for libnm +, python3 +, qttools # for translations +, wrapQtAppsHook +, libnotify +, qt5compat +, qtbase +, qtdeclarative +, qrencode +, qtmultimedia +, qtnetworkauth +, qtsvg +, qtwebengine +, qtwebchannel +, withWebengine ? true - jami-meta = with lib; { - homepage = "https://jami.net/"; - description = " for Jami, the free and universal communication platform that respects the privacy and freedoms of its users"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.linsui ]; - }; +# for pjsip +, fetchFromGitHub +, pjsip +# for opendht +, opendht +}: + +let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in -rec { - ffmpeg-jami = (ffmpeg_5.override rec { - version = "5.0.1"; - branch = version; - sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; - doCheck = false; - }).overrideAttrs (old: - let - patch-src = src + "/daemon/contrib/src/ffmpeg/"; - in - { - 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) - ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); - outputs = [ "out" "doc" ]; - }); +stdenv.mkDerivation rec { + pname = "jami"; + version = "20230206.0"; + + src = fetchFromGitLab { + domain = "git.jami.net"; + owner = "savoirfairelinux"; + repo = "jami-client-qt"; + rev = "stable/${version}"; + hash = "sha256-MQ28UJUvgJoPk65neUgMrG+SxOcfnUl803urEFQ7468="; + fetchSubmodules = true; + }; pjsip-jami = pjsip.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "eae25732568e600d248aa8c226271ff6b81df170"; + version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc="; + hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ="; }; - 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" ]; + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -104,11 +100,105 @@ rec { enablePushNotifications = true; }; - jami-daemon = callPackage ./daemon.nix { - inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; + daemon = stdenv.mkDerivation { + pname = "jami-daemon"; + inherit src version meta; + sourceRoot = "source/daemon"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl + ]; + + buildInputs = [ + alsa-lib + asio + dbus + dbus_cplusplus + fmt + ffmpeg_5 + gmp + gnutls + http-parser + jack + jsoncpp + libarchive + libgit2 + libnatpmp + libpulseaudio + libupnp + yaml-cpp + msgpack + opendht-jami + openssl + pjsip-jami + restinio + secp256k1 + speex + udev + webrtc-audio-processing + zlib + ]; + + enableParallelBuilding = true; }; - jami-client = qt6Packages.callPackage ./client.nix { - inherit version src ffmpeg-jami jami-meta; + preConfigure = '' + echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h + ''; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + cmake + python3 + qttools + ]; + + buildInputs = [ + daemon + ffmpeg_5 + libnotify + networkmanager + qtbase + qt5compat + qrencode + qtnetworkauth + qtdeclarative + qtmultimedia + qtsvg + qtwebchannel + ] ++ lib.optionals withWebengine [ + qtwebengine + ]; + + cmakeFlags = [ + "-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces" + ] ++ lib.optionals (!withWebengine) [ + "-DWITH_WEBENGINE=false" + ]; + + qtWrapperArgs = [ + # With wayland the titlebar is not themed and the wmclass is wrong. + "--set-default QT_QPA_PLATFORM xcb" + ]; + + postInstall = '' + # Make the jamid d-bus services available + ln -s ${daemon}/share/dbus-1 $out/share + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "stable/"; + }; + + meta = with lib; { + homepage = "https://jami.net/"; + description = "The free and universal communication platform that respects the privacy and freedoms of its users"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.linsui ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh deleted file mode 100755 index 27472d568c28b..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch - -set -e - -jami_dir=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) - -cd $jami_dir/../../../../.. - -# Update src version and hash -version=$(curl -s 'https://dl.jami.net/release/tarballs/?C=M;O=D' | sed -n -E 's/^.*jami_([0-9.a-f]+)\.tar\.gz.*$/\1/p' | head -n 1) -echo "Latest version: ${version}" - -update-source-version jami-daemon "$version" --file=$jami_dir/default.nix - -src=$(nix-build --no-out-link -A jami-daemon.src) - -config_dir="$jami_dir/config" -mkdir -p $config_dir - -ffmpeg_rules="${src}/daemon/contrib/src/ffmpeg/rules.mak" - -# Update FFmpeg patches -ffmpeg_patches=$(sed -n '/^ffmpeg:/,/^$/p' ${ffmpeg_rules} | sed -n -E 's/.*ffmpeg\/(.*patch).*/\1/p') -echo -e "Patches for FFmpeg:\n${ffmpeg_patches}\n" -echo "${ffmpeg_patches}" > "$config_dir/ffmpeg_patches" - -# Update FFmpeg args -ffmpeg_args_common=$(sed -n '/#disable everything/,/#platform specific options/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Common args for FFmpeg:\n${ffmpeg_args_common}\n" -echo "${ffmpeg_args_common}" > "$config_dir/ffmpeg_args_common" - -ffmpeg_args_linux1=$(sed -n '/ifdef HAVE_LINUX/,/ifdef HAVE_ANDROID/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -ffmpeg_args_linux2=$(sed -n '/# Desktop Linux/,/i386 x86_64/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Linux args for FFmpeg:\n${ffmpeg_args_linux1}\n${ffmpeg_args_linux2}\n" -echo "${ffmpeg_args_linux1}" > "$config_dir/ffmpeg_args_linux" -echo "${ffmpeg_args_linux2}" >> "$config_dir/ffmpeg_args_linux" - -ffmpeg_args_x86=$(sed -n '/i386 x86_64/,/# End Desktop Linux:/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "x86 args for FFmpeg:\n${ffmpeg_args_x86}\n" -echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86" - -# Update pjsip patches -pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p') -echo -e "Patches for pjsip:\n${pjsip_patches}\n" -echo "${pjsip_patches}" > "$config_dir/pjsip_patches" - -# Update pjsip version -pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) -update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix - -pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak" - -# Update pjsip args -pjsip_args_common=$(sed -n '/PJPROJECT_OPTIONS :=/,/with-gnutls/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*\\/\1/p') -echo -e "Common args for pjsip:\n${pjsip_args_common}\n" -echo "${pjsip_args_common}" > "$config_dir/pjsip_args_common" - -pjsip_args_linux=$(sed -n '/HAVE_LINUX/,/endif/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Linux args for pjsip:\n${pjsip_args_linux}\n" -echo "${pjsip_args_linux}" > "$config_dir/pjsip_args_linux" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 0ef6b2e74d7b8..cb634f434d244 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 +{ stdenv, lib, fetchFromGitHub, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg }: @@ -6,11 +6,13 @@ let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; - version = "2.10.5550"; + version = "2.11.5633"; - src = fetchurl { - url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; - sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; + src = fetchFromGitHub { + owner = "jitsi"; + repo = "jitsi"; + rev = "refs/tags/${lib.versions.patch version}"; + hash = "sha256-CN4o0VfHdoUteI2wyJ2hFJ9UsQ2wWUzcvrLMbR/l36M="; }; patches = [ ./jitsi.patch ]; @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://jitsi.org/"; + homepage = "https://desktop.jitsi.org/"; description = "Open Source Video Calls and Chat"; sourceProvenance = with sourceTypes; [ binaryBytecode diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index baa4613b1731d..06a1d98762f88 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-03-20"; + version = "unstable-2023-01-31"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "8cce6d20b49e917929521a13caed30e81037c868"; - hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; + rev = "0c9370cfe41ae7f99b4fceced896f66fb4e9195c"; + hash = "sha256-6KSzsPs8tSzVOxGUWj/AvSJihrSwamZgUNGvjnmNnag="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 73d386b379d5e..2869401b5969b 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -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, diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 1535b694231e2..6a1b5086bc936 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/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix new file mode 100644 index 0000000000000..43d2d7e374555 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gperf +, file, ncurses, openssl, readline, sqlite, zlib +, AppKit, Cocoa, Foundation +}: + +stdenv.mkDerivation rec { + pname = "nchat"; + version = "3.17"; + + src = fetchFromGitHub { + owner = "d99kris"; + repo = "nchat"; + rev = "v${version}"; + hash = "sha256-BtWKt8paI0gCGSzLYN8x3Yp5MUpwCb2vBGcGQG2aumY="; + }; + + postPatch = '' + substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ + --replace "get_git_head_revision" "#get_git_head_revision" + ''; + + nativeBuildInputs = [ cmake gperf ]; + + buildInputs = [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ]; + + cmakeFlags = [ + "-DHAS_WHATSAPP=OFF" # go module build required + ]; + + meta = with lib; { + description = "Terminal-based chat client with support for Telegram and WhatsApp"; + homepage = "https://github.com/d99kris/nchat"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index e6b3d84c7b79d..bbabfedc690ad 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "nheko"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - hash = "sha256-2sN5lVjJ/CPH9U6NfZkAYZUTT+YDgPOy9dTVGp0svkg="; + hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 9845491f235de..0b51d172b7462 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ + env.NIX_CFLAGS_COMPILE = builtins.toString [ # glib-2.62 deprecations "-DGLIB_DISABLE_DEPRECATION_WARNINGS" # override "-O0 -Werror" set by build system diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix index 36a5a0a7c90a2..1a1fd3b409a66 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]); meta = with lib; { homepage = "https://github.com/ars3niy/tdlib-purple"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index f5d2479bdaa15..d3700a66be789 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -9,16 +9,16 @@ 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 ]; - NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = let python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e97b6c5b3ffbc..8f7c42de8abbe 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.0.9"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-o2ydZodmMAYeU0IiczKNlzY2hgTJbzyJWO/cZSTfAuM="; + sha256 = "sha256-MQBDX4gCpEERdgimAAhKvnN76L1ckpsfWIHZqIsSJOE="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 3e5af22c824a5..a0e94dc0f1d63 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 0573c7231e271..cf2c44f5f2f2c 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/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index f8037e1ef47cb..4d46c9870f06b 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.6"; + version = "0.11.7"; # 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"; - hash = "sha256-DWG67Jr2hDas1aL5Q+9MUjNKNLFpOFLsehYbJfy/rzg="; + hash = "sha256-oN80HQkPpJfhM4WBaRm4ytmhLjSokjEpfMhP6/XnQXs="; }; 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 1fba61b8b0c6a..d8f3fcb17939a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.3.0"; - hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY="; + version = "6.5.1"; + hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.4.0-beta.1"; - hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU="; + version = "6.6.0-beta.1"; + hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 446c483f5bc0d..c3b9caf9ab4bd 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 = "20230109-1"; + version = "20230223-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8="; + hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; }; postPatch = '' @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch index 1d9ca8d838d9c..4a49ff991e6bc 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -1,4 +1,4 @@ -From 2c126682aaabd7f486dfb2ff75fe29b5d8697060 Mon Sep 17 00:00:00 2001 +From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 26 Feb 2022 12:33:13 +0100 Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD @@ -8,10 +8,10 @@ Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 799e782..caceaac 100644 +index ea3fea1..01e444d 100644 --- a/build.gradle +++ b/build.gradle -@@ -83,6 +83,9 @@ static String getVersion() { +@@ -82,6 +82,9 @@ static String getVersion() { repositories { maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages @@ -21,16 +21,16 @@ index 799e782..caceaac 100644 mavenCentral() } -@@ -104,6 +107,8 @@ dependencies { +@@ -101,6 +104,8 @@ dependencies { + implementation 'io.prometheus:simpleclient:0.16.0' + implementation 'io.prometheus:simpleclient_hotspot:0.16.0' implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - } - -@@ -171,4 +176,4 @@ allprojects { + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'io.sentry:sentry:6.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' +@@ -170,4 +175,4 @@ allprojects { runtime { options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] @@ -38,5 +38,5 @@ index 799e782..caceaac 100644 \ No newline at end of file +} -- -2.36.2 +2.38.3 diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch index 96a7d6d2ef3f3..bf583de53ba26 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -1,4 +1,4 @@ -From b068af1f3e49dedfb489e3ed957934ff651e98ee Mon Sep 17 00:00:00 2001 +From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 26 Feb 2022 12:36:15 +0100 Subject: [PATCH 2/2] buildconfig/local deps fixes @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] buildconfig/local deps fixes 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle -index 799e782..6ecef3e 100644 +index ea3fea1..24415d8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal @@ -35,7 +35,7 @@ index 799e782..6ecef3e 100644 compileJava.options.encoding = 'UTF-8' -@@ -83,7 +93,10 @@ static String getVersion() { +@@ -82,7 +92,10 @@ static String getVersion() { repositories { maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages @@ -47,16 +47,16 @@ index 799e782..6ecef3e 100644 } dependencies { -@@ -104,6 +117,8 @@ dependencies { +@@ -101,6 +114,8 @@ dependencies { + implementation 'io.prometheus:simpleclient:0.16.0' + implementation 'io.prometheus:simpleclient_hotspot:0.16.0' implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - } - -@@ -167,8 +182,3 @@ allprojects { + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'io.sentry:sentry:6.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' +@@ -166,8 +181,3 @@ allprojects { } } } @@ -67,5 +67,5 @@ index 799e782..6ecef3e 100644 -} \ No newline at end of file -- -2.36.2 +2.38.3 diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index a9e023cdf63a9..b15dbbb92bdb2 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -2,15 +2,18 @@ , makeWrapper, fetchpatch, substituteAll, jre_minimal }: +# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` +# can be removed again! + let pname = "signald"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RN0OYjOmVtHKeFkviep952uf3qWuBj8lhcaP1Lk/gDo="; + sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; jre' = jre_minimal.override { @@ -42,11 +45,30 @@ let export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh -x + + # WARNING: don't try this at home and wear safety-goggles while working with this! + # We patch around in the dependency tree to resolve some spurious dependency resolution errors. + # Whenever this package gets updated, please check if some of these hacks are obsolete! + + # Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed), + # but gradle doesn't detect such renames, only fetches the latter and then fails + # in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`. + pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null + cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar + popd &>/dev/null + + # For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required + # according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here. + # According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1 + # the only relevant change is in the code itself (and in the tests/docs), so this seems + # binary-compatible. + cp -v \ + $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \ + $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar ''; # Don't move info to share/ forceShare = [ "dummy" ]; @@ -54,12 +76,12 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-ANiNDdTuCuDEH5zUPsrVF6Uegdq3zVsMv+uMtYRX0jE="; - aarch64-linux = "sha256-V9zn4v/ZeLELAwFJ5y7OVAeJwZp4DmHm4KWxE6KpwGs="; + x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q="; + aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw="; }.${stdenv.system} or (throw "Unsupported platform"); }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit pname src version; patches = [ @@ -69,6 +91,11 @@ in stdenv.mkDerivation rec { }) ]; + passthru = { + # Mostly for debugging purposes. + inherit deps; + }; + buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ff3b74fd7fcd4..23571658a24b7 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -178,7 +178,8 @@ let # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ + --replace /usr/share/ $out/share/ \ + --replace bin/slack "bin/slack -s" runHook postInstall ''; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 0036ffc77ca56..177671f21c005 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -46,7 +46,11 @@ let version = versions.linux; src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb"; + urls = [ + "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + # NOTE: the archive.org timestamp must also be updated if the version changes. + "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + ]; hash = hashes.linux; }; 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 bd2f9e4b3f5ec..f627647e1efb8 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 @@ -56,6 +56,10 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + ./tg_owt.patch + ]; + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch new file mode 100644 index 0000000000000..05332d51c0473 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch @@ -0,0 +1,23 @@ +--- a/src/modules/include/module_common_types_public.h ++++ b/src/modules/include/module_common_types_public.h +@@ -11,6 +11,7 @@ + #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + ++#include <cstdint> + #include <limits> + + #include "absl/types/optional.h" +diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h +index 28c95ea9..790b0b73 100644 +--- a/src/common_video/h265/h265_pps_parser.h ++++ b/src/common_video/h265/h265_pps_parser.h +@@ -13,6 +13,8 @@ + + #include "absl/types/optional.h" + ++#include <stdint.h> ++ + namespace rtc { + class BitBuffer; + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a62bf67790bcd..3066a3aa745bd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.5.3"; + version = "4.6.5"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -84,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l"; + sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk"; }; postPatch = '' 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 e80ccd2105aa5..713069ff95a3a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake, ninja, yasm , libjpeg, openssl_1_1, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , openh264, usrsctp, libevent, libvpx @@ -31,6 +31,19 @@ stdenv.mkDerivation { mesa libepoxy libglvnd ]; + patches = [ + # GCC 12 Fix + (fetchpatch { + url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch"; + hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0="; + }) + # additional fix for GCC 12 + musl + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20"; + hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs="; + }) + ]; + cmakeFlags = [ # Building as a shared library isn't officially supported and may break at any time. "-DBUILD_SHARED_LIBS=OFF" 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 0000000000000..d032057203122 --- /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/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index f28cc3c25f6ea..a01df75371c85 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "42.10.0.24000"; + version = "43.2.0.25211"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221019145240/Webex_ubuntu.7z"; - sha256 = "03b77a3fcce76f04cf684bcdecb3bcce97c5a8b6cc36b40967cc14fa9a46c102"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230214022524/Webex_ubuntu.7z"; + sha256 = "c58a0da26c8f64302cc612c60980dbd68c074d6d8a567b3d870d7d6d06b420ad"; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index af321660676bc..5bd11cff90ea4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,7 +30,7 @@ , libxkbcommon , udev , zlib -, krb5 +, libkrb5 # Runtime , coreutils , pciutils @@ -48,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.13.6.14918"; - versions.x86_64-darwin = "5.13.6.14918"; - versions.x86_64-linux = "5.13.5.431"; + versions.aarch64-darwin = "5.13.7.15481"; + versions.x86_64-darwin = "5.13.7.15481"; + versions.x86_64-linux = "5.13.10.1208"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; + hash = "sha256-lCg8xCEuZSWnd4fieug9xjudE9q6pNICRsbvA4ATVK8="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; + hash = "sha256-jmMpkqUga/KQJfXFbGURcWQudnCKlIi5NGY6LuekjKw="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; + hash = "sha256-GmDWb7HRpf5khA5DAGOD5lx5zSzOdDfTvmcOU/LwN+A="; }; }; @@ -103,11 +103,13 @@ let xorg.libxshmfence xorg.xcbutilimage xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm xorg.libXfixes xorg.libXtst udev zlib - krb5 + libkrb5 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 241828fdfc3c4..f46283583cd15 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.9.4"; + version = "5.9.5"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM="; + hash = "sha256-w2thmF/UA42j3u3m4L+/onilQhwMOa7IJoOMZ/ERypw="; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 43bc47b17af44..996677f8a11b3 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/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index c144b4bf58531..f6341a4d74470 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 4bc930b12d0af..02927d870c90c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -43,7 +43,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { }; # Prevent ``undefined reference to `qt_version_tag''' in SSL check - NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; + env.NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ qtbase boost zlib ] diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index e00a177b673e4..d5a977f65fbe5 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2023-01-03"; + version = "unstable-2023-02-13"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "5414edb01f30ad9480e211030db1bcd858e5f741"; - sha256 = "sha256-GsdU+IBuHhwt8n4SEMCUSUzLQezwVtZ9L/0uF5aculA="; + rev = "1318e784bd2bba3765aee97811a3f0053d3a6723"; + sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; }; vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; @@ -32,6 +32,6 @@ buildGoModule rec { description = "Your everyday IRC student"; homepage = "https://ellidri.org/senpai"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 478b28190ae69..ad460fe6c7782 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -65,7 +65,7 @@ let ++ concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" + env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 2a686fdd8b9e8..8aea49decb7ea 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 22ea41ec4343a..4806e3ae4a733 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 = "3.1.0"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; + sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o="; }; - vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; + vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index a9197c9db5fbc..08a9967de4a0d 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -15,6 +15,19 @@ let inherit (kubo-migrator-unwrapped) src; sourceRoot = "source/${pname}"; vendorSha256 = null; + # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match + # See https://github.com/ipfs/fs-repo-migrations/pull/163 + postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' + substituteInPlace 'vendor/github.com/marten-seemann/qtls-go1-15/common.go' \ + --replace \ + '"container/list"' \ + '"container/list" + "context"' \ + --replace \ + 'config *Config' \ + 'config *Config + ctx context.Context' + ''; doCheck = false; meta = kubo-migrator-unwrapped.meta // { mainProgram = pname; @@ -23,8 +36,9 @@ let }; # Concatenation of the latest repo version and the version of that migration - version = "12.1.0.2"; + version = "13.1.0.0"; + fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0"; fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1"; fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1"; @@ -39,6 +53,7 @@ let fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; all-migrations = [ + fs-repo-12-to-13 fs-repo-11-to-12 fs-repo-10-to-11 fs-repo-9-to-10 diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index a99ab2b2cbb61..dcf206d5c8aa3 100644 --- a/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -15,13 +15,13 @@ buildGoModule rec { # The fs-repo-migrations code itself is the same between # the two versions but the migration code, which is built # into separate binaries, is not. - rev = "fs-repo-11-to-12/v1.0.2"; - sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik="; + rev = "fs-repo-12-to-13/v1.0.0"; + hash = "sha256-QQone7E2Be+jVfnrwqQ1Ny4jo6mSDHhaY3ErkNdn2f8="; }; sourceRoot = "source/fs-repo-migrations"; - vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; + vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; doCheck = false; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index cc19511d87cc9..4e13bdc717c8c 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.5"; + version = "1.7.1"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-yKsCM8LZ/GR/bc2WW+Ml1vSroB4iaxh09Az/B+aIVBU="; + hash = "sha256-YYlH9s3iNEIacs8izEnIU32j+2lruQ5JJrjvDIzQjRE="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index ddc0f4b932ad0..9ffdb16301075 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -12,17 +12,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-pUp/hW4Kk3pixGfbQvphLJM9Dc/w01T1KPRewOicPqM="; + hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg="; }; proxyVendor = true; - vendorHash = "sha256-Nx+k0PLPIx7Ia0LobXUOw7oOFVz1FXV49haAkRAVOcM="; + vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index d5e40edeb6617..9dee3ed33d846 100644 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -1,8 +1,8 @@ -diff --git a/config/aerc.conf b/config/aerc.conf -index fbbf587..ede1a03 100644 ---- a/config/aerc.conf -+++ b/config/aerc.conf -@@ -107,8 +107,7 @@ next-message-on-delete=true +diff --git i/config/aerc.conf w/config/aerc.conf +index 05ebbf4..db6877b 100644 +--- i/config/aerc.conf ++++ w/config/aerc.conf +@@ -152,8 +152,7 @@ # # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -10,9 +10,9 @@ index fbbf587..ede1a03 100644 -# /usr/share/aerc/stylesets +# @out@/share/aerc/stylesets # - # default: "" - stylesets-dirs= -@@ -254,8 +253,7 @@ new-email= + #stylesets-dirs= + +@@ -445,8 +444,7 @@ message/rfc822=colorize # # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -20,37 +20,27 @@ index fbbf587..ede1a03 100644 -# /usr/share/aerc/templates +# @out@/share/aerc/templates # - # default: "" - template-dirs= -diff --git a/config/config.go b/config/config.go -index 2120310..92b7655 100644 ---- a/config/config.go -+++ b/config/config.go -@@ -331,8 +331,8 @@ func buildDefaultDirs() []string { + #template-dirs= + +diff --git i/config/config.go w/config/config.go +index 09fb5ef..c73a7ee 100644 +--- i/config/config.go ++++ w/config/config.go +@@ -60,8 +60,7 @@ func buildDefaultDirs() []string { } // Add fixed fallback locations - defaultDirs = append(defaultDirs, "/usr/local/share/aerc") - defaultDirs = append(defaultDirs, "/usr/share/aerc") -+ defaultDirs = append(defaultDirs, "@out@/local/share/aerc") + defaultDirs = append(defaultDirs, "@out@/share/aerc") return defaultDirs } -diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd -index 885c4f8..77a853e 100644 ---- a/doc/aerc-config.5.scd -+++ b/doc/aerc-config.5.scd -@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus - "aerc", which defaults to ~/.config/aerc. - - Examples of these config files are typically included with your installation of --aerc and are usually installed in /usr/share/aerc. -+aerc and are usually installed in @out@/share/aerc. - - Each file uses the _ini_ format, and consists of sections with keys and values. - A line beginning with # is considered a comment and ignored, as are empty lines. -@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf. +diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd +index d48e38a..39784c4 100644 +--- i/doc/aerc-config.5.scd ++++ w/doc/aerc-config.5.scd +@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -59,26 +49,8 @@ index 885c4f8..77a853e 100644 + @out@/share/aerc/stylesets ``` - Default: "" -@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a - subject which contains "text". Use header,~regex to match against a regex. - - aerc ships with some default filters installed in the share directory (usually --_/usr/share/aerc/filters_). Note that these may have additional dependencies -+_@out@/share/aerc/filters_). Note that these may have additional dependencies - that aerc does not have alone. - - ## TRIGGERS -@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the - template name. - - aerc ships with some default templates installed in the share directory (usually --_/usr/share/aerc/templates_). -+_@out@/share/aerc/templates_). - - These options are configured in the *[templates]* section of aerc.conf. - -@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf. + *styleset-name* = _<string>_ +@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/templates ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -87,4 +59,26 @@ index 885c4f8..77a853e 100644 + @out@/share/aerc/templates ``` - Default: "" + *new-message* = _<template_name>_ +diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd +index 6c9e319..0ef97ce 100644 +--- i/doc/aerc-templates.7.scd ++++ w/doc/aerc-templates.7.scd +@@ -111,7 +111,7 @@ aerc provides the following additional functions: + Execute external command, provide the second argument to its stdin. + + ``` +- {{exec `/usr/local/share/aerc/filters/html` .OriginalText}} ++ {{exec `@out@/share/aerc/filters/html` .OriginalText}} + ``` + + *toLocal* +@@ -142,7 +142,7 @@ aerc provides the following additional functions: + Example: Automatic HTML parsing for text/html mime type messages + ``` + {{if eq .OriginalMIMEType "text/html"}} +- {{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}} ++ {{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}} + {{else}} + {{wrap 72 .OriginalText | quote}} + {{end}} diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index bc27b91a97da9..ac0687900f179 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" ]; postBuild = '' - ${python3Packages.python.interpreter} setup.py build_sphinx -b html,man + ${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man ''; postInstall = '' diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 8033a734b981a..49e8852fd0ce4 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.46.3"; + version = "3.46.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU="; + sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index a5ed92f519e3b..65bb334611a6f 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.3"; + version = "3.46.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM="; + sha256 = "eghCMc7SRaNLcT141Dp3Zgyso79S5qT1AwpqCAxpez0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 7837393926f63..0a4a4a9d77978 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -7,10 +7,16 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; postBuild = '' + declare -a schemas; + for plugin in ${toString plugins}; do + for schema in $plugin/share/gsettings-schemas/*; do + schemas+=($schema); + done + done for i in $out/bin/* $out/libexec/**; do if [ ! -d $i ]; then echo wrapping $i - wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" + wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" --prefix XDG_DATA_DIRS : "''${schemas[@]}" fi done diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 870477545b53f..d0072a00c5a61 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.7.6"; + version = "2.8.1"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "sha256-7B3ebY2QAk+64NycptoMmAo7GxUFOo3a7CH7txV/KTY="; + sha256 = "sha256-nHKZ3skRbDhKWocaw5mbaRnZC37FxFIVd08iFgrEA0s="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index de82535cd5601..fb852f76045d1 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libiconv ruby ]; src = fetchFromGitHub { owner = "leahneukirchen"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dfa92fc42c98e..91a424d9eb12e 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -18,6 +18,8 @@ , gssSupport ? true , writeScript }: +assert smimeSupport -> sslSupport; +assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9bd99c86e773b..fb5d664080496 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -196,7 +196,7 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + inherit lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; pname = "thunderbird-bin"; baseName = "thunderbird"; channel = "release"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ed5c9843f2813..73cd49ec6c0a4 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.6.1"; + version = "102.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/af/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/af/thunderbird-102.8.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "417eb44163275bceea7251e544499f56056a16aa3defe97f9f26df0abaa8fe8b"; + sha256 = "ba2ede548ebecf34dbb9064fa40ffebd1b04c75fe49a9b75e0381b6d1863e448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ar/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ar/thunderbird-102.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9717df3c3020d2b6814eb8ce99eafa62f71f56cbe0d7515044b7ff88c763cf44"; + sha256 = "6ce47dbc702e0557ed4ac1898a18e3aa17af0b7e9f9958410084aba1b765e3f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ast/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ast/thunderbird-102.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b6984f90666a29a922e098635504786716c38c0cafe243b5a1d43b64af64d0ee"; + sha256 = "0aa0ceb9067c91ad548edd7f3603fbc61a25b3ef0aba2ec669bf02ddabbd29d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/be/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/be/thunderbird-102.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d9060ad38fc5da77c9c709dbc498ce656d20668b16d2c811dc400bf9170aceee"; + sha256 = "4ff2f25a296dc9737a68180b4594ee367d5499189948aa0f03ba273f6c3ce08c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/bg/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/bg/thunderbird-102.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "936c52b46c7671a3328e6ebdd9d0ff0e61e761efc0210f0c470893072d04d7a8"; + sha256 = "5100741120ee268ffd7c47fb96130f58d32e4f817e461589216b7613c58fca2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/br/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/br/thunderbird-102.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5c82a79835dd1f94b54113c9982e01c1a5cbce09c89a8ca5783407669de35665"; + sha256 = "0b957c10107762463559825bc8ec31b69782cc31254f712515f6e25612acbcce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ca/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ca/thunderbird-102.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4461d13cef193613c490eb3194e4a49c8273cd18a6802450c1bec7a239ff3236"; + sha256 = "2c51198833e5f177d3637e965c0d69435abbf26cc75347817c9b2aa1793083cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cak/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/cak/thunderbird-102.8.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3382850dab21c32bf31b1ba10474a2cb017c16af5d3fc3697fe15dc39ccd9b40"; + sha256 = "d9bec543aacbbd68a5da25d331488639eb9808a38978ecb70c33b014d1883d2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cs/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/cs/thunderbird-102.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1d9f24e160547e4af0d6420b443e2c36762a13bfe7a0c552162fac05c08d8b1b"; + sha256 = "cd0c0eea3b9962366d6356f78d0f9add27a124b40306d9fd9dca55e38f6a3880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cy/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/cy/thunderbird-102.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dcb3a9894021d08f31dc9b5eb14bff17bd4e0ae8009c9f65b444c1ff0aca4d91"; + sha256 = "dce2c89acf985f25f3f3c8be5f4c99078215d7786140ea53ae1436e552c0db6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/da/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/da/thunderbird-102.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "0fed9e8faebbeadbeae53aa06a773b412d45adafde237742b93dfd9196c9e9e4"; + sha256 = "b770cd13cb0d4016d594552e953dd64822eee279f780f3c430f2df2edcfffd69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/de/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/de/thunderbird-102.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dd9a22884495c0d1ebb18fd7721688a2e14917684bc176c90578c8008d3836e8"; + sha256 = "b236aaac3efa2141254c604c031bbfc7b111f74aa4eeff195c2b45029a0d9b67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/dsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/dsb/thunderbird-102.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2a84bf4e6862346bd03a05be6fdbeeb79347890294ec6f93809bedfa089005dd"; + sha256 = "82ace3dc15970a1257cd6dbb2b884a5059ea0e413e78e3a97d6778da2dab13fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/el/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/el/thunderbird-102.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f758bd822941145ba0da6e296f12264329a30c3f1cb5b8ce16f9887ad89caf8b"; + sha256 = "70738ccfcdab51cbd6369656f424a38e497a35fc6a74a4eb6f33bf79db774d49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-CA/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-CA/thunderbird-102.8.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4f0edd405507b23fac31461f9511f35aacd096d92a4b598801f021ac5d3021a8"; + sha256 = "9b5011ce3c43f404ddf9b3d2d6b931cce9b39423ac44503fd52015bd20e217aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-GB/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-GB/thunderbird-102.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "15443e7ed39849346c562a67a673fb4bd39e05f8bf616fd7170e9352ea4b5404"; + sha256 = "cb943b6e9fe2562ca5867f559459ae741be0b0a5758988e77de3e5895f33ff7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-US/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-US/thunderbird-102.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "501c5f0c97e89d5b5fb066b5f480cc3598a1bdc86dfc32482d3bf2c453ed29c3"; + sha256 = "bba8cee22cab7a5134b4478a48117f5e2fff0dd2c7357920010e7f4e4df55728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-AR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/es-AR/thunderbird-102.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c228716b6c6bf78efdbfe877a01d98a697c048ba36b5b692d4a9e4f35c5c8359"; + sha256 = "1346bc8d7d6806f1d7d3fba08954d62d823fa8a645588e1edcbdcb582adb4c6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-ES/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/es-ES/thunderbird-102.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "35ff4ab3acdacaa17c31577f34e791f805f039fff636f696f483e0e77a13cdce"; + sha256 = "414829e3819c3c9c608d6d4ada7e3619326ddab645afec5b87e1c3f9eff308d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-MX/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/es-MX/thunderbird-102.8.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "da0dac340fe0467d48c75ca25a0f0c6ca40e7904969aff5efac7d14b8e2a790e"; + sha256 = "258d9884194c73d91346c49be97e80379f330ad11c8b16c7a3a804ed44bb8b01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/et/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/et/thunderbird-102.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "840bef653741da3b19b85c645fed1375ba706dee4bf2e6c8684b9f50a2d54a35"; + sha256 = "e01ea9daab81222ce424ecf498fab0fbefb4ebae8f8f3420a3b324898bfc09be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/eu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/eu/thunderbird-102.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "397a1a04b45f4035338328a52baa2bfc30be9f48fcc76137122d18e0a350fcd3"; + sha256 = "1f53f007d559496a66e7466f86bdbea375d879b760882d1a1df77560c26d204d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/fi/thunderbird-102.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9af605e6b57db7d2c661ecd95f422b613f1819110bd9ceee7b8d4da546fbe069"; + sha256 = "55d8c2cee9fc9da86bba621a6e79aa2f7645f4ec83cf309444c7a3c09c1122a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/fr/thunderbird-102.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "44c4a26ba5da3ddd8fb5368529279a50ffc3593f3b7cef35eb903d915d7720c1"; + sha256 = "ef26719a3a616f6e9e597cd110aa05ffaf832a63bc966ed9897a1b0bb6ee818a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fy-NL/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/fy-NL/thunderbird-102.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "74023e7e027554a79362cdaeb8921393e55d902c10653221c7edc9c245646f99"; + sha256 = "c9e30388ef4d54a5e8557668775460b32e6db213eb2beacc96338c5b883653ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ga-IE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ga-IE/thunderbird-102.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04f6ea825e23b89ea5f55d5fdf86c11ed7c4f224df2f5fbcb1b800a5f45b22f1"; + sha256 = "84ddd0d3646c31ef1da02f9a5e1cf48ec5dc459668fe36435db5f490eba40502"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gd/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/gd/thunderbird-102.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fb428e74e80863cc6a69b2f9ede1694daa490637c166c5aacc041fa70943b5b2"; + sha256 = "11befd31b721e7c2a7e02b1d56099553b76dd9a870f7bf045041a353fbaf3fb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/gl/thunderbird-102.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c548d0f51b881b220dbc8c93a69add3f1b19579236b3e47d0bb3cccdb7d8647d"; + sha256 = "fab4badae04fcee3473937498d4e0672da9b94e1b1c09c4a21c6cbbab42c4a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/he/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/he/thunderbird-102.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b22faa9d7646eb8efa3fc0e15c966f7286b53c12d72baa534a92ba20432ff8b7"; + sha256 = "d45c0d8f4da3d5e4786aee3ca3f909429838533dfebe52f1cdbff453d891ffd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hr/thunderbird-102.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "05571451a11e827ba451354f97695e449afe85d7c7dcd2c0ff3aea24727272c5"; + sha256 = "a2d1d496ccb94502e4bbe5168709c0c547ee7e45100c7276d5efadc7bf0e8e3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hsb/thunderbird-102.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a3c0f43e1db05456aea23dc1f17b1057eb86124cc14a1ca5e80b71b1518a1fda"; + sha256 = "cc74e62df0255e1f4c89d639851c1984ee19aa1f7eafbfdaf32cae6ed27127ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hu/thunderbird-102.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6b0f9ac8947699adc325435be839cb0c08052db330d0d2c8327fce5f4cc2eb22"; + sha256 = "13522a168cadd0ddc06392634745867928116b4fc6fecfd908fee1cf79155f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hy-AM/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hy-AM/thunderbird-102.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0150496630287f01ed05dcf9e3dda88a923936e77cac41e2df856d8f4298f240"; + sha256 = "e79f42377015d42d861c1519d0767ca12ff1ea019884e8f9f6afb56a7f8513ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/id/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/id/thunderbird-102.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0a2946beef4068a760f139f32782cea1f7ed20d8d577448bed785146394094ed"; + sha256 = "39cddf34e49330204a2926f8aca2b50d88020a0bbd7b2520b5ae1429fc9983ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/is/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/is/thunderbird-102.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9e876cd8b01e9ec4c77311c325b807d3318a17c7d4943a42dd1faf6500f222fe"; + sha256 = "2c73156fa3c4b242dc9d409b7b5d911b8b150425d554fb1e3ca8f149705281e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/it/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/it/thunderbird-102.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "92a90f181df2b5ef167a0b2fcbc5169615a39287b75a7428650bc679e211c755"; + sha256 = "41974d06b1553751ddae9e6d6d6b4439e0163964b5fa1cae7324ea2a3949ac70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ja/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ja/thunderbird-102.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a90c125ee302827c11ba1ec41f6548c7c42c88041713747aa7ecfdb84b307d92"; + sha256 = "42500186b681a7ef81f7d71c864ca515497f3b705f7474d104ee75454ffa8a03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ka/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ka/thunderbird-102.8.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a26c7070396101c94c35a35aada3869309d19e060f8c4e44ffa77a9cb6d291e4"; + sha256 = "bec232ad6c9f1cf1fc38edd0e9210336a56bf20ea8f61dafd113c8bff9da5117"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kab/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/kab/thunderbird-102.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4596eec5222f4fc3c9f27c3af1426880ec3846b981b5719bf97decde06f14580"; + sha256 = "e27ce311cc367d4f76b2fc632bb7454569346cb715b50235f4952c8a4aad4931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/kk/thunderbird-102.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "957df20187a944e587f16426b975e0b25dc274ac6ff0112f8ad96f7b520f35f3"; + sha256 = "711c93de3db1fdca7583a6fe715816eb3fbc24d2024a49e9ed0968b86008ae53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ko/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ko/thunderbird-102.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "77cb35952ebd1b14e661d6c67933fe5c28e5670e2a08399227e90e0d1665a149"; + sha256 = "4b02afd65cb37438fd6470e39015a4aee0fb526c640b24c9dda43860740554d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lt/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/lt/thunderbird-102.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fda5d9ee40b2a9266a14969187fe54f5dfa97b3029cd23bb4f74dba31139cb9b"; + sha256 = "38a1ee1acfae532a477f917e977d784ca8e5b8861d1f8b77c769a6a0e75c106c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lv/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/lv/thunderbird-102.8.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "088a7b5746926614ce27ec42ac8e50dfa573006e76bc2cb2cab8d94b820ed3db"; + sha256 = "26e4095f76e63044b12f578382092ca1e8e540cd808f13f57e6b75ac24900d57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ms/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ms/thunderbird-102.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "827c08cdc65fbd81bdd326b2036071d2174d469c72224929af899c3af90cbb1b"; + sha256 = "762b0646a9ca93291ae76951b789b1a23b6fe5b023bf47b3567ab28c118147d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nb-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/nb-NO/thunderbird-102.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f049be571b8d9b39dae313d370e2510251a0521ab64cb82cb432843fb26c407b"; + sha256 = "5f8d639afa6bccce81a9d475ea3e5db2a9799f325314d8f2ace366e7c919391c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/nl/thunderbird-102.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "26fb69eceb626eb7482f67ef0043dd9fa58003b534bf4066aef3d51792ea1834"; + sha256 = "0cc441bf7aa9fede1a6b87e58c4a0eee6881196b68308ddd870215c6f93a3b16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nn-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/nn-NO/thunderbird-102.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4e586bda023baecaee92853a4e6e993e35ce193ca2770071bc22ba2006109898"; + sha256 = "8cc81b524082efe23ee865583cddadce33ae8367d4bfc97cb631bd1599deec14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pa-IN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pa-IN/thunderbird-102.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8fad3effac8d00d5a07466b94b8d51ad6ecc23552ffec658fef6d127b0b80e4b"; + sha256 = "d2db7a51cc627f60d645bc6c2f3bc01971d4358b99187c27e1ab97a803a465f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pl/thunderbird-102.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7dc544a10b244425e76e341fc1164b52e915fb5e6c12fc755bcca173810827b7"; + sha256 = "97ab876eb3321de7acd899b4d637dd1ba1fbe1ca39a4cb5933b3f27a374848e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-BR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pt-BR/thunderbird-102.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7b38735922511f3a03febc10e98fced7880a8874ccb53c3c946d4db225d02823"; + sha256 = "d4107a7fa690926e27c031164a8686d48b7ec85f87e759877b1b611899acd2dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-PT/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pt-PT/thunderbird-102.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4baa786ae442af119a3c9d794a31aedee06839b8dc9551b46028a4578c4086bc"; + sha256 = "8fd0180fc900ac146bc027d0684c32628adf7fed1c3d6ba629d2ce860eba7365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/rm/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/rm/thunderbird-102.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "087b4ecbbf95853ca6937a828f4f806d32f8c56d0feaf0f5e05628e2ca2e3ace"; + sha256 = "67d9639e25d18f3a87fb46837cdd5a5c02a8750288f1ce3c8a9966bd8a27ccd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ro/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ro/thunderbird-102.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3324a4fc7ab8e00d35fb7d1a4c6567a3a3f1b4c50590ca206eb6d5a6b950842"; + sha256 = "a6647805b9d150e2b122acbd1b68e615685ccc71ffac30969c844a47e8d53871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ru/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ru/thunderbird-102.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6a2d2daf0f325f8f033869b3fe4e644ba5022244bff1031b35a439e43999cf44"; + sha256 = "49f80efa92dc62e030a77a591767a59dcf79a555a38ea529904779bddd51ed3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sk/thunderbird-102.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "275785c953e5c88adf3b234c604ded4b04a087f28f32bfbf39e0b3a8e1e64c82"; + sha256 = "d0f1eba84c00b072b041cb47f3ad9c743eb9fdb5cf24f2800aaafd1673174ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sl/thunderbird-102.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "398725e455f26782f3d44a8165897bc375a9d0b7544e1ee37f70b77898ee4ff9"; + sha256 = "79be6e3e6bf71677ebe697629dddab4e626a057d569f54174b4226a5b89c3fb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sq/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sq/thunderbird-102.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cd2c03610f93518a95bd75cc0c7fc867b3922aaaf7e891d67dd6562aa4bc3064"; + sha256 = "e038fd9cff2bb4d3b5e4732276de7741e081a9a0c5867025bad0e0f9ea95a34f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sr/thunderbird-102.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bf380394a724353bf91fae056a00e1e8238a14bd1d221bb47cc2ad6247ec721f"; + sha256 = "400246f1cc4d75b9792e48043dd38b908281a3a1f6bf1f59b3d5c9653f65ad87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sv-SE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sv-SE/thunderbird-102.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8b57f7ed92a353a970c063c9374303c273a190fcc04045a7fb9ed7774a2bbfb6"; + sha256 = "f820013501e8110dc7b7e23516e7fe3888072c45f392424d3dab3441c3c2075b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/th/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/th/thunderbird-102.8.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "99abebff09161c06c5985e74e5e1337153d99d13fa8661abf8e4f1895c12d1ff"; + sha256 = "71c8986491d336851a6eca7e4aa033e749349936321de1811847ebf9e0ccebb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/tr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/tr/thunderbird-102.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b17a54aab88fc7c13c3e5551f9b9a14153e124b19d58fef3da28392dd1a18157"; + sha256 = "019156e1d394fd052e7f2d7fcd96058801eb14e4ff61d9e9f907569b129aa2bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/uk/thunderbird-102.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "63565388a50fe92887ec6adbbcb9a2ee9835873fbaee782901b7f7fd8e35500f"; + sha256 = "e37cadef887a0fce4459e91c90d63361115f86d8cc7cb841107771ed378443db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uz/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/uz/thunderbird-102.8.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad501a7dd6f98f5b263fd7c71572632088a4801b52ccb6ee37ebf235162fddb1"; + sha256 = "60a4946bc07b76d76f92332234f2d87f70d7b3c4e7f15530a61e602a358e64b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/vi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/vi/thunderbird-102.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fd5d17c2965a94fcc0e2d167d5f202a67a024c0797afcc92481a3413d6445ffe"; + sha256 = "05ed2df59ea6d9265d9133c6bab1858cfb324cb58fdbc9997749bccae653b539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-CN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/zh-CN/thunderbird-102.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e666ac3bd0f75b3f7915bfade39b044b69af7f3d5901c0f48311ff614f4d710b"; + sha256 = "c7a01ce36f53cc45d706f6607459807044f098c1d9a3316bad13b834d53fa2eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-TW/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/zh-TW/thunderbird-102.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5c85008c1974b961e08065976a28b0897ff9d5199bc69e1c3c403a10d546156b"; + sha256 = "7d85ee85882a0c50ae25a338db564eb404df7eaefce93726a0bf15e6c6988811"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/af/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/af/thunderbird-102.8.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e8c7b235b856b7c3ff1859acf856c8917d5a1dfc7e4a6d2b9d4736b3709f9150"; + sha256 = "96f298579a357caff8b69aa1c1c485201640ffe05ab6e3adf5cec5f4268250c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ar/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ar/thunderbird-102.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8594ee599a9bcd600b679e762956042e71cfcc60d6942f22ec9c3a25a0790f78"; + sha256 = "b382d9665457bf9dda8c5aa38d657e92e534795f4d1a4d42b5a07625e40d02c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ast/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ast/thunderbird-102.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "15d81d66cee46104d0ba9af9dd6704b1dfde2c3720a68fd23fe5181b56b2942d"; + sha256 = "00b76108dfde73e07487f841e7167477e938bed167d95132536e9d92bd9ad3f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/be/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/be/thunderbird-102.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "07bc7abcc461b68d4bd7015518a4ab0f00486c3104ff04fb195244af826ce99e"; + sha256 = "80b459c031c7d678c28e50ff8f0df864e6be3183551e5677bf280d749712689b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/bg/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/bg/thunderbird-102.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3c3995a3c75d7100d3b5a37de7d96032b41365cc27337af3f90bc01c318c621b"; + sha256 = "1a98a96b8da3d6d6ae642c19a9ce5f29d6f0f9a68a016a60ce179ad080feb40d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/br/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/br/thunderbird-102.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a390683e704cafa6b594028c02db0729519688b14284cbf4e23af06d797030b6"; + sha256 = "50f2bb8baa7db5f863f9a05569b45516c217a6454d48a5042442bd59237a79a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ca/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ca/thunderbird-102.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bae799d097b2a072b4f8ecee6dd18b91a07d08f070da39a22dbd669bffa9cb33"; + sha256 = "4ec8300f818e3e623dfd5bb84ba8e5682b1481acbcc24cc40c7c893f7843dad6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cak/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/cak/thunderbird-102.8.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "68af639a2d228cc8925702ab32c8f7e6fd9ed48c83111325d93b477811177f80"; + sha256 = "73e38bb0cc6c77563de93b763e082ec0799c37920b35fac6acc14091ad90bc91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cs/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/cs/thunderbird-102.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "191ec59655ec025ca02360710b180899bb3486910b5c6721165b4cc8ec78f9b2"; + sha256 = "3cf10ca513bc83cb327d450ea66ea70d2ed891c7d22f7cbd4bb151d48265ba47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cy/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/cy/thunderbird-102.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a65d91c31430b9b0b138014135d23d56e4ecd849aec398539c6dadb63fdbf03c"; + sha256 = "dc530f8efe020b87e257de80e781e86c6b102114eead16e86642964df9d4e290"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/da/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/da/thunderbird-102.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9306558c123903497e2e5ad7968aa69e94b9c4e809f6f5b4d35b9aafcbc75ed0"; + sha256 = "54bcabdff268df1a8f8e4aade54866283da0e031b62def9e535bb6eaa92cc97b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/de/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/de/thunderbird-102.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ab06a47e5472db33702187a88bd8a794632809977632bf129f3d980b8a06ceb5"; + sha256 = "8045387afd1c74a2041be37ef67fa8bbdf0e0c05f66a0772d4828fd1ba889caf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/dsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/dsb/thunderbird-102.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "05adea0c112d5d481990a7960de93c7a61d055f8268cbf617b295f86daaeb5b9"; + sha256 = "b9b708de0e810844bd3573951234a134c29cf122ebf239c0ff74fe51dc3e5a3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/el/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/el/thunderbird-102.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6d4d1913ae19fa528aa6986c617226d30cd46099825afb2bae83b052f5aac490"; + sha256 = "c0beca9e0e4e98c21908029c04b84b8c9e4a08a2f9aef8bf016c98b50410e126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-CA/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-CA/thunderbird-102.8.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9919702fe73038c05cbcdf747126b22b7b4fd62549ad4d1361ef85fe6aa92f71"; + sha256 = "2b3a93b4194a29c38b41cf3ecab924303ff55f475b9a59395971a03a81e7af08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-GB/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-GB/thunderbird-102.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5d8b8bcf27c67d6a0c70bb6754167474e9bd9fb7489f1fd21f3754d27d872326"; + sha256 = "ae3cd3135dfce0be827e1a16f3be6a09301a95c976acbe382be9bb74115b4ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-US/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-US/thunderbird-102.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b24ea963c7e09d1f69b1297a6f86a7d0462403a9172d81ef47c375141d54cce9"; + sha256 = "c6e2f9c987e9c5987bc555ea6b5647e5048543170d39123e14619b31a087fdad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-AR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/es-AR/thunderbird-102.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1617dc229307d42e1a60ea44f359a62f042f53064360dac7ffd59b6a7c90da41"; + sha256 = "a59fd6d68562ad3debb66c2253270edd1b6e87c0f060fc6b73ecb87849d2f965"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-ES/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/es-ES/thunderbird-102.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9f19e6654ff4e2eab1d9f7ee555da87c270e60cffb820b000b7892583f4faf6f"; + sha256 = "5bc63628e1c4b2735ababbc9732a25f1cfe14137753b547024ca6e4286b71db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-MX/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/es-MX/thunderbird-102.8.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7b055cfb21573399df99e4d6884cb4c61ce2221ac8ea463d1d2b7115d97ece2a"; + sha256 = "894aa1d22f69f270657f9dd8448950bf9301e369e28313179bc4708b66b6f014"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/et/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/et/thunderbird-102.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "cbeef98898969cd7b858bb127c6ca8b6b9888cda0e230e303a8c4c777a30d151"; + sha256 = "5249066b7d6d19e964c1bbb452749f0a79b11f5d462c208c123c10a7884cf69a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/eu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/eu/thunderbird-102.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5e8160115595350cf5b0a44e71c09d32fbac65ffda9ac6f22cb5e910d18462c1"; + sha256 = "aed52a4d32b18e95936610af1f2f5830c8c06159e62fbae124396e865deab7cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/fi/thunderbird-102.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "291883c64f376bad4b6345864d10f0e067123589a2b30f38dc24a99b25854949"; + sha256 = "e848d5d478f57e0213be2a550aee1d15c3090b1683c0de28e6ff5c32c9b33753"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/fr/thunderbird-102.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b57f6a1f499a009176cd894df6fa9fd151b707b63aec8dfb62e426a294c53d4"; + sha256 = "7e22ca894d4f742b3555cf1057cd7e97f0968408bce07f21c655b7265026326a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fy-NL/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/fy-NL/thunderbird-102.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6e355a646c8dd77c72fe16c896c25572c9b87c4806364836b3681407bf7941b7"; + sha256 = "5562b6fcf035387ef3f5369fe2edd406cdb6417786a2a044ba8e582fe33094b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ga-IE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ga-IE/thunderbird-102.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fc2b1fbfc5aeb15082e656c01a71943045233ee593c3e1710440a79f50d4c0cc"; + sha256 = "eaa935bb3a977a10571268ef9c0e30a9560a273bf100dd8bcaf86333b39c4a74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gd/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/gd/thunderbird-102.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "e8be8dba1751fb4633dc5bef4a047b3ff85ed9e799b89669f26f8e0e3125e30a"; + sha256 = "b3c7eb3ddaeb76e1e3dd298962ded700717fb71a600f02c6275839875253a821"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/gl/thunderbird-102.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "78ffb29b73629b7d319bf752471608e3d44624b5b99b6eaea7f241901d623a05"; + sha256 = "642af77ea5002d4d649369e08d55e866cb99fd2f991975a111a79a4b9108cb3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/he/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/he/thunderbird-102.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3bb4469702756c39cb70b0639b825e922d769a9aae7e78f296d8188b039499b6"; + sha256 = "d50515d49dc86d39715a8b673dd3e384eb5e4b2210ce62abaa6c5849fee8b29e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hr/thunderbird-102.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "acd95b3717e6b617212c75be3b9e0b193f33cf5e5636d2ea535a720006f7cfe8"; + sha256 = "1fe0639429f6de5e6df096acbdbcb04ec9b83e971c1667cf008e4cfa3830062f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hsb/thunderbird-102.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7c65d7f28c713723c58ed62715404224b8f4163a1915f702d125f827e642b509"; + sha256 = "d9655265dd36ad5300e1d5daf471a7d9393e21fa94c8b7c12995c5f9cf955a02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hu/thunderbird-102.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6d206289e4e8ef8db85c29ec001b91add5eac67bca3d7f5eb42099cdc9934c6b"; + sha256 = "16f2cb8efce4333fda4daef686956622e24e828c6b8f0493b1025fb3581a6322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hy-AM/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hy-AM/thunderbird-102.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8823ea085d97bedddb4ea16517626dae9747db2450900eaa102139121eacc5fb"; + sha256 = "cd31deaae27fca3afeb71ccd092c13b68a1f9afbfd3cf0bd8e569879d55a0da9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/id/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/id/thunderbird-102.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e6fc35cb393f7a0cd63625700e11c313124a2542cebd431159e065c826581176"; + sha256 = "3535fe394cb67f5047e78ae5cf75b8fb0a861fe2a5d942b8ab12961b0ee1ea6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/is/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/is/thunderbird-102.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f92db50f2f743436373da51e2f3b9bba7c4f6943254a70e7459ebb7d90dba3a0"; + sha256 = "32066d8612387fc80375f4514b3a01dd7d74eeb7fca6769699f7344b6c8ab3cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/it/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/it/thunderbird-102.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9cbf3eeb035ddd0f60c3404efc79faccb454fe406467a3c66d71b6ad4e87389e"; + sha256 = "f602713708789fe391c638fd9049603b6a9e8303ba2608911569f4fce8c005eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ja/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ja/thunderbird-102.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "38c5621f8b32d55b67a79103704541b14599bc67090216a9561ac1cb4c311bd8"; + sha256 = "a95845637e8083a28a207554ac3400eb8fb19b3e31d4a2d1982b96154bdaf945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ka/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ka/thunderbird-102.8.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "05b906fba741580368f52b7ddbc4772181f4d1fb4ecca20c94bfa0d41364383b"; + sha256 = "d8942afa3552a41fcc12b24295432e0f83721e4df210b1a43096535b3d5944f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kab/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/kab/thunderbird-102.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a225ab4d086e1b21afa6d0d1d8b33434832f37c7bfc4982d2024783111cd7d01"; + sha256 = "d06565f2512596a2b964cc7efc17d67061882966ece76ab1bc1a76991a3f629c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/kk/thunderbird-102.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "38f0349f890702adf3f6854893e3a8bec5d6244ecbd69b86fa839f417a9e86c8"; + sha256 = "273258bf7fd75b25521bb79dcb4f9b5491a7fa8b76eebc6fe82b1f6a3554f9ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ko/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ko/thunderbird-102.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d838976ac2902cd6cd055480a1f4b7510abb83cb2448b64fb36d600525a90a88"; + sha256 = "9c6644f489f4b8e7f016df15d8d04d63931a4f47e6136ffd108c250d73494b67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lt/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/lt/thunderbird-102.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "14e66fca1018cdc74b7bb50c46def97b0c6f25d667f869fc0c17d8ac16d7cc5d"; + sha256 = "ac5a4b5da556278928fa795cc47e2db88a5336b2e12bc3a00f9db17e68c41365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lv/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/lv/thunderbird-102.8.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6b7fa2d6c712b373f5013f3acf875f8ea8b8fdb582b6759e96469094b375540f"; + sha256 = "d00c5f721bccf20957eefeca50ed1a71251d1672d659e43c809465b303099da3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ms/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ms/thunderbird-102.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fc42cae3d6ba0910df7aaa2c1df8391e70da60a093aaff60287503feaae37260"; + sha256 = "77a17b05cf63e0565c697c23889e84a548397b41f307f1f57d0ca965c1932b24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nb-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/nb-NO/thunderbird-102.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0ffb1b18c916f9c27e5ba3ab8bb5ee3107e37f983c2645a1955e9a4904cd8c47"; + sha256 = "c4c7b9d061188db625ff7dd7a9f0552583625c9c5fbb77269d8c6018849ee1e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/nl/thunderbird-102.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "fcd3a85abbff759ed27c314f0b9d47d1a216ebe9bdaa3926885be81b31fdcc5a"; + sha256 = "474ca230c6749d0de8162268bd18b34f98b10da1aae91ef241f99aeb77f335b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nn-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/nn-NO/thunderbird-102.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "affde5a378f0ac70d48d7e4c75f6b2f680517cb2106a28aa4a53e376349b43d3"; + sha256 = "39a215f35617f2b3ebe6b5215ca231edde9938c047f04928f69966786adb8eea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pa-IN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pa-IN/thunderbird-102.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "81984847af5c43eeb35870d39eb6e006d8b9df35b5e03135670973ae6f5f7d1d"; + sha256 = "9f3bf27d34cea4c0409c6b0a7861f38650107a3458fc5b3a35806a3c49974fe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pl/thunderbird-102.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4710f6042126da09159cb5d465909bea3dff62753b6c5811f8920ca7782bcf73"; + sha256 = "a25766f5c924bcc77499eb87f83ff91f3ac3cdd3a97416827fd0bf7f74b5761e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-BR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pt-BR/thunderbird-102.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "92c564bb0623a9a258fefdacd7a76a3e636ca5211f962c3b3a68cfb16cc5217a"; + sha256 = "6c5b0f5250b8fed7e5b53c8f3c4b55fa122d4c3360aeb4393d2af3c1f9b11f72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-PT/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pt-PT/thunderbird-102.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "37fb096c984cd78174def41da70d0c352536b1780a817731759f35ac3554e330"; + sha256 = "b0f99ef79a979e45764a59f5ba75a52bffd750586c18caccf44aa5e36c7a90d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/rm/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/rm/thunderbird-102.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b72355afb5333ef44336d4686141a44b4f291edf110c75168070959380bbac58"; + sha256 = "90225e33183ed0bae5e2dbe47c072f703dce5a1673e3b5f0c25acba0ea611af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ro/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ro/thunderbird-102.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8536fa781ea743fce1379137da66394ce1f79ccce4daf4f9d5e2c28432c94466"; + sha256 = "ca68f9b3fdd149067998240e42ce6d64066b32a4d3455b079e0847ed225d13e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ru/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ru/thunderbird-102.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "69b0d192d7cb04aedff4f356e9520ef6ce5f8125fc2309c60a1e6073dee64cc3"; + sha256 = "880109a31e6d0fa7a66465a1b480e08311438193bb256a0c6d97dcf3788ecf9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sk/thunderbird-102.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0a1c3955f1ccd027a45249b7d0d44f40fa8a47c680dcd0411d04cf8dacfacad2"; + sha256 = "f30784a7b41c4e1d08331f366f390cdacd79542841b486cb84efbc0268ba1ea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sl/thunderbird-102.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e9659cb2099dd02c1a990914383f75569b01a1f39f1f79c1dd60b24129c0986c"; + sha256 = "e94321812047fdf7015d38bb1001a7ac476e67ffc428451a3f361abe62a7bba5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sq/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sq/thunderbird-102.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "080493bf33a13e2e705d8200f8b6edf4f85ba292881d71df4dd38600fee105da"; + sha256 = "0debbcc0772c8184ceb4b3dd8658a7808f1ac0e7c1b3b83b0229a4283c345223"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sr/thunderbird-102.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "dd1efccc8bfba45aef4e25d872652b39a05de669e57aa30827b09574968f4ab7"; + sha256 = "db48cc5e315519b65cd36b67ed9652397a050fccbebf68e608f5ab64cea4300f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sv-SE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sv-SE/thunderbird-102.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f04fee4bbcdcf35c18be80c3a0d5cfde8cd3c918854c254f775272a3a005e2e6"; + sha256 = "cbe5fc9e42a824c8bcc78d1dc20d519b7db4f380a3a897b98f8ef8cfad57cc41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/th/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/th/thunderbird-102.8.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "841d28387ddcc3fdbaec217a8bc987bbed43a735b1d0ffe2eeb8b6fa58458f47"; + sha256 = "0f72fb98688da2dd9b457b747504d7b937d4f8680192ac13e08220f6fb52a48c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/tr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/tr/thunderbird-102.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e4d793ff7e738389aabc7ec9d6893e2e4162e63996c36341f64af570b26f5f6a"; + sha256 = "3ac2b0a3e8d65a2101a8a599a349d03250afe343ed82cd81b94f481edc3a5e04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/uk/thunderbird-102.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "03fecaf497d2a4188474e4ee6a0fcf084a32d0903fa041cbe39eab29421f7276"; + sha256 = "30d6b00ddc305022e4dd9a6fe759be5d34df1968108b6ce9165ea3d14bc31dd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uz/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/uz/thunderbird-102.8.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d463b9108838a61c153ae4a8fc69fb805881589b441206c08e583289ef18c314"; + sha256 = "946be925d11a5721d8c875ffed36f33d51ce46d2797899c0c385c4816cca38d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/vi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/vi/thunderbird-102.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8f7cb20aa60e27c1b776ea03842f38629044b6ee1c3c49df172c774cc387f409"; + sha256 = "ad260c10d05b5656ff86e24b2ea5df7110840954b84caf388c1af8d55c38ebdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-CN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/zh-CN/thunderbird-102.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "90d52ae6329d04ddfa8f37d5f54f98ee0893ece5a7c73c550fbea568538c7485"; + sha256 = "20321d57e7ed909cf6ebdf9e349b6fbd91fb3d3ce4a4b6ba42d28693c3454644"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-TW/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/zh-TW/thunderbird-102.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "35b625402841a21a128eaf7c92ff277c996d6ff07f269fdf92f0d6cb3e04876c"; + sha256 = "4cab4bd41dc1424f442b141546b0d9b0122afd21fdf0decbee9b6151522bb48a"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 49985ac7bdb25..2b3678de27266 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.6.1"; + version = "102.8.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83"; + sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8"; }; 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 a2972f9bfb961..6b5e8a254c89a 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.106.4"; + version = "3.108.12"; 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-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; + sha256 = "sha256-ZXQCth5nhCkEZI348057cRjzFWl/IEytQmkmBuJzw3w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 15dc909aa6466..1bda56c542019 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 +, libGL, 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) libGL libnotify libappindicator wayland ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 6a705959a11e4..c9b6ac807a050 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -71,7 +71,7 @@ let ++ lib.optional (!pipewireSupport) "-D pipewire=OFF" ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON"; - NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd}/include/speech-dispatcher"; postFixup = '' wrapProgram $out/bin/mumble \ diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 4592d17d348fb..41ff2b74a0640 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -15,16 +15,12 @@ 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. - lib.optionalString stdenv.isAarch64 '' + preRebuild = lib.optionalString stdenv.isAarch64 '' rm -rf node_modules/oracledb ''; diff --git a/pkgs/applications/networking/n8n/fix-permissions.diff b/pkgs/applications/networking/n8n/fix-permissions.diff deleted file mode 100644 index 81a5a4ee6465d..0000000000000 --- a/pkgs/applications/networking/n8n/fix-permissions.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 0e9f619b1ffe2..0b08453a96254 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.0" = { + "@azure/core-client-1.7.1" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; - sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; + sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; }; }; "@azure/core-http-2.3.1" = { @@ -67,22 +67,22 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.5.0" = { + "@azure/core-lro-2.5.1" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; - sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; + sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; }; }; - "@azure/core-paging-1.4.0" = { + "@azure/core-paging-1.5.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; - sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; + sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; "@azure/core-rest-pipeline-1.10.1" = { @@ -193,13 +193,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.32.2" = { + "@azure/msal-browser-2.33.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.2"; + version = "2.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; + sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; + }; + }; + "@azure/msal-common-10.0.0" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; - sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; + sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; }; }; "@azure/msal-common-4.5.1" = { @@ -220,15 +229,6 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@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"; @@ -238,13 +238,13 @@ let sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; }; }; - "@azure/msal-node-1.14.6" = { + "@azure/msal-node-1.15.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.6"; + version = "1.15.0"; 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=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; + sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -256,13 +256,13 @@ let sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/parser-7.20.13" = { + "@babel/parser-7.20.15" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.13"; + version = "7.20.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; - sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; + sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; }; }; "@babel/runtime-7.20.13" = { @@ -292,22 +292,31 @@ let sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; }; }; - "@codemirror/lang-javascript-6.1.2" = { + "@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.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.2.tgz"; - sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ=="; + 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" = { + "@codemirror/language-6.5.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz"; - sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.5.0.tgz"; + sha512 = "dI+dV/u2klIt0Y9kE3TH9vuBidAB3xuuDPofwzvnW8ZKqJnKTbT3EjyV7DeKcmrRgXMhlPTL7AdH1V5KOCYuHQ=="; }; }; "@codemirror/lint-6.1.0" = { @@ -328,13 +337,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.7.3" = { + "@codemirror/view-6.8.1" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.7.3"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz"; - sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.8.1.tgz"; + sha512 = "bXWs42i1mnBexaktPABaEpYbt4FbJMnlesObDLF0GE8poRiNaRgm7H/2NfXfD5Swas1ULdFgONLLs4ncwHuz8g=="; }; }; "@colors/colors-1.5.0" = { @@ -409,13 +418,13 @@ let sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.1" = { + "@fortawesome/fontawesome-common-types-6.3.0" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; - sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz"; + sha512 = "4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg=="; }; }; "@fortawesome/fontawesome-svg-core-1.3.0" = { @@ -427,13 +436,13 @@ let sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; }; }; - "@fortawesome/free-regular-svg-icons-6.2.1" = { + "@fortawesome/free-regular-svg-icons-6.3.0" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz"; + sha512 = "cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg=="; }; }; "@fortawesome/free-solid-svg-icons-5.15.4" = { @@ -607,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"; @@ -643,6 +697,15 @@ let sha512 = "SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="; }; }; + "@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"; @@ -652,6 +715,15 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; + "@lezer/html-1.3.1" = { + name = "_at_lezer_slash_html"; + packageName = "@lezer/html"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.1.tgz"; + sha512 = "mxmArW0psdJ3Vd3bZvCbrFpd7gNJgTjqTLhFZfTPo3jsw0STaQ68EWVWBQInv9W8j94XKaL2sbO3qixicFMnYw=="; + }; + }; "@lezer/javascript-1.4.1" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; @@ -661,13 +733,13 @@ let sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; }; }; - "@lezer/lr-1.3.1" = { + "@lezer/lr-1.3.3" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.1.tgz"; - sha512 = "+GymJB/+3gThkk2zHwseaJTI5oa4AuOuj1I2LCslAVq1dFZLSX8SAe4ZlJq1TjezteDXtF/+d4qeWz9JvnrG9Q=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz"; + sha512 = "JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -742,13 +814,13 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@oclif/command-1.8.21" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; - sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.18.6" = { @@ -760,6 +832,15 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; + "@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"; @@ -796,13 +877,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/screen-3.0.4" = { @@ -949,49 +1030,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.33.0" = { + "@sentry/core-7.37.1" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.33.0.tgz"; - sha512 = "mrSgUnXjxHVi0cVea1lv7gC/Y66ya2a3atCHaPEij/+l+3APg5d0Ixt1zMx5YllMiZKf6wpxlZ0uwXcqdAAw+w=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz"; + sha512 = "eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ=="; }; }; - "@sentry/integrations-7.33.0" = { + "@sentry/integrations-7.37.1" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.33.0.tgz"; - sha512 = "r67/9R+DaOZETg7gRvOuYPo5XQdzEaE8f7OaET071dUP0kyUBjO74Y7SZxZV/xjBthMXexw5TANHmLVrZQQVag=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.37.1.tgz"; + sha512 = "/7VZXw7/DxZPsGNEaU/gcKRNPtmK75mz9oM71C5UbRDDEdFSEeVq2jG+tOq2lIsd2VQlsAmN3DG5yqiGA9C4eQ=="; }; }; - "@sentry/node-7.33.0" = { + "@sentry/node-7.37.1" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.33.0.tgz"; - sha512 = "isQVF9LLSG4EZLHiSJ3chgK6f3ZBdGxm8fX6YGm8HWz07CubJddes3yBPLPRNXrRLd7X3SK8pPcK5oc3LIKqAw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz"; + sha512 = "nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA=="; }; }; - "@sentry/types-7.33.0" = { + "@sentry/types-7.37.1" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.33.0.tgz"; - sha512 = "5kkmYjtBWSbPxfYGiXdZFPS6xpFBNlXvDqeX4NpCFXz6/LiEDn6tZ61kuCSFb8MZlyqyCX5WsP3aiI2FJfpGIA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz"; + sha512 = "c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="; }; }; - "@sentry/utils-7.33.0" = { + "@sentry/utils-7.37.1" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.33.0.tgz"; - sha512 = "msp02GV1gOfaN5FjKjWxI00rtbYLXEE5cTGldhs/Dt9KI63dDk1nwPDkSLhg6joqRItAq0thlBh6un717HdWbg=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz"; + sha512 = "/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA=="; }; }; "@servie/events-1.0.0" = { @@ -1012,22 +1093,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.28" = { + "@swc/core-1.3.35" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.28"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.28.tgz"; - sha512 = "yzc61HbAIjHeOYTUW/IgXAywlSviMFymnUiLY7dNUELGHjMVxSp0XnIlPQN4v5UekYbwLEV8+KChaoQRACiQCw=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz"; + sha512 = "KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w=="; }; }; - "@swc/wasm-1.3.28" = { + "@swc/wasm-1.3.35" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.28"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.28.tgz"; - sha512 = "6RDkQHSi6FxaoPmGnzMq5smYxXlcEec+t6EHrv8rk4emIrnsFjSc2D2PQ0K4xoryJn2NVD3cDbAEVHe6XZX5AQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.35.tgz"; + sha512 = "8xBOgl9eziAuqF4HYwYx4Kh6eHfOQECvO0ZMlrFNW0jgE+ntqxcRjBhuzZ6iWb24nifzXbuGLQntbns4IJYJgQ=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1111,6 +1192,15 @@ let 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"; @@ -1156,22 +1246,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.16" = { + "@types/express-4.17.17" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.16"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; - sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; - }; - }; - "@types/express-jwt-0.0.42" = { - name = "_at_types_slash_express-jwt"; - packageName = "@types/express-jwt"; - version = "0.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz"; - sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; "@types/express-serve-static-core-4.17.33" = { @@ -1183,15 +1264,6 @@ let sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; - "@types/express-unless-2.0.1" = { - name = "_at_types_slash_express-unless"; - packageName = "@types/express-unless"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-2.0.1.tgz"; - sha512 = "PJLiNw03EjkWDkQbhNjIXXDLObC3eMQhFASDV+WakFbT8eL7YdjlbV6MXd3Av5Lejq499d6pFuV1jyK+EHyG3Q=="; - }; - }; "@types/js-nacl-1.3.1" = { name = "_at_types_slash_js-nacl"; packageName = "@types/js-nacl"; @@ -1210,6 +1282,15 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; + "@types/jsonwebtoken-9.0.1" = { + name = "_at_types_slash_jsonwebtoken"; + packageName = "@types/jsonwebtoken"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; + sha512 = "c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw=="; + }; + }; "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; @@ -1246,13 +1327,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.11.18" = { + "@types/node-18.13.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.18"; + version = "18.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"; + sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1327,6 +1408,15 @@ let sha512 = "7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg=="; }; }; + "@types/triple-beam-1.3.2" = { + name = "_at_types_slash_triple-beam"; + packageName = "@types/triple-beam"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz"; + sha512 = "txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="; + }; + }; "@types/tunnel-0.0.3" = { name = "_at_types_slash_tunnel"; packageName = "@types/tunnel"; @@ -1336,13 +1426,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/validator-13.7.11" = { + "@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.12" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.11"; + version = "13.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz"; - sha512 = "WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz"; + sha512 = "YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1867,13 +1966,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1301.0" = { + "aws-sdk-2.1313.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1301.0"; + version = "2.1313.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1301.0.tgz"; - sha512 = "AxCt0GfWV14AWC0yvN3+WEBr45JMu2X3FHb8r3H8EhZjJfHk3hWcDwu6vS5Qd8NFDATlFdWJfyQjPVU1YuaDfw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz"; + sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1993,13 +2092,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.0.1" = { + "better-sqlite3-8.1.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; - sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; + sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; }; }; "big-integer-1.6.51" = { @@ -2281,13 +2380,13 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; - "bull-4.10.2" = { + "bull-4.10.4" = { name = "bull"; packageName = "bull"; - version = "4.10.2"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz"; - sha512 = "xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ=="; + url = "https://registry.npmjs.org/bull/-/bull-4.10.4.tgz"; + sha512 = "o9m/7HjS/Or3vqRd59evBlWCXd9Lp+ALppKseoSKHaykK46SmRjAilX98PgmOz1yeVaurt8D5UtvEt4bUjM3eA=="; }; }; "busboy-1.6.0" = { @@ -2632,13 +2731,22 @@ let sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; }; }; - "codemirror-lang-n8n-expression-0.1.0" = { + "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.1.0"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.1.0.tgz"; - sha512 = "20ss5p0koTu5bfivr1sBHYs7cpjWT2JhVB5gn7TX9WWPt+v/9p9tEcYSOyL/sm+OFuWh698Cgnmrba4efQnMCQ=="; + 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" = { @@ -2875,13 +2983,13 @@ 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.4" = { @@ -3307,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" = { @@ -3334,13 +3442,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.4" = { + "define-properties-1.2.0" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; "degenerator-3.0.2" = { @@ -3703,15 +3811,6 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; - "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=="; - }; - }; "entities-4.4.0" = { name = "entities"; packageName = "entities"; @@ -3991,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"; @@ -4009,15 +4117,6 @@ let sha512 = "tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ=="; }; }; - "express-unless-2.1.3" = { - name = "express-unless"; - packageName = "express-unless"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express-unless/-/express-unless-2.1.3.tgz"; - sha512 = "wj4tLMyCVYuIIKHGt0FhCtIViBcwzWejX0EjNxveAa6dG+0XBCQhMbx+PnkLkFCxLC69qoFrxds4pIyL88inaQ=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -4576,6 +4675,15 @@ let sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; + "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-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; @@ -4891,13 +4999,13 @@ let sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; }; }; - "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-errors-2.0.0" = { @@ -4945,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"; @@ -4981,13 +5098,13 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; - "ics-2.41.0" = { + "ics-2.44.0" = { name = "ics"; packageName = "ics"; - version = "2.41.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/ics/-/ics-2.41.0.tgz"; - sha512 = "6oleMfOpdBIrZGMNrTutwW7eFwua8lOkymDNxMXlsVF00HghqH+I3S6frt3a2rfjXTlkI0qiY2rnsKP2JQ9vJA=="; + url = "https://registry.npmjs.org/ics/-/ics-2.44.0.tgz"; + sha512 = "JeiPjNeWkd7Qri/wfHqjZCtglVwRJRqy1MEFKn9QzatzxUyCOsx4YARPlLkU8UnPxpg4VtEjR+VRUG+Cvj6bDg=="; }; }; "ieee754-1.1.13" = { @@ -5107,13 +5224,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "internal-slot-1.0.4" = { + "internal-slot-1.0.5" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; + sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; }; }; "interpret-1.4.0" = { @@ -5134,13 +5251,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.6" = { + "ioredis-5.3.1" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.6"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.6.tgz"; - sha512 = "F1xO+kYIz+TCOccvhThs2pem6sc9uTl9JsZybWpqe4FeCFDmf04XwbLQUGIqi2UWaDUuR61w2dhxx6NJEFehOA=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.1.tgz"; + sha512 = "C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg=="; }; }; "ip-1.1.8" = { @@ -5638,6 +5755,15 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; + "jose-4.11.4" = { + name = "jose"; + packageName = "jose"; + version = "4.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jose/-/jose-4.11.4.tgz"; + sha512 = "94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ=="; + }; + }; "jquery-3.6.3" = { name = "jquery"; packageName = "jquery"; @@ -5647,13 +5773,13 @@ let sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; }; }; - "js-base64-3.7.4" = { + "js-base64-3.7.5" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; - sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; + sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; "js-md4-0.3.2" = { @@ -5845,15 +5971,6 @@ let sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; - "jsplumb-2.15.4" = { - name = "jsplumb"; - packageName = "jsplumb"; - version = "2.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.4.tgz"; - sha512 = "QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g=="; - }; - }; "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; @@ -5881,13 +5998,13 @@ let sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; }; }; - "jwks-rsa-1.12.3" = { + "jwks-rsa-3.0.1" = { name = "jwks-rsa"; packageName = "jwks-rsa"; - version = "1.12.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.12.3.tgz"; - sha512 = "cFipFDeYYaO9FhhYJcZWX/IyZgc0+g316rcHnDpT2dNRNIE/lMOmWKKqp09TkJoYlNFzrEVODsR4GgXJMgWhnA=="; + url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz"; + sha512 = "UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw=="; }; }; "jws-3.2.2" = { @@ -5926,6 +6043,15 @@ 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"; @@ -5971,13 +6097,13 @@ let sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.18" = { + "libphonenumber-js-1.10.19" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.18"; + version = "1.10.19"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz"; - sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz"; + sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg=="; }; }; "libpq-1.8.12" = { @@ -6349,13 +6475,13 @@ let sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; }; }; - "logform-2.4.2" = { + "logform-2.5.1" = { name = "logform"; packageName = "logform"; - version = "2.4.2"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"; + sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; }; }; "long-4.0.0" = { @@ -6430,13 +6556,13 @@ let sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; }; }; - "lru-memoizer-2.1.4" = { + "lru-memoizer-2.2.0" = { name = "lru-memoizer"; packageName = "lru-memoizer"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz"; - sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; + url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz"; + sha512 = "QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw=="; }; }; "lru_map-0.3.3" = { @@ -6448,24 +6574,6 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-2.3.2" = { - name = "luxon"; - packageName = "luxon"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; - sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; - }; - }; - "luxon-2.5.2" = { - name = "luxon"; - packageName = "luxon"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz"; - sha512 = "Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA=="; - }; - }; "luxon-3.2.1" = { name = "luxon"; packageName = "luxon"; @@ -6547,6 +6655,15 @@ let 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"; @@ -6745,13 +6862,13 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimist-1.2.7" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; "minipass-3.3.6" = { @@ -6763,13 +6880,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.0" = { + "minipass-4.0.3" = { name = "minipass"; packageName = "minipass"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.3.tgz"; + sha512 = "OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw=="; }; }; "minipass-collect-1.0.2" = { @@ -6844,6 +6961,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"; @@ -6898,13 +7024,13 @@ let sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mongodb-4.13.0" = { + "mongodb-4.14.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; - sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.14.0.tgz"; + sha512 = "coGKkWXIBczZPr284tYKFLg+KbGPPLlSbdgfKAb6QqCFt5bo5VFZ50O3FFzsw4rnkqjwT6D8Qcoo9nshYKM7Mg=="; }; }; "mongodb-connection-string-url-2.6.0" = { @@ -6970,13 +7096,13 @@ let sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; }; }; - "msgpackr-1.8.2" = { + "msgpackr-1.8.3" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; - sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; + sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; }; }; "mssql-7.3.5" = { @@ -7033,49 +7159,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.151.2" = { + "n8n-core-0.154.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.151.2"; + version = "0.154.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.151.2.tgz"; - sha512 = "QIGNeKuRuY+G+kPxDShjXnxVjCMCEbZ6xB530+V30s2MFa+XnEKJtPdLbsCr0j8AUTHqEb/oMkHAoEyPPg8M1g=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.1.tgz"; + sha512 = "LpwNxGxGpHrA3fJNeAL7qVAKrXj88MDWuK40JVnLXGgnWjdy9M8Gpz0ucHXBRuN0HxeCpCA+59edNsDUUaBAsQ=="; }; }; - "n8n-design-system-0.51.1" = { + "n8n-design-system-0.53.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.51.1"; + version = "0.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.51.1.tgz"; - sha512 = "zK4UI/LkdRzAGZfL9K7/tZSLjxXTIKgt/72LrgEJ8CGNxYPavk0f7eYTH9Q8tbcLAaMLDjUcbcdzVEWh5YZofA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.53.0.tgz"; + sha512 = "QTPcnNOv9sp9RzT0I4cuB2lqEmHJrv+TBV1D8mZ3upas7ZMdNVLhGiRM8EgbeQoY5jsKlTA3nagTflNQy8H/tw=="; }; }; - "n8n-editor-ui-0.178.1" = { + "n8n-editor-ui-0.181.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.178.1"; + version = "0.181.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.178.1.tgz"; - sha512 = "bpSRVRys6fIAuhsmxQrU2QXP0UaRfGan+wODcZbX8SnWSG90ANN7R++CvS6tfL+i8vKvDzLYFjWlm1y40Esbag=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.1.tgz"; + sha512 = "NmkTic2XLgAgx/sKsKd8kPDuEuj7roBXT1uLcFdlz+mnn4LN12GFFyHO6GrOJC3lYA6SY6QQZ475/EpNsMzqLw=="; }; }; - "n8n-nodes-base-0.210.1" = { + "n8n-nodes-base-0.213.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.210.1"; + version = "0.213.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.210.1.tgz"; - sha512 = "UvkjbmJoBtgqHMz+ff7AJYnVcRpPLY7rh0OPQSR3B6BQ7lzE9eBaBpfTvtIopxRwKeK3vke9UUb6ztdkgDaBDw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.1.tgz"; + sha512 = "diU4FVseBaJ3wC/57o/snFHv19KMrWv3bxadFfpMDHYN1u6YB4L3GacpNgBE1CLPgGIptlVNhVJ4USInIIVDrw=="; }; }; - "n8n-workflow-0.133.2" = { + "n8n-workflow-0.136.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.133.2"; + version = "0.136.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.133.2.tgz"; - sha512 = "XnNmt5idpqb/7nVFtNCS4RQUDMfIslfepl2WJfwa/0jSQYWaJmFWhV0OmIj3mJTWaLaiy1qDjAEaEYZZBaQ69A=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.1.tgz"; + sha512 = "Y7v72erInEIlXGjdUzJD/Cj4qagmNx6w5jqLCb/Z/t2VHBEXrBasHAA96leiVwx9VILlaMXMK/p6PJz3NNnpNA=="; }; }; "named-placeholders-1.1.3" = { @@ -7186,13 +7312,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.31.0" = { + "node-abi-3.33.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.31.0"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz"; + sha512 = "7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog=="; }; }; "node-abort-controller-2.0.0" = { @@ -7204,13 +7330,13 @@ let sha512 = "L8RfEgjBTHAISTuagw51PprVAqNZoG6KSB6LQ6H1bskMVkFs5E71IyjauLBv3XbuomJlguWF/VnRHdJ1gqiAqA=="; }; }; - "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-4.3.0" = { @@ -7231,13 +7357,13 @@ let sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; - "node-fetch-2.6.8" = { + "node-fetch-2.6.9" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; }; }; "node-forge-1.3.1" = { @@ -7330,13 +7456,13 @@ let sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; - "nodemailer-6.9.0" = { + "nodemailer-6.9.1" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz"; - sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz"; + sha512 = "qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA=="; }; }; "nopt-5.0.0" = { @@ -7564,13 +7690,13 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.4.0" = { + "open-8.4.1" = { name = "open"; packageName = "open"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; + sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; }; }; "openapi-types-10.0.0" = { @@ -8005,6 +8131,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"; @@ -8014,13 +8149,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" = { @@ -8068,22 +8203,22 @@ let 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" = { @@ -8131,13 +8266,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.0.29" = { + "pinia-2.0.30" = { name = "pinia"; packageName = "pinia"; - version = "2.0.29"; + version = "2.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.29.tgz"; - sha512 = "5z/KpFecq/cIgfeTnulJXldiLcTITRkTe3N58RKYSj0Pc1EdR6oyCdnf5A9jLoVwBqX5LtHhd0kGlpzWvk9oiQ=="; + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz"; + sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; }; }; "popsicle-12.1.0" = { @@ -8257,13 +8392,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.2.3" = { + "posthog-node-2.4.0" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.2.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.3.tgz"; - sha512 = "dYlLZhrDus+uRov/Hh+EiRlMoMhRKchNjNa7mNE2iWmKg/ryOTipf0XYKS9UKdki7aU1NzWFhnLe11HF615XuA=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz"; + sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q=="; }; }; "prebuild-install-7.1.1" = { @@ -8284,6 +8419,15 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; + "prettier-2.8.4" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"; + sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; + }; + }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -8419,13 +8563,13 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.2.0" = { + "protobufjs-7.2.2" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.0"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; - sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.2.tgz"; + sha512 = "++PrQIjrom+bFDPpfmqXfAGSQs40116JRrqqyf53dymUMvvb5d/LMRyicRoF1AUKoXVS1/IgJXlEgcpr4gTF3Q=="; }; }; "proxy-addr-2.0.7" = { @@ -9049,13 +9193,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" = { @@ -9355,13 +9499,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.17" = { + "snowflake-sdk-1.6.18" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.17"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.17.tgz"; - sha512 = "ui2zRPbXIK3qaW8zuQCy+mHTieN6U5yeoJmKkyhdnh/8qKOqfR9Csj5nv+bXm8Y64kG24sybtIfCzf8C9abUMQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz"; + sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ=="; }; }; "socks-2.7.1" = { @@ -9634,6 +9778,15 @@ 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"; @@ -9661,6 +9814,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"; @@ -10012,13 +10174,22 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; - "tinycolor2-1.5.2" = { + "tinycolor2-1.6.0" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.5.2"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz"; + sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; + }; + }; + "title-case-3.0.3" = { + name = "title-case"; + packageName = "title-case"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; - sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; + url = "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz"; + sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA=="; }; }; "tlds-1.236.0" = { @@ -10192,13 +10363,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.1" = { + "tslib-2.5.0" = { name = "tslib"; packageName = "tslib"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; - sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; }; }; "tsscmp-1.0.6" = { @@ -10282,13 +10453,13 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typeorm-0.3.11" = { + "typeorm-0.3.12" = { name = "typeorm"; packageName = "typeorm"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz"; - sha512 = "pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.12.tgz"; + sha512 = "sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA=="; }; }; "typeorm-aurora-data-api-driver-2.4.4" = { @@ -10300,13 +10471,13 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; - "typescript-4.9.4" = { + "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; "uc.micro-1.0.6" = { @@ -10597,6 +10768,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"; @@ -10642,13 +10822,13 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.13" = { + "vm2-3.9.14" = { name = "vm2"; packageName = "vm2"; - version = "3.9.13"; + version = "3.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; - sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; + sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; }; }; "vue-2.6.14" = { @@ -10714,6 +10894,15 @@ let sha512 = "C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="; }; }; + "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"; @@ -10768,6 +10957,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"; @@ -10984,6 +11182,15 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; + "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=="; + }; + }; "xlsx-0.17.5" = { name = "xlsx"; packageName = "xlsx"; @@ -11179,10 +11386,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.212.1"; + version = "0.215.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.212.1.tgz"; - sha512 = "9i4U/dJ84TEFIkj++nx+u3lLgpOxeco5QjopG+Ejjv6Gd3Jc+oL8MF3opN9v0JWagPX+yOnszol6aN+U4Sl8tA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.215.1.tgz"; + sha512 = "iJcgw8F8zop+Agyrq5x3xczr/uZSR/ghXltcfZ0D/mLe7RxeWvZk1kg0fxaX+sTBeAu0yhsPvib3EBeTqNTcJg=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11196,108 +11403,65 @@ in sources."js-yaml-4.1.0" ]; }) - (sources."@azure/abort-controller-1.1.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-auth-1.4.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-client-1.7.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."@azure/abort-controller-1.1.0" + sources."@azure/core-auth-1.4.0" + sources."@azure/core-client-1.7.1" (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.1" sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.5.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-paging-1.4.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (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.1" - ]; - }) - (sources."@azure/core-tracing-1.0.1" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-util-1.1.1" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."@azure/core-lro-2.5.1" + sources."@azure/core-paging-1.5.0" + sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.1.1" (sources."@azure/identity-2.1.0" // { dependencies = [ sources."jwa-2.0.0" sources."jws-4.0.0" - sources."open-8.4.0" - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/keyvault-keys-4.6.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/logger-1.0.3" // { - dependencies = [ - sources."tslib-2.4.1" + sources."open-8.4.1" ]; }) + sources."@azure/keyvault-keys-4.6.0" + sources."@azure/logger-1.0.3" sources."@azure/ms-rest-azure-env-2.0.0" (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ sources."form-data-2.5.1" + sources."tslib-1.14.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/msal-browser-2.32.2" // { + (sources."@azure/msal-browser-2.33.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { + (sources."@azure/msal-node-1.15.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) (sources."@azure/storage-blob-12.12.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.1" ]; }) - sources."@babel/parser-7.20.13" + 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-javascript-6.1.2" - sources."@codemirror/language-6.4.0" + sources."@codemirror/lang-css-6.0.2" + sources."@codemirror/lang-javascript-6.1.3" + sources."@codemirror/language-6.5.0" sources."@codemirror/lint-6.1.0" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.7.3" + sources."@codemirror/view-6.8.1" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" @@ -11306,9 +11470,9 @@ in 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.1" // { + (sources."@fortawesome/free-regular-svg-icons-6.3.0" // { dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.2.1" + sources."@fortawesome/fontawesome-common-types-6.3.0" ]; }) (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { @@ -11337,7 +11501,7 @@ in dependencies = [ sources."@grpc/proto-loader-0.7.4" sources."long-5.2.1" - sources."protobufjs-7.2.0" + sources."protobufjs-7.2.2" sources."yargs-16.2.0" ]; }) @@ -11359,13 +11523,20 @@ in 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.2" + sources."@lezer/css-1.1.1" sources."@lezer/highlight-1.1.3" + sources."@lezer/html-1.3.1" sources."@lezer/javascript-1.4.1" - sources."@lezer/lr-1.3.1" + sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" (sources."@n8n_io/license-sdk-1.8.0" // { dependencies = [ @@ -11382,16 +11553,11 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@oclif/command-1.8.21" - (sources."@oclif/config-1.18.6" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."@oclif/command-1.8.22" + sources."@oclif/config-1.18.8" (sources."@oclif/core-1.26.1" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.4.1" sources."wrap-ansi-7.0.0" ]; }) @@ -11403,13 +11569,13 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.5" - sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.9" // { + (sources."@oclif/help-1.0.5" // { dependencies = [ - sources."tslib-2.4.1" + sources."@oclif/config-1.18.6" ]; }) + sources."@oclif/linewrap-1.0.0" + sources."@oclif/parser-3.8.10" sources."@oclif/screen-3.0.4" sources."@opentelemetry/api-1.4.0" sources."@protobufjs/aspromise-1.1.2" @@ -11440,39 +11606,55 @@ in sources."domhandler-5.0.3" ]; }) - sources."@sentry/core-7.33.0" - sources."@sentry/integrations-7.33.0" - sources."@sentry/node-7.33.0" - sources."@sentry/types-7.33.0" - sources."@sentry/utils-7.33.0" + (sources."@sentry/core-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/integrations-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.37.1" + (sources."@sentry/utils-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.28" - sources."@swc/wasm-1.3.28" + sources."@swc/core-1.3.35" + sources."@swc/wasm-1.3.35" 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."@tootallnate/once-2.0.0" 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.16" - sources."@types/express-jwt-0.0.42" + sources."@types/express-4.17.17" 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/jsonwebtoken-9.0.1" 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.18" + sources."@types/node-18.13.0" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11485,8 +11667,10 @@ in sources."@types/stack-trace-0.0.29" sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" + sources."@types/triple-beam-1.3.2" sources."@types/tunnel-0.0.3" - sources."@types/validator-13.7.11" + sources."@types/uuid-9.0.0" + sources."@types/validator-13.7.12" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11558,11 +11742,7 @@ in sources."asn1.js-rfc5280-3.0.0" sources."assert-options-0.8.0" sources."assert-plus-1.0.0" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."ast-types-0.13.4" sources."async-3.2.4" sources."async-validator-1.8.5" sources."asynckit-0.4.0" @@ -11574,7 +11754,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1301.0" // { + (sources."aws-sdk-2.1313.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11605,17 +11785,13 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.0.1" + sources."better-sqlite3-8.1.0" 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."bl-4.1.0" // { dependencies = [ @@ -11643,7 +11819,7 @@ in sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bufferutil-4.0.7" - (sources."bull-4.10.2" // { + (sources."bull-4.10.4" // { dependencies = [ sources."cron-parser-4.7.1" ]; @@ -11664,16 +11840,8 @@ in 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.1" - ]; - }) - (sources."capital-case-1.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."camel-case-4.1.2" + sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."cfb-1.2.2" // { @@ -11682,11 +11850,7 @@ in ]; }) sources."chalk-4.1.2" - (sources."change-case-4.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."change-case-4.1.2" sources."chardet-0.7.0" sources."charenc-0.0.2" (sources."checkpoint-stream-0.1.2" // { @@ -11719,7 +11883,8 @@ in ]; }) sources."cluster-key-slot-1.1.2" - sources."codemirror-lang-n8n-expression-0.1.0" + 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 = [ @@ -11751,13 +11916,9 @@ in sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" - (sources."constant-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."constant-case-3.0.4" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convict-6.2.4" sources."cookie-0.4.2" (sources."cookie-parser-1.4.6" // { @@ -11804,7 +11965,7 @@ in sources."deepmerge-1.5.2" sources."default-user-agent-1.0.0" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -11821,11 +11982,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.6.0" sources."duplexify-3.7.1" @@ -11841,7 +11998,7 @@ in sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."ent-2.2.0" - sources."entities-2.2.0" + sources."entities-2.1.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."es-abstract-1.21.1" @@ -11875,6 +12032,7 @@ 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" @@ -11882,7 +12040,6 @@ in ]; }) sources."express-prom-bundle-6.6.0" - sources."express-unless-2.1.3" sources."extend-3.0.2" sources."extend-shallow-2.0.1" (sources."external-editor-3.1.0" // { @@ -11906,7 +12063,7 @@ 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.6" @@ -11968,6 +12125,8 @@ in sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."universalify-0.1.2" @@ -12029,18 +12188,14 @@ in sources."has-unicode-2.0.1" sources."hdb-pool-0.1.6" sources."he-1.2.0" - (sources."header-case-2.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."header-case-2.0.4" 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-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" @@ -12049,15 +12204,16 @@ in ]; }) 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-proxy-agent-5.0.0" 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."ics-2.44.0" sources."ieee754-1.2.1" sources."ignore-5.2.4" (sources."imap-0.8.19" // { @@ -12080,9 +12236,9 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."interpret-1.4.0" - (sources."ioredis-5.2.6" // { + (sources."ioredis-5.3.1" // { dependencies = [ sources."denque-2.1.0" ]; @@ -12139,8 +12295,9 @@ in sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" + sources."jose-4.11.4" sources."jquery-3.6.3" - sources."js-base64-3.7.4" + sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" @@ -12166,24 +12323,23 @@ in }) sources."jsonschema-1.4.1" sources."jsonwebtoken-9.0.0" - sources."jsplumb-2.15.4" 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."jwks-rsa-3.0.1" sources."jws-3.2.2" sources."kafkajs-1.16.0" 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.2.0" - sources."libphonenumber-js-1.10.18" + sources."libphonenumber-js-1.10.19" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -12228,16 +12384,12 @@ in sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" sources."lodash.zipobject-4.1.3" - sources."logform-2.4.2" + sources."logform-2.5.1" sources."long-4.0.0" sources."lossless-json-1.0.5" - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."lower-case-2.0.2" sources."lru-cache-4.0.2" - sources."lru-memoizer-2.1.4" + sources."lru-memoizer-2.2.0" sources."lru_map-0.3.3" sources."luxon-3.2.1" (sources."mailparser-3.6.3" // { @@ -12256,6 +12408,8 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."lru-cache-6.0.0" sources."minipass-3.3.6" sources."socks-proxy-agent-6.2.1" @@ -12263,12 +12417,7 @@ in ]; }) sources."mappersmith-2.41.0" - (sources."markdown-it-12.3.2" // { - dependencies = [ - sources."argparse-2.0.1" - sources."entities-2.1.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" @@ -12292,12 +12441,8 @@ in sources."brace-expansion-1.1.11" ]; }) - sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minimist-1.2.8" + sources."minipass-4.0.3" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12345,7 +12490,7 @@ in sources."moment-2.29.4" sources."moment-timezone-0.5.40" sources."monaco-editor-0.33.0" - sources."mongodb-4.13.0" + sources."mongodb-4.14.0" (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" @@ -12357,12 +12502,17 @@ in dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" + sources."ws-7.5.9" ]; }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" - sources."msal-1.4.17" - sources."msgpackr-1.8.2" + (sources."msal-1.4.17" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."msgpackr-1.8.3" (sources."mssql-8.1.4" // { dependencies = [ sources."commander-9.5.0" @@ -12378,27 +12528,28 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.151.2" // { + (sources."n8n-core-0.154.1" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" ]; }) - sources."n8n-design-system-0.51.1" - (sources."n8n-editor-ui-0.178.1" // { + (sources."n8n-design-system-0.53.0" // { dependencies = [ - sources."luxon-2.5.2" + sources."argparse-2.0.1" + sources."markdown-it-12.3.2" + sources."vue2-boring-avatars-0.3.8" ]; }) - (sources."n8n-nodes-base-0.210.1" // { + sources."n8n-editor-ui-0.181.1" + (sources."n8n-nodes-base-0.213.1" // { dependencies = [ sources."chokidar-3.5.2" - sources."luxon-2.3.2" ]; }) - (sources."n8n-workflow-0.133.2" // { + (sources."n8n-workflow-0.136.1" // { dependencies = [ - sources."luxon-2.3.2" + sources."ast-types-0.15.2" ]; }) (sources."named-placeholders-1.1.3" // { @@ -12416,16 +12567,12 @@ in 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.1" - ]; - }) - sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."no-case-3.0.4" + sources."node-abi-3.33.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.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ @@ -12451,7 +12598,7 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.9.0" + sources."nodemailer-6.9.1" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -12489,18 +12636,19 @@ in sources."p-map-2.1.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" - sources."pac-proxy-agent-5.0.0" - (sources."pac-resolver-5.0.1" // { + (sources."pac-proxy-agent-5.0.0" // { dependencies = [ - sources."ip-1.1.8" + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" ]; }) - sources."packet-reader-1.0.0" - (sources."param-case-3.0.4" // { + (sources."pac-resolver-5.0.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."ip-1.1.8" ]; }) + sources."packet-reader-1.0.0" + sources."param-case-3.0.4" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" @@ -12508,11 +12656,7 @@ in sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseley-0.11.0" sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."pascal-case-3.1.2" sources."passport-0.6.0" sources."passport-cookie-1.0.9" sources."passport-jwt-4.0.1" @@ -12522,11 +12666,7 @@ in sources."ansi-escapes-3.2.0" ]; }) - (sources."path-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."path-case-3.0.4" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -12543,9 +12683,9 @@ in 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" // { @@ -12558,9 +12698,13 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-promise-10.15.4" - 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 = [ @@ -12569,7 +12713,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.0.29" + sources."pinia-2.0.30" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -12582,13 +12726,14 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.2.3" // { + (sources."posthog-node-2.4.0" // { dependencies = [ sources."axios-0.27.2" ]; }) sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" + sources."prettier-2.8.4" sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" @@ -12607,6 +12752,8 @@ in sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."lru-cache-5.1.1" sources."yallist-3.1.1" ]; @@ -12651,7 +12798,6 @@ in (sources."recast-0.21.5" // { dependencies = [ sources."ast-types-0.15.2" - sources."tslib-2.4.1" ]; }) sources."rechoir-0.6.2" @@ -12705,14 +12851,18 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" 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" @@ -12735,11 +12885,7 @@ in sources."ms-2.1.3" ]; }) - (sources."sentence-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."sentence-case-3.0.4" sources."seq-queue-0.0.5" sources."serialize-javascript-5.0.1" sources."serve-static-1.15.0" @@ -12765,18 +12911,12 @@ in 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.1" - ]; - }) - (sources."snowflake-sdk-1.6.17" // { + sources."snake-case-3.0.4" + (sources."snowflake-sdk-1.6.18" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" - sources."jsonwebtoken-8.5.1" sources."mkdirp-1.0.4" - sources."semver-5.7.1" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; @@ -12820,9 +12960,15 @@ in 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" @@ -12871,12 +13017,7 @@ 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."teeny-request-7.2.0" sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" @@ -12887,7 +13028,8 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" + sources."title-case-3.0.3" sources."tlds-1.236.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -12913,7 +13055,7 @@ in sources."triple-beam-1.3.0" sources."ts-expect-1.3.0" sources."ts-node-10.9.1" - sources."tslib-1.14.1" + sources."tslib-2.5.0" sources."tsscmp-1.0.6" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" @@ -12923,12 +13065,20 @@ in sources."type-is-1.6.18" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - (sources."typeorm-0.3.11" // { + (sources."typeorm-0.3.12" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.12" - sources."@azure/identity-1.5.2" + (sources."@azure/identity-1.5.2" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@azure/msal-common-4.5.1" - sources."@azure/msal-node-1.0.0-beta.6" + (sources."@azure/msal-node-1.0.0-beta.6" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" sources."bl-2.2.1" @@ -12936,6 +13086,7 @@ in sources."buffer-6.0.3" sources."cliui-8.0.1" sources."dotenv-16.0.3" + sources."glob-8.1.0" sources."js-yaml-4.1.0" sources."jsbi-3.2.5" (sources."jsonwebtoken-8.5.1" // { @@ -12945,7 +13096,8 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."mkdirp-1.0.4" + sources."minimatch-5.1.6" + sources."mkdirp-2.1.3" sources."mongodb-3.7.3" sources."mssql-7.3.5" sources."node-abort-controller-2.0.0" @@ -12957,14 +13109,14 @@ in sources."bl-5.1.0" ]; }) - sources."tslib-2.4.1" + sources."uuid-9.0.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.4" + sources."typescript-4.9.5" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" @@ -12976,16 +13128,8 @@ in sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" - (sources."upper-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."upper-case-first-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."upper-case-2.0.2" + sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" (sources."url-0.10.3" // { dependencies = [ @@ -13026,13 +13170,14 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" 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.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" @@ -13070,7 +13215,7 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-8.12.0" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 50949da7539a9..0b6d71b3adc9f 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-NHTS9YajVjyAjSEQxMqyyY2Hwd30pjnIthZ+1jroqTE="; + sha256 = "sha256-ZJnQiTcfvxHFgRNytQANs/lF4hy0S0cXOy8IuGECYi0="; }; - vendorSha256 = "sha256-1sXG/xEzPVN1aRCsYqUee9aidT+ognZszOC7SR8YArw="; + vendorHash = "sha256-TLij88IksL0+pARKVhEhPg6qUPAXMlL2DWJk4ynahUs="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index b1fb3b2054f5f..b29d9f494b042 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-slang=${slang.dev}" "--with-ssl=${openssl.dev}" + "--with-slrnpull" ]; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch index ab7cb9bffa45d..260a7dd4ddd7e 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -8,18 +8,13 @@ Subject: [PATCH] Explicitly copy dbus files into the store dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt -index 1f35335..7f76951 100644 +index 2e7349ef7..512d4b188 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt -@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable) - ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable) - +@@ -1,5 +1,6 @@ macro(dbus_add_activation_service _sources) -- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir) + pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") foreach (_i ${_sources}) get_filename_component(_service_file ${_i} ABSOLUTE) string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) --- -2.19.2 - diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index e409551f1232d..6355f2418b668 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.6"; + version = "3.7.3"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; + sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc="; }; patches = [ diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index b6f93ede05eee..c17c65e14fe2f 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.38.0"; + version = "1.39.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-dJ/3MBEsA8M4pfE+GPT/bNnK3n4fL3Hwk0umgMTJAfY="; + sha256 = "sha256-7inMloKU/AL4s/p171xCzs4p4+AcLsvsbVsELK9vhFc="; }; - vendorSha256 = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; + 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 818e8764dd99f..17d32b84a78f6 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/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index cad7339fe081f..773ec444edf92 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; # offrss.o:offrss.h:75: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configurePhase = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/applications/networking/p2p/dht/default.nix index b1d01f82876eb..6765c029ffe25 100644 --- a/pkgs/applications/networking/p2p/dht/default.nix +++ b/pkgs/applications/networking/p2p/dht/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dht"; - version = "0.25"; + version = "0.27"; src = fetchFromGitHub { - # Use transmission fork from post-0.25-transmission branch + # Use transmission fork from post-0.27-transmission branch owner = "transmission"; repo = pname; - rev = "25e12bb39eea3d433602de6390796fec8a8f3620"; - sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s="; + rev = "015585510e402a057ec17142711ba2b568b5fd62"; + sha256 = "m4utcxqE3Mn5L4IQ9UfuJXj2KkXXnqKBGqh7kHHGMJQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index fda9d87681a95..1291caa088ff8 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -27,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 319a5e7f0dc80..999d2fa5dd659 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,14 +10,14 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); mkDerivation rec { - pname = "qbittorrent"; - version = "4.4.5"; + pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; + version = "4.5.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; + hash = "sha256-U0JDLLyIrMBqP4EqRAj48sdv9Om9cwdx4vP/0Ob1QB8="; }; enableParallelBuilding = true; @@ -43,8 +43,8 @@ mkDerivation rec { 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 + cp -R src/${pname}.app $out/Applications + makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/applications/networking/p2p/storrent/default.nix index 4c96200cc6860..a21a9fef38550 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/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8d605877a62ea..8f44d79f817dd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchurl , cmake , pkg-config , openssl @@ -46,6 +47,14 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # fix build with openssl 3.0 + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; + hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; + }) + ]; + outputs = [ "out" "apparmor" ]; cmakeFlags = diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index 75e7981af5b2d..e1a2a38264477 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.interpreter} -O -m compileall . + ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 02b0c91e2da9a..07ea1707526d1 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.interpreter} -O -m compileall . + ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 13175aaca6713..caba7159214ea 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,12 @@ let pname = "pcloud"; - version = "1.10.0"; - code = "XZCy4sVZGb7r8VpDE4SCv2QI3OYx1HYChIvy"; + version = "1.10.1"; + code = "XZwHPTVZ7J1WFU374k8BqSWO2519y4aGFdAV"; # 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-kzID1y/jVuqFfD/PIUR2TFa0AvxKVcfNQ4ZXiHx0gRk="; + hash = "sha256-Mum1SL/EZ7iFK9e3o+T0CxkAQ0FkjSBy2FEUDonxtTI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index eae9a8a3d87a0..33747e2d669b2 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -4,8 +4,11 @@ , fetchpatch , openssl , libsamplerate +, swig , alsa-lib , AppKit +, python3 +, pythonSupport ? true }: stdenv.mkDerivation rec { @@ -33,6 +36,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = + lib.optionals pythonSupport [ swig python3 ]; + buildInputs = [ openssl libsamplerate ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; @@ -41,11 +47,24 @@ stdenv.mkDerivation rec { export LD=$CC ''; + postBuild = lib.optionalString pythonSupport '' + make -C pjsip-apps/src/swig/python + ''; + + outputs = [ "out" ] + ++ lib.optional pythonSupport "py"; + + configureFlags = [ "--enable-shared" ]; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua mkdir -p $out/share/${pname}-${version}/samples cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples + '' + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python setup.py install --prefix=$py + ) ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 1fc698fe19003..fe0112a4aaef0 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 bdf75f6440e2e..5dc7779e12e90 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,44 +2,51 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "2.3.0"; + version = "3.0.18"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; - rev = "br-${version}"; - sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg="; + rev = "v${version}"; + hash = "sha256-0gQnMhjwW2NEJwafqndStQ33dIu82lW6ntXFRCpbmm4="; }; - vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg="; + vendorHash = "sha256-lHMcVcaoBwjE2ikEZPeZexC5XvhkAtvHnDci7UAa4vg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret ]; - buildPhase = '' - runHook preBuild + proxyVendor = true; # Bridge uses some C headers so we have to enable proxyVendor + preBuild = '' patchShebangs ./utils/ - make BUILD_TIME= -j$NIX_BUILD_CORES build-nogui - - runHook postBuild + (cd ./utils/ && ./credits.sh bridge) ''; - installPhase = '' - runHook preInstall - - install -Dm555 proton-bridge $out/bin/protonmail-bridge - - runHook postInstall + ldflags = + let constants = "github.com/ProtonMail/proton-bridge/v3/internal/constants"; in + [ + "-X ${constants}.Version=${version}" + "-X ${constants}.Revision=${src.rev}" + "-X ${constants}.buildTime=unknown" + "-X ${constants}.FullAppName=ProtonMailBridge" # Should be "Proton Mail Bridge", but quoting doesn't seems to work in nix's ldflags + ]; + + subPackages = [ + "cmd/Desktop-Bridge" + ]; + + postInstall = '' + mv $out/bin/Desktop-Bridge $out/bin/bridge # The cli is named like that in the upstream repo ''; meta = with lib; { homepage = "https://github.com/ProtonMail/proton-bridge"; - changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md"; + changelog = "https://github.com/ProtonMail/proton-bridge/blob/${src.rev}/Changelog.md"; downloadPage = "https://github.com/ProtonMail/proton-bridge/releases"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lightdiscord ]; + maintainers = with maintainers; [ mrfreezeex ]; description = "Use your ProtonMail account with your local e-mail client"; longDescription = '' An application that runs on your computer in the background and seamlessly encrypts diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 3e6dfb1a7d22e..af55fef18c738 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 4acc2c57f19fb..78f8b1a2a0c8f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -14,58 +14,14 @@ let # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "21.09.0" = { - major = "21"; - minor = "9"; + "23.02.0" = { + major = "23"; + minor = "2"; patch = "0"; - x64hash = "d58d5cbbcb5ace95b75b1400061d475b8e72dbdf5f03abacea6d39686991f848"; - x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51"; - x64suffix = "25"; - x86suffix = "25"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html"; - }; - - "21.12.0" = { - major = "21"; - minor = "12"; - patch = "0"; - x64hash = "de81deab648e1ebe0ddb12aa9591c8014d7fad4eba0db768f25eb156330bb34d"; - x86hash = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292"; - x64suffix = "18"; - x86suffix = "18"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html"; - }; - - "22.05.0" = { - major = "22"; - minor = "5"; - patch = "0"; - x64hash = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053"; - x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1"; - x64suffix = "16"; - x86suffix = "16"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest2.html"; - }; - - "22.07.0" = { - major = "22"; - minor = "7"; - patch = "0"; - 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"; + x64hash = "d0030a4782ba4b2628139635a12a7de044a4eb36906ef1eadb05b6ea77c1a7bc"; + x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b"; + x64suffix = "10"; + x86suffix = "10"; 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 a35e5b03f4a9d..dd1842e7d4773 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -70,13 +70,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-I9xJWHoY8fZ5T9zca77gFciC+7JdD6fMwV16giiY4FU="; + sha256 = "sha256-4sq3LblFRWCBREudtzg+o9wjstm58gPzBq7QAwlWvEg="; }; postPatch = '' @@ -175,11 +175,11 @@ stdenv.mkDerivation rec { WITH_X11 = true; }; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" - ]; + ]); NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ "-framework AudioToolbox" diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 6249cce973ef5..4d8c1ee9dc40e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index f127d7c53d32b..759388cbd4253 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -26,11 +26,11 @@ 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.35.7"; + version = "15.38.3"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc="; + url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x/teamviewer_${version}_amd64.deb"; + sha256 = "sha256-+GGpGV8rl15VQvPRA2PWngQI4VoxCrZ0ArEm9FgdOVE="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 18c0c3e73de63..c5095d8fd43e9 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q="; + sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14="; }; strictDeps = true; diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index a35f918ff5a06..0203128e6bad5 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.2"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-kAEkeRAS+gMjdriop4tQcqc+GldldxOn+QwgWTl8XB0="; + hash = "sha256-UATtfJPpB0twIh6vsgfMSbu9S0F36l+PQgpWYDBmy4M="; }; - vendorHash = "sha256-rZHM0HwiTNbUuJmlNOHg/XoYxqrKt59l5BL/vjm4Hfk="; + vendorHash = "sha256-XJracr2oblyVid6QKri0EUr5LrEgA3w27PPqbqWcNh8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 31af7b140f2c7..677405c5a295b 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -20,14 +20,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "seahub"; - version = "9.0.6"; + version = "9.0.10"; format = "other"; src = fetchFromGitHub { owner = "haiwen"; repo = "seahub"; - rev = "876b7ba9b680fc668e89706aff535593772ae921"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds="; + rev = "5971bf25fe67d94ec4d9f53b785c15a098113620"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; }; dontBuild = true; @@ -61,6 +61,8 @@ python.pkgs.buildPythonApplication rec { pysearpc seaserv gunicorn + markdown + bleach ]; installPhase = '' diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index f51c8d051a51f..ee75ee6df6483 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.40"; + version = "3.43"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130="; + hash = "sha256-u2HGawshd2OdkchgpZUN6P2fTBSwJk+RjHAYYEpPgCg="; }; - vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo="; + vendorHash = "sha256-Q6B+iqUb97ZayjYDe4OOhkWj1Cxy+ILQxxEU2Jw/Als="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index a3c79fd9560b7..a51f88ad5f7e8 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; # TODO: Remove after the next release (0.8.4 should work without this): - NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${harfbuzz.dev}/include/harfbuzz" ]; meta = with lib; { description = "Comprehensive suite for man in the middle attacks"; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 452263f0742f8..47687bb544c26 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -9,7 +9,7 @@ assert withQt -> qt5 != null; let - version = "4.0.2"; + version = "4.0.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-81kVaZ8vmyjdshEgLUDsiYTlg008kRSDFEpJhLpEQR0="; + sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE="; }; cmakeFlags = [ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { ]; # Avoid referencing -dev paths because of debug assertions. - NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 6dc59e1432ab3..a5c0c73fac92a 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -1,9 +1,11 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , libpcap , stdenv +, alsa-lib +, expat , fontconfig , libGL , xorg @@ -12,20 +14,24 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.0.1"; + version = "1.1.1"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-8K774j04BOEuJjnFYjaSctPwBrKYYKqjFS2+PyxJ2FM="; + src = fetchFromGitHub { + owner = "gyulyvgc"; + repo = "sniffnet"; + rev = "v${version}"; + hash = "sha256-o971F3JxZUfTCaLRPYxCsU5UZ2VcvZftVEl/sZAQwpA="; }; - cargoSha256 = "sha256-096i4wDdoJCICd0L2QNY+7cKHQnijK22zj4XaQNuko8="; + cargoHash = "sha256-Otn5FvZZkzO0MHiopjU2/+redyusituDQb7DT5bdbPE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + expat fontconfig libGL xorg.libX11 @@ -34,6 +40,7 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit + rustPlatform.bindgenHook ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index ae424a1fe50a1..58ffecef723a8 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/pkgs/applications/networking/soju/default.nix @@ -60,6 +60,6 @@ buildGoModule rec { homepage = "https://soju.im"; changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ azahi malvo ]; + maintainers = with maintainers; [ azahi malte-v ]; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 97ee3ed586252..7c0b8dc0747e8 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -2,40 +2,45 @@ , stdenv , fetchFromGitHub , ocamlPackages -, fontschumachermisc -, xset -, makeWrapper , ncurses -, gnugrep , copyDesktopItems , makeDesktopItem +, wrapGAppsHook +, glib +, gsettings-desktop-schemas +, zlib , enableX11 ? true +, Cocoa }: stdenv.mkDerivation rec { pname = "unison"; - version = "2.52.1"; + version = "2.53.0"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; + sha256 = "sha256-4Lyn1UecpVIhoEXIFu35XK4aoAfYGPCZ9L4ZY7224yo="; }; - nativeBuildInputs = [ makeWrapper ] + strictDeps = true; + + nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ ocamlPackages.ocaml ncurses ]; + buildInputs = [ gsettings-desktop-schemas ncurses zlib ] + ++ lib.optional stdenv.isDarwin Cocoa; preBuild = lib.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.cairo2}"/lib/ocaml/*/site-lib/cairo2)|" src/Makefile.OCaml '' + '' echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = [ "INSTALLDIR=$(out)/bin/" - "UISTYLE=${if enableX11 then "gtk2" else "text"}" + "UISTYLE=${if enableX11 then "gtk3" else "text"}" ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; preInstall = '' @@ -43,11 +48,6 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString enableX11 '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" - done - install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ''; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index f24e1255d5e81..6c6dddee1735e 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-07-08"; + version = "unstable-2022-12-19"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; - sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; + rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c"; + sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e74084e14c524..d221324b205b6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,16 +1,16 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: +{ pkgsBuildBuild, go, buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Z4YVU45na4BgIbN/IlORpTCuf2EuSuOyppDRzswn3EI="; + hash = "sha256-Jbg56Nn+5ZjIv1KZrThkqWY+P13MglLE78E6jc0rbY0="; }; vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; @@ -22,7 +22,12 @@ let buildPhase = '' runHook preBuild - go run build.go -no-upgrade -version v${version} build ${target} + ( + export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD + go build build.go + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto + ) + ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} runHook postBuild ''; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index dea70ffacdce1..850692f185474 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.2.0-13258"; + version = "3.2.1-13272"; 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-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; + sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; + sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index e349cf0db1410..dd37e32b36e42 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.45.3"; + version = "7.56.1"; src = fetchurl { # find the latest version with @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_123.snap"; - sha512 = "1a43ece6ccb0f5a7b29a3ff0c41f27b0d82bd90214cc3d0b88dbd57ecaf2f59c092906e7ed377e3d04f2fc418027f7a0cb7f2e4458ef619663b84b080581c375"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_144.snap"; + sha512 = "aad9ab72ad3dcbb897fa99139b83993770c243f49e8784c34ac38603f0d76578374723e756c4f51ea2d0a39f6b9c7738e7ce070a8ddfa11f8cf831260563f6d9"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 0c47fc323a645..23c7916354fd7 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.2"; + version = "0.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-oKkZC9fi5xPnLTI00MnG2gMjzMZHMNFI77ztbR4KQo4="; + hash = "sha256-c8X0kedfM8DPTEQAbh8cXIfEvxG2cdUD3twVHs0/k7U"; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sbyAyjxpol2SBxoLUsiPGfkP2diBPgJW0vEDHYWgmLU="; + hash = "sha256-TS/Q6T3bPjkk1bfINTR6bcPy8fnbAxbKJUrx2pYsPWY="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Fast and secure file transfer"; homepage = "https://apps.gnome.org/app/app.drey.Warp"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix new file mode 100644 index 0000000000000..b338cab2b3c46 --- /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/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index d0b71ee92cf89..e8910d9509294 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -6,18 +6,19 @@ , copyDesktopItems , makeDesktopItem , gtk3 -, openssl +, openssl_1_1 , xdg-user-dirs , keybinder3 }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.9"; + version = "0.1.0"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-E75ZqenCs5zWBERYoIrWc2v5CyjGKLrfsae1RCi/qNQ="; + url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; + sha256 = "sha256-WuEwhJ1YhbldFfisfUsp3GCV2vQy9oTam6BkL/7QEgI="; + stripRoot = false; }; nativeBuildInputs = [ @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - openssl + openssl_1_1 keybinder3 ]; @@ -38,6 +39,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mv AppFlowy/* ./ + mkdir -p $out/opt/ mkdir -p $out/bin/ diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index 0a00ac1463b5b..c490be238112a 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -25,7 +25,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ - gobject-introspection gtksourceview3 libappindicator-gtk3 libnotify diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 57b23ea95d164..302419fdcefcf 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -69,7 +69,7 @@ mkDerivation rec { propagatedUserEnvPkgs = [ kproperty ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; qtWrapperArgs = [ "--prefix PATH : ${lib.getBin pstoedit}/bin" diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5828ac35fc3f4..0c14eedd47ae9 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,17 +2,15 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.23.1"; + version = "1.24"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; + hash = "sha256-Ep+8O93L/CG4qcBFzCBMRasK/ySp8+cU59LcyZRTJtg="; }; - pythonRelaxDeps = [ "cheroot" ]; - - nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ babel @@ -20,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { cheroot click flask - flaskbabel + flask-babel jaraco_functools jinja2 markdown2 diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 700a94429964d..65a2d579d3f7b 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -80,6 +80,11 @@ stdenv.mkDerivation rec { # guile warning GUILE_AUTO_COMPILE="0"; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=use-after-free" + ]); + # `make check` target does not define its prerequisites but expects them to # have already been built. The list of targets below was built through trial # and error based on failing tests. diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e93be60741bb3..785b069c9a5b5 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.55"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; + sha256 = "xpoJzRkLYirMpHa7w9TAPWjXzPWbumG/A2zmCIX5+2U="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix new file mode 100644 index 0000000000000..acec5f7cabf74 --- /dev/null +++ b/pkgs/applications/office/iotas/default.nix @@ -0,0 +1,76 @@ +{ lib +, python3 +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, librsvg +, libsecret +, libadwaita +, gtksourceview5 +, webkitgtk_5_0 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "iotas"; + version = "0.1.9"; + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "cheywood"; + repo = pname; + rev = version; + hash = "sha256-TdsqxpJq2+hoLHcJ58JQ20TWerZMXL3wkT9oIlVkrk4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libsecret + libadwaita + gtksourceview5 + webkitgtk_5_0 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pygtkspellcheck + requests + markdown-it-py + linkify-it-py + mdit-py-plugins + ]; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Simple note taking with mobile-first design and Nextcloud sync"; + homepage = "https://gitlab.gnome.org/cheywood/iotas"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix index 6917e2ab94b15..ebbb0bbd9f93b 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/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index 861ec4d99ef04..e3e3106b83021 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , shared-mime-info # Qt +, qtnetworkauth , qtxmlpatterns , qtwebengine , qca-qt5 @@ -28,11 +29,13 @@ mkDerivation rec { pname = "kbibtex"; - version = "0.9.2"; + version = "0.9.3.1"; - src = fetchurl { - url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz"; - sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr"; + src = let + majorMinorPatch = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); + in fetchurl { + url = "mirror://kde/stable/KBibTeX/${majorMinorPatch}/kbibtex-${version}.tar.xz"; + hash = "sha256-kH/E5xv9dmzM7WrIMlGCo4y0Xv/7XHowELJP3OJz8kQ="; }; nativeBuildInputs = [ @@ -41,6 +44,7 @@ mkDerivation rec { ]; buildInputs = [ + qtnetworkauth qtxmlpatterns qtwebengine qca-qt5 diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index dfab08ace2d90..3b39f88add753 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; # Hidden dependency that wasn't included in CMakeLists.txt: - NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; + env.NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; nativeBuildInputs = [ doxygen extra-cmake-modules graphviz kdoctools diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index e885e03c1cd2a..181c627f238cd 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,30 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 -, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }: +{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3, gpgme +, installShellFiles, texinfo, gnused, usePython ? false, gpgmeSupport ? false }: stdenv.mkDerivation rec { pname = "ledger"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; rev = "v${version}"; - sha256 = "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"; + hash = "sha256-0hN6Hpmgwb3naV2K1fxX0OyH0IyCQAh1nZ9TMNAutic="; }; - outputs = [ "out" "dev" "py" ]; + outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ]; buildInputs = [ - (boost.override { enablePython = usePython; python = python3; }) gmp mpfr libedit gnused - ] ++ lib.optional usePython python3; + ] ++ lib.optionals gpgmeSupport [ + gpgme + ] ++ (if usePython + then [ python3 (boost.override { enablePython = true; python = python3; }) ] + else [ boost ]); nativeBuildInputs = [ cmake texinfo installShellFiles ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" - (lib.optionalString usePython "-DUSE_PYTHON=true") + "-DUSE_PYTHON:BOOL=${if usePython then "ON" else "OFF"}" + "-DUSE_GPGME:BOOL=${if gpgmeSupport then "ON" else "OFF"}" ]; # by default, it will query the python interpreter for it's sitepackages location @@ -34,22 +38,6 @@ stdenv.mkDerivation rec { --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"' ''; - patches = [ - # Add support for $XDG_CONFIG_HOME. Remove with the next release - (fetchpatch { - url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch"; - 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" ]; postInstall = '' @@ -57,17 +45,16 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; + homepage = "https://www.ledger-cli.org/"; + changelog = "https://github.com/ledger/ledger/raw/v${version}/NEWS.md"; license = licenses.bsd3; - longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed from the UNIX command-line. This may put off some users, as there is no flashy UI, but for those who want unparalleled reporting access to their data, there really is no alternative. ''; - platforms = platforms.all; maintainers = with maintainers; [ jwiegley marsam ]; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fdf76152a6521..8fa7d6d78a74a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -110,6 +110,7 @@ , wrapQtAppsHook ? null , variant ? "fresh" , symlinkJoin +, postgresql } @ args: assert builtins.elem variant [ "fresh" "still" ]; @@ -175,7 +176,7 @@ in outputs = [ "out" "dev" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ]; @@ -404,6 +405,7 @@ in "--with-system-libwps" "--with-system-openldap" "--with-system-coinmp" + "--with-system-postgresql" # Without these, configure does not finish "--without-junit" @@ -418,7 +420,6 @@ in # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" - "--disable-postgresql-sdbc" "--disable-firebird-sdbc" "--without-fonts" "--without-doxygen" @@ -546,6 +547,7 @@ in pam perl poppler + postgresql python3 sane-backends unixODBC diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index b84502170bf13..e1f39e8964c5e 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -10,26 +10,29 @@ , wrapGAppsHook , curl , sqlite -, wxGTK +, wxGTK32 , gtk3 -, libobjc +, darwin }: stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-0zUZBkdFLvc32gkGqu0pYlVsHuwjhaVZzu9acSmNfu8="; + hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" + '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + substituteInPlace 3rd/CMakeLists.txt \ + --replace "-msse4.2 -maes" "" ''; nativeBuildInputs = [ @@ -46,14 +49,16 @@ stdenv.mkDerivation rec { buildInputs = [ curl sqlite - wxGTK + wxGTK32 gtk3 ] ++ lib.optionals stdenv.isDarwin [ - libobjc + darwin.libobjc ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-deprecated-copy" "-Wno-old-style-cast" + "-Wno-unused-parameter" ]); postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 7065343378f1e..a6bb64bbdf7c9 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.6"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24="; + sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644="; }; 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/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 62e97670c2b60..e2dfb12c92f94 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -12,6 +12,7 @@ , dconf , dpkg , fontconfig +, gcc-unwrapped , gdk-pixbuf , glib , glibc @@ -66,6 +67,7 @@ let runtimeLibs = lib.makeLibraryPath [ curl glibc + gcc-unwrapped.lib libudev0-shim pulseaudio ]; diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index 43b511c74a6bb..b2554cea7a698 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -46,6 +46,6 @@ appimageTools.wrapType2 rec { description = "Linux Electron Onenote - A Linux compatible version of OneNote"; license = licenses.mit; maintainers = with maintainers; [ tiagolobocastro ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/office/paper-note/default.nix b/pkgs/applications/office/paper-note/default.nix index 18ab6250d028b..e9fdd485befdc 100644 --- a/pkgs/applications/office/paper-note/default.nix +++ b/pkgs/applications/office/paper-note/default.nix @@ -44,13 +44,15 @@ stdenv.mkDerivation rec { gtksourceview5 ]; - postInstall = '' - ln -s $out/bin/io.posidon.Paper $out/bin/paper + postPatch = '' + substituteInPlace src/meson.build \ + --replace "1.2.0" "${libadwaita.version}" ''; meta = with lib; { - description = "Take notes in Markdown"; - homepage = "https://posidon.io/paper/"; + description = "A pretty note-taking app for GNOME"; + homepage = "https://gitlab.com/posidon_software/paper"; + mainProgram = "io.posidon.Paper"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ j0lol ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c87e54e091543..f4535b59cf89e 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 @@ -12,10 +14,18 @@ , unpaper , poppler_utils , liberation_ttf -, fetchFromGitHub }: let + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "paperless-ngx"; + rev = "refs/tags/v${version}"; + hash = "sha256-aIJWEZD98tjfNDQjQfxRR1kOJ4P/fxZP8sw1dKy7apw="; + }; + # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { @@ -78,36 +88,67 @@ let unpaper poppler_utils ]; + + frontend = buildNpmPackage { + pname = "paperless-ngx-frontend"; + inherit version src; + + npmDepsHash = "sha256-es9x7KR5S7E8KjYWq8ie/EwlAy6zrDvySYQi1vy08Wc="; + + 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.pythonPackages.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.11.3"; + format = "other"; - # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend - src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; - }; + inherit version src; - format = "other"; + nativeBuildInputs = [ + gettext + ]; - propagatedBuildInputs = with python.pkgs.pythonPackages; [ + propagatedBuildInputs = with python.pkgs; [ aioredis - arrow + amqp + anyio asgiref async-timeout attrs autobahn automat + billiard bleach - blessed celery certifi cffi channels-redis channels - chardet + charset-normalizer click + click-didyoumean + click-plugins + click-repl coloredlogs concurrent-log-handler constantly @@ -116,20 +157,19 @@ python.pkgs.pythonPackages.buildPythonApplication rec { dateparser django-celery-results django-cors-headers + django-compression-middleware django-extensions django-filter - django-picklefield django djangorestframework filelock - fuzzywuzzy gunicorn h11 hiredis httptools humanfriendly + humanize hyperlink - imagehash idna imap-tools img2pdf @@ -140,9 +180,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + mysqlclient nltk numpy ocrmypdf + packaging pathvalidate pdf2image pdfminer-six @@ -150,6 +192,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { pillow pluggy portalocker + prompt-toolkit psycopg2 pyasn1-modules pyasn1 @@ -158,7 +201,6 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - levenshtein python-magic pytz pyyaml @@ -171,36 +213,51 @@ 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; - # Compile manually because `pythonRecompileBytecodeHook` only works for - # files in `python.sitePackages` postBuild = '' - ${python.interpreter} -OO -m compileall src + # Compile manually because `pythonRecompileBytecodeHook` only works + # for files in `python.sitePackages` + ${python.pythonForBuild.interpreter} -OO -m compileall src + + # Collect static files + ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input + + # Compile string translations using gettext + ${python.pythonForBuild.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" \ @@ -210,12 +267,17 @@ python.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; - nativeCheckInputs = 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 ]; @@ -234,7 +296,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html" "" + --replace "--cov --cov-report=html --cov-report=xml" "" # 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 \ @@ -250,13 +312,14 @@ python.pkgs.pythonPackages.buildPythonApplication rec { ]; 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-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index ee621df4d8379..ca6cab2c1e4f8 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -11,6 +11,7 @@ , fabulous , getkey , psutil +, shared-mime-info , pkgs }: @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + shared-mime-info openpaperwork-gtk ]; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 980a4aabf7ab5..6323c2c417b85 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; + sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix new file mode 100644 index 0000000000000..1a61f786de2fe --- /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 e0bfa57b1e8d3..e602e6e5af7f4 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.60.2"; + version = "0.61.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4="; + hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 99f5e0e249f63..c8829981e4a3b 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.1.1"; + version = "23.2.4"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-BMisfFMy3kNoZHCYbGqzT9hxzVpKBUN6fSOilPw9O1w="; + sha256 = "sha256-ZliVhnO9fK/6k4Ga86ZSmhzQ3YKziAab19oZs9Pteic="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index db5995149c082..6cc26c95a05b5 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/rime-cli/default.nix b/pkgs/applications/office/rime-cli/default.nix new file mode 100644 index 0000000000000..5dd412a450224 --- /dev/null +++ b/pkgs/applications/office/rime-cli/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "rime-cli"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "puddinging"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CI0Jva7oA/zUGatv+wCdByqbTBNQRw+4clr8IDKX6HQ="; + }; + + vendorHash = null; + + meta = with lib; { + homepage = "https://github.com/puddinging/rime-cli"; + changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}"; + description = "A command line tool to add customized vocabulary for Rime IME"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index fc1087ab2d933..9b7c58ef5c938 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.1"; + version = "7.12.2"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y="; + sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix index d2d44511bc63f..209fa7c4556b8 100644 --- a/pkgs/applications/office/teapot/default.nix +++ b/pkgs/applications/office/teapot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # By no known reason libtirpc is not detected - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; cmakeConfigureFlags = [ diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 50db368073d14..7794116ecd46d 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -67,6 +67,7 @@ python3.pkgs.buildPythonApplication rec { # Testing of the CLI part and output "test_color_due_dates" "test_color_flag" + "test_datetime_serialization" # Will be fixed in versions after 4.1.0 "test_default_command" "test_main" "test_missing_cache_dir" @@ -74,8 +75,6 @@ python3.pkgs.buildPythonApplication rec { "test_xdg_existant" # Tests are sensitive to performance "test_sorting_fields" - ] ++ lib.optionals stdenv.isDarwin [ - "test_sorting_fields" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 5566906919a8d..a18307c77548c 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-2023-01-23"; + version = "unstable-2023-02-25"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; - sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; + rev = "e2acd675e6aeac609ae071aa169b2661c1fbd862"; + sha256 = "y7y9DQ6oy/1EuLl4FAkRJd0zzMRm/2OOvnfWtwpf8AU="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { Cocoa ]; - NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; + env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; postInstall = lib.optionalString stdenv.isDarwin '' shopt -s extglob diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 08084bfbf7ac8..35b9b694c0918 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,117 +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.58.7"; - - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; - - serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - in { - trilium-desktop = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; - meta = metaCommon // { - mainProgram = "trilium"; - }; - - 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" ]; - }) - ]; - - # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch - postPatch = '' - rm ./trilium-portable.sh - ''; - - 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}) - ''; + trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; }; + trilium-server = callPackage ./server.nix { metaCommon = metaCommon; }; - 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 <<EOF - #!${stdenv.cc.shell} - cd $out/share/trilium-server - exec ./node/bin/node src/www - EOF - chmod a+x $out/bin/trilium-server - ''; - - passthru.tests = { - trilium-server = nixosTests.trilium-server; - }; - }; } diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix new file mode 100644 index 0000000000000..e48355660cb21 --- /dev/null +++ b/pkgs/applications/office/trilium/desktop.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, unzip, autoPatchelfHook +, fetchurl, atomEnv, makeWrapper +, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, metaCommon +}: + +let + pname = "trilium-desktop"; + version = "0.58.8"; + + linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i"; + + darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; + darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q"; + + meta = metaCommon // { + mainProgram = "trilium"; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + + linux = stdenv.mkDerivation rec { + pname = "trilium-desktop"; + inherit version; + + src = fetchurl linuxSource; + + 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" ]; + }) + ]; + + # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch + postPatch = '' + rm ./trilium-portable.sh + ''; + + 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; + }; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl darwinSource; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + }; + +in + if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix new file mode 100644 index 0000000000000..78bae4f4655b8 --- /dev/null +++ b/pkgs/applications/office/trilium/server.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, autoPatchelfHook, fetchurl, nixosTests +, metaCommon }: + +let + serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv"; + version = "0.58.8"; +in stdenv.mkDerivation rec { + pname = "trilium-server"; + inherit version; + meta = metaCommon // { + platforms = [ "x86_64-linux" ]; + }; + + 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 <<EOF + #!${stdenv.cc.shell} + cd $out/share/trilium-server + exec ./node/bin/node src/www + EOF + chmod a+x $out/bin/trilium-server + ''; + + passthru.tests = { + trilium-server = nixosTests.trilium-server; + }; +} diff --git a/pkgs/applications/office/trilium/update.sh b/pkgs/applications/office/trilium/update.sh index 02af29dace2f4..e292609e3f759 100755 --- a/pkgs/applications/office/trilium/update.sh +++ b/pkgs/applications/office/trilium/update.sh @@ -4,15 +4,20 @@ set -euo pipefail cd $(dirname "${BASH_SOURCE[0]}") +setKV () { + sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1 +} + version=$(curl -s --show-error "https://api.github.com/repos/zadam/trilium/releases/latest" | jq -r '.tag_name' | tail -c +2) +# Update desktop application sha256_linux64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz) -sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz) +sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip) +setKV ./desktop.nix version $version +setKV ./desktop.nix linuxSource.sha256 $sha256_linux64 +setKV ./desktop.nix darwinSource.sha256 $sha256_darwin64 -setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix -} - -setKV version $version -setKV desktopSource.sha256 $sha256_linux64 -setKV serverSource.sha256 $sha256_linux64_server +# Update server +sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz) +setKV ./server.nix version $version +setKV ./server.nix serverSource.sha256 $sha256_linux64_server diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 0b086160e50ce..3647d8ea8e22f 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; # To be able to find <Xft.h> - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 2dc24570b7210..f16e4cf146c6f 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.20"; + version = "6.0.22"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-HsAvodqio3GJ9TK1pt4WwlEZEAo52ocH0r7cf9IQe9w="; + sha256 = "sha256-OXlX4E5C6UEDR3+fDYB3O5isO8vABpd6hvrq+4kZ1iA="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index 8158e4d6ea6e8..7a7e48d736d0c 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -3,11 +3,12 @@ , cmake , corrosion , extra-cmake-modules -, gcc11 +, gcc12 , kconfig , kcoreaddons , kdbusaddons , ki18n +, kirigami-addons , kirigami2 , knotifications , kpurpose @@ -19,8 +20,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "22.11" -, cargoSha256 ? "sha256-l1+nRXGt6Oga9yFJ3sVNitUN4XNcVjT1bJwi2XlleF4=" +, cargoShaForVersion ? "23.01.0" +, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk=" }: # Guard against incomplete updates. @@ -45,7 +46,7 @@ mkDerivation rec { cmake corrosion extra-cmake-modules - gcc11 # doesn't build with GCC 9 from stdenv on aarch64 + gcc12 # doesn't build with GCC 9 from stdenv on aarch64 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo @@ -57,6 +58,7 @@ mkDerivation rec { kcoreaddons kdbusaddons ki18n + kirigami-addons kirigami2 knotifications kpurpose diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix index cb87fe0ed24db..14bfc6d18917e 100644 --- a/pkgs/applications/plasma-mobile/audiotube.nix +++ b/pkgs/applications/plasma-mobile/audiotube.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules -, gcc11 +, gcc12 , wrapGAppsHook , gst_all_1 @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook - gcc11 # doesn't build with GCC 9 from stdenv on aarch64 + gcc12 # doesn't build with GCC 9 from stdenv on aarch64 python3Packages.wrapPython python3Packages.pybind11 ]; diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 86a4f1d10071a..9efbaa6033950 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -78,6 +78,7 @@ let plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; + qmlkonsole = callPackage ./qmlkonsole.nix {}; spacebar = callPackage ./spacebar.nix { inherit srcs; }; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 96bb4eb0907c2..ffcf74a5f7154 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.11/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/23.01.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix index 1903bf259baea..59b455398203d 100644 --- a/pkgs/applications/plasma-mobile/kasts.nix +++ b/pkgs/applications/plasma-mobile/kasts.nix @@ -9,6 +9,7 @@ , kconfig , kcoreaddons , ki18n +, kirigami-addons , kirigami2 , networkmanager-qt , qtkeychain @@ -40,6 +41,7 @@ mkDerivation rec { kconfig kcoreaddons ki18n + kirigami-addons kirigami2 networkmanager-qt qtkeychain diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix index 49dcb1db99f7b..d6a1f999ce651 100644 --- a/pkgs/applications/plasma-mobile/kweather.nix +++ b/pkgs/applications/plasma-mobile/kweather.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , kconfig +, kholidays , ki18n , kirigami-addons , kirigami2 @@ -26,6 +27,7 @@ mkDerivation rec { buildInputs = [ kconfig + kholidays ki18n kirigami-addons kirigami2 diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/plasma-mobile/neochat.nix index 2f655d5a9e09c..8b3da82b8b885 100644 --- a/pkgs/applications/plasma-mobile/neochat.nix +++ b/pkgs/applications/plasma-mobile/neochat.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv +{ gcc12Stdenv , lib , srcs @@ -31,7 +31,7 @@ }: # Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "neochat"; inherit (srcs.neochat) version src; diff --git a/pkgs/applications/plasma-mobile/plasmatube/default.nix b/pkgs/applications/plasma-mobile/plasmatube/default.nix index 81041b22931dc..c9753babeaaf0 100644 --- a/pkgs/applications/plasma-mobile/plasmatube/default.nix +++ b/pkgs/applications/plasma-mobile/plasmatube/default.nix @@ -8,6 +8,7 @@ , kdeclarative , ki18n , kirigami2 +, mpv , qtmultimedia , qtquickcontrols2 , yt-dlp @@ -26,6 +27,7 @@ mkDerivation { kdeclarative ki18n kirigami2 + mpv qtmultimedia qtquickcontrols2 ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/plasma-mobile/qmlkonsole.nix b/pkgs/applications/plasma-mobile/qmlkonsole.nix new file mode 100644 index 0000000000000..da892fb47c0e4 --- /dev/null +++ b/pkgs/applications/plasma-mobile/qmlkonsole.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, ki18n +, kirigami-addons +, kirigami2 +, kcoreaddons +, qtquickcontrols2 +, kwindowsystem +, qmltermwidget +}: + +mkDerivation { + pname = "qmlkonsole"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + ki18n + kirigami-addons + kirigami2 + qtquickcontrols2 + kcoreaddons + kwindowsystem + qmltermwidget + ]; + + meta = with lib; { + description = "Terminal app for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/qmlkonsole"; + license = with licenses; [ gpl2Plus gpl3Plus cc0 ]; + maintainers = with maintainers; [ balsoft ]; + }; +} diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 7ec5541f48c8e..c120851e5b2e0 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,6 +1,6 @@ { lib , mkDerivation -, gcc11Stdenv +, gcc12Stdenv , srcs , cmake @@ -12,6 +12,7 @@ , kcontacts , ki18n , kio +, kirigami-addons , kirigami2 , knotifications , kpeople @@ -23,8 +24,8 @@ , qtquickcontrols2 }: -# Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +# Workaround for AArch64 still using GCC9. +gcc12Stdenv.mkDerivation rec { pname = "spacebar"; inherit (srcs.spacebar) version src; @@ -40,6 +41,7 @@ gcc11Stdenv.mkDerivation rec { kcontacts ki18n kio + kirigami-addons kirigami2 knotifications kpeople diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index a30966847a59d..42e0612cf8cb0 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -4,195 +4,187 @@ { alligator = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/alligator-22.11.tar.xz"; - sha256 = "02hg42mmvykq71my6wbgc3yri4c3mr4bp73b7p21j1b8m3x0ycsl"; - name = "alligator-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/alligator-23.01.0.tar.xz"; + sha256 = "00vcj8dvzqj9vhq60ygqj62vx26lnai1j7117q0klp8wc9vngbvc"; + name = "alligator-23.01.0.tar.xz"; }; }; angelfish = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/angelfish-22.11.tar.xz"; - sha256 = "07gp6468c7rhf3hzzk6qyz4kcah0s1wnn5r3mx7qmg777xaans9y"; - name = "angelfish-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/angelfish-23.01.0.tar.xz"; + sha256 = "1pzms8xj57r8cv400fbcj9f4v8bs8xlws0f8zgak57jw5yxs073p"; + name = "angelfish-23.01.0.tar.xz"; }; }; audiotube = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/audiotube-22.11.tar.xz"; - sha256 = "0ga7ag8v9l91j5rrn02kk73zl29lwigcql1xfh7yw5cnky3xd13q"; - name = "audiotube-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/audiotube-23.01.0.tar.xz"; + sha256 = "0cjyjqin8zmgav3wf96zv2kr0ifn4xk4il1l5ybwf4k73qg1387x"; + name = "audiotube-23.01.0.tar.xz"; }; }; calindori = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/calindori-22.11.tar.xz"; - sha256 = "1mgdd61zmnjbpcwkaq2aiawksf1s86b05sq502by6gpdrwndhb5c"; - name = "calindori-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/calindori-23.01.0.tar.xz"; + sha256 = "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl"; + name = "calindori-23.01.0.tar.xz"; }; }; kalk = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kalk-22.11.tar.xz"; - sha256 = "0ri39455341nw6bn0lphky6n2b4ib9g4i24f6gzc0adnbhbpxdiq"; - name = "kalk-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kalk-23.01.0.tar.xz"; + sha256 = "1d5xlinrwjyxfr7ibxjjgbqmy69w6sgxxdpfn1x1wccnjfld4zqf"; + name = "kalk-23.01.0.tar.xz"; }; }; kasts = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kasts-22.11.tar.xz"; - sha256 = "049700i15cw07c6053iml1q3h5mni24kdf8nvkdafdafhslb84i9"; - name = "kasts-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kasts-23.01.0.tar.xz"; + sha256 = "09xvgd5vdmniqlnaxrim9d0rpv2qkdz91jq168gzl1kczl26pivf"; + name = "kasts-23.01.0.tar.xz"; }; }; kclock = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kclock-22.11.tar.xz"; - sha256 = "02v64zfbv1g3q4w79d0r8rxqiqsnxms7dgkjv09bp1gl1asqx354"; - name = "kclock-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kclock-23.01.0.tar.xz"; + sha256 = "0fxda2cqi9qqj2lkzs08jr8i35jzzy5z76k2mbz2qyfmby7hsz1r"; + name = "kclock-23.01.0.tar.xz"; }; }; keysmith = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/keysmith-22.11.tar.xz"; - sha256 = "1aimsgwk80yvncbsjnaxvr6aj8y4g40dpwfv0qi0k7b3xkrmqdk5"; - name = "keysmith-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/keysmith-23.01.0.tar.xz"; + sha256 = "0m5gbf3rw1l6qx5aphr57726p6v5nl2g718ainxa689p075smfbf"; + name = "keysmith-23.01.0.tar.xz"; }; }; khealthcertificate = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/khealthcertificate-22.11.tar.xz"; - sha256 = "0gw6j70k0nvbfb1vfj8b64vfipdckzd8hqqmp9vrmsg7y8g8n0hi"; - name = "khealthcertificate-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/khealthcertificate-23.01.0.tar.xz"; + sha256 = "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm"; + name = "khealthcertificate-23.01.0.tar.xz"; }; }; koko = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/koko-22.11.tar.xz"; - sha256 = "1jqjjd9spyppdbijdnvci742wj80p10pfbjp1hyc0y4zdjic67bv"; - name = "koko-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/koko-23.01.0.tar.xz"; + sha256 = "1bfbfwavphj3bnf8icnakbdaa6a7i0fgyhs8xa73clwig54fk4np"; + name = "koko-23.01.0.tar.xz"; }; }; kongress = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kongress-22.11.tar.xz"; - sha256 = "03r8xck9vxl3al3f5v6g0yzqzs3yxl3lg7zg73ik22q6z2rb1adb"; - name = "kongress-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kongress-23.01.0.tar.xz"; + sha256 = "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5"; + name = "kongress-23.01.0.tar.xz"; }; }; krecorder = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/krecorder-22.11.tar.xz"; - sha256 = "1wiihcp1c0wc7ssj9hj18rnzf8synaxmq6b0m2m286x4zibl50wb"; - name = "krecorder-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/krecorder-23.01.0.tar.xz"; + sha256 = "0aja3w8qbp96h43igajs068s89gf6nn7zwf6c813rbyqzl350phn"; + name = "krecorder-23.01.0.tar.xz"; }; }; ktrip = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/ktrip-22.11.tar.xz"; - sha256 = "07mjf9jpj20ixhswy4byqy3m4sr1qylwlvq2prabn11j42ahpsy7"; - name = "ktrip-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/ktrip-23.01.0.tar.xz"; + sha256 = "1l69fd1hhclm9212h6zm4nhkc0dg2wl47jw7wl9s6vy3xvmysihm"; + name = "ktrip-23.01.0.tar.xz"; }; }; kweather = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kweather-22.11.tar.xz"; - sha256 = "0sqc74yp5hvrjagax6nj0gm4qvbxqr66706yh12abcn9gpl33ndl"; - name = "kweather-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kweather-23.01.0.tar.xz"; + sha256 = "1hcb8jzx2bwcyxphya7kx7q2yri1w0k2753xiibw1hlgmb3qzr7s"; + name = "kweather-23.01.0.tar.xz"; }; }; neochat = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/neochat-22.11.tar.xz"; - sha256 = "1gnhk9hww05bc4y8jd4sg3146c6m96ds2saajrnzyc6963j2ndi5"; - name = "neochat-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/neochat-23.01.0.tar.xz"; + sha256 = "0pkas8whwy1ih4sx9vaa7k55iiiy955dh4d53i4l1d0sjdf8pysd"; + name = "neochat-23.01.0.tar.xz"; }; }; plasma-dialer = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-dialer-22.11.tar.xz"; - sha256 = "1qx7xmvfszpsrb2jylnwfs8rhr09kxvy5vnyzzcds248ljh5l6dy"; - name = "plasma-dialer-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-dialer-23.01.0.tar.xz"; + sha256 = "0n9g3jf71lpcwlwr1ia1i6kh0kiv2vizssni1df3cwskd7hivn7h"; + name = "plasma-dialer-23.01.0.tar.xz"; }; }; plasma-phonebook = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-phonebook-22.11.tar.xz"; - sha256 = "02sj6v18w63ixy0c93fm4j9n4q98497qrb509q84618gry4cazly"; - name = "plasma-phonebook-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-phonebook-23.01.0.tar.xz"; + sha256 = "0pprfgims9h6g1xw48w66bqkmqp7qp7gkc7k4zbj3lgmmnwh6z9i"; + name = "plasma-phonebook-23.01.0.tar.xz"; }; }; plasma-settings = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-settings-22.11.tar.xz"; - sha256 = "0pg71plcbn4zkwxwcvay9swaa5xn3mnljdpnh4i8f86x2pa1pq5j"; - name = "plasma-settings-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-settings-23.01.0.tar.xz"; + sha256 = "0fz0zjyh15ma6kv79pm0gc92iz6gikxyr4afkyzabzk9559dv1p7"; + name = "plasma-settings-23.01.0.tar.xz"; }; }; plasmatube = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasmatube-22.11.tar.xz"; - sha256 = "0vgxvyw4yl91kaj9cnjf455mpj4a5rh5f1z0in8k9p2jbs8wmjil"; - name = "plasmatube-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasmatube-23.01.0.tar.xz"; + sha256 = "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj"; + name = "plasmatube-23.01.0.tar.xz"; }; }; qmlkonsole = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/qmlkonsole-22.11.tar.xz"; - sha256 = "03hwyrl6rb7yidw0nadis6csb6snpfv137j46rbpl35vrqrnrh5i"; - name = "qmlkonsole-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/qmlkonsole-23.01.0.tar.xz"; + sha256 = "07h2pkz9h5lm232jasf6znf0i2p5c5qxnjac1d51qf8rfm0fp1q3"; + name = "qmlkonsole-23.01.0.tar.xz"; }; }; spacebar = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/spacebar-22.11.tar.xz"; - sha256 = "1q0nyfvssiz5i19wyk4pvazax3vvk945cmknw4l51mpcc3hnc1v5"; - name = "spacebar-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/spacebar-23.01.0.tar.xz"; + sha256 = "0srwvbnb80cgxkjjq2ch1lrbki7m169i86hig41h368wr9nmjnsl"; + name = "spacebar-23.01.0.tar.xz"; }; }; telly-skout = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - 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.11"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/tokodon-22.11.tar.xz"; - sha256 = "0afrqih1bkgg0xqr81sq9q3glyhy8347p8vzddl42zsxax9wki59"; - name = "tokodon-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/telly-skout-23.01.0.tar.xz"; + sha256 = "1wcabca1wlxjna4bd1blpwh7hi1wrcmn8bc06g8mpdzm8756d7sk"; + name = "telly-skout-23.01.0.tar.xz"; }; }; vakzination = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/vakzination-22.11.tar.xz"; - sha256 = "0587p5q9v0lh3nz00dfa8kym36xcgcg8n4alnchk6kr8c479kmk6"; - name = "vakzination-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/vakzination-23.01.0.tar.xz"; + sha256 = "1lx46r46xq18a1pxa6qhnwks43w022fkbrvylb84ycy59djq371n"; + name = "vakzination-23.01.0.tar.xz"; }; }; } diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/plasma-mobile/tokodon.nix index a412835c8ccd1..f93336d40fa8c 100644 --- a/pkgs/applications/plasma-mobile/tokodon.nix +++ b/pkgs/applications/plasma-mobile/tokodon.nix @@ -34,14 +34,14 @@ libsForQt5.mkDerivation rec { pname = "tokodon"; - version = "22.11.2"; + version = "23.01.0"; # 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="; + hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index ceb0f7661c8e3..641bda8fb8618 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -1,18 +1,19 @@ { lib , stdenvNoCC , fetchFromGitHub +, nix-update-script , nixosTests , php}: stdenvNoCC.mkDerivation rec { name = "cloudlog"; - version = "2.3.3"; + version = "2.4"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4="; + sha256 = "sha256-aF1f6EmlcUgZOkHJgrW6P923QW56vWMH8CZ4cnYiiSk="; }; postPath = '' @@ -25,8 +26,11 @@ stdenvNoCC.mkDerivation rec { cp -R ./* $out ''; - passthru.tests = { - inherit (nixosTests) cloudlog; + passthru = { + tests = { + inherit (nixosTests) cloudlog; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index a67b48c840be1..defed4dc431ac 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { hackrf ] ++ lib.optional stdenv.isLinux limesuite; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion"; buildFlags = [ "dump1090" "view1090" ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 549df5d9b5ddd..f6c7531ab3c71 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.23"; + version = "4.1.25"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-42bh/J/DQ/V9ORKKZgOmlvhyNR7UjbqPPD0Wi9ofyo0="; + sha256 = "sha256-TsS/OS2mXwqsk+E+9MEoETIHRWks8Hg/qw8WRmAxB2M="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index e06b241905d3a..5425c6b73ac8e 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 477953ab26fde..b1bda9fadce35 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 06cb2776a0b34..605a916c6b4da 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -69,9 +69,9 @@ stdenv.mkDerivation rec { "-DUNITTEST=ON" ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-DAPPLE_OLD_XCODE" - ]; + ]); doCheck = true; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 6ca669a8fe948..e06e3437281cf 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -49,12 +49,12 @@ , versionAttr ? { major = "3.10"; minor = "5"; - patch = "0"; + patch = "1"; } }: let - sourceSha256 = "sha256-NP7OH4kRulWpWxyHudIzCJPfjiiilgnhBlixmwOj70I="; + sourceSha256 = "sha256-D5Bsj70IHFOLPZQbaxkGdx7Lz94bXhCfnNfhZb3dDp4="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index ff6aaf35bea09..bdbc22cb787d3 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -37,20 +37,18 @@ rec { ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "native" info then info.native else []) ++ - (if builtins.hasAttr "pythonNative" info then info.pythonNative else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "native" info) info.native) ++ + (lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative) + ) ) ) featuresInfo); buildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "runtime" info then info.runtime else []) ++ - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "runtime" info) info.runtime) ++ + (lib.optionals (builtins.hasAttr "pythonRuntime" info) info.pythonRuntime) + ) ) ) featuresInfo); cmakeFlags = lib.mapAttrsToList ( diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 926022353e41f..c38c89fc459b1 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -41,12 +41,9 @@ let ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( - if unwrapped.hasFeature feat then - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals ((unwrapped.hasFeature feat) && (builtins.hasAttr "pythonRuntime" info)) info.pythonRuntime ) - ) unwrapped.featuresInfo) + ) unwrapped.featuresInfo) ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index cfb1f367ad80f..9a48854ccc699 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -1,18 +1,19 @@ { lib , stdenv , fetchFromGitLab +, nix-update-script , nwjs }: stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.0110"; + version = "1.23.0206"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-yQWdBNt7maYTzroB+P1hsGIeivkP+soR3/b847HLYZY="; + sha256 = "sha256-XWjKJga9aQrMb0ZfA4ElsPU1CfMwFtwYSK1vjgtlKes="; }; postPatch = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "An amateur radio companion to WSJT-X or JTDX"; longDescription = '' diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 404ec7aa96a19..41d1407a9af3c 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, cmake, pkg-config , airspy -, librtlsdr +, rtl-sdr , fdk_aac , faad2 , fftwFloat @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ airspy - librtlsdr + rtl-sdr fdk_aac faad2 fftwFloat @@ -42,7 +42,7 @@ mkDerivation rec { postFixup = '' # guglielmo opens SDR libraries at run time - patchelf --add-rpath "${airspy}/lib:${librtlsdr}/lib" $out/bin/.guglielmo-wrapped + patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped ''; meta = with lib; { diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 1180f5a941ae7..647f3efd6706c 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hackrf"; - version = "2022.09.1"; + version = "2023.01.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "hackrf"; rev = "v${version}"; - sha256 = "sha256-c+9DEMxioIbEDNTdLSOnxX1zpFk07K9rlGP9goEJMlU="; + sha256 = "sha256-zvSSCNtqHOZVlrBggjgxEyUTqTiAIAhdzUkm4Pm9b3k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix new file mode 100644 index 0000000000000..aa89d88197510 --- /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, + qtlocation, + qtserialport, + qttools, + qtbase, + yaml-cpp, +}: + +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 = [ + libusb1 + qtlocation + qtserialport + qttools + qtbase + yaml-cpp + ]; + + 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 = "GUI application and command line tool for programming 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/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 75fb91d5ce6a4..34e83ab95ca23 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,18 +1,18 @@ -{ lib, python38Packages, fetchPypi -, fftw, alsa-lib, pulseaudio, wxPython_4_0 }: +{ lib, python39Packages, fetchPypi +, fftw, alsa-lib, pulseaudio, pyusb, wxPython_4_0 }: -python38Packages.buildPythonApplication rec { +python39Packages.buildPythonApplication rec { pname = "quisk"; - version = "4.1.73"; + version = "4.2.17"; src = fetchPypi { inherit pname version; - sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8"; + sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY="; }; buildInputs = [ fftw alsa-lib pulseaudio ]; - propagatedBuildInputs = [ wxPython_4_0 ]; + propagatedBuildInputs = [ pyusb wxPython_4_0 ]; doCheck = false; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index d8180750c7a1c..722a0565e0de5 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "librtlsdr"; repo = "librtlsdr"; rev = "v${version}"; - sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk"; + hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; }; postPatch = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libusb1 ]; + propagatedBuildInputs = [ libusb1 ]; cmakeFlags = lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index fa3f566b3f0c1..392088eca95f4 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.6"; + version = "7.10.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4="; + sha256 = "sha256-hsYt7zGG6CSWeQ9A3GPt65efjZGPu33O5pIhnZjFgmY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index f2bb7920ea43d..9926fab1a7469 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -8,7 +8,7 @@ , hackrf_source ? true, hackrf , limesdr_source ? false, limesuite , sddc_source ? false -, rtl_sdr_source ? true, librtlsdr, libusb1 +, rtl_sdr_source ? true, rtl-sdr, libusb1 , rtl_tcp_source ? true , sdrplay_source ? false, sdrplay , soapy_source ? true, soapysdr @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ lib.optional bladerf_source libbladeRF ++ lib.optional hackrf_source hackrf ++ lib.optional limesdr_source limesuite - ++ lib.optionals rtl_sdr_source [ librtlsdr libusb1 ] + ++ lib.optionals rtl_sdr_source [ rtl-sdr libusb1 ] ++ lib.optional sdrplay_source sdrplay ++ lib.optional soapy_source soapysdr ++ lib.optionals plutosdr_source [ libiio libad9361 ] @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { OPT_BUILD_RIGCTL_SERVER = rigctl_server; }; - NIX_CFLAGS_COMPILE = "-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; hardeningDisable = lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index 95f429aef43e0..ebb34b0a0ce55 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]); meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index adf997773eccf..59a1e0f59acc4 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -5,7 +5,8 @@ , python ? null , ncurses, swig2 , extraPackages ? [] -} : +, testers +}: let @@ -14,7 +15,7 @@ let modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; inherit version; @@ -58,12 +59,15 @@ in stdenv.mkDerivation { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; mainProgram = "SoapySDRUtil"; + pkgConfigModules = [ "SoapySDR" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 3fd066ec7b7bb..80121db69c010 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { These change the parameters used when sounding the Morse code. cw reports any errors in embedded commands ''; - homepage = "http://unixcw.sourceforge.net"; + homepage = "https://unixcw.sourceforge.net"; maintainers = [ maintainers.mafo ]; license = licenses.gpl2; platforms=platforms.linux; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 93836cee28197..3dd7a5422537e 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/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index d47bd418f513d..fe2b915e93adc 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 hamlib ]; diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/applications/science/astronomy/astrolog/default.nix index 26d0639ae67f2..743a58e9e053d 100644 --- a/pkgs/applications/science/astronomy/astrolog/default.nix +++ b/pkgs/applications/science/astronomy/astrolog/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ xorg.libX11 ]; - NIX_CFLAGS_COMPILE = "-Wno-format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; installPhase = let diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 703416f074aa8..64e3f8713b2f8 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct22b"; - version = "20221001_b"; + srcVersion = "feb23a"; + version = "20230201_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk="; + sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch deleted file mode 100644 index 3bbcb9f36e990..0000000000000 --- a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py ---- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200 -+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200 -@@ -32,7 +32,7 @@ - libs.insert(0, '-L' + getvar('LIBDIR')) - - # Framework (specific for Mac) --if not getvar('PYTHONFRAMEWORK'): -- libs.extend(getvar('LINKFORSHARED').split()) -+#if not getvar('PYTHONFRAMEWORK'): -+# libs.extend(getvar('LINKFORSHARED').split()) - - print(' '.join(libs)) diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index f5fa5f1d1e4b8..5fd698788cc97 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/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index d74ad2c4e8788..3769948fd3eff 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-WWbtfqvGd13+a41z8/MjlchllpuhLX08nu15OlYUeuI="; + sha256 = "sha256-sve9q4iM/Y8+K64Ceby/KGx5Un5G0o5cCnIxJkXTgug="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 8c0cb2be32b9d..94aa92a1b713f 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Renders an image of the earth or other planets into the X root window"; - homepage = "http://xplanet.sourceforge.net"; + homepage = "https://xplanet.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus sander ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index e117af03b57dd..4c5f3162febdb 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, vtk_8, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }: stdenv.mkDerivation rec { - pname = "ANTs"; + pname = "ANTs"; version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk 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/bayescan/default.nix b/pkgs/applications/science/biology/bayescan/default.nix index cd5bb3210364e..e715ff4b45b06 100644 --- a/pkgs/applications/science/biology/bayescan/default.nix +++ b/pkgs/applications/science/biology/bayescan/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -r ../*pdf ../input_examples ../"R functions" $out/share/doc/bayescan ''; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = with lib; { description = "Detecting natural selection from population-based genetic data"; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 719f450650029..993afff5965e9 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.16"; + version = "1.17"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-kL9kfJrXnhCiQ7gFjIc94Ff9cBLiUNWuZXSDl4ei7NY="; + sha256 = "sha256-AfddjnAdhbLHWRckEgCcwE8pthYWrOL6dRFhI95Flsw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix index ccb797d8a227e..bec263a2d9315 100644 --- a/pkgs/applications/science/biology/bowtie/default.nix +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An ultrafast memory-efficient short read aligner"; license = licenses.artistic2; - homepage = "http://bowtie-bio.sourceforge.net"; + homepage = "https://bowtie-bio.sourceforge.net"; maintainers = with maintainers; [ prusnak ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 42ce5f934e826..3eef648372555 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" (lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing") ]; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 90eef027a8425..cbde1647db9bf 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/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 8073b1bea1634..241585b3579ed 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.3"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg"; + sha256 = "sha256-gvPftUSH+Gnn8LQeORpv7jjHewUKSeo2FVNcoaE2GKU="; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 9aa655932d35a..c555a30b15a8d 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "eggnogdb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE="; + hash = "sha256-6R2gl2l2Cl/eva0g+kxDLBI2+5T9cFTgaGMsEfeDVU0="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 5c2f09a4faefa..0ceaab4ab46be 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of `cupsfilter'; # foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index f6d767235b7ff..ec97f0e6aa31d 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.5"; + version = "2.16.0"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-AKKMtR0hU2O84mRJxxsXNCYHeW8d6t3XJpzOKKaxAWw="; + sha256 = "sha256-pfFUtPgHzTWMm3sh4un8SwSYF8HM30HbAQznxlu4Irw="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index 8ea115c6b25df..b4999193e177e 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "inormalize"; - name = "${pname}-2014-10-21"; + version = "unstable-2014-10-21"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index fe2b773fb0e30..0104a5506bc6a 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 = "1422"; + version = "1447"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; - rev = version; - sha256 = "sha256-3OhttOd6qgO6d+sbVkZj8i/K6bJTvlMyfa3E4mIpt24="; + rev = "refs/tags/${version}"; + hash = "sha256-zts1F2tFeBP7CQifpc2M4i6duK8FA7hQXTOizv8/kWM="; }; - 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/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index e8aef4138b05e..42178722b5517 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -4,8 +4,7 @@ stdenv.mkDerivation rec { pname = "minc-widgets"; - name = "${pname}-2016-04-20"; - + version = "unstable-2016-04-20"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/applications/science/biology/minia/default.nix index 6b6bc300e0d9f..023a05d7504f9 100644 --- a/pkgs/applications/science/biology/minia/default.nix +++ b/pkgs/applications/science/biology/minia/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./no-bundle.patch ]; - NIX_CFLAGS_COMPILE = [ "-Wformat" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wformat" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ hdf5 boost ]; diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix new file mode 100644 index 0000000000000..f26f06a1f298b --- /dev/null +++ b/pkgs/applications/science/biology/nest/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, testers +, cmake +, gsl +, libtool +, findutils +, llvmPackages +, mpi +, nest +, pkg-config +, boost +, python3 +, readline +, autoPatchelfHook +, withPython ? false +, withMpi ? false +}: + +stdenv.mkDerivation rec { + pname = "nest"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "nest"; + repo = "nest-simulator"; + rev = "v${version}"; + sha256 = "sha256-wmn5LOOHlSuyPdV6O6v7j10dxdcvqpym6MfveZdL+dU="; + }; + + postPatch = '' + patchShebangs cmake/CheckFiles/check_return_val.sh + # fix PyNEST installation path + # it expects CMAKE_INSTALL_LIBDIR to be relative + substituteInPlace cmake/ProcessOptions.cmake \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/python" "lib/python" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + findutils + ]; + + buildInputs = [ + gsl + readline + libtool # libltdl + boost + ] ++ lib.optionals withPython [ + python3 + python3.pkgs.cython + ] ++ lib.optional withMpi mpi + ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + + propagatedBuildInputs = with python3.pkgs; [ + numpy + ]; + + cmakeFlags = [ + "-Dwith-python=${if withPython then "ON" else "OFF"}" + "-Dwith-mpi=${if withMpi then "ON" else "OFF"}" + "-Dwith-openmp=ON" + ]; + + postInstall = '' + # Alternative to autoPatchElf, moves libraries where + # Nest expects them to be + find $out/lib/nest -type f -exec ln -s {} $out/lib \; + ''; + + passthru.tests.version = testers.testVersion { + package = nest; + command = "nest --version"; + }; + + meta = with lib; { + description = "NEST is a command line tool for simulating neural networks"; + homepage = "https://www.nest-simulator.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ jiegec davidcromp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index a35d586b9ac3f..115def63a3097 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,94 +1,104 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config -, automake -, autoconf -, libtool -, ncurses , readline -, which -, python ? null -, useMpi ? false +, xorg , mpi -, iv +, cmake +, bison +, flex +, git +, perl +, gsl +, xcbuild +, python3 +, useMpi ? false +, useIv ? true +, useCore ? false +, useRx3d ? false }: + stdenv.mkDerivation rec { - pname = "neuron${lib.optionalString useMpi "-mpi"}"; - version = "7.5"; + pname = "neuron"; + version = "8.2.2"; - nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; - buildInputs = [ ncurses readline python iv ] - ++ lib.optional useMpi mpi; + # format is for pythonModule conversion + format = "other"; - src = fetchurl { - url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; - sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; - }; + nativeBuildInputs = [ + cmake + bison + flex + git + ] ++ lib.optional useCore [ perl gsl ] + ++ lib.optional stdenv.isDarwin [ xcbuild ]; - patches = (lib.optionals (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + buildInputs = lib.optional useIv [ + xorg.libX11.dev + xorg.libXcomposite.dev + xorg.libXext.dev + ]; - # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/gnu/neuron_gnu_builtin.h \ - --replace 'double abs(double arg);' "" \ - --replace 'float abs(float arg);' "" \ - --replace 'short abs(short arg);' "" \ - --replace 'long abs(long arg);' "" - '' + lib.optionalString stdenv.isDarwin '' - # we are darwin, but we don't have all the quirks the source wants to compensate for - substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' - for f in src/nrnpython/*.[ch] ; do - substituteInPlace $f --replace "<Python/Python.h>" "<Python.h>" - done - ''; + propagatedBuildInputs = [ + readline + python3 + python3.pkgs.wheel + python3.pkgs.setuptools + python3.pkgs.scikit-build + python3.pkgs.matplotlib + ] ++ lib.optional useMpi [ + mpi + ] ++ lib.optional useMpi [ + python3.pkgs.mpi4py + ] ++ lib.optional useRx3d [ + python3.pkgs.cython + python3.pkgs.numpy + ]; - enableParallelBuilding = true; + patches = [ ./neuron_darwin_rpath.patch ]; - ## neuron install by default everything under prefix/${host_arch}/* - ## override this to support nix standard file hierarchy - ## without issues: install everything under prefix/ - preConfigure = '' - ./build.sh - export prefix="''${prefix} --exec-prefix=''${out}" + # Patch build shells for cmake (bin, src, cmake) and submodules (external) + postPatch = '' + patchShebangs ./bin ./src ./external ./cmake + sed -e 's#DESTDIR =#DESTDIR = '"$out"'#' -i external/coreneuron/extra/nrnivmodl_core_makefile.in ''; - configureFlags = with lib; - [ "--with-readline=${readline}" "--with-iv=${iv}" ] - ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] - ++ (if useMpi then ["--with-mpi" "--with-paranrn"] - else ["--without-mpi"]); + cmakeFlags = [ + "-DNRN_ENABLE_INTERVIEWS=${if useIv then "ON" else "OFF"}" + "-DNRN_ENABLE_MPI=${if useMpi then "ON" else "OFF"}" + "-DNRN_ENABLE_CORENEURON=${if useCore then "ON" else "OFF"}" + "-DNRN_ENABLE_RX3D=${if useRx3d then "ON" else "OFF"}" + ]; - - postInstall = lib.optionalString (python != null) '' - ## standardise python neuron install dir if any - if [[ -d $out/lib/python ]]; then - mkdir -p ''${out}/${python.sitePackages} - mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ - fi + postInstall = '' + mkdir -p $out/${python3.sitePackages} + mv $out/lib/python/* $out/${python3.sitePackages}/ + rm -rf $out/lib/python build + for entry in $out/lib/*.so; do + # remove references to build + patchelf --set-rpath $(patchelf --print-rpath $entry | tr ':' '\n' | sed '/^\/build/d' | tr '\n' ':') $entry + done ''; - propagatedBuildInputs = [ readline ncurses which libtool ]; + src = fetchurl { + url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz"; + sha256 = "sha256-orGeBxu3pu4AyAW5P1EGJv8G0dOUZcSOjpUaloqicZU="; + }; meta = with lib; { - broken = stdenv.isDarwin; description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; - - longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, - involving many ion-specific channels, ion accumulation, and second messengers"; - - sourceProvenance = with sourceTypes; [ - fromSource - ] ++ lib.optionals (python != null) [ - binaryNativeCode # "geometry3d" bundled libraries - ]; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - maintainers = [ maintainers.adev ]; - # source claims it's only tested for x86 and powerpc - platforms = platforms.x86_64 ++ platforms.i686; + longDescription = '' + NEURON is a simulation environment for developing and exercising models of + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, + involving many ion-specific channels, ion accumulation, and second messengers + ''; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.bsd3; + homepage = "http://www.neuron.yale.edu/neuron"; + maintainers = with maintainers; [ adev davidcromp ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch deleted file mode 100644 index 923bffb1c338e..0000000000000 --- a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- nrn-7.4/src/mac/Makefile.am 2015-11-12 21:42:45.000000000 +0100 -+++ nrn-7.4.new/src/mac/Makefile.am 2016-08-24 17:43:39.000000000 +0200 -@@ -15,18 +15,8 @@ - host_cpu = @host_cpu@ - - if MAC_DARWIN --carbon = @enable_carbon@ - bin_SCRIPTS = $(launch_scripts) - install: install-am --if UniversalMacBinary -- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- lipo aouti386 aoutppc -create -output a.out --else -- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- --endif -- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)" - for i in $(S) ; do \ - sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \ - mv temp $(DESTDIR)$(bindir)/$$i; \ diff --git a/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch new file mode 100644 index 0000000000000..1b0fa2670782a --- /dev/null +++ b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch @@ -0,0 +1,11 @@ +--- a/src/nrnpython/setup.py.in ++++ b/src/nrnpython/setup.py.in +@@ -124,7 +124,7 @@ libdirs = [destdir + get_escaped_path("@NRN_LIBDIR@"), + rpath_prefix_flag='-Wl,-R' + extra_link_args = [@NRN_LINK_FLAGS_COMMA_SEPARATED_STRINGS@] + @MAC_DARWIN_FALSE@extra_link_args += [rpath_prefix_flag+lib_path for lib_path in libdirs] +-@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../") ++@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../../") + @MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,%s" % ivlibdir) + + # as neuron module will be built during make, add build/lib diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index d5f625893e925..0be59bcd726a0 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07v9v9s41lvw72wpb1jgh2nzanyc994779bd35p76vg8mzifmprl"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=narrowing" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 659b1e97f200f..c2948087d8ed7 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-VaUr63v7mzhh4VBghH7a7qrqOYwl6vucmmKzTi9yAjY="; }) ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + ]; + postInstall = '' mkdir $out/bin mv $out/octopus $out/bin diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 66ba244cacd68..871c76dc6e31b 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: /build/ccKomtcd.o:(.bss+0x4544): multiple definition of `SeqTypes'; # /build/ccx7EsgU.o:(.bss+0x2a0dfdc): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preBuild = '' cd ./src/ diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index b21ef2d71d6c2..00fd0ff0083e0 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h - ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} + ${lib.optionalString stdenv.cc.isClang "sed -i 's|g++|clang++|g' Makefile.std"} makeFlagsArray+=( ZLIB=-lz diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index 0a33c97673196..e5ee4b53089f6 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { --replace "/bin/bash" "${bash}/bin/bash" mkdir -p "$out/${python.sitePackages}" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py install \ + ${python.pythonForBuild.interpreter} setup.py install \ --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix index 9cfa7cb933b0c..640d2f5ae4160 100644 --- a/pkgs/applications/science/biology/seaview/default.nix +++ b/pkgs/applications/science/biology/seaview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224. ''; - homepage = "http://doua.prabi.fr/software/seaview"; + homepage = "https://doua.prabi.fr/software/seaview"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 5fcb367ce5cb1..04ef7c2e062ba 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.60"; + version = "2.62"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-ppKG7Z1TyLwUyqRnGYk3QWPJqKeNcW04GMW7myPFSNM="; + sha256 = "sha256-7uhQVLC/AEPAPUdm3+vABoIwG4uhNy/EngjsrZjT0Ts="; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 8585f3770fbcd..9730601e4e7d1 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python2 ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" "-Wno-error=pessimizing-move" ]; diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index b1a174aaf882d..441c7ed6dcc3d 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ./libfml.a(rle.o):/build/source/SeqLib/fermi-lite/rle.h:33: multiple definition of # `rle_auxtab'; ./libfml.a(misc.o):/build/source/SeqLib/fermi-lite/rle.h:33: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix index f74ba9d2e4434..53daffbe0677e 100644 --- a/pkgs/applications/science/biology/tandem-aligner/default.nix +++ b/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , zlib }: @@ -16,6 +17,15 @@ stdenv.mkDerivation { hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8="; }; + patches = [ + (fetchpatch { + # https://github.com/seryrzu/tandem_aligner/pull/4 + url = "https://github.com/seryrzu/tandem_aligner/commit/8b516c94f90aaa9cb84278aa811285d4204b03a9.patch"; + hash = "sha256-kD46SykXklG/avK0+sc61YKFw9Bes8ZgFAjVXmcpN8k="; + stripLen = 1; + }) + ]; + sourceRoot = "source/tandem_aligner"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 8b9b086b77b28..2c0cad05596a5 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "varscan"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "https://github.com/dkoboldt/varscan/raw/master/VarScan.v${version}.jar"; - sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0="; + sha256 = "sha256-q4jkkKTqXHiaAPRThqo82i43+B4NaHUUuMyefW6tgg0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index c6339bab1228e..547123b67957c 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen ]; - NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; + env.NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; patches = [ (fetchurl { diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix index 37057e1c604a4..fe2d658b5a44f 100644 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Otherwise built fails as: # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index dc41019d364b0..260b1e24a082f 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/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b5b5be84c8ec1..98f7ccbfee02a 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.83"; + version = "16.1.3"; 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-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8="; + sha256 = "sha256-k1F4OaER9vg8GIi4eqppeh2f0MtlcBSfd4zkewFp2As="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/applications/science/chemistry/mopac/default.nix new file mode 100644 index 0000000000000..d2b2b558bb78a --- /dev/null +++ b/pkgs/applications/science/chemistry/mopac/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, gfortran +, fetchFromGitHub +, cmake +, blas +, lapack +, python3Packages +}: + +assert blas.isILP64 == lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "mopac"; + version = "22.0.6"; + + src = fetchFromGitHub { + owner = "openmopac"; + repo = pname; + rev = "v${version}"; + hash = "sha256-j4AP3tki+Ep9Pv+pDg8TwCiJvpF2j5npW3Kpat+7gGg="; + }; + + nativeBuildInputs = [ gfortran cmake ]; + + buildInputs = [ blas lapack ]; + + checkInputs = with python3Packages; [ python numpy ]; + + doCheck = true; + + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + meta = with lib; { + description = "Semiempirical quantum chemistry"; + homepage = "https://github.com/openmopac/mopac"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix new file mode 100644 index 0000000000000..1e76a30595346 --- /dev/null +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -0,0 +1,194 @@ +{ lib +, stdenv +, pkgs +, fetchFromGitHub +, fetchpatch +, which +, openssh +, gcc +, gfortran +, perl +, mpi +, blas +, lapack +, python3 +, tcsh +, bash +, automake +, autoconf +, libtool +, makeWrapper +}: + +assert blas.isILP64 == lapack.isILP64; + +let + versionGA = "5.7.2"; # Fixed by nwchem + + ga_src = fetchFromGitHub { + owner = "GlobalArrays"; + repo = "ga"; + rev = "v${versionGA}"; + sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i"; + }; + +in +stdenv.mkDerivation rec { + pname = "nwchem"; + version = "7.0.2"; + + src = fetchFromGitHub { + owner = "nwchemgit"; + repo = "nwchem"; + rev = "v${version}-release"; + sha256 = "1ckhcjaw1hzdsmm1x2fva27c4rs3r0h82qivg72v53idz880hbp3"; + }; + + patches = [ + # Fix Python 3.10 compatibility + (fetchpatch { + name = "python3.10"; + url = "https://github.com/nwchemgit/nwchem/commit/638401361c6f294164a4f820ff867a62ac836fd5.patch"; + sha256 = "sha256-yUZb3wWYZm1dX0HwvffksFwhVdb7ix1p8ooJnqiSgEg="; + }) + ]; + + nativeBuildInputs = [ + perl + automake + autoconf + libtool + makeWrapper + gfortran + which + ]; + buildInputs = [ + tcsh + openssh + blas + lapack + python3 + ]; + propagatedBuildInputs = [ mpi ]; + propagatedUserEnvPkgs = [ mpi ]; + + postUnpack = '' + cp -r ${ga_src}/ source/src/tools/ga-${versionGA} + chmod -R u+w source/src/tools/ga-${versionGA} + ''; + + postPatch = '' + find -type f -executable -exec sed -i "s:/bin/csh:${tcsh}/bin/tcsh:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/usr/bin/gcc:${gcc}/bin/gcc:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -executable -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -name "makelib.h" -exec sed -i "s:/bin/rm:rm:" \{} \; + + # Overwrite script, skipping the download + echo -e '#!/bin/sh\n cd ga-${versionGA};autoreconf -ivf' > src/tools/get-tools-github + + patchShebangs ./ + ''; + + # There is no configure script. Instead the build is controlled via + # environment variables passed to the Makefile + configurePhase = '' + runHook preConfigure + + # config parameters + export NWCHEM_TARGET="LINUX64" + + export ARMCI_NETWORK="MPI-PR" + export USE_MPI="y" + export USE_MPIF="y" + + export NWCHEM_MODULES="all python" + + export USE_PYTHONCONFIG="y" + export USE_PYTHON64="n" + export PYTHONLIBTYPE="so" + export PYTHONHOME="${python3}" + export PYTHONVERSION=${lib.versions.majorMinor python3.version} + + export BLASOPT="-L${blas}/lib -lblas" + export LAPACK_LIB="-L${lapack}/lib -llapack" + export BLAS_SIZE=${if blas.isILP64 then "8" else "4"} + + # extra TCE related options + export MRCC_METHODS="y" + export EACCSD="y" + export IPCCSD="y" + + export NWCHEM_TOP="$(pwd)" + + runHook postConfigure + ''; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${ga_src} src/tools/ga-${versionGA}.tar.gz + cd src + make nwchem_config + ${lib.optionalString (!blas.isILP64) "make 64_to_32"} + ''; + + postBuild = '' + cd $NWCHEM_TOP/src/util + make version + make + cd $NWCHEM_TOP/src + make link + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/nwchem + + cp $NWCHEM_TOP/bin/LINUX64/nwchem $out/bin/nwchem + cp -r $NWCHEM_TOP/src/data $out/share/nwchem/ + cp -r $NWCHEM_TOP/src/basis/libraries $out/share/nwchem/data + cp -r $NWCHEM_TOP/src/nwpw/libraryps $out/share/nwchem/data + cp -r $NWCHEM_TOP/QA $out/share/nwchem + + wrapProgram $out/bin/nwchem \ + --set-default NWCHEM_BASIS_LIBRARY $out/share/nwchem/data/libraries/ + + cat > $out/share/nwchem/nwchemrc << EOF + nwchem_basis_library $out/share/nwchem/data/libraries/ + nwchem_nwpw_library $out/share/nwchem//data/libraryps/ + ffield amber + amber_1 $out/share/nwchem/data/amber_s/ + amber_2 $out/share/nwchem/data/amber_q/ + amber_3 $out/share/nwchem/data/amber_x/ + amber_4 $out/share/nwchem/data/amber_u/ + spce $out/share/nwchem/data/solvents/spce.rst + charmm_s $out/share/nwchem/data/charmm_s/ + charmm_x $out/share/nwchem/data/charmm_x/ + EOF + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + export OMP_NUM_THREADS=1 + + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + export OMPI_MCA_rmaps_base_oversubscribe=1 + + # run a simple water test + mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out + grep "Total SCF energy" h2o.out | grep 76.010538 + ''; + + passthru = { inherit mpi; }; + + meta = with lib; { + description = "Open Source High-Performance Computational Chemistry"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + homepage = "https://nwchemgit.github.io"; + license = licenses.ecl20; + }; +} diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index d0058c8650d81..cc145baef037a 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { ]; configureFlags = with lib; [ - "--with-yaml-prefix=${libyaml}" + "--with-yaml-prefix=${lib.getDev libyaml}" "--with-blas=-lblas" "--with-lapack=-llapack" - "--with-fftw-prefix=${fftw.dev}" - "--with-gsl-prefix=${gsl}" - "--with-libxc-prefix=${libxc}" + "--with-fftw-prefix=${lib.getDev fftw}" + "--with-gsl-prefix=${lib.getDev gsl}" + "--with-libxc-prefix=${lib.getDev libxc}" "--enable-openmp" ] ++ optional enableFma "--enable-fma3" ++ optional enableFma4 "--enable-fma4" diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 4ad0380ef1e31..15a1e3158233f 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; - NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; hardeningDisable = [ "format" ]; installPhase = '' diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix new file mode 100644 index 0000000000000..455588ee17d18 --- /dev/null +++ b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +, wxGTK32 +, libGL +, libGLU +, pkg-config +, xorg +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "wxmacmolplt"; + version = "7.7.2"; + + src = fetchFromGitHub { + owner = "brettbode"; + repo = pname; + rev = "v${version}"; + hash = "sha256-sNxCjIEJUrDWtcUqBQqvanNfgNQ7T4cabYy+x9D1U+Q="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ + wxGTK32 + libGL + libGLU + xorg.libX11 + xorg.libX11.dev + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Graphical user inteface for GAMESS-US"; + homepage = "https://brettbode.github.io/wxmacmolplt/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix index e1ed24be78350..4e794aaa29e24 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -5,7 +5,7 @@ , libconfig , boost , libyaml -, libyamlcpp +, yaml-cpp , ncurses , gpm , enableAccelergy ? true @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libconfig boost libyaml - libyamlcpp + yaml-cpp ncurses accelergy ] ++ lib.optionals stdenv.isLinux [ gpm ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { #link-time optimization fails on darwin #see https://github.com/NixOS/nixpkgs/issues/19098 - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-lto"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; postPatch = '' # use nix ar/ranlib diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 9645e5426ab11..2e882aff361dc 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -15,13 +15,13 @@ mkDerivation { pname = "appcsxcad"; - version = "unstable-2020-01-04"; + version = "unstable-2023-01-06"; src = fetchFromGitHub { owner = "thliebig"; repo = "AppCSXCAD"; - rev = "de8c271ec8b57e80233cb2a432e3d7fd54d30876"; - sha256 = "0shnfa0if3w588a68gr82qi6k7ldg1j2921fnzji90mmay21birp"; + rev = "379ede4b8e00c11e8d0fb724c35547991b30c423"; + hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index d9953a7857390..f6b0ff93fff5e 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "csxcad"; - version = "unstable-2020-02-08"; + version = "unstable-2022-05-18"; src = fetchFromGitHub { owner = "thliebig"; repo = "CSXCAD"; - rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; - sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; + rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1"; + sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn"; }; patches = [./searchPath.patch ]; diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 0515809dffebb..72b931f1d11cc 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -4,8 +4,8 @@ let pkgDescription = "A digital logic designer and circuit simulator."; - version = "0.29"; - buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + version = "0.30"; + buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; @@ -24,7 +24,8 @@ let # 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}"; + # Also use the commit date as a build and output timestamp. + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in stdenv.mkDerivation rec { pname = "digital"; @@ -33,20 +34,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hneemann"; repo = "Digital"; - rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; - sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6"; + sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM="; }; - # 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; + inherit src nativeBuildInputs version; dontFixup = true; buildPhase = '' mvn package ${mvnOptions} -Dmaven.repo.local=$out @@ -62,15 +59,11 @@ stdenv.mkDerivation rec { ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE="; }; nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; - postPatch = '' - substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" - ''; - buildPhase = '' mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} ''; diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch deleted file mode 100644 index cdc5a777c49d1..0000000000000 --- a/pkgs/applications/science/electronics/digital/pom.xml.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index d5f8330b4..58ed18b63 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -129,7 +130,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> -- <version>2.5</version> -+ <version>3.2.0</version> - <configuration> - <archive> - <manifest> -@@ -188,6 +189,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> -+ <version>3.2.0</version> - <configuration> - <finalName>Digital</finalName> - <appendAssemblyId>false</appendAssemblyId> -@@ -202,7 +204,7 @@ - </manifest> - <manifestEntries> - <Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision> -- <Build-Time>${maven.build.timestamp}</Build-Time> -+ <Build-Time>@buildDate@</Build-Time> - <SplashScreen-Image>icons/splash.png</SplashScreen-Image> - </manifestEntries> - </archive> diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 1f6679625ec77..25efbd754b2a5 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -1,10 +1,36 @@ { lib -, python3Packages +, stdenv +, python3 , fetchFromBitbucket , fetchpatch +, substituteAll +, geos }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + shapely = super.shapely.overridePythonAttrs (old: rec { + version = "1.8.4"; + src = self.fetchPypi { + pname = "Shapely"; + inherit version; + hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + }; + # 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 = ./shapely-library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + }) + ]; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "flatcam"; version = "8.5"; @@ -15,7 +41,7 @@ python3Packages.buildPythonApplication rec { sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ matplotlib numpy packaging diff --git a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch new file mode 100644 index 0000000000000..d095eada9d6e1 --- /dev/null +++ b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch @@ -0,0 +1,31 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 88c5f53..1ccd6e4 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): + alt_paths = [ + 'libgeos_c.so.1', + 'libgeos_c.so', ++ '@libgeos_c@', + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': + "/usr/local/lib/libgeos_c.dylib", + # homebrew Apple Silicon + "/opt/homebrew/lib/libgeos_c.dylib", ++ "@libgeos_c@", + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +diff --git a/tests/test_dlls.py b/tests/test_dlls.py +index c71da8e..c36262c 100644 +--- a/tests/test_dlls.py ++++ b/tests/test_dlls.py +@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): + '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) + os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) + 'libgeos_c.so.1', +- 'libgeos_c.so']) ++ 'libgeos_c.so', ++ '@libgeos_c@']) diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index b1244b79a89f8..138d45c787cdd 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: postscript.o:postscript.h:29: multiple definition of # `postscript_params'; fped.o:postscript.h:29: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; # This uses '/bin/bash', '/usr/local' and 'lex' by default makeFlags = [ diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 22b65f2da313a..fdda4b2b0af2c 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${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + env.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 57a832fed2423..cc03a2e8c8196 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; - homepage = "http://gtkwave.sourceforge.net"; + homepage = "https://gtkwave.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ thoughtpolice jiegec ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index d7250db07b491..697c27842081d 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -22,6 +22,7 @@ , libXdmcp , lndir , unixODBC +, fetchpatch , util-linux , libselinux @@ -34,6 +35,7 @@ , at-spi2-core , libXtst , pcre2 +, libdeflate , swig4 , python @@ -50,7 +52,6 @@ , withNgspice , withScripting , withI18n -, withPCM , debug , sanitizeAddress , sanitizeThreads @@ -71,16 +72,28 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + ] + ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release + [ + (fetchpatch { # for wxGTK 3.2.2.1's .1 field + name = "support wxWidgets subrelease field"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff"; + hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54="; + }) + (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython + name = "relax wxPython check to just major.minor"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff"; + hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU="; + }) ]; # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - postPatch = if (!stable) then '' + postPatch = lib.optionalString (!stable) '' substituteInPlace cmake/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" - '' - else ""; + ''; makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -88,6 +101,7 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DKICAD_USE_EGL=ON" + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 ] ++ optionals (withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=ON" @@ -117,12 +131,6 @@ stdenv.mkDerivation rec { ] ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" - ] - ++ optionals (!withPCM && stable) [ - "-DKICAD_PCM=OFF" - ] - ++ optionals (!stable) [ # upstream issue 12491 - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -167,8 +175,9 @@ stdenv.mkDerivation rec { boost swig4 python + unixODBC + libdeflate ] - ++ optional (!stable) unixODBC ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6aeb63d671148..c7eb9d69522c9 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 @@ -24,7 +24,6 @@ , sanitizeThreads ? false , with3d ? true , withI18n ? true -, withPCM ? true # Plugin and Content Manager , srcs ? { } }: @@ -118,7 +117,7 @@ stdenv.mkDerivation rec { inherit stable baseName; inherit kicadSrc kicadVersion; inherit wxGTK python wxPython; - inherit withOCC withNgspice withScripting withI18n withPCM; + inherit withOCC withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; }; @@ -150,15 +149,15 @@ stdenv.mkDerivation rec { "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland "--set-default MOZ_DBUS_REMOTE 1" - "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" - "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols" - "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" + "--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" + "--set-default KICAD7_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] ++ optionals (with3d) [ - "--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] @@ -170,8 +169,9 @@ 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" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in (concatStringsSep "\n" (flatten [ @@ -181,13 +181,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" ]) @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { description = (if (stable) then "Open Source Electronics Design Automation suite" else "Open Source EDA suite, development build") - + (if (!with3d) then ", without 3D models" else ""); + + (lib.optionalString (!with3d) ", without 3D models"); homepage = "https://www.kicad.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. @@ -223,6 +223,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, diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 811a405853634..4562e8447624f 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.10"; + version = "7.0.0"; src = { - rev = "86aedd382b4ece39e27bef209e81792915103704"; - sha256 = "0pz8d96imc0q3nh7npr5zf0jkzi94wchvw57spcrgqfac9yrld3q"; + rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216"; + sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"; }; }; libVersion = { - version = "6.0.10"; + version = "7.0.0"; libSources = { - symbols.rev = "3ec40517b37d78faf7ff5504c81362420c4b601f"; - symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "417c4ea884a0d1501061f511730604890bbb0a35"; - packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; + symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f"; + symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"; + templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; + templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; + footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c"; + footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"; + packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037"; + packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-12-19"; + version = "2023-02-14"; src = { - rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692"; - sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0"; + rev = "29c4482bc898f627cebcd5f64e063e8a813a5445"; + sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y"; }; }; libVersion = { - version = "2022-12-19"; + version = "2023-02-14"; libSources = { - symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e"; - symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267"; - packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp"; + symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a"; + symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn"; + templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; + templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; + footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf"; + footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk"; + packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e"; + packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw"; }; }; }; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index edee5946d9460..fc68969bd498a 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { patchShebangs scripts/* ''; - NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; patches = [ ./0001-strip-bin-prefix.patch diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 22950326e8674..84551eeb6311f 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 97571eeb36b45..cff9809b03065 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.2"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - sha256 = "sha256-7N11S7OiAogyuNqrf7R5NZyVbiXgXxJ5t6lwBzL0YAU="; + hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk="; }; 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 d4aa6e6dfc0b5..9fd9d56295d88 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/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index a5f2cf394b44f..eeb10b3a5a1dc 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; - homepage = "http://qucs.sourceforge.net"; + homepage = "https://qucs.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 33d145c007566..e77f6aeeb29b2 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub , perl, flex, bison, python3, autoconf -, which, cmake +, which, cmake, help2man }: stdenv.mkDerivation rec { pname = "verilator"; - version = "5.002"; + version = "5.006"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-RNoKAEF7zl+WqqbxGP/VvdQqQP8VI3hoQku3b/g0XpU="; + hash = "sha256-PA8hbE6XECapuaO5YcgEodOoxSDqpMucdijJBBb7fZg="; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison python3 autoconf ]; + nativeBuildInputs = [ flex bison python3 autoconf help2man ]; nativeCheckInputs = [ which ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... @@ -24,14 +24,8 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; - preCheck = '' - patchShebangs \ - src/flexfix \ - src/vlcovgen \ - bin/verilator \ - bin/verilator_coverage \ - test_regress/driver.pl \ - test_regress/t/*.pl + postPatch = '' + patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl} ''; meta = with lib; { diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 7a9f58a0c6e34..9f9224b5543cd 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; - homepage = "http://xoscope.sourceforge.net"; + homepage = "https://xoscope.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 6a20a68324f1e..6ac9dd64982f1 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-11-09"; + version = "unstable-2023-02-04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "be9a35c0363174a7cef21d55ed80d92a9ef95ab1"; - hash = "sha256-IN9YgJONcC55N89OXMrMuNuznTdjXNWxR0IngH8OWC8="; + rev = "a8f0ef2368aa56b3ad20a52298a02e63b2a93e2d"; + hash = "sha256-48i6AKQhMG5hcnkS0vejOy1PqFbeb6FpU7Yx0rEvHDI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 3d752b7d7b931..1d0c72359cfcc 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 d4f0ac3e5044a..c627b8a3c8f5a 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 7077d56f8069b..75288b5ff80bf 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 diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index f6f43f1b0bb30..38fef51c56e6d 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib boost.out boost.dev ]; - NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ lib.optionals stdenv.cc.isClang [ "-Wno-empty-body" diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 4009761e8dc3c..ddfa999fcc7e3 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.74.0"; + version = "5.76.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow="; + sha256 = "sha256-OVOoAfoqev33c7pIzBGK9HD+zgji/+BWKD33RYJaSDc="; }; nativeBuildInputs = [ @@ -60,9 +60,13 @@ stdenv.mkDerivation rec { --prefix PATH : "$out/share/cbmc" \ ''; - # fix "argument unused during compilation" - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang - "-Wno-unused-command-line-argument"; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isClang [ + # fix "argument unused during compilation" + "-Wno-unused-command-line-argument" + ]); # TODO: add jbmc support cmakeFlags = [ "-DWITH_JBMC=OFF" "-Dsat_impl=cadical" "-Dcadical_INCLUDE_DIR=${cadical.dev}/include" ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8a40216c3ecba..49c9fc47fef26 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -66,10 +66,10 @@ let buildIde = args.buildIde or (!coqAtLeast "8.14"); ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; - csdpPatch = if csdp != null then '' + csdpPatch = lib.optionalString (csdp != null) '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; + ''; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } @@ -91,7 +91,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; inherit ocamlPackages ocamlNativeBuildInputs; - inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; + inherit ocamlPropagatedBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -158,7 +158,7 @@ self = stdenv.mkDerivation { UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""} + ${lib.optionalString (!coqAtLeast "8.7") "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\""} ${csdpPatch} ''; @@ -196,7 +196,7 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in optionalString (!coqAtLeast "8.17") '' + postInstall = let suffix = optionalString (coqAtLeast "8.14") "-core"; in optionalString (!coqAtLeast "8.17") '' cp bin/votour $out/bin/ '' + '' ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} @@ -227,12 +227,12 @@ if coqAtLeast "8.17" then self.overrideAttrs(_: { buildPhase = '' runHook preBuild make dunestrap - dune build -p coq-core,coq-stdlib,coq,coqide-server${if buildIde then ",coqide" else ""} -j $NIX_BUILD_CORES + dune build -p coq-core,coq-stdlib,coq,coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES runHook postBuild ''; installPhase = '' runHook preInstall - dune install --prefix $out coq-core coq-stdlib coq coqide-server${if buildIde then " coqide" else ""} + dune install --prefix $out coq-core coq-stdlib coq coqide-server${lib.optionalString buildIde " coqide"} runHook postInstall ''; }) else self diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 33de2d27dc90b..cd04d612b5290 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,32 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, boost +}: stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.8.0"; + version = "5.11.4"; src = fetchFromGitHub { - owner = "msoos"; - repo = "cryptominisat"; - rev = version; - sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50"; + owner = "msoos"; + repo = "cryptominisat"; + rev = version; + hash = "sha256-7JNfFKSYWgyyNnWNzXGLqWRwSW+5r6PBMelKeAmx8sc="; }; - patches = [ - (fetchpatch { - # https://github.com/msoos/cryptominisat/pull/621 - url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch"; - sha256 = "0hdy345bwcbxz0jl1jdxfa6mmfh77s2pz9rnncsr0jzk11b3j0cw"; - }) - ]; - buildInputs = [ python3 boost ]; - nativeBuildInputs = [ cmake xxd ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "An advanced SAT Solver"; - homepage = "https://github.com/msoos/cryptominisat"; - license = licenses.mit; + homepage = "https://github.com/msoos/cryptominisat"; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 195dd98aa3b4a..f056b3e433fbc 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/cvc4/cvc4-bash-patsub-replacement.patch b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch new file mode 100644 index 0000000000000..a97665c2f86c4 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch @@ -0,0 +1,39 @@ +Per https://bodhi.fedoraproject.org/updates/FEDORA-2022-dc47174c36: + +This update fixes a failure to build with source with bash 5.2. Bash's +`patsub_replacement` feature makes ampersand a special character when doing +variable substitution, which was not previously the case. This update instructs +bash to turn off the new behavior. + +The patch itself is adapted from +https://src.fedoraproject.org/rpms/cvc4/blob/f7c24c6ad72a8812d244313f13032fa23d393315/f/cvc4-bash-patsub-replacement.patch. +--- a/src/expr/mkexpr 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkexpr 2022-10-11 14:28:31.120453409 -0600 +@@ -16,6 +16,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkkind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkkind 2022-10-11 14:34:17.008996126 -0600 +@@ -15,6 +15,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkmetakind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkmetakind 2022-10-11 14:34:32.248020036 -0600 +@@ -18,6 +18,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + cat <<EOF + /********************* */ diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 873c3ca57c0c9..e9f04d2044dc7 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat ''; + patches = [ + ./cvc4-bash-patsub-replacement.patch + ]; + preConfigure = '' patchShebangs ./src/ ''; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 5bce776771d35..f0cb044b3beb3 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cadical, symfpu, gmp, git, python3, gtest, libantlr3c, antlr3_4, boost, jdk }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, flex, cadical, symfpu, gmp, python3, gtest, libantlr3c, antlr3_4, boost, jdk }: stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - sha256 = "sha256-CVXK6yehfUrSbo8R1Dk1oc/siCtmV9DjEp6q+aLuVQA="; + hash = "sha256-1yJZtPZ4nMg9Kn3jHpN8b5XeFZ8ZeVLrKYWh7Rp3/oQ="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ cadical.dev symfpu gmp git python3 python3.pkgs.toml gtest libantlr3c antlr3_4 boost jdk ]; + nativeBuildInputs = [ pkg-config cmake flex ]; + buildInputs = [ + cadical.dev symfpu gmp gtest libantlr3c antlr3_4 boost jdk + (python3.withPackages (ps: with ps; [ pyparsing toml ])) + ]; preConfigure = '' patchShebangs ./src/ diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index d6d9bb11a9a0a..187cbc9a92ae4 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/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index e66fe992e189a..4c105a40e20db 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 ff88586e0353b..6485681e3313f 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/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 024e6e526c4e4..898e344f2a453 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { ]; # Silence various warnings during the compilation of fortified bitcode. - NIX_CFLAGS_COMPILE = ["-Wno-macro-redefined"]; + env.NIX_CFLAGS_COMPILE = toString ["-Wno-macro-redefined"]; prePatch = '' patchShebangs . diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index cbc85c5544ccd..4087763aa0c54 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/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index bbc96b2b681cc..a00c565fb4e06 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE="; }; - nativeBuildInputs = [ pkg-config opaline ]; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ]; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config opaline ] ++ (with ocamlPackages; [ findlib ocaml ]); + buildInputs = with ocamlPackages; [ ocamlgraph ]; installTargets = "ott.install"; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 2606b94f4bbb5..4e65c018d1a20 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 b6d15162fec35..57220aa523cf8 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 648ebee6550c0..af11cd0d6d8f9 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -3,8 +3,11 @@ 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"; @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { ''; # 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"; + env.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" diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix index 07365eef33fac..1f62389775517 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/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 14b3055ab36b0..59afbc094e40d 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 8ca2a6baa8890..55b59ff2e3b06 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 diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index fb14723241b81..83fbb6d6546b0 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://yices.csl.sri.com"; + homepage = "https://yices.csl.sri.com"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 75cfa2568f85a..f810a5a56739a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -18,23 +18,26 @@ assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; with lib; -let common = { version, sha256, patches ? [ ] }: +let common = { version, sha256, patches ? [ ], tag ? "z3" }: stdenv.mkDerivation rec { pname = "z3"; inherit version sha256 patches; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; - rev = "z3-${version}"; + rev = "${tag}-${version}"; 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 '' @@ -44,7 +47,7 @@ let common = { version, sha256, patches ? [ ] }: configurePhase = concatStringsSep " " ( - [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] + [ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" @@ -92,4 +95,9 @@ in version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; }; + z3_4_8_5 = common { + tag = "Z3"; + version = "4.8.5"; + sha256 = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; + }; } diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1644ca3d1433c..6b76eea33cefa 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/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 9479011d5f149..ad22d57882ed6 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -26,12 +26,12 @@ buildPythonApplication rec { pname = "streamlit"; - version = "1.16.0"; + version = "1.18.1"; format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-TBNWIe3m646dbnOMxUltkNZr23g0Dqsestvxl4zHr4A="; + hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 83acfcfe9c37d..580de87bdb23f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -8,15 +8,18 @@ # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false +, testers }: assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "R"; version = "4.2.2"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU="; }; @@ -97,6 +100,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; @@ -121,8 +126,9 @@ stdenv.mkDerivation rec { user-defined recursive functions and input and output facilities. ''; + pkgConfigModules = [ "libR" ]; platforms = platforms.all; maintainers = with maintainers; [ jbedo ] ++ teams.sage.members; }; -} +}) diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index fe68d9d245c52..4fccc3a464039 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "An open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs"; homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index d6c95633dd520..ed6836afbd92a 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -21,7 +21,13 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit nccl; + # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1. + # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead. + # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default. + cudnn = if lib.versionOlder cudatoolkit.version "10.1" + then cudaPackages.cudnn + else cudaPackages.cudnn_7_6_5; in assert leveldbSupport -> (leveldb != null && snappy != null); diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index d521da2f114cd..75dbccced193c 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.2"; + version = "2.14.1.3"; src = fetchurl { urls = [ "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-3o8jKmEYxNQtExOkjqTVU24mtSok+T/RnRw6goNzThM="; + sha256 = "sha256-5aAvYzjAkpLZGf9UE+Ta18Io9EwP769yYlVykiH4qd0="; }; postPatch = '' diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 4b0ae6f8ac9d9..7a89fdd73c848 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack spooles blas lapack ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${spooles}/include/spooles" "-std=legacy" ]; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index bffd208f9ef61..f885dae444ba6 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { OMPI_CXX = "g++"; # Uses some deprecated tensorflow functions - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] ++ lib.optional cudaSupport cudatoolkit diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 507fa0815298b..42e17c70673e6 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -36,7 +36,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A'; # eukleides_build/quadrilateral.o:(.bss+0x18): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 677e7d9a0d96c..7a466f8c000c5 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -134,8 +134,6 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942 rm -r "$out/share/gap/pkg" cp -ar pkg tst "$out/share/gap" - - makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap" ''; preFixup = '' diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 7357f024c90d4..1b5a0622f4e29 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/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index a2624c29662e4..315433feb1c2a 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gretl is a cross-platform software package for econometric analysis, written in the C programming language. ''; - homepage = "http://gretl.sourceforge.net"; + homepage = "https://gretl.sourceforge.net"; license = licenses.gpl3; maintainers = with maintainers; [ dmrauh ]; platforms = with platforms; all; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index f4c117267d568..6a1bc86abced3 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Mixed Integer Linear Programming (MILP) solver"; - homepage = "http://lpsolve.sourceforge.net"; + homepage = "https://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index dcba888ce2fb1..c1a329c608864 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -50,10 +50,16 @@ 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=${cudaFlags.cudaCapabilitiesSemiColonString}" + "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + "-Wno-error=uninitialized" + ]; + postPatch = '' substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ --replace "/bin/bash" "${bash}/bin/bash" diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 91cf4ae4f3894..41dff3adede5a 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , gmp , libX11 , libpthreadstubs @@ -14,7 +15,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { urls = [ @@ -22,9 +23,18 @@ 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-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0="; + hash = "sha256-sEYoER7iKHZRmksc2vsy/rqjTq+iT56B9Y+NBX++4N0="; }; + patches = [ + # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441 + (fetchpatch { + name = "fix-find_isogenous_from_Atkin.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/bug2441.patch?id=9.8.rc0"; + hash = "sha256-DvOUFlFDnopN+MJY6GYRPNabuoHPFch/nNn+49ygznc="; + }) + ]; + buildInputs = [ gmp libX11 diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index d9921e68edb11..bbfc8aed44284 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; sourceRoot = "."; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 0eecff0a17989..4dc11db532fdf 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.8"; + version = "4.9"; 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-GfsAypJBpHwpvoEl/IzJ1gQfeMcYwB7oNe01xWJ+86w="; + sha256 = "sha256-BMkLgms6JsWmPhi+MZv/Eqie8BKL+KaPtk3xBZSyWfM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/applications/science/math/programmer-calculator/default.nix index e9c7cb985cb9b..ee48a1d0f1a3e 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/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index bb945b06ba137..e58674f344971 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "readstat"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "WizardMac"; repo = "ReadStat"; rev = "v${version}"; - sha256 = "1r04lq45h1yn34v1mgfiqjfzyaqv4axqlby0nkandamcsqyhc7y4"; + sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index c3a81c2109ee4..c4de5da45dbf0 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -10,7 +10,7 @@ First you should find out which change to nixpkgs is at fault (if you don't alre If the build broke as a result of a package update, try those solutions in order: -- search the [sage trac](https://trac.sagemath.org/) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. +- search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. - check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch). @@ -19,7 +19,7 @@ If the build broke as a result of a package update, try those solutions in order ``` [user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage -[user@localhost sage]$ git checkout 8.2 # substitute the relevant version here +[user@localhost sage]$ git checkout 9.8 # substitute the relevant version here ``` Then make the needed changes and generate a patch with `git diff`: @@ -29,42 +29,10 @@ Then make the needed changes and generate a patch with `git diff`: [user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/applications/science/math/sage/patches/name-of-patch.patch ``` -Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, [propose them upstream](#proposing-a-sage-patch) and add a link to the trac ticket. +Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details). - pin the package version in `default.nix` and add a note that explains why that is necessary. - -## Proposing a sage patch - -You can [login the sage trac using GitHub](https://trac.sagemath.org/login). Your username will then be `gh-<your-github-name>`. The only other way is to request a trac account via email. After that refer to [git the hard way](http://doc.sagemath.org/html/en/developer/manual_git.html#chapter-manual-git) in the sage documentation. The "easy way" requires a non-GitHub account (requested via email) and a special tool. The "hard way" is really not all that hard if you're a bit familiar with git. - -Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then: - -``` -[user@localhost ~]$ git clone https://github.com/sagemath/sage.git -[user@localhost ~]$ cd sage -[user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master -[user@localhost sage]$ git checkout -b u/gh-<your-github-username>/<your-branch-name> develop -[user@localhost sage]$ <make changes> -[user@localhost sage]$ git add . -[user@localhost sage]$ git commit -[user@localhost sage]$ git show # review your changes -[user@localhost sage]$ git push --set-upstream trac u/gh-<your-github-username>/<your-branch-name> -``` - -You now created a branch on the trac server (you *must* follow the naming scheme as you only have push access to branches with the `u/gh-<your-github-username>/` prefix). -Now you can [create a new trac ticket](https://trac.sagemath.org/newticket). -- Write a description of the change -- set the type and component as appropriate -- write your real name in the "Authors" field -- write `u/gh-<your-github-username>/<your-branch-name>` in the "Branch" field -- click "Create ticket" -- click "Modify" on the top right of your ticket (for some reason you can only change the ticket status after you have created it) -- set the ticket status from `new` to `needs_review` -- click "Save changes" - -Refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details. - ## I want to update sage You'll need to change the `version` field in `sage-src.nix`. Afterwards just try to build and let nix tell you which patches no longer apply (hopefully because they were adopted upstream). Remove those. @@ -74,5 +42,5 @@ If the problem is not obvious, you can try to first update sage to an intermedia ## Well, that didn't help! -If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping @timokau (or whoever is listed in the `maintainers` list of the sage package). +If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping the sage maintainers (as listed in the sage package). Describe what you did and why it didn't work. Afterwards it would be great if you help the next guy out and improve this documentation! diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 1f8b33f687384..39d358a1f9a83 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -35,7 +35,8 @@ writeTextFile rec { export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' - export GAP_ROOT_DIR='${gap}/share/gap' + export GAP_LIB_DIR='${gap}/lib/gap' + export GAP_SHARE_DIR='${gap}/share/gap' export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" 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 deleted file mode 100644 index 40bbbe23f1a3f..0000000000000 --- a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index d68a2c8a107ac..5e18b7415632e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -57,14 +57,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.7"; + version = "9.8"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-MYpCp18wqKwCa+tcJ7He14p1FXDlVm1vubQqQS9g3LY="; + sha256 = "sha256-dDbrzJXsOBARYfJz0r7n3LbaoXHnx7Acz6HBa95NV9o="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -89,14 +89,6 @@ 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 @@ -119,28 +111,12 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch - # https://trac.sagemath.org/ticket/34118 - (fetchSageDiff { - name = "sympy-1.11-upgrade.patch"; - base = "9.7"; - rev = "52815744bde2b682245b6f985a112f7cb8666056"; - sha256 = "sha256-gv6z6JkQ6S6oCJQNkVgcPVvzlplyvR1nC7pWmcUiSc0="; - }) - - # https://trac.sagemath.org/ticket/34460 - (fetchSageDiff { - name = "ipywidgets-8-upgrade.patch"; - base = "9.7"; - rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; - sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; - }) - # https://trac.sagemath.org/ticket/34391 (fetchSageDiff { name = "gap-4.12-upgrade.patch"; - base = "9.8.beta2"; - rev = "eb8cd42feb58963adba67599bf6e311e03424328"; - sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw="; + base = "9.8.beta7"; + rev = "dd4a17281adcda74e11f998ef519b6bd0dafb043"; + sha256 = "sha256-UQT9DO9xd5hh5RucvUkIm+rggPKu8bc1YaSI6LVYH98="; }) # https://trac.sagemath.org/ticket/34701 @@ -151,46 +127,6 @@ 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 diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 79d4f78082e09..4910f5e8bf1d2 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -18,7 +18,7 @@ let src = sage-with-env.env.lib.src; runAllTests = files == null; testArgs = if runAllTests then "--all" else testFileList; - patienceSpecifier = if longTests then "--long" else ""; + patienceSpecifier = lib.optionalString longTests "--long"; timeSpecifier = if timeLimit == null then "" else "--short ${toString timeLimit}"; relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute testFileList = lib.concatStringsSep " " (map relpathToArg files); diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 59e64bd0b8eff..f6da20531385b 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, undmg, makeWrapper, xorg }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, undmg +, autoPatchelfHook +, alsa-lib +, ncurses5 +, xorg +}: let pname = "scilab-bin"; @@ -26,88 +35,69 @@ let platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Only; + mainProgram = "scilab"; }; darwin = stdenv.mkDerivation rec { inherit pname version src meta; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + undmg + ]; sourceRoot = "scilab-${version}.app"; installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/scilab.app,bin} cp -R . $out/Applications/scilab.app makeWrapper $out/{Applications/scilab.app/Contents/MacOS,bin}/scilab + + runHook postInstall ''; }; linux = stdenv.mkDerivation rec { inherit pname version src meta; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm - ]; - - fixupPhase = '' - sed -i 's|\$(/bin/|$(|g' bin/scilab - sed -i 's|/usr/bin/||g' bin/scilab - - sci="$out/opt/scilab-${version}" - fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" - fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" - - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$fullLibPath" bin/scilab-bin - find . -name '*.so' -type f | while read file; do - patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null - done - ''; - - installPhase = '' - mkdir -p "$out/opt/scilab-${version}" - cp -r . "$out/opt/scilab-${version}/" - - # Create bin/ dir - mkdir "$out/bin" - - # Creating executable symlinks - ln -s "$out/opt/scilab-${version}/bin/scilab" "$out/bin/scilab" - ln -s "$out/opt/scilab-${version}/bin/scilab-cli" "$out/bin/scilab-cli" - ln -s "$out/opt/scilab-${version}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + ncurses5 + stdenv.cc.cc + ] ++ (with xorg; [ + libX11 + libXcursor + libXext + libXft + libXi + libXrandr + libXrender + libXtst + libXxf86vm + ]); - # Creating desktop config dir - mkdir -p "$out/share/applications" - - # Moving desktop config files - mv $out/opt/scilab-${version}/share/applications/*.desktop $out/share/applications - - # Fixing Exec paths and launching each app with a terminal - sed -i -e "s|Exec=|Exec=$out/opt/scilab-${version}/bin/|g" \ - -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop - - # Moving icons to the appropriate locations - for path in $out/opt/scilab-${version}/share/icons/hicolor/*/*/* - do - newpath=$(echo $path | sed 's|/opt/scilab-${version}||g') - filename=$(echo $path | sed 's|.*/||g') - dir=$(echo $newpath | sed "s|$filename||g") - mkdir -p $dir - mv $path $newpath - done - - # Removing emptied folders - rm -rf $out/opt/scilab-${version}/share/{applications,icons} - - # Moving other share/ folders - mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share - ''; + installPhase = '' + runHook preInstall + + mkdir -p $out + mv -t $out bin include lib share thirdparty + sed -i \ + -e 's|\$(/bin/|$(|g' \ + -e 's|/usr/bin/||g' \ + $out/bin/{scilab,xcos} + sed -i \ + -e "s|Exec=|Exec=$out/bin/|g" \ + -e "s|Terminal=.*$|Terminal=true|g" \ + $out/share/applications/*.desktop + + runHook postInstall + ''; }; in if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 3ca1501e382e6..e41d851cf7e87 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { # https://www.singular.uni-kl.de:8002/trac/ticket/837 platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = "http://www.singular.uni-kl.de"; + homepage = "https://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; mainProgram = "Singular"; }; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index f6d9f4510faf8..7c28f65f3bf7b 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20221201130942"; + version = "3.1.20230213100550"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PeddmHMJYtj/AAItmUVeyETizF7SKzkJ3bXYkeZU+xs="; + hash = "sha256-BtHkIVadcccnYYX8lRqiCzO+/qFeBaZfdUuu6qrjysk="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index a4aa6457d608d..5ec7973065d2f 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { swig3 ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix index 088fa83b7d92e..ffa0a158ac95a 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix @@ -16,7 +16,7 @@ let # getAttr-like helper for optional append to string: # "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world" # "Hello" + appendByAttr "a" " " {} = "Hello" - appendByAttr = attr: sep: x: if hasAttr attr x then sep + (getAttr attr x) else ""; + appendByAttr = attr: sep: x: lib.optionalString (hasAttr attr x) (sep + (getAttr attr x)); # Are there any OM dependencies at all? ifDeps = length pkg.omdeps != 0; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 1c173b75238ce..f9bcfa5df73c5 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -4,6 +4,8 @@ , libpng ? null , eigen ? null , libtiff ? null +, ceres-solver +, enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ]; + buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -27,7 +29,8 @@ 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"}" - ]; + "-DTARGET_ARCHITECTURE=generic" + ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 031f1655b0af3..fde756181cca4 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: +{ 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: { @@ -20,10 +40,38 @@ stdenv.mkDerivation rec { # SSE is enabled by default cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; - buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; + 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"; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index af6aed851e09c..cfda819a42ca7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -207,6 +207,7 @@ 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}. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5093a586a85af..cdc5bc855731b 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2022.4"; + version = "2023"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-xRG+YC/ylAIGW1CQaEHe+YdSY5uSqV8bChBg2bXicpc="; + sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; }; nativeBuildInputs = [ cmake ]; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.gromacs.org"; + homepage = "https://www.gromacs.org"; license = licenses.gpl2; description = "Molecular dynamics software package"; longDescription = '' diff --git a/pkgs/applications/science/physics/dawncut/default.nix b/pkgs/applications/science/physics/dawncut/default.nix index 8c0bc1ae6394a..5c17837d2e952 100644 --- a/pkgs/applications/science/physics/dawncut/default.nix +++ b/pkgs/applications/science/physics/dawncut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - NIX_CFLAGS_COMPILE="-std=c++98"; + env.NIX_CFLAGS_COMPILE = "-std=c++98"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index a203db1204cb3..9221f4bcdbdd1 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 bc9e3c7e90cd1..ec29c02054df2 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -1,14 +1,13 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , apfel , gsl , lhapdf , libarchive -, libyamlcpp +, yaml-cpp , python3 , sqlite , swig @@ -16,22 +15,15 @@ stdenv.mkDerivation rec { pname = "nnpdf"; - version = "4.0.4"; + version = "4.0.6"; src = fetchFromGitHub { owner = "NNPDF"; repo = pname; rev = version; - sha256 = "sha256-Alx4W0TkPzJBsnRXcKBrlEU6jWTnOjrji/IPk+dNCw0="; + hash = "sha256-mwOMNlYFhHZq/wakO1/HGwcxvKGKh5OyFa2D9d3Y3IA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/NNPDF/nnpdf/commit/7943b62a91d3a41fd4f6366b18881d50695f4b45.diff"; - hash = "sha256-UXhTO7vZgJiY8h3bgjg7SQC0gMUQsYQ/V/PgtCEQ7VU="; - }) - ]; - postPatch = '' for file in CMakeLists.txt buildmaster/CMakeLists.txt; do substituteInPlace $file \ @@ -49,7 +41,7 @@ stdenv.mkDerivation rec { gsl lhapdf libarchive - libyamlcpp + yaml-cpp python3 python3.pkgs.numpy sqlite diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4e6f6626602f9..1852ef3ff1c8e 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,13 +38,13 @@ 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 ; - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; # workaround wrong library IDs diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 271274126b754..a76327b854b0d 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/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c037e41d74c6f..56d68fcd474be 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -19,7 +19,9 @@ , libwpd , libxslt , lyx +, makeWrapper , perl +, perlPackages , pkg-config , poppler_utils , python3Packages @@ -55,7 +57,7 @@ mkDerivation rec { "--without-inotify" ]); - NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DNIXPKGS" ]; patches = [ # fix "No/bad main configuration file" error @@ -66,6 +68,7 @@ mkDerivation rec { file pkg-config python3Packages.setuptools + makeWrapper which ]; @@ -73,6 +76,7 @@ mkDerivation rec { bison chmlib python3Packages.python + python3Packages.mutagen xapian zlib ] ++ lib.optional withGui [ @@ -111,6 +115,10 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl fi done + wrapProgram $out/share/recoll/filters/rclaudio.py \ + --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/share/recoll/filters/rclimg \ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' '' + lib.optionalString (stdenv.isDarwin && withGui) '' @@ -130,6 +138,6 @@ mkDerivation rec { changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming ehmry ]; }; } diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index f4ec3126976e1..cf9e8ec05fd47 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/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index db7a37e2be34d..eb8d892dd62e3 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-w4c9rVO54mrjUX2iRxUQ7PHqE+8D+BqBgHMK2X9nI0g="; + sha256 = "sha256-+B3h7ydN+ISElpOMMCcKORYnq1MaMhvr+4I2qHJ26As="; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/applications/system/zxfer/default.nix new file mode 100644 index 0000000000000..b62c1262430ca --- /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/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index a736e836cb62e..0e74c2046c055 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/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 7ae2825f175a7..bd80a15d0562a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -18,7 +18,7 @@ , wayland-scanner , pkg-config , utf8proc -, allowPgo ? true +, allowPgo ? !stdenv.hostPlatform.isMusl , python3 # for PGO # for clang stdenv check , foot diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 85ee654a989a0..95c4f0f71541a 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/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index aad2c367b91fd..07980f8375aa9 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland @@ -21,20 +21,23 @@ , zsh , fish , nixosTests +, go +, buildGoModule }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.26.5"; + version = "0.27.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4="; + hash = "sha256-/K/5T15kULTQP1FCLnyrKfhlQjIStayutaxLjmHjHes="; }; + vendorHash = "sha256-JLPPNOsoq+ErLhELsX3z3YehYfgp7OGXEXlP3IVcM5k="; buildInputs = [ harfbuzz @@ -67,21 +70,15 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs + go ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. ]; - outputs = [ "out" "terminfo" "shell_integration" ]; + outputs = [ "out" "terminfo" "shell_integration" "kitten" ]; 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 @@ -99,7 +96,20 @@ buildPythonApplication rec { # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - dontConfigure = true; + CGO_ENABLED = 0; + GOFLAGS = "-trimpath"; + + configurePhase = let + goModules = (buildGoModule { + pname = "kitty-go-modules"; + inherit src vendorHash version; + }).go-modules; + in '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOPROXY=off + cp -r --reflink=auto ${goModules} vendor + ''; buildPhase = let commonOptions = '' @@ -114,17 +124,17 @@ buildPythonApplication rec { runHook preBuild ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' - ${python.interpreter} setup.py build ${darwinOptions} + ${python.pythonForBuild.interpreter} setup.py build ${darwinOptions} make docs - ${python.interpreter} setup.py kitty.app ${darwinOptions} + ${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions} '' else '' - ${python.interpreter} setup.py build-launcher - ${python.interpreter} setup.py linux-package \ + ${python.pythonForBuild.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} + ${python.pythonForBuild.interpreter} setup.py build-launcher ''} runHook postBuild ''; @@ -169,15 +179,19 @@ buildPythonApplication rec { installPhase = '' runHook preInstall mkdir -p $out + mkdir -p $kitten/bin ${if stdenv.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" + ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" + cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten" mkdir "$out/Applications" cp -r kitty.app "$out/Applications/kitty.app" installManPage 'docs/_build/man/kitty.1' '' else '' cp -r linux-package/{bin,share,lib} $out + cp linux-package/bin/kitten $kitten/bin/kitten ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 7cc1b23a60ac7..54c9f9467636f 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 keybinder3 libnotify python3 diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix index b85133e7aecb1..3dcf23170209c 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.1"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = "${version}"; - sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14="; + sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index cece7cb8a01e6..15a605a328466 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -2,6 +2,7 @@ , rustPlatform , lib , fetchFromGitHub +, fetchpatch , ncurses , perl , pkg-config @@ -26,6 +27,7 @@ , UserNotifications , nixosTests , runCommand +, vulkan-loader }: rustPlatform.buildRustPackage rec { @@ -40,12 +42,12 @@ rustPlatform.buildRustPackage rec { 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" + patches = [ + # fix build with rust 1.67 + (fetchpatch { + url = "https://github.com/wez/wezterm/commit/36519f0d90e1875fb4b3f11f6cbf94c7d716ef78.patch"; + sha256 = "sha256-sOGFmDan1uO1xOBCpvlGrSotjfw01MjRg0KVqa5omig="; + }) ]; postPatch = '' @@ -105,7 +107,10 @@ rustPlatform.buildRustPackage rec { ''; preFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui + patchelf \ + --add-needed "${libGL}/lib/libEGL.so.1" \ + --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \ + $out/bin/wezterm-gui '' + lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" @@ -122,9 +127,7 @@ rustPlatform.buildRustPackage rec { }; terminfo = runCommand "wezterm-terminfo" { - nativeBuildInputs = [ - ncurses - ]; + nativeBuildInputs = [ ncurses ]; } '' mkdir -p $out/share/terminfo $out/nix-support tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo @@ -132,10 +135,9 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; + description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; homepage = "https://wezfurlong.org/wezterm"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 24a698ba80358..a5c98cb7df812 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "377"; + version = "378"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-2xCP56Rdjtl+YEchtYRDtHNknmHiY2Mb+HWfhhipkLI="; + hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index f7ba075114b7f..927bd7acaa946 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -26,14 +26,13 @@ buildPythonApplication rec { pname = "commitizen"; - version = "2.39.1"; + version = "2.42.1"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-QQIYyg2zwV7cfFxGHVsLiTRBgTGs3O7OJcmURvfY3LQ="; - deepClone = true; + hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8="; }; format = "pyproject"; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index a60aa27a8439c..0167f09ad5ba0 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]); + preInstall = '' mkdir -p $out/bin ''; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index e00853393e058..8693e6d208fad 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -1,32 +1,42 @@ -{ lib -, stdenv -, buildGoPackage +{ bash +, buildGoModule +, common-updater-scripts +, coreutils +, curl , fetchurl -, makeWrapper , git -, bash , gzip +, jq +, lib +, makeWrapper +, nix +, nixosTests , openssh , pam , pamSupport ? true , sqliteSupport ? true +, stdenv +, writeShellApplication }: -buildGoPackage rec { +buildGoModule rec { pname = "forgejo"; - version = "1.18.2-1"; + version = "1.18.5-0"; 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="; + url = "https://codeberg.org/attachments/bb93c0c9-98c4-465c-bcff-e07ac3ee72a3"; + hash = "sha256-jyaJ7W/K1Nn44ZhyJHZD+dKObU3hYx6mmDzvbvrR7gw="; }; + vendorHash = null; + + subPackages = [ "." ]; + outputs = [ "out" "data" ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional pamSupport pam; patches = [ @@ -39,28 +49,71 @@ buildGoPackage rec { 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 ./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.forgejo; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "update-forgejo"; + runtimeInputs = [ + common-updater-scripts + coreutils + curl + jq + nix + ]; + text = '' + releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \ + --silent \ + --header "accept: application/json") + + stable=$(jq '.[0] + | .tag_name[1:] as $version + | ("forgejo-src-\($version).tar.gz") as $filename + | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ + <<< "$releases") + + archive_url=$(jq -r .gz <<< "$stable") + checksum_url=$(jq -r .sha256 <<< "$stable") + release_url=$(jq -r .html_url <<< "$stable") + version=$(jq -r .version <<< "$stable") + + if [[ "${version}" = "$version" ]]; then + echo "No new version found (already at $version)" + exit 0 + fi + + echo "Release: $release_url" + + sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) + sri_hash=$(nix hash to-sri --type sha256 "$sha256") + + update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + ''; + }); 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 ]; + maintainers = with maintainers; [ indeednotjames urandom ]; broken = stdenv.isDarwin; + mainProgram = "gitea"; }; } diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 335a899b4da10..f505ebdfeb860 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/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index dcce6f7f3c002..0df0669c41da7 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -12,7 +12,7 @@ let pname = "gfold"; - version = "4.2.0"; + version = "4.3.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-cH4FhXrdT0ejpyt8G2rSGw9WE9sfOXRkSA9+FVwRmtQ="; + sha256 = "sha256-jlUGtTtoJ3DQbs4VEDUbYyl+s9S+bLTQ+GM6OQg6MNo="; }; - cargoSha256 = "sha256-NmVmqBzRUdumWQ9MzolZTo0VQW9JTjIyYRwUTzGiQZ4="; + cargoHash = "sha256-Mrqg0wOG3JHDdGMZMcFsifpazOukZeoMPrQh4vIfQyU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 284da7b4fae28..3f154f0350c4d 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-kebBochGagpg26Q2bkpUTPMYYwwBpBVx2+ZtsErJWYk="; + hash = "sha256-91TmPIjFOCeZmbobn3mIJis5qofJFmNGuX19+Cyo8Ck="; }; - vendorSha256 = "sha256-OjTl43UQGGHqCrw0kMBShuS8aonjWczfzQGmGJLhdrU="; + vendorHash = "sha256-NiXC0ooUkAqFCLp3eRBpryazQU94gSnw0gYFwQNeCo4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix index 26632abe4694b..b9bfc6f745ec7 100644 --- a/pkgs/applications/version-management/ghq/default.nix +++ b/pkgs/applications/version-management/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY="; + sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84="; }; - vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM="; + vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs="; doCheck = false; diff --git a/pkgs/applications/version-management/git-chglog/default.nix b/pkgs/applications/version-management/git-chglog/default.nix index b427acf960ec7..ad0d64a6ef62a 100644 --- a/pkgs/applications/version-management/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.4"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "sha256-UlhJ004ceXpdB/9296cL2sbBYsjV8D+3YS1vmFgnko8="; + sha256 = "sha256-rTJn2vUrEnmG2japqCxHv3BR9MpmMfpMLO2FBP6ONbw="; }; - vendorSha256 = "sha256-FLFPcmkrhZ+/UX1xpexsDv3cgC/Ocj4qTFJOX+rmdyQ="; + vendorHash = "sha256-skhEHpSnxOTZrL8XLlQZL3s224mg8XRINKJnatYCQko="; ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index fb4ebea2480f5..e9959cd42deee 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -1,9 +1,6 @@ -{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: -let - inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify qtpy; - -in buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-cola"; version = "4.1.0"; @@ -14,11 +11,23 @@ in buildPythonApplication rec { hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY="; }; - buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip_4 pyinotify qtpy ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + # TODO: remove in the next release since upstream removed pytest-flake8 + # https://github.com/git-cola/git-cola/commit/6c5c5c6c888ee1a095fc1ca5521af9a03b833205 + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--flake8" "" + ''; + + propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ]; + nativeCheckInputs = with python3Packages; [ git pytestCheckHook ]; - doCheck = false; + disabledTestPaths = [ + "qtpy/" + "contrib/win32" + ] ++ lib.optionals stdenv.isDarwin [ + "cola/inotify.py" + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -28,7 +37,6 @@ in buildPythonApplication rec { homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = [ maintainers.bobvanderlinden ]; }; } diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 27998f1c9c15b..e9b4d75bf64ac 100644 --- a/pkgs/applications/version-management/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.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-ZpysJ+xs3IenqAdoswG0OkzxzuNPSKkqlutGxn4VRw8="; + hash = "sha256-siVSZke+anVTaLiJVyDEKvgX+VmS0axa+4721nlgmiw="; }; - cargoHash = "sha256-IPsMlVfgwoFEQlXmW4gnt16WNF5W6akobUVct/iF42E="; + cargoHash = "sha256-QMAAKkjWgM/UiOfkNMLQxyGEYYmiSvE0Pd8fZXYyN48="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 24fc850b31b08..885f6d1355e93 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.14.3"; + version = "3.15.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; + hash = "sha256-hIm3JDLXUTwjuVfAHvZBWFBJNOAVWyfl/X4A6B0OoXg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 69fb89604bb79..8bd9d315d0059 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' diff --git a/pkgs/applications/version-management/git-subset/default.nix b/pkgs/applications/version-management/git-subset/default.nix deleted file mode 100644 index 53db1c01eefb7..0000000000000 --- a/pkgs/applications/version-management/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-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 0ef5a678ee8ef..a7dbf0c6ba4bc 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, libgit2 +, IOKit +, CoreFoundation +, fetchpatch +}: rustPlatform.buildRustPackage rec { pname = "git-trim"; @@ -11,11 +21,22 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k="; + cargoHash = "sha256-mS8kNkZs8jX99ryG4XkU+U/iWIIcmET2vOfG1YNNZFU="; + + cargoPatches = [ + # Update git2 https://github.com/foriequal0/git-trim/pull/202 + (fetchpatch { + url = "https://github.com/foriequal0/git-trim/commit/4355cd1d6f605455087c4d7ad16bfb92ffee941f.patch"; + sha256 = "sha256-C1pX4oe9ZCgvqYTBJeSjMdr0KFyjv2PNVMJDlwCAngY="; + }) + ]; + + OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl libgit2 ] + ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 56f7e697ec87b..ef1b8db97b03f 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.39.0"; + version = "2.39.2"; 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-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls="; + sha256 = "R1918Tc7LNTkOHBhhRdZZtXBH2jE2x5IwmJXxD3c8tY="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 3126dde505499..3141d08cdcece 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoPackage +, buildGoModule , fetchurl , makeWrapper , git @@ -13,16 +13,18 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "gitea"; - version = "1.18.3"; + version = "1.18.5"; # 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"; - hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU="; + hash = "sha256-OGPn4fknYfzmuAi6CL8m/Ih4uRNraVDmpBm20qT3lKk="; }; + vendorHash = null; + patches = [ ./static-root-path.patch ]; @@ -31,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; { diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2b6018dfe4460..434da9188ef78 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 = "9.0.0"; + version = "9.1.1"; 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-I6iIg+RBTz5HyommAvDuQBBURjMm04t31o5OZNCrYGc="; + sha256 = "sha256-CbIKdErthpMnVIuv+EJsWBRixMDG8h9aQ2XcmqpzKUc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "1dhswjzyjrfz4psjji53fjpvb8845lv44qqc6ncfv1ljx9ky828r"; + sha256 = "sha256-J6ruK1UE0A9VG1tUHeSUDEL4wqRmUnOH8ftKHIIQuVc="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "0jzcwx1z240rr08qc6vbasn51bcadz2jl3vm3jwgjpfdwypnsvk1"; + sha256 = "sha256-cjz/pbV+uV6tbhj3NXDfZ93hgxFtNYhFIh6+jG4pFtU="; }; }; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a36dc3bc2503c..63d22703d284c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.7.5", - "repo_hash": "sha256-zo1b82y114NpX43rJAWQmUhORM1kQxyiSnonqPUQJmY=", - "yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l", + "version": "15.8.3", + "repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=", + "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.7.5-ee", + "rev": "v15.8.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.7.5", - "GITLAB_PAGES_VERSION": "15.7.5", - "GITLAB_SHELL_VERSION": "14.14.0", - "GITLAB_WORKHORSE_VERSION": "15.7.5" + "GITALY_SERVER_VERSION": "15.8.3", + "GITLAB_PAGES_VERSION": "15.8.3", + "GITLAB_SHELL_VERSION": "14.15.0", + "GITLAB_WORKHORSE_VERSION": "15.8.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index da95241d34c4b..2b90a2e0cdaf0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -80,7 +80,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -90,7 +90,7 @@ GEM 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) @@ -112,15 +112,15 @@ 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) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 9f217aa65f34c..aab5bfbd6a6fe 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.7.5"; + version = "15.8.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-FT77MUcErc/16tChwyNczCLtADTOEzKKTsTlhLI6aV8="; + sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8="; }; - vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY="; + vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index f7471a12b008d..f3a4a082f205c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -317,10 +317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -385,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"]; @@ -494,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"]; @@ -537,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 = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 74fd1ab320e02..25e2a0642423a 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.14.0"; + version = "14.15.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-zXRLaEy2Q+mm1GLjLB1AxRtBxXAoLw6PA1YOJfvVhoc="; + sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-mhmM33cXJbqVJ1jY82Mi/nWzz7HXdxxSsFNQknFkwpQ="; + 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 b164076c28b69..252be4e563137 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.7.5"; + version = "15.8.3"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-TrLc5L4kLAdu1CEM3ezw6hhF6Icy3rXkFyUaVTUQ6X4="; + 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 417dc56637da3..96517b56ff918 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' 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' - Bundler::Checksum.patch! + BundlerChecksum.patch! end gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false @@ -37,7 +37,7 @@ gem 'view_component', '~> 2.74.1' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.4.3' +gem 'pg', '~> 1.4.5' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.1' @@ -84,7 +84,7 @@ 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', '~> 2.0.0' @@ -113,7 +113,7 @@ gem 'gpgme', '~> 2.0.22' # 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' @@ -200,7 +200,7 @@ 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.3', require: 'rack/timeout/base' @@ -304,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.4' +gem 'rack-proxy', '~> 0.7.6' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -358,12 +358,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.6', require: false + gem 'lefthook', '~> 1.2.7', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.2', '>= 1.2.1' + gem 'lookbook', '~> 1.4', '>= 1.4.5' # Better errors handler gem 'better_errors', '~> 2.9.1' @@ -395,7 +395,7 @@ group :development, :test do gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 9.1.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 @@ -538,7 +538,7 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f 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' @@ -574,6 +574,7 @@ 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 087d4d8aeec04..ea1771e5af3bd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -172,6 +172,9 @@ GEM 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) @@ -598,7 +601,7 @@ GEM gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (9.1.0) + gitlab-styles (9.2.0) rubocop (~> 1.38.0) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.14) @@ -832,7 +835,7 @@ GEM kramdown (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.6) + lefthook (1.2.7) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -861,7 +864,7 @@ GEM 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) @@ -870,7 +873,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.2.1) + lookbook (1.4.5) actioncable activemodel css_parser @@ -930,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) @@ -1068,7 +1071,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.4.3) + pg (1.4.5) pg_query (2.2.0) google-protobuf (>= 3.19.2) plist (3.6.0) @@ -1108,7 +1111,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.1) - rack (2.2.4) + rack (2.2.6.2) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) @@ -1123,7 +1126,7 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.4) + rack-proxy (0.7.6) rack rack-test (2.0.2) rack (>= 1.3) @@ -1150,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) @@ -1174,7 +1177,7 @@ GEM rchardet (1.8.0) rdoc (6.3.2) re2 (1.6.0) - recaptcha (4.13.1) + recaptcha (5.12.3) json recursive-open-struct (1.1.3) redcarpet (3.5.1) @@ -1274,14 +1277,14 @@ GEM rubocop (>= 0.51) rubocop-graphql (0.18.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.15.0) + rubocop-performance (1.15.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.2) + rubocop-rails (2.17.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.15.0) + rubocop-rspec (2.16.0) rubocop (~> 1.33) ruby-fogbugz (0.3.0) crack (~> 0.4) @@ -1581,6 +1584,7 @@ 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) @@ -1672,7 +1676,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) - gitlab-styles (~> 9.1.0) + gitlab-styles (~> 9.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) @@ -1716,15 +1720,15 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3)! - lefthook (~> 1.2.6) + lefthook (~> 1.2.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) listen (~> 3.7) - lockbox (~> 0.6.2) + lockbox (~> 1.1.1) lograge (~> 0.5) loofah (~> 2.19.1) - lookbook (~> 1.2, >= 1.2.1) + lookbook (~> 1.4, >= 1.4.5) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! @@ -1734,7 +1738,7 @@ DEPENDENCIES 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.10) oauth2 (~> 2.0) @@ -1767,7 +1771,7 @@ DEPENDENCIES parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.3) + pg (~> 1.4.5) pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) @@ -1777,11 +1781,11 @@ DEPENDENCIES pry-shell (~> 0.5.1) puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.4) + 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.4) + rack-proxy (~> 0.7.6) rack-timeout (~> 0.6.3) rails (~> 6.1.6.1) rails-controller-testing @@ -1790,7 +1794,7 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.3.2) re2 (~> 1.6.0) - recaptcha (~> 4.11) + recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) redis-namespace (~> 1.9.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 968d07704fcb9..269318a0961d1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -206,6 +206,17 @@ src: }; 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 = []; @@ -2177,10 +2188,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ch27hxbby16jxvxg1jq3sqdbd3gg7ss4ymxn3yhsjy7gyglxza6"; + sha256 = "196fhlbhhanpbn5iriccp7m04xgkq7swyk07im50q7z05pxyf1ki"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -3098,10 +3109,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qyylcc57pcf8mwm9dvlzkfjxcpbypnp4q21ni05s7wxalxb12ld"; + sha256 = "18vcakjkb5fhavq9s6j7zwjc14c652361qws5g1slqb300anfww2"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; letter_opener = { dependencies = ["launchy"]; @@ -3194,10 +3205,10 @@ src: 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"]; @@ -3227,10 +3238,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mv5q4gpgzklwrgp7s7mhi0gb7x739qhyrni2n96i2vr4nv48a3l"; + sha256 = "1nww5h9frmbjfpfy2nb296vn78xnq1qg0lq3lsn52ky8s8rb65dw"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.5"; }; lru_redux = { groups = ["default"]; @@ -3581,10 +3592,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.1"; }; net-ntp = { groups = ["default"]; @@ -4153,10 +4164,10 @@ src: 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"]; @@ -4358,10 +4369,10 @@ src: 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"]; @@ -4424,10 +4435,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6j2xk3s3ps3r9vqgwq3flyij9jgkyzanmgiifid8yqhcskgfx8"; + sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; type = "gem"; }; - version = "0.7.4"; + version = "0.7.6"; }; rack-test = { dependencies = ["rack"]; @@ -4489,10 +4500,10 @@ src: 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"]; @@ -4614,10 +4625,10 @@ src: 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"]; @@ -5020,10 +5031,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; + sha256 = "00ld0hfm2x5hzms9xhkyjfxs8afsmlg1kf0mklk68cq4wwwihkwd"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -5031,10 +5042,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "052viwgi7dbbnq0pxihz1k72dwhph8gw4v2zzw057w42l39hhh6i"; + sha256 = "1bv51vwcg5m4v35n7653xclw9vv3ifvgbhvc2l79wz2p76ipm1bx"; type = "gem"; }; - version = "2.17.2"; + version = "2.17.3"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -5042,10 +5053,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4"; + sha256 = "1rpcww107xq6aj5wkypzjj346jaxhqal33wmhlwb9gc2h425yg5k"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index 7e66985bb8864..2b25c5e52775e 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitmux"; - version = "0.7.10"; + version = "0.9.1"; src = fetchFromGitHub { owner = "arl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0="; + sha256 = "sha256-QbQykbZo8fMyCMd0MF7CGrPFECN0ehcTGGLeQXbnlxw="; }; - vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; + vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0="; # GitHub source does contain a regression test for the module # but it requires networking as it git clones a repo from github diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index d2a51c94727a2..708703b64d2d3 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -7,26 +7,27 @@ , libiconv , Security , SystemConfiguration +, curl , openssl }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.19.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-GGXujTn5Xb63vKIycj5o9+PCsMN1Kp3RCSg1wiM31qA="; + sha256 = "sha256-PetU/cUWFZWl1OoSObI7wwqJLexWPTP6ynNSyPXjvMc="; }; - cargoSha256 = "sha256-MAZhrd9CtFOIAaUUbXplBo+eo6Zaws2LIRkPoX4HztE="; + cargoHash = "sha256-A7gwC9EQ+5GVciGsL9uPbZ6nThPfku3ZNH8qQwfI0QQ="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = [ curl ] ++ (if stdenv.isDarwin then [ libiconv Security SystemConfiguration ] - else [ openssl ]; + else [ openssl ]); # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 9d6bbbd13f67c..a789a35f7a5d7 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.24.1"; + version = "1.25.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-CUchYPMBTINkMJg8TC8rKMVkrcj/Gy+ZxV7jbtMFvpg="; + hash = "sha256-x/VH6cRrJZ2t2iftBPC86FcgIwjRNzV11MwLG2y+Paw="; }; - vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; + vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix index 5786ebc8a6507..c99403889d54a 100644 --- a/pkgs/applications/version-management/glitter/default.nix +++ b/pkgs/applications/version-management/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xrQqeRJfBEcjX0tkULg+94R7+mWWn6QeKIfZiDp+Vt8="; + sha256 = "sha256-sMAHVXpgAhZYUpl75JRtKhTqt/sQkSkoEzk7aGV1vcQ="; }; - cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; + cargoSha256 = "sha256-CaWpGNP7Jsv/3dks0LVbZXoD/9HqJmOzaD0ejT5xSqA="; nativeCheckInputs = [ git diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 0549169ed1b6e..824d0e0560485 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -8,16 +8,16 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.10"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "sha256-EFGC94aIMW7AYJpgaHBT4W7BjXd+oijMqQPH40rIvlg="; + sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8="; }; - vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg="; + vendorSha256 = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 7db96739b2b53..e601b1165f5d8 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.82"; + version = "0.83"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-Lb0WZ4gTuG/GBAnEh9ff/K0ciwjDX3cmEhItMyJ/lmI="; + sha256 = "sha256-kNhU6OR9IUNPL72D90nhq2X5vmVW7YUmpnq/EOUvG/8="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index d198b528f2ad9..36c67568020c7 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.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-ajBL2o5i4UmclL/s9eEVtn/p51/F4gsClmcYBrAZ+1o="; + sha256 = "sha256-FczlSBlLhLIamLiY4cGVAoHx0/sxx+tykICzedFbbx8="; }; - cargoSha256 = "sha256-RgF2StIMfFzbp0azG4yRPvzrZ4kczWtOWVd+KTTPbRw="; + cargoHash = "sha256-PydDgXp47KUSLvAQgfO+09lrzTnBjzGd+zA5f/jZfRc="; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix index 754fa778fed90..38531775b99e9 100644 --- a/pkgs/applications/version-management/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/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 3e1f002f9776d..06c7c6c4d9410 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.7"; + version = "1.2.9"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es="; + sha256 = "sha256-MYeQMgac1bqqN2QPz2KO55w7++3MnsRFm/ziSm6e2Rw="; }; - vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; + vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 20edc2af502b7..2e71206aff231 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -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/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix index f74ae1cf37a3b..213243f1851ca 100644 --- a/pkgs/applications/version-management/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -10,7 +10,10 @@ , openssl , libusb1 , AppKit +, git , openssh +, testers +, radicle-cli }: rustPlatform.buildRustPackage rec { @@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec { done ''; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ + git + openssh + ]; preCheck = '' eval $(ssh-agent) ''; + passthru.tests = { + version = testers.testVersion { package = radicle-cli; }; + }; + meta = { description = "Command-line tooling for Radicle, a decentralized code collaboration network"; homepage = "https://radicle.xyz"; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 0027af3defe90..5c1499139ca0e 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 subversion apr aprutil python3 ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 5f2f9aab2b3c3..40d909c8e0282 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.diffutils buildPackages.ed ]; - NIX_CFLAGS_COMPILE = "-std=c99"; + env.NIX_CFLAGS_COMPILE = "-std=c99"; hardeningDisable = lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index cd4fee2194559..ff91d07e87be2 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -4,9 +4,11 @@ version = 3 [[package]] name = "abomonation" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e72913c99b1f927aa7bd59a41518fdd9995f63ffc8760f211609e0241c4fb2" +version = "0.7.3+smallvec1" +source = "git+https://github.com/markbt/abomonation?rev=0f43346d2afa2aedc64d61f3f4273e8d1e454642#0f43346d2afa2aedc64d61f3f4273e8d1e454642" +dependencies = [ + "smallvec", +] [[package]] name = "abomonation_derive" @@ -86,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arc-swap" @@ -148,7 +150,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -165,7 +167,7 @@ dependencies = [ name = "async-runtime" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "num_cpus", "once_cell", "tokio", @@ -173,9 +175,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -448,9 +450,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -470,9 +472,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" dependencies = [ "memchr", "serde", @@ -484,14 +486,14 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -511,9 +513,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] @@ -540,6 +542,15 @@ dependencies = [ ] [[package]] +name = "camino" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +dependencies = [ + "serde", +] + +[[package]] name = "cassowary" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -576,9 +587,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -604,7 +615,7 @@ dependencies = [ "async-trait", "configmodel", "fail", - "futures 0.3.25", + "futures 0.3.26", "io", "manifest", "manifest-tree", @@ -688,7 +699,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -773,12 +784,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "quote", ] @@ -822,6 +833,7 @@ version = "0.1.0" dependencies = [ "anyhow", "filetime", + "futures 0.3.26", "hostcaps", "identity", "lazy_static", @@ -829,11 +841,13 @@ dependencies = [ "mime", "regex", "reqwest", + "reqwest-eventsource", "rust-ini", "serde", "serde_json", "tempfile", "thiserror", + "tokio", ] [[package]] @@ -854,9 +868,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils 0.8.14", ] @@ -870,7 +884,7 @@ dependencies = [ "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -890,7 +904,7 @@ dependencies = [ "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -964,14 +978,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -1039,7 +1053,7 @@ dependencies = [ "async-runtime", "cpython", "cpython_ext", - "futures 0.3.25", + "futures 0.3.26", "itertools 0.10.5", "tokio", ] @@ -1384,9 +1398,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" dependencies = [ "cc", "cxxbridge-flags", @@ -1396,9 +1410,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" dependencies = [ "cc", "codespan-reporting", @@ -1411,15 +1425,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" [[package]] name = "cxxbridge-macro" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" dependencies = [ "proc-macro2", "quote", @@ -1439,22 +1453,21 @@ dependencies = [ "drawdag", "fail", "fs2", - "futures 0.3.25", + "futures 0.3.26", "indexedlog", "indexmap", - "itertools 0.10.5", "mincode", "minibytes", "nonblocking", "once_cell", "quickcheck", "rand 0.8.5", + "renderdag", "serde", "tempfile", "thiserror", "tokio", "tracing", - "unicode-width", "vlqencoding", ] @@ -1478,7 +1491,6 @@ dependencies = [ "abomonation_derive", "minibytes", "quickcheck", - "quickcheck_arbitrary_derive", "serde", ] @@ -1492,7 +1504,7 @@ dependencies = [ "hashbrown 0.12.3", "lock_api", "once_cell", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", "rayon", "serde", ] @@ -1624,7 +1636,7 @@ dependencies = [ "dag", "edenapi_trait", "fail", - "futures 0.3.25", + "futures 0.3.26", "http", "identity", "manifest-tree", @@ -1663,12 +1675,12 @@ dependencies = [ "async-runtime", "async-trait", "auth", - "bytes 1.3.0", + "bytes 1.4.0", "chrono", "configmodel", "edenapi_trait", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "hg-http", "http-client", "itertools 0.10.5", @@ -1701,7 +1713,7 @@ dependencies = [ "crossbeam 0.8.2", "edenapi", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "itertools 0.10.5", "minibytes", "tokio", @@ -1717,7 +1729,7 @@ dependencies = [ "async-trait", "configmodel", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "http", "http-client", "minibytes", @@ -1732,7 +1744,7 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.3.0", + "bytes 1.4.0", "dag-types", "insta_ext", "paste", @@ -1773,9 +1785,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1794,9 +1806,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] @@ -1807,7 +1819,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro2", "quote", "syn", @@ -1876,6 +1888,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom 7.1.3", + "pin-project-lite", +] + +[[package]] name = "exchange" version = "0.1.0" dependencies = [ @@ -1931,14 +1954,14 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#0b9b58848f96c78f65513457c15292b81dc6b91e" +source = "git+https://github.com/facebook/fb303.git?branch=main#d35b962b6f3dc787ed64c8d6b1b49a986e69f4d0" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -1952,7 +1975,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "fbinit_macros", "quickcheck", @@ -1961,7 +1984,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "proc-macro2", "quote", @@ -1971,14 +1994,15 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#46238c81c2c30ec8e9907203922218e4ecfd4cbb" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5641439382254134d192ca8fe3c9af23f87b5fa" dependencies = [ "anyhow", "async-trait", "base64 0.11.0", "bufsize", - "bytes 1.3.0", - "futures 0.3.25", + "bytes 1.4.0", + "camino", + "futures 0.3.26", "ghost", "num-derive", "num-traits", @@ -1991,24 +2015,24 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "byteorder", - "bytes 1.3.0", + "bytes 1.4.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" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", - "bytes 1.3.0", + "bytes 1.4.0", "fbthrift", "fbthrift_framed", "fbthrift_util", - "futures 0.3.25", + "futures 0.3.26", "tokio", "tokio-tower", "tokio-util 0.6.10", @@ -2018,7 +2042,7 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "tokio", ] @@ -2043,7 +2067,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2200,9 +2224,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -2219,16 +2243,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "futures-timer", "pin-utils", ] [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -2236,15 +2260,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -2253,9 +2277,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -2274,9 +2298,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -2285,15 +2309,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -2303,9 +2327,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2405,7 +2429,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.25", + "futures 0.3.26", "git2", "minibytes", "storemodel", @@ -2425,7 +2449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.1.0", + "bstr 1.2.0", "fnv", "log", "regex", @@ -2437,7 +2461,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", @@ -2485,9 +2509,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2615,7 +2639,7 @@ dependencies = [ "async-trait", "dag", "edenapi", - "futures 0.3.25", + "futures 0.3.26", "gitdag", "metalog", "minibytes", @@ -2669,7 +2693,7 @@ dependencies = [ [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "lazy_static", ] @@ -2677,7 +2701,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2700,7 +2724,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "fnv", "itoa 1.0.5", ] @@ -2711,7 +2735,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "http", "pin-project-lite", ] @@ -2728,7 +2752,7 @@ dependencies = [ "curl", "curl-sys", "env_logger 0.7.1", - "futures 0.3.25", + "futures 0.3.26", "http", "lru-cache", "maplit", @@ -2780,11 +2804,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", @@ -2821,7 +2845,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "hyper", "native-tls", "tokio", @@ -2887,9 +2911,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ "globset", "lazy_static", @@ -3004,12 +3028,12 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3080,9 +3104,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -3140,9 +3164,9 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libgit2-sys" -version = "0.13.4+1.4.2" +version = "0.13.5+1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" +checksum = "51e5ea06c26926f1002dd553fded6cfcdc9784c1f60feeb58368b4d9b07b6dba" dependencies = [ "cc", "libc", @@ -3305,7 +3329,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", - "futures 0.3.25", + "futures 0.3.26", "futures-batch", "manifest", "minibench", @@ -3347,9 +3371,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maybe-uninit" @@ -3441,7 +3465,7 @@ dependencies = [ name = "metrics" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "once_cell", ] @@ -3498,13 +3522,19 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "memmap", "quickcheck", "serde", ] [[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] name = "miniz_oxide" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3555,7 +3585,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3645,11 +3675,10 @@ dependencies = [ "bitflags", "dag", "drawdag", - "futures 0.3.25", + "futures 0.3.26", "indexedlog", "rand 0.8.5", "rand_chacha 0.3.1", - "renderdag", "tempdir", "types", "vlqencoding", @@ -3735,10 +3764,20 @@ dependencies = [ ] [[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] name = "nonblocking" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", ] [[package]] @@ -3981,7 +4020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", ] [[package]] @@ -4000,15 +4039,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -4070,9 +4109,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" +checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" dependencies = [ "thiserror", "ucd-trie", @@ -4080,9 +4119,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" +checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" dependencies = [ "pest", "pest_generator", @@ -4090,9 +4129,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" +checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" dependencies = [ "pest", "pest_meta", @@ -4103,9 +4142,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" +checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" dependencies = [ "once_cell", "pest", @@ -4114,15 +4153,6 @@ dependencies = [ [[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" @@ -4142,22 +4172,12 @@ dependencies = [ [[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" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", + "phf_generator", + "phf_shared 0.11.1", ] [[package]] @@ -4176,7 +4196,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" dependencies = [ - "phf_generator 0.11.1", + "phf_generator", "phf_shared 0.11.1", "proc-macro2", "quote", @@ -4185,15 +4205,6 @@ dependencies = [ [[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" @@ -4314,7 +4325,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4369,9 +4380,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -4524,13 +4535,12 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "futures 0.3.25", + "futures 0.3.26", "hgcommits", "minibytes", "parking_lot 0.11.2", "pyedenapi", "pymetalog", - "renderdag", "storemodel", ] @@ -4599,7 +4609,7 @@ dependencies = [ "edenapi", "edenapi_ext", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "minibytes", "progress-model", "pyconfigloader", @@ -4896,7 +4906,7 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "futures 0.3.25", + "futures 0.3.26", "io", "minibytes", "parking_lot 0.11.2", @@ -5075,7 +5085,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "proc-macro2", "quickcheck", @@ -5138,7 +5148,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -5215,15 +5224,6 @@ dependencies = [ ] [[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" @@ -5235,9 +5235,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel 0.5.6", "crossbeam-deque 0.8.2", @@ -5340,7 +5340,12 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ + "bitflags", "dag", + "itertools 0.10.5", + "nonblocking", + "serde", + "unicode-width", ] [[package]] @@ -5401,7 +5406,7 @@ version = "0.11.11" source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b" dependencies = [ "base64 0.13.1", - "bytes 1.3.0", + "bytes 1.4.0", "encoding_rs", "futures-core", "futures-util", @@ -5441,6 +5446,22 @@ dependencies = [ ] [[package]] +name = "reqwest-eventsource" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom 7.1.3", + "pin-project-lite", + "reqwest", + "thiserror", +] + +[[package]] name = "resolv-conf" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5466,7 +5487,7 @@ dependencies = [ "edenapi", "edenapi_types", "fbinit", - "futures 0.3.25", + "futures 0.3.26", "hex", "hg-http", "hg-metrics", @@ -5613,16 +5634,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.6" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -5685,7 +5706,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5700,6 +5721,7 @@ dependencies = [ "log", "serde", "thiserror", + "tokio", "toml", ] @@ -5727,9 +5749,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -5740,9 +5762,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -5788,20 +5810,20 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" dependencies = [ "anyhow", "byteorder", - "bytes 1.3.0", + "bytes 1.4.0", "serde", "thiserror", ] [[package]] name = "serde_bytes" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] @@ -5829,9 +5851,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" dependencies = [ "itoa 1.0.5", "ryu", @@ -6037,7 +6059,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6048,7 +6070,7 @@ name = "sparse" version = "0.1.0" dependencies = [ "anyhow", - "futures 0.3.25", + "futures 0.3.26", "globset", "once_cell", "pathmatcher", @@ -6111,7 +6133,7 @@ dependencies = [ "anyhow", "async-trait", "auto_impl", - "futures 0.3.25", + "futures 0.3.26", "minibytes", "types", ] @@ -6154,7 +6176,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.25", + "futures 0.3.26", "pin-project 0.4.30", "tokio", ] @@ -6284,9 +6306,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -6308,19 +6330,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "terminfo" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" dependencies = [ - "dirs 2.0.2", + "dirs 4.0.0", "fnv", - "nom", - "phf 0.8.0", + "nom 5.1.2", + "phf 0.11.1", "phf_codegen", ] @@ -6458,7 +6480,7 @@ dependencies = [ "const-cstr", "fb303_core", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -6479,7 +6501,7 @@ dependencies = [ "config_thrift", "fb303_core", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "thiserror", "thrift", ] @@ -6487,7 +6509,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", "clap 2.34.0", @@ -6555,18 +6577,18 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.1" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", - "bytes 1.3.0", + "bytes 1.4.0", "libc", "memchr", "mio 0.8.5", @@ -6577,7 +6599,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6655,10 +6677,10 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "async-io", - "futures 0.3.25", + "futures 0.3.26", "tokio", "tracing", "uds_windows", @@ -6670,7 +6692,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-core", "futures-io", "futures-sink", @@ -6686,7 +6708,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-core", "futures-sink", "pin-project-lite", @@ -6881,6 +6903,7 @@ dependencies = [ "anyhow", "bitflags", "byteorder", + "fs2", "identity", "itertools 0.10.5", "pretty_assertions", @@ -6889,7 +6912,7 @@ dependencies = [ "rand_chacha 0.3.1", "repolock", "sha2 0.10.6", - "tempdir", + "tempfile", "thiserror", "tracing", "twox-hash", @@ -7028,9 +7051,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" @@ -7049,9 +7072,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -7255,9 +7278,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7265,9 +7288,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -7280,9 +7303,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7292,9 +7315,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7302,9 +7325,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -7315,18 +7338,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" dependencies = [ "anyhow", - "bytes 1.3.0", - "futures 0.3.25", + "bytes 1.4.0", + "futures 0.3.26", "maplit", "serde", "serde_bser", @@ -7338,9 +7361,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -7422,9 +7445,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -7496,6 +7519,30 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7556,7 +7603,7 @@ dependencies = [ "configmodel", "crossbeam 0.8.2", "edenfs_client", - "futures 0.3.25", + "futures 0.3.26", "identity", "io", "manifest", @@ -7650,9 +7697,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.5+zstd.1.5.2" +version = "2.0.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" dependencies = [ "cc", "libc", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 8873e8c4718ee..80cc6bf9e9360 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-zlvb+qn9SSBPZmlF8KwKTWyKj94FGOafSMRMNLsccOU"; + hash = "sha256-WOvkw+vuU/9vWgxCx7ogawQWCr1O7E70uw/LhuLiSzE"; }; addonsSrc = "${src}/addons"; @@ -51,7 +51,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-+29WAgSXVciHhLMN04yfKiWCpjM3Vo54nUdTP6owSLs"; + sha256 = "sha256-haeVRO5JBStrO7fjI9WhC5xZwX0IlZR1wxh0Q+m/UQM"; }; # Builds the NodeJS server that runs with `sl web` @@ -88,111 +88,94 @@ let 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 { +# Builds the main `sl` binary and its Python extensions +python3Packages.buildPythonApplication { pname = "sapling"; - inherit version; - - dontUnpack = true; + inherit src version; + + sourceRoot = "source/eden/scm"; + + # Upstream does not commit Cargo.lock + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; + "cloned-0.1.0" = "sha256-ZWO3/+O3Oc2Zg99seJ40CInrW1+3rFvL5HjIxhjDW5I="; + "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; + "fb303_core-0.0.0" = "sha256-LEib4QL5sMCUyQ9yGWnsOmO6hmlDaE80nfmrTC8elu0="; + "fbthrift-0.0.1+unstable" = "sha256-4SjdZzG6UP8OY7/Qy7ebdKOg1WdZ2USG6wJ7YhA/PxU="; + "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; + "serde_bser-0.3.1" = "sha256-uW7qXEn0p7m6uo5r+rD3TDH/Lf1cBMWml0TbhysgDH8="; + }; + }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; - installPhase = '' - runHook preInstall + # 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 + ''; - mkdir -p $out - cp -r ${sapling}/* $out + # 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' + ''; - runHook postInstall + 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 + ]; + + HGNAME = "sl"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION = version; + SAPLING_VERSION_HASH = versionHash; + # 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 = '' + installCheckPhase = '' echo -n "testing sapling version; should be \"${version}\"... " - ${sapling}/bin/sl version | grep -qw "${version}" + $out/bin/sl version | grep -qw "${version}" echo "OK!" ''; diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 9cbcd71cbcf7c..eeedd64b95063 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -73,6 +73,6 @@ "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.2.20221222-152408-ha6a66d09", - "versionHash": "14601963598499040874" + "version": "0.2.20230124-180750-hf8cd450a", + "versionHash": "5465836048527734544" } diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix new file mode 100644 index 0000000000000..b49969317ef3a --- /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 a9aabd7a87da0..32dc11d4527d2 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.3"; + version = "22.1.4"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; + sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 7faca39e2fe4f..9c9f6f4033301 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -2,6 +2,7 @@ , callPackage , recurseIntoAttrs , nixosTests +, config }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -28,12 +29,10 @@ let }; }; in -with python.pkgs; recurseIntoAttrs { +with python.pkgs; recurseIntoAttrs ({ inherit python; coresrht = toPythonApplication srht; buildsrht = toPythonApplication buildsrht; - # 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; @@ -46,4 +45,7 @@ with python.pkgs; recurseIntoAttrs { passthru.tests = { nixos-sourcehut = nixosTests.sourcehut; }; -} +} // lib.optionalAttrs config.allowAliases { + # Added 2022-10-29 + dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; +}) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index cba7be9531732..258f03eb78315 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g="; + sha256 = "sha256-6wA2dnUUgS6HNQo2vMFqoT+seZHqcNLoTN+f5+Ok1AQ="; }; - cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto="; + cargoHash = "sha256-XkRnbfTaCo0J1+yOOvIxhDTjtaZURkjFOPWsFRk8iNU="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index ceee5d6b48868..2bed38959c139 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2079"; - x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U="; + buildVersion = "2083"; + x64sha256 = "bWHbP8j228jUDr1XDLRciq7hcET6o6Udr/lLODXRudc="; } {}; sublime-merge-dev = common { - buildVersion = "2081"; - x64sha256 = "QzJP25KxczmrR5PZ9ujRSM3V+TrKqiH82plo1bTv48s="; + buildVersion = "2082"; + x64sha256 = "Gl1BrLTSDLRTgrYQW/99o0XRjSIxvnNYRIViZEidcsM="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index cfce8a35f9e12..ada5f9fea6409 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/pkgs/applications/version-management/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.7"; + version = "2.5.8"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-D5NQaxkGhwyBoScI7fZxnSHC0ABmsUeRf8pZCKooV3w="; + sha256 = "sha256-VuuqR5fj0YvqIfVPH7N3rpAfIbcTwOx9W3H60saCToQ="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 32c2e14da1cf6..73a2035c31fb5 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -29,7 +29,7 @@ to support their use in yadm. resholve.mkDerivation rec { pname = "yadm"; - version = "3.2.1"; + version = "3.2.2"; nativeBuildInputs = [ installShellFiles ]; @@ -37,7 +37,7 @@ resholve.mkDerivation rec { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - hash = "sha256:0h3gxhdf32g21xx9si0lv0sa4ipb1k0n5qpln0w2vipvfgakn5mn"; + hash = "sha256-GcuqMlE8oef9+LIqKoCotktU7GcgPBE9CTVrZ8bKhv4="; }; dontConfigure = true; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 079fb1792e180..bb2d5822a22e1 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { --replace "NSUInteger" "size_t" ''; - NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; + env.NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; NIX_CFLAGS_LINK = "-L${luajit52}/lib"; configurePhase = '' diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 07a0a5803ca0e..80da93e5a2281 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.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY="; + hash = "sha256-8fpOCyv/XafrVy76jtazRoHW2gidjikgnRdaWzh8kY8="; }; 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/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index d7ad9846306a5..e3a97197d1049 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ + env.NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ "-Wno-error=deprecated-declarations" "-Wno-error=incompatible-pointer-types" ]; diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 26954375aff5b..3d62384634707 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = '' + # https://github.com/CCExtractor/ccextractor/issues/1467 + sed -i '/allheaders.h/a#include <leptonica/pix_internal.h>' src/lib_ccx/ocr.c + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/CMakeLists.txt \ --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' ''; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 0ce0623ec9d9e..972a68e04f03f 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/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 540339f05a561..d4e35ac484183 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: subtitles.o:src/coriander.h:110: multiple definition of # `main_window'; main.o:src/coriander.h:110: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' cp ${automake}/share/automake-*/mkinstalldirs . diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 42c1d40b61256..39af3876bf6ff 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -165,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/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index a63671accec4e..bab41b11bee94 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: mpris-interface.o:src/playlist.h:32: multiple definition of # `plclose'; gui.o:src/playlist.h:32: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6390558013f58..afc97cd7e1a9f 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/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7c06f6ddb8598..bd15099b26bac 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -25,7 +25,7 @@ , numactl , writeText # Processing, video codecs, containers -, ffmpeg-full +, ffmpeg_5-full , nv-codec-headers , libogg , x264 @@ -34,6 +34,7 @@ , libtheora , dav1d , zimg +, svt-av1 # Codecs, audio , libopus , lame @@ -84,57 +85,55 @@ }: let - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy"; + sha256 = "sha256-0MJ1inMNA6s8l2S0wnpM2c7FxOoOHxs9u4E/rgKfjJo="; }; # Handbrake maintains a set of ffmpeg patches. In particular, these # patches are required for subtitle timing to work correctly. See: # https://github.com/HandBrake/HandBrake/issues/4029 - ffmpeg-version = "4.4.1"; - ffmpeg-hb = ffmpeg-full.overrideAttrs (old: { + ffmpeg-version = "5.1.1"; + ffmpeg-hb = ffmpeg_5-full.overrideAttrs (old: { version = ffmpeg-version; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; - hash = "sha256-j8nyCsXtlRFanihWR63Q7t1cwamKA5raFMEyRS+YrEI="; + hash = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs="; }; - patches = old.patches or [] ++ [ - "${src}/contrib/ffmpeg/A01-qsv-scale-fix-green-stripes.patch" - "${src}/contrib/ffmpeg/A02-qsv-interpolation.patch" - "${src}/contrib/ffmpeg/A03-qsv-dx11-ffmpeg44.patch" - "${src}/contrib/ffmpeg/A04-configure-ensure-the-right-libmfx-version-is-used-wh.patch" - "${src}/contrib/ffmpeg/A05-qsv-add-includedir-mfx-to-the-search-path-for-old-ve.patch" - "${src}/contrib/ffmpeg/A06-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A07-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A08-qsvenc-don-t-support-multi-frame-encode-when-MFX_VER.patch" - "${src}/contrib/ffmpeg/A09-qsvenc-don-t-support-MFX_RATECONTROL_LA_EXT-when-MFX.patch" - "${src}/contrib/ffmpeg/A10-qsv-don-t-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A11-qsv-opaque-deinterlace.patch" - "${src}/contrib/ffmpeg/A12-qsv-opaque-vpp.patch" - "${src}/contrib/ffmpeg/A13-qsv-opaque-hwcontext_qsv.patch" - "${src}/contrib/ffmpeg/A14-configure-check-mfxdefs.h-instead-of-mfxvp9.h-for-MF.patch" - "${src}/contrib/ffmpeg/A15-configure-allow-user-to-build-FFmpeg-against-oneVPL.patch" - "${src}/contrib/ffmpeg/A16-qsv-add-macro-QSV_ONEVPL-for-the-oneVPL-SDK.patch" - "${src}/contrib/ffmpeg/A17-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" - "${src}/contrib/ffmpeg/A18-qsv-new-method-hwcontext_qsv.patch" - "${src}/contrib/ffmpeg/A19-qsv-fix-session-for-d3d11-device.patch" - "${src}/contrib/ffmpeg/A20-mov-read-name-track-tag-written-by-movenc.patch" - "${src}/contrib/ffmpeg/A21-movenc-write-3gpp-track-titl-tag.patch" - "${src}/contrib/ffmpeg/A22-mov-read-3gpp-udta-tags.patch" - "${src}/contrib/ffmpeg/A23-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A24-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A25-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A26-ccaption_dec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A27-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A28-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A29-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A30-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A32-qsv-fix-decode-10bit-hdr.patch" + patches = old.patches or [ ] ++ [ + "${src}/contrib/ffmpeg/A01-qsv-libavfilter-qsvvpp-change-the-output-frame-s-width-a.patch" + "${src}/contrib/ffmpeg/A02-qsv-configure-ensure-enable-libmfx-uses-libmfx-1.x.patch" + "${src}/contrib/ffmpeg/A03-qsv-configure-fix-the-check-for-MFX_CODEC_VP9.patch" + "${src}/contrib/ffmpeg/A04-qsv-remove-mfx-prefix-from-mfx-headers.patch" + "${src}/contrib/ffmpeg/A05-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A06-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A07-qsvenc-support-multi-frame-encode-when-MFX_VERSION-2.patch" + "${src}/contrib/ffmpeg/A08-qsvenc-support-MFX_RATECONTROL_LA_EXT-when-MFX_VERSI.patch" + "${src}/contrib/ffmpeg/A09-qsv-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A10-qsv-configure-add-enable-libvpl-option.patch" + "${src}/contrib/ffmpeg/A11-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" + "${src}/contrib/ffmpeg/A12-qsv-fix-decode-10bit-hdr.patch" + "${src}/contrib/ffmpeg/A13-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A14-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A15-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A16-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A17-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A18-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A19-ccaption_dec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A20-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A21-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A22-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A23-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A24-fix-eac3-dowmix.patch" + "${src}/contrib/ffmpeg/A25-enable-truehd-pass.patch" + "${src}/contrib/ffmpeg/A26-Update-the-min-version-to-1.4.23.0-for-AMF-SDK.patch" + "${src}/contrib/ffmpeg/A27-avcodec-amfenc-Fixes-the-color-information-in-the-ou.patch" + "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch" + "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch" ]; }); @@ -151,148 +150,151 @@ let inherit (lib) optional optionals optionalString versions; in -let self = stdenv.mkDerivation rec { - pname = "handbrake"; - inherit version src; +let + self = stdenv.mkDerivation rec { + pname = "handbrake"; + inherit version src; - postPatch = '' - install -Dm444 ${versionFile} ${versionFile.name} + postPatch = '' + install -Dm444 ${versionFile} ${versionFile.name} - patchShebangs scripts + patchShebangs scripts - substituteInPlace libhb/hb.c \ - --replace 'return hb_version;' 'return "${version}";' + substituteInPlace libhb/hb.c \ + --replace 'return hb_version;' 'return "${version}";' - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - '' + optionalString stdenv.isDarwin '' - # Use the Nix-provided libxml2 instead of the patched version available on - # the Handbrake website. - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py + '' + optionalString stdenv.isDarwin '' + # Use the Nix-provided libxml2 instead of the patched version available on + # the Handbrake website. + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 - # Prevent the configure script from failing if xcodebuild isn't available, - # which it isn't in the Nix context. (The actual build goes fine without - # xcodebuild.) - sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py - '' + optionalString stdenv.isLinux '' - # Use the Nix-provided libxml2 instead of the system-provided one. - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - ''; + # Prevent the configure script from failing if xcodebuild isn't available, + # which it isn't in the Nix context. (The actual build goes fine without + # xcodebuild.) + sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py + '' + optionalString stdenv.isLinux '' + # Use the Nix-provided libxml2 instead of the system-provided one. + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + ''; - nativeBuildInputs = [ - autoconf - automake - libtool - m4 - pkg-config - python3 - ] - ++ optionals useGtk [ intltool wrapGAppsHook ]; + nativeBuildInputs = [ + autoconf + automake + libtool + m4 + pkg-config + python3 + ] + ++ optionals useGtk [ intltool wrapGAppsHook ]; - buildInputs = [ - a52dec - dav1d - ffmpeg-hb - fontconfig - freetype - fribidi - harfbuzz - jansson - lame - libass - libbluray - libdvdcss - libdvdnav - libdvdread - libiconv - libjpeg_turbo - libogg - libopus - libsamplerate - libtheora - libvorbis - libvpx - libxml2 - speex - x264 - x265 - xz - zimg - ] - ++ optional (!stdenv.isDarwin) numactl - ++ optionals useGtk [ - dbus-glib - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk3 - hicolor-icon-theme - libappindicator-gtk3 - libgudev - libnotify - udev - ] - ++ optional useFdk fdk_aac - ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] - # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, - # look at ./make/configure.py search "enable_nvenc" - ++ optional stdenv.isLinux nv-codec-headers; + buildInputs = [ + a52dec + dav1d + ffmpeg-hb + fontconfig + freetype + fribidi + harfbuzz + jansson + lame + libass + libbluray + libdvdcss + libdvdnav + libdvdread + libiconv + libjpeg_turbo + libogg + libopus + libsamplerate + libtheora + libvorbis + libvpx + libxml2 + speex + svt-av1 + x264 + x265 + xz + zimg + ] + ++ optional (!stdenv.isDarwin) numactl + ++ optionals useGtk [ + dbus-glib + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + hicolor-icon-theme + libappindicator-gtk3 + libgudev + libnotify + udev + ] + ++ optional useFdk fdk_aac + ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] + # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, + # look at ./make/configure.py search "enable_nvenc" + ++ optional stdenv.isLinux nv-codec-headers; - configureFlags = [ - "--disable-df-fetch" - "--disable-df-verify" - "--disable-gtk-update-checks" - ] - ++ optional (!useGtk) "--disable-gtk" - ++ optional useFdk "--enable-fdk-aac" - ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional stdenv.hostPlatform.isx86 "--harden"; + configureFlags = [ + "--disable-df-fetch" + "--disable-df-verify" + "--disable-gtk-update-checks" + ] + ++ optional (!useGtk) "--disable-gtk" + ++ optional useFdk "--enable-fdk-aac" + ++ optional stdenv.isDarwin "--disable-xcode" + ++ optional stdenv.hostPlatform.isx86 "--harden"; - # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ "-lx265" ]; + # NOTE: 2018-12-27: Check NixOS HandBrake test if changing + NIX_LDFLAGS = [ "-lx265" ]; - makeFlags = [ "--directory=build" ]; + makeFlags = [ "--directory=build" ]; - passthru.tests = { - basic-conversion = - let - # Big Buck Bunny example, licensed under CC Attribution 3.0. - testMkv = fetchurl { - url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; - sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; - }; - in - runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' - mkdir -p $out - cd $out - HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 - test -e test.mp4 - HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 - test -e test.mkv - ''; - version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; - }; + passthru.tests = { + basic-conversion = + let + # Big Buck Bunny example, licensed under CC Attribution 3.0. + testMkv = fetchurl { + url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; + sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; + }; + in + runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' + mkdir -p $out + cd $out + HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 + test -e test.mp4 + HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 + test -e test.mkv + ''; + version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; + }; - meta = with lib; { - homepage = "https://handbrake.fr/"; - description = "A tool for converting video files and ripping DVDs"; - longDescription = '' - Tool for converting and remuxing video files - into selection of modern and widely supported codecs - and containers. Very versatile and customizable. - Package provides: - CLI - `HandbrakeCLI` - GTK GUI - `ghb` - ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Anton-Latukha wmertens ]; - platforms = with platforms; unix; - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + meta = with lib; { + homepage = "https://handbrake.fr/"; + description = "A tool for converting video files and ripping DVDs"; + longDescription = '' + Tool for converting and remuxing video files + into selection of modern and widely supported codecs + and containers. Very versatile and customizable. + Package provides: + CLI - `HandbrakeCLI` + GTK GUI - `ghb` + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ Anton-Latukha wmertens ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + }; }; -}; -in self +in +self diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index a776fabc9a790..25fac4fba61de 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.10.0"; + version = "0.10.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-UU8tbaZz7udDulh+PHPZDc3rm1MvK4dafPgXL50apMI="; + hash = "sha256-kXafPUcWWvadGbcN4PAtXlFmfll/mSpwu2Sbh6Gxx4w="; 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 32f4267d9fcc1..12689bedcbd38 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20210224"; + version = "20221205"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; diff --git a/pkgs/applications/video/imagination/default.nix b/pkgs/applications/video/imagination/default.nix index 732d8f547ff69..804265bcb5456 100644 --- a/pkgs/applications/video/imagination/default.nix +++ b/pkgs/applications/video/imagination/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight and simple DVD slide show maker"; - homepage = "http://imagination.sourceforge.net"; + homepage = "https://imagination.sourceforge.net"; license = licenses.gpl3Only; maintainers = with maintainers; [ austinbutler ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 4f2b4ef440f76..d6379550e884f 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0="; + sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 02c58925558e6..c1e0488c01425 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.2.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; + sha256 = "sha256-hz6uIzlVuocSZRDYLnJ3/OZ4UDNlavJFky4CuyggANI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index 6cbce01f61f67..02263f46e0f4b 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -5,6 +5,7 @@ , cmake , extra-cmake-modules , libvlc +, libv4l , libX11 , kidletime , kdelibs4support @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvlc + libv4l libX11 kidletime qtx11extras diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index bec74dd46a975..1053ca11cb3c4 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.1.1"; + version = "1.1.8"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To="; + hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildKodiAddon rec { }; meta = with lib; { - homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept"; + homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept"; description = "Watch videos available on Arte+7"; license = licenses.mit; maintainers = teams.kodi.members; diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index c2885ba03a0a1..f219a3fd1fdfb 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,13 +1,18 @@ -{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "0.1.0+matrix.1"; + version = "unstable-2022-11-28"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + # video search doesn't work for the version on kodi.tv + # if the result contains channels + # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 + src = fetchFromGitHub { + owner = "TheAssassin"; + repo = "kodi-invidious-plugin"; + rev = "85b66525632d94630c9301d9c490fc002a335d77"; + hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; }; propagatedBuildInputs = [ @@ -18,9 +23,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.invidious"; - }; }; meta = with lib; { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d083f1eda20a9..110c48c1e4abb 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.2"; + version = "1.17.3"; # 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-gACMzJ7oZCk/INSeJaV7GnF9hy/6F9d0QDLp5jPiF4k="; + sha256 = "1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0"; }; 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-qD+Kuz8j3vDch4PlNQYqdbffL3YSKRqKg6IfkLk/LaQ="; + sha256 = "16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb"; }; in mkDerivation { diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index d0d52ade25ad9..bc36039224758 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -39,6 +39,9 @@ stdenvNoCC.mkDerivation rec { yarnLock = ./yarn.lock; packageJSON = ./package.json; + # workaround for https://github.com/webpack/webpack/issues/14532 + NODE_OPTIONS = "--openssl-legacy-provider"; + patches = [ # NOTE: fixes for hardcoded paths and assumptions about filesystem # permissions @@ -86,8 +89,9 @@ stdenvNoCC.mkDerivation rec { yarn2nix; }; - meta = { + meta = with lib; { inherit (mirakurun.meta) description platforms; - maintainers = with lib.maintainers; [ midchildan ]; + license = licenses.asl20; + maintainers = with maintainers; [ midchildan ]; }; } diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 9f91cc0c3c08b..372bc52044e70 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "mpc-qt"; - version = "22.02"; + version = "23.02"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "sha256-DRbNDrWnaTT4A0dRFAv9MX/MDwV/rXIw+R8fQJmVN+g="; + sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk="; }; nativeBuildInputs = [ pkg-config qmake qttools ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7f6fd0b286f49..28e0d1d469a07 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -80,17 +80,17 @@ 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 = '' @@ -216,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.unix; }; -} +}) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 4052c968d2ba0..af033781ac2c4 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 0c46b4c2ba858..35f5fcb549f1d 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -3,13 +3,13 @@ # 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; 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 0000000000000..811b49e8714bc --- /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/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fa6167b9c1184..2ac85084b4130 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - version = "29.0.0"; + version = "29.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-c+G02k4AACaYfa5Zhsanr6AU3vNbopDMcYtuny/d25Y="; + sha256 = "sha256-TIUSjyPEsKRNTSLQXuLJGEgD989hJ5GhOsqJ4nkKVsY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index ad37c503c0ab9..c796b2d84fa05 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -22,7 +22,7 @@ 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 { }; @@ -30,6 +30,8 @@ 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; }; 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 cd7548846fa25..b581dc4402227 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio libbfd SDL2 ]; - NIX_CFLAGS_COMPILE = "-mavx"; + env.NIX_CFLAGS_COMPILE = "-mavx"; installPhase = '' mkdir -p $out/lib/obs-plugins/ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 70b6790a58a88..e58220bce7e81 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-ndi.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index a16c8924adceb..a16c8924adceb 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix +++ b/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 index 03b54473bb8ba..03b54473bb8ba 100644 --- a/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch +++ b/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 0000000000000..499f07fccd7af --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pciutils +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-vaapi"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = pname; + rev = version; + hash = "sha256-wrbVuqIe+DY3R+Jp3zCy2Uw3fv5ejYHtRV2Sv+y/n0w="; + }; + + 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 + ]; + + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-vaapi.so $out/lib/obs-plugins/ + ''; + + 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 ba0e8a8182633..c156ac288b663 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -8,6 +8,7 @@ , wayland-scanner , obs-studio , libX11 +, libxcb , vulkan-headers , vulkan-loader , libGL @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL libX11 + libxcb vulkan-headers vulkan-loader wayland diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 5303991f1fb96..62bc80d26df3b 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/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 48f1b98f6e537..d910383bf956d 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libvorbis libdvdread ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = { description = "Tools for modifying and inspecting OGG media streams"; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 02270cd75e06e..ec980f1bfd1be 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -7,6 +7,7 @@ , gtk3 , libopenshot , python3 +, qtbase , qtsvg , wrapGAppsHook }: @@ -55,7 +56,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { '' # Fix toolbar icons on Darwin + lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 4214bed7167f4..904f039758ca3 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt - sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt - export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ @@ -62,7 +60,10 @@ stdenv.mkDerivation rec { doCheck = false; - cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; + cmakeFlags = [ + "-DENABLE_RUBY=OFF" + "-DPYTHON_MODULE_PATH=${python3.sitePackages}" + ]; meta = with lib; { homepage = "http://openshot.org/"; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 60e5924b5f342..30c364578eb0a 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/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index e268b05094edc..5abc6c47a1346 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { qtgraphicaleffects ]; - NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; + env.NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; qmakeFlags = [ "QMAKE_LRELEASE=${lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index d50b7ababfa77..b02d6e6e31fc7 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/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 6a8207e7bc16d..664cbcf2db3f6 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.1.2"; + version = "5.3.0"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno="; + hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE="; }; nativeCheckInputs = with python3Packages; [ @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { requests websocket-client urllib3 + certifi ]) ++ [ ffmpeg ]; diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0316318534dcd..f1b469006a709 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/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix new file mode 100644 index 0000000000000..a7bdf2e110fb4 --- /dev/null +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, fetchzip +, ffmpeg +, gtk2 +, hunspell +, icoutils +, mono +, mpv +, tesseract4 +}: + +stdenv.mkDerivation rec { + pname = "subtitleedit"; + version = "3.6.11"; + + src = fetchzip { + url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; + sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26"; + stripRoot = false; + }; + + preUnpack = '' + rm -rf source + ''; + + nativeBuildInputs = [ + copyDesktopItems + icoutils + makeWrapper + ]; + + runtimeLibs = lib.makeLibraryPath [ + gtk2 + hunspell + mpv + tesseract4 + ]; + + runtimeBins = lib.makeBinPath [ + ffmpeg + hunspell + tesseract4 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps + + cp -r * $out/bin/ + ln -s ${hunspell.out}/lib/libhunspell*.so $out/bin/libhunspell.so + makeWrapper "${mono}/bin/mono" $out/bin/subtitleedit \ + --add-flags "$out/bin/SubtitleEdit.exe" \ + --prefix LD_LIBRARY_PATH : ${runtimeLibs} \ + --prefix PATH : ${runtimeBins} + + wrestool -x -t 14 SubtitleEdit.exe > subtitleedit.ico + icotool -x -i 3 -o $out/share/icons/hicolor/16x16/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 6 -o $out/share/icons/hicolor/32x32/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 9 -o $out/share/icons/hicolor/48x48/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 10 -o $out/share/icons/hicolor/256x256/apps/subtitleedit.png subtitleedit.ico + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Subtitle Edit"; + exec = "subtitleedit"; + icon = "subtitleedit"; + comment = meta.description; + categories = [ "Video" ]; + }) + ]; + + meta = with lib; { + description = "A subtitle editor"; + homepage = "https://nikse.dk/subtitleedit/"; + license = licenses.gpl3Plus; + longDescription = '' + With Subtitle Edit you can easily adjust a subtitle if it is out of sync with + the video in several different ways. You can also use it for making + new subtitles from scratch (using the time-line /waveform/spectrogram) + or for translating subtitles. + ''; + maintainers = with maintainers; [ paveloom ]; + platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index 706dbc187377a..c21a0611262da 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; - homepage = "http://tivodecode.sourceforge.net"; + homepage = "https://tivodecode.sourceforge.net"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 023f37de287db..70e335192d9d3 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/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 28528318c162f..404af2ec83b37 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub +{ lib, stdenv, vdr, fetchFromGitHub , graphicsmagick, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${vdr.version}-${name}"; + name = "vdr-${name}-${vdr.version}"; inherit (vdr) src; buildInputs = [ vdr ]; preConfigure = "cd PLUGINS/src/${name}"; @@ -55,13 +55,13 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.26"; + version = "3.1.1"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; - rev = "v${version}"; + sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; + rev = "V${version}"; }; buildInputs = [ vdr ffmpeg ]; @@ -101,12 +101,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { repo = "vdr-plugin-epgsearch"; owner = "vdr-projects"; - sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; + sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y="; rev = "v${version}"; }; @@ -150,7 +150,7 @@ in { vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.1"; + version = "1.8.3"; buildInputs = [ vdr ]; @@ -160,7 +160,7 @@ in { repo = "vdr-plugin-vnsiserver"; owner = "vdr-projects"; rev = version; - sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; + sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE="; }; meta = with lib; { @@ -173,14 +173,15 @@ in { }; - text2skin = stdenv.mkDerivation { + text2skin = stdenv.mkDerivation rec { pname = "vdr-text2skin"; version = "1.3.4-20170702"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; - sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; + src = fetchFromGitHub { + repo = "vdr-plugin-text2skin"; + owner = "vdr-projects"; rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad"; + sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; }; buildInputs = [ vdr graphicsmagick ]; @@ -200,7 +201,7 @@ in { dontInstall = true; meta = with lib; { - homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; + inherit (src.meta) homepage; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index f31e7b79ae7db..ed9c09087e412 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.3"; + version = "1.9.7"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM="; + sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 2bb9437f1b06f..82c23b4892e43 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: alsa_device.o:(.bss+0x8): multiple definition of `rc'; QvkAlsaDevice.o:(.bss+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 9c07eb1a6368a..1a8c6f2d3adbe 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: char-coding.o:/build/w_scan-20170107/si_types.h:117: multiple definition of # `service_t'; countries.o:/build/w_scan-20170107/si_types.h:117: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = { description = "Small CLI utility to scan DVB and ATSC transmissions"; diff --git a/pkgs/applications/video/w_scan2/default.nix b/pkgs/applications/video/w_scan2/default.nix new file mode 100644 index 0000000000000..56000407fce63 --- /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/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 837e86082f950..7350765ab5d2f 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -46,7 +46,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang "-Qunused-arguments"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Qunused-arguments"; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d13cfbd7f177f..e49c2a6591217 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,12 +1,17 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , lima +, lima-bin , makeWrapper , qemu , testers , colima + # use lima-bin on darwin to support native macOS virtualization + # https://github.com/NixOS/nixpkgs/pull/209171 +, lima-drv ? if stdenv.isDarwin then lima-bin else lima }: buildGoModule rec { @@ -41,7 +46,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima qemu ]} + --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index 59a2de96e9dd6..ef25427c4a234 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/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 25b89889b5288..a27930fcb4ac4 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.5"; + version = "2.1.7"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpZ3hVgnh8gkrSghSvhSZnG9uaN+GTKFGHv+MMcs73Q="; + hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno="; }; nativeBuildInputs = [ pkg-config ]; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { + changelog = "https://github.com/containers/conmon/releases/tag/${src.rev}"; homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 40a1e671cc565..d5fb7df67f707 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.15"; + version = "1.6.19"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; + hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; @@ -45,6 +45,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) docker; }; meta = with lib; { + changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}"; homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 60d05f6f23095..1c2dce886536c 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.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-SNNy/oI3ZcMeRLEMS2nSCS/rRaen5WsDfhdlHQCdtP4="; + hash = "sha256-Pm96fOfbBqf7mc9llv3sFi00Ioa3f9WNoDmLBPhB2eI="; fetchSubmodules = true; }; @@ -74,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/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index c116a581103bb..bbefed66fae3d 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 1646c05175141..cada624a2a686 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.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8="; + sha256 = "sha256-/kdEzC97atFJw8rWFAdm9tofayj1fwBRvNKwbjWIGR8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc="; + vendorHash = "sha256-1iEJPVrsRqQQhkspRmUtS4ru4DCKiyobGztM4d0vb2Y="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5027a8fd5c911..17b3982a1f7d0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -2,11 +2,12 @@ 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 @@ -29,7 +30,7 @@ rec { owner = "opencontainers"; repo = "runc"; rev = runcRev; - sha256 = runcSha256; + hash = runcHash; }; # docker/runc already include these patches / are not applicable @@ -44,7 +45,7 @@ rec { owner = "containerd"; repo = "containerd"; rev = containerdRev; - sha256 = containerdSha256; + hash = containerdHash; }; buildInputs = oldAttrs.buildInputs @@ -59,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 @@ -67,9 +68,16 @@ rec { buildInputs = [ glibc glibc.static ]; - NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; + env.NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + hash = mobyHash; + }; + moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec { pname = "moby"; inherit version; @@ -95,7 +103,7 @@ rec { (fetchpatch { name = "buildkit-zfs.patch"; url = "https://github.com/moby/moby/pull/43136.patch"; - sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) ]; @@ -108,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 - @@ -159,8 +167,8 @@ rec { src = fetchFromGitHub { owner = "docker"; repo = "cli"; - rev = "v${version}"; - sha256 = sha256; + rev = cliRev; + hash = cliHash; }; goPackagePath = "github.com/docker/cli"; @@ -192,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 @@ -254,20 +262,16 @@ rec { # 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/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index d96277604b5f6..bbf20c6039f53 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -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/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch new file mode 100644 index 0000000000000..85806bfcd8922 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index d5c3627..2bd692a 100644 +--- a/meson.build ++++ b/meson.build +@@ -86,7 +86,7 @@ govirt_global_cflags = ['-std=c99', + '-Woverride-init', + '-Wno-unused-parameter'] + +-foreach arg : govirt_global_cflags ++foreach arg : compiler.get_supported_arguments(govirt_global_cflags) + add_project_arguments(arg, language : 'c') + endforeach diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix index 0815781c21f7d..18d88b5468524 100644 --- a/pkgs/applications/virtualization/libgovirt/default.nix +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -1,46 +1,48 @@ { lib , stdenv -, fetchurl -, glib +, fetchzip , gnome -, librest -, libsoup +, meson , pkg-config , gobject-introspection +, ninja +, glib +, librest_1_0 }: stdenv.mkDerivation rec { pname = "libgovirt"; - version = "0.3.8"; + version = "0.3.9"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = fetchzip { url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; + sha256 = "sha256-6RDuJTyaVYlO4Kq+niQyepom6xj1lqdBbyWL/VnZUdk="; }; - patches = lib.optionals stdenv.isDarwin [ - # The flag breaks the build on darwin and doesn't seem necessary - ./no-version-script-ld-flag.patch + patches = [ + # https://gitlab.gnome.org/GNOME/libgovirt/-/issues/9 + ./auto-disable-incompatible-compiler-warnings.patch ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (lib.concatStringsSep " " [ + "-Wno-typedef-redefinition" + "-Wno-missing-field-initializers" + "-Wno-cast-align" + ]); nativeBuildInputs = [ + meson pkg-config gobject-introspection - ]; - - buildInputs = [ - libsoup + ninja ]; propagatedBuildInputs = [ glib - librest + librest_1_0 ]; - enableParallelBuilding = true; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch deleted file mode 100644 index a837c3bf06421..0000000000000 --- a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/govirt/Makefile.in -+++ b/govirt/Makefile.in -@@ -511,8 +511,7 @@ - libgovirt_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ -- -no-undefined \ -- -Wl,--version-script=$(srcdir)/govirt.sym -+ -no-undefined - - libgovirt_la_CFLAGS = \ - $(WARNINGFLAGS_C) - -Diff finished. Fri Oct 28 10:36:38 2022 diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index d718c61066f2c..6cbed6f41f601 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { HOME="$(mktemp -d)" ''; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ]; diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix new file mode 100644 index 0000000000000..86b49c5a1eb62 --- /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/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index c41779459454b..c8072c903d260 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 = "1.1.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; + sha256 = "sha256-v9ycluLfkrPDzjsMXtv7w9UHgMaGzTsJw4lT/KfRAu4="; }; - cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; + cargoHash = "sha256-wVQEa1qS+JF6PHKvRrRFbSvj2qp6j14ErOQPkxP0uuA="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f6cc83fde17c4..287fa02df75fc 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -14,17 +14,61 @@ , go-md2man , nixosTests , python3 +, makeWrapper +, symlinkJoin +, extraPackages ? [ ] +, runc +, crun +, conmon +, slirp4netns +, fuse-overlayfs +, util-linux +, iptables +, iproute2 +, catatonit +, gvproxy +, aardvark-dns +, netavark +, testers +, podman }: +let + # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed + binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ + runc + crun + conmon + slirp4netns + fuse-overlayfs + util-linux + iptables + iproute2 + ] ++ extraPackages); + + helpersBin = symlinkJoin { + name = "podman-helper-binary-wrapper"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns + catatonit # added here for the pause image and also set in `containersConf` for `init_path` + netavark + ]; + }; +in buildGoModule rec { pname = "podman"; - version = "4.3.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY="; + hash = "sha256-337PFsPGm7pUgnFeNJKwT+/7AdbWSfCx4kXyAvHyWJQ="; }; patches = [ @@ -32,13 +76,13 @@ buildGoModule rec { ./rm-podman-mac-helper-msg.patch ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; - outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles python3 ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs @@ -50,13 +94,16 @@ buildGoModule rec { systemd ]; + HELPER_BINARIES_DIR = "${PREFIX}/libexec/podman"; # used in buildPhase & installPhase + PREFIX = "${placeholder "out"}"; + buildPhase = '' runHook preBuild patchShebangs . ${if stdenv.isDarwin then '' make podman-remote # podman-mac-helper uses FHS paths '' else '' - make bin/podman bin/rootlessport + make bin/podman bin/rootlessport bin/quadlet ''} make docs runHook postBuild @@ -64,29 +111,30 @@ buildGoModule rec { installPhase = '' runHook preInstall - mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper ${if stdenv.isDarwin then '' - mv bin/{darwin/podman,podman} + install bin/darwin/podman -Dt $out/bin '' else '' - install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d - for s in contrib/systemd/**/*.in; do - substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary - done - PREFIX=$out make install.systemd - install -Dm555 bin/rootlessport -t $rootlessport/bin + make install.bin install.systemd ''} - install -Dm555 bin/podman -t $out/bin - PREFIX=$out make install.completions - MANDIR=$man/share/man make install.man + make install.completions install.man + mkdir -p ${HELPER_BINARIES_DIR} + ln -s ${helpersBin}/bin/* ${HELPER_BINARIES_DIR} + wrapProgram $out/bin/podman \ + --prefix PATH : ${lib.escapeShellArg binPath} runHook postInstall ''; postFixup = lib.optionalString stdenv.isLinux '' - RPATH=$(patchelf --print-rpath $out/bin/podman) - patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman + RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) + patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; passthru.tests = { + version = testers.testVersion { + package = podman; + command = "HOME=$TMPDIR podman --version"; + }; + } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 902a50e4ce24f..d1fe9bcc9b0ae 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,16 +1,16 @@ diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index a6907c0df..717d82ff3 100644 +index 4f25b4d26..8a79862fd 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: +@@ -1509,11 +1509,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 deleted file mode 100644 index 7fe483a7079e5..0000000000000 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ podman-unwrapped -, runCommand -, makeWrapper -, symlinkJoin -, lib -, stdenv -, extraPackages ? [] -, runc # Default container runtime -, crun # Container runtime (default with cgroups v2 for podman/buildah) -, conmon # Container runtime monitor -, slirp4netns # User-mode networking for unprivileged namespaces -, fuse-overlayfs # CoW for images, much faster than default vfs -, util-linux # nsenter -, iptables -, 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 - -let - binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ - runc - crun - conmon - slirp4netns - fuse-overlayfs - util-linux - iptables - iproute2 - ] ++ extraPackages); - - helpersBin = symlinkJoin { - name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}"; - - # this only works for some binaries, others may need to be be added to `binPath` or in the modules - paths = [ - gvproxy - ] ++ lib.optionals stdenv.isLinux [ - aardvark-dns - catatonit # added here for the pause image and also set in `containersConf` for `init_path` - netavark - podman-unwrapped.rootlessport - ]; - }; - -in runCommand podman-unwrapped.name { - name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}"; - inherit (podman-unwrapped) pname version passthru; - - preferLocalBuild = true; - - meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ]; - - outputs = [ - "out" - "man" - ]; - - nativeBuildInputs = [ - makeWrapper - ]; - -} '' - ln -s ${podman-unwrapped.man} $man - - mkdir -p $out/bin - ln -s ${podman-unwrapped}/etc $out/etc - ln -s ${podman-unwrapped}/lib $out/lib - ln -s ${podman-unwrapped}/share $out/share - makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ - --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ - --prefix PATH : ${lib.escapeShellArg binPath} -'' diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 18472f03d850c..648183654701e 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.2"; + version = "1.0.5"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc="; + sha256 = "sha256-V/4atbYG3jP0o1Bfn/dZBDXEk+Yi4cSJAY8HnTmpHRI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc="; + sha256 = "sha256-gJZ3z6xDgWwOPjCLZg3LRMk3KoTXGaotXgO/xDUwAvk="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { 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/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e68cf7048b56a..c20a2c53d6002 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo @@ -51,7 +51,13 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ] + nativeBuildInputs = [ + makeWrapper removeReferencesTo + pkg-config flex bison meson ninja perl + + # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation + python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme + ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -143,7 +149,6 @@ stdenv.mkDerivation rec { # have our patches and will be subtly broken because of that. "--meson=meson" "--cross-prefix=${stdenv.cc.targetPrefix}" - "--cpu=${stdenv.hostPlatform.uname.processor}" (lib.enableFeature guestAgentSupport "guest-agent") ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix new file mode 100644 index 0000000000000..9c4de021f2560 --- /dev/null +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, dpkg +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "quickgui"; + version = "1.2.8"; + + src = fetchurl { + url = "https://github.com/quickemu-project/quickgui/releases/download/v${version}/quickgui_${version}-1_lunar1.0_amd64.deb"; + sha256 = "sha256-crnV7OWH5UbkMM/TxTIOlXmvqBgjFmQG7RxameMOjH0="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + wrapGAppsHook + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + runHook preInstall + + mv usr $out + substituteInPlace $out/share/applications/quickgui.desktop \ + --replace "/usr" $out + + runHook postInstall + ''; + + meta = { + description = "A Flutter frontend for quickemu"; + homepage = "https://github.com/quickemu-project/quickgui"; + changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}"; + maintainers = [ lib.maintainers.heyimnova ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + mainProgram = "quickgui"; + }; +} diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix new file mode 100644 index 0000000000000..54f3cf7700be8 --- /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/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix new file mode 100644 index 0000000000000..b952b0f189185 --- /dev/null +++ b/pkgs/applications/virtualization/sail-riscv/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, lib +, arch +, ocamlPackages +, ocaml +, zlib +, z3 +}: + + +stdenv.mkDerivation rec { + pname = "sail-riscv"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "riscv"; + repo = pname; + rev = version; + hash = "sha256-7PZNNUMaCZEBf0lOCqkquewRgZPooBOjIbGF7JlLnEo="; + }; + + nativeBuildInputs = with ocamlPackages; [ ocamlbuild findlib ocaml z3 sail ]; + buildInputs = with ocamlPackages; [ zlib linksem ]; + strictDeps = true; + + postPatch = '' + rm -r prover_snapshots + ''; + + makeFlags = [ + "SAIL=sail" + "ARCH=${arch}" + "SAIL_DIR=${ocamlPackages.sail}/share/sail" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp c_emulator/riscv_sim_${arch} $out/bin + mkdir $out/share/ + cp -r generated_definitions/{coq,hol4,isabelle} $out/share/ + + runHook postInstall + ''; + + + meta = with lib; { + homepage = "https://github.com/riscv/sail-riscv"; + description = "A formal specification of the RISC-V architecture, written in Sail"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix deleted file mode 100644 index 5ec5b19ce0426..0000000000000 --- a/pkgs/applications/virtualization/singularity/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, fetchurl -, util-linux -, gpgme -, openssl -, libuuid -, coreutils -, which -, makeWrapper -, cryptsetup -, squashfsTools -, buildGoPackage}: - -with lib; - -buildGoPackage rec { - pname = "singularity"; - version = "3.8.7"; - - src = fetchurl { - url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-Myny5YP4SoNDyywDgKHWy86vrn0eYztcvK33FD6shZs="; - }; - - goPackagePath = "github.com/sylabs/singularity"; - - buildInputs = [ gpgme openssl libuuid ]; - nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ]; - propagatedBuildInputs = [ coreutils squashfsTools ]; - - postPatch = '' - substituteInPlace internal/pkg/build/files/copy.go \ - --replace /bin/cp ${coreutils}/bin/cp - ''; - - postConfigure = '' - cd go/src/github.com/sylabs/singularity - - patchShebangs . - sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - - ./mconfig -V ${version} -p $out --localstatedir=/var - - # Don't install SUID binaries - sed -i 's/-m 4755/-m 755/g' builddir/Makefile - ''; - - buildPhase = '' - runHook preBuild - make -C builddir - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make -C builddir install LOCALSTATEDIR=$out/var - chmod 755 $out/libexec/singularity/bin/starter-suid - - # Explicitly configure paths in the config file - sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf - sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://www.sylabs.io/"; - description = "Application containers for linux"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.jbedo ]; - }; -} diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix new file mode 100644 index 0000000000000..f20735e45e3dc --- /dev/null +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -0,0 +1,238 @@ +# Configurations that should only be overrided by +# overrideAttrs +{ pname +, version +, src +, projectName # "apptainer" or "singularity" +, vendorHash ? null +, deleteVendor ? false +, proxyVendor ? false +, extraConfigureFlags ? [ ] +, extraDescription ? "" +, extraMeta ? { } +}: + +let + # Workaround for vendor-related attributes not overridable (#86349) + # should be removed when the issue is resolved + _defaultGoVendorArgs = { + inherit + vendorHash + deleteVendor + proxyVendor + ; + }; +in +{ lib +, buildGoModule +, runCommandLocal + # Native build inputs +, makeWrapper +, pkg-config +, util-linux +, which + # Build inputs +, bash +, conmon +, coreutils +, cryptsetup +, fakeroot +, go +, gpgme +, libseccomp +, libuuid + # This is for nvidia-container-cli +, nvidia-docker +, openssl +, squashfsTools +, squashfuse + # Overridable configurations +, enableNvidiaContainerCli ? true + # Compile with seccomp support + # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available. +, enableSeccomp ? true + # Whether the configure script treat SUID support as default + # When equal to enableSuid, it supress the --with-suid / --without-suid build flag + # It can be set to `null` to always pass either --with-suid or --without-suided + # Type: null or boolean +, defaultToSuid ? true + # Whether to compile with SUID support +, enableSuid ? false +, starterSuidPath ? null + # newuidmapPath and newgidmapPath are to support --fakeroot + # where those SUID-ed executables are unavailable from the FHS system PATH. + # Path to SUID-ed newuidmap executable +, newuidmapPath ? null + # Path to SUID-ed newgidmap executable +, newgidmapPath ? null + # Remove the symlinks to `singularity*` when projectName != "singularity" +, removeCompat ? false + # Workaround #86349 + # should be removed when the issue is resolved +, vendorHash ? _defaultGoVendorArgs.vendorHash +, deleteVendor ? _defaultGoVendorArgs.deleteVendor +, proxyVendor ? _defaultGoVendorArgs.proxyVendor +}: + +let + defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; + privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else + (runCommandLocal "privileged-un-utils" { } '' + mkdir -p "$out/bin" + ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" + ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" + ''); +in +buildGoModule { + inherit pname version src; + + # Override vendorHash with the output got from + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # or with `null` when using vendored source tarball. + inherit vendorHash deleteVendor proxyVendor; + + # go is used to compile extensions when building container images + allowGoReference = true; + + strictDeps = true; + + passthru = { + inherit + enableSeccomp + enableSuid + projectName + removeCompat + starterSuidPath + ; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + util-linux + which + ]; + + buildInputs = [ + bash # To patch /bin/sh shebangs. + conmon + cryptsetup + gpgme + libuuid + openssl + squashfsTools + squashfuse + ] + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ++ lib.optional enableSeccomp libseccomp + ; + + configureScript = "./mconfig"; + + configureFlags = [ + "--localstatedir=/var/lib" + "--runstatedir=/var/run" + ] + ++ lib.optional (!enableSeccomp) "--without-seccomp" + ++ lib.optional (enableSuid != defaultToSuid) (if enableSuid then "--with-suid" else "--without-suid") + ++ extraConfigureFlags + ; + + # Packages to prefix to the Apptainer/Singularity container runtime default PATH + # Use overrideAttrs to override + defaultPathInputs = [ + bash + coreutils + cryptsetup # cryptsetup + go + privileged-un-utils + squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image + squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges + ] + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ; + + postPatch = '' + if [[ ! -e .git || ! -e VERSION ]]; then + echo "${version}" > VERSION + fi + # Patch shebangs for script run during build + patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts + # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs + substituteInPlace cmd/internal/cli/actions.go \ + --replace "defaultPath = \"${defaultPathOriginal}\"" "defaultPath = \"''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}${defaultPathOriginal}\"" + ''; + + postConfigure = '' + # Code borrowed from pkgs/stdenv/generic/setup.sh configurePhase() + + # set to empty if unset + : ''${configureFlags=} + + # shellcheck disable=SC2086 + $configureScript -V ${version} "''${prefixKey:---prefix=}$prefix" $configureFlags "''${configureFlagsArray[@]}" + + # End of the code from pkgs/stdenv/generic/setup.sh configurPhase() + ''; + + buildPhase = '' + runHook preBuild + make -C builddir -j"$NIX_BUILD_CORES" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make -C builddir install LOCALSTATEDIR="$out/var/lib" + runHook postInstall + ''; + + postFixup = '' + substituteInPlace "$out/bin/run-singularity" \ + --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" + wrapProgram "$out/bin/${projectName}" \ + --prefix PATH : "${lib.makeBinPath [ + fakeroot + squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH + ]}" + # Make changes in the config file + ${lib.optionalString enableNvidiaContainerCli '' + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ + --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" + ''} + ${lib.optionalString (removeCompat && (projectName != "singularity")) '' + unlink "$out/bin/singularity" + for file in "$out"/share/man/man?/singularity*.gz; do + if [[ -L "$file" ]]; then + unlink "$file" + fi + done + for file in "$out"/share/*-completion/completions/singularity; do + if [[ -e "$file" ]] + rm "$file" + done + ''} + ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' + chmod +x $out/libexec/${projectName}/bin/starter-suid + '')} + ${lib.optionalString (enableSuid && !isNull starterSuidPath) '' + mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig} + ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid" + ''} + ''; + + meta = with lib; { + description = "Application containers for linux" + extraDescription; + longDescription = '' + Singularity (the upstream) renamed themselves to Apptainer + to distinguish themselves from a fork made by Sylabs Inc.. See + + https://sylabs.io/2021/05/singularity-community-edition + https://apptainer.org/news/community-announcement-20211130 + ''; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ jbedo ShamrockLee ]; + mainProgram = projectName; + } // extraMeta; +} diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix new file mode 100644 index 0000000000000..a21066d775746 --- /dev/null +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -0,0 +1,92 @@ +{ callPackage +, fetchFromGitHub +, nixos +, conmon +}: +let + apptainer = callPackage + (import ./generic.nix rec { + pname = "apptainer"; + version = "1.1.5"; + projectName = "apptainer"; + + src = fetchFromGitHub { + owner = "apptainer"; + repo = "apptainer"; + rev = "v${version}"; + hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-tAnh7A8Lw5KtY7hq+sqHMEUlgXvgeeCKKIfRZFoRtug="; + + extraDescription = " (previously known as Singularity)"; + extraMeta.homepage = "https://apptainer.org"; + }) + { + # Apptainer doesn't depend on conmon + conmon = null; + + # Apptainer builders require explicit --with-suid / --without-suid flag + # when building on a system with disabled unprivileged namespace. + # See https://github.com/NixOS/nixpkgs/pull/215690#issuecomment-1426954601 + defaultToSuid = null; + }; + + singularity = callPackage + (import ./generic.nix rec { + pname = "singularity-ce"; + version = "3.10.4"; + projectName = "singularity"; + + src = fetchFromGitHub { + owner = "sylabs"; + repo = "singularity"; + rev = "v${version}"; + hash = "sha256-bUnQXQVwaVA3Lkw3X9TBWqNBgiPxAVCHnkq0vc+CIsM="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-K8helLcOuz3E4LzBE9y3pnZqwdwhO/iMPTN1o22ipVg="; + + # Do not build conmon from the Git submodule source, + # Use Nixpkgs provided version + extraConfigureFlags = [ + "--without-conmon" + ]; + + extraDescription = " (Sylabs Inc's fork of Singularity, a.k.a. SingularityCE)"; + extraMeta.homepage = "https://sylabs.io/"; + }) + { + defaultToSuid = true; + }; + + genOverridenNixos = package: packageName: (nixos { + programs.singularity = { + enable = true; + inherit package; + }; + }).config.programs.singularity.packageOverriden.overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + description = ""; + longDescription = '' + This package produces identical store derivations to `pkgs.${packageName}` + overriden and installed by the NixOS module `programs.singularity` + with default configuration. + + This is for binary substitutes only. Use pkgs.${packageName} instead. + ''; + }; + }); +in +{ + inherit apptainer singularity; + + apptainer-overriden-nixos = genOverridenNixos apptainer "apptainer"; + singularity-overriden-nixos = genOverridenNixos singularity "singularity"; +} diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 2b27e3a7875a2..5390a4fb6625d 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # FIXME: May no longer be needed with spice-vdagent versions over 0.21.0 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 76668301c6bbf..2df0978b0d0aa 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = "sed -i /tini-static/d CMakeLists.txt"; - NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; + env.NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 1c648b25ddb02..dc6f79d6a7e55 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/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2e8aa34286a6f..0e24dd9b08f2e 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -3,14 +3,20 @@ , bash-completion , fetchurl , fetchpatch -, gdbm ? null +, gdbm , glib , gsettings-desktop-schemas , gtk-vnc , gtk3 , intltool -, libcap ? null +, libcap , libgovirt + # Currently unsupported. According to upstream, libgovirt is for a very narrow + # use-case and we don't currently cover it in Nixpkgs. It's safe to disable. + # https://gitlab.com/virt-viewer/virt-viewer/-/issues/100#note_1265011223 + # Can be enabled again once this is merged: + # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/129 +, ovirtSupport ? false , libvirt , libvirt-glib , libxml2 @@ -19,21 +25,13 @@ , pkg-config , python3 , shared-mime-info -# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 -, spice-gtk_libsoup2 ? null -, spice-protocol ? null +, spice-gtk +, spice-protocol , spiceSupport ? true , vte , wrapGAppsHook }: -assert spiceSupport -> ( - gdbm != null - && (stdenv.isLinux -> libcap != null) - && spice-gtk_libsoup2 != null - && spice-protocol != null -); - with lib; stdenv.mkDerivation rec { @@ -46,10 +44,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with meson 0.61 - # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117 + # Fix build with meson 0.61. Should be fixed in the next release. + # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/120 (fetchpatch { - url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch"; + url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/98d9f202ef768f22ae21b5c43a080a1aa64a7107.patch"; sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o="; }) ]; @@ -71,21 +69,26 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk-vnc gtk3 - libgovirt libvirt libvirt-glib libxml2 vte + ] ++ optionals ovirtSupport [ + libgovirt ] ++ optionals spiceSupport ([ gdbm - spice-gtk_libsoup2 + spice-gtk spice-protocol ] ++ optionals stdenv.isLinux [ libcap ]); # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + + mesonFlags = [ + (lib.mesonEnable "ovirt" ovirtSupport) + ]; strictDeps = true; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d6531452c760f..1ff7f0abebaa4 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index cb91d8505633e..57fd03361305d 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -148,7 +148,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ # Fix build on Glibc 2.24. "-Wno-error=deprecated-declarations" # Fix build with GCC 8 diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix index 5347b0961a540..115ab3d53e04b 100644 --- a/pkgs/applications/window-managers/cardboard/default.nix +++ b/pkgs/applications/window-managers/cardboard/default.nix @@ -99,6 +99,8 @@ stdenv.mkDerivation rec { cp -r ${expected-wrap} ${expected-wrap.name} cp -r ${wlroots-wrap} ${wlroots-wrap.name} ) + + sed '1i#include <functional>' -i cardboard/ViewAnimation.h # gcc12 ''; # "Inherited" from Nixpkgs expression for wlroots @@ -108,6 +110,8 @@ stdenv.mkDerivation rec { "-Dwlroots:libseat=disabled" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; # gcc12 + meta = with lib; { homepage = "https://gitlab.com/cardboardwm/cardboard"; description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 95170b79326de..6e2e45e8b9a67 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=${lib.optionalString enableXWayland "-DXWAYLAND"} + XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"} + ) ''; - 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/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 6dc22a664d3dc..d056005e8f523 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS="-lX11"; meta = with lib; { diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ed6b9fd4aac73..f1d7c585c4430 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -77,10 +77,9 @@ stdenv.mkDerivation rec { 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 2485552fce6ea..1450807c6709f 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # 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"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index ec2e03de0f8ee..1c06fc2ae28d2 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 ad2ed5bf34617..52a213cda86fe 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.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-Zl7ob0JcFN8sl8Zuf2aB7l7q3W8GmvVBoI1W3aLLXfU="; + hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix index 61a82f526d9eb..4c75b082506d4 100644 --- a/pkgs/applications/window-managers/katriawm/default.nix +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -7,14 +7,14 @@ , pkg-config }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "katriawm"; - version = "21.09"; + version = "22.12"; src = fetchzip { - name = finalAttrs.pname + "-" + finalAttrs.version; - url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8="; + name = self.pname + "-" + self.version; + url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz"; + hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc="; }; nativeBuildInputs = [ @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "prefix=$(out)" ]; - meta = with lib; { + meta = { 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 ]; + license = lib.licenses.mit; + maintainers = [ lib.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 8bd0691450c74..adf3facb99b22 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -23,15 +23,15 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "labwc"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; + rev = self.version; + hash = "sha256-PfvtNbSAz1vt0+ko4zRPyRRN+lhQoA2kJ2xoJy5o4So="; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { 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 0000000000000..8c28f0c22abee --- /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 fe3e46f7b47a6..70d7476432a28 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/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix new file mode 100644 index 0000000000000..fd3e82e43aa50 --- /dev/null +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, nixosTests +, cmake +, pkg-config +, mir +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "miriway"; + version = "unstable-2023-02-18"; + + src = fetchFromGitHub { + owner = "Miriway"; + repo = "Miriway"; + rev = "1363ae0452c5093f84418bc65354e93796caec65"; + hash = "sha256-hQ2z3GlTJG9qewJLkPpoRMSn0D7xCLyl+1O+G4NnedA="; + }; + + 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/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index fc25171076709..fdd9604f7c796 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: workspaces.o:src/keyboard.h:93: multiple definition of # `NumLockMask'; client.o:src/keyboard.h:93: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 6f1a37f9379a1..f2d0e1d484d76 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/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 7a10bf4cfaefc..439030f34da3c 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eIW8NNhacAM/7gZCUHCmiySANLenfcaCRTUkoJUZRPQ="; + hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; fetchSubmodules = true; }; @@ -65,10 +65,11 @@ stdenv.mkDerivation rec { 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 adamcstephens ]; + maintainers = with maintainers; [ fortuneteller2k adamcstephens rodrgz ]; }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6cfc55240222a..32c8cf1b86a38 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,13 +22,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0="; + hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; }; patches = [ diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index b7e07444a06be..c3058294ca55c 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 = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "jirutka"; repo = "swaylock-effects"; rev = "v${version}"; - sha256 = "sha256-VkyH9XN/pR1UY/liG5ygDHp+ymdqCPeWHyU7/teJGbU="; + sha256 = "sha256-MKmWVYssO9HAcP5uqwpy9kDa6/kfZyV2NI7ibozt7Ug="; }; postPatch = '' diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 30e43fa0c902a..20a7a5ed7fe08 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; - rev = version; - hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; + rev = "v${version}"; + hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix index 1aa3dace78523..36cfdcfaed33c 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/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index fb57c0a73c2a2..9886fc97af149 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index 225e44c21cedb..5c68a39a1ead5 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { export sourceRoot=$(echo */${pname}/wmsm) ''; - NIX_CFLAGS_COMPILE = "-std=gnu89"; + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix index 25a25a06ad9ed..f1a6635b362a2 100644 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' gzip -9 --stdout yeahwm.1 > yeahwm.1.gz diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index fed0f6cb3441b..63adf2a276516 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -20,7 +20,11 @@ let nativeBuildInputs = [ makeWrapper ]; passthru = { unwrapped = Agda; - tests = { inherit (nixosTests) agda; }; + inherit withPackages; + tests = { + inherit (nixosTests) agda; + allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self)); + }; }; inherit (Agda) meta; } '' @@ -81,6 +85,13 @@ let runHook postInstall ''; + # As documented at https://github.com/NixOS/nixpkgs/issues/172752, + # we need to set LC_ALL to an UTF-8-supporting locale. However, on + # darwin, it seems that there is no standard such locale; luckily, + # the referenced issue doesn't seem to surface on darwin. Hence let's + # set this only on non-darwin. + LC_ALL = lib.optionalString (!stdenv.isDarwin) "C.UTF-8"; + meta = if meta.broken or false then meta // { hydraPlatforms = lib.platforms.none; } else meta; # Retrieve all packages from the finished package set that have the current package as a dependency and build them diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 7186675a5c624..fec2d0526bb32 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -83,12 +83,12 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' +'' else lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool \ -id $out/lib/libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libblas${canonicalExtension} -'' else "") + '' +'') + '' if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" @@ -115,12 +115,12 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' +'' else lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ -id $out/lib/libcblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libcblas${canonicalExtension} -'' else "") + '' +'') + '' if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" fi diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 80fb7be8c1e10..9886a035e4ec2 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation { cp -L "$liblapack" $out/lib/liblapack${canonicalExtension} chmod +w $out/lib/liblapack${canonicalExtension} -'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' +'' + (lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider'}/lib" $out/lib/liblapack${canonicalExtension} -'' else "") + '' +'') + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" @@ -83,10 +83,10 @@ EOF cp -L "$liblapacke" $out/lib/liblapacke${canonicalExtension} chmod +w $out/lib/liblapacke${canonicalExtension} -'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' +'' + (lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider'}/lib" $out/lib/liblapacke${canonicalExtension} -'' else "") + '' +'') + '' if [ -f "$out/lib/liblapacke.so.3" ]; then ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so diff --git a/pkgs/build-support/binary-cache/default.nix b/pkgs/build-support/binary-cache/default.nix new file mode 100644 index 0000000000000..577328cad920d --- /dev/null +++ b/pkgs/build-support/binary-cache/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPackages }: + +# This function is for creating a flat-file binary cache, i.e. the kind created by +# nix copy --to file:///some/path and usable as a substituter (with the file:// prefix). + +# For example, in the Nixpkgs repo: +# nix-build -E 'with import ./. {}; mkBinaryCache { rootPaths = [hello]; }' + +{ name ? "binary-cache" +, rootPaths +}: + +stdenv.mkDerivation { + inherit name; + + __structuredAttrs = true; + + exportReferencesGraph.closure = rootPaths; + + preferLocalBuild = true; + + PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin:${buildPackages.python3}/bin:${buildPackages.nix}/bin:${buildPackages.xz}/bin"; + + builder = builtins.toFile "builder" '' + . .attrs.sh + + export out=''${outputs[out]} + + mkdir $out + mkdir $out/nar + + python ${./make-binary-cache.py} + + # These directories must exist, or Nix might try to create them in LocalBinaryCacheStore::init(), + # which fails if mounted read-only + mkdir $out/realisations + mkdir $out/debuginfo + mkdir $out/log + ''; +} diff --git a/pkgs/build-support/binary-cache/make-binary-cache.py b/pkgs/build-support/binary-cache/make-binary-cache.py new file mode 100644 index 0000000000000..16dd8a7e96bcf --- /dev/null +++ b/pkgs/build-support/binary-cache/make-binary-cache.py @@ -0,0 +1,43 @@ + +import json +import os +import subprocess + +with open(".attrs.json", "r") as f: + closures = json.load(f)["closure"] + +os.chdir(os.environ["out"]) + +nixPrefix = os.environ["NIX_STORE"] # Usually /nix/store + +with open("nix-cache-info", "w") as f: + f.write("StoreDir: " + nixPrefix + "\n") + +def dropPrefix(path): + return path[len(nixPrefix + "/"):] + +for item in closures: + narInfoHash = dropPrefix(item["path"]).split("-")[0] + + xzFile = "nar/" + narInfoHash + ".nar.xz" + with open(xzFile, "w") as f: + subprocess.run("nix-store --dump %s | xz -c" % item["path"], stdout=f, shell=True) + + fileHash = subprocess.run(["nix-hash", "--base32", "--type", "sha256", item["path"]], capture_output=True).stdout.decode().strip() + fileSize = os.path.getsize(xzFile) + + # Rename the .nar.xz file to its own hash to match "nix copy" behavior + finalXzFile = "nar/" + fileHash + ".nar.xz" + os.rename(xzFile, finalXzFile) + + with open(narInfoHash + ".narinfo", "w") as f: + f.writelines((x + "\n" for x in [ + "StorePath: " + item["path"], + "URL: " + finalXzFile, + "Compression: xz", + "FileHash: sha256:" + fileHash, + "FileSize: " + str(fileSize), + "NarHash: " + item["narHash"], + "NarSize: " + str(item["narSize"]), + "References: " + " ".join(dropPrefix(ref) for ref in item["references"]), + ])) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 45ae3eba9b445..6e33f6189a4af 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -92,9 +92,8 @@ let else ""; expand-response-params = - if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" - then import ../expand-response-params { inherit (buildPackages) stdenv; } - else ""; + lib.optionalString (buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null") + (import ../expand-response-params { inherit (buildPackages) stdenv; }); in diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index d1cd502e7e4ba..a3f331b23cb89 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -118,10 +118,10 @@ stdenv.mkDerivation (fBuildAttrs // { # Remove all built in external workspaces, Bazel will recreate them when building rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} - ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} + ${lib.optionalString removeRulesCC "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}"} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""} - ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""} + ${lib.optionalString removeLocalConfigCc "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}"} + ${lib.optionalString removeLocal "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}"} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index c539d671e9838..048233d728c47 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,7 +1,5 @@ { lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }: -let buildFHSEnv = callPackage ./env.nix { }; in - args @ { name , runScript ? "bash" @@ -139,6 +137,18 @@ let fi done + declare -a x11_args + # Always mount a tmpfs on /tmp/.X11-unix + # Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277 + x11_args+=(--tmpfs /tmp/.X11-unix) + + # Try to guess X socket path. This doesn't cover _everything_, but it covers some things. + if [[ "$DISPLAY" == :* ]]; then + display_nr=''${DISPLAY#?} + local_socket=/tmp/.X11-unix/X$display_nr + x11_args+=(--ro-bind-try "$local_socket" "$local_socket") + fi + cmd=( ${bubblewrap}/bin/bwrap --dev-bind /dev /dev @@ -173,6 +183,7 @@ let "''${ro_mounts[@]}" "''${symlinks[@]}" "''${auto_mounts[@]}" + "''${x11_args[@]}" ${concatStringsSep "\n " extraBwrapArgs} ${init runScript}/bin/${name}-init ${initArgs} ) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 7ebcba73708c2..c4d967a11c699 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -212,7 +212,7 @@ in stdenv.mkDerivation { cd $out ${extraBuildCommands} cd $out - ${if isMultiBuild then extraBuildCommandsMulti else ""} + ${lib.optionalString isMultiBuild extraBuildCommandsMulti} ''; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 09457caecb865..fbc50c2dc2533 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: +{ stdenv, lib, buildEnv, writeText, pkgs, pkgsi686Linux }: { name , profile ? "" @@ -237,7 +237,7 @@ in stdenv.mkDerivation { cd $out ${extraBuildCommands} cd $out - ${if isMultiBuild then extraBuildCommandsMulti else ""} + ${lib.optionalString isMultiBuild extraBuildCommandsMulti} ''; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index f223009cba5cb..3bf675b5d2083 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, graalvm, glibcLocales }: - -{ name ? "${args.pname}-${args.version}" - # Final executable name +{ lib +, stdenv +, glibcLocales + # The GraalVM derivation to use +, graalvmDrv +, name ? "${args.pname}-${args.version}" , executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src @@ -9,8 +11,6 @@ # Default native-image arguments. You probably don't want to set this, # except in special cases. In most cases, use extraNativeBuildArgs instead , nativeImageBuildArgs ? [ - "-jar" jar - "-H:CLibraryPath=${lib.getLib graalvm}/lib" (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") "-H:Name=${executable}" "--verbose" @@ -19,16 +19,25 @@ , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" - # The GraalVM derivation to use -, graalvmDrv ? graalvm # Locale to be used by GraalVM compiler , LC_ALL ? "en_US.UTF-8" , meta ? { } , ... } @ args: -stdenv.mkDerivation (args // { - inherit dontUnpack LC_ALL; +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "glibcLocales" + "jar" + "dontUnpack" + "LC_ALL" + "meta" + ]; +in +stdenv.mkDerivation ({ + inherit dontUnpack LC_ALL jar; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ]; @@ -37,7 +46,7 @@ stdenv.mkDerivation (args // { buildPhase = args.buildPhase or '' runHook preBuild - native-image ''${nativeImageBuildArgs[@]} + native-image -jar "$jar" ''${nativeImageBuildArgs[@]} runHook postBuild ''; @@ -50,12 +59,16 @@ stdenv.mkDerivation (args // { runHook postInstall ''; + disallowedReferences = [ graalvmDrv ]; + + passthru = { inherit graalvmDrv; }; + meta = { # default to graalvm's platforms platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; # need to have native-image-installable-svm available - broken = !(builtins.elem "native-image-installable-svm" graalvmDrv.products); + broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products); } // meta; -}) +} // extraArgs) diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index bc6482f0a88e6..5737989249af4 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,8 +6,8 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true }: let +lib: pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true}: let build = if application then pythonPackages.buildPythonApplication else pythonPackages.buildPythonPackage; @@ -18,7 +18,8 @@ in build { nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ - (if doCheck then (info.tests_require or []) else [])); + (lib.optionals doCheck (info.tests_require or [])) + ); propagatedBuildInputs = map (p: pythonPackages.${p}) (info.install_requires or []); diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 55be5f3a9d0a4..6520c04f5e8a8 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -59,9 +59,7 @@ let suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = - if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null" - then import ../expand-response-params { inherit (buildPackages) stdenv; } - else ""; + lib.optionalString ((buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null") (import ../expand-response-params { inherit (buildPackages) stdenv; }); useGccForLibs = isClang && libcxx == null @@ -321,6 +319,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 '' ## diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index e0ba7b3e08c8c..e26504a66f10a 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -84,9 +84,9 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; nativeBuildInputs = args.overrideNativeBuildInputs - or ([ which coq.ocamlPackages.findlib ] + or ([ which ] ++ optional useDune coq.ocamlPackages.dune_3 - ++ optional (useDune || mlPlugin) coq.ocamlPackages.ocaml + ++ optionals (useDune || mlPlugin) [ coq.ocamlPackages.ocaml coq.ocamlPackages.findlib ] ++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs); buildInputs = args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs); diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/build-support/deterministic-uname/deterministic-uname.sh index 134bd467bce3f..5272bb5b3fe17 100644 --- a/pkgs/build-support/deterministic-uname/deterministic-uname.sh +++ b/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -133,7 +133,7 @@ fi # 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" + 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" 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 bce3d799fbb1a..a72f0291a872b 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -20,7 +20,7 @@ in dotnetConfigureHook = callPackage ({ }: makeSetupHook { name = "dotnet-configure-hook"; - deps = [ dotnet-sdk nuget-source ]; + propagatedBuildInputs = [ dotnet-sdk nuget-source ]; substitutions = { nugetSource = nuget-source; inherit runtimeId; @@ -30,7 +30,7 @@ in dotnetBuildHook = callPackage ({ }: makeSetupHook { name = "dotnet-build-hook"; - deps = [ dotnet-sdk ]; + propagatedBuildInputs = [ dotnet-sdk ]; substitutions = { inherit buildType runtimeId; }; @@ -39,7 +39,7 @@ in dotnetCheckHook = callPackage ({ }: makeSetupHook { name = "dotnet-check-hook"; - deps = [ dotnet-test-sdk ]; + propagatedBuildInputs = [ dotnet-test-sdk ]; substitutions = { inherit buildType libraryPath; disabledTests = lib.optionalString (disabledTests != []) @@ -54,7 +54,7 @@ in dotnetInstallHook = callPackage ({ }: makeSetupHook { name = "dotnet-install-hook"; - deps = [ dotnet-sdk ]; + propagatedBuildInputs = [ dotnet-sdk ]; substitutions = { inherit buildType runtimeId; }; @@ -63,7 +63,7 @@ in dotnetFixupHook = callPackage ({ }: makeSetupHook { name = "dotnet-fixup-hook"; - deps = [ dotnet-runtime ]; + propagatedBuildInputs = [ dotnet-runtime ]; substitutions = { dotnetRuntime = dotnet-runtime; runtimeDeps = libraryPath; diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix index 8dc77f3aac03a..ea1c5328082d5 100644 --- a/pkgs/build-support/dotnet/make-nuget-source/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -30,9 +30,7 @@ let meta.licence = let depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); in (lib.flatten (lib.forEach depLicenses (spdx: - if (spdx != "") - then lib.getLicenseFromSpdxId spdx - else [] + lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx) ))); }; in nuget-source diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 163f6fc60eea3..380642a5e6816 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,10 +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 90363275b9737..4b49e9676ec02 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -24,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 018852770504a..ce5537f46f40d 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -11,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/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index 6d084d3c77edb..da19848326840 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -35,4 +35,4 @@ let ({prefix, path}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in - if (pathParts != []) then (builtins.head pathParts).path else "" + lib.optionalString (pathParts != []) ((builtins.head pathParts).path) diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index e5a1a61b78d30..4eb70f672d488 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,6 +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 <<EOF > "${out}/compositeImage.sh" @@ -26,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 3b0c33770467e..6a7b977db29f8 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 0fa51e69840cd..fe9ff5c469bad 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/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 009b23c406d6b..36b758ab574e4 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,6 +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. @@ -19,5 +19,3 @@ popd # Just nuke the checkout file. rm $out/.fslckout - -stopNest diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 3a4876bc5de3e..7866c403ec425 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -1,9 +1,9 @@ -{stdenv, fossil, cacert}: +{stdenv, lib, fossil, cacert}: {name ? null, url, rev, sha256}: stdenv.mkDerivation { - name = "fossil-archive" + (if name != null then "-${name}" else ""); + name = "fossil-archive" + (lib.optionalString (name != null) "-${name}"); builder = ./builder.sh; nativeBuildInputs = [fossil cacert]; diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index acb970639ab17..77f6381b09ab2 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,7 @@ 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} \ @@ -18,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 2d0b4b20ef8b7..56973f5d3678a 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -7,9 +7,7 @@ short = builtins.substring 0 7 rev; - appendShort = if (builtins.match "[a-f0-9]*" rev) != null - then "-${short}" - else ""; + appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${short}"; in "${if matched == null then base else builtins.head matched}${appendShort}"; in { url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index cec0e441f2296..1ce294757713c 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,10 +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/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 15309d0a19508..b3c28fb0e2649 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -12,13 +12,13 @@ if md5 != null then else # TODO: statically check if mercurial as the https support if the url starts woth https. stdenvNoCC.mkDerivation { - name = "hg-archive" + (if name != null then "-${name}" else ""); + name = "hg-archive" + (lib.optionalString (name != null) "-${name}"); builder = ./builder.sh; nativeBuildInputs = [mercurial]; impureEnvVars = lib.fetchers.proxyImpureEnvVars; - subrepoClause = if fetchSubrepos then "S" else ""; + subrepoClause = lib.optionalString fetchSubrepos "S"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index efdbd0decf95c..b1d8593e72d48 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -43,13 +43,15 @@ let (lib.replaceStrings ["."] ["_"] artifactId) "-" version ]; + suffix = if isNull classifier then "" else "-${classifier}"; + filename = "${artifactId}-${version}${suffix}.jar"; mkJarUrl = repoUrl: lib.concatStringsSep "/" [ (lib.removeSuffix "/" repoUrl) (lib.replaceStrings ["."] ["/"] groupId) artifactId version - "${artifactId}-${version}${lib.optionalString (!isNull classifier) "-${classifier}"}.jar" + filename ]; urls_ = if url != "" then [url] @@ -68,7 +70,7 @@ in # packages packages that mention this derivation in their buildInputs. installPhase = '' mkdir -p $out/share/java - ln -s ${jar} $out/share/java/${artifactId}-${version}.jar + ln -s ${jar} $out/share/java/${filename} ''; # We also add a `jar` attribute that can be used to easily obtain the path # to the downloaded jar file. diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 7db66730dab82..1aabd7949ee1d 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -8,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 @@ -32,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}" @@ -43,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 3ebe797f736da..d059715cedc1e 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -18,7 +18,7 @@ let args' = if relative != null then { stripLen = 1 + lib.length (lib.splitString "/" relative) + stripLen; - extraPrefix = if extraPrefix != null then extraPrefix else ""; + extraPrefix = lib.optionalString (extraPrefix != null) extraPrefix; } else { inherit stripLen extraPrefix; }; diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index b58e5a88b3cd8..aa4d049aba431 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,7 +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 @@ -22,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 b0441299dd2c6..5782151524f7a 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,7 +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" @@ -12,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 dd987f41b4467..e8eaba934858e 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -37,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/flutter/default.nix b/pkgs/build-support/flutter/default.nix index a5d6108513cee..a4b4942ef5950 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -187,7 +187,7 @@ let # TODO: do we need this? NIX_LDFLAGS = "-rpath ${lib.makeLibraryPath self.buildInputs}"; - NIX_CFLAGS_COMPILE = "-I${xorg.libX11}/include"; + env.NIX_CFLAGS_COMPILE = "-I${xorg.libX11}/include"; LD_LIBRARY_PATH = lib.makeLibraryPath self.buildInputs; configurePhase = '' diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 647f2a2f7adcf..aca313264a28c 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"; @@ -142,6 +145,11 @@ let cp -r --reflink=auto vendor $out ''} + if ! [ "$(ls -A $out)" ]; then + echo "vendor folder is empty, please set 'vendorHash = null;' or 'vendorSha256 = null;' in your expression" + exit 10 + fi + runHook postInstall ''; @@ -185,6 +193,12 @@ let ''} '' + '' + # currently pie is only enabled by default in pkgsMusl + # this will respect the `hardening{Disable,Enable}` flags if set + if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then + export GOFLAGS="-buildmode=pie $GOFLAGS" + fi + runHook postConfigure ''; diff --git a/pkgs/build-support/go/package.nix b/pkgs/build-support/go/package.nix index ba1ab37a0c0eb..9106bf9796ebb 100644 --- a/pkgs/build-support/go/package.nix +++ b/pkgs/build-support/go/package.nix @@ -134,6 +134,12 @@ let export GOPATH=$NIX_BUILD_TOP/go:$GOPATH export GOCACHE=$TMPDIR/go-cache + # currently pie is only enabled by default in pkgsMusl + # this will respect the `hardening{Disable,Enable}` flags if set + if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then + export GOFLAGS="-buildmode=pie $GOFLAGS" + fi + runHook postConfigure ''; diff --git a/pkgs/build-support/kernel/make-initrd-ng/README.md b/pkgs/build-support/kernel/make-initrd-ng/README.md index 741eba67e43f0..d92b7eab7fe18 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/README.md +++ b/pkgs/build-support/kernel/make-initrd-ng/README.md @@ -38,6 +38,9 @@ object is copied depends on its type. - If it is *also* an ELF file, then all of its direct shared library dependencies are also listed as objects to be copied. + - If an unwrapped file exists as `.[filename]-wrapped`, then it is + also listed as an object to be copied. + 2. A directory's direct children are listed as objects to be copied, and a directory at the same absolute path in the initrd is created. diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 89a7c08fda7ea..c23713b723c39 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -1,8 +1,9 @@ use std::collections::{HashSet, VecDeque}; use std::env; -use std::ffi::OsStr; +use std::ffi::{OsStr, OsString}; use std::fs; use std::hash::Hash; +use std::iter::FromIterator; use std::io::{BufRead, BufReader, Error}; use std::os::unix; use std::path::{Component, Path, PathBuf}; @@ -163,6 +164,19 @@ fn handle_path( let typ = fs::symlink_metadata(&source)?.file_type(); if typ.is_file() && !target.exists() { copy_file(&source, &target, queue)?; + + if let Some(filename) = source.file_name() { + source.set_file_name(OsString::from_iter([ + OsStr::new("."), + filename, + OsStr::new("-wrapped"), + ])); + + let wrapped_path = source.as_path(); + if wrapped_path.exists() { + queue.push_back(Box::from(wrapped_path)); + } + } } else if typ.is_symlink() { let link_target = fs::read_link(&source)?; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index b5eb21e5ba4b5..6e2de7fa11b05 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -46,14 +46,14 @@ else stdenv.mkDerivation rec { -L${llvmPackages_13.clang.libc}/lib \ -Wl,-install_name,$libName \ -Wall -std=c99 -O3 -fPIC libredirect.c \ - -ldl -shared -o "$libName" + -shared -o "$libName" '' else if stdenv.isDarwin then '' $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ -Wl,-install_name,$out/lib/$libName \ - -ldl -shared -o "$libName" + -shared -o "$libName" '' else '' $CC -Wall -std=c99 -O3 -fPIC libredirect.c \ - -ldl -shared -o "$libName" + -shared -o "$libName" ''} if [ -n "$doInstallCheck" ]; then diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 1222d2ee75c64..9ecc16450cc27 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -201,6 +201,37 @@ WRAPPER(int, __xstat64)(int ver, const char * path, struct stat64 * st) WRAPPER_DEF(__xstat64) #endif +#if defined(__linux__) && defined(STATX_TYPE) +WRAPPER(int, statx)(int dirfd, const char * restrict pathname, int flags, + unsigned int mask, struct statx * restrict statxbuf) +{ + int (*statx_real) (int, const char * restrict, int, + unsigned int, struct statx * restrict) = LOOKUP_REAL(statx); + char buf[PATH_MAX]; + return statx_real(dirfd, rewrite(pathname, buf), flags, mask, statxbuf); +} +WRAPPER_DEF(statx) +#endif + +WRAPPER(int, fstatat)(int dirfd, const char * pathname, struct stat * statbuf, int flags) +{ + int (*fstatat_real) (int, const char *, struct stat *, int) = LOOKUP_REAL(fstatat); + char buf[PATH_MAX]; + return fstatat_real(dirfd, rewrite(pathname, buf), statbuf, flags); +} +WRAPPER_DEF(fstatat); + +// In musl libc, fstatat64 is simply a macro for fstatat +#if !defined(__APPLE__) && !defined(fstatat64) +WRAPPER(int, fstatat64)(int dirfd, const char * pathname, struct stat64 * statbuf, int flags) +{ + int (*fstatat64_real) (int, const char *, struct stat64 *, int) = LOOKUP_REAL(fstatat64); + char buf[PATH_MAX]; + return fstatat64_real(dirfd, rewrite(pathname, buf), statbuf, flags); +} +WRAPPER_DEF(fstatat64); +#endif + WRAPPER(int, stat)(const char * path, struct stat * st) { int (*__stat_real) (const char *, struct stat *) = LOOKUP_REAL(stat); @@ -209,6 +240,17 @@ WRAPPER(int, stat)(const char * path, struct stat * st) } WRAPPER_DEF(stat) +// In musl libc, stat64 is simply a macro for stat +#if !defined(__APPLE__) && !defined(stat64) +WRAPPER(int, stat64)(const char * path, struct stat64 * st) +{ + int (*stat64_real) (const char *, struct stat64 *) = LOOKUP_REAL(stat64); + char buf[PATH_MAX]; + return stat64_real(rewrite(path, buf), st); +} +WRAPPER_DEF(stat64) +#endif + WRAPPER(int, access)(const char * path, int mode) { int (*access_real) (const char *, int mode) = LOOKUP_REAL(access); @@ -346,6 +388,14 @@ WRAPPER(int, system)(const char *command) } WRAPPER_DEF(system) +WRAPPER(int, chdir)(const char *path) +{ + int (*chdir_real) (const char *) = LOOKUP_REAL(chdir); + char buf[PATH_MAX]; + return chdir_real(rewrite(path, buf)); +} +WRAPPER_DEF(chdir); + WRAPPER(int, mkdir)(const char *path, mode_t mode) { int (*mkdir_real) (const char *path, mode_t mode) = LOOKUP_REAL(mkdir); diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index 144e6d3d66dd0..7dd384ae3ed7e 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -63,6 +63,12 @@ int main(int argc, char *argv[]) FILE *testfp; int testfd; struct stat testsb; +#ifndef __APPLE__ + struct stat64 testsb64; +#endif +#if defined(__linux__) && defined(STATX_TYPE) + struct statx testsbx; +#endif char buf[PATH_MAX]; testfp = fopen(TESTPATH, "r"); @@ -76,6 +82,20 @@ int main(int argc, char *argv[]) assert(access(TESTPATH, X_OK) == 0); assert(stat(TESTPATH, &testsb) != -1); +#ifndef __APPLE__ + assert(stat64(TESTPATH, &testsb64) != -1); +#endif + assert(fstatat(123, TESTPATH, &testsb, 0) != -1); +#ifndef __APPLE__ + assert(fstatat64(123, TESTPATH, &testsb64, 0) != -1); +#endif +#if defined(__linux__) && defined(STATX_TYPE) + assert(statx(123, TESTPATH, 0, STATX_ALL, &testsbx) != -1); +#endif + + assert(getcwd(buf, PATH_MAX) != NULL); + assert(chdir(TESTDIR) == 0); + assert(chdir(buf) == 0); assert(mkdir(TESTDIR "/dir-mkdir", 0777) == 0); assert(unlink(TESTDIR "/dir-mkdir") == -1); // it's a directory! diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index 39b02a47141ac..3517e949f67a9 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -53,4 +53,6 @@ stdenv.mkDerivation ({ export; } >> "$out" ''; + + preferLocalBuild = true; } // rest) 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 65ac661cea516..e5c93f1f77842 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 = [ buildPackages.makeWrapper ]; + propagatedBuildInputs = [ buildPackages.makeWrapper ]; substitutions = { hostNode = "${nodejs}/bin/node"; jq = "${buildPackages.jq}/bin/jq"; diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 7d6277df987f3..d87071d8559f0 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, rustPlatform, makeWrapper, Security, gnutar, gzip, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }: +{ lib, stdenvNoCC, rustPlatform, makeWrapper, Security, gnutar, gzip, nix, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }: { prefetch-npm-deps = rustPlatform.buildRustPackage { @@ -20,7 +20,7 @@ buildInputs = lib.optional stdenvNoCC.isDarwin Security; postInstall = '' - wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip ]} + wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip nix ]} ''; passthru.tests = diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index c2dfe27b2c603..8f02c559238e5 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -36,6 +36,6 @@ stdenvNoCC.mkDerivation { inherit perl; inherit (builtins) storeDir; shell = lib.getBin shell + (shell.shellPath or ""); - signingUtils = if darwinCodeSign then signingUtils else ""; + signingUtils = lib.optionalString darwinCodeSign signingUtils; }; } diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 2ded76d3cd4ac..ce3b389b9cee3 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 ca14a4495fed6..f68597662608f 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -46,14 +46,11 @@ stdenv.mkDerivation { 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 diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh index 1aa14cfeb7cc7..1d43c8e162ab2 100644 --- a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -12,7 +12,7 @@ if [ -z "${NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi -set -- "$@" @addFlags@ +set -- @addFlags@ "$@" if (( ${#role_suffixes[@]} > 0 )); then # replace env var with nix-modified one diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 168343c808214..24d5b2e1cafc9 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -10,7 +10,7 @@ directory, so the Makefile of the package should support DESTDIR. */ -{ src, stdenv +{ src, lib, stdenv , name ? "binary-tarball" , ... } @ args: @@ -30,7 +30,7 @@ stdenv.mkDerivation ( // args // { - name = name + (if src ? version then "-" + src.version else ""); + name = name + (lib.optionalString (src ? version) "-${src.version}"); postHook = '' mkdir -p $out/nix-support diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 9104bf2dce5cc..6e08caf0a4e53 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -24,7 +24,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( // removeAttrs args ["vmTools" "lib"] // { - name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); + name = name + "-" + diskImage.name + (lib.optionalString (src ? version) "-${src.version}"); # !!! cut&paste from rpm-build.nix postHook = '' @@ -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/default.nix b/pkgs/build-support/release/default.nix index da1078369a584..ee414ea3280d2 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -11,7 +11,7 @@ rec { makeSourceTarball = sourceTarball; # compatibility binaryTarball = args: import ./binary-tarball.nix ( - { inherit stdenv; + { inherit lib stdenv; } // args); mvnBuild = args: import ./maven-build.nix ( @@ -38,7 +38,7 @@ rec { } // args); rpmBuild = args: import ./rpm-build.nix ( - { inherit vmTools; + { inherit lib vmTools; } // args); debBuild = args: import ./debian-build.nix ( diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index daee44b85accd..f618032724c9a 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation ( { inherit name src; - phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; + phases = "setupPhase unpackPhase patchPhase mvnCompile ${lib.optionalString doTestCompile "mvnTestCompile mvnTestJar"} ${lib.optionalString doTest "mvnTest"} ${lib.optionalString doJavadoc "mvnJavadoc"} ${lib.optionalString doCheckstyle "mvnCheckstyle"} mvnJar mvnAssembly mvnRelease finalPhase"; setupPhase = '' runHook preSetupPhase @@ -88,9 +88,9 @@ stdenv.mkDerivation ( { echo "$releaseName" > $out/nix-support/hydra-release-name - ${if doRelease then '' + ${lib.optionalString doRelease '' echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products - '' else ""} + ''} ''; finalPhase = '' diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 5ed2b0752efc5..0498232d4d623 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 ''; @@ -86,7 +85,7 @@ stdenv.mkDerivation ( // removeAttrs args [ "lib" ] # Propagating lib causes the evaluation to fail, because lib is a function that can't be converted to a string // { - name = name + (if src ? version then "-" + src.version else ""); + name = name + (lib.optionalString (src ? version) "-${src.version}"); postHook = '' . ${./functions.sh} @@ -168,7 +167,7 @@ stdenv.mkDerivation ( echo "building out of source tree, from \`$PWD'..." - ${if preConfigure != null then preConfigure else ""} + ${lib.optionalString (preConfigure != null) preConfigure} ''; } else {}) diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 47c01f2e66b24..8f47114705092 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -3,7 +3,7 @@ { name ? "rpm-build" , diskImage -, src, vmTools +, src, lib, vmTools , ... } @ args: vmTools.buildRPM ( @@ -11,7 +11,7 @@ vmTools.buildRPM ( removeAttrs args ["vmTools"] // { - name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); + name = name + "-" + diskImage.name + (lib.optionalString (src ? version) "-${src.version}"); preBuild = '' . ${./functions.sh} diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 742cce13b7bf1..d624d071cc21b 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -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 1c946764c7581..5168eb6ab7592 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -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) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 98030225bcbb1..435a942daa26c 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -299,7 +299,7 @@ crate_: lib.makeOverridable ); libName = if crate ? libName then crate.libName else crate.crateName; - libPath = if crate ? libPath then crate.libPath else ""; + libPath = lib.optionalString (crate ? libPath) crate.libPath; # Seed the symbol hashes with something unique every time. # https://doc.rust-lang.org/1.0.0/rustc/metadata/loader/index.html#frobbing-symbols diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 69ee4f56b98f7..b057d1681b03b 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -4,7 +4,6 @@ , rust , stdenv , callPackage -, cacert , cargoBuildHook , cargoCheckHook , cargoInstallHook @@ -124,7 +123,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg inherit cargo cargo-auditable; }) ] ++ [ - cacert cargoBuildHook (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index 7ca306b613bcd..36ab931697410 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -73,6 +73,9 @@ in stdenv.mkDerivation ({ ${cargoUpdateHook} + # Override the `http.cainfo` option usually specified in `.cargo/config`. + export CARGO_HTTP_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt + cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG # Create an empty vendor directory when there is no dependency to vendor diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 8146573e79dba..90a81d68b5200 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -61,14 +61,15 @@ cargoSetupPostPatchHook() { fi echo - echo "ERROR: cargoSha256 is out of date" + echo "ERROR: cargoHash or cargoSha256 is out of date" echo echo "Cargo.lock is not the same in $cargoDepsCopy" echo echo "To fix the issue:" - echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value' - echo "2. Build the derivation and wait for it to fail with a hash mismatch" - echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field" + echo '1. Set cargoHash/cargoSha256 to an empty string: `cargoHash = "";`' + echo '2. Build the derivation and wait for it to fail with a hash mismatch' + echo '3. Copy the "got: sha256-..." value back into the cargoHash field' + echo ' You should have: cargoHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";' echo exit 1 diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 13562acd54925..b4034120103ed 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -2,6 +2,7 @@ , callPackage , cargo , cargo-nextest +, clang , lib , makeSetupHook , maturin @@ -30,7 +31,7 @@ in { cargoBuildHook = callPackage ({ }: makeSetupHook { name = "cargo-build-hook.sh"; - deps = [ cargo ]; + propagatedBuildInputs = [ cargo ]; substitutions = { inherit ccForBuild ccForHost cxxForBuild cxxForHost rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; @@ -40,7 +41,7 @@ in { cargoCheckHook = callPackage ({ }: makeSetupHook { name = "cargo-check-hook.sh"; - deps = [ cargo ]; + propagatedBuildInputs = [ cargo ]; substitutions = { inherit rustTargetPlatformSpec; }; @@ -49,7 +50,7 @@ in { cargoInstallHook = callPackage ({ }: makeSetupHook { name = "cargo-install-hook.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; substitutions = { inherit shortTarget; }; @@ -58,7 +59,7 @@ in { cargoNextestHook = callPackage ({ }: makeSetupHook { name = "cargo-nextest-hook.sh"; - deps = [ cargo cargo-nextest ]; + propagatedBuildInputs = [ cargo cargo-nextest ]; substitutions = { inherit rustTargetPlatformSpec; }; @@ -67,7 +68,7 @@ in { cargoSetupHook = callPackage ({ }: makeSetupHook { name = "cargo-setup-hook.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; substitutions = { defaultConfig = ../fetchcargo-default-config.toml; @@ -116,7 +117,7 @@ in { maturinBuildHook = callPackage ({ }: makeSetupHook { name = "maturin-build-hook.sh"; - deps = [ cargo maturin rustc ]; + propagatedBuildInputs = [ cargo maturin rustc ]; substitutions = { inherit ccForBuild ccForHost cxxForBuild cxxForHost rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; @@ -126,8 +127,8 @@ in { bindgenHook = callPackage ({}: makeSetupHook { name = "rust-bindgen-hook"; substitutions = { - libclang = rustc.llvmPackages.clang.cc.lib; - clang = rustc.llvmPackages.clang; + libclang = clang.cc.lib; + inherit 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 42e448b8246f0..9ff9c2f6289c1 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -36,7 +36,9 @@ let then builtins.readFile lockFile else args.lockFileContents; - packages = (builtins.fromTOML lockFileContents).package; + parsedLockFile = builtins.fromTOML lockFileContents; + + packages = parsedLockFile.package; # There is no source attribute for the source package itself. But # since we do not want to vendor the source package anyway, we can @@ -79,17 +81,16 @@ let # We can't use the existing fetchCrate function, since it uses a # recursive hash of the unpacked crate. fetchCrate = pkg: - assert lib.assertMsg (pkg ? checksum) '' + let + checksum = pkg.checksum or parsedLockFile.metadata."checksum ${pkg.name} ${pkg.version} (${pkg.source})"; + in + assert lib.assertMsg (checksum != null) '' Package ${pkg.name} does not have a checksum. - Please note that the Cargo.lock format where checksums used to be listed - under [metadata] is not supported. - If that is the case, running `cargo update` with a recent toolchain will - automatically update the format along with the crate's depenendencies. ''; fetchurl { name = "crate-${pkg.name}-${pkg.version}.tar.gz"; url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download"; - sha256 = pkg.checksum; + sha256 = checksum; }; # Fetch and unpack a crate. @@ -105,7 +106,7 @@ let tar xf "${crateTarball}" -C $out --strip-components=1 # Cargo is happy with largely empty metadata. - printf '{"files":{},"package":"${pkg.checksum}"}' > "$out/.cargo-checksum.json" + printf '{"files":{},"package":"${crateTarball.outputHash}"}' > "$out/.cargo-checksum.json" '' else if gitParts != null then let @@ -183,10 +184,15 @@ let '' else throw "Cannot handle crate source: ${pkg.source}"; - vendorDir = runCommand "cargo-vendor-dir" (lib.optionalAttrs (lockFile == null) { - inherit lockFileContents; - passAsFile = [ "lockFileContents" ]; - }) '' + vendorDir = runCommand "cargo-vendor-dir" + (if lockFile == null then { + inherit lockFileContents; + passAsFile = [ "lockFileContents" ]; + } else { + passthru = { + inherit lockFile; + }; + }) '' mkdir -p $out/.cargo ${ diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 77397f9b7220c..aa5ba14c1397b 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -30,10 +30,17 @@ rec { else lib.optional platform.isUnix "unix" ++ lib.optional platform.isWindows "windows"; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + toTargetVendor = platform: let + inherit (platform.parsed) vendor; + in platform.rustc.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + # Returns the name of the rust target, even if it is custom. Adjustments are # because rust has slightly different naming conventions than we do. toRustTarget = platform: let - inherit (platform.parsed) cpu vendor kernel abi; + inherit (platform.parsed) cpu kernel abi; cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; @@ -41,9 +48,7 @@ rec { "armv5tel" = "armv5te"; "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; - vendor_ = platform.rustc.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; + vendor_ = toTargetVendor platform; in platform.rustc.config or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/default.nix index c5c7b2f1c931b..74be68b2c3564 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -11,4 +11,5 @@ gitDependencyTag = callPackage ./git-dependency-tag { }; gitDependencyBranch = callPackage ./git-dependency-branch { }; maturin = callPackage ./maturin { }; + v1 = callPackage ./v1 { }; } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock new file mode 100644 index 0000000000000..fe976f090aac8 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock @@ -0,0 +1,85 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.10.2+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ppv-lite86 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "getrandom 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "v1" +version = "0.1.0" +dependencies = [ + "rand 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[metadata] +"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +"checksum getrandom 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +"checksum libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)" = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +"checksum ppv-lite86 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +"checksum rand 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +"checksum rand_chacha 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +"checksum rand_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +"checksum rand_hc 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +"checksum wasi 0.10.2+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml new file mode 100644 index 0000000000000..4b825c45cadca --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "v1" +version = "0.1.0" +authors = ["Daniël de Kok <me@danieldk.eu>"] +edition = "2018" + +[dependencies] +rand = "0.8" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix new file mode 100644 index 0000000000000..d13d468ae7f94 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix @@ -0,0 +1,18 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "v1"; + version = "0.1.0"; + + src = ./.; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/v1 + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs new file mode 100644 index 0000000000000..50b4ed799e43e --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index 9c03bc2ee9354..36714178156bd 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -13,7 +13,7 @@ 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 find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do @@ -36,6 +36,4 @@ auditTmpdir() { fi done - - stopNest } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index efb65a809962d..e731feb1b1256 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/canonicalize-jars.sh b/pkgs/build-support/setup-hooks/canonicalize-jars.sh index 8c55810748ea0..5137bfc94b011 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/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index c9b03b75cd037..17b97b1082e93 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -10,7 +10,8 @@ }: makeSetupHook { - deps = [ dieHook ] + name = "make-binary-wrapper-hook"; + propagatedBuildInputs = [ 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 cd9c2eaa2d804..b07b0c5ae804c 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,4 +1,6 @@ -postFixupHooks+=(_makeSymlinksRelative) +# symlinks are often created in postFixup +# don't use fixupOutputHooks, it is before postFixup +postFixupHooks+=(_makeSymlinksRelativeInAllOutputs) # 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 +8,8 @@ postFixupHooks+=(_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 @@ -26,3 +28,10 @@ _makeSymlinksRelative() { done < <(find $prefix -type l -print0) } + +_makeSymlinksRelativeInAllOutputs() { + local output + for output in $(getAllOutputNames); do + prefix="${!output}" _makeSymlinksRelative + done +} diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 8a2fc2f915e91..3a318933f138d 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 } diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 04ebcd2cc64ec..a26113abea88e 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 8131304cccf9b..3eec67d60feb4 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 @@ -53,7 +53,7 @@ EOF 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,10 +65,10 @@ 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 @@ -76,6 +76,6 @@ EOF } postgresqlStop() { - header 'stopping postgresql' + echo 'stopping postgresql' pg_ctl stop } diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index be94af545be17..3c8c9c294c3e2 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 104b5515b3db6..f5e3bdced6995 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -36,7 +36,7 @@ _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}" diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index 5ef6138388562..99633a3c7c9af 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -9,12 +9,15 @@ , dconf , callPackage , wrapGAppsHook -, writeTextFile +, targetPackages }: makeSetupHook { name = "wrap-gapps-hook"; - deps = lib.optionals (!stdenv.isDarwin) [ + propagatedBuildInputs = [ + # We use the wrapProgram function. + makeWrapper + ] ++ lib.optionals (!stdenv.isDarwin) [ # It is highly probable that a program will use GSettings, # at minimum through GTK file chooser dialogue. # Let’s add a GIO module for “dconf” GSettings backend @@ -23,19 +26,22 @@ makeSetupHook { # Unfortunately, it also requires the user to have dconf # D-Bus service enabled globally (e.g. through a NixOS module). dconf.lib + ] ++ lib.optionals isGraphical [ # TODO: remove this, packages should depend on GTK explicitly. gtk3 + librsvg + ]; + + # depsTargetTargetPropagated will essentially be buildInputs when wrapGAppsHook is placed into nativeBuildInputs + # the librsvg above should be removed but kept to not break anything that implicitly depended on its binaries + depsTargetTargetPropagated = assert (lib.assertMsg (!targetPackages ? raw) "wrapGAppsHook must be in nativeBuildInputs"); lib.optionals isGraphical [ # librsvg provides a module for gdk-pixbuf to allow rendering # SVG icons. Most icon themes are SVG-based and so are some # graphics in GTK (e.g. cross for closing window in window title bar) # so it is pretty much required for applications using GTK. librsvg - ] ++ [ - - # We use the wrapProgram function. - makeWrapper ]; passthru = { tests = let @@ -65,6 +71,15 @@ makeSetupHook { '' ); + basic-contains-gdk-pixbuf = let + tested = basic; + in testLib.runTest "basic-contains-gdk-pixbuf" ( + testLib.skip stdenv.isDarwin '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GDK_PIXBUF_MODULE_FILE" "${lib.getLib librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GDK_PIXBUF_MODULE_FILE" "${lib.getLib librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"} + '' + ); + # Simple derivation containing a gobject-introspection typelib. typelib-Mahjong = stdenv.mkDerivation { name = "typelib-Mahjong"; diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix index 42866c3419ddf..59fa9de24f9d1 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix @@ -1,7 +1,7 @@ { lib, runCommand }: rec { - runTest = name: body: runCommand name { } '' + runTest = name: body: runCommand name { strictDeps = true; } '' set -o errexit ${body} touch $out diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 46df792bdf6c8..9689e41245909 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -10,8 +10,8 @@ , gawk , util-linux , runtimeShell -, e2fsprogs }: - +, e2fsprogs +}: rec { shellScript = name: text: writeScript name '' @@ -20,40 +20,51 @@ rec { ${text} ''; - mkLayer = { - name, - contents ? [], - }: - runCommand "singularity-layer-${name}" { - inherit contents; - } '' + mkLayer = + { name + , contents ? [ ] + # May be "apptainer" instead of "singularity" + , projectName ? (singularity.projectName or "singularity") + }: + runCommand "${projectName}-layer-${name}" + { + inherit contents; + } '' mkdir $out for f in $contents ; do cp -ra $f $out/ done ''; - buildImage = { - name, - contents ? [], - diskSize ? 1024, - runScript ? "#!${stdenv.shell}\nexec /bin/sh", - runAsRoot ? null, - memSize ? 512 - }: - let layer = mkLayer { - inherit name; - contents = contents ++ [ bash runScriptFile ]; - }; - runAsRootFile = shellScript "run-as-root.sh" runAsRoot; - runScriptFile = shellScript "run-script.sh" runScript; - result = vmTools.runInLinuxVM ( - runCommand "singularity-image-${name}.img" { + buildImage = + let + defaultSingularity = singularity; + in + { name + , contents ? [ ] + , diskSize ? 1024 + , runScript ? "#!${stdenv.shell}\nexec /bin/sh" + , runAsRoot ? null + , memSize ? 512 + , singularity ? defaultSingularity + }: + let + projectName = singularity.projectName or "singularity"; + layer = mkLayer { + inherit name; + contents = contents ++ [ bash runScriptFile ]; + inherit projectName; + }; + runAsRootFile = shellScript "run-as-root.sh" runAsRoot; + runScriptFile = shellScript "run-script.sh" runScript; + result = vmTools.runInLinuxVM ( + runCommand "${projectName}-image-${name}.img" + { buildInputs = [ singularity e2fsprogs util-linux gawk ]; layerClosure = writeReferencesToFile layer; preVM = vmTools.createEmptyImage { size = diskSize; - fullName = "singularity-run-disk"; + fullName = "${projectName}-run-disk"; }; inherit memSize; } @@ -92,19 +103,20 @@ rec { if [ ! -e bin/sh ]; then ln -s ${runtimeShell} bin/sh fi - mkdir -p .singularity.d - ln -s ${runScriptFile} .singularity.d/runscript + mkdir -p .${projectName}.d + ln -s ${runScriptFile} .${projectName}.d/runscript - # Fill out .singularity.d - mkdir -p .singularity.d/env - touch .singularity.d/env/94-appsbase.sh + # Fill out .${projectName}.d + mkdir -p .${projectName}.d/env + touch .${projectName}.d/env/94-appsbase.sh cd .. - mkdir -p /var/singularity/mnt/{container,final,overlay,session,source} + mkdir -p /var/lib/${projectName}/mnt/{container,final,overlay,session,source} echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd echo > /etc/resolv.conf - TMPDIR=$(pwd -P) singularity build $out ./img + TMPDIR=$(pwd -P) ${projectName} build $out ./img ''); - in result; + in + result; } diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 6ab0ee843cb08..542133dd959a3 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -121,4 +121,7 @@ in nixosTesting.simpleTest calledTest; + hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + + testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { }; } diff --git a/pkgs/build-support/testers/hasPkgConfigModule/tester.nix b/pkgs/build-support/testers/hasPkgConfigModule/tester.nix new file mode 100644 index 0000000000000..c8342cdd5c3bf --- /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 0000000000000..8005c3f937095 --- /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 0a5381b2b738d..313c556737fb3 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, ... }: { diff --git a/pkgs/build-support/testers/testMetaPkgConfig/tester.nix b/pkgs/build-support/testers/testMetaPkgConfig/tester.nix new file mode 100644 index 0000000000000..bee97ace1409c --- /dev/null +++ b/pkgs/build-support/testers/testMetaPkgConfig/tester.nix @@ -0,0 +1,14 @@ +{ lib, runCommand, testers }: + +package: + +runCommand "check-meta-pkg-config-modules-for-${package.name}" { + meta = { + description = "Test whether ${package.name} exposes all pkg-config modules ${toString package.meta.pkgConfigModules}"; + }; + dependsOn = map + (moduleName: testers.hasPkgConfigModule { inherit package moduleName; }) + package.meta.pkgConfigModules; +} '' + echo "found all of ${toString package.meta.pkgConfigModules}" > "$out" +'' diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 80c3214f06a36..413ed65852f50 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,13 +58,13 @@ 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 @@ -91,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/<store path> - * writeTextFile { - * name = "my-file"; - * text = '' - * Contents of File - * ''; - * } - * # See also the `writeText` helper function below. - * - * # Writes executable my-file to /nix/store/<store path>/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/<store path> + writeTextFile { + name = "my-file"; + text = '' + Contents of File + ''; + } + + + See also the `writeText` helper function below. + + + # Writes executable my-file to /nix/store/<store path>/bin/my-file + writeTextFile { + name = "my-file"; + text = '' + Contents of File + ''; + executable = true; + destination = "/bin/my-file"; + } + + */ writeTextFile = { name # the name of the derivation @@ -144,29 +156,35 @@ rec { ''; /* - * Writes a text file to nix store with no optional parameters available. - * - * Example: - * # Writes contents of file to /nix/store/<store path> - * 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/<store path> + 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/<store path>/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/<store path>/share/my-file + writeTextDir "share/my-file" + '' + Contents of File + ''; + + */ writeTextDir = path: text: writeTextFile { inherit text; @@ -175,48 +193,58 @@ rec { }; /* - * Writes a text file to /nix/store/<store path> 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/<store path> and makes executable - * writeScript "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to /nix/store/<store path> 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/<store path> 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/<store path>/bin/<name> and - * marks the file as executable. - * - * Example: - * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable. - * writeScriptBin "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to /nix/store/<store path>/bin/<name> and + marks the file as executable. + + Example: + + + + # Writes my-file to /nix/store/<store path>/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/<store path> 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/<store path> and makes executable. + writeShellScript "my-file" + '' + Contents of File + ''; + + */ writeShellScript = name: text: writeTextFile { @@ -232,17 +260,20 @@ rec { }; /* - * Similar to writeShellScript and writeScriptBin. - * Writes an executable Shell script to /nix/store/<store path>/bin/<name> and checks its syntax. - * Automatically includes interpreter above the contents passed. - * - * Example: - * # Writes my-file to /nix/store/<store path>/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/<store path>/bin/<name> and checks its syntax. + Automatically includes interpreter above the contents passed. + + Example: + + + # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable. + writeShellScriptBin "my-file" + '' + Contents of File + ''; + + */ writeShellScriptBin = name : text : writeTextFile { @@ -259,25 +290,29 @@ rec { }; /* - * Similar to writeShellScriptBin and writeScriptBin. - * Writes an executable Shell script to /nix/store/<store path>/bin/<name> 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/<store path>/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/<store path>/bin/<name> 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/<store path>/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 @@ -334,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/<store path> - * concatTextFile { - * name = "my-file"; - * files = [ drv1 "${drv2}/path/to/file" ]; - * } - * # See also the `concatText` helper function below. - * - * # Writes executable my-file to /nix/store/<store path>/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/<store path> + concatTextFile { + name = "my-file"; + files = [ drv1 "${drv2}/path/to/file" ]; + } + + + See also the `concatText` helper function below. + + + # Writes executable my-file to /nix/store/<store path>/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 @@ -373,70 +415,81 @@ rec { /* - * Writes a text file to nix store with no optional parameters available. - * - * Example: - * # Writes contents of files to /nix/store/<store path> - * 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/<store path> + 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/<store path> - * 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/<store path> + 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 @@ -456,35 +509,40 @@ rec { '' mkdir -p $out for i in $(cat $pathsPath); do - ${lndir}/bin/lndir -silent $i $out - done + ${lndir}/bin/lndir $i $out + done 2>&1 | sed 's/^/symlinkJoin: warning: keeping existing file: /' ${postBuild} ''; /* - * 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 @@ -510,59 +568,53 @@ 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; - */ - makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {}, passthru ? {} }: script: + # docs in doc/builders/special/makesetuphook.section.md + makeSetupHook = + { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook" + , deps ? [ ] + # hooks go in nativeBuildInput so these will be nativeBuildInput + , propagatedBuildInputs ? [ ] + # these will be buildInputs + , depsTargetTargetPropagated ? [ ] + , meta ? { } + , passthru ? { } + , substitutions ? { } + }: + script: runCommand name (substitutions // { inherit meta; + inherit depsTargetTargetPropagated; + propagatedBuildInputs = + # remove list conditionals before 23.11 + lib.warnIf (!lib.isList deps) "'deps' argument to makeSetupHook must be a list. content of deps: ${toString deps}" + (lib.warnIf (deps != [ ]) "'deps' argument to makeSetupHook is deprecated and will be removed in release 23.11., Please use propagatedBuildInputs instead. content of deps: ${toString deps}" + propagatedBuildInputs ++ (if lib.isList deps then deps else [ deps ])); strictDeps = true; # TODO 2023-01, no backport: simplify to inherit passthru; passthru = passthru @@ -573,8 +625,7 @@ rec { ('' mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook - '' + lib.optionalString (deps != []) '' - printWords ${toString deps} > $out/nix-support/propagated-build-inputs + recordPropagatedDependencies '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); @@ -627,27 +678,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 @@ -709,18 +760,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 @@ -767,30 +819,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 <path>} can be - # shortened to ${<path>}. + /* + 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 <path>} can be + shortened to ${<path>}. + */ 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/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index fe23025df1d8d..2d331e18dfeb4 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -156,7 +156,7 @@ foreach my $pkgName (@order) { $cleanedName =~ s/~//g; print " (fetchurl {\n"; - print " url = $urlPrefix/$cdata->{Filename};\n"; + print " url = \"$urlPrefix/$cdata->{Filename}\";\n"; print " sha256 = \"$cdata->{SHA256}\";\n"; print " name = \"$cleanedName\";\n" if $cleanedName ne $origName; print " })\n"; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7bae2fc7cfb27..403bc9b1d2dab 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -35,10 +35,12 @@ rec { mkdir -p $out/lib # Copy what we need from Glibc. - cp -p ${pkgs.stdenv.cc.libc}/lib/ld-linux*.so.? $out/lib - cp -p ${pkgs.stdenv.cc.libc}/lib/libc.so.* $out/lib - cp -p ${pkgs.stdenv.cc.libc}/lib/libm.so.* $out/lib - cp -p ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* $out/lib + cp -p \ + ${pkgs.stdenv.cc.libc}/lib/ld-*.so.? \ + ${pkgs.stdenv.cc.libc}/lib/libc.so.* \ + ${pkgs.stdenv.cc.libc}/lib/libm.so.* \ + ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* \ + $out/lib # Copy BusyBox. cp -pd ${pkgs.busybox}/bin/* $out/bin @@ -49,7 +51,7 @@ rec { for i in $out/bin/*; do if [ -f "$i" -a ! -L "$i" ]; then echo "patching $i..." - patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true + patchelf --set-interpreter $out/lib/ld-*.so.? --set-rpath $out/lib $i || true fi done ''; # */ @@ -406,7 +408,7 @@ rec { eval "$origPostHook" ''; - origPostHook = if attrs ? postHook then attrs.postHook else ""; + origPostHook = lib.optionalString (attrs ? postHook) attrs.postHook; /* Don't run Nix-specific build steps like patchelf. */ fixupPhase = "true"; @@ -527,9 +529,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 +560,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" @@ -1034,22 +1034,22 @@ rec { }; debian11i386 = { - name = "debian-11.5-bullseye-i386"; - fullName = "Debian 11.5 Bullseye (i386)"; + name = "debian-11.6-bullseye-i386"; + fullName = "Debian 11.6 Bullseye (i386)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-i386/Packages.xz"; - hash = "sha256-tHrWSd4K5TCwIaLTPqK/Rcon0O0r+Jsxb7OcchOo8Vo="; + url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-i386/Packages.xz"; + hash = "sha256-z9eG7RlvelEnZAaeCfIO+XxTZVL3d+zTA7ShU43l/pw="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; debian11x86_64 = { - name = "debian-11.5-bullseye-amd64"; - fullName = "Debian 11.5 Bullseye (amd64)"; + name = "debian-11.6-bullseye-amd64"; + fullName = "Debian 11.6 Bullseye (amd64)"; packagesList = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20221126T084953Z/dists/bullseye/main/binary-amd64/Packages.xz"; - hash = "sha256-whpBERKOPyhrWguVQ2QchrwRHU4tCkGwu42x6khF/2g="; + url = "https://snapshot.debian.org/archive/debian/20230131T034648Z/dists/bullseye/main/binary-amd64/Packages.xz"; + hash = "sha256-mz0eCWdn6uWt40OxsSPheHzEnMeLE52yR/vpb48/VF0="; }; urlPrefix = "mirror://debian"; packages = commonDebianPackages; diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index 703e71438a71e..cf0a52d92274e 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -54,6 +54,6 @@ fi tags=$(git ls-remote --tags --refs "$url") # keep only the version part of the tag -tags=$(echo "$tags" | cut --delimiter=/ --field=3) +tags=$(echo "$tags" | cut --delimiter=/ --field=3-) echo "$tags" diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index f839ce0c6dcd6..59620b16a6ccf 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2022-07-04"; + version = "unstable-2023-02-06"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "0b95de112857b185b83141ac9324fb0e786c56df"; - sha256 = "sha256-HWkZJd4t7gsbbSGiQ92Lav9EMBPMLXmXFT6HVfyFLSI="; + rev = "ccaa76761a1b100e99287c120196bd5f32d4a403"; + hash = "sha256-RL/94dQiZJ60cXHQ9r4P3hRBqe55oUissCmSp4XLM+o="; }; dontBuild = true; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 2995f85f93e83..22b686684f989 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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'"; - sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; + 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 + ''; # 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 @@ -20,10 +29,4 @@ in (fetchzip { license = "unknown"; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf - ''; -}) +} diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 5f2e6640d2613..22900b4b7fcd5 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "6.101"; - name = "andika-${version}"; -in - (fetchzip rec { - inherit name; +stdenvNoCC.mkDerivation rec { + pname = "andika"; + version = "6.200"; + src = fetchzip { url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + hash = "sha256-Ge+Yq3+1IJ+mXhjw7Vtpu5DIWiMfwOdEH/S1RSzYh3A="; + }; - sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; + installPhase = '' + runHook preInstall - 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 = '' + 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/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 ]; - }; - }).overrideAttrs (_: { - 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}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index afbd80674c660..c363f025bfd2d 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -1,12 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; - sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85"; + 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 + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder fonts"; @@ -15,10 +26,4 @@ let version = "1.100"; in maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/data/fonts/annapurna-sil/default.nix index 6eff39cf1ac1d..59957bb7005d1 100644 --- a/pkgs/data/fonts/annapurna-sil/default.nix +++ b/pkgs/data/fonts/annapurna-sil/default.nix @@ -1,31 +1,31 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "annapurna-sil"; version = "1.204"; - name = "annapurna-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; + hash = "sha256-4ya3Iydrz5Pvol9sTDIe9ZW5k3+XQp8GB2LAnRpeiXs="; + }; - sha256 = "sha256-kVeP9ZX8H+Wn6jzmH1UQvUKY6vJjadMTdEusS7LodFM="; + installPhase = '' + runHook preInstall - 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 ]; - }; - }).overrideAttrs (_: { - 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}" + 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. ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 259ac0141b2bf..81a175b944b84 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/atkinson-hyperlegible/default.nix b/pkgs/data/fonts/atkinson-hyperlegible/default.nix index 8b2b04553726a..e8b09cfb637cd 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="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype fonts/otf/* - postFetch = '' - install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/* - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 50f456373c698..f1ee19b3b1579 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 c38329227f027..b78f3a9e85bff 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="; + }; - postFetch = '' - mkdir -p $out/share/fonts/truetype + installPhase = '' + runHook preInstall - mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype + mv 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 7ec429036bceb..9839295653d12 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; - sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; + 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 + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; @@ -18,9 +27,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ emily ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/data/fonts/barlow/default.nix index aa618140b1b4d..e9bfa4dee3753 100644 --- a/pkgs/data/fonts/barlow/default.nix +++ b/pkgs/data/fonts/barlow/default.nix @@ -1,14 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld"; + 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; { description = "A grotesk variable font superfamily"; @@ -17,13 +29,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index be6ed005b166e..143975f28db79 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/blackout/default.nix b/pkgs/data/fonts/blackout/default.nix new file mode 100644 index 0000000000000..b615aa66c59ce --- /dev/null +++ b/pkgs/data/fonts/blackout/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "blackout"; + version = "2014-07-29"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "4864cfc1749590e9f78549c6e57116fe98480c0f"; + hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + + runHook postInstall + ''; + + meta = { + description = "A bad-ass, unholy-mother-shut-your-mouth stencil sans-serif"; + longDescription = '' + Eats holes for breakfast lunch and dinner. Inspired by filling in + sans-serif newspaper headlines. Continually updated with coffee and + music. Makes your work louder than the next person’s. + + Comes in three styles: Midnight (solid), 2AM (reversed), & Sunrise + (stroked). + ''; + homepage = "https://www.theleagueofmoveabletype.com/blackout"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/data/fonts/borg-sans-mono/default.nix index 0f5de931b8453..8037e5dc645f9 100644 --- a/pkgs/data/fonts/borg-sans-mono/default.nix +++ b/pkgs/data/fonts/borg-sans-mono/default.nix @@ -1,16 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Droid Sans Mono Slashed + Hasklig-style ligatures"; @@ -19,9 +25,4 @@ in platforms = platforms.all; maintainers = with maintainers; [ atila ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index e68d429db2e84..186a5359c44fd 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/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 112f7c8d7d10e..df1af86d5ce04 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec="; + 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; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; @@ -18,10 +27,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/data/fonts/ccsymbols/default.nix index a32d35a08852c..f31dc65a8a568 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 533f40a9a00ad..52c32fcc3d804 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "charis-sil"; version = "6.101"; - name = "charis-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; + hash = "sha256-Rf5eKQVZw7zgTv6KkJUdNdd4sSJPdvjy/GDLusvlgzE="; + }; - sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/charis"; - description = "A family of highly readable fonts for broad multilingual use"; - longDescription = '' + 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/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 ]; - }; - }).overrideAttrs (_: { - 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}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/pkgs/data/fonts/chunk/default.nix b/pkgs/data/fonts/chunk/default.nix new file mode 100644 index 0000000000000..708393185e940 --- /dev/null +++ b/pkgs/data/fonts/chunk/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "chunk"; + version = "2021-03-03"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104"; + hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "An ultra-bold, ultra-awesome slab serif typeface"; + longDescription = '' + Chunk is an ultra-bold slab serif typeface that is reminiscent of old + American Western woodcuts, broadsides, and newspaper headlines. Used + mainly for display, the fat block lettering is unreserved yet refined for + contemporary use. + + In 2014, a new textured style was created by Tyler Finck called Chunk + Five Print. It contains the same glyphs as the original. + ''; + homepage = "https://www.theleagueofmoveabletype.com/chunk"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/data/fonts/cnstrokeorder/default.nix index 965bf119f6e70..66803b1b63ff8 100644 --- a/pkgs/data/fonts/cnstrokeorder/default.nix +++ b/pkgs/data/fonts/cnstrokeorder/default.nix @@ -1,20 +1,23 @@ -{ 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 - sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; + install -D $src $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + + runHook postInstall + ''; meta = with lib; { description = "Chinese font that shows stroke order for HSK 1-4"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index fc7ce56f79651..f47da9fc5306a 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 0c915f21c132e..fc3b8d6085be9 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 a5eafeae89cae..c4c7648acd294 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,15 +1,27 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "comic-relief"; version = "1.1"; - name = "comic-relief-${version}"; -in (fetchzip rec { - inherit name; - 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 - sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + mkdir -p $out/etc/fonts/conf.d + 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 + cp *.ttf -d $out/share/fonts/truetype + cp FONTLOG.txt -d $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://fontlibrary.org/en/font/comic-relief"; @@ -23,20 +35,11 @@ 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 # want to install the font alias of this package. priority = 10; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/etc/fonts/conf.d - mkdir -p $out/share/doc/${name} - 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} - ''; -}) +} diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/data/fonts/courier-prime/default.nix index 59a823727b8f3..1226966d5e6cd 100644 --- a/pkgs/data/fonts/courier-prime/default.nix +++ b/pkgs/data/fonts/courier-prime/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; + + 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; { description = "Monospaced font designed specifically for screenplays"; @@ -17,9 +24,4 @@ in (fetchzip rec { maintainers = [ maintainers.austinbutler ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf - ''; -}) +} diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 6402cf5be5946..7eff1c211b90b 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,15 +1,24 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.13.0"; -in -(fetchzip rec { - name = "Cozette-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "cozette"; + version = "1.19.1"; - 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-CpabWJJDCY+mgE+9U8L50MmWVfhkm+LnfMQtOTXyE8s="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; + 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; { description = "A bitmap programming font optimized for coziness"; @@ -18,12 +27,4 @@ in platforms = platforms.all; maintainers = with maintainers; [ brettlyons marsam ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/data/fonts/curie/default.nix index fd21d1964a216..4f3ab7eb013a0 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"; - - downloadToTemp = true; + src = fetchurl { + url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + hash = "sha256-B89GNbOmm3lY/cRWQJEFu/5morCM/WrRQb/m6covbt8="; + }; - recursiveHash = true; + sourceRoot = "."; - sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A="; + installPhase = '' + runHook preInstall - 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 0df5dd51df695..84af3d18bfe48 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -1,15 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.3.2"; +stdenvNoCC.mkDerivation rec { pname = "d2codingfont"; + version = "1.3.2"; + + src = fetchzip { + url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + stripRoot = false; + hash = "sha256-iC6iaUSVg4zt3wVFJUU4HEeswuKDOTFsAxq/0gRiOCA="; + }; -in (fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + installPhase = '' + runHook preInstall - sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj"; + install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/ + + runHook postInstall + ''; meta = with lib; { description = "Monospace font with support for Korean and latin characters"; @@ -25,9 +32,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix index 5129f4bc5a5ec..7960691959907 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/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 918996c5f6448..a33f086c9bbe3 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/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index 83e2a9ac8e713..5ffd9da5e03da 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "doulos-sil"; version = "6.101"; - name = "doulos-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip"; + hash = "sha256-CPjk6SLgsDYjachZZ1hanp6Q+cxTxfHOkoeU59Om5b8="; + }; - sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/doulos"; - description = "A font that provides complete support for the International Phonetic Alphabet"; - longDescription = '' + 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/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 ]; - }; - }).overrideAttrs (_: { - 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}" ''; - }) + 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 4240e853f296a..7a57d9308cf9c 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,15 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "eb-garamond"; version = "0.016"; - name = "eb-garamond-${version}"; -in (fetchzip rec { - inherit name; - 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.georgduffner.at/ebgaramond/"; @@ -18,10 +25,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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}" - ''; -}) +} diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/data/fonts/edwin/default.nix index 4b1688dbc55e7..41926ac1b6795 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"; - - downloadToTemp = true; - - recursiveHash = true; + src = fetchurl { + url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-F6BzwnrsaELegdo6Bdju1OG+RI9zKnn4tIASR3q6zYk="; + }; - sha256 = "sha256-e0ADK72ECl+QMvLWtFJfeHBmuEwzr9M+Kqvkd5Z2mmo="; + installPhase = '' + runHook preInstall - 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/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 5a31358b72ae8..256084a320fce 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; + install -Dm644 fonts/*.ttf -t $out/share/fonts/all-the-icons + + runHook postInstall + ''; meta = with lib; { description = "Icon fonts for emacs all-the-icons"; @@ -20,17 +27,12 @@ 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; maintainers = with maintainers; [ rlupton20 ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons - ''; -}) +} diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index a6836afbc871f..1c9fc453c7d3d 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let name = "encode-sans-1.002"; -in (fetchzip rec { - inherit name; +{ lib, stdenvNoCC, fetchzip }: - url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; +stdenvNoCC.mkDerivation rec { + pname = "encode-sans"; + version = "1.002"; - sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; + src = fetchzip { + url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; + hash = "sha256-TPAUc5msAUgJZHibjgYaS2TOuzKFy0rje9ZQTXE6s+w="; + }; + + 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 + ''; meta = with lib; { description = "A versatile sans serif font family"; @@ -23,10 +33,4 @@ in (fetchzip rec { maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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}" - ''; -}) +} diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index c410826b2fb5d..d1b59e2cdc0f6 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/ezra-sil/default.nix b/pkgs/data/fonts/ezra-sil/default.nix index 2d970fbc38c05..7b628bd4bbc00 100644 --- a/pkgs/data/fonts/ezra-sil/default.nix +++ b/pkgs/data/fonts/ezra-sil/default.nix @@ -1,28 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ezra-sil"; version = "2.51"; - name = "ezra-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/ezra/EzraSIL-${version}.zip"; + hash = "sha256-hGOHjvFVFLwyVkcoUz+7rQekCdn4oEOB+L16XRpthJM="; + }; - sha256 = "sha256-1LGw/RPFeNtEvcBWFWZf8+dABvWye2RfZ/jt8rwQewM="; + installPhase = '' + runHook preInstall - 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 ]; - }; - }).overrideAttrs (_: { - 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}" - ''; - }) + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + 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/fanwood/default.nix b/pkgs/data/fonts/fanwood/default.nix new file mode 100644 index 0000000000000..ef8be0a6522a2 --- /dev/null +++ b/pkgs/data/fonts/fanwood/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "fanwood"; + version = "2011-05-11"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432"; + hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A serif based on the work of a famous Czech-American type designer of yesteryear"; + longDescription = '' + Based on work of a famous Czech-American type designer of yesteryear. The + package includes roman and italic. + ''; + homepage = "https://www.theleagueofmoveabletype.com/fanwood"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index f1eb2184266ff..b0e63835156a5 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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 + 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"; @@ -22,10 +31,4 @@ in (fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - # 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 - ''; -}) +} diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 3d8c5bf3428f8..35d51bb340c97 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; @@ -19,9 +28,4 @@ maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 763f54bb76794..5d059dbf88e08 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; + install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; @@ -22,9 +30,4 @@ in (fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 039c5099b56ea..89af9fb7b7c3b 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 cb9d5e73ed2aa..53592152a3334 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,19 +1,23 @@ -{ 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 - sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; + install -m444 -D $src $out/share/fonts/truetype/${pname}-${version}.ttf + + runHook postInstall + ''; meta = { homepage = "http://www.fixedsysexcelsior.com/"; diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 973df59e408bf..a6f748f2f07f8 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,21 +1,22 @@ -{ 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 - inherit sha256; + runHook postInstall + ''; meta = with lib; { description = "Font Awesome - OTF font"; @@ -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 2d053b1ce7fcb..21bab9002bcf2 100644 --- a/pkgs/data/fonts/fraunces/default.nix +++ b/pkgs/data/fonts/fraunces/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + 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; { description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; @@ -17,10 +25,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 9d8c28681a9f1..4bf50d3385879 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "freefont-ttf"; version = "20120503"; - url = "mirror://gnu/freefont/freefont-ttf-${version}.zip"; + src = fetchzip { + url = "mirror://gnu/freefont/freefont-ttf-${version}.zip"; + hash = "sha256-K3kVHGcDTxQ7N7XqSdwRObriVkBoBYPKHbyYrYvm7VU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.ttf $out/share/fonts/truetype - sha256 = "sha256-bdMZg/mHYc0N6HiR8uNl0CjeOwBou+OYj3LPkyEUHUA="; + runHook postInstall + ''; meta = { description = "GNU Free UCS Outline Fonts"; @@ -24,6 +28,6 @@ fetchzip rec { homepage = "https://www.gnu.org/software/freefont/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/data/fonts/galatia-sil/default.nix index 965596373c26e..70881399d593e 100644 --- a/pkgs/data/fonts/galatia-sil/default.nix +++ b/pkgs/data/fonts/galatia-sil/default.nix @@ -1,31 +1,31 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "galatia-sil"; version = "2.1"; - name = "galatia-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/galatia/GalatiaSIL-${version}.zip"; + hash = "sha256-7kXnTC5vpUOjcT40oNW6e32zFGejlWJq1J+p+5DiAos="; + }; - sha256 = "sha256-zLL/7LMcJul2LilhEafpvm+tiYlgv1y1jj85VvG+wiI="; + installPhase = '' + runHook preInstall - 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 ]; - }; - }).overrideAttrs (_: { - 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}" + 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). ''; - }) + 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 1b8b3307eb352..53ea5558c1f1a 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/gelasio/default.nix b/pkgs/data/fonts/gelasio/default.nix index c8cf655a18cfb..cea8e439d36bf 100644 --- a/pkgs/data/fonts/gelasio/default.nix +++ b/pkgs/data/fonts/gelasio/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub }: - -let - version = "unstable-2018-08-12"; -in fetchFromGitHub { - name = "gelasio-${version}"; - owner = "SorkinType"; - repo = "Gelasio"; - rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; - sha256 = "0dfskz2vpwsmd88rxqsxf0f01g4f2hm6073afcm424x5gc297n39"; - - postFetch = '' - tar xf $downloadedFile --strip=1 +{ lib, stdenvNoCC, fetchFromGitHub }: + +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 + 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 be2f71b5346cf..5cbc31accf076 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,17 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - major = "1"; - minor = "102"; - version = "${major}.${minor}"; - name = "gentium-book-basic-${version}"; -in (fetchzip rec { - inherit name; +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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/gentium/"; @@ -20,10 +25,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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} - ''; -}) +} diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 9494f8e62afe4..5c3f7dfab23f1 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "gentium"; version = "6.101"; - name = "gentium-${version}"; -in (fetchzip rec { - inherit name; - 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; + 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 + ''; meta = with lib; { homepage = "https://software.sil.org/gentium/"; @@ -34,20 +42,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/data/fonts/goudy-bookletter-1911/default.nix new file mode 100644 index 0000000000000..3fd0352b55576 --- /dev/null +++ b/pkgs/data/fonts/goudy-bookletter-1911/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "goudy-bookletter-1911"; + version = "2011-05-11"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "85ff5b834b4f63feb36fd2053949c19660580e48"; + hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A public domain font based on Frederic Goudy’s Kennerley Oldstyle"; + homepage = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 4b67da84d99ae..6c6bd1918dbf8 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s"; + install -Dm644 *.ttf -t $out/share/fonts/hack + + runHook postInstall + ''; meta = with lib; { description = "A typeface designed for source code"; @@ -22,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 @@ -33,9 +40,4 @@ in (fetchzip { maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack - ''; -}) +} diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index fc499534d1e3a..f6dd5baa60c2d 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -13,7 +13,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/{doc,fonts} install -Dm644 *.ttf -t $out/share/fonts/truetype install -Dm644 *.txt -t $out/share/doc/hanazono diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 8c81bf520424e..a69f8f743cbea 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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 - sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + install -m444 -Dt $out/share/fonts/opentype *.otf + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/i-tu/Hasklig"; @@ -17,9 +25,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ davidrusu Profpatsch ]; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - ''; -}) +} diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 29abcfd607f78..c72e4b9e19a09 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -1,15 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; + 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 = "https://velvetyne.fr/fonts/hyper-scrypt/"; @@ -28,15 +35,9 @@ in 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; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/data/fonts/i-dot-ming/default.nix index d15d7bcc245e8..fb2679b2eba26 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 6da80a1bf830a..483ed98737d01 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 c632338d59e1b..0de1f38a0ff85 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + install -Dm644 */*.otf IBM-Plex-Sans-JP/unhinted/* -t $out/share/fonts/opentype - sha256 = "sha256-HxO0L5Q6WJQBqtg64cczzuRcSYi4jEqbOzEWxDmqFp8="; + runHook postInstall + ''; meta = with lib; { description = "IBM Plex Typeface"; @@ -19,9 +25,4 @@ in (fetchzip { platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index d8127b8512743..1ca1ce2f90988 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 16adc93a9eec2..46ab699fd3986 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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 + + mkdir -p $out/share/fonts/opentype + cp */*.otf $out/share/fonts/opentype - sha256 = "sha256-8p15thg3xyvCA/8dH2jGQoc54nzESFDyv5m47FgWrSI="; + runHook postInstall + ''; meta = with lib; { homepage = "https://rsms.me/inter/"; @@ -17,10 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ demize dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) - +} diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 590163fc05fd0..c8f9a44c2e51a 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 = "17.1.0"; + version = "19.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index d544c1624bcae..8f4e0464032de 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchFromSourcehut }: +{ lib, iosevka, fetchFromSourcehut, fetchFromGitHub, buildNpmPackage }: let sets = [ @@ -23,25 +23,40 @@ let sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p"; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; - overrideAttrs = (attrs: { - inherit version; - - meta = with lib; { - inherit (src.meta) homepage; - description = '' - Customised build of the Iosevka typeface, with a consistent - rounded style and overrides for almost all individual glyphs - in both roman (upright) and italic (slanted) variants. - ''; - license = licenses.ofl; - platforms = attrs.meta.platforms; - maintainers = [ maintainers.DamienCassou ]; - }; - }); makeIosevkaFont = set: - (callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs - overrideAttrs; -in builtins.listToAttrs (builtins.map (set: { - name = set; - value = makeIosevkaFont set; -}) sets) + let superBuildNpmPackage = buildNpmPackage; in + (iosevka.override rec { + inherit set privateBuildPlan; + buildNpmPackage = args: superBuildNpmPackage + (args // { + inherit version; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77"; + hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w="; + }; + + npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw="; + + meta = with lib; { + inherit (src.meta) homepage; + description = '' + Customised build of the Iosevka typeface, with a consistent + rounded style and overrides for almost all individual glyphs + in both roman (upright) and italic (slanted) variants. + ''; + license = licenses.ofl; + platforms = iosevka.meta.platforms; + maintainers = [ maintainers.DamienCassou ]; + }; + }); + }); +in +builtins.listToAttrs (builtins.map + (set: { + name = set; + value = makeIosevkaFont set; + }) + sets) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index d9efb0eedcd7d..3a1957ea96d0f 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, remarshal +{ stdenv +, lib +, buildNpmPackage +, fetchFromGitHub +, darwin +, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer @@ -42,70 +47,63 @@ # ''; , 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 = "19.0.1"; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "v${version}"; + hash = "sha256-nkW9sp7AdaClNTuyC97S0bS6vgVeJQBphfoVOaexnBs="; }; -in -stdenv.mkDerivation rec { - pname = if set != null then "iosevka-${set}" else "iosevka"; - inherit (nodeIosevka) version src; + npmDepsHash = "sha256-LWFHlVGYvOJzdCT2Y86VSzsf/fLJ3B9cJAkBkZyUrMM="; nativeBuildInputs = [ - nodejs remarshal ttfautohint-nox + ] ++ lib.optionals stdenv.isDarwin [ + # libtool + darwin.cctools ]; 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 +124,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 +141,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 2e810490ca8d8..0000000000000 --- 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 <nixpkgs> { - 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 cff861ddfbf6e..0000000000000 --- 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 8d918058988a0..0000000000000 --- 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 6699023498cbd..2193c0832263b 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 = "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"; + iosevka = "0h763gicj32dcwwcq976w81qyw5602vgybmicz0z6ryggm3r03bm"; + iosevka-aile = "13ihigp432jvlwgh3bb4nfv6yfav2dc0rc70l17dcirp746mw7ak"; + iosevka-curly = "1wx46yls9h179mlxcdhjbxl3s9w0pgrkr48mp97yg8dhpnpfckiv"; + iosevka-curly-slab = "0knqx70b1hhrvmwq72b199ql3gcby3cal7qhwvzfd9p238pla2lv"; + iosevka-etoile = "0lmx2wq0kvh0agfznqlmh2wj4hyc2cysbf4f60jiys78i81q5r8b"; + iosevka-slab = "08x6q0al6w73kbjwpkp8zbd7sgsbwdy8pg2i2n27iid4p10hhrd9"; + iosevka-ss01 = "1vqznn97s981mfx943m7bdvnh3h7v5syp8xq39jjb884c67ar5rg"; + iosevka-ss02 = "0vp85rwxgv2z2v2zxgr7fbqjxmp1zyg2bp1mdxxli6pamfrjb4yq"; + iosevka-ss03 = "131m574ngna9zyiqjgvpr64d6n7lbxnf045vs9i01agiqh7acp7p"; + iosevka-ss04 = "04i48dgzzpjgwca691ccd914mrw2xnhak2pwgaanac5ag90w9zv0"; + iosevka-ss05 = "1db7yn0x4vyvd2v06rmll48a842zwwigwf9jhs3m0lskiya5glaz"; + iosevka-ss06 = "1ymad9kpl0prbj220rnw5gchicb4hi731cgjn3lgjmw737kpg183"; + iosevka-ss07 = "1ljxbdswglw60z54px6fvk185l2h0zabgn96lgncb5wqhnn4zmd5"; + iosevka-ss08 = "10wj07g4yss3d1d81qrm1hy8dkjn5bqym61w4innqpljficqc8da"; + iosevka-ss09 = "0wf57sdyppba1ja5rbjn71fxlf2jh4d6m572jqqnz3fim729cll0"; + iosevka-ss10 = "1apffjqcfs1vaj6gg3svcjfc7n1b370h0bgra489bm1xv23lsxsv"; + iosevka-ss11 = "1zyiias5v4m7i9b2za2apkh8k7lynvyhqaxv5zha599w0di7q1zl"; + iosevka-ss12 = "1mh8gl078f9clkimpizycj2m2bi8jx2ckidrq2p2xdwhji068wjv"; + iosevka-ss13 = "0dhqiwdg9ng78nsr397v4ri3h682wn8yzjpw9ax5yfx7h9r85afm"; + iosevka-ss14 = "03xslqdwm5jn3ld89nvy2lxvxh35wlwijzg0q0pvl16d4a6n6pnh"; + iosevka-ss15 = "03v5miyz49838s5862jj2ssn7sixni91pb88ddzw47dhlwxyf8fy"; + iosevka-ss16 = "1hs5rv8kf7sscmdvmdxszy9y1zk4bd355789gfcgznxmsd4240ig"; + iosevka-ss17 = "0mv7ilvppwbc018fv2a6ghj0v1jd22n8z3al0hbhkn9gr9xixdj2"; + iosevka-ss18 = "0kyl0qqpn7l87cv40vgplqw1i0qncgxq0k8yxzgaz74ski48rf4y"; + sgr-iosevka = "0r19pllpdw3wah81ic0vzqbbrfl45cq401zx175arsxi38hz3lqa"; + sgr-iosevka-aile = "1w2gqj5s3v11n9pzifjjy0z7bdw3qx7pwyajajamqw75zb3jh0rf"; + sgr-iosevka-curly = "1v1q4chckiwzddcnpprsyxvii2kiim69iiim9xqx2wf3qp7sficp"; + sgr-iosevka-curly-slab = "1dbw51i7vqga65l2i9x1vvc098nqdqi396anwzbxpz0q32lv5s0p"; + sgr-iosevka-etoile = "1xx1q1j16fzi8z7xddbm38pm9xj71g4jyjkijqwzzfx7xphr5sk6"; + sgr-iosevka-fixed = "1vbsg6563q4xrr0mqf94ykaz6vdi3ns4c0qaryv8m60pqidvb11h"; + sgr-iosevka-fixed-curly = "14c4k9kbxqrrrmivfjxcmmaicmwflqph2z106s6zr6ifc8qxhk48"; + sgr-iosevka-fixed-curly-slab = "0krlp00b4pwwnfsigjfpi5ixvsllvr6kqj8r7hwlrq6xcqkb5wxd"; + sgr-iosevka-fixed-slab = "0zw26ldz2g1lwzman85wggb4igq8sllsi514cbi42firr16sa91q"; + sgr-iosevka-fixed-ss01 = "09igz4ax75gbqhvckr3l6j8lna81pqnql0bii3v0f41fjqk19w2z"; + sgr-iosevka-fixed-ss02 = "06p278qk1dq3kdq0nqbwspnxvrnhvxqssx8sa2cpcs2rp120a247"; + sgr-iosevka-fixed-ss03 = "1ipvi2sj5prbd11f7ihcgss5yd00aqgymzxqa6njh1j3c4hwacnr"; + sgr-iosevka-fixed-ss04 = "1pwx5r9avv97pcgsdpx5lw7lf19vg5kncn6viwrg659q0bar9bih"; + sgr-iosevka-fixed-ss05 = "0qmak7zdqmycbf3bndbhmkifcxy818w5vsp0pl2qnkklvq2y0v4r"; + sgr-iosevka-fixed-ss06 = "1b163h34h0yxh1jmpimjhjvj97dk2wvzcl7vnbiqwxvandlk6xrn"; + sgr-iosevka-fixed-ss07 = "0i4rc8424vjlqp38cj8h0c168419i0b5dxklsapbwahryzh1d1gp"; + sgr-iosevka-fixed-ss08 = "03kgjhin6cahbxgclckq8w05ax0nz4y392hwsxmvcz21p0cyglan"; + sgr-iosevka-fixed-ss09 = "1xbr1y8izvl36s7k0wbh1a9h5dlgn3dlpyjz3mic4a60xbf7l97d"; + sgr-iosevka-fixed-ss10 = "1kpi03gf30sfryvmi5syig7x0bcz0k2hpms0afrhaz0gprnnv2ap"; + sgr-iosevka-fixed-ss11 = "1v3yybp1aslp811ssjiglxknnnk7p1hymaa1lxdc5hn2hawxmzzn"; + sgr-iosevka-fixed-ss12 = "12yqrv9lvzwzps3zvhhyzdkf01j8h1abhgwnq1abma5h8mlydwkl"; + sgr-iosevka-fixed-ss13 = "08v2zjil62i01r3nqnvpbq51jsx3fxrcqzd1s625hbcywy4x6dvb"; + sgr-iosevka-fixed-ss14 = "1j97971kczdlkvwhcxj55yhqq5q4n1pk5k04pqffh2pl8zdzlj4h"; + sgr-iosevka-fixed-ss15 = "10l56ypqjnnxw33vgd8ajlwiyrvcglx0yh8faxj18if77pfsk82l"; + sgr-iosevka-fixed-ss16 = "0zfjld1s45ipwrxm1sv7kw2vs3f9lbs52zsgm31k8im6zr88rp0i"; + sgr-iosevka-fixed-ss17 = "0b0849jmbq8ync56bn6x7gld6sciyb72ffw95xjlsnfbx2gqyp8h"; + sgr-iosevka-fixed-ss18 = "0yyzc95b65427knjwas5yf4qsd831xz1fbwnvd0c6ngj9dc5xns0"; + sgr-iosevka-slab = "156n7pc9va263c4rg73cv8bizimkv6sabpk7784r423vahwv1s3v"; + sgr-iosevka-ss01 = "0bj0l93hgia8js7ikalm4ij3aa9yii1psnbymi9m5k3qxx8z4i2a"; + sgr-iosevka-ss02 = "0nrvx3grbf0j72gm749j3bpv92qd0g2riywflwa2nxdi9zgprwvh"; + sgr-iosevka-ss03 = "0a9k02r1fwb72dkvihm94s5fhgblz3lkjfwsywr81i5if3v7xnap"; + sgr-iosevka-ss04 = "04yd8zwibjqwc6ml52wwbg52aya2cxm2qk6czjb0rryvb7rx7bjy"; + sgr-iosevka-ss05 = "1syv7vigqzr42535fav2m945z4011xsnhm4sayxqkr4nx1vfx16i"; + sgr-iosevka-ss06 = "1qj2jf9550m37ssp4djmgqd5gk76kz15vxjaiyf2wmvwbl41iwl9"; + sgr-iosevka-ss07 = "1cx2lgqjy29wgb4a77j0ipy0ya3v8b6ipsdrdiqzpbl4j4bn0hbr"; + sgr-iosevka-ss08 = "005vzpcqwbgj4m8c8rd7qvjgjnzwh7napxxp9np5abwv4w6alnav"; + sgr-iosevka-ss09 = "0akhfl78fm8hxdhl4rd6d7bk7gin3hnk2y5cigxki403k415rwqc"; + sgr-iosevka-ss10 = "1aqw31vm4l5840nzg9dghkh33l8grsi7632qh9pm6rcj1x2vsqg4"; + sgr-iosevka-ss11 = "0gvc5rhb4291zy2zdp04ksqs65il3bwgdb4jkc8xq4v62h34i7cw"; + sgr-iosevka-ss12 = "0kra3lgzfbf2cf5p48djay22mwzgz604x9hxkmzq0h4r5rf41lfw"; + sgr-iosevka-ss13 = "1az0ficcg8i1fy37s8svrqi8fcqjz0rzqcprs5rz8m4qrhym0m9b"; + sgr-iosevka-ss14 = "1xg9is9l0dhzqaxq9dpkvdi4rsfkw5nr5jzccjvpvmw3d16kzjm2"; + sgr-iosevka-ss15 = "08r22a314aaqvsjca80k87kyi5nxwn0r63yvar6wn03sgay9hvlz"; + sgr-iosevka-ss16 = "1nqsf9y91llvsc5z1xhwlcnw499fl4n4zvmmsrp3l1gdcg7jcvyl"; + sgr-iosevka-ss17 = "1k5n0i2pffm403ra071ydyzvp5kiqj6q96yfwasqj2p39gjccp3j"; + sgr-iosevka-ss18 = "0kqdggh51x3djmmag485a0mygxckly3vxnzfi659fxfb8p6n0r1n"; + sgr-iosevka-term = "1k836142pkpwn3wnjxv329rbcycm66p24a7a0grnim9i8nsdq64g"; + sgr-iosevka-term-curly = "1sjz4xdvdxxd1d82mgrpafi081d13pvg2csl1g8hgv38x6n2s7j2"; + sgr-iosevka-term-curly-slab = "1vb7ccphwwl1rcb4xarigyj7jqfaglrxxa5p39vc0y3qa7rmjml6"; + sgr-iosevka-term-slab = "14l465qi0ap8qjyzydwda7zzw4xp5gvj6234hqr7p5g7wp8fv1nn"; + sgr-iosevka-term-ss01 = "0b0m1aa7mq0n8yv3m6bchjh50ixl32z1247vkfa7gi53qhprr4zn"; + sgr-iosevka-term-ss02 = "08cdlhgi6sidm62yw6v2n89bmwrgqx1rdwwx72lxhm1qmgzha7yz"; + sgr-iosevka-term-ss03 = "076vpwn8yzgx8r49fpcmbz2djqpr4wa4m6mfcfr5n733pczfnfj4"; + sgr-iosevka-term-ss04 = "13hyzzwhcsk7hsx8yn84zh2z1d6kzx7p7c820cfbgz2h6d6sag8j"; + sgr-iosevka-term-ss05 = "1j3wbf35h1f7qiypbw55fpq38qmp9z4wkvbzs4rhavhjihiw9jfs"; + sgr-iosevka-term-ss06 = "1cdphl4m1khjsi4a740jn7qcl2f7qqsbsngvpyvym1h6jxq8nm34"; + sgr-iosevka-term-ss07 = "1in8zdy791c9ghifgy0wrvsmkw6368h5kzgnqriy6rrabrrib8sq"; + sgr-iosevka-term-ss08 = "1ddxyz4s5rq5l9d1f1cazgcbgzbjzga1szm50l21vl5q11k8080i"; + sgr-iosevka-term-ss09 = "03rb552pqrzkki1xiqy4c06cbj7igdgi0sh8x6myycfikn8xjy32"; + sgr-iosevka-term-ss10 = "1cs03craw089c19wk1ia82i1461fyhxlrknk0bajqd5g1snl60by"; + sgr-iosevka-term-ss11 = "1l81kf1aq7i2lxas98i4xwzy71kjpx84l7gciwc18h41f3x2cs59"; + sgr-iosevka-term-ss12 = "1svp9v04m4v1njg89qjwxvarlvnxpfibxq40izig2gzimq534iyj"; + sgr-iosevka-term-ss13 = "0s9l2h3q6hazi9wrgf9xl9l9g38bb60k99dy219vzyfkl3y7vin4"; + sgr-iosevka-term-ss14 = "1ffmyh2sfnwrfn66x1wd8r00fnmm6v7mvzs3shigz971adgk61si"; + sgr-iosevka-term-ss15 = "12xygrna1g7jaz9hzkl0bnzxaky3gjmvbgy67fi65qk0fwhjb2yf"; + sgr-iosevka-term-ss16 = "13bnl8kg2dj7yr96ngm1y8hm5w56s4mgqpq1gi11667p95wil2sy"; + sgr-iosevka-term-ss17 = "07nh459pmfdcx6pcpzixr8d472zjqkp7122dxp6ifh0kmxnzys15"; + sgr-iosevka-term-ss18 = "0f4fg4sbvh35sf41z5lhg0af4rkm03vrgnkral5kdvvpabxznwwq"; } diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index 9f3268f8d5b76..986eab13a2577 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,9 +30,4 @@ license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 5dca9b9faa918..8a1f91da34fb3 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "Japanese font package with Mincho and Gothic fonts"; @@ -19,9 +28,4 @@ license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 2e535255cc6bb..d59c111c96b73 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/jost/default.nix b/pkgs/data/fonts/jost/default.nix index 676ec842c8d24..f5d3a1e48b5a1 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{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"; - sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; + 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 + ''; meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; @@ -15,9 +23,4 @@ in (fetchzip { license = licenses.ofl; maintainers = [ maintainers.ar1a ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 47b1afd36fd96..6054066465c37 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.046"; + version = "0.048"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-mq37L3bhUhdjB8z3I9i8+wyLrMSsu/nZrZXOuqE3JlU="; + hash = "sha256-KSyJMlQclEj2CR+5uSYLmPtseWiDIUuahaPDx7Tn/bw="; }; installPhase = '' diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/data/fonts/junction/default.nix new file mode 100644 index 0000000000000..7f5ba5c4a2012 --- /dev/null +++ b/pkgs/data/fonts/junction/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "junction"; + version = "2014-05-29"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535"; + hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "Junction is a a humanist sans-serif font"; + longDescription = '' + Junction is a a humanist sans-serif, and the first open-source type + project started by The League of Moveable Type. It has been updated + (2014) to include additional weights (light/bold) and expanded + international support. + ''; + homepage = "https://www.theleagueofmoveabletype.com/junction"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 5f5ce1048c5e1..4e42cf1c4174e 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/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 2dbe43aa6aec6..1a2f51a6d625f 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,21 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = { description = "An arab fixed-width font"; homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/knewave/default.nix b/pkgs/data/fonts/knewave/default.nix new file mode 100644 index 0000000000000..eaadb7afc0de2 --- /dev/null +++ b/pkgs/data/fonts/knewave/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "knewave"; + version = "2012-07-30"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb"; + hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = " A bold, painted face for the rocker within"; + longDescription = '' + Knewave is bold, painted face. Get it? Git it. + ''; + homepage = "https://www.theleagueofmoveabletype.com/knewave"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/data/fonts/kreative-square-fonts/default.nix index c9e51319733f0..f6a0023bd11f0 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 31a857bfda057..f54c17b51f3db 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/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 7b298c73169f7..1932fd6da8a94 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/pkgs/data/fonts/last-resort/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "last-resort"; version = "15.000"; -in fetchurl { - name = "last-resort-${version}"; - 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 - recursiveHash = true; - sha256 = "sha256-mkRIA6Hajl5e9j/qb3WSKaIaHmekjl5wGUSszWMfmjw="; + install -D -m 0644 $src $out/share/fonts/truetype/LastResortHE-Regular.ttf + + runHook postInstall + ''; meta = with lib; { description = "Fallback font of last resort"; diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 7fa894c1cc8d2..ff1cc62bee0e9 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; + install -Dm644 Lato2OFL/*.ttf -t $out/share/fonts/lato + + runHook postInstall + ''; meta = with lib; { homepage = "https://www.latofonts.com/"; @@ -32,9 +42,4 @@ platforms = platforms.all; maintainers = with maintainers; [ chris-martin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato - ''; -}) +} diff --git a/pkgs/data/fonts/league-gothic/default.nix b/pkgs/data/fonts/league-gothic/default.nix new file mode 100644 index 0000000000000..4186eb70f6dbe --- /dev/null +++ b/pkgs/data/fonts/league-gothic/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchzip, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "league-gothic"; + version = "1.601"; + + src = fetchzip { + url = "https://github.com/theleagueof/league-gothic/releases/download/${self.version}/LeagueGothic-${self.version}.tar.xz"; + hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf + + runHook postInstall + ''; + + meta = { + description = "A revival of an old classic, Alternate Gothic #1"; + longDescription = '' + League Gothic is a revival of an old classic, and one of our favorite + typefaces, Alternate Gothic #1. It was originally designed by Morris + Fuller Benton for the American Type Founders Company in 1903. The company + went bankrupt in 1993, and since the original typeface was created before + 1923, the typeface is in the public domain. + + We decided to make our own version, and contribute it to the Open Source + Type Movement. Thanks to a commission from the fine & patient folks over + at WND.com, it’s been revised & updated with contributions from Micah + Rich, Tyler Finck, and Dannci, who contributed extra glyphs. + ''; + homepage = "https://www.theleagueofmoveabletype.com/league-gothic"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index f6855dc99d662..905cf0a9adec8 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -1,35 +1,46 @@ -{lib, stdenv, fetchurl, unzip, raleway}: - -let - - # TO UPDATE: - # ./update.sh > ./fonts.nix - # we use the extended version of raleway (same license). - fonts = [raleway] - ++ map fetchurl (builtins.filter (f: f.name != "raleway.zip") (import ./fonts.nix)); - -in -stdenv.mkDerivation rec { - - baseName = "league-of-moveable-type"; - version = "2016-10-15"; - name="${baseName}-${version}"; - - srcs = fonts; - - nativeBuildInputs = [ unzip ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp */*.otf $out/share/fonts/opentype - # for Raleway, where the fonts are already in /share/… - cp */share/fonts/opentype/*.otf $out/share/fonts/opentype - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0"; +{ lib +, symlinkJoin +, the-neue-black +, blackout +, chunk +, fanwood +, goudy-bookletter-1911 +, junction-font +, knewave +, league-gothic +, league-script-number-one +, league-spartan +, linden-hill +, orbitron +, ostrich-sans +, prociono +, raleway +, sniglet +, sorts-mill-goudy +}: + +symlinkJoin { + name = "league-of-moveable-type"; + + paths = [ + the-neue-black + blackout + chunk + fanwood + goudy-bookletter-1911 + junction-font + knewave + league-gothic + league-script-number-one + league-spartan + linden-hill + orbitron + ostrich-sans + prociono + raleway + sniglet + sorts-mill-goudy + ]; meta = { description = "Font Collection by The League of Moveable Type"; @@ -46,6 +57,6 @@ stdenv.mkDerivation rec { license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ bergey Profpatsch ]; + maintainers = with lib.maintainers; [ bergey minijackson Profpatsch ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/pkgs/data/fonts/league-of-moveable-type/fonts.nix deleted file mode 100644 index efbe6a4c41cb9..0000000000000 --- a/pkgs/data/fonts/league-of-moveable-type/fonts.nix +++ /dev/null @@ -1,82 +0,0 @@ -[ - { - url = "https://www.theleagueofmoveabletype.com/league-spartan/download"; - sha256 = "1z9pff8xm58njs7whaxb3sq4vbdkxv7llwgm9nqhwshmgr52jrm1"; - name = "league-spartan.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/junction/download"; - sha256 = "1qbhfha012ma26n43lm1fh06i7z47wk50r8qsp09bpxc5yr4ypi7"; - name = "junction.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/ostrich-sans/download"; - sha256 = "11ydhbgcfhmydcnim64vb035cha14krxxrbf62426dm6bvxkphp3"; - name = "ostrich-sans.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; - sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; - name = "league-gothic.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/blackout/download"; - sha256 = "1r7dihnjvy4fgvaj5m4llc9dm4cpdl1l79mhg3as16qvjgazms3p"; - name = "blackout.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/knewave/download"; - sha256 = "065yiakhm6h6jkmigj4pqm2qi6saph0pwb7g8s9gwkskhkk5iy57"; - name = "knewave.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/fanwood/download"; - sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; - name = "fanwood.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; - sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; - name = "linden-hill.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/league-script-number-one/download"; - sha256 = "056hb02a5vydrq5q0gwzanp2zkrrv1spm8sfc5wzhyfzgwd1vc76"; - name = "league-script-number-one.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/raleway/download"; - sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; - name = "raleway.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/prociono/download"; - sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; - name = "prociono.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/orbitron/download"; - sha256 = "156w4j324d350pvjmzdg2w8inhhdfzrvb86rhlavgd9sxx2fykk4"; - name = "orbitron.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; - sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; - name = "goudy-bookletter-1911.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; - sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; - name = "sorts-mill-goudy.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/chunk/download"; - sha256 = "15mbqwz90y1n4vlj2xkc8vd56va6la5qnxhiipvcmkrng5y3931j"; - name = "chunk.zip"; - } - { - url = "https://www.theleagueofmoveabletype.com/sniglet/download"; - sha256 = "1lhpnjm52gyhy9s2kwbsg1rd9iyrqli5q9ngp141igx4p1bgbqkc"; - name = "sniglet.zip"; - } -] diff --git a/pkgs/data/fonts/league-of-moveable-type/update.sh b/pkgs/data/fonts/league-of-moveable-type/update.sh deleted file mode 100644 index 4d41df4fdb85a..0000000000000 --- a/pkgs/data/fonts/league-of-moveable-type/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -SITE=https://www.theleagueofmoveabletype.com - -# since there is no nice way to get all the fonts, -# this fetches the homepage and extracts their names from the html … -fonts=$(curl "$SITE" 2>/dev/null | \ - sed -ne 's/<img.*cloudfront.*images\/\(.*\)-[[:digit:]-]\..*$/\1/p') - -# build an ad-hoc nixexpr list with the files & hashes -echo "[" -for f in $fonts; do - url="$SITE/$f/download" - hash=$(nix-prefetch-url --type sha256 "$url" 2>/dev/null) - cat <<EOF - { - url = "$url"; - sha256 = "$hash"; - name = "$f.zip"; - } -EOF -done -echo "]" - - diff --git a/pkgs/data/fonts/league-script-number-one/default.nix b/pkgs/data/fonts/league-script-number-one/default.nix new file mode 100644 index 0000000000000..11d7dc6173c5a --- /dev/null +++ b/pkgs/data/fonts/league-script-number-one/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "league-script-number-one"; + version = "2011-05-25"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "225add0b37cf8268759ba4572e02630d9fb54ecf"; + hash = "sha256-Z3Zrp0Os3On0tESVical1Qh6wY1H2Hc0OPTlkbtsrCI="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A modern, coquettish script font"; + longDescription = '' + This ain’t no Lucinda. League Script #1 is a modern, coquettish script + font that sits somewhere between your high school girlfriend’s love notes + and handwritten letters from the ’20s. Designed exclusively for the + League of Moveable Type, it includes ligatures and will act as the + framework for future script designs. + ''; + homepage = "https://www.theleagueofmoveabletype.com/league-script"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix new file mode 100644 index 0000000000000..599aeca8ca655 --- /dev/null +++ b/pkgs/data/fonts/league-spartan/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchzip, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "league-spartan"; + version = "2.220"; + + src = fetchzip { + url = "https://github.com/theleagueof/league-spartan/releases/download/${self.version}/LeagueSpartan-${self.version}.tar.xz"; + hash = "sha256-dkvWRYli8vk+E0DkZ2NWCJKfSfdo4jEcGo0puQpFVVc="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf + + runHook postInstall + ''; + + meta = { + description = "A fantastic new revival of ATF's classic Spartan, a geometric sans-serif that has no problem kicking its enemies in the chest."; + longDescription = '' + A new classic, this is a bold, modern, geometric sans-serif that has no + problem kicking its enemies in the chest. + + Taking a strong influence from ATF's classic Spartan family, we're + starting our own family out with a single strong weight. We've put a few + unique touches into a beautiful, historical typeface, and made sure to + include an extensive characterset – currently totaling over 300 glyphs. + + Over time, the open-source license will allow us expand League Spartan + into a full family, with multiple weights and styles, and we're starting + by releasing our first Bold style for this exciting, modern classic now. + ''; + homepage = "https://www.theleagueofmoveabletype.com/league-spartan"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 8f58cb92baa48..cc60f80965319 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 a4be7b5b3e6bf..56d83554e9ca9 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 63bbf8eba724e..cd55c10d2e642 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 b41ae8878cc25..f6fe791743cdf 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/linden-hill/default.nix b/pkgs/data/fonts/linden-hill/default.nix new file mode 100644 index 0000000000000..f48313fd4ac9b --- /dev/null +++ b/pkgs/data/fonts/linden-hill/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "linden-hill"; + version = "2011-05-25"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "a3f7ae6c4cac1b7e5ce5269e1fcc6a2fbb9e31ee"; + hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A digital version of Frederic Goudy’s Deepdene"; + longDescription = '' + Linden Hill is a digital version of Frederic Goudy’s Deepdene. The + package includes roman and italic. + ''; + homepage = "https://www.theleagueofmoveabletype.com/linden-hill"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/pkgs/data/fonts/linja-pi-pu-lukin/default.nix index 426acd2668d75..40f330cec7c4c 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="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/opentype/linja-pi-pu-lukin.otf - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/opentype/linja-pi-pu-lukin.otf + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index ebe4ceb88ca11..3881f0f0f4e76 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -1,13 +1,24 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; - sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; + 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}/ + cp otf/*.otf $out/share/fonts/opentype/ + cp doc/*.txt $out/share/doc/latinmodern-math-${version}/ + + runHook postInstall + ''; 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"; @@ -19,11 +30,4 @@ in (fetchzip rec { maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - 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}/ - ''; -}) +} diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix new file mode 100644 index 0000000000000..3ae29a8e2a41a --- /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.006"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; + hash = "sha256-n7TTunWOHGWLxvs75r5My1il0KELOZbAgTGqtMpQ+mQ="; + }; + + 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/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index 9bf4f32caeb27..7c9ab17a79d1d 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 30e0c1a8b67a1..15a77c2481935 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -5,10 +5,11 @@ }: let - maple-font = { pname, version, sha256, desc }: stdenv.mkDerivation + maple-font = { pname, sha256, desc }: stdenv.mkDerivation rec{ - inherit pname version desc; + inherit pname desc; + version = "6.2"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; inherit sha256; @@ -31,23 +32,28 @@ let platforms = platforms.all; maintainers = with maintainers; [ oluceps ]; }; - }; + in { - Mono-v5 = maple-font { + Mono = maple-font { pname = "MapleMono"; - version = "5.5"; - sha256 = "sha256-xkZ9NefjWHPjWNW8LGM8CgT2Zrg4j1evvx1K56sUzR8="; + sha256 = "sha256-KhG0gQRnHFvpoxdcySSEYWDtOgG4xIm8X0Ua9o1aGTw="; desc = "monospace"; }; - Mono-NF-v5 = maple-font { + + NF = maple-font { pname = "MapleMono-NF"; - version = "5.5"; - sha256 = "sha256-cPVGuH1CSfnRvQ4ehBvOVno7CT6Popc1Nnpcn5uJoQY="; + sha256 = "sha256-Ov6AEaLy80cwrFtmKWUceI809SwBlHsQf2F86/sc/6A="; desc = "Nerd Font"; }; + SC-NF = maple-font { + pname = "MapleMono-SC-NF"; + sha256 = "sha256-bb62YGzdE9qvlyuZG7YI16gOxWC+AijlRLY8ET+q5Rg="; + desc = "Nerd Font SC"; + }; + } diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index b8dd5492a56f7..7f6bedc75e8bd 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "marathi-cursive"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; - hash = "sha256-JE9T3UMSYn/JfEWuWHikDJIlt4nZl6GzY98v3vG6di4="; + hash = "sha256-C/z8ALV9bht0SaYqACO5ulSVCk1d6wBwvpVC4ZLgtek="; }; installPhase = '' diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 656be1b153eb3..f03e8683e5097 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 0000000000000..5cd79834b3cac --- /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/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index f0ff4c1b2052e..59597120c1003 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -1,22 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; + + 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 + cp fonts/*.ttf $out/share/fonts/truetype/ + ''; meta = with lib; { description = "minimalist monospaced font"; homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index b45d130b1c284..7f7c2876694fc 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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 - sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY="; + mkdir -p $out/share/fonts/mononoki + cp webfont/* $out/share/fonts/mononoki + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/madmalik/mononoki"; @@ -16,9 +25,4 @@ in (fetchzip { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/mononoki - unzip -j $downloadedFile -d $out/share/fonts/mononoki - ''; -}) +} diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index cb396080e49f8..6074018f55459 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/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index c36292eb00141..5d8aa43a5b21c 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/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index fbceb3c927dcb..d036eed35c966 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 4a0e3c975f542..3798a33b66c67 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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 - sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc"; + mkdir -p $out/share/fonts/NanumGothicCoding + cp *.ttf $out/share/fonts/NanumGothicCoding + + runHook postInstall + ''; meta = with lib; { description = "A contemporary monospaced sans-serif typeface with a warm touch"; @@ -18,9 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/NanumGothicCoding - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding - ''; -}) +} diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/data/fonts/nanum/default.nix index 8f432edf41965..64575a1310290 100644 --- a/pkgs/data/fonts/nanum/default.nix +++ b/pkgs/data/fonts/nanum/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "nanum"; - version = "20170925"; + version = "20200506"; src = fetchurl { url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; - hash = "sha256-GlVXH9YUU3wHMkNoz5miBv7N2oUEbwUXlcVoElQ9++4="; + hash = "sha256-FXgDdIGYFRJQo898sDrvhE5AjpyYhJ3YieGRhGqsrUs="; }; installPhase = '' diff --git a/pkgs/data/fonts/nasin-nanpa/default.nix b/pkgs/data/fonts/nasin-nanpa/default.nix new file mode 100644 index 0000000000000..cd05c667a2487 --- /dev/null +++ b/pkgs/data/fonts/nasin-nanpa/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "nasin-nanpa"; + version = "2.5.1"; + + srcs = [ + (fetchurl { + name = "nasin-nanpa.otf"; + url = "https://github.com/ETBCOR/nasin-nanpa/releases/download/n${version}/nasin-nanpa-${version}.otf"; + hash = "sha256-++uOrqFzQ6CB/OPEmBivpjMfAtFk3PSsCNpFBjOtGEg="; + }) + (fetchurl { + name = "nasin-nanpa-lasina-kin.otf"; + url = "https://github.com/ETBCOR/nasin-nanpa/releases/download/n${version}/nasin-nanpa-${version}-lasina-kin.otf"; + hash = "sha256-4WIX74y2O4NaKi/JQrgTbOxlKDQKJ/F9wkQuoOdWuTI="; + }) + ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + for src in $srcs; do + file=$(stripHash $src) + cp $src $out/share/fonts/opentype/$file + done + ''; + + meta = with lib; { + homepage = "https://github.com/ETBCOR/nasin-nanpa"; + description = "UCSUR OpenType monospaced font for the Toki Pona writing system, Sitelen Pona"; + longDescription = '' + ni li nasin pi sitelen pona. + sitelen ale pi nasin ni li sama mute weka. + sitelen pi nasin ni li lon nasin UCSUR kin. + ''; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index cfa36870ed4bc..4970e0d5920fa 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; - sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; + 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 + ''; meta = with lib; { description = ''Typeface designed to mimic the national park service @@ -17,9 +25,4 @@ in (fetchzip { license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ - ''; -}) +} diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index f497a184be01c..f5076f3c93cb6 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 5d96ba5527205..f1236d5c05c10 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; - sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + cp ${pname}-v${version}/${pname}.otf $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { homepage = "http://jamiewilson.io/norwester"; @@ -18,9 +26,4 @@ in (fetchzip { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ - ''; -}) +} diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 6161f711958c4..b3e4d7d67bced 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -230,15 +230,22 @@ rec { 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="; - - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf + stdenvNoCC.mkDerivation { + inherit pname version; + + 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/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix index 0513baf486802..f05a7ddd319c8 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="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m644 -Dt $out/share/doc/${name} README.md + 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/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index c6b7846a85fe9..33bf37c18baef 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldstandard"; version = "2.2"; - name = "oldstandard-${version}"; -in (fetchzip rec { - inherit name; - 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 - sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + install -m444 -Dt $out/share/fonts/opentype *.otf + install -m444 -Dt $out/share/doc/${pname}-${version} FONTLOG.txt + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/oldstand"; @@ -18,10 +26,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} FONTLOG.txt - ''; -}) +} diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index f34ff0c17b7a7..8a6b01b1d6d79 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,26 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/open-dyslexic + + runHook postInstall + ''; 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 ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/data/fonts/open-fonts/default.nix index e503b11430336..6a628174f2e4f 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 0c7f8dce57a3c..4883cd818b1c1 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 f4a0a9600a156..dcbf0085141ee 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,45 +1,48 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "20110526"; -in fetchFromGitHub { - name = "orbitron-${version}"; +stdenvNoCC.mkDerivation (self: { + pname = "orbitron"; + version = "2011-05-25"; - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "13e6a5222aa6818d81c9acd27edd701a2d744152"; + hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; + }; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf - install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf - ''; + installPhase = '' + runHook preInstall - sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + 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; - maintainers = [ maintainers.leenaars ]; + maintainers = with lib.maintainers; [ leenaars minijackson ]; }; -} +}) diff --git a/pkgs/data/fonts/ostrich-sans/default.nix b/pkgs/data/fonts/ostrich-sans/default.nix new file mode 100644 index 0000000000000..b86727312ec10 --- /dev/null +++ b/pkgs/data/fonts/ostrich-sans/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "ostrich-sans"; + version = "2014-04-18"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "a949d40d0576d12ba26e2a45e19c91fd0228c964"; + hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A gorgeous modern sans-serif with a very long neck"; + longDescription = '' + A gorgeous modern sans-serif with a very long neck. With a whole slew of + styles & weights. + ''; + homepage = "https://www.theleagueofmoveabletype.com/ostrich-sans"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 553b4e52efdbb..521c08c85cea1 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "overpass"; version = "3.0.5"; - name = "overpass-${version}"; -in (fetchzip rec { - inherit name; - 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; + 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 + ''; meta = with lib; { homepage = "https://overpassfont.org/"; @@ -18,11 +26,4 @@ in (fetchzip rec { platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - 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} - ''; -}) +} diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index e34e49d981475..32d9273d63905 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 a3d273bb8ae1a..a91596a66e513 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 292e9466b96cb..86646ae0ac5de 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 1c976ecb489ed..dffd25c23aa59 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index abe6c3d87f661..f346382d1f738 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index f0bdbc3ea0046..568363889ff23 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/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3a2ae92c1e5a5..ea2da0fe2ecff 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/prociono/default.nix b/pkgs/data/fonts/prociono/default.nix new file mode 100644 index 0000000000000..b5bdf4d22926d --- /dev/null +++ b/pkgs/data/fonts/prociono/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "prociono"; + version = "2011-05-25"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "f9d9680de6d6f0c13939f23c9dd14cd7853cf844"; + hash = "sha256-gC5E0Z0O2cnthoBEu+UOQLsr3/a/3/JPIx3WCPsXXtk="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A roman serif with blackletter elements"; + longDescription = '' + "Prociono" (pro-tsee-O-no) is an Esperanto word meaning either the star + Procyon or the animal species known as the raccoon. It is a roman serif + with blackletter elements. + ''; + homepage = "https://www.theleagueofmoveabletype.com/prociono"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index e8881fce3674c..195b6ed1d39ad 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.upperbounds.net"; + homepage = "https://www.upperbounds.net"; description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 36fa7b136aff9..0682388978316 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-Ba7D4J72GZQsGn0KINRib9BmHsAnoEsAwAOC+M3CkMU="; + install -Dm644 */*/*.otf -t $out/share/fonts/opentype + install -Dm644 */*/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; @@ -18,10 +27,4 @@ in (fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 7841a203f7e7f..7659598842324 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,27 +1,29 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "quattrocento-sans"; version = "2.0"; - name = "quattrocento-sans-${version}"; -in (fetchzip rec { - inherit name; - 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; + install -Dm644 */*/QuattrocentoSans*.otf -t $out/share/fonts/opentype + install -Dm644 */FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; 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 ]; }; -}).overrideAttrs (_: { - 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} - ''; -}) +} diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 12f146c0e8fcd..a70396437ec1b 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -1,27 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "quattrocento"; version = "1.1"; - name = "quattrocento-${version}"; -in (fetchzip rec { - inherit name; - 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; + install -Dm644 */*.otf -t $out/share/fonts/opentype + install -Dm644 FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; 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 ]; }; -}).overrideAttrs (_: { - 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} - ''; -}) +} diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index ddded71a6fa21..c1d766f7d36b5 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,42 +1,40 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchzip, stdenvNoCC }: -let - version = "2016-08-30"; -in fetchFromGitHub { - name = "raleway-${version}"; +stdenvNoCC.mkDerivation (self: { + pname = "raleway"; + version = "4.101"; - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + src = fetchzip { + url = "https://github.com/theleagueof/raleway/releases/download/${self.version}/Raleway-${self.version}.tar.xz"; + hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww="; + }; - postFetch = '' - tar xf $downloadedFile --strip=1 - find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \; - cp *.txt *.md -d $out - ''; + installPhase = '' + runHook preInstall - sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf + + runHook postInstall + ''; meta = { description = "Raleway is an elegant sans-serif typeface family"; - longDescription = '' Initially designed by Matt McInerney as a single thin weight, it was expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida - in 2012 and iKerned by Igino Marini. In 2013 the Italics where added. + in 2012 and iKerned by Igino Marini. In 2013 the Italics where added, and + most recently — a variable version. - It is a display face and the download features both old style and lining - numerals, standard and discretionary ligatures, a pretty complete set of - diacritics, as well as a stylistic alternate inspired by more geometric - sans-serif typefaces than its neo-grotesque inspired default character - set. + It features both old style and lining numerals, standard and + discretionary ligatures, a pretty complete set of diacritics, as well as + a stylistic alternate inspired by more geometric sans-serif typefaces + than its neo-grotesque inspired default character set. It also has a sister display family, Raleway Dots. ''; - - homepage = "https://github.com/impallari/Raleway"; + homepage = "https://www.theleagueofmoveabletype.com/raleway"; license = lib.licenses.ofl; - - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = with lib.maintainers; [ minijackson Profpatsch ]; }; -} +}) diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 9daaffd0b4ba0..76782d5105091 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub }: -let - version = "4.0.2"; -in -fetchFromGitHub { - name = "redhat-official-${version}"; +{ lib, stdenvNoCC, fetchFromGitHub }: - owner = "RedHatOfficial"; - repo = "RedHatFont"; - rev = version; +stdenvNoCC.mkDerivation rec { + pname = "redhat-official"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "RedHatOfficial"; + repo = "RedHatFont"; + rev = version; + hash = "sha256-r43KtMIedNitb5Arg8fTGB3hrRZoA8oUHVEL24k4LeQ="; + }; + + 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 fc89d65259222..1c36f41b48399 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 0000000000000..d6cc1019ccd41 --- /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 9f53eaa38cd1c..02ca82edf10f0 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = { homepage = "https://github.com/google/roboto"; @@ -22,9 +30,4 @@ in (fetchzip { platforms = lib.platforms.all; maintainers = [ lib.maintainers.romildo ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 9079ba7fada0b..860a0066270d1 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 b29114e6b1c4a..a1785e1b93739 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/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 9bfe95518dc12..b0e341cf88f16 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.38.0"; -in fetchurl { - name = "sarasa-gothic-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "sarasa-gothic"; + version = "0.40.1"; - # 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-lGkb3e2EFHkDLm+/KArfOQ50qBFRThlpcID06g0t4aI="; + 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-cpgFOhmFSyJA2yhGCCud9jF3LEboiRKyfb3NPiRzJdQ="; + }; + + sourceRoot = "."; - recursiveHash = true; - downloadToTemp = true; + 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 07c7f6b0bc310..9960248b0d752 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,20 +1,30 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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}"; - name = "scheherazade${lib.optionalString new "-new"}-${version}"; + pname = "scheherazade${lib.optionalString new "-new"}"; +in +stdenvNoCC.mkDerivation rec { + inherit pname version; + + src = fetchzip { + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; + inherit hash; + }; -in (fetchzip rec { - inherit name; + installPhase = '' + runHook preInstall - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc + cp -r documentation $out/share/doc/ - inherit sha256; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/scheherazade/"; @@ -40,13 +50,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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} - ''; -}) +} diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index bf5b887cc7713..1f946ecb17af9 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"; - - downloadToTemp = true; - - recursiveHash = true; + src = fetchurl { + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + hash = "sha256-8IV4aaDoRsbxddy4U90fEZ6henUhjmO38HNtWo4ein8="; + }; - sha256 = "sha256-pVWkj/2lFpmWk0PPDrIMU4Gey7/m/9tzUsuD3ZDUAdc="; + installPhase = '' + runHook preInstall - 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/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index d5e7e2b243c3f..c5f5e00e023a4 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/sniglet/default.nix b/pkgs/data/fonts/sniglet/default.nix new file mode 100644 index 0000000000000..a109637a9a1bb --- /dev/null +++ b/pkgs/data/fonts/sniglet/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "sniglet"; + version = "2011-05-25"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "5c6b0860bdd0d8c4f16222e4de3918c384db17c4"; + hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A fun rounded display face that’s great for headlines"; + longDescription = '' + A rounded display face that’s great for headlines. It comes with a full + character set, so you can type in Icelandic or even French! + ''; + homepage = "https://www.theleagueofmoveabletype.com/sniglet"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/sorts-mill-goudy/default.nix b/pkgs/data/fonts/sorts-mill-goudy/default.nix new file mode 100644 index 0000000000000..432740a9267da --- /dev/null +++ b/pkgs/data/fonts/sorts-mill-goudy/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "sorts-mill-goudy"; + version = "2011-05-25"; + + src = fetchFromGitHub { + owner = "theleagueof"; + repo = self.pname; + rev = "06072890c7b05f274215a24f17449655ccb2c8af"; + hash = "sha256-NEfLBJatUmdUL5gJEimJHZfOd1OtI7pxTN97eWMODyM="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "A ‘revival’ of Goudy Oldstyle and Italic"; + longDescription = '' + A 'revival' of Goudy Oldstyle and Italic, with features including small + capitals (in the roman only), oldstyle and lining figures, superscripts + and subscripts, fractions, ligatures, class-based kerning, case-sensitive + forms, and capital spacing. There is support for many languages using + latin scripts. + ''; + homepage = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 37273530bb5c2..c94e9aaca4809 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368"; + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "Monospaced font family for user interface and coding environments"; @@ -17,9 +25,4 @@ in (fetchzip { homepage = "https://adobe-fonts.github.io/source-code-pro/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix index 076291ab88934..2a64680ee19bc 100644 --- a/pkgs/data/fonts/source-han-code-jp/default.nix +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "16y5as1k864ghy3vzp8svr3q0sw57rv53za3f48700ksvxz5pwry"; + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "A monospaced Latin font suitable for coding"; @@ -18,9 +24,4 @@ in (fetchzip { homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index edf8ecfaa49fd..2f9111865455f 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -1,7 +1,7 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ stdenvNoCC -, lib -, fetchzip +{ lib +, stdenvNoCC +, fetchurl +, unzip }: let @@ -9,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; + 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"; @@ -31,18 +47,14 @@ let license = lib.licenses.ofl; maintainers = with lib.maintainers; [ taku0 emily ]; }; - }).overrideAttrs (_: { inherit postFetch; }); + }; in { sans = makePackage { 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"; }; @@ -50,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"; }; @@ -62,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 382c20aa97687..2a2d2c70f289c 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,18 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; + + src = fetchzip { + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + hash = "sha256-1Savijgq3INuUN89MR0t748HOuGseXVw5Kd4hYwuVas="; + }; + + installPhase = '' + runHook preInstall - url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + 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 - sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY="; + runHook postInstall + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-sans/"; @@ -21,11 +31,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/data/fonts/source-sans/default.nix index 94df27765ee28..1433804ce71d7 100644 --- a/pkgs/data/fonts/source-sans/default.nix +++ b/pkgs/data/fonts/source-sans/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94"; + 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 + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-sans/"; @@ -17,11 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index 8f2ae0f79904c..698694faf5074 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,18 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk="; + 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 + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-serif/"; @@ -21,11 +31,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/data/fonts/source-serif/default.nix index 3c61627183c01..626b36f2705b0 100644 --- a/pkgs/data/fonts/source-serif/default.nix +++ b/pkgs/data/fonts/source-serif/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h"; + 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 + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-serif/"; @@ -17,11 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - 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 - ''; -}) +} diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 737a799438fc7..89d189f4f8b13 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 + version = "1.9.2"; + + src = fetchurl { + url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; + hash = "sha256-AOGgGJLye0Yg3QTlNZPgRdtRim8atn+ZIm8aPpUnivY="; + }; + + 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-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index fb494391a8784..86ceb388f86aa 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o="; + install -Dm644 */*.otf -t $out/share/fonts/opentype + install -Dm644 */*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { homepage = "https://www.stixfonts.org/"; @@ -17,10 +26,4 @@ in platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index c4af97c7cc253..26870d8003b93 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; + + 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"; @@ -16,9 +25,4 @@ in (fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 3c9494f1c0436..6231d0e0c1dc5 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,14 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall + + for i in *.ttf; do + local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" + install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" + 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"; @@ -20,15 +32,4 @@ in (fetchzip { license = licenses.ofl; maintainers = with maintainers; [ ]; }; -}).overrideAttrs (_: { - postFetch = '' - unzip -j $downloadedFile - - for i in *.ttf; do - local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" - install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" - done - - install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" - ''; -}) +} diff --git a/pkgs/data/fonts/the-neue-black/default.nix b/pkgs/data/fonts/the-neue-black/default.nix new file mode 100644 index 0000000000000..af3cd639c6e91 --- /dev/null +++ b/pkgs/data/fonts/the-neue-black/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchzip, stdenvNoCC }: + +stdenvNoCC.mkDerivation (self: { + pname = "the-neue-black"; + version = "1.007"; + + src = fetchzip { + url = "https://github.com/theleagueof/the-neue-black/releases/download/${self.version}/TheNeueBlack-${self.version}.tar.xz"; + hash = "sha256-AsB6w1000xdl+pOPDXqqzQhru1T/VD0hIJ4gFec7mU4="; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf + install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf + + runHook postInstall + ''; + + meta = { + description = "Tré Seals’ first open-source font, a typeface based on the Chicago Freedom Movement"; + longDescription = '' + The open-source release of The Neue Black is in partnership with designer + Tré Seals of Vocal Type Co. The Neue Black is a display sans serif with a + robust character set that has over 25 ligatures and various inktrap + alternates. + ''; + homepage = "https://www.theleagueofmoveabletype.com/the-neue-black"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ minijackson ]; + }; +}) diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index 69107f4a8e577..3a3107e136666 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,15 +1,25 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "theano"; version = "2.0"; - name = "theano-${version}"; -in (fetchzip rec { - inherit name; - 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 - sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${pname}-${version} + cp *.otf $out/share/fonts/opentype + cp *.txt $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/theano"; @@ -18,11 +28,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - 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}" - ''; -}) +} diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/data/fonts/times-newer-roman/default.nix index 8f6e7eceb0c01..840e75c710b30 100644 --- a/pkgs/data/fonts/times-newer-roman/default.nix +++ b/pkgs/data/fonts/times-newer-roman/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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 - hash = "sha256-Hx59RYLLwfimEQjEEes0lCpg6iql46DFwhQ7kVGiEzc="; + mkdir -p $out/share/fonts/opentype + cp *.otf $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "A font that looks just like Times New Roman, except each character is 5-10% wider"; @@ -18,9 +26,4 @@ in maintainers = with maintainers; [ ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/data/fonts/tt2020/default.nix index c92e86032733f..63b4e1834a3b0 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/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 2c945f2452866..27933b5b139d4 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,13 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + + 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 + cp */*.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)"; @@ -16,9 +26,4 @@ in license = licenses.cc-by-sa-40; maintainers = [ maintainers.endgame ]; }; -}).overrideAttrs (_: { - postFetch= '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index fe694a5e31a6b..3e3087c6abc8b 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let name = "undefined-medium-1.0"; -in (fetchzip rec { - inherit name; +{ lib, stdenvNoCC, fetchzip }: - url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; +stdenvNoCC.mkDerivation rec { + pname = "undefined-medium"; + version = "1.1"; - sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk"; + src = fetchzip { + url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; + hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://undefined-medium.com/"; @@ -19,9 +28,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 026a262a8455f..aa8720683025c 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 6702fd1b02209..6ba69b57feafc 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 b8885298c084e..d65b270c881f0 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}"; + version = "33.003"; - owner = "rastikerdar"; - repo = "vazir-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + hash = "sha256-C1UtfrRFzz0uv/hj8e7huXe4sNd5h7ozVhirWEAyXGg="; + }; + + 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/vollkorn/default.nix b/pkgs/data/fonts/vollkorn/default.nix index b5e3a8e5729df..deeeac19c9394 100644 --- a/pkgs/data/fonts/vollkorn/default.nix +++ b/pkgs/data/fonts/vollkorn/default.nix @@ -1,30 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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; - meta = with lib; { - homepage = "http://vollkorn-typeface.com/"; - description = "The free and healthy typeface for bread and butter use"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.schmittlauch ]; + src = fetchzip { + url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; + stripRoot = false; + hash = "sha256-oG79GgCwCavbMFAPakza08IPmt13Gwujrkc/NKTai7g="; }; -}).overrideAttrs (_: { - postFetch = '' + + 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; { + homepage = "http://vollkorn-typeface.com/"; + description = "The free and healthy typeface for bread and butter use"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.schmittlauch ]; + }; +} diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index 7171f65cb689c..00f9cebac121f 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 _docs/font-source/weathericons-regular.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "Weather Icons"; @@ -21,9 +29,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ pnelson ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/data/fonts/work-sans/default.nix index 208f370105798..07c5704b51713 100644 --- a/pkgs/data/fonts/work-sans/default.nix +++ b/pkgs/data/fonts/work-sans/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "sha256-S4O5EoKY4w/p+MHeHRCmPyQRAOUfEwNiETxMgNcsrws="; + install -Dm644 fonts/variable/*.ttf fonts/static/TTF/*.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "A grotesque sans"; @@ -18,9 +24,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "*/fonts/*.ttf" -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index a5106b5e6b183..c59f74d45474c 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -12,8 +12,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ + install -Dm644 *.ttc -t $out/share/fonts/ runHook postInstall ''; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index cfdd3c0eae0b9..c1ddbe9fae6c9 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="; + }; + + installPhase = '' + runHook preInstall - 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 + install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf + install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + 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 2b1a967043df0..99cd30f3dfa73 100644 --- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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="; + }; + + installPhase = '' + runHook preInstall - sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "The free font classic"; @@ -15,9 +25,4 @@ homepage = "https://yanone.de/fonts/kaffeesatz/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix index e3dd19c71127e..886362d78e990 100644 --- a/pkgs/data/fonts/zilla-slab/default.nix +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -1,13 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ 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"; - sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; + 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 + ''; meta = with lib; { homepage = "https://github.com/mozilla/zilla-slab"; @@ -26,10 +36,4 @@ in (fetchzip { maintainers = with maintainers; [ caugner ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ - ''; -}) +} diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/data/icons/capitaine-cursors-themed/default.nix index d86ce3f8161ae..bd0147fecde31 100644 --- a/pkgs/data/icons/capitaine-cursors-themed/default.nix +++ b/pkgs/data/icons/capitaine-cursors-themed/default.nix @@ -1,14 +1,22 @@ -{ lib, fetchzip }: -fetchzip rec { +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation 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 = '' + src = fetchzip { + url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip"; + stripRoot = false; + hash = "sha256-ipPpmZKU/xLA45fdOvxVbtFDCUsCYIvzeps/DjhFkNg="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons cp -r ./ $out/share/icons + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/icons/catppuccin-papirus-folders/default.nix b/pkgs/data/icons/catppuccin-papirus-folders/default.nix new file mode 100644 index 0000000000000..263ea1f374287 --- /dev/null +++ b/pkgs/data/icons/catppuccin-papirus-folders/default.nix @@ -0,0 +1,54 @@ +{ + stdenvNoCC, + lib, + fetchFromGitHub, + gtk3, + papirus-icon-theme, + flavor ? "mocha", + accent ? "blue" +}: let + validAccents = ["blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow"]; + validFlavors = ["latte" "frappe" "macchiato" "mocha"]; + pname = "catppuccin-papirus-folders"; +in + lib.checkListOfEnum "${pname}: accent colors" validAccents [ accent ] + lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ] + + stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2022-12-04"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "papirus-folders"; + rev = "1a367642df9cf340770bd7097fbe85b9cea65bcb"; + sha256 = "sha256-mFDfRVDA9WyriyFVzsI7iqmPopN56z54FvLkZDS2Dv8="; + }; + + nativeBuildInputs = [ gtk3 ]; + + postPatch = '' + patchShebangs ./papirus-folders + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r --no-preserve=mode ${papirus-icon-theme}/share/icons/Papirus* $out/share/icons + cp -r src/* $out/share/icons/Papirus + for theme in $out/share/icons/*; do + USER_HOME=$HOME DISABLE_UPDATE_ICON_CACHE=1 \ + ./papirus-folders -t $theme -o -C cat-${flavor}-${accent} + gtk-update-icon-cache --force $theme + done + runHook postInstall + ''; + + meta = with lib; { + description = "Soothing pastel theme for Papirus Icon Theme folders"; + homepage = "https://github.com/catppuccin/papirus-folders"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rubyowo ]; + }; + } diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/data/icons/fluent-icon-theme/default.nix index e7553b4b74d42..50c11d7b3a8c8 100644 --- a/pkgs/data/icons/fluent-icon-theme/default.nix +++ b/pkgs/data/icons/fluent-icon-theme/default.nix @@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-30"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-sxs2GrPuUoitZtiIU7SWFSLGXOTitS41MGt17TeuICE="; + hash = "sha256-Plm05+5r6p9MabLmmh8kWitALGFalruBbhAgBhPCjRo="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 529f8aec9e64f..17c5b7fa36dfe 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 = "23.01.12"; + version = "23.02.25"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-WqCQxZcr19tKcEwULoW9O3rhq3fFs4xRl37p7VJYodY="; + sha256 = "sha256-JQK4GjL3piztBVXRnIMNxdB+XTXNaNvWg0wLLui4tRE="; }; 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 2337a97517cc1..f3503a9f5f073 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 = "23.01.12"; + version = "23.02.16"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-DqinupNkjAzjiLkuPCw9IaKRCHtwGnvUQbPNLUeqtRs="; + sha256 = "sha256-z9LHSfhCTeHsf4XtPJeOqOqfKHHz0B7n2hciIpCQ9H4="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 3e065a74dfeff..9b41b66c8de5e 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-05"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-KQ3NmxNtJTURjH15hyZzngJ6aVTwlze28xQbRTlQmPE="; + sha256 = "sha256-yXpHm/iXtBdEo6m8W7Itp3N9vrWRTb7S3aKi0X2RObo="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index cb55697fa50bc..eee3a425b709b 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -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 = [ diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index da37b5887e02c..2b98e09eca29b 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/volantes-cursors/default.nix b/pkgs/data/icons/volantes-cursors/default.nix new file mode 100644 index 0000000000000..b7ef49135e93d --- /dev/null +++ b/pkgs/data/icons/volantes-cursors/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, inkscape +, xcursorgen +}: +stdenv.mkDerivation { + pname = "volantes-cursors"; + version = "2022-08-27"; + + src = fetchFromGitHub { + owner = "varlesh"; + repo = "volantes-cursors"; + rev = "b13a4bbf6bd1d7e85fadf7f2ecc44acc198f8d01"; + hash = "sha256-vJe1S+YHrUBwJSwt2+InTu5ho2FOtz7FjDxu0BIA1Js="; + }; + + strictDeps = true; + nativeBuildInputs = [ inkscape xcursorgen ]; + + makeTargets = [ "build" ]; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = with lib; { + homepage = "https://www.pling.com/p/1356095/"; + description = "Classic cursor theme with a flying style"; + license = licenses.gpl2; + maintainers = with maintainers; [ jordanisaacs ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index c138ac710d57b..7c28c82e86467 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230112"; + version = "20230212"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-mMu+U3gtoZmi6LrTMTqsNZKZ+w4J6LZ16Aorneyy7P8="; + sha256 = "sha256-Tnma6tpET4Vrm5G8KmLpsVnpD2JIKts56kZQsBIbRZ8="; }; dontUnpack = true; diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index f19b666abeabf..729d3cdbb7b89 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -1,23 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; version = "42.0"; - url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; + src = fetchzip { + url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; + stripRoot = false; + hash = "sha256-paRon3ecGXNp3ZDnN1DU9RVU2NDWTBiKjy0OP3vcPLE="; + }; + + installPhase = '' + runHook preInstall - stripRoot = false; - postFetch = '' mkdir -p $out/share/unicode/cldr/common - mv $out/common/annotations{,Derived} -t $out/share/unicode/cldr/common + mv common/annotations{,Derived} -t $out/share/unicode/cldr/common - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-9OOd69nBaDSt+ilL3PTGpcQgC60PnHqd8/CYa2LgeI0="; - meta = with lib; { description = "Names and keywords for Unicode characters from the Common Locale Data Repository"; homepage = "https://cldr.unicode.org"; diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix index 261a7741f16fd..0ce188bdc9067 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 3d91a4e7e727f..343c206b33015 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 = "20230223"; src = fetchFromGitHub { owner = "ddccontrol"; - repo = "ddccontrol-db"; + repo = pname; rev = version; - sha256 = "sha256-OmroJ2AEQdELE2Wuk1qPXzp+/9RUUULrEAdEpmXrJxw="; + sha256 = "sha256-ehmMSriBYVOeKbXDybpnbYwBEQJcN0NQJ3zaneMxFmQ="; }; - 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/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 9e14413b745c8..bc5feff0162c7 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz", - "sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w", - "msg": "Update from Hackage at 2023-01-08T15:35:40Z" + "commit": "220fb2ad74640b02e543271393f21ba227bd2627", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/220fb2ad74640b02e543271393f21ba227bd2627.tar.gz", + "sha256": "1hpbqw04i8p2h5w31a7rqlmhdjpj4r4v62kdqich57hm1cj2ml7h", + "msg": "Update from Hackage at 2023-02-13T17:53:53Z" } diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/data/misc/papirus-folders/default.nix index 92bfe362bcda5..24fbeb0b0e23d 100644 --- a/pkgs/data/misc/papirus-folders/default.nix +++ b/pkgs/data/misc/papirus-folders/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-folders"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; rev = "v${version}"; - sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY="; + sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g="; }; buildInputs = [ diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 6d35279b6de20..392761a9bd250 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "poppler-data"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; - sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; + sha256 = "yDW2QKQM41fhuDZmqr2V7f+iTd3dSbja/2OtuFHNq3Q="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index 063e120d3c4b1..02b0ba0b439b5 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "2021-09-03"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "publicsuffix"; - repo = "list"; - rev = "2533d032871e1ef1f410fc0754b848d4587c8021"; - sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I="; + version = "unstable-2021-09-03"; - postFetch = '' - install -Dm0444 $out/public_suffix_list.dat $out/tests/test_psl.txt -t $out/share/publicsuffix - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchFromGitHub { + owner = "publicsuffix"; + repo = "list"; + rev = "2533d032871e1ef1f410fc0754b848d4587c8021"; + hash = "sha256-moibTN9KovABcg+ubKUgMXg4b8sMrTVo6Itmiati/Vk="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index e1709ae35cf31..4bfe201beb484 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; buildInputs = lib.optional (!stdenv.isLinux) libiconv; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; preConfigure = '' patchShebangs . diff --git a/pkgs/data/misc/sing-geoip/default.nix b/pkgs/data/misc/sing-geoip/default.nix new file mode 100644 index 0000000000000..e8ea5ddd44280 --- /dev/null +++ b/pkgs/data/misc/sing-geoip/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenvNoCC +, buildGoModule +, fetchFromGitHub +, clash-geoip +}: + +let + generator = buildGoModule rec { + pname = "sing-geoip"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "SagerNet"; + repo = pname; + rev = "2ced72c94da4c9259c40353c375319d9d28a78f3"; + hash = "sha256-z8aP+OfTuzQNwOT3EEnI9uze/vbHTJLEiCPqIrnNUHw="; + }; + + vendorHash = "sha256-lr0XMLFxJmLqIqCuGgmsFh324jmZVj71blmStMn41Rs="; + + postPatch = '' + # The codes args should start from the third args + substituteInPlace main.go --replace "os.Args[2:]" "os.Args[3:]" + ''; + + meta = with lib; { + description = "GeoIP data for sing-box"; + homepage = "https://github.com/SagerNet/sing-geoip"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ linsui ]; + }; + }; +in +stdenvNoCC.mkDerivation rec { + inherit (generator) pname; + inherit (clash-geoip) version; + + dontUnpack = true; + + nativeBuildInputs = [ generator ]; + + buildPhase = '' + runHook preBuild + + ${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip.db + ${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip-cn.db cn + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 geoip.db $out/share/sing-box/geoip.db + install -Dm644 geoip-cn.db $out/share/sing-box/geoip-cn.db + + runHook postInstall + ''; + + passthru = { inherit generator; }; + + meta = generator.meta // { + inherit (clash-geoip.meta) license; + }; +} diff --git a/pkgs/data/misc/sing-geosite/default.nix b/pkgs/data/misc/sing-geosite/default.nix new file mode 100644 index 0000000000000..55ba01c61559d --- /dev/null +++ b/pkgs/data/misc/sing-geosite/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, substituteAll +, v2ray-domain-list-community +}: + +let + patch = substituteAll { + src = ./main.go; + geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; + }; +in +buildGoModule rec { + pname = "sing-geosite"; + inherit (v2ray-domain-list-community) version; + + src = fetchFromGitHub { + owner = "SagerNet"; + repo = "sing-geosite"; + rev = "4a32d56c1705f77668beb5828df0b0a051efdeb9"; + hash = "sha256-P/EBcwJI2G9327BNi84R+q6BABx9DEKpN6ETTp8Q4NU="; + }; + + vendorHash = "sha256-uQOmUXT2wd40DwwTCMnFFKd47eu+BPBDjiCGtUNFoKY="; + + patchPhase = '' + sed -i -e '/func main()/,/^}/d' -e '/"io"/a "io/ioutil"' main.go + cat ${patch} >> main.go + ''; + + buildPhase = '' + runHook preBuild + go run -v . + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm644 geosite.db $out/share/sing-box/geosite.db + runHook postInstall + ''; + + meta = with lib; { + description = "community managed domain list"; + homepage = "https://github.com/SagerNet/sing-geosite"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ linsui ]; + }; +} diff --git a/pkgs/data/misc/sing-geosite/main.go b/pkgs/data/misc/sing-geosite/main.go new file mode 100644 index 0000000000000..d059d99ffe1eb --- /dev/null +++ b/pkgs/data/misc/sing-geosite/main.go @@ -0,0 +1,19 @@ +func main() { + outputFile, err := os.Create("geosite.db") + if err != nil { + panic(err) + } + defer outputFile.Close() + vData, err := ioutil.ReadFile("@geosite_data@") + if err != nil { + panic(err) + } + domainMap, err := parse(vData) + if err != nil { + panic(err) + } + err = geosite.Write(outputFile, domainMap) + if err != nil { + panic(err) + } +} diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 93405fb788ef8..2cbcad3fb8808 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.19"; + version = "3.20"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-qT9Q6Mntnt9lOhYmGFJlkDyAHQ0CGQpWr1rLF08FGeg="; + hash = "sha256-qMVUP1EpeeO+i5RfnAt/Idz+pR9dVyCT4Ss9lEJgj6k="; }; # List of file formats to package. diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index bf27cb03e2852..ae14a27c8b7f4 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -1,4 +1,5 @@ { lib +, stdenvNoCC , fetchurl , symlinkJoin }: @@ -6,30 +7,40 @@ let version = "15.0"; - fetchData = { file, sha256 }: fetchurl { - url = "https://www.unicode.org/Public/emoji/${version}/${file}"; - inherit sha256; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' + fetchData = { suffix, hash }: stdenvNoCC.mkDerivation { + pname = "unicode-emoji-${suffix}"; + inherit version; + + src = fetchurl { + url = "https://www.unicode.org/Public/emoji/${version}/emoji-${suffix}.txt"; + inherit hash; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + installDir="$out/share/unicode/emoji" mkdir -p "$installDir" - mv "$downloadedFile" "$installDir/${file}" + cp "$src" "$installDir/emoji-${suffix}.txt" + + runHook postInstall ''; }; srcs = { emoji-sequences = fetchData { - file = "emoji-sequences.txt"; - sha256 = "sha256-vRpXHAcdY3arTnFwBH3WUW3DOh8B3L9+sRcecLHZ2lg="; + suffix = "sequences"; + hash = "sha256-XCIi2KQy2JagMaaML1SwT79HsPzi5phT8euKPpRetW0="; }; emoji-test = fetchData { - file = "emoji-test.txt"; - sha256 = "sha256-3Rega6+ZJ5jXRhLFL/i/12V5IypEo5FaGG6Wf9Bj0UU="; + suffix = "test"; + hash = "sha256-hEXyOsg4jglr4Z0CYuFPzv+Fb/Ugk/I1bciUhfGoU9s="; }; emoji-zwj-sequences = fetchData { - file = "emoji-zwj-sequences.txt"; - sha256 = "sha256-9AqrpyUCiBcR/fafa4VaH0pT5o1YzEZDVySsX4ja1u8="; + suffix = "zwj-sequences"; + hash = "sha256-/jV/kRe3dGZ2Bjdl1YcTft+bJZA6eSvVSTW/CFZ5EYI="; }; }; in diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 14299bdc522ab..4df61f1f4120f 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230106031328"; + version = "20230227064844"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU="; + hash = "sha256-popSTy1BXKUhWtYePlERVqui+wiltyTaYk7071z08i8="; }; - vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; + vendorHash = "sha256-wqOpZ5MSWN3L+rVKdA2E/Zbwqb/KHwMKoGlSIPBKgv0="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 439845d79ab60..a6b3aa6ec302f 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 = "202301190046"; + version = "202302230047"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "83ea735314fbc2c3404cb4b9aa044b476e67bc8b"; - sha256 = "sha256-8u2xhpoA6BH9e+kgDwxPsjD4RSuUw05h39aUo7ivM3U="; + rev = "8ae031e49fecaa0ef8d3e2501741cf2cb12e3eac"; + sha256 = "sha256-5p3u9/v32bMEhAXgu/v5ooiis0Nt4peVPeCA9o0AKv8="; }; installPhase = '' diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 1bf0abc41ae57..25f677309e72a 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2022.08.12"; + version = "2023.02.13"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Wcj30Xlm23Gyf5DnNe6PW0LKNSdpSoxebptWvTecO4Q="; + sha256 = "sha256-/oHoqGlNxHU6RQh6HEx+G0je5aWfX3ls43TqVQ8LLnM="; }; dontBuild = true; diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/data/themes/base16-schemes/default.nix new file mode 100644 index 0000000000000..b4e3b1c87d6fb --- /dev/null +++ b/pkgs/data/themes/base16-schemes/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation (finalAttrs: { + pname = "base16-schemes"; + version = "unstable-2022-12-16"; + + src = fetchFromGitHub { + owner = "tinted-theming"; + repo = "base16-schemes"; + rev = "cf6bc892a24af19e11383adedc6ce7901f133ea7"; + sha256 = "sha256-U9pfie3qABp5sTr3M9ga/jX8C807FeiXlmEZnC4ZM58="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes/ + install *.yaml $out/share/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "All the color schemes for use in base16 packages"; + homepage = finalAttrs.src.meta.homepage; + maintainers = [ maintainers.DamienCassou ]; + license = licenses.mit; + }; +}) diff --git a/pkgs/data/themes/breath-theme/default.nix b/pkgs/data/themes/breath-theme/default.nix new file mode 100644 index 0000000000000..79bca7720207e --- /dev/null +++ b/pkgs/data/themes/breath-theme/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kdecoration +, plasma-workspace +, qtbase +}: + +stdenv.mkDerivation { + pname = "breath-theme"; + version = "unstable-2022-12-22"; + + src = fetchFromGitLab { + domain = "gitlab.manjaro.org"; + owner = "themes"; + group = "artwork"; + repo = "breath"; + rev = "98822e7d903f16116bfb02ff9921824c139d7bbc"; + sha256 = "sha256-gvzhHOuOhxV3TC3UZeVpxeSDLpCJV+SaapcJ5mbHskY="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + + kdecoration + plasma-workspace + qtbase + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ "-DBUILD_PLASMA_THEMES=ON" "-DBUILD_SDDM_THEME=ON" ]; + + meta = with lib; { + description = "Manjaro KDE default theme"; + homepage = "https://gitlab.manjaro.org/artwork/themes/breath"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ huantian ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/themes/catppuccin-kvantum/default.nix b/pkgs/data/themes/catppuccin-kvantum/default.nix new file mode 100644 index 0000000000000..222f9178ff4fc --- /dev/null +++ b/pkgs/data/themes/catppuccin-kvantum/default.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + accent ? "Blue", + variant ? "Frappe", +}: let + pname = "catppuccin-kvantum"; +in + lib.checkListOfEnum "${pname}: theme accent" ["Blue" "Flamingo" "Green" "Lavender" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow"] [accent] + lib.checkListOfEnum "${pname}: color variant" ["Latte" "Frappe" "Macchiato" "Mocha"] [variant] + + stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2022-07-04"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "Kvantum"; + rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; + sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/Kvantum + cp -a src/Catppuccin-${variant}-${accent} $out/share/Kvantum + runHook postInstall + ''; + + meta = with lib; { + description = "Soothing pastel theme for Kvantum"; + homepage = "https://github.com/catppuccin/Kvantum"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ggwpaiushtha]; + }; + } 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 213bd7134acb7..57da762b9d64e 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/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 6e5dc5f35a182..a5bfac658b421 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchurl, gtk-engine-murrine }: +{ lib +, stdenv +, fetchurl +, gtk-engine-murrine +, gitUpdater +}: stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.21"; + version = "2.22"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "sha256-ptiJeb4ebfnH6HpTN1NsPAYbkLlPcZtn2aBKO0zW2Tw="; + sha256 = "sha256-WvSlzCock0UMdvajHRBNHSugVMStR1FDt9vjzX5Kp8A="; }; sourceRoot = "."; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; installPhase = '' runHook preInstall @@ -20,8 +27,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/madmaxms/theme-obsidian-2"; + rev-prefix = "v"; + }; + meta = with lib; { - description = "Gnome theme, based upon Adwaita-Maia dark skin"; + description = "Gnome theme based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3Only ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/tokyo-night-gtk/default.nix b/pkgs/data/themes/tokyo-night-gtk/default.nix new file mode 100644 index 0000000000000..a117562174e5b --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk-engine-murrine +}: + +stdenvNoCC.mkDerivation { + pname = "tokyo-night-gtk"; + version = "2023.01.17"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; + sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + 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 Tokyo Night colour palette."; + homepage = "www.pling.com/p/1681315/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ garaiza-93 ]; + }; +} diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 85dc0788bfbaf..f9dbf73b3a991 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/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 1073fd8f2505b..c01c8e08166e7 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2022-10-27"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-jOrTasnkNExCgvST+09JOQ0iosjoEu3aoj3C1pNHTgY="; + sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; }; nativeBuildInputs = [ @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { done # Do not provide `sudo`, as it is not needed in our use case of the install script - substituteInPlace lib-core.sh --replace '$(which sudo)' false + substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false # Provides a dummy home directory - substituteInPlace lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' + substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' ''; dontBuild = true; diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 22c214728f2b5..03e73f6813cf0 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -56,14 +56,14 @@ let cmakeFeatureFlag = feature: flag: "-D${feature}=${if flag then "on" else "off"}"; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; version = "0.6.2.1"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = finalAttrs.version; + rev = self.version; hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM="; }; @@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_PRESET=everything" # The upstream project recommends tagging the distribution "-DDISTR_TAG=Nixpkgs" - "-DENGINE_BUILDTAG=${finalAttrs.version}" + "-DENGINE_BUILDTAG=${self.version}" (cmakeFeatureFlag "HYBRID_SDL" true) (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua) (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua) diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/desktops/arcan/cat9/default.nix index 909f4d57993ba..d94f3c59c425a 100644 --- a/pkgs/desktops/arcan/cat9/default.nix +++ b/pkgs/desktops/arcan/cat9/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (self: { pname = "cat9"; - version = "unstable-2018-09-13"; + version = "unstable-2023-02-11"; src = fetchFromGitHub { owner = "letoram"; - repo = finalPackages.pname; - rev = "754d9d2900d647a0fa264720528117471a32f295"; - hash = "sha256-UmbynVOJYvHz+deA99lj/BBFOauZzwSNs+qR28pASPY="; + repo = "cat9"; + rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897"; + hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ="; }; dontConfigure = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalPackages: { meta = with lib; { homepage = "https://github.com/letoram/cat9"; description = "A User shell for LASH"; - license = licenses.bsd3; + license = licenses.unlicense; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index a18f33ef93aad..04492ee3db9ae 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (self: { pname = "durden"; - version = "unstable-2022-10-16"; + version = "unstable-2023-01-19"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "728a9f09ac8b306ab2619b4e2ec4f48decf1b7a8"; - hash = "sha256-ckOKdrz232Q6hAyFC2mAyZQLNuuR8JbVhbLy32qFn1o="; + rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2"; + hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA="; }; dontConfigure = true; diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 1c1c66fd3fb0d..a9a1e24a97b93 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "unstable-2022-04-03"; + version = "unstable-2023-02-05"; src = fetchFromGitHub { owner = "letoram"; repo = "pipeworld"; - rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef"; - hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E="; + rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e"; + hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM="; }; dontConfigure = true; diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index 03a8f05908b57..a2acbfbdea490 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -3,13 +3,13 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (self: { pname = "prio"; version = "unstable-2018-09-13"; src = fetchFromGitHub { owner = "letoram"; - repo = finalPackages.pname; + repo = "prio"; rev = "c3f97491339d15f063d6937d5f89bcfaea774dd1"; hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM="; }; diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index cee9cecfa47d5..ef7a0f3d762c8 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { xorg.libXxf86vm ]; - NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; + env.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"; diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 2eb54d018bc69..e461ac9ea077b 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of # `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "World" diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 158e72587a73c..ef3013f2e4045 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,6 +53,23 @@ , 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.6.7"; @@ -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 @@ -151,9 +157,9 @@ 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/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py + sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.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|/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 diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 8398df6b7c128..a488baab0071f 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.4.3"; + version = "1.4.5"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-blsDOAdfu0N6I+6ZvycL+BIIsZPIjwYm+sJnbZtHJE8="; + hash = "sha256-5mMV4WinpFR9ihgoQsgIXre0VpBdg9S8GjSkx+7ocLg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix new file mode 100644 index 0000000000000..44cafeb6fb1a8 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, udisks2-qt5 +, gio-qt +, image-editor +, glibmm +, freeimage +, opencv +, ffmpeg +, ffmpegthumbnailer +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-album"; + version = "5.10.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-S/oVRD72dtpnvfGV6YfN5/syrmWA44H/1BbmAe0xjAY="; + }; + + # This patch should be removed after upgrading to 6.0.0 + postPatch = '' + substituteInPlace libUnionImage/CMakeLists.txt \ + --replace "/usr" "$out" + substituteInPlace src/CMakeLists.txt \ + --replace "set(PREFIX /usr)" "set(PREFIX $out)" \ + --replace "/usr/bin" "$out/bin" \ + --replace "/usr/share/deepin-manual/manual-assets/application/)" "share/deepin-manual/manual-assets/application/)" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + udisks2-qt5 + gio-qt + image-editor + glibmm + freeimage + opencv + ffmpeg + ffmpegthumbnailer + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "A fashion photo manager for viewing and organizing pictures"; + homepage = "https://github.com/linuxdeepin/deepin-album"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} 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 0000000000000..e565eabe1821f --- /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-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix new file mode 100644 index 0000000000000..95e1c9eeb49f4 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, image-editor +, qtbase +, qtmultimedia +, ffmpeg +, ffmpegthumbnailer +, libusb1 +, portaudio +, libv4l +, gst_all_1 +, systemd +}: + +stdenv.mkDerivation rec { + pname = "deepin-camera"; + version = "1.4.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-p2RCetx1lgLonXZaC3umE+nDgZnp64o3iR2MgQhbisM="; + }; + + # QLibrary and dlopen work with LD_LIBRARY_PATH + patches = [ ./dont_use_libPath.diff ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "/usr/share/libimagevisualresult/filter_cube" "${image-editor}/share/libimagevisualresult/filter_cube" \ + --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" + substituteInPlace src/com.deepin.Camera.service \ + --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \ + --replace "/usr/share/applications/deepin-camera.desktop" "$out/share/applications/deepin-camera.desktop" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + image-editor + qtbase + qtmultimedia + ffmpeg + ffmpegthumbnailer + libusb1 + portaudio + libv4l + ] ++ (with gst_all_1 ; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + cmakeFlags = [ "-DVERSION=${version}" ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Tool to view camera, take photo and video"; + homepage = "https://github.com/linuxdeepin/deepin-camera"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff new file mode 100644 index 0000000000000..b4ef86f79b38a --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff @@ -0,0 +1,25 @@ +diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp +index d3c6f5c..4817446 100644 +--- a/src/src/mainwindow.cpp ++++ b/src/src/mainwindow.cpp +@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog() + + QString CMainWindow::libPath(const QString &strlib) + { +- QDir dir; +- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); +- dir.setPath(path); +- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib +- +- if (list.contains(strlib)) +- return strlib; +- +- list.sort(); +- if (list.size() > 0) +- return list.last(); +- +- return ""; ++ return strlib; + } + + void CMainWindow::reflushSnapshotLabel() diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix new file mode 100644 index 0000000000000..d62c72ca0b11c --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, udisks2-qt5 +, cmake +, qtbase +, qttools +, pkg-config +, kcodecs +, karchive +, wrapQtAppsHook +, minizip +, libzip +, libarchive +}: + +stdenv.mkDerivation rec { + pname = "deepin-compressor"; + version = "5.12.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-HJDtUvXUT94G4WqrK92UMmijnuC4ApkKHU3yE3rOKHQ="; + }; + + postPatch = '' + substituteInPlace src/source/common/pluginmanager.cpp \ + --replace "/usr/lib/" "$out/lib/" + substituteInPlace src/desktop/deepin-compressor.desktop \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + udisks2-qt5 + kcodecs + karchive + minizip + libzip + libarchive + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + "-DUSE_TEST=OFF" + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A fast and lightweight application for creating and extracting archives"; + homepage = "https://github.com/linuxdeepin/deepin-compressor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix new file mode 100644 index 0000000000000..2138d910960fb --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-draw"; + version = "5.11.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-49RQQ52HR5aqzeVEjGm9vQpTOxhY7I0X724x/Bboo90="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-draw/commit/dac714fe603e1b77fc39952bfe6949852ee6c2d5.patch"; + sha256 = "sha256-zajxmKkZJT1lcyvPv/PRPMxcstF69PB1tC50gYKDlWA="; + }) + ]; + + postPatch = '' + substituteInPlace com.deepin.Draw.service \ + --replace "/usr/bin/deepin-draw" "$out/bin/deepin-draw" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + ]; + + 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 = "Lightweight drawing tool for users to freely draw and simply edit images"; + homepage = "https://github.com/linuxdeepin/deepin-draw"; + 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 0000000000000..01a26d58f289d --- /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-image-viewer/0001-fix-install-path-for-nix.patch b/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch new file mode 100644 index 0000000000000..61d13556acb63 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch @@ -0,0 +1,25 @@ +From c2fa29800c64f5bda04203bb2eb1845b29c1de3c Mon Sep 17 00:00:00 2001 +From: rewine <luhongxu@deepin.org> +Date: Fri, 25 Mar 2022 18:20:17 +0800 +Subject: [PATCH] fix install path for nix + +--- + qimage-plugins/libraw/CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/qimage-plugins/libraw/CMakeLists.txt b/qimage-plugins/libraw/CMakeLists.txt +index 4bfd85ad..00d11bd3 100644 +--- a/qimage-plugins/libraw/CMakeLists.txt ++++ b/qimage-plugins/libraw/CMakeLists.txt +@@ -44,7 +44,6 @@ target_include_directories(xraw PUBLIC ${RAW_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIR + + target_link_libraries(${CMD_NAME} Qt5::Core Qt5::Gui raw) + +-install(TARGETS ${CMD_NAME} DESTINATION ${Qt5Core_DIR}/../../qt5/plugins/imageformats) +- ++install(TARGETS ${CMD_NAME} DESTINATION qt5/plugins/imageformats) + + QT5_USE_MODULES(${PROJECT_NAME} Core Gui) +-- +2.35.1 + diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix new file mode 100644 index 0000000000000..0b51bc42b2c56 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, gio-qt +, udisks2-qt5 +, image-editor +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, libraw +, libexif +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-image-viewer"; + version = "5.9.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-5A6K47NcMkvncZIF5CXeHYYZWEHQ4YDnPDQr2axCmaI="; + }; + + patches = [ + ./0001-fix-install-path-for-nix.patch + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-image-viewer/commit/4a046e6207fea306e592fddc33c1285cf719a63d.patch"; + sha256 = "sha256-aIgYmq6WDfCE+ZcD0GshxM+QmBWZGjh9MzZcTMrhBJ0="; + }) + (fetchpatch { + name = "fix build with libraw 0.21"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; + sha256 = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; + }) + ]; + + postPatch = '' + substituteInPlace src/com.deepin.ImageViewer.service \ + --replace "/usr/bin/deepin-image-viewer" "$out/bin/deepin-image-viewer" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + gio-qt + udisks2-qt5 + image-editor + libraw + libexif + ]; + + 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 = "An image viewing tool with fashion interface and smooth performance"; + homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix new file mode 100644 index 0000000000000..eaeeae9892998 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, runtimeShell +, cmake +, pkg-config +, wrapQtAppsHook +, qtbase +, qttools +, qtx11extras +, qtmultimedia +, dtkwidget +, qt5integration +, qt5platform-plugins +, qtmpris +, qtdbusextended +, gsettings-qt +, elfutils +, ffmpeg +, ffmpegthumbnailer +, mpv +, xorg +, pcre +, libdvdread +, libdvdnav +, libunwind +, libva +, zstd +, glib +, gst_all_1 +, gtest +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "deepin-movie-reborn"; + version = "5.10.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0m8wYRQGsdN4zpnHUJKCfF05SdvTauRSp6gCu2F9ZAI"; + }; + + patches = [ + (fetchpatch { + name = "chore: dont use </usr/include/linux/cdrom.h>"; + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/2afc63541589adab8b0c8c48e290f03535ec2996.patch"; + sha256 = "sha256-Q9dv5L5sUGeuvNxF8ypQlZuZVuU4NIR/8d8EyP/Q5wk="; + }) + (fetchpatch { + name = "feat: rewrite libPath to read LD_LIBRARY_PATH"; + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/432bf452ed244c256e99ecaf80bb6a0eef9b4a74.patch"; + sha256 = "sha256-5hRQ8D9twBKgouVpIBa1pdAGk0lI/wEdQaHBBHFCZBA"; + }) + ]; + + postPatch = '' + substituteInPlace src/widgets/toolbox_proxy.cpp \ + --replace "/bin/bash" "${runtimeShell}" + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + qtx11extras + qtmultimedia + qtdbusextended + qtmpris + gsettings-qt + elfutils.dev + ffmpeg + ffmpegthumbnailer + xorg.libXtst + xorg.libXdmcp + xorg.xcbproto + pcre.dev + libdvdread + libdvdnav + libunwind + libva + zstd.dev + mpv + gtest + libpulseaudio + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Full-featured video player supporting playing local and streaming media in multiple video formats"; + homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix new file mode 100644 index 0000000000000..04b7b46443e2d --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, udisks2-qt5 +, qtmpris +, qtdbusextended +, qtmultimedia +, qttools +, kcodecs +, ffmpeg +, libvlc +, libcue +, taglib +, gsettings-qt +, SDL2 +, gtest +, qtbase +, gst_all_1 +}: + +stdenv.mkDerivation rec { + pname = "deepin-music"; + version = "6.2.21"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-sN611COCWy1gF/BZZqZ154uYuRo9HsbJw2wXe9OJ+iQ="; + }; + + postPatch = '' + substituteInPlace src/music-player/CMakeLists.txt \ + --replace "include_directories(/usr/include/vlc)" "include_directories(${libvlc}/include/vlc)" \ + --replace "include_directories(/usr/include/vlc/plugins)" "include_directories(${libvlc}/include/vlc/plugins)" \ + --replace "/usr/share" "$out/share" + substituteInPlace src/libmusic-plugin/CMakeLists.txt \ + --replace "/usr/lib/deepin-aiassistant" "$out/lib/deepin-aiassistant" + substituteInPlace src/music-player/data/deepin-music.desktop \ + --replace "/usr/bin/deepin-music" "$out/bin/deepin-music" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + udisks2-qt5 + qtmpris + qtdbusextended + qtmultimedia + kcodecs + ffmpeg + libvlc + libcue + taglib + gsettings-qt + SDL2 + gtest + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Awesome music player with brilliant and tweakful UI Deepin-UI based"; + homepage = "https://github.com/linuxdeepin/deepin-music"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix new file mode 100644 index 0000000000000..0d710652e3892 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qttools +, pkg-config +, wrapQtAppsHook +, dtkwidget +, qtsvg +, xorg +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-picker"; + version = "5.0.28"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-b463PqrCpt/DQqint5Xb0cRT66iHNPavj0lsTMv801k="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qtsvg + xorg.libXtst + ]; + + postPatch = '' + substituteInPlace com.deepin.Picker.service \ + --replace "/usr/bin/deepin-picker" "$out/bin/deepin-picker" + ''; + + qmakeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "ICONDIR=${placeholder "out"}/share/icons/hicolor/scalable/apps" + "APPDIR=${placeholder "out"}/share/applications" + "DSRDIR=${placeholder "out"}/share/deepin-picker" + "DOCDIR=${placeholder "out"}/share/dman/deepin-picker" + ]; + + meta = with lib; { + description = "Color picker application"; + homepage = "https://github.com/linuxdeepin/deepin-picker"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix new file mode 100644 index 0000000000000..f7ab5220b61c4 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, qtwebengine +, karchive +, poppler +, libchardet +, libspectre +, openjpeg +, djvulibre +, gtest +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-reader"; + version = "5.10.28"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0jHhsxEjBbu3ktvjX1eKnkZDwzRk9MrUSJSdYeOvWtI="; + }; + + patches = [ ./use-pkg-config.diff ]; + + postPatch = '' + substituteInPlace reader/{reader.pro,document/Model.cpp} htmltopdf/htmltopdf.pro 3rdparty/deepin-pdfium/src/src.pro \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + qmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtwebengine + karchive + poppler + libchardet + libspectre + djvulibre + openjpeg + gtest + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A simple memo software with texts and voice recordings"; + homepage = "https://github.com/linuxdeepin/deepin-reader"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff new file mode 100644 index 0000000000000..7993cecd30add --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff @@ -0,0 +1,46 @@ +diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri +index 3e04f340..894b0ac7 100755 +--- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri ++++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri +@@ -20,13 +20,8 @@ DEFINES += USE_SYSTEM_LIBJPEG \ + USE_SYSTEM_LIBOPENJPEG2 \ + USE_SYSTEM_FREETYPE + +-INCLUDEPATH += /usr/include/openjpeg-2.3 \ +- /usr/include/openjpeg-2.4 \ +- /usr/include/freetype2 \ +- /usr/include/freetype2/freetype \ +- /usr/include/freetype2/freetype/config +- +-LIBS += -lopenjp2 -llcms2 -lfreetype ++CONFIG += link_pkgconfig ++PKGCONFIG += libopenjp2 lcms2 freetype2 + + #QMAKE_CXXFLAGS += "-Wc++11-narrowing" #is_clang + #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override" #is_clang Suppress no override warning for overridden functions. +diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro +index 196b91d3..bda71ff4 100755 +--- a/3rdparty/deepin-pdfium/src/src.pro ++++ b/3rdparty/deepin-pdfium/src/src.pro +@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium + + TEMPLATE = lib + +-CONFIG += c++14 ++CONFIG += c++14 link_pkgconfig ++ ++PKGCONFIG += chardet + + ###安全漏洞检测 + #QMAKE_CXX += -g -fsanitize=undefined,address -O2 +@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri) + + INCLUDEPATH += $$PWD/../include + +-INCLUDEPATH += /usr/include/chardet +- +-LIBS += -lchardet +- + public_headers += \ + $$PWD/../include/dpdfglobal.h \ + $$PWD/../include/dpdfdoc.h \ 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 0000000000000..657b69e6d95a3 --- /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/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix new file mode 100644 index 0000000000000..8cc453004a526 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, qtbase +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, qtmultimedia +, qtwebengine +, libvlc +, gst_all_1 +, gtest +}: +stdenv.mkDerivation rec { + pname = "deepin-voice-note"; + version = "5.10.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ZDw/kGmhcoTPDUsZa9CYhrVbK4Uo75G0L4q4cCBPr7E="; + }; + + postPatch = '' + substituteInPlace src/common/audiowatcher.cpp \ + --replace "/usr/share" "$out/share" + substituteInPlace assets/deepin-voice-note.desktop \ + --replace "/usr/bin" "$out/bin" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtmultimedia + qtwebengine + libvlc + gtest + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); + + cmakeFlags = [ "-DVERSION=${version}" ]; + + env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0"; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Simple memo software with texts and voice recordings"; + homepage = "https://github.com/linuxdeepin/deepin-voice-note"; + 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 0000000000000..91438a043c0a6 --- /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 0000000000000..3864989196f39 --- /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 0000000000000..0cda82fdfcf29 --- /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 0000000000000..f311339b6be01 --- /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/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix new file mode 100644 index 0000000000000..74a8786abe346 --- /dev/null +++ b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, dde-api +}: + +stdenv.mkDerivation rec { + pname = "deepin-wallpapers"; + version = "1.7.10"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-D7DXyPh74VlYn5vKUzDh/P/xoskxs8N/BEg5ZemXRwk="; + }; + + nativeBuildInputs = [ dde-api ]; + + postPatch = '' + patchShebangs blur_image.sh + + substituteInPlace blur_image.sh \ + --replace /usr/lib/deepin-api/image-blur ${dde-api}/lib/deepin-api/image-blur + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/wallpapers/deepin + cp deepin/* $out/share/wallpapers/deepin + mkdir -p $out/share/wallpapers/image-blur + cp image-blur/* $out/share/wallpapers/image-blur + mkdir -p $out/share/backgrounds + ln -s $out/share/wallpapers/deepin/desktop.jpg $out/share/backgrounds/default_background.jpg + runHook postInstall + ''; + + meta = with lib; { + description = "deepin-wallpapers provides wallpapers of dde"; + homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; + license = with licenses; [ gpl3Plus cc-by-sa-30 ]; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix new file mode 100644 index 0000000000000..eeed587c3747a --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, runtimeShell +, qtbase +, gtest +}: + +stdenv.mkDerivation rec { + pname = "dde-calendar"; + version = "5.8.30"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-8/UXq9W3Gb1Lg/nOji6zcHJts6lgY2uDxvrBxQs3Zio="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/dde-calendar/commit/b9d9555d90a36318eeee62ece49250b4bf8acd10.patch"; + sha256 = "sha256-pvgxZPczs/lkwNjysNuVu+1AY69VZlxOn7hR9A02/3M="; + }) + ]; + + postPatch = '' + substituteInPlace calendar-service/src/dbmanager/huanglidatabase.cpp \ + --replace "/usr/share/dde-calendar/data/huangli.db" "$out/share/dde-calendar/data/huangli.db" + substituteInPlace calendar-service/src/main.cpp \ + --replace "/usr/share/dde-calendar/translations" "$out/share/dde-calendar/translations" + substituteInPlace calendar-service/assets/data/com.deepin.dataserver.Calendar.service \ + --replace "/usr/lib/deepin-daemon/dde-calendar-service" "$out/lib/deepin-daemon/dde-calendar-service" + substituteInPlace calendar-client/assets/dbus/com.deepin.Calendar.service \ + --replace "/usr/bin/dde-calendar" "$out/bin/dde-calendar" + substituteInPlace calendar-service/{src/{csystemdtimercontrol.cpp,jobremindmanager.cpp},assets/{data/com.dde.calendarserver.calendar.service,dde-calendar-service.desktop}} \ + --replace "/bin/bash" "${runtimeShell}" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + gtest + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + postFixup = '' + wrapQtApp $out/lib/deepin-daemon/dde-calendar-service + ''; + + meta = with lib; { + description = "Calendar for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/dde-calendar"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix new file mode 100644 index 0000000000000..a1acab05cf1a5 --- /dev/null +++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, pkg-config +, cmake +, qttools +, wrapQtAppsHook +, polkit-qt +, qtbase +}: +stdenv.mkDerivation rec { + pname = "dde-polkit-agent"; + version = "5.5.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-4wAqMymLPxKXbfAx2PtkEGfwenphPxBZn+qCdcyqNc0="; + }; + + postPatch = '' + substituteInPlace AuthDialog.cpp \ + --replace "/usr/share/dde-session-shell/dde-session-shell.conf" "/etc/dde-session-shell/dde-session-shell.conf" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + polkit-qt + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + postFixup = '' + wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent + ''; + + meta = with lib; { + description = "PolicyKit agent for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix new file mode 100644 index 0000000000000..f9b4e7592fb85 --- /dev/null +++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, dde-polkit-agent +, libsecret +, libgnome-keyring +}: + +stdenv.mkDerivation rec { + pname = "dpa-ext-gnomekeyring"; + version = "5.0.11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-mXaGwbtEwaqfOT0izK64zX4s3VFmsRpUGOVm6oSEhn8="; + }; + + postPatch = '' + substituteInPlace gnomekeyringextention.cpp \ + --replace "/usr/share/dpa-ext-gnomekeyring" "$out/share/dpa-ext-gnomekeyring" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + dde-polkit-agent + libgnome-keyring + libsecret + ]; + + meta = with lib; { + description = "GNOME keyring extension for dde-polkit-agent"; + homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; + 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 0000000000000..f9bbf7df5eb73 --- /dev/null +++ b/pkgs/desktops/deepin/default.nix @@ -0,0 +1,76 @@ +{ lib, pkgs, libsForQt5 }: +let + packages = self: + let + inherit (self) callPackage; + + replaceAll = x: y: '' + echo Replacing "${x}" to "${y}": + for file in $(grep -rl "${x}"); do + echo -- $file + substituteInPlace $file \ + --replace "${x}" "${y}" + done + ''; + 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 { }; + + #### CORE + dde-calendar = callPackage ./core/dde-calendar { }; + dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; + dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; + + #### Dtk Application + deepin-album = callPackage ./apps/deepin-album { }; + deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-camera = callPackage ./apps/deepin-camera { }; + deepin-compressor = callPackage ./apps/deepin-compressor { }; + deepin-draw = callPackage ./apps/deepin-draw { }; + deepin-editor = callPackage ./apps/deepin-editor { }; + deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; + deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; + deepin-music = callPackage ./apps/deepin-music { }; + deepin-picker = callPackage ./apps/deepin-picker { }; + deepin-terminal = callPackage ./apps/deepin-terminal { }; + deepin-reader = callPackage ./apps/deepin-reader { }; + deepin-voice-note = callPackage ./apps/deepin-voice-note { }; + + #### Go Packages + go-lib = callPackage ./go-package/go-lib { inherit replaceAll; }; + go-gir-generator = callPackage ./go-package/go-gir-generator { }; + go-dbus-factory = callPackage ./go-package/go-dbus-factory { }; + dde-api = callPackage ./go-package/dde-api { inherit replaceAll; }; + deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; + deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; + + #### TOOLS + dde-device-formatter = callPackage ./tools/dde-device-formatter { }; + deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; + + #### ARTWORK + dde-account-faces = callPackage ./artwork/dde-account-faces { }; + deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; + deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; + deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; + deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; + + #### MISC + deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; + deepin-turbo = callPackage ./misc/deepin-turbo { }; + }; +in +lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/go-package/dde-api/0001-fix-PATH-for-NixOS.patch b/pkgs/desktops/deepin/go-package/dde-api/0001-fix-PATH-for-NixOS.patch new file mode 100644 index 0000000000000..c4726982241d3 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-api/0001-fix-PATH-for-NixOS.patch @@ -0,0 +1,39 @@ +From c8f597bd7286a76e7ce371e4f7982d9d2700868a Mon Sep 17 00:00:00 2001 +From: rewine <luhongxu@deepin.org> +Date: Wed, 28 Dec 2022 23:06:53 +0800 +Subject: [PATCH] fix PATH for NixOS + +--- + device/main.go | 2 +- + locale-helper/main.go | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/device/main.go b/device/main.go +index 6c5404c..f79bcfc 100644 +--- a/device/main.go ++++ b/device/main.go +@@ -15,7 +15,7 @@ import ( + var logger = log.NewLogger(dbusServiceName) + + func main() { +- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") ++ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") + service, err := dbusutil.NewSystemService() + if err != nil { + logger.Fatal("failed to new system service:", err) +diff --git a/locale-helper/main.go b/locale-helper/main.go +index 0866e48..ef000b5 100644 +--- a/locale-helper/main.go ++++ b/locale-helper/main.go +@@ -45,7 +45,7 @@ var ( + ) + + func main() { +- os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") ++ os.Setenv("PATH", "/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") + logger.BeginTracing() + defer logger.EndTracing() + +-- +2.38.1 + diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix new file mode 100644 index 0000000000000..ef4a287b3df96 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoPackage +, replaceAll +, wrapQtAppsHook +, wrapGAppsHook +, gtk3 +, pkg-config +, deepin-gettext-tools +, alsa-lib +, go-dbus-factory +, go-gir-generator +, go-lib +, libcanberra +, libgudev +, librsvg +, poppler +, pulseaudio +, gdk-pixbuf-xlib +, dbus +, coreutils +, deepin-desktop-base +}: + +buildGoPackage rec { + pname = "dde-api"; + version = "5.5.32"; + + goPackagePath = "github.com/linuxdeepin/dde-api"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-F+vEOSpysqVtjs8de5mCmeANuCbYUQ860ZHl5rwNYac="; + }; + + patches = [ ./0001-fix-PATH-for-NixOS.patch ]; + + postPatch = replaceAll "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" + + replaceAll "/usr/share/i18n/language_info.json" "${deepin-desktop-base}/share/i18n/language_info.json" + + replaceAll "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" + + replaceAll "/usr/bin/true" "${coreutils}/bin/true" + + replaceAll "/usr/sbin/alsactl" "alsactl" + + '' + substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \ + --replace "/usr/share/dde-api" "$out/share/dde-api" + substituteInPlace themes/{theme.go,settings.go} \ + --replace "/usr/share" "/run/current-system/sw/share" + ''; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + pkg-config + deepin-gettext-tools + wrapQtAppsHook + wrapGAppsHook + ]; + dontWrapGApps = true; + + buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + gtk3 + alsa-lib + libcanberra + libgudev + librsvg + poppler + pulseaudio + gdk-pixbuf-xlib + ]; + + buildPhase = '' + runHook preBuild + GOPATH="$GOPATH:${go-dbus-factory}/share/gocode" + GOPATH="$GOPATH:${go-gir-generator}/share/gocode" + GOPATH="$GOPATH:${go-lib}/share/gocode" + make -C go/src/${goPackagePath} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath} + runHook postInstall + ''; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + for binary in $out/lib/deepin-api/*; do + wrapProgram $binary "''${qtWrapperArgs[@]}" + done + ''; + + meta = with lib; { + description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc"; + homepage = "https://github.com/linuxdeepin/dde-api"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/dde-api/deps.nix b/pkgs/desktops/deepin/go-package/dde-api/deps.nix new file mode 100644 index 0000000000000..52ee3d963cf93 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/dde-api/deps.nix @@ -0,0 +1,210 @@ +[ + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "sha256-uViE2kPj7tMrGYVjjdLOl2jFDmmu+3P7GvnZBse2zVY="; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "sha256-pSeMTPvSkxlthh65LjNYYhPLvCZDkBgVgAGYWW0Aguo="; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "0.6.9"; + sha256 = "sha256-xXNaXpFFHJN1fCFLoVrQFCXQ4ya+Kga55QWcJL/InkA="; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlites"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.14.12"; + sha256 = "sha256-SLW1FyyfJGPUid1epgmJHZGJebI77Wg5WMAPiz1GcYs="; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.1.0"; + sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0="; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.5.1"; + sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY="; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "289d7a0edf712062d9f1484b07bdf2383f48802f"; + sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs="; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.7.1"; + sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w="; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"; + sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90="; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.3.0"; + sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw="; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc"; + sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk="; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://github.com/golang/image"; + rev = "a8550c1d254a56cf1762a2993881d2b23c0c83dd"; + sha256 = "sha256-gtRGCsCe8tKLsZWhKLL8c5whz9rCMoCHfH13rcSW/OM="; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "b94a6e3cc13755c0a75fffecbb089eb346fc4289"; + sha256 = "sha256-uriYmwxT69xbmWKO/5OAyeMa2lFBOJDrU2KtQh/+ZjY="; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "sha256-RsS4qxdRQ3q+GejA8D9Iu31A/mZNms4LbJ7518jWiu4="; + }; + } + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "sha256-psUCHRFGEOpN3obFbCvSfW0AGEFSI29d0q4MFsHG3qI="; + }; + } + { + goPackagePath = "github.com/fogleman/gg"; + fetch = { + type = "git"; + url = "https://github.com/fogleman/gg"; + rev = "v1.3.0"; + sha256 = "sha256-Fs2JI0FmF4N5EzXJzGAPZMxZxo6wKyebkN/iBZ9sdNo="; + }; + } + { + goPackagePath = "github.com/golang/freetype"; + fetch = { + type = "git"; + url = "https://github.com/golang/freetype"; + rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; + sha256 = "sha256-rOOsv1sNLbYEKnwXZtUlB2CXVkFANyzZy2E7w2QbnKQ="; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; + sha256 = "sha256-8U2oSi446U13c3uqcbg/14okypxKmckRuvWfZlGHVys="; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "sha256-yvPV+HlDOyJsiwAcVHQkmtw8DHSXyw+cXHkigXm8rAA="; + }; + } + { + goPackagePath = "github.com/youpy/go-wav"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-wav"; + rev = "v0.3.2"; + sha256 = "sha256-jNqXW3F3fcgjT47+d2MVXauWkA7+1KfYVu3ZZpRCTkM="; + }; + } + { + goPackagePath = "github.com/zaf/g711"; + fetch = { + type = "git"; + url = "https://github.com/zaf/g711"; + rev = "v1.2"; + sha256 = "sha256-G+0cgGw/fcOUFVn32AeqUE0YjyOS82Z5MTcn6IANhCY="; + }; + } + { + goPackagePath = "github.com/youpy/go-riff"; + fetch = { + type = "git"; + url = "https://github.com/youpy/go-riff"; + rev = "v0.1.0"; + sha256 = "sha256-d/3rkxDeRTPveZblArKc61gB4LJVV08n7g0THieuhx8="; + }; + } +] + diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix new file mode 100644 index 0000000000000..1fc24b4a283bd --- /dev/null +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoPackage +, go-lib +, glib +}: +buildGoPackage rec { + pname = "deepin-desktop-schemas"; + version = "5.10.11"; + + goPackagePath = "github.com/linuxdeepin/deepin-desktop-schemas"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-MboNj0zC3azavDUsmeNNafCcUa0GeoySl610+WOtNww="; + }; + + nativeBuildInputs = [ glib ]; + buildInputs = [ go-lib ]; + + postPatch = '' + # Relocate files path for backgrounds and wallpapers + for file in $(grep -rl "/usr/share") + do + substituteInPlace $file \ + --replace "/usr/share" "/run/current-system/sw/share" + done + ''; + + buildPhase = '' + runHook preBuild + GOPATH="$GOPATH:${go-lib}/share/gocode" + make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install DESTDIR="$out" PREFIX="/" -C go/src/${goPackagePath} + runHook postInstall + ''; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + meta = with lib; { + description = "GSettings deepin desktop-wide schemas"; + homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix new file mode 100644 index 0000000000000..040c561d352e1 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoPackage +, pkg-config +, deepin-gettext-tools +, go-dbus-factory +, go-gir-generator +, go-lib +, gtk3 +, glib +, libxcrypt +, gettext +, iniparser +, cracklib +, linux-pam +}: + +buildGoPackage rec { + pname = "deepin-pw-check"; + version = "5.1.18"; + + goPackagePath = "github.com/linuxdeepin/deepin-pw-check"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-v1Z4ArkrejjOCO1vD+BhfEl9pTfuvKgLM6Ont0IUCQk="; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + pkg-config + gettext + deepin-gettext-tools + ]; + + buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + glib + libxcrypt + gtk3 + iniparser + cracklib + linux-pam + ]; + + postPatch = '' + sed -i 's|iniparser/||' */*.c + substituteInPlace misc/pkgconfig/libdeepin_pw_check.pc \ + --replace "/usr" "$out" + substituteInPlace misc/system-services/com.deepin.daemon.PasswdConf.service \ + --replace "/usr/lib/deepin-pw-check/deepin-pw-check" "$out/lib/deepin-pw-check/deepin-pw-check" + ''; + + buildPhase = '' + runHook preBuild + GOPATH="$GOPATH:${go-dbus-factory}/share/gocode" + GOPATH="$GOPATH:${go-gir-generator}/share/gocode" + GOPATH="$GOPATH:${go-lib}/share/gocode" + make -C go/src/${goPackagePath} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install PREFIX="$out" PKG_FILE_DIR=$out/lib/pkg-config PAM_MODULE_DIR=$out/etc/pam.d -C go/src/${goPackagePath} + # https://github.com/linuxdeepin/deepin-pw-check/blob/d5597482678a489077a506a87f06d2b6c4e7e4ed/debian/rules#L21 + ln -s $out/lib/libdeepin_pw_check.so $out/lib/libdeepin_pw_check.so.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to verify the validity of the password"; + homepage = "https://github.com/linuxdeepin/deepin-pw-check"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix new file mode 100644 index 0000000000000..509940b6d5705 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/deps.nix @@ -0,0 +1,75 @@ +[ + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.5.1"; + sha256 = "sha256-B8kZ8yiWgallT7R2j1kSRJcJkSGFVf9ise+TpXa+7XY="; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.1.0"; + sha256 = "sha256-JSPtmkGEStBEVrKGszeLCb7P38SzQKgMiDC3eDppXs0="; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.7.1"; + sha256 = "sha256-disUVIHiIDSj/go3APtJH8awSl8QwKRRFLKI7LRnl0w="; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "289d7a0edf712062d9f1484b07bdf2383f48802f"; + sha256 = "sha256-AzS/J3OocI7mA0xsIfQzyskNKVija7F2yvuts+EFJBs="; + }; + } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "496545a6307b2a7d7a710fd516e5e16e8ab62dbc"; + sha256 = "sha256-j8yDji+vqsitpRZirpb4w/Em8nstgf28wpwkcrOlxBk="; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.3.0"; + sha256 = "sha256-T753/EiD5Cpk6H2JFhd+s1gFvpNptG2XlEHxZF6dQaw="; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"; + sha256 = "sha256-XA4Oj1gdmdV/F/+8kMI+DBxKPthZ768hbKsO3d9Gx90="; + }; + } +] + diff --git a/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix new file mode 100644 index 0000000000000..4c12dce491d79 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "go-dbus-factory"; + version = "1.10.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-6u9Bpoa80j/K1MipncfM378/qmSSMZAlx88jE4hHYBk="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Generate go binding of D-Bus interfaces"; + homepage = "https://github.com/linuxdeepin/go-dbus-factory"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix new file mode 100644 index 0000000000000..7f377d2a6e744 --- /dev/null +++ b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, go +, pkg-config +, libgudev +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "go-gir-generator"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-lFseui/M3+TyfYoa+rnS0cGhN6gdLrgpzgOwqzYcyPk="; + }; + + nativeBuildInputs = [ + pkg-config + go + ]; + + buildInputs = [ + libgudev + gobject-introspection + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "GOCACHE=$(TMPDIR)/go-cache" + ]; + + meta = with lib; { + description = "Generate static golang bindings for GObject"; + homepage = "https://github.com/linuxdeepin/go-gir-generator"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/go-package/go-lib/default.nix b/pkgs/desktops/deepin/go-package/go-lib/default.nix new file mode 100644 index 0000000000000..3a6a8f03dfb5c --- /dev/null +++ b/pkgs/desktops/deepin/go-package/go-lib/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, replaceAll +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "go-lib"; + version = "5.8.27"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ZV5zWu7UvNKVcVo79/iKMhF4H09rGyDCvEL61H05lZc="; + }; + + patches = [ + (fetchpatch { + name = "fix_IsDir_for_symlink"; + url = "https://github.com/linuxdeepin/go-lib/commit/79239904679dc70a11e1ac8e65670afcfdd7c122.patch"; + sha256 = "sha256-RsN9hK26i/W6P/+e1l1spCLdlgIEWTehhIW6POBOvW4="; + }) + ]; + + postPatch = replaceAll "/bin/sh" "${runtimeShell}"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gocode/src/github.com/linuxdeepin/go-lib + cp -a * $out/share/gocode/src/github.com/linuxdeepin/go-lib + rm -r $out/share/gocode/src/github.com/linuxdeepin/go-lib/debian + runHook postInstall + ''; + + meta = with lib; { + description = "Library containing many useful go routines for things such as glib, gettext, archive, graphic, etc"; + homepage = "https://github.com/linuxdeepin/go-lib"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} 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 0000000000000..ef302c5b72220 --- /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 0000000000000..ad3dce815c91c --- /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 0000000000000..3f65505e0af55 --- /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 0000000000000..8605a0d214b74 --- /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 0000000000000..24e22e99c5024 --- /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 0000000000000..282d079570d36 --- /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 0000000000000..0cc40768285a3 --- /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 0000000000000..170ae821eba2a --- /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 0000000000000..a1797344a0b0b --- /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 0000000000000..5c27afe7e4c0f --- /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 0000000000000..ec5f3568fbd6f --- /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 0000000000000..b3e5a189135cd --- /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 0000000000000..6ebe542398b70 --- /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 0000000000000..84321809ebebf --- /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/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix new file mode 100644 index 0000000000000..8aaf7929c5aba --- /dev/null +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: +stdenvNoCC.mkDerivation rec { + pname = "deepin-desktop-base"; + version = "2022.03.07"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-joAduRI9jUtPA4lNsEhgOZlci8j/cvD8rJThqvj6a8A="; + }; + + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; + + # distribution_logo_transparent.svg come form nixos-artwork(https://github.com/NixOS/nixos-artwork)/logo/nixos-white.svg under CC-BY license, used for dde-lock + postInstall = '' + rm -r $out/etc + rm -r $out/usr/share/python-apt + rm -r $out/usr/share/plymouth + rm -r $out/usr/share/distro-info + mv $out/usr/* $out/ + rm -r $out/usr + install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg + ''; + + meta = with lib; { + description = "Base assets and definitions for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg b/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg new file mode 100644 index 0000000000000..18f8d4055c394 --- /dev/null +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="156px" + height="46px" + viewBox="0 0 156 46" + version="1.1" + id="SVGRoot" + sodipodi:docname="distribution_logo_transparent.svg" + inkscape:version="1.1 (c4e8f9e, 2021-05-24)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview12158" + pagecolor="#ffffff" + bordercolor="#ffffff" + borderopacity="0" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:document-units="px" + showgrid="false" + inkscape:zoom="0.67972082" + inkscape:cx="397.22191" + inkscape:cy="90.478323" + inkscape:window-width="1920" + inkscape:window-height="960" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs12153" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g12416" + transform="matrix(0.10297744,0,0,0.10574712,-2.4660846,-2.6161481)"> + <g + id="layer7" + inkscape:label="bg" + style="display:none"> + <rect + transform="translate(-132.5822,958.04022)" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect5389" + width="1543.4287" + height="483.7439" + x="132.5822" + y="-957.77832" /> + <rect + style="fill:#000000;fill-opacity:1;stroke-width:0.529749" + id="rect6896" + width="1543.4287" + height="483.74393" + x="-9.0332054e-07" + y="0.26189968" /> + </g> + <g + id="layer5" + inkscape:label="guide" + style="display:none;opacity:0.516" + transform="translate(-132.5822,958.04022)"> + <rect + y="-957.77832" + x="132.5822" + height="483.7439" + width="1543.4283" + id="rect5350" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d4d4d4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9b9b9b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect5346" + width="1496.443" + height="435.68069" + x="155.77646" + y="-933.38721" + inkscape:export-xdpi="17.971878" + inkscape:export-ydpi="17.971878" /> + <rect + y="-851.65918" + x="159.02695" + height="272.58423" + width="1492.5731" + id="rect5348" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#848484;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + </g> + <g + id="layer6" + inkscape:label="logo-guide" + style="display:none" + transform="translate(-132.5822,958.04022)"> + <rect + y="-958.02759" + x="132.65129" + height="484.30399" + width="550.41602" + id="rect5379" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5c201e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + inkscape:export-filename="/home/tim/dev/nix/homepage/logo/nix-wiki.png" + inkscape:export-xdpi="22.07" + inkscape:export-ydpi="22.07" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c24a46;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect5372" + width="501.94415" + height="434.30405" + x="156.12303" + y="-933.02759" + inkscape:export-filename="/home/tim/dev/nix/homepage/logo/nixos-logo-only-hires-print.png" + inkscape:export-xdpi="212.2" + inkscape:export-ydpi="212.2" /> + <rect + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d98d8a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + id="rect5381" + width="24.939611" + height="24.939611" + x="658.02826" + y="-958.04022" /> + </g> + <g + style="display:inline" + inkscape:label="text-vegur" + id="g5329" + transform="translate(-132.5822,958.04022)"> + <g + aria-label="Nix" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:395.097px;line-height:125%;font-family:Carlito;-inkscape-font-specification:Carlito;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text5407"> + <path + d="m 969.15319,-847.11833 h -30.81755 v 139.86428 c 0,19.75484 0.79019,50.96749 1.97548,85.73601 h -1.18529 c -15.40877,-28.84207 -32.79303,-56.49884 -45.04104,-75.46349 l -96.79872,-150.1368 h -42.27536 v 267.87565 h 30.81755 v -139.86427 c 0,-19.75485 -0.79019,-56.89395 -1.97548,-91.26737 h 1.18529 c 22.91561,39.90478 36.34891,62.0302 48.99201,80.99485 l 96.79872,150.13679 h 38.32439 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff" + id="path4683" /> + <path + d="m 1027.8251,-579.24268 h 33.1881 v -191.22686 h -33.1881 z m 16.594,-219.27874 c 11.4578,0 20.5451,-9.08722 20.5451,-20.54503 0,-11.45781 -9.0873,-20.54504 -20.5451,-20.54504 -11.4578,0 -20.545,9.08723 -20.545,20.54504 0,11.45781 9.0872,20.54503 20.545,20.54503 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff" + id="path4685" /> + <path + d="m 1267.7785,-770.46954 h -37.9293 l -46.6214,70.32723 h -1.1853 l -45.0411,-70.32723 h -41.09 l 68.3517,93.24285 v 1.18529 l -70.7223,96.79872 h 37.9293 l 49.7822,-75.85859 h 1.1853 l 49.7822,75.85859 h 41.09 l -72.3027,-98.37911 v -1.18529 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff" + id="path4687" /> + </g> + <g + aria-label="O" + transform="scale(0.95067318,1.0518862)" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:367.487px;line-height:125%;font-family:Carlito;-inkscape-font-specification:Carlito;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text5356"> + <path + d="m 1468.5915,-800.79725 c -66.1477,0 -120.5358,48.14083 -120.5358,128.25306 0,80.11223 54.3881,128.25306 120.5358,128.25306 66.1477,0 120.5359,-48.14083 120.5359,-128.25306 0,-80.11223 -54.3882,-128.25306 -120.5359,-128.25306 z m 0,24.98914 c 49.2433,0 86.727,36.74872 86.727,103.26392 0,66.5152 -37.4837,103.26392 -86.727,103.26392 -49.2433,0 -86.727,-36.74872 -86.727,-103.26392 0,-66.5152 37.4837,-103.26392 86.727,-103.26392 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff" + id="path4680" /> + </g> + <g + aria-label="S" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:386.555px;line-height:125%;font-family:Carlito;-inkscape-font-specification:Carlito;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text5364"> + <path + d="m 1523.761,-773.88643 c 0,37.10927 19.3277,57.21012 64.1681,75.37819 34.4034,13.91598 48.3193,26.28573 48.3193,51.79835 0,30.92438 -25.126,46.38657 -58.3697,46.38657 -17.395,0 -37.1093,-2.70588 -58.7564,-10.05042 l -3.479,26.67228 c 18.9412,6.95799 39.8152,9.66387 60.6891,9.66387 51.7984,0 95.0925,-26.28573 95.0925,-79.24374 0,-36.7227 -22.4202,-54.50422 -67.6471,-72.6723 -30.1512,-11.9832 -44.8403,-24.73951 -44.8403,-51.41179 0,-25.89917 22.4202,-40.2017 50.6387,-40.2017 16.6218,0 34.7899,4.2521 47.5462,9.27732 l 3.479,-26.28573 c -14.6891,-6.18488 -32.8572,-9.27732 -52.958,-9.27732 -47.5463,0 -83.8824,27.4454 -83.8824,69.96642 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Vegur;-inkscape-font-specification:Vegur;fill:#ffffff" + id="path4677" /> + </g> + </g> + <g + id="layer4" + inkscape:label="white-logo" + style="display:inline"> + <g + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:11.0512" + transform="matrix(0.09048806,0,0,0.09048806,9.7879003,109.19458)" + id="g955"> + <g + transform="matrix(11.047619,0,0,11.047619,-1572.2888,9377.7107)" + id="g869" + style="fill:#ffffff;fill-opacity:1"> + <g + transform="rotate(-60,226.35754,-449.37199)" + id="g932" + style="fill:#ffffff;fill-opacity:1;stroke-width:11.0512"> + <path + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" + id="path3336-6-3" + d="m 449.71876,-420.51322 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8257 z" + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:33.1535;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <path + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" + id="path4260-0-6" + d="m 309.54892,-710.38827 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8256 z" + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:33.1535;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + <use + x="0" + y="0" + xlink:href="#path3336-6-3" + inkscape:transform-center-x="124.43045" + inkscape:transform-center-y="151.59082" + id="use3439-6-7" + transform="rotate(60,728.23563,-692.24036)" + width="100%" + height="100%" + style="fill:#ffffff;fill-opacity:1;stroke-width:11.0512" /> + <use + x="0" + y="0" + xlink:href="#path3336-6-3" + inkscape:transform-center-x="59.669705" + inkscape:transform-center-y="-139.94592" + id="use3449-5-5" + transform="rotate(180,477.5036,-570.81898)" + width="100%" + height="100%" + style="fill:#ffffff;fill-opacity:1;stroke-width:11.0512" /> + <use + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:11.0512" + x="0" + y="0" + xlink:href="#path4260-0-6" + id="use4354-5-3" + transform="rotate(120,407.33916,-716.08356)" + width="100%" + height="100%" /> + <use + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:11.0512" + x="0" + y="0" + xlink:href="#path4260-0-6" + id="use4362-2-5" + transform="rotate(-120,407.28823,-715.86995)" + width="100%" + height="100%" /> + </g> + </g> + </g> + </g> + </g> +</svg> diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix new file mode 100644 index 0000000000000..7eaca5768607a --- /dev/null +++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, dtkwidget +}: + +stdenv.mkDerivation rec { + pname = "deepin-turbo"; + version = "0.0.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-t6/Ws/Q8DO0zBzrUr/liD61VkxbOv4W4x6VgMWr+Ozk="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + ]; + + postPatch = '' + substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out" + ''; + + meta = with lib; { + description = "A daemon that helps to launch dtk applications faster"; + homepage = "https://github.com/linuxdeepin/deepin-turbo"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix new file mode 100644 index 0000000000000..87a2fe1b66c79 --- /dev/null +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, deepin-gettext-tools +, qt5integration +, qmake +, qtbase +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, udisks2-qt5 +}: + +stdenv.mkDerivation rec { + pname = "dde-device-formatter"; + version = "unstable-2022-09-05"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = "9b8489cb2bb7c85bd62557d16a5eabc94100512e"; + sha256 = "sha256-Mi48dSDCoKhr8CGt9z64/9d7+r9QSrPPICv+R5VDuaU="; + }; + + patches = [ + (fetchpatch { + name = "chore: don't use hardcode path"; + url = "https://github.com/linuxdeepin/dde-device-formatter/commit/b836a498b8e783e0dff3820302957f15ee8416eb.patch"; + sha256 = "sha256-i/VqJ6EmCyhE6weHKUB66bW6b51gLyssIAzb5li4aJM="; + }) + ]; + + postPatch = '' + substituteInPlace dde-device-formatter.pro --replace "/usr" "$out" + patchShebangs *.sh + ''; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + deepin-gettext-tools + ]; + + buildInputs = [ + dtkwidget + udisks2-qt5 + qtx11extras + ]; + + 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 simple graphical interface for creating file system in a block device"; + homepage = "https://github.com/linuxdeepin/dde-device-formatter"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix new file mode 100644 index 0000000000000..d219e6d73b16a --- /dev/null +++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, gettext +, python3Packages +, perlPackages +}: + +stdenv.mkDerivation rec { + pname = "deepin-gettext-tools"; + version = "1.0.10"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-5Dd2QU6JYwuktusssNDfA7IHa6HbFcWo9sZf5PS7NtI="; + }; + + postPatch = '' + substituteInPlace src/generate_mo.py --replace "sudo cp" "cp" + ''; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ + gettext + perlPackages.perl + perlPackages.ConfigTiny + perlPackages.XMLLibXML + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postFixup = '' + wrapPythonPrograms + wrapPythonProgramsIn "$out/lib/${pname}" + wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB + ''; + + meta = with lib; { + description = "Translation file processing utils for DDE development"; + homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index df63449c2f61f..902178d167063 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,19 +1,21 @@ {lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib , gnome-common, gtk2, pango -, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: +, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 +, testers +}: -with lib; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "2.10.5"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; - patches = optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { name = "change-igemacintegration-to-gtkosxapplication.patch"; url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; @@ -31,13 +33,19 @@ stdenv.mkDerivation rec { atk cairo glib gtk2 pango libxml2Python perl gettext - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ gnome-common gtk-mac-integration-gtk2 ]; - preConfigure = optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' intltoolize --force ''; doCheck = false; # requires X11 daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gtksourceview-2.0" ]; + }; +}) diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4c9f28230c31e..7ce615fb3c71c 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib -, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-vfs"; version = "2.24.4"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; @@ -35,4 +39,10 @@ stdenv.mkDerivation rec { postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; doCheck = false; # needs dbus daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gnome-vfs-2.0" "gnome-vfs-module-2.0" ]; + }; +}) diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index d7895df784b6a..3d79656d25823 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.2"; + version = "44.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "+VDS01xZS7bI28n1RAytd4jKCoaI4rB4Rvg96aTj/CU="; + sha256 = "O7sbN3XUwnfa9UqqtEsOuDpOsfCfA5GAAEHJ5WiT7BE="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index c79d3d731ea9c..4f036de24d730 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hmwGIsZv21rSpHXpz8zLIZocZDHwCayyKR1D8hQLFH4="; + sha256 = "pUuUPv5CAQqcEuTc2ts3e/NslMOAB3i4Uww6g0QJ3Mc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 78f5f059d1567..8b7a94668f238 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.2"; + version = "43.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nD4OlDPBhTqZ7VLt7BMmP0Q/hW28o7IWXC46cLhjKzA="; + sha256 = "7tu69YDZuC20vmV7k7zuXzioe3hScPxJVcC/OGIs7ZM="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 0cb6f374f29b6..ba83f42fce601 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.3"; + version = "43.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE="; + sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 60de418f1e440..bbab612b9c8d8 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchurl , vala , meson @@ -36,6 +37,14 @@ stdenv.mkDerivation rec { hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0="; }; + patches = [ + (fetchpatch { + name = "gpg-2.4.patch"; + url = "https://gitlab.gnome.org/GNOME/seahorse/-/commit/9260c74779be3d7a378db0671af862ffa3573d42.patch"; + hash = "sha256-4QiFgH4jC1ucmA9fFozUQZ3Mat76SgpYkMpRz80RH64="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index ea2b1de436532..f8d20291a1fa8 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg ]; - NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; + env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 67ac1cfa9708a..2459c3535e977 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 @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { extraLoaders = [ librsvg webp-pixbuf-loader + libheif.out ]; }}" ''; diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 2a7c0323e0917..8b5f935f49144 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tm1Jn57nJpbYPPhEElN3GBqVRVSkuzeFtzKTOArAwic="; + sha256 = "6G6tJ8uZgoFRUGZN478g+vN193uAZbArMRgMZba767Q="; }; patches = lib.optionals withPantheon [ diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 30f8ed9fac979..d561ad6646a2e 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { "-Dmultimedia=disabled" ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 082483b1c2479..f5ea57f1f8001 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.46.3"; + version = "3.46.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4="; + sha256 = "pZslQUXFn6zXx7U4LbeNxfDtH2pum4/n1edZWfk8DMg="; }; patches = [ 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 dfe109f57bda6..c0cfade44b4eb 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -298,7 +298,7 @@ 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 611d5c8..4790fca 100644 +index 28755e2..da8c40c 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5593,7 +5593,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 61a367222b689..eeee846ad190a 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "43"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "GfdJ2MN/hy8VW7aaK756yjgRdeaSnxmYBH13XLxjckQ="; + sha256 = "jkWcrTinV0aDpV5ed2kOZYxvn+ruycuCA5qyW6K8oF0="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 760af24880c4d..560d40ddc115e 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VbYd9+k/Cr4f+kZeGOPF3k9JqQ8mjqnRHtyGrwbQceE="; + sha256 = "Ug3IjJAce4/n4SoBOhQlz+2R8vhAhIWitJ+SxnWZACA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index c018b4ea4a34a..0b4d71adc5fe9 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.2"; + version = "43.4.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1/JWq6gKkscnsyn9AchgLaS3jw/drsk/zZEJaWRwBWM="; + sha256 = "sha256-AA+XBRroJHJJOSsB+/uiCv7lZiZxlscNVEChisBY2Z4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 877b99748ec5d..6a160f6cf77d5 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -19,6 +19,7 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , gnome +, useWrappedDaemon ? true }: stdenv.mkDerivation rec { @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { ''; # Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep - postFixup = '' + postFixup = lib.optionalString useWrappedDaemon '' files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*) for file in ''${files[*]}; do diff --git a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix index 95fdf35b8831b..a45cd7a1ed21a 100644 --- a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { dleyna-server ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747 ]; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix index d9a67183e3c3b..e05040cc6e4cf 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix @@ -39,16 +39,15 @@ , nss , gcr , gnome-session-ctl -, pantheon }: stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.38.2"; + version = "42.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; }; patches = [ @@ -63,37 +62,6 @@ stdenv.mkDerivation rec { inherit tzdata; }) - # Adjust to libgweather changes. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; - sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; - }) - - # Fix build with new meson - # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch"; - sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ="; - }) - # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True) - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff"; - sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY="; - }) - - # Port to gweather4 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch"; - sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch"; - sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM="; - }) - # Use geocode-glib_2 dependency # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 (fetchpatch { @@ -148,7 +116,7 @@ stdenv.mkDerivation rec { # Default for release buildtype but passed manually because # we're using plain - NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; postPatch = '' for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch index 2229302cab7c0..2229302cab7c0 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 0c20e07a770dd..e494a46d16d09 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { # Default for release buildtype but passed manually because # we're using plain - NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index c13ed844c28d4..86a63876c670e 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -62,19 +62,18 @@ , mesa }: -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup let pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "43.2"; + version = "43.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "52/UvpNCQQ7p+9zday2Bxv8GDnyMxaDxyuanq6JdGGA="; + sha256 = "Sf+NBfVfpPHCLwXQOFhSzrQpprY4DBuoRh5ipG1MBx4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 450da49cf9801..591bd397c0ac3 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.3"; + version = "43.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "k+6AdHl4rSzALlrnPQo9Psgu6hNPx3niqpFpAbu1gJA="; + sha256 = "6d8GDrq1n0lpfV7yYw7DbeYEVBadwZGvYNNINyCq2z4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index aa3c7ed398114..f6d2eb4bf63ac 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,14 +1,13 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome +, testers +}: -let +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-keyring"; version = "3.12.0"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/libgnome-keyring/${lib.versions.majorMinor finalAttrs.version}/libgnome-keyring-${finalAttrs.version}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -17,11 +16,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; + pkgConfigModules = [ "gnome-keyring-1" ]; + platforms = lib.platforms.unix; + maintainers = []; longDescription = '' gnome-keyring is a program that keeps password and other secrets for @@ -29,4 +32,4 @@ stdenv.mkDerivation rec { with the gnome-keyring system. ''; }; -} +}) diff --git a/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch deleted file mode 100644 index 7374e1b86935e..0000000000000 --- a/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com> -Date: Sat, 19 Oct 2019 13:26:05 +0200 -Subject: [PATCH] drop inheritable - -Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 - -We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. - ---- - config.h.meson | 3 +++ - meson.build | 5 +++++ - meson_options.txt | 6 ++++++ - src/core/main.c | 11 +++++++++++ - src/meson.build | 1 + - 5 files changed, 26 insertions(+) - -diff --git a/config.h.meson b/config.h.meson -index 0bab71848..202fb7ed1 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -58,6 +58,9 @@ - /* Xwayland applications allowed to issue keyboard grabs */ - #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES - -+/* Defined if libcap-ng is available */ -+#mesondefine HAVE_LIBCAPNG -+ - /* XKB base prefix */ - #mesondefine XKB_BASE - -diff --git a/meson.build b/meson.build -index 3322bd3b1..01c8020fa 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' - libcanberra_req = '>= 0.26' - libwacom_req = '>= 0.13' - atk_req = '>= 2.5.3' -+libcapng_req = '>= 0.7.9' - - # optional version requirements - udev_req = '>= 228' -@@ -131,6 +131,7 @@ ice_dep = dependency('ice') - atk_dep = dependency('atk', version: atk_req) - libcanberra_dep = dependency('libcanberra', version: libcanberra_req) - dbus_dep = dependency('dbus-1') -+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - - # For now always require X11 support - have_x11 = true -@@ -256,6 +258,7 @@ have_core_tests = false - have_cogl_tests = false - have_clutter_tests = false - have_installed_tests = false -+have_libcapng = libcapng_dep.found() - - if have_tests - have_core_tests = get_option('core_tests') -@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) - cdata.set('HAVE_SM', have_sm) - cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) - cdata.set('HAVE_INTROSPECTION', have_introspection) -+cdata.set('HAVE_LIBCAPNG', have_libcapng) - cdata.set('HAVE_PROFILER', have_profiler) - - xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -465,6 +465,7 @@ output = [ - ' Introspection............ ' + have_introspection.to_string(), - ' Profiler................. ' + have_profiler.to_string(), - ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(), -+ ' libcap-ng................ ' + have_libcapng.to_string(), - '', - ' Tests:', - '', -diff --git a/meson_options.txt b/meson_options.txt -index 73aa7adde..8bfaacd9a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', - value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' - ) -+ -+option('libcapng', -+ type: 'feature', -+ value: 'auto', -+ description: 'Enable libcap-ng support' -+) -diff --git a/src/core/main.c b/src/core/main.c -index 7f4f666d2..b27968f13 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -66,6 +66,10 @@ - #include <girepository.h> - #endif - -+#ifdef HAVE_LIBCAPNG -+#include <cap-ng.h> -+#endif -+ - #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) - #include <systemd/sd-login.h> - #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ -@@ -670,5 +674,12 @@ int - meta_run (void) - { - meta_start (); -+ -+#ifdef HAVE_LIBCAPNG -+ capng_clear(CAPNG_SELECT_BOTH); -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); -+ capng_apply(CAPNG_SELECT_BOTH); -+#endif -+ - meta_run_main_loop (); - meta_finalize (); -diff --git a/src/meson.build b/src/meson.build -index 90d80734f..a9fffa2c2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,6 +18,7 @@ mutter_pkg_deps = [ - glib_dep, - gsettings_desktop_schemas_dep, - gtk3_dep, -+ libcapng_dep, - pango_dep, - ] - --- -2.23.0 - diff --git a/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch deleted file mode 100644 index 9737682397921..0000000000000 --- a/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a58ace29db48f98ad59f4f309d49b458c68a6eec Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Wed, 28 Jul 2021 22:08:11 +0800 -Subject: [PATCH] Fix glitches in gala - -Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch> - -This fixes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index febfb31918..71906000c0 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -15926,7 +15926,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/42/default.nix index 464cd285a780c..b2c1ccc43b1c6 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/42/default.nix @@ -15,6 +15,7 @@ , zenity , libcanberra , ninja +, xvfb-run , xkeyboard_config , libxkbfile , libXdamage @@ -47,32 +48,16 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.6"; + version = "42.7"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxln9azl4krmknq2vmhd15lgpa2q7gh7whiv14nsqbr9iaxmg2x"; + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM="; }; patches = [ - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking - # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch - - # Fixes issues for users of mutter like in gala. - # https://github.com/elementary/gala/issues/605 - # https://gitlab.gnome.org/GNOME/mutter/issues/536 - ./fix-glitches-in-gala.patch - - # Stop using source_root()/build_root(). - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch"; - sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0="; - }) - # Fix build with separate sysprof. # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 (fetchpatch { @@ -111,6 +96,7 @@ let self = stdenv.mkDerivation rec { mesa # needed for gbm meson ninja + xvfb-run pkg-config python3 wrapGAppsHook @@ -156,7 +142,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-7"; + libdir = "${self}/lib/mutter-10"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch index 6ac0a431f61ff..6ac0a431f61ff 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch +++ b/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index ed7bb388d85e2..5220bf8388e21 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "43.2"; + version = "43.3"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "/S63B63DM8wnevhoXlzzkTXhxNeYofnQXojkU9w+u4Q="; + sha256 = "Z75IINmycMnDxl44lHvwUtLC/xiunnBCHUklnvrACn0="; }; patches = [ @@ -65,6 +65,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) + + # Fix focus regression. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2848 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/12ce58dba4f96f6a948c1d166646d263253e3ee0.patch"; + sha256 = "CGu11aLFs8VEt8NiIkih+cXZzU82oxY6Ko9QRKOkM98="; + }) ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index c2414020968e5..6c5d6bc64b74b 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.0"; + version = "0.42.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AG2nhnffKMruKHxEwp/NntyxshYkI7x/LdLchWuOK7s="; + sha256 = "BfMrbray/j8dg8Vp3QKnRnfN5nyTpb3O6JXiPr+omD0="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index 1bb1f4384b54b..f5eb4c5e80dfc 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 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 0000000000000..d412cc4a5bf04 --- /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 ae8bc2bc13024..155d8413ee2ac 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - # Using 3.38 to match Mutter used in Pantheon - gnome-settings-daemon338 = callPackage ./core/gnome-settings-daemon/3.38 { }; + # Using 42 to match Mutter used in Pantheon + gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { }; gnome-software = callPackage ./core/gnome-software { }; @@ -96,8 +96,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; - # Needed for elementary's gala and greeter until support for higher versions is provided - mutter338 = callPackage ./core/mutter/3.38 { }; + # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided + mutter42 = callPackage ./core/mutter/42 { }; nautilus = callPackage ./core/nautilus { }; @@ -271,4 +271,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26 gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 + mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 + gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 } diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index 29a60e5513af2..759fd1d9bfe38 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-EasyScreenCast"; - version = "1.4.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "EasyScreenCast"; repo = "EasyScreenCast"; rev = version; - sha256 = "sha256-+lh/hqYC9+DUvLE016KuAY4Ybw8KrqEEG7WG4pUbg2k="; + hash = "sha256-+cH/gczCdxoSrLp5nD82Spo8bSGyRnUUut3Xkmr9f3o="; }; patches = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - glib gettext + glib gettext jq ]; makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch index 2d32021b6c665..4ea048ba79bf2 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch @@ -1,16 +1,40 @@ -diff --git i/utilaudio.js w/utilaudio.js -index 983b29c..7a94de8 100644 ---- i/utilaudio.js -+++ w/utilaudio.js -@@ -11,10 +11,7 @@ - */ +diff --git a/prefs.js b/prefs.js +index 97b85a3..2fc6539 100644 +--- a/prefs.js ++++ b/prefs.js +@@ -14,8 +14,8 @@ + 'use strict'; const GIRepository = imports.gi.GIRepository; --GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); --GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); --GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); --GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell"); +-GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); +-GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); ++GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell'); ++GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell'); + + const GObject = imports.gi.GObject; + const Gio = imports.gi.Gio; +@@ -746,7 +746,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ + Lib.TalkativeLog('-^-NOT SET xdg-user video'); + + ctx.CtrlExe.Execute( +- '/usr/bin/sh -c "echo $HOME"', ++ '/bin/sh -c "echo $HOME"', + true, + (success, out) => { + Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`); +diff --git a/utilaudio.js b/utilaudio.js +index 957eda2..84af241 100644 +--- a/utilaudio.js ++++ b/utilaudio.js +@@ -15,10 +15,7 @@ + + const GObject = imports.gi.GObject; + const GIRepository = imports.gi.GIRepository; +-GIRepository.Repository.prepend_search_path('/usr/lib/gnome-shell'); +-GIRepository.Repository.prepend_library_path('/usr/lib/gnome-shell'); +-GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); +-GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); +GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); const Gvc = imports.gi.Gvc; - const Lang = imports.lang; + const ExtensionUtils = imports.misc.extensionUtils; diff --git a/pkgs/desktops/gnome/extensions/collisions.json b/pkgs/desktops/gnome/extensions/collisions.json index 61635abcf3313..8beb546213297 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": { @@ -164,6 +168,10 @@ "volume-scroller": [ "volume_scroller@trflynn89.pm.me", "volume_scroller@noskoski" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "42": { @@ -179,6 +187,10 @@ "lockkeys@vaina.lt", "lockkeys@fawtytoo" ], + "clipboard-indicator": [ + "clipboard-indicator@tudmotu.com", + "clipboard-indicator@Dieg0Js.github.io" + ], "noannoyance": [ "noannoyance@sindex.com", "noannoyance@daase.net" @@ -198,6 +210,10 @@ "auto-activities": [ "auto-activities@acedron.github.io", "auto-activities@CleoMenezesJr.github.io" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "43": { @@ -209,9 +225,25 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "horizontal-workspace-indicator@tty2.io" ], + "clipboard-indicator": [ + "clipboard-indicator@tudmotu.com", + "clipboard-indicator@Dieg0Js.github.io" + ], + "keep-awake": [ + "KeepAwake@jepfa.de", + "awake@vixalien.com" + ], "noannoyance": [ "noannoyance@sindex.com", "noannoyance@daase.net" + ], + "battery-time": [ + "batime@martin.zurowietz.de", + "batterytime@typeof.pw" + ], + "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 81622db59c1ec..d21f994a43afe 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -12,6 +12,7 @@ , nvme-cli , procps , pulseaudio +, libgtop , python3 , smartmontools , substituteAll @@ -112,6 +113,15 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ rhoriguchi ]; })) + (patchExtension "tophat@fflewddur.github.io" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/tophat_at_fflewddur.github.io.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) + ]; + })) + (patchExtension "unite@hardpixel.eu" (old: { buildInputs = [ xprop ]; diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch new file mode 100644 index 0000000000000..03b016cae2498 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch @@ -0,0 +1,13 @@ +diff --git a/extension.js b/extension.js +index 60396f8..b044872 100644 +--- a/extension.js ++++ b/extension.js +@@ -20,6 +20,8 @@ + + /* exported init, enable, disable */ + ++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); ++ + let depFailures = []; + let missingLibs = []; + diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 08f2e7de384f3..dbd8a49a924bb 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -12,13 +12,23 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator"; "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2"; - # forks of each other, azan@faissal.bensefia.id is more recent - "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; - "azan@hatem.masmoudi.org" = null; + "clipboard-indicator@tudmotu.com" = "clipboard-indicator"; + "clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2"; + + # DEPRECATED: Use "Caffeine" instead + "KeepAwake@jepfa.de" = "keep-awake"; + "awake@vixalien.com" = null; "noannoyance@sindex.com" = "noannoyance"; "noannoyance@daase.net" = "noannoyance-2"; + "batime@martin.zurowietz.de" = "battery-time"; + "batterytime@typeof.pw" = "battery-time-2"; + + # no source repository can be found for this extension + "floating-panel@aylur" = "floating-panel"; + "floating-panel-usedbymyself@wpism" = null; + # ############################################################################ # 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 @@ -81,6 +91,10 @@ "transparent-window@pbxqdown.github.com" = "transparent-window"; "transparentwindows.mdirshad07" = 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; + # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612 "flypie@schneegans.github.com" = null; diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index 1a5613f50ac04..4323b80600970 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -11,13 +11,13 @@ , {"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": "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": "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": "50", "sha256": "0509w179iq78151ff6186a12mnzp9dbv322dnmisdxsk3whiysk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "40": {"version": "50", "sha256": "0509w179iq78151ff6186a12mnzp9dbv322dnmisdxsk3whiysk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "41": {"version": "50", "sha256": "0509w179iq78151ff6186a12mnzp9dbv322dnmisdxsk3whiysk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "42": {"version": "50", "sha256": "0509w179iq78151ff6186a12mnzp9dbv322dnmisdxsk3whiysk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "43": {"version": "50", "sha256": "0509w179iq78151ff6186a12mnzp9dbv322dnmisdxsk3whiysk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sb2Nra2V5cyIsCiAgInV1aWQiOiAibG9ja2tleXNAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNTAKfQ=="}}} , {"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": "57", "sha256": "0inq9hb87mzq3cv0m403z9n7sx6kflpbny808hy2lhlxfji7dwid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}}} +, {"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": "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=="}}} @@ -35,23 +35,23 @@ , {"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": "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": "44", "sha256": "0rpknbpscv24pvcgpl3r3f6g51zk7rbhvh76sj4j51v0jfrrw710", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VvbnBhdGFwb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNhZmZlaW5lIiwKICAidXVpZCI6ICJjYWZmZWluZUBwYXRhcG9uLmluZm8iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} , {"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": "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": "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": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "40": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "41": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "42": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}, "43": {"version": "112", "sha256": "1fik9pmmp297idgfgk03gc6mh1s4lvfa5b0mhy945ymbm2y6viaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy90dXhvcjEzMzcvaGlkZXRvcGJhciIsCiAgInV1aWQiOiAiaGlkZXRvcGJhckBtYXRoaWV1LmJpZG9uLmNhIiwKICAidmVyc2lvbiI6IDExMgp9"}}} , {"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": "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": "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": "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": "36", "sha256": "0irv62p760zyq1x03vnz6bq08nxpkrs85m9806js62si68dkwby5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM2Cn0="}, "41": {"version": "36", "sha256": "0irv62p760zyq1x03vnz6bq08nxpkrs85m9806js62si68dkwby5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM2Cn0="}, "42": {"version": "36", "sha256": "0irv62p760zyq1x03vnz6bq08nxpkrs85m9806js62si68dkwby5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "36", "sha256": "0irv62p760zyq1x03vnz6bq08nxpkrs85m9806js62si68dkwby5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FpL2F1dG9oaWRlLWJhdHRlcnkiLAogICJ1dWlkIjogImF1dG9oaWRlLWJhdHRlcnlAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDM2Cn0="}}} , {"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="}}} -, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "46", "sha256": "1wq4aqmi81nmmi1wcnnpk5mhkzgsl42parhh3v3796i4w6y7c48v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhcHBpbmRpY2F0b3JzdXBwb3J0QHJnY2pvbmFzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}, "40": {"version": "46", "sha256": "1wq4aqmi81nmmi1wcnnpk5mhkzgsl42parhh3v3796i4w6y7c48v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhcHBpbmRpY2F0b3JzdXBwb3J0QHJnY2pvbmFzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}, "41": {"version": "46", "sha256": "1wq4aqmi81nmmi1wcnnpk5mhkzgsl42parhh3v3796i4w6y7c48v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhcHBpbmRpY2F0b3JzdXBwb3J0QHJnY2pvbmFzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}, "42": {"version": "46", "sha256": "1wq4aqmi81nmmi1wcnnpk5mhkzgsl42parhh3v3796i4w6y7c48v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhcHBpbmRpY2F0b3JzdXBwb3J0QHJnY2pvbmFzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}, "43": {"version": "46", "sha256": "1wq4aqmi81nmmi1wcnnpk5mhkzgsl42parhh3v3796i4w6y7c48v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhcHBpbmRpY2F0b3JzdXBwb3J0QHJnY2pvbmFzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}}} +, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "47", "sha256": "0l0jlk1i3zqlj7aymnxib2dpp7ap3iyr8kbixfpm7y0dy6nimqpa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "40": {"version": "47", "sha256": "0l0jlk1i3zqlj7aymnxib2dpp7ap3iyr8kbixfpm7y0dy6nimqpa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "41": {"version": "47", "sha256": "0l0jlk1i3zqlj7aymnxib2dpp7ap3iyr8kbixfpm7y0dy6nimqpa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "42": {"version": "47", "sha256": "0l0jlk1i3zqlj7aymnxib2dpp7ap3iyr8kbixfpm7y0dy6nimqpa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "43": {"version": "47", "sha256": "0l0jlk1i3zqlj7aymnxib2dpp7ap3iyr8kbixfpm7y0dy6nimqpa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}}} , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": {"38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, "40": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "41": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "42": {"version": "66", "sha256": "0a1156n4ding1ypjnxm1xz5cqihrf5m2d4bf2zmci29nsjina9c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY2IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "43": {"version": "67", "sha256": "114kwp1q0qzkd03851mky1syxz8i5zgvazb53rh800wacb4wsh5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Nwp9"}}} , {"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": "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="}}} @@ -91,13 +91,13 @@ , {"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="}, "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": "11", "sha256": "1jf606qc93d3hvi9bxdia9r1cjgq35qdrkib4wvisqlpvfri1dw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "11", "sha256": "1jf606qc93d3hvi9bxdia9r1cjgq35qdrkib4wvisqlpvfri1dw3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"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"}, "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=="}}} @@ -110,7 +110,7 @@ , {"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=="}}} @@ -141,20 +141,20 @@ , {"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.", "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"}}} , {"uuid": "printers@linux-man.org", "name": "Printers", "pname": "printers", "description": "Manage Jobs and Printers. Required package: cups-bsd", "link": "https://extensions.gnome.org/extension/1218/printers/", "shell_version_map": {"38": {"version": "12", "sha256": "1q2k5b4z159nfr5mn4ah8fz9x8dq35x5sz99s8yhalbkb0ba0d1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "42": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "43": {"version": "20", "sha256": "161f0lmza6j2d203p0ihb62ambsfbj4w2didjcgfvsy80m386gx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LW1hbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tcHJpbnRlcnMiLAogICJ1dWlkIjogInByaW50ZXJzQGxpbnV4LW1hbi5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} , {"uuid": "move-osd-windows@maestroschan.fr", "name": "Move OSD Windows", "pname": "move-osd-windows", "description": "Change the position of OSD windows (sound & luminosity popups).", "link": "https://extensions.gnome.org/extension/1220/move-osd-windows/", "shell_version_map": {"38": {"version": "3", "sha256": "1nmvbx7qbr9a9al5wirnsfwn4qb1qbql2w9f7fpajipasill9hkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgcG9zaXRpb24gb2YgT1NEIHdpbmRvd3MgKHNvdW5kICYgbHVtaW5vc2l0eSBwb3B1cHMpLiIsCiAgImdldHRleHQtZG9tYWluIjogIm1vdmUtb3NkLXdpbmRvd3MiLAogICJuYW1lIjogIk1vdmUgT1NEIFdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWVzdHJvc2NoYW4vTW92ZS1PU0QtV2luZG93cy1HTk9NRS1FeHRlbnNpb24iLAogICJ1dWlkIjogIm1vdmUtb3NkLXdpbmRvd3NAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "arc-menu@linxgem33.com", "name": "Arc Menu", "pname": "arc-menu", "description": "## Unmaintained 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": "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"}, "43": {"version": "26", "sha256": "1r14i6q8ijfa2grfq21gfm2mlkh0l0m3a3555pkdgwrhqf6xlkmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"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": "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": "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="}}} @@ -171,7 +171,7 @@ , {"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": "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": "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": "29", "sha256": "1kgpbkbz2s06715nbqhlwfclaan69j00dr8fjyird5lz2hrv81cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "41": {"version": "29", "sha256": "1kgpbkbz2s06715nbqhlwfclaan69j00dr8fjyird5lz2hrv81cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "29", "sha256": "1kgpbkbz2s06715nbqhlwfclaan69j00dr8fjyird5lz2hrv81cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "43": {"version": "29", "sha256": "1kgpbkbz2s06715nbqhlwfclaan69j00dr8fjyird5lz2hrv81cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NaLU5JQy9ydW4tb3ItcmFpc2UiLAogICJ1dWlkIjogInJ1bi1vci1yYWlzZUBlZHZhcmQuY3oiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}}} , {"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"}}} , {"uuid": "notes@maestroschan.fr", "name": "Notes", "pname": "notes", "description": "Sticky notes for the GNOME Shell desktop.", "link": "https://extensions.gnome.org/extension/1357/notes/", "shell_version_map": {"38": {"version": "22", "sha256": "0svx60711cphswiigd1sswczk17cjxr7gr3davk4krkhya04llp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "0sffysgh58p6yk6pa4ggzzz4nj2m2zfl7mb3fdn9i9cp35iamprh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} @@ -183,7 +183,7 @@ , {"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=="}}} +, {"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": "33", "sha256": "0a4y0ihfy9mbj08xjyaxb3bgfmh06mk1kn5wn3bwgpbxc1sjmwna", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "0a4y0ihfy9mbj08xjyaxb3bgfmh06mk1kn5wn3bwgpbxc1sjmwna", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "33", "sha256": "0a4y0ihfy9mbj08xjyaxb3bgfmh06mk1kn5wn3bwgpbxc1sjmwna", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "43": {"version": "33", "sha256": "0a4y0ihfy9mbj08xjyaxb3bgfmh06mk1kn5wn3bwgpbxc1sjmwna", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "syspeek-gs@gs.eros2.info", "name": "SysPeek-GS", "pname": "syspeek-gs", "description": "Minimalistic CPU load monitor widget inspired by SysPeek indicator", "link": "https://extensions.gnome.org/extension/1409/syspeek-gs/", "shell_version_map": {"38": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "11", "sha256": "1bbx2rqxyc73kmc1l7p8pk70yf72cq1dw6m6fslq89kxxvyk9bh0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3N5c3BlZWstZ3MiLAogICJ1dWlkIjogInN5c3BlZWstZ3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "discrete-brightness@gs.eros2.info", "name": "Discrete brightness", "pname": "discrete-brightness", "description": "Discrete brightness indicator changes brightness in discrete steps, unlike default smooth brightness bar in Gnome Shell. Extension for notebooks/tablets only, default brightness bar must be present in Gnome Shell.", "link": "https://extensions.gnome.org/extension/1410/discrete-brightness/", "shell_version_map": {"38": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0p9ljikhp0l7m2yq0rdr9xkamyrrc4jdcnicbq8qli2zfj5n97g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZXMgYnJpZ2h0bmVzcyBpbiBkaXNjcmV0ZSBzdGVwcywgdW5saWtlIGRlZmF1bHQgc21vb3RoIGJyaWdodG5lc3MgYmFyIGluIEdub21lIFNoZWxsLiBFeHRlbnNpb24gZm9yIG5vdGVib29rcy90YWJsZXRzIG9ubHksIGRlZmF1bHQgYnJpZ2h0bmVzcyBiYXIgbXVzdCBiZSBwcmVzZW50IGluIEdub21lIFNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzY3JldGUgYnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "quake-mode@repsac-by.github.com", "name": "quake-mode", "pname": "quake-mode", "description": "Drop-down mode for any application", "link": "https://extensions.gnome.org/extension/1411/quake-mode/", "shell_version_map": {"38": {"version": "3", "sha256": "17498v2jw85fhrsldvgnj3x01h00wqarsp9zqp6ym4h7syzbjxrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJuYW1lIjogInF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "04crfzkw1dl52v899axpx7igkhdk0v1b0jrhagd9hvqbcxz9zgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "8", "sha256": "0w23267rm320n3vyc5x9rhlc7ffc5kzay37npkdps6b04dqar6wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0w23267rm320n3vyc5x9rhlc7ffc5kzay37npkdps6b04dqar6wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "8", "sha256": "0w23267rm320n3vyc5x9rhlc7ffc5kzay37npkdps6b04dqar6wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWFrZS1tb2RlQHJlcHNhYy1ieS5naXRodWIuY29tIiwKICAibmFtZSI6ICJxdWFrZS1tb2RlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIucmVwc2FjLWJ5LnF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} @@ -203,7 +203,7 @@ , {"uuid": "fullbattery@categulario.tk", "name": "Full Battery indicator", "pname": "full-battery-indicator", "description": "Notifies when battery is full", "link": "https://extensions.gnome.org/extension/1466/full-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "rdesktop-menu@bastien.git.geekwu.org", "name": "Rdesktop launcher", "pname": "rdesktop-launcher", "description": "Add a servers status menu for quickly running rdesktop", "link": "https://extensions.gnome.org/extension/1467/rdesktop-launcher/", "shell_version_map": {"38": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "17", "sha256": "1pl0ad76dphpmda2qk860mz78h7l701zpsp2c7hbmcsp6vsf2nzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0LmdlZWt3dS5vcmcvYmFzdGllbi9yZGVza3RvcC1tZW51IiwKICAidXVpZCI6ICJyZGVza3RvcC1tZW51QGJhc3RpZW4uZ2l0LmdlZWt3dS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"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": "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=="}, "43": {"version": "12", "sha256": "05zhgz2pjd74wryzrjz13k737c26sd271i84dmzygd9l3dyr1pd2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1iYXRpbWUiLAogICJ1dWlkIjogImJhdGltZUBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"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": "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="}}} @@ -231,7 +231,7 @@ , {"uuid": "topiconsfix@aleskva@devnullmail.com", "name": "TopIconsFix", "pname": "topiconsfix", "description": "Shows legacy tray icons on top – the fixed version of https://extensions.gnome.org/extension/495/topicons/", "link": "https://extensions.gnome.org/extension/1674/topiconsfix/", "shell_version_map": {"38": {"version": "15", "sha256": "0dd8a7v4nagyg2scfjw53gq85x5djsncqzj122w1mlhrrv6m9d0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcGljb25zZml4QGFsZXNrdmFAZGV2bnVsbG1haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "15", "sha256": "0dd8a7v4nagyg2scfjw53gq85x5djsncqzj122w1mlhrrv6m9d0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcGljb25zZml4QGFsZXNrdmFAZGV2bnVsbG1haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0dd8a7v4nagyg2scfjw53gq85x5djsncqzj122w1mlhrrv6m9d0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcGljb25zZml4QGFsZXNrdmFAZGV2bnVsbG1haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0dd8a7v4nagyg2scfjw53gq85x5djsncqzj122w1mlhrrv6m9d0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcGljb25zZml4QGFsZXNrdmFAZGV2bnVsbG1haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "0dd8a7v4nagyg2scfjw53gq85x5djsncqzj122w1mlhrrv6m9d0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcGljb25zZml4QGFsZXNrdmFAZGV2bnVsbG1haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "animation-tweaks@Selenium-H", "name": "Animation Tweaks", "pname": "animation-tweaks", "description": "Add animations to different items and customize them.\n\nPlease reset the extension after updating.\nThe Extension will stop when upgraded to an incompatible version.\nIn that case an Update tab is created to easily reset the extension.\nA Reset menu entry is also always present in in the Top Right Application menu of the extension preferences window.\nA Default shortcut combination of Super Key + t is provided to disable the extension.\n\nSome effects might not work properly on wayland, for which an option to integrate with wayland is provided on Integrations tab.\nHowever, some animations might not work properly.\n\nTo manage effect Delay time enable Show delay time in preferences Window from Top Right Application menu -> Preferences\nand reopen preferences.", "link": "https://extensions.gnome.org/extension/1680/animation-tweaks/", "shell_version_map": {"38": {"version": "18", "sha256": "07niv7biy9yxmxdg498kqypyqva6y8slm3gmn70dpx9f9ng8ya55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQWRkIGFuaW1hdGlvbnMgdG8gZGlmZmVyZW50IGl0ZW1zIGFuZCBjdXN0b21pemUgdGhlbS4iLAogICJkZXNjcmlwdGlvbiI6ICJBZGQgYW5pbWF0aW9ucyB0byBkaWZmZXJlbnQgaXRlbXMgYW5kIGN1c3RvbWl6ZSB0aGVtLlxuXG5QbGVhc2UgcmVzZXQgdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGluZy5cblRoZSBFeHRlbnNpb24gd2lsbCBzdG9wIHdoZW4gdXBncmFkZWQgdG8gYW4gaW5jb21wYXRpYmxlIHZlcnNpb24uXG5JbiB0aGF0IGNhc2UgYW4gVXBkYXRlIHRhYiBpcyBjcmVhdGVkIHRvIGVhc2lseSByZXNldCB0aGUgZXh0ZW5zaW9uLlxuQSBSZXNldCBtZW51IGVudHJ5IGlzIGFsc28gYWx3YXlzIHByZXNlbnQgaW4gaW4gdGhlIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IG9mIHRoZSBleHRlbnNpb24gcHJlZmVyZW5jZXMgd2luZG93LlxuQSBEZWZhdWx0IHNob3J0Y3V0IGNvbWJpbmF0aW9uIG9mIFN1cGVyIEtleSArIHQgaXMgcHJvdmlkZWQgdG8gZGlzYWJsZSB0aGUgZXh0ZW5zaW9uLlxuXG5Tb21lIGVmZmVjdHMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkgb24gd2F5bGFuZCwgZm9yIHdoaWNoIGFuIG9wdGlvbiB0byBpbnRlZ3JhdGUgd2l0aCB3YXlsYW5kIGlzIHByb3ZpZGVkIG9uIEludGVncmF0aW9ucyB0YWIuXG5Ib3dldmVyLCBzb21lIGFuaW1hdGlvbnMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkuXG5cblRvIG1hbmFnZSBlZmZlY3QgRGVsYXkgdGltZSBlbmFibGUgU2hvdyBkZWxheSB0aW1lIGluIHByZWZlcmVuY2VzIFdpbmRvdyBmcm9tIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IC0+IFByZWZlcmVuY2VzXG5hbmQgcmVvcGVuIHByZWZlcmVuY2VzLiIsCiAgIm5hbWUiOiAiQW5pbWF0aW9uIFR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvQW5pbWF0aW9uLVR3ZWFrcyIsCiAgInV1aWQiOiAiYW5pbWF0aW9uLXR3ZWFrc0BTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "07niv7biy9yxmxdg498kqypyqva6y8slm3gmn70dpx9f9ng8ya55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQWRkIGFuaW1hdGlvbnMgdG8gZGlmZmVyZW50IGl0ZW1zIGFuZCBjdXN0b21pemUgdGhlbS4iLAogICJkZXNjcmlwdGlvbiI6ICJBZGQgYW5pbWF0aW9ucyB0byBkaWZmZXJlbnQgaXRlbXMgYW5kIGN1c3RvbWl6ZSB0aGVtLlxuXG5QbGVhc2UgcmVzZXQgdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGluZy5cblRoZSBFeHRlbnNpb24gd2lsbCBzdG9wIHdoZW4gdXBncmFkZWQgdG8gYW4gaW5jb21wYXRpYmxlIHZlcnNpb24uXG5JbiB0aGF0IGNhc2UgYW4gVXBkYXRlIHRhYiBpcyBjcmVhdGVkIHRvIGVhc2lseSByZXNldCB0aGUgZXh0ZW5zaW9uLlxuQSBSZXNldCBtZW51IGVudHJ5IGlzIGFsc28gYWx3YXlzIHByZXNlbnQgaW4gaW4gdGhlIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IG9mIHRoZSBleHRlbnNpb24gcHJlZmVyZW5jZXMgd2luZG93LlxuQSBEZWZhdWx0IHNob3J0Y3V0IGNvbWJpbmF0aW9uIG9mIFN1cGVyIEtleSArIHQgaXMgcHJvdmlkZWQgdG8gZGlzYWJsZSB0aGUgZXh0ZW5zaW9uLlxuXG5Tb21lIGVmZmVjdHMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkgb24gd2F5bGFuZCwgZm9yIHdoaWNoIGFuIG9wdGlvbiB0byBpbnRlZ3JhdGUgd2l0aCB3YXlsYW5kIGlzIHByb3ZpZGVkIG9uIEludGVncmF0aW9ucyB0YWIuXG5Ib3dldmVyLCBzb21lIGFuaW1hdGlvbnMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkuXG5cblRvIG1hbmFnZSBlZmZlY3QgRGVsYXkgdGltZSBlbmFibGUgU2hvdyBkZWxheSB0aW1lIGluIHByZWZlcmVuY2VzIFdpbmRvdyBmcm9tIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IC0+IFByZWZlcmVuY2VzXG5hbmQgcmVvcGVuIHByZWZlcmVuY2VzLiIsCiAgIm5hbWUiOiAiQW5pbWF0aW9uIFR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvQW5pbWF0aW9uLVR3ZWFrcyIsCiAgInV1aWQiOiAiYW5pbWF0aW9uLXR3ZWFrc0BTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "07niv7biy9yxmxdg498kqypyqva6y8slm3gmn70dpx9f9ng8ya55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQWRkIGFuaW1hdGlvbnMgdG8gZGlmZmVyZW50IGl0ZW1zIGFuZCBjdXN0b21pemUgdGhlbS4iLAogICJkZXNjcmlwdGlvbiI6ICJBZGQgYW5pbWF0aW9ucyB0byBkaWZmZXJlbnQgaXRlbXMgYW5kIGN1c3RvbWl6ZSB0aGVtLlxuXG5QbGVhc2UgcmVzZXQgdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGluZy5cblRoZSBFeHRlbnNpb24gd2lsbCBzdG9wIHdoZW4gdXBncmFkZWQgdG8gYW4gaW5jb21wYXRpYmxlIHZlcnNpb24uXG5JbiB0aGF0IGNhc2UgYW4gVXBkYXRlIHRhYiBpcyBjcmVhdGVkIHRvIGVhc2lseSByZXNldCB0aGUgZXh0ZW5zaW9uLlxuQSBSZXNldCBtZW51IGVudHJ5IGlzIGFsc28gYWx3YXlzIHByZXNlbnQgaW4gaW4gdGhlIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IG9mIHRoZSBleHRlbnNpb24gcHJlZmVyZW5jZXMgd2luZG93LlxuQSBEZWZhdWx0IHNob3J0Y3V0IGNvbWJpbmF0aW9uIG9mIFN1cGVyIEtleSArIHQgaXMgcHJvdmlkZWQgdG8gZGlzYWJsZSB0aGUgZXh0ZW5zaW9uLlxuXG5Tb21lIGVmZmVjdHMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkgb24gd2F5bGFuZCwgZm9yIHdoaWNoIGFuIG9wdGlvbiB0byBpbnRlZ3JhdGUgd2l0aCB3YXlsYW5kIGlzIHByb3ZpZGVkIG9uIEludGVncmF0aW9ucyB0YWIuXG5Ib3dldmVyLCBzb21lIGFuaW1hdGlvbnMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkuXG5cblRvIG1hbmFnZSBlZmZlY3QgRGVsYXkgdGltZSBlbmFibGUgU2hvdyBkZWxheSB0aW1lIGluIHByZWZlcmVuY2VzIFdpbmRvdyBmcm9tIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IC0+IFByZWZlcmVuY2VzXG5hbmQgcmVvcGVuIHByZWZlcmVuY2VzLiIsCiAgIm5hbWUiOiAiQW5pbWF0aW9uIFR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvQW5pbWF0aW9uLVR3ZWFrcyIsCiAgInV1aWQiOiAiYW5pbWF0aW9uLXR3ZWFrc0BTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "drawOnYourScreen@abakkk.framagit.org", "name": "Draw On You Screen", "pname": "draw-on-you-screen", "description": "", "link": "https://extensions.gnome.org/extension/1683/draw-on-you-screen/", "shell_version_map": {"38": {"version": "11", "sha256": "0kbgngcb2n234snnavbm8giwi6zhvr48bs0qy4f511d52l2wyawy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXdPbllvdXJTY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdSBTY3JlZW4iLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAic3ZnLWZpbGUtbmFtZSI6ICJEcmF3T25Zb3VyU2NyZWVuIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZHJhd09uWW91clNjcmVlbkBhYmFra2suZnJhbWFnaXQub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"uuid": "Always-Show-Titles-In-Overview@gmail.com", "name": "Always Show Titles In Overview", "pname": "always-show-titles-in-overview", "description": "Customize Gnome 3 overview.\n\n- Always show titles of all window thumbnails\n- Show/hide app icons\n- App icon position: Bottom, Center\n- Show/hide the app icon when a window is in fullscreen mode\n- Tweak the window thumbnail active size increment (from 5 to 60, the default is 15)\n- Show/hide the background\n- Hide/show icons for Video/TV players, like SMPlayer \n\n", "link": "https://extensions.gnome.org/extension/1689/always-show-titles-in-overview/", "shell_version_map": {"38": {"version": "10", "sha256": "1vnbj1li9ci5n25b49swxps9zqajgr10vfgv5lcn9f9brzm373fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9BbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXciLAogICJ1dWlkIjogIkFsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlld0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "21", "sha256": "1x5kfxah593r4c8gqsm83mxn53b6lahhlycpbj1ns7mar779rzj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3IiwKICAidXVpZCI6ICJBbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "21", "sha256": "1x5kfxah593r4c8gqsm83mxn53b6lahhlycpbj1ns7mar779rzj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3IiwKICAidXVpZCI6ICJBbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "42": {"version": "21", "sha256": "1x5kfxah593r4c8gqsm83mxn53b6lahhlycpbj1ns7mar779rzj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3IiwKICAidXVpZCI6ICJBbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "43": {"version": "21", "sha256": "1x5kfxah593r4c8gqsm83mxn53b6lahhlycpbj1ns7mar779rzj3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3IiwKICAidXVpZCI6ICJBbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}}} +, {"uuid": "Always-Show-Titles-In-Overview@gmail.com", "name": "Always Show Titles In Overview", "pname": "always-show-titles-in-overview", "description": "Customize Gnome 3 overview.\n\n- Always show titles of all window thumbnails\n- Always show close buttons of all window thumbnails\n- Window titles position (Bottom, Center)\n- Move window titles to the bottom when fullscreen\n- Move window titles to the bottom for video/TV players, like SMPlayer\n- Show/hide app icons\n- App icon position: Bottom, Center\n- Show/hide the app icon when a window is in fullscreen mode\n- Show/hide the background\n- Hide/show icons for Video/TV players, like SMPlayer\n- Tweak the window thumbnail active size increment (from 5 to 60, the default is 15)\n- Hide the background \n\n", "link": "https://extensions.gnome.org/extension/1689/always-show-titles-in-overview/", "shell_version_map": {"38": {"version": "10", "sha256": "0sswhzk6xfsvgr7xc4lmhx09p8d7d2r9m8jcbrvg830azddx30pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gQWx3YXlzIHNob3cgY2xvc2UgYnV0dG9ucyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gV2luZG93IHRpdGxlcyBwb3NpdGlvbiAoQm90dG9tLCBDZW50ZXIpXG4tIE1vdmUgd2luZG93IHRpdGxlcyB0byB0aGUgYm90dG9tIHdoZW4gZnVsbHNjcmVlblxuLSBNb3ZlIHdpbmRvdyB0aXRsZXMgdG8gdGhlIGJvdHRvbSBmb3IgdmlkZW8vVFYgcGxheWVycywgbGlrZSBTTVBsYXllclxuLSBTaG93L2hpZGUgYXBwIGljb25zXG4tIEFwcCBpY29uIHBvc2l0aW9uOiBCb3R0b20sIENlbnRlclxuLSBTaG93L2hpZGUgdGhlIGFwcCBpY29uIHdoZW4gYSB3aW5kb3cgaXMgaW4gZnVsbHNjcmVlbiBtb2RlXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXJcbi0gVHdlYWsgdGhlIHdpbmRvdyB0aHVtYm5haWwgYWN0aXZlIHNpemUgaW5jcmVtZW50IChmcm9tIDUgdG8gNjAsIHRoZSBkZWZhdWx0IGlzIDE1KVxuLSBIaWRlIHRoZSBiYWNrZ3JvdW5kIFxuXG4iLAogICJuYW1lIjogIkFsd2F5cyBTaG93IFRpdGxlcyBJbiBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3IiwKICAidXVpZCI6ICJBbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "22", "sha256": "0f01lkv30mxk47cypcw5v1j5ir0537y8cxdakzj423xjjllwk6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gQWx3YXlzIHNob3cgY2xvc2UgYnV0dG9ucyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gV2luZG93IHRpdGxlcyBwb3NpdGlvbiAoQm90dG9tLCBDZW50ZXIpXG4tIE1vdmUgd2luZG93IHRpdGxlcyB0byB0aGUgYm90dG9tIHdoZW4gZnVsbHNjcmVlblxuLSBNb3ZlIHdpbmRvdyB0aXRsZXMgdG8gdGhlIGJvdHRvbSBmb3IgdmlkZW8vVFYgcGxheWVycywgbGlrZSBTTVBsYXllclxuLSBTaG93L2hpZGUgYXBwIGljb25zXG4tIEFwcCBpY29uIHBvc2l0aW9uOiBCb3R0b20sIENlbnRlclxuLSBTaG93L2hpZGUgdGhlIGFwcCBpY29uIHdoZW4gYSB3aW5kb3cgaXMgaW4gZnVsbHNjcmVlbiBtb2RlXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXJcbi0gVHdlYWsgdGhlIHdpbmRvdyB0aHVtYm5haWwgYWN0aXZlIHNpemUgaW5jcmVtZW50IChmcm9tIDUgdG8gNjAsIHRoZSBkZWZhdWx0IGlzIDE1KVxuLSBIaWRlIHRoZSBiYWNrZ3JvdW5kIFxuXG4iLAogICJuYW1lIjogIkFsd2F5cyBTaG93IFRpdGxlcyBJbiBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL0Fsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlldyIsCiAgInV1aWQiOiAiQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "0f01lkv30mxk47cypcw5v1j5ir0537y8cxdakzj423xjjllwk6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gQWx3YXlzIHNob3cgY2xvc2UgYnV0dG9ucyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gV2luZG93IHRpdGxlcyBwb3NpdGlvbiAoQm90dG9tLCBDZW50ZXIpXG4tIE1vdmUgd2luZG93IHRpdGxlcyB0byB0aGUgYm90dG9tIHdoZW4gZnVsbHNjcmVlblxuLSBNb3ZlIHdpbmRvdyB0aXRsZXMgdG8gdGhlIGJvdHRvbSBmb3IgdmlkZW8vVFYgcGxheWVycywgbGlrZSBTTVBsYXllclxuLSBTaG93L2hpZGUgYXBwIGljb25zXG4tIEFwcCBpY29uIHBvc2l0aW9uOiBCb3R0b20sIENlbnRlclxuLSBTaG93L2hpZGUgdGhlIGFwcCBpY29uIHdoZW4gYSB3aW5kb3cgaXMgaW4gZnVsbHNjcmVlbiBtb2RlXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXJcbi0gVHdlYWsgdGhlIHdpbmRvdyB0aHVtYm5haWwgYWN0aXZlIHNpemUgaW5jcmVtZW50IChmcm9tIDUgdG8gNjAsIHRoZSBkZWZhdWx0IGlzIDE1KVxuLSBIaWRlIHRoZSBiYWNrZ3JvdW5kIFxuXG4iLAogICJuYW1lIjogIkFsd2F5cyBTaG93IFRpdGxlcyBJbiBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL0Fsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlldyIsCiAgInV1aWQiOiAiQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "0f01lkv30mxk47cypcw5v1j5ir0537y8cxdakzj423xjjllwk6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gQWx3YXlzIHNob3cgY2xvc2UgYnV0dG9ucyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gV2luZG93IHRpdGxlcyBwb3NpdGlvbiAoQm90dG9tLCBDZW50ZXIpXG4tIE1vdmUgd2luZG93IHRpdGxlcyB0byB0aGUgYm90dG9tIHdoZW4gZnVsbHNjcmVlblxuLSBNb3ZlIHdpbmRvdyB0aXRsZXMgdG8gdGhlIGJvdHRvbSBmb3IgdmlkZW8vVFYgcGxheWVycywgbGlrZSBTTVBsYXllclxuLSBTaG93L2hpZGUgYXBwIGljb25zXG4tIEFwcCBpY29uIHBvc2l0aW9uOiBCb3R0b20sIENlbnRlclxuLSBTaG93L2hpZGUgdGhlIGFwcCBpY29uIHdoZW4gYSB3aW5kb3cgaXMgaW4gZnVsbHNjcmVlbiBtb2RlXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXJcbi0gVHdlYWsgdGhlIHdpbmRvdyB0aHVtYm5haWwgYWN0aXZlIHNpemUgaW5jcmVtZW50IChmcm9tIDUgdG8gNjAsIHRoZSBkZWZhdWx0IGlzIDE1KVxuLSBIaWRlIHRoZSBiYWNrZ3JvdW5kIFxuXG4iLAogICJuYW1lIjogIkFsd2F5cyBTaG93IFRpdGxlcyBJbiBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL0Fsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlldyIsCiAgInV1aWQiOiAiQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "0f01lkv30mxk47cypcw5v1j5ir0537y8cxdakzj423xjjllwk6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gQWx3YXlzIHNob3cgY2xvc2UgYnV0dG9ucyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gV2luZG93IHRpdGxlcyBwb3NpdGlvbiAoQm90dG9tLCBDZW50ZXIpXG4tIE1vdmUgd2luZG93IHRpdGxlcyB0byB0aGUgYm90dG9tIHdoZW4gZnVsbHNjcmVlblxuLSBNb3ZlIHdpbmRvdyB0aXRsZXMgdG8gdGhlIGJvdHRvbSBmb3IgdmlkZW8vVFYgcGxheWVycywgbGlrZSBTTVBsYXllclxuLSBTaG93L2hpZGUgYXBwIGljb25zXG4tIEFwcCBpY29uIHBvc2l0aW9uOiBCb3R0b20sIENlbnRlclxuLSBTaG93L2hpZGUgdGhlIGFwcCBpY29uIHdoZW4gYSB3aW5kb3cgaXMgaW4gZnVsbHNjcmVlbiBtb2RlXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXJcbi0gVHdlYWsgdGhlIHdpbmRvdyB0aHVtYm5haWwgYWN0aXZlIHNpemUgaW5jcmVtZW50IChmcm9tIDUgdG8gNjAsIHRoZSBkZWZhdWx0IGlzIDE1KVxuLSBIaWRlIHRoZSBiYWNrZ3JvdW5kIFxuXG4iLAogICJuYW1lIjogIkFsd2F5cyBTaG93IFRpdGxlcyBJbiBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL0Fsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlldyIsCiAgInV1aWQiOiAiQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "overview-navigation@nathanielsimard.github.com", "name": "Overview Navigation", "pname": "overview-navigation", "description": "This extension aims to make Gnome Shell easier to navigate using only the keyboard. It is inspired by the vim plugins of Firefox and Chrome.", "link": "https://extensions.gnome.org/extension/1702/overview-navigation/", "shell_version_map": {"38": {"version": "14", "sha256": "10i2j0klcyi22qakmw1f338ldc87w54a0jlg1bwq84ifflmnm8nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uYXRoYW5pZWxzaW1hcmQvb3ZlcnZpZXctbmF2aWdhdGlvbiIsCiAgInV1aWQiOiAib3ZlcnZpZXctbmF2aWdhdGlvbkBuYXRoYW5pZWxzaW1hcmQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "15", "sha256": "03ah1cx6kjw7698b9wwhz7ag8pag15g8zkxzfrsrcmving9syynd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmF0aGFuaWVsc2ltYXJkL292ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LW5hdmlnYXRpb25AbmF0aGFuaWVsc2ltYXJkLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "16", "sha256": "1qdqbsrmxnvx01hlaq17nps124xah1rkqvr0rpxms7f3klkgkw0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmF0aGFuaWVsc2ltYXJkL292ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LW5hdmlnYXRpb25AbmF0aGFuaWVsc2ltYXJkLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "17", "sha256": "0zhwl4j982jgyxcbdj50bdp98plfqs2hzgc8zl5rxv498662700w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmF0aGFuaWVsc2ltYXJkL292ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LW5hdmlnYXRpb25AbmF0aGFuaWVsc2ltYXJkLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "transparent-top-bar@zhanghai.me", "name": "Transparent Top Bar", "pname": "transparent-top-bar", "description": "Bring back the transparent top bar when free-floating in GNOME Shell 3.32.\n\nThis basically comes from the feature implementation removed in GNOME Shell 3.32, and I modified the code a bit to make it an extension. Enjoy!", "link": "https://extensions.gnome.org/extension/1708/transparent-top-bar/", "shell_version_map": {"38": {"version": "9", "sha256": "0i34ns1rm2iis9mvbyjvckb0l1b0zzzczzan7591y8lqfjplsmzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "15", "sha256": "1yiliqwiyci1v1633k6xw4bmim3nyb29lwdh2xiwi4p936cw247m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1yiliqwiyci1v1633k6xw4bmim3nyb29lwdh2xiwi4p936cw247m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "1yiliqwiyci1v1633k6xw4bmim3nyb29lwdh2xiwi4p936cw247m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "1yiliqwiyci1v1633k6xw4bmim3nyb29lwdh2xiwi4p936cw247m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "ssh-search-provider@extensions.gnome-shell.fifi.org", "name": "SSH Search Provider Reborn", "pname": "ssh-search-provider-reborn", "description": "Provide SSH search results in overview.\n\nThis is a fork of the original \"SSH Search Provider\", updated to work with newer Gnome-Shells.", "link": "https://extensions.gnome.org/extension/1714/ssh-search-provider-reborn/", "shell_version_map": {"38": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "12", "sha256": "12859viin7i3xi2bv5q232drv6cms5xgnrcbjx2xmgm3jykc3j9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3NzaC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogInNzaC1zZWFyY2gtcHJvdmlkZXJAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTItMC1nMTg2Mjk3MSIsCiAgInZlcnNpb24iOiAxMgp9"}}} @@ -253,8 +253,8 @@ , {"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": "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": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "40": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "41": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "43": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}}} -, {"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="}}} @@ -305,14 +305,14 @@ , {"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": "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-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": "14", "sha256": "0w8whn009b960wllaf9sw86h7d5xc768rjf5kq4m47ycmxj0nb19", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"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": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "43": {"version": "21", "sha256": "0wm9r34k1xng9fvasz4mcmqbzy5fhwg00jdrnzh7b4a2rqhqv9dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} +, {"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": "17", "sha256": "12npd6sm5nksabk6nf6gd7kmpimhwzagy6k3d2ch005yf19vwdx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"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": "35", "sha256": "1295hf1xgzj6p89k40zz7x4fbdbvm9bkv88ym8f2ibn6080gbx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} +, {"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": "36", "sha256": "1jqkj799jz7s7kpis2sp2iqx5h8sxmqfswilncfvyyxkgs7v5lk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} , {"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": "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": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "1yl5qfx42vrc880wwjpr8miy10hlp7pnm0z0hsh4n6y79ld12yfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQ29udHJvbF9CbHVyX0VmZmVjdF9Pbl9Mb2NrX1NjcmVlbiIsCiAgInV1aWQiOiAiQ29udHJvbEJsdXJFZmZlY3RPbkxvY2tTY3JlZW5AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"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": "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="}}} @@ -328,7 +328,7 @@ , {"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": "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": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"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=="}}} @@ -339,12 +339,12 @@ , {"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 '<Super>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": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}, "41": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}, "42": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}, "43": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}}} +, {"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": "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="}}} @@ -374,12 +374,12 @@ , {"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": "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": "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": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "0ms8cgfl5fy0j5ykpkcm17z01kamy09qfp5inbnb8izkvn34mzmr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NyLWlyL2dub21lLXNoYW1zaS1jYWxlbmRhciIsCiAgInV1aWQiOiAic2hhbXNpLWNhbGVuZGFyQGdub21lLnNjci5pciIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"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": "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=="}}} +, {"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": "17", "sha256": "0xwbkg75z8cbnwc9mkwh4wlh6yr674aivdxyg4xla9p6nkr4d1wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "0xwbkg75z8cbnwc9mkwh4wlh6yr674aivdxyg4xla9p6nkr4d1wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlb3JkZXIgd29ya3NwYWNlcyBpbiB0aGUgb3ZlcnZpZXcgd2l0aCBBbHQrVXAvQWx0K0Rvd24iLAogICJuYW1lIjogIlJlb3JkZXIgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbW1yMC9nbm9tZS1yZW9yZGVyLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInJlb3JkZXItd29ya3NwYWNlc0BqZXIuZGV2IiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"uuid": "eos-hack@endlessos.org", "name": "Hack", "pname": "hack", "description": "Add the Flip to Hack experience to the desktop", "link": "https://extensions.gnome.org/extension/3690/hack/", "shell_version_map": {"38": {"version": "11", "sha256": "1m45rylhv1lw7vh8zmpsfcs1fiv0ah770gk14x965mkalqgph2ha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "9", "sha256": "1j0sizyv7j6fdkp9ich8pfa78igf5f4fj2l4p2ncjc3zbz06a32z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1j0sizyv7j6fdkp9ich8pfa78igf5f4fj2l4p2ncjc3zbz06a32z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1j0sizyv7j6fdkp9ich8pfa78igf5f4fj2l4p2ncjc3zbz06a32z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgRmxpcCB0byBIYWNrIGV4cGVyaWVuY2UgdG8gdGhlIGRlc2t0b3AiLAogICJuYW1lIjogIkhhY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmVuZGxlc3Nvcy5oYWNrLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1oYWNrLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWhhY2tAZW5kbGVzc29zLm9yZyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "desktop-scroller@calango", "name": "Desktop Scroller (GNOME 3.38)", "pname": "desktop-scroller-gnome-338", "description": "Switch between desktops scrolling at the upper edge of the screen, including in overview. Change your delay between scroll events in extension.js. If you want to scroll on more lines from the top of the screen just remember that other extensions or indicators will not be able to catch their scroll events.", "link": "https://extensions.gnome.org/extension/3709/desktop-scroller-gnome-338/", "shell_version_map": {"38": {"version": "1", "sha256": "11g4w7bbzb8p9w78w83jpslgbs74rc26np0b1v35dg7nc7x33q4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIGRlc2t0b3BzIHNjcm9sbGluZyBhdCB0aGUgdXBwZXIgZWRnZSBvZiB0aGUgc2NyZWVuLCBpbmNsdWRpbmcgaW4gb3ZlcnZpZXcuIENoYW5nZSB5b3VyIGRlbGF5IGJldHdlZW4gc2Nyb2xsIGV2ZW50cyBpbiBleHRlbnNpb24uanMuIElmIHlvdSB3YW50IHRvIHNjcm9sbCBvbiBtb3JlIGxpbmVzIGZyb20gdGhlIHRvcCBvZiB0aGUgc2NyZWVuIGp1c3QgcmVtZW1iZXIgdGhhdCBvdGhlciBleHRlbnNpb25zIG9yIGluZGljYXRvcnMgd2lsbCBub3QgYmUgYWJsZSB0byBjYXRjaCB0aGVpciBzY3JvbGwgZXZlbnRzLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBTY3JvbGxlciAoR05PTUUgMy4zOCkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJkZXNrdG9wLXNjcm9sbGVyQGNhbGFuZ28iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "appmenu-color-icon@yanbab.gitlab.com", "name": "Colored AppMenu Icon", "pname": "color-app-menu-icon", "description": "Replace the symbolic application menu icon with the colored one", "link": "https://extensions.gnome.org/extension/3712/color-app-menu-icon/", "shell_version_map": {"38": {"version": "1", "sha256": "17bsnqimkanf6c3d3qjvhggi5r3xjp6pha05fyh6b1ak9m9lvg53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSBjb2xvcmVkIG9uZSIsCiAgIm5hbWUiOiAiQ29sb3JlZCBBcHBNZW51IEljb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS95YW5iYWIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJlZ3VsYXItYXBwbWVudS1pY29uIiwKICAidXVpZCI6ICJhcHBtZW51LWNvbG9yLWljb25AeWFuYmFiLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -390,7 +390,7 @@ , {"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": "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": "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": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "090l0c310xq0avmygqvhj0ipp6hzhyb59rbxz8i41iqiiyz8182p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"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=="}}} , {"uuid": "latency-monitor@gitlab.labsatho.me", "name": "Latency Monitor", "pname": "latency-monitor", "description": "A simple extension for displaying latency information using pings in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3746/latency-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "0k2y1qrq7irkn2c72pk4c5x4fwzaxkfp3jj7qvhzih6zmkifdzcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZGlzcGxheWluZyBsYXRlbmN5IGluZm9ybWF0aW9uIHVzaW5nIHBpbmdzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiTGF0ZW5jeSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdGVuY3ktbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3dhbGthZndhbGthL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sYXRlbmN5LW1vbml0b3IiLAogICJ1dWlkIjogImxhdGVuY3ktbW9uaXRvckBnaXRsYWIubGFic2F0aG8ubWUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "the-circles-widget@xenlism.github.io", "name": "The Circles - Desktop Widget", "pname": "the-circles-desktop-widget", "description": "Show System Infomations on Desktop as Circles Desktop Widget\n\nmore info \nhttps://www.linuxuprising.com/2020/11/display-clock-ram-and-cpu-usage-as.html", "link": "https://extensions.gnome.org/extension/3748/the-circles-desktop-widget/", "shell_version_map": {"38": {"version": "6", "sha256": "0kxync9gdjgcfq3vfhf5z0065n30jw5y5jl00hdgarsh4pkbji04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAidGhlLWNpcmNsZXMtd2lkZ2V0QHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "12", "sha256": "0ngn00y97dqv667z47xahfv53dlb2asm0jbk9harlv4516jdrg0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJ1dWlkIjogInRoZS1jaXJjbGVzLXdpZGdldEB4ZW5saXNtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}}} @@ -405,7 +405,7 @@ , {"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-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-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-40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD Position\n- OSD Visibility\n- Overview Spacing Size (40-43)\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-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-43)\n- Switcher Popup Delay\n- System Menu (Aggregate Menu) Visibility (3.36-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-43)\n- Workspace Background Corner Size in Overview (40-43)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40-43)\n- Workspace Switcher Size (40-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": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "0ndhq5izyhnnxq9pr2j14si9rpn1yhy3rk7kwzd4b84d15lyhh94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLTQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MC00Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYtNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIExvb2tpbmcgR2xhc3MgU2l6ZVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBQb3NpdGlvblxuLSBPU0QgVmlzaWJpbGl0eVxuLSBPdmVydmlldyBTcGFjaW5nIFNpemUgKDQwLTQzKVxuLSBQYW5lbCBBcnJvdyBWaXNpYmlsaXR5ICgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNi00MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzICg0MC00Mylcbi0gU3dpdGNoZXIgUG9wdXAgRGVsYXlcbi0gU3lzdGVtIE1lbnUgKEFnZ3JlZ2F0ZSBNZW51KSBWaXNpYmlsaXR5ICgzLjM2LTQyKVxuLSBUYWtlIFNjcmVlbnNob3QgQnV0dG9uIGluIFdpbmRvdyBNZW51IFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbiAoNDAtNDMpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3ICg0MC00Mylcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MC00Mylcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFNpemUgKDQwLTQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZFxuLSBXb3JsZCBDbG9jayBWaXNpYmlsaXR5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAianVzdC1wZXJmZWN0aW9uIiwKICAibmFtZSI6ICJKdXN0IFBlcmZlY3Rpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuanVzdC1wZXJmZWN0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2pyYWhtYXR6YWRlaC9qdXN0LXBlcmZlY3Rpb24iLAogICJ1dWlkIjogImp1c3QtcGVyZmVjdGlvbi1kZXNrdG9wQGp1c3QtcGVyZmVjdGlvbiIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"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"}}} @@ -431,12 +431,12 @@ , {"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": "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": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} +, {"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": "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=="}}} @@ -452,6 +452,7 @@ , {"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=="}}} @@ -490,8 +491,8 @@ , {"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": "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"}}} +, {"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.\n\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).\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, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "26", "sha256": "090v433j6bjm22hblnl9dfkfhqhsw9x09i7h0fzdkchglgapjq9m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "090v433j6bjm22hblnl9dfkfhqhsw9x09i7h0fzdkchglgapjq9m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "090v433j6bjm22hblnl9dfkfhqhsw9x09i7h0fzdkchglgapjq9m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "090v433j6bjm22hblnl9dfkfhqhsw9x09i7h0fzdkchglgapjq9m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "090v433j6bjm22hblnl9dfkfhqhsw9x09i7h0fzdkchglgapjq9m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}}} +, {"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": "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=="}}} @@ -501,11 +502,11 @@ , {"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": "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": "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": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "1kdr3y3h0ph7wvxx1q5kpfyq5388k7ab0ingw9zxcn0q770z99wy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2lyZWxlc3MtaGlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"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"}}} @@ -518,12 +519,12 @@ , {"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="}}} @@ -532,20 +533,20 @@ , {"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": "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": "force-show-osk@bruh.ltd", "name": "(UNMAINTAINED) 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": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "0f2lj11bk2qc5zr4jy4szsnhd6lrm06z4mm297k5wx2k8pxcfrjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiKFVOTUFJTlRBSU5FRCkgRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vd2FybmluZ25vbnBvdGFibGV3YXRlci9mb3JjZS1zaG93LW9zayIsCiAgInV1aWQiOiAiZm9yY2Utc2hvdy1vc2tAYnJ1aC5sdGQiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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=="}, "42": {"version": "7", "sha256": "0nmyagf8b1xzci79vhk13bl61hw50yd40aa0pvd8gcsl2z74s2n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "0nmyagf8b1xzci79vhk13bl61hw50yd40aa0pvd8gcsl2z74s2n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"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=="}}} @@ -585,7 +586,7 @@ , {"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 - 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": "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": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "41": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "42": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "43": {"version": "62", "sha256": "07nghbx4mh54zvf8569cx49xhvckg7fjxvjnk2ybnv74ki8a8qmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbkNIQU5HRVNcblxuIC0gUXVhcnRlciB0aWxpbmcsIGZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3Vlcy8xNjYuIENhbiBiZSB0b2dnbGVkLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlL2lzc3VlcyIsCiAgImdldHRleHQtZG9tYWluIjogImZvcmdlIiwKICAibmFtZSI6ICJGb3JnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mb3JnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNjIKfQ=="}}} , {"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": "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"}}} @@ -601,9 +602,9 @@ , {"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"}}} @@ -630,7 +631,7 @@ , {"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": "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": "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": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "43": {"version": "26", "sha256": "1ii9pd21ykff2mislpgxm2mqhvhhfvy01njcr7qwcnip6wm0z62w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9icnVuby5lbmdsZXJ0L2dub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzc0BicnVuby5lbmdsZXJ0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"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=="}}} @@ -639,18 +640,18 @@ , {"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": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "40": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"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": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "40": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "43": {"version": "26", "sha256": "1anzibhjpkj2834sbz522m6nxxjp66vdh5ckp92p5p68lfzc0504", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"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", "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": "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": "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": "9", "sha256": "16gad4kwknvn4m8v6s7h6l8bxvjqfw9ispxiwik13nycsw5jpgw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "16gad4kwknvn4m8v6s7h6l8bxvjqfw9ispxiwik13nycsw5jpgw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "16gad4kwknvn4m8v6s7h6l8bxvjqfw9ispxiwik13nycsw5jpgw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "16gad4kwknvn4m8v6s7h6l8bxvjqfw9ispxiwik13nycsw5jpgw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"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": "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- Restore the previous session at startup. disabled by default.\n- Save running apps and windows automatically when necessary, this will be used to restore the previous session at startup.\n- Close running apps and windows automatically before Log Out, Restart, Power Off. disabled by default.\n- Close running windows gracefully\n- Close apps with multiple windows gracefully via ydotool so you don't lose sessions of this app (See also: How to make Close by rules work)\n- Save running apps and windows manually\n- Restore a selected session at startup (See also: #9). disabled by default.\n- Restore a saved session manually\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 -> 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\n\nFor more information, please visit https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager/blob/feature-close-save-session-while-logout/README.md", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "35", "sha256": "0s3ga10chmc3snmk5msd7p8hkcc65acshh0x65j9gxy28yl22005", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gUmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IHdoZW4gbmVjZXNzYXJ5LCB0aGlzIHdpbGwgYmUgdXNlZCB0byByZXN0b3JlIHRoZSBwcmV2aW91cyBzZXNzaW9uIGF0IHN0YXJ0dXAuXG4tIENsb3NlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IGJlZm9yZSBMb2cgT3V0LCBSZXN0YXJ0LCBQb3dlciBPZmYuIGRpc2FibGVkIGJ5IGRlZmF1bHQuXG4tIENsb3NlIHJ1bm5pbmcgd2luZG93cyBncmFjZWZ1bGx5XG4tIENsb3NlIGFwcHMgd2l0aCBtdWx0aXBsZSB3aW5kb3dzIGdyYWNlZnVsbHkgdmlhIHlkb3Rvb2wgc28geW91IGRvbid0IGxvc2Ugc2Vzc2lvbnMgb2YgdGhpcyBhcHAgKFNlZSBhbHNvOiBIb3cgdG8gbWFrZSBDbG9zZSBieSBydWxlcyB3b3JrKVxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBtYW51YWxseVxuLSBSZXN0b3JlIGEgc2VsZWN0ZWQgc2Vzc2lvbiBhdCBzdGFydHVwIChTZWUgYWxzbzogIzkpLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBSZXN0b3JlIGEgc2F2ZWQgc2Vzc2lvbiBtYW51YWxseVxuLSBSZXN0b3JlIHdpbmRvdyBzdGF0ZSwgaW5jbHVkaW5nIEFsd2F5cyBvbiBUb3AsIEFsd2F5cyBvbiBWaXNpYmxlIFdvcmtzcGFjZSBhbmQgbWF4aW1pemF0aW9uXG4tIFJlc3RvcmUgd2luZG93IHdvcmtzcGFjZSwgc2l6ZSBhbmQgcG9zaXRpb25cbi0gUmVzdG9yZSAyIGNvbHVtbiB3aW5kb3cgdGlsaW5nXG4tIFN0YXNoIGFsbCBzdXBwb3J0ZWQgd2luZG93IHN0YXRlcyBzbyB0aGF0IHRob3NlIHN0YXRlcyB3aWxsIGJlIHJlc3RvcmVkIGFmdGVyIGdub21lIHNoZWxsIHJlc3RhcnRzIHZpYSBBbHQrRjIgLT4gciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "35", "sha256": "0s3ga10chmc3snmk5msd7p8hkcc65acshh0x65j9gxy28yl22005", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gUmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IHdoZW4gbmVjZXNzYXJ5LCB0aGlzIHdpbGwgYmUgdXNlZCB0byByZXN0b3JlIHRoZSBwcmV2aW91cyBzZXNzaW9uIGF0IHN0YXJ0dXAuXG4tIENsb3NlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IGJlZm9yZSBMb2cgT3V0LCBSZXN0YXJ0LCBQb3dlciBPZmYuIGRpc2FibGVkIGJ5IGRlZmF1bHQuXG4tIENsb3NlIHJ1bm5pbmcgd2luZG93cyBncmFjZWZ1bGx5XG4tIENsb3NlIGFwcHMgd2l0aCBtdWx0aXBsZSB3aW5kb3dzIGdyYWNlZnVsbHkgdmlhIHlkb3Rvb2wgc28geW91IGRvbid0IGxvc2Ugc2Vzc2lvbnMgb2YgdGhpcyBhcHAgKFNlZSBhbHNvOiBIb3cgdG8gbWFrZSBDbG9zZSBieSBydWxlcyB3b3JrKVxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBtYW51YWxseVxuLSBSZXN0b3JlIGEgc2VsZWN0ZWQgc2Vzc2lvbiBhdCBzdGFydHVwIChTZWUgYWxzbzogIzkpLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBSZXN0b3JlIGEgc2F2ZWQgc2Vzc2lvbiBtYW51YWxseVxuLSBSZXN0b3JlIHdpbmRvdyBzdGF0ZSwgaW5jbHVkaW5nIEFsd2F5cyBvbiBUb3AsIEFsd2F5cyBvbiBWaXNpYmxlIFdvcmtzcGFjZSBhbmQgbWF4aW1pemF0aW9uXG4tIFJlc3RvcmUgd2luZG93IHdvcmtzcGFjZSwgc2l6ZSBhbmQgcG9zaXRpb25cbi0gUmVzdG9yZSAyIGNvbHVtbiB3aW5kb3cgdGlsaW5nXG4tIFN0YXNoIGFsbCBzdXBwb3J0ZWQgd2luZG93IHN0YXRlcyBzbyB0aGF0IHRob3NlIHN0YXRlcyB3aWxsIGJlIHJlc3RvcmVkIGFmdGVyIGdub21lIHNoZWxsIHJlc3RhcnRzIHZpYSBBbHQrRjIgLT4gciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "42": {"version": "35", "sha256": "0s3ga10chmc3snmk5msd7p8hkcc65acshh0x65j9gxy28yl22005", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gUmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IHdoZW4gbmVjZXNzYXJ5LCB0aGlzIHdpbGwgYmUgdXNlZCB0byByZXN0b3JlIHRoZSBwcmV2aW91cyBzZXNzaW9uIGF0IHN0YXJ0dXAuXG4tIENsb3NlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IGJlZm9yZSBMb2cgT3V0LCBSZXN0YXJ0LCBQb3dlciBPZmYuIGRpc2FibGVkIGJ5IGRlZmF1bHQuXG4tIENsb3NlIHJ1bm5pbmcgd2luZG93cyBncmFjZWZ1bGx5XG4tIENsb3NlIGFwcHMgd2l0aCBtdWx0aXBsZSB3aW5kb3dzIGdyYWNlZnVsbHkgdmlhIHlkb3Rvb2wgc28geW91IGRvbid0IGxvc2Ugc2Vzc2lvbnMgb2YgdGhpcyBhcHAgKFNlZSBhbHNvOiBIb3cgdG8gbWFrZSBDbG9zZSBieSBydWxlcyB3b3JrKVxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBtYW51YWxseVxuLSBSZXN0b3JlIGEgc2VsZWN0ZWQgc2Vzc2lvbiBhdCBzdGFydHVwIChTZWUgYWxzbzogIzkpLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBSZXN0b3JlIGEgc2F2ZWQgc2Vzc2lvbiBtYW51YWxseVxuLSBSZXN0b3JlIHdpbmRvdyBzdGF0ZSwgaW5jbHVkaW5nIEFsd2F5cyBvbiBUb3AsIEFsd2F5cyBvbiBWaXNpYmxlIFdvcmtzcGFjZSBhbmQgbWF4aW1pemF0aW9uXG4tIFJlc3RvcmUgd2luZG93IHdvcmtzcGFjZSwgc2l6ZSBhbmQgcG9zaXRpb25cbi0gUmVzdG9yZSAyIGNvbHVtbiB3aW5kb3cgdGlsaW5nXG4tIFN0YXNoIGFsbCBzdXBwb3J0ZWQgd2luZG93IHN0YXRlcyBzbyB0aGF0IHRob3NlIHN0YXRlcyB3aWxsIGJlIHJlc3RvcmVkIGFmdGVyIGdub21lIHNoZWxsIHJlc3RhcnRzIHZpYSBBbHQrRjIgLT4gciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "43": {"version": "35", "sha256": "0s3ga10chmc3snmk5msd7p8hkcc65acshh0x65j9gxy28yl22005", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gUmVzdG9yZSB0aGUgcHJldmlvdXMgc2Vzc2lvbiBhdCBzdGFydHVwLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IHdoZW4gbmVjZXNzYXJ5LCB0aGlzIHdpbGwgYmUgdXNlZCB0byByZXN0b3JlIHRoZSBwcmV2aW91cyBzZXNzaW9uIGF0IHN0YXJ0dXAuXG4tIENsb3NlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBhdXRvbWF0aWNhbGx5IGJlZm9yZSBMb2cgT3V0LCBSZXN0YXJ0LCBQb3dlciBPZmYuIGRpc2FibGVkIGJ5IGRlZmF1bHQuXG4tIENsb3NlIHJ1bm5pbmcgd2luZG93cyBncmFjZWZ1bGx5XG4tIENsb3NlIGFwcHMgd2l0aCBtdWx0aXBsZSB3aW5kb3dzIGdyYWNlZnVsbHkgdmlhIHlkb3Rvb2wgc28geW91IGRvbid0IGxvc2Ugc2Vzc2lvbnMgb2YgdGhpcyBhcHAgKFNlZSBhbHNvOiBIb3cgdG8gbWFrZSBDbG9zZSBieSBydWxlcyB3b3JrKVxuLSBTYXZlIHJ1bm5pbmcgYXBwcyBhbmQgd2luZG93cyBtYW51YWxseVxuLSBSZXN0b3JlIGEgc2VsZWN0ZWQgc2Vzc2lvbiBhdCBzdGFydHVwIChTZWUgYWxzbzogIzkpLiBkaXNhYmxlZCBieSBkZWZhdWx0LlxuLSBSZXN0b3JlIGEgc2F2ZWQgc2Vzc2lvbiBtYW51YWxseVxuLSBSZXN0b3JlIHdpbmRvdyBzdGF0ZSwgaW5jbHVkaW5nIEFsd2F5cyBvbiBUb3AsIEFsd2F5cyBvbiBWaXNpYmxlIFdvcmtzcGFjZSBhbmQgbWF4aW1pemF0aW9uXG4tIFJlc3RvcmUgd2luZG93IHdvcmtzcGFjZSwgc2l6ZSBhbmQgcG9zaXRpb25cbi0gUmVzdG9yZSAyIGNvbHVtbiB3aW5kb3cgdGlsaW5nXG4tIFN0YXNoIGFsbCBzdXBwb3J0ZWQgd2luZG93IHN0YXRlcyBzbyB0aGF0IHRob3NlIHN0YXRlcyB3aWxsIGJlIHJlc3RvcmVkIGFmdGVyIGdub21lIHNoZWxsIHJlc3RhcnRzIHZpYSBBbHQrRjIgLT4gciBvciBraWxsYWxsIC0zIGdub21lLXNoZWxsLlxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBSZW1vdmUgc2F2ZWQgc2Vzc2lvbiB0byB0cmFzaFxuLSBTZWFyY2ggc2F2ZWQgc2Vzc2lvbiBieSB0aGUgc2Vzc2lvbiBuYW1lIGZ1enppbHlcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24sIHBsZWFzZSB2aXNpdCBodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyL2Jsb2IvZmVhdHVyZS1jbG9zZS1zYXZlLXNlc3Npb24td2hpbGUtbG9nb3V0L1JFQURNRS5tZCIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}}} , {"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": "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="}}} @@ -674,13 +675,13 @@ , {"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": "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": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"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"}, "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": "18", "sha256": "1acwj8f349bwjk4f0vb4dpbc9344njx4vi0cwr4bfhvycg2fczrd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}}} +, {"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": "20", "sha256": "0bi4mm9i8bhgdfiqklzyhifkbm8cwh4zr4xpza60fmjm8il41w7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"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": "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"}}} @@ -709,26 +710,26 @@ , {"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\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": "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": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1cp0gyj8kms59p9l5wn2z0p4g9rfyn79wxv806gllqmwql6xrm4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNrIGF0IHRvcCBsZWZ0IGNvcm5lciB0byBicmluZyB1cCBhcHBzIG1lbnUuIiwKICAibmFtZSI6ICJVc2FibGUgT3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"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": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"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 media 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": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1gvjw5b2jgsfdx2d71pvcwfbk4ybckgzqqj8djnb5v05z8qhp4bm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIG1lZGlhIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"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": "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": "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": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0sxcg7wixyksjs1a2gdm4xp2hh2c3ph3hrlm311b1phsi0zrlv7x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4iLAogICJuYW1lIjogIkdyYWRpZW50IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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": "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.\n\nMore details: https://github.com/hus3h/gnome-shell-extension-ddnet-friends-panel", "link": "https://extensions.gnome.org/extension/4965/ddnet-friends-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "19jaa7n33xzi6x08wznpx9yf675zp51y3bvvx8jph64hz7g9fhnp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJ1dWlkIjogImRkbmV0LWZyaWVuZHMtcGFuZWxAaHVzM2giLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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"}}} @@ -736,16 +737,16 @@ , {"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": "The Animated & Effectful Dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} +, {"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": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "[Unmaintained] You can edit DCONF and CSS for similar effects\n\nA Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflicts with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend. \n\nAdded Features:\nBorder Radius \nBorder Margins\nDock & Icon Alignment\nEtc.", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "0ni4pizzh9c559jzg1f7m5lnn1a0lln1vwy14i2ykhy0qky4xb3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltVbm1haW50YWluZWRdIFlvdSBjYW4gZWRpdCBEQ09ORiBhbmQgQ1NTIGZvciBzaW1pbGFyIGVmZmVjdHNcblxuQSBEYXNoIHRvIERvY2sgZm9yayBmb3IgdGhlIENPU01JQy9HTk9NRSBTaGVsbCwgZml4ZXMgY29uZmxpY3RzIHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4gXG5cbkFkZGVkIEZlYXR1cmVzOlxuQm9yZGVyIFJhZGl1cyBcbkJvcmRlciBNYXJnaW5zXG5Eb2NrICZhbXA7IEljb24gQWxpZ25tZW50XG5FdGMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIGZvciBDT1NNSUMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaGFsZm1leGljYW5oYWxmYW1hemluZ0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} +, {"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": "9", "sha256": "09qjmpk0k8r3g56ps26pdw22mwyrch2fjmf9fmdxwkxfxxr8sf1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "09qjmpk0k8r3g56ps26pdw22mwyrch2fjmf9fmdxwkxfxxr8sf1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "09qjmpk0k8r3g56ps26pdw22mwyrch2fjmf9fmdxwkxfxxr8sf1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"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": "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": "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": "4", "sha256": "0giy8k85qszvw8b26m0b66jjx4vwvwc05y5j6mdjkjlc5cdsmrxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0giy8k85qszvw8b26m0b66jjx4vwvwc05y5j6mdjkjlc5cdsmrxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZSBhIHdpbmRvdyBieSBpdHMgdGl0bGUgb3IgV01fQ0xBU1MiLAogICJuYW1lIjogIkFjdGl2YXRlIFdpbmRvdyBCeSBUaXRsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVjYXN3ZXJrbWVpc3Rlci9hY3RpdmF0ZS13aW5kb3ctYnktdGl0bGUiLAogICJ1dWlkIjogImFjdGl2YXRlLXdpbmRvdy1ieS10aXRsZUBsdWNhc3dlcmttZWlzdGVyLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"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=="}}} , {"uuid": "eortologio@danchris.github.io", "name": "Eortologio", "pname": "eortologio-extension", "description": "Simple gnome extension to display the greek namedays", "link": "https://extensions.gnome.org/extension/5046/eortologio-extension/", "shell_version_map": {"41": {"version": "3", "sha256": "0gfg8i0rd83xqf9gqdxx02pl4kj34sn17nkws2d24l1pm55zz7g7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBleHRlbnNpb24gdG8gZGlzcGxheSB0aGUgZ3JlZWsgbmFtZWRheXMiLAogICJuYW1lIjogIkVvcnRvbG9naW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJlb3J0b2xvZ2lvQGRhbmNocmlzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0gfg8i0rd83xqf9gqdxx02pl4kj34sn17nkws2d24l1pm55zz7g7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBleHRlbnNpb24gdG8gZGlzcGxheSB0aGUgZ3JlZWsgbmFtZWRheXMiLAogICJuYW1lIjogIkVvcnRvbG9naW8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJlb3J0b2xvZ2lvQGRhbmNocmlzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -754,7 +755,7 @@ , {"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", "link": "https://extensions.gnome.org/extension/5072/one-thing/", "shell_version_map": {"38": {"version": "4", "sha256": "1bbxd87gj8wv79z1flcija6gsrl0jycnfya5mn92vqmkarjs1sn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1bbxd87gj8wv79z1flcija6gsrl0jycnfya5mn92vqmkarjs1sn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "5", "sha256": "18qxzc6qcdgzfbb5ffbc4gn5kp3mzggwk6bdxzy1gvcmbg9lnk7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW50ZWhlbWVyc29uL29uZS10aGluZyIsCiAgInV1aWQiOiAib25lLXRoaW5nQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "18qxzc6qcdgzfbb5ffbc4gn5kp3mzggwk6bdxzy1gvcmbg9lnk7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW50ZWhlbWVyc29uL29uZS10aGluZyIsCiAgInV1aWQiOiAib25lLXRoaW5nQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"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": "3", "sha256": "1xh6kgbb7lvlv6w663yz8a6jw93j5njjxqlgivjiq1s2rhhg3pqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6YXRlL3NpbXBsZS1pbmRpY2F0aW9uLW9mLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInRoaXMuc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlc0BhemF0ZS5lbWFpbCIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1xh6kgbb7lvlv6w663yz8a6jw93j5njjxqlgivjiq1s2rhhg3pqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6YXRlL3NpbXBsZS1pbmRpY2F0aW9uLW9mLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInRoaXMuc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlc0BhemF0ZS5lbWFpbCIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -765,11 +766,11 @@ , {"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": "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": "16", "sha256": "19fv89mhh9xsdqhc8sgyq9fplc71svjm6f09n7z0578dcwkl75cy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "19fv89mhh9xsdqhc8sgyq9fplc71svjm6f09n7z0578dcwkl75cy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}}} -, {"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": "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": "21", "sha256": "06hfl07q9v6r6igys09c2bk7r1jdv588nl6m1br382fl8b6g5bgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "43": {"version": "21", "sha256": "06hfl07q9v6r6igys09c2bk7r1jdv588nl6m1br382fl8b6g5bgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} +, {"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=="}}} @@ -777,12 +778,12 @@ , {"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": "3", "sha256": "02a94xfc2myh952lx3wjnxmgwzw5rh92f8b8ylmvz74vfm4rfwl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "02a94xfc2myh952lx3wjnxmgwzw5rh92f8b8ylmvz74vfm4rfwl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"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": "5", "sha256": "0y0hd3k2b7nvnja40jq6paa0y5667wajzpc38yq5k7cj6naypbs9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "0y0hd3k2b7nvnja40jq6paa0y5667wajzpc38yq5k7cj6naypbs9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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": "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 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": "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, ...\n\nThe upcoming version (24) that is already available for testing in the GitHub repository offers even more control over Shell UI layout and behavior and works also with horizontally stacked workspaces. It now includes most functionality from the Overview Feature Pack extension, so disable it before activation of the new VW if you use it. I appreciate bug reports and suggestions (on the GitHub).", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "14gss8a6dz06v81qqxifjc2c916yzky2qrgrwzf2ly83hsnq5cv9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBsaWtlIHZlcnRpY2FsbHkgc3RhY2tlZCB3b3JrcHNhY2VzLCB0aGlzIGV4dGVuc2lvbiBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSBHTk9NRSBBY3Rpdml0aWVzIHRvIHlvdXIgbmVlZHMuIExheW91dCwgdmlzaWJpbGl0eSBhbmQgc2l6ZSBvZiB0aGUgZGFzaCBhbmQgd29ya3NwYWNlIHRodW1ibmFpbHMsIGRhc2ggb3JpZW50YXRpb24sIHN0YXRpYyBhcHAgZ3JpZCwgc3RhdGljIHdvcmtzcGFjZSBvdmVydmlldyBtb2Rlcywgc3RhdGljIGJsdXJyZWQgYmFja2dyb3VuZCwgd29ya3NwYWNlIHRpdGxlcywgIHdpbmRvdyB0aXRsZXMgYWx3YXlzIHZpc2libGUsIC4uLlxuXG5UaGUgdXBjb21pbmcgdmVyc2lvbiAoMjQpIHRoYXQgaXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIHRlc3RpbmcgaW4gdGhlIEdpdEh1YiByZXBvc2l0b3J5IG9mZmVycyBldmVuIG1vcmUgY29udHJvbCBvdmVyIFNoZWxsIFVJIGxheW91dCBhbmQgYmVoYXZpb3IgYW5kIHdvcmtzIGFsc28gd2l0aCBob3Jpem9udGFsbHkgc3RhY2tlZCB3b3Jrc3BhY2VzLiBJdCBub3cgaW5jbHVkZXMgbW9zdCBmdW5jdGlvbmFsaXR5IGZyb20gdGhlIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayBleHRlbnNpb24sIHNvIGRpc2FibGUgaXQgYmVmb3JlIGFjdGl2YXRpb24gb2YgdGhlIG5ldyBWVyBpZiB5b3UgdXNlIGl0LiAgSSBhcHByZWNpYXRlIGJ1ZyByZXBvcnRzIGFuZCBzdWdnZXN0aW9ucyAob24gdGhlIEdpdEh1YikuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidmVydGljYWwtd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV29ya3NwYWNlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvdmVydGljYWwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidmVydGljYWwtd29ya3NwYWNlc0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"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="}}} @@ -790,16 +791,16 @@ , {"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\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": "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": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1gsq5k5azlcs5rlxh68makrnvjp35ym12hkb1cfcxngvw5dan85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgY3VycmVudCB0aW1lIHRvIGRhdGUgbWVudS4iLAogICJuYW1lIjogIlRpbWUgaW4gZGF0ZSBtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tuZWRtZS9UaW1lLWluLWRhdGUtbWVudSIsCiAgInV1aWQiOiAidGltZS1pbi1kYXRlLW1lbnVAa25lZG1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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": "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": "tophat@fflewddur.github.io", "name": "TopHat", "pname": "tophat", "description": "TopHat aims to be an elegant system resource monitor for the GNOME shell. It displays CPU, memory, disk, and network activity in the GNOME top bar.", "link": "https://extensions.gnome.org/extension/5219/tophat/", "shell_version_map": {"38": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1w71r3ddihgyad0p8iy65wq4akl0gsk8kl0dii5srcgysrri3c84", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcEhhdCBhaW1zIHRvIGJlIGFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IgZm9yIHRoZSBHTk9NRSBzaGVsbC4gSXQgZGlzcGxheXMgQ1BVLCBtZW1vcnksIGRpc2ssIGFuZCBuZXR3b3JrIGFjdGl2aXR5IGluIHRoZSBHTk9NRSB0b3AgYmFyLiIsCiAgImdldHRleHQtZG9tYWluIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9waGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmbGV3ZGR1ci90b3BoYXQiLAogICJ1dWlkIjogInRvcGhhdEBmZmxld2RkdXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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": "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 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": "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.\n\nExtension Homepage https://gitlab.com/smedius/desktop-icons-ng", "link": "https://extensions.gnome.org/extension/5263/gtk4-desktop-icons-ng-ding/", "shell_version_map": {"40": {"version": "17", "sha256": "1jdf42iwb7kmags80pa0qmwxccjnywa1dq3jv1vlf6hsc8a8rx3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuXG5cbkV4dGVuc2lvbiBIb21lcGFnZSBodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "1jdf42iwb7kmags80pa0qmwxccjnywa1dq3jv1vlf6hsc8a8rx3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuXG5cbkV4dGVuc2lvbiBIb21lcGFnZSBodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "31", "sha256": "1da0w9hp7rl2hbqik0xd8cwlkv9g1djzm083kp61y3sx8j9prh71", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuXG5cbkV4dGVuc2lvbiBIb21lcGFnZSBodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "31", "sha256": "1da0w9hp7rl2hbqik0xd8cwlkv9g1djzm083kp61y3sx8j9prh71", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsIGZ1bmN0aW9ucyBhcmUgYXN5bmMgd2hlcmUgcG9zc2libGUsIG11bHRpcGxlIGZpeGVzIGFuZCBuZXcgZmVhdHVyZXMtXG5cbiogTWFrZSBMaW5rcyBvbiBEZXNrdG9wLlxuKiBDb3BpZWQvZHJvcHBlZC9wYXN0ZWQgZmlsZXMgcmV0YWluIGRyb3BwZWQgcG9zaXRpb24uXG4qIFJpZ2h0IENsaWNrIE1lbnVzIHdpbGwgbm90IGdvIHVuZGVyIHRoZSBkb2NrLlxuKiBCZXR0ZXIgbXVsdGkgbW9uaXRvciBzdXBwb3J0LCBwcmVmZXJlbmNlIHRvIHBsYWNlIGljb25zIG9uIG5vbiBwcmltYXJ5IG1vbml0b3IuXG4qIEdTY29ubmVjdCBleHRlbnNpb24gaW50ZWdyYXRpb24sIGNhbiBzZW5kIGZpbGVzIGZyb20gZGVza3RvcCBkaXJlY3RseSB0byBtb2JpbGUgZGV2aWNlLlxuKiBEcmFnIGFuZCBkcm9wIEZhdm9yaXRlIGFwcHMgZnJvbSBEYXNoIHRvIERvY2ssIERhc2ggdG8gUGFuZWwgZGlyZWN0bHkgdG8gRGVza3RvcCBvciByZW1vdmUgZnJvbSBmYXZvcml0ZXMuXG4qIEltcHJvdmVkIGdlc3R1cmUgc3dpdGNoaW5nIG9mIHdvcmtzcGFjZXMsIGljb25zIGFwcGVhciB0byBiZSBvbiBhbGwgd29ya3NwYWNlcyBpbiBtb3Zpbmcgd2luZG93cy5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgb250byB0aGUgZG9jayAtIERyYWcgaWNvbnMgZnJvbSBkZXNrdG9wIHRvIGFuZCBkcm9wIG92ZXIgYXBwbGljYXRpb24gaWNvbiB0byBvcGVuIHRoZW0gd2l0aCB0aGUgYXBwLiBXb3JrcyB3aXRoIERhc2ggdG8gRG9jayBhbmQgRGFzaCB0byBQYW5lbC5cbiogU3VwcG9ydCBmb3IgZHJhZ2dpbmcgaWNvbnMgZnJvbSBkZXNrdG9wIGRpcmVjdGx5IHRvIFRyYXNoIG9uIERhc2ggdG8gRG9jayBvciB0byBtb3VudGVkIHZvbHVtZXMgdG8gY29weSB0aGVtIGRpcmVjdGx5LlxuKiBEaXNwbGF5IEdJTVAgdGh1bWJuYWlscywgZXZlbiBmb3Igc25hcCBhbmQgZmxhdHBhY2sgaW5zdGFsbHMuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBiZXN0IG9uIFdheWxhbmQuIFRoZXJlIGlzIGEgYnVnIGluIEdKUyBvbiBYMTEsIHBsZWFzZSBzZWUgUmVhZG1lLiBUaGlzIGV4dGVuc2lvbiBub3cgd29ya3Mgd2l0aCBzb21lIGhhY2tzLCBldmVuIG9uIFgxMS4gSG93ZXZlciB5b3VyIG1pbGVhZ2UgbWF5IHZhcnkgYW5kIHVzZSB3aXRoIGNhdXRpb24gb24gWDExIGFuZCByZXBvcnQgYW55IGlzc3Vlcy5cblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIG9uIHRoZSBnaXRsYWIgbGluayBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuXG5cbkV4dGVuc2lvbiBIb21lcGFnZSBodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCBEZXNrdG9wIEljb25zIE5HIHdpdGggR1Njb25uZWN0IEludGVncmF0aW9uLCBEcmFnIGFuZCBEcm9wIG9udG8gRG9jayAoR3RrNC1ESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}}} , {"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=="}}} @@ -815,12 +816,12 @@ , {"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": "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": "17", "sha256": "1x480zhlhnfhifwcxghg05bwa84mhnk360ihbvavrfdp7pcs6z8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "1x480zhlhnfhifwcxghg05bwa84mhnk360ihbvavrfdp7pcs6z8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} -, {"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": "24", "sha256": "00ax6sfmh0lqkwd6z4xb1gizrs8wi08frzgpxpxj0ax20vyp7h21", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} +, {"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=="}}} @@ -830,28 +831,28 @@ , {"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": "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": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"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": "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.\n\nThis extension requires the package 'iio-sensor-proxy' to function properly. This extension aims to work with mobile devices such as laptops,tablets and phones. These devices tend to contain an accelerometer that is used by this extension to help determine rotation.", "link": "https://extensions.gnome.org/extension/5389/screen-rotate/", "shell_version_map": {"40": {"version": "9", "sha256": "1qaidm4nsk72hil46hs333wnck5lmn8bzk7sn8kd2s7p7l89gz6j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLlxuXG5UaGlzIGV4dGVuc2lvbiByZXF1aXJlcyB0aGUgcGFja2FnZSAnaWlvLXNlbnNvci1wcm94eScgdG8gZnVuY3Rpb24gcHJvcGVybHkuIFRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gd29yayB3aXRoIG1vYmlsZSBkZXZpY2VzIHN1Y2ggYXMgbGFwdG9wcyx0YWJsZXRzIGFuZCBwaG9uZXMuIFRoZXNlIGRldmljZXMgdGVuZCB0byBjb250YWluIGFuIGFjY2VsZXJvbWV0ZXIgdGhhdCBpcyB1c2VkIGJ5IHRoaXMgZXh0ZW5zaW9uIHRvIGhlbHAgZGV0ZXJtaW5lIHJvdGF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1qaidm4nsk72hil46hs333wnck5lmn8bzk7sn8kd2s7p7l89gz6j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLlxuXG5UaGlzIGV4dGVuc2lvbiByZXF1aXJlcyB0aGUgcGFja2FnZSAnaWlvLXNlbnNvci1wcm94eScgdG8gZnVuY3Rpb24gcHJvcGVybHkuIFRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gd29yayB3aXRoIG1vYmlsZSBkZXZpY2VzIHN1Y2ggYXMgbGFwdG9wcyx0YWJsZXRzIGFuZCBwaG9uZXMuIFRoZXNlIGRldmljZXMgdGVuZCB0byBjb250YWluIGFuIGFjY2VsZXJvbWV0ZXIgdGhhdCBpcyB1c2VkIGJ5IHRoaXMgZXh0ZW5zaW9uIHRvIGhlbHAgZGV0ZXJtaW5lIHJvdGF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1qaidm4nsk72hil46hs333wnck5lmn8bzk7sn8kd2s7p7l89gz6j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLlxuXG5UaGlzIGV4dGVuc2lvbiByZXF1aXJlcyB0aGUgcGFja2FnZSAnaWlvLXNlbnNvci1wcm94eScgdG8gZnVuY3Rpb24gcHJvcGVybHkuIFRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gd29yayB3aXRoIG1vYmlsZSBkZXZpY2VzIHN1Y2ggYXMgbGFwdG9wcyx0YWJsZXRzIGFuZCBwaG9uZXMuIFRoZXNlIGRldmljZXMgdGVuZCB0byBjb250YWluIGFuIGFjY2VsZXJvbWV0ZXIgdGhhdCBpcyB1c2VkIGJ5IHRoaXMgZXh0ZW5zaW9uIHRvIGhlbHAgZGV0ZXJtaW5lIHJvdGF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1qaidm4nsk72hil46hs333wnck5lmn8bzk7sn8kd2s7p7l89gz6j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLlxuXG5UaGlzIGV4dGVuc2lvbiByZXF1aXJlcyB0aGUgcGFja2FnZSAnaWlvLXNlbnNvci1wcm94eScgdG8gZnVuY3Rpb24gcHJvcGVybHkuIFRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gd29yayB3aXRoIG1vYmlsZSBkZXZpY2VzIHN1Y2ggYXMgbGFwdG9wcyx0YWJsZXRzIGFuZCBwaG9uZXMuIFRoZXNlIGRldmljZXMgdGVuZCB0byBjb250YWluIGFuIGFjY2VsZXJvbWV0ZXIgdGhhdCBpcyB1c2VkIGJ5IHRoaXMgZXh0ZW5zaW9uIHRvIGhlbHAgZGV0ZXJtaW5lIHJvdGF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"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": "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": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0ryfg286b995zi2r1y1h91jq2xxw4ss5brjzxi2bsh97lij74cyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWxja29zL0dyYW5kVGhlZnRGb2N1cyIsCiAgInV1aWQiOiAiZ3JhbmQtdGhlZnQtZm9jdXNAemFsY2tvcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"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). \n\nFrom version 4 added a functionality to copy the QR Code to clipboard with right click on it.", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "13wgzlcs3wwm63vnvg828v06lgbv6yhjln83x2s4n8lzb9ckfs6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiBcblxuRnJvbSB2ZXJzaW9uIDQgYWRkZWQgYSBmdW5jdGlvbmFsaXR5IHRvIGNvcHkgdGhlIFFSIENvZGUgdG8gY2xpcGJvYXJkIHdpdGggcmlnaHQgY2xpY2sgb24gaXQuIiwKICAibmFtZSI6ICJXaWZpIFFSIENvZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13aWZpcXJjb2RlIiwKICAidXVpZCI6ICJ3aWZpcXJjb2RlQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"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": {"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": "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": "2", "sha256": "0j1pwzdhsg0vg1rv2bb2y5kd3mx6cr84g1va79m7iylp7ij0hkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9vc2Qtdm9sdW1lLW51bWJlciIsCiAgInV1aWQiOiAib3NkLXZvbHVtZS1udW1iZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0j1pwzdhsg0vg1rv2bb2y5kd3mx6cr84g1va79m7iylp7ij0hkca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3NkLXZvbHVtZS1udW1iZXIiLAogICJuYW1lIjogIk9TRCBWb2x1bWUgTnVtYmVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9zZC12b2x1bWUtbnVtYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9vc2Qtdm9sdW1lLW51bWJlciIsCiAgInV1aWQiOiAib3NkLXZvbHVtZS1udW1iZXJAZGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"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": "4", "sha256": "0jrax7sb7nqwl0zcgcxivg8561jrbwakylnflbrnba003xdh6bad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnRpc3RpY2F0MS9nbm9tZS1uZXh0LXVwIiwKICAidXVpZCI6ICJuZXh0LXVwQGFydGlzdGljYXQxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "0jrax7sb7nqwl0zcgcxivg8561jrbwakylnflbrnba003xdh6bad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcnRpc3RpY2F0MS9nbm9tZS1uZXh0LXVwIiwKICAidXVpZCI6ICJuZXh0LXVwQGFydGlzdGljYXQxLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"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": "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": "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": "7", "sha256": "15i34wk3b9d7dhkmbxnkv1f21hsrk4bckhvndd9jn2i1kf217x3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "15i34wk3b9d7dhkmbxnkv1f21hsrk4bckhvndd9jn2i1kf217x3x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgdGhlIEF1dG8gQWN0aXZpdGllcyBleHRlbnNpb24sIGl0cyBmb3JtZXIgb3duZXIgdHJhbnNmZXJyZWQgaXRzIHJlcG9zaXRvcnkgdG8gbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXV0by1hY3Rpdml0aWVzIiwKICAibmFtZSI6ICJBdXRvIEFjdGl2aXRpZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAibWktamFuLXNlbmFAcHJvdG9uLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2F1dG8tYWN0aXZpdGllcyIsCiAgInV1aWQiOiAiYXV0by1hY3Rpdml0aWVzQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"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": "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="}}} @@ -862,22 +863,51 @@ , {"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": "custom-accent-colors@demiskp", "name": "Custom Accent Colors", "pname": "custom-accent-colors", "description": "Allows the user to choose between 9 Custom Accent Colors. The Accent Color can be applied to GTK4/GTK3 apps and the Gnome Shell.", "link": "https://extensions.gnome.org/extension/5547/custom-accent-colors/", "shell_version_map": {"43": {"version": "5", "sha256": "11w3x66qvyni8awdjklk80vgir93w3i2aliwdfriphp1prv93fxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0aGUgdXNlciB0byBjaG9vc2UgYmV0d2VlbiA5IEN1c3RvbSBBY2NlbnQgQ29sb3JzLiBUaGUgQWNjZW50IENvbG9yIGNhbiBiZSBhcHBsaWVkIHRvIEdUSzQvR1RLMyBhcHBzIGFuZCB0aGUgR25vbWUgU2hlbGwuIiwKICAibmFtZSI6ICJDdXN0b20gQWNjZW50IENvbG9ycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZW1pc2twL2N1c3RvbS1hY2NlbnQtY29sb3JzIiwKICAidXVpZCI6ICJjdXN0b20tYWNjZW50LWNvbG9yc0BkZW1pc2twIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "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": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "43": {"version": "2", "sha256": "17q31jyvgyv5sq6mjc9i07c28miswyza7hmr3wch5c6dl6s9hgrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIGV4dGVuc2lvbiBmb3IgYnJhbmRpbmcgYW5kIGN1c3RvbWlzYXRpb24gb2YgWmlpb25cblRoZSBzbWFydCBjb250cmFjdCBhdWRpdGluZyBWTSB1c2VkIGJ5IGh0dHBzOi8vaGFsYm9ybi5jb20uXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgaGVhdmlseSBtb2RpZmllZCBmb3JrIG9mIGh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IGFuZCB1c2VzIGl0IGFzIGEgYmFzZS4gR2V0IG1vcmUgaW5mb3JtYXRpb24gb24gWklJT04gYXQgaHR0cHM6Ly96aWlvbi5vcmcuIiwKICAibmFtZSI6ICJaSUlPTmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56aWlvbmV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aWlvbi1vcy96aWlvbi1leHQiLAogICJ1dWlkIjogInppaW9uQGhhbGJvcm4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"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": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"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": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "01i79afkn865g16ivd026x7j0fnk7v5yb4bz41lycpqwypbsrjk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} +, {"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": "2", "sha256": "13znn7h22x1vgvnpm3jy1bn0ihad4wxnq8f46p798hpd5m180xgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICAgVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggVGFkbyIsCiAgIm5hbWUiOiAiVGFkb1x1MDBiMCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXpvbmVpbGwvdGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRhZG8tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uQGZpby5pZSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "indicate-focus@leleat-on-github", "name": "Focus Indicator", "pname": "focus-indicator", "description": "Indicate the focus after switching workspaces", "link": "https://extensions.gnome.org/extension/5612/focus-indicator/", "shell_version_map": {"43": {"version": "5", "sha256": "0dyhbip716bksvr9dp7hybsvyq89x34654178h9dn810xfq8c06z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlIHRoZSBmb2N1cyBhZnRlciBzd2l0Y2hpbmcgd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiRm9jdXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmluZGljYXRlLWZvY3VzLXByb3RvdHlwZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvZm9jdXMtaW5kaWNhdG9yLXByb3RvdHlwZSIsCiAgInV1aWQiOiAiaW5kaWNhdGUtZm9jdXNAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"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": "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": "8", "sha256": "0mi3csynk46s78bsg8v2ha8mc6s3mg5yhh3wgk07m6f2xip9jf2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBUYWRvIiwKICAibmFtZSI6ICJUYWRvXHUwMGIwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rtem9uZWlsbC90YWRvLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb25AZmlvLmllIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"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 as reported by upower", "link": "https://extensions.gnome.org/extension/5615/battery-indicator-upower/", "shell_version_map": {"42": {"version": "5", "sha256": "12birrs2laqi7df0yjmmirjqhp6ls0fk7vgx75zp91p9g9v5358b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGFzIHJlcG9ydGVkIGJ5IHVwb3dlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBpbmRpY2F0b3IgKHVwb3dlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWxrby9iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yQGpnb3R0aS5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "12birrs2laqi7df0yjmmirjqhp6ls0fk7vgx75zp91p9g9v5358b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGFzIHJlcG9ydGVkIGJ5IHVwb3dlciIsCiAgIm5hbWUiOiAiQmF0dGVyeSBpbmRpY2F0b3IgKHVwb3dlcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYWxrby9iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yQGpnb3R0aS5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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 2 or 4 sections.\n\nPrerequisite:\n- Disable (or change) keyboard shortcuts for Super+Left/Right/Up/Down in\nSettings -> Keyboard -> Keyboard shortcuts -> Windows", "link": "https://extensions.gnome.org/extension/5651/view-split/", "shell_version_map": {"42": {"version": "7", "sha256": "14hjfpispfpj461h0k7yqjq25vyc4469318kxddl9pwiqb26xa9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byAyIG9yIDQgc2VjdGlvbnMuXG5cblByZXJlcXVpc2l0ZTpcbi0gRGlzYWJsZSAob3IgY2hhbmdlKSBrZXlib2FyZCBzaG9ydGN1dHMgZm9yIFN1cGVyK0xlZnQvUmlnaHQvVXAvRG93biBpblxuU2V0dGluZ3MgLT4gS2V5Ym9hcmQgLT4gS2V5Ym9hcmQgc2hvcnRjdXRzIC0+IFdpbmRvd3MiLAogICJuYW1lIjogIlZpZXcgU3BsaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "14hjfpispfpj461h0k7yqjq25vyc4469318kxddl9pwiqb26xa9j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byAyIG9yIDQgc2VjdGlvbnMuXG5cblByZXJlcXVpc2l0ZTpcbi0gRGlzYWJsZSAob3IgY2hhbmdlKSBrZXlib2FyZCBzaG9ydGN1dHMgZm9yIFN1cGVyK0xlZnQvUmlnaHQvVXAvRG93biBpblxuU2V0dGluZ3MgLT4gS2V5Ym9hcmQgLT4gS2V5Ym9hcmQgc2hvcnRjdXRzIC0+IFdpbmRvd3MiLAogICJuYW1lIjogIlZpZXcgU3BsaXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"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": "4", "sha256": "0shpi61ymwgd0m9nc4jbl1ygjkdz563ip24pw531cv8b8jw8rqcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgQXBwTWVudSwgcmVwbGFjZSB0aGUgYWN0aXZpdGllcyBsYWJlbCB3aXRoIDMgZG90cyBhbmQgYW5pbWF0ZSB0aGVtIGFzIGEgbG9hZGluZyBzcGlubmVyLiIsCiAgIm5hbWUiOiAiUmVwbGFjZSBBY3Rpdml0aWVzIExhYmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlcGxhY2UtYWN0aXZpdGllcy1sYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvcmVwbGFjZS1hY3Rpdml0aWVzLWxhYmVsIiwKICAidXVpZCI6ICJyZXBsYWNlLWFjdGl2aXRpZXMtbGFiZWxAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"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": "2", "sha256": "0wpcgr5mmh5h412an9l91xg2y0p679aa2civc3zygkvvw38zpm77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "downloads-indicator@Dieg0Js.github.io", "name": "Downloads Indicator", "pname": "downloads-indicator", "description": "A minimal Downloads manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5712/downloads-indicator/", "shell_version_map": {"43": {"version": "2", "sha256": "08rqx7hmf12ib2s2i6dlww9m2rhvivb7b3vwdldgv7wjn4ibsj9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBEb3dubG9hZHMgbWFuYWdlciBmb3IgdGhlIGdub21lIHNoZWxsLiBGb3JrIG9mIEdub21lIFRyYXNoIGZyb20gQXhlbCB2b24gQmVydG9sZGkuIiwKICAibmFtZSI6ICJEb3dubG9hZHMgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJEaWVnMEpzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtZG93bmxvYWRzLWluZGljYXRvciIsCiAgInV1aWQiOiAiZG93bmxvYWRzLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "trash-indicator@Dieg0Js.github.io", "name": "Trash Indicator", "pname": "trash-indicator", "description": "A minimal Trash manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5715/trash-indicator/", "shell_version_map": {"43": {"version": "2", "sha256": "1lz8m11d1zbdkggm8zjnwi2fyalingy6nr4y2n2smxfpgfd2q9zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBUcmFzaCBtYW5hZ2VyIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgR25vbWUgVHJhc2ggZnJvbSBBeGVsIHZvbiBCZXJ0b2xkaS4iLAogICJuYW1lIjogIlRyYXNoIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiRGllZzBKcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EaWVnMEpzL2dub21lLXRyYXNoLWluZGljYXRvciIsCiAgInV1aWQiOiAidHJhc2gtaW5kaWNhdG9yQERpZWcwSnMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "battery-indicator-icon@Deminder", "name": "Battery Indicator Icon", "pname": "battery-indicator-icon", "description": "Replace the battery indicator icon with a circle or portrait.", "link": "https://extensions.gnome.org/extension/5718/battery-indicator-icon/", "shell_version_map": {"43": {"version": "5", "sha256": "1c08vk4rpy83nf9pv5k87d61iha371jd876rpqx42qklqy03ra83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RlbWluZGVyL2JhdHRlcnktaW5kaWNhdG9yLWljb24iLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yLWljb25ARGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "clipboard-indicator@Dieg0Js.github.io", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "A minimal clipboard indicator for the gnome shell. Fork of Clipman by popov895.", "link": "https://extensions.gnome.org/extension/5721/clipboard-indicator/", "shell_version_map": {"42": {"version": "1", "sha256": "1i9jsvf9lkf0r5fjhzp8mp8f1ndfgwcqid1dy37gggvz0ga209fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgQ2xpcG1hbiBieSBwb3Bvdjg5NS4iLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1i9jsvf9lkf0r5fjhzp8mp8f1ndfgwcqid1dy37gggvz0ga209fm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwuIEZvcmsgb2YgQ2xpcG1hbiBieSBwb3Bvdjg5NS4iLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "Battery-Health-Charging@maniacx.github.com", "name": "Battery Health Charging", "pname": "battery-health-charging", "description": "Battery Health Charging extension sets the limit of battery charging to maximize battery health for laptop. Since users usually keep their AC adapter connected while using their laptop, the battery is often in a state of high-power(98-100%) for extended length of time which causes a reduction in battery life.\nYou can set the limit to stop charging at one of the 2 or 3 (if device supports it) following modes.\n1. Full Capacity Mode: Battery is charged to its full capacity for longer use on battery power.\n2. Balanced Mode (if device supports it): This mode is recommended when using the Notebook on battery power during meetings or conferences.\n3. Maximum Lifespan Mode: This mode is recommended when the Notebook is always powered by AC adapter.\n\nFor more information about modes, compatibility, translation, bugs/issues visit:\nhttps://github.com/maniacx/Battery-Health-Charging", "link": "https://extensions.gnome.org/extension/5724/battery-health-charging/", "shell_version_map": {"43": {"version": "5", "sha256": "1mj8d2i06f6530jcks8y9f8ap2z9kj1s6pc0iafdv3v80b83f0sq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJhdHRlcnkgSGVhbHRoIENoYXJnaW5nIGV4dGVuc2lvbiBzZXRzIHRoZSBsaW1pdCBvZiBiYXR0ZXJ5IGNoYXJnaW5nIHRvIG1heGltaXplIGJhdHRlcnkgaGVhbHRoIGZvciBsYXB0b3AuIFNpbmNlIHVzZXJzIHVzdWFsbHkga2VlcCB0aGVpciBBQyBhZGFwdGVyIGNvbm5lY3RlZCB3aGlsZSB1c2luZyB0aGVpciBsYXB0b3AsIHRoZSBiYXR0ZXJ5IGlzIG9mdGVuIGluIGEgc3RhdGUgb2YgIGhpZ2gtcG93ZXIoOTgtMTAwJSkgZm9yIGV4dGVuZGVkIGxlbmd0aCBvZiB0aW1lIHdoaWNoIGNhdXNlcyBhIHJlZHVjdGlvbiBpbiBiYXR0ZXJ5IGxpZmUuXG5Zb3UgY2FuIHNldCB0aGUgbGltaXQgdG8gc3RvcCBjaGFyZ2luZyBhdCBvbmUgb2YgdGhlIDIgb3IgMyAoaWYgZGV2aWNlIHN1cHBvcnRzIGl0KSBmb2xsb3dpbmcgbW9kZXMuXG4xLiBGdWxsIENhcGFjaXR5IE1vZGU6IEJhdHRlcnkgaXMgY2hhcmdlZCB0byBpdHMgZnVsbCBjYXBhY2l0eSBmb3IgbG9uZ2VyIHVzZSBvbiBiYXR0ZXJ5IHBvd2VyLlxuMi4gQmFsYW5jZWQgTW9kZSAoaWYgZGV2aWNlIHN1cHBvcnRzIGl0KTogVGhpcyBtb2RlIGlzIHJlY29tbWVuZGVkIHdoZW4gdXNpbmcgdGhlIE5vdGVib29rIG9uIGJhdHRlcnkgcG93ZXIgZHVyaW5nIG1lZXRpbmdzIG9yIGNvbmZlcmVuY2VzLlxuMy4gTWF4aW11bSBMaWZlc3BhbiBNb2RlOiBUaGlzIG1vZGUgaXMgcmVjb21tZW5kZWQgd2hlbiB0aGUgTm90ZWJvb2sgaXMgYWx3YXlzIHBvd2VyZWQgYnkgQUMgYWRhcHRlci5cblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgbW9kZXMsIGNvbXBhdGliaWxpdHksIHRyYW5zbGF0aW9uLCBidWdzL2lzc3VlcyB2aXNpdDpcbmh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEhlYWx0aCBDaGFyZ2luZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW5pYWN4L0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAidXVpZCI6ICJCYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZ0BtYW5pYWN4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click the power menu button to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": {"43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"uuid": "auto-brightness-toggle@sao.studio", "name": "Auto Brightness Toggle", "pname": "auto-brightness-toggle", "description": "Toggle auto brightness in quick settings", "link": "https://extensions.gnome.org/extension/5736/auto-brightness-toggle/", "shell_version_map": {"43": {"version": "2", "sha256": "143v91wf8ymcnmibg36m3zn08h2asmyks9s5gws7hlvmamfmlx33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhdXRvIGJyaWdodG5lc3MgaW4gcXVpY2sgc2V0dGluZ3MiLAogICJuYW1lIjogIkF1dG8gQnJpZ2h0bmVzcyBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvYXV0by1icmlnaHRuZXNzLXRvZ2dsZSIsCiAgInV1aWQiOiAiYXV0by1icmlnaHRuZXNzLXRvZ2dsZUBzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "Finans_Monitor@taylantatli_github", "name": "Finans Monitörü", "pname": "finans-monitoru", "description": "An Extension to track gold and foreign exchange prices in Turkey in real time with finans.truncgil.com API.", "link": "https://extensions.gnome.org/extension/5739/finans-monitoru/", "shell_version_map": {"43": {"version": "2", "sha256": "1mn38k1wqdp21l2x0aipjc9s4dx8gkkx693n2kshn2gxn0w4nair", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJBbiBFeHRlbnNpb24gdG8gdHJhY2sgZ29sZCBhbmQgZm9yZWlnbiBleGNoYW5nZSBwcmljZXMgaW4gVHVya2V5IGluIHJlYWwgdGltZSB3aXRoIGZpbmFucy50cnVuY2dpbC5jb20gQVBJLiIsCiAgIm5hbWUiOiAiRmluYW5zIE1vbml0XHUwMGY2clx1MDBmYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5maW5hbnMtbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9UYXlsYW5UYXRsaS9maW5hbnNtb25pdG9ydSIsCiAgInV1aWQiOiAiRmluYW5zX01vbml0b3JAdGF5bGFudGF0bGlfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "volume-osd-always@alexandrecvieira.github.io", "name": "Volume OSD Always", "pname": "volume-osd-always", "description": "Show Volume OSD Always by scrolling over panel volume icon or changing volume slider.\n\nVersion 5: Added audio mute/unmute by middle-clicking the speaker icon on the menu bar\nVersion 6: Bug fix", "link": "https://extensions.gnome.org/extension/5742/volume-osd-always/", "shell_version_map": {"42": {"version": "6", "sha256": "1afihsj9bisvnjsdi0ji69hapc9a32p2631g2d3vq0y63nsadfvy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVm9sdW1lIE9TRCBBbHdheXMgYnkgc2Nyb2xsaW5nIG92ZXIgcGFuZWwgdm9sdW1lIGljb24gb3IgY2hhbmdpbmcgdm9sdW1lIHNsaWRlci5cblxuVmVyc2lvbiA1OiBBZGRlZCBhdWRpbyBtdXRlL3VubXV0ZSBieSBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXJcblZlcnNpb24gNjogQnVnIGZpeCIsCiAgIm5hbWUiOiAiVm9sdW1lIE9TRCBBbHdheXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhhbmRyZWN2aWVpcmEvdm9sdW1lLW9zZC1hbHdheXMiLAogICJ1dWlkIjogInZvbHVtZS1vc2QtYWx3YXlzQGFsZXhhbmRyZWN2aWVpcmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "1afihsj9bisvnjsdi0ji69hapc9a32p2631g2d3vq0y63nsadfvy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVm9sdW1lIE9TRCBBbHdheXMgYnkgc2Nyb2xsaW5nIG92ZXIgcGFuZWwgdm9sdW1lIGljb24gb3IgY2hhbmdpbmcgdm9sdW1lIHNsaWRlci5cblxuVmVyc2lvbiA1OiBBZGRlZCBhdWRpbyBtdXRlL3VubXV0ZSBieSBtaWRkbGUtY2xpY2tpbmcgdGhlIHNwZWFrZXIgaWNvbiBvbiB0aGUgbWVudSBiYXJcblZlcnNpb24gNjogQnVnIGZpeCIsCiAgIm5hbWUiOiAiVm9sdW1lIE9TRCBBbHdheXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXhhbmRyZWN2aWVpcmEvdm9sdW1lLW9zZC1hbHdheXMiLAogICJ1dWlkIjogInZvbHVtZS1vc2QtYWx3YXlzQGFsZXhhbmRyZWN2aWVpcmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "pico-system-monitor@hiddewie", "name": "Pico System Monitor", "pname": "pico-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/5748/pico-system-monitor/", "shell_version_map": {"38": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "07rzz5prp8ffv88a0dgib204y7kb43ggcm127fgwrz3nbfk3xndz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBzdGF0dXMgb24gR05PTUUgU2hlbGwgcGFuZWxcblxuYmFyIHNob3dzIENQVXxtZW1vcnl8c3dhcCB1c2FnZXMsdGhlbiB0aGUgZG93bmxvYWR8dXBsb2FkIHNwZWVkIGFuZCBDUFUgdGVtcGVyYXR1cmUgYW5kIGZhbiBzcGVlZFxuXG5EaWZmZXJlbnQgY29sb3JzIHJlcHJlc2VudCBkaWZmZXJlbnQgcGVyY2VudGFnZSBzdGF0ZXMgYW5kIENQVSB0ZW1wZXJhdHVyZVxuXG5wbGVhc2UgdXNlIG1vbm9zcGFjZWQgZm9udCBmb3IgYmVzdCBleHBlcmllbmNlIiwKICAibmFtZSI6ICJQaWNvIFN5c3RlbSBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hpZGRld2llL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waWNvLXN5c3RlbS1tb25pdG9yIiwKICAidXVpZCI6ICJwaWNvLXN5c3RlbS1tb25pdG9yQGhpZGRld2llIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "awake@vixalien.com", "name": "Keep Awake", "pname": "keep-awake", "description": "[DEPRECATED: Use \"Caffeine\" instead]. Disable the screensaver & auto suspend in quick settings", "link": "https://extensions.gnome.org/extension/5752/keep-awake/", "shell_version_map": {"43": {"version": "4", "sha256": "0rp8i954nlqnqgfl46xbl45pwib8v9zv6saa83kvcz4wzv3xvrdh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltERVBSRUNBVEVEOiBVc2UgXCJDYWZmZWluZVwiIGluc3RlYWRdLiBEaXNhYmxlIHRoZSBzY3JlZW5zYXZlciAmIGF1dG8gc3VzcGVuZCBpbiBxdWljayBzZXR0aW5ncyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hd2FrZSIsCiAgIm5hbWUiOiAiS2VlcCBBd2FrZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hd2FrZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92aXhhbGllbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXdha2UiLAogICJ1dWlkIjogImF3YWtlQHZpeGFsaWVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "brightness-control-percentage@minozzi60.gmail.com", "name": "Brightness Control Percentage", "pname": "brightness-control-percentage", "description": "Very useful to show your screen brightness value without having to open the menu", "link": "https://extensions.gnome.org/extension/5757/brightness-control-percentage/", "shell_version_map": {"42": {"version": "1", "sha256": "02w5caxi9dvxp4wdizxdiymaii5549f2rh9nwa7mb3psgw2a8sq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnkgdXNlZnVsIHRvIHNob3cgeW91ciBzY3JlZW4gYnJpZ2h0bmVzcyB2YWx1ZSB3aXRob3V0IGhhdmluZyB0byBvcGVuIHRoZSBtZW51IiwKICAibmFtZSI6ICJCcmlnaHRuZXNzIENvbnRyb2wgUGVyY2VudGFnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaW5venp6aS9icmlnaHRuZXNzLWNvbnRyb2wtcGVyY2VudGFnZSIsCiAgInV1aWQiOiAiYnJpZ2h0bmVzcy1jb250cm9sLXBlcmNlbnRhZ2VAbWlub3p6aTYwLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "faustus-tuf@anas", "name": "Faustus Tuf Controls", "pname": "faustus-tuf-controls", "description": "This extension provides an easy and convenient way to change settings for your tuf laptop in the GNOME desktop environment based on the open source driver faustus for Tuf gaming laptops", "link": "https://extensions.gnome.org/extension/5760/faustus-tuf-controls/", "shell_version_map": {"40": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0ln74gsl9j1pk9x22xx1zjqcm3fjr819xwll9p7ghvhq49wl29hp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGFuIGVhc3kgYW5kIGNvbnZlbmllbnQgd2F5IHRvIGNoYW5nZSBzZXR0aW5ncyBmb3IgeW91ciB0dWYgbGFwdG9wIGluIHRoZSBHTk9NRSBkZXNrdG9wIGVudmlyb25tZW50IGJhc2VkIG9uIHRoZSBvcGVuIHNvdXJjZSBkcml2ZXIgZmF1c3R1cyBmb3IgVHVmIGdhbWluZyBsYXB0b3BzIiwKICAibmFtZSI6ICJGYXVzdHVzIFR1ZiBDb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmFzbGFoYW0vZmF1c3R1cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImZhdXN0dXMtdHVmQGFuYXMiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "wifiSwitcher@afzal.website", "name": "Wifi Switcher", "pname": "wifi-switcher", "description": "# Gnome-Wifi-Switcher\n\nThe purpose of this extension is to save time while switching wifi.\n\n# How To Use\n\nAll Wifi and newly added Networks are enabled by Default. You need to Disbale them by Right Clicking on \"Not Connected\" or Your Currently connected wifi name shown in main panel by the extension.\n\nLeft Click on the wifi to connect to next Wifi SSID, Simple.\n\nIssues: Currently on Ubuntu 20.04 clicking on switches some time does not work. So the Work around is minimize all other apps and then enable or disable wifis.\n\n# Thanks\nInspired by [SJBERTRAND](https://extensions.gnome.org//extension/5362/wireguard-vpn-extension/)\n\n# Pull Request\nWaiting for someone to fix PopupMenu which is currently shown on left side and on switching any switch closes automatically.", "link": "https://extensions.gnome.org/extension/5763/wifi-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "1rcsjhvq90176x4wa2j8xgfx7ajdiczw80anv5hhjbrp8byrhmxg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR25vbWUtV2lmaS1Td2l0Y2hlclxuXG5UaGUgcHVycG9zZSBvZiB0aGlzIGV4dGVuc2lvbiBpcyB0byBzYXZlIHRpbWUgd2hpbGUgc3dpdGNoaW5nIHdpZmkuXG5cbiMgSG93IFRvIFVzZVxuXG5BbGwgV2lmaSBhbmQgbmV3bHkgYWRkZWQgTmV0d29ya3MgYXJlIGVuYWJsZWQgYnkgRGVmYXVsdC4gWW91IG5lZWQgdG8gRGlzYmFsZSB0aGVtIGJ5IFJpZ2h0IENsaWNraW5nIG9uIFwiTm90IENvbm5lY3RlZFwiIG9yIFlvdXIgQ3VycmVudGx5IGNvbm5lY3RlZCB3aWZpIG5hbWUgc2hvd24gaW4gbWFpbiBwYW5lbCBieSB0aGUgZXh0ZW5zaW9uLlxuXG5MZWZ0IENsaWNrIG9uIHRoZSB3aWZpIHRvIGNvbm5lY3QgdG8gbmV4dCBXaWZpIFNTSUQsIFNpbXBsZS5cblxuSXNzdWVzOiBDdXJyZW50bHkgb24gVWJ1bnR1IDIwLjA0IGNsaWNraW5nIG9uIHN3aXRjaGVzIHNvbWUgdGltZSBkb2VzIG5vdCB3b3JrLiBTbyB0aGUgV29yayBhcm91bmQgaXMgbWluaW1pemUgYWxsIG90aGVyIGFwcHMgYW5kIHRoZW4gZW5hYmxlIG9yIGRpc2FibGUgd2lmaXMuXG5cbiMgVGhhbmtzXG5JbnNwaXJlZCBieSBbU0pCRVJUUkFORF0oaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy8vZXh0ZW5zaW9uLzUzNjIvd2lyZWd1YXJkLXZwbi1leHRlbnNpb24vKVxuXG4jIFB1bGwgUmVxdWVzdFxuV2FpdGluZyBmb3Igc29tZW9uZSB0byBmaXggUG9wdXBNZW51IHdoaWNoIGlzIGN1cnJlbnRseSBzaG93biBvbiBsZWZ0IHNpZGUgYW5kIG9uIHN3aXRjaGluZyBhbnkgc3dpdGNoIGNsb3NlcyBhdXRvbWF0aWNhbGx5LiIsCiAgIm5hbWUiOiAiV2lmaSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hZnpsLXd0dS9Hbm9tZS1XaWZpLVN3aXRjaGVyIiwKICAidXVpZCI6ICJ3aWZpU3dpdGNoZXJAYWZ6YWwud2Vic2l0ZSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "desaturated-tray-icons@cr1337.github.com", "name": "Desaturated Tray Icons", "pname": "desaturated-tray-icons", "description": "Display all tray icons in grayscale", "link": "https://extensions.gnome.org/extension/5766/desaturated-tray-icons/", "shell_version_map": {"42": {"version": "2", "sha256": "1v27biy9psxiv9fkgp83p9rqbwid2rqdwdc6f5rl4mnhj0fn8p8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYWxsIHRyYXkgaWNvbnMgaW4gZ3JheXNjYWxlIiwKICAibmFtZSI6ICJEZXNhdHVyYXRlZCBUcmF5IEljb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NSMTMzNy9kZXNhdHVyYXRlZC10cmF5LWljb25zIiwKICAidXVpZCI6ICJkZXNhdHVyYXRlZC10cmF5LWljb25zQGNyMTMzNy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "hassleless-overview-search@mechtifs", "name": "Hassleless Overview Search", "pname": "hassleless-overview-search", "description": "This extension reverts the ibus input source to default when entering the overview, and restores it after exiting, which solves the conflict between the ibus popup and the \"Type to search\" feature.", "link": "https://extensions.gnome.org/extension/5769/hassleless-overview-search/", "shell_version_map": {"42": {"version": "2", "sha256": "1k34mhmj9y9a2qikccakbv0cwx3qnw7a3a0yiqcf2b6781ml1kwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy9oYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaCIsCiAgInV1aWQiOiAiaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2hAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1k34mhmj9y9a2qikccakbv0cwx3qnw7a3a0yiqcf2b6781ml1kwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHJldmVydHMgdGhlIGlidXMgaW5wdXQgc291cmNlIHRvIGRlZmF1bHQgd2hlbiBlbnRlcmluZyB0aGUgb3ZlcnZpZXcsIGFuZCByZXN0b3JlcyBpdCBhZnRlciBleGl0aW5nLCB3aGljaCBzb2x2ZXMgdGhlIGNvbmZsaWN0IGJldHdlZW4gdGhlIGlidXMgcG9wdXAgYW5kIHRoZSBcIlR5cGUgdG8gc2VhcmNoXCIgZmVhdHVyZS4iLAogICJuYW1lIjogIkhhc3NsZWxlc3MgT3ZlcnZpZXcgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWNodGlmcy9oYXNzbGVsZXNzLW92ZXJ2aWV3LXNlYXJjaCIsCiAgInV1aWQiOiAiaGFzc2xlbGVzcy1vdmVydmlldy1zZWFyY2hAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "livecaptions@sapples.net", "name": "Live Captions Assistant", "pname": "live-captions-assistant", "description": "Provides better desktop integration for Live Captions", "link": "https://extensions.gnome.org/extension/5775/live-captions-assistant/", "shell_version_map": {"40": {"version": "1", "sha256": "0vbg5gmij43nw5vzl8cr47gghnrfp8lb6ly3jj62zyxjpfcs857l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hYmIxMjgvZ25vbWUtbGl2ZS1jYXB0aW9ucy1hc3Npc3RhbnQiLAogICJ1dWlkIjogImxpdmVjYXB0aW9uc0BzYXBwbGVzLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "0vbg5gmij43nw5vzl8cr47gghnrfp8lb6ly3jj62zyxjpfcs857l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hYmIxMjgvZ25vbWUtbGl2ZS1jYXB0aW9ucy1hc3Npc3RhbnQiLAogICJ1dWlkIjogImxpdmVjYXB0aW9uc0BzYXBwbGVzLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "0vbg5gmij43nw5vzl8cr47gghnrfp8lb6ly3jj62zyxjpfcs857l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hYmIxMjgvZ25vbWUtbGl2ZS1jYXB0aW9ucy1hc3Npc3RhbnQiLAogICJ1dWlkIjogImxpdmVjYXB0aW9uc0BzYXBwbGVzLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "0vbg5gmij43nw5vzl8cr47gghnrfp8lb6ly3jj62zyxjpfcs857l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGJldHRlciBkZXNrdG9wIGludGVncmF0aW9uIGZvciBMaXZlIENhcHRpb25zIiwKICAibmFtZSI6ICJMaXZlIENhcHRpb25zIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hYmIxMjgvZ25vbWUtbGl2ZS1jYXB0aW9ucy1hc3Npc3RhbnQiLAogICJ1dWlkIjogImxpdmVjYXB0aW9uc0BzYXBwbGVzLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} ] diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 90ef25fcca51c..9018df07e9cd6 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 = [ diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index bc54591ebd650..adee04a0df805 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/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 460dbfdb38bfc..3b141c501a8c9 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/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 55239caf2bd17..727ae63585991 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , pkg-config , glib @@ -29,6 +30,17 @@ mkDerivation rec { sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24="; }; + patches = [ + # FIXME: backport Plasma 5.27 build fix, remove for next release + (fetchpatch { + url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff"; + hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc="; + }) + ]; + + # FIXME: required to build with Plasma 5.27, which uses std::optional + cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 486d27baf565b..c236cc919d88d 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ optionals (enableXps) [ "--enable-xps" ] ++ optionals (enableImages) [ "--enable-pixbuf" ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 0012e2501c414..95ac7a1cfafdd 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { mate-settings-daemon ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index a67b82d0109dc..764f86cf061e9 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-suid=no" ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 4c82397ef681b..4340c5549aa44 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mate-panel ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index b1273bb72ae57..c2037d22724b5 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; makeFlags = [ "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 159d13e59122b..3fbc590bd8554 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional pulseaudioSupport "--enable-pulse"; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 110ec7e406558..70151d83782de 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 4fb9768ef7eef..eeea360308a63 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "7.0.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-fRurEkatWbtGiTRNe6tA2NyYk1IRCBW8SKBSUm4FrO4="; + sha256 = "sha256-jtNPRsq33bIn3jy3F63UNrwrhaTBYbRYLDxyxgAXjIc="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index a5586648621fc..d2ec15c09c6cc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.2.1"; + version = "6.2.2"; outputs = [ "out" "dev" ]; @@ -37,18 +36,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-pJFeMG2aGaMkS00fSoRlMR2YSg5YzwqwaQT8G7Gk5S4="; + sha256 = "sha256-YV7fcRaLaDwa0m6zbdhayCAqeON5nqEdQ1IUtDKu5AY="; }; - 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 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 657ea7a260c97..0000000000000 --- 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 <rjl931189261@126.com> -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 786539d567b1c..3c9fc107a9780 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,12 +43,14 @@ 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" ]; 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 550aefbb1f106..ead8bafaa1259 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 8b7ec684dbeae..0b9c3213b3d28 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -23,20 +23,20 @@ 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; }) ]; @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { gtk3 ibus libgee - libgnomekbd libhandy libxklavier switchboard 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 0b5c8b8fd27e6..bed4ca5573c87 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 b71f6ee36ac5e..160319f0e1606 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5"; + sha256 = "sha256-iXkNdUMHa0IF2FLn34/6G4w3m53GRZun8yzc8dxAg20="; }; patches = [ diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 7a9a0dd8fbd8f..cd151ee19430e 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 = [ diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index defa583e98a2a..a96cce755c976 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -40,10 +40,10 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter338; + mutter = pkgs.gnome.mutter42; - # Using 3.38 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; + # Using 42 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 85e0f1a28fc4e..e02129cc8c081 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "6.0.2"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "default-settings"; rev = version; - sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y="; + sha256 = "sha256-RPnERK93GCfWyw1sIW5BitCIo11/t1koV4r1+NF5NdI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 7598ab5ed818e..94a6e533dda30 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -15,6 +15,7 @@ , libgee , libhandy , gnome-settings-daemon +, mesa , mutter , elementary-icon-theme , wingpanel-with-indicators @@ -22,7 +23,6 @@ , nixos-artwork , lightdm , gdk-pixbuf -, clutter-gtk , dbus , accountsservice , wrapGAppsHook @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice - clutter-gtk # else we get could not generate cargs for mutter-clutter-2 elementary-icon-theme gnome-settings-daemon gdk-pixbuf @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { libgee libhandy lightdm + mesa # for libEGL mutter ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 94d461a590acf..f249a091572b6 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,58 +1,44 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson , ninja , vala -, libxml2 , desktop-file-utils -, gtk3 +, gtk4 , glib -, granite +, granite7 , libgee -, libhandy -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.2.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "shortcut-overlay"; rev = version; - sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; + sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/shortcut-overlay/pull/113 - (fetchpatch { - url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch"; - sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils - libxml2 meson ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 + granite7 + gtk4 libgee - libhandy ]; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 56428a9124ae4..89e035d86901e 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -17,8 +16,8 @@ , bamf , libcanberra-gtk3 , gnome-desktop +, mesa , mutter -, clutter , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -26,83 +25,19 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.3.1"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y="; + sha256 = "sha256-YHmmF9tYDgMieLCs9My7NU16Ysq4n2sxWT/7MpaerkI="; }; patches = [ # We look for plugins in `/run/current-system/sw/lib/` because # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch - - # WindowManager: save/restore easing on workspace switch - # https://github.com/elementary/gala/pull/1430 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/1f94db16c627f73af5dc69714611815e4691b5e8.patch"; - sha256 = "sha256-PLNbAXyOG0TMn1y2QIBnL6BOQVqBA+DBgPOVJo4nDr8="; - }) - - # WindowSwitcher: fix initial alt-tab switcher indicator visibility - # https://github.com/elementary/gala/pull/1417 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch"; - sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM="; - }) - - # MultitaskingView: fix allocation assertions - # https://github.com/elementary/gala/pull/1463 - (fetchpatch { - 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 = [ @@ -119,7 +54,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf - clutter gnome-settings-daemon gexiv2 gnome-desktop @@ -127,6 +61,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee + mesa # for libEGL mutter ]; 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 f342642e326c2..2a13ff787c613 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "elementary"; repo = "applications-menu"; rev = version; - sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M="; + sha256 = "sha256-WlRrEkX0DGIHYWvUc9G4BbvofzWJwqkiJaJFwQ43GPE="; }; patches = [ diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 0f46c70297170..0903dc6970969 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/pkgs/desktops/pantheon/granite/7/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.1.0"; + version = "7.2.0"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-tdZSiIK+BW8uhbRxLUcrGQt71jRfVLOTgFNOqeLK6ig="; + sha256 = "sha256-LU2eIeaNqO4/6dPUuzOQ/w4tx0dEm26JwZ87yQ16c4o="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix index d0ee4a0d1c766..a140d9cdcb0eb 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 = [ diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 6396b7c6c51e0..f8fc60a5409d4 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -51,9 +51,9 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; + qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {}; - packages = self: with self; + packages = self: let propagate = out: @@ -98,6 +98,7 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ]; meta = let meta = args.meta or { }; in @@ -109,8 +110,8 @@ let broken = meta.broken or broken; }; in - mkDerivation (args // { - inherit pname version meta outputs setupHook src; + (args.stdenv or qtStdenv).mkDerivation (args // { + inherit pname version meta outputs setupHook src nativeBuildInputs; }); }; @@ -123,6 +124,7 @@ let breeze-grub = callPackage ./breeze-grub.nix { }; breeze-plymouth = callPackage ./breeze-plymouth { }; discover = callPackage ./discover.nix { }; + flatpak-kcm = callPackage ./flatpak-kcm.nix { }; kactivitymanagerd = callPackage ./kactivitymanagerd.nix { }; kde-cli-tools = callPackage ./kde-cli-tools.nix { }; kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; @@ -130,7 +132,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 { }; @@ -162,6 +164,7 @@ let plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault { }; + plasma-welcome = callPackage ./plasma-welcome.nix { }; plasma-workspace = callPackage ./plasma-workspace { }; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { }; polkit-kde-agent = callPackage ./polkit-kde-agent.nix { }; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 2da4dc40e6be0..feb1a5d3a80b6 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.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/flatpak-kcm.nix b/pkgs/desktops/plasma-5/flatpak-kcm.nix new file mode 100644 index 0000000000000..406a0c9c920ce --- /dev/null +++ b/pkgs/desktops/plasma-5/flatpak-kcm.nix @@ -0,0 +1,18 @@ +{ mkDerivation +, extra-cmake-modules +, flatpak +, kcmutils +, kconfig +, kdeclarative +}: + +mkDerivation { + pname = "flatpak-kcm"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + flatpak + kcmutils + kconfig + kdeclarative + ]; +} diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix deleted file mode 100644 index c63d22858a551..0000000000000 --- 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 0000000000000..c6cf9bd8d6df9 --- /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 0000000000000..2f27dd201ce56 --- /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 ${systemsettings}/bin/systemsettings $out/bin/kinfocenter + ''; +} diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index d53d808e10844..f09104d534f90 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -7,6 +7,7 @@ , kdeclarative , kglobalaccel , kidletime +, libkscreen , kwayland , libXcursor , pam @@ -27,6 +28,7 @@ mkDerivation { kdeclarative kglobalaccel kidletime + libkscreen kwayland libXcursor pam diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index 6b04d055eac77..5b552a1f78605 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "ksystemstats"; - NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getBin libksysguard}/share" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; } diff --git a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch deleted file mode 100644 index ddaa7f76b13be..0000000000000 --- a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 84f020835e3624342a928aae68e62e636bf2cc8c Mon Sep 17 00:00:00 2001 -From: Yuriy Taraday <yorik.sar@gmail.com> -Date: Wed, 12 Oct 2022 12:07:23 +0400 -Subject: [PATCH] Revert "[x11] Refactor output updates" - -This reverts commit 9a34ebbffc791cbeadc9abafda793ebee654b270. - -This should fix compilation with older GCC. ---- - CMakeLists.txt | 2 +- - .../standalone/x11_standalone_platform.cpp | 63 +++++++++++-------- - 2 files changed, 38 insertions(+), 27 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e7bf700e..6ff24aa5c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,7 +70,7 @@ add_definitions(-DMESA_EGL_NO_X11_HEADERS) - add_definitions(-DEGL_NO_X11) - add_definitions(-DEGL_NO_PLATFORM_SPECIFIC_TYPES) - --set(CMAKE_CXX_STANDARD 20) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - - # required frameworks by Core -diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp -index 498d5cbe3..ac0f732b2 100644 ---- a/src/backends/x11/standalone/x11_standalone_platform.cpp -+++ b/src/backends/x11/standalone/x11_standalone_platform.cpp -@@ -54,8 +54,6 @@ - #include <QX11Info> - #endif - --#include <span> -- - namespace KWin - { - -@@ -407,7 +405,8 @@ void X11StandalonePlatform::invertScreen() - ScreenResources res((active_client && active_client->window() != XCB_WINDOW_NONE) ? active_client->window() : rootWindow()); - - if (!res.isNull()) { -- for (auto crtc : std::span(res.crtcs(), res->num_crtcs)) { -+ for (int j = 0; j < res->num_crtcs; ++j) { -+ auto crtc = res.crtcs()[j]; - CrtcGamma gamma(crtc); - if (gamma.isNull()) { - continue; -@@ -480,39 +479,54 @@ void X11StandalonePlatform::doUpdateOutputs() - if (Xcb::Extensions::self()->isRandrAvailable()) { - T resources(rootWindow()); - if (!resources.isNull()) { -+ xcb_randr_crtc_t *crtcs = resources.crtcs(); -+ const xcb_randr_mode_info_t *modes = resources.modes(); -+ -+ QVector<Xcb::RandR::CrtcInfo> infos(resources->num_crtcs); -+ for (int i = 0; i < resources->num_crtcs; ++i) { -+ infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp); -+ } - -- std::span crtcs(resources.crtcs(), resources->num_crtcs); -- for (auto crtc : crtcs) { -- Xcb::RandR::CrtcInfo info(crtc, resources->config_timestamp); -+ for (int i = 0; i < resources->num_crtcs; ++i) { -+ Xcb::RandR::CrtcInfo info(infos.at(i)); - - const QRect geometry = info.rect(); - if (!geometry.isValid()) { - continue; - } - -- float refreshRate = -1.0f; -+ xcb_randr_output_t *outputs = info.outputs(); -+ QVector<Xcb::RandR::OutputInfo> outputInfos(outputs ? resources->num_outputs : 0); -+ QVector<Xcb::RandR::OutputProperty> edids(outputs ? resources->num_outputs : 0); -+ if (outputs) { -+ for (int i = 0; i < resources->num_outputs; ++i) { -+ outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp); -+ edids[i] = Xcb::RandR::OutputProperty(outputs[i], atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); -+ } -+ } - -- for (auto mode : std::span(resources.modes(), resources->num_modes)) { -- if (info->mode == mode.id) { -- if (mode.htotal != 0 && mode.vtotal != 0) { // BUG 313996 -+ float refreshRate = -1.0f; -+ for (int j = 0; j < resources->num_modes; ++j) { -+ if (info->mode == modes[j].id) { -+ if (modes[j].htotal != 0 && modes[j].vtotal != 0) { // BUG 313996 - // refresh rate calculation - WTF was wikipedia 1998 when I needed it? -- int dotclock = mode.dot_clock, -- vtotal = mode.vtotal; -- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { -+ int dotclock = modes[j].dot_clock, -+ vtotal = modes[j].vtotal; -+ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { - dotclock *= 2; - } -- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { -+ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { - vtotal *= 2; - } -- refreshRate = dotclock / float(mode.htotal * vtotal); -+ refreshRate = dotclock / float(modes[j].htotal * vtotal); - } - break; // found mode - } - } - -- for (auto xcbOutput : std::span(info.outputs(), info->num_outputs)) { -- Xcb::RandR::OutputInfo outputInfo(xcbOutput, resources->config_timestamp); -- if (outputInfo->crtc != crtc) { -+ for (int j = 0; j < info->num_outputs; ++j) { -+ Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j)); -+ if (outputInfo->crtc != crtcs[i]) { - continue; - } - -@@ -528,14 +542,12 @@ void X11StandalonePlatform::doUpdateOutputs() - // TODO: Perhaps the output has to save the inherited gamma ramp and - // restore it during tear down. Currently neither standalone x11 nor - // drm platform do this. -- Xcb::RandR::CrtcGamma gamma(crtc); -+ Xcb::RandR::CrtcGamma gamma(crtcs[i]); - - output->setRenderLoop(m_renderLoop.get()); -- output->setCrtc(crtc); -+ output->setCrtc(crtcs[i]); - output->setGammaRampSize(gamma.isNull() ? 0 : gamma->size); -- auto it = std::find(crtcs.begin(), crtcs.end(), crtc); -- int crtcIndex = std::distance(crtcs.begin(), it); -- output->setXineramaNumber(crtcIndex); -+ output->setXineramaNumber(i); - - QSize physicalSize(outputInfo->mm_width, outputInfo->mm_height); - switch (info->rotation) { -@@ -556,10 +568,9 @@ void X11StandalonePlatform::doUpdateOutputs() - .physicalSize = physicalSize, - }; - -- auto edidProperty = Xcb::RandR::OutputProperty(xcbOutput, atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); - bool ok; -- if (auto data = edidProperty.toByteArray(&ok); ok && !data.isEmpty()) { -- if (auto edid = Edid(data, edidProperty.data()->num_items); edid.isValid()) { -+ if (auto data = edids[j].toByteArray(&ok); ok && !data.isEmpty()) { -+ if (auto edid = Edid(data, edids[j].data()->num_items); edid.isValid()) { - information.manufacturer = edid.manufacturerString(); - information.model = edid.monitorName(); - information.serialNumber = edid.serialNumber(); --- -2.37.2 - diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch index 50c7cef3f8cd1..d0be721b044c8 100644 --- a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch +++ b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -13,9 +13,9 @@ index efd236b..a69c046 100644 --- a/src/plugins/qpa/main.cpp +++ b/src/plugins/qpa/main.cpp @@ -23,7 +23,7 @@ public: + QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) { - Q_UNUSED(paramList) - if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { + if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { // Not KWin diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 8f69c965ea072..6269dd4d0c2a2 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -57,6 +57,7 @@ , plasma-framework , libqaccessibilityclient , python3 +, gcc12Stdenv }: # TODO (ttuegel): investigate qmlplugindump failure @@ -142,12 +143,15 @@ mkDerivation { url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; }) - ] ++ lib.optionals stdenv.isAarch64 [ - ./0001-Revert-x11-Refactor-output-updates.patch ]; + + stdenv = if stdenv.isAarch64 then gcc12Stdenv else stdenv; + CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' - ]; + ] + ++ lib.optional stdenv.isAarch64 "-mno-outline-atomics"; + postInstall = '' # Some package(s) refer to these service types by the wrong name. # I would prefer to patch those packages, but I cannot find them! diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch index 3d19f2d89fa16..948c045db4b17 100644 --- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch +++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch @@ -1,16 +1,20 @@ -Index: libkscreen-5.9.4/src/backendmanager.cpp -=================================================================== ---- libkscreen-5.9.4.orig/src/backendmanager.cpp -+++ libkscreen-5.9.4/src/backendmanager.cpp -@@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend) +diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp +index e1013d5..4bded53 100644 +--- a/src/backendmanager.cpp ++++ b/src/backendmanager.cpp +@@ -164,18 +164,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend) + QFileInfoList BackendManager::listBackends() { - // Compile a list of installed backends first +- // Compile a list of installed backends first - const QString backendFilter = QStringLiteral("KSC_*"); - const QStringList paths = QCoreApplication::libraryPaths(); - QFileInfoList finfos; - for (const QString &path : paths) { -- const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files); +- const QDir dir(path + QStringLiteral("/kf" QT_STRINGIFY(QT_VERSION_MAJOR) "/kscreen/"), +- backendFilter, +- QDir::SortFlags(QDir::QDir::Name), +- QDir::NoDotAndDotDot | QDir::Files); - finfos.append(dir.entryInfoList()); - } - return finfos; @@ -21,4 +25,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp + return dir.entryInfoList(); } - KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments) + void BackendManager::setBackendArgs(const QVariantMap &arguments) diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix index 3f169244fdaff..be1c6ff42eff8 100644 --- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix +++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix @@ -8,6 +8,7 @@ , kdeclarative , kcmutils , kpackage +, kscreenlocker , kwindowsystem , wayland , pkg-config @@ -29,6 +30,7 @@ mkDerivation { kdeclarative kcmutils kpackage + kscreenlocker kwindowsystem wayland libcec diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix index 8ab2d635b28d1..58fac85690d01 100644 --- a/pkgs/desktops/plasma-5/plasma-sdk.nix +++ b/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -11,6 +11,7 @@ , ki18n , kiconthemes , kio +, kitemmodels , plasma-framework , kservice , ktexteditor @@ -33,6 +34,7 @@ mkDerivation { ki18n kiconthemes kio + kitemmodels plasma-framework kservice ktexteditor diff --git a/pkgs/desktops/plasma-5/plasma-welcome.nix b/pkgs/desktops/plasma-5/plasma-welcome.nix new file mode 100644 index 0000000000000..1ae778b3282a9 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-welcome.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, extra-cmake-modules +, qtquickcontrols2 +, accounts-qt +, kaccounts-integration +, kcoreaddons +, kconfigwidgets +, kdbusaddons +, kdeclarative +, ki18n +, kio +, kirigami2 +, knewstuff +, knotifications +, kservice +, kuserfeedback +, kwindowsystem +, plasma-framework +, signond +}: + +mkDerivation { + pname = "plasma-welcome"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtquickcontrols2 + accounts-qt + kaccounts-integration + kcoreaddons + kconfigwidgets + kdbusaddons + kdeclarative + ki18n + kio + kirigami2 + knewstuff + knotifications + kservice + kuserfeedback + kwindowsystem + plasma-framework + signond + ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 252b6a9fac557..9d1fe45656e28 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -162,7 +162,7 @@ mkDerivation { ln -sf $out/bin/kcminit $out/bin/kcminit_startup ''; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"'' diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index cc0a02b6aabea..caa9494e7dbc2 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,467 +4,483 @@ { aura-browser = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/aura-browser-5.26.5.tar.xz"; - sha256 = "0dhj058vh577jyhcjdp6x9dmh6apxk6yinknfci8l6vss9gchini"; - name = "aura-browser-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/aura-browser-5.27.2.tar.xz"; + sha256 = "0ri1zv3xbd2wivnfi404zv8baf0h2a7wclmnbqjn0z5i898icmsr"; + name = "aura-browser-5.27.2.tar.xz"; }; }; bluedevil = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/bluedevil-5.26.5.tar.xz"; - sha256 = "069hsn40zbnpkd73zcnnkdjv7n30dqyls5yvg3m0ljphn1syi79y"; - name = "bluedevil-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/bluedevil-5.27.2.tar.xz"; + sha256 = "0v3nq4yiqiyh3crizv3nilriqxvhajm5hghhqdrgabw9a7svp001"; + name = "bluedevil-5.27.2.tar.xz"; }; }; breeze = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-5.26.5.tar.xz"; - sha256 = "00zzb03jan14byh19mga3jrzwi3rl084cgpnk0wj3gwgf903p78y"; - name = "breeze-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-5.27.2.tar.xz"; + sha256 = "1ajr8ljn5nias0smjr3wlqwisgb59qzmmkmm4yc5il21ib20lp8l"; + name = "breeze-5.27.2.tar.xz"; }; }; breeze-grub = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-grub-5.26.5.tar.xz"; - sha256 = "0ibjqv6hyqi4ljf5jhx5sv55li9jcvk5lydl0xrb54v8czbarg4w"; - name = "breeze-grub-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-grub-5.27.2.tar.xz"; + sha256 = "1fr84vylyvpba1z81sf6qj46ya7s853l7a2lflzrjrg41k84q7g4"; + name = "breeze-grub-5.27.2.tar.xz"; }; }; breeze-gtk = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-gtk-5.26.5.tar.xz"; - sha256 = "1k1kcrv6cbx9m0yxnqhdgwq0bd8qf8055acwjdphwjhl50icliqi"; - name = "breeze-gtk-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-gtk-5.27.2.tar.xz"; + sha256 = "00k5b2cmz9b5l0mabj47pjaw5wn13laga2z3m5p2dz4y6m8gm3f1"; + name = "breeze-gtk-5.27.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/breeze-plymouth-5.26.5.tar.xz"; - sha256 = "0skiii7ni6r6jp3a7nq10hd6qdria1481lml4l57ma9afgvpxi9v"; - name = "breeze-plymouth-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/breeze-plymouth-5.27.2.tar.xz"; + sha256 = "1zbkj0mjpzkgbkl47zbrg9cxfk68245jm5i5p3194sqbw9l104mx"; + name = "breeze-plymouth-5.27.2.tar.xz"; }; }; discover = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/discover-5.26.5.tar.xz"; - sha256 = "19fd4f7nvqznfkrivxh77si627kqjnm1g17lidl9alz2iy2bxfm6"; - name = "discover-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/discover-5.27.2.tar.xz"; + sha256 = "0bcnm1ccvwhhvcdz8a44canrzfjl03hkrqfjwrr89y0mxiws46rc"; + name = "discover-5.27.2.tar.xz"; }; }; drkonqi = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/drkonqi-5.26.5.tar.xz"; - sha256 = "1syl78sl7wzjdb53glln6laa017cawgz0c39p33bdwq3kpzckw07"; - name = "drkonqi-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/drkonqi-5.27.2.tar.xz"; + sha256 = "0fwjz7qxal0dixrh1wjb17vpr6jx8fki91xxbbdfnr8ykixfsx56"; + name = "drkonqi-5.27.2.tar.xz"; + }; + }; + flatpak-kcm = { + version = "5.27.2"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.27.2/flatpak-kcm-5.27.2.tar.xz"; + sha256 = "0rrw6v8vwgxj78v16wwa3d4gamymjvgpi27lmcqmf9588chnn8xf"; + name = "flatpak-kcm-5.27.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kactivitymanagerd-5.26.5.tar.xz"; - sha256 = "0ypnnh3lpcfw8ggi6nc8sr4hcsamx6s3ax869b6rhh392avcw2ha"; - name = "kactivitymanagerd-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kactivitymanagerd-5.27.2.tar.xz"; + sha256 = "1ni2yqk51qf23ck6j4kbli6pqhbnlix2w51la4af45ma8wr2gvix"; + name = "kactivitymanagerd-5.27.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/kde-cli-tools-5.27.2.tar.xz"; + sha256 = "189n92i79yxj6v2rwawg3grav4k5kdazh9fgnhijkwg2s6m7pdfm"; + name = "kde-cli-tools-5.27.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/kde-gtk-config-5.27.2.tar.xz"; + sha256 = "1m4qzv6haa9vq8z0m9v6i2y05syagazpg6inrgf6bvyrwh0zwbfa"; + name = "kde-gtk-config-5.27.2.tar.xz"; }; }; kdecoration = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kdecoration-5.26.5.tar.xz"; - sha256 = "1dzpqzi25wxmilj92lqjmd6wid3nlkbvnnpcpp0ywd860q30zzd2"; - name = "kdecoration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kdecoration-5.27.2.tar.xz"; + sha256 = "0xds1xx6jj6qy7jrl9wsnpcm1w4qd4im1bl21b9g1gmz7m53zvdm"; + name = "kdecoration-5.27.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kdeplasma-addons-5.26.5.tar.xz"; - sha256 = "17vrdnigif4v38gbh04p8qs7wqp3y3nqll1m7xc4qfqbq1dydyjq"; - name = "kdeplasma-addons-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kdeplasma-addons-5.27.2.tar.xz"; + sha256 = "1fr0fnw1k9jm55dhk22wxfxl4asyk7712gmyrmc8w93i1lnnwd19"; + name = "kdeplasma-addons-5.27.2.tar.xz"; }; }; kgamma5 = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kgamma5-5.26.5.tar.xz"; - sha256 = "0v4rpm2asv31w1rqrhn25kbcdl1acahg10lmh6iwisxl1i3x8hd8"; - name = "kgamma5-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kgamma5-5.27.2.tar.xz"; + sha256 = "03drd26nmy4q1vdw4kyzj6dvyfydzjybbzffyjdnnfc3yflhc32g"; + name = "kgamma5-5.27.2.tar.xz"; }; }; khotkeys = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/khotkeys-5.26.5.tar.xz"; - sha256 = "0lkmh5n76kmrdxm4snkk1zz7d927qkl69ajd5qhz277whpz3slw8"; - name = "khotkeys-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/khotkeys-5.27.2.tar.xz"; + sha256 = "02fv67x68dlxk9q80qpfkyjrd4bgwqhzi6c6jari5f24ajl2kfqp"; + name = "khotkeys-5.27.2.tar.xz"; }; }; kinfocenter = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kinfocenter-5.26.5.tar.xz"; - sha256 = "0rka2fm7r2zikv3lcd1q39swgcp6fs5l4f5ldpgwpk9bps96cy4x"; - name = "kinfocenter-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kinfocenter-5.27.2.tar.xz"; + sha256 = "1v10xfqcrj16ljasz8v0f0isjrc2brdmblfq6il4f4nckb23qmmw"; + name = "kinfocenter-5.27.2.tar.xz"; }; }; kmenuedit = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kmenuedit-5.26.5.tar.xz"; - sha256 = "17iyk77mb1lp9xjl92ffvv111b4m2qq98xznd1qafnah7ix1cg7p"; - name = "kmenuedit-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kmenuedit-5.27.2.tar.xz"; + sha256 = "1v6147x23rbp9nfmznbwf550ycml8zh6xa85vjj8gw7dma0zfx97"; + name = "kmenuedit-5.27.2.tar.xz"; }; }; kpipewire = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kpipewire-5.26.5.tar.xz"; - sha256 = "1yqymwq48mqv9zfw3idb0abizrfhr7f4d37ys9w7a9jixcm7rdrv"; - name = "kpipewire-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kpipewire-5.27.2.tar.xz"; + sha256 = "1w15w49ali3v8sf3ahcsbbaynd20an5jy5305diza0g5ivyz0xh9"; + name = "kpipewire-5.27.2.tar.xz"; }; }; kscreen = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kscreen-5.26.5.tar.xz"; - sha256 = "0w8yrzpgr23s7sr3296lrm2zbm2j2174zv5az41i44l907iq9y1x"; - name = "kscreen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kscreen-5.27.2.tar.xz"; + sha256 = "0xfj57xszxyrfpn2wq9sbmy6psxk81zirwz5x85sdlbzdz9cz28w"; + name = "kscreen-5.27.2.tar.xz"; }; }; kscreenlocker = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kscreenlocker-5.26.5.tar.xz"; - sha256 = "0lwn3xbbk1578974m3nkk2x5h9fadrcizvh4q4528s5wgxja6w2g"; - name = "kscreenlocker-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kscreenlocker-5.27.2.tar.xz"; + sha256 = "0683rr6jg6zf12h00hypwb2hsvbngfq3vpf08qms0lcl78r5c41s"; + name = "kscreenlocker-5.27.2.tar.xz"; }; }; ksshaskpass = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/ksshaskpass-5.26.5.tar.xz"; - sha256 = "0k0jxbkav115i5nhazxyz3s3wg6gyfcsa1jilf3j3fr8vnh8qhx0"; - name = "ksshaskpass-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/ksshaskpass-5.27.2.tar.xz"; + sha256 = "1ianh4zqdym9a8r2rzffryyn1bwv6v8fbcha5ac2qi57mdkhk5fr"; + name = "ksshaskpass-5.27.2.tar.xz"; }; }; ksystemstats = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/ksystemstats-5.26.5.tar.xz"; - sha256 = "18sa2w6vgbqmw8wrg5vqbraql04x9kb7mj9k35z4zs2n4abfrrbi"; - name = "ksystemstats-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/ksystemstats-5.27.2.tar.xz"; + sha256 = "1wm3xf4h3y7cz8gpmyz3nm6lrdz31v7hf7cah9hzsk6i8ahc8bpr"; + name = "ksystemstats-5.27.2.tar.xz"; }; }; kwallet-pam = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwallet-pam-5.26.5.tar.xz"; - sha256 = "1c5pzih8id0gld7qdf8ffxsbfgq9bsvpx37qyzr941b3vif7f9yx"; - name = "kwallet-pam-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwallet-pam-5.27.2.tar.xz"; + sha256 = "04krmcvkbpm8m0yx7gr1n53w0j9ifi1yl4p3b9z5ammkbrw7xrb8"; + name = "kwallet-pam-5.27.2.tar.xz"; }; }; kwayland-integration = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwayland-integration-5.26.5.tar.xz"; - sha256 = "0czq16lq210hq7a3wqg7pvdr9a8vm16z6yb82p0w6yqv15kk7alx"; - name = "kwayland-integration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwayland-integration-5.27.2.tar.xz"; + sha256 = "00qwrihgy2xxjpcshkhygvq15wyclsn4s9hl0m29y6d34j1m4awn"; + name = "kwayland-integration-5.27.2.tar.xz"; }; }; kwin = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwin-5.26.5.tar.xz"; - sha256 = "1n0v0553s9l8s6wgdz5bhrnvww20q49h92v3m4w216razj7q3q0k"; - name = "kwin-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwin-5.27.2.tar.xz"; + sha256 = "1xanx9yx0gzn75mkns5dpp65hlvijr85lxapac0rj8nw1hkfrcnh"; + name = "kwin-5.27.2.tar.xz"; }; }; kwrited = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/kwrited-5.26.5.tar.xz"; - sha256 = "14savlbywkx5107s0viprafs9pl389zhjk32iy4x5jmf9dk6vmm9"; - name = "kwrited-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/kwrited-5.27.2.tar.xz"; + sha256 = "12sb6g4dj5188iq7yv37js65999api8r60vcqcap3gjzsrxn1ilw"; + name = "kwrited-5.27.2.tar.xz"; }; }; layer-shell-qt = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/layer-shell-qt-5.27.2.tar.xz"; + sha256 = "1zq82q035wf9dfs8imk2dbkxczjihlm23gc6pbnkpn1c3g7q1a1s"; + name = "layer-shell-qt-5.27.2.tar.xz"; }; }; libkscreen = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/libkscreen-5.26.5.tar.xz"; - sha256 = "0vajgzjvpn909ds88jddsg7bman0rdphrm70b0k5ar7bcw0x54d5"; - name = "libkscreen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/libkscreen-5.27.2.tar.xz"; + sha256 = "1kr9nkxsa3a3d4pdwlv89rw9c8rqhh9wcr3ii4hh791179v82wkb"; + name = "libkscreen-5.27.2.tar.xz"; }; }; libksysguard = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/libksysguard-5.26.5.tar.xz"; - sha256 = "01a1wm6z191lzjqd5iws90jd3ld3r6r1qaw95bl65l9ar8p3gr8p"; - name = "libksysguard-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/libksysguard-5.27.2.tar.xz"; + sha256 = "01ksfg07a2q6f1jisfrfk3j4zvcvpspc8xakc9a14dpzkib7ifnn"; + name = "libksysguard-5.27.2.tar.xz"; }; }; milou = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/milou-5.26.5.tar.xz"; - sha256 = "1pmz4n41ysb0mhgykvc65r5as8fkd7wr4k57sk0a12wzsndy7zv8"; - name = "milou-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/milou-5.27.2.tar.xz"; + sha256 = "1qxsnqdxw3y3jpdnx1wz0q17ll3gwqq4jrx2sddz887yf8kmbhsk"; + name = "milou-5.27.2.tar.xz"; }; }; oxygen = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/oxygen-5.26.5.tar.xz"; - sha256 = "0wllhniaqpzvzji51a9871j1697kjwbz4xj8q9x1w89ip88pb6gq"; - name = "oxygen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/oxygen-5.27.2.tar.xz"; + sha256 = "0gz03yskna0sjf4mpzpgh8s8xy9vxk2rp3w5d2vwvq798yqj4i36"; + name = "oxygen-5.27.2.tar.xz"; }; }; oxygen-sounds = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/oxygen-sounds-5.26.5.tar.xz"; - sha256 = "1ws6bssn2r2m666kd6i0xnmzxb8x3z2pa6qk36xpbs1xjxdv5wny"; - name = "oxygen-sounds-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/oxygen-sounds-5.27.2.tar.xz"; + sha256 = "0v0rdcd08fhjbh5lhl7n77pady278lxb6sid4486ip050wzgmdhk"; + name = "oxygen-sounds-5.27.2.tar.xz"; }; }; plank-player = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plank-player-5.26.5.tar.xz"; - sha256 = "18yw74mqcd0igps10m1sd41rlir2y8y78xkljxj5w2y4yvh97vbs"; - name = "plank-player-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plank-player-5.27.2.tar.xz"; + sha256 = "1zksd833sm4khjm7qaaxf2zlg1lscf2mdcqqcgxa590kb6cdk4g7"; + name = "plank-player-5.27.2.tar.xz"; }; }; plasma-bigscreen = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-bigscreen-5.26.5.tar.xz"; - sha256 = "0893ngwdgq1l76gib4p9212lwp4i2gxvpnmxygndbmkz7nhjax75"; - name = "plasma-bigscreen-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-bigscreen-5.27.2.tar.xz"; + sha256 = "1ap6w8s8lzsk4qlkjbig5vaq2kkghg4jc4rmmrmh55qb5805d29j"; + name = "plasma-bigscreen-5.27.2.tar.xz"; }; }; plasma-browser-integration = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/plasma-browser-integration-5.27.2.tar.xz"; + sha256 = "0cj46jsd8piy773qdamhpihywdl9qk2qpiigyyhbnsbwxcvl4fbw"; + name = "plasma-browser-integration-5.27.2.tar.xz"; }; }; plasma-desktop = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-desktop-5.26.5.tar.xz"; - sha256 = "15kc5sam3y2c1ccp14cs7v5zakgzz9gpxpyxapimlvkwscxmvzn6"; - name = "plasma-desktop-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-desktop-5.27.2.tar.xz"; + sha256 = "0dsic9had0nihw5k8a6vw5svdxsysa2kphk295kirf6k9qm2k2v5"; + name = "plasma-desktop-5.27.2.tar.xz"; }; }; plasma-disks = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-disks-5.26.5.tar.xz"; - sha256 = "137k44lly2qv6vrmfi4g2xqc7y907ywwshp7mn07qmbps3a85h30"; - name = "plasma-disks-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-disks-5.27.2.tar.xz"; + sha256 = "0mapi9bclsnn6mv3gl5c87jxygm3pr3cc6ksvkpwqah46c76mmi3"; + name = "plasma-disks-5.27.2.tar.xz"; }; }; plasma-firewall = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-firewall-5.26.5.tar.xz"; - sha256 = "18fp7iqnyjx2p44n8hjs7fss212ja3k2i5cryrnmwpf7r0q73l36"; - name = "plasma-firewall-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-firewall-5.27.2.tar.xz"; + sha256 = "0vi64wkc9vxrfc2h1m4f8q8sqc2wl6s610ajs12r0sf8c4297fv1"; + name = "plasma-firewall-5.27.2.tar.xz"; }; }; plasma-integration = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-integration-5.26.5.tar.xz"; - sha256 = "0ap7rzhqmm7ai9sc6w281f2kf81qgs2h2qpf5bvbc6wm3vn1lm1g"; - name = "plasma-integration-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-integration-5.27.2.tar.xz"; + sha256 = "1220f4f2ykmrrxngmlc8xdjip63fidlhh42vslgy9bll6ag0qkys"; + name = "plasma-integration-5.27.2.tar.xz"; }; }; plasma-mobile = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-mobile-5.26.5.tar.xz"; - sha256 = "06gha8mga9xqmmvzc9why9pfzzpy8czrqym3k3n23pa9hy2qqsvj"; - name = "plasma-mobile-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-mobile-5.27.2.tar.xz"; + sha256 = "0v0cli1fyhzv80vhav4nablss0p9mzflll48f6lvx2sdqpiypcgq"; + name = "plasma-mobile-5.27.2.tar.xz"; }; }; plasma-nano = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-nano-5.26.5.tar.xz"; - sha256 = "161sabckgl8gjxxsm0aklp33bf05iq2p84vh2v5y6bfpimsnamnj"; - name = "plasma-nano-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-nano-5.27.2.tar.xz"; + sha256 = "1lk7pg2j6fkvys849qfvd0crxkalrvmvqxl6ifw12d7kvdmz91nx"; + name = "plasma-nano-5.27.2.tar.xz"; }; }; plasma-nm = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-nm-5.26.5.tar.xz"; - sha256 = "1msi9lhkhpb29h6fwkxqmp9js70r8vrvzzf38hzkgxcbf3757k64"; - name = "plasma-nm-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-nm-5.27.2.tar.xz"; + sha256 = "15lh7nxryvv66hbf43bwarfw38jzr6405waf1z8dsvn5wckp093v"; + name = "plasma-nm-5.27.2.tar.xz"; }; }; plasma-pa = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-pa-5.26.5.tar.xz"; - sha256 = "19i9ipajiz68silvprap9pykki6rhb7d2ways501bx8g4vfcb0h5"; - name = "plasma-pa-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-pa-5.27.2.tar.xz"; + sha256 = "0imwyv0w6xkbcyafhqsg4h3w56sclfaxnjfjkjbzn1hgmizx7n7k"; + name = "plasma-pa-5.27.2.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-remotecontrollers-5.26.5.tar.xz"; - sha256 = "1cam1jchp3nwqkqskln4qbpb4rixzwa0bwma89ysdgqy0pzpq2x0"; - name = "plasma-remotecontrollers-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-remotecontrollers-5.27.2.tar.xz"; + sha256 = "1ash4z6fi0kzdysnnlbh7vxpdwbfi0xyyyg845pmvhwhv6i82c7y"; + name = "plasma-remotecontrollers-5.27.2.tar.xz"; }; }; plasma-sdk = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-sdk-5.26.5.tar.xz"; - sha256 = "0p20s2cp5vd1chj28wq88ixb625hisl134hnlllz6h70s5vzy79n"; - name = "plasma-sdk-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-sdk-5.27.2.tar.xz"; + sha256 = "1p68hfa884jym5mb22lrssxg5xwdnwsichdvmmqfy50szsv2n7mf"; + name = "plasma-sdk-5.27.2.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-systemmonitor-5.26.5.tar.xz"; - sha256 = "0xghszlm8h70p192qizv2kj7f02fnf3p3hg1p10ni7sqfaczrbq1"; - name = "plasma-systemmonitor-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-systemmonitor-5.27.2.tar.xz"; + sha256 = "1kl9xjfkwy36nzva1hkq5pabczl174w29lxkzhim3q8laap6dql6"; + name = "plasma-systemmonitor-5.27.2.tar.xz"; }; }; plasma-tests = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-tests-5.26.5.tar.xz"; - sha256 = "1h0cinrgjdp7rhl3v55c40a5agd93rqwx1xjqyj06vkjkbigx0fr"; - name = "plasma-tests-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-tests-5.27.2.tar.xz"; + sha256 = "0q5qb4c1lbd7jpww382h86h74llvpm1zdnjb8a66x1nfnnws7db3"; + name = "plasma-tests-5.27.2.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-thunderbolt-5.26.5.tar.xz"; - sha256 = "1lzj3m2k34m3fvcq3ykr5igaq0sbc4v87cncxvz6ln0p7cq0i6y5"; - name = "plasma-thunderbolt-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-thunderbolt-5.27.2.tar.xz"; + sha256 = "0aml4xx3bdnyx367lz3crnd21f08w239ps77wy41a0pdp47i5nfd"; + name = "plasma-thunderbolt-5.27.2.tar.xz"; }; }; plasma-vault = { - version = "5.26.5"; + version = "5.27.2"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.27.2/plasma-vault-5.27.2.tar.xz"; + sha256 = "0hqxjmm236bivvlhivrzcypsa0kki4pc44l46jzvm5a0dsljv827"; + name = "plasma-vault-5.27.2.tar.xz"; + }; + }; + plasma-welcome = { + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-vault-5.26.5.tar.xz"; - sha256 = "104cs6prb8v5mccshz5brknfllyfbfnjzzpdrgk1xpzh5apwmhja"; - name = "plasma-vault-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-welcome-5.27.2.tar.xz"; + sha256 = "06g8hnqnja2g17cx3vwx21zlrywmhiqb6zk0d72c02avr67px3gn"; + name = "plasma-welcome-5.27.2.tar.xz"; }; }; plasma-workspace = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plasma-workspace-5.26.5.tar.xz"; - sha256 = "082jnlqgbp48bmyp1nbzg2d0p0pxkvra6xjv40kvh6k6rmpr5cjc"; - name = "plasma-workspace-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plasma-workspace-5.27.2.tar.xz"; + sha256 = "19hlbp2ihblw5ynk44lasfgr4nk5z2mqm3gza5zvf08zpzwc437i"; + name = "plasma-workspace-5.27.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/plasma-workspace-wallpapers-5.27.2.tar.xz"; + sha256 = "1x4mxs6b90z0rz3lacxr20ii8ihjq3z36vi2y9rllhcdzvpcbzy6"; + name = "plasma-workspace-wallpapers-5.27.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/plymouth-kcm-5.26.5.tar.xz"; - sha256 = "1isxs6gxbab2ddl22c3992gmdgy3mi5yjb9inv32ajzs6r7snrj1"; - name = "plymouth-kcm-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/plymouth-kcm-5.27.2.tar.xz"; + sha256 = "1nkxz8jmqwm8js16j9pcbbhjns7vhs98k70lsj0mc7mgh3y5bdf6"; + name = "plymouth-kcm-5.27.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.26.5"; + version = "1-5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/polkit-kde-agent-1-5.27.2.tar.xz"; + sha256 = "0pz7dnrh10lzxlxnfsg06k012wb3qlqgvn0wwv7xb76yis75jmi4"; + name = "polkit-kde-agent-1-5.27.2.tar.xz"; }; }; powerdevil = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/powerdevil-5.26.5.tar.xz"; - sha256 = "063bqwdnpskcwqzpgcmjwgs9vpkn1gnq2nnzj2sdzrlflfrdsfvp"; - name = "powerdevil-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/powerdevil-5.27.2.tar.xz"; + sha256 = "1awrfwki1ldmvwamdss4vkb5mlclw58zijpg6ip732ripiawhx1x"; + name = "powerdevil-5.27.2.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/qqc2-breeze-style-5.27.2.tar.xz"; + sha256 = "0j2dy64sr0giagyi3yw9c40lnjmn1wsdi5vmj6cakvglhklnwl5w"; + name = "qqc2-breeze-style-5.27.2.tar.xz"; }; }; sddm-kcm = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/sddm-kcm-5.26.5.tar.xz"; - sha256 = "0cglb7dvwrkdpl5bgg91yfxrvqfpc2szj3qipcmd6ladsvbz8cxv"; - name = "sddm-kcm-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/sddm-kcm-5.27.2.tar.xz"; + sha256 = "1lnciz566iz7alpz51j27cvdpkxnv88v5nnfjlql80d8a74gq3vs"; + name = "sddm-kcm-5.27.2.tar.xz"; }; }; systemsettings = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.26.5/systemsettings-5.26.5.tar.xz"; - sha256 = "1jb1d6933gq07vgg3kzqna91cpcv87p38wrk70g17iz7pszjb3ns"; - name = "systemsettings-5.26.5.tar.xz"; + url = "${mirror}/stable/plasma/5.27.2/systemsettings-5.27.2.tar.xz"; + sha256 = "1qdj18plsi4l3z4hlm4c41gz3xmv9rkishs9a45kib2avd0sxvnd"; + name = "systemsettings-5.27.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.26.5"; + version = "5.27.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/plasma/5.27.2/xdg-desktop-portal-kde-5.27.2.tar.xz"; + sha256 = "05rjm8h375bmmsslpm6nl1m7zsd8f7n3vm15nq4771hnlv8dml4p"; + name = "xdg-desktop-portal-kde-5.27.2.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 94d8f92ac4f94..1c438df1b82f3 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/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index e26c90592252f..b05be287a89d4 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; - NIX_LDFLAGS = "-ldl -lm"; + NIX_LDFLAGS = "-lm"; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index abbdfd6e498d8..10a75af99a3f5 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -24,7 +24,7 @@ mkXfceDerivation { xfconf ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = with lib; { description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 2d3d9c5d4e011..b579e070076d0 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -26,7 +26,7 @@ mkXfceDerivation { xfconf ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; configureFlags = [ "--enable-dbus-start-daemon" diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 9bbc524eab0f4..4eb6786ffddc1 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, libxfce4ui, xfconf, libwnck, libXmu }: +{ lib +, mkXfceDerivation +, exo +, gtk3 +, libxfce4ui +, xfconf +, libwnck +, libXmu +}: mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; version = "1.5.5"; + odd-unstable = false; sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA="; - nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 libxfce4ui xfconf 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 99c8741851fa0..74b9e8797db94 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -11,7 +11,7 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; - NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; + env.NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index bb8a846c50095..e5d34969d4c81 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -23,7 +23,7 @@ mkXfceDerivation { ]; # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = with lib; { description = "Application library for Xfce"; diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index a2bdee37eb695..efc917ab1f282 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.18.0"; + version = "4.18.1"; - sha256 = "sha256-m4O/vTFqzkF6rzyGVw8xdwcX7S/SyOSJo8aCZjniXAw="; + sha256 = "sha256-nqASXyHR7wNiNPorlz2ix+Otyir6I9KCCr1vfS6GO8E="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index c64a696031865..f4dfebb422f79 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.18.1"; + version = "4.18.3"; - sha256 = "sha256-n624TZGygFrOjkQ9fUVJUetRV8JDXYSg89tOHm4Va+M="; + sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index d76523a94c3cd..155e3124207cf 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.18.0"; + version = "4.18.1"; - sha256 = "sha256-CnZk0Ca3IG6nmiwe7eIvPqpzJgRZHIyqeoTA5cPpU7s="; + 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-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index f8dc8b92da302..ab30dc49c5f5e 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -12,7 +12,7 @@ mkXfceDerivation { configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ]; # See https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 7d67741657992..ed36d2b92b737 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.18.0"; + version = "4.18.1"; - sha256 = "sha256-HZVu5UVLKDCWaUpw1SV8E0JLGRG946w4QLlA51rg/Bo="; + sha256 = "sha256-33G7X5kA3MCNJ9Aq9ZCafP0Qm/46iUmLFB8clhKwDz8="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 6ac1199314242..5dc21338a72cb 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -25,7 +25,9 @@ makeScopeWithSplicing mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; + automakeAddFlags = pkgs.makeSetupHook { + name = "xfce-automake-add-flags-hook"; + } ./automakeAddFlags.sh; #### CORE 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 5202f7f54c245..eaf090c348cff 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-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 0dc3d3a81aa60..a1027c752ddd3 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 5c04ca4a50ffa..475fe4564eee9 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -133,7 +133,8 @@ rec { # 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 -z,muldefs" >> $out/nix-support/cc-ldflags - echo 'if [[ ! " $@ " =~ " -shared " ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh + echo 'expandResponseParams "$@"' >> $out/nix-support/add-flags.sh + echo 'if [[ ! (" ''${params[@]} " =~ " -shared ") && ! (" ''${params[@]} " =~ " -no-pie ") ]]; 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 # https://android.googlesource.com/platform/external/android-cmake/+/refs/heads/cmake-master-dev/android.toolchain.cmake diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index d1afa55387d3a..eb70517c82ec8 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 1ebe3760ec8d4..b5d20fa97783a 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 6b6ef7ce35014..081d4988bace0 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 0dfd68f0993c3..43d613d072ee1 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 86f7d94eed1bd..23982fb2a789d 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -43,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/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 34f3edd94337c..fdd4548c663fa 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, erlang }: let - version = "0.46.1"; + version = "0.46.2"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -24,7 +24,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-UiXnamLl6Brp+XOsoldeahNxJ9OKEUgSs1WLRmB9yL8="; + sha256 = "sha256-J0Qa8s8v/KT4/Jaj9JYsfvzviMUx8FnX0nMoeH8bkB8="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/beam-modules/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix index 9c2ed1ea22b64..2d1fa623745af 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; @@ -21,9 +19,18 @@ stdenv.mkDerivation ({ }; unpackCmd = '' - tar -xf $curSrc contents.tar.gz + tar -xf $curSrc contents.tar.gz CHECKSUM metadata.config mkdir contents tar -C contents -xzf contents.tar.gz + mv metadata.config contents/hex_metadata.config + + # To make the extracted hex tarballs appear legitimate to mix, we need to + # make sure they contain not just the contents of contents.tar.gz but also + # a .hex file with some lock metadata. + # We use an old version of .hex file per hex's mix_task_test.exs since it + # is just plain-text instead of an encoded format. + # See: https://github.com/hexpm/hex/blob/main/test/hex/mix_task_test.exs#L410 + echo -n "${pkg},${version},$(cat CHECKSUM | tr '[:upper:]' '[:lower:]'),hexpm" > contents/.hex ''; installPhase = '' diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index ac6d5f3c8b92b..6d047dbe1ca59 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (attrs // { installPhase = attrs.installPhase or '' runHook preInstall - mix deps.get --only ${mixEnv} + mix deps.get ''${MIX_ENV:+--only $MIX_ENV} find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} + cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out runHook postInstall diff --git a/pkgs/development/beam-modules/fetch-rebar-deps.nix b/pkgs/development/beam-modules/fetch-rebar-deps.nix index eee8f3729bd44..b253e16761ba0 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/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 59771c340295c..b884809505f33 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/alan/2.nix b/pkgs/development/compilers/alan/2.nix index 7329a0115d845..a80b6ab35cb0a 100644 --- a/pkgs/development/compilers/alan/2.nix +++ b/pkgs/development/compilers/alan/2.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Add a workarounf for -fno-common tollchains like upstream gcc-10. # alan-3 is already fixed, but the backport is nontrivial. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' mkdir -p $out/bin $out/share/alan2 diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 9c7e8e3d0ac46..639ca81227624 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "aspectj"; - version = "1.9.9.1"; + version = "1.9.19"; builder = ./builder.sh; src = let versionSnakeCase = builtins.replaceStrings ["."] ["_"] version; in fetchurl { url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - sha256 = "sha256-kiMQuEPXoSpHUiInkfYsrfCAcSc6mX42TRIBbeIQhWs="; + sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M="; }; inherit jre; diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix index 3fe0e0b2eede5..206a3aff61cbf 100644 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/pkgs/development/compilers/bs-platform/ocaml.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # ld: libcamlrun.a(minor_gc.o):/build/ocaml/byterun/caml/major_gc.h:67: multiple definition of # `caml_major_ring'; libcamlrun.a(stacks.o):/build/ocaml/byterun/caml/major_gc.h:67: first defined here # Match -fcommon workaround in ocaml-4.06 itself. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildPhase = '' make -j9 world.opt diff --git a/pkgs/development/compilers/chez-racket/default.nix b/pkgs/development/compilers/chez-racket/default.nix index fa32934243c6d..158dfa0529334 100644 --- a/pkgs/development/compilers/chez-racket/default.nix +++ b/pkgs/development/compilers/chez-racket/default.nix @@ -1,16 +1,23 @@ { stdenv, buildPackages, callPackage }: let - chezSystemMap = { - # See `/workarea` of source code for list of systems - "aarch64-darwin" = "tarm64osx"; - "aarch64-linux" = "tarm64le"; - "armv7l-linux" = "tarm32le"; - "x86_64-darwin" = "ta6osx"; - "x86_64-linux" = "ta6le"; - }; + chezArch = + /**/ if stdenv.hostPlatform.isAarch then "arm${toString stdenv.hostPlatform.parsed.cpu.bits}" + else if stdenv.hostPlatform.isx86_32 then "i3" + else if stdenv.hostPlatform.isx86_64 then "a6" + else if stdenv.hostPlatform.isPower then "ppc${toString stdenv.hostPlatform.parsed.cpu.bits}" + else throw "Add ${stdenv.hostPlatform.parsed.cpu.arch} to chezArch to enable building chez-racket"; + + chezOs = + /**/ if stdenv.hostPlatform.isDarwin then "osx" + else if stdenv.hostPlatform.isFreeBSD then "fb" + else if stdenv.hostPlatform.isLinux then "le" + else if stdenv.hostPlatform.isNetBSD then "nb" + else if stdenv.hostPlatform.isOpenBSD then "ob" + else throw "Add ${stdenv.hostPlatform.uname.system} to chezOs to enable building chez-racket"; + inherit (stdenv.hostPlatform) system; - chezSystem = chezSystemMap.${system} or (throw "Add ${system} to chezSystemMap to enable building chez-racket"); + chezSystem = "t${chezArch}${chezOs}"; # Chez Scheme uses an ad-hoc `configure`, hence we don't use the usual # stdenv abstractions. forBoot = { diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/development/compilers/chez-racket/shared.nix index f5a9bbc1e5b4b..46f53204309b2 100644 --- a/pkgs/development/compilers/chez-racket/shared.nix +++ b/pkgs/development/compilers/chez-racket/shared.nix @@ -24,12 +24,11 @@ stdenv.mkDerivation (args // { ''; nativeBuildInputs = lib.optionals stdenv.isDarwin (with darwin; [ cctools autoSignDarwinBinariesHook ]); - buildInputs = [ ncurses libX11 zlib lz4 ] - ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; meta = { description = "Fork of Chez Scheme for Racket"; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 67fa1efd2a678..e14e01d44ee68 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; /* ** We patch out a very annoying 'feature' in ./configure, which diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 5f41a36263a9c..cb56eabc5d781 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,10 +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/fetchegg/builder.sh b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh index f02e017577873..34c9de37233d3 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh @@ -1,11 +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/circt/default.nix b/pkgs/development/compilers/circt/default.nix new file mode 100644 index 0000000000000..7bf6a64eeb84c --- /dev/null +++ b/pkgs/development/compilers/circt/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, cmake +, coreutils +, python3 +, git +, fetchFromGitHub +, ninja +}: + +let + pythonEnv = python3.withPackages (ps: [ ps.psutil ]); +in +stdenv.mkDerivation rec { + pname = "circt"; + version = "1.30.0"; + src = fetchFromGitHub { + owner = "llvm"; + repo = "circt"; + rev = "firtool-${version}"; + sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8="; + fetchSubmodules = true; + }; + + requiredSystemFeatures = [ "big-parallel" ]; + + nativeBuildInputs = [ cmake ninja git pythonEnv ]; + + cmakeDir = "../llvm/llvm"; + cmakeFlags = [ + "-DLLVM_ENABLE_BINDINGS=OFF" + "-DLLVM_ENABLE_OCAMLDOC=OFF" + "-DLLVM_BUILD_EXAMPLES=OFF" + "-DLLVM_OPTIMIZED_TABLEGEN=ON" + "-DLLVM_ENABLE_PROJECTS=mlir" + "-DLLVM_EXTERNAL_PROJECTS=circt" + "-DLLVM_EXTERNAL_CIRCT_SOURCE_DIR=.." + "-DCIRCT_LLHD_SIM_ENABLED=OFF" + ]; + + # There are some tests depending on `clang-tools` to work. They are activated only when detected + # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these + # tests work. Because + # + # 1. The absolute paths of binaries used in tests are resolved in configure phase. + # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, + # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in + # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. + # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. + # + # As a temporary fix, we disabled these tests when using clang stdenv + # cannot use lib.optionalString as it creates an empty string, disabling all tests + LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null; + + preConfigure = '' + substituteInPlace test/circt-reduce/test/annotation-remover.mlir --replace "/usr/bin/env" "${coreutils}/bin/env" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv bin/{{fir,hls}tool,circt-{as,dis,lsp-server,opt,reduce,translate}} $out/bin + runHook postInstall + ''; + + doCheck = true; + checkTarget = "check-circt check-circt-integration"; + + meta = { + description = "Circuit IR compilers and tools"; + homepage = "https://circt.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sharzy ]; + platforms = lib.platforms.all; + }; +} + diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 96c36bad6f7b7..173cd93f34d5e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -269,8 +269,8 @@ rec { }; crystal_1_7 = generic { - version = "1.7.1"; - sha256 = "sha256-PaeqqY+rSxntzz+30mJnjxzj2Xgu/BNkolw3Y30aZgk="; + version = "1.7.2"; + sha256 = "sha256-Bwd9Gmtwa/0oLhps3fc8GqBlB4o31LCR1Sf98Pz4i90="; binary = binaryCrystal_1_2; }; diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index a98e188271cb5..e986ae2dc14da 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -229,6 +229,13 @@ stdenv.mkDerivation rec { addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/* addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/x86/* addOpenGLRunpath $out/target-linux-x64/* + '' + + # Prune broken symlinks which can cause problems with consumers of this package. + '' + while read -r -d "" file; do + echo "Found and removing broken symlink $file" + rm "$file" + done < <(find "$out" "$lib" "$doc" -xtype l -print0) ''; # cuda-gdb doesn't run correctly when not using sandboxing, so diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 24f653ded29be..8e1e54723b2e4 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -2,7 +2,18 @@ , lib , cudatoolkit }: + +# Type aliases +# Gpu = { +# archName: String, # e.g., "Hopper" +# computeCapability: String, # e.g., "9.0" +# minCudaVersion: String, # e.g., "11.8" +# maxCudaVersion: String, # e.g., "12.0" +# } + let + inherit (lib) attrsets lists strings trivial versions; + cudaVersion = cudatoolkit.version; # Flags are determined based on your CUDA toolkit by default. You may benefit # from improved performance, reduced file size, or greater hardware suppport by @@ -13,66 +24,116 @@ let # # 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; + # gpus :: List Gpu + gpus = builtins.import ./gpus.nix; + + # isVersionIn :: Gpu -> Bool + isSupported = gpu: + let + inherit (gpu) minCudaVersion maxCudaVersion; + lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; + upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion); + in + lowerBoundSatisfied && upperBoundSatisfied; + + # supportedGpus :: List Gpu + # GPUs which are supported by the provided CUDA version. + supportedGpus = builtins.filter isSupported gpus; + + # cudaArchNameToVersions :: AttrSet String (List String) + # Maps the name of a GPU architecture to different versions of that architecture. + # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. + cudaArchNameToVersions = + lists.groupBy' + (versions: gpu: versions ++ [ gpu.computeCapability ]) + [ ] + (gpu: gpu.archName) + supportedGpus; + + # cudaArchNames :: List String + # NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here; + # otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them + # from is already sorted, so we'll preserve that order here. + cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus); + + # cudaComputeCapabilityToName :: AttrSet String String + # Maps the version of a GPU architecture to the name of that architecture. + # For example, "8.0" maps to "Ampere". + cudaComputeCapabilityToName = builtins.listToAttrs ( + lists.map + (gpu: { + name = gpu.computeCapability; + value = gpu.archName; + }) + supportedGpus + ); + + # cudaComputeCapabilities :: List String + # NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here; + # otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them + # from is already sorted, so we'll preserve that order here. + # Use the user-provided list of CUDA capabilities if it's provided. + cudaComputeCapabilities = config.cudaCapabilities + or (lists.map (gpu: gpu.computeCapability) supportedGpus); + + # cudaForwardComputeCapability :: String + cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX"; + + # cudaComputeCapabilitiesAndForward :: List String + # The list of supported CUDA architectures, including the forward compatibility architecture. + # If forward compatibility is disabled, this will be the same as cudaComputeCapabilities. + cudaComputeCapabilitiesAndForward = cudaComputeCapabilities + ++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability; + + # dropDot :: String -> String + dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver; + + # archMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of architectures. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ]. + archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}"); + + # gencodeMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of gencode arguments. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80" + # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ]. + gencodeMapper = feat: lists.map ( + computeCapability: + "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" + ); + + # cudaRealArches :: List String + # The real architectures are physical architectures supported by the CUDA version. + # For example, "sm_80". + cudaRealArches = archMapper "sm" cudaComputeCapabilities; + + # cudaVirtualArches :: List String + # The virtual architectures are typically used for forward compatibility, when trying to support + # an architecture newer than the CUDA version allows. + # For example, "compute_80". + cudaVirtualArches = archMapper "compute" cudaComputeCapabilities; + + # cudaArches :: List String + # By default, build for all supported architectures and forward compatibility via a virtual + # architecture for the newest supported architecture. + cudaArches = cudaRealArches ++ + lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches); + + # cudaGencode :: List String + # A list of CUDA gencode arguments to pass to NVCC. + cudaGencode = + let + base = gencodeMapper "sm" cudaComputeCapabilities; + forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ]; + in + base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat; in { - inherit cudaArchs cudaArchNames cudaCapabilities cudaCapabilitiesCommaString cudaCapabilitiesSemiColonString - cudaRealCapabilities cudaRealCapabilitiesCommaString cudaGencode cudaRealArchs cudaPTXArchs; + inherit + cudaArchNames + cudaArchNameToVersions cudaComputeCapabilityToName + cudaRealArches cudaVirtualArches cudaArches + cudaGencode; + cudaCapabilities = cudaComputeCapabilitiesAndForward; } diff --git a/pkgs/development/compilers/cudatoolkit/gpus.nix b/pkgs/development/compilers/cudatoolkit/gpus.nix new file mode 100644 index 0000000000000..e938e91297478 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/gpus.nix @@ -0,0 +1,110 @@ +[ + { + archName = "Kepler"; + computeCapability = "3.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.5"; + minCudaVersion = "10.0"; + maxCudaVersion = "11.8"; + } + { + archName = "Kepler"; + computeCapability = "3.7"; + minCudaVersion = "10.0"; + maxCudaVersion = "11.8"; + } + { + archName = "Maxwell"; + computeCapability = "5.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Maxwell"; + computeCapability = "5.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Maxwell"; + computeCapability = "5.3"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.1"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Volta"; + computeCapability = "7.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Volta"; + computeCapability = "7.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Turing"; + computeCapability = "7.5"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.0"; + minCudaVersion = "11.2"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.6"; + minCudaVersion = "11.2"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.7"; + minCudaVersion = "11.5"; + maxCudaVersion = "12.0"; + } + { + archName = "Ada"; + computeCapability = "8.9"; + minCudaVersion = "11.8"; + maxCudaVersion = "12.0"; + } + { + archName = "Hopper"; + computeCapability = "9.0"; + minCudaVersion = "11.8"; + maxCudaVersion = "12.0"; + } +] diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 962663f08bcb9..d10c68236b32e 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -13,7 +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; + "12.0" = ./manifests/redistrib_12.0.1.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 deleted file mode 100644 index ca99487e6722f..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.0.json +++ /dev/null @@ -1,1127 +0,0 @@ -{ - "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/redist/manifests/redistrib_12.0.1.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.1.json new file mode 100644 index 0000000000000..77bd44962abfc --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.1.json @@ -0,0 +1,1128 @@ +{ + "release_date": "2023-01-31", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "99ab5e0f671490141e0f41724f271dbfad75fb1105532f0726523d4fdcf12783", + "md5": "b77b8d051671afd1d6f994c67ef3baeb", + "size": "1031260" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "12a24d11fe5d77e57adbd9db5a596224a17d6bcee3df7f51a65a3fb01c191028", + "md5": "5b5be14567397d68e3d90b86b3ba2f94", + "size": "1031500" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "8ac9fa2cbaf2ead8c7794b787eea98a7ee94ecf44f99d564e1a4ae349f08a153", + "md5": "0799dc5f7591ceb6b7f10e54366c5884", + "size": "1030984" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.0.140-archive.zip", + "sha256": "4a660ecc7d6651f797279cb5aeeaef90defc33469b2015ef2a15375c7c56aeec", + "md5": "94df119ff7099e090e335913869abbdb", + "size": "2610906" + }, + "linux-aarch64": { + "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "c5333a62613f990396496988c4b6021ffdeea2d633bdd980e7a038cc2db0db79", + "md5": "1e969e1e7cd53b8e4d64ee093517a23a", + "size": "1031408" + } + }, + "cuda_compat": { + "name": "CUDA compat L4T", + "license": "CUDA Toolkit", + "version": "12.0.32271208", + "linux-aarch64": { + "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.0.32271208-archive.tar.xz", + "sha256": "343819e63007e307947f2d4ce981a36693bd0266e99516cc0c91b24897e25938", + "md5": "ab3e1ac6c9a31912df5620d94ed44ae6", + "size": "16078292" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "version": "12.0.146", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.0.146-archive.tar.xz", + "sha256": "af047b03ea261db8413fe61cd9c5d480e784b41f286d1cd31925eddaf8b2e84c", + "md5": "7b4b29816f73a489cf99b35cd1bc6d1f", + "size": "976768" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.0.146-archive.tar.xz", + "sha256": "21db5f223ba9d6f0c873b81068e6ca9d1dede310ab43d2f200820530aa41ef9b", + "md5": "74f380e1b605220c08140d1a09b94761", + "size": "968140" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.0.146-archive.tar.xz", + "sha256": "33b14bd774b0bec908d4758bfb30fcf2020cd0c93ad899376f438113de3df519", + "md5": "837b6e6688b50b85085862b95fb1e5e5", + "size": "969116" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.0.146-archive.zip", + "sha256": "f40f5ab0d3a566f30d865903f76b504a168a58adc11cf16e0c53f1c2cea4a588", + "md5": "bbc51b42e2afb43e20719fd93b9ec4e8", + "size": "2362874" + }, + "linux-aarch64": { + "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.0.146-archive.tar.xz", + "sha256": "cb333a5ef5da06aa88823501c3269dbde7b3b2aa53b3cf9d76c7ebad9d53a532", + "md5": "672231dc9e9f9fb59d86267d58b831c6", + "size": "977400" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "6f032c74da29c8a4738e30e69f42111f754dc7ffde2aa0417cfb3b3813aef0a1", + "md5": "b22f9840396ae7a033e90a6d84358a89", + "size": "166916" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "c1c8361fcbec46156df7fb764a7a8b213f06ec0ae926e98316bc4ec63ce3a68e", + "md5": "28894e39e6fa6e5994684a85f557226e", + "size": "206572" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "899dde9d02095a6802c81021480dd093ae4a1d2af314ba3cefdd93e8a2eb076b", + "md5": "72ce0111cde945e9eae10988086afb17", + "size": "175484" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.0.140-archive.zip", + "sha256": "51def3bad16ad68a33a7fcb3ab75ee8b7c607e025bf1aeb07105377085450691", + "md5": "8988bc0c90e8a57de436d44672b2ef7c", + "size": "3789889" + }, + "linux-aarch64": { + "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "fef156cad68f94b8180ac20b99f57cbbeeb05107ed42dc160b33a529c2cd010f", + "md5": "d4c8bbd42a90279a5a77ad9ea47baf1a", + "size": "175420" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "version": "12.0.146", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.0.146-archive.tar.xz", + "sha256": "ab0cd16702748861a58668e78fe6ed27d69c649f585a616927e7809a4108881b", + "md5": "9450ec8fe5cdef7ad0fad2fae37e04a1", + "size": "18991980" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.0.146-archive.tar.xz", + "sha256": "24d5bdeed953816ea2137393b306dbe1eb269e6411d2d4d50665104357716866", + "md5": "3536b230cddd5f569d9db5933e533302", + "size": "9815620" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.0.146-archive.tar.xz", + "sha256": "df39906fe2320a4b7901b5afe6bc39c43c0cd83871bcd153005166bca3036fba", + "md5": "86b5b0201e44a97e7c6d0776f28ccbae", + "size": "9725744" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.0.146-archive.zip", + "sha256": "cc888b32d5e2d6dfbdab00c5ac99bbb35f45cbee6a9e79f679013a550811a322", + "md5": "aeb8b8d7a4a22becfbb0b3500357a423", + "size": "13237455" + }, + "linux-aarch64": { + "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.0.146-archive.tar.xz", + "sha256": "36e00f979177b559fd6b137ecbdf8cf9e5ed6d3e2d9960c3d17e9b375cecf540", + "md5": "183727f766b796a8819abcbf563f225d", + "size": "7679384" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "fee967a2ca2c22ca74495c55b7771d0f1f373c21e5320d655f0d4dcc863548ec", + "md5": "add93722725ad91107e7dc46bba4cd55", + "size": "186184" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "5b00578c3504e72c65140b30785a652b1f231b0ef7643a104605ab601a2d38ac", + "md5": "85bd21a31c60192b9b88157ff3a5192e", + "size": "179804" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "a92c6ac9c386630fcdf4566cada5bb45b8d826690649c1cdb796da0ada07720d", + "md5": "e9b4589c18ad44a527237b48afeda30e", + "size": "171972" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.0.140-archive.zip", + "sha256": "c25359098a319adf86020da49c0a7718be0f9684e424f7daee4bc39c5e42063f", + "md5": "d2f0a956d3c38740bbd9ede6651aa31a", + "size": "168497" + }, + "linux-aarch64": { + "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "e53500b0b8b468c03e34bbc05089f6cd2b11e6874e1c9c995e6cde13a50d67f6", + "md5": "11daee96f53bf5e095b61b54d6157e5c", + "size": "171980" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "e535d9c8ca9830c24c70e9b08fb6aef009cc490dbfe11e514a5b6a9abdb87e1f", + "md5": "f03dd4d7871da95689970a29fdb889b1", + "size": "3972436" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.0.140-archive.zip", + "sha256": "a220773af909aecfa467eeb1be10c5390bce9660fa3eb7dec56e367ee2984b24", + "md5": "9469c1c926def7b2e01e8c1469c21cb1", + "size": "5048369" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "e9d35c48e30a7bb4d8835580494849ca7b5b39b244cafeb792864488f83b3cec", + "md5": "97e971e6cfb8b14f25f024096f8de3c1", + "size": "67044" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "33f7b839f5f01a81285fc6da4f121cfb8857e7e85ef3041f89332ea39a811981", + "md5": "8d597206f5afa27c761bae8a2b67c8e6", + "size": "67112" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "1b952a3a38949e546ac70d1307dea0d2013778dd550aa26485d0fde6784c4e81", + "md5": "c0a8d48a5d2244458e0ca2fc770201d8", + "size": "67180" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.0.140-archive.zip", + "sha256": "1166dad7c941068e680277b1deb3f92417ce17acbcb4022a262a3a1ad5c410f5", + "md5": "59155977b997a67e0b53d45a06d1675c", + "size": "105380" + }, + "linux-aarch64": { + "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "5c5f1ddc8c05dbf8e46f0de6b300c7dedd91e2047906500e2c4f46a363cca5c3", + "md5": "193b5539477134fee9afe8b1456f6251", + "size": "67044" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "d8a9f3ce2b10b3586dd6af887b3e00cb76e7013b12e7060d23f01ff9b4808738", + "md5": "ae797cca7f7f80e5b34a9d241b262034", + "size": "65706444" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "c2cc2e789d267af56b7a0782412d8b4c09229f7e064c6b076401f4a10811695f", + "md5": "f060b14655e923dd2364225b08d1fba3", + "size": "65484032" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "eb4ee6eed7cf749026e9cdfd1676ea7d39213b16cb8ed9cf3076fb1f56c6f646", + "md5": "269fe631516733aee8c382ad2781266a", + "size": "65381072" + }, + "linux-aarch64": { + "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "f6b3c5eecd79ec0cf1757629231a682c96be96b52c3e50d036071d457ee941dc", + "md5": "8ac5b300e21d08be2e64f2f706c99f56", + "size": "65243124" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "3495eb983d528dd8d1917e4fabd833e9ec88acb0b30e02fcaf5cfc5598683ec7", + "md5": "1bca54c09196aa1c6dacc120fdf9471d", + "size": "118610252" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "ad40ea617abe96b4cd55ffb3dcf30b56704dacb35eaacac79391971d69fe9736", + "md5": "0a423201f7f68802b94893c37a4b9c6b", + "size": "118610260" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "906b894dffd853acefe6ab3d2a6cd74a0aa99b34bb8ca1e848174bddf55bfa3b", + "md5": "6a0d869f8220935bbaadfc0bb337fa3d", + "size": "44036908" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "9cd7b8e584c74a648147c9cfbedb505165c90187f0eb10a4696541ac0751f2b5", + "md5": "3ab025c357486c3912f6cc4ce1374f3c", + "size": "40987532" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "04ea3493f4411007f1941eacc2de4af2277804a3d5be2e18f2aea54a362431bd", + "md5": "c9597a42999bf90124515ea4039e367b", + "size": "39730304" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.0.140-archive.zip", + "sha256": "410100486923612c1984e4b4d93b04c9d689f5aca9e93294f1d78e3af745746b", + "md5": "0a82b305e8d5ece3a0ce45a942039c9e", + "size": "58942235" + }, + "linux-aarch64": { + "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "9540d9b13bc5d576f3ea645cb077b420c672c7197c7e5c9dae3db75d5a671d67", + "md5": "38ec2847d9b1418c338e6987826e3c28", + "size": "39767432" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "edcd6133f55d04dce7f09c0b9e70b3c2e3b67a4ac526aaaffd98cbdf619fd160", + "md5": "432998db00587b79d2df4f167853a8e9", + "size": "49877104" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "69e46bf5eafa22ba341a61cdb23cb78fa09b43656c77c219a3a53f2ab5105bc0", + "md5": "6c8365934df42e34cb4731038cc59aa0", + "size": "49865372" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "591da3a8957102934dd4af1c18a4a781c071b7da6a88213ad05edba3393783ce", + "md5": "5eeb1815186c5fed4a9aa6a7ecfdc48f", + "size": "49808164" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.0.140-archive.zip", + "sha256": "ac84be4b8657dff366ac949d2a1827ed30ff8a130a46bad92006c4bad6a79be6", + "md5": "7f09d7a69988beefac772b7ac5f5be55", + "size": "50113623" + }, + "linux-aarch64": { + "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "27bd736406574ab8c4090725da5b3504905e2e2aed4d1cc1fbf3ddbaf1e2cd18", + "md5": "2e690fe0ee14d3c052a615b890eb155a", + "size": "49797168" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "c775973769480a1e2e1f6dcd3ae8e384e8829bb8afd5669b6f5af9a442b947e3", + "md5": "f2503fc3152d1c41adb1b29babefbb30", + "size": "81756" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "414c1faea0f537965b3af44631fe2f3a285fdac8d641b8b3c120e48230327ba5", + "md5": "e786d89b7bfc30bcdd9914e161b63d59", + "size": "81376" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "f41a552e53842e8fe9d0851f29433c115a0bc05cc44c93bc33a7ad5b91d73a14", + "md5": "4a0f57b6cc1fcc16ac3277fb47a79b5c", + "size": "81856" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.0.140-archive.zip", + "sha256": "4c753f4b871a62f3586e9c3afa51128445c7b1479da303daebfcbc5a3743e9a8", + "md5": "056c25ad1d6e4c113fcd43fbfdbdd970", + "size": "114004" + }, + "linux-aarch64": { + "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "4635668f7b0dfcf78cf497c2132a7a02eebf2c31ef082edf03a9ff9fe985e3f4", + "md5": "35a7f4c9c1c3595b5039c9c11b35d2c9", + "size": "81912" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "version": "12.0.146", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.0.146-archive.tar.xz", + "sha256": "b37b2f8f5a2289accb75378cf75ed56404b1e608d56f35fcb70c952235fd2f8b", + "md5": "41626aec89fa0bd023a9f0ebd9e3d01e", + "size": "2438328" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.0.146-archive.tar.xz", + "sha256": "9accaff6e628e949c8e744900e0b602579b75f40a4b8e225b6faf64ffc691838", + "md5": "95d8e7233519f26bcc2a7c6dbede4c03", + "size": "2116312" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.0.146-archive.zip", + "sha256": "f44dffd0ad1d6e38d1f4a1ac8046e91a8cdf6deb52ea8bb830a07d27dce5d785", + "md5": "f7a1de81dc1707ab16413c14fa6075bd", + "size": "1699140" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "6ffa51a5e0b2977302204b218337900948b1662e596617a5947e520ff4cf3662", + "md5": "9e0895e3a15a8654e4d5b5f4749c1445", + "size": "56364" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "c8c5b05b8ddf84718c16ebd49076b7759dfac7f8e8118cd25f9b53db9f142ccf", + "md5": "54c8d5a5c66798a1f015d88490d0bc6a", + "size": "57044" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "38583e2894b3ccb9231a5396d17b0a7484662f50b22cfa3da788f9fe4b8f4e7c", + "md5": "ff47e44fa4e14bd97d1bf61b58e73c42", + "size": "48380" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.0.140-archive.zip", + "sha256": "812a98986560898885d0bf404d2c885019af7cf07c76a91198ee3e63c983eea9", + "md5": "317154c8f87e3244ebf84f5eee673f05", + "size": "145970" + }, + "linux-aarch64": { + "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "cbd65b9b9e9c6b25b4ec7537d8e318c209826244b0d448dac3a5249069b35d61", + "md5": "117e73f57dbd89f4777bedbd8a1aaf12", + "size": "48368" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "90199c8586a1ee88363358c25e028b1ae301457c5f3e36120a4135b8d941a5d8", + "md5": "e060441812dab7d91c6640a8ed75d754", + "size": "30077936" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "b6001319eb9ae636a41a1578a86999f596f6e3b68c5a2d3b9f971686dcdc7d28", + "md5": "476c0cf7b89963bb7b7be164156fa8d2", + "size": "27780348" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "a6af3286a30ffa69ec667886c0e0aa44df23cd32dd77807c39ff8cab1ecc3492", + "md5": "22ba03908fb5ecc1e2c5324d83e828ba", + "size": "27628256" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.0.140-archive.zip", + "sha256": "cd8e8c5be748ad2675040ebcf8435c6431ef6dc08e3313e537d67cc31f370c3d", + "md5": "e59638914ede3ce08335903618554b4f", + "size": "96584114" + }, + "linux-aarch64": { + "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "3482f78e1170b3ba5ab43b024c56d635721ca01ab9e3f691eb32544c1743eac9", + "md5": "d58028836d92c6aaac6361112e820fa8", + "size": "27623484" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "de43a0f2b6e1923cf399fd45f4bb233a5d16a4e87ce2c625c8743a1c1e44473a", + "md5": "1aa900b42fe683ac2de6f80acb994bdc", + "size": "48416" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "acf77f9563c403e395588dffebb38a1aa7022db6b557a3c3bfd74e5fc3afa089", + "md5": "81f24300cc240345097e59750d125bd4", + "size": "48496" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "0d3a5f2b182dead113f5593d8738761ba4893cf24ba10388d8b65fb3c4cc6e58", + "md5": "8cf63d7d607d9ea6701385f5901194d8", + "size": "48964" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.0.140-archive.zip", + "sha256": "e5a79481f7289bf7f2e4f6cf2c50f639fa4f2b3e7155c060e160f0d9ae2e2515", + "md5": "18794972b4a5648fb35de89916835097", + "size": "65732" + }, + "linux-aarch64": { + "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "cdcf8f1e0adaaddd343ed0ad4db54a951233f8584e602ec568bce853968780dc", + "md5": "7aaa8ef2a023cddb2036df0718d54645", + "size": "48880" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "version": "12.0.146", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.0.146-archive.tar.xz", + "sha256": "5d067e1081ace9e3bced739ee3ee15dd17d5120e835bba84ec25f7b55b59c91a", + "md5": "c4bdf5353f06cce21a745e003d954a2c", + "size": "112429480" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.0.146-archive.tar.xz", + "sha256": "c81acd1d577243434495d2da002f2bd30d6dd298f0ee46bd44ab509b000d37fd", + "md5": "6eabf361592df6c6504edea599fa3408", + "size": "117087696" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.0.146-archive.zip", + "sha256": "eece54744ed33210e0e117ad5cb68680c787546fbdff8f1fded89493ec7483b3", + "md5": "6d96dca3bc76ad0616259cde4f9b932f", + "size": "120359555" + } + }, + "cuda_opencl": { + "name": "CUDA OpenCL", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "100df7f9554b7e2c6139d2ac4a9d6268fe40c78a1346c65ace44f1c1a545f255", + "md5": "8de4e80fb65427242823ff40f7ffee84", + "size": "69236" + }, + "windows-x86_64": { + "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.0.140-archive.zip", + "sha256": "17e52184c473564c0ed9fd3e9c6be86fba2f41ae5a7526ef2d1416221029ada5", + "md5": "846e8734c5a79b4289bd677a40d3bafb", + "size": "103599" + } + }, + "cuda_profiler_api": { + "name": "CUDA Profiler API", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "48663707a6ea2cbf5468b4bd956c650afd5793f0a32f2f8f0775d0a731695495", + "md5": "c02d36417d57de4311d410aa50597007", + "size": "16048" + }, + "linux-ppc64le": { + "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "599e7a9d9cc937fd52775545c9d234bbbd0c361632fe16ce5764edb89740d053", + "md5": "04b5e051a56a319ec3f4c96619135e95", + "size": "16048" + }, + "linux-sbsa": { + "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "d181eedf77a91dc4dacec561c5735c957d07f8d7fcb69fa70fe35989c1398a82", + "md5": "c6e5719d9aaf0668dae442d2d9ffd903", + "size": "16044" + }, + "windows-x86_64": { + "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.0.140-archive.zip", + "sha256": "303405e4184be2cee7ecfbbb3744e33288bcb82f9191f33a58961ee33b53c4f6", + "md5": "16a4627384b03b417cd134528ce6269c", + "size": "20085" + }, + "linux-aarch64": { + "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "047a0d78f2253b1026f4afffc3540d5e26b2315841a5e97cc7346abdf87a8359", + "md5": "a587551ecc7be7c7dd54b33caf1c4846", + "size": "16048" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "9de1b2862f2994c7f730928d715dab442e5de0adba8409d5eabb5cd103a3c0e0", + "md5": "76f096cf40b5343fd1e50ab17d4755d4", + "size": "8127860" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "2fd04f3345b3010f77120181ea65d0fa507389ca89680d239509e5f38c6bf522", + "md5": "9ae700f4339b16e2f1be8db4decf26a4", + "size": "7425776" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "fc16a5451538c5c901ba738e89743eb63d0ec6055e9ec892745bb08fc3371cfa", + "md5": "fd0ecb32481fa34a86f2f382ae6fd46f", + "size": "6006356" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.0.140-archive.zip", + "sha256": "51abebc3d4bb715b65e8979d1d8d209d955cc56d714d7c8d7561c1a8a7d61186", + "md5": "466ad0f4e4a5282eedcaa86fdeda52fb", + "size": "13693692" + }, + "linux-aarch64": { + "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "f5345690ded34f3ece4a4232480ff78d646beecc175438c4fe2d5986bef9157a", + "md5": "c38c53652b569bad8c70dfd76f47623f", + "size": "3447724" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "version": "525.85.12", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-525.85.12-archive.tar.xz", + "sha256": "01e6e1a873347c91489860509e6332d5224eb48704dd3160335601083ffd0c74", + "md5": "9fb80a825581049edc6900212677a10d", + "size": "1629480" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-525.85.12-archive.tar.xz", + "sha256": "ba615237bda8b4e939d2cd0967b4c76a74f18266a410414069368b04a3a25d74", + "md5": "4d5ff6479fe477e6a7d15a1bd7752ee4", + "size": "1508600" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "version": "12.0.2.224", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.0.2.224-archive.tar.xz", + "sha256": "67f9d7f639762685a93a8d3a12b8625084749fade6a887323fbb53bf6fefc81b", + "md5": "935441a812035b68de6e8ac1c5c5b57b", + "size": "459134512" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.0.2.224-archive.tar.xz", + "sha256": "54a6b189a76a924b9e34e76124d7a0564f554c5106b9641d9101c9ea55b9b57b", + "md5": "29b5588ea8b9ff28e75d7853490fed72", + "size": "382119004" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.0.2.224-archive.tar.xz", + "sha256": "024561f702d72795f69a8c2a481da8961c85b954c43a3cb9ad66dd6f01ffbf65", + "md5": "3d88d77dbcb3738882f28c6d62aa992b", + "size": "456807572" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.0.2.224-archive.zip", + "sha256": "d7094c6ac5a9dfa27bfecca7b0afea8293f0828e1bce895c9b87740674bbc75f", + "md5": "c6661bab87b9e8f75cd6d1012ea4ec94", + "size": "390167374" + }, + "linux-aarch64": { + "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.0.2.224-archive.tar.xz", + "sha256": "779817bf118e62c6a1b80037b045128f389b80b05bde774b4e7ec9b2b03e86c7", + "md5": "0b64240177205e6227f12b822c2e42f7", + "size": "328770940" + } + }, + "libcudla": { + "name": "cuDLA", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-aarch64": { + "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "7cebd3bebc36e72428132b82363afe3da4430c0f0d67244a2388343c4b134fbb", + "md5": "cc0be7e33d4c99f0993da0657cecb33e", + "size": "38488" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "version": "11.0.1.95", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.1.95-archive.tar.xz", + "sha256": "0052bb2dfbb2d5bbe11c986b4c6f20cd2fb2ec006336829c70976ce6b9cb3f88", + "md5": "58d2016dbacfffb93030f952e3f86dad", + "size": "121897888" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.1.95-archive.tar.xz", + "sha256": "ca5d8102a3727494ff09c85245d978d034cb6e6f271060f9a342e1bb40c69a5b", + "md5": "2e9b9a83a2fcc0a311c3c34c71b5e86d", + "size": "122079000" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.1.95-archive.tar.xz", + "sha256": "2df31984726527989418ffbec944f2c0fcc59707d5c84dd53c04a35c5b93dc95", + "md5": "c4d046384b9cd532b0bfdc67d7ceb643", + "size": "121291816" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.1.95-archive.zip", + "sha256": "3e284518643b7788c38c0f67a9a34f6310b4558a9e72d71d1e7d95a80d947038", + "md5": "bf34ccc53e8f01c4294b83cd17ed13b0", + "size": "87874793" + }, + "linux-aarch64": { + "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.1.95-archive.tar.xz", + "sha256": "c2ded0d0cf2d2686d31da81488d6e0d56c5d97f8509a3de9a7f41a6636d916de", + "md5": "b80ed442ecafa22400026f42d272f3fd", + "size": "121616748" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "version": "1.5.1.14", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.5.1.14-archive.tar.xz", + "sha256": "5b4a1d07c2edab0a41e538032e986de21d0b463a676c6da8db1874c1be222c98", + "md5": "a81f90496568078342e7c8308268b5ee", + "size": "40936936" + }, + "linux-aarch64": { + "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.5.1.14-archive.tar.xz", + "sha256": "5d92d5ce85c34fe543817061af37f5776e065322cadbc8fcc6371609069b5ed9", + "md5": "fe7ac7da49dfa00274ea937d5325b677", + "size": "40599536" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "version": "10.3.1.124", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.1.124-archive.tar.xz", + "sha256": "0a890a9dd99c199973d909bd7a4a3614f236810b7b2b713417d1ceeb00cc2c51", + "md5": "bc25b5d48ad0946c57bf2be0710970b9", + "size": "81951488" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.1.124-archive.tar.xz", + "sha256": "14a828fca560d9656c416f5b2a1db492e9d4b7910756f8da64d6e18fa145df4a", + "md5": "12c06d06351d6423f225a54ac033b374", + "size": "81985552" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.1.124-archive.tar.xz", + "sha256": "d73bfb1fee2cef2d5e72a71777ebe7a21a3002db95fb1f367c573189c3dd0253", + "md5": "f9c1095bcac07a6600f07c54748f031a", + "size": "81937240" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.1.124-archive.zip", + "sha256": "e214f386e7313371e1a70928f0cefe315093ee9ecceb48b784fcb8d8ce92bbb9", + "md5": "c2e74f8cb80a9523b291f219576e914d", + "size": "55278625" + }, + "linux-aarch64": { + "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.1.124-archive.tar.xz", + "sha256": "4d9b6ef38bd646f9a9219e605b6dc2a33ae2b5a15458b57b297f27938eee9a79", + "md5": "a0b62f77a0a460be6e70be4324f9cfc8", + "size": "82232176" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "version": "11.4.3.1", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.4.3.1-archive.tar.xz", + "sha256": "7e457ec82af1819d7ceed3bdc68dd31819a51f9562836e24a7a9baecd71af08f", + "md5": "7ad5190e540fb9135d658753c45b86e8", + "size": "82229860" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.4.3.1-archive.tar.xz", + "sha256": "1a413618bc7c6cc7c720d149132a8af980cb9fcccc1ddc61d7987b8512432f01", + "md5": "c13e69f550e16d08021bcd759cbdabe5", + "size": "82525004" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.4.3.1-archive.tar.xz", + "sha256": "f707901e02374dd1bbfa5ac8901da799cca5fdc18c088cd4d8a8d7ba1b91e02e", + "md5": "1156776fece680992de827278a708bcc", + "size": "81414176" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.4.3.1-archive.zip", + "sha256": "f4fd50ca109b8633409c26806dac80f2cb0cf9e8d715158c1addee1403ce9792", + "md5": "b39d8229fc5fe70ab055b7bb8eb70531", + "size": "122536913" + }, + "linux-aarch64": { + "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.4.3.1-archive.tar.xz", + "sha256": "9ee052656581ea67b37fcbe0430f680530351bfa77a2fd3575f5afc262a6cf26", + "md5": "5244e0816734c75637854d54e1bfb1fa", + "size": "75620036" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "version": "12.0.1.140", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.0.1.140-archive.tar.xz", + "sha256": "e6042e6e8c9f075e6f23a172473a384858dd8d0a1e97950763f96eec329e168b", + "md5": "cabeacf931dadcb975d77e6284b4cc84", + "size": "204690448" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.0.1.140-archive.tar.xz", + "sha256": "c5242ffb1297af6829b99351c95b17d340358309e15920100ff1626bfa2beb1a", + "md5": "ca44fdb9a271e3518efe020f39ede832", + "size": "204824704" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.0.1.140-archive.tar.xz", + "sha256": "f0df2c3d36b4529d84f8d447c7640a988f4c52db965b4582abfc282c90173937", + "md5": "bbe10d53442afd198854a7baa19983d0", + "size": "204323552" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.0.1.140-archive.zip", + "sha256": "0721ffa90bcf2d25b46245f76b30a8d948a3a05bca8f63ca0a4380d76ab37233", + "md5": "4078766b5b56d2788c4953d298b03f52", + "size": "186154754" + }, + "linux-aarch64": { + "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.0.1.140-archive.tar.xz", + "sha256": "878b02e09d73677365fc9195f282164c80f004921ae33b84c804333c1a28ab9d", + "md5": "1b5a38918444442d6f96347f1b59a03f", + "size": "197912292" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "version": "12.0.1.104", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.0.1.104-archive.tar.xz", + "sha256": "8ec3a0b1f4f465f8602a7113b8109fad19433ff03cb4d8e5018c30af29000776", + "md5": "39084873a037e853f828b95a1a3a59ed", + "size": "184050196" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.0.1.104-archive.tar.xz", + "sha256": "7a98948ae3de878578acf44a2e164fe8885e51d15001a62b21b58c900e07c5bc", + "md5": "306ee2637f755bd64a7ce83309929127", + "size": "184321688" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.0.1.104-archive.tar.xz", + "sha256": "a34350a0ba18d6d11627ffbff407d356b9505935455bdb5f299b6c3ec5e30dae", + "md5": "9c34f25849843d20cce021a136f6858b", + "size": "183391228" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.0.1.104-archive.zip", + "sha256": "59a51d922eb358097a3e22d1293843d2f3c2004979ac687469c6846b01b4375f", + "md5": "058232598b0d0ec8548d27264819b9e3", + "size": "152997938" + }, + "linux-aarch64": { + "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.0.1.104-archive.tar.xz", + "sha256": "db02a7461a8921167b86f2b8702fbea545180840895740f6ff006d7578d22734", + "md5": "403dde0ba97503e96ae0e22e513b9664", + "size": "177965376" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "version": "525.85.12", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-525.85.12-archive.tar.xz", + "sha256": "3539eb9651970ea4c1dffa9b5c884c2c421649fff52b691fcc42220f7e24b7ec", + "md5": "4ad512a2936fbe583c84aa4c9e06305e", + "size": "561656" + }, + "linux-sbsa": { + "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-525.85.12-archive.tar.xz", + "sha256": "d97f6f9f6c038218ff1bedab1d96d5c94fa48bc2fe2bb2de7d5b221d2f629a31", + "md5": "85a6b8d66d05b202752a2e5350515e87", + "size": "515764" + } + }, + "libnvjitlink": { + "name": "NVIDIA compiler library for JIT LTO functionality", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "6bbfae3c369ad5b7807e9697000cb60ecc84e4a21af9376b9f42ed56f8ce9c7a", + "md5": "b35eecc3329a2bee14681d869e7fe47f", + "size": "25648248" + }, + "linux-ppc64le": { + "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "5e2852073355e56d8cb8b13471dd64b2192ef65d86f4729e79196316d09e9190", + "md5": "674254a8c7618392655edf25740ef555", + "size": "23619516" + }, + "linux-sbsa": { + "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "7b45ef9787670e2676257e769deb60c12467a4751806ed4da49ff6c3826e8939", + "md5": "1271ae15c7378d5e8e890b5799aa1aad", + "size": "23449160" + }, + "windows-x86_64": { + "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.0.140-archive.zip", + "sha256": "88c4d3ca3fe2275b4ef0212034a67748465af2e9e193560c63c4c251f618caf9", + "md5": "998fcaa70cb98b1667e67f20bc235ace", + "size": "86246489" + }, + "linux-aarch64": { + "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "65fd365da945c56562057ab2992582783bfa69f411a69f8bc51635349737821b", + "md5": "59b5856a104a98ae441d7a70f7aaeb94", + "size": "23450460" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "version": "12.0.1.102", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.0.1.102-archive.tar.xz", + "sha256": "b32bcd888bbbbb33f5005ac0e6a11eedaa5b959ecf9ee3249efc171f51a113ec", + "md5": "e82d14cff3fbb8b3cb10a51741ecf477", + "size": "1969992" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.0.1.102-archive.tar.xz", + "sha256": "89202c70183641b619dfef9735a2733c84ff8253c0285f8285c5e18653b0a990", + "md5": "0a05211b4466527f6c711e4ca9f732cc", + "size": "1980928" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.0.1.102-archive.tar.xz", + "sha256": "7ef6721a63aed4cd352c0099e68dd9e4da9d46bfefa51e4fbc2502c25e65f9cc", + "md5": "07f679e66d7f796bcda1e54e074c48ef", + "size": "1785664" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.0.1.102-archive.zip", + "sha256": "c79833f8f39c0dfa113418f277d97eb251fc21ba1a2513270ada080e367c2a5e", + "md5": "1f7bc966ef37116f8e229c29a1fa38a4", + "size": "1944326" + } + }, + "libnvvm_samples": { + "name": "NVVM library samples", + "license": "CUDA Toolkit", + "version": "12.0.140", + "linux-x86_64": { + "relative_path": "libnvvm_samples/linux-x86_64/libnvvm_samples-linux-x86_64-12.0.140-archive.tar.xz", + "sha256": "ce3929b34e8e384c723812d4a9c0f11548ba0babcb48d60055c3df60fe188715", + "md5": "538f8a1603d7b61b5b05199cb963f059", + "size": "28996" + }, + "linux-ppc64le": { + "relative_path": "libnvvm_samples/linux-ppc64le/libnvvm_samples-linux-ppc64le-12.0.140-archive.tar.xz", + "sha256": "4df51724b43fcaa04d6c3ce5dc399a8b769ae467dbaacc4d7a3bd9c20d3ec4c8", + "md5": "1e1afdcaf6f5842dacd4bdf21e64675d", + "size": "29012" + }, + "linux-sbsa": { + "relative_path": "libnvvm_samples/linux-sbsa/libnvvm_samples-linux-sbsa-12.0.140-archive.tar.xz", + "sha256": "a2335d32398255a2d320c02190e765fb24152390cebae5c769bf36cad68b8012", + "md5": "c50e4529ebe1c4c5c744079f5ea78e24", + "size": "29000" + }, + "windows-x86_64": { + "relative_path": "libnvvm_samples/windows-x86_64/libnvvm_samples-windows-x86_64-12.0.140-archive.zip", + "sha256": "333f4061c49e4b16e2c27e8d98e4d15c6022d054d9961abb735f769362bc1598", + "md5": "00c4ba15a0e049e1cf32842c010849da", + "size": "44435" + }, + "linux-aarch64": { + "relative_path": "libnvvm_samples/linux-aarch64/libnvvm_samples-linux-aarch64-12.0.140-archive.tar.xz", + "sha256": "58fb261c21b65e621435c3aa84e74ca226a83b8aef10aa819597ee90dc156729", + "md5": "6173ccfadd99fab98ceafa1a7f783dfb", + "size": "29016" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "version": "2022.4.1.6", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.4.1.6-archive.tar.xz", + "sha256": "956e33a364c05c241119ad516e3f60bedafa3153e3e9c0767d339e991cb7834e", + "md5": "965db56d5e997049488d3d9d4330ac90", + "size": "704959776" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.4.1.6-archive.tar.xz", + "sha256": "ee5573bacb6b9f62a4d72cfaa206e932b47104a92e5ecb5b66f477f2b246aef3", + "md5": "3e6d3d24244026f434aec56561f22511", + "size": "181949792" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.4.1.6-archive.tar.xz", + "sha256": "ffe9a0ab066d507b6842eadb6742cf96809d040b94cc8290b5d385622b0e1a44", + "md5": "ffbcb1f275e8d2015205334f46661e08", + "size": "341205496" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.4.1.6-archive.zip", + "sha256": "28c5bd4fd1feb9bcc8d172c7de9892443d0b58ff805780d7d73a69e641f4e542", + "md5": "0592d427662087dc120bc5c1a50b24fb", + "size": "634500519" + }, + "linux-aarch64": { + "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2022.4.1.6-archive.tar.xz", + "sha256": "aa2c3b2ed5876ae456f2a18b2c7ad1ef7a9513045fd5265080d499db6a3c7c98", + "md5": "5ee36f325cffd6668b30ecbad5916ac3", + "size": "704427344" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "version": "2022.4.2.50", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.4.2.50-archive.tar.xz", + "sha256": "3bc4e45b902769e3863f2666d494702646f94c45879a4bcfbc95d75ca752e53a", + "md5": "8222d8bb9c59ce9c6533ba00dd6990b8", + "size": "197298716" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.4.2.50-archive.tar.xz", + "sha256": "b5697fbc0ca527bbcfe9843618726b902c37505e74b87bfa29a7f7c5fe8a2dff", + "md5": "1b25cc578badf50022f88ef910fdb4ad", + "size": "53269504" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.4.2.50-archive.tar.xz", + "sha256": "4a4fa9fb31e4d4761c0f37b5cf8f40bb8410896fea5339c089ffe9424284a891", + "md5": "048181e9705e7118e0d18c99fcdb9d93", + "size": "189113176" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.4.2.50-archive.zip", + "sha256": "b3a6e73159059330c69c6e31cef9a01b30516af0d6ce2e00b2335fef16a9c7ba", + "md5": "a6521a96e888f93f575e65dbe711c183", + "size": "729036951" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "version": "2022.4.1.23005", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.4.1.23005-archive.zip", + "sha256": "4097057929dff3f868bc564ba2b6892118b902c8629acc2433e7ae0a7adffb92", + "md5": "fe5e9856cfa1a77a1977dbebea40d7b3", + "size": "536311869" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "version": "525.85.12", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-525.85.12-archive.tar.xz", + "sha256": "65583fc002a79e0ea71fd8dc2aaf47a605f49a9d037becf1591f698c392d7f1d", + "md5": "7df3732c5e635b3f9da5cbc5fde57069", + "size": "418377088" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-525.85.12-archive.tar.xz", + "sha256": "043fe51133095d886e615d9517cfab5314768581c203497dfd7f947d153b3be0", + "md5": "26b7254d5cf55d04818defa011269247", + "size": "98002240" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-525.85.12-archive.tar.xz", + "sha256": "9367b72119fe1fd62bafe80107a576a0c8aafc0b3b53f4f35dd9cf0c5ff5b201", + "md5": "328c5d3992ba97a9a7355174ac624013", + "size": "269356144" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "version": "2.14.14", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.14.14-archive.tar.xz", + "sha256": "e60b3ee35d1e18350fe3efa5de126db241d03cf31bf4ba7cde7452496951b6d0", + "md5": "c8f5b97b446c7c5bba00133567399ed4", + "size": "57120" + }, + "linux-aarch64": { + "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.14.14-archive.tar.xz", + "sha256": "04277985c736a905d7de7fcbc3be28181c8dcbea4860a6a7c41568a879305bf4", + "md5": "cf75db54f806ccde883205de966b768d", + "size": "57132" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "version": "12.0.140", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.0.140-archive.zip", + "sha256": "7e767ba60251d7d4c524b5874121ddc3a5aeccb26cc594fb2e5506dc56131f66", + "md5": "8032bbb001599e6758fb71ec07cddb11", + "size": "545134" + } + } +} + diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml index 8f1a3d625d401..7e9fcae3271ac 100644 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ b/pkgs/development/compilers/cudatoolkit/versions.toml @@ -73,9 +73,9 @@ 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=" +version = "12.0.1" +url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run" +sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=" # 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 diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 2e6b0d3f68f12..67448f38f257e 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dev86"; - version = "0.16.21"; + version = "unstable-2022-07-19"; - src = fetchurl { - url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz"; - sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3"; + src = fetchFromGitHub { + owner = "jbruchon"; + repo = "dev86"; + rev = "f5cd3e5c17a0d3cd8298bac8e30bed6e59c4e57a"; + hash = "sha256-CWeboFkJkpKHZ/wkuvMj5a+5qB2uzAtoYy8OdyYErMg="; }; - hardeningDisable = [ "format" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - makeFlags = [ "PREFIX=$(out)" ]; - - # Parallel builds are not supported due to build process structure: - # tools are built sequentially in submakefiles and are reusing the - # same targets as dependencies. Building dependencies in parallel - # from different submakes is not synchronized and fails: + # Parallel builds are not supported due to build process structure: tools are + # built sequentially in submakefiles and are reusing the same targets as + # dependencies. Building dependencies in parallel from different submakes is + # not synchronized and fails: # make[3]: Entering directory '/build/dev86-0.16.21/libc' # Unable to execute as86. enableParallelBuilding = false; meta = { - description = "Linux 8086 development environment"; - homepage = "https://github.com/lkundrak/dev86"; + homepage = "https://github.com/jbruchon/dev86"; + description = + "C compiler, assembler and linker environment for the production of 8086 executables"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index c862bb2bbfde0..3f8871df4f96d 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -213,7 +213,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/default.nix b/pkgs/development/compilers/dotnet/default.nix index fddcbcea466b3..c0764ed95113b 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -30,6 +30,7 @@ let dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); + dotnet_8_0 = import ./versions/8.0.nix (buildAttrs // { inherit icu; }); in rec { inherit systemToDotnetRid; @@ -41,4 +42,4 @@ rec { 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 +} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix new file mode 100644 index 0000000000000..be943300c70c1 --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -0,0 +1,181 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + +# v8.0 (preview) +{ + aspnetcore_8_0 = buildAspNetCore { + inherit icu; + version = "8.0.0-preview.1.23112.2"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/bcd36740-4478-4104-aad3-97de2eda3c63/4278c479d008a08a82e6ed799ea4cab6/aspnetcore-runtime-8.0.0-preview.1.23112.2-linux-x64.tar.gz"; + sha512 = "8d7a5fbbd62078d55cd93dadb346e8889b5cf4a7337f864839d2ca32283d592d037b89cb0c9940df4cdd956b527fcd3ce5fe608ef7b77dc9ab6d04390e053495"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/63cbd12f-0328-4828-878c-4970ebe2561d/3b0e89d0e68beb6d09ad2323d64d039c/aspnetcore-runtime-8.0.0-preview.1.23112.2-linux-arm64.tar.gz"; + sha512 = "b8f5eb4087267f84bbea48f7c98f53d09cffdf269792c713c9d02b892ebc1eea075a39af7fc3cc63348ee6adc54179a5145b884fdf5d8853b7018c800073a10e"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/60354a8c-773b-4999-af88-f6232bf5b644/19f1f472670e5625ee6a75d09b95653b/aspnetcore-runtime-8.0.0-preview.1.23112.2-osx-x64.tar.gz"; + sha512 = "8fa6786adfcab090872ade64b742af43d75d973d6800ed5be171ba16324dcff7957e52582136116c1e2708e64c08141d4e095088841146d8e651f1f496757d19"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/00e1ec5d-62c0-4084-bf5d-f5667a77afe5/f4d1ceeb2d51a60323084ef43317b1f2/aspnetcore-runtime-8.0.0-preview.1.23112.2-osx-arm64.tar.gz"; + sha512 = "f816c7a078a6d121e74108a9199dfa235ec27e47222e2d25573f8d417560526d9c1e7792a0efe21e0a65e7db07bdbda942b33e38b656d32e9d00d250d7013092"; + }; + }; + }; + + runtime_8_0 = buildNetRuntime { + inherit icu; + version = "8.0.0-preview.1.23110.8"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/6c535b62-2132-4f07-90d0-2b172d18e436/b4b8aa2b558e1472c650a40707f25241/dotnet-runtime-8.0.0-preview.1.23110.8-linux-x64.tar.gz"; + sha512 = "76436051d57d602e7d45055c64f5ef4db9a3af3358f880115442b3d7bdcd2a4eaad36c59d51d8508049418d9f62a3f7c0747d989d7d758bd84244806a6f83b02"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/29109381-5068-4e80-a3f8-d0c825202bbc/b4205a8a483c639c0cfdf54bb1fb5ec6/dotnet-runtime-8.0.0-preview.1.23110.8-linux-arm64.tar.gz"; + sha512 = "2a15a8affb01c905e9ab4989f58a36bf9fec4e7395e3c44f143657e7d2e3903d7469ddc06c3fd57d3fcf48db4713d2ecd2c8ad2b3e361e8138e1890ba81adf73"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/02916946-04e0-45d1-b36d-07ebc9bab6c2/c160d7f42df423bd40d7251ee015b440/dotnet-runtime-8.0.0-preview.1.23110.8-osx-x64.tar.gz"; + sha512 = "c07754ca2067f38a37b2e4f35eea1dd8a82757906ae21964a21d2c2eabddfb80cb309a2267e619b6bb2447b917d8b47948c7835063200efded1fa35f89edb4d9"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/13005a07-288f-4c55-b874-71a336d4c687/ba476df7f39fd64214b1911ac4791c97/dotnet-runtime-8.0.0-preview.1.23110.8-osx-arm64.tar.gz"; + sha512 = "415ff6cc4cffc0cb25b92a88cd12f4653d087247b6e81b2e3d2f49b25363301ab239ef82d0d174f7dd7b31989ecfa8b6ed4dbf5e37d659fee864bcc22df0a908"; + }; + }; + }; + + sdk_8_0 = buildNetSdk { + inherit icu; + version = "8.0.100-preview.1.23115.2"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/e2578737-231b-493c-a6ee-f181496fe679/18038808d2621094ebe172ca011a7c22/dotnet-sdk-8.0.100-preview.1.23115.2-linux-x64.tar.gz"; + sha512 = "23a14c92e402161ed8d42ec9cb25a97868a1b72348195d28cffa00a12815f019308b56485e4375c0d0a33d9a683d83cc1e1a2a517eea44af8fb353171b6c3f64"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/57c316ef-4b1d-4b1e-b180-f38302132d3d/b938e1b373897fadfb25ff4b55ca32e6/dotnet-sdk-8.0.100-preview.1.23115.2-linux-arm64.tar.gz"; + sha512 = "98518887927605051312554499e197c14b32e8100fe8d8015a4556fdca3a347a3d2215d14069d33b27d978489f3e958c11baf18ba33e1b98580d2eb64cc1097b"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/0b01073d-3861-4fe0-abba-41e271c79725/12150bdbeeeb50e157b91f2adab90c80/dotnet-sdk-8.0.100-preview.1.23115.2-osx-x64.tar.gz"; + sha512 = "fb67f43a8a4e56d6121fadb2e2a8a24157d9cee3ba1b0e0bbeb2997f0574f97a525d22bd40ceee026ae782512d9ef88ced892d94af852681399e7e320c1d642b"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/00476255-fac3-4e26-98a4-c487aa89945c/76550e8fb59f35fcb6b789d570b9ace5/dotnet-sdk-8.0.100-preview.1.23115.2-osx-arm64.tar.gz"; + sha512 = "51164fa4a7353d36bf83126e8a2875152ef55b3d0641d61d143a3572c0e169e9e6026e924209d7b9cca93475b8b9fd6e476f733b1d21944e942f67a43f319aea"; + }; + }; + packages = { fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1lbzvxjm9mhbwygvn6rfbih2gsaapb33c9bkr48812jz0n1nj4kk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0p99wvlr0mpg5600ajcmsxhqcazk1m95vivjrw691a7sqbqibrq6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "07j3asxynyby94qi3ky1yqcmakjd06fyq9354r6mkckn30i4ncs5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0d3qxg43wz7g5kas3c2mr9hcxzm5bw8cm0q4jv17wzwzwkk4jnfy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0il697pzhd5ikfc76695i3621bhl469cg0hz50j061bsb06q4dqi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "195qsdbrzv3llb5yq0dfwx3iqiyw7v6f8idwibj43347j4pdi6w9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1jrc4fjydzqj4ksa0hr51ic4xp1ifrsq2liy1sjzsvvkyifbz9f8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "1b0f760q94x33x4masnz9v643adrdqc5xf8cliphd4g3awspkszf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.1.23112.2"; sha256 = "0vxndnbgyvjminvssx0qlwiqyapsy7fsjyh8ndkf3g5brvr4id2n"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.1.23112.2"; sha256 = "0li0x59gdzgip7fwkbvcfr4vw9h8hkfh96jpj8wnk66jbmyk6phk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.1.23112.2"; sha256 = "1r5z6h6c9w1xw4d5fvqplsr2j6k1bkw8kp2a7zkxya0f185g1abl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.1.23112.2"; sha256 = "1317rfzgc1znrzqjk31ykrnzcpw8835y7vsrxi19fk6m6a2ylx4s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.1.23112.2"; sha256 = "1l5vh6qz4y31l3mxa7isv6pbhaqfd9j23493c8wci1adqg2lhgfv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "09f8ckxyw8mpvypzifk3rmcays4jzypbz61gznvhkk1mxfh47hia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1d433w5750sf540w2nf4m926yw3mciml4z5w1wiyw4fgq3z329d5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "17dla35fn05rn2svkap5j2j6579i3sgarama3ma2s0zsd3qbppbw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1qc8h53yyyryfx9c9wj5zzjm47g4xc57wjrcq4ddr6dbw9spyq7i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0adzrwsccm8wl666haxybrs2x3qm86mjl0ql18sz67gxpdx1lbf2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "13m9gzs0dy8nr7k8ha82h04491c932z45lf02xpdw7f30p8wd111"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "13wnc79f0kjhq6g5024v2vjn3cc0618117vz9bwbkfpy6bnsz1ny"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p5jws2bdj5swy7r8z32swzn9c0h2mrwalhd3q9f7n8mgqqr9g5n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "08w4mkak0kabbaqv9vw2hy65qmz5967z73cmd901l9sr5gr8k9i0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vshh5crb100kqpis3qxjffp09mkcha20yps4czl0aqy6rv7nacf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "0vwx782gmcgmzid0pync6xwyg4ribcq4yawpssd0jldmy7kr8zvg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1r5f67l3jhiw7hyfawm680aag3wlhqx79rarlbgqmh1gs4z3z2ds"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "04y6rks7j3mizg1y5ykdgl8kczl31zr99kn15z1z7ymajldxga4a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1f7hklh9vkzxnr81k1i5rhjwn5q9bi4a7gf5lz6lrjg8w97fh1fy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "009l5ykx91zy9inrr0xmqqgjgxj9gr20350j1gzv8n0hwd73n3s1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0jllhxnmpmbspk6p9mwnlac1f0pw42vxy4vgc4dm8y4d8mqpbp9p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "0vnwx5607gwnjnzs89c48202jiysb92kby0s7jfv5lvb0r1naacb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "08mxpbzdpdj99w3a0mbvb2873kd7gf36w76d6qrix1zcpf4chfih"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0kx86mr5jss54a51iyky4x1j7jy6zmac50yr9hdmzkgg4ilqz82w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "12ll7kdgc2v1270lww2ylcrlapzrwr2nbd2jx2wjgsb1q13asas0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1s5z4p505z9ymf41s247w2f3xy3p433sf8g6a01anmkhyrja0shy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0x0z37702vw2wwhypjvdfxxrdxyhykv30npm3q9w68d00w7kdaj3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1lwdndszklk7m2pmj9b9s1k2h9cp3a8hsas0nq6kypmpwh473asj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0zmxs0v0r92g3f3680fp4mryi74mza85yknzcg2ygvasw1zq57db"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1d2xvd54lgfsipv5gpakv8r5qvqhxg47k89qbr62f11clqjp1pbl"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0bc702a48wpbfya6ffaz3jnzl1b01q915v9aqd07h2km57mimyc8"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1i6l87iqkg4695cbsfchzv74smag9wi5xfz6854k7pqhfx0bmmnn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1ysiwq6z3xz9b0n8prvgd5a5bwdyl86fcan6fy7h2zj3crbc5hnh"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "14xnzkimq1pf7qcm8dlcwszcx00yy39im064yxj46bak9md0ppfz"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "006f41nqrbq2wh6qfik71pf2zqknmckk8g6pf4hbnckp95jlb9zj"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0kd96jcwmpjb0cvpdaj88rnv99vdb4p0fmy05khq0jk1qyxm4h9i"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0qlm6p4s49w7v911pia35h6dh3ljl0yk8gavb0ij9xmy8zkrjxsk"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "10vrhk52f87q98ixmy642avj5b47dhgnhgd9z0mv063xx31f7z4h"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0hid6jpg4q1xl5lf0a65pj1x4dn4zvim4j4pyhgsshb0pqj9kzhy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "19rylmrajxcmjpfijgmn64z2v935d4rmq9vnm0187a1h9kyvqz9l"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1a3ckzz5l92hr6rhdv942w16654dldcv8s4g3hiv2snd3ra1qdal"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "06ykyfmj6q65fn5xx6hgr8g83k4pwv118rs02wi5sl2xgl37w60s"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00ikv949xhyd50ndv58inblggjdzphcky8w9nf84pyiw9vpfgaxr"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1h7qkd30q588lmkr7yw68xmm9cipiwbi7lyardcc7kkqr7v3m2r0"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "14kclfm2cg55j94nynrqdy3nby98051lvh5jl0r6aw06380g6z3h"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p9p8anr605fmrqzll2qlrryb060lkijnsw6w7rarh724jcx6van"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1gl523fpl5446h8hds2w38lr05x41fnggkb26d92wrl4av3ymmhm"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0y8gsgzx44zyw5ixacm5sisqmclgvf7qi1dgflfd33mpylzskway"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0534xd1n557s09n1bf88ninp7r6cdj4d27dk1ls6bwq9a1f7wz11"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1mlcgfxpl7n8p968qxs92mis7yvwcf8zv6ypgj7h3gpzxk7mpyb9"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0hkxz60p0byc10qi3kmhzfgwr5a94y64z5ijagas0s829y3xg15w"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1blcg6isbcbb0vv1misnhgp8005d4kjs1rpjmssv5r7abvz077wq"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1afsc9a1drr7i1blqcgaphggjpkyfj6amc5wrw8r7q3sx6ix3m9l"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0mpr88cfi1cqlw0asf43jrh4g5j8brz7bmv5ggzjjskq5s4ijyrz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "07d3mxprv0szcvj2s0fynzbzhx67iamjdil69cavkwx5lkry07s5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "00iz16i9kdmjg8wax6w6ybm810xi6593rkixawpszjqhiifwd4vh"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "0gxpywgcda1z82r8xzcw4xsynlc330r4ms9bnfdm5iq8xbdafkbh"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0aklxhf1kfn6rk9ifapkrrviamrdr2nvsjniwgz02ihms7d38maz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "12k9flpf571xz14jg47mra12ssv6s4nscafb3zivlhw949bpz4sd"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0p67vwnhczfz6p8vx1llybwkp9wvvk5piiw9pzwy2qi71913l2nz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1szg1rgyyj0c1fsnyf0xv5m7c2dp9qs13pdaa0r8l0g2nc79wd59"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "03jwqgr2x9lliz4f96bdbc6h1z02dgq037qhjn48s7a9khp3ky77"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "144sxccrc0m5wwp192csa3byyhbn0s40d6gysh9z1da680m6rmvq"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "01i9lifhxsali51j4p7ip9jnpdl30cgx8j0w6ib7l4bq0719s5pm"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1rwn1c22a14fkb5wlap81p0amaa2s19z9xb44zwk844vyfyia9iv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0gnhcx2avlr4cvxfnz0rwbdbg7sxpvkn1rq7ff6a8gp9wf9xngp5"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0b0wc36adbfc31wc2lcwbzlb056pj8x9zcp8h1iikpc1fpxn0dyh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0ahn58gm3031yy9glhdph0chpixxpjykbgjzk2nxi65b6knvn9lv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "063rf8bc5200vzcdig2pm1qb5y9ihnn35dyv2ws2k487v54mchh5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.1.23110.8"; sha256 = "176gkl0hwgiw6dj5j10gaqi7sra2qshhfsrksh2zrr2askrynkyj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1jrmf89v3596gfv2ihfaahx144yaxy31zy4h6mz7g1d3si18i5d1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0j01372ydb1w1jqydyds175cgcj4gnhwv1swzcbxl6ljp8zpjw0l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vwfp4xwgbffzihx2sxqwq2ywrd5xrnj9djgchmcscssgix8p6k1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "094q704n6np5hiqc75p24frqrzw155194128bhs1frhq4qbyfwxh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.1.23110.8"; sha256 = "1zzjs4wi9i06kfv301ib5pgi631w0ssv1sw5vawk6j20aks098mr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.1.23110.8"; sha256 = "1jdbr2425mvyqcycd257hr75r9b5jfm8g2n8ycdily7viagk37wm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "03yzv12bxlix9dag8ik3smxbk9fxyw9agnwdqa68dlacqi515w4r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1dqzg08wililm03qx760cjq56d2q340vsrqk5r5i8y3dvzzbmpb9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "18pi9ih1jx2fwkvx6smw1vlcyky2cj981v1fnav983ywz5cm1l5y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.1.23110.8"; sha256 = "0msgs5dvjqcaz59dx4l0fxdfs48vab6nypimq4q8q4az52r6pikl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1inn16z3ms723lanc323b0zbvn0kygh67hyi6y9afvn5l6wjb29j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.1.23110.8"; sha256 = "1h8ijydxk6qby92vcbj7im1vwsyi7xwcmck7p6iqxmfph06kl02p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.1.23110.8"; sha256 = "11lr9a44m9mxrwr5d8yrhv6pjp11lycd1z8jarx553vjnilqaryr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00nki84qrr7nmgvm93ivclj5jmxbnp3i0461s03yi7hcc459qhmz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "00k4g5nah2dc7iwcd422i793mrkg02fz09yig3kqy1z8q3b5m2ln"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "0lgkamn3x004wkq0ijqsw0rdfrkwb68kg6wf8lg9fssikp6r75c2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "05c7cxrg2191v8lnbsg0ygj5qc4mj5x9x6088v9m039wbswc4ggc"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "0p2aqc921666d35hgwc45kn6qxh1qn28jq7ca0pql4v8778pxkln"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.1.23110.8"; sha256 = "1wcw6rzqcdvc14p87d5ip4l9hlnf5cm52sqklakgnv15k9a00i7i"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.1.23110.8"; sha256 = "1qddlbadxfk3jmbm41gry0d4nl8rm6rgb58cya3qvwrp4rizxi5s"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.1.23110.8"; sha256 = "1ryndj04m867fdfn8jvkahkm5mq3bp3z4b4skpf6skq9w994fksk"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "1p798z08kyw2mnpps9z8f1q7mj76p1phqrikhxh99l12cdcv69z9"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "0bfw4wmwjijm7aimf1zf51ghhxabp4ag27x1sgjx9vbysi0g9fjd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "055snp02x9v4s8kqhyrcmasz0dsjw2mp2wsfyfnyjvyj1nrr47ii"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "0w2wciixif3j8l210jvdlk92hxmhzydwy7si8g9509a848s3rppc"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "162gb1a7g3y7prcp6k40bj0z7jvs6hhsx063i1m1w8a07ng65mpy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "107sh6dmzpv2jign21r50pg68qq7n8iyrd2ia159p3rlchc6w3qv"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.1.23110.8"; sha256 = "1vgahyzblbvgjfl3dcxhd1d2f1jz7bk9vc7k8bi28sh4hm9xq1av"; }) + ]; + }; +} diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 3397252b47a6d..41189be5dbd27 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -65,7 +65,7 @@ edk2 = buildStdenv.mkDerivation { makeFlags = [ "-C BaseTools" ] ++ lib.optionals (stdenv.cc.isClang) [ "CXX=llvm BUILD_AR=ar BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang BUILD_LD=ld" ]; - NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; + env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 9931e45c9b668..7cd9413991fc6 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: cexp.o:(.bss+0x40): multiple definition of `obstck'; cccp.o:(.bss+0x0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure='' configureFlagsArray=( diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index e0ef27ce23726..044ff1182f2b0 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ]; - NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = "-fPIC"; postPatch = '' sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index d084889dcac99..a21aa31ef4076 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2022.11.19"; + version = "2023.02.01"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-IJMzRi335RbK8mEXQaF1UDPC0JVi6zSqcz6RS874m3Q="; + hash = "sha256-sLhbIGF7j1tH8zKsPq1qOSwHvYDrVCyfln9UbE3IYv0="; }; strictDeps = true; nativeBuildInputs = [ + z3 makeWrapper installShellFiles removeReferencesTo @@ -24,9 +25,7 @@ stdenv.mkDerivation rec { menhir ]); - buildInputs = [ - z3 - ] ++ (with ocamlPackages; [ + buildInputs = with ocamlPackages; [ batteries zarith stdint @@ -39,12 +38,10 @@ stdenv.mkDerivation rec { ppx_deriving ppx_deriving_yojson process - ]); + ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "libs" ]; - enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index caff0ad023f8d..668391b2645bd 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -10,17 +10,19 @@ stdenv.mkDerivation rec { version = "12.2.rel1"; platform = { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; + aarch64-darwin = "darwin-arm64"; + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; sha256 = { - aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; - x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; - x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; + aarch64-darwin = "0j12n631bmbfvnfbmv4q7cfhmh4l7ka3vcjcvyw0vjqb4msyia91"; + aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; + x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; + x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -47,6 +49,6 @@ stdenv.mkDerivation rec { 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" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 2751501901f2d..4df0872688be2 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -24,7 +24,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , libxcrypt }: @@ -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 @@ -77,6 +83,67 @@ let majorVersion = "10"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc10.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -119,10 +186,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -140,8 +207,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit @@ -152,41 +219,12 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc libxcrypt - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -194,32 +232,7 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -227,8 +240,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -251,10 +263,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -268,24 +277,17 @@ stdenv.mkDerivation ({ inherit enableMultilib enableShared; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; + } // optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index dc472abec4f4b..4b91e05983046 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -51,8 +51,14 @@ let majorVersion = "11"; 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 @@ -76,13 +82,77 @@ let majorVersion = "11"; ++ 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; + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + + # openjdk build fails without this on -march=opteron; is upstream in gcc12 + ++ [ ./gcc-issue-103910.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc11.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -125,10 +195,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -146,8 +216,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit @@ -158,41 +228,12 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc libxcrypt - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package; - - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -200,32 +241,7 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -233,8 +249,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -257,10 +272,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -274,22 +286,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; }; } diff --git a/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch b/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch new file mode 100644 index 0000000000000..c3edd960f0973 --- /dev/null +++ b/pkgs/development/compilers/gcc/11/gcc-issue-103910.patch @@ -0,0 +1,41 @@ +From d243f4009d8071b734df16cd70f4c5d09a373769 Mon Sep 17 00:00:00 2001 +From: Andrew Pinski <apinski@marvell.com> +Date: Wed, 5 Jan 2022 22:00:07 +0000 +Subject: [PATCH] Fix target/103910: missing GTY on x86_mfence causing PCH + usage to ICE + +With -O3 -march=opteron, a mfence builtin is added after the loop +to say the nontemporal stores are no longer needed. This all good +without precompiled headers as the function decl that is referneced +by x86_mfence is referenced in another variable but with precompiled +headers, x86_mfence is all messed up and the decl was GC'ed away. +This fixes the problem by marking x86_mfence as GTY to save/restore +during precompiled headers just like most other variables in +the header file. + +Committed as obvious after a bootstrap/test on x86_64-linux-gnu. + +gcc/ChangeLog: + + PR target/103910 + * config/i386/i386.h (x86_mfence): Mark with GTY. +--- + gcc/config/i386/i386.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h +index f027608eefa..3ac0f698ae2 100644 +--- a/gcc/config/i386/i386.h ++++ b/gcc/config/i386/i386.h +@@ -486,7 +486,7 @@ extern unsigned char ix86_prefetch_sse; + + /* Fence to use after loop using storent. */ + +-extern tree x86_mfence; ++extern GTY(()) tree x86_mfence; + #define FENCE_FOLLOWING_MOVNT x86_mfence + + /* Once GDB has been enhanced to deal with functions without frame +-- +2.31.1 + diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 7e1847ebba988..375c098eec63d 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -64,7 +64,10 @@ let majorVersion = "12"; ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch ../ppc-musl.patch - ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { + ] + # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building + # a foreign one: https://github.com/iains/gcc-12-branch/issues/18 + ++ optional (stdenv.isDarwin && stdenv.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) (fetchpatch { name = "gcc-12-darwin-aarch64-support.patch"; url = "https://github.com/Homebrew/formula-patches/raw/1d184289/gcc/gcc-12.2.0-arm.diff"; sha256 = "sha256-omclLslGi/2yCV4pNBMaIpPDMW3tcz/RXdupbNbeOHA="; @@ -123,6 +126,68 @@ let majorVersion = "12"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc12.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + libucontext + libxcrypt + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -165,10 +230,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -187,7 +252,7 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else "") + )) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit @@ -198,43 +263,12 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc libxcrypt - 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; + inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = (import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }) + '' + preConfigure = (callFile ../common/pre-configure.nix { }) + '' ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h ''; @@ -242,32 +276,7 @@ stdenv.mkDerivation ({ configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -275,8 +284,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -299,10 +307,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -316,22 +321,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 042e561a2e363..7e6d4eb12239e 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -111,6 +111,82 @@ let majorVersion = "4"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc48.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + gtk2 + isl + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross threadsCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; + in # We need all these X libraries when building AWT with GTK. @@ -158,73 +234,16 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (cloog != null) cloog) - ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - cloog - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -232,8 +251,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -271,10 +289,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -289,22 +304,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with lib.maintainers; [ veprbl ]; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 8420cfdde7d5c..4ea63d7c12e1a 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -127,6 +127,82 @@ let majorVersion = "4"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc49.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + gtk2 + isl + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross threadsCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; + in # We need all these X libraries when building AWT with GTK. @@ -178,73 +254,16 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (cloog != null) cloog) - ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - cloog - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -252,8 +271,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -291,10 +309,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -308,22 +323,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = with lib.maintainers; [ veprbl ]; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 66b53c6d5b5e2..7e5e2c6b10b5b 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -31,7 +31,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -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 @@ -108,6 +115,86 @@ let majorVersion = "6"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + javaEcj + javaAntlr + xlibs + javaAwtGtk + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc6.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + boehmgc + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchFromGitHub + fetchpatch + fetchurl + flex + gettext + gmp + gnatboot + gnused + gtk2 + isl + langAda + langC + langCC + langFortran + langGo + langJava + langJit + langObjC + langObjCpp + lib + libICE + libSM + libX11 + libXi + libXrandr + libXrender + libXt + libXtst + libart_lgpl + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + pkg-config + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + unzip + which + x11Support + xorgproto + zip + zlib + ; + }; in # We need all these X libraries when building AWT with GTK. @@ -159,10 +246,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -180,82 +267,24 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else ""); + )) + ); inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkg-config) - ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langJava langAda langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langJava javaAwtGtk javaAntlr javaEcj - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -263,8 +292,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -302,10 +330,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -319,20 +344,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 8fd990f95ffba..ffe5b721b4f1d 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -21,7 +21,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -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 [ @@ -84,6 +91,63 @@ let majorVersion = "7"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc7.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + isl + langC + langCC + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -126,10 +190,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -147,8 +211,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' @@ -158,70 +222,20 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - langJit - ; - } ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + configureFlags = (callFile ../common/configure-flags.nix { }) + ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" ++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ; @@ -231,8 +245,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -257,10 +270,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -274,22 +284,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 2dc141b529fc1..e0b1a1e24ada0 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -21,7 +21,7 @@ , threadsCross ? null # for MinGW , crossStageStatic ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages }: @@ -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 @@ -67,6 +73,63 @@ let majorVersion = "8"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc8.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnused + isl + langC + langCC + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -109,10 +172,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -130,8 +193,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' @@ -141,69 +204,18 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform langGo crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langCC - langFortran - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -211,8 +223,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -235,10 +246,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -252,22 +260,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9b5f4504db8e9..bcfd1c7dd38a8 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -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 @@ -79,6 +84,66 @@ let majorVersion = "9"; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + callFile = lib.callPackageWith { + # lets + inherit + majorVersion + version + buildPlatform + hostPlatform + targetPlatform + patches + crossMingw + stageNameAddon + crossNameAddon + ; + # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc9.cc.override)" | jq '.[]' --raw-output' + inherit + binutils + buildPackages + cloog + crossStageStatic + enableLTO + enableMultilib + enablePlugin + enableShared + fetchpatch + fetchurl + gettext + gmp + gnatboot + gnused + isl + langAda + langC + langCC + langD + langFortran + langGo + langJit + langObjC + langObjCpp + lib + libcCross + libmpc + mpfr + name + noSysDirs + patchelf + perl + profiledCompiler + reproducibleBuild + staticCompiler + stdenv + targetPackages + texinfo + threadsCross + which + zip + zlib + ; + }; + in stdenv.mkDerivation ({ @@ -121,10 +186,10 @@ stdenv.mkDerivation ({ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' + ( - if targetPlatform != hostPlatform || stdenv.cc.libc != null then + lib.optionalString (targetPlatform != hostPlatform || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. - let + (let libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( @@ -142,8 +207,8 @@ stdenv.mkDerivation ({ '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' - ) - else "") + )) + ) + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( 'LIMITS_H_TEST=false' @@ -153,72 +218,18 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional langAda gnatboot) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional buildPlatform.isDarwin gnused) - ; - - # For building runtime libs - depsBuildTarget = - ( - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ] - ) - ++ optional targetPlatform.isLinux patchelf; - - buildInputs = [ - gmp mpfr libmpc - targetPackages.stdenv.cc.bintools # For linking code at run-time - ] ++ (optional (isl != null) isl) - ++ (optional (zlib != null) zlib) - ; - - depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; + inherit (callFile ../common/dependencies.nix { }) + depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; - NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm"; - preConfigure = import ../common/pre-configure.nix { - inherit lib; - inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; - }; + preConfigure = callFile ../common/pre-configure.nix { }; dontDisableStatic = true; configurePlatforms = [ "build" "host" "target" ]; - configureFlags = import ../common/configure-flags.nix { - inherit - lib - stdenv - targetPackages - crossStageStatic libcCross threadsCross - version - - binutils gmp mpfr libmpc isl - - enableLTO - enableMultilib - enablePlugin - enableShared - - langC - langD - langCC - langFortran - langAda - langGo - langObjC - langObjCpp - langJit - ; - }; + configureFlags = callFile ../common/configure-flags.nix { }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; @@ -226,8 +237,7 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - inherit - (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget preFixup; @@ -250,10 +260,7 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - inherit - (import ../common/extra-target-flags.nix { - inherit lib stdenv crossStageStatic langD libcCross threadsCross; - }) + inherit (callFile ../common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET ; @@ -267,22 +274,14 @@ stdenv.mkDerivation ({ inherit enableShared enableMultilib; meta = { - homepage = "https://gcc.gnu.org/"; - license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as - libraries for these languages (libstdc++, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = lib.teams.gcc.members; - - platforms = lib.platforms.unix; + inherit (callFile ../common/meta.nix { }) + homepage + license + description + longDescription + platforms + maintainers + ; badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 113bd83ea53fc..2d7a058fa015c 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -240,25 +240,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 c9e9b00f60ed1..78d13cb941e3c 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -25,7 +25,6 @@ , langJit }: -assert cloog != null -> lib.versionOlder version "5"; assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] @@ -119,7 +118,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 @@ -188,7 +187,7 @@ let # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" - ++ lib.optionals (cloog != null) [ + ++ lib.optionals (lib.versionOlder version "5" && cloog != null) [ "--with-cloog=${cloog}" "--disable-cloog-version-check" "--enable-cloog-backend=isl" diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix new file mode 100644 index 0000000000000..d3ae3e33c46c5 --- /dev/null +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, version +, buildPackages +, targetPackages +, texinfo +, which +, gettext +, pkg-config ? null +, gnused +, patchelf +, gmp +, mpfr +, libmpc +, libucontext ? null +, libxcrypt ? null +, cloog ? null +, isl ? null +, zlib ? null +, gnatboot ? null +, flex ? null +, boehmgc ? null +, zip ? null +, unzip ? null +, gtk2 ? null +, libart_lgpl ? null +, perl ? null +, xlibs ? null +, langJava ? false +, javaAwtGtk ? false +, langAda ? false +, langGo ? false +, crossStageStatic ? null +, threadsCross ? null +}: + +let + inherit (lib) optionals; + inherit (stdenv) buildPlatform hostPlatform targetPlatform; +in + +{ + # same for all gcc's + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + texinfo + which + gettext + ] + ++ optionals (perl != null) [ perl ] + ++ optionals javaAwtGtk [ pkg-config ] + ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ] + ++ optionals langAda [ gnatboot ] + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ optionals buildPlatform.isDarwin [ gnused ] + ; + + # For building runtime libs + # same for all gcc's + depsBuildTarget = + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ + # build != host == target + stdenv.cc + ] + ) + ++ optionals targetPlatform.isLinux [ patchelf ]; + + buildInputs = [ + gmp + mpfr + libmpc + ] + ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ] + ++ [ + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] + ++ optionals (lib.versionOlder version "5" && cloog != null) [ cloog ] + ++ optionals (isl != null) [ isl ] + ++ optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc zip unzip ] + ++ optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs) + ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ] + ; + + # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too + depsTargetTarget = optionals (!crossStageStatic && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ]; +} diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix new file mode 100644 index 0000000000000..84c3dc189b1fa --- /dev/null +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -0,0 +1,19 @@ +{ lib, version, }: + +with lib; { + homepage = "https://gcc.gnu.org/"; + license = licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}"; + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + platforms = platforms.unix; + maintainers = if versionOlder version "5" then [ maintainers.veprbl ] else teams.gcc.members; + +} diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index e6ccc2598035b..3703797765096 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # -fcommon: workaround build failure on -fno-common toolchains: # ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of # `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here - NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon"; + env.NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon"; meta = with lib; { description = "GNU Common Lisp compiler working via GCC"; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 3d2fd7551e67d..110378244fd00 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gambit ] ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; - NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; + env.NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 10ee40f710c81..41461a26d425f 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -122,6 +122,7 @@ let # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -420,6 +421,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 94ad5a78a0a76..22552fa67fb2f 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -137,6 +137,7 @@ let # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -416,6 +417,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 4cd22a358e147..79b006ce5537b 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -94,6 +94,7 @@ let { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; + isHadrian = true; }; aarch64-darwin = { variantSuffix = ""; @@ -107,6 +108,7 @@ let { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; + isHadrian = true; }; }; # Binary distributions for the musl libc for the respective system. @@ -118,6 +120,7 @@ let sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481"; }; isStatic = true; + isHadrian = true; # We can't check the RPATH for statically linked executable exePathForLibraryCheck = null; archSpecificLibraries = [ @@ -263,20 +266,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` @@ -414,6 +403,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix new file mode 100644 index 0000000000000..a573e8855f5d5 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -0,0 +1,376 @@ +{ 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.2.6"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "7a54cf0398ad488b4ed219e15d1d1e64c0b6876c43a0564550dd11f0540d7305"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + 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 ."; + + # 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 + '' + 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 + ''; + + # 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/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index a3c1d5ca722c0..6870bdab1c8b1 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, git, pkg-config, openssl, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.25.3"; + version = "0.26.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JT9NUca+DaqxT36heaNKijIuqdnSvrYCfY2uM7wTOGo="; + rev = "refs/tags/v${version}"; + hash = "sha256-NLUAKNWbKPAf81ce1OWTy/pnDcF2LfF12825DfE8AWw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-YPyGCd4//yta3jy5tWB4C5yRgxNbfG+hGF5/QSch/6M="; + cargoSha256 = "sha256-IOZEdoQ5cqXjhgqNzOg4h5t8i3JDxfjamLFdesEy9Z8="; 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 f5f46ff9f4f7f..e0e980483064b 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "1.3.236.0"; + version = "1.3.239.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = "sdk-${version}"; - hash = "sha256-iVcx1j7OMJEU4cPydNwQSFufTUiqq7GKp69Y6pEt7Wc="; + hash = "sha256-P2HG/oJXdB5nvU3zVnj2vSLJGQuDcZiQBfBBvuR66Kk="; }; # These get set at all-packages, keep onto them for child drvs @@ -33,6 +33,14 @@ stdenv.mkDerivation rec { url = "https://github.com/KhronosGroup/glslang/commit/7627bd89583c5aafb8b38c81c15494019271fabf.patch"; hash = "sha256-1Dwhn78PG4gAGgEwTXpC+mkZRyvy8sTIsEvihXFeNaQ="; }) + # Upstream tries to detect the Darwin linker by checking for AppleClang, but it’s just Clang in nixpkgs. + # Revert the commit to allow the build to work on Darwin with the nixpkg Darwin Clang toolchain. + (fetchpatch { + name = "Fix-Darwin-linker-error.patch"; + url = "https://github.com/KhronosGroup/glslang/commit/586baa35a47b3aa6ad3fa829a27f0f4206400668.patch"; + hash = "sha256-paAl4E8GzogcxDEzn/XuhNH6XObp+i7WfArqAiuH4Mk="; + revert = true; + }) ]; postPatch = '' diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/development/compilers/gnu-cim/default.nix new file mode 100644 index 0000000000000..b1cb9f08597e0 --- /dev/null +++ b/pkgs/development/compilers/gnu-cim/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "gnu-cim"; + version = "5.1"; + + outputs = ["out" "lib" "man" "info"]; + + src = fetchurl { + url = "mirror://gnu/cim/cim-${version}.tar.gz"; + hash = "sha256-uQcXtm7EAFA73WnlN+i38+ip0QbDupoIoErlc2mgaak="; + }; + + postPatch = '' + for fname in lib/{simulation,simset}.c; do + substituteInPlace "$fname" \ + --replace \ + '#include "../../lib/cim.h"' \ + '#include "../lib/cim.h"' + done + ''; + + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + + doCheck = true; + + meta = with lib; { + description = "A GNU compiler for the programming language Simula"; + longDescription = '' + GNU Cim is a compiler for the programming language Simula. + It offers a class concept, separate compilation with full type checking, + interface to external C routines, an application package for process + simulation and a coroutine concept. Commonly used with the Demos for + discrete event modelling. + ''; + homepage = "https://www.gnu.org/software/cim/"; + license = licenses.gpl2; + platforms = platforms.all; + badPlatforms = [ "aarch64-darwin" ]; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 3c089f02920a1..a6ecf62bbcb76 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , tzdata , substituteAll @@ -87,6 +88,12 @@ stdenv.mkDerivation rec { }) ./remove-tools-1.11.patch ./go_no_vendor_checks-1.16.patch + + # runtime: support riscv64 SV57 mode + (fetchpatch { + url = "https://github.com/golang/go/commit/1e3c19f3fee12e5e2b7802a54908a4d4d03960da.patch"; + sha256 = "sha256-mk/9gXwQEcAkiRemF6GiNU0c0fhDR29/YcKgQR7ONTA="; + }) ]; GOOS = stdenv.targetPlatform.parsed.kernel.name; @@ -148,12 +155,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + '' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' rm -rf bin/*_* ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} ''} - '' else ""); + ''); installPhase = '' runHook preInstall @@ -173,6 +180,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 27223e6dea6eb..dda624c19122f 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , tzdata , substituteAll @@ -46,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.4"; + version = "1.19.6"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-7adNtKxJSACj5m7nhOSVv7ubjlNd+SSosBsagCi382g="; + hash = "sha256-1/ABP4Lm1/hizGy1yM20ju9fLiObNbqpfi8adGYEN2c="; }; strictDeps = true; @@ -87,6 +88,12 @@ stdenv.mkDerivation rec { }) ./remove-tools-1.11.patch ./go_no_vendor_checks-1.16.patch + + # runtime: support riscv64 SV57 mode + (fetchpatch { + url = "https://github.com/golang/go/commit/1e3c19f3fee12e5e2b7802a54908a4d4d03960da.patch"; + sha256 = "sha256-mk/9gXwQEcAkiRemF6GiNU0c0fhDR29/YcKgQR7ONTA="; + }) ]; GOOS = stdenv.targetPlatform.parsed.kernel.name; @@ -148,12 +155,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + '' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' rm -rf bin/*_* ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} ''} - '' else ""); + ''); installPhase = '' runHook preInstall @@ -173,6 +180,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index be569ed688c9d..f432e5468779f 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20rc3"; + version = "1.20.1"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-iMSJjeo/vu1Mi/CXZCXyxx27EdodN7U3TdR2JjKOMYs="; + hash = "sha256-tcGjr1LDhabRx2rtU2HPJkWQI5gNAyDedli645FYMaI="; }; strictDeps = true; @@ -147,12 +147,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + '' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' rm -rf bin/*_* ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} ''} - '' else ""); + ''); installPhase = '' runHook preInstall @@ -172,6 +172,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}"; description = "The Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix new file mode 100644 index 0000000000000..a3236c14a084f --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -0,0 +1,175 @@ +{ lib +, stdenv +, alsa-lib +, autoPatchelfHook +, cairo +, cups +, darwin +, fontconfig +, glib +, gtk3 +, makeWrapper +, setJavaClassPath +, unzip +, xorg +, zlib + # extra params +, javaVersion +, meta ? { } +, products ? [ ] +, gtkSupport ? stdenv.isLinux +, ... +} @ args: + +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "alsa-lib" + "autoPatchelfHook" + "cairo" + "cups" + "darwin" + "fontconfig" + "glib" + "gtk3" + "makeWrapper" + "setJavaClassPath" + "unzip" + "xorg" + "zlib" + "javaVersion" + "meta" + "products" + "gtkSupport" + ]; + runtimeLibraryPath = lib.makeLibraryPath + ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); + mapProducts = key: default: (map (p: p.graalvmPhases.${key} or default) products); + concatProducts = key: lib.concatStringsSep "\n" (mapProducts key ""); + + graalvmXXX-ce = stdenv.mkDerivation ({ + pname = "graalvm${javaVersion}-ce"; + + unpackPhase = '' + runHook preUnpack + + mkdir -p "$out" + + # The tarball on Linux has the following directory structure: + # + # graalvm-ce-java11-20.3.0/* + # + # while on Darwin it looks like this: + # + # graalvm-ce-java11-20.3.0/Contents/Home/* + # + # We therefor use --strip-components=1 vs 3 depending on the platform. + tar xf "$src" -C "$out" --strip-components=${ + if stdenv.isLinux then "1" else "3" + } + + # Sanity check + if [ ! -d "$out/bin" ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi + + runHook postUnpack + ''; + + postUnpack = '' + for product in ${toString products}; do + cp -Rv $product/* $out + done + ''; + + dontStrip = true; + + nativeBuildInputs = [ unzip makeWrapper ] + ++ lib.optional stdenv.isLinux autoPatchelfHook; + + propagatedBuildInputs = [ setJavaClassPath zlib ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + ]; + + preInstall = concatProducts "preInstall"; + postInstall = '' + # jni.h expects jni_md.h to be in the header search path. + ln -sf $out/include/linux/*_md.h $out/include/ + + # copy-paste openjdk's preFixup + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook << EOF + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + '' + concatProducts "postInstall"; + + preFixup = lib.optionalString (stdenv.isLinux) '' + for bin in $(find "$out/bin" -executable -type f); do + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + done + '' + concatProducts "preFixup"; + postFixup = concatProducts "postFixup"; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + ${# broken in darwin + lib.optionalString stdenv.isLinux '' + echo "Testing Jshell" + echo '1 + 1' | $out/bin/jshell + ''} + + echo ${ + lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + '' + } > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + echo "Testing GraalVM" + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + ${concatProducts "installCheckPhase"} + + runHook postInstallCheck + ''; + + passthru = { + inherit products; + home = graalvmXXX-ce; + updateScript = ./update.sh; + }; + + meta = with lib; ({ + 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; teams.graalvm-ce.members ++ [ ]; + } // meta); + } // extraArgs); +in +graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix new file mode 100644 index 0000000000000..6037435d3aec4 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, autoPatchelfHook +, graalvm-ce +, makeWrapper +, perl +, unzip +, zlib + # extra params +, product +, javaVersion +, extraBuildInputs ? [ ] +, extraNativeBuildInputs ? [ ] +, graalvmPhases ? { } +, meta ? { } +, passthru ? { } +, ... +} @ args: + +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "autoPatchelfHook" + "graalvm-ce" + "makeWrapper" + "perl" + "unzip" + "zlib" + "product" + "javaVersion" + "extraBuildInputs" + "extraNativeBuildInputs" + "graalvmPhases" + "meta" + "passthru" + ]; +in +stdenv.mkDerivation ({ + pname = "${product}-java${javaVersion}"; + + nativeBuildInputs = [ perl unzip makeWrapper ] + ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ extraNativeBuildInputs; + + buildInputs = [ + stdenv.cc.cc.lib # libstdc++.so.6 + zlib + ] ++ extraBuildInputs; + + unpackPhase = '' + runHook preUnpack + + unpack_jar() { + local jar="$1" + unzip -q -o "$jar" -d "$out" + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + symlink $2, "$ENV{out}/$1"; + }' "$out/META-INF/symlinks" + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' "$out/META-INF/permissions" + rm -rf "$out/META-INF" + } + + unpack_jar "$src" + + runHook postUnpack + ''; + + # Allow autoPatchelf to automatically fix lib references between products + fixupPhase = '' + runHook preFixup + + mkdir -p $out/lib + shopt -s globstar + ln -s $out/languages/**/lib/*.so $out/lib + + runHook postFixup + ''; + + dontInstall = true; + dontBuild = true; + dontStrip = true; + + passthru = { + inherit product javaVersion; + # build phases that are going to run during GraalVM derivation build, + # since they depend in having the fully setup GraalVM environment + # e.g.: graalvmPhases.installCheckPhase will run the checks only after + # GraalVM+products is build + # see buildGraalvm.nix file for the available phases + inherit graalvmPhases; + } // passthru; + + meta = with lib; ({ + inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; + description = "High-Performance Polyglot VM (Product: ${product})"; + } // meta); +} // extraArgs) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 17ecd5060ba29..a0d57b75faa2e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -1,75 +1,168 @@ -{ callPackage, Foundation }: -/* - Add new graal versions and products here and then see update.nix on how to - generate the sources. -*/ +{ lib +, stdenv +, callPackage +, fetchurl +}: let - mkGraal = opts: callPackage (import ./mkGraal.nix opts) { - inherit Foundation; + buildGraalvm = callPackage ./buildGraalvm.nix; + buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; + javaPlatform = { + "aarch64-linux" = "linux-aarch64"; + "x86_64-linux" = "linux-amd64"; + "aarch64-darwin" = "darwin-aarch64"; + "x86_64-darwin" = "darwin-amd64"; }; + javaPlatformVersion = javaVersion: + "${javaVersion}-${javaPlatform.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}")}"; + source = product: javaVersion: (import ./hashes.nix).${product}.${javaPlatformVersion javaVersion} + or (throw "Unsupported product combination: product=${product} java=${javaVersion} system=${stdenv.system}"); - /* - Looks a bit ugly but makes version update in the update script using sed - much easier +in +rec { + inherit buildGraalvm buildGraalvmProduct; - Don't change these values! They will be updated by the update script, see ./update.nix. - */ - graalvm11-ce-release-version = "22.3.0"; - graalvm17-ce-release-version = "22.3.0"; + ### Java 11 ### - products = [ - "graalvm-ce" - "native-image-installable-svm" - ]; + # Mostly available for build purposes, not to be exposed at the top level + graalvm11-ce-bare = buildGraalvm rec { + version = "22.3.1"; + javaVersion = "11"; + src = fetchurl (source "graalvm-ce" javaVersion); + meta.platforms = builtins.attrNames javaPlatform; + products = [ ]; + }; -in -{ - inherit mkGraal; - - graalvm11-ce = mkGraal rec { - config = { - x86_64-darwin = { - inherit products; - arch = "darwin-amd64"; - }; - x86_64-linux = { - inherit products; - arch = "linux-amd64"; - }; - aarch64-darwin = { - inherit products; - arch = "darwin-aarch64"; - }; - aarch64-linux = { - inherit products; - arch = "linux-aarch64"; - }; - }; - defaultVersion = graalvm11-ce-release-version; + graalvm11-ce = graalvm11-ce-bare.override { + products = [ native-image-installable-svm-java11 ]; + }; + + # Mostly available for testing, not to be exposed at the top level + graalvm11-ce-full = graalvm11-ce-bare.override { + products = [ + js-installable-svm-java11 + llvm-installable-svm-java11 + native-image-installable-svm-java11 + nodejs-installable-svm-java11 + python-installable-svm-java11 + ruby-installable-svm-java11 + wasm-installable-svm-java11 + ]; + }; + + js-installable-svm-java11 = callPackage ./js-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + + llvm-installable-svm-java11 = callPackage ./llvm-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "llvm-installable-svm" javaVersion); + }; + + native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "native-image-installable-svm" javaVersion); + }; + + nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "nodejs-installable-svm" javaVersion); + graalvm-ce = graalvm11-ce-bare; + }; + + python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + + ruby-installable-svm-java11 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java11; + }; + + wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; + + ### Java 17 ### + + # Mostly available for build purposes, not to be exposed at the top level + graalvm17-ce-bare = buildGraalvm rec { + version = "22.3.1"; + javaVersion = "17"; + src = fetchurl (source "graalvm-ce" javaVersion); + meta.platforms = builtins.attrNames javaPlatform; + products = [ ]; + }; + + graalvm17-ce = graalvm17-ce-bare.override { + products = [ native-image-installable-svm-java17 ]; + }; + + # Mostly available for testing, not to be exposed at the top level + graalvm17-ce-full = graalvm17-ce-bare.override { + products = [ + js-installable-svm-java17 + llvm-installable-svm-java17 + native-image-installable-svm-java17 + nodejs-installable-svm-java17 + python-installable-svm-java17 + ruby-installable-svm-java17 + wasm-installable-svm-java17 + ]; + }; + + js-installable-svm-java17 = callPackage ./js-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + + llvm-installable-svm-java17 = callPackage ./llvm-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "llvm-installable-svm" javaVersion); + }; + + native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "native-image-installable-svm" javaVersion); + }; + + nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "nodejs-installable-svm" javaVersion); + graalvm-ce = graalvm17-ce-bare; + }; + + python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + + ruby-installable-svm-java17 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java17; }; - graalvm17-ce = mkGraal rec { - config = { - x86_64-darwin = { - inherit products; - arch = "darwin-amd64"; - }; - x86_64-linux = { - inherit products; - arch = "linux-amd64"; - }; - aarch64-darwin = { - inherit products; - arch = "darwin-aarch64"; - }; - aarch64-linux = { - inherit products; - arch = "linux-aarch64"; - }; - }; - defaultVersion = graalvm17-ce-release-version; + wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json deleted file mode 100644 index c9145e9654f83..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "darwin-aarch64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "c9657e902c2ba674931c3cf233a38c4de3d5186ae5d70452f9df75ac0c4cacff", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-darwin-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "dd9f91a970c7270b3f7fe8e711ba1ae081d34ed433c75f2bb0459aaf19e0fbe7", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-darwin-aarch64-22.3.0.jar" - } - }, - "darwin-amd64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "b8b39d6a3e3a9ed6348c2776ff071fc64ca90f98999ee846e6ca7e5fdc746a8b", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-darwin-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "00fe13c42813f581955eb35370bb8409ba17c7fdc83971d000baf695be2a0cb5", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-darwin-amd64-22.3.0.jar" - } - }, - "linux-aarch64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "c6646149dad486a0b02c5fc10649786240f275efda65aa14a25d01d2f5bafe15", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "0886e214f03f8a44962ecab459a94afb5c6a0f20910cb128d9ff775f4a9e4162", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-aarch64-22.3.0.jar" - } - }, - "linux-amd64": { - "graalvm-ce|java11|22.3.0": { - "sha256": "d4200bcc43e5ad4e6949c1b1edc1e59f63066e3a2280d5bd82d0c9b1d67c3f2c", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java11|22.3.0": { - "sha256": "17843f92dc9de74b161a63c52cc2a4597e5472cf3f6f6d71930fb655b35f9208", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-amd64-22.3.0.jar" - } - } -} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json deleted file mode 100644 index dc2da450b6996..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "darwin-aarch64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "dfc0c8998b8d00fcca87ef1c866c6e4985fd20b0beba3021f9677f9b166dfaf8", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-darwin-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "b6e44cb03f560bb43db1fd0aa862af36ba1df6717765920d91c18519712adfe9", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-darwin-aarch64-22.3.0.jar" - } - }, - "darwin-amd64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "422cd6abecfb8b40238460c09c42c5a018cb92fab4165de9691be2e3c3d0e8d1", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-darwin-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "9ce13874e62877d3bbe3faa4a57fbbffc766fdc8191971e7b25de0226fe86598", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-darwin-amd64-22.3.0.jar" - } - }, - "linux-aarch64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "e27249d9eef4504deb005cf14c6a028aad1adfa37209e12e9d7407710c08ed90", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-linux-aarch64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "d5b833c44d37fbe4df75906f73144e2db01e683bca3386fe185f4abbc8fbc798", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-linux-aarch64-22.3.0.jar" - } - }, - "linux-amd64": { - "graalvm-ce|java17|22.3.0": { - "sha256": "3473d8b3b1bc682e95adfb3ac1d9a59b51b0f43e2b752f2a5b550e4ebfa2fd17", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java17-linux-amd64-22.3.0.tar.gz" - }, - "native-image-installable-svm|java17|22.3.0": { - "sha256": "d1f5c58b65c57ad8a0c7da0c4569ce815ebf1ae503b0741ba1facf27b816d398", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java17-linux-amd64-22.3.0.jar" - } - } -} diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix new file mode 100644 index 0000000000000..eb2f455abbe59 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -0,0 +1,267 @@ +# Generated by pkgs/development/compilers/graalvm/community-edition/update.sh script +{ + "llvm-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0h8xkvsixcwak5dymkj3jgjv11w3ivnd6d45v5pdbymd0m2ifia8"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "nodejs-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "wasm-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "js-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1b8vnjjsa548c6j3dycxp57i9xmyvndiz2xhv7fm10izcplyspxq"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "python-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1yl36x5svld7qnm3m6vmacm2n4d6l9vhdxhaypvlv2bbfbnym3c5"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "native-image-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0z9rbmci6yz7f7mqd3xzsxc5ih4hq72lyzqfchan7fr6mh38d6gw"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "03v20fc9famlnbrznpasnd5gdl5k9nl4dlj3pp6bad4y6l7rqnx5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "1yb7kpbs7hrzlysvrqjzgfz678p1hbg6237jzb35zmwdaczav51n"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "00fbyqsj4xj9ay8bki1190lf59bgrzvla8lzzq51p53a1bdrhhmv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1kaqvkbhj3iifq6asyrpy225a89y7klzbh7an1ycnvc2hvqkv4nz"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "09l7x4x8yanq55v6y6wpfx94mvsq1bpbnihknjc6dnq3vcrci77n"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "036w9dmdcs46kmjqr3086mg389fgr3h1zysavfq8cbh199x0ibia"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "1hvjfvcn878bzvi944v3x23sby72hbfvg5s3zzspyc37l5cdpqi3"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "graalvm-ce" = { + "11-linux-aarch64" = { + sha256 = "1g4a3z9993pq52j3jf25pbcq9rvl8jz1yar8c859jw5chaf3ysml"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-aarch64-22.3.1.tar.gz"; + }; + "17-linux-aarch64" = { + sha256 = "06288dwbql943nii74i9mngzb38h2nzrxzzgs346mgk2965gwm59"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-aarch64-22.3.1.tar.gz"; + }; + "11-linux-amd64" = { + sha256 = "1f6xkdnxn6xsm24sqw24rsca72wm7v6q96m23l5fng5ym0jpfm2m"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-amd64-22.3.1.tar.gz"; + }; + "17-linux-amd64" = { + sha256 = "0aci9i28rq5nk2qya9dcg5hxr3sgsbv7f5x8679hrjrqmrclmkrs"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-amd64-22.3.1.tar.gz"; + }; + "11-darwin-aarch64" = { + sha256 = "0cbcm9d211m4b6g1bkpfksma917lzqkl4kx38vm1nrwjkll357y5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-aarch64-22.3.1.tar.gz"; + }; + "17-darwin-aarch64" = { + sha256 = "1qbw3hlmqcrmd70xk56463scdxr50n66z2n3c24h68qlwwlpqc73"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-aarch64-22.3.1.tar.gz"; + }; + "11-darwin-amd64" = { + sha256 = "0a12rzf99x5l29f6bwm6myk18dgnrx2c9rwmii2pm864y7azlnij"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-amd64-22.3.1.tar.gz"; + }; + "17-darwin-amd64" = { + sha256 = "02lclv2j3v850izh84wdvksi3d3xmgpfl7x85vzifhgsvagm6sz4"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz"; + }; + }; + "ruby-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "10wm1sq7smywy63mzlsbn21kzd65yaqj8yismpq8bz19h9skas7w"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix new file mode 100644 index 0000000000000..45cf50e90feef --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix @@ -0,0 +1,17 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "js-installable-svm"; + + graalvmPhases.installCheckPhase = '' + echo "Testing GraalJS" + echo '1 + 1' | $out/bin/js + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix new file mode 100644 index 0000000000000..9fc8fb3db95ed --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix @@ -0,0 +1,18 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "llvm-installable-svm"; + + # TODO: improve this test + graalvmPhases.installCheckPhase = '' + echo "Testing llvm" + $out/bin/lli --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix b/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix deleted file mode 100644 index bd2d4413ec52c..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/mkGraal.nix +++ /dev/null @@ -1,335 +0,0 @@ -{ - # An attrset describing each platform configuration. All values are extract - # from the GraalVM releases available on - # https://github.com/graalvm/graalvm-ce-builds/releases - # Example: - # config = { - # x86_64-linux = { - # # List of products that will be included in the GraalVM derivation - # # See `with{NativeImage,Ruby,Python,WASM,*}Svm` variables for the - # # available values - # products = [ "graalvm-ce" "native-image-installable-svm" ]; - # # GraalVM arch, not to be confused with the nix platform - # arch = "linux-amd64"; - # # GraalVM version - # version = "22.0.0.2"; - # }; - # } - config - # GraalVM version that will be used unless overridden by `config.<platform>.version` -, defaultVersion - # Java version used by GraalVM -, javaVersion - # Platforms were GraalVM will be allowed to build (i.e. `meta.platforms`) -, platforms ? builtins.attrNames config - # If set to true, update script will (re-)generate the sources file even if - # there are no updates available -, forceUpdate ? false - # Path for the sources file that will be used - # See `update.nix` file for a description on how this file works -, sourcesPath ? ./. + "/graalvm${javaVersion}-ce-sources.json" - # Use musl instead of glibc to allow true static builds in GraalVM's - # Native Image (i.e.: `--static --libc=musl`). This will cause glibc static - # builds to fail, so it should be used with care -, useMusl ? false -}: - -{ stdenv -, lib -, autoPatchelfHook -, fetchurl -, makeWrapper -, setJavaClassPath -, writeShellScriptBin - # minimum dependencies -, alsa-lib -, fontconfig -, Foundation -, freetype -, glibc -, openssl -, perl -, unzip -, xorg -, zlib - # runtime dependencies -, binutils -, cups -, gcc -, musl - # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? stdenv.isLinux -, cairo -, glib - # updateScript deps -, gnused -, gtk3 -, jq -, writeShellScript -}: - -assert useMusl -> stdenv.isLinux; - -let - platform = config.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - version = platform.version or defaultVersion; - name = "graalvm${javaVersion}-ce"; - sources = builtins.fromJSON (builtins.readFile sourcesPath); - - runtimeLibraryPath = lib.makeLibraryPath - ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); - - runtimeDependencies = lib.makeBinPath ([ - binutils - stdenv.cc - ] ++ lib.optionals useMusl [ - (lib.getDev musl) - # GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc - (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'') - ]); - - withNativeImageSvm = builtins.elem "native-image-installable-svm" platform.products; - withRubySvm = builtins.elem "ruby-installable-svm" platform.products; - withPythonSvm = builtins.elem "python-installable-svm" platform.products; - withWasmSvm = builtins.elem "wasm-installable-svm" platform.products; - - graalvmXXX-ce = stdenv.mkDerivation rec { - inherit version; - pname = name; - - srcs = map fetchurl (builtins.attrValues sources.${platform.arch}); - - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - freetype - stdenv.cc.cc.lib # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - zlib - ] ++ lib.optionals withRubySvm [ - openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so - ]; - - nativeBuildInputs = [ unzip perl makeWrapper ] - ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - - unpackPhase = '' - unpack_jar() { - jar=$1 - unzip -q -o $jar -d $out - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - system "ln -s $2 $ENV{out}/$1"; - }' $out/META-INF/symlinks - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' $out/META-INF/permissions - rm -rf $out/META-INF - } - - mkdir -p $out - arr=($srcs) - - # The tarball on Linux has the following directory structure: - # - # graalvm-ce-java11-20.3.0/* - # - # while on Darwin it looks like this: - # - # graalvm-ce-java11-20.3.0/Contents/Home/* - # - # We therefor use --strip-components=1 vs 3 depending on the platform. - tar xf ''${arr[0]} -C $out --strip-components=${ - if stdenv.isLinux then "1" else "3" - } - - # Sanity check - if [ ! -d $out/bin ]; then - echo "The `bin` is directory missing after extracting the graalvm" - echo "tarball, please compare the directory structure of the" - echo "tarball with what happens in the unpackPhase (in particular" - echo "with regards to the `--strip-components` flag)." - exit 1 - fi - - for jar in "''${arr[@]:1}"; do - unpack_jar "$jar" - done - ''; - - outputs = [ "out" "lib" ]; - - installPhase = '' - # ensure that $lib/lib exists to avoid breaking builds - mkdir -p "$lib/lib" - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # copy-paste openjdk's preFixup - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat > $out/nix-support/setup-hook << EOF - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ${ - lib.optionalString (stdenv.isLinux) '' - # provide libraries needed for static compilation - ${ - if useMusl then - ''for f in "${musl.stdenv.cc.cc}/lib/"* "${musl}/lib/"* "${zlib.static}/lib/"*; do'' - else - ''for f in "${glibc}/lib/"* "${glibc.static}/lib/"* "${zlib.static}/lib/"*; do'' - } - ln -s "$f" "$out/lib/svm/clibraries/${platform.arch}/$(basename $f)" - done - - # add those libraries to $lib output too, so we can use them with - # `native-image -H:CLibraryPath=''${lib.getLib graalvmXX-ce}/lib ...` and reduce - # closure size by not depending on GraalVM $out (that is much bigger) - # we always use glibc here, since musl is only supported for static compilation - for f in "${glibc}/lib/"*; do - ln -s "$f" "$lib/lib/$(basename $f)" - done - '' - } - ''; - - dontStrip = true; - - # Workaround for libssl.so.10 wanted by TruffleRuby - # Resulting TruffleRuby cannot use `openssl` library. - autoPatchelfIgnoreMissingDeps = withRubySvm && stdenv.isDarwin; - - preFixup = lib.optionalString (stdenv.isLinux) '' - # Find all executables in any directory that contains '/bin/' - for bin in $(find "$out" -executable -type f -wholename '*/bin/*'); do - wrapProgram "$bin" \ - --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" \ - --prefix PATH : "${runtimeDependencies}" - done - - find "$out" -name libfontmanager.so -exec \ - patchelf --add-needed libfontconfig.so {} \; - - ${ - lib.optionalString withRubySvm '' - # Workaround for libssl.so.10/libcrypto.so.10 wanted by TruffleRuby - patchelf $out/languages/ruby/lib/mri/openssl.so \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so - '' - } - ''; - - # $out/bin/native-image needs zlib to build native executables. - propagatedBuildInputs = [ setJavaClassPath zlib ] ++ - # On Darwin native-image calls clang and it - # tries to include <Foundation/Foundation.h>, - # and Interactive Ruby (irb) requires OpenSSL - # headers. - lib.optionals stdenv.hostPlatform.isDarwin [ Foundation openssl ]; - - doInstallCheck = true; - installCheckPhase = '' - echo ${ - lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } - } - '' - } > HelloWorld.java - $out/bin/javac HelloWorld.java - - # run on JVM with Graal Compiler - $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - - ${# --static flag doesn't work for darwin - lib.optionalString (withNativeImageSvm && stdenv.isLinux && !useMusl) '' - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces --no-server HelloWorld - ./helloworld | fgrep 'Hello World' - - echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image --no-server --static HelloWorld - ./helloworld | fgrep 'Hello World' - '' - } - - ${# --static flag doesn't work for darwin - lib.optionalString (withNativeImageSvm && stdenv.isLinux && useMusl) '' - echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image --no-server --libc=musl --static HelloWorld - ./helloworld | fgrep 'Hello World' - '' - } - - ${ - lib.optionalString withWasmSvm '' - echo "Testing Jshell" - echo '1 + 1' | $out/bin/jshell - '' - } - - ${ - lib.optionalString withPythonSvm '' - echo "Testing GraalPython" - $out/bin/graalpython -c 'print(1 + 1)' - echo '1 + 1' | $out/bin/graalpython - '' - } - - ${ - lib.optionalString withRubySvm '' - echo "Testing TruffleRuby" - # Hide warnings about wrong locale - export LANG=C - export LC_ALL=C - $out/bin/ruby -e 'puts(1 + 1)' - '' - # FIXME: irb is broken in all platforms - + lib.optionalString false '' - echo '1 + 1' | $out/bin/irb - '' - } - ''; - - passthru = { - inherit (platform) products; - home = graalvmXXX-ce; - updateScript = import ./update.nix { - inherit config defaultVersion forceUpdate gnused jq lib name sourcesPath writeShellScript; - graalVersion = version; - javaVersion = "java${javaVersion}"; - }; - }; - - meta = with lib; { - inherit platforms; - 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 - glittershark - babariviere - ericdallo - thiagokokada - ]; - }; - }; -in -graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix new file mode 100644 index 0000000000000..427c5ffef5b5e --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, graalvmCEPackages +, gcc +, glibc +, javaVersion +, musl +, src +, version +, writeShellScriptBin +, zlib +, useMusl ? false +, extraCLibs ? [ ] +}: + +assert useMusl -> stdenv.isLinux; +let + cLibs = [ glibc zlib.static ] + ++ lib.optionals (!useMusl) [ glibc.static ] + ++ lib.optionals useMusl [ musl ] + ++ extraCLibs; + # GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc + musl-gcc = (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"''); + binPath = lib.makeBinPath ([ gcc ] ++ lib.optionals useMusl [ musl-gcc ]); +in +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "native-image-installable-svm"; + + graalvmPhases.postInstall = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${lib.concatStringsSep " " + (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} + ''; + + graalvmPhases.installCheckPhase = '' + echo "Ahead-Of-Time compilation" + $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld + ./helloworld | fgrep 'Hello World' + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && !useMusl) '' + echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" + $out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld + ./helloworld | fgrep 'Hello World' + + echo "Ahead-Of-Time compilation with --static" + $out/bin/native-image --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''} + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && useMusl) '' + echo "Ahead-Of-Time compilation with --static and --libc=musl" + $out/bin/native-image --static HelloWorld --libc=musl + ./helloworld | fgrep 'Hello World' + ''} + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix new file mode 100644 index 0000000000000..022ac0a44fe18 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix @@ -0,0 +1,21 @@ +{ lib +, stdenv +, graalvmCEPackages +, graalvm-ce +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "nodejs-installable-svm"; + + extraNativeBuildInputs = [ graalvm-ce ]; + + # TODO: improve test + graalvmPhases.installCheckPhase = '' + echo "Testing NodeJS" + $out/bin/npx --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix new file mode 100644 index 0000000000000..43d6e85ef5603 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix @@ -0,0 +1,18 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "python-installable-svm"; + + graalvmPhases.installCheckPhase = '' + echo "Testing GraalPython" + $out/bin/graalpy -c 'print(1 + 1)' + echo '1 + 1' | $out/bin/graalpy + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix new file mode 100644 index 0000000000000..30d0739b4b1d7 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, graalvmCEPackages +, llvm-installable-svm +, openssl +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "ruby-installable-svm"; + + extraBuildInputs = [ + llvm-installable-svm + openssl + ]; + + preFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/languages/ruby/lib/mri/openssl.so \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + ''; + + graalvmPhases.installCheckPhase = '' + echo "Testing TruffleRuby" + # Fixup/silence warnings about wrong locale + export LANG=C + export LC_ALL=C + $out/bin/ruby -e 'puts(1 + 1)' + ${# broken in darwin with sandbox enabled + lib.optionalString stdenv.isLinux '' + echo '1 + 1' | $out/bin/irb + ''} + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.nix b/pkgs/development/compilers/graalvm/community-edition/update.nix deleted file mode 100644 index 8bb31c792ddae..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/update.nix +++ /dev/null @@ -1,227 +0,0 @@ -{ config -, defaultVersion -, forceUpdate -, gnused -, graalVersion -, javaVersion -, jq -, lib -, name -, sourcesPath -, writeShellScript -}: - -/* - How to use: - run `nix-shell maintainers/scripts/update.nix --argstr package graalvmXX-ce` - to update the graalvmXX-ce-sources.json file. - E.g: nix-shell maintainers/scripts/update.nix --argstr package graalvm17-ce - - Basic idea: - If we know the platform, product, javaVersion and graalVersion - we can create the url. This leads to the following json structure: - { - "platform/arch1": { - "product1|javaVersion|graalVersion": { "sha256": "...", "url": "..."}, - "product2|javaVersion|graalVersion": { "sha256": "...", "url": "..."}, - ... - }, - "platform/arch2": { - ... - } - } -*/ - -let - separator = "|"; - - # isDev :: String -> Boolean - isDev = version: - lib.hasInfix "dev" version; - - # getLatestVersion :: String -> String - getLatestVersion = currentVersion: - let - dev = if isDev currentVersion then "dev-" else ""; - url = "https://api.github.com/repos/graalvm/graalvm-ce-${dev}builds/releases/latest"; - file = builtins.fetchurl url; - json = builtins.fromJSON (builtins.readFile file); - in - lib.removePrefix "vm-" json.tag_name; - - # getArchString :: String -> String - getArchString = nixArchString: - { - "aarch64-linux" = "linux-aarch64"; - "aarch64-darwin" = "darwin-aarch64"; - "x86_64-linux" = "linux-amd64"; - "x86_64-darwin" = "darwin-amd64"; - }.${nixArchString}; - - - # getProductSuffix :: String -> String - getProductSuffix = productName: - { - "graalvm-ce" = ".tar.gz"; - "native-image-installable-svm" = ".jar"; - "ruby-installable-svm" = ".jar"; - "wasm-installable-svm" = ".jar"; - "python-installable-svm" = ".jar"; - "js-installable-svm" = ".jar"; - }.${productName}; - - # getProductSuffix :: String -> String - getProductBaseUrl = productName: - { - "graalvm-ce" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; - "native-image-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; - "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 - getDevUrl = { arch, graalVersion, product, javaVersion }: - let - baseUrl = https://github.com/graalvm/graalvm-ce-dev-builds/releases/download; - in - "${baseUrl}/${graalVersion}/${product}-${javaVersion}-${arch}-dev${getProductSuffix product}"; - - # getReleaseUrl :: AttrSet -> String - getReleaseUrl = { arch, graalVersion, product, javaVersion }: - let baseUrl = getProductBaseUrl product; - in - "${baseUrl}/vm-${graalVersion}/${product}-${javaVersion}-${arch}-${graalVersion}${getProductSuffix product}"; - - # getUrl :: AttrSet -> String - getUrl = args@{ arch, graalVersion, product, javaVersion }: - if isDev graalVersion - then getDevUrl args - else getReleaseUrl args; - - # computeSha256 :: String -> String - computeSha256 = url: - builtins.hashFile "sha256" (builtins.fetchurl url); - - # downloadSha256 :: String -> String - downloadSha256 = url: - let sha256Url = url + ".sha256"; - in - builtins.readFile (builtins.fetchurl sha256Url); - - # getSha256 :: String -> String -> String - getSha256 = graalVersion: url: - if isDev graalVersion - then computeSha256 url - else downloadSha256 url; - - # cartesianZipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c] - cartesianZipListsWith = f: fst: snd: - let - cartesianProduct = lib.cartesianProductOfSets { a = fst; b = snd; }; - fst' = builtins.catAttrs "a" cartesianProduct; - snd' = builtins.catAttrs "b" cartesianProduct; - in - lib.zipListsWith f fst' snd'; - - # zipListsToAttrs :: [a] -> [b] -> AttrSet - zipListsToAttrs = names: values: - lib.listToAttrs ( - lib.zipListsWith (name: value: { inherit name value; }) names values - ); - - # genProductJavaVersionGraalVersionAttrSet :: String -> AttrSet - genProductJavaVersionGraalVersionAttrSet = product_javaVersion_graalVersion: - let - attrNames = [ "product" "javaVersion" "graalVersion" ]; - attrValues = lib.splitString separator product_javaVersion_graalVersion; - in - zipListsToAttrs attrNames attrValues; - - # genUrlAndSha256 :: String -> String -> AttrSet - genUrlAndSha256 = arch: product_javaVersion_graalVersion: - let - productJavaVersionGraalVersion = - (genProductJavaVersionGraalVersionAttrSet product_javaVersion_graalVersion) - // { inherit arch; }; - url = getUrl productJavaVersionGraalVersion; - sha256 = getSha256 productJavaVersionGraalVersion.graalVersion url; - in - { - ${arch} = { - ${product_javaVersion_graalVersion} = { - inherit sha256 url; - }; - }; - }; - - # genArchProductVersionPairs :: String -> -> String -> AttrSet -> [AttrSet] - genArchProductVersionList = javaVersion: graalVersion: archProducts: - let - arch = archProducts.arch; - products = archProducts.products; - javaGraalVersion = javaVersion + separator + (getLatestVersion (archProducts.version or graalVersion)); - productJavaGraalVersionList = - cartesianZipListsWith (a: b: a + separator + b) - products [ javaGraalVersion ]; - in - cartesianZipListsWith (genUrlAndSha256) [ arch ] productJavaGraalVersionList; - - - # genSources :: String -> String -> AttrSet -> Path String - genSources = javaVersion: defaultVersion: config: - let - archProducts = builtins.attrValues config; - sourcesList = builtins.concatMap (genArchProductVersionList javaVersion defaultVersion) archProducts; - sourcesAttr = builtins.foldl' (lib.recursiveUpdate) { } sourcesList; - in - builtins.toFile "sources.json" (builtins.toJSON sourcesAttr); - - # isNew :: String -> String -> Boolean - isNew = newVersion: currentVersion: - { - "-1" = false; - "0" = false; - "1" = true; - }.${builtins.toString (builtins.compareVersions newVersion currentVersion)}; - - newVersion = getLatestVersion graalVersion; - sourcesJson = genSources javaVersion defaultVersion config; - sourcesJsonPath = lib.strings.escapeShellArg sourcesPath; - - # versionKeyInDefaultNix String -> String - versionKeyInDefaultNix = graalVersion: - if isDev graalVersion - then "${name}-dev-version" - else "${name}-release-version"; - - /* - updateScriptText :: String -> String -> String - Writes the json file and updates the version in default.nix using sed - because update-source-version does not work srcs. - */ - updateScriptText = newVersion: currentVersion: - - if (forceUpdate || (isNew newVersion currentVersion)) - then - let - versionKey = versionKeyInDefaultNix currentVersion; - in - '' - echo "New version found. Updating ${currentVersion} -> ${newVersion}". - export PATH="${lib.makeBinPath [ jq gnused ]}:$PATH" - jq . ${sourcesJson} > ${sourcesJsonPath} - sed -i 's|${versionKey} = "${currentVersion}";|${versionKey} = "${newVersion}";|' \ - ${lib.strings.escapeShellArg ./default.nix} - '' - else ''echo "No new version found. Skip updating."''; - -in -writeShellScript "update-graal.sh" '' - set -o errexit - set -o nounset - set -o pipefail - - ${updateScriptText newVersion graalVersion} -'' diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh new file mode 100755 index 0000000000000..6cafb0f0d1186 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p coreutils curl.out nix jq gnused -i bash + +set -eou pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +tmpfile="$(mktemp --suffix=.nix)" + +trap 'rm -rf "$tmpfile"' EXIT + +info() { echo "[INFO] $*"; } + +echo_file() { echo "$@" >> "$tmpfile"; } + +verlte() { + [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ] +} + +readonly hashes_nix="hashes.nix" +readonly nixpkgs=../../../../.. + +readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version --json | jq -r)" + +if [[ -z "${1:-}" ]]; then + readonly gh_version="$(curl \ + ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | \ + jq --raw-output .tag_name)" + readonly new_version="${gh_version//vm-/}" +else + readonly new_version="$1" +fi + +info "Current version: $current_version" +info "New version: $new_version" +if verlte "$new_version" "$current_version"; then + info "graalvm-ce $current_version is up-to-date." + [[ -z "${FORCE:-}" ]] && exit 0 +else + info "graalvm-ce $current_version is out-of-date. Updating..." +fi + +declare -r -A products_urls=( + [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" + [js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar" + [llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar" + [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" + [nodejs-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/nodejs-installable-svm-java@platform@-${new_version}.jar" + [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" + [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" + [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" +) + +readonly platforms=( + "11-linux-aarch64" + "17-linux-aarch64" + "11-linux-amd64" + "17-linux-amd64" + "11-darwin-aarch64" + "17-darwin-aarch64" + "11-darwin-amd64" + "17-darwin-amd64" +) + +info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..." + +# Indentation of `echo_file` function is on purpose to make it easier to visualize the output +echo_file "# Generated by $0 script" +echo_file "{" +for product in "${!products_urls[@]}"; do + url="${products_urls["${product}"]}" +echo_file " \"$product\" = {" + for platform in "${platforms[@]}"; do + args=("${url//@platform@/$platform}") + # Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same + # e.g.: when adding a new product and running this script with FORCE=1 + if [[ "$current_version" == "$new_version" ]] && \ + previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r)"; then + args+=("$previous_hash" "--type" "sha256") + else + info "Hash in '$product' for '$platform' not found. Re-downloading it..." + fi + if hash="$(nix-prefetch-url "${args[@]}")"; then +echo_file " \"$platform\" = {" +echo_file " sha256 = \"$hash\";" +echo_file " url = \"${url//@platform@/${platform}}\";" +echo_file " };" + else + info "Error while downloading '$product' for '$platform'. Skipping it..." + fi + done +echo_file " };" +done +echo_file "}" + +info "Updating graalvm-ce version..." +# update-source-version does not work here since it expects src attribute +sed "s|$current_version|$new_version|" -i default.nix + +info "Moving the temporary file to hashes.nix" +mv "$tmpfile" "$hashes_nix" + +info "Done!" diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix new file mode 100644 index 0000000000000..9a5bef7c1e35c --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, graalvm-ce +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "wasm-installable-svm"; + + # TODO: improve this test + graalvmPhases.installCheckPhase = '' + echo "Testing wasm" + $out/bin/wasm --help + ''; + + # Not supported in aarch64-darwin yet as GraalVM 22.3.1 release + meta.platforms = builtins.filter (p: p != "aarch64-darwin") graalvm-ce.meta.platforms; +} diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix index c04897fad1bbd..1213653208129 100644 --- a/pkgs/development/compilers/hare/default.nix +++ b/pkgs/development/compilers/hare/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: { - harec = callPackage ./harec { }; - hare = callPackage ./hare { }; + harec = pkgs.callPackage ./harec { }; + hare = pkgs.callPackage ./hare { }; }) diff --git a/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff index 4f8ba6056046d..4f8ba6056046d 100644 --- a/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch +++ b/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff diff --git a/pkgs/development/compilers/hare/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk index 1d0783b118d3c..b3b0f535915a0 100644 --- a/pkgs/development/compilers/hare/hare/config-template.mk +++ b/pkgs/development/compilers/hare/hare/config-template.mk @@ -25,3 +25,20 @@ SCDOC = scdoc # Where to store build artifacts # set HARECACHE externally + +# Cross-compiler toolchains +# # TODO: fixup this +AARCH64_AS=aarch64-as +AARCH64_AR=aarch64-ar +AARCH64_CC=aarch64-cc +AARCH64_LD=aarch64-ld + +RISCV64_AS=riscv64-as +RISCV64_AR=riscv64-ar +RISCV64_CC=riscv64-cc +RISCV64_LD=riscv64-ld + +X86_64_AS=as +X86_64_AR=ar +X86_64_CC=cc +X86_64_LD=ld diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 2c6b8da6e3427..c1d5e7800c958 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -2,25 +2,30 @@ , stdenv , fetchFromSourcehut , binutils-unwrapped -, harec +, harePackages , makeWrapper , qbe , scdoc , substituteAll }: -stdenv.mkDerivation (finalAttrs: { +let + inherit (harePackages) harec; +in +stdenv.mkDerivation (self: { pname = "hare"; - version = "unstable-2022-07-30"; + version = "unstable-2023-02-10"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare"; - rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9"; - hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc="; + rev = "52b3f2d0c7a85e04a79666a954101e527b7f1272"; + hash = "sha256-/zP8LbZ113Ar06MZF1zP20LKMGko+4HcOXSntLVAQAU="; }; - patches = [ ./disable-failing-test-cases.patch ]; + patches = [ + ./000-disable-failing-test-cases.diff + ]; nativeBuildInputs = [ binutils-unwrapped @@ -86,12 +91,13 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { homepage = "http://harelang.org/"; description = "A systems programming language designed to be simple, stable, and robust"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (harec.meta) platforms badPlatforms; + broken = stdenv.isAarch64; # still figuring how to set cross-compiling stuff }; }) diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix index bdc9ef56b9d11..b29f53151ae46 100644 --- a/pkgs/development/compilers/hare/harec/default.nix +++ b/pkgs/development/compilers/hare/harec/default.nix @@ -4,15 +4,15 @@ , qbe }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "harec"; - version = "unstable-2022-07-02"; + version = "unstable-2023-02-08"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "harec"; - rev = "56359312644f76941de1878d33a1a0b840be8056"; - hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4="; + rev = "4730fa6b835f08c44bd7991cc8b264fbc27d752b"; + hash = "sha256-XOhZWdmkMAuXbj7svILJI3wI7RF9OAb/OE1uGel4/vE="; }; nativeBuildInputs = [ @@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { homepage = "http://harelang.org/"; description = "Bootstrapping Hare compiler written in C for POSIX systems"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; # The upstream developers do not like proprietary operating systems; see # https://harelang.org/platforms/ - platforms = with platforms; + platforms = with lib.platforms; lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); - badPlatforms = with platforms; darwin; + badPlatforms = lib.platforms.darwin; }; }) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 610fffa03879e..5aa423bbf84ba 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -49,7 +49,7 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "hip-${hipPlatform}"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index 54641d45bce5e..1fde0f320c405 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/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 2d42d69775efa..143feeb98e16f 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -30,7 +30,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; javaVersion = "17.0.5"; - build = "653.14"; + build = "653.25"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-7Nx7Y12oMfs4zeQMSfnUaDCW1xJYMEkcoTapSpmVCfU="; + hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU="; }; BOOT_JDK = openjdk17-bootstrap.home; @@ -79,8 +79,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { installPhase = let buildType = if debugBuild then "fastdebug" else "release"; - debugSuffix = if debugBuild then "-fastdebug" else ""; - jcefSuffix = if debugBuild then "" else "_jcef"; + debugSuffix = lib.optionalString debugBuild "-fastdebug"; + jcefSuffix = lib.optionalString (!debugBuild) "_jcef"; in '' runHook preInstall diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 71bf442c82cdb..d13b078494ad3 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.0-beta2"; + version = "1.9.0-beta4"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs="; + hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM="; }; patches = [ @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao joshniemela ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 7e84d78e0d8eb..f3ed8a45b88a7 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 cb78eb5c6b34a..a07e724cbd7a3 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.8.0"; + version = "1.8.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-C7lBn6yYMqVqOhnK0oL48tbxI30tRn3I3+m9SipDxC4="; + hash = "sha256-TD+nvBu57zBYojGdi8w7cZYHn4jpL9zY0wSkb0trV4c="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 9288fafa6f77a..c7de19cd5b49a 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.8.0"; + version = "1.8.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "19dcc2ylh11vxirglda8xrrm06i2nd53ndd8b1smf2vyj0v9593m"; - "macos-x86_64" = "0pkc4g09qwp4lcvs62qis0zxdjbr9z5mbgyi4mczxx5kqha4fxp3"; - "linux-x86_64" = "124nvhjh9xj8nsdjf71vzsgfjdq6mc0nalk79xfvsp2wh7xd8d0n"; + "macos-aarch64" = "119ar6wax0bkp5fmardplhsvaw1jhpfr5xgkpkkv10nmx4agbkh8"; + "macos-x86_64" = "1nqqzx397k1ifpdymaw39iz5mzpyi7n00kpw03y5iq5avzr7rsjj"; + "linux-x86_64" = "0hlpda33y07d8dybjn65gzdl0ws0r8vda515pr2rhfisls18lp2c"; }.${arch}; in fetchurl { diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 72f4a9591184b..93ef913b4a7d8 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -10,12 +10,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-JwFFreUV70W5soXY0UF8/4QlN2oWejdxqwh4KT5VDoQ="; + sha256 = "sha256-gyMSpy+F3pF2Kv1ygUs20mrspJ6GtJ6ySyZD7zfZj2w="; fetchSubmodules = true; }; @@ -94,6 +94,7 @@ ocamlPackages.buildDunePackage rec { data-encoding pure-splitmix zarith_stubs_js + simple-diff ]; nativeCheckInputs = [ diff --git a/pkgs/development/compilers/llvm/10/bintools/default.nix b/pkgs/development/compilers/llvm/10/bintools/default.nix index 1eb7215c00856..38002439c205d 100644 --- a/pkgs/development/compilers/llvm/10/bintools/default.nix +++ b/pkgs/development/compilers/llvm/10/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix index 7a4d3f06150c8..f113e55f2849a 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index f4120cb91cac5..4d46863fea1a5 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -65,13 +65,13 @@ let # `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; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; # disabled until recommonmark supports sphinx 3 #Llvm-manpages = lowPrio (tools.libllvm.override { diff --git a/pkgs/development/compilers/llvm/10/lldb/default.nix b/pkgs/development/compilers/llvm/10/lldb/default.nix index c1be5230e2206..4a40a931af65b 100644 --- a/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 95eba5d7fb36e..41c20ac47ebfd 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -191,7 +192,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/11/bintools/default.nix b/pkgs/development/compilers/llvm/11/bintools/default.nix index 1eb7215c00856..38002439c205d 100644 --- a/pkgs/development/compilers/llvm/11/bintools/default.nix +++ b/pkgs/development/compilers/llvm/11/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index aa725afdb8b40..979ec9e23f65d 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index c950beef0e8d1..fdaba0ca2be45 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -67,7 +67,7 @@ let # `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; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -80,7 +80,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/11/lldb/default.nix b/pkgs/development/compilers/llvm/11/lldb/default.nix index 46d6c6628e105..5912323608dcc 100644 --- a/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -69,8 +69,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 2123efdf23519..93cf2757c6522 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -203,7 +204,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/12/bintools/default.nix b/pkgs/development/compilers/llvm/12/bintools/default.nix index 1eb7215c00856..38002439c205d 100644 --- a/pkgs/development/compilers/llvm/12/bintools/default.nix +++ b/pkgs/development/compilers/llvm/12/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index d0b02c3aaeb85..22e2ab9d5b2b0 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index da3beccbe3252..73f53350206b0 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -68,13 +68,13 @@ let # `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; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; # disabled until recommonmark supports sphinx 3 #Llvm-manpages = lowPrio (tools.libllvm.override { diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index b6659034e8131..c75eb255cd75d 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -85,8 +85,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index b04eeb3c72693..3d5592e19ee59 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -191,7 +192,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/13/bintools/default.nix b/pkgs/development/compilers/llvm/13/bintools/default.nix index b6ee7b4dc25cf..b69f4bd129175 100644 --- a/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 52aa9ffe11f5c..02ddabad6769a 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 3fc459eb7f042..29dda832e4496 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -70,13 +70,13 @@ let # `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; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/13/lldb/default.nix b/pkgs/development/compilers/llvm/13/lldb/default.nix index d040e2b3975ee..ca7a17a5e90d2 100644 --- a/pkgs/development/compilers/llvm/13/lldb/default.nix +++ b/pkgs/development/compilers/llvm/13/lldb/default.nix @@ -101,8 +101,11 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 32e96212fa575..e2d6da816f32c 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -153,7 +154,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix index b6ee7b4dc25cf..b69f4bd129175 100644 --- a/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix index 4351c56ef530b..aff2722074ee3 100644 --- a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 5d14c2f5f933e..314a882db8efa 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -70,13 +70,13 @@ let # `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; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/14/lldb/default.nix b/pkgs/development/compilers/llvm/14/lldb/default.nix index 2493dcde0c845..cd28325a55737 100644 --- a/pkgs/development/compilers/llvm/14/lldb/default.nix +++ b/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -106,8 +106,15 @@ stdenv.mkDerivation (rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' - if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then + echo "ERROR: python files not installed where expected!"; + return 1; + fi + if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then + echo "ERROR: lua files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch index f69ed9e162fb4..f2a3b27296c13 100644 --- a/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch @@ -2,15 +2,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 79d451965ed4..78188978d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH +@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH # If we are not building as part of LLVM, build LLDB as a standalone project, # using LLVM as an external library. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + include(GNUInstallDirs) + project(lldb) - include(LLDBStandalone) - + set(LLDB_BUILT_STANDALONE TRUE) + endif() +@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") +@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua") + else() +- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}") ++ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}") + endif() + get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR) + finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}") diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake index 3291a7c808e1..b27d27ce6a87 100644 --- a/cmake/modules/AddLLDB.cmake @@ -34,3 +52,16 @@ index 7d48491ec89a..c04543585588 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 7d48491ec89a..c04543585588 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -70,7 +70,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) \ No newline at end of file diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 5437735f78fed..d8010ecf893d2 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -6,6 +6,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -165,7 +166,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" 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 0000000000000..c7b20dd28e234 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/bintools/default.nix @@ -0,0 +1,37 @@ +{ lib, runCommand, stdenv, llvm, lld, version }: + +let + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; +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 0000000000000..b0671150a7bd9 --- /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 0000000000000..f767c56836d5c --- /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 0000000000000..1c94f293eb934 --- /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 <w@wdtz.org> +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 0000000000000..07013e5a68259 --- /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 0000000000000..ca1c2332abd9f --- /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 0000000000000..425dc2af01e7c --- /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 0000000000000..6f20d23b32bc1 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -0,0 +1,158 @@ +{ 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; + + env.NIX_CFLAGS_COMPILE = toString [ + "-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_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 <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" + ''; + + # 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. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000000..f3b1f63a7d713 --- /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 0000000000000..135cf625ef78f --- /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 0000000000000..894a74e74d464 --- /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 0000000000000..d12e705702bd6 --- /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 = lib.licenses.ncsa; + 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; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang; + + 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 0000000000000..94374c8a312df --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -0,0 +1,110 @@ +{ 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. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch new file mode 100644 index 0000000000000..daee5bdd0ed33 --- /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 0000000000000..cb5fa44f07009 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -0,0 +1,108 @@ +{ 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. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + }; +} 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 0000000000000..fa587612aaf63 --- /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 0000000000000..4ebfe46aa813d --- /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 0000000000000..dd14e2acaf869 --- /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 0000000000000..edfb2a8760bd6 --- /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 0000000000000..e8bca769de5fa --- /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 0000000000000..ea62b2ad50c75 --- /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 0000000000000..20d35c9f3ea91 --- /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 0000000000000..4b50b79cf613b --- /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 + # `<bsm/audit_session.h>` 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 0000000000000..4388f5c7f593f --- /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 0000000000000..7b200e86505ca --- /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 <sys/ptrace.h> ++#include <asm/ptrace.h> ++ ++// 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 <vector> + +-#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 <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#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 0000000000000..e0db80afeb9f7 --- /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/<version number>'. + 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 0000000000000..de98c43615314 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -0,0 +1,430 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, fetchpatch +, cmake +, darwin +, ninja +, python3 +, python3Packages +, libffi +, enableGoldPlugin ? libbfd.hasPluginAPI +, 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 (enableGoldPlugin) [ + "-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 0000000000000..b01363e98aa00 --- /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 0000000000000..0ef317af8cc75 --- /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 0000000000000..32f1d13a9dc23 --- /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 0000000000000..d824516c0a16c --- /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 0000000000000..1354ad267314a --- /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 0000000000000..d51335436ad23 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/openmp/default.nix @@ -0,0 +1,74 @@ +{ 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. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch new file mode 100644 index 0000000000000..103b054ed1763 --- /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 0000000000000..77a93208832a1 --- /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 0000000000000..1e952fdc36a8f --- /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/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix index 6a9aa416f47be..bf3edf5258a07 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 3cfc89dac75f3..d446608d35357 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -41,7 +41,7 @@ let # `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; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -54,7 +54,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index a4d04f0618c7e..31b88098c83a8 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libxml2 , ncurses @@ -168,10 +169,9 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - ++ lib.optional (!isDarwin) + ] ++ lib.optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ lib.optionals (isDarwin) [ + ] ++ lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix index c8841b479d1f9..ce7d6161f6201 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index a0c4ba7271852..e5b5094f05cca 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -41,7 +41,7 @@ let # `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; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -54,7 +54,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index d18bf2149e1d7..954887cd23680 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -4,6 +4,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libxml2 , ncurses @@ -162,7 +163,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/7/bintools/default.nix b/pkgs/development/compilers/llvm/7/bintools/default.nix index 1eb7215c00856..38002439c205d 100644 --- a/pkgs/development/compilers/llvm/7/bintools/default.nix +++ b/pkgs/development/compilers/llvm/7/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix index ff960c89a9c5d..2de67dc043861 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 7ddd14b60d3db..3fc0b359ad6c2 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -65,7 +65,7 @@ let # `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; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix index 3ab2daad32bd4..0a0aa3be18a19 100644 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ b/pkgs/development/compilers/llvm/7/lldb/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fno-rtti"; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; cmakeFlags = [ "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index da72bb8b35ae3..eaeef3c2ef505 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -180,7 +181,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/8/bintools/default.nix b/pkgs/development/compilers/llvm/8/bintools/default.nix index 1eb7215c00856..38002439c205d 100644 --- a/pkgs/development/compilers/llvm/8/bintools/default.nix +++ b/pkgs/development/compilers/llvm/8/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix index 209c70f83416c..eadb46acd7093 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 29a2ee7ddc1ec..d628eab465094 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -65,7 +65,7 @@ let # `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; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/8/lldb/default.nix b/pkgs/development/compilers/llvm/8/lldb/default.nix index 3612211542984..4e8cdcdf8ac2f 100644 --- a/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -75,8 +75,11 @@ stdenv.mkDerivation rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 5c381a896e152..aa76fc0c3cf7e 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -173,7 +174,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/9/bintools/default.nix b/pkgs/development/compilers/llvm/9/bintools/default.nix index 1eb7215c00856..38002439c205d 100644 --- a/pkgs/development/compilers/llvm/9/bintools/default.nix +++ b/pkgs/development/compilers/llvm/9/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix index b4e83d3c30147..be7380470ce9f 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index e2191a81e7958..57187c5ecf1e7 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -65,7 +65,7 @@ let # `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; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; diff --git a/pkgs/development/compilers/llvm/9/lldb/default.nix b/pkgs/development/compilers/llvm/9/lldb/default.nix index 57560ccbfe5be..49cc0a0d42a68 100644 --- a/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -80,8 +80,11 @@ stdenv.mkDerivation rec { doCheck = false; + doInstallCheck = true; + installCheckPhase = '' if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + echo "ERROR: python files not installed where expected!"; return 1; fi ''; diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index f8b6a8170f85a..89bc014f5c65a 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -188,7 +189,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/git/bintools/default.nix b/pkgs/development/compilers/llvm/git/bintools/default.nix index 303faf7bbb61b..c7b20dd28e234 100644 --- a/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -1,10 +1,7 @@ -{ runCommand, stdenv, llvm, lld, version }: +{ lib, runCommand, stdenv, llvm, lld, version }: let - prefix = - if stdenv.hostPlatform != stdenv.targetPlatform - then "${stdenv.targetPlatform.config}-" - else ""; + prefix = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) "${stdenv.targetPlatform.config}-"; in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; passthru = { diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index ae4a7f1244ef9..029f953c83e4a 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ++ lib.optional stdenv.isDarwin xcbuild.xcrun; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" ]; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index ffbce74a48220..67c6bcf44373a 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -69,13 +69,13 @@ let # `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; }; + llvm = tools.libllvm; libclang = callPackage ./clang { inherit llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; llvm-manpages = lowPrio (tools.libllvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index b4e2757f20ca1..9a0d375df9c37 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -6,6 +6,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) , libbfd , libpfm , libxml2 @@ -151,7 +152,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index f014676a1809e..272a1209b4920 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -48,7 +48,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-llvm-${targetName}"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -65,7 +65,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-iyr3cstC8CB1YaACadNqBs/oI8lh4bJzK0WtEB0wZvg="; + hash = "sha256-BDvC6QFDFtahA9hmJDLiM6K4mrO3j9E9rEXm7KulcuA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 4f2b081b4db24..903fdb54fee14 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 0000000000000..e58b8ad498d6f --- /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; + + env.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/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index 332f3d83e263c..f0d95323fe33f 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 5a96242da7b13..3d62434a57cff 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation { runHook postConfigure ''; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-parameter" + "-Wno-error=use-after-free" + ]; + buildPhase = '' runHook preBuild cd src diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index f4b1c48d229df..f7c40f8a0e7b8 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "0gnzip7qfadnl0r1k8bpc9a6796sy503h77ggds02wrz7mpq32nf"; + sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA="; }; nativeBuildInputs = [ ruby bison rake ]; @@ -24,6 +24,14 @@ stdenv.mkDerivation rec { doCheck = true; + checkPhase = '' + runHook preCheck + + rake test + + runHook postCheck + ''; + meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 074ec0a47469a..bdd8022e69de3 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -262,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 af895131dec9a..3e13b9247fb98 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 c25da7346dd1c..e4a4ed0f9580e 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; prefixKey = "-prefix "; configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" libX11 ]; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 801e12d1549b9..70f7e9afa1de0 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -15,5 +15,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 59836955f4419..2e3445b20c7a5 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -18,5 +18,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix index 8c561c553295b..94c171560a337 100644 --- a/pkgs/development/compilers/ocaml/4.03.nix +++ b/pkgs/development/compilers/ocaml/4.03.nix @@ -17,5 +17,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index 9651650d0d69d..68c40855ca529 100644 --- a/pkgs/development/compilers/ocaml/4.04.nix +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -20,5 +20,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/pkgs/development/compilers/ocaml/4.05.nix index aabd1b2f69a5d..5f1130f339cb5 100644 --- a/pkgs/development/compilers/ocaml/4.05.nix +++ b/pkgs/development/compilers/ocaml/4.05.nix @@ -20,5 +20,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index 6e06ad585b2c6..903679b1b0827 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -17,5 +17,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index 1356a2b3c8e40..833e7fb27961f 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -17,5 +17,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index 9ab19a612671b..d5d11ead1f8a7 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -20,5 +20,5 @@ import ./generic.nix { # gcc-10. Otherwise build fails as: # ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of # `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } diff --git a/pkgs/development/compilers/ocaml/4.09.1-Werror.patch b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch new file mode 100644 index 0000000000000..153c8a06e34eb --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch @@ -0,0 +1,16 @@ +The 4.09.1 tarball appears to have been acidentally generated as a +development tarball, which causes configure to enable -Werror. This +means newer compilers will make the build fail. + +diff a/configure b/configure +--- a/configure ++++ b/configure +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index c5f649c15d6bb..2d06720939052 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -8,6 +8,7 @@ import ./generic.nix { hardeningDisable = [ "strictoverflow" ]; patches = [ + ./4.09.1-Werror.patch # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch"; sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; } diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1fa52721ddb97..c2cc7bb40b5f8 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -17,7 +17,7 @@ in 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 spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12"; assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0"; let diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 9d8a2367b9348..a61a66ada9349 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 0677d32e6ea98..95752b2c2fe43 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 <<EOF >test.cpp #include <string> @@ -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 72b25bff777b6..d350c937110f8 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -4,15 +4,15 @@ , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let major = "11"; minor = "0"; - update = "17"; - build = "8"; + update = "18"; + build = "10"; 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 = "sha256-kvgLYqQZPqyuigVyzbDHc3TMff0clvzM8IdzYLYcxPU="; + sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; @@ -72,7 +72,7 @@ let # Workaround for # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` # when building jtreg - NIX_CFLAGS_COMPILE = "-Wformat"; + env.NIX_CFLAGS_COMPILE = "-Wformat"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index bd3defbd6b98c..7f8ea2330b202 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -4,7 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: @@ -77,7 +77,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; NIX_LDFLAGS = lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 40dc753f7955c..a6c65ce710fe9 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -4,7 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: @@ -77,7 +77,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 047e1a3908191..07bded3676a42 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -4,7 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: @@ -72,7 +72,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index c33e937f9f24b..5f9013198c7fa 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -4,7 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: @@ -72,7 +72,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 461cd724144ed..becf6d9b96ecd 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -4,7 +4,7 @@ , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: @@ -79,7 +79,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 6d8087d7e948d..4714bf11c5558 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -4,15 +4,15 @@ , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let version = { feature = "17"; - interim = ".0.5"; - build = "8"; + interim = ".0.6"; + build = "10"; }; openjdk = stdenv.mkDerivation { @@ -23,7 +23,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-2k1Mm36ds6MZheZVsLvXkoqQG4zYeIRWzbP1aZ72Vqs="; + sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; @@ -88,7 +88,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 37b51a1ee4ce0..99ea75459def8 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -4,7 +4,7 @@ , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: @@ -86,7 +86,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 717bfedcb6354..41a630425e98a 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -7,15 +7,15 @@ # 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 +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: let version = { feature = "19"; - interim = ".0.1"; - build = "10"; + interim = ".0.2"; + build = "7"; }; openjdk = stdenv.mkDerivation { @@ -26,7 +26,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-IS6ABnVdW1qJ4gu4YSgMVFXBTNdtWFdbNNz+kMaiyk8="; + hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; @@ -57,8 +57,8 @@ let # 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="; + url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560"; + hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k="; }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch @@ -88,7 +88,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index c65a9fcc66b68..4e1d1ba6635b7 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 = "352"; + update = "362"; build = "ga"; openjdk8 = stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ let owner = "openjdk"; repo = "jdk8u"; rev = "jdk${version}"; - sha256 = "sha256-xDiiALDjStD9IPhbBr997rm/v2Q/WdS10cILBCmdJIQ="; + sha256 = "sha256-C5dQwfIIpIrLeO3JWERyFCQHUSgG8gARuc3qXAeLkJ4="; }; outputs = [ "out" "jre" ]; @@ -78,7 +78,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html "-Wno-error=deprecated-declarations" diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index 127a921f097c7..74383ddef783d 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -2,7 +2,7 @@ lib: version: with lib; { homepage = "https://openjdk.java.net/"; license = licenses.gpl2Only; description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo asbachb ]; + maintainers = with maintainers; [ edwtjo ]; 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" ]) [ diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 164677c3b8dcd..276767fa37a82 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,26 +1,19 @@ { 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 }: +, gperf, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 +, openjdk11-bootstrap +, withMedia ? true +, withWebKit ? false +}: let major = "11"; - update = ".0.17"; + update = ".0.18"; build = "1"; repover = "${major}${update}+${build}"; 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}"; @@ -28,10 +21,10 @@ let owner = "openjdk"; repo = "jfx${major}u"; rev = repover; - sha256 = "sha256-uKb6k+tIFdwy1BYiHWeGmKNz82X4CZjFlGYqLDpSFY0="; + sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -81,8 +74,8 @@ in makePackage { pname = "openjfx-modular-sdk"; gradleProperties = '' - COMPILE_MEDIA = true - COMPILE_WEBKIT = false + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 788baabde848f..b7ee8a0258193 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,9 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby }: +, pkg-config, perl, cmake, gperf, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, ffmpeg_4-headless, python3, ruby +, withMedia ? true +, withWebKit ? false +}: let major = "15"; @@ -21,7 +24,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -31,7 +34,7 @@ let JDK_HOME = ${openjdk11_headless.home} '' + args.gradleProperties or ""); - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. "-DGLIB_DISABLE_DEPRECATION_WARNINGS" @@ -76,8 +79,8 @@ in makePackage { pname = "openjfx-modular-sdk"; gradleProperties = '' - COMPILE_MEDIA = true - COMPILE_WEBKIT = false + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} ''; preBuild = '' @@ -95,7 +98,7 @@ in makePackage { # -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"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; stripDebugList = [ "." ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 8d4d47df32e7f..5c1d057a21880 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,11 +1,14 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, icu68 }: +, pkg-config, perl, cmake, gperf, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, ffmpeg_4-headless, python3, ruby, icu68 +, withMedia ? true +, withWebKit ? false +}: let major = "17"; - update = ".0.5"; - build = "+1"; + update = ".0.6"; + build = "+3"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { java = openjdk17_headless; @@ -18,10 +21,10 @@ let owner = "openjdk"; repo = "jfx${major}u"; rev = repover; - sha256 = "sha256-jzLOlWuhkUS0/4+nXtjd1/IYbAHHnJrusFRTh7aPt8U="; + sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -66,8 +69,8 @@ in makePackage { pname = "openjfx-modular-sdk"; gradleProperties = '' - COMPILE_MEDIA = true - COMPILE_WEBKIT = false + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} ''; preBuild = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19.nix index 96103734eb0a5..e0c23e4734b17 100644 --- a/pkgs/development/compilers/openjdk/openjfx/19.nix +++ b/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -1,11 +1,14 @@ { 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 }: +, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk3, libXtst +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, withMedia ? true +, withWebKit ? false +}: let major = "19"; - update = ""; - build = "+11"; + update = ".0.2.1"; + build = "+1"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { # note: gradle does not yet support running on 19 @@ -19,7 +22,7 @@ let owner = "openjdk"; repo = "jfx"; rev = repover; - hash = "sha256-UXTaXtJ8py83V7IQK9wACIEWDAMRUaYNgH9e/Aeyuzc="; + hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs="; }; patches = [ @@ -35,7 +38,7 @@ let }) ]; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + buildInputs = [ gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -83,8 +86,8 @@ in makePackage { pname = "openjfx-modular-sdk"; gradleProperties = '' - COMPILE_MEDIA = true - COMPILE_WEBKIT = false + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} ''; preBuild = '' diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 771830d8b6ac7..e36eb28d465e5 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -46,7 +46,8 @@ in stdenv.mkDerivation rec { ++ optionals buildDevDoc [ gtk-doc file docbook_xsl ] ; - doCheck = true; + # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41 + doCheck = !(stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"); passthru.tests = { inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 798cdb790b878..08406a2773532 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.5"; + version = "1.2.3.6"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-5wDwHj+1X6HhhiLfEbOzijpZH6GwpTPEKgNh3iIGTWY="; + sha256 = "sha256-3i2L1wORVN+X5sr4Hs+zGD/GgM1sAXt34R4kGMkd4qk="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/development/compilers/paco/default.nix index 69e7b2628787b..d8014dd8e51b1 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 a3ec48b7f1e72..0000000000000 --- 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/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 159dec05e2939..76d1ebdb4102e 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { pname = "picat"; - version = "3.0p4"; + version = "3.3p3"; src = fetchurl { - url = "http://picat-lang.org/download/picat30_4_src.tar.gz"; - sha256 = "1rwin44m7ni2h2v51sh2r8gj2k6wm6f86zgaylrria9jr57inpqj"; + url = "http://picat-lang.org/download/picat333_src.tar.gz"; + hash = "sha256-LMmAHCGKgon/wNbrXTUH9hiHyGVwwSDpB1236xawzXs="; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index fbb457359149a..18443efae7a2e 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { doCheck = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; installPhase = "make config=release prefix=$out " + lib.optionalString stdenv.isDarwin "bits=64 " diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index c9464813d3f2e..ee075ec040568 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "1.0"; + version = "1.1"; src = fetchzip { url = "https://c9x.me/compile/release/qbe-${version}.tar.xz"; - sha256 = "sha256-Or6m/y5hb9SlSToBevjhaSbk5Lo5BasbqeJmKd1QpGM="; + sha256 = "sha256-yFZ3cpp7eLjf7ythKFTY1YEJYyfeg2en4/D8+9oM1B4="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 6dca665ad99d8..732d33608e350 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 b58f24c151aa8..7cec0eb0ddbb8 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-lto"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/development/compilers/rust/1_66.nix b/pkgs/development/compilers/rust/1_66.nix deleted file mode 100644 index 6aee98bdba063..0000000000000 --- a/pkgs/development/compilers/rust/1_66.nix +++ /dev/null @@ -1,64 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost -, makeRustPlatform -, llvmPackages_11 -, llvmPackages_14, llvm_14 -} @ args: - -import ./default.nix { - 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; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; - - llvmBootstrapForDarwin = llvmPackages_11; - - # For use at runtime - llvmShared = llvm_14.override { enableSharedLibraries = true; }; - - # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_14; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.65.0"; - - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` - bootstrapHashes = { - 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_66; - - rustcPatches = [ - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_14" "llvm_14"]) diff --git a/pkgs/development/compilers/rust/1_67.nix b/pkgs/development/compilers/rust/1_67.nix new file mode 100644 index 0000000000000..2d22432798a41 --- /dev/null +++ b/pkgs/development/compilers/rust/1_67.nix @@ -0,0 +1,73 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security, SystemConfiguration +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost +, makeRustPlatform +, llvmPackages_11 +, llvmPackages_15, llvm_15 +, fetchpatch +} @ args: + +import ./default.nix { + rustcVersion = "1.67.1"; + rustcSha256 = "sha256-Rkg9Pl3oWjvUb456OuGDdJY5EGfb5xOiXTzwUbPZ/24="; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + + llvmBootstrapForDarwin = llvmPackages_11; + + # For use at runtime + llvmShared = llvm_15.override { enableSharedLibraries = true; }; + + # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox + llvmPackages = llvmPackages_15; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.66.1"; + + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` + bootstrapHashes = { + i686-unknown-linux-gnu = "823128f64e902ee8aff61488c552c983e17ccca10c3f46dd93fde924d5100eb3"; + x86_64-unknown-linux-gnu = "7ecf79e9ea23d05917b0172f9f81fb1e47011d261a719998f8d5620a1e835023"; + x86_64-unknown-linux-musl = "70b660148238b8a137c6f165b0bc7bdcb50204c22a314bed6174ecd672f02e57"; + arm-unknown-linux-gnueabihf = "12c93efe71f3334ef6e718786f6a60b9566f097d23a7f1e8f38ed9add209126f"; + armv7-unknown-linux-gnueabihf = "f43c8cd3fd7d1c1e08bd6317220b2ec9b25891f464604f80bb17985b09bbf62a"; + aarch64-unknown-linux-gnu = "84b8a79803c1b91386460fe6a7d04c54002344452ff8e5c5631d5fa275ed0c9c"; + aarch64-unknown-linux-musl = "b2665da33efd328cff192a67ad026ea84f9deab8d1971892f4bbc22647606163"; + x86_64-apple-darwin = "0fcf341db2579aa6eb61a3430cd1dbc79b042dfe89686b93cc887d818d086c30"; + aarch64-apple-darwin = "03469fcaa0d8c505e6db03c18ded73cfbb6a2ce159292f8cf06c042bfc9f7cf9"; + powerpc64le-unknown-linux-gnu = "ccf915a0137bb83a9d9b133a234ae53cc099f2ba26e3cb09d209b47bbee2ade7"; + riscv64gc-unknown-linux-gnu = "525cb05edaf3ed0560753b413c72dd1b06492df28bf3c427a66fda683fdca3fc"; + mips64el-unknown-linux-gnuabi64 = "3c241cc80410fe389e8b04beda62c42496c225fe8776db9d55a498c53244f7a6"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_67; + + rustcPatches = [ + # Fixes ICE. + # https://github.com/rust-lang/rust/pull/107688 + (fetchpatch { + name = "re-erased-regions-are-local.patch"; + url = "https://github.com/rust-lang/rust/commit/9d110847ab7f6aef56a8cd20cb6cea4fbcc51cd9.patch"; + excludes = [ "*tests/*" ]; + hash = "sha256-EZH5K1BEOOfi97xZr1xEHFP4jjvJ1+xqtRMvxBoL8pU="; + }) + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix index 3afa59739a374..b50097d5e66bc 100644 --- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix +++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -1,12 +1,9 @@ -{ lib, writeShellApplication, cargo, cargo-auditable }: +{ lib, writeShellScriptBin, cargo, cargo-auditable }: -(writeShellApplication { - name = "cargo"; - runtimeInputs = [ cargo cargo-auditable ]; - text = '' - CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 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.nix b/pkgs/development/compilers/rust/cargo.nix index 9b10767e5bff7..481b4195891ca 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib -, installShellFiles, makeWrapper, cacert, rustPlatform, rustc +, installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security , auditable ? false # TODO: change to true when this is the default }: @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { (lib.getDev pkgsHostHost.curl) zlib ]; - buildInputs = [ cacert file curl python3 openssl zlib ] + buildInputs = [ file curl python3 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that @@ -39,14 +39,7 @@ rustPlatform.buildRustPackage { RUSTC_BOOTSTRAP = 1; postInstall = '' - # NOTE: We override the `http.cainfo` option usually specified in - # `.cargo/config`. This is an issue when users want to specify - # their own certificate chain as environment variables take - # precedence - wrapProgram "$out/bin/cargo" \ - --suffix PATH : "${rustc}/bin" \ - --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ - --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" + wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" installManPage src/tools/cargo/src/etc/man/* @@ -76,7 +69,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/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 23b8e7effe123..499db45021eac 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -20,14 +20,21 @@ rustPlatform.buildRustPackage { # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) doCheck = false; + # Clippy uses the rustc_driver and std private libraries, and Rust's build process forces them to have + # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path + # to itself. + # + # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 + # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver + install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver" + install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy" ''; meta = with lib; { homepage = "https://rust-lang.github.io/rust-clippy/"; description = "A bunch of lints to catch common mistakes and improve your Rust code"; - maintainers = with maintainers; [ basvandijk ]; + maintainers = with maintainers; [ basvandijk ] ++ teams.rust.members; license = with licenses; [ mit asl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 64254d5025291..130cb8326115b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -11,6 +11,8 @@ , sha256 , patches ? [] , fd +, ripgrep +, wezterm , firefox , thunderbird }: @@ -165,7 +167,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - # TODO: remove libiconv once 1.66 is used to bootstrap ++ optionals stdenv.isDarwin [ libiconv Security ] ++ optional (!withBundledLLVM) llvmShared; @@ -205,13 +206,15 @@ in stdenv.mkDerivation rec { passthru = { llvm = llvmShared; inherit llvmPackages; - tests = { inherit fd; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; + tests = { + inherit fd ripgrep wezterm; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; }; 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 c9aa4a962ffa6..4fcccbf970410 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - NIX_CFLAGS_COMPILE = lib.optionals (lib.versionOlder version "2.1.10") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder version "2.1.10") [ # Workaround build failure on -fno-common toolchains like upstream # clang-13. Without the change build fails as: # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { "-fcommon" ] # Fails to find `O_LARGEFILE` otherwise. - ++ [ "-D_GNU_SOURCE" ]; + ++ [ "-D_GNU_SOURCE" ]); buildPhase = '' runHook preBuild @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) - } ${if stdenv.hostPlatform.system == "aarch64-darwin" then "--arch=arm64" else ""} + } ${lib.optionalString (stdenv.hostPlatform.system == "aarch64-darwin") "--arch=arm64"} (cd doc/manual ; make info) runHook postBuild diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 601f05a51bb0a..7652d176230a5 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"; @@ -88,7 +86,7 @@ stdenv.mkDerivation rec { nixfmt ] } - versionSelect='v${versions.major version}.${versions.minor version}.*' + versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*' oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" if [ "$oldVersion" != "$latestTag" ]; then @@ -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 1914156e59d61..0bcfe7bef7c47 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.2.2"; pname = "scala-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; - sha256 = "sha256-GUvQMICPb8feCDv9fHUjDXGa7cIPPLdWLcZdGLShcng="; + hash = "sha256-t8Xt70LozePoDXE3IHejWOTWCEYcOZytRDKz/QxgmZg="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/pkgs/development/compilers/scryer-prolog/cargo.patch b/pkgs/development/compilers/scryer-prolog/cargo.patch deleted file mode 100644 index 48db924ca261f..0000000000000 --- a/pkgs/development/compilers/scryer-prolog/cargo.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 05e54911..3a567165 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1826,6 +1826,7 @@ dependencies = [ - "futures", - "fxhash", - "git-version", -+ "gmp-mpfr-sys", - "hostname", - "hyper", - "hyper-tls", -diff --git a/Cargo.toml b/Cargo.toml -index 6e42de23..a50e3d47 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -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"] } - - [dev-dependencies] - assert_cmd = "1.0.3" diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 739d600bf63d3..4850f299dcbbb 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -1,13 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub +{ lib , rustPlatform -, rustfmt +, fetchFromGitHub +, pkg-config +, openssl , gmp , libmpc , mpfr -, openssl -, pkg-config +, stdenv }: rustPlatform.buildRustPackage rec { @@ -21,19 +20,16 @@ rustPlatform.buildRustPackage rec { sha256 = "bDLVOXX9nv6Guu5czRFkviJf7dBiaqt5O8SLUJlcBZo="; }; - cargoPatches = [ - # Use system openssl, gmp, mpc and mpfr. - ./cargo.patch - ]; + cargoSha256 = "sha256-tv/4GOl93nGLWyoAXY5roxRqS1twskkQTSddltH4n9U="; - cargoSha256 = "A6HtvxGTjJliDMUSGkQKB13FRyfBU4EPvrlZ97ic0Ic="; - - nativeBuildInputs = [ pkg-config rustfmt]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl gmp libmpc mpfr ]; + CARGO_FEATURE_USE_SYSTEM_LIBS = true; + meta = with lib; { broken = stdenv.isDarwin; - description = "A modern Prolog implementation written mostly in Rust."; + description = "A modern Prolog implementation written mostly in Rust"; homepage = "https://github.com/mthom/scryer-prolog"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ malbarbo ]; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 5b7eeb5b943e8..584c0e7a66046 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 diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 55bf5237e6180..9a3e68a1b73b3 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -96,7 +96,7 @@ let for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do patchShebangs "$i" done - TERM=xterm ./scripts/tests.sh ${if z3Support then "--no-smt" else ""} + TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"} popd ''; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 5747ce4b607b5..818ad22fae74c 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -139,7 +139,7 @@ in stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of # `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preAutoreconf = '' pushd ./platforms/unix/config > /dev/null diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/development/compilers/stanc/default.nix index e3df16230a78c..b4d0c5e682302 100644 --- a/pkgs/development/compilers/stanc/default.nix +++ b/pkgs/development/compilers/stanc/default.nix @@ -22,9 +22,11 @@ ocamlPackages.buildDunePackage rec { --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd" ''; + nativeBuildInputs = with ocamlPackages; [ + menhir + ]; buildInputs = with ocamlPackages; [ core_unix - menhir menhirLib ppx_deriving fmt diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix new file mode 100644 index 0000000000000..5f37c3ec841ba --- /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/<OS>`, + # containing binaries for supported archs. On other platforms, binaries are + # installed to `lib/swift/<OS>/<ARCH>`. 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 index 40d7728cf7884..40d7728cf7884 100644 --- a/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch +++ b/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 0000000000000..9c6cafed3699c --- /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 $<TARGET_FILE:clang> ++ 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 0000000000000..9a22d0482ea5c --- /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<char> &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<char> &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 0000000000000..a3cf4f60675cb --- /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 0000000000000..e09d5162a93a4 --- /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 0000000000000..a68326c580b12 --- /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 <algorithm> +@@ -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 0000000000000..987b99d745391 --- /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<std::string> &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 0000000000000..20d81a6e8296c --- /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<char> &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 0000000000000..e4697f631e708 --- /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 $<TARGET_FILE:swift-frontend-bootstrapping0> ++ 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 $<TARGET_FILE:swift-frontend-bootstrapping1> ++ 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 $<TARGET_FILE:swift-frontend> ++ 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 50bc73582f1ba..e8eb4d738ca93 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 { - 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"; - }; + callPackage = newScope self; - fetchAppleRepo = { repo, rev, sha256 }: - fetchFromGitHub { - owner = "apple"; - inherit repo rev sha256; - name = "${repo}-${rev}-src"; - }; + # 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; - fetchSwiftRelease = { repo, sha256, fetchSubmodules ? false }: - fetchFromGitHub { - owner = "apple"; - inherit repo sha256 fetchSubmodules; - rev = "swift-${versions.swift}-RELEASE"; - name = "${repo}-${versions.swift}-src"; - }; + # 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; - 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="; + # 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; - cmark-gfm = fetchAppleRepo { - repo = "swift-cmark"; - rev = "swift-${versions.swift}-RELEASE-gfm"; - sha256 = "sha256-g28iKmMR2W0r1urf8Fk1HBxAp5OlonNYSVN3Ril66tQ="; + swift-unwrapped = callPackage ./compiler { + inherit (darwin) DarwinTools cctools sigtool; + inherit (apple_sdk) MacOSX-SDK CLTools_Executables; + inherit (apple_sdk.frameworks) CoreServices Foundation Combine; }; - # 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="; + swiftNoSwiftDriver = callPackage ./wrapper { + swift = swift-unwrapped; + useSwiftDriver = false; }; - 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 . - ''; + Dispatch = if stdenv.isDarwin + then null # part of libsystem + else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; - patchPhase = '' - # Just patch all the things for now, we can focus this later. - patchShebangs $SWIFT_SOURCE_ROOT + Foundation = if stdenv.isDarwin + then apple_sdk.frameworks.Foundation + else callPackage ./foundation { swift = swiftNoSwiftDriver; }; - # 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; - - nativeCheckInputs = [ 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 + # 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; + }; - # Extract the generated tarball into the store. - tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 ''${out/#\/} - find $out -type d -empty -delete + swiftpm = callPackage ./swiftpm { + inherit (darwin) DarwinTools cctools; + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + swift = swiftNoSwiftDriver; + }; - # 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 + swift-driver = callPackage ./swift-driver { + swift = swiftNoSwiftDriver; + }; - 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 ]} + swift = callPackage ./wrapper { + swift = swift-unwrapped; + }; - 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 ]} - ''; + sourcekit-lsp = callPackage ./sourcekit-lsp { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; - # Hack to avoid build and install directories in RPATHs. - preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; + swift-docc = callPackage ./swift-docc { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; - 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 0000000000000..efb35bd74c9fe --- /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 0000000000000..a34984d19f047 --- /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 0000000000000..4a0616ded5ac5 --- /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 0000000000000..0ea1869d5528d --- /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($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:HAVE_CONFIG_H>) + + +-if(ENABLE_SWIFT) ++if(0) + set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>" CACHE PATH "Path where the libraries will be installed") + set(INSTALL_DISPATCH_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch") + set(INSTALL_BLOCK_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_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 0000000000000..dd696dc61085f --- /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 6c42921cd2338..0000000000000 --- 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 0b4c2cc55c4fe..0000000000000 --- 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 eb522ac96f7e9..0000000000000 --- 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 3cacdfc0c55e7..0000000000000 --- 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 928c1db6dee87..0000000000000 --- 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 46da01635540e..0000000000000 --- 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 0000000000000..deb82de20add2 --- /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 0000000000000..fbc898142f78e --- /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 0000000000000..af73c75539465 --- /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 0000000000000..53e790874d5d2 --- /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 0000000000000..c3b2fb60a7fcb --- /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 0000000000000..f85512f840711 --- /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 0000000000000..bcd873a44f89d --- /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 0000000000000..ced9a6df956c0 --- /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 0000000000000..60fe2aeb9c92d --- /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 0000000000000..760e8156c43fc --- /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 0000000000000..f9e893abb7c31 --- /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 0000000000000..b9eb23f21061d --- /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 0000000000000..c0cfe2b7d225d --- /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 0000000000000..6c3ae87d68c98 --- /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 0000000000000..6080865ebe37a --- /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 0000000000000..f297eafd389b1 --- /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 0000000000000..3025672563d27 --- /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 0000000000000..45d09093c62c9 --- /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 0000000000000..48a6350ece965 --- /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 0000000000000..9aeba452f9e80 --- /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 + $<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${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 + $<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${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 0000000000000..bef8d43a0dbc6 --- /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 0000000000000..406e1d68d0e42 --- /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 0000000000000..e24d154d29873 --- /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 0000000000000..60c4e33eb154f --- /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 0000000000000..327ccf37e4253 --- /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 0000000000000..785e82cc34b6d --- /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 0000000000000..160fbb1ccca31 --- /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 0000000000000..0c7e0f8cbcf87 --- /dev/null +++ b/pkgs/development/compilers/swift/wrapper/default.nix @@ -0,0 +1,57 @@ +{ 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 = lib.optionalString useSwiftDriver "${swift-driver}/bin/swift-driver"; + + 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 0000000000000..398f19977f667 --- /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 0000000000000..0c56e63b6f29e --- /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 0000000000000..c8003d8486f10 --- /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/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index d165b347c60af..e8d2ffe172654 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-I${ocaml}/include"; + env.NIX_CFLAGS_COMPILE = "-I${ocaml}/include"; buildPhase = "omake all"; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 159b1827fc8fd..ed1d7fc57a64f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { "-L${variables.libdir}" "-Wl,--rpath ${variables.libdir}" "-ltcc" - "-ldl" ]; variables = rec { prefix = "${placeholder "out"}"; diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix index 2c8d6eb21aebc..cae9a17ccca47 100644 --- a/pkgs/development/compilers/uasm/default.nix +++ b/pkgs/development/compilers/uasm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "uasm"; - version = "2.55"; + version = "2.56.2"; src = fetchFromGitHub { owner = "Terraspace"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { # the given path has multiple possibilities: #<Git::Ref:0x00007f618689c378>, #<Git::Ref:0x00007f618689c1e8> # Probably because upstream has both a tag and a branch with the same name rev = "refs/tags/v${version}"; - sha256 = "sha256-CIbHPKJa60SyJeFgF1Tux7RfJZBChhUVXR7HGa+gCtQ="; + hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = [ (fetchpatch { name = "fix-v2_55-compilation-on-macos.patch"; url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch"; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 67ebaa04699e3..b72548e753c37 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { -L${sqlite.out}/lib"; ''; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=use-after-free" + ]; + # Be sure to keep the statically linked libraries dontDisableStatic = true; diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix index 7d83624e84153..bda3653eb0d7b 100644 --- a/pkgs/development/compilers/xa/dxa.nix +++ b/pkgs/development/compilers/xa/dxa.nix @@ -4,14 +4,14 @@ , installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dxa"; version = "0.1.5"; src = fetchurl { urls = [ - "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" - "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/dxa-${self.version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/dxa-${self.version}.tar.gz" ]; hash = "sha256-jkDtd4FlgfmtlaysLtaaL7KseFDkM9Gc1oQZOkWCZ5k="; }; @@ -27,17 +27,18 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -d $out/bin/ - install dxa $out/bin/ + + install -Dm755 -T dxa $out/bin/dxa installManPage dxa.1 + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.floodgap.com/retrotech/xa/"; description = "Andre Fachat's open-source 6502 disassembler"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index db719c8fd23fa..9f4d45ba49774 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -4,16 +4,16 @@ , perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "xa"; - version = "2.3.13"; + version = "2.3.14"; src = fetchurl { urls = [ - "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" - "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/xa-${self.version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${self.version}.tar.gz" ]; - hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; + hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4="; }; nativeCheckInputs = [ perl ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - meta = with lib; { + meta = { homepage = "https://www.floodgap.com/retrotech/xa/"; description = "Andre Fachat's open-source 6502 cross assembler"; longDescription = '' @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { suite, as well as "bare" plain binary object files - block structure for label scoping ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index c933456afd1e5..7828d0e9b2590 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: libYap.a(pl-dtoa.o):/build/yap-6.3.3/H/pl-yap.h:230: multiple definition of `ATOM_'; # libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here - NIX_CFLAGS_COMPILE = "-fpermissive -fcommon"; + env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon"; meta = { # the linux 32 bit build fails. diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index e1c035745f709..dfe5152993f32 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.25"; + version = "0.26"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-hOuuKvT6ZM7G0HTGtVeEHHfJWqwUinD+DxT3r0CQZH0="; + hash = "sha256-0xV+323YTK+VhnD05SmvGv8uT4TzqA9IZ/iKl1as1Kc="; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 899006735873c..1ff817a82969e 100644 --- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -15,11 +15,11 @@ src = fetchFromGitHub { owner = "chipsalliance"; repo = "yosys-f4pga-plugins"; - rev = "e23ff6db487da9ceea576c53ac33853566c3a84e"; - hash = "sha256-HJ4br6lQwRrcnkLgV3aecr3T3zcPzA11MfxhRjwIb0I="; + rev = "08430ec4f53d1cf9d6a2091211d6c5ce501d5486"; + hash = "sha256-xCFi8OrNfsKt7bVSYJ/yuBify/pyCU1rI16gaCBgil8="; }; - version = "2022.11.07"; + version = "2023.02.08"; # Supported symbiflow plugins. # @@ -79,13 +79,13 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { ]; buildFlags = [ - "PLUGINS_DIR=\${out}/share/yosys/plugins/" - "DATA_DIR=\${out}/share/yosys/" + "YOSYS_PLUGINS_DIR=\${out}/share/yosys/plugins/" + "YOSYS_DATA_DIR=\${out}/share/yosys/" ]; checkFlags = [ - "PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" - "DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" + "YOSYS_PLUGINS_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" + "YOSYS_DATA_DIR=\${NIX_BUILD_TOP}/source/${plugin}-plugin" ( "NIX_YOSYS_PLUGIN_DIRS=\${NIX_BUILD_TOP}/source/${plugin}-plugin" # sdc and xdc plugins use design introspection for their tests + (lib.optionalString ( plugin == "sdc" || plugin == "xdc" ) diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index f8357c1e04253..549d0c50c3d9b 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform.system != "aarch64-linux"; #_FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = "-O"; + env.NIX_CFLAGS_COMPILE = "-O"; short_rev = builtins.substring 0 7 src.rev; makeFlags = [ diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix new file mode 100644 index 0000000000000..966be329befcf --- /dev/null +++ b/pkgs/development/compilers/zig/0.10.nix @@ -0,0 +1,72 @@ +{ 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" + + # ensure determinism in the compiler build + "-DZIG_TARGET_MCPU=baseline" + ]; + + 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 index e7c62a4cf938c..637186f686e90 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/0.9.1.nix @@ -62,6 +62,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # ensure determinism in the compiler build + "-DZIG_TARGET_MCPU=baseline" ]; doCheck = true; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index fb33f92bcc2a5..acde0cdb84c5e 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -14,7 +14,7 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.16"; out = "3.11"; } + { case = range "8.14" "8.16"; out = "3.12"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -25,10 +25,13 @@ let compcert = mkCoqDerivation rec { "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; + "3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0="; }; - 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; @@ -136,7 +139,7 @@ compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.16") "3.11" ]; + { cases = [ (isEq "8.16") (range "3.11" "3.12") ]; out = [ # Support for Coq 8.16.0 (fetchpatch { diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 8adea66a6de0d..7e7ec784c313b 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -56,7 +56,7 @@ in mkCoqDerivation { buildFlags = [ "OCAMLWARN=" ]; mlPlugin = true; - propagatedBuildInputs = [ elpi ]; + propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix new file mode 100644 index 0000000000000..e75171a943841 --- /dev/null +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -0,0 +1,36 @@ +{ lib, mkCoqDerivation, coq, serapi, makeWrapper, version ? null }: + +mkCoqDerivation rec { + pname = "coq-lsp"; + owner = "ejgallego"; + namePrefix = [ ]; + + useDune = true; + + release."0.1.6.1+8.16".sha256 = "sha256-aX8/pN4fVYaF7ZEPYfvYpEZLiQM++ZG1fAhiLftQ9Aw="; + + inherit version; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = isEq "8.16"; out = "0.1.6.1+8.16"; } + ] null; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + dune install ${pname} --prefix=$out + wrapProgram $out/bin/coq-lsp --prefix OCAMLPATH : $OCAMLPATH + runHook postInstall + ''; + + propagatedBuildInputs = [ serapi ] + ++ (with coq.ocamlPackages; [ camlp-streams dune-build-info menhir uri yojson ]); + + meta = with lib; { + description = "Language Server Protocol and VS Code Extension for Coq"; + homepage = "https://github.com/ejgallego/coq-lsp"; + changelog = "https://github.com/ejgallego/coq-lsp/blob/${defaultVersion}/CHANGES.md"; + maintainers = with maintainers; [ marsam ]; + license = licenses.lgpl21Only; + }; +} diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index e5e23247f1413..edf573bcccf5b 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -42,7 +42,7 @@ mkCoqDerivation { release."1.3-coq8.10".version = "1.3"; release."1.1.1-coq8.9".version = "1.1.1"; release."1.1-coq8.9".version = "1.1"; - releaseRev = v: "v${v}"; + releaseRev = v: "refs/tags/v${v}"; postPatch = '' substituteInPlace Makefile.coq.local --replace \ diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index b6e2df653becd..922a601584d42 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,10 +7,12 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit 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"; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 5f38c4bbae24c..b574f4c9fb209 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -6,6 +6,7 @@ repo = "Coq-Equations"; inherit 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,6 +55,8 @@ 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; diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index cc4966affcfdd..e6ef7b83c61a7 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.16"; out = "1.1.3+coq${coq.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"; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 27641f4f5a99a..260f6fb0a9d3f 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,7 +2,7 @@ let release = { - "8.16.0+0.16.0".sha256 = "sha256-Of5vO6wvqGyxagjGuuY3qCiLKbBr3VzLHiIn9U2R21E="; + "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; @@ -18,7 +18,7 @@ in defaultVersion = with versions; lib.switch coq.version [ - { case = isEq "8.16"; out = "8.16.0+0.16.0"; } + { case = isEq "8.16"; out = "8.16.0+0.16.3"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } @@ -88,7 +88,7 @@ in ]; propagatedBuildInputs = o.propagatedBuildInputs ++ - lib.optional (version == "8.16.0+0.16.0" || version == "dev") coq.ocamlPackages.ppx_hash + lib.optional (version == "8.16.0+0.16.3" || version == "dev") coq.ocamlPackages.ppx_hash ; }) diff --git a/pkgs/development/coq-modules/smtcoq/cvc4.nix b/pkgs/development/coq-modules/smtcoq/cvc4.nix index 036feae5865c3..5b555cc8fc080 100644 --- a/pkgs/development/coq-modules/smtcoq/cvc4.nix +++ b/pkgs/development/coq-modules/smtcoq/cvc4.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat ''; + patches = [ + ../../../applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch + ]; + preConfigure = '' patchShebangs ./src/ ''; diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix deleted file mode 100644 index 3044e884e3c68..0000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, stdenvNoCC -, autoPatchelfHook -, openssl -, icu -}: - -buildDotnetModule rec { - pname = "python-language-server"; - version = "2022-02-18"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "python-language-server"; - rev = "52c1afd34b5acb0b44597bb8681232876fe94084"; - sha256 = "05s8mwi3dqzjghgpr1mfs1b7cgrq818bbj1v7aly6axc8c2n4gny"; - }; - - projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj"; - nugetDeps = ./deps.nix; - - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.runtime_3_1; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc.lib ]; - runtimeDeps = [ openssl icu ]; - - postFixup = '' - mv $out/bin/Microsoft.Python.LanguageServer $out/bin/python-language-server - ''; - - passthru.updateScript = ./updater.sh; - - meta = with lib; { - description = "Microsoft Language Server for Python"; - homepage = "https://github.com/microsoft/python-language-server"; - license = licenses.asl20; - maintainers = with maintainers; [ thomasjm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix deleted file mode 100644 index de012bfb0abbc..0000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ /dev/null @@ -1,107 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "MessagePack"; version = "2.1.90"; sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.90"; sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; }) - (fetchNuGet { pname = "MicroBuild.Core"; version = "0.3.0"; sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.8"; sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; }) - (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 = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.6.13"; sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.6.13"; sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.5.76"; sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (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.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.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) - (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.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (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.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) - (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.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.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) - (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.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) - (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.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (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.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.5.46"; sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) - (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.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (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.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (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.Pipelines"; version = "4.7.0"; sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (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.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) - (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.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) - (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.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) - (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.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) - (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.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) -] diff --git a/pkgs/development/dotnet-modules/python-language-server/updater.sh b/pkgs/development/dotnet-modules/python-language-server/updater.sh deleted file mode 100755 index 33ab153aee261..0000000000000 --- a/pkgs/development/dotnet-modules/python-language-server/updater.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p gnused jq common-updater-scripts nix-prefetch-git -set -eo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -deps_file="$(realpath ./deps.nix)" - -nix-prefetch-git https://github.com/microsoft/python-language-server --quiet > repo_info -new_version="$(jq -r ".date" < repo_info | cut -d"T" -f1)" -new_hash="$(jq -r ".sha256" < repo_info)" -new_rev="$(jq -r ".rev" < repo_info)" -rm repo_info - -old_rev="$(sed -nE 's/\s*rev = "(.*)".*/\1/p' ./default.nix)" - -if [[ $new_rev == $old_rev ]]; then - echo "Already up to date!" - exit 0 -fi - -pushd ../../../.. -update-source-version python-language-server "$new_version" "$new_hash" --rev="$new_rev" -$(nix-build -A python-language-server.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index 2f8d7d878a8e0..eac0fcde53f69 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 3fbeaab38739b..99f1f6e784079 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv, installShellFiles }: let @@ -13,6 +13,10 @@ let sha256 = "sha256-jew4KLpOOXE9N/h4qFqof8y26DQrvm78E/ARbbwocD4="; }; + nativeBuildInputs = [ + installShellFiles + ]; + subPackages = [ "." ]; vendorSha256 = "sha256-BunonnjzGnpcmGJXxEQXvjJLGvdSXUOK9zAhXoAemHY="; @@ -23,6 +27,15 @@ let "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + postInstall = '' + export HOME="$(mktemp -d)" + for s in {bash,zsh,fish}; do + $out/bin/arduino-cli completion $s > completion.$s + installShellCompletion --cmd arduino-cli --$s completion.$s + done + unset HOME + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Arduino from the command line"; @@ -46,7 +59,9 @@ if stdenv.isLinux then extraInstallCommands = '' mv $out/bin/$name $out/bin/arduino-cli + cp -r ${pkg.outPath}/share $out/share ''; + passthru.pureGoPkg = pkg; targetPkgs = pkgs: with pkgs; [ zlib diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index f3d6cd6a6d89c..f53e49edaed4a 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # Explicitly specify targets so they don't get stripped. makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/pkgs/development/embedded/fpga/lattice-diamond/default.nix index e8bc4c1b1be53..f80261720cf67 100644 --- a/pkgs/development/embedded/fpga/lattice-diamond/default.nix +++ b/pkgs/development/embedded/fpga/lattice-diamond/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, - freetype, fontconfig, xorg, libusb-compat-0_1 }: + freetype, fontconfig, xorg, libusb-compat-0_1, coreutils }: stdenv.mkDerivation { pname = "diamond"; @@ -67,7 +67,7 @@ stdenv.mkDerivation { done # Patch executable ELFs. - for path in bin/lin64 ispfpga/bin/lin64; do + for path in bin/lin64 ispfpga/bin/lin64 synpbase/linux_a_64 synpbase/linux_a_64/mbin; do cd $out/$prefix/$path for f in *; do if ! file $f | grep -q "ELF 64-bit LSB executable" ; then @@ -79,19 +79,22 @@ stdenv.mkDerivation { # dependencies from nix. patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$libPath" --force-rpath \ + --set-rpath "$libPath:$out/$prefix/bin/lin64:$out/$prefix/ispfpga/bin/lin64" \ + --force-rpath \ $f done done + # Patch absolute /usr/bin/id path in script + sed -i -e "s#/usr/bin/id#${coreutils}/bin/id#" $out/$prefix/synpbase/bin/config/platform_set + # Remove 32-bit libz. rm $out/$prefix/bin/lin64/libz.{so,so.1} - # Make wrappers (should these target more than the 'diamond' tool?). - # The purpose of these is just to call the target program using its - # absolute path - otherwise, it will crash. + # Make wrappers. The purpose of these is just to call the target program + # using its absolute path - otherwise, it will crash. mkdir -p bin - for tool in diamond ; do + for tool in diamond pnmainc ddtcmd ; do makeWrapper $out/$prefix/bin/lin64/$tool $out/bin/$tool done ''; diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index c80f5f3dd573e..dea8a56f38d41 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , pkg-config , hidapi @@ -11,10 +10,10 @@ stdenv.mkDerivation rec { pname = "openocd"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3"; + sha256 = "sha256-ryVHiL6Yhh8r2RA/5uYKd07Jaow3R0Tu+Rl/YEMHWvo="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,15 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libftdi1 libusb1 ] ++ lib.optional stdenv.isLinux libgpiod; - patches = [ - # Patch is upstream, so can be removed when OpenOCD 0.12.0 or later is released. - (fetchpatch - { - url = "https://github.com/openocd-org/openocd/commit/cff0e417da58adef1ceef9a63a99412c2cc87ff3.patch"; - sha256 = "Xxzf5miWy4S34sbQq8VQdAbY/oqGyhL/AJxiEPRuj3Q="; - }) - ]; - configureFlags = [ "--disable-werror" "--enable-jtag_vpi" @@ -46,10 +36,10 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" "-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0 - ]; + ]); postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 75f9adf0d3e69..40aa423374130 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/stm8/stm8flash/default.nix b/pkgs/development/embedded/stm8/stm8flash/default.nix index eaf1a19c91bcc..1584ee7fdf073 100644 --- a/pkgs/development/embedded/stm8/stm8flash/default.nix +++ b/pkgs/development/embedded/stm8/stm8flash/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # NOTE: _FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = "-O"; + env.NIX_CFLAGS_COMPILE = "-O"; preBuild = '' export DESTDIR=$out; diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index e902d837c9d5c..0da71d1de10db 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/uisp/default.nix b/pkgs/development/embedded/uisp/default.nix index 986a560ff6e8b..0ae31bc24fb2e 100644 --- a/pkgs/development/embedded/uisp/default.nix +++ b/pkgs/development/embedded/uisp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index dee81f2baebde..81febc3171b7d 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/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 8a42a0825aabc..be6d368db1e34 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-2023-01-06"; + version = "unstable-2023-02-15"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/d24f4eab2352468510fb81e276aab9d62e94b561.tar.gz"; - sha256 = "16d3mf4d622gns1myx9mwx39sx0l9wndybxn5ik00x0pxnmh7f36"; + url = "https://github.com/NixOS/cabal2nix/archive/5cd07f1df825084fd47cf49cf49f14569859a51c.tar.gz"; + sha256 = "1zwl5h6xqadw7fw3mkr5jljczcyrbhvi6kas19mj1wiyx6bj34yw"; }; 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 ec9b70f4a0cee..6ef78179918e7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,6 +20,49 @@ with haskellLib; self: super: { + # cabal-install needs most recent versions of Cabal and Cabal-syntax, + # so we need to put some extra work for non-latest GHCs + inherit ( + let + # !!! Use cself/csuper inside for the actual overrides + cabalInstallOverlay = cself: csuper: + lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { + Cabal = cself.Cabal_3_8_1_0; + Cabal-syntax = cself.Cabal-syntax_3_8_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # GHC 9.2.5 starts shipping 1.6.16.0 + process = cself.process_1_6_16_0; + } // lib.optionalAttrs (lib.versions.majorMinor self.ghc.version == "8.10") { + # 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 csuper.vector; + }; + in + { + cabal-install = super.cabal-install.overrideScope cabalInstallOverlay; + cabal-install-solver = super.cabal-install-solver.overrideScope cabalInstallOverlay; + + guardian = lib.pipe + # Needs cabal-install >= 3.8 /as well as/ matching Cabal + (super.guardian.overrideScope (self: super: + cabalInstallOverlay self super // { + # Needs at least path-io 1.8.0 due to canonicalizePath changes + path-io = self.path-io_1_8_0; + } + )) + [ + # Tests need internet access (run stack) + dontCheck + # May as well… + (self.generateOptparseApplicativeCompletions [ "guardian" ]) + ]; + } + ) cabal-install + cabal-install-solver + guardian + ; + + # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; @@ -60,6 +103,15 @@ self: super: { ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # patat main branch has an unreleased commit that fixes the build by + # relaxing restrictive upper boundaries. This can be removed once there's a + # new release following version 0.8.8.0. + patat = appendPatch (fetchpatch { + url = "https://github.com/jaspervdj/patat/commit/be9e0fe5642ba6aa7b25705ba17950923e9951fa.patch"; + sha256 = "sha256-Vxxi46qrkIyzYQZ+fe1vNTPldcQEI2rX2H40GvFJR2M="; + excludes = ["stack.yaml" "stack.yaml.lock"]; + }) super.patat; + # 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: @@ -80,7 +132,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 = "052ld021yvjbnx1sbj1ryflsyn0v1y1ygx1zv0ql6fk3cysw5lxf"; + sha256 = "0f2nnszfiqwdgfky3190prkhcndp0mva3jk7a6cl461w8kp1jspa"; # 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 @@ -138,6 +190,8 @@ self: super: { # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; + pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli)); + # sse2 flag due to https://github.com/haskell/vector/issues/47. # Jailbreak is necessary for QuickCheck dependency. vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector); @@ -171,6 +225,9 @@ self: super: { # Fails no apparent reason. Upstream has been notified by e-mail. assertions = dontCheck super.assertions; + # 2023-01-29: Restrictive base bound already loosened on master but not released: https://github.com/sebastiaanvisser/clay/commit/4483bdf7a452903f177220958f1610030ab7f28a + clay = throwIfNot (super.clay.version == "0.14.0") "Remove clay jailbreak in configuration-common.nix when you see this eval error." (doJailbreak super.clay); + # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; @@ -197,12 +254,20 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; + # 2022-01-29: Tests fail: https://github.com/psibi/streamly-bytestring/issues/27 + # 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30 + streamly-bytestring = dontCheck (doJailbreak super.streamly-bytestring); + # base bound digit = doJailbreak super.digit; - # matterhorn-50200.17.0 won't work with brick >= 0.71 + # 2022-01-29: Tests require package to be in ghc-db. + aeson-schemas = dontCheck super.aeson-schemas; + + # 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` @@ -746,10 +811,14 @@ 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_8; - hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_8; + hspec = self.hspec_2_10_9; + hspec-wai = self.hspec-wai.override { + hspec = self.hspec_2_10_9; }; + hspec-contrib = self.hspec-contrib.override { + hspec-core = self.hspec-core_2_10_9; + }; + fsnotify = self.fsnotify_0_4_1_0; }); # Depends on broken fluid. @@ -919,12 +988,13 @@ self: super: { ''; }) super.hpack; - # hslua has tests that appear to break when using musl. + # hslua has tests that break when using musl. # https://github.com/hslua/hslua/issues/106 - # Note that hslua is currently version 1.3. However, in the latest version - # (>= 2.0), hslua has been split into multiple packages and this override - # will likely need to be moved to the hslua-core package. - hslua = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua else super.hslua; + hslua-core = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua-core else super.hslua-core; + + # Missing files required by the test suite. + # https://github.com/deemp/flakes/issues/4 + lima = dontCheck super.lima; # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate. prettyprinter = dontCheck super.prettyprinter; @@ -1114,6 +1184,7 @@ self: super: { # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; persistent-postgresql = + # TODO: move this override to configuration-nix.nix overrideCabal (drv: { postPatch = drv.postPath or "" + '' @@ -1122,8 +1193,14 @@ self: super: { sed -i test/PgInit.hs \ -e s^'host=" <> host <> "'^^ ''; - # https://github.com/NixOS/nixpkgs/issues/198495 - doCheck = pkgs.postgresql.doCheck; + doCheck = + # https://github.com/commercialhaskell/stackage/issues/6884 + # persistent-postgresql-2.13.5.1 needs persistent-test >= 2.13.1.3 which + # is incompatible with the stackage version of persistent, so the tests + # are disabled temporarily. + false + # https://github.com/NixOS/nixpkgs/issues/198495 + && pkgs.postgresql.doCheck; preCheck = drv.preCheck or "" + '' PGDATABASE=test PGUSER=test @@ -1135,10 +1212,14 @@ self: super: { }) super.persistent-postgresql; + # Test suite requires a later version of persistent-test which depends on persistent 2.14 + # https://github.com/commercialhaskell/stackage/issues/6884 + persistent-sqlite = dontCheck super.persistent-sqlite; + # 2021-12-26: Too strict bounds on doctest polysemy-plugin = doJailbreak super.polysemy-plugin; - # hasn‘t bumped upper bounds + # hasn’t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; @@ -1435,14 +1516,14 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - 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_2_10_9 = doDistribute (super.hspec_2_10_9.override { + hspec-discover = self.hspec-discover_2_10_9; + hspec-core = self.hspec-core_2_10_9; }); - hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override { + hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override { hspec-meta = self.hspec-meta_2_10_5; }; - hspec-core_2_10_8 = super.hspec-core_2_10_8.override { + hspec-core_2_10_9 = super.hspec-core_2_10_9.override { hspec-meta = self.hspec-meta_2_10_5; }; @@ -1769,7 +1850,12 @@ self: super: { relative = "llvm-hs-pure"; excludes = [ "**/Triple.hs" ]; # doesn't exist in 9.0.0 }) - ] super.llvm-hs-pure; + ] (overrideCabal { + # Hackage Revision prevents patch from applying. Revision 1 does not allow + # bytestring-0.11.4 which is bundled with 9.2.6. + editedCabalFile = null; + revision = null; + } super.llvm-hs-pure); # * Fix build failure by picking patch from 8.5, we need # this version of sbv for petrinizer @@ -2025,9 +2111,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # https://github.com/peti/hopenssl/issues/5 - hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; }; - # Fixes compilation with GHC 9.0 and above # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3 regex-compat-tdfa = appendPatches [ @@ -2229,9 +2312,13 @@ self: super: { # 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 { - brick = doJailbreak (dontCheck super.brick_1_3); + brick = doJailbreak (dontCheck super.brick_1_6); }); + # Too strict upper bound on bytestring + # https://github.com/TravisWhitaker/rdf/issues/8 + rdf = doJailbreak super.rdf; + # random <1.2 unfoldable = doJailbreak super.unfoldable; @@ -2328,4 +2415,8 @@ self: super: { # 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 2c40ee7711eef..03ef34510bb3d 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -40,6 +40,13 @@ self: super: ({ darwin.apple_sdk.frameworks.ApplicationServices ] super.apecs-physics; + # Framework deps are hidden behind a flag + hmidi = addExtraLibraries [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreAudio + darwin.apple_sdk.frameworks.CoreMIDI + ] super.hmidi; + # "erf table" test fails on Darwin # https://github.com/bos/math-functions/issues/63 math-functions = dontCheck super.math-functions; @@ -311,6 +318,8 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; + heystone = addBuildTool pkgs.fixDarwinDylibNames super.heystone; + } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: 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 baa8752e1e8f9..db5e18beef173 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -48,36 +48,24 @@ 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; - # 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; - 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; - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - 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 (unmarkBroken self.ghc-api-compat_8_10_7); - # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # 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; + # Needs to use ghc-lib due to incompatible GHC + ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); + # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; unliftio-core = doJailbreak super.unliftio-core; - # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10. + # Jailbreaking because monoidal-containers hasn’t bumped it's base dependency for 8.10. monoidal-containers = doJailbreak super.monoidal-containers; # Jailbreak to fix the build. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ddd41bc57e723..92278ebb0e217 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,13 +94,13 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; - # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. + # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; # Older compilers need the latest ghc-lib to build this package. hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin; - # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + # vector 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; mmorph = super.mmorph_1_1_3; 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 941f95c07fac3..389bbd3081240 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -54,18 +54,6 @@ self: super: { # This build needs a newer version of Cabal. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - # 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; - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_16_0; - }); - cabal-install-solver = super.cabal-install-solver.overrideScope (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; - }); - # Additionally depends on OneTuple for GHC < 9.0 base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; @@ -125,12 +113,12 @@ self: super: { liquid-vector = markBroken super.liquid-vector; liquidhaskell = markBroken super.liquidhaskell; - # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. + # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. 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 0.12.2 indroduced doctest checks that don’t work on older compilers vector = dontCheck super.vector; ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); @@ -141,11 +129,12 @@ self: super: { hlint = self.hlint_3_2_8; - ghc-lib-parser = self.ghc-lib-parser_8_10_7_20220219; + ghc-lib-parser = doDistribute self.ghc-lib-parser_8_10_7_20220219; + ghc-lib = doDistribute self.ghc-lib_8_10_7_20220219; - # ghc versions which don‘t match the ghc-lib-parser-ex version need the + # 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; + ghc-lib-parser-ex = doDistribute (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; 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 5748691dd400c..6e347a76db0e7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -49,18 +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; - # cabal-install needs the latest/matching versions of Cabal-syntax and Cabal - cabal-install = super.cabal-install.overrideScope (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; - }); - cabal-install-solver = super.cabal-install-solver.overrideScope (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; - }); - # Jailbreaks & Version Updates # This `doJailbreak` can be removed once the following PR is released to Hackage: @@ -121,6 +109,9 @@ self: super: { Cabal = lself.Cabal_3_6_3_0; })); + # Needs to use ghc-lib due to incompatible GHC + ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); + # 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.<package>.scope` hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ 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 c77a86913f618..9fbeec03e4b55 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -49,17 +49,8 @@ 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; - # 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; - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_16_0; - }); - cabal-install-solver = super.cabal-install-solver.overrideScope (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; - }); + # weeder == 2.5.* requires GHC 9.4 + weeder = doDistribute self.weeder_2_4_1; # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; @@ -84,19 +75,22 @@ self: super: { # For -fghc-lib see cabal.project in haskell-language-server. stylish-haskell = enableCabalFlag "ghc-lib" super.stylish-haskell; + # Needs to match ghc version + ghc-tags = doDistribute self.ghc-tags_1_5; + # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 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; - # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; + # Too strict upper bound on bytestring, relevant for GHC 9.2.6 specifically + # https://github.com/protolude/protolude/issues/127#issuecomment-1428807874 + protolude = doJailbreak super.protolude; + # https://github.com/fpco/inline-c/pull/131 inline-c-cpp = (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) 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 b65479335393b..30d117103c835 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -104,16 +104,17 @@ in { resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; - + shake-cabal = doDistribute self.shake-cabal_0_2_2_3; + libmpd = doJailbreak super.libmpd; 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_8; - hspec-core = self.hspec-core_2_10_8; + hspec = self.hspec_2_10_9; + hspec-core = self.hspec-core_2_10_9; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_8; + hspec-discover = self.hspec-discover_2_10_9; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 @@ -183,22 +184,34 @@ in { }) self.ghc-exactprint_1_6_1_1; - # 2022-10-06: plugins disabled for hls 1.8.0.0 based on + # 2023-02-01: plugins disabled for hls 1.9.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-eval-plugin = null; - hls-floskell-plugin = null; - hls-ormolu-plugin = null; - hls-rename-plugin = null; + hls-ormolu-plugin = null; # This plugin is supposed to work, but fails to compile. + hls-floskell-plugin = null; # This plugin is supposed to work, but fails to compile. + hls-rename-plugin = null; # This plugin is supposed to work, but fails to compile. hls-stylish-haskell-plugin = null; }; # https://github.com/tweag/ormolu/issues/941 - ormolu = overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.ormolu); + ormolu = doDistribute self.ormolu_0_5_2_0; fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); + + # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455 + # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so + # the GHC 9.6 configuration may need similar overrides eventually. + X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; + # Jailbreaks for https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309 + glib = __CabalEagerPkgConfigWorkaround (doJailbreak super.glib); + cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo); + pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango); + + # The gtk2hs setup hook provided by this package lacks the ppOrdering field that + # recent versions of Cabal require. This leads to builds like cairo and glib + # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323. + gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index a2546c3dc5f44..b96526640bb00 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 22ce6fd8f9e80..152a77d612f09 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -86,7 +86,6 @@ broken-packages: - aeson-parsec-picky - aeson-prefix - aeson-schema - - aeson-schemas - aeson-smart - aeson-streams - aeson-t @@ -224,6 +223,7 @@ broken-packages: - ascii-string - ascii-vector-avc - asif + - asn1-ber-syntax - asn1-codec - asn1-data - AspectAG @@ -400,7 +400,6 @@ broken-packages: - bindings-wlc - bind-marshal - binembed - - binrep - binsm - bio - BiobaseNewick @@ -427,6 +426,7 @@ broken-packages: - bitx-bitcoin - bizzlelude-js - bkr + - blagda - blakesum - blas - blaze-html-hexpat @@ -472,7 +472,7 @@ broken-packages: - brick-dropdownmenu - brick-filetree - bricks-internal - - brick-skylighting + - brick-tabular-list - brillig - brittany - broadcast-chan-tests @@ -512,6 +512,7 @@ broken-packages: - byline - by-other-names - bytearray-parsing + - bytepatch - bytestring-aeson-orphans - bytestring-arbitrary - bytestring-class @@ -705,7 +706,6 @@ broken-packages: - classy-parallel - classyplate - ClassyPrelude - - clay - clckwrks-plugin-bugs - clckwrks-plugin-mailinglist - clckwrks-theme-clckwrks @@ -927,6 +927,7 @@ broken-packages: - credential-store - critbit - criterion-cmp + - criterion-compare - criterion-plus - criterion-to-html - criu-rpc-types @@ -1106,6 +1107,7 @@ broken-packages: - derive-monoid - derive-trie - deriving-openapi3 + - deriving-trans - derp-lib - describe - descriptive @@ -1437,6 +1439,7 @@ broken-packages: - extensible-effects-concurrent - extensible-skeleton - external-sort + - extism - extractelf - ez3 - ez-couch @@ -1446,7 +1449,6 @@ broken-packages: - fadno-braids - fadno-xml - failable-list - - FailT - failure-detector - fake - fake-type @@ -1486,6 +1488,7 @@ broken-packages: - fenfire - fernet - FerryCore + - festival - Feval - fez-conf - ffeed @@ -1821,7 +1824,6 @@ broken-packages: - gloss-banana - gloss-export - gloss-game - - glpk-headers - gltf-codec - glue - g-npm @@ -2421,6 +2423,7 @@ broken-packages: - hquantlib-time - hquery - hR + - h-raylib - hreq-core - hRESP - h-reversi @@ -2484,7 +2487,6 @@ broken-packages: - hslogger-template - hs-logo - hslua-examples - - hslua-list - hsluv-haskell - hsmagick - hsmodetweaks @@ -2620,6 +2622,7 @@ broken-packages: - hwhile - hw-json-demo - hw-json-lens + - hw-json-simd - hworker - hw-playground-linear - hw-prim-bits @@ -2920,6 +2923,7 @@ broken-packages: - khph - kickass-torrents-dump-parser - kickchan + - kind-generics-deriving - kleene-list - kmn-programming - kmonad @@ -3007,6 +3011,7 @@ broken-packages: - LATS - launchdarkly-server-sdk - launchpad-control + - lawful-classes-hedgehog - lawless-concurrent-machines - layers - layout @@ -3067,6 +3072,7 @@ broken-packages: - libpafe - libpq - librandomorg + - libsecp256k1 - libsystemd-daemon - libtagc - libxls @@ -3247,7 +3253,6 @@ broken-packages: - math-grads - math-interpolate - math-metric - - math-programming - matrix-as-xyz - matrix-lens - matrix-market @@ -3358,6 +3363,10 @@ broken-packages: - ml-w - mm2 - mmsyn2 + - mmsyn4 + - mmsyn7l + - mmsyn7ukr-array + - mmsyn7ukr-common - mmtf - mmtl - Mobile-Legends-Hack-Cheats @@ -3386,6 +3395,7 @@ broken-packages: - monad-control-aligned - monadcryptorandom - monad-fork + - monadic-bang - monadiccp - monadic-recursion-schemes - monad-introspect @@ -3430,6 +3440,7 @@ broken-packages: - monoid-owns - monoidplus - monoids + - monoid-statistics - monopati - monus - monzo @@ -3805,10 +3816,12 @@ broken-packages: - pandoc-filter-indent - pandoc-include - pandoc-lens + - pandoc-lua-engine - pandoc-markdown-ghci-filter - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot + - pandoc-server - pandoc-unlit - pandoc-utils - pandora @@ -3873,9 +3886,9 @@ broken-packages: - PasswordGenerator - passwords - pasta + - pasta-curves - pastis - pasty - - patat - patches-vector - Pathfinder - pathfindingcore @@ -3954,7 +3967,13 @@ broken-packages: - phone-numbers - phone-push - phonetic-languages-constaints + - phonetic-languages-constraints-array + - phonetic-languages-filters-array + - phonetic-languages-permutations-array + - phonetic-languages-phonetics-basics + - phonetic-languages-plus - phonetic-languages-simplified-properties-array-old + - phonetic-languages-ukrainian-array - phonetic-languages-vector - phraskell - Phsu @@ -4173,6 +4192,7 @@ broken-packages: - process-leksah - process-listlike - processmemory + - process-sequential - procrastinating-variable - procstat - product-isomorphic @@ -4273,6 +4293,7 @@ broken-packages: - QuickAnnotate - quickbooks - quickcheck-arbitrary-template + - quickcheck-groups - quickcheck-monoid-subclasses - quickcheck-property-comb - quickcheck-property-monad @@ -4360,6 +4381,7 @@ broken-packages: - records - records-sop - record-wrangler + - recover-rtti - recursors - red-black-record - redis-glob @@ -4692,10 +4714,12 @@ broken-packages: - servant-router - servant-scotty - servant-seo + - servant-serf - servant-smsc-ru - servant-stache - servant-static-th - servant-streaming + - servant-streamly - servant-tracing - servant-typed-error - servant-wasm @@ -4721,7 +4745,6 @@ broken-packages: - SFML - sfml-audio - sfmt - - sfnt2woff - SG - sgd - SGplus @@ -4869,6 +4892,7 @@ broken-packages: - snake-game - snap-accept - snap-auth-cli + - snap-blaze-clay - snap-configuration-utilities - snap-error-collector - snap-language @@ -5051,7 +5075,6 @@ broken-packages: - streaming-sort - streamly-archive - streamly-binary - - streamly-bytestring - streamly-cassava - streamly-examples - streamly-lmdb @@ -5310,6 +5333,7 @@ broken-packages: - threadscope - threepenny-editors - threepenny-gui-contextmenu + - threepenny-gui-flexbox - thrift - Thrift - throttled-io-loop @@ -5489,6 +5513,7 @@ broken-packages: - type-indexed-queues - type-int - type-interpreter + - typelet - type-level-bst - type-level-natural-number-induction - type-level-natural-number-operations @@ -5521,6 +5546,8 @@ broken-packages: - uhexdump - uhttpc - ui-command + - ukrainian-phonetics-basic-array + - ukrainian-phonetics-basic-array-bytestring - unamb-custom - unbeliever - unbounded-delays-units @@ -5755,6 +5782,7 @@ broken-packages: - webkit-javascriptcore - webmention - web-output + - web-page - web-push - Webrexp - web-routes-quasi @@ -5794,6 +5822,7 @@ broken-packages: - wol - word24 - word2vec-model + - wordchoice - wordify - Wordlint - wordn @@ -5824,7 +5853,6 @@ broken-packages: - X11-rm - X11-xdamage - X11-xfixes - - xcffib - xchat-plugin - xcp - x-dsp @@ -5975,6 +6003,8 @@ broken-packages: - yoda - Yogurt - youtube + - yst + - yu-auth - yu-core - yuiGrid - yu-tool diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 52ba243cb0d07..f6795d8fa612c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -76,8 +76,6 @@ default-package-overrides: - http-client-restricted < 0.0.5 # 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 @@ -86,6 +84,10 @@ default-package-overrides: - 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 + # needed as long as we have pandoc < 3.0, i.e. stackage lts 20 + - pandoc-crossref < 0.3.15.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. @@ -96,12 +98,13 @@ extra-packages: - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 + - apply-refact == 0.11.* # 2023-02-02: needed for hls-hlint-plugin on 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 == 1.3 # 2022-11-03: needed by swarm 0.2.0.0 + - brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick - 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 - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses @@ -156,9 +159,11 @@ 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 + - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.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 + - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* package-maintainers: abbradar: @@ -269,6 +274,8 @@ package-maintainers: - wstunnel gridaphobe: - located-base + iblech: + - Agda ivanbrennan: - xmonad - xmonad-contrib @@ -291,11 +298,12 @@ package-maintainers: - sensei maralorn: - cabal-fmt + - clay - ema - emanote - generic-optics - ghcid - - ghcide + - graphql-client - haskell-language-server - hedgehog - hledger @@ -308,8 +316,11 @@ package-maintainers: - matrix-client - optics - pandoc + - pandoc-cli + - pandoc-crossref - paths - postgresql-simple + - purebred-email - reflex-dom - releaser - replace-megaparsec @@ -320,6 +331,7 @@ package-maintainers: - snap - stm-containers - streamly + - streamly-bytestring - taskwarrior - tz - weeder @@ -357,6 +369,10 @@ package-maintainers: - persistent-sqlite - persistent-template - shakespeare + raehik: + - strongweak + - binrep + - bytepatch roberth: - arion-compose - cabal-pkg-config-version-hook @@ -455,6 +471,7 @@ unsupported-platforms: bindings-directfb: [ platforms.darwin ] bindings-sane: [ platforms.darwin ] bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r + bytelog: [ platforms.darwin ] # due to posix-api camfort: [ aarch64-linux ] charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 cut-the-crap: [ platforms.darwin ] @@ -558,6 +575,7 @@ supported-platforms: bindings-parport: [ platforms.linux ] # parport is a linux kernel component blake3: [ platforms.x86 ] # uses x86 intrinsics btrfs: [ platforms.linux ] # depends on linux + bytepatch: [ platforms.x86 ] # due to blake3 cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32) crc32c: [ platforms.x86 ] # uses x86 intrinsics d3d11binding: [ platforms.windows ] @@ -601,6 +619,7 @@ supported-platforms: scat: [ platforms.x86 ] # uses scrypt, which requries x86 scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8 seqalign: [ platforms.x86 ] # x86 intrinsics + tasty-papi: [ platforms.linux ] # limited by pkgs.papi udev: [ platforms.linux ] Win32-console: [ platforms.windows ] Win32-dhcp-server: [ platforms.windows ] @@ -661,7 +680,7 @@ dont-distribute-packages: - yices-easy - yices-painless - # These packages don‘t build because they use deprecated webkit versions. + # These packages don’t build because they use deprecated webkit versions. - diagrams-hsqml - dialog - ghcjs-dom-webkit diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 99e542eed090a..169a3664f1dae 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 20.5 +# Stackage LTS 20.11 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,7 +11,7 @@ default-package-overrides: - acid-state ==0.16.1.1 - action-permutations ==0.0.0.1 - active ==0.2.0.16 - - ad ==4.5.2 + - ad ==4.5.3 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.2 - adler32 ==0.1.2.0 @@ -38,7 +38,6 @@ default-package-overrides: - 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 @@ -87,15 +86,15 @@ default-package-overrides: - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - ascii ==1.2.4.0 - - ascii-case ==1.0.1.1 - - ascii-char ==1.0.0.16 + - ascii-case ==1.0.1.2 + - ascii-char ==1.0.0.17 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.14 - - ascii-numbers ==1.1.0.0 - - ascii-predicates ==1.0.1.0 + - 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 @@ -123,14 +122,14 @@ default-package-overrides: - aura ==3.2.9 - authenticate ==1.3.5.1 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.1 + - autodocodec ==0.2.0.3 - autodocodec-openapi3 ==0.2.1.1 - - autodocodec-schema ==0.1.0.2 - - autodocodec-yaml ==0.2.0.2 + - autodocodec-schema ==0.1.0.3 + - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.2 - auto-update ==0.1.6 - avro ==0.6.1.2 - - aws-cloudfront-signed-cookies ==0.2.0.11 + - 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 @@ -188,7 +187,7 @@ default-package-overrides: - binary-instances ==1.0.3 - binary-list ==1.1.1.2 - binary-orphans ==1.0.3 - - binary-parser ==0.5.7.2 + - binary-parser ==0.5.7.3 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -232,7 +231,7 @@ default-package-overrides: - boots ==0.2.0.1 - bordacount ==0.1.0.0 - boring ==0.2 - - bound ==2.0.5 + - bound ==2.0.6 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 @@ -297,11 +296,11 @@ default-package-overrides: - cacophony ==0.10.1 - cairo ==0.13.8.2 - calendar-recycling ==0.0.0.1 - - call-alloy ==0.4.0.1 + - call-alloy ==0.4.0.2 - calligraphy ==0.1.3 - call-plantuml ==0.0.1.1 - call-stack ==0.4.0 - - can-i-haz ==0.3.1.0 + - can-i-haz ==0.3.1.1 - capability ==0.5.0.1 - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 @@ -340,7 +339,7 @@ default-package-overrides: - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - checkers ==0.6.0 - - checksum ==0.0 + - checksum ==0.0.0.1 - chimera ==0.3.3.0 - choice ==0.2.2 - chronologique ==0.3.1.3 @@ -350,7 +349,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - - citeproc ==0.8.0.2 + - citeproc ==0.8.1 - classy-prelude ==1.5.0.2 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -379,13 +378,13 @@ default-package-overrides: - 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.1 - comfort-array-shape ==0.0 - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 - commonmark ==0.2.2 - commonmark-extensions ==0.2.3.3 - - commonmark-pandoc ==0.2.1.2 + - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 @@ -406,7 +405,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.16 + - concurrent-output ==1.10.17 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -445,11 +444,11 @@ 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.6.1.1 - - core-telemetry ==0.2.7.0 + - core-data ==0.3.9.0 + - core-program ==0.6.3.0 + - core-telemetry ==0.2.7.3 - core-text ==0.3.8.0 - countable ==1.2 - country ==0.2.3 @@ -476,7 +475,7 @@ default-package-overrides: - cryptohash-md5 ==0.11.101.0 - cryptohash-sha1 ==0.11.101.0 - cryptohash-sha256 ==0.11.102.1 - - cryptohash-sha512 ==0.11.101.0 + - cryptohash-sha512 ==0.11.102.0 - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 @@ -505,10 +504,10 @@ default-package-overrides: - cursor-gen ==0.4.0.0 - cyclotomic ==1.1.1 - czipwith ==1.0.1.4 - - d10 ==1.0.1.0 - - data-accessor ==0.2.3 - - data-accessor-mtl ==0.2.0.4 - - data-accessor-transformers ==0.2.1.7 + - d10 ==1.0.1.2 + - data-accessor ==0.2.3.1 + - data-accessor-mtl ==0.2.0.5 + - data-accessor-transformers ==0.2.1.8 - data-array-byte ==0.1.0.1 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.2 @@ -574,10 +573,10 @@ default-package-overrides: - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - - deriving-aeson ==0.2.8 + - deriving-aeson ==0.2.9 - deriving-compat ==0.6.2 - detour-via-sci ==1.0.0 - - df1 ==0.4 + - df1 ==0.4.1 - dhall ==1.41.2 - dhall-bash ==1.0.40 - dhall-json ==1.7.11 @@ -598,7 +597,7 @@ default-package-overrides: - dictionary-sharing ==0.1.0.0 - di-df1 ==1.2.1 - Diff ==0.4.1 - - digest ==0.0.1.4 + - digest ==0.0.1.5 - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 @@ -632,12 +631,13 @@ default-package-overrides: - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.4 - - domain-aeson ==0.1 + - domain-aeson ==0.1.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.10.0.0 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.4.2 @@ -668,10 +668,10 @@ default-package-overrides: - 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 ==2.2.2.0 + - effectful-core ==2.2.2.1 - effectful-plugin ==1.0.0.0 - - effectful-th ==1.0.0.0 + - effectful-th ==1.0.0.1 - either ==5.0.2 - either-both ==0.1.1.1 - either-unwrap ==1.1 @@ -680,15 +680,15 @@ default-package-overrides: - elf ==0.31 - eliminators ==0.9 - elm2nix ==0.3.0 - - elm-bridge ==0.8.1 + - elm-bridge ==0.8.2 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - 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 + - elynx ==0.7.1.0 + - elynx-markov ==0.7.1.0 + - elynx-nexus ==0.7.1.0 + - elynx-seq ==0.7.1.0 + - elynx-tools ==0.7.1.0 + - elynx-tree ==0.7.1.0 - emacs-module ==0.1.1.1 - email-validate ==2.3.2.18 - emojis ==0.1.2 @@ -735,7 +735,7 @@ default-package-overrides: - experimenter ==0.1.0.14 - expiring-cache-map ==0.0.6.1 - explainable-predicates ==0.1.2.3 - - explicit-exception ==0.1.10 + - explicit-exception ==0.1.10.1 - exp-pairs ==0.2.1.0 - express ==1.0.10 - extended-reals ==0.2.4.0 @@ -754,7 +754,7 @@ default-package-overrides: - fakepull ==0.3.0.2 - faktory ==1.1.2.4 - fasta ==0.10.4.2 - - fast-logger ==3.1.1 + - fast-logger ==3.1.2 - fast-math ==1.0.2 - fb ==2.1.1.1 - fclabels ==2.0.5.1 @@ -808,7 +808,7 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.3 - focuslist ==0.1.1.0 - - foldl ==1.4.13 + - foldl ==1.4.14 - folds ==0.7.8 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 @@ -856,7 +856,7 @@ default-package-overrides: - generic-aeson ==0.2.0.14 - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==1.0.0.0 + - generic-data ==1.0.0.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.2 - generic-functor ==1.1.0.0 @@ -902,7 +902,7 @@ default-package-overrides: - genvalidity-vector ==1.0.0.0 - geodetics ==0.1.2 - geojson ==4.1.0 - - getopt-generics ==0.13.0.4 + - getopt-generics ==0.13.1.0 - ghc-bignum-orphans ==0.1.1 - ghc-byteorder ==4.11.0.0.10 - ghc-check ==0.5.0.8 @@ -914,8 +914,8 @@ default-package-overrides: - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.2.5.20221107 - - ghc-lib-parser ==9.2.5.20221107 + - ghc-lib ==9.2.6.20230211 + - ghc-lib-parser ==9.2.6.20230211 - ghc-lib-parser-ex ==9.2.0.4 - ghc-parser ==0.2.4.0 - ghc-paths ==0.1.0.12 @@ -1014,16 +1014,16 @@ default-package-overrides: - 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-hsp ==7.3.7.7 + - happstack-jmacro ==7.0.12.5 - happstack-server ==7.7.2 - happstack-server-tls ==7.2.1.3 - - happy ==1.20.0 + - happy ==1.20.1.1 - happy-meta ==0.2.0.11 - - harp ==0.4.3.5 + - harp ==0.4.3.6 - HasBigDecimal ==0.2.0.0 - hasbolt ==0.1.6.2 - - hashable ==1.4.1.0 + - hashable ==1.4.2.0 - hashids ==1.0.2.7 - hashmap ==1.3.3 - hashtables ==1.3.1 @@ -1032,7 +1032,7 @@ default-package-overrides: - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 - - HaskellNet ==0.6.0.1 + - HaskellNet ==0.6.0.2 - HaskellNet-SSL ==0.3.4.4 - haskell-src ==1.0.4 - haskell-src-exts ==1.23.1 @@ -1050,13 +1050,13 @@ default-package-overrides: - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.3 - hasql-optparse-applicative ==0.5 - - hasql-pool ==0.8.0.6 + - hasql-pool ==0.8.0.7 - hasql-queue ==1.2.0.2 - 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 @@ -1083,7 +1083,7 @@ default-package-overrides: - hexml ==0.3.4 - hexml-lens ==0.2.2 - hexpat ==0.20.13 - - hex-text ==0.1.0.7 + - hex-text ==0.1.0.8 - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgeometry ==0.14 @@ -1102,7 +1102,7 @@ default-package-overrides: - hkd-default ==1.1.0.0 - hkgr ==0.4.2 - hledger ==1.27.1 - - hledger-interest ==1.6.4 + - hledger-interest ==1.6.5 - hledger-lib ==1.27.1 - hledger-stockquotes ==0.1.2.1 - hledger-ui ==1.27.1 @@ -1122,7 +1122,7 @@ default-package-overrides: - hnock ==0.4.0 - hoauth2 ==2.6.0 - hoogle ==5.0.18.3 - - hopenssl ==2.2.4 + - hopenssl ==2.2.5 - hopfli ==0.2.2.1 - horizontal-rule ==0.5.0.0 - hosc ==0.19.1 @@ -1131,7 +1131,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10 - - hpack ==0.35.1 + - hpack ==0.35.2 - hpack-dhall ==0.5.7 - hpc-codecov ==0.3.0.0 - hpc-lcov ==1.1.0 @@ -1163,19 +1163,19 @@ default-package-overrides: - 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.2.1 - hslua-packaging ==2.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.4 + - HsOpenSSL ==0.11.7.5 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.9.7 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - - hspec-contrib ==0.5.1.1 + - hspec-contrib ==0.5.2 - hspec-core ==2.9.7 - hspec-discover ==2.9.7 - hspec-expectations ==0.8.2 @@ -1200,7 +1200,7 @@ default-package-overrides: - hstatistics ==0.3.1 - HStringTemplate ==0.8.8 - HSvm ==0.1.1.3.25 - - hsx2hs ==0.14.1.10 + - hsx2hs ==0.14.1.11 - hsx-jmacro ==7.3.8.2 - HsYAML ==0.2.1.1 - HsYAML-aeson ==0.2.0.1 @@ -1229,7 +1229,7 @@ default-package-overrides: - http-directory ==0.1.10 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - - http-io-streams ==0.1.6.1 + - http-io-streams ==0.1.6.2 - http-link-header ==1.2.1 - http-media ==0.8.0.0 - http-query ==0.1.3 @@ -1399,14 +1399,14 @@ default-package-overrides: - keep-alive ==0.2.1.0 - keycode ==0.2.2 - keys ==3.12.3 - - ki ==1.0.0.1 + - ki ==1.0.0.2 - 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 + - knob ==0.2.2 - koji ==0.0.2 - l10n ==0.1.0.1 - labels ==0.3.3 @@ -1415,7 +1415,7 @@ default-package-overrides: - lame ==0.2.0 - language-avro ==0.1.4.0 - language-bash ==0.9.2 - - language-c ==0.9.1 + - language-c ==0.9.2 - language-c-quote ==0.13 - language-docker ==12.0.0 - language-dot ==0.1.1 @@ -1428,7 +1428,7 @@ default-package-overrides: - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.3 + - lapack-ffi-tools ==0.1.3.1 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==2.0.3 @@ -1480,7 +1480,7 @@ default-package-overrides: - ListLike ==4.7.8 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-t ==1.0.5.3 + - list-t ==1.0.5.6 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1489,7 +1489,7 @@ default-package-overrides: - little-rio ==1.0.1 - lmdb ==0.2.5 - load-env ==0.2.1.0 - - loc ==0.1.4.0 + - loc ==0.1.4.1 - locators ==0.3.0.3 - loch-th ==0.2.2 - lockfree-queue ==0.2.4 @@ -1523,14 +1523,14 @@ default-package-overrides: - magic ==1.1 - mainland-pretty ==0.7.1 - main-tester ==0.2.0.1 - - managed ==1.0.9 + - managed ==1.0.10 - 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 - markov-chain-usage-model ==0.0.0 - - mason ==0.2.5 + - mason ==0.2.6 - massiv ==1.0.3.0 - massiv-io ==1.0.0.1 - massiv-persist ==1.0.0.3 @@ -1546,7 +1546,7 @@ default-package-overrides: - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 - maximal-cliques ==0.1.1 - - mcmc ==0.8.0.1 + - mcmc ==0.8.1.0 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.2.2 @@ -1555,7 +1555,7 @@ default-package-overrides: - mega-sdist ==0.4.2.1 - membership ==0.0.1 - memcache ==0.3.0.1 - - memfd ==1.0.1.0 + - memfd ==1.0.1.1 - memory ==0.17.0 - MemoTrie ==0.6.10 - mergeful ==0.3.0.0 @@ -1578,9 +1578,9 @@ default-package-overrides: - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.11 - microspec ==0.2.1.3 - - microstache ==1.0.2.2 + - microstache ==1.0.2.3 - midair ==0.2.0.1 - - midi ==0.2.2.3 + - midi ==0.2.2.4 - midi-music-box ==0.0.1.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 @@ -1602,7 +1602,7 @@ default-package-overrides: - mmark-cli ==0.0.5.1 - mmark-ext ==0.2.1.5 - mmorph ==1.2.0 - - mnist-idx ==0.1.3.1 + - mnist-idx ==0.1.3.2 - mnist-idx-conduit ==0.4.0.0 - mockery ==0.3.5 - mock-time ==0.1.0 @@ -1618,8 +1618,8 @@ default-package-overrides: - 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 ==0.3.39 + - monad-logger-aeson ==0.4.0.3 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 - monad-logger-prefix ==0.1.12 @@ -1647,7 +1647,7 @@ default-package-overrides: - monoid-extras ==0.6.2 - monoid-subclasses ==1.1.3 - monoid-transformer ==0.0.4 - - monomer ==1.5.0.0 + - monomer ==1.5.1.0 - mono-traversable ==1.0.15.3 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.2.0 @@ -1705,7 +1705,7 @@ default-package-overrides: - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - netlib-ffi ==0.1.1 - - net-mqtt ==0.8.2.4 + - net-mqtt ==0.8.2.5 - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 - netrc ==0.2.0.0 @@ -1762,7 +1762,7 @@ default-package-overrides: - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 - - nvim-hs ==2.3.2.0 + - nvim-hs ==2.3.2.1 - nvim-hs-contrib ==2.0.0.1 - nvim-hs-ghcid ==2.0.1.0 - oauthenticated ==0.3.0.0 @@ -1807,7 +1807,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.17.0.0 - optparse-enum ==1.0.0.0 - - optparse-generic ==1.4.8 + - optparse-generic ==1.4.9 - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 @@ -1843,7 +1843,7 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 - - partial-semigroup ==0.6.0.0 + - partial-semigroup ==0.6.0.1 - password ==3.0.2.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 @@ -1857,8 +1857,8 @@ 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-text-utf8 ==0.0.1.11 + - pathtype ==0.8.1.2 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 @@ -1868,7 +1868,7 @@ default-package-overrides: - pcre2 ==2.1.1.1 - pcre-heavy ==1.0.0.3 - pcre-light ==0.4.1.0 - - pcre-utils ==0.1.8.2 + - pcre-utils ==0.1.9 - pdc ==0.1.1 - pdf-toolbox-content ==0.1.1 - pdf-toolbox-core ==0.1.1 @@ -1885,13 +1885,13 @@ default-package-overrides: - persistent-documentation ==0.1.0.4 - persistent-iproute ==0.2.5 - persistent-mongoDB ==2.13.0.1 - - persistent-mysql ==2.13.1.3 + - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.5.0 + - persistent-postgresql ==2.13.5.1 - persistent-qq ==2.12.0.2 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 - - persistent-sqlite ==2.13.1.0 + - persistent-sqlite ==2.13.1.1 - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.2 - persistent-typed-db ==0.1.0.7 @@ -1930,7 +1930,7 @@ default-package-overrides: - 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 @@ -1952,7 +1952,7 @@ default-package-overrides: - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.13.1 - - postgresql-libpq ==0.9.4.3 + - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.6 - postgresql-query ==3.10.0 @@ -1973,7 +1973,7 @@ default-package-overrides: - pretty-hex ==1.1 - prettyprinter ==1.7.1 - prettyprinter-ansi-terminal ==1.1.3 - - prettyprinter-combinators ==0.1.1 + - prettyprinter-combinators ==0.1.1.1 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.2 - prettyprinter-compat-wl-pprint ==1.0.1 @@ -2089,7 +2089,7 @@ default-package-overrides: - rcu ==0.2.6 - rdtsc ==1.3.0.1 - re2 ==0.3 - - reactive-banana ==1.3.1.0 + - reactive-banana ==1.3.2.0 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - reanimate-svg ==0.13.0.1 @@ -2111,7 +2111,7 @@ default-package-overrides: - reform ==0.2.7.5 - reform-blaze ==0.2.4.4 - reform-hamlet ==0.0.5.3 - - reform-happstack ==0.2.5.5 + - reform-happstack ==0.2.5.6 - reform-hsp ==0.2.7.2 - RefSerialize ==0.4.0 - ref-tf ==0.5.0.1 @@ -2132,7 +2132,7 @@ default-package-overrides: - registry-hedgehog-aeson ==0.2.0.0 - registry-options ==0.1.0.0 - reinterpret-cast ==0.1.0 - - rel8 ==1.4.0.0 + - rel8 ==1.4.1.0 - relapse ==1.0.0.1 - reliable-io ==0.0.2 - relude ==1.1.0.0 @@ -2200,8 +2200,8 @@ default-package-overrides: - safe-money ==0.9.1 - SafeSemaphore ==0.10.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 - sandi ==0.5 - sandwich ==0.1.2.0 @@ -2274,7 +2274,7 @@ default-package-overrides: - servant-foreign ==0.15.4 - servant-http-streams ==0.18.4 - servant-JuicyPixels ==0.3.1.0 - - servant-lucid ==0.9.0.5 + - servant-lucid ==0.9.0.6 - servant-machines ==0.15.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 @@ -2321,7 +2321,7 @@ default-package-overrides: - shelltestrunner ==1.9 - shell-utility ==0.1 - shellwords ==0.1.3.1 - - shelly ==1.10.0 + - shelly ==1.10.0.1 - shikensu ==0.4.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.2.0.0 @@ -2352,15 +2352,15 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.13.2 - - skylighting-core ==0.13.2 + - skylighting ==0.13.2.1 + - skylighting-core ==0.13.2.1 - 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.2 - - slynx ==0.7.0.1 + - slynx ==0.7.1.0 - smallcheck ==1.2.1 - smtp-mail ==0.3.0.0 - snowflake ==0.1.1.1 @@ -2373,7 +2373,7 @@ default-package-overrides: - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.7 - - sox ==0.2.3.1 + - sox ==0.2.3.2 - spacecookie ==1.0.0.2 - sparse-linear-algebra ==0.3.1 - spdx ==1.0.0.3 @@ -2392,7 +2392,7 @@ default-package-overrides: - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spoon ==0.3.1 - - spreadsheet ==0.1.3.8 + - spreadsheet ==0.1.3.9 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.2 @@ -2466,13 +2466,13 @@ default-package-overrides: - string-random ==0.1.4.3 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.3.1 - - stripe-scotty ==1.1.0.2 - - stripe-signature ==1.0.0.14 - - stripe-wreq ==1.0.1.14 + - stripe-concepts ==1.0.3.2 + - stripe-scotty ==1.1.0.3 + - stripe-signature ==1.0.0.15 + - stripe-wreq ==1.0.1.15 - strive ==6.0.0.4 - strongweak ==0.3.2 - - structs ==0.1.6 + - structs ==0.1.7 - structured ==0.1.1 - structured-cli ==2.7.0.1 - stylish-haskell ==0.14.3.0 @@ -2483,10 +2483,10 @@ default-package-overrides: - 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 ==0.13.0.1 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 @@ -2507,7 +2507,7 @@ default-package-overrides: - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 - - synthesizer-core ==0.8.2.1 + - synthesizer-core ==0.8.3 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - systemd ==2.3.0 @@ -2539,7 +2539,7 @@ default-package-overrides: - tasty-golden ==2.3.5 - tasty-hedgehog ==1.3.1.0 - tasty-hslua ==1.0.2 - - tasty-hspec ==1.2.0.1 + - tasty-hspec ==1.2.0.2 - tasty-html ==0.4.1.4 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 @@ -2560,7 +2560,7 @@ default-package-overrides: - tcp-streams ==1.0.1.1 - tdigest ==0.2.1.1 - teardown ==0.5.0.1 - - telegram-bot-simple ==0.6.1 + - telegram-bot-simple ==0.6.2 - template ==0.2.0.10 - template-haskell-compat-v0208 ==0.1.9.1 - temporary ==1.3 @@ -2584,7 +2584,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.5.4 + - texmath ==0.12.5.5 - text-ansi ==0.2.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2602,7 +2602,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.5 - text-show ==3.10 - - text-show-instances ==3.9.3 + - text-show-instances ==3.9.4 - text-zipper ==0.12 - tfp ==1.0.2 - tf-random ==0.5 @@ -2610,14 +2610,14 @@ default-package-overrides: - th-bang-compat ==0.0.1.0 - th-compat ==0.1.4 - th-constraint-compat ==0.0.1.0 - - th-data-compat ==0.1.1.0 + - th-data-compat ==0.1.2.0 - th-desugar ==1.13.1 - th-env ==0.1.1 - these ==1.1.1.1 - these-lens ==1.0.1.2 - these-optics ==1.0.1.2 - these-skinny ==0.7.5 - - th-expand-syns ==0.4.10.0 + - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.6 - th-lego ==0.3.0.2 - th-lift ==0.8.2 @@ -2662,7 +2662,7 @@ default-package-overrides: - tls ==1.5.8 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.7.0.1 + - tlynx ==0.7.1.0 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 @@ -2681,7 +2681,7 @@ default-package-overrides: - transaction ==0.1.1.3 - transformers-base ==0.4.6 - transformers-compat ==0.7.2 - - transformers-either ==0.1.2 + - transformers-either ==0.1.3 - transformers-fix ==1.0 - transient ==0.7.0.0 - traverse-with-class ==1.0.1.1 @@ -2712,7 +2712,7 @@ default-package-overrides: - type-fun ==0.1.3 - type-hint ==0.1 - type-level-integers ==0.0.1 - - type-level-kv-list ==2.0.0 + - type-level-kv-list ==2.0.2.0 - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.2 - type-map ==0.1.7.0 @@ -2739,7 +2739,7 @@ default-package-overrides: - unconstrained ==0.1.0.2 - unexceptionalio ==0.5.1 - unexceptionalio-trans ==0.5.1 - - unfork ==1.0.0.0 + - unfork ==1.0.0.1 - unicode ==0.0.1.1 - unicode-collation ==0.1.3.3 - unicode-data ==0.3.1 @@ -2753,7 +2753,7 @@ default-package-overrides: - uniplate ==1.6.13 - uniq-deep ==1.2.1 - unique ==0.0.1 - - unique-logic ==0.4 + - unique-logic ==0.4.0.1 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - units-parser ==0.1.1.4 @@ -2769,7 +2769,7 @@ default-package-overrides: - unix-time ==0.4.8 - unjson ==0.15.4 - unliftio ==0.2.23.0 - - unliftio-core ==0.2.0.1 + - unliftio-core ==0.2.1.0 - unliftio-path ==0.0.2.0 - unliftio-pool ==0.2.2.0 - unliftio-streams ==0.1.1.1 @@ -2826,10 +2826,10 @@ default-package-overrides: - vector-extras ==0.2.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-rotcev ==0.1.0.1 + - vector-rotcev ==0.1.0.2 - vector-sized ==1.5.0 - vector-space ==0.16 - - vector-split ==1.0.0.2 + - vector-split ==1.0.0.3 - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 @@ -2887,11 +2887,11 @@ default-package-overrides: - webgear-server ==1.0.4 - webpage ==0.0.5.1 - web-plugins ==0.4.1 - - web-routes ==0.27.14.4 - - web-routes-boomerang ==0.28.4.3 - - web-routes-happstack ==0.23.12.2 + - web-routes ==0.27.15 + - web-routes-boomerang ==0.28.4.4 + - web-routes-happstack ==0.23.12.3 - web-routes-hsp ==0.24.6.2 - - web-routes-th ==0.22.7 + - web-routes-th ==0.22.8.1 - web-routes-wai ==0.24.3.2 - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.3 @@ -2900,7 +2900,7 @@ default-package-overrides: - Win32 ==2.12.0.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.1.5.0 + - witch ==1.1.6.0 with-compiler: ghc-9.2.5 - withdependencies ==0.3.0 - witherable ==0.4.2 @@ -2925,7 +2925,7 @@ with-compiler: ghc-9.2.5 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==2.0.0.2 + - wuss ==2.0.1.0 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -2941,7 +2941,7 @@ with-compiler: ghc-9.2.5 - xlsx ==1.0.0.1 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - - xml-basic ==0.1.3.1 + - xml-basic ==0.1.3.2 - xmlbf ==0.6.2 - xmlbf-xeno ==0.2.1 - xmlbf-xmlhtml ==0.2 @@ -2964,7 +2964,7 @@ with-compiler: ghc-9.2.5 - xor ==0.0.1.1 - xss-sanitize ==0.3.7.1 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.8.0 + - yaml ==0.11.10.0 - yaml-unscrambler ==0.1.0.12 - Yampa ==0.13.7 - yarn-lock ==0.6.5 @@ -2974,12 +2974,12 @@ with-compiler: ghc-9.2.5 - yesod-auth ==1.6.11 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - - yesod-auth-oauth2 ==0.7.0.2 + - yesod-auth-oauth2 ==0.7.0.3 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.0 + - yesod-core ==1.6.24.1 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - - yesod-form ==1.7.3 + - yesod-form ==1.7.4 - yesod-form-bootstrap4 ==3.0.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 70a3c7525df4b..fd70e850c4080 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -247,6 +247,7 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 + - LPFP - LPPaver - LambdaHack - LambdaINet @@ -463,7 +464,9 @@ dont-distribute-packages: - algebra-sql - algebraic - algolia + - algorithmic-composition-basic - algorithmic-composition-frequency-shift + - algorithmic-composition-overtones - align-audio - alms - alpha @@ -673,10 +676,10 @@ dont-distribute-packages: - array-forth - arraylist - ascii-cows - - ascii-superset_1_2_5_0 + - ascii-superset_1_2_7_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_5_1_0 + - ascii_1_5_4_0 - asic - asil - assert4hs-hspec @@ -811,6 +814,7 @@ dont-distribute-packages: - bitcoin-types - bitcoind-regtest - bitcoind-rpc + - bitfield - bitly-cli - bitmaps - bittorrent @@ -874,7 +878,6 @@ dont-distribute-packages: - bv-sized - bv-sized-lens - bytable - - bytepatch - bytestring-builder-varword - bytestring-read - ca @@ -1029,7 +1032,6 @@ dont-distribute-packages: - comark - comfort-array - comfort-array-shape - - comfort-array_0_5_2 - comfort-fftw - comfort-glpk - commsec @@ -1118,7 +1120,6 @@ dont-distribute-packages: - crf-chain1-constrained - crf-chain2-generic - crf-chain2-tiers - - criterion-compare - criu-rpc - crockford - cron-compat @@ -1286,6 +1287,7 @@ dont-distribute-packages: - dobutokO3 - dobutokO4 - doc-review + - domaindriven - dormouse-client - dovetail - dovetail-aeson @@ -1396,6 +1398,7 @@ dont-distribute-packages: - eventuo11y - eventuo11y-batteries - eventuo11y-json + - eventuo11y-otel - every-bit-counts - ewe - exference @@ -1592,6 +1595,7 @@ dont-distribute-packages: - ghc-instances - ghc-mod - ghc-session + - ghc-tags-pipes - ghc-tags-plugin - ghci-pretty - ghcjs-dom-hello @@ -1860,12 +1864,13 @@ dont-distribute-packages: - graph-visit - graphicsFormats - graphicstools - - graphql-client - graphtype - greencard-lib - grenade - gridbounds - gridland + - grisette + - grisette-monad-coroutine - groot - gross - groundhog-converters @@ -2203,8 +2208,6 @@ dont-distribute-packages: - hpaco-lib - hpage - hpaste - - hpath-directory - - hpath-io - hpc-tracer - hplayground - hpqtypes-effectful @@ -2254,7 +2257,6 @@ dont-distribute-packages: - hsfacter - hsinspect-lsp - hslogstash - - hslua-module-zip - hsndfile-storablevector - hspec-expectations-pretty - hspec-pg-transact @@ -2300,6 +2302,9 @@ dont-distribute-packages: - huzzy - hw-all - hw-aws-sqs-conduit + - hw-json + - hw-json-simple-cursor + - hw-json-standard-cursor - hw-uri - hworker-ses - hwormhole @@ -2371,6 +2376,7 @@ dont-distribute-packages: - instant-deepseq - instant-hashable - instant-zipper + - instrument-cloudwatch - integreat - intel-aes - interpolatedstring-qq @@ -2545,6 +2551,7 @@ dont-distribute-packages: - lapack - lapack-comfort-array - lapack-hmatrix + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -2726,12 +2733,9 @@ dont-distribute-packages: - marvin - masakazu-bot - matchers - - math-programming-glpk - - math-programming-tests - mathblog - mathlink - matsuri - - matterhorn - maxent - maxent-learner-hw-gui - maxsharing @@ -2770,6 +2774,7 @@ dont-distribute-packages: - mkbndl - mlist - mmsyn6ukr + - mmsyn6ukr-array - mmsyn7h - mmsyn7s - mmsyn7ukr @@ -3003,6 +3008,7 @@ dont-distribute-packages: - padKONTROL - pairing - panda + - pandoc-crossref_0_3_15_0 - pandoc-highlighting-extensions - pandoc-japanese-filters - pandora-io @@ -3053,6 +3059,8 @@ dont-distribute-packages: - persistable-record - persistable-types-HDBC-pg - persistent-audit + - persistent-event-source + - persistent-eventsource - persistent-hssqlppp - persistent-map - persistent-mtl @@ -3069,8 +3077,15 @@ dont-distribute-packages: - phonetic-languages-general - phonetic-languages-permutations - phonetic-languages-properties + - phonetic-languages-simplified-base - phonetic-languages-simplified-common + - phonetic-languages-simplified-examples-array + - phonetic-languages-simplified-examples-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-array - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double - phonetic-languages-ukrainian @@ -3470,6 +3485,7 @@ dont-distribute-packages: - satchmo-funsat - satchmo-toysat - sauron + - sbv-program - sbvPlugin - sc2-lowlevel - sc2-support @@ -3553,7 +3569,6 @@ dont-distribute-packages: - servant-streaming-client - servant-streaming-docs - servant-streaming-server - - servant-streamly - servant-swagger-tags - servant-to-elm - servant-util @@ -3632,7 +3647,6 @@ dont-distribute-packages: - smtlib2-quickcheck - smtlib2-timing - smtp2mta - - snap-blaze-clay - snap-elm - snap-extras - snaplet-actionlog @@ -3744,12 +3758,12 @@ dont-distribute-packages: - streamed - streaming-fft - streaming-process - - streamly-posix - strelka - strelka-wai - strict-containers-lens - strict-containers-serialise - strict-data + - string-interpreter - string-typelits - stripe-haskell - stripe-http-client @@ -3820,7 +3834,6 @@ dont-distribute-packages: - synthesizer - synthesizer-alsa - synthesizer-core - - synthesizer-core_0_8_3 - synthesizer-dimensional - synthesizer-filter - synthesizer-llvm @@ -3887,7 +3900,6 @@ dont-distribute-packages: - theoremquest-client - thimk - threaded - - threepenny-gui-flexbox - thumbnail-polish - tic-tac-toe - tickle @@ -4131,7 +4143,6 @@ dont-distribute-packages: - weatherhs - web-inv-route - web-mongrel2 - - web-page - web-rep - web-routes-regular - web-routing diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 26d2e2aef4be5..50210cdccb3dc 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -874,6 +874,10 @@ self: super: builtins.intersectAttrs super { (overrideCabal { doCheck = pkgs.postgresql.doCheck; }) ]; + # Wants running postgresql database accessible over ip, so postgresqlTestHook + # won't work (or would need to patch test suite). + domaindriven-core = dontCheck super.domaindriven-core; + cachix = super.cachix.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; fsnotify = dontCheck super.fsnotify_0_4_1_0; @@ -941,6 +945,9 @@ self: super: builtins.intersectAttrs super { # Tries to access network aws-sns-verify = dontCheck super.aws-sns-verify; + # Test suite requires network access + minicurl = dontCheck super.minicurl; + # procex relies on close_range which has been introduced in Linux 5.9, # the test suite seems to force the use of this feature (or the fallback # mechanism is broken), so we can't run the test suite on machines with a @@ -1046,10 +1053,12 @@ self: super: builtins.intersectAttrs super { hint = dontCheck super.hint; # Make sure that Cabal 3.8.* can be built as-is - Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override { + Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_8_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible process = self.process_1_6_16_0; - }); + })); # cabal-install switched to build type simple in 3.2.0.0 # as a result, the cabal(1) man page is no longer installed @@ -1115,7 +1124,7 @@ self: super: builtins.intersectAttrs super { hls-splice-plugin hls-refactor-plugin hls-cabal-plugin; - # Tests have file permissions expections that don‘t work with the nix store. + # 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; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4b7201bb6ac9b..73986361499a7 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -199,7 +199,8 @@ let defaultConfigureFlags = [ "--verbose" "--prefix=$out" - "--libdir=\\$prefix/lib/\\$compiler" + # Note: This must be kept in sync manually with mkGhcLibdir + ("--libdir=\\$prefix/lib/\\$compiler" + lib.optionalString (ghc ? hadrian) "/lib") "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") @@ -207,7 +208,7 @@ let "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") @@ -284,10 +285,13 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}"; + mkGhcLibdir = ghc: "lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + + lib.optionalString (ghc ? hadrian) "/lib"; + ghcLibdir = mkGhcLibdir ghc; nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; - buildPkgDb = ghcName: packageConfDir: '' + buildPkgDb = thisGhc: packageConfDir: '' # If this dependency has a package database, then copy the contents of it, # unless it is one of our GHCs. These can appear in our dependencies when # we are doing native builds, and they have package databases in them, but @@ -297,8 +301,8 @@ let # we compile with it, and doing so can result in having multiple copies of # e.g. Cabal in the database with the same name and version, which is # ambiguous. - if [ -d "$p/lib/${ghcName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then - cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ + if [ -d "$p/${mkGhcLibdir thisGhc}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then + cp -f "$p/${mkGhcLibdir thisGhc}/package.conf.d/"*.conf ${packageConfDir}/ continue fi ''; @@ -363,14 +367,14 @@ stdenv.mkDerivation ({ # pkgs* arrays defined in stdenv/setup.hs + '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"} + ${buildPkgDb nativeGhc "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache '' # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghcNameWithPrefix "$packageConfDir"} + ${buildPkgDb ghc "$packageConfDir"} if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi @@ -510,7 +514,7 @@ stdenv.mkDerivation ({ # just the target specified; "install" will error here, since not all targets have been built. else '' ${setupCommand} copy ${buildTarget} - local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d" + local packageConfDir="$out/${ghcLibdir}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile @@ -539,7 +543,7 @@ stdenv.mkDerivation ({ ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") '' for exe in "${binDir}/"* ; do - install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" + install_name_tool -add_rpath "$out/${ghcLibdir}/${pname}-${version}" "$exe" done ''} @@ -675,7 +679,7 @@ stdenv.mkDerivation ({ "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html"; "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" - else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}"; + else "${ghcEnv}/${ghcLibdir}"; }); env = envFunc { }; diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 8b3020f886130..eae0337effc07 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 175ffe274db05..15bf8cff47367 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,38 +811,39 @@ self: { "Agda" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, case-insensitive - , containers, data-hash, deepseq, directory, edit-distance, emacs - , equivalence, exceptions, filepath, ghc-compact, gitrev, happy - , hashable, hashtables, haskeline, monad-control, mtl, murmur-hash - , parallel, pretty, process, regex-tdfa, split, stm, strict - , template-haskell, text, time, transformers, unordered-containers - , uri-encode, zlib + , containers, data-hash, deepseq, directory, dlist, edit-distance + , emacs, equivalence, exceptions, filepath, ghc-compact, gitrev + , happy, hashable, haskeline, monad-control, mtl, murmur-hash + , parallel, pretty, process, regex-tdfa, split, stm, STMonadTrans + , strict, text, time, time-compat, transformers + , unordered-containers, uri-encode, vector, vector-hashtables, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.2.2"; - sha256 = "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5"; - revision = "2"; - editedCabalFile = "0mas4lsd093rg4w6js12cjmnz8227q5g0jhkhyrnr25jglqjz75n"; + version = "2.6.3"; + sha256 = "05k0insn1c2dbpddl1slcdn972j8vgkzzy870yxl43j75j0ckb5y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ aeson array async base binary blaze-html boxes bytestring - case-insensitive containers data-hash deepseq directory + case-insensitive containers data-hash deepseq directory dlist edit-distance equivalence exceptions filepath ghc-compact gitrev - hashable hashtables haskeline monad-control mtl murmur-hash - parallel pretty process regex-tdfa split stm strict - template-haskell text time transformers unordered-containers - uri-encode zlib + hashable haskeline monad-control mtl murmur-hash parallel pretty + process regex-tdfa split stm STMonadTrans strict text time + time-compat transformers unordered-containers uri-encode vector + vector-hashtables zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - maintainers = [ lib.maintainers.abbradar lib.maintainers.turion ]; + maintainers = [ + lib.maintainers.abbradar lib.maintainers.iblech + lib.maintainers.turion + ]; }) {inherit (pkgs) emacs;}; "Agda-executable" = callPackage @@ -2134,8 +2135,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.8.1"; - sha256 = "1jj3daw8vr11v4dlvdkd7gddkpiy484mpk8dl9zgns2wnq5ibrkj"; + version = "0.8.8.2"; + sha256 = "1m4l5p8qg1mqg612x43gip5gp10x4avrm36b9iw2r2ny32rvwkdy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2909,6 +2910,8 @@ self: { pname = "Cabal"; version = "3.8.1.0"; sha256 = "0236fddzhalsr2gjbjsk92rgh8866fks28r04g8fbmzkqbkcnr3l"; + revision = "1"; + editedCabalFile = "1bah5bdjy5zxpwnzsdqibf999nirm1np8j76vr34na5vg5knrlaq"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2967,8 +2970,8 @@ self: { pname = "Cabal-syntax"; version = "3.8.1.0"; sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; - revision = "2"; - editedCabalFile = "1bzwjxj5mrsxxcgrfgisamx3f3ymz5bz085k6p83s7djh39ayaxx"; + revision = "3"; + editedCabalFile = "14zm8h7sfawysr9g37in8by8aj1p87fywj83hmshp8n6lrxr6bgd"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -4005,16 +4008,12 @@ self: { ({ mkDerivation, array, base, HUnit, pretty, QuickCheck, random }: mkDerivation { pname = "Crypto"; - version = "4.2.5.1"; - sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base HUnit pretty QuickCheck random - ]; - description = "Collects together existing Haskell cryptographic functions into a package"; - license = "unknown"; + version = "4.2.5.2"; + sha256 = "0nsv3vvlik76vdncnh771ki95903gdfsg3iyfdinm3rkhybz30m6"; + libraryHaskellDepends = [ array base pretty random ]; + testHaskellDepends = [ base HUnit pretty QuickCheck ]; + description = "Common Cryptographic Algorithms in Pure Haskell"; + license = "BSD-3-Clause AND GPL-2.0-or-later"; }) {}; "CurryDB" = callPackage @@ -6000,18 +5999,14 @@ self: { }: mkDerivation { pname = "FailT"; - version = "0.1.0.0"; - sha256 = "13ai9w5i3ay3v0skn32fllymnywd77zdr4lvf16k99lnimbzzm6y"; - revision = "2"; - editedCabalFile = "1cvw3icblydaid9w74dqaprsp8556zapr4ajw8qi8iw8y3kss891"; + version = "0.1.1.0"; + sha256 = "1hv9zycvsf696x9g73w9jhlipw826vl71gix09jmm02i9jpyr4q2"; 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 @@ -6335,6 +6330,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "FirstPrelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "FirstPrelude"; + version = "0.1.2.0"; + sha256 = "00qv9h9i3yy7rh6wl8qs2r00z9hqpm56y9g717qh0skrl1fdk3yk"; + libraryHaskellDepends = [ base ]; + description = "A version of Prelude suitable for teaching"; + license = lib.licenses.bsd3; + }) {}; + "FixedPoint-simple" = callPackage ({ mkDerivation, base, deepseq, template-haskell }: mkDerivation { @@ -10005,26 +10011,6 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.3.1"; - sha256 = "0vgyixd8j3nzpy8s04cy3q7gj2gfblba2z0ppr58rdm8qgj16j5c"; - libraryHaskellDepends = [ - base bibtex bytestring containers hashable matrix parsec - prettyprinter QuickCheck text transformers - ]; - testHaskellDepends = [ - base parsec QuickCheck tasty tasty-quickcheck text - ]; - description = "The Haskell LaTeX library"; - license = lib.licenses.bsd3; - }) {}; - - "HaTeX_3_22_3_2" = callPackage - ({ mkDerivation, base, bibtex, bytestring, containers, hashable - , matrix, parsec, prettyprinter, QuickCheck, tasty - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HaTeX"; version = "3.22.3.2"; sha256 = "1hxj661nkaylh46xrwddj8zm1gb64714yz7jk1afmy5n4yzsqdzj"; libraryHaskellDepends = [ @@ -10036,7 +10022,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -10104,6 +10089,8 @@ self: { pname = "HaXml"; version = "1.25.12"; sha256 = "1xaqp519dw948v00q309msx07yhzxbd0k8ds5q434l6g6cmsqqgc"; + revision = "1"; + editedCabalFile = "1bx5gw3jg6j0rppf5297grw9cv1vccvj5av1hny5i60nrj1725rc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10333,8 +10320,8 @@ self: { }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.3"; - sha256 = "04kczdr702kkqa89pm5lc3glq4xqnjy0rszpq7ms1zlj1gwvgckz"; + version = "0.1.0.4"; + sha256 = "093qbknl2isl91446rvrvi53vbnpiny2m0h4gl8sr48bivhilqvx"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; @@ -10491,24 +10478,6 @@ self: { }: mkDerivation { pname = "HaskellNet"; - version = "0.6.0.1"; - sha256 = "08rwi28q46md2d25l1h6s6hdqf8c2c47is5w5vyydbqx6pmfdc73"; - revision = "1"; - editedCabalFile = "0c5ixp7nl0h9nixr3g079wvjvs7j6hra2va5hnj93bsjbcm350k3"; - libraryHaskellDepends = [ - array base base64 bytestring cryptohash-md5 mime-mail mtl network - network-bsd old-time pretty text - ]; - description = "Client support for POP3, SMTP, and IMAP"; - license = lib.licenses.bsd3; - }) {}; - - "HaskellNet_0_6_0_2" = callPackage - ({ mkDerivation, array, base, base64, bytestring, cryptohash-md5 - , mime-mail, mtl, network, network-bsd, old-time, pretty, text - }: - mkDerivation { - pname = "HaskellNet"; version = "0.6.0.2"; sha256 = "0lqdqch6qwfrf89hfmvvcna2wgvhzx02v0cwsm7bbhq258alfapj"; libraryHaskellDepends = [ @@ -10517,7 +10486,6 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HaskellNet-SSL" = callPackage @@ -11186,8 +11154,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.4"; - sha256 = "0zxcfa8b0ng97v53vb8fvg2gss89b28xiz83rx38a0h4lsxpn2xf"; + version = "0.11.7.5"; + sha256 = "0y0l5nb0jsc8lm12w66a2n7nwcrgjxy1q2xdy8a788695az5xy71"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -12230,6 +12198,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_6_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover + , JuicyPixels + }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.6.0"; + sha256 = "0scjsdf2w91rlvkx0xn55p4jjy5g29hwb11jaxw52090p1vm0a7w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -12662,6 +12648,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "LPFP" = callPackage + ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib + , gloss, gnuplot, linear, not-gloss, spatial-math + }: + mkDerivation { + pname = "LPFP"; + version = "1.0"; + sha256 = "0sxl6zwji66blk2vamc6ffb17ibbxp3ypnq14xr2y5vlqj0v2flq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers diagrams-cairo diagrams-lib gloss gnuplot not-gloss + spatial-math + ]; + executableHaskellDepends = [ + base diagrams-cairo diagrams-lib gloss gnuplot linear not-gloss + spatial-math + ]; + description = "Code for the book Learn Physics with Functional Programming"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "LPPaver" = callPackage ({ mkDerivation, aern2-mfun, aern2-mp, base, collect-errors , containers, directory, mixed-types-num, optparse-applicative @@ -14056,6 +14065,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "MissingH_1_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, directory, filepath + , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time + , parsec, process, regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.6.0.0"; + sha256 = "0krd15c5c1k92zm1w2qmqwib2gg93bxqz76xmyhcjkx1l229cfzw"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process regex-compat time + unix + ]; + testHaskellDepends = [ + base containers directory filepath HUnit old-time parsec + regex-compat time unix + ]; + description = "Large utility library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -14276,8 +14308,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 ]; @@ -14293,8 +14325,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "1"; - editedCabalFile = "1swvjlsazh6wj1k8yj7ijarmw1sfmk9fv53h1hbfqcxva4gbhnkp"; + revision = "2"; + editedCabalFile = "0pkfprfr4386s2a67dk0kazn2x3m2nfr3w5r32y75rb2aa25dbmy"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -18961,6 +18993,8 @@ self: { pname = "ShellCheck"; version = "0.9.0"; sha256 = "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb"; + revision = "1"; + editedCabalFile = "0gs8q9dijsxzz6chq1gwzn34b2l2iskh72j10n47qqf598dwbjgm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20378,12 +20412,16 @@ self: { }: mkDerivation { pname = "TCache"; - version = "0.12.1"; - sha256 = "1gdp78v359jf9hzwdkips7z99s9lvi21vw0l88dgl9yirmgv8d7i"; + version = "0.13.3"; + sha256 = "0d1lwp4mfvjlrn2k96h41ijl4rs7h46hrrwxyry1bw41vinifs5q"; libraryHaskellDepends = [ base bytestring containers directory hashtables mtl old-time RefSerialize stm text ]; + testHaskellDepends = [ + base bytestring containers directory hashtables mtl old-time + RefSerialize stm text + ]; description = "A Transactional cache with user-defined persistence"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -20691,6 +20729,8 @@ self: { pname = "TeX-my-math"; version = "0.202.2.0"; sha256 = "1w074jr2qr603hjh644cvlc0n1miaz10r8mhkskq39jn184kriyl"; + revision = "1"; + editedCabalFile = "1chcybl7wf1kkf4mnjxm3vd7hdjmq6fkc8x1hn9fydln57wjzw0v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22762,8 +22802,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.14"; - sha256 = "14fhg7pkvm3rjcw6v5c0jxnq2l7v3rhw1bkb3a6g1s27alar9ynl"; + version = "0.14.1"; + sha256 = "0q2fgm2la2xyvnpfwl163md31g0m8kb0n2cxm26nfnljnbwq3a5b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23860,6 +23900,8 @@ self: { pname = "accelerate-llvm-native"; version = "1.3.0.0"; sha256 = "1x4wfbp83ppzknd98k2ad160a8kdqh96qqmyfzdqyvy44iskxcn6"; + revision = "1"; + editedCabalFile = "1w98zxyg5zr9xbx6wzglh1agc7pf25qlxbblvvvizf9niq84bw56"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring cereal containers deepseq directory dlist filepath ghc ghc-prim hashable libffi @@ -24062,8 +24104,8 @@ self: { pname = "acid-state"; version = "0.16.1.1"; sha256 = "05hcbk5dhwygc29b1jbyh2zzjrxybm44hj02wmv2bhz04b5wldca"; - revision = "2"; - editedCabalFile = "0q3z7mxahsv8wxlcm4wzqfd49im22j6lgxxd25mdrj59hzkfr6i7"; + revision = "3"; + editedCabalFile = "0ky6fsq5z9kd8wfri7fh7jzpf3d7l6r9574zpb4sc1wwvq0p45rr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24931,8 +24973,8 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.5.2"; - sha256 = "08vcp760j6ay8k9zs4qzhvirf775vhni56923jbjzdxrs9mm5167"; + version = "4.5.3"; + sha256 = "1p4r70s9xslza7ag3ifnf69ji37mkkj2gabfi1lj0fyssm0jyy5y"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers @@ -25863,8 +25905,8 @@ self: { }: mkDerivation { pname = "aeson-flowtyped"; - version = "0.13.2.1"; - sha256 = "03zs0mz6fxgvcvfnx3j55yj2hi4npfj10kirjysnx0icypqy6x7g"; + version = "0.14.0"; + sha256 = "1w7bc2i6ncnzyaxrzl1r0p54s7b579q3n83bg5621zn5m2y450gv"; libraryHaskellDepends = [ aeson base containers data-fix deriving-compat free generics-sop mtl recursion-schemes reflection scientific text time @@ -26275,8 +26317,6 @@ self: { ]; description = "Easily consume JSON data on-demand with type-safety"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-serialize" = callPackage @@ -26777,6 +26817,27 @@ self: { mainProgram = "agda2lagda"; }) {}; + "agda2lagda_0_2023_1_12" = callPackage + ({ mkDerivation, base, directory, filepath, goldplate + , optparse-applicative, process + }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2023.1.12"; + sha256 = "0arcap9vpa6yfj7mhdsljrkr0581d3jfnkxr1d8fb35mdawsiikl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + testHaskellDepends = [ base process ]; + testToolDepends = [ goldplate ]; + description = "Translate .agda files into .lagda.tex files."; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + mainProgram = "agda2lagda"; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -27748,6 +27809,7 @@ 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 @@ -27798,6 +27860,7 @@ 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 @@ -33547,6 +33610,40 @@ self: { mainProgram = "refactor"; }) {}; + "apply-refact_0_12_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.12.0.0"; + sha256 = "0xwlvygz5mvcsklqxlm34jhibwighp1v0gin2w95j0ncs96s47yc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-boot-th + ghc-exactprint 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"; + }) {}; + "apply-unordered" = callPackage ({ mkDerivation, base, fin, ghc, ghc-tcplugins-extra, hspec , should-not-typecheck, syb @@ -34006,8 +34103,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.10.2.0"; - sha256 = "0z0ralwh0z1zx5nf83j7cli9fdf9c9gpl99r7kiqv167kb2wiw9x"; + version = "0.11.0.0"; + sha256 = "0zl9lsz9bhzyd4vd61q0rkawb7iyghk9cb5pzm4gm4y9d9hayw0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34234,8 +34331,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.4"; - sha256 = "1yin826p57pmabv763l9igz6lk6c43f0y6cg2f5lqi6q1662x03w"; + version = "1.7.6"; + sha256 = "1s6fmz4mz333q8blj0x9c8wl8hh7zxq7b7jz0icdkc53ncghbfhv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -34725,14 +34822,12 @@ self: { broken = true; }) {inherit (pkgs) arpack;}; - "array_0_5_4_0" = callPackage + "array_0_5_5_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.4.0"; - sha256 = "1ixqnwxd36l2j3873hwnfip17k2nzncbvsx7pnprqzv9z59mf4rv"; - revision = "1"; - editedCabalFile = "0y6v6mfd0y5jzskp7b6jwg1ybfirpgrppvd4zri9xccd73v1xfaa"; + version = "0.5.5.0"; + sha256 = "06zmbd6zlim22zfxmdzzw947nzx9g2d6yx30min6spsk54r8vcqq"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = lib.licenses.bsd3; @@ -35151,15 +35246,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_5_1_0" = callPackage + "ascii_1_5_4_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.5.1.0"; - sha256 = "01a2xrkk60bpbz4x337jp66fy7zhdpb2c649c62inx723cc1q4il"; + version = "1.5.4.0"; + sha256 = "1lgmdhgby6kdvsl8xg2swqvw9vzlni7s53g42jidd13iappzkxkq"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35193,25 +35288,12 @@ self: { ({ mkDerivation, ascii-char, base, hashable, hspec }: mkDerivation { pname = "ascii-case"; - version = "1.0.1.1"; - sha256 = "1vsqjxh8mhzd960p30lbzakfa3acfqpk646a61jhn0j3yv7lq7p3"; - libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base hspec ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_1_2" = callPackage - ({ mkDerivation, ascii-char, base, hashable, hspec }: - mkDerivation { - pname = "ascii-case"; version = "1.0.1.2"; sha256 = "17gqpc65ffy4ipf0bhrs5nyqcmn6fxpx859m03wzm5m2y7ki67nd"; libraryHaskellDepends = [ ascii-char base hashable ]; testHaskellDepends = [ ascii-char base hspec ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-caseless" = callPackage @@ -35232,8 +35314,8 @@ self: { ({ mkDerivation, base, hashable, hspec }: mkDerivation { pname = "ascii-char"; - version = "1.0.0.16"; - sha256 = "06iig5p15ip0wpg330dq8kclq7g7j2xkrkk0dbl3z509d44mg049"; + version = "1.0.0.17"; + sha256 = "1562gkfvrcjygs9qpyswsk25d4m2pxblmmbb0hw8jsaml2jwsyss"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ base hspec ]; description = "A Char type representing an ASCII character"; @@ -35286,27 +35368,12 @@ self: { ({ mkDerivation, ascii-char, base, hashable, hedgehog }: mkDerivation { pname = "ascii-group"; - version = "1.0.0.14"; - sha256 = "0rk3lvs4b6d4cfzb5zc87f42wdmziprpfd4fww5r68ry3ccyn1ps"; - revision = "1"; - editedCabalFile = "0iwf48cq67qzgw4ih6532yxl03bpnzrhz68y0yfk87r1y3hsdxfx"; - libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base hedgehog ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_15" = callPackage - ({ mkDerivation, ascii-char, base, hashable, hedgehog }: - mkDerivation { - pname = "ascii-group"; version = "1.0.0.15"; sha256 = "006b4idi63hz8x54a5fmx5isypdvif8q4ijf274dr93n0c9wh1di"; libraryHaskellDepends = [ ascii-char base hashable ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -35331,27 +35398,6 @@ self: { }: mkDerivation { pname = "ascii-numbers"; - version = "1.1.0.0"; - sha256 = "041qyhgksqchj3x09fbirxba7s31aicaqnk8185g2l70zgxjz6iv"; - revision = "2"; - editedCabalFile = "0nw6iy42ql53gl4i74ilmdar5r4l2wbn5ihv1yqbqm7rm9bqda8p"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-superset base bytestring hashable text - ]; - testHaskellDepends = [ - ascii-case ascii-char ascii-superset base bytestring hashable - hedgehog invert text - ]; - description = "ASCII representations of numbers"; - license = lib.licenses.asl20; - }) {}; - - "ascii-numbers_1_1_0_2" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base - , bytestring, hashable, hedgehog, invert, text - }: - mkDerivation { - pname = "ascii-numbers"; version = "1.1.0.2"; sha256 = "0dqqnqrn3hvmjgakm6vzbidlik4p483wcslcwr60qbxa1v5lmznv"; revision = "2"; @@ -35365,34 +35411,18 @@ 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.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; - }) {}; - - "ascii-predicates_1_0_1_2" = callPackage - ({ mkDerivation, ascii-char, base, hedgehog }: - mkDerivation { - pname = "ascii-predicates"; 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; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -35445,10 +35475,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 ]; @@ -35457,14 +35485,14 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii-superset_1_2_5_0" = callPackage + "ascii-superset_1_2_7_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"; + version = "1.2.7.0"; + sha256 = "140xdw3r9aj9yhjwbvhqyb4c4scad2rfdj9kf6yh1aqf4lqvh0kn"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char base bytestring hashable text ]; @@ -35495,19 +35523,19 @@ 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; @@ -35706,6 +35734,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 @@ -37350,6 +37403,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 { @@ -37480,6 +37544,8 @@ self: { pname = "audacity"; version = "0.0.2.1"; sha256 = "04r36gy8z0d2fz1l5px6yajp7izf3zpda9vci6q0wc273pxc8ck6"; + revision = "1"; + editedCabalFile = "0f43s469wgrp6vkiqz1ibnvcv37zjsng2pdzkhhpg9v4syi30r3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37748,6 +37814,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 { @@ -37786,8 +37864,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.1"; - sha256 = "1pjv2nk8g7cvck2g6nm15dy2bwg3hqdhyyi4c0q7x2k0awn2qkjg"; + version = "0.2.0.3"; + sha256 = "1ihyyxj4lbk172z7wnv11ryir3d00d5jrcprqiy0q7b4gkzsn3q6"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -37821,8 +37899,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.1.0.2"; - sha256 = "0vvwjz8abn6qmk2801p7vyrbjkqcxdqjlc82ha8l9xvb6mmvqy3i"; + version = "0.1.0.3"; + sha256 = "1rb9ff1n0pllx02g1741mkvil2hz5km306pbyqm15h17vlpa5kdw"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -37872,24 +37950,6 @@ self: { }: mkDerivation { pname = "autodocodec-yaml"; - version = "0.2.0.2"; - sha256 = "164nrmpxrwyr49f0gczi2sixzrs3sv2pn8j293s9avw684aq2prx"; - libraryHaskellDepends = [ - autodocodec autodocodec-schema base bytestring containers path - path-io safe-coloured-text scientific text unordered-containers - vector yaml - ]; - description = "Autodocodec interpreters for yaml"; - license = lib.licenses.mit; - }) {}; - - "autodocodec-yaml_0_2_0_3" = callPackage - ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring - , containers, path, path-io, safe-coloured-text, scientific, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "autodocodec-yaml"; version = "0.2.0.3"; sha256 = "00cf3zz0jgnqq45rkpf5a9jlds16rgfc15ndhv1fgq7yz935g93f"; libraryHaskellDepends = [ @@ -37899,7 +37959,6 @@ self: { ]; description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "autoexporter" = callPackage @@ -37917,6 +37976,24 @@ self: { mainProgram = "autoexporter"; }) {}; + "autoexporter_2_0_0_7" = callPackage + ({ mkDerivation, base, Cabal-syntax, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "2.0.0.7"; + sha256 = "19h4i73r06p3blza9qfkvcqp9wg7nhyif8cff6a5ky40fbqqs3gf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal-syntax directory filepath ]; + executableHaskellDepends = [ + base Cabal-syntax directory filepath + ]; + description = "Automatically re-export modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "autoexporter"; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -38486,8 +38563,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.23"; - sha256 = "0kfdj9hxjvziq1y74xj9mm17zcgwywpvp9c0i6gfd5malf4qxgg0"; + version = "0.24"; + sha256 = "0phcpmq15fn62pq2ngr6lyylqaz3cq3qdp828rcbzvsrarscy519"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38538,32 +38615,6 @@ self: { }: 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; - mainProgram = "aws-cloudfront-signed-cookies"; - }) {}; - - "aws-cloudfront-signed-cookies_0_2_0_12" = 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.12"; sha256 = "1gdam3h8ir1lz8phhj03ckiv0f371xl79adi4kz2yqk2ayvcixhv"; isLibrary = true; @@ -38577,7 +38628,6 @@ self: { 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"; }) {}; @@ -38910,8 +38960,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "4.1.1"; - sha256 = "0w4pdyagcs7m05kccdq0x3s1d4vbr2ihqjrbill0p0gn25q9h6cc"; + version = "4.1.2"; + sha256 = "1c5m9mmkcrgz5hd1swinfcrblkmc4yg142kzlfxfcxnyray3digm"; libraryHaskellDepends = [ aeson base bytestring case-insensitive exceptions hashable http-client http-types mtl path path-io safe-exceptions-checked @@ -41732,6 +41782,28 @@ self: { license = lib.licenses.mit; }) {}; + "beam-core_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, scientific + , tagged, tasty, tasty-hunit, text, time, vector, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.10.0.0"; + sha256 = "0567j05c3ihr5j3n3pl39x84xp4p6y2haxybwc22acbami1hqrkw"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri scientific tagged text time vector + vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -42675,6 +42747,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bifunctor-classes-compat" = callPackage + ({ mkDerivation, base, base-orphans, tagged, transformers }: + mkDerivation { + pname = "bifunctor-classes-compat"; + version = "0.1"; + sha256 = "0by738hg600sf5dcbjsn9flpqn3bgam72036znxbml17rcw6xj9p"; + libraryHaskellDepends = [ base base-orphans tagged transformers ]; + doHaddock = false; + description = "Compatibility package for the Bifunctor, Bifoldable, and Bitraversable classes"; + license = lib.licenses.bsd3; + }) {}; + "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , hspec-discover, QuickCheck, tagged, template-haskell @@ -43226,20 +43310,20 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, bytestring, mtl, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "binary-parser"; - version = "0.5.7.2"; - sha256 = "1p17v5fspislzmqy5wxrnmbfg0l0yvm35mk034q4imkmjy0pa1w7"; + version = "0.5.7.3"; + sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd"; libraryHaskellDepends = [ base bytestring mtl text transformers ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + base base-prelude bytestring mtl QuickCheck quickcheck-instances + tasty tasty-hunit tasty-quickcheck text transformers ]; - description = "A highly-efficient but limited parser API specialised for bytestrings"; + description = "An efficient but limited parser API specialised to bytestrings"; license = lib.licenses.mit; }) {}; @@ -44440,6 +44524,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 @@ -44452,8 +44538,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.raehik ]; }) {}; "bins" = callPackage @@ -45409,6 +45494,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bitfield" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest, QuickCheck + , sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "bitfield"; + version = "0.0.0.0"; + sha256 = "1b9jqbcyzp1ajcgjiipjgn1h514kl6zav4ai474x6xalhvwfcpx9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest QuickCheck sydtest validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Generic and easy to use haskell bitfields"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -45981,7 +46084,9 @@ self: { ]; description = "Shake frontend for Agda blogging"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "blagda"; + broken = true; }) {}; "blake2" = callPackage @@ -46006,8 +46111,8 @@ self: { ({ mkDerivation, base, memory, tasty, tasty-hunit }: mkDerivation { pname = "blake3"; - version = "0.2"; - sha256 = "1a6pfcsdnqwr116jypzla6nvl1wzny60r5ypi2yj4gjpmpbkj8b8"; + version = "0.3"; + sha256 = "12hm7bd4jqxw0gqmczb9vxn99lbwawr09xwp6y7xb0fzrr97ysls"; libraryHaskellDepends = [ base memory ]; testHaskellDepends = [ base memory tasty tasty-hunit ]; description = "BLAKE3 hashing algorithm"; @@ -46669,20 +46774,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.1.0"; - sha256 = "0dy2xspnmy9487zgjaws250kp5qnip3ir8qwnn57ah92h3z1w0mj"; + 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 @@ -46697,12 +46801,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.1.0"; - sha256 = "1cr3zb69hradfc02di523vhykp0y8v8mpyzc37xw8i3phrgasw57"; + version = "0.7.1.1"; + sha256 = "1k795lar667y5ai484cmrv5cvzdcca165cgvai9234b721by80jx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46710,9 +46814,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; @@ -47220,29 +47322,30 @@ self: { }) {}; "board-games" = callPackage - ({ mkDerivation, array, base, cgi, containers, criterion - , enummapset, html, httpd-shed, network-uri, non-empty, parallel - , QuickCheck, random, transformers, utility-ht + ({ mkDerivation, array, base, boxes, cgi, combinatorial, containers + , criterion, doctest-exitcode-stdio, doctest-lib, enummapset + , explicit-exception, haha, html, httpd-shed, network-uri + , non-empty, parallel, QuickCheck, random, semigroups + , shell-utility, transformers, utility-ht }: mkDerivation { pname = "board-games"; - version = "0.3"; - sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7"; - revision = "1"; - editedCabalFile = "0rb5bqjg6r8p2v2wfdhivsbgbn55acdjsj6hcy6bv5w50qmg1l6c"; + version = "0.4"; + sha256 = "05lrjgxdg836ik7ry5h9m9diirfc55086winssr9y0g6vbgbifpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base cgi containers enummapset html non-empty QuickCheck - random transformers utility-ht + array base boxes cgi combinatorial containers enummapset + explicit-exception haha html non-empty QuickCheck random semigroups + transformers utility-ht ]; executableHaskellDepends = [ array base cgi containers html httpd-shed network-uri non-empty - random transformers utility-ht + random shell-utility transformers utility-ht ]; testHaskellDepends = [ - array base containers enummapset non-empty QuickCheck random - transformers utility-ht + array base containers doctest-exitcode-stdio doctest-lib enummapset + non-empty QuickCheck random transformers utility-ht ]; benchmarkHaskellDepends = [ base containers criterion enummapset non-empty parallel QuickCheck @@ -48118,8 +48221,8 @@ self: { }: mkDerivation { pname = "bound"; - version = "2.0.5"; - sha256 = "1cnw0q97bys7jcpjds2fb6zkq9pyqxcb8v0b5dvkckqmlp8agn4v"; + version = "2.0.6"; + sha256 = "1mlnpc4x7gn97b8pqiwj3shv23slfylwplp7zr37ar5ff9isbm28"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -48639,33 +48742,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_1_3" = 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.3"; - sha256 = "0lpd6685ya0va0a6n7cw70f5b1s13y8ynzac0gkxyqb1ivzj0hsb"; - 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; - }) {}; - "brick" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions @@ -48692,7 +48768,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_1_5" = callPackage + "brick_1_6" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck @@ -48701,8 +48777,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "1.5"; - sha256 = "0kszp6yrpqc9v87m38rladhmn8xcdbrrh05xr6fi936n34bhi432"; + version = "1.6"; + sha256 = "18vx2p8yfraxb77cd9pvdvsqgm3pcvrkc6wa74jsr7177akgnga6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48781,7 +48857,7 @@ self: { mainProgram = "mywork-example"; }) {}; - "brick-skylighting" = callPackage + "brick-skylighting_0_3" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48797,10 +48873,9 @@ self: { description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; - "brick-skylighting_1_0" = callPackage + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48815,6 +48890,23 @@ self: { ]; description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; + }) {}; + + "brick-tabular-list" = callPackage + ({ mkDerivation, base, brick, containers, generic-lens, microlens + , optics-core, vty + }: + mkDerivation { + pname = "brick-tabular-list"; + version = "0.1.0.2"; + sha256 = "1ldzbl9wnk6ghckbxlmqs3vf1qivh7qndgy5iryasiy9bil8h9fk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers generic-lens microlens optics-core vty + ]; + description = "Tabular list widgets for brick"; + license = lib.licenses.bsd0; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -49226,6 +49318,8 @@ self: { pname = "brotli"; version = "0.0.0.1"; sha256 = "0fp8vhqzl6i1vvb4fw4zya6cgkzmj0yaaw94jdf2kggm3gn8zwfc"; + revision = "1"; + editedCabalFile = "1mp8fcczfaxk2rfmaakxyrc0w9cwglj1dv9fifl3spvp6g8zcr1n"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ brotli ]; testHaskellDepends = [ @@ -49266,8 +49360,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; - revision = "5"; - editedCabalFile = "0fp2ysmldmq8c1jlbprky1b7dxls3vgj4n1prnd84k2d01g7ff9m"; + revision = "6"; + editedCabalFile = "01w72wyvfyf8d5wb88ds1m8mrk7xik8y4kzj1025jxh45li2w4dr"; libraryHaskellDepends = [ base brotli bytestring io-streams ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -50177,6 +50271,27 @@ self: { license = lib.licenses.mit; }) {}; + "burrito_2_0_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "2.0.1.3"; + sha256 = "001j2mvrqvlycf85d1k265vz89bqzx52hlmnbjzcd0x4y6lghgry"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec parsec QuickCheck template-haskell + text transformers + ]; + description = "Parse and render URI templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -50459,8 +50574,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "1.0.4"; - sha256 = "0c6d8b11dgg585fvql0h2rrmiw2l8831ig2f89jlqzkdsa0asm67"; + version = "1.0.5"; + sha256 = "1ydldi9q9rxggjh6mncg7mwggi0wpigld96nqqgw33ldcid8b7as"; libraryHaskellDepends = [ base bitwise bytestring deepseq panic parameterized-utils random th-lift @@ -50511,8 +50626,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "1.1.1"; - sha256 = "0yy9hd8yhpi175fgnp8cd4h0bifx2zvy82jmbkd28kpbgw6b49vi"; + version = "1.1.2"; + sha256 = "11z9dga8jq3f0h4v0c3s2brrcqb029h6wsn0x97393vkx7pjhai2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50680,6 +50795,7 @@ self: { ]; description = "Fast logging"; license = lib.licenses.bsd3; + badPlatforms = lib.platforms.darwin; }) {}; "byteorder" = callPackage @@ -50704,6 +50820,8 @@ self: { pname = "bytepatch"; version = "0.4.0"; sha256 = "0algbhwzkhj5l98djzhy6ayd4wpldxv75zvqhpp6ckm94ryvb4v9"; + revision = "1"; + editedCabalFile = "1n4cff6wfbgdrw2hn7q1ns346w3mcn6a84v15hw4yzd173pbk4k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50724,8 +50842,11 @@ self: { testToolDepends = [ hspec-discover ]; description = "Patch byte-representable data in a bytestream"; license = lib.licenses.mit; + platforms = lib.platforms.x86; hydraPlatforms = lib.platforms.none; mainProgram = "bytepatch"; + maintainers = [ lib.maintainers.raehik ]; + broken = true; }) {}; "bytes" = callPackage @@ -50833,14 +50954,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "bytestring_0_11_3_1" = callPackage + "bytestring_0_11_4_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck, random, tasty , tasty-bench, tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "bytestring"; - version = "0.11.3.1"; - sha256 = "0nh75v2hmmcq650q51sv28yprrnnah80spiqvw4js8dy48bqwlah"; + version = "0.11.4.0"; + sha256 = "1lvnjnrsnwbyn5day55fkhzrwggjrabz1rvaq833lsawcbvsw6j9"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck tasty tasty-quickcheck @@ -51658,8 +51779,8 @@ self: { pname = "c2hs"; version = "0.28.8"; sha256 = "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir"; - revision = "1"; - editedCabalFile = "0hbv1j9b04gm617c5xqndr4iqidabwdpcn2dcrnaacc04ylchvl2"; + revision = "2"; + editedCabalFile = "14j3sjxvwhj32zpz0iyigc6wdn6pjm3vlgs0prq0grvk48p176f3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -51763,8 +51884,8 @@ self: { }: mkDerivation { pname = "cab"; - version = "0.2.19"; - sha256 = "0rn8b8fydrm8ad0va0pg016y5ph3dc0xashg0rqfjhzv8kwzlkzk"; + version = "0.2.20"; + sha256 = "005vpmjpxrnj84pn7qjswjrb0vzmyhid2lr923q7m4rr3bi78ac1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51809,6 +51930,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 @@ -51899,37 +52032,38 @@ self: { "cabal-cache" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , antiope-core, antiope-optparse-applicative, antiope-s3, base - , 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 + , attoparsec, base, bytestring, cabal-install-parsers + , conduit-extra, containers, cryptonite, deepseq, directory + , exceptions, filepath, generic-lens, Glob, hedgehog + , hedgehog-extras, hspec, hspec-discover, http-client + , http-client-tls, http-types, hw-hspec-hedgehog, lens, mtl + , network-uri, oops, optparse-applicative, process, raw-strings-qq + , relation, resourcet, stm, stringsearch, temporary, text, time + , topograph, transformers, unliftio }: mkDerivation { pname = "cabal-cache"; - version = "1.0.5.4"; - sha256 = "15jg140ly7rska7v8ihvd383q9lj4i5c18rzjad4yi8f78jjciqb"; + version = "1.0.6.0"; + sha256 = "0jjybnj06f8w3fh44q3mq28fvyd1v7yfbh0rrkxsikdxnhi74z9j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 - base bytestring containers cryptonite deepseq directory exceptions + aeson amazonka amazonka-core amazonka-s3 attoparsec base bytestring + conduit-extra containers cryptonite deepseq directory exceptions filepath generic-lens http-client http-client-tls http-types lens - mtl network-uri optparse-applicative process relation resourcet stm - text topograph transformers + mtl network-uri oops optparse-applicative process relation + resourcet stm text topograph transformers ]; executableHaskellDepends = [ - aeson amazonka amazonka-core antiope-core - 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 + aeson amazonka amazonka-core base bytestring cabal-install-parsers + containers directory exceptions filepath generic-lens lens mtl + network-uri oops optparse-applicative resourcet stm stringsearch + temporary text unliftio ]; testHaskellDepends = [ - aeson antiope-core base bytestring filepath hedgehog hspec - http-types hw-hspec-hedgehog lens network-uri raw-strings-qq text + aeson amazonka base bytestring directory exceptions filepath Glob + hedgehog hedgehog-extras hspec http-types hw-hspec-hedgehog lens + mtl network-uri oops raw-strings-qq text time ]; testToolDepends = [ hspec-discover ]; description = "CI Assistant for Haskell projects"; @@ -52541,8 +52675,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.5"; - sha256 = "017q4cagx3w0ww9bpilji9hiscilmg78m10ggi9ih0997hjp4l50"; + version = "0.6"; + sha256 = "000gw1gxgn3rr95l05fv8yliqxjn9hpdafqz9r4kr9632cn93328"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal-syntax containers cryptohash-sha256 deepseq directory @@ -52864,8 +52998,8 @@ self: { }: mkDerivation { pname = "cabal-sort"; - version = "0.0.5.4"; - sha256 = "1pssbb9i5h3q97i3qrybz9iyd1nsh9y27ykxvda6vk820jxjvb9b"; + version = "0.0.5.5"; + sha256 = "0lxw7kbqpaf4j03rrlivkb0imvnw0wsnxjy8gvcjs0jb101dzf8g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -53175,6 +53309,28 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; + "cabal2spec_2_6_4" = callPackage + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.6.4"; + sha256 = "01h028nm4r149niwrc0pc0pgsvkwr0vqwazv21rlxw56ikbpd6j6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + description = "Convert Cabal files into rpm spec files"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal2spec"; + maintainers = [ lib.maintainers.peti ]; + }) {}; + "cabalQuery" = callPackage ({ mkDerivation, base, Cabal, containers, directory, MissingH , pretty @@ -54034,13 +54190,13 @@ self: { "call-alloy" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , extra, filepath, hspec, mtl, process, split, transformers - , trifecta, unix + , extra, filepath, hspec, mtl, process, split, string-interpolate + , transformers, trifecta, unix }: mkDerivation { pname = "call-alloy"; - version = "0.4.0.1"; - sha256 = "0xxrin8n2kk37jip5hacyn87sxhwz4bjk6crd90yw8f1sg8n354m"; + version = "0.4.0.2"; + sha256 = "0kazmpc2969640n5qnsks2ndw522ag71fiqp5anmzfb75mxfr5zv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory extra filepath mtl @@ -54048,7 +54204,7 @@ self: { ]; testHaskellDepends = [ async base bytestring containers directory extra filepath hspec mtl - process split transformers trifecta unix + process split string-interpolate transformers trifecta unix ]; description = "A simple library to call Alloy given a specification"; license = lib.licenses.mit; @@ -54210,8 +54366,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, HUnit, mtl }: mkDerivation { pname = "can-i-haz"; - version = "0.3.1.0"; - sha256 = "0pwwl5pawvd1sygc8k7ichfk15inhcy4has40zplqqws5lmm6mz8"; + version = "0.3.1.1"; + sha256 = "19518f7xrki9igv4i9ish1v3cgix5g0mgvwrkrjgq3ny2jwmqljw"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base deepseq hspec HUnit mtl ]; description = "Generic implementation of the Has and CoHas patterns"; @@ -54539,8 +54695,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.16.0.0"; - sha256 = "1pxg8l5lahx8j1wayq665s2as29zpfmjh0kn3962awxj376fhrwf"; + version = "0.17.0.0"; + sha256 = "0qs914mnka65qlji1jirgyrnr4qb08qb7mkacm9h09713dz91acw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54704,8 +54860,8 @@ self: { }: mkDerivation { pname = "car-pool"; - version = "0.0.1"; - sha256 = "1y674qnixmk6l4yvbvz3vsxzpfchy5vq0qsn4b2xyziqxscz9aih"; + version = "0.0.1.1"; + sha256 = "0xbaaynw0bi18lbdxa0n0ypd8qkn6x4y7i7vsan2zawwbkn264sg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55526,6 +55682,8 @@ self: { pname = "cassava"; version = "0.5.3.0"; sha256 = "1gp954w05bj83z4i6isq2qxi1flqwppsgxxrp1f75mrs8cglbj5l"; + revision = "1"; + editedCabalFile = "1lavd2c7w2p2x4i7h35r8kgcgrrlhcql70zk5vgqv5ll04pp0niy"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -55546,8 +55704,8 @@ self: { }: mkDerivation { pname = "cassava-conduit"; - version = "0.6.0"; - sha256 = "114ab0kxy7rj1hps1sy9i0mkj2lp046zjlpll2apmf3mxdminva0"; + version = "0.6.1"; + sha256 = "11nwn090x1b39vl0l9vbsphf5qlp4cxz6q1lrp0qqq1dvq9q1642"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit containers mtl text @@ -55729,9 +55887,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 @@ -56867,8 +57023,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.5.0.0"; - sha256 = "09wvp9vkqasns4flw9z46nhcy96r4qxjv6h47d5f90drz77pmm8a"; + version = "3001.5.0.1"; + sha256 = "044gfqfdw5xdr6mzp5i3956a5fcj15j32zwzzd6ym15nxgrvjqh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57772,8 +57928,8 @@ self: { ({ mkDerivation, base, explicit-exception, utility-ht }: mkDerivation { pname = "checksum"; - version = "0.0"; - sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik"; + version = "0.0.0.1"; + sha256 = "1p1ys40jjndbq4p5hr64ps464yd5brv1nf821crr6ncfcw8h3742"; libraryHaskellDepends = [ base explicit-exception utility-ht ]; description = "Compute and verify checksums of ISBN, IBAN, etc"; license = lib.licenses.bsd3; @@ -57857,8 +58013,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.0"; - sha256 = "0hmj9dvsvwrp7ab4zrzmbvmzy0q6fr2ifzmdp4ajbxlmca0yh3py"; + version = "0.9.3.1"; + sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59096,8 +59252,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.8.0.2"; - sha256 = "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw"; + version = "0.8.1"; + sha256 = "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59940,8 +60096,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "clckwrks" = callPackage @@ -60310,17 +60465,22 @@ self: { "clerk" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, lens - , mtl, text, time, transformers, xlsx + , lima, mtl, text, time, transformers, typed-process, xlsx }: mkDerivation { pname = "clerk"; - version = "0.1.0.2"; - sha256 = "0nbli8pj7v4wblbji2hqlkwbh98iiclg7vpbg6qsa91bw8p4nwmd"; + version = "0.1.0.3"; + sha256 = "01bxj0znkk8gizn0ilslzn07x4rm716ghpckwfqf7ilh78q5jfnd"; libraryHaskellDepends = [ base bytestring containers data-default lens mtl text time transformers xlsx ]; - description = "Declaratively describe spreadsheets and generate xlsx"; + testHaskellDepends = [ + base bytestring containers data-default lens mtl text time + transformers typed-process xlsx + ]; + testToolDepends = [ lima ]; + description = "Declaratively describe spreadsheets"; license = lib.licenses.bsd3; }) {}; @@ -60430,8 +60590,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "cli-arguments"; - version = "0.6.0.0"; - sha256 = "0vg5xmdg84bv6bab03iv9zj0i1vkp9xlfjbm1rpzjjhpihp8v5sg"; + version = "0.7.0.0"; + sha256 = "13l72n6n34zgv6cj9k7vimh3n0gc7vgrw12il7nvb87wg0cjm1wn"; libraryHaskellDepends = [ base ]; description = "A library to process command line arguments in some more convenient way"; license = lib.licenses.mit; @@ -61860,8 +62020,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 ]; @@ -61980,24 +62140,25 @@ self: { "cobot-io" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring, cobot - , containers, data-msgpack, deepseq, directory, hspec, http-conduit - , hyraxAbif, lens, linear, megaparsec, mtl, neat-interpolation - , parser-combinators, QuickCheck, split, text, vector + , containers, data-msgpack, deepseq, directory, filepath, hspec + , http-conduit, hyraxAbif, lens, linear, megaparsec, mtl + , neat-interpolation, parser-combinators, QuickCheck, split, text + , vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.4.4"; - sha256 = "04dizmriis6zs7jfwbagnzrszlmky8xkvrsmxb8wra90fnww8l66"; + version = "0.1.5.1"; + sha256 = "0k26qzrd1j744dg5is26gmh99xawf25wzlj72wmlc56nx5rc6cfx"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers - data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec - mtl parser-combinators split text vector + data-msgpack deepseq filepath http-conduit hyraxAbif lens linear + megaparsec mtl parser-combinators split text vector ]; testHaskellDepends = [ array attoparsec base binary bytestring cobot containers - data-msgpack deepseq directory hspec http-conduit hyraxAbif lens - linear megaparsec mtl neat-interpolation parser-combinators - QuickCheck split text vector + data-msgpack deepseq directory filepath hspec http-conduit + hyraxAbif lens linear megaparsec mtl neat-interpolation + parser-combinators QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = lib.licenses.bsd3; @@ -62268,8 +62429,8 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.8.0"; - sha256 = "0iaiw3gngpg2cwm0pgckn9vb0hjm7xm8szsii0k2s4d8fkl4k5rv"; + version = "0.8.1"; + sha256 = "1gpm33pv2c1cbvwi253f3ksrjaxlrhzwwsvlzp84x8834801lkl3"; libraryHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable @@ -62877,8 +63038,8 @@ self: { pname = "colonnade"; version = "1.2.0.2"; sha256 = "1asjx71gp26a15v7g3p8bfddb5nnzky6672c35xx35hq73mhykr4"; - revision = "4"; - editedCabalFile = "0425ag47i8llirh6jdy11mqilr6bdq0nzcx4yfha2n57qpx1gkjs"; + revision = "5"; + editedCabalFile = "1f4m7lqksb7lvzs3j5v8c04l2mmq7pq1d8w7p8y9chy595rrb1kn"; libraryHaskellDepends = [ base bytestring contravariant profunctors semigroups text vector ]; @@ -63383,32 +63544,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.5.1.1"; - sha256 = "07rajrpp495g17naywybkrydd67ixiav5g8rayavwabvyrybnmgy"; - 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 - ]; - description = "Arrays where the index type is a function of the shape type"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "comfort-array_0_5_2" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , non-empty, prelude-compat, primitive, QuickCheck, semigroups - , storable-record, storablevector, tagged, transformers, utility-ht - }: - mkDerivation { - pname = "comfort-array"; - version = "0.5.2"; - sha256 = "0rpv9mn1jmkb9f89y02zfg2vwz4slzny31yjrvwcm43jhdyvzkwh"; + version = "0.5.2.1"; + sha256 = "01vijksddhqmypikk0kgsw02fqdp3anvxvvmhimw11kg87n5dy7v"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector @@ -63592,8 +63729,8 @@ self: { }: mkDerivation { pname = "commander-cli"; - version = "0.10.2.0"; - sha256 = "1cp7g04ag1pkcqlckpzxfq3x4vw7yd6v9vzhhp228pjc1f36iqgx"; + version = "0.11.0.0"; + sha256 = "01c968r4qzvqbjwqwhp1xk7s59wsbaas9jvdfi2sgk2jk6vg0ss3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63739,8 +63876,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.1.2"; - sha256 = "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap"; + version = "0.2.1.3"; + sha256 = "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp"; libraryHaskellDepends = [ base commonmark commonmark-extensions pandoc-types text ]; @@ -65539,8 +65676,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.16"; - sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"; + version = "1.10.17"; + sha256 = "12dmpjdiv3y1jnljvsbx258plzjvsjnizn25csmy7w4scfbrjl0b"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -67690,12 +67827,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "containers_0_6_6" = callPackage + "containers_0_6_7" = callPackage ({ mkDerivation, array, base, deepseq, template-haskell }: mkDerivation { pname = "containers"; - version = "0.6.6"; - sha256 = "1s1a1d8hvlgarmajf3p8ars1cqxyaw1ncmw0793g7m82y78hw6dq"; + version = "0.6.7"; + sha256 = "0x684l54zpz2xh8jqyc1q107aggf9v3a5vz9cmgcx9l8bvyfy5l5"; libraryHaskellDepends = [ array base deepseq template-haskell ]; description = "Assorted concrete container types"; license = lib.licenses.bsd3; @@ -68615,26 +68752,6 @@ self: { }: mkDerivation { pname = "cookie"; - version = "0.4.5"; - sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq text time - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - text time - ]; - description = "HTTP cookie parsing and rendering"; - license = lib.licenses.mit; - }) {}; - - "cookie_0_4_6" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - , time - }: - mkDerivation { - pname = "cookie"; version = "0.4.6"; sha256 = "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc"; libraryHaskellDepends = [ @@ -68646,7 +68763,6 @@ self: { ]; description = "HTTP cookie parsing and rendering"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "cookies" = callPackage @@ -68972,8 +69088,8 @@ self: { }: mkDerivation { pname = "core-data"; - version = "0.3.8.0"; - sha256 = "16gkll00awgb0l5mdpxd33f3szgvfsbwxlh3nkj1jsdkjrir4ggc"; + version = "0.3.9.0"; + sha256 = "126z21i4f7z7pf415jjqjd4ik6sb9kid1dgrlc2yzq2vd4wdi9gg"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable hourglass prettyprinter scientific text time unordered-containers uuid vector @@ -68982,6 +69098,21 @@ self: { license = lib.licenses.mit; }) {}; + "core-effect-effectful" = callPackage + ({ mkDerivation, base, core-data, core-program, core-text + , effectful-core + }: + mkDerivation { + pname = "core-effect-effectful"; + version = "0.0.0.4"; + sha256 = "1an8x6kjxp00slxqhvizyh7j3i6irain0xbv4ic7y5csqj5lqy6f"; + libraryHaskellDepends = [ + base core-data core-program core-text effectful-core + ]; + description = "Interoperability with the effectful effects system"; + license = lib.licenses.mit; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -69005,20 +69136,42 @@ self: { , exceptions, filepath, fsnotify, hashable, hourglass, mtl , prettyprinter, safe-exceptions, stm, template-haskell , terminal-size, text, text-short, transformers, typed-process - , unix + , unix, unliftio-core }: mkDerivation { pname = "core-program"; - version = "0.6.1.1"; - sha256 = "1qc9acs4jcrs80677fkd42h7nzwx8n7falrnxjsqpslh6i900hzc"; + version = "0.6.3.0"; + sha256 = "1jd1733f2yn9bsbj5p4y62gqjlzdykpj5yaisd82s28lijqrqi02"; libraryHaskellDepends = [ base bytestring 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 + typed-process unix unliftio-core + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + }) {}; + + "core-program_0_6_5_0" = callPackage + ({ mkDerivation, base, bytestring, 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, unliftio-core + }: + mkDerivation { + pname = "core-program"; + version = "0.6.5.0"; + sha256 = "0xbvwivby27dky11nhs0szs9dbs5mlivspbkvrflja30kaa7lqam"; + libraryHaskellDepends = [ + base bytestring 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 unliftio-core ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "core-telemetry" = callPackage @@ -69029,8 +69182,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.2.7.0"; - sha256 = "148ij7rdnjh4fl84b8r20vffm0564afj101zn7xkji653fv1ha0s"; + version = "0.2.7.3"; + sha256 = "1lini012vrpxn947l5aa7wjjqny9mxzvmhpzkmvpmc72cmqhfcjw"; libraryHaskellDepends = [ base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions @@ -69749,8 +69902,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "4.4.1"; - sha256 = "14g31626g72qljbrds08cpx670v2zgis05z3nkd5b7lim99ibhfh"; + version = "4.4.2"; + sha256 = "0yrrrwm69j3k0fwcdrhdzq49zin4jqn5xcl603dr9zfaxfrjw4js"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -70688,6 +70841,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "criterion-compare"; + broken = true; }) {}; "criterion-measurement" = callPackage @@ -71594,10 +71748,8 @@ self: { }: mkDerivation { pname = "cryptohash-sha512"; - version = "0.11.101.0"; - sha256 = "0a6sc5b6w0k47fyjhyrfm3p25jsbsqjknfq5mbj53p2p1qsfykc1"; - revision = "1"; - editedCabalFile = "1mjbn84bg9r3m1dcfpmmalck2wdfdm4i8wrqfi624mbaqs8a0fqs"; + version = "0.11.102.0"; + sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -71811,6 +71963,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "cryptostore_0_3_0_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, basement + , bytestring, cryptonite, hourglass, memory, pem, tasty + , tasty-hunit, tasty-quickcheck, x509, x509-validation + }: + mkDerivation { + pname = "cryptostore"; + version = "0.3.0.0"; + sha256 = "0s6r7pjdp2jqqxq0b1f1ks23h1dh8hh4vqzbqm8irgvmsz445pwh"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base basement bytestring cryptonite + hourglass memory pem x509 x509-validation + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass memory pem tasty + tasty-hunit tasty-quickcheck x509 + ]; + description = "Serialization of cryptographic data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -73116,6 +73290,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 { @@ -73178,6 +73369,8 @@ self: { pname = "cutter"; version = "0.0"; sha256 = "1hka1k012d2nwnkbhbiga6307v1p5s88s2nxkrnymvr0db1ijwqi"; + revision = "1"; + editedCabalFile = "00fh0bhdlsrik1mq1hm3w6dg4m9c03bk22c3ans309dk5swr9hcy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73340,21 +73533,6 @@ self: { ({ mkDerivation, base, hashable, hedgehog, template-haskell }: mkDerivation { pname = "d10"; - version = "1.0.1.0"; - sha256 = "0494hnk99nski7xsas06kbskvi4m9k7h5hizn1w8034xc34n0ppg"; - libraryHaskellDepends = [ - base hashable hedgehog template-haskell - ]; - testHaskellDepends = [ base hashable hedgehog template-haskell ]; - doHaddock = false; - description = "Digits 0-9"; - license = lib.licenses.mit; - }) {}; - - "d10_1_0_1_2" = callPackage - ({ mkDerivation, base, hashable, hedgehog, template-haskell }: - mkDerivation { - pname = "d10"; version = "1.0.1.2"; sha256 = "138mhpl9yhaxbd98m1n5g8h4skbb4agyf7igl1ar3mr6snfhilas"; libraryHaskellDepends = [ @@ -73364,7 +73542,6 @@ self: { doHaddock = false; description = "Digits 0-9"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "d3d11binding" = callPackage @@ -74001,8 +74178,8 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "data-accessor"; - version = "0.2.3"; - sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; + version = "0.2.3.1"; + sha256 = "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6"; libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; license = lib.licenses.bsd3; @@ -74055,8 +74232,8 @@ self: { ({ mkDerivation, base, data-accessor, mtl }: mkDerivation { pname = "data-accessor-mtl"; - version = "0.2.0.4"; - sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh"; + version = "0.2.0.5"; + sha256 = "0xnd5l961530yzpzrkv13jz8lv42szs8ra75nnw8rzkwaijsvi4r"; libraryHaskellDepends = [ base data-accessor mtl ]; description = "Use Accessor to access state in mtl State monad class"; license = lib.licenses.bsd3; @@ -74084,8 +74261,8 @@ self: { ({ mkDerivation, base, data-accessor, transformers }: mkDerivation { pname = "data-accessor-transformers"; - version = "0.2.1.7"; - sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10"; + version = "0.2.1.8"; + sha256 = "1m18bdhddi4l7ijd1mighjbjdw5qkznsgrqb8532cv9al55r9y83"; libraryHaskellDepends = [ base data-accessor transformers ]; description = "Use Accessor to access state in transformers State monad"; license = lib.licenses.bsd3; @@ -74099,6 +74276,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; + revision = "1"; + editedCabalFile = "1nma7gz7lhain6jvwb3w3s53716ss8ypkk93gxpsaaz824svvw9f"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -74949,6 +75128,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; @@ -75006,6 +75187,8 @@ self: { pname = "data-interval"; version = "2.1.1"; sha256 = "1gxdf1pi54s9fvxgp112b0l9f4q4r29f03caz04wbhv1f6cbs912"; + revision = "1"; + editedCabalFile = "0b7wljz2xcj8j2aka343i19rzw2lva5bbd4wp9wmrzlafp8anxpd"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -77457,8 +77640,8 @@ self: { pname = "decimal-literals"; version = "0.1.0.1"; sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; - revision = "1"; - editedCabalFile = "0giz73yb179xvww1s92dbl4mhvcxlv25f0zrjwc9lsvx9h2aivg0"; + revision = "2"; + editedCabalFile = "0wrjxapnv7i20krg601jzqik3pns6s7kr3c2x99n4lqi43b1a2v9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -78256,8 +78439,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.5.0"; - sha256 = "19jhxcmh6qf3nhixjjp7sqcpn4jpl6cdnaccvfn8375h83v1dbp9"; + version = "0.6.8.0"; + sha256 = "1r0v6mvl1z5zxiwgrbx8bij6i2yv8cwwlh5x4cs5im174la6irfv"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -78881,27 +79064,12 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.8"; - sha256 = "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd"; - revision = "1"; - editedCabalFile = "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5"; - libraryHaskellDepends = [ aeson base ]; - testHaskellDepends = [ aeson base bytestring ]; - description = "Type driven generic aeson instance customisation"; - 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 @@ -78956,19 +79124,22 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, monad-control, monad-control-identity, mtl - , transformers, transformers-base + ({ mkDerivation, base, exceptions, monad-control + , monad-control-identity, mtl, primitive, random, resourcet + , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.5.0.1"; - sha256 = "1d9mrld6c6hcjzw2rhss83zhlsjy9fddfhg55fdrwsajr87zsppl"; + version = "0.8.0.0"; + sha256 = "10i7lhpdpy68mi2ax5v445hy39m160jvvxqhz3hb4ixgzhibdi0h"; libraryHaskellDepends = [ - base monad-control monad-control-identity mtl transformers - transformers-base + base exceptions monad-control monad-control-identity mtl primitive + random resourcet transformers transformers-base unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "derivingvia-extras" = callPackage @@ -79303,8 +79474,8 @@ self: { }: mkDerivation { pname = "df1"; - version = "0.4"; - sha256 = "0adsmfjfcxsg55y4pahw408b82bi7phyzq48vrf80p84nyxmmpsi"; + version = "0.4.1"; + sha256 = "0fz9krv450kn4qymgggcgfkmrxgzcsgcbwbbfw2cqa0rvslw71g8"; libraryHaskellDepends = [ attoparsec base bytestring containers text time ]; @@ -79570,8 +79741,8 @@ self: { pname = "dhall"; version = "1.41.2"; sha256 = "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"; - revision = "4"; - editedCabalFile = "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx"; + revision = "5"; + editedCabalFile = "0jhhwzzinlxyb2gxr2jcyr71mbdig7njkw2zi8znns1ik6ix0d4c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -80640,8 +80811,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 @@ -81042,6 +81213,8 @@ self: { pname = "dice"; version = "0.1.1"; sha256 = "1y4184xicjwp29cyriq3qcr066167nwfy0720dmxjbgw795jxpsb"; + revision = "1"; + editedCabalFile = "1006bnawdn3fp76q2arz62q5dkkxgix18m7bcrb63xjzhssm09xy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec random random-fu ]; @@ -81216,6 +81389,8 @@ self: { pname = "diff-loc"; version = "0.1.0.0"; sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; + revision = "1"; + editedCabalFile = "1macpybgwxyak0cgpimkjqzzn0xf4mkyj9n0papjzxjaw3iv4vmd"; libraryHaskellDepends = [ base fingertree show-combinators ]; description = "Map file locations across diffs"; license = lib.licenses.mit; @@ -81405,12 +81580,12 @@ self: { ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; - version = "0.0.1.4"; - sha256 = "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr"; + version = "0.0.1.5"; + sha256 = "1lpj16hazg8yh2rxspc1y7da9vgmz6jw9fx9qrvwv1hzmv8mvnvv"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; }) {inherit (pkgs) zlib;}; "digest-pure" = callPackage @@ -81690,8 +81865,8 @@ self: { }: mkDerivation { pname = "digraph"; - version = "0.2.2"; - sha256 = "1v7mayj3cjr1gl27d5fzgghrwk08d87da9ckyk5l7ksjqf6d4px7"; + version = "0.3.0"; + sha256 = "0p70978qy83xz14drzk874zghjh3jybgw9a4fp1cfrmpmbdms5df"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -84620,6 +84795,38 @@ self: { mainProgram = "doctest"; }) {}; + "doctest_0_21_0" = callPackage + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core + , hspec-discover, HUnit, mockery, process, QuickCheck, setenv + , silently, stringbuilder, syb, transformers + }: + mkDerivation { + pname = "doctest"; + version = "0.21.0"; + sha256 = "0jb4vjwx3xqmcm563g1j8fz1kp5irwwb141xp46c25x108wpnmay"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat code-page deepseq directory exceptions filepath + ghc ghc-paths process syb transformers + ]; + executableHaskellDepends = [ + base base-compat code-page deepseq directory exceptions filepath + ghc ghc-paths process syb transformers + ]; + testHaskellDepends = [ + base base-compat code-page deepseq directory exceptions filepath + ghc ghc-paths hspec hspec-core HUnit mockery process QuickCheck + setenv silently stringbuilder syb transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "doctest"; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -84694,8 +84901,8 @@ self: { pname = "doctest-exitcode-stdio"; version = "0.0"; sha256 = "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"; - revision = "1"; - editedCabalFile = "1065s8bch6zhl6mc8nhvfpwd1irmjd04z7xgycbpihc14x4ijim3"; + revision = "2"; + editedCabalFile = "0gfnxkbm126m0d4pnqgl5ca6ab8x5p1vpbxjxgz1sxczablsmk5b"; libraryHaskellDepends = [ base doctest-lib QuickCheck semigroups transformers ]; @@ -84711,8 +84918,8 @@ self: { pname = "doctest-extract"; version = "0.1"; sha256 = "1ncrq67d6zcqw5al5m2g7q6ys8rxhsq8rrzbj1dlsyl4q63vyrms"; - revision = "1"; - editedCabalFile = "11b43xx6bmn7zbw9hxjcfcbmhjsm1jbnh08qnfxiw9i02j12mnlj"; + revision = "3"; + editedCabalFile = "1gmydr5gabjp7vnf8knxr8d97cx1wm85n2dmxj7529l05qhia9j6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85066,20 +85273,25 @@ self: { }) {}; "domain-aeson" = callPackage - ({ mkDerivation, aeson, base, domain, domain-core, rerebase - , template-haskell, template-haskell-compat-v0208, text, th-lego + ({ mkDerivation, aeson, base, domain, domain-core + , generic-arbitrary, hspec, quickcheck-classes + , quickcheck-instances, rerebase, template-haskell + , template-haskell-compat-v0208, text, th-lego , unordered-containers, vector }: mkDerivation { pname = "domain-aeson"; - version = "0.1"; - sha256 = "08kc4j9bs2nmkd7ddnygw9rjm25z6js1y9fmhisc5kjhf26cbwm2"; + version = "0.1.1"; + sha256 = "1kfkxgqzyvbwlapi5dn7zzz4v7hcjqihhj9rw9hyrflvw2axvqkq"; libraryHaskellDepends = [ aeson base domain-core template-haskell template-haskell-compat-v0208 text th-lego unordered-containers vector ]; - testHaskellDepends = [ domain rerebase ]; + testHaskellDepends = [ + domain generic-arbitrary hspec quickcheck-classes + quickcheck-instances rerebase + ]; description = "Integration of domain with aeson"; license = lib.licenses.mit; }) {}; @@ -85156,6 +85368,60 @@ self: { broken = true; }) {}; + "domaindriven" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , deepseq, domaindriven-core, exceptions, generic-lens, hspec + , http-client, http-types, microlens, mtl, openapi3 + , postgresql-simple, QuickCheck, quickcheck-arbitrary-adt + , quickcheck-classes, random, servant-client, servant-server + , streamly, template-haskell, text, time, transformers, unliftio + , unliftio-pool, unordered-containers, uuid, vector, warp + }: + mkDerivation { + pname = "domaindriven"; + version = "0.5.0"; + sha256 = "1h0yy6alf30gza466nhz8zzfm3xjzqi4m157hz57qr295iqv9wcl"; + libraryHaskellDepends = [ + aeson async base bytestring containers deepseq domaindriven-core + exceptions generic-lens http-types microlens mtl openapi3 + postgresql-simple random servant-server streamly template-haskell + text time transformers unliftio unliftio-pool unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson async base containers deepseq domaindriven-core exceptions + hspec http-client mtl openapi3 QuickCheck quickcheck-arbitrary-adt + quickcheck-classes servant-client servant-server text warp + ]; + description = "Batteries included event sourcing and CQRS"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "domaindriven-core" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , deepseq, exceptions, generic-lens, hspec, http-types, microlens + , mtl, postgresql-simple, random, streamly, template-haskell, time + , transformers, unliftio, unliftio-pool, unordered-containers, uuid + , vector + }: + mkDerivation { + pname = "domaindriven-core"; + version = "0.5.0"; + sha256 = "177xb2kpq14g3dhs56lzjknx9vkzgzc4wxmlh9rqzbybqdn4ppx7"; + libraryHaskellDepends = [ + aeson async base bytestring containers deepseq exceptions + generic-lens http-types microlens mtl postgresql-simple random + streamly template-haskell time transformers unliftio unliftio-pool + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base hspec postgresql-simple streamly time unliftio-pool uuid + ]; + description = "Batteries included event sourcing and CQRS"; + license = lib.licenses.bsd3; + }) {}; + "dominion" = callPackage ({ mkDerivation, base, containers, hspec, lens, mtl, random }: mkDerivation { @@ -86695,10 +86961,8 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.2.1.0"; - sha256 = "1fxamg2npi1arhsjyxgbzcn50m3y9kn9ganc79gbn8xcx252rp63"; - revision = "1"; - editedCabalFile = "0fxsf82kqnfy6nn8805x6dksj6j5z0dyajb4nh47r3sq067jb1n0"; + version = "0.2.1.1"; + sha256 = "0rqh1sy500gbgqr69z220yb8g7gp117z0iw1kly9zxqhrzn3sv9f"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -87885,6 +88149,26 @@ self: { broken = true; }) {}; + "ebml" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, split, tasty + , tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "ebml"; + version = "0.1.1.0"; + sha256 = "1zp7chyyjs24jvckiw12ra7r0gyslfvnc5ksm47djja852j00v7s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base binary bytestring containers text ]; + executableHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base binary bytestring split tasty tasty-golden tasty-hunit text + ]; + description = "A pure EBML parser"; + license = lib.licenses.bsd3; + mainProgram = "haskell-ebml"; + }) {}; + "ebnf-bff" = callPackage ({ mkDerivation, aeson, base, bytestring, cond, directory, parsec , text @@ -87952,8 +88236,8 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.3"; - sha256 = "16jysii88v1wkm3g7vjx9vdhzcjqq1dlfrjkf2hccrcxz8wqv4d1"; + version = "0.2.3.1"; + sha256 = "1fqld8cqrknnd18v8c92awilfdrc07lja6347zqkr4kin4b5s7s4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptohash-sha512 integer-gmp @@ -88564,8 +88848,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.2.1.0"; - sha256 = "0p2kr9vcyhcpvyrqbvwmjjh4k2lsrrhhq6rdi087iyvd7vj33al2"; + version = "2.2.2.0"; + sha256 = "1j6p28d5701v0a5fhgra1mhnzsqbxj44mpnixrh8jy34rcbq02bi"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -88587,13 +88871,12 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.2.1.0"; - sha256 = "0439fk1gr2jq663zl6p0ra9hkzmjm9ad24wnbrbz1nnl5v01ay2s"; + version = "2.2.2.1"; + sha256 = "1k3l79rh7whfm7yrdxmxyjggmwm912g8r6brwxjkla5d4phg4azp"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core ]; - doHaddock = false; description = "An easy to use, performant extensible effects library"; license = lib.licenses.bsd3; }) {}; @@ -88616,6 +88899,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_0" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc + , ghc-tcplugins-extra + }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.0"; + sha256 = "13m63lidazn8cp2f0y801nwri48h5mny3azsz5gpz1c7jj072xaa"; + libraryHaskellDepends = [ + base containers effectful-core ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -88630,20 +88930,18 @@ self: { }) {}; "effectful-th" = callPackage - ({ mkDerivation, base, containers, effectful, exceptions + ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.0"; - sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; - revision = "3"; - editedCabalFile = "1nqwvgdvqgh4dvkidyaga7jd95p3hn54hy5gwadsvyf9lll4vjck"; + version = "1.0.0.1"; + sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; libraryHaskellDepends = [ - base containers effectful exceptions template-haskell + base containers effectful-core exceptions template-haskell th-abstraction ]; - testHaskellDepends = [ base effectful ]; + testHaskellDepends = [ base effectful-core ]; description = "Template Haskell utilities for the effectful library"; license = lib.licenses.bsd3; }) {}; @@ -89072,8 +89370,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.6"; - sha256 = "1zmd728dxxifvpj7zwzb87rfmgs3wiz75d2g2lcm2sr0yafvzan4"; + version = "0.0.4.7"; + sha256 = "12j8jbbh5p9bmb1gwza4j38rynpp9x9vs30bbiaqf44jijzmkb53"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -89654,8 +89952,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.8.1"; - sha256 = "0qhxjgjmbs2gr43rzxhzr6hjygkjr7fiqka93vsfi13hpv6bw2p7"; + version = "0.8.2"; + sha256 = "15nwxz2v678l26hapmphs1aqmnmx89r5j1mf3iys86n73qp3vfjl"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -90157,8 +90455,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.7.0.1"; - sha256 = "1r2d3v2y4xmqf45d7649d54f1dsrywil2km40qx951adrawp8g0q"; + version = "0.7.1.0"; + sha256 = "1k6hxsxcqlrfrcww1n31kidn5y7kafz9fm2qflj7zrcxpfpi9skj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90177,8 +90475,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.7.0.1"; - sha256 = "0dci3fpvyxjffn2lapdddj8flyk2id2b9z0shfidcknaghgig1gr"; + version = "0.7.1.0"; + sha256 = "1m4nrpm3g9zwk1gf0v93nlr8vb5pd8sgn1mnzj6b968vq3zb2ab3"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random random statistics vector @@ -90196,8 +90494,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.7.0.1"; - sha256 = "0rf1ydwhglcnvp3cdqhij859c3gn7l54nazw4501b6wj59ky7p75"; + version = "0.7.1.0"; + sha256 = "0yl3wkk5nz5hn11h1rmpmp7vzjf94n6bmylq16cik44kj1723y59"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -90212,8 +90510,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.7.0.1"; - sha256 = "1zjg9kayk97xqxpd6pryypmk9p69ylcyycfdzccj9pssqx99i5bi"; + version = "0.7.1.0"; + sha256 = "08wcikxgzl0j60xzffih5fd3mjbjisf17gr5aa1njjhs0vh6y8mg"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices parallel primitive random vector vector-th-unbox word8 @@ -90234,8 +90532,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.7.0.1"; - sha256 = "1lqsmpdwxg9b6v7hm8aizgwzcwp4kspvc6wphk6nlj34dxsjy673"; + version = "0.7.1.0"; + sha256 = "14dhq49ri7wndzkpiwv28r5w85wiwq3x2c00yz1x5ax3347jcdgh"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 directory hmatrix optparse-applicative random @@ -90249,18 +90547,17 @@ self: { "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, parallel, QuickCheck - , quickcheck-classes, random, statistics + , elynx-nexus, elynx-tools, hspec, math-functions, microlens + , parallel, QuickCheck, quickcheck-classes, random, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.7.0.1"; - sha256 = "0f9fmwv0580027qhlcffkzvx55nccx43klgkdbjnrhdqvd7h5a1s"; + version = "0.7.1.0"; + sha256 = "0jcqz49ml20cg0mwkpqjci44fkbcjhxf6dhhl8y68yczlz0778zs"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers - data-default-class deepseq double-conversion elynx-nexus - math-functions parallel random statistics + data-default-class deepseq elynx-nexus math-functions parallel + random statistics ]; testHaskellDepends = [ attoparsec base bytestring containers data-default elynx-tools @@ -90534,12 +90831,12 @@ self: { ({ mkDerivation, 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 + , containers, data-default, dependent-sum, deriving-aeson + , 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 @@ -90547,8 +90844,8 @@ self: { }: mkDerivation { pname = "emanote"; - version = "1.0.0.0"; - sha256 = "0yysrrcdgp06d0s50am86xzjp4d67d1in5ibwdpvbv9knxnk8w5v"; + version = "1.0.2.0"; + sha256 = "0g6mla1izms1i4l08kzg0js56gz54z87458k0k3w7fnj5f1576y7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90556,40 +90853,43 @@ self: { 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 - 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 + dependent-sum deriving-aeson 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 ]; executableHaskellDepends = [ 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 - 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 + dependent-sum deriving-aeson 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 - 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 + dependent-sum deriving-aeson 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 ]; description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; @@ -91788,8 +92088,8 @@ self: { }: mkDerivation { pname = "equal-files"; - version = "0.0.5.3"; - sha256 = "1akj045b5554bmlbg94vaji1ly10n89xj1vip9ywamy5hv18bdz5"; + version = "0.0.5.4"; + sha256 = "13gf8f8ik1wdr8n8sa1jlzzfh1bi2892fb5bhmixlxk0d81dm76i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93806,14 +94106,15 @@ self: { "eventuo11y" = callPackage ({ mkDerivation, base, exceptions, general-allocate, monad-control - , mtl, primitive, transformers, transformers-base, unliftio-core + , mtl, primitive, time, transformers, transformers-base + , unliftio-core }: mkDerivation { pname = "eventuo11y"; - version = "0.6.0.0"; - sha256 = "1zk49cfg2cab5h5xy2bghk643aq6p0zi937linnxgl53c21br1li"; + version = "0.9.0.0"; + sha256 = "0ayzk79z2xvkhlmr6yg9q52kdjh68ahsi9hhc0bi58zg46dnq18i"; libraryHaskellDepends = [ - base exceptions general-allocate monad-control mtl primitive + base exceptions general-allocate monad-control mtl primitive time transformers transformers-base unliftio-core ]; description = "An event-oriented observability library"; @@ -93831,8 +94132,8 @@ self: { }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.3.0.0"; - sha256 = "12agwfk89jxsa2hdy5ghvkjddp2xs58973r4zi5zsf3zzx7nlx56"; + version = "0.4.0.0"; + sha256 = "04b1rigdxv5v2j8r7lfbl15a1hr9ifra9lnkxxc1j1symbpq620m"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y eventuo11y-json general-allocate http-media http-types @@ -93862,8 +94163,8 @@ self: { }: mkDerivation { pname = "eventuo11y-json"; - version = "0.2.0.0"; - sha256 = "132dkvsp1p5lj103amsfkn9grc4rx7qgs2nh5506mybykhhhzzg5"; + version = "0.3.0.2"; + sha256 = "1q60hb7zaa3gifbsf1d7zl1bclz21ysmb3g1ww5xz4hr5fy03ksi"; libraryHaskellDepends = [ aeson base bytestring eventuo11y eventuo11y-dsl template-haskell text time uuid @@ -93873,6 +94174,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "eventuo11y-otel" = callPackage + ({ mkDerivation, base, eventuo11y, hs-opentelemetry-api, text }: + mkDerivation { + pname = "eventuo11y-otel"; + version = "0.1.0.2"; + sha256 = "0mv97s3vnw7ppry3vinis6dv0j93pj5dywp0xzxrcsw9nbwiy3gj"; + libraryHaskellDepends = [ + base eventuo11y hs-opentelemetry-api text + ]; + description = "OpenTelemetry-based rendering for eventuo11y"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -93926,8 +94241,8 @@ self: { }: mkDerivation { pname = "evoke"; - version = "0.2022.8.26"; - sha256 = "05jyak1dmb4cw4gp5p71pv8imkfachylq8bak81jmg6ni2shp28j"; + version = "0.2023.1.26"; + sha256 = "0c03ggjx7amcjqylcadshknqwqm9x6mlsa9d6np1vff6asf8s8b4"; libraryHaskellDepends = [ base ghc text ]; testHaskellDepends = [ aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 @@ -94218,6 +94533,8 @@ self: { pname = "exceptions"; version = "0.10.7"; sha256 = "0jb0ah5k2mb4clhb34c59f615vzl54lhx3hf6njqsgdmr3jashls"; + revision = "1"; + editedCabalFile = "05hqkph2rd7vkgbggbpa13i3r8wvb2fgsan40cd8macggwkw5k30"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -95050,13 +95367,27 @@ self: { ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; - version = "0.1.10"; - sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00"; + version = "0.1.10.1"; + sha256 = "1pv57m0ynwfljnr0g3snpc716q497l4h9x0d66vj46jgp909iw79"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq semigroups transformers ]; + description = "Exceptions which are explicit in the type signature"; + license = lib.licenses.bsd3; + }) {}; + + "explicit-exception_0_2" = callPackage + ({ mkDerivation, base, deepseq, semigroups, transformers }: + mkDerivation { + pname = "explicit-exception"; + version = "0.2"; + sha256 = "0n2cgliy0ls9740crzpk19wl3cbk5zq90x7qmhhw8idbip7xidni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; description = "Exceptions which are explicit in the type signature"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "explicit-iomodes" = callPackage @@ -95577,6 +95908,34 @@ self: { broken = true; }) {}; + "extism" = callPackage + ({ mkDerivation, base, bytestring, extism, extism-manifest, HUnit + , json + }: + mkDerivation { + pname = "extism"; + version = "0.1.0"; + sha256 = "1gg359qwvqk8qqwd9s6hlrka0x3ajf1v3g750iyw1vyy74dakx8x"; + libraryHaskellDepends = [ base bytestring extism-manifest json ]; + librarySystemDepends = [ extism ]; + testHaskellDepends = [ base bytestring HUnit ]; + description = "Extism bindings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {extism = null;}; + + "extism-manifest" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, json }: + mkDerivation { + pname = "extism-manifest"; + version = "0.1.0"; + sha256 = "0dr3pxkf11cija6k75rv5mzmracw1yyis82sj7x2blkjg190hk6s"; + libraryHaskellDepends = [ base base64-bytestring bytestring json ]; + description = "Extism manifest bindings"; + license = lib.licenses.bsd3; + }) {}; + "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix @@ -96385,8 +96744,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.1.1"; - sha256 = "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3"; + version = "3.1.2"; + sha256 = "1l0h4ddb17xm6qkjhn5gqyfz18szyqcq9wqq92fc24sp2zbd7rv5"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -96398,6 +96757,27 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "fast-logger_3_2_0" = callPackage + ({ mkDerivation, array, async, auto-update, base, bytestring + , directory, easy-file, filepath, hspec, hspec-discover, stm, text + , unix-compat, unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "3.2.0"; + sha256 = "1f0ac7b3irmc4967jrbjnkh8y89gdv57r6vv7m6fkbbjxyyp4nqp"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath stm + text unix-compat unix-time + ]; + testHaskellDepends = [ async base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -97080,6 +97460,18 @@ self: { mainProgram = "fcd"; }) {}; + "fcf-base" = callPackage + ({ mkDerivation, base, fcf-family }: + mkDerivation { + pname = "fcf-base"; + version = "0.1.0.0"; + sha256 = "19jrcpj496bpchv8fw30vd5b5w3sj1qkzmh5jlahyvz5wsppzwsq"; + libraryHaskellDepends = [ base fcf-family ]; + testHaskellDepends = [ base fcf-family ]; + description = "Family-of-families instances for base"; + license = lib.licenses.mit; + }) {}; + "fcf-composite" = callPackage ({ mkDerivation, base, composite-base, fcf-containers , first-class-families, tasty, tasty-hunit, vinyl @@ -97108,8 +97500,8 @@ self: { }: mkDerivation { pname = "fcf-containers"; - version = "0.7.1"; - sha256 = "1234vz8ha4wzzbxnw3za5kdhisd37n8v3sd01rdcmnmnhb7fv3qs"; + version = "0.7.2"; + sha256 = "0lw7zm5k4mkvzxxmhp2lbanlkgb3n6gp583g34r53rz576bhhhj9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; @@ -97121,6 +97513,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "fcf-family" = callPackage + ({ mkDerivation, base, containers, first-class-families + , template-haskell + }: + mkDerivation { + pname = "fcf-family"; + version = "0.2.0.0"; + sha256 = "17v811dfdvgdvhwri34df3sf3n82crd41pi28j8gbdqs4zg0lgln"; + libraryHaskellDepends = [ + base containers first-class-families template-haskell + ]; + testHaskellDepends = [ base first-class-families ]; + description = "Family of families: featherweight defunctionalization"; + license = lib.licenses.mit; + }) {}; + "fcf-graphs" = callPackage ({ mkDerivation, base, doctest, fcf-containers , first-class-families, Glob @@ -97485,6 +97893,8 @@ self: { pname = "feed"; version = "1.3.2.1"; sha256 = "0marh7qmggq1z5339nid3gil7k786d3yk79b0rwfkxxaxmr41xd8"; + revision = "1"; + editedCabalFile = "032578cqdl7c7ibmbn92z6b72r8yvnwlhxwnr709pzdjc9qd4ghr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -98018,6 +98428,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 @@ -98238,14 +98669,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fgl_5_8_0_0" = callPackage + "fgl_5_8_1_1" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; - version = "5.8.0.0"; - sha256 = "02cdigf5m3520vh30lld0j5d4al7nmsa4m9v9bjw1fprfaac03nn"; + version = "5.8.1.1"; + sha256 = "1bccd85756nk09hgv6h52k4vkxw2xdqbk5m20g8q6301rdpgs239"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -98511,6 +98942,8 @@ self: { pname = "file-io"; version = "0.1.0.1"; sha256 = "1kxr2cdv3zmml7v3gmk2zrd2kwvph46fzv3r2ia5brq5qvm2s544"; + revision = "1"; + editedCabalFile = "0kfisk0vrjviw194rg2ildzr0qlg45wk4cwa4s3qpl3hp4zag1lj"; libraryHaskellDepends = [ base bytestring filepath unix ]; description = "Basic file IO operations via 'OsPath'"; license = lib.licenses.bsd3; @@ -98660,6 +99093,8 @@ self: { pname = "filemanip"; version = "0.3.6.3"; sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8"; + revision = "1"; + editedCabalFile = "1l53qqlh9w7572n5dxk8rq0p8vsvg6m1afbak6xzdx0kgg8j6y8a"; libraryHaskellDepends = [ base bytestring directory filepath mtl unix-compat ]; @@ -98934,8 +99369,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filters-basic"; - version = "0.1.1.0"; - sha256 = "09q6fb8cv7di67wb8zhky8qpbwivzax59xik1zbcjf3sp465a337"; + version = "0.2.0.0"; + sha256 = "18kn8m2fdib16kabs8fax0skac2ipwqwbf0xqzqnrfdjmvhsqbgq"; libraryHaskellDepends = [ base ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; @@ -100387,6 +100822,31 @@ self: { license = lib.licenses.mit; }) {}; + "flatparse_0_4_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, gauge + , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive + , QuickCheck, quickcheck-instances, template-haskell, utf8-string + }: + mkDerivation { + pname = "flatparse"; + version = "0.4.0.1"; + sha256 = "0cv9ip5vh6sw039acpghcanlnyrvfrmd3av1ihbf66w7y0qv1h40"; + libraryHaskellDepends = [ + base bytestring containers integer-gmp template-haskell utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec HUnit QuickCheck quickcheck-instances + utf8-string + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring gauge integer-gmp megaparsec parsec + primitive utf8-string + ]; + description = "High-performance parsing from strict bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "flay" = callPackage ({ mkDerivation, base, constraints, tasty, tasty-quickcheck , transformers @@ -100769,6 +101229,19 @@ self: { license = lib.licenses.mit; }) {}; + "flow_2_0_0_2" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "flow"; + version = "2.0.0.2"; + sha256 = "15z2hl2mg0ifj0rpinwy0s9v1kbwgpp0m87w4sfyljqw34388rvq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Write more understandable Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -101476,8 +101949,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "foldable-ix"; - version = "0.2.1.0"; - sha256 = "0sbqlii75sjmha2kmiwi36r2wdkpxdargyrrv2g60vpryvndiqck"; + version = "0.3.0.0"; + sha256 = "0n5cfihda5mhww9kb81mdhswz01bzwsrmhyh4mknsws6im8rbrpz"; + revision = "1"; + editedCabalFile = "0wgdl703cr9m5p3azzgrv1ljvrpr1b9w3nx7w6v2g3sdgj1pqf90"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; @@ -101503,8 +101978,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.13"; - sha256 = "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw"; + version = "1.4.14"; + sha256 = "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -101521,8 +101996,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"; @@ -101805,8 +102280,8 @@ self: { }: mkDerivation { pname = "fontconfig-pure"; - version = "0.1.0.0"; - sha256 = "0rnx9s5kj5lr70gp4454qy3h4lfndf9f976h331jp0f4y47c2d42"; + version = "0.1.1.1"; + sha256 = "1fj74g8hpdd8gqf937l3spnkasqsbgc1qxw6zxmv1cfz86r4fmn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102800,6 +103275,8 @@ self: { pname = "fpe"; version = "0.1.1"; sha256 = "1rzd1g6zk98l5bz5d7pr66i10gd2kx6vrv9py06wcnz3b5svkx2l"; + revision = "1"; + editedCabalFile = "0qf0qsh3ig76s8inimcwr5yksyzpz3szn80qi599zhv66nflqilf"; libraryHaskellDepends = [ base bytestring integer-logarithms vector ]; @@ -105023,8 +105500,8 @@ self: { }: mkDerivation { pname = "functor-combinators"; - version = "0.4.1.0"; - sha256 = "1b7324ia810i1rjn2z4q3h7rcbbvmfh3nl8vxswgnkglhrkcmg49"; + version = "0.4.1.2"; + sha256 = "18b7whmsy1bqmqpyva4wipaakjbg8c3zi30pxlh44jw2cwf91c7j"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant deriving-compat free hashable invariant kan-extensions mmorph mtl @@ -105531,12 +106008,12 @@ self: { , prettyprinter-ansi-terminal, process, process-extras, QuickCheck , random, regex-tdfa, srcloc, statistics, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, time, transformers, vector, versions, zip-archive, zlib + , text, time, transformers, vector, versions, zlib }: mkDerivation { pname = "futhark"; - version = "0.22.7"; - sha256 = "0vld3wms8y3bzl7m8lvc6xlcxq80ipi7rfk1wkfjddzzqg5gmnl7"; + version = "0.23.1"; + sha256 = "0si4si74d8y9dgsqiixj6cfblpr2l02dwijbngwv5xdyfpbdfgq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105549,8 +106026,7 @@ self: { neat-interpolation parallel prettyprinter prettyprinter-ansi-terminal process process-extras random regex-tdfa srcloc statistics template-haskell temporary - terminal-size text time transformers vector versions zip-archive - zlib + terminal-size text time transformers vector versions zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; @@ -107155,8 +107631,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.0.0"; - sha256 = "1i388gvnk4brc49pp44xaayddcpg78ii1yv0n4r09nl4iicggsyc"; + version = "0.2.1.1"; + sha256 = "0jcqknrlpcyl825y9r612mh8d7dcs68sxjm1j600nbdl4ksw8qmb"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -107328,8 +107804,8 @@ self: { }: mkDerivation { pname = "generic-data"; - version = "1.0.0.0"; - sha256 = "1cfax93wzb9w3lfhrp4lmyyqxj6cjvsjny8wv3qxjyfqs2w2380g"; + version = "1.0.0.1"; + sha256 = "0fz65k4sxn9c23rg5iv0vij2mksl5rkn6dl2f3i9d9d60b5wca9y"; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th show-combinators @@ -107651,6 +108127,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "generic-persistence" = callPackage + ({ mkDerivation, base, bytestring, convertible, exceptions, ghc + , ghc-prim, HDBC, HDBC-sqlite3, hspec, hspec-discover, QuickCheck + , rio, syb, text, time, transformers + }: + mkDerivation { + pname = "generic-persistence"; + version = "0.2.0.1"; + sha256 = "1i50bdywfrlfqz1by8x3ci2nap5c1hl2bvhw5h2ych7szrp9mmp7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring convertible exceptions ghc ghc-prim HDBC + HDBC-sqlite3 rio syb text time transformers + ]; + executableHaskellDepends = [ + base bytestring convertible exceptions ghc ghc-prim HDBC + HDBC-sqlite3 rio syb text time transformers + ]; + testHaskellDepends = [ + base bytestring convertible exceptions ghc ghc-prim HDBC + HDBC-sqlite3 hspec hspec-discover QuickCheck rio syb text time + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Database persistence using generics"; + license = lib.licenses.bsd3; + mainProgram = "generic-persistence-demo"; + }) {}; + "generic-pretty" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , tasty, tasty-hunit, text, vector @@ -108084,8 +108590,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.8"; - sha256 = "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb"; + version = "0.7.9"; + sha256 = "0dkzma11nd7hc1xsriiq50nxr8h50sh1y562yjsqaganxh2sprsx"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; @@ -109052,8 +109558,8 @@ self: { }: mkDerivation { pname = "geomancy"; - version = "0.2.4.1"; - sha256 = "0rnp4ma5gxxd2lf9n36ifbw2jr0nl6jfxqzvvp86mlvs3a7jpsxd"; + version = "0.2.4.2"; + sha256 = "0ms2gfhcrxcfg10s3xpaawz4kqs4dy00p5mgc7s6pjiq5qgj4mn4"; libraryHaskellDepends = [ base containers deepseq mono-traversable simple-affine-space ]; @@ -109149,8 +109655,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.13.0.4"; - sha256 = "1rszkcn1rg38wf35538ljk5bbqjc57y9sb3a0al7qxm82gy8yigr"; + version = "0.13.1.0"; + sha256 = "00xswyi9y49qab2fpkdx7isx40kfa93p3gfransivzgg9m3si37d"; libraryHaskellDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -109406,8 +109912,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; - revision = "3"; - editedCabalFile = "088rz5c0pq2r1w3msy0y9hl4gca8s8nblpcz7w2f5sx5pajg8flj"; + revision = "4"; + editedCabalFile = "0jc4d4is49d6ddxpdkyqkpr464y80ydsb57shqndp08assplj93b"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -110095,8 +110601,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.2.5.20221107"; - sha256 = "0layv7zsjlah3dmr538g34pg7cwwiawg0xcihyjxdh2x5q5qi05s"; + version = "9.2.6.20230211"; + sha256 = "1f0sf922yh5n8057c14vs362pka7kq0c6h87kmarmrz8mjp19c37"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110157,8 +110663,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.5.20221107"; - sha256 = "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4"; + version = "9.2.6.20230211"; + sha256 = "0q0n9nsi8hxd9pjsrn7vdkwrjvsig8100dd1w5v7hka2dryffi6z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110436,8 +110942,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.12"; sha256 = "1164w9pqnf7rjm05mmfjznz7rrn415blrkk1kjc0gjvks1vfdjvf"; - revision = "4"; - editedCabalFile = "1d5za4k498q48wk6cz0jm3d68rh5ldz6adr8vp24nn7jv17g770w"; + revision = "5"; + editedCabalFile = "12y71qx0yjxxjjzvkpx12ld0fkmpkli8qxpfxp3xfnz8w0gxbv9c"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -110773,7 +111279,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-tags" = callPackage + "ghc-tags_1_5" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, deepseq, directory, filepath, ghc, ghc-boot , ghc-paths, optparse-applicative, process, stm, temporary, text @@ -110792,33 +111298,43 @@ self: { ]; description = "Utility for generating ctags and etags with GHC API"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-tags"; + }) {}; + + "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 + }: + mkDerivation { + pname = "ghc-tags"; + version = "1.6"; + sha256 = "0iiqapx4v4jz4d7ni4dcvpfl948ydx2a7kxvjsk2irdcknzymblw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring containers deepseq directory + filepath ghc-lib 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; mainProgram = "ghc-tags"; }) {}; "ghc-tags-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , criterion, deepseq, directory, filepath, filepath-bytestring, ghc - , lattices, mtl, pipes, pipes-attoparsec, pipes-bytestring - , QuickCheck, quickcheck-instances, tasty, tasty-golden - , tasty-quickcheck, text, transformers + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , filepath-bytestring, ghc, text }: mkDerivation { pname = "ghc-tags-core"; - version = "0.4.2.2"; - sha256 = "1mp1c5jvvbmypjh45nnvlkvqrj4hj55pcb9f42qwv5xw4yan86m1"; + version = "0.5.0.0"; + sha256 = "1qcxwqf8sqxsm8wnvs4518s4wxlbnsjbv10nbs5sv3kcsgjf67ws"; libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq directory - filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring - text transformers - ]; - testHaskellDepends = [ - attoparsec base bytestring directory filepath filepath-bytestring - lattices mtl pipes QuickCheck quickcheck-instances tasty - tasty-golden tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq filepath-bytestring mtl pipes - pipes-attoparsec pipes-bytestring text + attoparsec base bytestring containers deepseq filepath-bytestring + ghc text ]; description = "a library to work with tags created from Haskell parsed tree"; license = lib.licenses.mpl20; @@ -110826,21 +111342,39 @@ self: { broken = true; }) {}; + "ghc-tags-pipes" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, filepath-bytestring + , ghc-tags-core, mtl, pipes, pipes-attoparsec, pipes-bytestring + , text + }: + mkDerivation { + pname = "ghc-tags-pipes"; + version = "0.1.0.0"; + sha256 = "1xyv0bh055xvcdv50mchyars505nq5g3xiv62kw701djch7jlvpf"; + libraryHaskellDepends = [ + attoparsec base bytestring filepath-bytestring ghc-tags-core mtl + pipes pipes-attoparsec pipes-bytestring text + ]; + description = "Streaming interface for ghc-tags-core"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-tags-plugin" = callPackage ({ mkDerivation, base, bytestring, directory, filepath - , filepath-bytestring, ghc, ghc-tags-core, lukko, mtl - , optparse-applicative, pipes, pipes-attoparsec, pipes-bytestring - , pipes-safe, text + , filepath-bytestring, ghc, ghc-tags-core, ghc-tags-pipes, lukko + , mtl, optparse-applicative, pipes, pipes-bytestring, pipes-safe + , text }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.5.2.0"; - sha256 = "1n8b3xsyji5p1w1wrpwscp71mhnh4y6i9v881wml4s49fp6rv3dj"; + version = "0.5.3.0"; + sha256 = "03s7f5x0s88dld85c51mbk0azs6cip0w55hkhidh5wwsvspr19h1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath filepath-bytestring ghc - ghc-tags-core lukko mtl optparse-applicative pipes pipes-attoparsec + ghc-tags-core ghc-tags-pipes lukko mtl optparse-applicative pipes pipes-bytestring pipes-safe text ]; description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; @@ -110852,8 +111386,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.8.3.0"; - sha256 = "0qrb8zz93rb25p8f4dhh2bxx3vb0yc92rx59xbh23ixijiszhas8"; + version = "0.9.0.0"; + sha256 = "1z14z12lhdc1bfa3qnq2srx0cm14cbkg7af94cdfqpqmbxjgw5h3"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -111356,7 +111890,6 @@ self: { testToolDepends = [ implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "ghcide-bench" = callPackage @@ -111699,24 +112232,24 @@ self: { "ghcup" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base - , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan - , case-insensitive, casing, containers, cryptohash-sha256, deepseq - , directory, disk-free-space, exceptions, filepath - , generic-arbitrary, haskus-utils-types, haskus-utils-variant - , hspec, hspec-discover, hspec-golden-aeson, libarchive - , lzma-static, megaparsec, mtl, optics, optparse-applicative - , os-release, pretty, pretty-terminal, process, QuickCheck - , quickcheck-arbitrary-adt, regex-posix, resourcet, retry, safe - , safe-exceptions, split, streamly, strict-base, tagsoup - , template-haskell, temporary, terminal-size, text, time - , transformers, unix, unix-bytestring, unliftio-core + , base16-bytestring, binary, bytestring, bz2, Cabal + , cabal-install-parsers, cabal-plan, case-insensitive, casing + , containers, cryptohash-sha256, deepseq, directory + , disk-free-space, exceptions, filepath, generic-arbitrary + , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover + , hspec-golden-aeson, libarchive, lzma-static, megaparsec, mtl + , optics, optparse-applicative, os-release, pretty, pretty-terminal + , process, QuickCheck, quickcheck-arbitrary-adt, regex-posix + , resourcet, retry, safe, safe-exceptions, split, streamly + , strict-base, tagsoup, template-haskell, temporary, terminal-size + , text, time, transformers, unix, unix-bytestring, unliftio-core , unordered-containers, uri-bytestring, utf8-string, vector , versions, word8, yaml-streamly, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.18.0"; - sha256 = "09mg0pg520vn4mcc0s59wzssnnj5ps5z50kri8z53bjvn4yfdwvv"; + version = "0.1.19.0"; + sha256 = "00g91zavfd58y17q723izch9j0x3fhx7a14ng061am5h41i76mlq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111731,17 +112264,17 @@ self: { word8 yaml-streamly zlib ]; executableHaskellDepends = [ - aeson aeson-pretty async base bytestring cabal-plan containers - deepseq directory filepath haskus-utils-types haskus-utils-variant - libarchive megaparsec mtl optparse-applicative pretty - pretty-terminal process resourcet safe safe-exceptions tagsoup - template-haskell temporary text unix unordered-containers + aeson aeson-pretty async base bytestring cabal-install-parsers + cabal-plan containers deepseq directory filepath haskus-utils-types + haskus-utils-variant libarchive megaparsec mtl optparse-applicative + pretty pretty-terminal process resourcet safe safe-exceptions + tagsoup template-haskell temporary text unix unordered-containers uri-bytestring utf8-string vector versions yaml-streamly ]; testHaskellDepends = [ base bytestring containers directory filepath generic-arbitrary hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt - streamly text uri-bytestring versions + streamly text unix uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; @@ -113449,8 +113982,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20221212"; - sha256 = "0afnl2w29w4j0229rsla93dzkmhcjlp8dv76sr861n186ywv8rzg"; + version = "10.20230126"; + sha256 = "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -114111,6 +114644,31 @@ self: { mainProgram = "github-release"; }) {}; + "github-release_2_0_0_3" = callPackage + ({ mkDerivation, aeson, base, burrito, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers + }: + mkDerivation { + pname = "github-release"; + version = "2.0.0.3"; + sha256 = "065jrbdx7y5fcbanngs6b0p4iryywg7hccbnkhb9spn9gzych4mg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + executableHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + description = "Upload files to GitHub releases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "github-release"; + }) {}; + "github-rest" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty @@ -115392,15 +115950,13 @@ self: { ({ mkDerivation, base, derive-storable, glpk, hspec }: mkDerivation { pname = "glpk-headers"; - version = "0.5.0"; - sha256 = "1v9wq6y4qa6m5l6z27rwgjk0s7q8gklq05djmqspm6c456f1z2q5"; + version = "0.5.1"; + sha256 = "05rkpfrcyvynqifd6fnvmj3kcp5dfgf96fjygazx6jjrw538wnd9"; libraryHaskellDepends = [ base derive-storable ]; librarySystemDepends = [ glpk ]; testHaskellDepends = [ base hspec ]; description = "Low-level Haskell bindings to the GLPK library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) glpk;}; "glpk-hs" = callPackage @@ -120108,8 +120664,8 @@ self: { ]; description = "A client for Haskell programs to query a GraphQL API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "graphql-codegen"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "graphql-spice" = callPackage @@ -120555,8 +121111,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "2.0.1.0"; - sha256 = "0p9sv21dj7sa9w5abz78q5mq72908iih8x61w19xf5z9rz5n5war"; + version = "2.0.2.0"; + sha256 = "1hlqy041d7qxvvhbv7lki852m9bvviml5b48vs0x299i4z9mhprx"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -120773,6 +121329,53 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "grisette" = callPackage + ({ mkDerivation, array, base, bytestring, call-stack, deepseq + , doctest, generic-deriving, Glob, hashable, hashtables, intern + , loch-th, mtl, once, sbv, tasty, tasty-hunit, tasty-quickcheck + , tasty-test-reporter, template-haskell, th-compat, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "grisette"; + version = "0.1.0.0"; + sha256 = "1dl972402pyk6i636w1547hdpyhhaikfzfpvqp19jrwgm5fdnifi"; + libraryHaskellDepends = [ + array base bytestring call-stack deepseq generic-deriving hashable + hashtables intern loch-th mtl once sbv template-haskell th-compat + transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring call-stack deepseq doctest generic-deriving + Glob hashable hashtables intern loch-th mtl once sbv tasty + tasty-hunit tasty-quickcheck tasty-test-reporter template-haskell + th-compat transformers unordered-containers vector + ]; + description = "Symbolic evaluation as a library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "grisette-monad-coroutine" = callPackage + ({ mkDerivation, base, grisette, monad-coroutine, mtl, tasty + , tasty-hunit, tasty-quickcheck, tasty-test-reporter, transformers + }: + mkDerivation { + pname = "grisette-monad-coroutine"; + version = "0.1.0.0"; + sha256 = "0bz8126lwdcx22smxv89z1ipfmnhxdvjzi830j0hzgmxkzw6g0d5"; + libraryHaskellDepends = [ + base grisette monad-coroutine mtl transformers + ]; + testHaskellDepends = [ + base grisette monad-coroutine mtl tasty tasty-hunit + tasty-quickcheck tasty-test-reporter transformers + ]; + description = "Support for monad-coroutine package with Grisette"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -121024,8 +121627,8 @@ self: { }: mkDerivation { pname = "group-by-date"; - version = "0.1.0.4"; - sha256 = "1k5bnk1kz25zgky5rqb214gq5adkz6qi6p16gk0hvy54iyjdj9sa"; + version = "0.1.0.5"; + sha256 = "1c19x8qqrq8fiaxdz917nim8z8dcsi4bcyf88ci39d3xq1iq9iis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121157,6 +121760,8 @@ self: { pname = "grow-vector"; version = "0.1.5.0"; sha256 = "1dn6gabmndhi56v3nsapxm9qbf54dp2blhgn8ibza0lnv8hwn15b"; + revision = "1"; + editedCabalFile = "0rvx6gcm8rf2mfj8q8zbixcwnpw5zm9lg0h7hkk1vbdzijr5pggy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ @@ -122059,6 +122664,39 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "guardian" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, array, base, bytestring + , Cabal, cabal-install, Cabal-syntax, containers, dlist + , generic-lens, githash, hashable, indexed-traversable + , indexed-traversable-instances, microlens, optparse-applicative + , path, path-io, rio, selective, semigroups, stack, tasty + , tasty-discover, tasty-hunit, template-haskell, text, transformers + , unordered-containers, validation-selective, vector, yaml + }: + mkDerivation { + pname = "guardian"; + version = "0.4.0.0"; + sha256 = "190b7jds9kngcmx6aqlkygv3rkgbn4kqwbkh0mr0fjvzyy16mg7k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson algebraic-graphs array base Cabal cabal-install Cabal-syntax + containers dlist generic-lens githash hashable indexed-traversable + indexed-traversable-instances microlens optparse-applicative path + path-io rio selective semigroups stack template-haskell text + transformers unordered-containers validation-selective vector yaml + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ + algebraic-graphs base bytestring containers path path-io rio tasty + tasty-hunit text unordered-containers validation-selective + ]; + testToolDepends = [ tasty-discover ]; + description = "The border guardian for your package dependencies"; + license = lib.licenses.bsd3; + mainProgram = "guardian"; + }) {}; + "guess-combinator" = callPackage ({ mkDerivation, base, HList }: mkDerivation { @@ -122116,8 +122754,8 @@ self: { ({ mkDerivation, base, directory, mmsyn3, process }: mkDerivation { pname = "gvti"; - version = "0.2.0.1"; - sha256 = "1bbkzp795h06xgsdfl5sssxi851l7h0ck8jfc5wdbqx9dpcv46x6"; + version = "0.3.1.0"; + sha256 = "0a6ck1lqzlv2sf0ywinm63v357h6lakzsj5lcwba13l649zacg52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mmsyn3 process ]; @@ -122235,24 +122873,27 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXext, libXi , libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.10"; - sha256 = "0qpr04gv0zjnpigmxzls5jsx3d98cl9127z8ljy743m5j0ff5z6f"; + version = "4.5.1.0"; + sha256 = "0l2z5lijmqdn483zah01d5vvlxxywd4wzxbffp3kcks6rcdwj6k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; librarySystemDepends = [ - c libGL libX11 libXcursor libXi libXinerama libXrandr + c libGL libX11 libXcursor libXext libXi libXinerama libXrandr ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr;}; "h-reversi" = callPackage ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck @@ -123367,6 +124008,41 @@ self: { mainProgram = "hackage-cli"; }) {}; + "hackage-cli_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, filepath, http-io-streams, io-streams + , microlens, microlens-mtl, microlens-th, mtl, netrc + , optparse-applicative, pretty, process-extras, semigroups + , stringsearch, tagsoup, tar, tasty, tasty-golden, text, time + , unordered-containers, zlib + }: + mkDerivation { + pname = "hackage-cli"; + version = "0.1.0.0"; + sha256 = "0wl2gpbcpdfmmmi99dkxy68gi3mn1aj8f2xrm5c8w1bs4sdxdzdq"; + revision = "1"; + editedCabalFile = "0v63w3v46n5jc3q7ywsih3wyqxg6f61psskpq1wkfwm9mnyxfwla"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers mtl pretty + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers deepseq directory filepath + http-io-streams io-streams microlens microlens-mtl microlens-th mtl + netrc optparse-applicative process-extras semigroups stringsearch + tagsoup tar text time unordered-containers zlib + ]; + testHaskellDepends = [ + base bytestring Cabal filepath tasty tasty-golden + ]; + doHaddock = false; + description = "CLI tool for Hackage"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "hackage-cli"; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -124622,8 +125298,8 @@ self: { pname = "hakyll"; version = "4.15.1.1"; sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; - revision = "8"; - editedCabalFile = "0mrgi1xjmvbjqasrchmjylp4gc63gw879flwl6r1v3nf9nv7ziwf"; + revision = "9"; + editedCabalFile = "11zdqxmmykw2nbd8isc638cj03vrz8nkicyv35sn7jdw2p690ybh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126354,8 +127030,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.6"; - sha256 = "1y23yzppvxjhmvaq9yl02v8mp6ww91jpsvqfhpzxkw1jccz54bcq"; + version = "7.3.7.7"; + sha256 = "1bgjy77sbrb7nmbvb98hw5w7lb6ffvbb0nb62ylg2pf9nl862khv"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -126407,8 +127083,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.12.4"; - sha256 = "1zqfivzwq6wfwfgds5icy5rs5vrxiw9w1wzxn5jlqn7zkz3svbl9"; + version = "7.0.12.5"; + sha256 = "1vk0674qalyhzwndpd7az4byshhxy38dh53pgma7awj2bx1n170c"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -126491,7 +127167,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "happstack-server_7_8_0_1" = callPackage + "happstack-server_7_8_0_2" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -126502,8 +127178,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.8.0.1"; - sha256 = "0bxgnsd0qawbd0yllrshdxm89g1vm4znrn5jwhbs86pmh205w3xy"; + version = "7.8.0.2"; + sha256 = "15cp6w5xh5rv2fg9rv1fd0y938280gbcpziv7kmq78zywar56mis"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -126664,10 +127340,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, process }: mkDerivation { pname = "happy"; - version = "1.20.0"; - sha256 = "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"; - revision = "1"; - editedCabalFile = "16dy1cv942rizxp8slnnbwi5l24ggsmy38madbin9scz38idqisx"; + version = "1.20.1.1"; + sha256 = "06w8g3lfk2ynrfhqznhp1mnp8a5b64lj6qviixpndzf5lv2psklb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -126896,8 +127570,8 @@ self: { }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.0.1"; - sha256 = "1icdk19js4kqpw7krk0jl5yqilc52w7wchkylqr5p2zlrm92wp6k"; + version = "1.0.3.1"; + sha256 = "096f23kdrv8278mxqk3nws65v078j54zjhr0wa1nqay5vbs459sz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127019,8 +127693,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "harp"; - version = "0.4.3.5"; - sha256 = "0a9vhldmfrnzbv6ic311akcvyd39j8llkwpm8snaap6s593p7z5h"; + version = "0.4.3.6"; + sha256 = "1949mz3sm8sw3wfxcakx3anriwrkng2n5ixwqdabbw9jhib8gm0f"; libraryHaskellDepends = [ base ]; description = "HaRP allows pattern-matching with regular expressions"; license = lib.licenses.bsd3; @@ -127119,6 +127793,8 @@ self: { pname = "hasbolt"; version = "0.1.6.2"; sha256 = "1y7vjng3qjy5jaj3c90b5a08xrn49c4bb2wa9s612ny5qc98dl9g"; + revision = "1"; + editedCabalFile = "029sw5fqcqpzsx2ahkngfimyd9kyjn7abg0cvz4pb8y96ypl3cs7"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default deepseq deepseq-generics mtl network text @@ -127144,8 +127820,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.9"; - sha256 = "0v3vl1q25g2qac2f3l4bk9bnzqx39d11wvbqclxrif26hv24pkdy"; + version = "0.0.2.0"; + sha256 = "0cxkps6zqnp97r118ffhnvh871dl4mklqcpgxhbfwfgsjar4w2y2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127367,6 +128043,50 @@ self: { broken = true; }) {}; + "hash-addressed" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , cryptohash-sha256, directory, filepath, gambler, mtl, pipes + , quaalude, resourcet, temporary + }: + mkDerivation { + pname = "hash-addressed"; + version = "0.2.0.1"; + sha256 = "1j4zr63if21g208zyhdk2mz8v3pfp23s33mrqzig0rryw3f0kby7"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptohash-sha256 directory + filepath gambler mtl pipes quaalude resourcet temporary + ]; + description = "Hash-addressed file storage"; + license = lib.licenses.asl20; + }) {}; + + "hash-addressed-cli" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptohash-sha256 + , directory, filepath, hash-addressed, ini, optparse-applicative + , pipes, quaalude, resourcet, safe-exceptions, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "hash-addressed-cli"; + version = "2.1.0.1"; + sha256 = "07maanr9hdqgrz41brfk3cahyaays0c12l6w5hb85nsxyil9w4xd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers cryptohash-sha256 directory filepath + hash-addressed ini optparse-applicative pipes quaalude resourcet + safe-exceptions text transformers unordered-containers + ]; + executableHaskellDepends = [ + base bytestring containers cryptohash-sha256 directory filepath + hash-addressed ini optparse-applicative pipes quaalude resourcet + safe-exceptions text transformers unordered-containers + ]; + description = "Hash-addressed file storage app"; + license = lib.licenses.asl20; + mainProgram = "hash-addressed"; + }) {}; + "hash-store" = callPackage ({ mkDerivation, base, base16-bytestring, blake2, bytestring , directory, filepath @@ -127402,26 +128122,6 @@ 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 { - pname = "hashable"; - version = "1.4.1.0"; - sha256 = "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1"; - libraryHaskellDepends = [ - base 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; - }) {}; - - "hashable_1_4_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-array-byte , deepseq, filepath, ghc-bignum, ghc-prim, HUnit, QuickCheck , random, test-framework, test-framework-hunit @@ -127441,7 +128141,6 @@ self: { ]; description = "A class for types that can be converted to a hash value"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hashable-accelerate" = callPackage @@ -128706,8 +129405,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.2"; - sha256 = "05r84czb05n69g7p7jazljh95yzdh2lpzgjjypgpg75mh83igr2w"; + version = "0.26.3"; + sha256 = "sha256-jsAb3JCSHCmi2dp9bpi/J3NRO/EQFB8ar4GpxAuBGOo="; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -132297,8 +132996,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 @@ -132313,6 +133012,21 @@ self: { broken = true; }) {}; + "hasql-listen-notify" = callPackage + ({ mkDerivation, base, bytestring, hasql, mtl, postgresql-libpq + , text + }: + mkDerivation { + pname = "hasql-listen-notify"; + version = "0.1.0"; + sha256 = "0bq4s4x76spjziqgda0shdzfwdhgz1fhsbdg63r3l0m01ixg1a50"; + libraryHaskellDepends = [ + base bytestring hasql mtl postgresql-libpq text + ]; + description = "LISTEN/NOTIFY with hasql"; + license = lib.licenses.bsd3; + }) {}; + "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite , directory, hasql, hasql-transaction, hspec, memory, text, time @@ -132389,8 +133103,8 @@ self: { }: mkDerivation { pname = "hasql-pool"; - version = "0.8.0.6"; - sha256 = "0scpgynr20j8qkhi5gjl0mh7iq713vz7r1zr4xa0jv0s2nd14j2v"; + version = "0.8.0.7"; + sha256 = "16s0k60ffa7bflj0n6diprs3rbm5ywfbfvv1qwv45zwhxlyd622x"; libraryHaskellDepends = [ base hasql stm transformers ]; testHaskellDepends = [ async hasql hspec rerebase stm ]; description = "Pool of connections for Hasql"; @@ -135105,8 +135819,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.3.0.2"; - sha256 = "1bf6fyvp2vzvm7z9ny1pcnaqqxqh9j42x6jyd2r8mv3dxdfdjkhr"; + 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 @@ -135235,10 +135949,8 @@ self: { ({ 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; @@ -135293,6 +136005,8 @@ self: { pname = "hedis"; version = "0.15.1"; sha256 = "1a09i21qmzjcx171452bm69cj188f1jha2gwj0yi7shimcqz3l8m"; + revision = "1"; + editedCabalFile = "1ppc8xygcqv9s9jf44s1hh7ndm9mrvjxjwhv5g2rfdkkbsfyr7r5"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -135560,8 +136274,8 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.1.1.0"; - sha256 = "17ba0jmzs4wk4303ydcr1p2k2kcjfs11mrhlglaz40z61z3vm1yl"; + version = "1.1.1.1"; + sha256 = "0s6ydncib0g4mdmx4vzwmp1cnbvxrb2pngvkd5jc5kn5vb3g929l"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -136916,18 +137630,6 @@ self: { }) {}; "hex-text" = 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; - }) {}; - - "hex-text_0_1_0_8" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, hspec, text }: mkDerivation { @@ -136940,7 +137642,6 @@ self: { ]; description = "ByteString-Text hexidecimal conversions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hexchat" = callPackage @@ -138358,6 +139059,8 @@ self: { pname = "hie-compat"; version = "0.3.1.0"; sha256 = "0ixk1xf8958ajxb11gxx64sf0w6glb9n171jmdqhzdfffd1abs71"; + revision = "1"; + editedCabalFile = "1dr9cqqmxq6dwsdbmm7q4a26ghsnq66yl49wy54dpyln5xzz4234"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -139932,6 +140635,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 { @@ -140512,10 +141240,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.6.4"; - sha256 = "1719sa7zxaa5amrqhkckn9ip5wzc2qbi8gn4f3l98a7sh77f9fym"; - revision = "1"; - editedCabalFile = "050x8yfvk3vqlipirfwn9h0ckghmsp6f8l6skg70d330i868zahm"; + version = "1.6.5"; + sha256 = "0znrypimfcr4immy3x5651cfkny1n8yi8isfh72mv2px70994pm1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141891,6 +142617,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 @@ -142384,8 +143112,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.5"; - sha256 = "1f66q9xq6da4xyl564jxixn60hs4qh4ksgdfigj4xsi44zij9gyx"; + version = "0.5.0.1"; + sha256 = "0im754fgqzi28snwf9bxkj4i1g69c0q8knzjvpmbrs79d5rncpxk"; libraryHaskellDepends = [ base comfort-array comfort-array-shape containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi @@ -144133,10 +144861,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { pname = "hopenssl"; - version = "2.2.4"; - sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x"; - revision = "1"; - editedCabalFile = "14bs0wjrqnnn1v8c4yznfzggvmgypm2lssgl0cr498kmp54if0lf"; + version = "2.2.5"; + sha256 = "1gq3q4fl8vbdg1ha69q18qj1zx13nhkrapz0chs4s0jb29hrh3vm"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit ]; @@ -144374,8 +145100,8 @@ self: { }: mkDerivation { pname = "horizon-gen-nix"; - version = "0.4.0"; - sha256 = "0s0macrn45wh1y7nflw9y73wxsynvym7n12f9n0yhxi8w3j7wzn2"; + version = "0.6"; + sha256 = "1dhd7w3zcw10migz5qfglqh9n6im3ip6af47vxlsib365vk02jl1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144395,8 +145121,8 @@ self: { }: mkDerivation { pname = "horizon-spec"; - version = "0.4.1"; - sha256 = "1xr9x626fzw8bhrkzgv3r00cjsawav76jb68yznj1jlv91cvmxac"; + version = "0.6"; + sha256 = "0p62f79p3bpjjrxfgvvd4i7p54y9xdjxxqg3qxji88m3mgvs4sfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144861,8 +145587,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.35.1"; - sha256 = "1hpc6bwx94v943p73l12nnncbs656f2fn7q3hb4qs13xrxygzl4g"; + version = "0.35.2"; + sha256 = "1v4h5dkbfwx8wlmbaq76av22ald9iyk80k8k7pz808nw30yh3dq3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145120,7 +145846,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Alternative to 'directory' package with ByteString based filepaths"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpath-filepath" = callPackage @@ -145149,7 +145874,6 @@ self: { ]; description = "High-level IO operations on files/directories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpath-posix" = callPackage @@ -145488,7 +146212,7 @@ self: { broken = true; }) {inherit (pkgs) postgresql;}; - "hpqtypes_1_10_0_2" = callPackage + "hpqtypes_1_11_1_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, HUnit, libpq, lifted-base, monad-control, mtl , QuickCheck, random, resource-pool, scientific, semigroups @@ -145498,8 +146222,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.10.0.2"; - sha256 = "0rrsd16cxh8p0ssayxla99svapkbbl2sn5n9hi8vcf9hazfh8nlw"; + version = "1.11.1.0"; + sha256 = "01k256bdcbp88s28bv9mr0pncgzxvwk80dblwwjs1bgnn7v7nvzk"; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base monad-control mtl resource-pool semigroups text text-show time @@ -145544,8 +146268,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.16.2.0"; - sha256 = "0vb96dm8w089j8zc0i5k8abr7dx5nbrmlpjwhpi2vshhmmihkja3"; + version = "1.16.3.0"; + sha256 = "157971qzbxbnwg81879x9rm76slac07s72gx4l1czs6ll53pkl3d"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra hpqtypes log-base mtl text text-show @@ -145629,8 +146353,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.1.1"; - sha256 = "0r8sbi4g49r95pxmm81q291nlixj4wi4m6qrq5wkjp8yrrm2s9gb"; + version = "0.1.2"; + sha256 = "1ggi44lmfs8nny93i60b4s26ygi8qk5dk2ip5sm9mm6ysz907f73"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145844,8 +146568,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "hquantlib-time"; - version = "0.0.5.1"; - sha256 = "1jvcpcnss3hgnjp6isbpbmjml068gasrlj376sbv7diynh8a4rlf"; + version = "0.0.5.2"; + sha256 = "04gzlh3qcbxs1659fgl2l45j16g4m5c4gasd0vwrn2wpskr9w38k"; libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = "LGPL"; @@ -147760,6 +148484,29 @@ self: { mainProgram = "hsc2hs"; }) {}; + "hsc2hs_0_68_9" = callPackage + ({ mkDerivation, base, containers, directory, filepath, HUnit + , process, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "hsc2hs"; + version = "0.68.9"; + sha256 = "02mwsgad10dg640alay7br1zrkn9vhwdf62iwf01921c1g710ny9"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base containers directory filepath process + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "A preprocessor that helps with writing Haskell bindings to C code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsc2hs"; + }) {}; + "hsc3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-binary-ieee754, data-ordlist, directory, filepath, hosc, mtl @@ -149045,6 +149792,29 @@ self: { mainProgram = "hsinstall"; }) {}; + "hsinstall_2_8" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, Cabal, directory, exceptions + , filepath, heredoc, newtype-generics, optparse-applicative + , process, safe-exceptions, transformers + }: + mkDerivation { + pname = "hsinstall"; + version = "2.8"; + sha256 = "1nxkmdvg7fsrmsy1033l7ghmjc859mrvc6gg6pz2xknpg0rwxx3h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ + ansi-wl-pprint base Cabal directory exceptions filepath heredoc + newtype-generics optparse-applicative process safe-exceptions + transformers + ]; + description = "Install Haskell software"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsinstall"; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -149333,14 +150103,12 @@ self: { ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; - version = "1.1.0"; - sha256 = "1437ff2vqhaymiabp31qhr5ixb99h93cp6qz6z82c4d9c5wvl0q6"; + version = "1.1.0.1"; + sha256 = "1gjccs0fwbxavzkm7j8nm2sw2h8rs7d5zyv1nxwkavyd73wqsqlh"; libraryHaskellDepends = [ base bytestring hslua-core ]; testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hslua-marshalling" = callPackage @@ -149425,24 +150193,6 @@ self: { }: mkDerivation { pname = "hslua-module-text"; - version = "1.0.2"; - sha256 = "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq"; - libraryHaskellDepends = [ - base hslua-core hslua-marshalling hslua-packaging text - ]; - testHaskellDepends = [ - base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text - ]; - description = "Lua module for text"; - license = lib.licenses.mit; - }) {}; - - "hslua-module-text_1_0_3_1" = callPackage - ({ mkDerivation, base, hslua-core, hslua-marshalling - , hslua-packaging, tasty, tasty-hunit, tasty-lua, text - }: - mkDerivation { - pname = "hslua-module-text"; version = "1.0.3.1"; sha256 = "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc"; libraryHaskellDepends = [ @@ -149453,7 +150203,6 @@ self: { ]; description = "Lua module for text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-version" = callPackage @@ -149495,7 +150244,6 @@ self: { ]; description = "Lua module to work with file zips"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-objectorientation" = callPackage @@ -149930,14 +150678,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_8" = callPackage + "hspec_2_10_9" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.8"; - sha256 = "13g46fk7hcnk3058pb2wwq257pi8628qaa9md9sfw5rlw878z25r"; + version = "2.10.9"; + sha256 = "0vbi07wpf7nvg2bxlp91gi7c7hkq29q8va83wawzlb0mzaxbsccl"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -149988,15 +150736,17 @@ self: { }) {}; "hspec-contrib" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-discover, HUnit - , QuickCheck + ({ mkDerivation, base, call-stack, hspec, hspec-core + , hspec-discover, HUnit, QuickCheck }: mkDerivation { pname = "hspec-contrib"; - version = "0.5.1.1"; - sha256 = "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"; - libraryHaskellDepends = [ base hspec-core HUnit ]; - testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ]; + version = "0.5.2"; + sha256 = "0002xzvyh790iwf1y33d4nflrbp5sxvpsp010srcfryf1n3qx2b0"; + libraryHaskellDepends = [ base call-stack hspec-core HUnit ]; + testHaskellDepends = [ + base call-stack hspec hspec-core HUnit QuickCheck + ]; testToolDepends = [ hspec-discover ]; description = "Contributed functionality for Hspec"; license = lib.licenses.mit; @@ -150060,7 +150810,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_8" = callPackage + "hspec-core_2_10_9" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -150069,8 +150819,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.8"; - sha256 = "0bka7r8b2qh82sxnz5mcfw2swl4k2v3q97yb0n1rhs1g444lfcqn"; + version = "2.10.9"; + sha256 = "1aby2axr9pqbb75va2n1szkl6jw402kin39xv2m8i6f14fy2hzpz"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -150151,14 +150901,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_8" = callPackage + "hspec-discover_2_10_9" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.8"; - sha256 = "032s5mfr9sw2bgdi2l6fy8jdwm79nr896dw1ha16m94m8596vmph"; + version = "2.10.9"; + sha256 = "16ahgiwgj1nkp0bhyvpvz5avaimigja0gz78576066rsgf6kcygj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -151806,8 +152556,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.10"; - sha256 = "04anp9jfr6y0f4dwzn6k051jkbvmnkdayjg980y2pjj6jqqxr00x"; + version = "0.14.1.11"; + sha256 = "1jpf3m7hcpl38p0a9wqpbaqffdxbqszyqisipgjwn0qmbh56jvas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153236,24 +153986,32 @@ self: { }) {}; "http-io-streams" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, brotli-streams, bytestring, case-insensitive - , containers, cryptohash-sha1, directory, HsOpenSSL, io-streams - , mtl, network, network-uri, openssl-streams, text, transformers - , xor + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-builder, brotli-streams + , bytestring, case-insensitive, containers, cryptohash-sha1 + , directory, HsOpenSSL, hspec, hspec-expectations, HUnit + , io-streams, lifted-base, mtl, network, network-uri + , openssl-streams, snap, snap-core, snap-server, system-fileio + , system-filepath, text, transformers, unordered-containers, xor }: mkDerivation { pname = "http-io-streams"; - version = "0.1.6.1"; - sha256 = "09ggsf9g8gf28d3d5z0rcdnl63d34al35z5d6v68k0n7r229ffb1"; - revision = "1"; - editedCabalFile = "0v2xp9fhrw77vh4vz5qk9lip5mhbf9lz5nkdrfcvrilfjgg4s17b"; + version = "0.1.6.2"; + sha256 = "0nil98dnw0y6g417mr9c9dan071ri3726dv0asgwwplq5mwy780q"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers cryptohash-sha1 directory HsOpenSSL io-streams mtl network network-uri openssl-streams text transformers xor ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive containers directory HsOpenSSL hspec + hspec-expectations HUnit io-streams lifted-base mtl network + network-uri openssl-streams snap snap-core snap-server + system-fileio system-filepath text transformers + unordered-containers + ]; description = "HTTP and WebSocket client based on io-streams"; license = "BSD-3-Clause AND GPL-2.0-or-later"; }) {}; @@ -153387,18 +154145,19 @@ self: { "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception - , HTTP, lazyio, network, network-uri, parsec, semigroups - , transformers, utility-ht + , HTTP, lazyio, network, network-uri, network-uri-flag, parsec + , semigroups, transformers, utility-ht }: mkDerivation { pname = "http-monad"; - version = "0.1.1.3"; - sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1"; + version = "0.1.1.4"; + sha256 = "00bzm1s896wdngz8clmjlfbdp4pw3xjk4sg1d2zznf4npssckm0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers explicit-exception HTTP lazyio network - network-uri parsec semigroups transformers utility-ht + network-uri network-uri-flag parsec semigroups transformers + utility-ht ]; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = lib.licenses.bsd3; @@ -153783,6 +154542,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_4_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, hspec + , hspec-discover, http-types, network, network-byte-order + , network-run, psqueues, stm, text, time-manager, typed-process + , unix-time, unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "4.0.0"; + sha256 = "1gvr0kkx7giskjhm4aag7zz43wgnqk6c6ksljabq7i5fj037z6zb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + unliftio + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types network + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge + network-byte-order stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -153906,8 +154700,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.0"; - sha256 = "12mkxhqhaxcmg2b8finpm5zlkzc614k004jzbacl6jrla3wvzmhw"; + version = "0.0.1"; + sha256 = "0p1rdcjzp5gpd8j64df9q8y9ag6sjzl0gfp68wx0s2xikh34lh98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155341,6 +156135,7 @@ self: { doHaddock = false; description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-json"; }) {}; @@ -155418,7 +156213,9 @@ self: { testToolDepends = [ doctest-discover ]; description = "SIMD-based JSON semi-indexer"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-json-simd"; + broken = true; }) {}; "hw-json-simple-cursor" = callPackage @@ -155456,6 +156253,7 @@ self: { ]; description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-json"; }) {}; @@ -155496,6 +156294,7 @@ self: { ]; description = "Memory efficient JSON parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hw-json-standard-cursor"; }) {}; @@ -157059,6 +157858,8 @@ self: { pname = "hyper"; version = "0.2.1.1"; sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; + revision = "2"; + editedCabalFile = "13r3dafkn9bn8jw1cvw18cc6v6drgj91bmfkgdpfnr5sk3ad6k6n"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; @@ -157366,14 +158167,13 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.27"; - sha256 = "1ww4lgf280sjj9bhj8s6pxadqwk91jkx6lngb2cqcf81gr38drhm"; - revision = "2"; - editedCabalFile = "168gf9ib669ji8lyd1a57xqkqmxyzi3m4r9pnmdxyfnqpnfqdv6r"; + version = "0.2.4.2"; + sha256 = "0k0pwvcsdmjr8vynz61hja35k1bpny6d3j2wppqf9jwgl031nh13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text + base binary bytestring directory filepath hscolour pretty-show + protolude text ]; executableHaskellDepends = [ base bytestring hscolour pretty-show protolude text @@ -158281,8 +159081,8 @@ self: { ({ mkDerivation, base, ghc, ghc-tcplugin-api }: mkDerivation { pname = "if-instance"; - version = "0.3.0.0"; - sha256 = "0d64h9ai0zmyzb9nnxfmr66chxbgdyy6vw2xhqybh4x7ga3ys4r9"; + version = "0.3.1.0"; + sha256 = "112f1nz684wdsmbg5srizb4j9lizrfwgdzm1fpyb5vsbj3ib0fh9"; libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; testHaskellDepends = [ base ghc ]; doHaddock = false; @@ -158745,8 +159545,8 @@ self: { }: mkDerivation { pname = "ihp-hsx"; - version = "0.20.0"; - sha256 = "118bhsyn5r9p03b8six9g5xna4vrh2qsq3ka4mqlvzv4kp4d7dkb"; + version = "1.0.0"; + sha256 = "0ln4xgr3wamhjd34q8vvd0z8chh4prqq7javl9n4ljvriyky13p7"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring containers ghc megaparsec string-conversions template-haskell text @@ -161049,14 +161849,14 @@ self: { license = lib.licenses.mit; }) {}; - "inspection-testing_0_5" = callPackage + "inspection-testing_0_5_0_1" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: mkDerivation { pname = "inspection-testing"; - version = "0.5"; - sha256 = "1iawvnk99c7w44qlw3sl98rrwa1krwjbzy0zsyi80ybg00abfwdh"; + version = "0.5.0.1"; + sha256 = "0zq7ickp6633y262nafi507zp0pmw8v6854sr1cncd3qqmrhnx99"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -161282,22 +162082,23 @@ self: { }) {}; "instrument" = callPackage - ({ mkDerivation, array, async, base, bytestring, cereal - , cereal-text, conduit, containers, csv-conduit, data-default - , errors, exceptions, hedis, hostname, HUnit, mtl, network, path - , path-io, QuickCheck, quickcheck-instances, retry, safe-exceptions - , safecopy, safecopy-hunit, statistics, stm, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unix, vector, zlib + ({ mkDerivation, array, async, atomic-primops, base, bytestring + , cereal, cereal-text, conduit, containers, csv-conduit + , data-default, errors, exceptions, hedis, hostname, HUnit, mtl + , network, path, path-io, QuickCheck, quickcheck-instances, retry + , safe-exceptions, safecopy, safecopy-hunit, statistics, stm, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers, unix + , vector, zlib }: mkDerivation { pname = "instrument"; - version = "0.6.0.0"; - sha256 = "12wjxd8yi4dg8ca3q96rc2pvdx83hwx5a9zx1i7picl4bm5gq7a4"; + version = "0.6.1.0"; + sha256 = "0lp759kgssp1mgz5b3na9306987fxrifahissql7w2dajg9ma0nr"; libraryHaskellDepends = [ - array base bytestring cereal cereal-text conduit containers - csv-conduit data-default errors exceptions hedis hostname mtl - network retry safe-exceptions safecopy statistics text time - transformers unix vector zlib + array atomic-primops base bytestring cereal cereal-text conduit + containers csv-conduit data-default errors exceptions hedis + hostname mtl network retry safe-exceptions safecopy statistics text + time transformers unix vector zlib ]; testHaskellDepends = [ async base bytestring cereal containers data-default hedis HUnit @@ -161322,6 +162123,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "instrument-cloudwatch" = callPackage + ({ mkDerivation, amazonka, amazonka-cloudwatch, async, base + , containers, instrument, lens, QuickCheck, retry, safe-exceptions + , semigroups, stm, stm-chans, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers + }: + mkDerivation { + pname = "instrument-cloudwatch"; + version = "0.2.1.0"; + sha256 = "1iigjf9c1n7by13q13hzxn8ciwvadxszbvsj782pf2arm3mhhvyw"; + libraryHaskellDepends = [ + amazonka amazonka-cloudwatch async base containers instrument lens + retry safe-exceptions semigroups stm stm-chans text time + transformers + ]; + testHaskellDepends = [ + base QuickCheck semigroups stm stm-chans tasty tasty-hunit + tasty-quickcheck + ]; + description = "Adds a worker for the instrument package that exports to Amazon CloudWatch"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "int-cast" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -161439,8 +162264,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "3"; - editedCabalFile = "0z81yksgx20d0rva41blsjcp3jsp1qy9sy385fpig0l074fzv6ym"; + revision = "4"; + editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -161493,16 +162318,17 @@ self: { }) {}; "integer-types" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec }: + ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec + , hspec-hedgehog, quaalude + }: 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; + version = "0.1.0.0"; + sha256 = "0ydhb8sy8klaf0lgvckxcl15wc7b2l0kqr3q225xgkw0qz6qzbic"; + libraryHaskellDepends = [ base deepseq quaalude ]; + testHaskellDepends = [ + base deepseq exceptions hedgehog hspec hspec-hedgehog quaalude + ]; description = "Integer, Natural, and Positive"; license = lib.licenses.asl20; }) {}; @@ -161732,8 +162558,8 @@ self: { }: mkDerivation { pname = "internetmarke"; - version = "0.0.3"; - sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z"; + version = "0.0.4"; + sha256 = "19wf0mx67kz2ghkw47b0xjxq5p81hhkc6i8mi5qm565r5nq5ff5n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -162036,8 +162862,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "2.1.2"; - sha256 = "114c8px57xhvvwzqjkmd0zw7xx8p4w4jhvfl8i1y5ybmaqad060f"; + version = "2.1.3"; + sha256 = "0dsy32n9s0d9i9479d9rhlwwnjl2grl4xg8jwg4mk91p34s8l05n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162361,6 +163187,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 @@ -164739,8 +165590,10 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.2.1"; - sha256 = "03cf6yb3nbcwy0429b0r2dxj6dvk295y4w73lyc6fpjh001yp7c9"; + version = "0.7.2.2"; + sha256 = "0f47cyhsjw57k4cgbmwvawn02v9dvx4x1pn7k2z612srf5l1igb5"; + revision = "1"; + editedCabalFile = "08y9jiyqxxpv6kjivlk2qaiidj3hayyfi7baqzsfn28bskxr7d9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164861,8 +165714,8 @@ self: { ({ mkDerivation, base, Cabal, Cabal-syntax }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.3.6"; - sha256 = "11vzq4yklsi7v04lch0540fgvbg6d5fnl4sdfdcg8n3ijkwqy49p"; + version = "1.4"; + sha256 = "0acl7v3m1hm0rdyzzh5w63d6i1z1pdn4767xy1437f4q614vaxjc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal Cabal-syntax ]; @@ -165473,6 +166326,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 @@ -166672,6 +167542,26 @@ self: { license = lib.licenses.mit; }) {}; + "json-feed_2_0_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "2.0.0.5"; + sha256 = "1204g20x1b19ki3cycss2dpfjfg521d7s5fi8i9wzd8vs5i0vwkb"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -167384,8 +168274,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit, hspec, jsonl }: mkDerivation { pname = "jsonl-conduit"; - version = "0.1.1"; - sha256 = "0678hasvy8f3dvrqsg5m21yd6wdxpj1dffg9asi2b0byr4rxdaax"; + version = "0.1.3"; + sha256 = "04xrkkyazj5ss8857ckngxd366a2lbyck1y6wfwisw2xnj3yxdqj"; libraryHaskellDepends = [ aeson base bytestring conduit jsonl ]; testHaskellDepends = [ aeson base bytestring conduit hspec ]; description = "Conduit interface to JSONL-encoded data"; @@ -170145,8 +171035,8 @@ self: { ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; - version = "1.0.0.1"; - sha256 = "04wglc9ddf9g2amr2h9pdcv0pzn6gqsqg67hds5zwz1jjdbk52ad"; + version = "1.0.0.2"; + sha256 = "1sxzgh8g9fahqwx7ky4f1g03fhy791hilfansx8kf39gfk646dcw"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; @@ -170158,8 +171048,8 @@ self: { }: mkDerivation { pname = "ki-effectful"; - version = "0.1.0.0"; - sha256 = "00r7f666kzjvx54hpvq3aiq09a9zqja0x22bff94l4pdzrpx8ch2"; + version = "0.1.1.0"; + sha256 = "0dnjfq4mxir4qr3rkkacjc6d5xlw1zbnsj889lj7bi70qsrjy182"; libraryHaskellDepends = [ base effectful-core ki stm ]; testHaskellDepends = [ base effectful-core stm tasty tasty-hunit ]; description = "Adaptation of the ki library for the effectful ecosystem"; @@ -170280,6 +171170,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-apply_0_4_0_0" = callPackage + ({ mkDerivation, base, first-class-families }: + mkDerivation { + pname = "kind-apply"; + version = "0.4.0.0"; + sha256 = "0bw41crzif6rdsfpskb8yanhzkcwn7hqwjawzifgi6jz3mvqqaha"; + libraryHaskellDepends = [ base first-class-families ]; + description = "Utilities to work with lists of types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kind-generics" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { @@ -170291,6 +171193,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics_0_5_0_0" = callPackage + ({ mkDerivation, base, first-class-families, kind-apply }: + mkDerivation { + pname = "kind-generics"; + version = "0.5.0.0"; + sha256 = "0l26fx2gyh8lav28zdwx882zmg4qqrj51d8ra9zs5jidirwhi415"; + libraryHaskellDepends = [ base first-class-families kind-apply ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "kind-generics-deriving" = callPackage + ({ mkDerivation, aeson, base, first-class-families, kind-apply + , kind-generics + }: + mkDerivation { + pname = "kind-generics-deriving"; + version = "0.3.0.0"; + sha256 = "03702p4kviy301vagzwybjak3kvfcxrsc22vq89ixlws7qpqakp1"; + libraryHaskellDepends = [ + aeson base first-class-families kind-apply kind-generics + ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "kind-generics-th" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction @@ -170309,6 +171240,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_3_0" = callPackage + ({ mkDerivation, base, fcf-family, ghc-prim, kind-generics + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.3.0"; + sha256 = "12rqqsvfwllq0k5dmgvab61j5n92xx6z6xlcmi4sm5zfxk2pi3b5"; + libraryHaskellDepends = [ + base fcf-family ghc-prim kind-generics template-haskell + th-abstraction + ]; + testHaskellDepends = [ base kind-generics template-haskell ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170352,8 +171301,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "5"; - editedCabalFile = "0fqzr4bwiif9ifmdjxkcnky9hn5ygn8pj3gd004dc27nx6dhxzmc"; + revision = "6"; + editedCabalFile = "15fkqfhf4pjskbivsvjnrq79667cdxf3jv2yx576vl8fkgx5l1ba"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -170581,8 +171530,8 @@ self: { ({ mkDerivation, base, bytestring, transformers }: mkDerivation { pname = "knob"; - version = "0.2.1"; - sha256 = "03q918gnm2d6jr57lydxz3i0mykvk7ghyq59cy2vavg395s4jrhy"; + version = "0.2.2"; + sha256 = "1sgfq0jkzzvhfwksjxk1z80z6mfgxniskjmqmxy5bq6ly42s3xhc"; libraryHaskellDepends = [ base bytestring transformers ]; description = "Memory-backed handles"; license = lib.licenses.mit; @@ -171194,10 +172143,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 ]; @@ -171400,6 +172347,19 @@ self: { license = lib.licenses.mit; }) {}; + "lackey_2_0_0_4" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "2.0.0.4"; + sha256 = "0cqmrsir562p9xxvjawj7rvmzypigmj4rhi6pgf5s0gmpzrjcskn"; + libraryHaskellDepends = [ base servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -172601,8 +173561,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.9.1"; - sha256 = "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl"; + version = "0.9.2"; + sha256 = "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -172872,6 +173832,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_12_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec + , prettyprinter, QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "12.1.0"; + sha256 = "0wbck5a50d0sdmvr3vvjgz1bbmqvj5avn1slxrazpfyy9rdnr9l3"; + libraryHaskellDepends = [ + base bytestring containers data-default data-default-class + megaparsec prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -173890,8 +174873,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.5"; - sha256 = "0g4nwbkb5nxfmh7aan7r94gchr3wmr45g18mzxzcxqxqpllj3vs1"; + version = "0.5.0.2"; + sha256 = "18gb8p2mx9hwhcqnqghvjhrdbxr7sziyr936vn2bnh33w9srnghi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173964,10 +174947,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.3"; - sha256 = "0qk5a43w8xn8pp9bhmjmjyvriiin2dyf4nvk13w858hsxyx6xqkx"; - revision = "1"; - editedCabalFile = "15w2ml6iqwk7776dl9m7lg0jp7akw9f8s95flrsjfxr479qig48i"; + version = "0.1.3.1"; + sha256 = "1mf41wcbxkgiv71c3jjwhsdg9d7qpa88qsifpa5vgplpx2v1p6ya"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -173986,8 +174967,8 @@ self: { }: mkDerivation { pname = "lapack-hmatrix"; - version = "0.0.0.1"; - sha256 = "0jd3sy03cxdfxakxaj1kxpc3jn0z8sd74lpxxg9s9jdvaxxxyflj"; + version = "0.0.0.2"; + sha256 = "16w7rwf1d7m3ml0zmdk2gf2ri0p9dljp67d8l6afwblzwqvlrkbd"; libraryHaskellDepends = [ base comfort-array hmatrix lapack netlib-ffi transformers utility-ht vector @@ -174021,6 +175002,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "large-generics" = callPackage @@ -174387,6 +175369,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "lattices_2_1" = callPackage + ({ 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 + }: + mkDerivation { + pname = "lattices"; + version = "2.1"; + sha256 = "1wxam7c00bcfl3g1aiayxzjscmmbm393gfj8zmx77ijhs7v1zp3v"; + libraryHaskellDepends = [ + 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 + tasty-quickcheck transformers universe-base + universe-reverse-instances unordered-containers + ]; + description = "Fine-grained library for constructing and manipulating lattices"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, clock, containers, cryptohash, exceptions, extra @@ -174397,8 +175404,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.3"; - sha256 = "0j5j4x94r7ha7amv0cggs7n7n9vyx1ga5kwdr8mcddc7karz18cg"; + version = "3.1.0"; + sha256 = "17jq8fccppdivd2a662aax1hf12rgldjhk2d89m285k6pdcfyyrh"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -174450,6 +175457,59 @@ self: { license = lib.licenses.bsd3; }) {}; + "lawful-classes-hedgehog" = callPackage + ({ mkDerivation, base, hedgehog, lawful-classes-types, mtl, tasty + , tasty-expected-failure, tasty-hedgehog, transformers + }: + mkDerivation { + pname = "lawful-classes-hedgehog"; + version = "0.1.2.1"; + sha256 = "1x20xsphq9la8g1a6n3427ib0kqpakxirs1qn7qhwwzk3wdra8qq"; + libraryHaskellDepends = [ + base hedgehog lawful-classes-types tasty tasty-hedgehog + transformers + ]; + testHaskellDepends = [ + base hedgehog lawful-classes-types mtl tasty tasty-expected-failure + transformers + ]; + description = "Hedgehog support for lawful-classes"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "lawful-classes-quickcheck" = callPackage + ({ mkDerivation, base, lawful-classes-types, mtl, QuickCheck, tasty + , tasty-expected-failure, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "lawful-classes-quickcheck"; + version = "0.1.2.1"; + sha256 = "1xi8agnb0mbkvbjbqqnqizbnnjv4kkdc6mwlm8yvc4ipl72y45n6"; + libraryHaskellDepends = [ + base lawful-classes-types QuickCheck tasty tasty-quickcheck + transformers + ]; + testHaskellDepends = [ + base lawful-classes-types mtl QuickCheck tasty + tasty-expected-failure transformers + ]; + description = "QuickCheck support for lawful-classes"; + license = lib.licenses.asl20; + }) {}; + + "lawful-classes-types" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lawful-classes-types"; + version = "0.1.0.2"; + sha256 = "0dza7qrq54k0p50bv7hj9y0c12kl3x51j6kh9k7aammfnl14hrri"; + libraryHaskellDepends = [ base ]; + description = "Types for lawful-classes"; + license = lib.licenses.asl20; + }) {}; + "lawless-concurrent-machines" = callPackage ({ mkDerivation, async, base, containers, lifted-async, machines , monad-control, semigroups, tasty, tasty-hunit, time, transformers @@ -174642,10 +175702,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 @@ -175043,8 +176101,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "ldtk-types"; - version = "0.1.0.0"; - sha256 = "0gf99imncx6b50jjv6nn6zf37xxq8kimhp14lxymbi86k6xl204z"; + version = "1.2.3"; + sha256 = "1xva58a0dsplw03sx2ip4ad88icp9mn5n5wpi81hgy9kj6szh22x"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Datatypes and Aeson instances for parsing LDtk"; @@ -177438,6 +178496,8 @@ self: { ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "libsodium" = callPackage @@ -177843,19 +178903,19 @@ self: { }) {}; "lifetimes" = callPackage - ({ mkDerivation, base, containers, hspec, monad-stm + ({ mkDerivation, async, base, containers, hspec, monad-stm , safe-exceptions, stm, transformers, zenhack-prelude }: mkDerivation { pname = "lifetimes"; - version = "0.1.0.0"; - sha256 = "192bzz4nqqi2kdk9x4nxlwmx0mf0sshqdcnx1dgyjh5z9k29rww5"; + version = "0.2.0.1"; + sha256 = "15b7gs7y5cxh4wv4ypzwknrh25305db44kqh0v07v4j40gzfys07"; libraryHaskellDepends = [ - base containers monad-stm stm transformers zenhack-prelude + async base containers monad-stm stm transformers zenhack-prelude ]; testHaskellDepends = [ - base containers hspec monad-stm safe-exceptions stm transformers - zenhack-prelude + async base containers hspec monad-stm safe-exceptions stm + transformers zenhack-prelude ]; description = "Flexible manual resource management"; license = lib.licenses.asl20; @@ -178210,6 +179270,30 @@ self: { broken = true; }) {}; + "lima" = callPackage + ({ mkDerivation, aeson, base, data-default, optparse-applicative + , yaml + }: + mkDerivation { + pname = "lima"; + version = "0.1.0.5"; + sha256 = "10hanr88zbrx57c52rmzmvqqn35yhylpzms0j60j195zwxmaliq6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base data-default optparse-applicative yaml + ]; + executableHaskellDepends = [ + aeson base data-default optparse-applicative yaml + ]; + testHaskellDepends = [ + aeson base data-default optparse-applicative yaml + ]; + description = "(Haskell or Literate Haskell) <-> Markdown converter"; + license = lib.licenses.mit; + mainProgram = "lima"; + }) {}; + "limp" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, tasty-th @@ -179629,16 +180713,17 @@ self: { , directory, exceptions, extra, filepath, fingertree, free, ghc , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable , hscolour, liquid-fixpoint, megaparsec, mtl, optics - , optparse-applicative, optparse-simple, pretty, process - , recursion-schemes, split, stm, string-conv, syb, tagged, tasty - , tasty-ant-xml, tasty-golden, tasty-hunit, tasty-rerun - , template-haskell, temporary, text, th-compat, time, transformers + , optparse-applicative, pretty, process, recursion-schemes, split + , syb, tasty, tasty-ant-xml, tasty-hunit, template-haskell + , temporary, text, th-compat, time, transformers , unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.10.7"; - sha256 = "02yaiwlq1xbdshmi655cwi8xnydrwpb3k1rsh00cdx6d8ab753kz"; + version = "0.9.0.2.1"; + sha256 = "174bazw76hrn3rlvcmsag87rv66r9vwm6008hw540gjvj2g1w0z4"; + revision = "1"; + editedCabalFile = "1ycl8vg7nzslkvsiimfv67fa095cgkzpzxila6wpnnsmf6d9m06z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179647,16 +180732,14 @@ self: { data-default data-fix deepseq Diff directory exceptions extra filepath fingertree free ghc ghc-boot ghc-paths ghc-prim githash gitrev hashable hscolour liquid-fixpoint megaparsec mtl optics - optparse-applicative optparse-simple pretty recursion-schemes split - syb template-haskell temporary text th-compat time transformers + optparse-applicative pretty recursion-schemes split syb + template-haskell temporary text th-compat time transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers directory extra filepath ghc liquid-fixpoint - megaparsec mtl optparse-applicative process stm string-conv syb - tagged tasty tasty-ant-xml tasty-golden tasty-hunit tasty-rerun - text transformers + base directory extra filepath ghc liquid-fixpoint megaparsec + process syb tasty tasty-ant-xml tasty-hunit text ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; @@ -179854,15 +180937,14 @@ self: { "list-t" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph - , monad-control, mtl, mtl-prelude, semigroups, transformers - , transformers-base + , monad-control, mtl, mtl-prelude, transformers, transformers-base }: mkDerivation { pname = "list-t"; - version = "1.0.5.3"; - sha256 = "0j3fgfa84f2cw87j80v5sq82s42505v82pwxgjyhbiflaxjd7wxd"; + version = "1.0.5.6"; + sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg"; libraryHaskellDepends = [ - base foldl logict mmorph monad-control mtl semigroups transformers + base foldl logict mmorph monad-control mtl transformers transformers-base ]; testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; @@ -180126,8 +181208,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lists-flines"; - version = "0.1.2.0"; - sha256 = "0m33az0fkry1p0653g3kyxi0y7flmlpivi02a5iz7drslikz6xbd"; + version = "0.1.3.0"; + sha256 = "015ln008c1nb9ajykn1kr91z8ab393xd59m8sgw1ih62k9g4f3f0"; + revision = "1"; + editedCabalFile = "0mb010y2p83n7cwxq35ynv35id6y1n14hfsjfgmvg1d8kax0g39k"; libraryHaskellDepends = [ base ]; description = "Additional data and structures to some 'String'-related lists"; license = lib.licenses.mit; @@ -180735,6 +181819,8 @@ self: { pname = "llvm-hs-pure"; version = "9.0.0"; sha256 = "0pxb5ah8r5pzpz2ibqw3g9g1isigb4z7pbzfrwr8kmcjn74ab3kf"; + revision = "1"; + editedCabalFile = "14vn4yyzwg5kh6wx67ax0vd06n94x1y9rzqj6k2qr8liayhmbxhh"; libraryHaskellDepends = [ attoparsec base bytestring containers fail mtl template-haskell transformers unordered-containers @@ -180771,6 +181857,8 @@ self: { pname = "llvm-pkg-config"; version = "0.0.2"; sha256 = "1p4ww8ylhr4ag1dfz4sffkg2qsyjj4zxccda3nr50k3c26pmmdz1"; + revision = "1"; + editedCabalFile = "0wd3vvcas446skkmp2w3jp7f3d1cbl7b58kikwgrmlqa6ddzyzlk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -181115,15 +182203,13 @@ self: { }: mkDerivation { pname = "loc"; - version = "0.1.4.0"; - sha256 = "1sv3nka1dxvxrvcl9jz8qa06194wvk2vcs894rzb4g052ikxgmnb"; - revision = "1"; - editedCabalFile = "015wiw9q95aqka731nyrc99m4c4h6fal92ka46rd6kcili8k7ysh"; + version = "0.1.4.1"; + sha256 = "12bsbjl0808dfcshz38iih3cl3768zix23adznnq821ffxsxfiiw"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hedgehog hspec hspec-hedgehog ]; - description = "Types representing line and column positions and ranges in text files"; + description = "Line and column positions and ranges in text files"; license = lib.licenses.asl20; }) {}; @@ -181131,10 +182217,10 @@ 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; }) {}; @@ -181393,6 +182479,8 @@ self: { pname = "log-base"; version = "0.12.0.0"; sha256 = "0z646qhyp636q24fxwkkpbg2z5f5vfyskkl04jrk9hpfvba3arsg"; + revision = "1"; + editedCabalFile = "1ivk7mm48hmw75ik7239rxr1c7ymc2bx1r78g3bz33sm500gms2h"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control mtl semigroups stm text time transformers-base @@ -181486,8 +182574,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.13.0.0"; - sha256 = "1jc3891y71rxidwhyfqkkh4jf7kvfw8if622z2fbdl7wgr40saqj"; + version = "0.13.0.1"; + sha256 = "1l9p4zpf18rkwkv485swrlwyx2l3iqd332273mkz64ybjqllsdkx"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-openssl http-types log-base network-uri @@ -181908,6 +182996,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "logical-constraints" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "logical-constraints"; + version = "0.1.3.0"; + sha256 = "1jw64bajnz1fizgkw9b01fpk7iyf5w7b8rd1zmhkqxg85npx3kql"; + libraryHaskellDepends = [ base ]; + description = "Simple logical constraints 'syntax-sugar' writing library"; + license = lib.licenses.mit; + }) {}; + "logicst" = callPackage ({ mkDerivation, base, logict, transformers }: mkDerivation { @@ -184069,8 +185168,8 @@ self: { }: mkDerivation { pname = "lzo"; - version = "0.1.1.4"; - sha256 = "1n6b2y2bmq3kl6h5mjl301r31rmvrcsc3l66jmnj3ilrj4506m1y"; + version = "0.1.1.5"; + sha256 = "1giv7ksmcgilmysdz26nmr37anvgyyddyzazx7cfwhrj6nv949w0"; libraryHaskellDepends = [ base binary bytestring digest digest-sig ]; @@ -185104,10 +186203,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; - version = "1.0.9"; - sha256 = "0vx8aim8bcyyvxxnmi1xkbl3kwrvskjn99z3y8h458g7nsinsisd"; - revision = "3"; - editedCabalFile = "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664"; + version = "1.0.10"; + sha256 = "0ngpk6zkpnc9hl9a46pgkc8ii4d7y06xci52birc5vy1a2fwl8is"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = lib.licenses.bsd3; @@ -185788,8 +186885,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "5"; - editedCabalFile = "0vfrq4gbd07jaz656lrxx7yar8lbgimkvkij52sn6d403wak20cv"; + revision = "6"; + editedCabalFile = "1al0603ldi5vsqid0bdvw4jnasc888cv5qqix5ps711rz86wmrrd"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -186337,20 +187434,6 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.5"; - sha256 = "0ch8qajaj83pifxy24z4srb3j51z5zn94lrx0ziqcfrpshck569j"; - libraryHaskellDepends = [ - array base bytestring ghc-prim network text - ]; - description = "Fast and extensible bytestring builder"; - license = lib.licenses.bsd3; - }) {}; - - "mason_0_2_6" = callPackage - ({ mkDerivation, array, base, bytestring, ghc-prim, network, text - }: - mkDerivation { - pname = "mason"; version = "0.2.6"; sha256 = "10z98igmpswwdfak4b42p5c9rx14fj9zi2j5jb3b194ihi82dnd7"; libraryHaskellDepends = [ @@ -186358,7 +187441,6 @@ self: { ]; description = "Fast and extensible bytestring builder"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "massiv" = callPackage @@ -186677,62 +187759,54 @@ self: { }) {}; "math-programming" = callPackage - ({ mkDerivation, base, containers, mtl, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , QuickCheck, text, transformers }: mkDerivation { pname = "math-programming"; - version = "0.4.0"; - sha256 = "0c154gvx0h1xincmmx2jcrvaivni36ahglbrwx08v8z3wdp51k0m"; - libraryHaskellDepends = [ base containers mtl text ]; - testHaskellDepends = [ - base containers mtl tasty tasty-discover tasty-hunit - tasty-quickcheck text + version = "0.5.1"; + sha256 = "0lp1mjl3c01xmypcix0q8pa4id1acx418mc1vlj5hrprs30smin1"; + libraryHaskellDepends = [ + base containers exceptions mtl text transformers ]; - testToolDepends = [ tasty-discover ]; + testHaskellDepends = [ base hspec mtl QuickCheck text ]; description = "A library for formulating and solving math programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "math-programming-glpk" = callPackage - ({ mkDerivation, base, containers, glpk, glpk-headers - , math-programming, math-programming-tests, mtl, tasty - , tasty-discover, tasty-hunit, text + ({ mkDerivation, base, glpk-headers, hspec, math-programming + , math-programming-tests, mtl, text, transformers, unliftio }: mkDerivation { pname = "math-programming-glpk"; - version = "0.4.1"; - sha256 = "1ikg8a3pspcrk46rr87lnwkhziihzfpjd543bisqs0pl2db1ll5b"; + version = "0.5.1"; + sha256 = "0b7r81l1gc57kxbflp4189wx4mvyxf5lf86in6vw2n76qxz04fsq"; libraryHaskellDepends = [ - base containers glpk-headers math-programming mtl text + base glpk-headers math-programming mtl text transformers unliftio ]; testHaskellDepends = [ - base containers glpk-headers math-programming - math-programming-tests mtl tasty tasty-discover tasty-hunit text + base hspec math-programming math-programming-tests unliftio ]; - testSystemDepends = [ glpk ]; - testToolDepends = [ tasty-discover ]; description = "A GLPK backend to the math-programming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) glpk;}; + }) {}; "math-programming-tests" = callPackage - ({ mkDerivation, base, math-programming, tasty, tasty-hunit - , tasty-quickcheck, text + ({ mkDerivation, base, containers, hspec, math-programming + , microlens, microlens-mtl, microlens-th, mtl, QuickCheck, random + , text }: mkDerivation { pname = "math-programming-tests"; - version = "0.4.0"; - sha256 = "01d6yb4zm2jky8jm8jzd1365nhjsa4c50b5a5yx3r7g078lk91pi"; + version = "0.5.1"; + sha256 = "0mfx6vs6nniprgdcpgnc2z7mpampyiqada6rsa5gkd3k8vwy6aa2"; libraryHaskellDepends = [ - base math-programming tasty tasty-hunit tasty-quickcheck text + base containers hspec math-programming microlens microlens-mtl + microlens-th mtl QuickCheck random text ]; description = "Utility functions for testing implementations of the math-programming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mathblog" = callPackage @@ -187158,7 +188232,6 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "matterhorn"; maintainers = [ lib.maintainers.kiwi ]; }) {}; @@ -187550,8 +188623,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.0.1"; - sha256 = "02wkdjll77biimblsjkyh97c3adfm7g64bbvyz3m5v37fg75231d"; + version = "0.8.1.0"; + sha256 = "15sdqfq9sfjwkbzwi3qsjg8d59nj44qx3sh3sd9zk3hmc11k8wp4"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -188208,20 +189281,20 @@ self: { }) {}; "melf" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , exceptions, filepath, mtl, optparse-applicative, prettyprinter + ({ mkDerivation, base, binary, bytestring, directory, exceptions + , filepath, lens, mtl, optparse-applicative, prettyprinter , singletons, singletons-base, singletons-th, tasty, tasty-golden , tasty-hunit, template-haskell, unix }: mkDerivation { pname = "melf"; - version = "1.1.0"; - sha256 = "0d8rc67yirdj03i1gdcyip51q3qbzfghfblwqzdm85hlhp7vidic"; + version = "1.2.0"; + sha256 = "1zhxgmkbadnyapdq2pqg181fbs47pqcd0vwq8k12sbfs9h3rhlzr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary bytestring exceptions mtl prettyprinter singletons + base binary bytestring exceptions lens mtl prettyprinter singletons singletons-base singletons-th template-haskell ]; executableHaskellDepends = [ @@ -188229,7 +189302,7 @@ self: { prettyprinter ]; testHaskellDepends = [ - base binary bytestring containers directory exceptions filepath mtl + base binary bytestring directory exceptions filepath mtl prettyprinter singletons singletons-th tasty tasty-golden tasty-hunit unix ]; @@ -188505,23 +189578,11 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "memfd"; - version = "1.0.1.0"; - sha256 = "154861xg18h02s26gf3fk8zqhr2d8x21p0s4ar56rfrbi7b2nqrk"; - libraryHaskellDepends = [ base transformers ]; - description = "Open temporary anonymous Linux file handles"; - license = lib.licenses.asl20; - }) {}; - - "memfd_1_0_1_1" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "memfd"; version = "1.0.1.1"; sha256 = "1ngd65ixj4ydjp6aqhs1md6vck6mwyf12j5jc425gxnpvmbzwvw8"; libraryHaskellDepends = [ base transformers ]; description = "Open temporary anonymous Linux file handles"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "meminfo" = callPackage @@ -189956,8 +191017,8 @@ self: { }: mkDerivation { pname = "microstache"; - version = "1.0.2.2"; - sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh"; + version = "1.0.2.3"; + sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -190033,8 +191094,8 @@ self: { }: mkDerivation { pname = "midi"; - version = "0.2.2.3"; - sha256 = "12vj9h7vdklzn5dglypjsw1bs9rdacdg9fmxhnbd89jv89dyn4km"; + version = "0.2.2.4"; + sha256 = "14dv5ihlk5jqmvd3b0wfk4nzk4phan5gx6fmvq616mrp6dsflx58"; libraryHaskellDepends = [ base binary bytestring event-list explicit-exception monoid-transformer non-negative QuickCheck random semigroups @@ -190646,6 +191707,20 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "minicurl" = callPackage + ({ mkDerivation, base, bytestring, cryptohash-sha256, curl, HUnit + }: + mkDerivation { + pname = "minicurl"; + version = "0"; + sha256 = "0zyvy4iakc7m3hblmc6kmm7nkwajjg5wsvxwd51d4idlm1b11xm2"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ curl ]; + testHaskellDepends = [ base bytestring cryptohash-sha256 HUnit ]; + description = "Minimal bindings to libcurl"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) curl;}; + "miniforth" = callPackage ({ mkDerivation, base, containers, lens, MonadRandom, mtl , mtl-compat, parsec, parsec3-numbers, readline @@ -191715,8 +192790,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn2-array"; - version = "0.3.0.0"; - sha256 = "0fmdql0jrzbr7yl0axk41l5xl476is5xp38p13179nppll44a5d4"; + version = "0.3.1.1"; + sha256 = "0f0lksih0mgfk70h3ws4yh5fshmcx2s32vva2yj3x5cx4c6w94n6"; libraryHaskellDepends = [ base ]; description = "A library that can be used for multiple Ord a => a -> b transformations"; license = lib.licenses.mit; @@ -191726,8 +192801,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn2-array-ukrainian-data"; - version = "0.1.0.0"; - sha256 = "1fvwa0aby40pahi5gx47x09qzl6myj6djp6shjv5f07m5ygq3h3q"; + version = "0.2.0.0"; + sha256 = "1i8cqgypikc0rjcjgv4x62c6j29cf7q37zzvg7b8ividvdjvkpbj"; libraryHaskellDepends = [ base ]; description = "Data that is taken from the ukrainian-phonetics-basic-array for optimization"; license = lib.licenses.mit; @@ -191748,8 +192823,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.6.0"; - sha256 = "0fbpjqr9vv10s0kn9i6l50csym40zrpa8yynm884a1580mq5w2d6"; + version = "0.2.0.0"; + sha256 = "1fmwxy9rb11l797gjmz1ymskcngqkll9q3g5z9zcqnprfcb8lpxi"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = lib.licenses.mit; @@ -191767,15 +192842,17 @@ self: { executableHaskellDepends = [ base directory mmsyn3 process ]; description = "The \"glue\" between electronic tables and GraphViz"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn4"; + broken = true; }) {}; "mmsyn5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.5.1.0"; - sha256 = "0ay36zs4wxv69i11hr66b07x079p0k41h8zvaz2fl431d3h385rw"; + version = "0.6.0.0"; + sha256 = "1737c8b960ngc38fdzsj9gwdlz0qzvd6yc5wcb226r6fpkf36z8c"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = lib.licenses.mit; @@ -191827,6 +192904,7 @@ self: { ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn6ukra"; }) {}; @@ -191872,7 +192950,9 @@ 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"; + broken = true; }) {}; "mmsyn7s" = callPackage @@ -191928,6 +193008,8 @@ 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; + broken = true; }) {}; "mmsyn7ukr-common" = callPackage @@ -191939,6 +193021,8 @@ 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; + broken = true; }) {}; "mmtf" = callPackage @@ -191996,8 +193080,8 @@ self: { }: mkDerivation { pname = "mnist-idx"; - version = "0.1.3.1"; - sha256 = "12246lq1a0jc91yqyng9v2cgf4pqmfmf820jjwnc6aglx86vsmni"; + version = "0.1.3.2"; + sha256 = "0ana9dqnanh8wgv1v7xgdznz2kf1p20lg96vkix83hk9v49gdcs3"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec QuickCheck vector @@ -192144,6 +193228,28 @@ self: { license = lib.licenses.mit; }) {}; + "mod_0_2_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-bignum, primitive + , quickcheck-classes, quickcheck-classes-base, semirings, tasty + , tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "mod"; + version = "0.2.0.0"; + sha256 = "18jn2hsp42crfx0a8cm2aahxwf54pxkq3v94q3mccp2lkx9is40z"; + libraryHaskellDepends = [ + base deepseq ghc-bignum primitive semirings vector + ]; + testHaskellDepends = [ + base containers primitive quickcheck-classes + quickcheck-classes-base semirings tasty tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Fast type-safe modular arithmetic"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "modbus-tcp" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, transformers }: mkDerivation { @@ -192288,6 +193394,8 @@ self: { pname = "modular-arithmetic"; version = "2.0.0.2"; sha256 = "1bbn3pwvpl9v7a8gkxx83w2s8mk2q9gin7yvkkr97f64rdf8lnrq"; + revision = "1"; + editedCabalFile = "035z6pjgbgcb39dh6zd822d1yxvjs5j684cx7mn14wq0q1l0q295"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "A type for integers modulo some constant"; @@ -192458,20 +193566,21 @@ self: { "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, fail, filepath, html, HTTP - , network, network-uri, old-locale, old-time, parsec, process - , transformers, unix, utility-ht + , network, network-bsd, network-uri, network-uri-flag, old-locale + , old-time, parsec, process, transformers, unix, utility-ht }: mkDerivation { pname = "mohws"; - version = "0.2.1.8"; - sha256 = "039abcwkqijsw8qp2iid6ilnyg79lvc1m6zik0jc4gadl5g704wh"; + version = "0.2.1.9"; + sha256 = "0a2hajnnngmarxpypbk1jvmwb8y93y2hhcnp86bj5rf3j5far5pf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor directory - explicit-exception fail filepath html HTTP network network-uri - old-locale old-time parsec process transformers unix utility-ht + explicit-exception fail filepath html HTTP network network-bsd + network-uri network-uri-flag old-locale old-time parsec process + transformers unix utility-ht ]; executableHaskellDepends = [ base bytestring ]; description = "Modular Haskell Web Server"; @@ -193074,10 +194183,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.37"; - sha256 = "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106"; - revision = "3"; - editedCabalFile = "1dzkw08b4ijacdw0vcfxlr13rd819x2yj7b6sr9jrrwicd45zm1z"; + version = "0.3.39"; + sha256 = "19992zh63axs0q86fgznk04dan8h3hbs72cjp1s3yynsgl23pwnk"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -193095,8 +194202,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.4.0.2"; - sha256 = "1z0r0xkd8i9nw9jlzb7m50m2qi48mf6v26h533jn91yw6gi830r0"; + version = "0.4.0.3"; + sha256 = "1i5lp7falarvwad3a7xnm865bl4q7jqj9dq96hlf4phh4rsx0h9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194009,6 +195116,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 @@ -194174,6 +195301,8 @@ self: { pname = "monadplus"; version = "1.4.3"; sha256 = "1gwy7kkcp696plfsbry22nvvqnainyv1n1van8yzskilz26k2yc5"; + revision = "1"; + editedCabalFile = "177z7d8hzl53cwxzsj0hqc1icm89d8k2faz99j790ag2vjmsai5g"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = lib.licenses.bsd3; @@ -194567,8 +195696,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.2"; - sha256 = "1ac59pk7yv0g55c7yxykmsy06d4dlxnas5739041ydc5f9vdd1wz"; + version = "1.1.4"; + sha256 = "1hg0vpm6nhdqxxpx9329gj135fqrfsw0kdlxd1ycfini69jsbxn6"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -194581,6 +195710,8 @@ self: { ]; description = "Monoids for calculation of statistics of sample"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monoid-subclasses" = callPackage @@ -194655,15 +195786,16 @@ self: { "monoidal-functors" = callPackage ({ mkDerivation, base, bifunctors, comonad, contravariant - , profunctors, semigroupoids, tagged, these + , distributive, profunctors, semialign, semigroupoids, tagged + , these }: mkDerivation { pname = "monoidal-functors"; - version = "0.1.1.0"; - sha256 = "11qac7z7xy8rwdzmp3x1i7bd28xvpd13yyfi27rsn56pyq6a4rqf"; + version = "0.2.1.0"; + sha256 = "0fxbshb7ha6l872k77qiyv6k4056ihb8sjjgf767118azsmf130x"; libraryHaskellDepends = [ - base bifunctors comonad contravariant profunctors semigroupoids - tagged these + base bifunctors comonad contravariant distributive profunctors + semialign semigroupoids tagged these ]; description = "Monoidal Functors Library"; license = lib.licenses.mit; @@ -194702,18 +195834,16 @@ self: { }) {}; "monomer" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring + ({ mkDerivation, async, attoparsec, base, bytestring , bytestring-to-vector, c2hs, containers, data-default, exceptions , extra, formatting, glew, hspec, http-client, JuicyPixels, lens - , mtl, nanovg, OpenGLRaw, process, random, sdl2, stm, text - , text-show, time, transformers, vector, websockets, wreq, wuss + , mtl, nanovg, OpenGLRaw, process, sdl2, stm, text, text-show, time + , transformers, vector, wreq }: mkDerivation { pname = "monomer"; - version = "1.5.0.0"; - sha256 = "0asp7j9xmysspyv2l8fcr36flcayqyhp41139kzg00b7jglpbpyg"; - revision = "1"; - editedCabalFile = "1ig93calrshb8q4jp8iw0y2yqkxmd5n7xg1nabc9bp0ypacba13m"; + version = "1.5.1.0"; + sha256 = "13z6ls2y8d4r98dwxl8d65xf0rcs4i0v65zlq93i7yk5zcyw0s8i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194723,12 +195853,13 @@ self: { transformers vector wreq ]; librarySystemDepends = [ glew ]; + libraryPkgconfigDepends = [ glew ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - aeson async attoparsec base bytestring bytestring-to-vector - containers data-default exceptions extra formatting http-client - JuicyPixels lens mtl nanovg OpenGLRaw process random sdl2 stm text - text-show time transformers vector websockets wreq wuss + async attoparsec base bytestring bytestring-to-vector containers + data-default exceptions extra formatting http-client JuicyPixels + lens mtl nanovg OpenGLRaw process sdl2 stm text text-show time + transformers vector wreq ]; testHaskellDepends = [ async attoparsec base bytestring bytestring-to-vector containers @@ -194738,6 +195869,7 @@ self: { ]; description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; + mainProgram = "dev-test-app"; }) {inherit (pkgs) glew;}; "monomer-hagrid" = callPackage @@ -194747,8 +195879,8 @@ self: { }: mkDerivation { pname = "monomer-hagrid"; - version = "0.2.0.1"; - sha256 = "0vic013zr80wlm1gf33y8vlkpmrv6z52975dpa3ciypayd36hy2m"; + version = "0.2.1.0"; + sha256 = "1hgw5p8nfw12jklrd2blli0wc4z9b60bk9gf3j0l8jxpivzwakqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198729,8 +199861,8 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.3"; - sha256 = "04cznws3qq9km75ssigz3cfnjkh5lldgmyy29p8vrdf4s2g8i4z1"; + version = "0.1.0.4"; + sha256 = "04hh9yydm6xkv526k5kivyimwbjic591527rl6r2c5bykmkdns38"; libraryHaskellDepends = [ base safe-exceptions ]; description = "A trivial lock based on MVar"; license = lib.licenses.asl20; @@ -199667,8 +200799,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "3"; - editedCabalFile = "1rfli2b4asgasvgp7zjvydhxbyd0vx44vr7yck2760wz1crkzhhn"; + revision = "4"; + editedCabalFile = "05m3mw2prbag8bshayvvigxr70jk32398sn3n5gjv1nfhbsplwcr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -199800,8 +200932,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.1.1.0"; - sha256 = "1g3xb3pr6sxn3sk9h2jbqlj30vh4nxcc14d06dawmqfva8b1gfp5"; + version = "1.1.2.0"; + sha256 = "0yzz8vb4pjb177p3z3qr4rvn8nz5bdha0w7jmq1791g0g022jvqj"; libraryHaskellDepends = [ aeson base deepseq hashable prettyprinter sayable text ]; @@ -200968,39 +202100,6 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.2.4"; - sha256 = "03w0086kn9zgsry8gm1ij7n5m3fqq7xfas4ma1fviqsx7w8wdc3r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra connection containers deepseq network-conduit-tls - network-uri QuickCheck stm text websockets - ]; - executableHaskellDepends = [ - async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra connection containers deepseq network-conduit-tls - network-uri optparse-applicative QuickCheck stm text websockets - ]; - testHaskellDepends = [ - async attoparsec attoparsec-binary base binary bytestring checkers - conduit conduit-extra connection containers deepseq HUnit - network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit - tasty-quickcheck text websockets - ]; - description = "An MQTT Protocol Implementation"; - license = lib.licenses.bsd3; - }) {}; - - "net-mqtt_0_8_2_5" = callPackage - ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary - , bytestring, checkers, conduit, conduit-extra, connection - , containers, deepseq, HUnit, network-conduit-tls, network-uri - , optparse-applicative, QuickCheck, stm, tasty, tasty-hunit - , tasty-quickcheck, text, websockets - }: - mkDerivation { - pname = "net-mqtt"; version = "0.8.2.5"; sha256 = "0k6yghgj693hbyk2zsjh3ns1yx9ypjjfj3mrrandn6lvpif08h9x"; isLibrary = true; @@ -201023,7 +202122,6 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "net-mqtt-lens" = callPackage @@ -202675,6 +203773,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-udp" = callPackage + ({ mkDerivation, base, bytestring, containers, iproute, network }: + mkDerivation { + pname = "network-udp"; + version = "0.0.0"; + sha256 = "1fj7pa9ymbbf8kvklxk44ric1kc37lwx4n3x0jcb8mm39ww6x629"; + libraryHaskellDepends = [ + base bytestring containers iproute network + ]; + description = "UDP library"; + license = lib.licenses.bsd3; + }) {}; + "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -203751,6 +204862,8 @@ self: { pname = "nix-diff"; version = "1.0.19"; sha256 = "0iscad4ydgg1365k64bzxn15pl4jnsv17jbzda4s0fs9ff4c5ias"; + revision = "1"; + editedCabalFile = "0yf5x1wx33bgpr1gj24jsgp5gx2741xjchyhvjb3acvw7w5lzr0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204343,8 +205456,8 @@ self: { ({ mkDerivation, array, base, containers, regex-compat }: mkDerivation { pname = "nofib-analyse"; - version = "8.5.0.20180213"; - sha256 = "04jdbbkjh0kmxn25hy7rqli8cmysvx8vbdqfnfxx35w93kpsndxf"; + version = "9.4.4"; + sha256 = "005a66adpsmlaj91qyf9x1f2xpnb311lqcdngnfb3rpryhjwvdzb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; @@ -205791,8 +206904,8 @@ self: { pname = "numbered-semigroups"; version = "0.1.0.0"; sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; - revision = "2"; - editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c"; + revision = "3"; + editedCabalFile = "1qi8cdying5l7anffawxjyjrqpvngg95aj646ahxr6wd9i96pwka"; libraryHaskellDepends = [ base call-stack semigroups ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; license = lib.licenses.lgpl3Only; @@ -206356,36 +207469,28 @@ self: { "nvim-hs" = 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 + , hspec-discover, megaparsec, messagepack, mtl, network + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , QuickCheck, 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 + , typed-process, unliftio, unliftio-core, utf8-string, vector, void }: mkDerivation { pname = "nvim-hs"; - version = "2.3.2.0"; - sha256 = "1szvh65sbxk81321ml0b1iib5ziiks2l8liwkgs4z47pmb14cps9"; + version = "2.3.2.1"; + sha256 = "1rq4n453hc3890n4mmxkiaddfpamj4af66f9wx2hqfi40ammfgna"; 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 + mtl network optparse-applicative prettyprinter + prettyprinter-ansi-terminal streaming-commons template-haskell + template-haskell-compat-v0208 text time time-locale-compat + 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 + base containers data-default deepseq hspec hspec-discover + prettyprinter prettyprinter-ansi-terminal QuickCheck unliftio + unliftio-core vector void ]; testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; @@ -207296,8 +208401,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.0.6"; - sha256 = "1ldjswdyxckxrmypmx027aw90b93r41izqw4qj1szp6p1mjbx3pn"; + version = "1.0.7"; + sha256 = "1xg4xjc7xw22vsra0iqslclhmz37nfvqhi6qj26f3xb30ivw43j3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -207311,19 +208416,19 @@ self: { }) {}; "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, aeson, base, filepath, HUnit, IfElse, mtl + , 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"; + version = "1.0.7"; + sha256 = "04axn5mjpfgiv91c6k3753m3349cgd3s8mknvmn5lh11gpwxhjx3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base filepath IfElse ogma-extra ogma-language-c + aeson base filepath IfElse mtl ogma-extra ogma-language-c ogma-language-cocospec ogma-language-copilot ogma-language-fret-cs ogma-language-fret-reqs ogma-language-smv ]; @@ -207342,8 +208447,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.0.6"; - sha256 = "1wk4374k09wwxhb9ki5pcl6igw6d83bxffrdv7qf8xgm051vna2y"; + version = "1.0.7"; + sha256 = "0870ifglgb2r7c5rm6m5276bh6m5av6jxci89fdj2xba6rm9x9ag"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -207360,8 +208465,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.0.6"; - sha256 = "1c30gcnrhqd4jg1rsv4s8vi0lvpslc3rn8zwkffrwxhll0qv7dma"; + version = "1.0.7"; + sha256 = "1pqmgmhw4d736k8vnk02ggrcqh88k8kn2766pml5m2d4svzjddb6"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -207379,8 +208484,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.0.6"; - sha256 = "0lnqg0mls8j7k1w735ygl1gaqzy9hz0q71sabirdgqf4p446rm21"; + version = "1.0.7"; + sha256 = "1i3w465prdaw734pnbydjs1k8k4lwivhdkvzxassam961n0gdnw6"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -207396,8 +208501,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.0.6"; - sha256 = "0ffbnxbsxl3mcmnys8zhagqwlsxk7da6w2szf9p0sx7032j8j20d"; + version = "1.0.7"; + sha256 = "0fac170jnyv1yz1w4w53y13p79qb69rnvz6qkkxh7603lcajjzn8"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -207410,8 +208515,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-cs"; - version = "1.0.6"; - sha256 = "1jb2xqxnr2wp2fwijlzv3lr8a1vwarbk9sy63881v6ygk7jlyz8f"; + version = "1.0.7"; + sha256 = "1dyqnm3yqih636dzkjh2hdw6ahmrczw8bagcgxch5v4w3pnpbhsc"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv ]; @@ -207431,8 +208536,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-reqs"; - version = "1.0.6"; - sha256 = "0dlscsf9i877qjijb5ygw32igyi42s02wj7ggav4h1dy36dm0bf7"; + version = "1.0.7"; + sha256 = "0q49la3kyh02pk7xccf9msmlw90wjd0chm3pbi5mng2rw865hkq3"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv text ]; @@ -207451,8 +208556,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.0.6"; - sha256 = "1cyjymfil3zyji8lj607r900icj8789nq1zx0civm29mz6ryrj8a"; + version = "1.0.7"; + sha256 = "1wnyjdi7s9l0aym9a06ldjk1zkpmk1yjxikdmgm79ww5zn42rmvq"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -208108,8 +209213,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"; @@ -208124,6 +209229,8 @@ self: { pname = "one-liner"; version = "2.1"; sha256 = "09gdivd38disddxs42179vmgca0yzk5dfm6ygicgl5l25qbizrfh"; + revision = "1"; + editedCabalFile = "1n6d74s0x91qi4fi6wv5yggjb1nvwk0ir580mkf67bca2x6f1cqn"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim linear-base profunctors tagged transformers @@ -208278,19 +209385,21 @@ self: { }) {}; "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, base, base-compat, doctest, doctest-discover + , exceptions, Glob, hedgehog, hedgehog-quickcheck, hspec + , hspec-discover, hw-hspec-hedgehog, lens, mtl, QuickCheck + , template-haskell, transformers }: mkDerivation { pname = "oops"; - version = "0.1.2.0"; - sha256 = "025vgnlnilja8sn66w34iy7vc83cpidg3vcvjl1vf1inmncsydrh"; - libraryHaskellDepends = [ base mtl QuickCheck transformers ]; + version = "0.2.0.0"; + sha256 = "0kqgilshjd0lrabfb4yllgqk93kyyy62h7igpyz48wvz0x9mvy3d"; + libraryHaskellDepends = [ + base exceptions mtl QuickCheck transformers + ]; testHaskellDepends = [ base base-compat doctest doctest-discover Glob hedgehog - hedgehog-quickcheck hspec hw-hspec-hedgehog lens QuickCheck + hedgehog-quickcheck hspec hw-hspec-hedgehog lens mtl QuickCheck template-haskell ]; testToolDepends = [ doctest-discover hspec-discover ]; @@ -210311,14 +211420,15 @@ self: { }: mkDerivation { pname = "optparse-generic"; - version = "1.4.8"; - sha256 = "108sjvjqmq2rps5x7yry0j17qyq4m0gpgxnnzc1i9cjrbhnqcida"; - revision = "1"; - editedCabalFile = "0rgh8sy2w7rh5n1sz0jxcq892myplbli15snggi77dflv00ic7zd"; + 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; maintainers = [ lib.maintainers.Gabriel439 ]; @@ -210997,17 +212107,17 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_5_2_0" = callPackage + "ormolu_0_5_3_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 + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env }: mkDerivation { pname = "ormolu"; - version = "0.5.2.0"; - sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96"; + version = "0.5.3.0"; + sha256 = "13x0iasi2mrwv6mnhg2clkaa0znm6i058vssyxri9mdi147sb3pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211016,12 +212126,12 @@ self: { MemoTrie mtl syb text ]; executableHaskellDepends = [ - base containers filepath ghc-lib-parser gitrev optparse-applicative - text + base containers directory filepath ghc-lib-parser + optparse-applicative text th-env ]; testHaskellDepends = [ - base containers directory filepath ghc-lib-parser hspec - hspec-megaparsec path path-io QuickCheck temporary text + base Cabal-syntax 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"; @@ -212280,6 +213390,62 @@ self: { ]; }) {}; + "pandoc_3_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64, 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, gridtables, haddock-library + , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup + , JuicyPixels, mime-types, mtl, network, network-uri, 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-quickcheck + , temporary, texmath, text, text-conversions, time + , unicode-collation, unicode-transforms, unix, xml, xml-conduit + , xml-types, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "3.1"; + sha256 = "1dwnlvkisqr7lz6rnm89lh5dkg14kzd3bshqyvzg7c31gh45cygr"; + configureFlags = [ "-f-trypandoc" ]; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64 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 gridtables haddock-library + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mime-types mtl network network-uri 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 xml-types yaml zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates filepath + Glob mtl pandoc-types process tasty tasty-golden tasty-hunit + tasty-quickcheck text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq mtl tasty-bench text + ]; + doHaddock = false; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -212336,6 +213502,26 @@ self: { mainProgram = "pandoc-citeproc-preamble"; }) {}; + "pandoc-cli" = callPackage + ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine + , pandoc-server, safe, text, wai-extra, warp + }: + mkDerivation { + pname = "pandoc-cli"; + version = "0.1"; + sha256 = "01fb51nbx6ljv7jkmny3bxlgkg307radr5n6d4m0rg7wxigsrmn5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hslua-cli pandoc pandoc-lua-engine pandoc-server safe text + wai-extra warp + ]; + description = "Conversion between documentation formats"; + license = lib.licenses.gpl2Plus; + mainProgram = "pandoc"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "pandoc-crossref" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl @@ -212369,6 +213555,46 @@ self: { description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "pandoc-crossref_0_3_15_0" = callPackage + ({ mkDerivation, base, containers, criterion, data-default, deepseq + , directory, filepath, gitrev, hspec, microlens, microlens-mtl + , microlens-th, mtl, open-browser, optparse-applicative, pandoc + , pandoc-cli, pandoc-types, syb, template-haskell, temporary, text + , utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.15.0"; + sha256 = "0kzxdpqkhm09vizsyb7ck0mnic32kci8plqlbsawdjkg4knvdn5r"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-default directory filepath microlens + microlens-mtl microlens-th mtl pandoc pandoc-types syb + template-haskell text utility-ht + ]; + executableHaskellDepends = [ + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text + ]; + testHaskellDepends = [ + base containers data-default directory filepath hspec microlens mtl + pandoc pandoc-types text + ]; + testToolDepends = [ pandoc-cli ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "pandoc-csv2table" = callPackage @@ -212592,6 +213818,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-lua-engine" = callPackage + ({ mkDerivation, base, bytestring, citeproc, containers + , data-default, directory, doclayout, doctemplates, exceptions + , filepath, hslua, hslua-aeson, hslua-core, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, lpeg, mtl, pandoc + , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , tasty-golden, tasty-hunit, tasty-lua, text + }: + mkDerivation { + pname = "pandoc-lua-engine"; + version = "0.1.1"; + sha256 = "0gkpa0djv277b61n860dyc040p5sqvc1nmpq76wyvzav994jx6pj"; + libraryHaskellDepends = [ + base bytestring citeproc containers data-default doclayout + doctemplates exceptions hslua hslua-aeson hslua-core + hslua-module-doclayout hslua-module-path hslua-module-system + hslua-module-text hslua-module-version hslua-module-zip lpeg mtl + pandoc pandoc-lua-marshal pandoc-types parsec SHA text + ]; + testHaskellDepends = [ + base bytestring data-default directory exceptions filepath hslua + pandoc pandoc-types tasty tasty-golden tasty-hunit tasty-lua text + ]; + description = "Lua engine to power custom pandoc conversions"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pandoc-lua-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hslua , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty @@ -212614,6 +213870,30 @@ self: { license = lib.licenses.mit; }) {}; + "pandoc-lua-marshal_0_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , hslua, hslua-list, hslua-marshalling, lua, pandoc-types + , QuickCheck, safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck + , text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.2.1"; + sha256 = "0mj5zb2n2wg41cmz3csvjn277hxxn6l1nfays9va2lmkgjmxpp4w"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling lua pandoc-types safe text + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling lua pandoc-types QuickCheck safe tasty + tasty-hunit tasty-lua tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -212727,6 +214007,42 @@ self: { mainProgram = "pandoc-plot"; }) {}; + "pandoc-plot_1_6_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , data-default, directory, filepath, gitrev, hashable + , 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.6.1"; + sha256 = "02ryb5bcdwli8fliwm7kngka4010a21wzz9ak8lgszgqm9d58li3"; + 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-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; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-plot"; + }) {}; + "pandoc-pyplot" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl @@ -212760,6 +214076,26 @@ self: { broken = true; }) {}; + "pandoc-server" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, containers + , data-default, doctemplates, pandoc, pandoc-types, servant-server + , skylighting, text, unicode-collation, wai, wai-cors + }: + mkDerivation { + pname = "pandoc-server"; + version = "0.1"; + sha256 = "1l0nvzq4p06lsn3q5krkddgl9qf5lv7s8siqhpvnz8gjzdnxi12q"; + libraryHaskellDepends = [ + aeson base base64 bytestring containers data-default doctemplates + pandoc pandoc-types servant-server skylighting text + unicode-collation wai wai-cors + ]; + description = "Pandoc document conversion as an HTTP servant-server"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pandoc-sidenote" = callPackage ({ mkDerivation, base, mtl, pandoc-types, text }: mkDerivation { @@ -212781,8 +214117,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.4.0"; - sha256 = "0j25frcafcr0jvk3dfrmxan2q95920wy6jm0fahwf20f4jbanzfc"; + version = "0.3.0.0"; + sha256 = "1r7i22d4jkhd11srzxbchl9bx337800pliyvwa59i9n6hhqkycvg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -212793,6 +214129,33 @@ self: { mainProgram = "styleFromMeta"; }) {}; + "pandoc-symreg" = callPackage + ({ mkDerivation, attoparsec, attoparsec-expr, base, bytestring, mtl + , optparse-applicative, srtree + }: + mkDerivation { + pname = "pandoc-symreg"; + version = "0.1.0.1"; + sha256 = "0lw82q4mygcnwfasiz3gps1y1i5cn80q7ch2g6xshjyxrbqq3qnf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + executableHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + testHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + description = "A tool to convert symbolic regression expressions into different formats"; + license = lib.licenses.gpl3Only; + mainProgram = "pandoc-symreg"; + }) {}; + "pandoc-throw" = callPackage ({ mkDerivation, base, exceptions, pandoc }: mkDerivation { @@ -212827,6 +214190,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-types_1_23" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.23"; + sha256 = "0b8na6516rkwx3b7la58zwpmjia7hvljswzw0nds7h0r090j2rsy"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -213866,6 +215253,8 @@ self: { pname = "parameterized-utils"; version = "2.1.6.0"; sha256 = "118inzvvr72bfr1pzgxglrpd2fsz0kn9hk791imygl0fv1258rb6"; + revision = "1"; + editedCabalFile = "126p5f4craqwlzqpj0rbrnrl83ykvkb8w6lz3sg4m9d91sqixfrh"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -214219,12 +215608,12 @@ self: { mainProgram = "parseargs-example"; }) {}; - "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"; @@ -214874,10 +216263,8 @@ self: { ({ mkDerivation, base, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.6.0.0"; - sha256 = "1fn8b8q99m6xdgiqi2smffk4s1h3sil2v5c1na8fl3gv04kc0v13"; - revision = "1"; - editedCabalFile = "0glacw02msrhc6yjbn6aaa06ixkby0fdcb1gk8lr47pdnhb4g8w0"; + version = "0.6.0.1"; + sha256 = "1zzpv5b860k22wng7qa0pcj129vgzm2vxda5x1f26f9vc0bm8q18"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; description = "A partial binary associative operator"; @@ -214888,8 +216275,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.13"; - sha256 = "117k12wgaypj7lkj9lqi7xhli9f33hsd455p87g9xxcwx32m0r53"; + version = "0.6.0.14"; + sha256 = "1f5c2z8ivmdbdy5s2f4q3pbrb4k53503zwsdc8c5drm34wrvim3b"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; @@ -215170,7 +216557,9 @@ self: { ]; description = "Provides the Pasta curves: Pallas, Vesta and their field elements Fp and Fq"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pasta-curves"; + broken = true; }) {}; "pastis" = callPackage @@ -215229,9 +216618,7 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "patat"; - broken = true; }) {}; "patch" = callPackage @@ -215496,10 +216883,8 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.1.10"; - sha256 = "1nbmsydpg8m09q5i907bnh57x5lcd3rw3rnxa31b93xzaynxwhsn"; - revision = "1"; - editedCabalFile = "1f1y2m1qqdxnqi1n4bvgbqilsjk3sqkvi4nk2pz5l9bl97k0l42z"; + version = "0.0.1.11"; + sha256 = "1dxqbcwsr3ayijssm7wr6z96p3vrwrfqhr15zhg7m3i2ad44wz8c"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; @@ -215591,20 +216976,21 @@ self: { }) {}; "pathtype" = callPackage - ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck - , random, semigroups, tagged, time, transformers, utility-ht + ({ mkDerivation, base, deepseq, directory, doctest-exitcode-stdio + , doctest-lib, QuickCheck, semigroups, tagged, time, transformers + , utility-ht }: mkDerivation { pname = "pathtype"; - version = "0.8.1.1"; - sha256 = "0322q8wd4mbp7q0cgym6mf2dxg2srp76r38kprxl9ik53s3y3p67"; - isLibrary = true; - isExecutable = true; + version = "0.8.1.2"; + sha256 = "1ikbl1yzlimf5yjvi6agliraqdi6mf6m7ig5rx97wh03vrx58hfk"; libraryHaskellDepends = [ - base deepseq directory old-time QuickCheck semigroups tagged time - transformers utility-ht + base deepseq directory doctest-exitcode-stdio QuickCheck semigroups + tagged time transformers utility-ht + ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib QuickCheck ]; - testHaskellDepends = [ base random ]; description = "Type-safe replacement for System.FilePath etc"; license = lib.licenses.bsd3; }) {}; @@ -215639,8 +217025,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "0.1.0.1"; - sha256 = "1mdl9r8kga6n7v7yvds46j0y8mg59h1irw8fbwqzzj142va9q8xc"; + version = "1.0.0.1"; + sha256 = "0rzb7lsidhfbyw8z1l5958a6y766l0b0kzlmgxvci9qg5d6qzp8h"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers exceptions http-client http-types network-uri text time uuid @@ -216163,8 +217549,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.8.2"; - sha256 = "1plawzvgxww9m0vjawmkf59bfxzxf0l93g7hfwyqjq4hcc8pwq2l"; + version = "0.1.9"; + sha256 = "03z0hri4pwwxajn9xgnprjmaqkiqw42bypm6m8791l3hn2fabw24"; libraryHaskellDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -217677,6 +219063,50 @@ self: { broken = true; }) {}; + "persistent-event-source" = callPackage + ({ mkDerivation, base, esqueleto, monad-logger, persistent + , persistent-mtl, tasty, tasty-hunit, tasty-quickcheck, text, time + , unliftio-core + }: + mkDerivation { + pname = "persistent-event-source"; + version = "0.1.0"; + sha256 = "1pk0655hv6rvkk9rfdnc03fy90q16yn53yfv83rc1vrxghs17mnr"; + libraryHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl text time + unliftio-core + ]; + testHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl tasty + tasty-hunit tasty-quickcheck text time unliftio-core + ]; + description = "Persistent based event sourcing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "persistent-eventsource" = callPackage + ({ mkDerivation, base, esqueleto, monad-logger, persistent + , persistent-mtl, tasty, tasty-hunit, tasty-quickcheck, text, time + , unliftio-core + }: + mkDerivation { + pname = "persistent-eventsource"; + version = "0.2.0"; + sha256 = "0fp23hxg217zbm3ak85rixd06dipscgsl2ldiyhp09f2jxkskslv"; + libraryHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl text time + unliftio-core + ]; + testHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl tasty + tasty-hunit tasty-quickcheck text time unliftio-core + ]; + description = "Persistent based event sourcing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-generic" = callPackage ({ mkDerivation, base, persistent, text }: mkDerivation { @@ -217826,6 +219256,8 @@ self: { pname = "persistent-mtl"; version = "0.5.0.1"; sha256 = "17sxwa8p95nrkacjr1wnpihwfq121z1pkyh1nvlfjy76b4aalqhi"; + revision = "1"; + editedCabalFile = "1qhazc2jqrhz6bkhn55nsikgf8kdvajb2ai6826nwrq657glzqa4"; testHaskellDepends = [ base bytestring conduit containers esqueleto explainable-predicates monad-logger persistent persistent-postgresql persistent-sqlite @@ -217847,8 +219279,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.13.1.3"; - sha256 = "0fm6agqwawwraw6l6kxm8lq40pm5pnjg093f574a7sdf648q21yc"; + version = "2.13.1.4"; + sha256 = "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -217965,8 +219397,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.5.0"; - sha256 = "1q9hy49nfrb3azgz5rjz235d7scy27l5axkih7crskaa04hf4k8d"; + version = "2.13.5.1"; + sha256 = "1snvzm01qgyiz3y12pzyy4phxwqpr7c47fi395w3cnl915y9i8rp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218167,8 +219599,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.1.0"; - sha256 = "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b"; + version = "2.13.1.1"; + sha256 = "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -218495,8 +219927,8 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.4.1"; - sha256 = "0fr0lzr7l31ai134c87jgqabw619ggj478ynq9mp1fq37hd11rbp"; + version = "0.0.4.2"; + sha256 = "0rdmdrch9q4sz23svsr52ymkllvfxi6kgc7mrfr0zdarah2sc8ip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219003,10 +220435,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-basis"; - version = "0.2.0.0"; - sha256 = "0hpdf2m0wpzd680hhlsiymygmdr2sw62d2s2qj1pb5757n2kans1"; + version = "0.3.0.0"; + sha256 = "0qabibf3xk534pk2fsz5x3mv91zca1wczzgla9pldw4x0ginwibi"; libraryHaskellDepends = [ base ]; - description = "A basics of the phonetic-languages functionality"; + description = "A basics of the phonetic-languages (PhLADiPreLiO-related) functionality"; license = lib.licenses.mit; }) {}; @@ -219051,11 +220483,13 @@ self: { ({ mkDerivation, base, subG }: mkDerivation { pname = "phonetic-languages-constraints-array"; - version = "0.1.2.0"; - sha256 = "1s28pipyijz13sn6wni9v850w8c6n6rkiqmavhddfnichwp3gq55"; + version = "0.2.0.0"; + sha256 = "1pqdraxiw35kvpiivbi26pj81wakib8bzi62n2547rvj55dh5j3z"; libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-examples" = callPackage @@ -219096,11 +220530,13 @@ self: { ({ mkDerivation, base, filters-basic, mmsyn2-array }: mkDerivation { pname = "phonetic-languages-filters-array"; - version = "0.5.0.0"; - sha256 = "087ngarvpihrjvfnm6kbm7qfiy947r35rig44hyn5dxzq7pxqzp6"; + version = "0.6.0.0"; + sha256 = "1k320n79gl2n2cr0hgza4c1k4rvbw5y0vav48hvin7lrqffqmiw5"; libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-general" = callPackage @@ -219136,11 +220572,13 @@ self: { ({ mkDerivation, base, subG }: mkDerivation { pname = "phonetic-languages-permutations-array"; - version = "0.3.4.0"; - sha256 = "06xlxh82m681ss0ycb9r6xmfcxgfq0pjsvd2s1nm43jk5a2yfxfn"; + version = "0.4.0.0"; + sha256 = "0z6zwzfngfhwy8lqylv06xd6lqdxrsrflhjpvqqv3hj68am5p17j"; libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-phonetics-basics" = callPackage @@ -219149,8 +220587,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.9.1.0"; - sha256 = "1ahmgk42n08644h6gmrnz5p13pip18sbyaim5za0z7aaxm9qr70v"; + version = "0.10.0.0"; + sha256 = "0mcsmdb5mmykccmg8maw78m383549blfdbd691drhv7xk833n6sy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219161,30 +220599,32 @@ self: { ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pldPL"; + broken = true; }) {}; "phonetic-languages-plus" = callPackage - ({ mkDerivation, base, bytestring, lists-flines, parallel + ({ mkDerivation, base, lists-flines, parallel , uniqueness-periods-vector-stats }: mkDerivation { pname = "phonetic-languages-plus"; - version = "0.6.0.0"; - sha256 = "03zfn9ql0gfgk2j0rgzkvbp8pd16khbc99hxzbv00ih5rjwyhzn5"; + version = "0.7.1.0"; + sha256 = "0bwj4zwgwy37fi6iybyl61fmlz07r87cbf46y93b21f0ffrw8084"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring lists-flines parallel - uniqueness-periods-vector-stats + base lists-flines parallel uniqueness-periods-vector-stats ]; executableHaskellDepends = [ - base bytestring lists-flines parallel - uniqueness-periods-vector-stats + base lists-flines parallel uniqueness-periods-vector-stats ]; description = "Some common shared between different packages functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "distributionTextG"; + broken = true; }) {}; "phonetic-languages-properties" = callPackage @@ -219209,8 +220649,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.9.2.0"; - sha256 = "0qnid53az0w4p4rb0pkxbn5z1s7r5h7cvyh4lh81c3q9bprc6cr0"; + version = "0.10.2.0"; + sha256 = "1ch9bd0ccmckrkfkgfy5mpm05jr0hkjbxxzwipcz1y3xf06yw5nw"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -219222,14 +220662,15 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.6.1.0"; - sha256 = "1217hpd1x65nl1yf50bghj8gmnv1wdwd5wbrhx454726p0fbjd7s"; + version = "0.7.0.0"; + sha256 = "0866pf3hyzhf2zygkk47n9yzm2z3mdm2asyq6fr8a34qrc9yyc4p"; libraryHaskellDepends = [ base phonetic-languages-basis phonetic-languages-permutations-array subG ]; description = "A basics of the phonetic-languages functionality that can be groupped"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-common" = callPackage @@ -219296,6 +220737,7 @@ self: { ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-examples-common" = callPackage @@ -219314,6 +220756,7 @@ self: { ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage @@ -219345,6 +220788,7 @@ 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 @@ -219361,6 +220805,7 @@ self: { ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage @@ -219378,6 +220823,7 @@ self: { ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -219434,6 +220880,7 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-array-common" = callPackage @@ -219442,8 +220889,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array-common"; - version = "0.3.0.0"; - sha256 = "1yf0z02zyqp9s441c2rg7rnfhvhiiqz0qm3i9r4jxwjr20hak333"; + version = "0.4.0.0"; + sha256 = "0fsjfgbqnn1bnvjiqaagh2mlzyyp5dgnvc508ps9h1iy505pm945"; libraryHaskellDepends = [ base phonetic-languages-basis phonetic-languages-rhythmicity ]; @@ -219528,15 +220975,17 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.9.3.0"; - sha256 = "0pi3dm72zw26lyp876r28ql4gxfp8h1sbr201a62g5p6jlvaixi4"; + version = "0.10.0.0"; + sha256 = "0ska3m86vs4xab1skzgaqdihqsnz9ag471fns880hj2lgjxn7jzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; executableHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "unconcatUkr"; + broken = true; }) {}; "phonetic-languages-vector" = callPackage @@ -223255,30 +224704,6 @@ 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 { - pname = "poly"; - version = "0.5.0.0"; - sha256 = "1h7nbyiwnbxyj2jss04raws7zapfq7mvzj7fmi8rqyr0aw91k4zl"; - 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 - ]; - benchmarkHaskellDepends = [ - base deepseq gauge mod semirings vector - ]; - description = "Polynomials"; - license = lib.licenses.bsd3; - }) {}; - - "poly_0_5_1_0" = callPackage ({ mkDerivation, base, deepseq, finite-typelits, mod, primitive , QuickCheck, quickcheck-classes, quickcheck-classes-base , semirings, tasty, tasty-bench, tasty-quickcheck, vector @@ -223302,7 +224727,6 @@ self: { ]; description = "Polynomials"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "poly-arity" = callPackage @@ -223486,8 +224910,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "5"; - editedCabalFile = "05qrn5pfdy45x1nkx7dvhnxs9j6d6cssws4kwn2sl3n9qmagr8mc"; + revision = "6"; + editedCabalFile = "0xrmzz7p2akgdyr7gm54yvq83lm9qixcrk72ia2w9xcs2r4b76vz"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -225580,22 +227004,6 @@ self: { ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; - version = "0.9.4.3"; - sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"; - revision = "3"; - editedCabalFile = "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring unix ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ base bytestring ]; - description = "low-level binding to libpq"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) postgresql;}; - - "postgresql-libpq_0_9_5_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: - mkDerivation { - pname = "postgresql-libpq"; version = "0.9.5.0"; sha256 = "0w2l687r9z92snvd0cjyv3dxghgr5alyw0vc2c6bp2600pc2nnfi"; setupHaskellDepends = [ base Cabal ]; @@ -225604,7 +227012,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "low-level binding to libpq"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) postgresql;}; "postgresql-libpq-notify" = callPackage @@ -226663,10 +228070,8 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.4.1"; - sha256 = "1ss88q1lndjvmy7bp2jxh7qbh6z57kl1q5zcv4kzjampajf1fjbi"; - revision = "2"; - editedCabalFile = "1gjpgq0pmhd4kv81fw399j2dqg8v9sjrfvk7m8dks0526vzr3nq3"; + version = "0.4.2"; + sha256 = "1pf57anqc7f90p6rhnlz78asm0xpj1wgh0642zb7g98pyxr1qx7g"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq hashable servant servant-client servant-client-core text @@ -226939,14 +228344,12 @@ self: { }: mkDerivation { pname = "prairie"; - version = "0.0.1.0"; - sha256 = "1n27ylk5yzvvl6isykw0hjarnzwx652fc0xy6qzfdj0swy0bgiw7"; - revision = "2"; - editedCabalFile = "1yp173nnsk875wvqqnr9ifkvj8k7zcjbgvzpkyc0sxkq3nlrjs9q"; + version = "0.0.2.0"; + sha256 = "1z9l8a45shvv1z8zsp4d1c0nrp7zblma8g0alhp2flp7wxfv7qf3"; libraryHaskellDepends = [ aeson base constraints containers lens template-haskell text ]; - testHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base lens ]; description = "A first class record field library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -227712,8 +229115,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 ]; @@ -227958,8 +229361,8 @@ self: { }: mkDerivation { pname = "prettyprinter-combinators"; - version = "0.1.1"; - sha256 = "1m6338w6cd7fsib00zs8dk16b4mxfa1vswg5bmkzafas1db6qbcg"; + version = "0.1.1.1"; + sha256 = "1553qii74af7a5xxj3n6ch9vv84kr5ayd1z69x0d78lqqraibx4y"; libraryHaskellDepends = [ base bimap bytestring containers dlist pretty-show prettyprinter syb template-haskell text unordered-containers vector @@ -228041,8 +229444,8 @@ self: { }: mkDerivation { pname = "prettyprinter-interp"; - version = "0.1.0.0"; - sha256 = "0p5mqvgdmh76yndf2agrmbs3qzb9wx9rimw1jcb2xdaixjrc7gzm"; + version = "0.2.0.0"; + sha256 = "0ml068y49n0s6p0nq0qfv5dmpkpkbd9p06hkj582yn2a1h32x0ff"; libraryHaskellDepends = [ base prettyprinter string-interpolate template-haskell text ]; @@ -228325,6 +229728,8 @@ self: { pname = "primitive"; version = "0.7.4.0"; sha256 = "1mddh42i6xg02z315c4lg3zsxlr3wziwnpzh2nhzdcifh716sbav"; + revision = "1"; + editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -228521,6 +229926,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 @@ -228581,26 +229997,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 @@ -229180,6 +230576,8 @@ 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; + broken = true; }) {}; "process-streaming" = callPackage @@ -229987,8 +231385,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.29"; - sha256 = "16nj96rhkfl5h9prqsfr8n1i20vcqlpfz8plbp2vsfha8kzsi2wl"; + version = "0.0.0.30"; + sha256 = "1jcfr6mw5rkcr0vfs53szymwkkdr5jxy8ph9n8cfrn56yqhcdvqj"; libraryHaskellDepends = [ aeson base bytestring cassava containers esqueleto generic-random lens mongoDB network-uri persistent persistent-mongoDB QuickCheck @@ -230195,8 +231593,8 @@ self: { }: mkDerivation { pname = "proof-assistant-bot"; - version = "0.2.0"; - sha256 = "1sks81xaxzz76ajcki43jy7a95d6lc5ijj3xgl5slmjd5m4fmwyc"; + version = "0.2.1"; + sha256 = "04vkg3yx0lviv2r8d46zh58af63pk4baaywzqf0jrqsppmqgzbg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230446,8 +231844,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.2"; - sha256 = "0wrahbiq7pa7bg0x7z9ynmy9ap30rj0lldgc2m7b49zhj43kax83"; + version = "0.9.4"; + sha256 = "1vgrwx36liqkshrfqkrb38nsbq84a6fbnmn0p2v0y76iccd2shid"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -230465,8 +231863,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 ]; @@ -231585,25 +232983,28 @@ self: { "publish" = callPackage ({ mkDerivation, base, bytestring, chronologique, core-data - , core-program, core-text, deepseq, directory, filepath, hspec - , megaparsec, pandoc, pandoc-types, template-haskell, text - , typed-process, unix, unordered-containers + , core-program, core-telemetry, core-text, deepseq, directory + , filepath, hspec, megaparsec, pandoc, pandoc-types + , safe-exceptions, template-haskell, text, typed-process, unix + , unordered-containers }: mkDerivation { pname = "publish"; - version = "2.2.3"; - sha256 = "150zvz40r7lwmrqv7hvn07wb0gs9rcyn37ivcdv0m0h96bzy84w3"; + version = "2.5.3"; + sha256 = "0sqy6q4vpjv0cmqq8iimfirhg9kmc9mjdw6a0rky9g7pybsqlrmf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring chronologique core-data core-program core-text - deepseq directory filepath megaparsec pandoc pandoc-types - template-haskell text typed-process unix unordered-containers + base bytestring chronologique core-data core-program core-telemetry + core-text deepseq directory filepath megaparsec pandoc pandoc-types + safe-exceptions template-haskell text typed-process unix + unordered-containers ]; testHaskellDepends = [ - base bytestring chronologique core-data core-program core-text - deepseq directory filepath hspec megaparsec pandoc pandoc-types - template-haskell text typed-process unix unordered-containers + base bytestring chronologique core-data core-program core-telemetry + core-text deepseq directory filepath hspec megaparsec pandoc + pandoc-types safe-exceptions template-haskell text typed-process + unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = lib.licenses.mit; @@ -232048,6 +233449,7 @@ self: { ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "purenix" = callPackage @@ -232201,6 +233603,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "purescript-bridge_0_15_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.15.0.0"; + sha256 = "09bjlmwq3vsprngsrvx3g1ah9n60bng91kfswv61lh1bhca0q9z0"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -233385,6 +234808,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.qt5) qtbase;}; + "quaalude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "quaalude"; + version = "0.0.0.1"; + sha256 = "0wwsrpm2s7gs2c4fwh4qvhnjywxfyf94dw715bz34q7bzyyk3lc6"; + libraryHaskellDepends = [ base ]; + description = "Extremely minimal prelude"; + license = lib.licenses.asl20; + }) {}; + "quack" = callPackage ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }: mkDerivation { @@ -233515,8 +234949,8 @@ self: { ({ mkDerivation, base, subG, uniqueness-periods-vector-stats }: mkDerivation { pname = "quantizer"; - version = "0.1.0.0"; - sha256 = "0pall4g5fd8flv7b380y7qqnh630jbnf5kbzxhpx13qr287casrh"; + version = "0.2.1.1"; + sha256 = "073sz728am6sj9zj2n2pnzvn5asvnj8lqcb8hbi09qp36w4mgvy4"; libraryHaskellDepends = [ base subG uniqueness-periods-vector-stats ]; @@ -233838,24 +235272,25 @@ self: { ({ mkDerivation, array, async, base, base16-bytestring, bytestring , containers, crypto-token, cryptonite, data-default-class, doctest , fast-logger, filepath, hspec, hspec-discover, iproute, memory - , network, network-byte-order, psqueues, QuickCheck, random, stm - , tls, unix-time, unliftio, unliftio-core, x509 + , network, network-byte-order, network-udp, psqueues, QuickCheck + , random, stm, tls, unix-time, unliftio, unliftio-core, x509 + , x509-system }: mkDerivation { pname = "quic"; - version = "0.0.1"; - sha256 = "0vwcfzkz56ldp8fx322vgxrh8g4f236zrv05rg9839x95l6jscsv"; + version = "0.1.0"; + sha256 = "0yv12241waj9ab4q7n1blnsv8h8rrbs7wk5xirz0p58zf6kkkbk5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base base16-bytestring bytestring containers crypto-token cryptonite data-default-class fast-logger filepath iproute memory - network network-byte-order psqueues random stm tls unix-time - unliftio unliftio-core x509 + network network-byte-order network-udp psqueues random stm tls + unix-time unliftio unliftio-core x509 x509-system ]; testHaskellDepends = [ async base base16-bytestring bytestring containers cryptonite - doctest hspec network QuickCheck tls unix-time unliftio + doctest hspec network network-udp QuickCheck tls unix-time unliftio ]; testToolDepends = [ hspec-discover ]; description = "QUIC"; @@ -234050,6 +235485,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-groups" = callPackage + ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show + , QuickCheck, quickcheck-classes, quickcheck-instances + , semigroupoids + }: + mkDerivation { + pname = "quickcheck-groups"; + version = "0.0.0.0"; + sha256 = "0ranwc1p7ps4f1ivbaxz18h98f3jh29hfw94zi11a27zqdyfscbg"; + libraryHaskellDepends = [ + base groups pretty-show QuickCheck quickcheck-classes + quickcheck-instances semigroupoids + ]; + testHaskellDepends = [ + base groups hspec QuickCheck quickcheck-classes + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Testing group class instances with QuickCheck"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "quickcheck-higherorder" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, test-fun @@ -235125,8 +236584,8 @@ self: { }: mkDerivation { pname = "r-glpk-phonetic-languages-ukrainian-durations"; - version = "0.4.2.0"; - sha256 = "04m9493db98x5i2n1zpgdl6kc2lvx0fmr8w17hs89jwfr8h6k4ni"; + version = "0.5.0.0"; + sha256 = "1r90d6krir42qb7jw0ayfrgx0iliz6gnm96lj9sl25qhjwps39v1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235700,6 +237159,19 @@ self: { license = lib.licenses.mit; }) {}; + "rampart_2_0_0_4" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "rampart"; + version = "2.0.0.4"; + sha256 = "15wm7m2rj91d28bdpkmljhcfqcwp7024sqn9p0ciljf92y1h8k63"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Determine how intervals relate to each other"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ramus" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io }: @@ -236631,6 +238103,28 @@ self: { license = lib.licenses.mit; }) {}; + "ratel_2_0_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, uuid + }: + mkDerivation { + pname = "ratel"; + version = "2.0.0.5"; + sha256 = "13cd8y318fyv0vrh9fcf8jp0iapfqkm3rb4yyjr5r04wbalnnnzw"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -236646,6 +238140,22 @@ self: { license = lib.licenses.mit; }) {}; + "ratel-wai_2_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "2.0.0.2"; + sha256 = "14w6f9n0yr1mi9g2fq4r7fmm7zkk0lqw1fgfhpz6qdcpsx25w5fy"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratelimiter" = callPackage ({ mkDerivation, base, containers, extra, mtl, time, timespan , vector @@ -236792,14 +238302,14 @@ self: { broken = true; }) {}; - "rattletrap_12_0_0" = callPackage + "rattletrap_12_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "12.0.0"; - sha256 = "0l20d9m84mn6gkmi7hii0q80rs7nzhbmwp1dx3i5jkww42ixbyfi"; + version = "12.0.1"; + sha256 = "1m71a0qccqlf6l1iq4f5nf1gl26nq5rb726bm4rqsr6kp7md10g7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237354,24 +238864,27 @@ self: { }) {}; "reactive-banana" = callPackage - ({ mkDerivation, base, containers, hashable, pqueue, psqueues - , random, semigroups, tasty, tasty-bench, tasty-hunit, these - , transformers, unordered-containers, vault + ({ mkDerivation, base, containers, deepseq, hashable, pqueue + , QuickCheck, random, semigroups, stm, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, these, transformers + , unordered-containers, vault }: mkDerivation { pname = "reactive-banana"; - version = "1.3.1.0"; - sha256 = "06cmr70cbvnvm69lnj2hkxfmznqj97rxs7y6baxpjkyhm0lsv1dl"; + version = "1.3.2.0"; + sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; libraryHaskellDepends = [ - base containers hashable pqueue semigroups these transformers - unordered-containers vault + base containers deepseq hashable pqueue semigroups stm these + transformers unordered-containers vault ]; testHaskellDepends = [ - base containers hashable pqueue psqueues semigroups tasty - tasty-hunit these transformers unordered-containers vault + base containers deepseq hashable pqueue QuickCheck semigroups tasty + tasty-hunit tasty-quickcheck these transformers + unordered-containers vault ]; benchmarkHaskellDepends = [ - base containers random tasty tasty-bench + base containers QuickCheck random tasty tasty-bench + tasty-quickcheck ]; description = "Library for functional reactive programming (FRP)"; license = lib.licenses.bsd3; @@ -237558,8 +239071,8 @@ self: { }: mkDerivation { pname = "reactive-jack"; - version = "0.4.1.1"; - sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr"; + version = "0.4.1.2"; + sha256 = "1ckm95dr3y14bh73nxapm9rl39bz1lpxmclgcnd9n2mkn0b1q54w"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random @@ -238405,6 +239918,8 @@ self: { ]; description = "Recover run-time type information from the GHC heap"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "recursion" = callPackage @@ -238533,6 +240048,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "recv_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover, network + }: + mkDerivation { + pname = "recv"; + version = "0.1.0"; + sha256 = "0nsdy7a0rbizgz5wpg06p9kac4chsrdxfk30paf7yjxlzxf90r7n"; + libraryHaskellDepends = [ base bytestring network ]; + testHaskellDepends = [ base bytestring hspec network ]; + testToolDepends = [ hspec-discover ]; + description = "Efficient network recv"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "red-black-record" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, profunctors , sop-core, tasty, tasty-hunit, text @@ -239410,6 +240940,8 @@ self: { pname = "reflex-dom-colonnade"; version = "0.4.6"; sha256 = "05vw4v3mrvqrc4z349xb3nz9qhy7iisw5ylwaqq2qg4xy0mf0z5n"; + revision = "1"; + editedCabalFile = "1gbb1sqf45rsj0235krmhj9ifhs2p4dzbb2nz9fxilq6bi8dqivp"; libraryHaskellDepends = [ base colonnade containers contravariant reflex reflex-dom semigroups text vector @@ -239955,8 +241487,8 @@ self: { }: mkDerivation { pname = "reflex-test-host"; - version = "0.1.2.1"; - sha256 = "0hpvpf0628rc43cnh7k0b0adjb13cw9d8ykhhk0x4n2p7i9cp2zi"; + version = "0.1.2.2"; + sha256 = "1km340p317yscwjmx20pazraczsilb6mna5ka9mx7al7864jcyk1"; libraryHaskellDepends = [ base dependent-sum lens mtl primitive ref-tf reflex these transformers @@ -240059,8 +241591,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.5"; - sha256 = "0knsx790vf5xvnxhfdz48gz3352z98ghy1ld7yh3rmp1apciqd35"; + version = "0.2.5.6"; + sha256 = "1v76z620b0iw3j2cr7mjs13jcf2lk800ilnl2k46jixc4zk75biy"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -240518,8 +242050,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "2"; - editedCabalFile = "19ryjv8va9bjwhfk4v81lsvi91aj7aw1cflggywjpmw001qr419d"; + revision = "3"; + editedCabalFile = "071s6k97z0wiqx5rga360awgj0a031gqm725835xxszdz36w0mbv"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -241319,12 +242851,17 @@ self: { }) {}; "regression-simple" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, ad, base, deepseq, math-functions, splitmix + , statistics, tasty, tasty-hunit + }: mkDerivation { pname = "regression-simple"; - version = "0.1.1"; - sha256 = "18gq05xrkkxg2zrnkx9z7n91g8lagz6j3cfw7mqik7dyc2m1w675"; - libraryHaskellDepends = [ base vector ]; + version = "0.2"; + sha256 = "15axsj9zfllyc98dpvxm7mr1vq2jxj5g7a8lkpbr24fxn3avd708"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + ad base math-functions splitmix statistics tasty tasty-hunit + ]; description = "Simple linear and quadratic regression"; license = lib.licenses.bsd3; }) {}; @@ -241496,8 +243033,8 @@ self: { }: mkDerivation { pname = "rel8"; - version = "1.4.0.0"; - sha256 = "1i0ah0wqx0z7grm9zbvf6mx6gk7lx1xfa7svbp4dnb4k8p52b63k"; + version = "1.4.1.0"; + sha256 = "0590pjiphpknxnc3g4y3f3rf134q9z5nbwrrbq81r1gx4nxb8d6n"; libraryHaskellDepends = [ aeson base bifunctors bytestring case-insensitive comonad contravariant hasql opaleye pretty product-profunctors profunctors @@ -242857,8 +244394,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.2.2"; - sha256 = "12p2mb215n7f0smczr5cfxkd89blchyyp5dsl6yzfij1ykf0yr9x"; + version = "0.2.2.3"; + sha256 = "1nwdvjvhd2msv6lzapdg1nkasp7wvc75mdg82ixqhwh8h7sgqs5p"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -243232,13 +244769,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "resource-pool_0_3_1_0" = callPackage - ({ mkDerivation, base, primitive, time }: + "resource-pool_0_4_0_0" = callPackage + ({ mkDerivation, base, hashable, primitive, time }: mkDerivation { pname = "resource-pool"; - version = "0.3.1.0"; - sha256 = "0klcyl0x15a0h73sn6176ma87cgb4n8g2szz54b5xzr60pws057y"; - libraryHaskellDepends = [ base primitive time ]; + version = "0.4.0.0"; + sha256 = "1cg99a88zlaxxb1aqjv8f2xip7wr6a8k0mwiyxjqsy3m7qz7h3cc"; + libraryHaskellDepends = [ base hashable primitive time ]; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -243522,8 +245059,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 @@ -243732,8 +245269,8 @@ self: { }: mkDerivation { pname = "ret"; - version = "0.1.5.2"; - sha256 = "1lsqjqib4nvxacsjlr4207vwwxdd86wxxjvxw4vqra6a5clj6g08"; + version = "0.2.0.0"; + sha256 = "16cymbh678qh0r237kffqmxjwgja8aryf4j8xj9z2nz40flklbca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246889,6 +248426,24 @@ self: { broken = true; }) {}; + "rpmostree-update" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , xdg-basedir + }: + mkDerivation { + pname = "rpmostree-update"; + version = "0.1.0"; + sha256 = "073mn1yzczz73vyivwsvbdbxb2q15i2li5v22d5y8jimsc59b232"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd xdg-basedir + ]; + description = "rpm-ostree update wrapper that caches change info"; + license = lib.licenses.bsd3; + mainProgram = "rpmostree-update"; + }) {}; + "rrb-vector" = callPackage ({ mkDerivation, base, deepseq, indexed-traversable, primitive , tasty, tasty-bench, tasty-quickcheck @@ -248220,8 +249775,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "5"; - editedCabalFile = "1qwzj9nija3kw6ijxl5nhny7vclp7x31cml3hl9fpajj5v0lhh4j"; + revision = "6"; + editedCabalFile = "0ii5cdg4l4ww81p7gd5m3z2jdqrs2hvqhwzrlz267nzxbws00x0b"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -248618,6 +250173,19 @@ self: { license = lib.licenses.mit; }) {}; + "salve_2_0_0_2" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "salve"; + version = "2.0.0.2"; + sha256 = "04281bi8vm78r5gsbfc1whkkrrivw3pa3s3wx33q1nh9ip0q7b6a"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Semantic version numbers and constraints"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels , MaybeT-transformers, monads-fd, network, old-locale, process @@ -248740,19 +250308,6 @@ self: { ({ mkDerivation, base, QuickCheck, storable-record }: mkDerivation { pname = "sample-frame"; - version = "0.0.3"; - sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base QuickCheck storable-record ]; - description = "Handling of samples in an (audio) signal"; - license = lib.licenses.bsd3; - }) {}; - - "sample-frame_0_0_4" = callPackage - ({ mkDerivation, base, QuickCheck, storable-record }: - mkDerivation { - pname = "sample-frame"; version = "0.0.4"; sha256 = "105hbd7s870vcjx49gk395craa4slcrngara8q3zfwn1cdpig49c"; isLibrary = true; @@ -248760,30 +250315,17 @@ self: { libraryHaskellDepends = [ base QuickCheck storable-record ]; description = "Handling of samples in an (audio) signal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sample-frame-np" = callPackage ({ mkDerivation, base, numeric-prelude, sample-frame }: mkDerivation { pname = "sample-frame-np"; - version = "0.0.4.1"; - sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi"; - libraryHaskellDepends = [ base numeric-prelude sample-frame ]; - description = "Orphan instances for types from sample-frame and numericprelude"; - license = lib.licenses.bsd3; - }) {}; - - "sample-frame-np_0_0_5" = callPackage - ({ mkDerivation, base, numeric-prelude, sample-frame }: - mkDerivation { - pname = "sample-frame-np"; 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; - hydraPlatforms = lib.platforms.none; }) {}; "sampling" = callPackage @@ -249415,8 +250957,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.0.2.0"; - sha256 = "041qjk1giqrsfis410r491c3b2s36ngsk64ihzpjb788xbr86adx"; + version = "1.1.0.0"; + sha256 = "0xaw4x4v1ir88by5dsffdxb8rdy06czq6amlxkj2wix871hyvm5j"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; @@ -249451,7 +250993,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_10_0" = callPackage + "sbp_4_11_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -249460,8 +251002,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.10.0"; - sha256 = "1mhnqiqi6yv3mn0rcwiq5k79a2zxcpqp4284ziqrcjwnhjxd2cnf"; + version = "4.11.0"; + sha256 = "0flwy85dvdmaqpl8b652as8zhdypq0a513v1pvp0hrnp1z0ylg1p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249560,6 +251102,53 @@ self: { broken = true; }) {inherit (pkgs) z3;}; + "sbv_9_2" = 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.2"; + sha256 = "0qmjdklrjcvyfkqbwafs79arjg46icnsbq018j0c6aqzhl94zknf"; + 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;}; + + "sbv-program" = callPackage + ({ mkDerivation, base, bifunctors, containers, pretty-simple, sbv + }: + mkDerivation { + pname = "sbv-program"; + version = "1.1.0.0"; + sha256 = "0bdddln73f27zy4a8j51n82wqpcsziagzviv3vfsq7s990dmkb2g"; + libraryHaskellDepends = [ + base bifunctors containers pretty-simple sbv + ]; + testHaskellDepends = [ base sbv ]; + description = "Component-based program synthesis using SBV"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -249567,8 +251156,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.2.2"; - sha256 = "0cv2f6n32m8xaii5dpk3kz6wclxgmri1zfh09dq23s91l5asrp1v"; + version = "9.4.4"; + sha256 = "0ibz3drbr6x4mx5253gwg2gmfvf6933x8nazlg3hf8f6zwmhcm4f"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -252565,6 +254154,8 @@ self: { pname = "semigroupoids"; version = "5.3.7"; sha256 = "169pjrm7lxjxrqj5q1iyl288bx5nj8n0pf2ri1cclxccqnvcsibd"; + revision = "1"; + editedCabalFile = "063xzbp4p93kbaygn26rzs4wmwf01mcj7d4qfsiwf39gd0wkf2dc"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -252807,24 +254398,25 @@ self: { "sensei" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, directory - , filepath, fsnotify, hspec, hspec-discover, hspec-wai, http-client - , http-types, mockery, network, process, silently, stm, text, time - , unix, wai, warp + , filepath, fsnotify, hspec, hspec-contrib, hspec-discover + , hspec-wai, http-client, http-types, mockery, network, process + , QuickCheck, silently, stm, text, time, unix, wai, warp }: mkDerivation { pname = "sensei"; - version = "0.6.2"; - sha256 = "168znkrlciywsqpgbssnz2n2w1w6240j1cxk83bpzlflg7q934ps"; + version = "0.7.0"; + sha256 = "032vn93gcya2drlcy4mw2rmncq9i21zrr53kdalsxa7xfsds93hw"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ ansi-terminal base bytestring directory filepath fsnotify http-client http-types network process stm text time unix wai warp ]; testHaskellDepends = [ ansi-terminal base bytestring directory filepath fsnotify hspec - hspec-wai http-client http-types mockery network process silently - stm text time unix wai warp + hspec-contrib hspec-wai http-client http-types mockery network + process QuickCheck silently stm text time unix wai warp ]; testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; @@ -253182,6 +254774,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sequence-formats_1_7_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.7.0"; + sha256 = "09ygkfgn381312miqlwxb9ypyixbiaal2hmh0m9zs7szlp4fcp46"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -254371,6 +255987,30 @@ self: { broken = true; }) {}; + "servant-elm_0_7_3" = callPackage + ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec + , HUnit, lens, servant, servant-client, servant-foreign, text + , wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.7.3"; + sha256 = "183grmmfa300mg7mjaqzhryprf9yzf7fnv1hwgsdv5q90n5v17lz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory elm-bridge lens servant servant-foreign text + wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-bridge hspec HUnit servant servant-client text + ]; + description = "Automatically derive Elm functions to query servant webservices"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-errors" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , http-api-data, http-media, http-types, markdown-unlit, scientific @@ -254639,23 +256279,24 @@ self: { }) {}; "servant-hmac-auth" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring + ({ mkDerivation, base, base64-bytestring, bytestring , case-insensitive, containers, cryptonite, filepath, hspec , hspec-discover, hspec-golden, http-client, http-types, memory , mtl, servant, servant-client, servant-client-core, servant-server - , text, transformers, wai + , text, transformers, wai, warp }: mkDerivation { pname = "servant-hmac-auth"; - version = "0.1.4"; - sha256 = "0nnmwqqdc7yzbd96bfmgcidz41knzrbh082dcwg2n3w0vvp0m98i"; + version = "0.1.5"; + sha256 = "1vpa699lrx20309z0brqlbiqn1mwjjqgb5k5nwxgqm67p8k3y0sx"; libraryHaskellDepends = [ - base base64-bytestring binary bytestring case-insensitive - containers cryptonite http-client http-types memory mtl servant - servant-client servant-client-core servant-server transformers wai + base base64-bytestring bytestring case-insensitive containers + cryptonite http-client http-types memory mtl servant servant-client + servant-client-core servant-server transformers wai ]; testHaskellDepends = [ - base case-insensitive filepath hspec hspec-golden http-types text + base case-insensitive filepath hspec hspec-golden http-client + http-types servant-client servant-server text warp ]; testToolDepends = [ hspec-discover ]; description = "Servant authentication with HMAC"; @@ -254882,8 +256523,8 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.5"; - sha256 = "0yhxj62hhqk0269wk3062dpb39qp7khz1gjqyqqmzfbb4v5x8mfz"; + version = "0.9.0.6"; + sha256 = "1z894w9hfcnsdwivy2qvwa254l9d9bsbdjvzlvksxy92aw1p6fd0"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -255164,6 +256805,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; + revision = "1"; + editedCabalFile = "0ixl07scnz0664sxbl7k784mi0pd2vdpsgizwnz9ik7j8hjqdi5c"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -255650,20 +257293,52 @@ self: { }) {}; "servant-serf" = callPackage - ({ mkDerivation, base, Cabal, directory, exceptions, filepath }: + ({ mkDerivation, base, Cabal-syntax, directory, exceptions + , filepath + }: mkDerivation { pname = "servant-serf"; - version = "0.3.1.2"; - sha256 = "12qyg3bj4f8y4f3z0p3dxh4ms8xdv6226120xsdd6jkbxynmap01"; + version = "0.3.1.3"; + sha256 = "0zlfy0xc4ssy7s68i6hddlkz41fa95490yhg19m1lvkqvc6mac2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal directory exceptions filepath + base Cabal-syntax directory exceptions filepath ]; executableHaskellDepends = [ base ]; description = "Automatically generate Servant API modules"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-serf"; + broken = true; + }) {}; + + "servant-serialization" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal, doctest + , flat, http-api-data, http-client, http-media, persist, QuickCheck + , serialise, servant, servant-client, servant-server, text, warp + }: + mkDerivation { + pname = "servant-serialization"; + version = "0.2.1"; + sha256 = "02xrbdwcnm9i33i386gnnigz1hk76z69iywxi2szzk0l8jnsgd32"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal flat http-media persist serialise + servant text + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal flat http-api-data http-client + http-media persist QuickCheck serialise servant servant-client + servant-server text warp + ]; + testHaskellDepends = [ + base binary bytestring cereal doctest flat http-media persist + QuickCheck serialise servant text + ]; + license = lib.licenses.mit; + mainProgram = "example"; }) {}; "servant-server" = callPackage @@ -255680,6 +257355,8 @@ self: { pname = "servant-server"; version = "0.19.2"; sha256 = "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy"; + revision = "1"; + editedCabalFile = "0qlc6bg31abfhdgwalmb89bkrdsxv21rcb2gdli85xy1jvcs4z7v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255948,6 +257625,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "servant-streamly-example"; + broken = true; }) {}; "servant-subscriber" = callPackage @@ -257311,9 +258989,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 @@ -257568,6 +259244,8 @@ self: { pname = "shake"; version = "0.19.7"; sha256 = "1lcr6q53qwm308bny6gfawcjhxsmalqi3dnwckam02zp2apmcaim"; + revision = "1"; + editedCabalFile = "1hz57kw5pp5cpbicbi7x8sz8c6qy58dzyiljz9b9f2r1rr683d9w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -257673,6 +259351,23 @@ self: { 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; + }) {}; + "shake-cabal-build" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -258594,10 +260289,33 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.10.0"; - sha256 = "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65"; - revision = "1"; - editedCabalFile = "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp"; + version = "1.10.0.1"; + sha256 = "0nm3yg6mhgxj670xn18v4zvzzqxqv9b1r6psdmsppgqny1szqm3x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-contrib HUnit + lifted-async mtl text transformers unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = lib.licenses.bsd3; + }) {}; + + "shelly_1_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.11.0"; + sha256 = "0vmi8qbp1w9ir25k2p05p4jx9r7v67kkyygygl660ji6l6a89h50"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258611,6 +260329,7 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -259500,8 +261219,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "signed-multiset"; - version = "0.4"; - sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747"; + version = "0.5"; + sha256 = "0ajpy07n57x8gbnxym1fdmwhwzyk2a5cxvhc3hjjn3lpn50hiicl"; libraryHaskellDepends = [ base containers ]; description = "Multisets with negative membership"; license = lib.licenses.bsd3; @@ -261332,6 +263051,8 @@ self: { pname = "siphon"; version = "0.8.2.0"; sha256 = "1nw8c9f7hyg26nldxkl4hkvdva5sgsyn7qqkqqrvp12qfsvdnqfi"; + revision = "1"; + editedCabalFile = "1hfvrh99bvh10gdw6z86scd8vzz56dkdfc8720hm7qiypdbgj8cr"; libraryHaskellDepends = [ attoparsec base bytestring colonnade semigroups streaming text transformers vector @@ -261815,8 +263536,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.5"; - sha256 = "0vz7p5vsjkvck3znn9ywbyi1vw0cmfb5n48m2sbcm4ky7j5x7yps"; + version = "1.0.7"; + sha256 = "02yyiplcdjad3dzcv7x4npj5h93q756ck892kdhzdrm9qbr96z66"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -261936,8 +263657,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.13.2"; - sha256 = "0dh4k39ddqca5px2d06ni8n9x3mifvkwd5i16077l472dwjcs879"; + version = "0.13.2.1"; + sha256 = "0lq68cavdp73praa2h8cclgnrh53fqg9x4r6q3fsvnr8lbcb4x7h"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -261963,8 +263684,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.13.2"; - sha256 = "0iwzfgynj3l8rnvvrl4kg0i1n31rz15da8cf1943gw1vcfh6w585"; + version = "0.13.2.1"; + sha256 = "1ib59w12f7mlh10nwj7404jv8x7z2r58g8a9ndr6ag8pxnf81054"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262584,8 +264305,8 @@ self: { ({ mkDerivation, base, hspec, text, text-icu }: mkDerivation { pname = "slugger"; - version = "0.1.0.1"; - sha256 = "1d1cx9c3qv8yd7q72q2vjp16mcsim4aw47dxv880q6xi5nmddcka"; + version = "0.1.0.2"; + sha256 = "003f44pc1q2mrprzxm492gd1v1y568k8m7vxdv5ys5zikz8gpqxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text text-icu ]; @@ -262623,8 +264344,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.7.0.1"; - sha256 = "1l46xpilja815zsj96lhginl4x8jg9skxb0pvny3h12972s1k89d"; + version = "0.7.1.0"; + sha256 = "1g69ybqfhsl74n516dzby2dswp5z4qr9xhc1fcxh9j6ynan1vcmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263258,10 +264979,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "smtlib-backends"; - version = "0.2"; - sha256 = "0p77m8f937zsnkxwc44pwhbm2dghbvw7f0xr867f07b1kzl6vpdk"; - revision = "1"; - editedCabalFile = "169qn41nvl5lcx41rhyj64nf7pxqabqh53f83m8wc0ydnim7jdc1"; + version = "0.3"; + sha256 = "13pyic8zq0dv7w529pciw0zfpzx63mrf3bq5nillsswbk0czv0qw"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -263270,22 +264989,19 @@ self: { }) {}; "smtlib-backends-process" = callPackage - ({ mkDerivation, async, base, bytestring, data-default - , smtlib-backends, smtlib-backends-tests, tasty, tasty-hunit - , typed-process + ({ mkDerivation, async, base, bytestring, process, smtlib-backends + , smtlib-backends-tests, tasty, tasty-hunit }: mkDerivation { pname = "smtlib-backends-process"; - version = "0.2"; - sha256 = "11jcx0ixf0yd9wjc77xvfsr1hvb5awr1wxvl18y54jdlkff8qfzz"; - revision = "1"; - editedCabalFile = "1shxanngvq2xfxqcxa4pkk5r570fbajvbrnwal0xnrljnf1rrfv5"; + version = "0.3"; + sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; libraryHaskellDepends = [ - async base bytestring data-default smtlib-backends typed-process + base bytestring process smtlib-backends ]; testHaskellDepends = [ - base bytestring data-default smtlib-backends smtlib-backends-tests - tasty tasty-hunit typed-process + async base bytestring process smtlib-backends smtlib-backends-tests + tasty tasty-hunit ]; description = "An SMT-LIB backend running solvers as external processes"; license = lib.licenses.mit; @@ -263296,8 +265012,8 @@ self: { ({ mkDerivation, base, smtlib-backends, tasty, tasty-hunit }: mkDerivation { pname = "smtlib-backends-tests"; - version = "0.2"; - sha256 = "14n5qdan4kbcc9h1agdnvc4hbaycmpm2srdx0c19g76iwc3598c8"; + version = "0.3"; + sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -263305,18 +265021,14 @@ self: { }) {}; "smtlib-backends-z3" = callPackage - ({ mkDerivation, base, bytestring, containers, gomp, inline-c - , smtlib-backends, smtlib-backends-tests, tasty, tasty-hunit, z3 + ({ mkDerivation, base, bytestring, gomp, 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 - ]; + version = "0.3"; + sha256 = "1dny8jmkx1aclq5sbn4kgnpn0sg1rf34za0j6ppggzmh647aim8l"; + libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ base bytestring smtlib-backends smtlib-backends-tests tasty @@ -263709,6 +265421,7 @@ self: { description = "blaze-html-clay integration for Snap"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-configuration-utilities" = callPackage @@ -263738,10 +265451,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.5.0"; - sha256 = "0hf671g7h4nikfvi05q3mmcxhfcsh874dkansssn0mc68k9fsak4"; - revision = "3"; - editedCabalFile = "02r6plphl4vqig3xap9amdib0qjd98nqpn5jhy6hsbiwh3p7cy9b"; + version = "1.0.5.1"; + sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -263945,28 +265656,25 @@ self: { }: mkDerivation { pname = "snap-server"; - version = "1.1.2.0"; - sha256 = "0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j"; - revision = "2"; - editedCabalFile = "0dzsn3y7jnha1jbp0n5igjrg4cb8kggps798rlix60d66iy8r1l2"; + version = "1.1.2.1"; + sha256 = "0znadz0av6k31s8d175904d2kajxayl38sva3dqh5ckdfkymfx54"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time transformers unix unix-compat - vector + attoparsec base blaze-builder bytestring case-insensitive clock + containers filepath HsOpenSSL io-streams io-streams-haproxy + lifted-base mtl network old-locale openssl-streams snap-core text + time transformers unix unix-compat vector ]; testHaskellDepends = [ attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector + case-insensitive clock containers deepseq directory filepath + HsOpenSSL http-common http-streams HUnit io-streams + io-streams-haproxy lifted-base monad-control mtl network old-locale + openssl-streams parallel QuickCheck random snap-core test-framework + test-framework-hunit test-framework-quickcheck2 text threads time + transformers unix unix-compat vector ]; benchmarkHaskellDepends = [ attoparsec base blaze-builder bytestring bytestring-builder @@ -266138,14 +267846,14 @@ self: { }: mkDerivation { pname = "sox"; - version = "0.2.3.1"; - sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh"; + version = "0.2.3.2"; + sha256 = "1ys6xm08gr3pvyrial2z1b3gvyd44b9510dpp4ifxqf882igkjgb"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame semigroups transformers unix utility-ht ]; description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; + license = lib.licenses.gpl3Only; }) {}; "soxlib" = callPackage @@ -266155,8 +267863,8 @@ self: { }: mkDerivation { pname = "soxlib"; - version = "0.0.3.1"; - sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd"; + version = "0.0.3.2"; + sha256 = "12pkalrwqcgz77wv948mkjldc57pj090rkrjw6k3xzqvsgvnrrpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267414,8 +269122,8 @@ self: { pname = "splitmix"; version = "0.1.0.4"; sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; - revision = "1"; - editedCabalFile = "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"; + revision = "2"; + editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -267575,8 +269283,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.8"; - sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4"; + version = "0.1.3.9"; + sha256 = "10sdywp24c0prvgkdndimc6jnkalzbsbdb1dxw6cv86xxphk65in"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267933,8 +269641,8 @@ self: { }: mkDerivation { pname = "sqlite-easy"; - version = "0.2.0.1"; - sha256 = "03sgw1g1iqkf1rv3dz5y9jh7z6iripx8dz9cs5ixznislsxkmg5l"; + version = "1.0.0.0"; + sha256 = "0w8mdfx4cwppdadbhqrcsl3lhwwmj7qv0r9r11lcm7y9frah7c02"; libraryHaskellDepends = [ base bytestring direct-sqlite migrant-core mtl resource-pool text unliftio-core @@ -267984,15 +269692,15 @@ self: { }) {}; "sqlite-simple-interpolate" = callPackage - ({ mkDerivation, base, haskell-src-meta, mtl, parsec, sqlite-simple + ({ mkDerivation, base, custom-interpolation, sqlite-simple , template-haskell }: mkDerivation { pname = "sqlite-simple-interpolate"; - version = "0.1.1"; - sha256 = "1vi43mm6lwdpsq0r2gs7nsrn4g88r3q4d8g5gmm7al8ziz9c39vq"; + version = "0.2.0.0"; + sha256 = "1wf68a6jia64grxl590zzpq5xj33k4n20jly0dpqj17brbqwv8fa"; libraryHaskellDepends = [ - base haskell-src-meta mtl parsec sqlite-simple template-haskell + base custom-interpolation sqlite-simple template-haskell ]; testHaskellDepends = [ base sqlite-simple ]; description = "Interpolated SQLite queries via quasiquotation"; @@ -268194,6 +269902,8 @@ self: { pname = "sr-extra"; version = "1.88"; sha256 = "1cpigfdpgcy3bpp51snza0wwd88ky04hwqlzbmvmwkwznd7wqxrb"; + revision = "1"; + editedCabalFile = "0lak0dd0p2c8qf870q4ahz9qjnjak7nfaswf69lrnc3yls1s7618"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -268316,6 +270026,18 @@ self: { license = lib.licenses.mit; }) {}; + "srtree" = callPackage + ({ mkDerivation, base, containers, mtl, random, vector }: + mkDerivation { + pname = "srtree"; + version = "0.1.2.1"; + sha256 = "1laybjb57vq50bkk2mqllxwygxg7i04ng2czm8vwy18577psbz11"; + libraryHaskellDepends = [ base containers mtl random vector ]; + testHaskellDepends = [ base containers mtl random vector ]; + description = "A general framework to work with Symbolic Regression expression trees"; + license = lib.licenses.bsd3; + }) {}; + "srv" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , raw-strings-qq, wai, wai-app-static, warp, warp-tls, yaml @@ -268977,25 +270699,23 @@ self: { "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib + , directory, docopt, filepath, hpc, hspec, hspec-contrib , http-client, HUnit, lens, lens-aeson, process, pureMD5, text - , time, unordered-containers, utf8-string, wreq, yaml + , time, utf8-string, wreq, yaml }: mkDerivation { pname = "stack-hpc-coveralls"; - version = "0.0.4.0"; - sha256 = "1xzjwngxidxd5xb470d2ans7swcdca14k3ilk758ravqsnk6xfyf"; + version = "0.0.7.0"; + sha256 = "1vf7h7a4mxxghmc3v5xys5jj3mxm1qkhqjkj92bkb4706gvph8a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath hpc http-client - lens lens-aeson process pureMD5 text unordered-containers - utf8-string wreq yaml + lens lens-aeson process pureMD5 text utf8-string wreq yaml ]; executableHaskellDepends = [ aeson base bytestring docopt ]; testHaskellDepends = [ - aeson base containers deepseq hlint hpc hspec hspec-contrib HUnit - time + aeson base containers deepseq hpc hspec hspec-contrib HUnit time ]; description = "Initial project template from stack"; license = lib.licenses.isc; @@ -269684,24 +271404,25 @@ self: { ({ 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, filepath, Glob - , hspec, lens, lens-aeson, monad-logger, mtl, optparse-applicative - , QuickCheck, 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.3.1"; - sha256 = "0mzn546zjgqjiky4mv19ap1qa6xxdf280qkmq041d9sj5s4xp2vh"; + version = "1.4.0.0"; + sha256 = "1w435rqmgcfxqddjds8bgzkbily97ga6hjhs0cbk15yjm0xswv08"; 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 - filepath Glob lens lens-aeson monad-logger mtl 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 QuickCheck resourcet rio semigroups text time + unliftio unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -270897,6 +272618,8 @@ self: { pname = "stm"; version = "2.5.1.0"; sha256 = "11c84d5qqvw2kfx6arw0vaf9h7pxwnyw8xvaf7fxjmhg4p8x16ib"; + revision = "1"; + editedCabalFile = "0wq35b8f0w577byhv0k1954pcy5bbv22w34qln0nlz62x8sgw1kr"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -270909,8 +272632,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.2.3.2"; - sha256 = "0h81amww5caa8950nn124sn5804vdsvxz2nahwvx88hbgsgldpkg"; + version = "0.3.0.0"; + sha256 = "03cwrb4fd62mi16g11lf06hjkwk529nh016z5vlvq9jbaxalv873"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -271075,8 +272798,8 @@ self: { ({ mkDerivation, base, hspec, stm }: mkDerivation { pname = "stm-incremental"; - version = "0.1.0.2"; - sha256 = "0fynnynx395r9mgm40w2nsb661vy9yaj7wxwfz206yrbpwrvd9vz"; + version = "0.1.1.0"; + sha256 = "15fymixnlbbdnpwqlnv83yzyx89a2x8y3h8d95xb4ad1d4fs79z3"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base hspec stm ]; description = "A library for constructing incremental computations"; @@ -271148,8 +272871,8 @@ self: { }: mkDerivation { pname = "stm-queue"; - version = "0.1.2.2"; - sha256 = "03mchkc1bvafh4674zyv5zxbrdwb20xvzn85wq8xkbs3z2gw9mi3"; + version = "0.2.0.0"; + sha256 = "0g4w5wv1wmhg2sj6pyq5bd0fi1b7zf99f1z0sjl3l8q0jwks16cy"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ async base hspec stm ]; benchmarkHaskellDepends = [ @@ -271350,8 +273073,8 @@ self: { }: mkDerivation { pname = "stooq-api"; - version = "0.4.1.0"; - sha256 = "0kjkccqwfr9bdlca8mw7ryw0jr88zs9ap9s9f2idzbdqdqavidiq"; + version = "0.4.2.0"; + sha256 = "0cfhmicx1z4biscn65ya5brqm606dxfnbi30f67k2w4km5vhs3d8"; libraryHaskellDepends = [ base bytestring cassava lens text time utf8-string vector wreq ]; @@ -271439,6 +273162,8 @@ self: { pname = "storable-record"; version = "0.0.6"; sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"; + revision = "1"; + editedCabalFile = "0gmyc50r9nzfwr5iyiixascgkv2lvk7xccvimqv2ix4zyi2fwdad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272297,8 +274022,8 @@ self: { pname = "streaming-postgresql-simple"; version = "0.2.0.5"; sha256 = "1gaj099hxdvyzmzz6z0s1kzv3qqv3py609jz7cp2j3f6497dhdqa"; - revision = "1"; - editedCabalFile = "11c8gc25bzqxa4mxj0shry5hhhll8i3yv6bspznl1d7gz3pxhrp4"; + revision = "2"; + editedCabalFile = "04vw6sd2h9pdxq28wvxgwp708z4795fm0k1sz9d5l2h21k8ikdq9"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -272516,8 +274241,7 @@ self: { ]; description = "Library for streamly and bytestring interoperation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "streamly-cassava" = callPackage @@ -272645,7 +274369,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Posix related streaming APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streamly-process" = callPackage @@ -273176,6 +274899,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 @@ -273250,14 +274975,15 @@ self: { }: mkDerivation { pname = "string-interpreter"; - version = "0.7.0.0"; - sha256 = "0j8q9vps7r3vd71j4slz540y8a3bbh1c2hdn5d9g2892984chjb2"; + version = "0.8.0.0"; + sha256 = "0ycd25sxvzjd2b19d2d5qs5wi8yy4bd9ayk16kpwm9wcs2xi99p1"; libraryHaskellDepends = [ base cli-arguments phonetic-languages-basis phonetic-languages-permutations-array ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "string-isos" = callPackage @@ -273393,8 +275119,8 @@ self: { }: mkDerivation { pname = "string-variants"; - version = "0.2.0.0"; - sha256 = "0rzxvqv6waggspqbph4n0q249v0h615965rqlbbhv8a3p87kmdcd"; + version = "0.2.1.0"; + sha256 = "06dgb0f9l05jb2m51n285rnhw9s3r61m7z7mmzbd1a078cs30ndf"; libraryHaskellDepends = [ aeson base bytestring mono-traversable QuickCheck refined refinery string-conversions template-haskell text @@ -273559,8 +275285,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; - version = "1.0.3.1"; - sha256 = "1mi538f8nm90mygrcv6w90bxf0d0lc4qxkbrq19j35l9r1xlm5bk"; + version = "1.0.3.2"; + sha256 = "1gvfqqfaxzgdyq03p7c6kys5bc6frpm5wsm8zsg8rk50wh18gzmg"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; @@ -273670,10 +275396,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.1.0.2"; - sha256 = "123l1khqd0ilcihrij1givz4lg2jns2r2iyf90yjh7zdva1xf507"; - revision = "1"; - editedCabalFile = "0rr2vyw1vpa4psxqq2x9lsp67lgm0pylmnsnixm681qa6pykjnhr"; + version = "1.1.0.3"; + sha256 = "10nfpn0rsknnbir4ghad7rygp2l0rsfkd74ipgz76b60k23x4kj9"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text @@ -273704,14 +275428,15 @@ self: { }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.14"; - sha256 = "0r982h1vd06yd1kyhyqf3s982a34amlnfzwykg3cs6pscpqbg7mz"; + version = "1.0.0.15"; + sha256 = "0p2m6lrl6sh44919wggzb3xpc29ib6khpac70zrx8s4f0iwrpyq4"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptohash-sha256 stripe-concepts text ]; testHaskellDepends = [ - base base16-bytestring bytestring stripe-concepts text + base base16-bytestring bytestring cryptohash-sha256 stripe-concepts + text ]; description = "Verification of Stripe webhook signatures"; license = lib.licenses.mit; @@ -273741,10 +275466,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.14"; - sha256 = "01z0hqqnnc2g8q0bzj4brjmd9wmpjda4rlk770brvk9ip9mjdlys"; - revision = "2"; - editedCabalFile = "1ijsspbd5in2jv1kcz78y0xxi09px60n51snfx9b49dsjnh2yniv"; + version = "1.0.1.15"; + sha256 = "0w9wa08i53k2557hd5cb0a8m65b6993j2dn9bd9g8p6j6j77cjcp"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text wreq ]; @@ -273801,6 +275524,24 @@ self: { license = lib.licenses.mit; }) {}; + "strive_6_0_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers + }: + mkDerivation { + pname = "strive"; + version = "6.0.0.5"; + sha256 = "13m05mxw3z0ji7z6sr05v1i15xvaf4kyhn2cqqrpzxhzf44m2bvk"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + description = "A client for the Strava V3 API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strong-path" = callPackage ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path , tasty, tasty-discover, tasty-hspec, tasty-quickcheck @@ -273876,6 +275617,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.raehik ]; }) {}; "strptime" = callPackage @@ -273916,10 +275658,8 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1.6"; - sha256 = "0wzbhsvix46aans0hdm11pvsigk1lxpdaha2sxslx0ip1xsdg0gk"; - revision = "1"; - editedCabalFile = "1vpi14bc8x53dxzcyya39zr287kyfrjxiy5z5lwfkf63dmsrbd28"; + version = "0.1.7"; + sha256 = "072gbzxh0cnrdmbwmksqfrdvv7xhsamjrmgd6vya17md76mqndab"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; @@ -274269,6 +276009,40 @@ self: { 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 + regex-tdfa syb text + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser 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-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson HUnit + mtl random regex-tdfa syb test-framework test-framework-hunit text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stylish-haskell"; + }) {}; + "stylist" = callPackage ({ mkDerivation, async, base, css-syntax, hashable, hspec , network-uri, QuickCheck, regex-tdfa, scientific, stylist-traits @@ -274379,8 +276153,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "subG"; - version = "0.5.3.0"; - sha256 = "0bq49g3ippsjiqm1qvd3y9a4fyngzw8f3my8n1amgyzxb6fk5q7w"; + version = "0.6.1.0"; + sha256 = "0y2hxb6rvzmyb8863wv7v4x3pai2fw8w968rzlgfrjh8vk1cw23r"; libraryHaskellDepends = [ base ]; description = "Some extension to the Foldable and Monoid classes"; license = lib.licenses.mit; @@ -275292,25 +277066,46 @@ self: { ({ mkDerivation, base, supply-chain-core }: mkDerivation { pname = "supply-chain"; - version = "0.0.0.0"; - sha256 = "12rdx593ivps3khxpvq0r1kc99jhzvc0qfkdxa7jdy0qn22fi3dx"; + version = "0.0.0.1"; + sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; + revision = "1"; + editedCabalFile = "1nnc5k8fp5bd5na9sd9qk5cbra2zjjmddxcn4qs1ahw4lxfy9gxx"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; }) {}; "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; }) {}; + "supply-next" = callPackage + ({ mkDerivation, base, containers, gambler, hspec, integer-types + , quaalude, supply-chain, transformers + }: + mkDerivation { + pname = "supply-next"; + version = "0.0.1.2"; + sha256 = "110j4ppkw155hdlz00wbzc9z3m0mqf4dl6pqcaigcqg624m0ppqk"; + libraryHaskellDepends = [ + base gambler integer-types quaalude supply-chain transformers + ]; + testHaskellDepends = [ + base containers gambler hspec integer-types quaalude supply-chain + transformers + ]; + description = "Supply-chain interface for basic streaming"; + license = lib.licenses.asl20; + }) {}; + "surjective" = callPackage ({ mkDerivation, base, lens, mtl, template-haskell }: mkDerivation { @@ -275858,15 +277653,15 @@ self: { , optparse-applicative, parser-combinators, prettyprinter , QuickCheck, random, servant, servant-server, simple-enumeration , split, stm, syb, tagged, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, template-haskell, text + , tasty-hunit, tasty-quickcheck, template-haskell, text, text-rope , text-zipper, time, transformers, unification-fd , unordered-containers, vector, vty, wai, warp, witch, word-wrap , yaml }: mkDerivation { pname = "swarm"; - version = "0.2.0.0"; - sha256 = "1f1fp4yia54j5x6kxkrsdlj9y2859gz22k4r3pphfiadfiw1gww3"; + version = "0.3.0.1"; + sha256 = "0b0ji08csj07ragr8sabn84l1zzlchvm0nz8rd7541fwm5b3jb5f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -275877,8 +277672,8 @@ self: { lsp megaparsec minimorph mtl murmur3 natural-sort parser-combinators prettyprinter random servant servant-server simple-enumeration split stm syb tagged template-haskell text - text-zipper time unification-fd unordered-containers vector vty wai - warp witch word-wrap yaml + text-rope text-zipper time unification-fd unordered-containers + vector vty wai warp witch word-wrap yaml ]; executableHaskellDepends = [ base githash optparse-applicative text @@ -275978,32 +277773,6 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.2.0"; - sha256 = "162sq6k9ylzlnqj4l9plykvhhrkc7sc08bza6az5cadfvnqlham8"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - polyparse text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = lib.licenses.lgpl21Only; - mainProgram = "Swish"; - }) {}; - - "swish_0_10_3_0" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, polyparse, semigroups - , test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; version = "0.10.3.0"; sha256 = "0qn3nmgxiyvvxv1hxdc6lgc5q8n53kj8lmdzvvjnq4q8s5mh5lhn"; isLibrary = true; @@ -276020,7 +277789,6 @@ self: { ]; description = "A semantic web toolkit"; license = lib.licenses.lgpl21Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "Swish"; }) {}; @@ -276193,25 +277961,24 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base - , bytestring, containers, Diff, dlist, envparse, filepath - , MonadRandom, mtl, optparse-applicative, path, path-io - , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle - , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm - , sydtest-discover, text + , bytestring, containers, dlist, envparse, filepath, MonadRandom + , mtl, optparse-applicative, path, path-io, pretty-show, QuickCheck + , quickcheck-io, random, random-shuffle, safe, safe-coloured-text + , safe-coloured-text-terminfo, stm, sydtest-discover, text, vector }: mkDerivation { pname = "sydtest"; - version = "0.13.0.0"; - sha256 = "0msa5y6fl00qjrj08c6bccbav179f05jk9hb9lmfbffq6bc86rc5"; + version = "0.13.0.1"; + sha256 = "0am1bgg2figd3zwd80ia8jayp3ikvvb50wvjaivy4y66gz7x4qb3"; libraryHaskellDepends = [ - async autodocodec autodocodec-yaml base bytestring containers Diff - dlist envparse filepath MonadRandom mtl optparse-applicative path - path-io pretty-show QuickCheck quickcheck-io random random-shuffle - safe safe-coloured-text safe-coloured-text-terminfo split stm text + async autodocodec autodocodec-yaml base bytestring containers dlist + envparse filepath MonadRandom mtl optparse-applicative path path-io + pretty-show QuickCheck quickcheck-io random random-shuffle safe + safe-coloured-text safe-coloured-text-terminfo stm text vector ]; testHaskellDepends = [ base bytestring path path-io QuickCheck random safe-coloured-text - stm text + stm text vector ]; testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; @@ -276554,11 +278321,11 @@ self: { }: mkDerivation { pname = "sydtest-webdriver-screenshot"; - version = "0.0.0.0"; - sha256 = "00w3ijgwwplgg0310qnc56c5a50i1vnzn94np4jscjv4aw849s1b"; + version = "0.0.0.1"; + sha256 = "0wh481za6x9bq4axazq6zpm0cgi98hsh4xiy02c90fxybzdk4mg9"; libraryHaskellDepends = [ - base bytestring http-types JuicyPixels mtl network-uri path path-io - sydtest sydtest-wai sydtest-webdriver webdriver + base bytestring JuicyPixels mtl path path-io sydtest + sydtest-webdriver webdriver ]; testHaskellDepends = [ base http-types network-uri sydtest sydtest-wai sydtest-webdriver @@ -276578,12 +278345,11 @@ self: { }: mkDerivation { pname = "sydtest-webdriver-yesod"; - version = "0.0.0.0"; - sha256 = "10q112rsj5gh3ijy7pf93zslsxqk7jim1i1fslqpld71wqw2abr2"; + version = "0.0.0.1"; + sha256 = "0rfsr45ff7p81y157x06qspjp00ng2kikw84c2ciw4bfjicdvvsr"; libraryHaskellDepends = [ - base bytestring http-client http-types mtl network-uri path path-io - sydtest sydtest-wai sydtest-webdriver sydtest-yesod text webdriver - yesod + base bytestring http-client http-types mtl network-uri sydtest + sydtest-wai sydtest-webdriver sydtest-yesod text webdriver yesod ]; testHaskellDepends = [ base path path-io sydtest sydtest-webdriver yesod @@ -276746,8 +278512,8 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.4.0.20211106"; - sha256 = "0fbw0fg78b8wh3fcbvcm9v3qrsvpyymhwd7f9a70yqj90mggl7sc"; + version = "0.5.0.20221211"; + sha256 = "00wkvvwyfy8g2ya86m8jy21656qrfapbf27k4hg6x2r0h87i5ddd"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers @@ -277539,43 +279305,10 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.2.1"; - sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj"; - revision = "1"; - editedCabalFile = "1c3l83qrdn3nxpp0gsr06iz9praw37c2j9zjj15pxd8in73mb74a"; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq event-list - explicit-exception filepath non-empty non-negative numeric-prelude - numeric-quest process QuickCheck random sample-frame-np semigroups - sox storable-record storable-tuple storablevector transformers - utility-ht - ]; - testHaskellDepends = [ - base containers event-list non-empty non-negative numeric-prelude - QuickCheck random storable-tuple storablevector transformers - utility-ht - ]; - benchmarkHaskellDepends = [ - array base binary bytestring directory numeric-prelude old-time - storable-tuple storablevector timeit utility-ht - ]; - description = "Audio signal processing coded in Haskell: Low level part"; - license = "GPL"; - hydraPlatforms = lib.platforms.none; - }) {}; - - "synthesizer-core_0_8_3" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, event-list, explicit-exception, filepath - , non-empty, non-negative, numeric-prelude, numeric-quest, old-time - , process, QuickCheck, random, sample-frame-np, semigroups, sox - , storable-record, storable-tuple, storablevector, timeit - , transformers, utility-ht - }: - mkDerivation { - pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; + revision = "1"; + editedCabalFile = "0ig8ysmw2hnbxgdv1p4h4vpyq782anw1g8wsqjrj6b0n4kazk5i8"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -277606,6 +279339,8 @@ self: { pname = "synthesizer-dimensional"; version = "0.8.1.1"; sha256 = "0giaa6v2yvb0amvdzdv5bq7dsns9pgbzv7sgjdi4a4zy0x4gmhc4"; + revision = "1"; + editedCabalFile = "15wb7v43ijbjqnnjdjf7c547wjbk4047in84q26b0vzi5nvrb3ij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277666,8 +279401,8 @@ self: { pname = "synthesizer-llvm"; version = "0.9"; sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; - revision = "1"; - editedCabalFile = "04z0s3hkpdcmri4w34s2ssz9wwf60z1ccc0bc3bphs1caz8i61j2"; + revision = "2"; + editedCabalFile = "1p9wr4i1q8mv3ghnw46k4dzfagid1f7sx45zbam3ja68ksq1da99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278514,8 +280249,8 @@ self: { }: mkDerivation { pname = "tagchup"; - version = "0.4.1.1"; - sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75"; + version = "0.4.1.2"; + sha256 = "0zlrdlb0f6dhhx163i62ljh1spr0d5gcf0c96m5z7nzq529qq792"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -280055,16 +281790,31 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.2.0.1"; - sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; - revision = "1"; - editedCabalFile = "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"; + version = "1.2.0.2"; + sha256 = "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck + ]; + description = "Hspec support for the Tasty test framework"; + 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 @@ -280141,6 +281891,8 @@ self: { pname = "tasty-inspection-testing"; version = "0.2"; sha256 = "1gdwbg545gwfx2a26s7hkgz9l9mfb13i6v20j09hqrlbh1xsi3qz"; + revision = "1"; + editedCabalFile = "1539r8zxbpwf1ia48syslq2j5v6l8czigp4fjwfwdcsf8x5k9j6g"; libraryHaskellDepends = [ base ghc inspection-testing tasty template-haskell ]; @@ -280208,8 +281960,8 @@ self: { pname = "tasty-json"; version = "0.1.0.0"; sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; - revision = "1"; - editedCabalFile = "0jk27ld4l435nnzc80wg6b46ibmc0cmbb0k3hpp58yxbyldr6xdr"; + revision = "2"; + editedCabalFile = "0739101s43mvv3f3fjchbj25ggjvdxf2n7an4gqsbcqz7s1lskdf"; libraryHaskellDepends = [ base bytestring containers stm tagged tasty text ]; @@ -280331,6 +282083,20 @@ self: { broken = true; }) {}; + "tasty-papi" = callPackage + ({ mkDerivation, base, containers, deepseq, papi, stm, tasty }: + mkDerivation { + pname = "tasty-papi"; + version = "0.1.0.1"; + sha256 = "0qlxdcjr8fv05vaspr4bna5wn28c0l0hn9a4znxcrrqlr1wqb3g8"; + libraryHaskellDepends = [ base containers deepseq stm tasty ]; + librarySystemDepends = [ papi ]; + testHaskellDepends = [ base tasty ]; + description = "Bencmarking using instruction counting"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + }) {inherit (pkgs) papi;}; + "tasty-prelude" = callPackage ({ mkDerivation, base, tasty, tasty-expected-failure, tasty-focus }: @@ -280399,8 +282165,8 @@ self: { pname = "tasty-rerun"; version = "1.1.18"; sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"; - revision = "3"; - editedCabalFile = "0091arn90cx5rzn5n2bpb9alzybwraf9yj7hb0bwdfyamzpf3pkb"; + revision = "4"; + editedCabalFile = "1i2van23247h62sz94kjiyyb6xvz88z6kkjqqsbxi4m74pga27hn"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -280474,8 +282240,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 @@ -281204,6 +282970,30 @@ self: { mainProgram = "hello-bot"; }) {}; + "telegram-bot-api" = 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 + , servant-server, split, stm, template-haskell, text, time + , transformers, unordered-containers, warp, warp-tls + }: + mkDerivation { + pname = "telegram-bot-api"; + version = "6.5"; + sha256 = "176c9fhfa2vl9cqwqcsad0p212w27ni4q38r7fbp1qkwxd5xrd02"; + 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 servant-server split + stm template-haskell text time transformers unordered-containers + warp warp-tls + ]; + description = "Easy to use library for building Telegram bots. Exports Telegram Bot API."; + license = lib.licenses.bsd3; + }) {}; + "telegram-bot-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls @@ -281214,8 +283004,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.6.1"; - sha256 = "01rxkgzfvqxgnxlcw70rhs84ygvccydlki827f3icqwfpm7cn6vn"; + version = "0.6.2"; + sha256 = "10w9lq0ns1ycn0agmpp5114yfjrd20vwq050jxnfyk603aaw49k1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281230,6 +283020,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "telegram-bot-simple_0_10" = 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 + , servant-server, split, stm, telegram-bot-api, template-haskell + , text, time, transformers, unordered-containers, warp, warp-tls + }: + mkDerivation { + pname = "telegram-bot-simple"; + version = "0.10"; + sha256 = "1xkmmcxnv052hfc0bwr3w6ilrf173npdpc0v5pwrhkz0kd88xxvh"; + 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 servant-server split + stm telegram-bot-api template-haskell text time transformers + unordered-containers warp warp-tls + ]; + description = "Easy to use library for building Telegram bots"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "telegram-raw-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deriving-aeson , generic-lens, hashable, http-client, http-client-tls, http-media @@ -282868,8 +284685,8 @@ self: { pname = "test-lib"; version = "0.4"; sha256 = "0jp0k27vvdz4lfrdi7874j7gnnn051kvqfn1k3zg1ap4m9jzyb45"; - revision = "1"; - editedCabalFile = "0hkscmcvgpqabc7fb8xln9grn31dw1p2cr6277l3snivkanc8889"; + revision = "2"; + editedCabalFile = "1l3xfmwhpvzixwx3s2zhc1ah9bjnp0yjr7d2cymhfnlpwv5jc47q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283300,8 +285117,30 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.5.4"; - sha256 = "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq"; + version = "0.12.5.5"; + sha256 = "0hm88495sql6dz10hkrhfdnzfpgaa8zcy00v3irkzibq886nbcva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + }) {}; + + "texmath_0_12_6" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.6"; + sha256 = "167y2flpsq3f3npjhrb3bxdbxys2aamgfrs1dr3f6l36hyg8mhvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283313,6 +285152,7 @@ self: { ]; description = "Conversion between math formats"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "texrunner" = callPackage @@ -284147,39 +285987,6 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.3"; - sha256 = "153hfl8k0489ll71apq48s59ngv8ag1vyhhs6pp3fgxmdwwg2xpl"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers unix unordered-containers - uuid-types vector xhtml - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_9_4" = callPackage - ({ mkDerivation, aeson, base, base-compat, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, uuid-types, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; version = "3.9.4"; sha256 = "154smhpc3l2h1iacdsywzirkv19w493yajhsiqg9pqmmiii7kwr5"; libraryHaskellDepends = [ @@ -284200,7 +286007,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -284225,8 +286031,8 @@ self: { }: mkDerivation { pname = "text-time"; - version = "0.3.1"; - sha256 = "1p0vdhvpcz07wiam3hsi7fixknb6shxlhvg624vksacg06qkck41"; + version = "0.3.2"; + sha256 = "0gi90lb4dvin9h9j2148fxg9z63y14yssqqa868q1spqpmnz1pim"; libraryHaskellDepends = [ attoparsec base formatting text time ]; testHaskellDepends = [ attoparsec base Cabal formatting hspec QuickCheck text time @@ -284356,6 +286162,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-zipper_0_13" = callPackage + ({ mkDerivation, base, deepseq, hspec, QuickCheck, text, vector }: + mkDerivation { + pname = "text-zipper"; + version = "0.13"; + sha256 = "1acq583wmgb53viqslbkgl454300fawg5lryxddfiy1mqk3iqlh6"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base deepseq text vector ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + description = "A text editor zipper library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-zipper-monad" = callPackage ({ mkDerivation, base, hspec, mtl, text-zipper }: mkDerivation { @@ -284678,12 +286498,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "th-data-compat_0_1_1_1" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.1.1.1"; + sha256 = "1ry22k1fr50az4gjy6vs3b11a4gp22hkagbbq4r3irqaz059z6dp"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-data-compat" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.1.1.0"; - sha256 = "0579yxlcl3cfirjim31capk7q2raf9bmmfnvcxxnicjmvx22790q"; + version = "0.1.2.0"; + sha256 = "1x8znbzzkrmp1vfq6blwnwb5cxyr9gkiwj6c5ab4nds4diy3j3cq"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; @@ -284767,8 +286599,8 @@ self: { }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.10.0"; - sha256 = "044h1hv4b0ihpwr9wndj55fa843cbzqp1difgj9wyy3mw925higm"; + version = "0.4.11.0"; + sha256 = "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -285847,6 +287679,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "threepenny-flexbox-exe"; + broken = true; }) {}; "thrift" = callPackage @@ -287424,19 +289257,20 @@ self: { "tinkoff-invest-sdk" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, concurrent-extra , errors, http2-client, http2-client-grpc, http2-grpc-proto-lens - , lens, mtl, proto-lens, proto-lens-runtime, proto-lens-setup, text - , unordered-containers + , lens, mtl, proto-lens, proto-lens-protoc, proto-lens-runtime + , proto-lens-setup, text, unordered-containers }: mkDerivation { pname = "tinkoff-invest-sdk"; - version = "0.1.0.0"; - sha256 = "1b66gb1cdlckhiaxbps31dklx0sz9wxs27cpy4zwfn0rxzi96wpv"; + version = "0.1.1.1"; + sha256 = "04l94l77243ik727lbqiy1brcvbgbyns0yl50xq9p87y0spbkrsi"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ async base bytestring concurrent-extra errors http2-client http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens proto-lens-runtime text unordered-containers ]; + libraryToolDepends = [ proto-lens-protoc ]; description = "gRPC based SDK for Tinkoff Invest API V2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -288050,8 +289884,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.7.0.1"; - sha256 = "117kwfqyww9qwsja4vx03vja7g6lgin3iy0ss2ckmdmnddimm9qs"; + version = "0.7.1.0"; + sha256 = "1hf4zfm6gapqd2yi0pylrmrjsgx98c21diixiv7bc7z6xs7g4pbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288470,8 +290304,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "6"; - editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v"; + revision = "7"; + editedCabalFile = "1nf6ciwh4llnmxsdff0shr8vh3j9x7cpi9hgn1dlas8glz4c6vn1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; @@ -288775,16 +290609,16 @@ self: { }) {}; "toml-reader-parse" = callPackage - ({ mkDerivation, base, comonad, containers, deepseq, dlist, mtl + ({ mkDerivation, base, comonad, containers, deepseq, dlist , optparse-applicative, prettyprinter, prettyprinter-combinators , tasty, tasty-hunit, text, time, toml-reader, vector }: mkDerivation { pname = "toml-reader-parse"; - version = "0.1.1.0"; - sha256 = "1ah47icy8lnpnmhpsmyp9pvp8f134pzzi6cvv5vpnw2r5szr9vly"; + version = "0.1.1.1"; + sha256 = "0fijwv9zs5ivbxyss81rr5sav99dxn3x35adfrb6pli4qmr7mlzi"; libraryHaskellDepends = [ - base comonad containers deepseq dlist mtl prettyprinter + base comonad containers deepseq dlist prettyprinter prettyprinter-combinators text time toml-reader vector ]; testHaskellDepends = [ @@ -290004,12 +291838,12 @@ self: { mainProgram = "Benchmark"; }) {}; - "transformers_0_6_0_5" = callPackage + "transformers_0_6_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.0.5"; - sha256 = "09s4svr1z1y93qwzq22py0s2s35b6lyszyfippiimccqrbk1jlsm"; + version = "0.6.1.0"; + sha256 = "1n54v7wrnk06rj9w70grpmr9c6xvw1shpwygfnshslarggnwpaz7"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -290140,8 +291974,8 @@ self: { ({ mkDerivation, base, exceptions, text, transformers }: mkDerivation { pname = "transformers-either"; - version = "0.1.2"; - sha256 = "1vb6jr2lpj6mqx9bv0ziqs6586gj6xka218qagxsm7w52w0hvz1v"; + version = "0.1.3"; + sha256 = "0vk4pyk26rpyn17r3imn0phl10lgdfw5cpabf77zpkdq8lr154yr"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Either monad transformer"; license = lib.licenses.bsd3; @@ -290151,8 +291985,8 @@ self: { ({ mkDerivation, base, exceptions, text, transformers }: mkDerivation { pname = "transformers-except"; - version = "0.1.2"; - sha256 = "00zxpip9nhli7ic1zaks7c4hj851dhdgkkwq5qw9vamr6whgh9cr"; + version = "0.1.3"; + sha256 = "038c4gywkhq3qry4h7589z1afh2dw25d6nrhr1yfi0mx4kqanjs8"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Except monad transformer with"; license = lib.licenses.bsd3; @@ -290669,6 +292503,36 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, data-array-byte, deepseq, Diff, hashable, parsec + , parsers, pretty, primitive, QuickCheck, scientific, semialign + , strict, tagged, tasty, tasty-golden, tasty-quickcheck, text + , these, time, trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.3"; + sha256 = "12qwq7jv5fd8qrpbx12ldwwz6r3jzil0d3w9wb11nlnzrqv5dh51"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers data-array-byte deepseq hashable + parsec parsers pretty primitive QuickCheck scientific semialign + strict tagged text these time unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -290884,8 +292748,8 @@ self: { ({ mkDerivation, base, containers, doctest, mtl }: mkDerivation { pname = "tree-traversals"; - version = "0.1.1.0"; - sha256 = "0wsa4qxlxk6308smv957by8fmnsnsxnxxga8c66bvnhlr95rg9rk"; + version = "0.1.2.0"; + sha256 = "1l31l43dv7gkv35qfh7vf6v9ar864s4kilki2nwniipdfbyrmjwd"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest mtl ]; description = "Functions and newtype wrappers for traversing Trees"; @@ -292309,8 +294173,8 @@ self: { pname = "turtle"; version = "1.6.1"; sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; - revision = "1"; - editedCabalFile = "1x4hk9kk8ra855jkzs7dc9691pk14xydixswbx2srs3r9rc6dpjb"; + revision = "2"; + editedCabalFile = "0zkw1mn9z09gkc0yjx6pfqyvrda076qi7ya12vfd1j3b7yljhpdn"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -293460,8 +295324,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "type-level-kv-list"; - version = "2.0.0"; - sha256 = "0m1hyddkc7652crki2r2rd0c7mr9sqcj57vhhkn280plqpmbl1kx"; + version = "2.0.2.0"; + sha256 = "1bdnmsxxrfhifzy3nm1j6hh2b6wgs38k8wyrg6rzq10wzxzi7bpz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Type level Key-Value list"; @@ -294290,6 +296154,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -294521,31 +296387,26 @@ self: { }) {}; "typograffiti" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, freetype2 - , gl, linear, mtl, pretty-show, sdl2, stm, template-haskell, vector + ({ mkDerivation, base, bytestring, containers, freetype2, gl + , harfbuzz-pure, linear, mtl, sdl2, stm, text, vector }: mkDerivation { pname = "typograffiti"; - version = "0.1.0.3"; - sha256 = "16491jhiw8yvs1491plf5c98rarxk0j2dfy76ggayxypzqdn2rmr"; + version = "0.2.0.0"; + sha256 = "0x7s9bfb68qhdjz98gf0k762mflrigih1qhxp6a4padkc2plwvww"; + revision = "2"; + editedCabalFile = "10v1ha01phgacfwialk3kmyaly61x1b8x9wmxnwbjr2bhfjxssqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers freetype2 gl linear mtl pretty-show stm - template-haskell vector - ]; - executableHaskellDepends = [ - base bytestring containers filepath freetype2 gl linear mtl - pretty-show sdl2 stm template-haskell vector - ]; - testHaskellDepends = [ - base bytestring containers freetype2 gl linear mtl pretty-show stm - template-haskell vector + base bytestring containers freetype2 gl harfbuzz-pure linear mtl + stm text vector ]; + executableHaskellDepends = [ base gl mtl sdl2 text ]; description = "Just let me draw nice text already"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "typograffiti-exe"; + mainProgram = "typograffiti"; broken = true; }) {}; @@ -295222,13 +297083,15 @@ self: { }: mkDerivation { pname = "ukrainian-phonetics-basic-array"; - version = "0.6.0.0"; - sha256 = "1n6blzjbqkvhnwlzjkn0xs8vnlv7n419ska09zd1r59jv15623ac"; + version = "0.7.0.0"; + sha256 = "13kwf822598hpvp0sa724bp4dyqgh79k0bydnlmxp51jsj8d85cq"; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ukrainian-phonetics-common ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-basic-array-bytestring" = callPackage @@ -295244,14 +297107,16 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-common" = callPackage ({ mkDerivation, base, mmsyn2-array }: mkDerivation { pname = "ukrainian-phonetics-common"; - version = "0.1.1.0"; - sha256 = "09sj6d29fcifxc30wxm5fqgvpifk7i7xf1dbxq7grawxf3w3l7hz"; + version = "0.2.0.0"; + sha256 = "0d5d06jshhhc24ii0h5mxwz9jnmqjzxkckbhsj9zpl81hfs54dsv"; libraryHaskellDepends = [ base mmsyn2-array ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; @@ -295633,8 +297498,8 @@ self: { pname = "unescaping-print"; version = "0.1"; sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5"; - revision = "3"; - editedCabalFile = "0r2ggyy2qla75jxdhd3izqqkqb3ar6538jczfwlbbxrj4w1xkd47"; + revision = "4"; + editedCabalFile = "1n09a1nsb6fm2abcg6zm4xhkgirhfwqbcxym84qaq82d8zmlyxqj"; libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; license = lib.licenses.bsd3; @@ -295718,25 +297583,11 @@ self: { ({ mkDerivation, async, base, safe-exceptions, stm }: mkDerivation { pname = "unfork"; - version = "1.0.0.0"; - sha256 = "0k770q549f1rcdhx21nb6n1van00za2wv50angdw5gkxihzczcjq"; - revision = "1"; - editedCabalFile = "1vwlyyrczrkma8ggzn29b6vwfbq51h3m1si1jfh6v5c99vajr33y"; - libraryHaskellDepends = [ async base safe-exceptions stm ]; - description = "Make any action thread safe"; - license = lib.licenses.asl20; - }) {}; - - "unfork_1_0_0_1" = callPackage - ({ mkDerivation, async, base, safe-exceptions, stm }: - mkDerivation { - pname = "unfork"; version = "1.0.0.1"; sha256 = "0rg2aklr77ba3k1kbd57p42jj0w23rc7rir1iczfskcdj7ki2rjm"; libraryHaskellDepends = [ async base safe-exceptions stm ]; description = "Make any action thread safe"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "unfree" = callPackage @@ -295944,6 +297795,8 @@ self: { pname = "unicode-data"; version = "0.4.0.1"; sha256 = "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"; + revision = "1"; + editedCabalFile = "1lvsn8r1xh8ip5gyrbwv7pk41yf2ynjimpd6g4am3n7j92djc7h8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -295962,6 +297815,8 @@ self: { pname = "unicode-data-names"; version = "0.2.0"; sha256 = "0i28rp5g6wmnga6i95a6cq3dhkjg3v477xwycbcl38dfwdj3iy2c"; + revision = "1"; + editedCabalFile = "1pxpg1mkv9yq26h9xcvxa6wza14y65g3j73gvs2nfmg4byksfdml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -295982,6 +297837,8 @@ self: { pname = "unicode-data-scripts"; version = "0.2.0.1"; sha256 = "0kpa2g59w9yiyl3adak7k0g9wnkwzv97c82x7bsrqvk23bdljxc0"; + revision = "1"; + editedCabalFile = "1f6kz6kwv9v087bzjss29qaid03vig6njnsa1w46p93dn2xscvsm"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec unicode-data ]; benchmarkHaskellDepends = [ @@ -296001,6 +297858,8 @@ self: { pname = "unicode-data-security"; version = "0.2.0"; sha256 = "10x58l62i7bj9kmnchp1rggln40sfbsyw4pxlzbk8dmhkh5zmdlx"; + revision = "1"; + editedCabalFile = "0mbsz5ynisjclzprvqvwd8q6l7kmv31qc2nkpbix05ipcrm0p4qg"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -296533,8 +298392,8 @@ self: { }: mkDerivation { pname = "unique-logic"; - version = "0.4"; - sha256 = "0lza0g7mvij6fj07nfyrgl7vy6hpqmmmzbnxylq71jb4a90sn28j"; + version = "0.4.0.1"; + sha256 = "05y401k00qminds1di27sxvhwjl5xn6yn1qq1vnbhs0ib4s8csvy"; libraryHaskellDepends = [ base explicit-exception transformers utility-ht ]; @@ -296553,6 +298412,8 @@ self: { pname = "unique-logic-tf"; version = "0.5.1"; sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; + revision = "1"; + editedCabalFile = "1bnd8jyrrawszaxz5w7jibys9qygp2gx39g5y312f0k5468x25qh"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -296729,8 +298590,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uniqueness-periods-vector-stats"; - version = "0.3.0.0"; - sha256 = "0vfkjmp730w9f0174fx0mpfrrbd2grwd838wnrrlxnv39y345i6h"; + version = "0.4.0.0"; + sha256 = "0ip401h6mgyz2qi391d1pjg37mrpf1qfa9pxdxga7r0bkmzs26hg"; libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; license = lib.licenses.mit; @@ -297417,10 +299278,10 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "unliftio-core"; - version = "0.2.0.1"; - sha256 = "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi"; - revision = "2"; - editedCabalFile = "1xx9nmxxg87nhwxgbmmw0xbrppnjc23ppyryar04i3njyg9wvazr"; + version = "0.2.1.0"; + sha256 = "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"; + revision = "1"; + editedCabalFile = "19pw6f7hmka8kgnsbrrhp73rdnvdsmagh1s325rxqv5if1km1hwz"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -297487,6 +299348,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "unliftio-pool_0_4_0_0" = callPackage + ({ mkDerivation, base, resource-pool, transformers, unliftio-core + }: + mkDerivation { + pname = "unliftio-pool"; + version = "0.4.0.0"; + sha256 = "0kkb9zsb624h9sx1izj7hf6fbaxh7hvp9d6qqdrqh1j6fdh46hlp"; + libraryHaskellDepends = [ + base resource-pool transformers unliftio-core + ]; + description = "Data.Pool generalized to MonadUnliftIO."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-streams" = callPackage ({ mkDerivation, base, bytestring, io-streams, text, unliftio-core }: @@ -300759,8 +302635,8 @@ self: { pname = "vector"; version = "0.13.0.0"; sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "1"; - editedCabalFile = "12cwdaqsy9dv7j7cwq6r6kdyfxqiya8khm6ccaabjhhpa2aqwljl"; + revision = "2"; + editedCabalFile = "19d6c1gp5d6v5wlg386aphn7893axba0zicpi7n5s4a55bqazs51"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -301062,8 +302938,8 @@ self: { }: mkDerivation { pname = "vector-hashtables"; - version = "0.1.1.1"; - sha256 = "02kixbi9v4rcj46fvvba5aq6vn6f5yncnvc71f4y7h1wq5b452jj"; + version = "0.1.1.2"; + sha256 = "0hrjvy9qg1m5g3w91zxy4syqmp8jk7ajjbxbzkhy282dwfigkyd2"; libraryHaskellDepends = [ base hashable primitive vector ]; testHaskellDepends = [ base containers hashable hspec primitive QuickCheck @@ -301167,8 +303043,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-rotcev"; - version = "0.1.0.1"; - sha256 = "1zrw1r6xspjncavd307xbbnjdmmhjq9w3dbvm0khnkxjgh47is8v"; + version = "0.1.0.2"; + sha256 = "1ch8r6v07qvczp7cn7l4hxy7pakj37hkx5vp7vz5yk3bcnjb1mqc"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base tasty tasty-quickcheck vector ]; description = "Vectors with O(1) reverse"; @@ -301271,8 +303147,8 @@ self: { }: mkDerivation { pname = "vector-split"; - version = "1.0.0.2"; - sha256 = "05mxkgcg5v2w0vnqq8z5s6aj0aqi7b55mh6knaafalpc1yjyxbml"; + version = "1.0.0.3"; + sha256 = "1y2imndpyx15jmiajhabi34522jcayrz05zrxiv1srj4fssz56bd"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck split tasty tasty-quickcheck vector @@ -301311,8 +303187,8 @@ self: { pname = "vector-stream"; version = "0.1.0.0"; sha256 = "0v40vdpp35lhnnnx7q17fah0c14jrkjlnwsk0q4mbwb7ch7j3258"; - revision = "1"; - editedCabalFile = "18sm3vd1qim9r3m40wgvnmcrfz1zl051yy84dffnp4si9vfgic09"; + revision = "2"; + editedCabalFile = "1jldm2bh9d0y7vmyv3l85ilps4n8ypqr6da0cgqg5dfi3hlxbmpm"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -302830,6 +304706,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vty_5_38" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, containers, deepseq, directory, filepath, microlens + , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text + , transformers, unix, utf8-string, vector + }: + mkDerivation { + pname = "vty"; + version = "5.38"; + sha256 = "18s84rrc1dhm5j8c24r8lgk8hjdrwsdjgf6hilqcdm90dx6jz0al"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath microlens microlens-mtl microlens-th mtl + parsec stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers directory filepath microlens microlens-mtl mtl + ]; + description = "A simple terminal UI library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -302911,8 +304812,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.24.3"; - sha256 = "00ral8nlksr37xqdmy0wb4r3f67g81fd8xx4glw4zj07jqlk4pm3"; + version = "3.24.5"; + sha256 = "0b2r0malnzalz0s59sa4ryyy1qg8ii886g15dhkmzcpz29yzwrc3"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -303632,24 +305533,24 @@ self: { "wai-lambda" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , directory, http-types, iproute, network, temporary, text + , deepseq, directory, http-types, iproute, network, temporary, text , unliftio, unordered-containers, vault, wai }: mkDerivation { pname = "wai-lambda"; - version = "0.1.0.0"; - sha256 = "1m77i3zazvpa4jirvgxjdik5fnzarrbmavvi48d72c8a8jjwsx9x"; + version = "0.1.1.0"; + sha256 = "1qx69gp2mrlc1gy45vcyicj9f9wyzdnidkqw15lm4hdmz20qwjzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring case-insensitive directory http-types - iproute network temporary text unliftio unordered-containers vault - wai + aeson base binary bytestring case-insensitive deepseq directory + http-types iproute network temporary text unliftio + unordered-containers vault wai ]; executableHaskellDepends = [ - aeson base binary bytestring case-insensitive directory http-types - iproute network temporary text unliftio unordered-containers vault - wai + aeson base binary bytestring case-insensitive deepseq directory + http-types iproute network temporary text unliftio + unordered-containers vault wai ]; description = "Haskell Webapps on AWS Lambda"; license = lib.licenses.mit; @@ -304732,6 +306633,33 @@ self: { license = lib.licenses.mit; }) {}; + "wai-saml2_0_4" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, c14n, containers, cryptonite, data-default-class + , filepath, http-types, mtl, network-uri, pretty-show, tasty + , tasty-golden, text, time, vault, wai, wai-extra, x509, x509-store + , xml-conduit, zlib + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.4"; + sha256 = "0rsp4bz20a5fsl3plg6k40vqvnjp2h0hy7pkx5xf9iyfadv1a5jw"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring c14n containers + cryptonite data-default-class http-types mtl network-uri text time + vault wai wai-extra x509 x509-store xml-conduit zlib + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring c14n containers + cryptonite data-default-class filepath http-types mtl network-uri + pretty-show tasty tasty-golden text time vault wai wai-extra x509 + x509-store xml-conduit zlib + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-secure-cookies" = callPackage ({ mkDerivation, base, bytestring, cryptonite, hspec , hspec-expectations, hspec-wai, http-types, memory, random, split @@ -305215,6 +307143,42 @@ self: { pname = "warp"; version = "3.3.23"; sha256 = "0y1r7czq5zrgklqrx1b9pmxn5lhmf7zpqdjz7hfmnzsmr3vndmms"; + revision = "1"; + editedCabalFile = "04akn70kmgmw7scapks11srfy44nqj9cy03qsp6rawlzwbxwk9id"; + libraryHaskellDepends = [ + array auto-update base bsb-http-chunked bytestring case-insensitive + containers ghc-prim hashable http-date http-types http2 iproute + network recv simple-sendfile stm streaming-commons text + time-manager unix unix-compat unliftio vault wai word8 x509 + ]; + testHaskellDepends = [ + array auto-update base bsb-http-chunked bytestring case-insensitive + containers directory ghc-prim hashable hspec http-client http-date + http-types http2 iproute network process QuickCheck recv + simple-sendfile stm streaming-commons text 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 recv time-manager unix unix-compat unliftio x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + }) {}; + + "warp_3_3_24" = 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 + , http-types, http2, iproute, network, process, QuickCheck, recv + , simple-sendfile, stm, streaming-commons, text, time-manager, unix + , unix-compat, unliftio, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.24"; + sha256 = "0g15zv35gvadx55k5165idnj8vxkd57zlmirm9clb94ck6ckmkba"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -305235,6 +307199,7 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -305340,6 +307305,24 @@ self: { license = lib.licenses.mit; }) {}; + "warp-tls_3_3_5" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, recv, streaming-commons, tls, tls-session-manager + , unliftio, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.3.5"; + sha256 = "1w59szdx5jipww9ypm86cnaid24xmyb0fgp2qvz8cgcdd2jmmrc7"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network recv + streaming-commons tls tls-session-manager unliftio wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 @@ -305801,6 +307784,7 @@ self: { description = "Monoidally construct web pages"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "web-plugins" = callPackage @@ -305877,8 +307861,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.14.4"; - sha256 = "10zpyxigrmp97x7xd9aw8kn925ygjf0jv8hppxmksjf9a6pvyfn1"; + version = "0.27.15"; + sha256 = "1kmyhyc3c9b2k0678q8yhd52x51jz153i8180a16ig05w6clc4xx"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -305892,8 +307876,8 @@ self: { ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.4.3"; - sha256 = "1cdn29084i2bvsh7pa6d4dr5bgpixix36dhi49q8nbcbp02qycap"; + version = "0.28.4.4"; + sha256 = "0sbw93flmhbwdg1lag5jm7qi8nh5fy4k3anxijzf1472y6kqncrp"; libraryHaskellDepends = [ base boomerang mtl parsec text web-routes ]; @@ -305918,8 +307902,8 @@ self: { }: mkDerivation { pname = "web-routes-happstack"; - version = "0.23.12.2"; - sha256 = "01ks9c8bln8yiff7dqfm3ai7scci304q94w1zaqvzph57m1whrd6"; + version = "0.23.12.3"; + sha256 = "1qkbaq5k9as5s0bdaiza02jfg17vwmsfwg6r3gg95sh4l5rvwyx6"; libraryHaskellDepends = [ base bytestring happstack-server text web-routes ]; @@ -305982,8 +307966,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.7"; - sha256 = "0h3xaml18jgc66ylmwlymp1mqnf59lfvsd3xswdki8dk31ryaca4"; + version = "0.22.8.1"; + sha256 = "0sv8ya7s70zlfr9qhavpb9i0q3l5arcarsxgb20w6cbghfj67kh5"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -306288,8 +308272,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.4.1.2"; - sha256 = "1xdqq80jcxzd0qvmsgrcpjkw4lpcsws2pin2v3v1gpf0qv0syi36"; + version = "0.5.0.1"; + sha256 = "1nlcf3fgx4bp4pghbr5yy161sg1gkzxa1j0699r04dnw4i8qw9d0"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -306848,8 +308832,8 @@ self: { }: mkDerivation { pname = "webp"; - version = "0.1.0.1"; - sha256 = "12ryx87z36ra243vcira7jkpn6k3c5sqp5r4h7zvxxm64rajyxcd"; + version = "0.1.0.2"; + sha256 = "04bf0apq9q2kpkkhsj93y3fmjkind7dmgb3hf3nxlj7sy46d4mix"; libraryHaskellDepends = [ base bytestring JuicyPixels vector ]; libraryPkgconfigDepends = [ libwebp ]; libraryToolDepends = [ c2hs ]; @@ -306950,8 +308934,8 @@ self: { pname = "websockets"; version = "0.12.7.3"; sha256 = "0g3z0n4irf3gvbdf9p97jq05ybdg0gwjy5bj4nfc7ivsvyhaic6k"; - revision = "1"; - editedCabalFile = "1yx97y6jl74vy200y43vjxfyzx338kh10dx8vxkjhr0mfh36wldq"; + revision = "2"; + editedCabalFile = "045dsjhhwv73wrs6f91az9hvxygznmx14g6f3fv69yhz9s6lbkry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307107,19 +309091,14 @@ self: { }) {}; "wedged" = callPackage - ({ mkDerivation, array, base, colour, containers, diagrams-lib - , diagrams-postscript, MonadRandom, strict - }: + ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "wedged"; - version = "3"; - sha256 = "1v7xc7bnyhlb2fs0j8zafbnvzyl0hsdyl59f0kibmn0w6sxq34xl"; + version = "4"; + sha256 = "19zkwzj9daz1zz0g20bgr6ardqkgizhfnajdq44g7lydykjnnij4"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - array base colour containers diagrams-lib diagrams-postscript - MonadRandom strict - ]; + executableHaskellDepends = [ array base containers random ]; description = "Wedged postcard generator"; license = "unknown"; hydraPlatforms = lib.platforms.none; @@ -307181,7 +309160,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "weeder" = callPackage + "weeder_2_4_1" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl , optparse-applicative, regex-tdfa, text, transformers @@ -307203,6 +309182,33 @@ self: { ]; description = "Detect dead code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "weeder"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "weeder" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.5.0"; + sha256 = "17i8mmkmqf0fc1gad3r5zw3ypc31q2vwqryl5n1wbh402sycn7il"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; mainProgram = "weeder"; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -307301,8 +309307,8 @@ self: { }: mkDerivation { pname = "welford-online-mean-variance"; - version = "0.1.0.4"; - sha256 = "0nzr6krkaa39h9v25hbagnw1f2g45dqrv8ifhvh16m4k7xf17xla"; + version = "0.2.0.0"; + sha256 = "0js964yvcpksy4mf7vx5919wk4yygwhk77g8w6j52ibgs87rijhf"; libraryHaskellDepends = [ base cereal deepseq vector ]; testHaskellDepends = [ base cereal deepseq QuickCheck tasty tasty-discover @@ -307443,41 +309449,42 @@ self: { "what4" = callPackage ({ mkDerivation, async, attoparsec, base, bifunctors, bimap - , bv-sized, bytestring, concurrent-extra, config-value, containers - , contravariant, data-binary-ieee754, deepseq, deriving-compat - , directory, exceptions, filepath, fingertree, ghc-prim, hashable - , hashtables, hedgehog, io-streams, lens, libBF, lumberjack, mtl - , panic, parameterized-utils, prettyprinter, process, QuickCheck - , scientific, tasty, tasty-checklist, tasty-expected-failure - , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-sugar - , template-haskell, temporary, text, th-abstraction, th-lift - , th-lift-instances, transformers, unordered-containers - , utf8-string, vector, versions, zenc + , BoundedChan, bv-sized, bytestring, concurrent-extra, config-value + , containers, contravariant, deepseq, deriving-compat, directory + , exceptions, filepath, fingertree, ghc-prim, hashable, hashtables + , hedgehog, io-streams, lens, libBF, lumberjack, megaparsec, mtl + , ordered-containers, panic, parameterized-utils, parsec + , prettyprinter, process, QuickCheck, s-cargot, scientific, stm + , tasty, tasty-checklist, tasty-expected-failure, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, tasty-sugar, template-haskell + , temporary, text, th-abstraction, th-lift, th-lift-instances, time + , transformers, unliftio, unordered-containers, utf8-string, vector + , versions, zenc }: mkDerivation { pname = "what4"; - version = "1.3"; - sha256 = "03p4sk543vygmah0mf1nzlxv9l3qzaiy023if3cszcwys22gr7kq"; + version = "1.4"; + sha256 = "1cmvf1cn4x3g86idbhs27f2hpm0vri51hcrvlss2bx4z85vk649b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - async attoparsec base bifunctors bimap bv-sized bytestring - concurrent-extra config-value containers data-binary-ieee754 - deepseq deriving-compat directory exceptions filepath fingertree - ghc-prim hashable hashtables io-streams lens libBF mtl panic - parameterized-utils prettyprinter process scientific - template-haskell temporary text th-abstraction th-lift - th-lift-instances transformers unordered-containers utf8-string - vector versions zenc + async attoparsec base bifunctors bimap BoundedChan bv-sized + bytestring concurrent-extra config-value containers deepseq + deriving-compat directory exceptions filepath fingertree ghc-prim + hashable hashtables io-streams lens libBF megaparsec mtl + ordered-containers panic parameterized-utils parsec prettyprinter + process s-cargot scientific stm template-haskell temporary text + th-abstraction th-lift th-lift-instances time transformers unliftio + unordered-containers utf8-string vector versions zenc ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ - base bv-sized bytestring containers contravariant - data-binary-ieee754 exceptions hedgehog io-streams libBF lumberjack + async base bv-sized bytestring containers contravariant directory + exceptions hedgehog io-streams libBF lumberjack ordered-containers parameterized-utils prettyprinter process QuickCheck tasty tasty-checklist tasty-expected-failure tasty-hedgehog tasty-hunit - tasty-quickcheck tasty-sugar text transformers versions + tasty-quickcheck tasty-sugar temporary text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -308077,8 +310084,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.1.5.0"; - sha256 = "1lg3kdy18d1cabb39hrj7k9s4ryc1bfrx6ln5k3j640ankdv1asj"; + version = "1.1.6.0"; + sha256 = "0bhrf3c3djchi2y0rcz015g34a4g8f1pfc8r89kpqbf2pfd8gw73"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -308090,14 +310097,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "witch_1_1_6_0" = callPackage + "witch_1_1_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, tagged , template-haskell, text, time, transformers }: mkDerivation { pname = "witch"; - version = "1.1.6.0"; - sha256 = "0bhrf3c3djchi2y0rcz015g34a4g8f1pfc8r89kpqbf2pfd8gw73"; + version = "1.1.6.1"; + sha256 = "1n4kckgk5v63bpjgky3dfgyayl82hlnxzwaa99pzyxrcjkpql5ay"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -308755,8 +310762,10 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.8"; - sha256 = "0ncs3g174db6508fic7x2xibvkccmz068g6hizp8fi20bwxb9js8"; + version = "0.1.2.9"; + sha256 = "0i0bdxm9pr7a1qzr73657xy62d05a54k3ksy229q07ydz04j5mmz"; + revision = "1"; + editedCabalFile = "0fmbhinfg1lcqym0b3wx5q0zv3r7pl9l0as3rv33gh2gjcvvf2nv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308772,7 +310781,9 @@ self: { benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "wrd"; + broken = true; }) {}; "wordcloud" = callPackage @@ -309207,8 +311218,8 @@ self: { }: mkDerivation { pname = "wraxml"; - version = "0.4.4.2"; - sha256 = "1cfbbr1fbp7wrm2w7rldvf3gvp8fzvnpa6c2mkxscarhmn5wl92z"; + version = "0.4.4.3"; + sha256 = "11b48rjpj2glm5bxg8mw9m73qfprb2a8gc57s06sh0n50295di2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309936,14 +311947,15 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets + ({ mkDerivation, base, bytestring, connection, exceptions, network + , websockets }: mkDerivation { pname = "wuss"; - version = "2.0.0.2"; - sha256 = "04jqq3blzyxqyymhcjsm5z89whk5y7cvnd9dw6nlc40vq4w4v802"; + version = "2.0.1.1"; + sha256 = "0mdj161z6dxvdm94r2mclv1yq90d2fz0c4q1jsv4qwq8g8abf8r0"; libraryHaskellDepends = [ - base bytestring connection network websockets + base bytestring connection exceptions network websockets ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; @@ -310354,8 +312366,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "1.1.2"; - sha256 = "068g730p0rbsf1l7k9jgc9d7ng0zx3552wqk357wl3q56jac0chs"; + version = "1.2.0"; + sha256 = "0xsjr73ayld2ra40715hk319cc353vpiv2xpv58cvwfdh76n5nsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310372,9 +312384,7 @@ self: { ]; description = "A cffi-based python binding for X"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "xcffibgen"; - broken = true; }) {}; "xchat-plugin" = callPackage @@ -310989,8 +312999,8 @@ self: { }: mkDerivation { pname = "xml-basic"; - version = "0.1.3.1"; - sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d"; + version = "0.1.3.2"; + sha256 = "0kj26v20rakmmxk0gf6dccmxkcv39mnpcj9dfx45yr27a53b8170"; libraryHaskellDepends = [ base containers data-accessor explicit-exception semigroups utility-ht @@ -311319,8 +313329,8 @@ self: { pname = "xml-lens"; version = "0.3.1"; sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; - revision = "1"; - editedCabalFile = "0ga90h55aw3f946xk1x2ailnwinw3v4icw9xirgncgf3lajwxl4f"; + revision = "2"; + editedCabalFile = "0n4clndkzg6cjw0slkbrn64byzdnlsxrf6va3xgvsry9d1i18ihf"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -311815,8 +313825,8 @@ self: { }: mkDerivation { pname = "xmlhtml"; - version = "0.2.5.3"; - sha256 = "0nvwrl4cw7hfsbndmxdmzs3cs35hs01bja6hrjrc8fairaaif2rf"; + version = "0.2.5.4"; + sha256 = "11aldkcd3lcxax42f4080127hqs1k95k84h5griwq27ig8gmbxdc"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -312257,8 +314267,8 @@ self: { pname = "xor"; version = "0.0.1.1"; sha256 = "05jwfrg4cm27ldj3dbl0y144njhiha9yiypirbhsg6lc1b36s3kh"; - revision = "1"; - editedCabalFile = "0ppy515y2y1bviaafx6hg440ain0l6j5pg4g5j7lwjzsknxb0jd5"; + revision = "2"; + editedCabalFile = "02y2587racvd9ppmllivzzn6zvdm051i6sc795lshvdq24ivvh9q"; libraryHaskellDepends = [ base bytestring ghc-byteorder ]; testHaskellDepends = [ base bytestring ghc-byteorder QuickCheck tasty tasty-hunit @@ -312788,8 +314798,8 @@ self: { }: mkDerivation { pname = "yahoo-prices"; - version = "0.1.0.2"; - sha256 = "1zyrj6rq75blzh1v9ja2bbyfaf3c2a6648lcmflmxmd45350ah9f"; + version = "0.1.0.5"; + sha256 = "0hkws2l46m9a859a9diph341shkq4x1270x5axj4clg36lsi5hcd"; libraryHaskellDepends = [ base bytestring cassava lens time vector wreq ]; @@ -313133,10 +315143,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.8.0"; - sha256 = "1s0arllihjjqp65jbc8c1w5106i2infppsirvbsifpmpkf14w6pn"; - revision = "2"; - editedCabalFile = "1dix5jm3d380vjr9l6wqz54zk883kilk8rijlvjp6b13mjxwcj1l"; + version = "0.11.10.0"; + sha256 = "01zylkpfrbwfbqxan9qywcjq6j6nks0pd6hjkah4lvr6vs9x4n38"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -313540,8 +315548,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14"; - sha256 = "1w2p15j1fh2xv460xc40w7li2mvv4nwqqys1xhr9zpby2cdkc39h"; + version = "0.14.1"; + sha256 = "163kl1iqldlz3b429zbyvasgd7kkv7z0h3vkk753273xl6kfx0xr"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -314550,8 +316558,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.0.2"; - sha256 = "1dnpw1rl8pa7dwfiy203l54x1rrzaiib7ryha9yy2vyaljlymg4v"; + version = "0.7.0.3"; + sha256 = "0qadhf72v71rzfzcbgfgxyf1dydf0x343n49995s6vkjx6p0kyy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -314787,8 +316795,8 @@ self: { pname = "yesod-colonnade"; version = "1.3.0.1"; sha256 = "1x5m3xv4jq2x49fnvxw3v8bvbsx4hdccykcn32fz3cwavp4p1q1p"; - revision = "2"; - editedCabalFile = "0z3zcfxsbjm1azbbscccimsazkc10jp0i24wznwb2pvm4pa5a7j4"; + revision = "3"; + editedCabalFile = "040r3scz1155ci40q3q7lhqyqfdq3x9cg2zp9jw1lqppl426fzmy"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade conduit conduit-extra text yesod-core yesod-elements @@ -314876,10 +316884,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.0"; - sha256 = "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10"; - revision = "1"; - editedCabalFile = "1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl"; + version = "1.6.24.1"; + sha256 = "1jbalzr3m92sfqladcpnvm6394qda0arhyzx7dychknssvbd2j3d"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -315176,8 +317182,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.7.3"; - sha256 = "10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww"; + version = "1.7.4"; + sha256 = "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -317109,8 +319115,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.7.1.3"; - sha256 = "120ppqk1jpkxjw3ip3q27f3aaghm4s725g6lmi54ma9f0s3m4hy9"; + version = "0.7.2"; + sha256 = "0prjrsz9xgk5drf2bp1mq7mq88w61zrn5g3qk1v93scpjp02dvs5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -317120,7 +319126,9 @@ self: { ]; description = "Builds a static website from templates and data in YAML or CSV files"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; mainProgram = "yst"; + broken = true; }) {}; "ytl" = callPackage @@ -317149,6 +319157,8 @@ self: { testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yu-core" = callPackage @@ -317645,8 +319655,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.5"; - sha256 = "1fc58cq0dgzqfy84z8mbana8lisnc2df7k7jhramafpl7qgkp9q4"; + version = "1.0.7"; + sha256 = "1ss7p1wzcxiap8zm3i6hqllkd0hkrp6bgk4magbaxpy7ic9kifb9"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -318392,6 +320402,8 @@ self: { pname = "zlib"; version = "0.6.3.0"; sha256 = "1nh4xsm3kgsg76jmkcphvy7hhslg9hx1s75mpsskhi2ksjd9ialy"; + revision = "1"; + editedCabalFile = "1z2dyphqmjb9akzqrqh8k82mfv416hqj82nz8mysidx09jgf7p4s"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ @@ -318687,8 +320699,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.1.1"; - sha256 = "02hhscjj1rql1xn08x1dh5lppsvrs059wh2psxz5i2glwc7jgd9a"; + version = "0.2.1.2"; + sha256 = "1c0j41riwcp4c2cvalcrkz6cwrp9vw2hfmpadsfsfb2sa7qmf8rj"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index ebaba1a22fa6d..fa6d2a20a9a23 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -464,4 +464,44 @@ rec { allowInconsistentDependencies = overrideCabal (drv: { allowInconsistentDependencies = true; }); + + # Work around a Cabal bug requiring pkg-config --static --libs to work even + # when linking dynamically, affecting Cabal 3.8 and 3.9. + # https://github.com/haskell/cabal/issues/8455 + # + # For this, we treat the runtime system/pkg-config dependencies of a Haskell + # derivation as if they were propagated from their dependencies which allows + # pkg-config --static to work in most cases. + # + # Warning: This function may change or be removed at any time, e.g. if we find + # a different workaround, upstream fixes the bug or we patch Cabal. + __CabalEagerPkgConfigWorkaround = + let + # Take list of derivations and return list of the transitive dependency + # closure, only taking into account buildInputs. Loosely based on + # closePropagationFast. + propagatedPlainBuildInputs = drvs: + builtins.map (i: i.val) ( + builtins.genericClosure { + startSet = builtins.map (drv: + { key = drv.outPath; val = drv; } + ) drvs; + operator = { val, ... }: + if !lib.isDerivation val + then [ ] + else + builtins.concatMap (drv: + if !lib.isDerivation drv + then [ ] + else [ { key = drv.outPath; val = drv; } ] + ) (val.buildInputs or [ ] ++ val.propagatedBuildInputs or [ ]); + } + ); + in + overrideCabal (old: { + benchmarkPkgconfigDepends = propagatedPlainBuildInputs old.benchmarkPkgconfigDepends or [ ]; + executablePkgconfigDepends = propagatedPlainBuildInputs old.executablePkgconfigDepends or [ ]; + libraryPkgconfigDepends = propagatedPlainBuildInputs old.libraryPkgconfigDepends or [ ]; + testPkgconfigDepends = propagatedPlainBuildInputs old.testPkgconfigDepends or [ ]; + }); } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 5b9546e7505fa..7104a2164af39 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -254,7 +254,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # a cabal flag with '--flag=myflag'. developPackage = { root - , name ? if builtins.typeOf root == "path" then builtins.baseNameOf root else "" + , name ? lib.optionalString (builtins.typeOf root == "path") (builtins.baseNameOf root) , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index 688844bcc46c9..50daaf136231f 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -10,9 +10,8 @@ let let version = pkg.version or ""; in - if isPvpVersion version then - ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"'' - else ""; + lib.optionalString (isPvpVersion version) + ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"''; all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); in runCommand "hackage-package-list" { } diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch deleted file mode 100644 index 9e1eeb7516023..0000000000000 --- a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 -From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> -Date: Wed, 10 Apr 2019 17:42:57 +0100 -Subject: [PATCH] Allow http-client 0.6.*. - -Changelog doesn't list any silently breaking semantic changes. ---- - amazonka/amazonka.cabal | 2 +- - core/amazonka-core.cabal | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal -index e86713f11c..81c4cb7e48 100644 ---- a/amazonka.cabal -+++ b/amazonka.cabal -@@ -67,7 +67,7 @@ library - , conduit-extra >= 1.1 - , directory >= 1.2 - , exceptions >= 0.6 -- , http-client >= 0.4 && < 0.6 -+ , http-client >= 0.4 && < 0.7 - , http-conduit >= 2.1.7 && < 3 - , http-types >= 0.8 - , ini >= 0.3.5 diff --git a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch deleted file mode 100644 index d99072d79c6e2..0000000000000 --- a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 -From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com> -Date: Wed, 10 Apr 2019 17:42:57 +0100 -Subject: [PATCH] Allow http-client 0.6.*. - -Changelog doesn't list any silently breaking semantic changes. ---- - amazonka/amazonka.cabal | 2 +- - core/amazonka-core.cabal | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal -index 9796e007cf..eccb24e5bd 100644 ---- a/amazonka-core.cabal -+++ b/amazonka-core.cabal -@@ -90,7 +90,7 @@ library - , deepseq >= 1.4 - , exceptions >= 0.6 - , hashable >= 1.2 -- , http-client >= 0.4 && < 0.6 -+ , http-client >= 0.4 && < 0.7 - , http-conduit >= 2.1.4 && < 3 - , http-types >= 0.8 && (<0.11 || >=0.12) - , lens >= 4.4 --- -2.23.0 diff --git a/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch b/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch deleted file mode 100644 index 04ff068e1d02e..0000000000000 --- a/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch +++ /dev/null @@ -1,333 +0,0 @@ -From 2490fa65eeba52699a7c0e303aa5cb9b78c2b1cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Fri, 17 Apr 2020 20:49:23 +0200 -Subject: [PATCH] Compile against GHC 8.8 - ---- - Setup.hs | 15 --------------- - src/Darcs/Patch/Depends.hs | 2 +- - src/Darcs/Patch/Match.hs | 12 ++++++------ - src/Darcs/Patch/PatchInfoAnd.hs | 2 +- - src/Darcs/Patch/Prim/V1/Apply.hs | 6 +++--- - src/Darcs/Patch/Prim/V1/Commute.hs | 1 + - src/Darcs/Patch/ReadMonads.hs | 1 + - src/Darcs/Patch/V1/Commute.hs | 1 + - src/Darcs/Repository/Diff.hs | 2 +- - src/Darcs/Repository/Match.hs | 2 +- - src/Darcs/Util/Tree/Monad.hs | 4 ++-- - 12 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/Setup.hs b/Setup.hs -index f5cc3e8..05caac4 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -75,21 +75,6 @@ - postInst = \ _ flags pkg lbi -> - installManpage pkg lbi (fromFlag $ installVerbosity flags) NoCopyDest, - -- sDistHook = \ pkg lbi hooks flags -> do -- let pkgVer = packageVersion pkg -- verb = fromFlag $ sDistVerbosity flags -- x <- versionPatches verb pkgVer -- y <- context verb -- rewriteFileEx silent "release/distributed-version" $ show x -- rewriteFileEx silent "release/distributed-context" $ show y -- putStrLn "about to hand over" -- let pkg' = pkg { library = sanity (library pkg) } -- sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } -- sanity _ = error "eh" -- sanity' bi = bi { otherModules = [ m | m <- otherModules bi, toFilePath m /= "Version" ] } -- -- sDistHook simpleUserHooks pkg' lbi hooks flags -- , - postConf = \_ _ _ _ -> return () --- Usually this checked for external C - --- dependencies, but we already have performed such - --- check in the confHook ---- a/darcs.cabal 1970-01-01 01:00:01.000000000 +0100 -+++ b/darcs.cabal 2020-04-18 10:26:07.605129733 +0200 -@@ -1,6 +1,5 @@ - Name: darcs - version: 2.14.2 --x-revision: 1 - License: GPL-2 - License-file: COPYING - Author: David Roundy <droundy@darcs.net>, <darcs-devel@darcs.net> -@@ -75,7 +74,7 @@ - description: Use libcurl for HTTP support. - - -- in future this could extend to any other external libraries, ---- e.g. libiconv -+-- e.g. libiconv - flag pkgconfig - description: Use pkgconfig to configure libcurl - default: False -@@ -113,7 +112,7 @@ - -- ---------------------------------------------------------------------- - - custom-setup -- setup-depends: base >= 4.9 && < 4.13, -+ setup-depends: base >= 4.9 && <5, - Cabal >= 1.24, - process >= 1.2.3.0 && < 1.7, - filepath >= 1.4.1 && < 1.5.0.0, -@@ -381,7 +380,7 @@ - else - build-depends: unix >= 2.7.1.0 && < 2.8 - -- build-depends: base >= 4.9 && < 4.13, -+ build-depends: base >= 4.9 && <5, - stm >= 2.1 && < 2.6, - binary >= 0.5 && < 0.10, - containers >= 0.5.6.2 && < 0.7, -@@ -402,19 +401,19 @@ - tar >= 0.5 && < 0.6, - data-ordlist == 0.4.*, - attoparsec >= 0.13.0.1 && < 0.14, -- zip-archive >= 0.3 && < 0.5, -+ zip-archive >= 0.3 && <1, - async >= 2.0.2 && < 2.3, -- sandi >= 0.4 && < 0.6, -+ sandi >= 0.4 && <1, - unix-compat >= 0.4.2 && < 0.6, - bytestring >= 0.10.6 && < 0.11, - old-time >= 1.1.0.3 && < 1.2, - time >= 1.5.0.1 && < 1.10, -- text >= 1.2.1.3 && < 1.3, -+ text >= 1.2.1.3 && <2, - directory >= 1.2.6.2 && < 1.4, - process >= 1.2.3.0 && < 1.7, - array >= 0.5.1.0 && < 0.6, - random >= 1.1 && < 1.2, -- hashable >= 1.2.3.3 && < 1.3, -+ hashable >= 1.2.3.3 && <2, - mmap >= 0.5.9 && < 0.6, - zlib >= 0.6.1.2 && < 0.7.0.0, - network-uri == 2.6.*, -@@ -443,7 +442,7 @@ - - -- The terminfo package cannot be built on Windows. - if flag(terminfo) && !os(windows) -- build-depends: terminfo >= 0.4.0.2 && < 0.5 -+ build-depends: terminfo >= 0.4.0.2 && <1 - cpp-options: -DHAVE_TERMINFO - - default-extensions: -@@ -500,7 +499,7 @@ - cc-options: -D_REENTRANT - - build-depends: darcs, -- base >= 4.9 && < 4.13 -+ base >= 4.9 && <5 - - -- ---------------------------------------------------------------------- - -- unit test driver -@@ -518,7 +517,7 @@ - build-depends: Win32 >= 2.3.1 && < 2.4 - - build-depends: darcs, -- base >= 4.9 && < 4.13, -+ base >= 4.9 && <5, - array >= 0.5.1.0 && < 0.6, - bytestring >= 0.10.6 && < 0.11, - cmdargs >= 0.10.10 && < 0.11, -@@ -527,15 +526,15 @@ - mtl >= 2.2.1 && < 2.3, - shelly >= 1.6.8 && < 1.9, - split >= 0.2.2 && < 0.3, -- text >= 1.2.1.3 && < 1.3, -+ text >= 1.2.1.3 && <2, - directory >= 1.2.6.2 && < 1.4, - FindBin >= 0.0.5 && < 0.1, -- QuickCheck >= 2.8.2 && < 2.13, -+ QuickCheck >= 2.8.2 && <3, - HUnit >= 1.3 && < 1.7, - test-framework >= 0.8.1.1 && < 0.9, - test-framework-hunit >= 0.3.0.2 && < 0.4, - test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, -- zip-archive >= 0.3 && < 0.5 -+ zip-archive >= 0.3 && <1 - - -- https://github.com/yesodweb/Shelly.hs/issues/177 - if os(windows) -diff --git a/src/Darcs/Patch/Depends.hs b/src/Darcs/Patch/Depends.hs -index 8531294..a4c71cb 100644 ---- a/src/Darcs/Patch/Depends.hs -+++ b/src/Darcs/Patch/Depends.hs -@@ -251,7 +251,7 @@ splitOnTag _ (PatchSet NilRL NilRL) = Nothing - unwrapOneTagged :: (Monad m) => PatchSet rt p wX wY -> m (PatchSet rt p wX wY) - unwrapOneTagged (PatchSet (ts :<: Tagged t _ tps) ps) = - return $ PatchSet ts (tps :<: t +<+ ps) --unwrapOneTagged _ = fail "called unwrapOneTagged with no Tagged's in the set" -+unwrapOneTagged _ = error "called unwrapOneTagged with no Tagged's in the set" - - -- | @getUncovered ps@ returns the 'PatchInfo' for all the patches in - -- @ps@ that are not depended on by anything else *through explicit -diff --git a/src/Darcs/Patch/Match.hs b/src/Darcs/Patch/Match.hs -index aba6c7a..2b6f53a 100644 ---- a/src/Darcs/Patch/Match.hs -+++ b/src/Darcs/Patch/Match.hs -@@ -421,7 +421,7 @@ getNonrangeMatchS fs repo = - Just m -> if nonrangeMatcherIsTag fs - then getTagS m repo - else getMatcherS Exclusive m repo -- Nothing -> fail "Pattern not specified in getNonrangeMatch." -+ Nothing -> error "Pattern not specified in getNonrangeMatch." - - -- | @firstMatch fs@ tells whether @fs@ implies a "first match", that - -- is if we match against patches from a point in the past on, rather -@@ -441,7 +441,7 @@ getFirstMatchS fs repo = - Just (_,b) -> unpullLastN repo b -- b is chronologically earlier than a - Nothing -> - case firstMatcher fs of -- Nothing -> fail "Pattern not specified in getFirstMatchS." -+ Nothing -> error "Pattern not specified in getFirstMatchS." - Just m -> if firstMatcherIsTag fs - then getTagS m repo - else getMatcherS Inclusive m repo -@@ -462,7 +462,7 @@ checkMatchSyntax :: [MatchFlag] -> IO () - checkMatchSyntax opts = - case getMatchPattern opts of - Nothing -> return () -- Just p -> either fail (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) -+ Just p -> either error (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) - - getMatchPattern :: [MatchFlag] -> Maybe String - getMatchPattern [] = Nothing -@@ -718,7 +718,7 @@ getMatcherS :: (ApplyMonad (ApplyState p) m, Matchable p) => - getMatcherS ioe m repo = - if matchExists m repo - then applyInvToMatcher ioe m repo -- else fail $ "Couldn't match pattern "++ show m -+ else error $ "Couldn't match pattern "++ show m - - getTagS :: (ApplyMonad (ApplyState p) m, MonadProgress m, Matchable p) => - Matcher rt p -> PatchSet rt p Origin wX -> m () -diff --git a/src/Darcs/Patch/PatchInfoAnd.hs b/src/Darcs/Patch/PatchInfoAnd.hs -index 2da7ec8..1147410 100644 ---- a/src/Darcs/Patch/PatchInfoAnd.hs -+++ b/src/Darcs/Patch/PatchInfoAnd.hs -@@ -167,7 +167,7 @@ conscientiously er (PIAP pinf hp) = - - -- | @hopefullyM@ is a version of @hopefully@ which calls @fail@ in a - -- monad instead of erroring. --hopefullyM :: Monad m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) -+hopefullyM :: MonadFail m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) - hopefullyM (PIAP pinf hp) = case hopefully2either hp of - Right p -> return p - Left e -> fail $ renderString -diff --git a/src/Darcs/Patch/Prim/V1/Apply.hs b/src/Darcs/Patch/Prim/V1/Apply.hs -index bea7e41..7984d21 100644 ---- a/src/Darcs/Patch/Prim/V1/Apply.hs -+++ b/src/Darcs/Patch/Prim/V1/Apply.hs -@@ -41,13 +41,13 @@ instance Apply Prim where - apply (FP f (TokReplace t o n)) = mModifyFilePS f doreplace - where doreplace fc = - case tryTokReplace t (BC.pack o) (BC.pack n) fc of -- Nothing -> fail $ "replace patch to " ++ fn2fp f -+ Nothing -> error $ "replace patch to " ++ fn2fp f - ++ " couldn't apply." - Just fc' -> return fc' - apply (FP f (Binary o n)) = mModifyFilePS f doapply - where doapply oldf = if o == oldf - then return n -- else fail $ "binary patch to " ++ fn2fp f -+ else error $ "binary patch to " ++ fn2fp f - ++ " couldn't apply." - apply (DP d AddDir) = mCreateDirectory d - apply (DP d RmDir) = mRemoveDirectory d -@@ -115,7 +115,7 @@ applyHunk f h fc = - case applyHunkLines h fc of - Right fc' -> return fc' - Left msg -> -- fail $ -+ error $ - "### Error applying:\n" ++ renderHunk h ++ - "\n### to file " ++ fn2fp f ++ ":\n" ++ BC.unpack fc ++ - "### Reason: " ++ msg -diff --git a/src/Darcs/Patch/Prim/V1/Commute.hs b/src/Darcs/Patch/Prim/V1/Commute.hs -index 7639dbd..e1432e6 100644 ---- a/src/Darcs/Patch/Prim/V1/Commute.hs -+++ b/src/Darcs/Patch/Prim/V1/Commute.hs -@@ -58,6 +58,7 @@ instance Monad Perhaps where - Failed >>= _ = Failed - Unknown >>= _ = Unknown - return = Succeeded -+instance MonadFail Perhaps where - fail _ = Unknown - - instance Alternative Perhaps where -diff --git a/src/Darcs/Patch/ReadMonads.hs b/src/Darcs/Patch/ReadMonads.hs -index 62a4f81..e1cb149 100644 ---- a/src/Darcs/Patch/ReadMonads.hs -+++ b/src/Darcs/Patch/ReadMonads.hs -@@ -237,6 +237,7 @@ failSM _ = SM (\_ -> Nothing) - instance Monad SM where - (>>=) = bindSM - return = returnSM -+instance MonadFail SM where - fail = failSM - - instance ParserM SM where -diff --git a/src/Darcs/Patch/V1/Commute.hs b/src/Darcs/Patch/V1/Commute.hs -index 0bb41a3..c6c3382 100644 ---- a/src/Darcs/Patch/V1/Commute.hs -+++ b/src/Darcs/Patch/V1/Commute.hs -@@ -93,6 +93,7 @@ instance Monad Perhaps where - Failed >>= _ = Failed - Unknown >>= _ = Unknown - return = Succeeded -+instance MonadFail Perhaps where - fail _ = Unknown - - instance Alternative Perhaps where -diff --git a/src/Darcs/Repository/Diff.hs b/src/Darcs/Repository/Diff.hs -index 8078d49..e0e2341 100644 ---- a/src/Darcs/Repository/Diff.hs -+++ b/src/Darcs/Repository/Diff.hs -@@ -138,7 +138,7 @@ treeDiff da ft t1 t2 = do - do rmDirP <- diff p (Removed subtree) - addFileP <- diff p (Changed (File emptyBlob) b') - return $ joinGap (+>+) rmDirP addFileP -- diff p _ = fail $ "Missing case at path " ++ show p -+ diff p _ = error $ "Missing case at path " ++ show p - - text_diff p a b - | BL.null a && BL.null b = emptyGap NilFL -diff --git a/src/Darcs/Repository/Match.hs b/src/Darcs/Repository/Match.hs -index 08c9f13..f33cabe 100644 ---- a/src/Darcs/Repository/Match.hs -+++ b/src/Darcs/Repository/Match.hs -@@ -60,7 +60,7 @@ getNonrangeMatch :: (ApplyMonad (ApplyState p) DefaultIO, IsRepoType rt, RepoPat - getNonrangeMatch r = withRecordedMatch r . getMatch where - getMatch fs = case hasIndexRange fs of - Just (n, m) | n == m -> applyNInv (n-1) -- | otherwise -> fail "Index range is not allowed for this command." -+ | otherwise -> error "Index range is not allowed for this command." - _ -> getNonrangeMatchS fs - - getOnePatchset :: (IsRepoType rt, RepoPatch p) -diff --git a/src/Darcs/Util/Tree/Monad.hs b/src/Darcs/Util/Tree/Monad.hs -index 0e01d9b..296fdc4 100644 ---- a/src/Darcs/Util/Tree/Monad.hs -+++ b/src/Darcs/Util/Tree/Monad.hs -@@ -216,7 +216,7 @@ instance (Monad m) => TreeRO (TreeMonad m) where - t <- gets tree - let f = findFile t p' - case f of -- Nothing -> fail $ "No such file " ++ show p' -+ Nothing -> error $ "No such file " ++ show p' - Just x -> lift (readBlob x) - - currentDirectory = ask -@@ -251,7 +251,7 @@ instance (Monad m) => TreeRW (TreeMonad m) where - let item = find tr from' - found_to = find tr to' - unless (isNothing found_to) $ -- fail $ "Error renaming: destination " ++ show to ++ " exists." -+ error $ "Error renaming: destination " ++ show to ++ " exists." - unless (isNothing item) $ do - modifyItem from Nothing - modifyItem to item --- -2.23.1 - diff --git a/pkgs/development/haskell-modules/patches/darcs-setup.patch b/pkgs/development/haskell-modules/patches/darcs-setup.patch deleted file mode 100644 index fbc7efde428e3..0000000000000 --- a/pkgs/development/haskell-modules/patches/darcs-setup.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- darcs-2.14.2/Setup.hs 2019-01-27 03:14:51.000000000 +1300 -+++ darcs.net/Setup.hs 2019-10-18 02:41:57.000000000 +1300 -@@ -11,7 +11,9 @@ - , TestSuite(testBuildInfo) - , updatePackageDescription - , cppOptions, ccOptions -- , library, libBuildInfo, otherModules ) -+ , library, libBuildInfo, otherModules -+ , ComponentName(CExeName) -+ ) - import Distribution.Package - ( packageVersion ) - import Distribution.Version( Version ) -@@ -21,24 +23,27 @@ - import Distribution.Simple.Setup - (buildVerbosity, copyDest, copyVerbosity, fromFlag, - haddockVerbosity, installVerbosity, sDistVerbosity, replVerbosity ) --import Distribution.Simple.BuildPaths ( autogenModulesDir ) -+import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) - import Distribution.System - ( OS(Windows), buildOS ) - import Distribution.Simple.Utils - (copyFiles, createDirectoryIfMissingVerbose, rawSystemStdout, -- rewriteFile ) -+ rewriteFileEx) -+import Distribution.Types.UnqualComponentName - import Distribution.Verbosity -- ( Verbosity ) -+ ( Verbosity, silent ) - import Distribution.Text - ( display ) --import Control.Monad ( unless, void ) - -+import Control.Monad ( unless, when, void ) - import System.Directory - ( doesDirectoryExist, doesFileExist ) - import System.IO - ( openFile, IOMode(..) ) - import System.Process (runProcess) - import Data.List( isInfixOf, lines ) -+import qualified Data.Map as M -+import Data.Maybe ( isJust ) - import System.FilePath ( (</>) ) - import Foreign.Marshal.Utils ( with ) - import Foreign.Storable ( peek ) -@@ -75,8 +80,8 @@ - verb = fromFlag $ sDistVerbosity flags - x <- versionPatches verb pkgVer - y <- context verb -- rewriteFile "release/distributed-version" $ show x -- rewriteFile "release/distributed-context" $ show y -+ rewriteFileEx silent "release/distributed-version" $ show x -+ rewriteFileEx silent "release/distributed-context" $ show y - putStrLn "about to hand over" - let pkg' = pkg { library = sanity (library pkg) } - sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } -@@ -105,8 +110,7 @@ - littleEndian <- testEndianness - let args = ("-DPACKAGE_VERSION=" ++ show' version) : - [arg | (arg, True) <- -- include fst iff snd. -- [-- We have MAPI iff building on/for Windows. -- ("-DHAVE_MAPI", buildOS == Windows), -+ [ - ("-DLITTLEENDIAN", littleEndian), - ("-DBIGENDIAN", not littleEndian)]] - bi = emptyBuildInfo { cppOptions = args, ccOptions = args } -@@ -133,20 +137,26 @@ - -- man page - -- --------------------------------------------------------------------- - -+hasDarcsExe :: LocalBuildInfo -> Bool -+hasDarcsExe = isJust . M.lookup darcsExe . componentNameMap where -+ darcsExe = CExeName (mkUnqualComponentName "darcs") -+ - buildManpage :: LocalBuildInfo -> IO () --buildManpage lbi = do -- let darcs = buildDir lbi </> "darcs/darcs" -- manpage = buildDir lbi </> "darcs/darcs.1" -- manpageHandle <- openFile manpage WriteMode -- void $ runProcess darcs ["help","manpage"] -- Nothing Nothing Nothing (Just manpageHandle) Nothing -+buildManpage lbi = -+ when (hasDarcsExe lbi) $ do -+ let darcs = buildDir lbi </> "darcs/darcs" -+ manpage = buildDir lbi </> "darcs/darcs.1" -+ manpageHandle <- openFile manpage WriteMode -+ void $ runProcess darcs ["help","manpage"] -+ Nothing Nothing Nothing (Just manpageHandle) Nothing - --installManpage :: PackageDescription -> LocalBuildInfo -- -> Verbosity -> CopyDest -> IO () -+installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO () - installManpage pkg lbi verbosity copy = -- copyFiles verbosity -- (mandir (absoluteInstallDirs pkg lbi copy) </> "man1") -- [(buildDir lbi </> "darcs", "darcs.1")] -+ when (hasDarcsExe lbi) $ -+ copyFiles -+ verbosity -+ (mandir (absoluteInstallDirs pkg lbi copy) </> "man1") -+ [(buildDir lbi </> "darcs", "darcs.1")] - - -- --------------------------------------------------------------------- - -- version module -@@ -187,12 +197,13 @@ - generateVersionModule :: Verbosity -> LocalBuildInfo - -> String -> String -> IO () - generateVersionModule verbosity lbi version state = do -- let dir = autogenModulesDir lbi -+ let dir = autogenPackageModulesDir lbi - createDirectoryIfMissingVerbose verbosity True dir - ctx <- context verbosity - hash <- weakhash verbosity -- rewriteFile (dir </> "Version.hs") $ unlines -+ rewriteFileEx silent (dir </> "Version.hs") $ unlines - ["module Version where" -+ ,"import Darcs.Prelude" - ,"version, weakhash, context :: String" - ,"version = \"" ++ version ++ " (" ++ state ++ ")\"" - ,"weakhash = " ++ case hash of diff --git a/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch deleted file mode 100644 index 7ed390d3f237e..0000000000000 --- a/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch +++ /dev/null @@ -1,383 +0,0 @@ -Only in dbus-1.2.13-new: .codeclimate.yml -diff -ur dbus-1.2.13-old/dbus.cabal dbus-1.2.13-new/dbus.cabal ---- dbus-1.2.13-old/dbus.cabal 2020-04-25 19:29:27.372272952 +0200 -+++ dbus-1.2.13-new/dbus.cabal 2020-04-25 19:26:36.140991920 +0200 -@@ -1,172 +1,180 @@ --cabal-version: >=1.8 - name: dbus - version: 1.2.13 - license: Apache-2.0 - license-file: license.txt --maintainer: Andrey Sverdlichenko <blaze@ruddy.ru> - author: John Millikin <john@john-millikin.com> -+maintainer: Andrey Sverdlichenko <blaze@ruddy.ru> -+build-type: Simple -+cabal-version: >= 1.8 -+category: Network, Desktop - stability: experimental - homepage: https://github.com/rblaze/haskell-dbus#readme -+ - synopsis: A client library for the D-Bus IPC system. - description: -- D-Bus is a simple, message-based protocol for inter-process -- communication, which allows applications to interact with other parts of -- the machine and the user's session using remote procedure calls. -- . -- D-Bus is a essential part of the modern Linux desktop, where it replaces -- earlier protocols such as CORBA and DCOP. -- . -- This library is an implementation of the D-Bus protocol in Haskell. It -- can be used to add D-Bus support to Haskell applications, without the -- awkward interfaces common to foreign bindings. -- . -- Example: connect to the session bus, and get a list of active names. -- . -- @ -- {-\# LANGUAGE OverloadedStrings \#-} -- . -- import Data.List (sort) -- import DBus -- import DBus.Client -- . -- main = do --   client <- connectSession --   // --   \-- Request a list of connected clients from the bus --   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") --   { methodCallDestination = Just \"org.freedesktop.DBus\" --   } --   // --   \-- org.freedesktop.DBus.ListNames() returns a single value, which is --   \-- a list of names (here represented as [String]) --   let Just names = fromVariant (methodReturnBody reply !! 0) --   // --   \-- Print each name on a line, sorted so reserved names are below --   \-- temporary names. --   mapM_ putStrLn (sort names) -- @ -- . -- >$ ghc --make list-names.hs -- >$ ./list-names -- >:1.0 -- >:1.1 -- >:1.10 -- >:1.106 -- >:1.109 -- >:1.110 -- >ca.desrt.dconf -- >org.freedesktop.DBus -- >org.freedesktop.Notifications -- >org.freedesktop.secrets -- >org.gnome.ScreenSaver --category: Network, Desktop --build-type: Simple -+ D-Bus is a simple, message-based protocol for inter-process -+ communication, which allows applications to interact with other parts of -+ the machine and the user's session using remote procedure calls. -+ . -+ D-Bus is a essential part of the modern Linux desktop, where it replaces -+ earlier protocols such as CORBA and DCOP. -+ . -+ This library is an implementation of the D-Bus protocol in Haskell. It -+ can be used to add D-Bus support to Haskell applications, without the -+ awkward interfaces common to foreign bindings. -+ . -+ Example: connect to the session bus, and get a list of active names. -+ . -+ @ -+ {-\# LANGUAGE OverloadedStrings \#-} -+ . -+ import Data.List (sort) -+ import DBus -+ import DBus.Client -+ . -+ main = do -+   client <- connectSession -+   -+   -- Request a list of connected clients from the bus -+   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") -+   { methodCallDestination = Just \"org.freedesktop.DBus\" -+   } -+   -+   -- org.freedesktop.DBus.ListNames() returns a single value, which is -+   -- a list of names (here represented as [String]) -+   let Just names = fromVariant (methodReturnBody reply !! 0) -+   -+   -- Print each name on a line, sorted so reserved names are below -+   -- temporary names. -+   mapM_ putStrLn (sort names) -+ @ -+ . -+ >$ ghc --make list-names.hs -+ >$ ./list-names -+ >:1.0 -+ >:1.1 -+ >:1.10 -+ >:1.106 -+ >:1.109 -+ >:1.110 -+ >ca.desrt.dconf -+ >org.freedesktop.DBus -+ >org.freedesktop.Notifications -+ >org.freedesktop.secrets -+ >org.gnome.ScreenSaver -+ -+ - extra-source-files: -- examples/dbus-monitor.hs -- examples/export.hs -- examples/introspect.hs -- examples/list-names.hs -- idlxml/dbus.xml -+ examples/dbus-monitor.hs -+ examples/export.hs -+ examples/introspect.hs -+ examples/list-names.hs -+ idlxml/dbus.xml - - source-repository head -- type: git -- location: https://github.com/rblaze/haskell-dbus -+ type: git -+ location: https://github.com/rblaze/haskell-dbus - - library -- exposed-modules: -- DBus -- DBus.Client -- DBus.Generation -- DBus.Internal.Address -- DBus.Internal.Message -- DBus.Internal.Types -- DBus.Internal.Wire -- DBus.Introspection -- DBus.Introspection.Parse -- DBus.Introspection.Render -- DBus.Introspection.Types -- DBus.Socket -- DBus.TH -- DBus.Transport -- hs-source-dirs: lib -- ghc-options: -W -Wall -- build-depends: -- base ==4.*, -- bytestring <0.11, -- cereal <0.6, -- conduit >=1.3.0 && <1.4, -- containers <0.7, -- deepseq <1.5, -- exceptions <0.11, -- filepath <1.5, -- lens <4.20, -- network >=3.0.1.0 && <3.2, -- parsec <3.2, -- random <1.2, -- split <0.3, -- template-haskell <2.16.0.0, -- text <1.3, -- th-lift <0.9, -- transformers <0.6, -- unix <2.8, -- vector <0.13, -- xml-conduit >=1.9.0.0 && <1.10.0.0, -- xml-types <0.4 -+ ghc-options: -W -Wall -+ hs-source-dirs: lib -+ -+ build-depends: -+ base >=4 && <5 -+ , bytestring -+ , cereal -+ , conduit >= 1.3.0 -+ , containers -+ , deepseq -+ , exceptions -+ , filepath -+ , lens < 4.20 -+ , network >= 3.0.1.0 && < 3.2 -+ , parsec -+ , random -+ , split -+ , template-haskell < 2.17.0.0 -+ , text -+ , th-lift < 0.9 -+ , transformers -+ , unix -+ , vector -+ , xml-conduit >= 1.9.0.0 && < 1.10.0.0 -+ , xml-types -+ -+ exposed-modules: -+ DBus -+ DBus.Client -+ DBus.Generation -+ DBus.Internal.Address -+ DBus.Internal.Message -+ DBus.Internal.Types -+ DBus.Internal.Wire -+ DBus.Introspection -+ DBus.Introspection.Parse -+ DBus.Introspection.Render -+ DBus.Introspection.Types -+ DBus.Socket -+ DBus.TH -+ DBus.Transport - - test-suite dbus_tests -- type: exitcode-stdio-1.0 -- main-is: DBusTests.hs -- hs-source-dirs: tests -- other-modules: -- DBusTests.Address -- DBusTests.BusName -- DBusTests.Client -- DBusTests.ErrorName -- DBusTests.Generation -- DBusTests.Integration -- DBusTests.InterfaceName -- DBusTests.Introspection -- DBusTests.MemberName -- DBusTests.Message -- DBusTests.ObjectPath -- DBusTests.Serialization -- DBusTests.Signature -- DBusTests.Socket -- DBusTests.TH -- DBusTests.Transport -- DBusTests.Util -- DBusTests.Variant -- DBusTests.Wire -- ghc-options: -W -Wall -fno-warn-orphans -- build-depends: -- dbus -any, -- base ==4.*, -- bytestring <0.11, -- cereal <0.6, -- containers <0.7, -- directory <1.4, -- extra <1.8, -- filepath <1.5, -- network >=3.0.1.0 && <3.2, -- parsec <3.2, -- process <1.7, -- QuickCheck <2.15, -- random <1.2, -- resourcet <1.3, -- tasty <1.3, -- tasty-hunit <0.11, -- tasty-quickcheck <0.11, -- text <1.3, -- transformers <0.6, -- unix <2.8, -- vector <0.13 -+ type: exitcode-stdio-1.0 -+ main-is: DBusTests.hs -+ hs-source-dirs: tests -+ ghc-options: -W -Wall -fno-warn-orphans -+ -+ build-depends: -+ dbus -+ , base >=4 && <5 -+ , bytestring -+ , cereal -+ , containers -+ , directory -+ , extra < 1.8 -+ , filepath -+ , network >= 3.0.1.0 && < 3.2 -+ , parsec -+ , process -+ , QuickCheck < 2.15 -+ , random -+ , resourcet -+ , tasty -+ , tasty-hunit -+ , tasty-quickcheck -+ , text -+ , transformers -+ , unix -+ , vector -+ -+ other-modules: -+ DBusTests.Address -+ DBusTests.BusName -+ DBusTests.Client -+ DBusTests.ErrorName -+ DBusTests.Generation -+ DBusTests.Integration -+ DBusTests.InterfaceName -+ DBusTests.Introspection -+ DBusTests.MemberName -+ DBusTests.Message -+ DBusTests.ObjectPath -+ DBusTests.Serialization -+ DBusTests.Signature -+ DBusTests.Socket -+ DBusTests.TH -+ DBusTests.Transport -+ DBusTests.Util -+ DBusTests.Variant -+ DBusTests.Wire - - benchmark dbus_benchmarks -- type: exitcode-stdio-1.0 -- main-is: DBusBenchmarks.hs -- hs-source-dirs: benchmarks -- ghc-options: -Wall -fno-warn-orphans -- build-depends: -- dbus -any, -- base ==4.*, -- criterion <1.6 -+ type: exitcode-stdio-1.0 -+ main-is: DBusBenchmarks.hs -+ hs-source-dirs: benchmarks -+ ghc-options: -Wall -fno-warn-orphans -+ -+ build-depends: -+ dbus -+ , base >=4 && <5 -+ , criterion -Only in dbus-1.2.13-new: .git -Only in dbus-1.2.13-new: .gitignore -diff -ur dbus-1.2.13-old/lib/DBus/Generation.hs dbus-1.2.13-new/lib/DBus/Generation.hs ---- dbus-1.2.13-old/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 -+++ dbus-1.2.13-new/lib/DBus/Generation.hs 2020-04-25 19:26:36.144991997 +0200 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - {-# LANGUAGE OverloadedStrings #-} - {-# LANGUAGE TemplateHaskell #-} - module DBus.Generation where -@@ -26,6 +27,13 @@ - import Prelude hiding (mapM) - import System.Posix.Types (Fd(..)) - -+-- | Compatibility helper to create (total) tuple expressions -+mkTupE :: [Exp] -> Exp -+mkTupE = TupE -+#if MIN_VERSION_template_haskell(2,16,0) -+ . map Just -+#endif -+ - type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a - - dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a -@@ -232,8 +240,8 @@ - finalOutputNames <- buildOutputNames - let variantListExp = map makeToVariantApp methodArgNames - mapOrHead' = mapOrHead outputLength -- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE -- finalResultTuple = mapOrHead' VarE finalOutputNames TupE -+ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE -+ finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE - maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP - getMethodCallDefDec = [d| - $( varP methodCallDefN ) = -@@ -432,7 +440,7 @@ - } - |] - let mapOrHead' = mapOrHead argCount -- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE -+ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE - maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP - applyToName toApply n = AppE toApply $ VarE n - finalApplication = foldl applyToName (VarE handlerArgN) diff --git a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch deleted file mode 100644 index 48cf6a035afb3..0000000000000 --- a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/GHC/Paths.hs b/GHC/Paths.hs -index c87565d..88b3db4 100644 ---- a/GHC/Paths.hs -+++ b/GHC/Paths.hs -@@ -1,13 +1,35 @@ - {-# LANGUAGE CPP #-} -+{-# LANGUAGE ScopedTypeVariables #-} - - module GHC.Paths ( - ghc, ghc_pkg, libdir, docdir - ) where - -+import Control.Exception as E -+import Data.Maybe -+import System.Environment -+import System.IO.Unsafe -+ -+-- Yes, there's lookupEnv now, but we want to be compatible -+-- with older GHCs. -+checkEnv :: String -> IO (Maybe String) -+checkEnv var = E.catch (fmap Just (getEnv var)) -+ (\ (e :: IOException) -> return Nothing) -+ -+nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath -+nixLibdir = unsafePerformIO (checkEnv "NIX_GHCJS_LIBDIR") -+nixDocdir = unsafePerformIO (checkEnv "NIX_GHCJS_DOCDIR") -+nixGhc = unsafePerformIO (checkEnv "NIX_GHCJS") -+nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCJSPKG") -+{-# NOINLINE nixLibdir #-} -+{-# NOINLINE nixDocdir #-} -+{-# NOINLINE nixGhc #-} -+{-# NOINLINE nixGhcPkg #-} -+ - libdir, docdir, ghc, ghc_pkg :: FilePath - --libdir = GHC_PATHS_LIBDIR --docdir = GHC_PATHS_DOCDIR -+libdir = fromMaybe GHC_PATHS_LIBDIR nixLibdir -+docdir = fromMaybe GHC_PATHS_DOCDIR nixDocdir - --ghc = GHC_PATHS_GHC --ghc_pkg = GHC_PATHS_GHC_PKG -+ghc = fromMaybe GHC_PATHS_GHC nixGhc -+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg -diff --git a/Setup.hs b/Setup.hs -index f2d1733..ca4792e 100644 ---- a/Setup.hs -+++ b/Setup.hs -@@ -39,13 +39,13 @@ main = defaultMainWithHooks simpleUserHooks { - #else - libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) - #endif -- ghcProgram (withPrograms lbi) ["--print-libdir"] -+ ghcjsProgram (withPrograms lbi) ["--print-libdir"] - let libdir = reverse $ dropWhile isSpace $ reverse libdir_ - -- ghc_pkg = case lookupProgram ghcPkgProgram (withPrograms lbi) of -+ ghc_pkg = case lookupProgram ghcjsPkgProgram (withPrograms lbi) of - Just p -> programPath p - Nothing -> error "ghc-pkg was not found" -- ghc = case lookupProgram ghcProgram (withPrograms lbi) of -+ ghc = case lookupProgram ghcjsProgram (withPrograms lbi) of - Just p -> programPath p - Nothing -> error "ghc was not found" - diff --git a/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch new file mode 100644 index 0000000000000..948a0366ca4e4 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch @@ -0,0 +1,12 @@ +diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs +index 598048f..b652b76 100644 +--- a/src/Gtk2HsSetup.hs ++++ b/src/Gtk2HsSetup.hs +@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor + ourC2hs bi lbi = PreProcessor { + #endif + platformIndependent = False, ++ ppOrdering = (\ _ _ ms -> return ms), + runPreProcessor = runC2HS bi lbi + } + diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/pkgs/development/haskell-modules/patches/hunspell.patch deleted file mode 100644 index cc115029a7add..0000000000000 --- a/pkgs/development/haskell-modules/patches/hunspell.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal ---- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal 2018-08-26 20:23:33.053763300 +0200 -+++ hunspell-hs-0.1.0.0/hunspell-hs.cabal 2018-08-26 20:42:05.886074510 +0200 -@@ -37,7 +37,7 @@ - base >=4.7 && <5 - , stm - if os(linux) -- extra-libraries: -+ pkgconfig-depends: - hunspell - if os(darwin) - include-dirs: -@@ -63,7 +63,7 @@ - , hunspell-hs - , stm - if os(linux) -- extra-libraries: -+ pkgconfig-depends: - hunspell - if os(darwin) - include-dirs: -@@ -88,7 +88,7 @@ - , hunspell-hs - , stm - if os(linux) -- extra-libraries: -+ pkgconfig-depends: - hunspell - if os(darwin) - include-dirs: diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index c478c875540d1..34eb2b71d7597 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 @@ -47,14 +49,19 @@ let isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" - else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; + else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + + lib.optionalString (ghc ? hadrian) "/lib"; 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 +78,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 +170,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/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 0cf336cffdf95..bdd15fd4fcc1a 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + env.NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index d37f2fbe1e1cb..8ad72842dc787 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + env.NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index d50ed8ff0520f..f8fb244d54c99 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.1.172"; + version = "1.1.173"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM="; + sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 95b7d611fa942..dfae27b371048 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.1208"; + version = "1.11.1.1224"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-bn9uNM46oYc0wxJJ8HMGbE8/2mnYxm/p9S6MhYfhcQM="; + sha256 = "sha256-T55/uETQFBWYS9ZifbF3KW8vWoeInq/QxH7UabVkBVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix index 03dfb72d7aba1..8ece89ef4f485 100644 --- a/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix +++ b/pkgs/development/interpreters/dhall/generate-dhall-directory-package.nix @@ -19,7 +19,7 @@ lib.makePackageOverridable name = "dhall-directory-package.nix"; buildCommand = '' - dhall-to-nixpkgs directory --fixed-output-derivations --file "${file}" "${src}" ${if document then "--document" else ""} > $out + dhall-to-nixpkgs directory --fixed-output-derivations --file "${file}" "${src}" ${lib.optionalString document "--document"} > $out ''; nativeBuildInputs = [ dhall-nixpkgs ]; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index cddb773ec1684..489d3b0128d93 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/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index d6dc77c3da69c..991880bc31e5a 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.2.1"; - sha256 = "xJ3fadveOFZ0TeHhjl3VnAtWyFTOVUIoFubXofvrsT0="; + version = "25.2.3"; + sha256 = "peTH8hDOEuMq18exbFhtEMrQQEqg2FPkapfNnnEfTYE="; } diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 40c05113ecffe..f7f5a54f415fa 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # -Wnarrowing is enabled by default in recent GCC versions, # causing compilation to fail. - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre zlib sqlite ]; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 3bcada9aa8f04..883f3df647ef1 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; - NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [ + env.NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [ # Needed with GCC 8 "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { "-Wno-error=maybe-uninitialized" # Needed with GCC 11 "-Wno-error=misleading-indentation" + # Needed with GCC 12 + "-Wno-error=nonnull" + "-Wno-error=stringop-overflow" + "-Wno-error=use-after-free" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix index e24742ac136e2..dc5f153c5ee1c 100644 --- a/pkgs/development/interpreters/hashlink/default.nix +++ b/pkgs/development/interpreters/hashlink/default.nix @@ -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 = [ diff --git a/pkgs/development/interpreters/hashlink/hashlink.patch b/pkgs/development/interpreters/hashlink/hashlink.patch deleted file mode 100644 index 20d4eedd5a8a3..0000000000000 --- 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 <OpenGLES/ES3/gl.h> - # define HL_GLES - #elif defined(HL_MAC) --# include <SDL.h> -+# include <SDL2/SDL.h> - # include <OpenGL/gl3.h> - # 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 <SDL.h> - # include <SDL_syswm.h> - #elif defined(HL_MAC) --# include <SDL.h> -+# include <SDL2/SDL.h> - #else - # include <SDL2/SDL.h> - #endif diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 0777fb8d48baa..8a6de1f094d25 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { ''; # for gcc5; c11 inline semantics breaks the build - NIX_CFLAGS_COMPILE = "-fgnu89-inline"; + env.NIX_CFLAGS_COMPILE = "-fgnu89-inline"; meta = with lib; { description = "Io programming language"; diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index d904a1ede3869..0987205f59d91 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { makeFlags = [ "kerf" "kerf_test" ]; # avoid a huge amount of warnings to make failures clearer - NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [ + env.NIX_CFLAGS_COMPILE = toString (map (x: "-Wno-${x}") [ "void-pointer-to-int-cast" "format" "implicit-function-declaration" "gnu-variable-sized-type-not-at-end" "unused-result" - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); patchPhase = '' substituteInPlace ./Makefile \ diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 23a77596e1d9d..ccb0e062a53f4 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, doxygen, cmake, readline }: -with lib; stdenv.mkDerivation rec { pname = "lolcode"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { # Maybe it clashes with lci scientific logic software package... postInstall = "mv $out/bin/lci $out/bin/lolcode-lci"; - meta = { + meta = with lib; { homepage = "http://lolcode.org"; description = "An esoteric programming language"; longDescription = '' diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 5e97e4f003e2f..53c7b5e9435e4 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "love"; - version = "11.4"; + version = "0.10.2"; src = fetchFromGitHub { owner = "love2d"; repo = "love"; rev = version; - sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4="; + sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; nativeBuildInputs = [ pkg-config autoconf automake ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 + env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = "https://love2d.org"; diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index bb8f88379fad8..768625e08cfa3 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 + env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = "https://love2d.org"; diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix index fc92c59bb910c..6c303f770decc 100644 --- a/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -27,7 +27,7 @@ in { luarocksCheckHook = callPackage ({ luarocks }: makeSetupHook { name = "luarocks-check-hook"; - deps = [ luarocks ]; + propagatedBuildInputs = [ luarocks ]; } ./luarocks-check-hook.sh) {}; # luarocks installs data in a non-overridable location. Until a proper luarocks patch, @@ -35,6 +35,6 @@ in { luarocksMoveDataFolder = callPackage ({ }: makeSetupHook { name = "luarocks-move-rock"; - deps = [ ]; + propagatedBuildInputs = [ ]; } ./luarocks-move-data.sh) {}; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 59afff3794494..4d05a2490e9e6 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -32,6 +32,10 @@ plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; + +compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_ALL" + else if (lib.versionOlder self.luaversion "5.4") then " -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2" + else " -DLUA_COMPAT_5_3"; in stdenv.mkDerivation rec { @@ -89,7 +93,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(${ + makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat compatFlags} $(${ if lib.versionAtLeast luaversion "5.2" then "SYSCFLAGS" else "MYCFLAGS"})' ) makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index 049afcd6116d9..43ececd1e794c 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 { - deps = makeWrapper; + name = "wrap-lua-hook"; + propagatedBuildInputs = [ 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/default.nix b/pkgs/development/interpreters/luajit/default.nix index 411220870e1a4..ddb49b40ff64d 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -52,6 +52,15 @@ let ++ 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"; @@ -88,11 +97,10 @@ 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; + env.NIX_CFLAGS_COMPILE = toString XCFLAGS; postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index baed9801ebe87..caeef615ff686 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.558"; + version = "0.563"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-103TLfVmXBN3Vd31nbBu7RlxrG4DX6xn/vpveIdnm5E="; + hash = "sha256-aGduwwguzIg3kFspIa/5nDFAC836J3B10Pg63psuWto="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index e83a724d25d2f..c9a490ddc4e31 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { in the Metamath Proof Explorer, and it generated its web pages. The *.mm ASCII databases (set.mm and others) are also included in this derivation. ''; - homepage = "http://us.metamath.org"; + homepage = "https://us.metamath.org"; downloadPage = "https://us.metamath.org/#downloads"; license = licenses.gpl2Plus; maintainers = [ maintainers.taneb ]; diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 85a980958da3b..8030980b77886 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2022-11-20"; + version = "unstable-2023-01-21"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "63909dc834708a5bd7c21d65a6633880f40295db"; - hash = "sha256-GeknXYsdRUzihzF3qHcCgbcB3w8geiWe5O1Az+4UqMs="; + rev = "d10cc61bc54050b07874a8597f8df20534885105"; + hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/development/interpreters/nextflow/default.nix index 7f96a29039a66..1d3d1070fc719 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/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index dff3e4101d550..e221956cf225f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -186,7 +186,7 @@ let NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = lib.optionalString use64BitIdx "-fdefault-integer-8"; configureFlags = [ "--with-blas=blas" diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 1e4616136a1b9..2317a479f0e20 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -10,7 +10,7 @@ # Each of the substitutions is available in the wrap.sh script as @thingSubstituted@ makeSetupHook { name = "${octave.name}-pkgs-setup-hook"; - deps = makeWrapper; + propagatedBuildInputs = [ makeWrapper ]; substitutions.executable = octave.interpreter; substitutions.octave = octave; } ./wrap.sh diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index ce7947a842ca6..e8db13a6474b0 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,7 +31,7 @@ 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; # On FreeBSD, if Perl is built with threads support, having @@ -57,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. @@ -93,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; @@ -138,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 ''; @@ -183,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 @@ -207,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; @@ -215,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 37277baae814f..ddc4ed17acbd2 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.27"; - hash = "sha256-X9iCsUN3wVjBtVzGrOkfuMGbd8WW1YMa0ST7u8kC28g="; + version = "8.0.28"; + hash = "sha256-nV50k1yQDjuce2vHQFlrcZM2MOufY3F8DEkj2MeIxi4="; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 6cfda280d3ef7..48cf458178b68 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.14"; - hash = "sha256-FMqZMz3WBKUEojaJRkhaw103nE2pbSjcUV1+tQLf+jI="; + version = "8.1.16"; + hash = "sha256-zZ8OoU2C2UVVh6SaC2yAKnuNj/eXA/n0ixfbAQ+2M84="; }); in diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 41627582dc83b..6dea1c8f9076f 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.1"; - hash = "sha256-ddb482WZPsDR2cYoHUVX5v7sWiYZSkaLiwFFnRd++yk="; + version = "8.2.3"; + hash = "sha256-h7tYhl849eKUGBMCkVLOohAv4pYbtNaLiPgx3dBUjQ8="; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index b8ceac621a619..74dedcfe2d18a 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -333,6 +333,7 @@ let description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; license = licenses.php301; + mainProgram = "php"; maintainers = teams.php.members; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 8e3e868fad931..b85f99a7b52d9 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 <<EOF ext.o: ext.c @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { EOF ''} ''; - sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}''; + sourceRoot = ''picoLisp/src${lib.optionalString stdenv.is64bit "64"}''; postBuild = '' cd ../src; make gate ''; @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp" ''; - meta = { + meta = with lib; { # darwin: build times out broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A simple Lisp with an integrated database"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index cfcf487b43565..9cd806c052333 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -24,7 +24,7 @@ , pkgsHostHost , pkgsTargetTarget , sourceVersion -, sha256 +, hash , passthruFun , static ? stdenv.hostPlatform.isStatic , stripBytecode ? reproducibleBuild @@ -54,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; @@ -89,7 +87,7 @@ let owner = "ActiveState"; repo = "cpython"; rev = "v${version}"; - inherit sha256; + inherit hash; }; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -133,9 +131,9 @@ let # * 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 @@ -147,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 @@ -158,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 @@ -166,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 ]; @@ -175,31 +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" "--with-system-ffi" "--with-system-expat" "--enable-unicode=ucs${toString ucsEncoding}" - ] ++ optionals stdenv.hostPlatform.isCygwin [ + ] ++ 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,23 +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 ++ + lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] - ++ optionals x11Support [ tcl tk libX11 ] - ++ optional (stdenv.isDarwin && configd != null) configd; + ++ 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 @@ -258,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"; + env.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'" ''; @@ -291,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 ''; @@ -311,14 +309,14 @@ 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 - '' + optionalString strip2to3 '' + '' + lib.optionalString strip2to3 '' rm -R $out/bin/2to3 $out/lib/python*/lib2to3 - '' + optionalString stripConfig '' + '' + lib.optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config* - '' + optionalString stripIdlelib '' + '' + lib.optionalString stripIdlelib '' # Strip IDLE rm -R $out/bin/idle* $out/lib/python*/idlelib - '' + optionalString stripTests '' + '' + lib.optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} ''; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 005858d31ef66..11b6fcbe8cf17 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -30,7 +30,7 @@ , pkgsHostHost , pkgsTargetTarget , sourceVersion -, sha256 +, hash , passthruFun , bash , stripConfig ? false @@ -215,7 +215,7 @@ in with passthru; stdenv.mkDerivation { src = fetchurl { url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; - inherit sha256; + inherit hash; }; prePatch = optionalString stdenv.isDarwin '' @@ -235,7 +235,7 @@ in with passthru; stdenv.mkDerivation { url = "https://github.com/python/cpython/commit/3fae04b10e2655a20a3aadb5e0d63e87206d0c67.diff"; revert = true; excludes = [ "Misc/NEWS.d/*" ]; - sha256 = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY="; + hash = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY="; }) ] ++ [ # Disable the use of ldconfig in ctypes.util.find_library (since @@ -345,6 +345,8 @@ in with passthru; stdenv.mkDerivation { "ac_cv_computed_gotos=yes" "ac_cv_file__dev_ptmx=yes" "ac_cv_file__dev_ptc=yes" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [ + "--with-build-python=${pythonForBuildInterpreter}" ] ++ optionals stdenv.hostPlatform.isLinux [ # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index faab3eb785e4b..c4b95af92f284 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -36,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 @@ -59,7 +63,7 @@ hooks = import ./hooks/default.nix; keep = lib.extends hooks pythonPackagesFun; extra = _: {}; - optionalExtensions = cond: as: if cond then as else []; + optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ([ @@ -113,23 +117,24 @@ }; sources = { - python39 = { + python310 = { sourceVersion = { major = "3"; - minor = "9"; - patch = "16"; + minor = "10"; + patch = "10"; suffix = ""; }; - sha256 = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk="; + hash = "sha256-BBnpCFv1G3pnIAmz9Q2/GFms3xi6cl0OwZqlyFA/DqM="; }; - python310 = { + + python311 = { sourceVersion = { major = "3"; - minor = "10"; - patch = "9"; + minor = "11"; + patch = "2"; suffix = ""; }; - sha256 = "sha256-WuA+MIJgFkuro5kh/bTb+ObQPYI1qTnUWCsz8LXkaoM="; + hash = "sha256-KeS49fFlhUKowT4t0nc1jJxI8rL3MYZS7xZ15AK50q8="; }; }; @@ -143,7 +148,7 @@ in { patch = "18"; suffix = ".6"; # ActiveState's Python 2 extended support }; - sha256 = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY="; + hash = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY="; inherit (darwin) configd; inherit passthruFun; }; @@ -156,16 +161,23 @@ in { patch = "16"; suffix = ""; }; - sha256 = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI="; + hash = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI="; inherit (darwin) configd; inherit passthruFun; }; - python39 = callPackage ./cpython ({ + python39 = callPackage ./cpython { self = __splicedPackages.python39; + sourceVersion = { + major = "3"; + minor = "9"; + patch = "16"; + suffix = ""; + }; + hash = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk="; inherit (darwin) configd; inherit passthruFun; - } // sources.python39); + }; python310 = callPackage ./cpython ({ self = __splicedPackages.python310; @@ -173,18 +185,11 @@ in { inherit passthruFun; } // sources.python310); - python311 = callPackage ./cpython { + python311 = callPackage ./cpython ({ self = __splicedPackages.python311; - sourceVersion = { - major = "3"; - minor = "11"; - patch = "1"; - suffix = ""; - }; - sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8="; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python311); python312 = callPackage ./cpython { self = __splicedPackages.python312; @@ -192,9 +197,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "a3"; + suffix = "a5"; }; - sha256 = "sha256-G2SzB14KkkGXTlgOCbCckRehxOK+aYA5IB7x2Kc0U9E="; + hash = "sha256-1m73o0L+OjVvnO47uXrcHl+0hA9rbP994P991JX4Mjs="; inherit (darwin) configd; inherit passthruFun; }; @@ -237,7 +242,7 @@ in { patch = "11"; }; - sha256 = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; + hash = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; @@ -254,7 +259,7 @@ in { patch = "11"; }; - sha256 = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; + hash = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.pypy27; @@ -266,7 +271,7 @@ in { pypy38 = __splicedPackages.pypy39.override { self = __splicedPackages.pythonInterpreters.pypy38; pythonVersion = "3.8"; - sha256 = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; + hash = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; }; pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04 @@ -280,7 +285,7 @@ in { patch = "11"; }; - sha256 = { + hash = { aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo="; x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0="; aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E="; @@ -298,7 +303,7 @@ in { minor = "3"; patch = "11"; }; - sha256 = { + hash = { aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk="; x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4="; @@ -308,8 +313,8 @@ in { 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 08dc3ea61ab76..001e477b9185b 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -11,7 +11,7 @@ in { condaInstallHook = callPackage ({ makePythonHook, gnutar, lbzip2 }: makePythonHook { name = "conda-install-hook"; - deps = [ gnutar lbzip2 ]; + propagatedBuildInputs = [ gnutar lbzip2 ]; substitutions = { inherit pythonSitePackages; }; @@ -20,19 +20,19 @@ in { condaUnpackHook = callPackage ({ makePythonHook }: makePythonHook { name = "conda-unpack-hook"; - deps = []; + propagatedBuildInputs = []; } ./conda-unpack-hook.sh) {}; eggBuildHook = callPackage ({ makePythonHook }: makePythonHook { name = "egg-build-hook.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; } ./egg-build-hook.sh) {}; eggInstallHook = callPackage ({ makePythonHook, setuptools }: makePythonHook { name = "egg-install-hook.sh"; - deps = [ setuptools ]; + propagatedBuildInputs = [ setuptools ]; substitutions = { inherit pythonInterpreter pythonSitePackages; }; @@ -41,13 +41,13 @@ in { eggUnpackHook = callPackage ({ makePythonHook, }: makePythonHook { name = "egg-unpack-hook.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; } ./egg-unpack-hook.sh) {}; flitBuildHook = callPackage ({ makePythonHook, flit }: makePythonHook { name = "flit-build-hook"; - deps = [ flit ]; + propagatedBuildInputs = [ flit ]; substitutions = { inherit pythonInterpreter; }; @@ -56,7 +56,7 @@ in { pipBuildHook = callPackage ({ makePythonHook, pip, wheel }: makePythonHook { name = "pip-build-hook.sh"; - deps = [ pip wheel ]; + propagatedBuildInputs = [ pip wheel ]; substitutions = { inherit pythonInterpreter pythonSitePackages; }; @@ -65,7 +65,7 @@ in { pipInstallHook = callPackage ({ makePythonHook, pip }: makePythonHook { name = "pip-install-hook"; - deps = [ pip ]; + propagatedBuildInputs = [ pip ]; substitutions = { inherit pythonInterpreter pythonSitePackages; }; @@ -74,7 +74,7 @@ in { pytestCheckHook = callPackage ({ makePythonHook, pytest }: makePythonHook { name = "pytest-check-hook"; - deps = [ pytest ]; + propagatedBuildInputs = [ pytest ]; substitutions = { inherit pythonCheckInterpreter; }; @@ -123,7 +123,7 @@ in { pythonRelaxDepsHook = callPackage ({ makePythonHook, wheel }: makePythonHook { name = "python-relax-deps-hook"; - deps = [ wheel ]; + propagatedBuildInputs = [ wheel ]; substitutions = { inherit pythonInterpreter; }; @@ -145,7 +145,7 @@ in { setuptoolsBuildHook = callPackage ({ makePythonHook, setuptools, wheel }: makePythonHook { name = "setuptools-setup-hook"; - deps = [ setuptools wheel ]; + propagatedBuildInputs = [ setuptools wheel ]; substitutions = { inherit pythonInterpreter pythonSitePackages setuppy; }; @@ -154,7 +154,7 @@ in { setuptoolsCheckHook = callPackage ({ makePythonHook, setuptools }: makePythonHook { name = "setuptools-check-hook"; - deps = [ setuptools ]; + propagatedBuildInputs = [ setuptools ]; substitutions = { inherit pythonCheckInterpreter setuppy; }; @@ -171,7 +171,7 @@ in { venvShellHook = disabledIf (!isPy3k) (callPackage ({ makePythonHook, ensureNewerSourcesForZipFilesHook }: makePythonHook { name = "venv-shell-hook"; - deps = [ ensureNewerSourcesForZipFilesHook ]; + propagatedBuildInputs = [ ensureNewerSourcesForZipFilesHook ]; substitutions = { inherit pythonInterpreter; }; @@ -180,7 +180,7 @@ in { wheelUnpackHook = callPackage ({ makePythonHook, wheel }: makePythonHook { name = "wheel-unpack-hook.sh"; - deps = [ wheel ]; + propagatedBuildInputs = [ wheel ]; } ./wheel-unpack-hook.sh) {}; wrapPython = callPackage ../wrap-python.nix { @@ -190,6 +190,6 @@ in { sphinxHook = callPackage ({ makePythonHook, sphinx, installShellFiles }: makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; - deps = [ sphinx installShellFiles ]; + propagatedBuildInputs = [ sphinx installShellFiles ]; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 971eacb71d9c7..b1f35cc2fb137 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -101,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; @@ -114,6 +108,7 @@ let name_ = name; + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" "disabledTestPaths" "outputs" @@ -204,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 6fad25ee8d630..84af77bade9e7 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -12,7 +12,7 @@ , pkgsTargetTarget , sourceVersion , pythonVersion -, sha256 +, hash , passthruFun , pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}" }: @@ -21,13 +21,14 @@ assert zlibSupport -> zlib != null; let isPy3k = (lib.versions.major pythonVersion) == "3"; + isPy38OrNewer = lib.versionAtLeast pythonVersion "3.8"; isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9"; - passthru = passthruFun { + passthru = passthruFun rec { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else if isPy3k then "3" else ""}"; - sitePackages = "site-packages"; + executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else lib.optionalString isPy3k "3"}"; + sitePackages = "${lib.optionalString isPy38OrNewer "lib/${libPrefix}/"}site-packages"; hasDistutilsCxxPatch = false; inherit pythonAttr; @@ -46,7 +47,7 @@ in with passthru; stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; @@ -122,7 +123,7 @@ in with passthru; stdenv.mkDerivation rec { 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 + cp ${../sitecustomize.py} $out/${if isPy38OrNewer then sitePackages else "lib/${libPrefix}/${sitePackages}"}/sitecustomize.py runHook postInstall ''; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index a25ab8a782210..69508742148be 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -19,7 +19,7 @@ , packageOverrides ? (self: super: {}) , sourceVersion , pythonVersion -, sha256 +, hash , passthruFun }: @@ -32,7 +32,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy3k then "3" else ""}"; + executable = "pypy${lib.optionalString isPy3k "3"}"; sitePackages = "lib/${libPrefix}/site-packages"; hasDistutilsCxxPatch = false; @@ -60,7 +60,7 @@ in with passthru; stdenv.mkDerivation { src = fetchurl { url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - inherit sha256; + inherit hash; }; buildInputs = [ diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index a95e0c2f651e9..c4b676271673d 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -19,7 +19,7 @@ , packageOverrides ? (self: super: {}) , sourceVersion , pythonVersion -, sha256 +, hash , passthruFun }: @@ -32,7 +32,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy3k then "3" else ""}"; + executable = "pypy${lib.optionalString isPy3k "3"}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; @@ -60,7 +60,7 @@ in with passthru; stdenv.mkDerivation { src = fetchurl { url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - inherit sha256; + inherit hash; }; buildInputs = [ diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index d5b02223fd6c3..0899ad18e967c 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -16,17 +16,22 @@ let # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. makeOverridablePythonPackage = f: origArgs: let - ff = f origArgs; - overrideWith = newArgs: origArgs // (if pkgs.lib.isFunction newArgs then newArgs origArgs else newArgs); + args = lib.fix (lib.extends + (_: previousAttrs: { + passthru = (previousAttrs.passthru or { }) // { + overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); + }; + }) + (_: origArgs)); + result = f args; + overrideWith = newArgs: args // (if pkgs.lib.isFunction newArgs then newArgs args else newArgs); in - if builtins.isAttrs ff then (ff // { + if builtins.isAttrs result then result + else if builtins.isFunction result then { overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); - }) - else if builtins.isFunction ff then { - overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); - __functor = self: ff; + __functor = self: result; } - else ff; + else result; buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" @@ -39,7 +44,7 @@ let })); # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg self; + buildSetupcfg = import ../../../build-support/build-setupcfg lib self; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index a7c6c8d842b0c..e3e2ca8c18cdd 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -31,14 +31,5 @@ rustPlatform.buildRustPackage rec { 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/tests.nix b/pkgs/development/interpreters/python/tests.nix index 037c8f87b8ba7..4ba1b757c3f6a 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -43,7 +43,8 @@ let # Use virtualenv from a Nix env. nixenv-virtualenv = rec { env = runCommand "${python.name}-virtualenv" {} '' - ${pythonVirtualEnv.interpreter} -m virtualenv $out + ${pythonVirtualEnv.interpreter} -m virtualenv venv + mv venv $out ''; interpreter = "${env}/bin/${python.executable}"; is_venv = "False"; @@ -173,7 +174,7 @@ let } ) {}; pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); - in + in lib.optionalAttrs stdenv.isLinux { condaExamplePackage = runCommand "import-requests" {} '' ${pythonWithRequests.interpreter} -c "import requests" > $out diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix index 497799e0a2af0..f7dfdf0a8b457 100644 --- a/pkgs/development/interpreters/python/update-python-libraries/default.nix +++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix @@ -1,8 +1,9 @@ -{ python3, runCommand, git, nix }: +{ python3, runCommand, git, nix, nix-prefetch-git }: runCommand "update-python-libraries" { buildInputs = [ nix + nix-prefetch-git (python3.withPackages(ps: with ps; [ packaging requests toolz ])) git ]; 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 feb44bef0790c..14b3ed4f3f1e4 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 @@ -12,14 +12,16 @@ to update all non-pinned libraries in that folder. """ import argparse +import json +import logging import os -import pathlib import re import requests from concurrent.futures import ThreadPoolExecutor as Pool from packaging.version import Version as _Version from packaging.version import InvalidVersion from packaging.specifiers import SpecifierSet +from typing import Optional, Any import collections import subprocess @@ -31,11 +33,12 @@ EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl'] PRERELEASES = False +BULK_UPDATE = False + GIT = "git" -NIXPGKS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip() +NIXPKGS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip() -import logging logging.basicConfig(level=logging.INFO) @@ -67,6 +70,22 @@ def _get_values(attribute, text): values = regex.findall(text) return values + +def _get_attr_value(attr_path: str) -> Optional[Any]: + try: + response = subprocess.check_output([ + "nix", + "--extra-experimental-features", "nix-command", + "eval", + "-f", f"{NIXPKGS_ROOT}/default.nix", + "--json", + f"{attr_path}" + ]) + return json.loads(response.decode()) + except (subprocess.CalledProcessError, ValueError): + return None + + def _get_unique_value(attribute, text): """Match attribute in text and return unique match. @@ -81,23 +100,29 @@ def _get_unique_value(attribute, text): else: raise ValueError("no value found for {}".format(attribute)) -def _get_line_and_value(attribute, text): +def _get_line_and_value(attribute, text, value=None): """Match attribute in text. Return the line and the value of the attribute.""" - regex = '({}\s+=\s+"(.*)";)'.format(attribute) + if value is None: + regex = rf'({attribute}\s+=\s+\"(.*)\";)' + else: + regex = rf'({attribute}\s+=\s+\"({value})\";)' regex = re.compile(regex) - value = regex.findall(text) - n = len(value) + results = regex.findall(text) + n = len(results) if n > 1: raise ValueError("found too many values for {}".format(attribute)) elif n == 1: - return value[0] + return results[0] else: raise ValueError("no value found for {}".format(attribute)) -def _replace_value(attribute, value, text): +def _replace_value(attribute, value, text, oldvalue=None): """Search and replace value of attribute in text.""" - old_line, old_value = _get_line_and_value(attribute, text) + if oldvalue is None: + old_line, old_value = _get_line_and_value(attribute, text) + else: + old_line, old_value = _get_line_and_value(attribute, text, oldvalue) new_line = old_line.replace(old_value, value) new_text = text.replace(old_line, new_line) return new_text @@ -124,6 +149,23 @@ def _fetch_github(url): raise ValueError("request for {} failed".format(url)) +def _hash_to_sri(algorithm, value): + """Convert a hash to its SRI representation""" + return subprocess.check_output([ + "nix", + "hash", + "to-sri", + "--type", algorithm, + value + ]).decode().strip() + + +def _skip_bulk_update(attr_name: str) -> bool: + return bool(_get_attr_value( + f"{attr_name}.skipBulkUpdate" + )) + + SEMVER = { 'major' : 0, 'minor' : 1, @@ -198,7 +240,7 @@ def _get_latest_version_github(package, extension, current_version, target): attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{package}") try: homepage = subprocess.check_output( - ["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\ + ["nix", "eval", "-f", f"{NIXPKGS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\ .decode('utf-8') except Exception as e: raise ValueError(f"Unable to determine homepage: {e}") @@ -217,17 +259,47 @@ def _get_latest_version_github(package, extension, current_version, target): release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases)) prefix = get_prefix(release['tag_name']) - try: - sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\ - .decode('utf-8').strip() - except: - # this may fail if they have both a branch and a tag of the same name, attempt tag name - tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags") - sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL)\ - .decode('utf-8').strip() - - return version, sha256, prefix + # some attributes require using the fetchgit + git_fetcher_args = [] + if (_get_attr_value(f"{attr_path}.src.fetchSubmodules")): + git_fetcher_args.append("--fetch-submodules") + if (_get_attr_value(f"{attr_path}.src.fetchLFS")): + git_fetcher_args.append("--fetch-lfs") + if (_get_attr_value(f"{attr_path}.src.leaveDotGit")): + git_fetcher_args.append("--leave-dotGit") + + if git_fetcher_args: + algorithm = "sha256" + cmd = [ + "nix-prefetch-git", + f"https://github.com/{owner}/{repo}.git", + "--hash", algorithm, + "--rev", f"refs/tags/{release['tag_name']}" + ] + cmd.extend(git_fetcher_args) + response = subprocess.check_output(cmd) + document = json.loads(response.decode()) + hash = _hash_to_sri(algorithm, document[algorithm]) + else: + try: + hash = subprocess.check_output([ + "nix-prefetch-url", + "--type", "sha256", + "--unpack", + f"{release['tarball_url']}" + ], stderr=subprocess.DEVNULL).decode('utf-8').strip() + except (subprocess.CalledProcessError, UnicodeError): + # this may fail if they have both a branch and a tag of the same name, attempt tag name + tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags") + hash = subprocess.check_output([ + "nix-prefetch-url", + "--type", "sha256", + "--unpack", + tag_url + ], stderr=subprocess.DEVNULL).decode('utf-8').strip() + + return version, hash, prefix FETCHERS = { @@ -272,12 +344,12 @@ def _determine_extension(text, fetcher): if fetcher == 'fetchPypi': try: src_format = _get_unique_value('format', text) - except ValueError as e: + except ValueError: src_format = None # format was not given try: extension = _get_unique_value('extension', text) - except ValueError as e: + except ValueError: extension = None # extension was not given if extension is None: @@ -294,8 +366,6 @@ def _determine_extension(text, fetcher): raise ValueError('url does not point to PyPI.') elif fetcher == 'fetchFromGitHub': - if "fetchSubmodules" in text: - raise ValueError("fetchFromGitHub fetcher doesn't support submodules") extension = "tar.gz" return extension @@ -321,6 +391,8 @@ def _update_package(path, target): # Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo successful_fetch = False for pname in pnames: + if BULK_UPDATE and _skip_bulk_update(f"python3Packages.{pname}"): + raise ValueError(f"Bulk update skipped for {pname}") try: new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target) successful_fetch = True @@ -340,16 +412,20 @@ def _update_package(path, target): raise ValueError("no file available for {}.".format(pname)) text = _replace_value('version', new_version, text) + # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts # sri hashes have been the default format since nix 2.4+ - sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + sri_hash = _hash_to_sri("sha256", new_sha256) - - # fetchers can specify a sha256, or a sri hash - try: - text = _replace_value('sha256', sri_hash, text) - except ValueError: - text = _replace_value('hash', sri_hash, text) + # retrieve the old output hash for a more precise match + if old_hash := _get_attr_value(f"python3Packages.{pname}.src.outputHash"): + # fetchers can specify a sha256, or a sri hash + try: + text = _replace_value('hash', sri_hash, text, old_hash) + except ValueError: + text = _replace_value('sha256', sri_hash, text, old_hash) + else: + raise ValueError(f"Unable to retrieve old hash for {pname}") if fetcher == 'fetchFromGitHub': # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` @@ -441,6 +517,10 @@ environment variables: packages = list(map(os.path.abspath, args.package)) + if len(packages) > 1: + global BULK_UPDATE + BULK_UPDATE = true + logging.info("Updating packages...") # Use threads to update packages concurrently diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index 29fc6cf820b20..c67a8e0885149 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -3,10 +3,9 @@ , makePythonHook , makeWrapper }: -with lib; - makePythonHook { - deps = makeWrapper; + name = "wrap-python-hook"; + propagatedBuildInputs = [ makeWrapper ]; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; substitutions.python = python.pythonForBuild; @@ -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 577f4c0fcf2c0..03f6fb31cb546 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -3,6 +3,7 @@ , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp , gtk3 +, glibcLocales , libedit, libffi , libiconv , libGL @@ -49,7 +50,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.7"; # always change at once with ./minimal.nix + version = "8.8"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "sha256-dqfmbUfnPrDcP8on/IGONuHUv/502iY8Xv47iAGjCgE="; + sha256 = "sha256-OYQi4rQjc+FOTg+W2j2Vy1dEJHuj9z6pmBX7aTwnFKs="; }; FONTCONFIG_FILE = fontsConf; @@ -107,6 +108,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) + gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") '' + lib.optionalString stdenv.isDarwin '' gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) '' diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 9ddaa0f141439..c52869344a6af 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -6,7 +6,7 @@ racket.overrideAttrs (oldAttrs: rec { version = oldAttrs.version; src = oldAttrs.src.override { name = "${pname}-${version}"; - sha256 = "sha256-Iy7ZzxfNf3Q7LM9z13XsNbWvJrJeVREprrYDi7DNwOw="; + sha256 = "sha256-KaYT1PzHtGYej3CZEnensGiFaR9+487XueiZf3e+hQU="; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index cfdeac264cbd1..3edbebd7cc053 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.6"; + version = "0.17.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-3FRzqHbzNhmYg3wRvajMzTWB7lOlgrxwQvvnB3fggGM="; + sha256 = "sha256-ekryYPSuBhK+0BvzGxtQVkWDIsfpqbWLc/WXjhPcFYw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 07c917473cc40..bee024829cefb 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]); RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg.out freetype glew.dev libGLU libGL fribidi zlib + SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib ]); enableParallelBuilding = true; @@ -59,14 +59,14 @@ stdenv.mkDerivation rec { buildPhase = with python3.pkgs; '' runHook preBuild - ${python.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES + ${python.pythonForBuild.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; installPhase = with python3.pkgs; '' runHook preInstall - ${python.interpreter} module/setup.py install --prefix=$out + ${python.pythonForBuild.interpreter} module/setup.py install --prefix=$out mkdir -p $out/share/renpy cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame_sdl2}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame_sdl2}/include/${python.libPrefix}"; meta = with lib; { description = "Visual Novel Engine"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 57d1e6d84fe1e..2bab78ecd4197 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -97,6 +97,13 @@ let }).${ver.majMinTiny} ++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch ++ op (atLeast30 && useBaseRuby) ./do-not-update-gems-baseruby.patch + ++ ops (ver.majMin == "3.0") [ + # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions. + (fetchpatch { + url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch"; + sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk="; + }) + ] ++ ops (!atLeast30 && rubygemsSupport) [ # We upgrade rubygems to a version that isn't compatible with the # ruby 2.7 installer. Backport the upstream fix. @@ -190,14 +197,7 @@ let # 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" + sed -i 's/CONFIG\["CC"\] = "\(.*\)"/CONFIG["CC"] = if ENV["CC"].nil? || ENV["CC"].empty? then "\1" else ENV["CC"] end/' "$rbConfig" # Remove unnecessary external intermediate files created by gems extMakefiles=$(find $out/${passthru.gemPath} -name Makefile) @@ -235,6 +235,21 @@ let $rbConfig $out/lib/libruby* ''; + installCheckPhase = '' + overriden_cc=$(CC=foo $out/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["CC"]') + if [[ "$overriden_cc" != "foo" ]]; then + echo "CC cannot be overwritten: $overriden_cc != foo" >&2 + false + fi + + fallback_cc=$(unset CC; $out/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["CC"]') + if [[ "$fallback_cc" != "$CC" ]]; then + echo "CC='$fallback_cc' should be '$CC' by default" >&2 + false + fi + ''; + doInstallCheck = true; + disallowedRequisites = op (!jitSupport) stdenv.cc.cc ++ op useBaseRuby baseRuby; @@ -273,13 +288,13 @@ in { mkRuby = generic; ruby_2_7 = generic { - version = rubyVersion "2" "7" "6" ""; - sha256 = "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"; + version = rubyVersion "2" "7" "7" ""; + sha256 = "sha256-4QEn22kdf/NkAs/oj0GMjQJaPx7qkgRLFi3XLwuMe5A="; }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "4" ""; - sha256 = "0avj4g3s2839b2y4m6pk8kid74r8nj7k0qm2rsdcwjzhg8h7rd3h"; + version = rubyVersion "3" "0" "5" ""; + sha256 = "sha256-mvxjgKAnpP4a4aPi7MtrSXucWsBjHBLKVvm3vrSEh3Y="; }; ruby_3_1 = generic { diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index bdc4cf3690fee..2bf5bc7296c6a 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,17 +1,15 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.7.6" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-with-openssl-dir-option.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/02-fix-broken-tests-caused-by-ad.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/03-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/04-more-detailed-stacktrace.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/05-malloc-trim.patch" + "2.7.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/04-malloc-trim.patch" ]; - "3.0.4" = ops useRailsExpress [ - "${patchSet}/patches/ruby/3.0/head/railsexpress/01-fix-with-openssl-dir-option.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/03-malloc-trim.patch" + "3.0.5" = ops useRailsExpress [ + "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" + "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; "3.1.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.1/head/railsexpress/01-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/ruby/ruby-version.nix b/pkgs/development/interpreters/ruby/ruby-version.nix index b1cbbfc216dcf..57fa60aea28c0 100644 --- a/pkgs/development/interpreters/ruby/ruby-version.nix +++ b/pkgs/development/interpreters/ruby/ruby-version.nix @@ -1,6 +1,6 @@ # Contains the ruby version heuristics { lib }: -with lib; + let # The returned set should be immutable rubyVersion = major: minor: tiny: tail: @@ -10,15 +10,15 @@ let # Contains the patch number "223" if tail is "p223" or null patchLevel = let - p = removePrefix "p" tail; + p = lib.removePrefix "p" tail; isPosInt = num: - 0 == stringLength - (replaceStrings + 0 == lib.stringLength + (lib.replaceStrings ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"] ["" "" "" "" "" "" "" "" "" "" ] num); in - if hasPrefix "p" tail && isPosInt p then p + if lib.hasPrefix "p" tail && isPosInt p then p else null; # Shortcuts @@ -28,11 +28,11 @@ let # Ruby separates lib and gem folders by ABI version which isn't very # consistent. libDir = - if versionAtLeast majMinTiny "2.1.0" then + if lib.versionAtLeast majMinTiny "2.1.0" then "${majMin}.0" - else if versionAtLeast majMinTiny "2.0.0" then + else if lib.versionAtLeast majMinTiny "2.0.0" then "2.0.0" - else if versionAtLeast majMinTiny "1.9.1" then + else if lib.versionAtLeast majMinTiny "1.9.1" then "1.9.1" else throw "version ${majMinTiny} is not supported"; @@ -55,9 +55,9 @@ let self.majMinTiny + ( if self.patchLevel != null then "-p${self.patchLevel}" - else if self.tail != "" then - "-${self.tail}" - else ""); + else + lib.optionalString (self.tail != "") "-${self.tail}" + ); }; in rubyVersion diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 51c0a9a7dfb3d..fbbfd4c973027 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "a6429bb1a7fb9b5798c22f43338739a6c192b42d"; - sha256 = "sha256-NpSa+uGQA1rfHNcLzPNTK65J+Wk9ZlzhHFePDA4uuo0="; + rev = "e6574c54a34fe6e4d45aa1433872a22ddfe14cf3"; + hash = "sha256-x2KvhgRVJ4Nc5v1j4DggKO1u3otG8HVMxhq4yuUKnds="; } diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix index ef89d1ca0a276..ff6808b13b0a1 100644 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ b/pkgs/development/interpreters/spidermonkey/102.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "102.1.0"; - hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; + version = "102.8.0"; + hash = "sha512-k+qHmXtmCIuUxulDtumemnHRkIRE0JbA9ltodtLFhOVf9hICZvOFH5hrZkvR8S+jEgawNHnCt1Hnw8oJesFCdQ=="; } diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index ca771fa75fd6b..0ffa5fc287d50 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "91.12.0"; - hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg=="; + version = "91.13.0"; + hash = "sha512-OLTMUt4h521gYea6F14cv9iIoWBwqpUfWkQoPy251+lPJQRiHw2nj+rG5xSRptDnA49j3QrhEtytcA6wLpqlFg=="; } diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index a6695082684d3..a6b0282ce5c11 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -62,19 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec { # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch - - # Patches required by GJS - # https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658 - # Install ProfilingCategoryList.h - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a"; - sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI="; - }) - # Fix embeder build - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b"; - sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA="; - }) ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch @@ -147,8 +134,9 @@ stdenv.mkDerivation (finalAttrs: rec { # cc-rs insists on using -mabi=lp64 (soft-float) for riscv64, # while we have a double-float toolchain - NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; postPatch = lib.optionalString (lib.versionOlder version "102") '' diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index ecb3d5787eb37..7271e5073c32f 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -2,8 +2,8 @@ , pkg-config, alsa-lib, libjack2, libsndfile, fftw , curl, gcc, libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs -, supercollider-with-plugins, supercolliderPlugins -, writeText, runCommand +, gitUpdater, supercollider-with-plugins +, supercolliderPlugins, writeText, runCommand }: mkDerivation rec { @@ -26,6 +26,8 @@ mkDerivation rec { }) ]; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config qttools ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] @@ -39,24 +41,32 @@ mkDerivation rec { "-DSC_EL=${if useSCEL then "ON" else "OFF"}" ]; - passthru.tests = { - # test to make sure sclang runs and included plugins are successfully found - sclang-sc3-plugins = let - supercollider-with-test-plugins = supercollider-with-plugins.override { - plugins = with supercolliderPlugins; [ sc3-plugins ]; - }; - testsc = writeText "test.sc" '' - var err = 0; - try { - MdaPiano.name.postln; - } { - err = 1; + passthru = { + updateScript = gitUpdater { + url = "https://github.com/supercollider/supercollider.git"; + rev-prefix = "Version-"; + ignoredVersions = "rc|beta"; + }; + + tests = { + # test to make sure sclang runs and included plugins are successfully found + sclang-sc3-plugins = let + supercollider-with-test-plugins = supercollider-with-plugins.override { + plugins = with supercolliderPlugins; [ sc3-plugins ]; }; - err.exit; + testsc = writeText "test.sc" '' + var err = 0; + try { + MdaPiano.name.postln; + } { + err = 1; + }; + err.exit; + ''; + in runCommand "sclang-sc3-plugins-test" { } '' + timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out ''; - in runCommand "sclang-sc3-plugins-test" {} '' - timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out - ''; + }; }; meta = with lib; { diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index a596d6d770aef..c7058817722e6 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, supercollider, fftw }: +{ stdenv, lib, fetchurl, cmake, supercollider, fftw, gitUpdater }: stdenv.mkDerivation rec { pname = "sc3-plugins"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { stripDebugList = [ "lib" "share" ]; + passthru.updateScript = gitUpdater { + url = "https://github.com/supercollider/sc3-plugins.git"; + rev-prefix = "Version-"; + ignoredVersions = "rc|beta"; + }; + meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 6351a08c1c071..6ce6e35189bf2 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -53,7 +53,7 @@ let libdir = "lib/${libPrefix}"; tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { name = "tcl-package-hook"; - deps = [ buildPackages.makeWrapper ]; + propagatedBuildInputs = [ buildPackages.makeWrapper ]; } ./tcl-package-hook.sh) {}; }; }; diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 41603037931ff..8548ac66402f0 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -41,6 +41,8 @@ findInstalledTclPkgs() { # Wrap any freshly-installed binaries and set up their TCLLIBPATH wrapTclBins() { + if [ "$dontWrapTclBinaries" ]; then return; fi + if [[ -z "${TCLLIBPATH-}" ]]; then echo "skipping automatic Tcl binary wrapping (nothing to do)" return diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 770661c60534a..c1a20a198f3b7 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, withThread ? true, withSSL ? true, xxd }: +{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, valgrind, withThread ? true, withSSL ? true, xxd }: stdenv.mkDerivation rec { pname = "trealla"; - version = "2.2.6"; + version = "2.8.4"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-DxlexijQPcNxlPjo/oIvsN//8nZ0injXFHc2t3n4yjg="; + sha256 = "sha256-/jB4jlYotvdU068+zj9Z+G0g75sI9dTmtgN874i0qAE="; }; postPatch = '' @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xxd ]; buildInputs = [ readline openssl libffi ]; + checkInputs = [ valgrind ]; enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 593a955c798bb..bca8ef1d159c3 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { # ld: ../common/ipp.o:(.bss+0x0): multiple definition of `lpath'; tglobals.o:(.bss+0x30): first defined here # TODO: remove the workaround once upstream releases version past: # https://sourceforge.net/p/unicon/unicon/ci/b1a65230233f3825d055aee913b4fdcf178a0eaf/ - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configurePhase = '' case "$(uname -a | sed 's/ /_/g')" in diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index b6bb4c16634f2..5666b078b4c32 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-t/ObsvUSNGFvHkVH2nl8vLFI+5GUQx6niCgeH4ykk/0="; + rev = "refs/tags/v${version}"; + hash = "sha256-797I3FBBfnAgNfOdMajm3WNkMo3MUXb1347LBggXrLk="; }; - cargoSha256 = "sha256-75/0D0lrV50wH51Ll7M1Lvqj2kRSaJXiQWElxCaF9mE="; + cargoHash = "sha256-zUTwhfRLKUixgj3JXiz2QOuwbFhfget+GcFSRL1QJ3w="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index b2844f723bc20..ecc8788ca7be7 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "4.0.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Vw3+KlAuCQiyBfPOZrUotgrdkG+FRjXg8AxAanfbwJQ="; + hash = "sha256-wCM+axQy5gOHUAThmwPYMt9/HWuIpGcQjMT9TSLqWbk="; fetchSubmodules = true; }; - cargoHash = "sha256-gV3Yf7YL3D3hrymYW1b80uOlp7RYRWFC7GtxAot5Ut0="; + cargoHash = "sha256-0RsTE6pcbbUFn7PWg1tNOlvix6TIB5DZxiJQVKU+lKg="; cargoBuildFlags = [ "--package wasmtime-cli" @@ -28,14 +28,8 @@ rustPlatform.buildRustPackage rec { # false positives of this package being broken due to failed runs on # Hydra (e.g. https://hydra.nixos.org/build/187667794/) doCheck = (stdenv.system != "x86_64-darwin"); - checkFlags = [ - "--skip=cli_tests::run_cwasm" - "--skip=commands::compile::test::test_unsupported_flags_compile" - "--skip=commands::compile::test::test_aarch64_flags_compile" - "--skip=commands::compile::test::test_successful_compile" - "--skip=commands::compile::test::test_x64_flags_compile" - "--skip=commands::compile::test::test_x64_presets_compile" - "--skip=traps::parse_dwarf_info" + cargoTestFlags = [ + "--package wasmtime-runtime" ]; postInstall = '' diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/development/interpreters/zuo/default.nix index 5ae05510f6b4a..f0d71673c2fbb 100644 --- a/pkgs/development/interpreters/zuo/default.nix +++ b/pkgs/development/interpreters/zuo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2022-11-15"; + version = "unstable-2023-01-02"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "7492a8aa3721bfad7d158497313b913537a8b12d"; - hash = "sha256-9tMYaKjBTGm9NjcytpUS9mgBlE9L1U2VECsqfU706u4="; + rev = "464aae9ae90dcb43ab003b922e4ae4d08611c55b"; + hash = "sha256-O8p3dEXqAP2UNPNBla9AtkndxgL8UoVp/QygXOmcgWg="; }; doCheck = true; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 14273f28a376b..7a49bcbda7fc6 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -35,7 +35,7 @@ # Workaround build failure on -fno-common toolchains: # ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of # `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildPhase = '' cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index b35880e013c86..c058590c85746 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -5,7 +5,7 @@ , sha512 , type ? "jar" , suffix ? "" -, sourceProvenance ? (if type == "jar" then [ lib.sourceTypes.binaryBytecode ] else []) +, sourceProvenance ? (lib.optionals (type == "jar") [ lib.sourceTypes.binaryBytecode ]) }: let diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index d966a75bb9d0a..01774cc262b4c 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -1,6 +1,5 @@ { lib, pkgs }: -with lib; with pkgs.javaPackages; let @@ -10,7 +9,7 @@ let poms = import ./poms.nix { inherit fetchMaven; }; in { # Maven needs all of these to function - mavenMinimal = flatten + mavenMinimal = lib.flatten collections.mavenLibs_2_0_6 ++ collections.mavenLibs_2_0_9 ++ collections.mavenLibs_2_2_1 diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3a2a048a860e0..5299135e9fe48 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -11,17 +11,15 @@ # NOTE: When editing this expression see if the same change applies to # SDL2 expression too -with lib; - let extraPropagatedBuildInputs = [ ] - ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] - ++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] - ++ optional alsaSupport alsa-lib - ++ optional pulseaudioSupport libpulseaudio - ++ optional stdenv.isDarwin Cocoa; - rpath = makeLibraryPath extraPropagatedBuildInputs; + ++ lib.optionals x11Support [ libXext libICE libXrandr ] + ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] + ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional stdenv.isDarwin Cocoa; + rpath = lib.makeLibraryPath extraPropagatedBuildInputs; in stdenv.mkDerivation rec { @@ -40,13 +38,13 @@ stdenv.mkDerivation rec { outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkg-config ] - ++ optional stdenv.isLinux libcap; + ++ lib.optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; buildInputs = [ ] - ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile - ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; configureFlags = [ "--disable-oss" @@ -58,9 +56,9 @@ stdenv.mkDerivation rec { # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) # # Please try revert the change that introduced this comment when updating SDL. - ] ++ optional stdenv.isDarwin "--disable-x11-shared" - ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; + ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared" + ++ lib.optional (!x11Support) "--without-x" + ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; patches = [ ./find-headers.patch diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index a38761ed7c503..f601e101660db 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -55,8 +55,6 @@ # NOTE: When editing this expression see if the same change applies to # SDL expression too -with lib; - stdenv.mkDerivation rec { pname = "SDL2"; version = "2.24.2"; @@ -88,40 +86,40 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals waylandSupport [ wayland wayland-scanner ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; dlopenPropagatedBuildInputs = [ ] # Propagated for #include <GLES/gl.h> in SDL_opengles.h. - ++ optional openglSupport libGL + ++ lib.optional openglSupport libGL # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h. - ++ 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 ]; + ++ lib.optionals x11Support [ libX11 xorgproto ]; + + 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/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 4ff02ffb7b2ef..a8824904aea88 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,15 +1,20 @@ { lib, stdenv, fetchurl , pkg-config , SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation +, version ? "2.6.3" +, hash ? "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=" }: -stdenv.mkDerivation rec { +let pname = "SDL2_image"; - version = "2.0.5"; +in + +stdenv.mkDerivation { + inherit pname version; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; - sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/SDL2_mixer/2_0.nix b/pkgs/development/libraries/SDL2_mixer/2_0.nix new file mode 100644 index 0000000000000..764a392199800 --- /dev/null +++ b/pkgs/development/libraries/SDL2_mixer/2_0.nix @@ -0,0 +1,22 @@ +{ fetchurl +, lzwolf +, SDL2_mixer +, timidity +}: + +SDL2_mixer.overrideAttrs(oa: rec { + version = "2.0.4"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz"; + sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; + }; + + # fix default path to timidity.cfg so MIDI files could be played + postPatch = '' + substituteInPlace timidity/options.h \ + --replace "/usr/share/timidity" "${timidity}/share/timidity" + ''; + + passthru.tests.lzwolf = lzwolf; +}) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 7e562dddf0fda..dab76bdab70b0 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -18,13 +18,25 @@ stdenv.mkDerivation rec { pname = "SDL2_mixer"; - version = "2.0.4"; + version = "2.6.3"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; - sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; + sha256 = "sha256-emuoakeGSM5hfjpekncYG8Z/fOmHZgXupq/9Sg1u6o8="; }; + configureFlags = [ + "--disable-music-ogg-shared" + "--disable-music-flac-shared" + "--disable-music-mod-modplug-shared" + "--disable-music-mp3-mpg123-shared" + "--disable-music-opus-shared" + "--disable-music-midi-fluidsynth-shared" + ] ++ lib.optionals stdenv.isDarwin [ + "--disable-sdltest" + "--disable-smpegtest" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ @@ -49,28 +61,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - # fix default path to timidity.cfg so MIDI files could be played - postPatch = '' - substituteInPlace timidity/options.h \ - --replace "/usr/share/timidity" "${timidity}/share/timidity" - ''; - - configureFlags = [ - "--disable-music-ogg-shared" - "--disable-music-flac-shared" - "--disable-music-mod-modplug-shared" - "--disable-music-mp3-mpg123-shared" - "--disable-music-opus-shared" - "--disable-music-midi-fluidsynth-shared" - ] ++ lib.optionals stdenv.isDarwin [ - "--disable-sdltest" - "--disable-smpegtest" - ]; - meta = with lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; - homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + homepage = "https://github.com/libsdl-org/SDL_mixer"; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index f424a2e67f568..06793ee5e551a 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.20.1"; + version = "2.20.2"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc="; + sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; diff --git a/pkgs/development/libraries/StormLib/default.nix b/pkgs/development/libraries/StormLib/default.nix index 0bf9ba63dc482..bc247e956235c 100644 --- a/pkgs/development/libraries/StormLib/default.nix +++ b/pkgs/development/libraries/StormLib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }: stdenv.mkDerivation rec { pname = "StormLib"; @@ -11,13 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc"; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks" + ''; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DWITH_LIBTOMCRYPT=ON" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ bzip2 libtomcrypt zlib ]; + buildInputs = [ bzip2 libtomcrypt zlib ] ++ + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; meta = with lib; { homepage = "https://github.com/ladislav-zezula/StormLib"; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 694aab16d1abd..584b328d47001 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection dbus + gettext glib polkit systemd diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 3de86d457269f..bae0401a781a8 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.10"; + version = "7.0.11"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-G3H1MBGseD/G9kigS3r9TrwRk8TYi2KC1CueKhtlNzA="; + sha256 = "sha256-r+LRiu/u1qMcbrjkSr8ErnemX6zvhgvc5cLWu8AQhww="; }; enableParallelBuilding = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool ]; buildInputs = [ perl ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" ]; diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 12bc6e7e4e192..ff520fb85ef31 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,21 +1,29 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.1"; + version = "0.1.7.1a"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "1acb693ad2nrmnn6jxsyrlkc0di3kk2ksj2w9wnyfxrgvfsil7rn"; + sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU="; }; - # Remove this once new version of agda-categories is released which - # directly references standard-library-1.7.1 postPatch = '' - substituteInPlace agda-categories.agda-lib \ - --replace 'standard-library-1.7' 'standard-library-1.7.1' + # Remove this once agda-categories incorporates this fix or once Agda's + # versioning system gets an overhaul in general. Right now there is no middle + # ground between "no version constraint" and "exact match down to patch". We + # do not want to need to change this postPatch directive on each minor + # version update of the stdlib, so we get rid of the version constraint + # altogether. + sed -Ei 's/standard-library-[0-9.]+/standard-library/' agda-categories.agda-lib + + # The Makefile of agda-categories uses git(1) instead of find(1) to + # determine the list of source files. We cannot use git, as $PWD will not + # be a valid Git working directory. + find src -name '*.agda' | sed -e 's|^src/[/]*|import |' -e 's|/|.|g' -e 's/.agda//' -e '/import Everything/d' | LC_COLLATE='C' sort > Everything.agda ''; buildInputs = [ standard-library ]; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 693bad67d08ee..573b13d3b4f9d 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "compat-2.6.2"; + version = "unstable-2022-01-14"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = version; - sha256 = "0j2nip5fbn61fpkm3qz4dlazl4mzdv7qlgw9zm15bkcvaila0h14"; + rev = "3d143d6d0a3f75966602480665623e87233ff93e"; + hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8="; }; preConfigure = '' diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index a69edded5b3d2..5cd2a4a9a2329 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,17 +2,15 @@ mkDerivation rec { pname = "cubical"; - version = "0.4"; + version = "unstable-2023-02-09"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "v${version}"; - hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE="; + rev = "6b1ce0b67fd94693c1a3e340c8e8765380de0edc"; + hash = "sha256-XRCaW94oAgy2GOnFiI9c5A8mEx7AzlbT4pFd+PMmc9o="; }; - LC_ALL = "C.UTF-8"; - # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. nativeBuildInputs = [ ghc ]; diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index bad3a02470e45..76f69f54d7191 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0khl12jvknsvjsq3l5cbp2b5qlw983qbymi1dcgfz9z0b92si3r0"; + hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 4fd87c69d71df..0f85c0f3bc4b9 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q4.4"; + version = "2023.Q1.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "sha256-MKU7bfjrvH4M2kON2tr5463nYjN1xoGAknsC9YmklEc="; + sha256 = "sha256-QNjBLOnSfCTA+5qLqejAqJv9eIWAEVNc/VrhidGjmTc="; }; buildInputs = [ diff --git a/pkgs/development/libraries/applet-window-buttons/default.nix b/pkgs/development/libraries/applet-window-buttons/default.nix index 61187581e9aad..4f605b8af98b6 100644 --- a/pkgs/development/libraries/applet-window-buttons/default.nix +++ b/pkgs/development/libraries/applet-window-buttons/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , extra-cmake-modules , kcoreaddons @@ -20,6 +21,14 @@ mkDerivation rec { hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE="; }; + patches = [ + # FIXME: cherry-pick Plasma 5.27 build fix, remove for next release + (fetchpatch { + url = "https://github.com/psifidotos/applet-window-buttons/commit/924994e10402921bf22fefc099bca2914989081c.diff"; + hash = "sha256-4ErqmkIbkvKwns50LhI8Et1EMyvrXYcNRL1rXCxau2w="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 909965bb06886..594ecfbdb306a 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/apr/cross-assume-dev-zero-mmappable.patch b/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch new file mode 100644 index 0000000000000..4bacb891f221e --- /dev/null +++ b/pkgs/development/libraries/apr/cross-assume-dev-zero-mmappable.patch @@ -0,0 +1,14 @@ +based onhttps://830833.bugs.gentoo.org/attachment.cgi?id=761676, +adjusted for 1.7.2 + +--- a/configure.in 2022-01-09 00:31:05.552582255 -0800 ++++ b/configure.in 2022-01-09 00:31:19.824582533 -0800 +@@ -1329,7 +1329,7 @@ + return 3; + } + return 0; +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])]) ++ }], [], [ac_cv_file__dev_zero=no], [:])]) + fi + + # Now we determine which one is our anonymous shmem preference. diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 0d980db9b5a8b..36a82afcf860f 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -2,38 +2,15 @@ stdenv.mkDerivation rec { pname = "apr"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; - sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; + sha256 = "sha256-ded8yGd2wDDApcQI370L8qC3Xu1TUeUtVDn6HlUJpD4="; }; patches = [ - (fetchpatch { - name = "CVE-2021-35940.patch"; - url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch"; - sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs"; - # convince fetchpatch to restore missing `a/`, `b/` to paths - extraPrefix = ""; - }) - - # Fix cross. - (fetchpatch { - url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch"; - sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y"; - }) - (fetchpatch { - url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; - sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; - }) - - # Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833 - (fetchpatch { - url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676"; - name = "cross-assume-dev-zero-mmappable.patch"; - sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8="; - }) + ./cross-assume-dev-zero-mmappable.patch ]; # This test needs the net diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dd7691762567a..b7ec97180890e 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.22"; + version = "0.8.26"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI="; + sha256 = "sha256-24FSq9qe8tAFGB4BOjD52BQiy8Rw6ZDE5Sq+VS5S638="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 2b07d3a87a64b..d3bee03c5e194 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ linear algebra library"; - homepage = "http://arma.sourceforge.net"; + homepage = "https://arma.sourceforge.net"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 5c60723309b74..0796dce793d66 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -43,7 +43,7 @@ # non-existent in older versions # see https://github.com/boostorg/process/issues/55 , enableS3 ? (!stdenv.isDarwin) || (lib.versionOlder boost.version "1.69" || lib.versionAtLeast boost.version "1.70") -, enableGcs ? !stdenv.isDarwin # google-cloud-cpp is not supported on darwin +, enableGcs ? (!stdenv.isDarwin) && (lib.versionAtLeast grpc.cxxStandard "17") # google-cloud-cpp is not supported on darwin, needs to support C++17 }: assert lib.asserts.assertMsg @@ -52,17 +52,19 @@ assert lib.asserts.assertMsg let arrow-testing = fetchFromGitHub { + name = "arrow-testing"; owner = "apache"; repo = "arrow-testing"; - rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; - hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; + rev = "ecab1162cbec872e17d949ecc86181670aee045c"; + hash = "sha256-w6rEuxfLTEO8DyXV44G6JOMeTfYtskFCOj9rHXNmj2Y="; }; parquet-testing = fetchFromGitHub { + name = "parquet-testing"; owner = "apache"; repo = "parquet-testing"; - rev = "aafd3fc9df431c2625a514fb46626e5614f1d199"; - hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; + rev = "5b82793ef7196f7b3583e85669ced211cd8b5ff2"; + hash = "sha256-gcOvk7qFHZgJWE9CpucC8zwayYw47VbC3lmSRu4JQFg="; }; aws-sdk-cpp-arrow = aws-sdk-cpp.override { @@ -79,11 +81,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "9.0.0"; + version = "11.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-qaAz8KNJAomZj0WGgNGVec8HkRcXumWv3my4AHD3qbU="; + hash = "sha256-Ldjw6ghIpYeFYo7jpXZ1VI1QnhchOi9dcrDZALQ/VDA="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -108,15 +110,15 @@ stdenv.mkDerivation rec { ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "8.1.0"; - hash = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk="; + rev = "9.0.1"; + hash = "sha256-onALN6agtrHWigtFlCeefD9CiRZI4Y690XTzy2UDnrk="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.6.0"; - hash = "sha256-hxCBomL4Qg9cHLRg9ZiO9k+JVOZXn6f4ikPtK+V9tno="; + rev = "v0.20.0"; + hash = "sha256-71hAwJ0cGvpwK/ibeeQt82e9uqxcu9sM1rPtPENMPfs="; }; patches = [ @@ -148,18 +150,17 @@ stdenv.mkDerivation rec { utf8proc zlib zstd - ] ++ lib.optionals enableShared [ - python3.pkgs.python - python3.pkgs.numpy ] ++ lib.optionals enableFlight [ grpc openssl protobuf + sqlite ] ++ lib.optionals enableS3 [ aws-sdk-cpp-arrow openssl ] ++ lib.optionals enableGcs [ crc32c curl - google-cloud-cpp grpc + google-cloud-cpp + grpc nlohmann_json ]; @@ -183,16 +184,12 @@ stdenv.mkDerivation rec { "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" "-DARROW_DATASET=ON" - "-DARROW_ENGINE=ON" "-DARROW_FILESYSTEM=ON" "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" "-DARROW_HDFS=ON" "-DARROW_IPC=ON" "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" - "-DARROW_PLASMA=ON" - # Disable Python for static mode because openblas is currently broken there. - "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" "-DARROW_USE_GLOG=ON" "-DARROW_WITH_BACKTRACE=ON" "-DARROW_WITH_BROTLI=ON" @@ -203,21 +200,21 @@ stdenv.mkDerivation rec { "-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZSTD=ON" "-DARROW_MIMALLOC=ON" - # Parquet options: - "-DARROW_PARQUET=ON" "-DARROW_SUBSTRAIT=ON" - "-DPARQUET_BUILD_EXECUTABLES=ON" "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" + # Parquet options: + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + "-DPARQUET_REQUIRE_ENCRYPTION=ON" ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ 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-arrow}/include/aws/core/Aws.h" - ++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ]; + ] ++ lib.optionals (!stdenv.isx86_64) [ "-DARROW_USE_SIMD=OFF" ] + ++ lib.optionals enableS3 [ "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ]; doInstallCheck = true; ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data"; @@ -237,33 +234,41 @@ stdenv.mkDerivation rec { "TestMinioServer.Connect" "TestS3FS.*" "TestS3FSGeneric.*" + ] ++ lib.optionals stdenv.isDarwin [ + # TODO: revisit at 12.0.0 or when + # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 + # is available, see + # https://github.com/apache/arrow/pull/15288#discussion_r1071244661 + "ExecPlanExecution.StressSourceSinkStopped" ]; in - lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; + lib.optionalString doInstallCheck "-${lib.concatStringsSep ":" filteredTests}"; + __darwinAllowLocalNetworking = true; - nativeInstallCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; - installCheckPhase = - let - excludedTests = lib.optionals stdenv.isDarwin [ - # Some plasma tests need to be patched to use a shorter AF_UNIX socket - # path on Darwin. See https://github.com/NixOS/nix/pull/1085 - "plasma-external-store-tests" - "plasma-client-tests" - ] ++ [ "arrow-gcsfs-test" ]; - in - '' - runHook preInstallCheck - ctest -L unittest \ - --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' + nativeInstallCheckInputs = [ perl which sqlite ] + ++ lib.optionals enableS3 [ minio ] + ++ lib.optionals enableFlight [ python3 ]; + + disabledTests = [ + # requires networking + "arrow-gcsfs-test" + "arrow-flight-integration-test" + ]; - runHook postInstallCheck - ''; + installCheckPhase = '' + runHook preInstallCheck + + ctest -L unittest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$' + + runHook postInstallCheck + ''; meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; + broken = stdenv.isLinux && stdenv.isAarch64; # waiting on gtest changes in staging platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index 8bcc12ae2b3a9..cb9f1eb30246e 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/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 74caec57c2d83..ea8a2133c82b0 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 81d9e54de435d..05f2d439adf3f 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/"; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 8e5793b0bcd12..4eaa95384d310 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.6.6"; + version = "0.6.8"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "bdueJqQwYglEiReW/vsbuzi9kUj2z8VYgQwNPyaYdsc="; + sha256 = "HGGLPf8afLaiT0MXVZIPokN1YmgTj/ox09t8YHwsLWk="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index a9163a257764f..59f7d169291b5 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "LIBDIR=${placeholder "out"}/lib" ]; - NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; + env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; meta = with lib; { description = "A C++ library of functions for DSP and Music Informatics purposes"; diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index a4916eecfe414..287ce2a700846 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -12,13 +12,17 @@ libunwindSupport ? true, libunwind, pulseaudioSupport ? true, - libpulseaudio + libpulseaudio, + soxSupport ? true, + sox }: stdenv.mkDerivation rec { pname = "roc-toolkit"; version = "0.2.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "roc-streaming"; repo = "roc-toolkit"; @@ -35,17 +39,17 @@ stdenv.mkDerivation rec { 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" ] ++ + "--prefix=${placeholder "out"}" ] ++ + lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ (if (!openfecSupport) diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 3d5d973eec55f..fc5162b34e8d4 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; - version = "0.5.1"; + version = "0.6.1"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-zyAKaO22She1e/+zPjiwSHeCctGLVYnT0vWgHODzSwc="; + sha256 = "sha256-iil6zj16R0Ex7T+jIQacExM3eFtWojfW8WjIXueW1Ww="; }; buildInputs = [ alsa-lib ]; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index d57b6a75cbaa2..2d2fd4f57716b 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 @@ -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-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index d5562d89f50f6..28f13d50f7842 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.14"; + version = "0.13.15"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ROSBjRvl036dslLZF5WgdBnlRvafrNaRzt65wfnk0s="; + sha256 = "sha256-UunYt5S8Xz/EZOojl+by3LaHidBE/P4Uwppm4SeHVP0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 5fb65ffa1811b..bb7989a2cbf5e 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ # openssl 3 generates several deprecation warnings "-Wno-error=deprecated-declarations" ]; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index b91c5025db3bc..99c1df8e0a39c 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { doCheck = false; # Ignore deprecation errors - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; passthru.updateScript = gitUpdater { ignoredVersions = ".ubuntu.*"; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 9091749db442b..97072fc4ad333 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.0"; + version = "5.2.16"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-HbKo5E1K+W5tPqRbcG4+ymUXv87iqc094pTeng94Aao="; + hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 8a5ed8f91f30c..b40ea68a48a6f 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "5.1.55"; + version = "5.2.23"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-wMf570/RP2Q4yluedECs+AKoH92PQQ8yVY+eBGGSAP4="; + sha256 = "sha256-c73PCM+bRz6CjGRY2AapEcvKC1UqyEfzb7qsicmrkQU="; }; nativeBuildInputs = [ cmake ]; @@ -29,12 +29,15 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=cast-function-type" "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" "-Wno-error=stringop-overflow" - ]; + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs and probably clang + "-Wno-error=use-after-free" + ]); propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index f1e537943f586..47fc87af143b7 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/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index feb41bf62941a..4268af7ee0bb6 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv, libxcrypt +{ lib, stdenv, icu, expat, zlib, bzip2, zstd, xz, python ? null, fixDarwinDylibNames, libiconv, libxcrypt , boost-build , fetchpatch , which @@ -34,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"; @@ -61,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}" @@ -82,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}" @@ -100,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 ); @@ -121,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; @@ -175,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 @@ -183,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++ : <linkflags>"-rpath $out/lib/" @@ -196,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++ : <archiver>$AR @@ -210,7 +209,7 @@ stdenv.mkDerivation { EOF '' # b2 needs to be explicitly told how to find Python when cross-compiling - + optionalString enablePython '' + + lib.optionalString enablePython '' cat << EOF >> user-config.jam using python : : ${python.interpreter} : ${python}/include/python${python.pythonVersion} @@ -225,11 +224,13 @@ 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 enableIcu icu - ++ optionals enablePython [ libxcrypt python ] - ++ optional enableNumpy python.pkgs.numpy; + ++ lib.optional (lib.versionAtLeast version "1.69") zstd + ++ lib.optional (lib.versionAtLeast version "1.65") xz + ++ lib.optional enableIcu icu + ++ lib.optionals enablePython [ libxcrypt python ] + ++ lib.optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; configurePlatforms = []; @@ -239,7 +240,7 @@ stdenv.mkDerivation { "--includedir=$(dev)/include" "--libdir=$(out)/lib" "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase - ] ++ optional (toolset != null) "--with-toolset=${toolset}" + ] ++ lib.optional (toolset != null) "--with-toolset=${toolset}" ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' @@ -265,7 +266,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 61c2a27f3d857..2c99989bc8892 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -30,6 +30,11 @@ buildGoModule { export GOARCH=$(go env GOHOSTARCH) ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-Wno-error=stringop-overflow" + ]); + buildPhase = '' ninjaBuildPhase ''; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 71ac20c4f31b5..1c5126584c2cc 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5203e941b3d04..2dc3266291d36 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bullet"; - version = "3.24"; + version = "3.25"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "sha256-1zQZI1MdW0Ipg5XJeiFZQi/6cI0t6Ckralc5DE3auow="; + sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM="; }; nativeBuildInputs = [ cmake ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"; meta = with lib; { diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 3a6ef0e3562d9..46ea599cefcc6 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 ]; @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + ]; + meta = with lib; { description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project."; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 8640fb6b5c9c9..f05f55cd8c922 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.18.5"; + version = "0.18.7"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "04b4kjisb5wzq6pilh8xzbxn7qcjgppl8k65hfv0zi0ja8fyp1xk"; + hash = "sha256-y1RE6AnyOrUN/z4md/xjlVwlIcL97ZEcKEOf8ZsCf+U="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index c1e7b52c04038..70a59bfa0db70 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -8,11 +8,14 @@ , libGL # libGLU libGL is no longer a big dependency , pdfSupport ? true , darwin +, testers }: let inherit (lib) optional optionals; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) pname version; +in { pname = "cairo"; version = "1.16.0"; @@ -132,6 +135,8 @@ in stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; longDescription = '' @@ -147,6 +152,11 @@ in stdenv.mkDerivation rec { ''; homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; + pkgConfigModules = [ + "cairo-ps" + "cairo-svg" + ] ++ lib.optional gobjectSupport "cairo-gobject" + ++ lib.optional pdfSupport "cairo-pdf"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix index 2d050adcc5b8a..38b025d8dda49 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.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-e5S3K0kYCB6nVZDi/DVKzMvrVk6IgXC2g7217sr8xUo="; + hash = "sha256-JVxBYhKTejc8lfqgxz5Ig5G9H90YuIcGAUopGJG/3Dg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index a5119f4a7f653..7052c98d8ef8f 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -8,6 +8,7 @@ , gflags , glog , suitesparse +, metis , runTests ? false , enableStatic ? stdenv.hostPlatform.isStatic , withBlas ? true @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; propagatedBuildInputs = [ eigen glog ] - ++ lib.optionals withBlas [ blas suitesparse ]; + ++ lib.optionals withBlas [ blas suitesparse metis ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index d21c0243bf3df..578b4341e73e3 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.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-BzZb8NDgf1NnkZaaxs+0YlVuYod/uiWJxA3geaYN7e0="; + sha256 = "sha256-e90N8bHFt3dOzppa4xkB7qra7/bHhAexTEYGXPFXS4s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 98acd0530e85e..941abaf0ba0bb 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,17 +1,19 @@ { lib , stdenv , fetchFromGitHub +, gmic +, gmic-qt }: stdenv.mkDerivation rec { pname = "cimg"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-laLi3ks5r0C61LDoCEgVqmqZ7/C18qQKxPm4zmQrw78="; + hash = "sha256-MPkZGKewusCw5TsW5NOtnrjqEK2dxRSCal1fn7Yiaio="; }; outputs = [ "out" "doc" ]; @@ -28,6 +30,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + # Need to update in lockstep. + inherit gmic gmic-qt; + }; + meta = with lib; { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 1a05eededc7c5..6fef10fe5d24e 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 861e9179e0948..18d055a387acf 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -30,17 +30,24 @@ stdenv.mkDerivation rec { "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT=" ]; - patches = # From debian - [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch - ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch - ./Install-contribs-lib.patch - ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; + patches = [ + # From debian + ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch + ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch + ./Install-contribs-lib.patch + # From arch + ./fix-missing-include-time.patch + + # required for darwin and linux-musl + ./pthread-include.patch + + ] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; # fails with "Unable to find executable: # /build/clucene-core-2.3.3.4/build/bin/cl_test" doCheck = false; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Core library for full-featured text search engine"; @@ -54,7 +61,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; - homepage = "http://clucene.sourceforge.net"; + homepage = "https://clucene.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 58c24069a3a4b..b6765af12a4c8 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; - homepage = "http://clucene.sourceforge.net"; + homepage = "https://clucene.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; diff --git a/pkgs/development/libraries/clucene-core/fix-darwin.patch b/pkgs/development/libraries/clucene-core/fix-darwin.patch index c06413f3c2e13..cb47a4f3763f0 100644 --- a/pkgs/development/libraries/clucene-core/fix-darwin.patch +++ b/pkgs/development/libraries/clucene-core/fix-darwin.patch @@ -1,16 +1,3 @@ ---- a/src/shared/CLucene/LuceneThreads.h -+++ b/src/shared/CLucene/LuceneThreads.h -@@ -7,6 +7,9 @@ - #ifndef _LuceneThreads_h - #define _LuceneThreads_h - -+#if defined(_CL_HAVE_PTHREAD) -+ #include <pthread.h> -+#endif - - CL_NS_DEF(util) - class CLuceneThreadIdCompare; - --- a/src/shared/CLucene/config/repl_tchar.h +++ b/src/shared/CLucene/config/repl_tchar.h @@ -28,26 +28,26 @@ diff --git a/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch b/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch new file mode 100644 index 0000000000000..0ac26f76929ac --- /dev/null +++ b/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch @@ -0,0 +1,49 @@ +From c1c2000c35ff39b09cb70fbdf66a107d3b17a674 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Wed, 12 Oct 2022 08:40:49 +0200 +Subject: [PATCH] Fix missing #include <time.h> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +At least on recent Fedora 37 beta, building now failed with + +> CLucene/document/DateTools.cpp:26:19: error: ‘gmtime’ was not declared in this scope +> 26 | tm *ptm = gmtime(&secs); +> | ^~~~~~ + +etc. + +As it turns out, after 22f9d40320e3deeaa8d6aaa7a770077c20a21dae "git-svn-id: +https://clucene.svn.sourceforge.net/svnroot/clucene/branches/lucene2_3_2@2672 +20ef185c-fe11-0410-a618-ba9304b01011" on 2008-06-26 had commented out +_CL_TIME_WITH_SYS_TIME in clucene-config.h.cmake as "not actually used for +anything", then cceccfb52917b5f4da447f1cf20c135952d41442 "Presenting DateTools +and deprecating DateField. DateTools still requires some testing and its own +unit testing" on 2008-06-29 had introduced this use of it (into then +src/CLucene/document/DateTools.H). And apparently most build environments have +silently been happy ever since when the dead leading check for +_CL_TIME_WITH_SYS_TIME didn't include both <sys/time.h> and <time.h>, but the +following check for _CL_HAVE_SYS_TIME_H only included <sys/time.h> but not +<time.h>. +--- + src/shared/CLucene/clucene-config.h.cmake | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/shared/CLucene/clucene-config.h.cmake b/src/shared/CLucene/clucene-config.h.cmake +index bd8683a5..6fe0f92b 100644 +--- a/src/shared/CLucene/clucene-config.h.cmake ++++ b/src/shared/CLucene/clucene-config.h.cmake +@@ -100,8 +100,7 @@ ${SYMBOL__T} + //#cmakedefine _CL_STAT_MACROS_BROKEN + + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +-//not actually used for anything... +-//#cmakedefine _CL_TIME_WITH_SYS_TIME 1 ++#cmakedefine _CL_TIME_WITH_SYS_TIME 1 + + /* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility("default"))) +-- +2.37.3 + diff --git a/pkgs/development/libraries/clucene-core/pthread-include.patch b/pkgs/development/libraries/clucene-core/pthread-include.patch new file mode 100644 index 0000000000000..73a168c132f41 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/pthread-include.patch @@ -0,0 +1,14 @@ +--- a/src/shared/CLucene/LuceneThreads.h ++++ b/src/shared/CLucene/LuceneThreads.h +@@ -7,6 +7,9 @@ + #ifndef _LuceneThreads_h + #define _LuceneThreads_h + ++#if defined(_CL_HAVE_PTHREAD) ++ #include <pthread.h> ++#endif + + CL_NS_DEF(util) + class CLuceneThreadIdCompare; + + diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 3459f2a849b0b..b88766952ee1e 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 f2945116e7efb..830791f6fb312 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 ed78f4f9ec84a..718377a7ca53d 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,16 +1,21 @@ { fetchurl, fetchpatch, lib, stdenv, cmake }: - +let + # Temporary split to save rebuilds; see PR #217469 + isUpdated = with stdenv; isDarwin && isAarch64; +in stdenv.mkDerivation rec { pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}.5"; + version = "${majorVersion}." + (if isUpdated then "6" else "5"); src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "1dm8pdvkyfa8dsbz9bpq7wwgixjij4sii9bbn5sgvqjm5ljdik7h"; + sha256 = if isUpdated + then "0xksffx1w3pzm18ynf28cx8scrhylcbz43s1rgkkdqnyil1q6cjv" + else "1dm8pdvkyfa8dsbz9bpq7wwgixjij4sii9bbn5sgvqjm5ljdik7h"; }; - patches = [ + patches = lib.optionals (!isUpdated) [ (fetchpatch { name = "musl-uintptr.patch"; url = "https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd"; @@ -20,38 +25,42 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional doCheck "-DUNIT_TESTING=ON" + ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; + + doCheck = true; + meta = with lib; { description = "Lightweight library to simplify and generalize unit tests for C"; + longDescription = '' + There are a variety of C unit testing frameworks available however + many of them are fairly complex and require the latest compiler + technology. Some development requires the use of old compilers which + makes it difficult to use some unit testing frameworks. In addition + many unit testing frameworks assume the code being tested is an + application or module that is targeted to the same platform that will + ultimately execute the test. Because of this assumption many + frameworks require the inclusion of standard C library headers in the + code module being tested which may collide with the custom or + incomplete implementation of the C library utilized by the code under + test. - longDescription = - ''There are a variety of C unit testing frameworks available however - many of them are fairly complex and require the latest compiler - technology. Some development requires the use of old compilers which - makes it difficult to use some unit testing frameworks. In addition - many unit testing frameworks assume the code being tested is an - application or module that is targeted to the same platform that will - ultimately execute the test. Because of this assumption many - frameworks require the inclusion of standard C library headers in the - code module being tested which may collide with the custom or - incomplete implementation of the C library utilized by the code under - test. - - Cmocka only requires a test application is linked with the standard C - library which minimizes conflicts with standard C library headers. - Also, CMocka tries to avoid the use of some of the newer features of - C compilers. - - This results in CMocka being a relatively small library that can be - used to test a variety of exotic code. If a developer wishes to - simply test an application with the latest compiler then other unit - testing frameworks may be preferable. - - This is the successor of Google's Cmockery.''; + Cmocka only requires a test application is linked with the standard C + library which minimizes conflicts with standard C library headers. + Also, CMocka tries to avoid the use of some of the newer features of + C compilers. - homepage = "https://cmocka.org/"; + This results in CMocka being a relatively small library that can be + used to test a variety of exotic code. If a developer wishes to + simply test an application with the latest compiler then other unit + testing frameworks may be preferable. + This is the successor of Google's Cmockery. + ''; + homepage = "https://cmocka.org/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ kragniz rasendubi ]; + broken = stdenv.hostPlatform.isStatic; # See https://github.com/NixOS/nixpkgs/issues/213623 }; } diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 9ced4e0a44d5a..8b0ac955810e8 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -28,8 +28,7 @@ let "example" ]; - # There is now a release, but it's cpu-only it seems to be for a very specific purpose - # Thus, we're sticking with the develop branch for now... + # ROCm 5.6 should release composable_kernel as stable with a tag in the future src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; @@ -53,6 +52,7 @@ let "-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 ]; @@ -82,7 +82,6 @@ let license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = buildExamples; # bin/example_grouped_gemm_xdl_bfp16] Error 139 }; }); @@ -93,6 +92,7 @@ in stdenv.mkDerivation { inherit (ck) pname version outputs src passthru meta; dontUnpack = true; + dontPatch = true; dontConfigure = true; dontBuild = true; @@ -109,4 +109,10 @@ in stdenv.mkDerivation { '' + '' runHook postInstall ''; + + # Fix paths + preFixup = '' + substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ + --replace "${ck}" "$out" + ''; } diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix index bd89b18dc7561..1d89025a51fa5 100644 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ b/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u8UmJ4bu00t7qxiNZ3nL7cd+8AIC0LoICj5FNPboCTQ="; + sha256 = "sha256-casFPNbPv9mkKpzfBENW7INClypuCO1L7clLGBXvSvI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 88e5bcf5d9d7b..6f4cdb1cf6878 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cosmopolitan"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "sha256-2Q4lutSIQ6tBwTy01lPSMepNAww9Kb7BwNyEcsSdWZ0="; + sha256 = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; }; patches = [ @@ -34,6 +34,9 @@ stdenv.mkDerivation rec { rm test/libc/calls/sched_setscheduler_test.c rm test/libc/thread/pthread_create_test.c rm test/libc/calls/getgroups_test.c + + # fails + rm test/libc/stdio/posix_spawn_test.c ''; installPhase = '' diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index bba2e03f8d59b..fa4fd5fe6d5c3 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt ''; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix index 44fcbe5463cb0..d44eed5e76f0f 100644 --- a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-http-client/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation { buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=range-loop-construct" + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" ]; meta = with lib; { diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 98c9c7ecac159..b71a6c0730310 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite libmysqlclient postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; - NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; + env.NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; meta = with lib; { homepage = "http://cppcms.com/sql/cppdb/"; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index 8790840c4c1dd..3b27601bcbfdc 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; cmakeFlags = [ "-DCRC32C_INSTALL=1" diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index 810b3a2aa8ff0..9b3304f6012f2 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = with python3Packages; [ cram ]; doCheck = true; - checkTarget = "test"; postPatch = '' patchShebangs ci/isdir.py src/protocol/gen-pb.py diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index 09d07064527ac..bccba589e031c 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid }: +{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "crossguid"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix index b91c00930ae01..2b3631a565da4 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/cyclonedds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch new file mode 100644 index 0000000000000..5d41552df37cf --- /dev/null +++ b/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch @@ -0,0 +1,26 @@ +From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@nextrem.ch> +Date: Mon, 3 Oct 2022 22:57:34 +0200 +Subject: [PATCH] Use full path in pkgconfig + +Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch> +--- + PkgConfig.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in +index 381e2343..93860ff0 100644 +--- a/PkgConfig.pc.in ++++ b/PkgConfig.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: Eclipse Cyclone DDS library +-- +2.37.3 + diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/development/libraries/cyclonedds/default.nix new file mode 100644 index 0000000000000..d7cd6986e658e --- /dev/null +++ b/pkgs/development/libraries/cyclonedds/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cyclonedds"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "eclipse-cyclonedds"; + repo = "cyclonedds"; + rev = version; + sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268="; + }; + + patches = [ + ./0001-Use-full-path-in-pkgconfig.patch + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Eclipse Cyclone DDS project"; + homepage = "https://cyclonedds.io/"; + license = with licenses; [ epl20 ]; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index db23009b8fa93..883b30c6a576c 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-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 005f1ac0302cb..263ddc6365284 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { + "dbus-c++-threading.patch?id=7f371172f5c"; sha256 = "1h362anx3wyxm5lq0v8girmip1jmkdbijrmbrq7k5pp47zkhwwrq"; }) + (fetchurl { + name = "template-operators.patch"; # since gcc12 + url = "https://src.fedoraproject.org/cgit/rpms/dbus-c++.git/plain/" + + "dbus-c++-template-operators.patch?id=d3f0d8bb519c0af"; + sha256 = "N25Y7jXDbr0qb7MfRr2yz3zRySppgGOe+oCfNQhRvVc="; + }) ]; nativeBuildInputs = [ pkg-config ]; @@ -37,7 +43,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ecore" "--disable-tests" ]; meta = with lib; { - homepage = "http://dbus-cplusplus.sourceforge.net"; + homepage = "https://dbus-cplusplus.sourceforge.net"; description = "C++ API for D-BUS"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 0a06881b5806c..0f4e62789a27b 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -75,5 +75,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + broken = stdenv.hostPlatform.isMusl; # Broken at 2022-02-25 + # See https://github.com/NixOS/nixpkgs/issues/218274 }; } diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/development/libraries/directx-headers/default.nix new file mode 100644 index 0000000000000..3ac15bb85e248 --- /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 0000000000000..513eebe7124f4 --- /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 331fe93e90dee..cb7b7466d0539 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv -, raft-canonical, sqlite }: +, raft-canonical, sqlite, lxd }: stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KVQa11gw/8h3Be+52V44W2M+fd7sB35emrS/aUEUGl0="; + hash = "sha256-x76f9Sw3BMgWSY7DLIqDjbggp/qVu8mJBtf4znTz9hA="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; @@ -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 diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index ab354b836b6a6..4b02b11b3d232 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -16,17 +16,23 @@ let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation rec { - version = "1.5.5"; + version = "1.5.6"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - sha256 = "sha256-WYWEUfBPz/Pt7sE8snG3/LnOA3DEUm/SUVLtsH7zG5g="; + hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI="; fetchSubmodules = true; }; + # ld: unknown option: --start-group + postPatch = '' + substituteInPlace cmake/draco_targets.cmake \ + --replace "^Clang" "^AppleClang" + ''; + buildInputs = [ gtest ] ++ lib.optionals withTranscoder [ eigen ghc_filesystem tinygltf ]; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 3df87efba19d2..0eca838dfce88 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.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw="; + 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 8d95bedf02237..2dd77b358b98b 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -7,7 +7,6 @@ , openssl , openjdk11 , unixODBC -, withHttpFs ? true , withJdbc ? false , withOdbc ? false }: @@ -17,35 +16,47 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-no4fcukEpzKmh2i41sdXGDljGhEDkzk3rYBATqlq6Gw="; + sha256 = "sha256-9m9+fldOgv2QTuUbw5y0zekBxZe8Dd4+8FqR3t3uFGg="; }; patches = [ ./version.patch ]; postPatch = '' substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" + substituteInPlace tools/shell/CMakeLists.txt \ + --replace \ + 'install(TARGETS shell RUNTIME DESTINATION "''${PROJECT_BINARY_DIR}")' \ + 'install(TARGETS shell RUNTIME DESTINATION "''${INSTALL_BIN_DIR}")' ''; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ openssl ] + ++ lib.optionals withJdbc [ openjdk11 ] + ++ lib.optionals withOdbc [ unixODBC ]; + cmakeFlags = [ - "-DBUILD_EXCEL_EXTENSION=ON" - "-DBUILD_FTS_EXTENSION=ON" - "-DBUILD_HTTPFS_EXTENSION=${enableFeature withHttpFs}" "-DBUILD_ICU_EXTENSION=ON" - "-DBUILD_JSON_EXTENSION=ON" - "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" "-DBUILD_PARQUET_EXTENSION=ON" - "-DBUILD_TPCDS_EXTENSION=ON" - "-DBUILD_TPCE=ON" "-DBUILD_TPCH_EXTENSION=ON" + "-DBUILD_TPCDS_EXTENSION=ON" + "-DBUILD_FTS_EXTENSION=ON" + "-DBUILD_HTTPFS_EXTENSION=ON" "-DBUILD_VISUALIZER_EXTENSION=ON" + "-DBUILD_JSON_EXTENSION=ON" + "-DBUILD_JEMALLOC_EXTENSION=ON" + "-DBUILD_EXCEL_EXTENSION=ON" "-DBUILD_INET_EXTENSION=ON" + "-DBUILD_TPCE=ON" + "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" "-DJDBC_DRIVER=${enableFeature withJdbc}" + # development settings + "-DBUILD_UNITTESTS=ON" ]; doInstallCheck = true; @@ -69,6 +80,10 @@ stdenv.mkDerivation rec { "test/sql/storage/compression/chimp/chimp_read_float.test" "test/sql/storage/compression/patas/patas_compression_ratio.test_coverage" "test/sql/storage/compression/patas/patas_read.test" + "test/sql/json/read_json_objects.test" + "test/sql/json/read_json.test" + "test/sql/copy/parquet/parquet_5968.test" + "test/fuzzer/pedro/buffer_manager_out_of_memory.test" # these are only hidden if no filters are passed in "[!hide]" # this test apparently never terminates @@ -87,11 +102,6 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - nativeBuildInputs = [ cmake ninja ]; - buildInputs = lib.optionals withHttpFs [ openssl ] - ++ lib.optionals withJdbc [ openjdk11 ] - ++ lib.optionals withOdbc [ unixODBC ]; - meta = with lib; { homepage = "https://github.com/duckdb/duckdb"; description = "Embeddable SQL OLAP Database Management System"; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 03c4ea0ee8f1e..3fa471b30b2df 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [cmake]; buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; - NIX_CFLAGS_COMPILE = "-std=c++11" + + env.NIX_CFLAGS_COMPILE = "-std=c++11" + lib.optionalString stdenv.isLinux " -pthread"; postInstall = '' mkdir -p $out/include diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 54df7be6f1bad..5663652429a48 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -4,6 +4,7 @@ , cmake , netcdf , openjpeg +, libaec , libpng , gfortran , perl @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.24.2"; + version = "2.28.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-xgrQ/YnhGRis4NhMAUifISIrEdbK0/90lYVqCt1hBAM="; + sha256 = "sha256-KDE0exUXr569cN08rYiugYqESNTmyGcapyhhfnNDHNU="; }; postPatch = '' @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf openjpeg + libaec libpng ]; @@ -60,14 +62,11 @@ stdenv.mkDerivation rec { doCheck = true; # Only do tests that don't require downloading 120MB of testdata - checkPhase = lib.optionalString (stdenv.isDarwin) '' - substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" - '' + '' + checkPhase = '' ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://confluence.ecmwf.int/display/ECC/"; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix new file mode 100644 index 0000000000000..c30f7392bb520 --- /dev/null +++ b/pkgs/development/libraries/edencommon/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, cmake, fetchFromGitHub, glog, folly, fmt_8, boost, gtest }: + +stdenv.mkDerivation rec { + pname = "edencommon"; + version = "2023.02.13.00"; + + src = fetchFromGitHub { + owner = "facebookexperimental"; + repo = "edencommon"; + rev = "v${version}"; + sha256 = "sha256-WxxE7ePZuNkSKRQG5Vni51xrrZT6BsKwwvhzykQf9X4="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + glog + folly + fmt_8 + boost + gtest + ]; + + meta = with lib; { + description = "A shared library for Meta's source control filesystem tools (EdenFS and Watchman)"; + homepage = "https://github.com/facebookexperimental/edencommon"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index e4509d058dae8..5cab69db676f2 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" "-DEMBREE_RAY_MASK=ON" + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" ]; diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index 08a650dbca003..01c87362d9d49 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "example-robot-data"; - version = "4.0.3"; + version = "4.0.5"; src = fetchFromGitHub { owner = "Gepetto"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-rxVyka8tcF/CmGTVNyh3FPR1LVa6JOAN+9zjElgqCak="; + sha256 = "sha256-KE+wmYlgETt6RtyN/BMApgS075/WtuhY+rM7YFkBH0E="; }; strictDeps = true; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index d17ca4ea751e9..54bab95992c0b 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "exempi"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0="; + sha256 = "sha256-sHSdsYqeeM93FzeVSoOM3NsdVBWIi6wbqcr4y6d8ZWw="; }; configureFlags = [ diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index dbc56572d537a..42f1f8db59bb0 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 e62a90fcd2bf0..f72e6f4f95437 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/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index b658cece4d8ab..f0c6924995717 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 = "23.01"; + version = "23.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-/XfwQUkhn82vAKa7ZyiPbD4c7XJhCIncxvWkj/m2P0M="; + sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix new file mode 100644 index 0000000000000..477f73ca2df43 --- /dev/null +++ b/pkgs/development/libraries/fb303/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, glog +, folly +, fmt_8 +, boost +, fbthrift +, zlib +, fizz +, libsodium +, wangle +, python3 +}: + +stdenv.mkDerivation rec { + pname = "fb303"; + version = "2023.02.13.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "fb303"; + rev = "v${version}"; + sha256 = "sha256-Dgef8Y8mvObbnXOsfWxTzMoqCph0i9lbusnjqn/WfTQ="; + }; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DPYTHON_EXTENSIONS=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + glog + folly + fmt_8 + boost + fbthrift + zlib + fizz + libsodium + wangle + python3 + ]; + + meta = with lib; { + description = "a base Thrift service and a common set of functionality for querying stats, options, and other information from a service"; + homepage = "https://github.com/facebook/fb303"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix new file mode 100644 index 0000000000000..15eedbdfc485c --- /dev/null +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchFromGitHub +, cmake +, bison +, boost +, libevent +, double-conversion +, libsodium +, fizz +, flex +, fmt_8 +, folly +, glog +, gflags +, libiberty +, openssl +, lib +, wangle +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "fbthrift"; + version = "2023.02.20.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "fbthrift"; + rev = "v${version}"; + sha256 = "sha256-MnF2JS+5kvcA6nymFWW7DTM5yWsnQR0U69lirG/CLDg="; + }; + + nativeBuildInputs = [ + cmake + bison + flex + ]; + + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + boost + double-conversion + fizz + fmt_8 + folly + glog + gflags + libevent + libiberty + openssl + wangle + zlib + zstd + libsodium + ]; + + meta = with lib; { + description = "Facebook's branch of Apache Thrift"; + homepage = "https://github.com/facebook/fbthrift"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ pierreis kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix deleted file mode 100644 index a8acf7a7ce61d..0000000000000 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ /dev/null @@ -1,511 +0,0 @@ -{ lib, stdenv, buildPackages, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm -/* - * Licensing options (yes some are listed twice, filters and such are not listed) - */ -, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab -, version3Licensing ? true # (L)GPL3: libvmaf,opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc -, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,blackmagic-design-desktop-video -/* - * Build options - */ -, smallBuild ? false # Optimize for size instead of speed -, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) -, grayBuild ? true # Full grayscale support -, swscaleAlphaBuild ? true # Alpha channel support in swscale -, hardcodedTablesBuild ? true # Hardcode decode tables instead of runtime generation -, safeBitstreamReaderBuild ? true # Buffer boundary checking in bitreaders -, multithreadBuild ? true # Multithreading via pthreads/win32 threads -, networkBuild ? true # Network support -, pixelutilsBuild ? true # Pixel utils in libavutil -, enableLto ? false # build with link-time optimization -/* - * Program options - */ -, ffmpegProgram ? true # Build ffmpeg executable -, ffplayProgram ? true # Build ffplay executable -, ffprobeProgram ? true # Build ffprobe executable -, qtFaststartProgram ? true # Build qt-faststart executable -/* - * Library options - */ -, avcodecLibrary ? true # Build avcodec library -, avdeviceLibrary ? true # Build avdevice library -, avfilterLibrary ? true # Build avfilter library -, avformatLibrary ? true # Build avformat library -, avutilLibrary ? true # Build avutil library -, postprocLibrary ? true # Build postproc library -, swresampleLibrary ? true # Build swresample library -, swscaleLibrary ? true # Build swscale library -/* - * Documentation options - */ -, htmlpagesDocumentation ? false # HTML documentation pages -, manpagesDocumentation ? true # Man documentation pages -, podpagesDocumentation ? false # POD documentation pages -, txtpagesDocumentation ? false # Text documentation pages -/* - * External libraries options - */ -, alsa-lib ? null # Alsa in/output support -#, avisynth ? null # Support for reading AviSynth scripts -, bzip2 ? null -, clang ? null -, celt ? null # CELT decoder -#, crystalhd ? null # Broadcom CrystalHD hardware acceleration -, cuda ? !stdenv.isDarwin && !stdenv.isAarch64 # Dynamically linked CUDA -, cuda-llvm ? !stdenv.isDarwin && !stdenv.isAarch64 # LLVM-based CUDA compilation -, dav1d ? null # AV1 decoder (focused on speed and correctness) -#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support -, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder -#, flite ? null # Flite (voice synthesis) support -, fontconfig ? null # Needed for drawtext filter -, freetype ? null # Needed for drawtext filter -, frei0r ? null # frei0r video filtering -, fribidi ? null # Needed for drawtext filter -, game-music-emu ? null # Game Music Emulator -, gnutls ? null -, gsm ? null # GSM de/encoder -#, ilbc ? null # iLBC de/encoder -, libjack2 ? null # Jack audio (only version 2 is supported in this build) -, ladspaH ? null # LADSPA audio filtering -, lame ? null # LAME MP3 encoder -, libass ? null # (Advanced) SubStation Alpha subtitle rendering -, libaom ? null # AV1 encoder -, libbluray ? null # BluRay reading -, libbs2b ? null # bs2b DSP library -, libcaca ? null # Textual display (ASCII art) -#, libcdio-paranoia ? null # Audio CD grabbing -, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) -, libdrm ? null # libdrm support -, libiconv ? null -#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) -, libmfx ? null # Hardware acceleration vis libmfx -, libmodplug ? null # ModPlug support -, 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 -, libtheora ? null # Theora encoder -, libv4l ? null # Video 4 Linux support -, libva ? null # Vaapi hardware acceleration -, libvdpau ? null # Vdpau hardware acceleration -, libvmaf ? null # Netflix's VMAF (Video Multi-Method Assessment Fusion) -, libvorbis ? null # Vorbis de/encoding, native encoder exists -, libvpx ? null # VP8 & VP9 de/encoding -, libwebp ? null # WebP encoder -, libX11 ? null # Xlib support -, libxcb ? null # X11 grabbing using XCB -, libxcbshmExtlib ? true # X11 grabbing shm communication -, libxcbxfixesExtlib ? true # X11 grabbing mouse rendering -, libxcbshapeExtlib ? true # X11 grabbing shape rendering -, libXv ? null # Xlib support -, libXext ? null # Xlib support -, libxml2 ? null # libxml2 support, for IMF and DASH demuxers -, xz ? null # xz-utils -, nv-codec-headers ? null -, nvdec ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVDEC support -, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64 # NVIDIA NVENC support -, openal ? null # OpenAL 1.1 capture support -, ocl-icd ? null # OpenCL ICD -, opencl-headers ? null # OpenCL headers -, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder -#, opencv ? null # Video filtering -, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering -, openh264 ? null # H.264/AVC encoder -, openjpeg ? null # JPEG 2000 de/encoder -, opensslExtlib ? false, openssl ? null -, libpulseaudio ? null # Pulseaudio input support -, rav1e ? null # AV1 encoder (focused on speed and safety) -, svt-av1 ? null # AV1 encoder/decoder (focused on speed and correctness) -, rtmpdump ? null # RTMP[E] support -#, libquvi ? null # Quvi input support -, samba ? null # Samba protocol -#, schroedinger ? null # Dirac de/encoder -, SDL2 ? null -#, shine ? null # Fixed-point MP3 encoder -, soxr ? null # Resampling via soxr -, speex ? null # Speex de/encoder -, srt ? null # Secure Reliable Transport (SRT) protocol -#, twolame ? null # MP2 encoder -#, utvideo ? null # Ut Video de/encoder -, vid-stab ? null # Video stabilization -#, vo-aacenc ? null # AAC encoder -, vo-amrwbenc ? null # AMR-WB encoder -, x264 ? null # H.264/AVC encoder -, x265 ? null # H.265/HEVC encoder -, xavs ? null # AVS encoder -, xvidcore ? null # Xvid encoder, native encoder exists -, zeromq4 ? null # Message passing -, zimg ? null -, zlib ? null -, vulkan-loader ? null -, glslang ? null -#, zvbi ? null # Teletext support -/* - * Developer options - */ -, debugDeveloper ? false -, optimizationsDeveloper ? true -, extraWarningsDeveloper ? false -, strippingDeveloper ? false -/* - * Darwin frameworks - */ -, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, VideoToolbox -}: - -/* Maintainer notes: - * - * Version bumps: - * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) - * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed - * and make the necessary changes. - * - * Packages with errors: - * flite ilbc schroedinger - * opencv - circular dependency issue - * - * Not packaged: - * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc oss shine twolame - * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video - * - * Need fixes to support Darwin: - * gsm libjack2 libmodplug libmfx(intel-media-sdk) nvenc pulseaudio samba - * vid-stab - * - * Need fixes to support AArch64: - * libmfx(intel-media-sdk) nvenc - * - * Not supported: - * stagefright-h264(android only) - * - * Known issues: - * flite: configure fails to find library - * Tried modifying ffmpeg's configure script and flite to use pkg-config - * Cross-compiling will disable features not present on host OS - * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) - * - */ - -let - inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64; - inherit (lib) optional optionals optionalString enableFeature; -in - -/* - * Licensing dependencies - */ -assert version3Licensing -> gplLicensing; -assert nonfreeLicensing -> gplLicensing && version3Licensing; -/* - * Build dependencies - */ -assert networkBuild -> gnutls != null || opensslExtlib; -assert pixelutilsBuild -> avutilLibrary; -/* - * Platform dependencies - */ -assert isDarwin -> !nvenc; -/* - * Program dependencies - */ -assert ffmpegProgram -> avcodecLibrary - && avfilterLibrary - && avformatLibrary - && swresampleLibrary; -assert ffplayProgram -> avcodecLibrary - && avformatLibrary - && swscaleLibrary - && swresampleLibrary - && SDL2 != null; -assert ffprobeProgram -> avcodecLibrary && avformatLibrary; -/* - * Library dependencies - */ -assert avcodecLibrary -> avutilLibrary; # configure flag since 0.6 -assert avdeviceLibrary -> avformatLibrary - && avcodecLibrary - && avutilLibrary; # configure flag since 0.6 -assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 -assert postprocLibrary -> avutilLibrary; -assert swresampleLibrary -> soxr != null; -assert swscaleLibrary -> avutilLibrary; -/* - * External libraries - */ -#assert decklinkExtlib -> blackmagic-design-desktop-video != null -# && !isCygwin && multithreadBuild # POSIX threads required -# && nonfreeLicensing; -assert fdkaacExtlib -> fdk_aac != null && nonfreeLicensing; -assert gnutls != null -> !opensslExtlib; -assert libxcbshmExtlib -> libxcb != null; -assert libxcbxfixesExtlib -> libxcb != null; -assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> libGL != null && libGLU != null; -assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; - -stdenv.mkDerivation rec { - pname = "ffmpeg-full"; - inherit (ffmpeg) src version patches; - - prePatch = '' - patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c - '' + lib.optionalString (frei0r != null) '' - substituteInPlace libavfilter/vf_frei0r.c \ - --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - substituteInPlace doc/filters.texi \ - --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - ''; - - configurePlatforms = []; - configureFlags = [ - "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" #mingw32 and mingw64 doesn't have a difference here, it is internally rewritten as mingw32 - "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - /* - * Licensing flags - */ - (enableFeature gplLicensing "gpl") - (enableFeature version3Licensing "version3") - (enableFeature nonfreeLicensing "nonfree") - /* - * Build flags - */ - # On some ARM platforms --enable-thumb - "--enable-shared" - (enableFeature true "pic") - (enableFeature smallBuild "small") - (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") - (enableFeature enableLto "lto") - (enableFeature grayBuild "gray") - (enableFeature swscaleAlphaBuild "swscale-alpha") - (enableFeature hardcodedTablesBuild "hardcoded-tables") - (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") - (if multithreadBuild then ( - if stdenv.hostPlatform.isWindows then - "--disable-pthreads --enable-w32threads" - else # Use POSIX threads by default - "--enable-pthreads --disable-w32threads") - else - "--disable-pthreads --disable-w32threads") - "--disable-os2threads" # We don't support OS/2 - (enableFeature networkBuild "network") - (enableFeature pixelutilsBuild "pixelutils") - /* - * Program flags - */ - (enableFeature ffmpegProgram "ffmpeg") - (enableFeature ffplayProgram "ffplay") - (enableFeature ffprobeProgram "ffprobe") - /* - * Library flags - */ - (enableFeature avcodecLibrary "avcodec") - (enableFeature avdeviceLibrary "avdevice") - (enableFeature avfilterLibrary "avfilter") - (enableFeature avformatLibrary "avformat") - (enableFeature avutilLibrary "avutil") - (enableFeature (postprocLibrary && gplLicensing) "postproc") - (enableFeature swresampleLibrary "swresample") - (enableFeature swscaleLibrary "swscale") - /* - * Documentation flags - */ - (enableFeature (htmlpagesDocumentation - || manpagesDocumentation - || podpagesDocumentation - || txtpagesDocumentation) "doc") - (enableFeature htmlpagesDocumentation "htmlpages") - (enableFeature manpagesDocumentation "manpages") - (enableFeature podpagesDocumentation "podpages") - (enableFeature txtpagesDocumentation "txtpages") - /* - * External libraries - */ - #(enableFeature avisynth "avisynth") - (enableFeature (bzip2 != null) "bzlib") - (enableFeature (celt != null) "libcelt") - (enableFeature cuda "cuda") - (enableFeature (clang != null && cuda-llvm) "cuda-llvm") - #(enableFeature crystalhd "crystalhd") - (enableFeature (dav1d != null) "libdav1d") - #(enableFeature decklinkExtlib "decklink") - (enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac") - #(enableFeature (flite != null) "libflite") - "--disable-libflite" # Force disable until a solution is found - (enableFeature (fontconfig != null) "fontconfig") - (enableFeature (freetype != null) "libfreetype") - (enableFeature (frei0r != null && gplLicensing) "frei0r") - (enableFeature (fribidi != null) "libfribidi") - (enableFeature (game-music-emu != null) "libgme") - (enableFeature (gnutls != null) "gnutls") - (enableFeature (gsm != null) "libgsm") - #(enableFeature (ilbc != null) "libilbc") - (enableFeature (ladspaH !=null) "ladspa") - (enableFeature (lame != null) "libmp3lame") - (enableFeature (libaom != null) "libaom") - (enableFeature (libass != null) "libass") - #(enableFeature (libavc1394 != null) null null) - (enableFeature (libbluray != null) "libbluray") - (enableFeature (libbs2b != null) "libbs2b") - #(enableFeature (libcaca != null) "libcaca") - #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio") - (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") - (enableFeature ((isLinux || isFreeBSD) && libdrm != null) "libdrm") - (enableFeature (libiconv != null) "iconv") - (enableFeature (libjack2 != null) "libjack") - #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - (enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx") - (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") - (enableFeature (libssh != null) "libssh") - (enableFeature (libtheora != null) "libtheora") - (enableFeature (if isLinux then libv4l != null else false) "libv4l2") - (enableFeature ((isLinux || isFreeBSD) && libva != null) "vaapi") - (enableFeature (libvdpau != null) "vdpau") - (enableFeature (libvorbis != null) "libvorbis") - (enableFeature (!isAarch64 && libvmaf != null && version3Licensing) "libvmaf") - (enableFeature (libvpx != null) "libvpx") - (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") - (enableFeature (libxcb != null) "libxcb") - (enableFeature libxcbshmExtlib "libxcb-shm") - (enableFeature libxcbxfixesExtlib "libxcb-xfixes") - (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (libxml2 != null) "libxml2") - (enableFeature (xz != null) "lzma") - (enableFeature nvdec "cuvid") - (enableFeature nvdec "nvdec") - (enableFeature nvenc "nvenc") - (enableFeature (openal != null) "openal") - (enableFeature (ocl-icd != null && opencl-headers != null) "opencl") - (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") - #(enableFeature (opencv != null) "libopencv") - (enableFeature openglExtlib "opengl") - (enableFeature (openh264 != null) "libopenh264") - (enableFeature (openjpeg != null) "libopenjpeg") - (enableFeature (opensslExtlib && gplLicensing) "openssl") - (enableFeature (libpulseaudio != null) "libpulse") - #(enableFeature quvi "libquvi") - (enableFeature (rav1e != null) "librav1e") - (enableFeature (svt-av1 != null) "libsvtav1") - (enableFeature (rtmpdump != null) "librtmp") - #(enableFeature (schroedinger != null) "libschroedinger") - (enableFeature (SDL2 != null) "sdl2") - (enableFeature (soxr != null) "libsoxr") - (enableFeature (speex != null) "libspeex") - #(enableFeature (twolame != null) "libtwolame") - #(enableFeature (utvideo != null && gplLicensing) "libutvideo") - (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 - #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") - (enableFeature (x264 != null && gplLicensing) "libx264") - (enableFeature (x265 != null && gplLicensing) "libx265") - (enableFeature (xavs != null && gplLicensing) "libxavs") - (enableFeature (xvidcore != null && gplLicensing) "libxvid") - (enableFeature (zeromq4 != null) "libzmq") - (enableFeature (zimg != null) "libzimg") - (enableFeature (zlib != null) "zlib") - (enableFeature (isLinux && vulkan-loader != null) "vulkan") - (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang") - (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient") - #(enableFeature (zvbi != null && gplLicensing) "libzvbi") - /* - * Developer flags - */ - (enableFeature debugDeveloper "debug") - (enableFeature optimizationsDeveloper "optimizations") - (enableFeature extraWarningsDeveloper "extra-warnings") - (enableFeature strippingDeveloper "stripping") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - "--host-cc=${buildPackages.stdenv.cc}/bin/cc" - ] ++ optionals stdenv.cc.isClang [ - "--cc=clang" - "--cxx=clang++" - ]; - - nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; - - 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 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 - ] ++ optionals openglExtlib [ libGL libGLU ] - ++ optionals nonfreeLicensing [ fdk_aac openssl ] - ++ optional ((isLinux || isFreeBSD) && libva != null) libva - ++ optional ((isLinux || isFreeBSD) && libdrm != null) libdrm - ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf - ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] - ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx - ++ optional (nvdec || nvenc) nv-codec-headers - ++ optional cuda-llvm clang - ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration VideoToolbox - libiconv ]; - - buildFlags = [ "all" ] - ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable - - doCheck = true; - checkPhase = let - ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ - make check -j$NIX_BUILD_CORES - ''; - - # Hacky framework patching technique borrowed from the phantomjs2 package - postInstall = optionalString qtFaststartProgram '' - cp -a tools/qt-faststart $out/bin/ - ''; - - postFixup = optionalString stdenv.isLinux '' - # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - addOpenGLRunpath $out/lib/libavcodec.so - addOpenGLRunpath $out/lib/libavutil.so - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = "https://www.ffmpeg.org/"; - changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; - longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - mux, demux, stream, filter and play pretty much anything that humans and machines - have created. It supports the most obscure ancient formats up to the cutting edge. - No matter if they were designed by some standards committee, the community or - a corporation. - ''; - license = ( - if nonfreeLicensing then - licenses.unfreeRedistributable - else if version3Licensing then - licenses.gpl3 - else if gplLicensing then - licenses.gpl2Plus - else - licenses.lgpl21Plus - ); - platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index ac88df930768a..7882c19da8f3f 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,8 +1,4 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix (rec { +import ./generic.nix rec { version = "4.4.3"; - branch = version; - sha256 = "sha256-M7jC281TD+HbVxBBU0Vgm0yiJ70NoeOpMy27DxH9Jzo="; - -} // args) + sha256 = "sha256-zZDzG1hD+0AHqElzeGR6OVm+H5wqtdktloSPmEUzT/c="; +} diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index b19c22a55f3a8..7ff9b1fc2e4cb 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -1,7 +1,4 @@ -{ callPackage, ... }@args: - -callPackage ./generic.nix (rec { +import ./generic.nix rec { version = "5.1.2"; - branch = version; - sha256 = "sha256-OaC8yNmFSfFsVwYkZ4JGpqxzbAZs69tAn5UC6RWyLys="; -} // args) + sha256 = "sha256-4jcfwIE0/DgP7ibwkrSm/aPiHIMFn34JNcXkCMx4ceI="; +} diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 01995e9237b15..5b08f03793909 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,205 +1,670 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm -, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libdrm, libvorbis, xz, soxr -, x264, x265, xvidcore, zimg, zlib, libopus, speex, nv-codec-headers, dav1d -, vpxSupport ? !stdenv.isAarch32, libvpx -, srtSupport ? true, srt -, vaapiSupport ? ((stdenv.isLinux || stdenv.isFreeBSD) && !stdenv.isAarch32) -, openglSupport ? false, libGLU, libGL -, libmfxSupport ? false, intel-media-sdk -, libaomSupport ? false, libaom -# Build options -, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime -, multithreadBuild ? true # Multithreading via pthreads/win32 threads -, sdlSupport ? !stdenv.isAarch32, SDL2 -, vdpauSupport ? !stdenv.isAarch32, libvdpau -# Developer options -, debugDeveloper ? false -, optimizationsDeveloper ? true -, extraWarningsDeveloper ? false -, Cocoa, CoreMedia, VideoToolbox -# Inherit generics -, branch, sha256, version, patches ? [], knownVulnerabilities ? [] -, doCheck ? true -, pulseaudioSupport ? stdenv.isLinux +{ version, sha256, extraPatches ? [], knownVulnerabilities ? [] }: + +{ lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm + +, ffmpegVariant ? "small" # Decides which dependencies are enabled by default + + # Build with headless deps; excludes dependencies that are only necessary for + # GUI applications. To be used for purposes that don't generally need such + # components and i.e. only depend on libav +, withHeadlessDeps ? ffmpegVariant == "headless" || withSmallDeps + + # Dependencies a user might customarily expect from a regular ffmpeg build. + # /All/ packages that depend on ffmpeg and some of its feaures should depend + # on the small variant. Small means the minimal set of features that satisfies + # all dependants in Nixpkgs +, withSmallDeps ? ffmpegVariant == "small" || withFullDeps + + # Everything enabled; only guarded behind platform exclusivity or brokeness. + # If you need to depend on ffmpeg-full because ffmpeg is missing some feature + # your package needs, you should enable that feature in regular ffmpeg + # instead. +, withFullDeps ? ffmpegVariant == "full" + +, fetchgit +, fetchpatch + + # Feature flags +, withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT +, withAom ? withFullDeps # AV1 reference encoder +, withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering +, withBluray ? withFullDeps # BluRay reading +, withBs2b ? withFullDeps # bs2b DSP library +, withBzlib ? withHeadlessDeps +, withCaca ? withFullDeps # Textual display (ASCII art) +, withCelt ? withFullDeps # CELT decoder +, withCrystalhd ? withFullDeps +, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !isAarch64)) +, withCudaLLVM ? withFullDeps +, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) +, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) +, withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support +, withFdkAac ? withFullDeps && withUnfree # Fraunhofer FDK AAC de/encoder +, withFontconfig ? withHeadlessDeps # Needed for drawtext filter +, withFreetype ? withHeadlessDeps # Needed for drawtext filter +, withFrei0r ? withFullDeps # frei0r video filtering +, withFribidi ? withFullDeps # Needed for drawtext filter +, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGme ? withFullDeps # Game Music Emulator +, withGnutls ? withHeadlessDeps +, withGsm ? withFullDeps # GSM de/encoder +, withIconv ? withHeadlessDeps +, withIlbc ? withFullDeps +, withJack ? withFullDeps && !stdenv.isDarwin # Jack audio +, withLadspa ? withFullDeps # LADSPA audio filtering +, withLzma ? withHeadlessDeps # xz-utils +, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support +, withMp3lame ? withHeadlessDeps # LAME MP3 encoder +, withMysofa ? withFullDeps # HRTF support via SOFAlizer +, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform +, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform +, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora +, withOpenal ? withFullDeps # OpenAL 1.1 capture support +, withOpencl ? withFullDeps +, withOpencoreAmrnb ? withFullDeps # AMR-NB de/encoder & AMR-WB decoder +, withOpengl ? false # OpenGL rendering +, withOpenh264 ? withFullDeps # H.264/AVC encoder +, withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder +, withOpenmpt ? withFullDeps # Tracked music files decoder +, withOpus ? withHeadlessDeps # Opus de/encoder +, withPulse ? withSmallDeps && !stdenv.isDarwin # Pulseaudio input support +, withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) +, withRtmp ? false # RTMP[E] support +, withSamba ? withFullDeps && !stdenv.isDarwin # Samba protocol +, withSdl2 ? withSmallDeps +, withSoxr ? withHeadlessDeps # Resampling via soxr +, withSpeex ? withHeadlessDeps # Speex de/encoder +, withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol +, withSsh ? withHeadlessDeps # SFTP protocol +, withSvg ? withFullDeps # SVG protocol +, withSvtav1 ? withFullDeps && !stdenv.isAarch64 # AV1 encoder/decoder (focused on speed and correctness) +, withTheora ? withHeadlessDeps # Theora encoder +, withV4l2 ? withFullDeps && !stdenv.isDarwin # Video 4 Linux support +, withV4l2M2m ? withV4l2 +, withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration +, withVdpau ? withSmallDeps # Vdpau hardware acceleration +, withVidStab ? withFullDeps # Video stabilization +, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVoAmrwbenc ? withFullDeps # AMR-WB encoder +, withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists +, withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding +, withVulkan ? withFullDeps && !stdenv.isDarwin +, withWebp ? withFullDeps # WebP encoder +, withX264 ? withHeadlessDeps # H.264/AVC encoder +, withX265 ? withHeadlessDeps # H.265/HEVC encoder +, withXavs ? withFullDeps # AVS encoder +, withXcb ? withXcbShm || withXcbxfixes || withXcbShape # X11 grabbing using XCB +, withXcbShape ? withFullDeps # X11 grabbing shape rendering +, withXcbShm ? withFullDeps # X11 grabbing shm communication +, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering +, withXlib ? withFullDeps # Xlib support +, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers +, withXvid ? withHeadlessDeps # Xvid encoder, native encoder exists +, withZimg ? withHeadlessDeps +, withZlib ? withHeadlessDeps +, withZmq ? withFullDeps # Message passing + +/* + * Licensing options (yes some are listed twice, filters and such are not listed) + */ +, withGPL ? true +, withGPLv3 ? true +, withUnfree ? false + +/* + * Build options + */ +, withSmallBuild ? false # Optimize for size instead of speed +, withRuntimeCPUDetection ? true # Detect CPU capabilities at runtime (disable to compile natively) +, withGrayscale ? withFullDeps # Full grayscale support +, withSwscaleAlpha ? buildSwscale # Alpha channel support in swscale. You probably want this when buildSwscale. +, withHardcodedTables ? withHeadlessDeps # Hardcode decode tables instead of runtime generation +, withSafeBitstreamReader ? withHeadlessDeps # Buffer boundary checking in bitreaders +, withMultithread ? true # Multithreading via pthreads/win32 threads +, withNetwork ? withHeadlessDeps # Network support +, withPixelutils ? withHeadlessDeps # Pixel utils in libavutil +, withLTO ? false # build with link-time optimization +/* + * Program options + */ +, buildFfmpeg ? withHeadlessDeps # Build ffmpeg executable +, buildFfplay ? withFullDeps # Build ffplay executable +, buildFfprobe ? withHeadlessDeps # Build ffprobe executable +, buildQtFaststart ? withFullDeps # Build qt-faststart executable +, withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart +/* + * Library options + */ +, buildAvcodec ? withHeadlessDeps # Build avcodec library +, buildAvdevice ? withHeadlessDeps # Build avdevice library +, buildAvfilter ? withHeadlessDeps # Build avfilter library +, buildAvformat ? withHeadlessDeps # Build avformat library +# Deprecated but depended upon by some packages. +# https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991) +, buildAvresample ? withHeadlessDeps && lib.versionOlder version "5" # Build avresample library +, buildAvutil ? withHeadlessDeps # Build avutil library +, buildPostproc ? withHeadlessDeps # Build postproc library +, buildSwresample ? withHeadlessDeps # Build swresample library +, buildSwscale ? withHeadlessDeps # Build swscale library +, withLib ? buildAvcodec + || buildAvdevice + || buildAvfilter + || buildAvformat + || buildAvutil + || buildPostproc + || buildSwresample + || buildSwscale +/* + * Documentation options + */ +, withDocumentation ? withHtmlDoc || withManPages || withPodDoc || withTxtDoc +, withHtmlDoc ? withHeadlessDeps # HTML documentation pages +, withManPages ? withHeadlessDeps # Man documentation pages +, withPodDoc ? withHeadlessDeps # POD documentation pages +, withTxtDoc ? withHeadlessDeps # Text documentation pages +# Whether a "doc" output will be produced. Note that withManPages does not produce +# a "doc" output because its files go to "man". +, withDoc ? withDocumentation && (withHtmlDoc || withPodDoc || withTxtDoc) + +/* + * Developer options + */ +, withDebug ? false +, withOptimisations ? true +, withExtraWarnings ? false +, withStripping ? false + +/* + * External libraries options + */ +, alsa-lib +, bzip2 +, clang +, celt +, dav1d +, fdk_aac +, fontconfig +, freetype +, frei0r +, fribidi +, game-music-emu +, gnutls +, gsm +, libjack2 +, ladspaH +, lame +, libass +, libaom +, libbluray +, libbs2b +, libcaca +, libdc1394 +, libraw1394 +, libdrm +, libiconv +, intel-media-sdk +, libmodplug +, libmysofa +, libogg +, libopenmpt +, libopus +, librsvg +, libssh +, libtheora +, libv4l +, libva +, libva-minimal +, libvdpau +, libvmaf +, libvorbis +, libvpx +, libwebp +, libX11 +, libxcb +, libXv +, libXext +, libxml2 +, xz +, nv-codec-headers +, openal +, ocl-icd # OpenCL ICD +, opencl-headers # OpenCL headers +, opencore-amr +, libGL +, libGLU +, openh264 +, openjpeg , libpulseaudio -, ... +, rav1e +, svt-av1 +, rtmpdump +, samba +, SDL2 +, soxr +, speex +, srt +, vid-stab +, vo-amrwbenc +, x264 +, x265 +, xavs +, xvidcore +, zeromq4 +, zimg +, zlib +, vulkan-headers +, vulkan-loader +, glslang +/* + * Darwin frameworks + */ +, AVFoundation +, Cocoa +, CoreAudio +, CoreMedia +, CoreServices +, MediaToolbox +, VideoDecodeAcceleration +, VideoToolbox +/* + * Testing + */ +, testers }: /* Maintainer notes: * - * THIS IS A MINIMAL BUILD OF FFMPEG, do not include dependencies unless - * a build that depends on ffmpeg requires them to be compiled into ffmpeg, - * see `ffmpeg-full' for an ffmpeg build with all features included. - * - * Need fixes to support Darwin: - * pulseaudio + * Version bumps: + * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) + * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed + * and make the necessary changes. * * Known issues: - * ALL - Cross-compiling will disable features not present on host OS - * (e.g. dxva2 support [DirectX] will not be enabled unless natively - * compiled on Cygwin) + * Cross-compiling will disable features not present on host OS + * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) * */ let - inherit (lib) optional optionals optionalString enableFeature filter; + inherit (lib) optional optionals optionalString enableFeature; +in - reqMin = requiredVersion: (builtins.compareVersions requiredVersion branch != 1); - ifMinVer = minVer: flag: if reqMin minVer then flag else null; +assert lib.elem ffmpegVariant [ "headless" "small" "full" ]; - ifVerOlder = maxVer: flag: if (lib.versionOlder branch maxVer) then flag else null; -in +/* + * Licensing dependencies + */ +assert withGPLv3 -> withGPL; +assert withUnfree -> withGPL && withGPLv3; +/* + * Build dependencies + */ +assert withPixelutils -> buildAvutil; +/* + * Program dependencies + */ +assert buildFfmpeg -> buildAvcodec + && buildAvfilter + && buildAvformat + && (buildSwresample || buildAvresample); +assert buildFfplay -> buildAvcodec + && buildAvformat + && buildSwscale + && (buildSwresample || buildAvresample); +assert buildFfprobe -> buildAvcodec && buildAvformat; +/* + * Library dependencies + */ +assert buildAvcodec -> buildAvutil; # configure flag since 0.6 +assert buildAvdevice -> buildAvformat + && buildAvcodec + && buildAvutil; # configure flag since 0.6 +assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6 +assert buildPostproc -> buildAvutil; +assert buildSwscale -> buildAvutil; -stdenv.mkDerivation rec { - pname = "ffmpeg"; +stdenv.mkDerivation (finalAttrs: { + pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}"); inherit version; - src = fetchurl { - url = "https://www.ffmpeg.org/releases/${pname}-${version}.tar.bz2"; + src = fetchgit { + url = "https://git.ffmpeg.org/ffmpeg.git"; + rev = "n${finalAttrs.version}"; inherit sha256; }; - postPatch = "patchShebangs ."; - inherit patches; + postPatch = '' + patchShebangs . + '' + lib.optionalString withFrei0r '' + substituteInPlace libavfilter/vf_frei0r.c \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + substituteInPlace doc/filters.texi \ + --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + '' + lib.optionalString withVulkan '' + # FIXME: horrible hack, remove for next release + substituteInPlace libavutil/hwcontext_vulkan.c \ + --replace VK_EXT_VIDEO_DECODE VK_KHR_VIDEO_DECODE + ''; - outputs = [ "bin" "dev" "out" "man" "doc" ]; - setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! + patches = map (patch: fetchpatch patch) extraPatches; configurePlatforms = []; - configureFlags = filter (v: v != null) ([ - "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" - "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config" - # License - "--enable-gpl" - "--enable-version3" - # Build flags - "--enable-shared" - "--enable-pic" - (ifMinVer "4.0" (enableFeature srtSupport "libsrt")) - (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") - "--enable-hardcoded-tables" - ] ++ - (if multithreadBuild then ( - if stdenv.isCygwin then - ["--disable-pthreads" "--enable-w32threads"] - else # Use POSIX threads by default - ["--enable-pthreads" "--disable-w32threads"]) - else - ["--disable-pthreads" "--disable-w32threads"]) - ++ [ - "--disable-os2threads" # We don't support OS/2 - "--enable-network" - "--enable-pixelutils" - # Executables - "--enable-ffmpeg" - "--disable-ffplay" - "--enable-ffprobe" - (ifVerOlder "4" "--disable-ffserver") - # Libraries - "--enable-avcodec" - "--enable-avdevice" - "--enable-avfilter" - "--enable-avformat" - (ifVerOlder "5.0" "--enable-avresample") - "--enable-avutil" - "--enable-postproc" - "--enable-swresample" - "--enable-swscale" - # Docs - "--disable-doc" - # External Libraries - "--enable-libass" - "--enable-bzlib" - "--enable-gnutls" - "--enable-fontconfig" - "--enable-libfreetype" - "--enable-libmp3lame" - "--enable-iconv" - "--enable-libtheora" - "--enable-libssh" - (enableFeature vaapiSupport "vaapi") - (enableFeature vaapiSupport "libdrm") - (enableFeature vdpauSupport "vdpau") - "--enable-libvorbis" - (enableFeature vpxSupport "libvpx") - "--enable-lzma" - (enableFeature openglSupport "opengl") - (ifMinVer "4.2" (enableFeature libmfxSupport "libmfx")) - (ifMinVer "4.2" (enableFeature libaomSupport "libaom")) - (lib.optionalString pulseaudioSupport "--enable-libpulse") - (enableFeature sdlSupport "sdl2") - "--enable-libsoxr" - "--enable-libx264" - "--enable-libxvid" - "--enable-libzimg" - "--enable-zlib" - "--enable-libopus" - "--enable-libspeex" - "--enable-libx265" - (ifMinVer "4.2" (enableFeature (reqMin "4.2") "libdav1d")) - # Developer flags - (enableFeature debugDeveloper "debug") - (enableFeature optimizationsDeveloper "optimizations") - (enableFeature extraWarningsDeveloper "extra-warnings") - "--disable-stripping" + setOutputFlags = false; # Only accepts some of them + configureFlags = [ + #mingw64 is internally treated as mingw32, so 32 and 64 make no difference here + "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" + "--arch=${stdenv.hostPlatform.parsed.cpu.name}" + "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config" + /* + * Licensing flags + */ + (enableFeature withGPL "gpl") + (enableFeature withGPLv3 "version3") + (enableFeature withUnfree "nonfree") + /* + * Build flags + */ + # On some ARM platforms --enable-thumb + "--enable-shared" + "--enable-pic" + + (enableFeature withSmallBuild "small") + (enableFeature withRuntimeCPUDetection "runtime-cpudetect") + (enableFeature withLTO "lto") + (enableFeature withGrayscale "gray") + (enableFeature withSwscaleAlpha "swscale-alpha") + (enableFeature withHardcodedTables "hardcoded-tables") + (enableFeature withSafeBitstreamReader "safe-bitstream-reader") + + (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + "--disable-os2threads" # We don't support OS/2 + + (enableFeature withNetwork "network") + (enableFeature withPixelutils "pixelutils") + + "--datadir=${placeholder "data"}/share/ffmpeg" + + /* + * Program flags + */ + (enableFeature buildFfmpeg "ffmpeg") + (enableFeature buildFfplay "ffplay") + (enableFeature buildFfprobe "ffprobe") + ] ++ optionals withBin [ + "--bindir=${placeholder "bin"}/bin" + ] ++ [ + /* + * Library flags + */ + (enableFeature buildAvcodec "avcodec") + (enableFeature buildAvdevice "avdevice") + (enableFeature buildAvfilter "avfilter") + (enableFeature buildAvformat "avformat") + ] ++ optionals (lib.versionOlder version "5") [ + # Ffmpeg > 4 doesn't know about the flag anymore + (enableFeature buildAvresample "avresample") + ] ++ [ + (enableFeature buildAvutil "avutil") + (enableFeature (buildPostproc && withGPL) "postproc") + (enableFeature buildSwresample "swresample") + (enableFeature buildSwscale "swscale") + ] ++ optionals withLib [ + "--libdir=${placeholder "lib"}/lib" + "--incdir=${placeholder "dev"}/include" + ] ++ [ + /* + * Documentation flags + */ + (enableFeature withDocumentation "doc") + (enableFeature withHtmlDoc "htmlpages") + (enableFeature withManPages "manpages") + ] ++ optionals withManPages [ + "--mandir=${placeholder "man"}/share/man" + ] ++ [ + (enableFeature withPodDoc "podpages") + (enableFeature withTxtDoc "txtpages") + ] ++ optionals withDoc [ + "--docdir=${placeholder "doc"}/share/doc/ffmpeg" + ] ++ [ + /* + * External libraries + */ + (enableFeature withAlsa "alsa") + (enableFeature withBzlib "bzlib") + (enableFeature withCelt "libcelt") + (enableFeature withCuda "cuda") + (enableFeature withCudaLLVM "cuda-llvm") + (enableFeature withDav1d "libdav1d") + (enableFeature withFdkAac "libfdk-aac") + "--disable-libflite" # Force disable until a solution is found + (enableFeature withFontconfig "fontconfig") + (enableFeature withFreetype "libfreetype") + (enableFeature withFrei0r "frei0r") + (enableFeature withFribidi "libfribidi") + (enableFeature withGme "libgme") + (enableFeature withGnutls "gnutls") + (enableFeature withGsm "libgsm") + (enableFeature withLadspa "ladspa") + (enableFeature withMp3lame "libmp3lame") + (enableFeature withAom "libaom") + (enableFeature withAss "libass") + (enableFeature withBluray "libbluray") + (enableFeature withBs2b "libbs2b") + (enableFeature withDc1394 "libdc1394") + (enableFeature withDrm "libdrm") + (enableFeature withIconv "iconv") + (enableFeature withJack "libjack") + (enableFeature withMfx "libmfx") + (enableFeature withModplug "libmodplug") + (enableFeature withMysofa "libmysofa") + (enableFeature withOpus "libopus") + (enableFeature withSvg "librsvg") + (enableFeature withSrt "libsrt") + (enableFeature withSsh "libssh") + (enableFeature withTheora "libtheora") + (enableFeature withV4l2 "libv4l2") + (enableFeature withV4l2M2m "v4l2-m2m") + (enableFeature withVaapi "vaapi") + (enableFeature withVdpau "vdpau") + (enableFeature withVorbis "libvorbis") + (enableFeature withVmaf "libvmaf") + (enableFeature withVpx "libvpx") + (enableFeature withWebp "libwebp") + (enableFeature withXlib "xlib") + (enableFeature withXcb "libxcb") + (enableFeature withXcbShm "libxcb-shm") + (enableFeature withXcbxfixes "libxcb-xfixes") + (enableFeature withXcbShape "libxcb-shape") + (enableFeature withXml2 "libxml2") + (enableFeature withLzma "lzma") + (enableFeature withNvdec "cuvid") + (enableFeature withNvdec "nvdec") + (enableFeature withNvenc "nvenc") + (enableFeature withOpenal "openal") + (enableFeature withOpencl "opencl") + (enableFeature withOpencoreAmrnb "libopencore-amrnb") + (enableFeature withOpengl "opengl") + (enableFeature withOpenh264 "libopenh264") + (enableFeature withOpenjpeg "libopenjpeg") + (enableFeature withOpenmpt "libopenmpt") + (enableFeature withPulse "libpulse") + (enableFeature withRav1e "librav1e") + (enableFeature withSvtav1 "libsvtav1") + (enableFeature withRtmp "librtmp") + (enableFeature withSdl2 "sdl2") + (enableFeature withSoxr "libsoxr") + (enableFeature withSpeex "libspeex") + (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 + (enableFeature withVoAmrwbenc "libvo-amrwbenc") + (enableFeature withX264 "libx264") + (enableFeature withX265 "libx265") + (enableFeature withXavs "libxavs") + (enableFeature withXvid "libxvid") + (enableFeature withZmq "libzmq") + (enableFeature withZimg "libzimg") + (enableFeature withZlib "zlib") + (enableFeature withVulkan "vulkan") + (enableFeature withGlslang "libglslang") + (enableFeature withSamba "libsmbclient") + /* + * Developer flags + */ + (enableFeature withDebug "debug") + (enableFeature withOptimisations "optimizations") + (enableFeature withExtraWarnings "extra-warnings") + (enableFeature withStripping "stripping") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-prefix=${stdenv.cc.targetPrefix}" - "--enable-cross-compile" - ] ++ optional stdenv.cc.isClang "--cc=clang"); - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; - - buildInputs = [ - bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis xz soxr x264 x265 xvidcore zimg zlib libopus speex nv-codec-headers - ] ++ optionals openglSupport [ libGL libGLU ] - ++ optional libmfxSupport intel-media-sdk - ++ optional libaomSupport libaom - ++ optional vpxSupport libvpx - ++ optionals (!stdenv.isDarwin && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin - ++ optionals vaapiSupport [ libva libdrm ] - ++ optional stdenv.isLinux alsa-lib - ++ optionals stdenv.isDarwin [ Cocoa CoreMedia VideoToolbox ] - ++ optional vdpauSupport libvdpau - ++ optional sdlSupport SDL2 - ++ optional srtSupport srt - ++ optional (reqMin "4.2") dav1d; + "--cross-prefix=${stdenv.cc.targetPrefix}" + "--enable-cross-compile" + "--host-cc=${buildPackages.stdenv.cc}/bin/cc" + ] ++ optionals stdenv.cc.isClang [ + "--cc=clang" + "--cxx=clang++" + ]; - enableParallelBuilding = true; + # ffmpeg embeds the configureFlags verbatim in its binaries and because we + # configure binary, include, library dir etc., this causes references in + # outputs where we don't want them. Patch the generated config.h to remove all + # such references except for data. + postConfigure = let + toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir. + in + "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h"; + + nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; + + # TODO This was always in buildInputs before, why? + buildInputs = optionals withFullDeps [ libdc1394 ] + ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to + ++ optionals (withNvdec || withNvenc) [ nv-codec-headers ] + ++ optionals withAlsa [ alsa-lib ] + ++ optionals withAom [ libaom ] + ++ optionals withAss [ libass ] + ++ optionals withBluray [ libbluray ] + ++ optionals withBs2b [ libbs2b ] + ++ optionals withBzlib [ bzip2 ] + ++ optionals withCaca [ libcaca ] + ++ optionals withCelt [ celt ] + ++ optionals withCudaLLVM [ clang ] + ++ optionals withDav1d [ dav1d ] + ++ optionals withDrm [ libdrm ] + ++ optionals withFdkAac [ fdk_aac ] + ++ optionals withFontconfig [ fontconfig ] + ++ optionals withFreetype [ freetype ] + ++ optionals withFrei0r [ frei0r ] + ++ optionals withFribidi [ fribidi ] + ++ optionals withGlslang [ glslang ] + ++ optionals withGme [ game-music-emu ] + ++ optionals withGnutls [ gnutls ] + ++ optionals withGsm [ gsm ] + ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? + ++ optionals withJack [ libjack2 ] + ++ optionals withLadspa [ ladspaH ] + ++ optionals withLzma [ xz ] + ++ optionals withMfx [ intel-media-sdk ] + ++ optionals withModplug [ libmodplug ] + ++ optionals withMp3lame [ lame ] + ++ optionals withMysofa [ libmysofa ] + ++ optionals withOgg [ libogg ] + ++ optionals withOpenal [ openal ] + ++ optionals withOpencl [ ocl-icd opencl-headers ] + ++ optionals withOpencoreAmrnb [ opencore-amr ] + ++ optionals withOpengl [ libGL libGLU ] + ++ optionals withOpenh264 [ openh264 ] + ++ optionals withOpenjpeg [ openjpeg ] + ++ optionals withOpenmpt [ libopenmpt ] + ++ optionals withOpus [ libopus ] + ++ optionals withPulse [ libpulseaudio ] + ++ optionals withRav1e [ rav1e ] + ++ optionals withRtmp [ rtmpdump ] + ++ optionals withSamba [ samba ] + ++ optionals withSdl2 [ SDL2 ] + ++ optionals withSoxr [ soxr ] + ++ optionals withSpeex [ speex ] + ++ optionals withSrt [ srt ] + ++ optionals withSsh [ libssh ] + ++ optionals withSvg [ librsvg ] + ++ optionals withSvtav1 [ svt-av1 ] + ++ optionals withTheora [ libtheora ] + ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] + ++ optionals withVdpau [ libvdpau ] + ++ optionals withVidStab [ vid-stab ] + ++ optionals withVmaf [ libvmaf ] + ++ optionals withVoAmrwbenc [ vo-amrwbenc ] + ++ optionals withVorbis [ libvorbis ] + ++ optionals withVpx [ libvpx ] + ++ optionals withV4l2 [ libv4l ] + ++ optionals withVulkan [ vulkan-headers vulkan-loader ] + ++ optionals withWebp [ libwebp ] + ++ optionals withX264 [ x264 ] + ++ optionals withX265 [ x265 ] + ++ optionals withXavs [ xavs ] + ++ optionals withXcb [ libxcb ] + ++ optionals withXlib [ libX11 libXv libXext ] + ++ optionals withXml2 [ libxml2 ] + ++ optionals withXvid [ xvidcore ] + ++ optionals withZimg [ zimg ] + ++ optionals withZlib [ zlib ] + ++ optionals withZmq [ zeromq4 ] + ++ optionals stdenv.isDarwin [ + # TODO fine-grained flags + AVFoundation + Cocoa + CoreAudio + CoreMedia + CoreServices + MediaToolbox + VideoDecodeAcceleration + VideoToolbox + ]; + + buildFlags = [ "all" ] + ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - inherit doCheck; + # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libsToLink = [ ] + ++ optional buildAvcodec "libavcodec" + ++ optional buildAvdevice "libavdevice" + ++ optional buildAvfilter "libavfilter" + ++ optional buildAvformat "libavformat" + ++ optional buildAvresample "libavresample" + ++ optional buildAvutil "libavutil" + ++ optional buildPostproc "libpostproc" + ++ optional buildSwresample "libswresample" + ++ optional buildSwscale "libswscale" + ; in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ - make check -j$NIX_BUILD_CORES + ${ldLibraryPathEnv}="${lib.concatStringsSep ":" libsToLink}" make check -j$NIX_BUILD_CORES ''; - # ffmpeg 3+ generates pkg-config (.pc) files that don't have the - # form automatically handled by the multiple-outputs hooks. - postFixup = '' - moveToOutput bin "$bin" - moveToOutput share/ffmpeg/examples "$doc" - for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do - substituteInPlace $pc \ - --replace "includedir=$out" "includedir=''${!outputInclude}" - done - '' + optionalString stdenv.isLinux '' - # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. + outputs = optionals withBin [ "bin" ] # The first output is the one that gets symlinked by default! + ++ optionals withLib [ "lib" "dev" ] + ++ optionals withDoc [ "doc" ] + ++ optionals withManPages [ "man" ] + ++ [ "data" "out" ] # We need an "out" output because we get an error otherwise. It's just an empty dir. + ; + + postInstall = optionalString buildQtFaststart '' + install -D tools/qt-faststart -t $bin/bin + ''; + + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + postFixup = optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/libavcodec.so addOpenGLRunpath $out/lib/libavutil.so ''; - installFlags = [ "install-man" ]; + enableParallelBuilding = true; - passthru = { - inherit vaapiSupport vdpauSupport; - }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; @@ -212,9 +677,12 @@ stdenv.mkDerivation rec { No matter if they were designed by some standards committee, the community or a corporation. ''; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; + license = with licenses; [ lgpl21Plus ] + ++ optional withGPL gpl2Plus + ++ optional withGPLv3 gpl3Plus + ++ optional withUnfree unfreeRedistributable; + pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; - inherit branch knownVulnerabilities; + maintainers = with maintainers; [ atemu ]; }; -} +}) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 6e7a58f5597eb..06fce3891e271 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-3bPxt911T0bGpAIS2RxBjo+VV84xW06eKcCj3ZAcmvw="; }; - NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = "-fPIC"; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index e57cbc34fa22b..9d83fdb4878ee 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -12,61 +12,70 @@ , enableMpi ? false , mpi , withDoc ? stdenv.cc.isGNU +, testers }: -with lib; +assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; -assert elem precision [ "single" "double" "long-double" "quad-precision" ]; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fftw-${precision}"; version = "3.3.10"; src = fetchurl { urls = [ - "https://fftw.org/fftw-${version}.tar.gz" - "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" + "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" + "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" ]; sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; 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; nativeCheckInputs = [ perl ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Fastest Fourier Transform in the West library"; homepage = "http://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; + pkgConfigModules = [ + { + "single" = "fftw3f"; + "double" = "fftw3"; + "long-double" = "fftw3l"; + "quad-precision" = "fftw3q"; + }.${precision} + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix new file mode 100644 index 0000000000000..182f4fba56e32 --- /dev/null +++ b/pkgs/development/libraries/fizz/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, cmake +, boost +, libevent +, double-conversion +, glog +, lib +, fmt_8 +, zstd +, gflags +, libiberty +, openssl +, folly +, libsodium +, gtest +, zlib +}: + +stdenv.mkDerivation rec { + pname = "fizz"; + version = "2023.02.20.00"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = "fizz"; + rev = "v${version}"; + hash = "sha256-qgp0E/xCbvMIndwUkqsvZuFY7333NviOkljqiMOhKtw="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeDir = "../fizz"; + + cmakeFlags = [ "-Wno-dev" ] + ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + NIX_LDFLAGS = "-lz"; + + buildInputs = [ + fmt_8 + boost + double-conversion + folly + glog + gflags + gtest + libevent + libiberty + libsodium + openssl + zlib + zstd + ]; + + meta = with lib; { + description = "C++14 implementation of the TLS-1.3 standard"; + homepage = "https://github.com/facebookincubator/fizz"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ pierreis kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 4f7fc14ee7b55..a65ad5c6fe377 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=misleading-indentation" "-Wno-error=stringop-overflow" ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 14e6abd900658..7fd08bc599a6b 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.1"; + version = "1.14.2"; # 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-CjyCM0MBjMWJhrbIJUVgnIzb8Pul8B2IMHvRSstd058="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-yAcR6s9CqZB49jlqplVV3Wv3PuxjF3a3np17cmK293Q="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 6b8017684d453..ffefdd6ed621b 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 146c4f87..bcdad2bc 100644 +index d35b4652..b4bb4a44 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { - {"GST_PTP_HELPER", NULL}, - {"GST_PTP_HELPER_1_0", NULL}, - {"GST_INSTALL_PLUGINS_HELPER", NULL}, +@@ -1899,6 +1899,7 @@ static const ExportData default_exports[] = { + {"KRB5CCNAME", NULL}, + {"XKB_CONFIG_ROOT", NULL}, + {"GIO_EXTRA_MODULES", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 323a9a2f8b464..6db1fc2e51a14 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , boost , cmake @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.11.28.00"; + version = "2023.02.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-TI3uMlkssKtTvxqj9Et12aAjbHoV9FVBvrZr7oCFlIo="; + sha256 = "sha256-YKS+UIlgDhMefovkkR/GlJcZtAjGLC9e8uhqfniH1eY="; }; nativeBuildInputs = [ @@ -56,8 +57,14 @@ stdenv.mkDerivation rec { # jemalloc headers are required in include/folly/portability/Malloc.h propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; - NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + + # temporary hack until folly builds work on aarch64, + # see https://github.com/facebook/folly/issues/1880 + "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" + ]; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \ diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 36bc4a2567770..c298999229799 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, darwin, fetchurl, openal }: +{ lib, stdenv, darwin, fetchurl, openal +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freealut"; version = "1.1.0"; src = fetchurl { - url = "http://www.openal.org/openal_webstf/downloads/freealut-${version}.tar.gz"; + url = "http://www.openal.org/openal_webstf/downloads/freealut-${finalAttrs.version}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; @@ -14,10 +16,13 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.OpenAL ; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = lib.licenses.lgpl2; + pkgConfigModules = [ "freealut" ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 776023f35f015..8c12766204cf9 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake }: +{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freeglut"; version = "3.2.2"; src = fetchurl { - url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; + url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz"; sha256 = "sha256-xZRKCC3wu6lrV1bd2x910M1yzie1OVxsHd6Fwv8pelA="; }; @@ -22,6 +24,8 @@ stdenv.mkDerivation rec { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' @@ -34,7 +38,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://freeglut.sourceforge.net/"; license = licenses.mit; + pkgConfigModules = [ "glut" ]; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 68907d798e19b..48048e4a9108d 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -22,14 +22,15 @@ , qt5 , texmacs , ttfautohint +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freetype"; version = "2.12.1"; - src = fetchurl { + src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; }; @@ -82,6 +83,7 @@ stdenv.mkDerivation rec { ttfautohint; inherit (python3.pkgs) freetype-py; inherit (qt5) qtbase; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -96,6 +98,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freetype.org/"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; + pkgConfigModules = [ "freetype2" ]; maintainers = with maintainers; [ ttuegel ]; }; -} +}) diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix new file mode 100644 index 0000000000000..c764b097b26c7 --- /dev/null +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "functionalplus"; + version = "0.2.18-p0"; + + src = fetchFromGitHub { + owner = "Dobiasd"; + repo = "FunctionalPlus"; + rev = "v${version}"; + sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Functional Programming Library for C++"; + homepage = "https://github.com/Dobiasd/FunctionalPlus"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 4000129f557ab..8b54cfb7b8797 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preCheck = '' ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} - ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} + ${lib.optionalString enablePython "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh"} ''; cmakeFlags = lib.optionals enablePython [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 8390a4626f00f..fdd5fc951ee8c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include" "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" - "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/mysql/libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index ecc37b7e71f73..d21fd25019604 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , enableVTK ? true -, vtk +, vtk_8 , ApplicationServices , Cocoa , enablePython ? false @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-MaQk2VlaZxZPNzVF9pUnEzMaXyN0tq2P3kodnGpl6PA="; + sha256 = "sha256-BmUJCqCGt+BvVpLG4bzCH4lsqmhWHU0gbOIU2CCIMGU="; }; cmakeFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals enableVTK [ - vtk + vtk_8 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Cocoa diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 87d3285e64bc2..ca0e8f81c4d00 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -19,16 +19,19 @@ , doCheck ? false , makeWrapper , lib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; version = "2.42.10"; outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "7ptsddE7oJaQei48aye2G80X9cfr6rWltDnS8uOf5Es="; }; @@ -62,8 +65,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - buildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ glib libtiff @@ -99,7 +100,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - for f in $out/${passthru.moduleDir}/*.dylib; do + for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done @@ -129,12 +130,13 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; versionPolicy = "odd-unstable"; }; tests = { installedTests = nixosTests.installed-tests.gdk-pixbuf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc @@ -147,6 +149,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; mainProgram = "gdk-pixbuf-thumbnailer"; + pkgConfigModules = [ "gdk-pixbuf-2.0" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 61106d7f620e4..df800e26ab932 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -47,6 +47,15 @@ stdenv.mkDerivation rec { sha256 = "zd6A0VpJ2rmmFO+Y+ATIzm5M/hM5o8JAw08/tFQ2uF0="; }; + patches = [ + (fetchurl { + name = "libraw.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/gegl04.git/plain/" + + "libraw.patch?id=5efd0c16a7b0e73abcaecc48af544ef027f4531b"; + hash = "sha256-ZgVigN1T7JmeBMwSdBsMsmXx0h7UW4Ft9HlSqeB0se8="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext @@ -106,7 +115,7 @@ stdenv.mkDerivation rec { # TODO: Fix missing math symbols in gegl seamless clone. # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = "-lm"; + env.NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' chmod +x tests/opencl/opencl_test.sh diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index e8476b0fefb8c..fad65d7dd4ced 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -15,7 +15,6 @@ , xorgserver }: -with lib; stdenv.mkDerivation rec { pname = "geis"; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare"; hardeningDisable = [ "format" ]; @@ -48,7 +47,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") ''; - meta = { + meta = with lib; { description = "A library for input gesture recognition"; homepage = "https://launchpad.net/geis"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix index fd0531fa747fd..415746d3e544e 100644 --- a/pkgs/development/libraries/geos/3.9.nix +++ b/pkgs/development/libraries/geos/3.9.nix @@ -1,11 +1,15 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.9.2"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; }; @@ -14,12 +18,15 @@ stdenv.mkDerivation rec { # https://trac.osgeo.org/geos/ticket/993 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index a331e0254568e..670fa30cb0f13 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -2,14 +2,16 @@ , stdenv , fetchurl , fetchpatch -, cmake }: +, cmake +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.11.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I="; }; @@ -17,12 +19,15 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ae5b9f48293a3..81f7abc90a388 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; + LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ "--disable-csharp" "--with-xz" diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 795aeb88440e4..5202dc0edabc4 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; }; - patches = lib.optional stdenv.hostPlatform.isDarwin + patches = [ + (fetchpatch { + name = "CVE-2022-28506.patch"; + url = "https://src.fedoraproject.org/rpms/giflib/raw/2e9917bf13df114354163f0c0211eccc00943596/f/CVE-2022-28506.patch"; + sha256 = "sha256-TBemEXkuox8FdS9RvjnWcTWPaHRo4crcwSR9czrUwBY="; + }) + ] ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index a6824f121d39b..3cac2db1702c1 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -27,18 +27,17 @@ let testDeps = [ - gobject-introspection # for Gio and cairo typelibs gtk3 atk pango.out gdk-pixbuf harfbuzz ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.74.1"; + version = "1.74.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8h+c0zN6ZypEx+ZL+ajYrXfBuIuVKythhMevmx8+9Fk="; + sha256 = "sha256-pAb9ahZSz2bcqyKAYr0Wp19bM3gkjfu74BayEnRKMLY="; }; patches = [ diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index b79c83cbf1556..617d51d85ed53 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }: +{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gl3w"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index bdb72b5d542af..6cbc5e99b1c3d 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "glbinding"; - version = "3.1.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "cginternals"; repo = pname; rev = "v${version}"; - sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08"; + sha256 = "sha256-xmEXZ1ssXzrElqd6D1zooFxLEyspsF4Dau3d9+1/2yw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index a51b1060b8a5c..3f355deb33b92 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchurl, libGLU, libXmu, libXi, libXext , AGL, OpenGL +, testers }: -with lib; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glew"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/glew/glew-${version}.tgz"; + url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux - ${optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile ''} ''; @@ -43,11 +42,14 @@ stdenv.mkDerivation rec { "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "https://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] + pkgConfigModules = [ "glew" ]; platforms = platforms.mesaPlatforms; }; -} +}) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 1e30eb744ba86..5e1c986be28f9 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext , OpenGL , enableEGL ? false +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glew"; version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${pname}-${version}.tgz"; + url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; @@ -41,17 +42,25 @@ stdenv.mkDerivation rec { set(GLEW_VERSION "$version") set(GLEW_LIBRARIES GLEW::glew\''${_glew_target_postfix}) get_target_property(GLEW_INCLUDE_DIRS GLEW::glew\''${_glew_target_postfix} INTERFACE_INCLUDE_DIRECTORIES) + set_target_properties(GLEW::GLEW\''${_glew_target_postfix} PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "" + IMPORTED_IMPLIB_RELEASE "GLEW" + IMPORTED_IMPLIB_DEBUG "GLEW" + ) EOF ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "An OpenGL extension loading library for C/C++"; homepage = "https://glew.sourceforge.net/"; license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing + pkgConfigModules = [ "glew" ]; platforms = with platforms; if enableEGL then subtractLists darwin mesaPlatforms else mesaPlatforms; }; -} +}) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 17de587ee11c5..cf14aa610756c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -19,6 +19,7 @@ , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch +, testers }: assert stdenv.isLinux -> util-linuxMinimal != null; @@ -55,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.74.3"; + version = "2.74.5"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s="; + sha256 = "zrqDpZmc6zGkxPyZISB8uf//0qsdbsA8Fi0/YIpcFMg="; }; patches = lib.optionals stdenv.isDarwin [ @@ -117,20 +118,6 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch - - # 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/-/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="; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -188,9 +175,12 @@ 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 [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=nonnull" # Default for release buildtype but passed manually because # we're using plain @@ -277,7 +267,10 @@ stdenv.mkDerivation (finalAttrs: { getSchemaPath = pkg: makeSchemaPath pkg pkg.name; getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; - tests.withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + tests = { + withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; inherit flattenInclude; updateScript = gnome.updateScript { @@ -300,9 +293,14 @@ stdenv.mkDerivation (finalAttrs: { 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 ]); + pkgConfigModules = [ + "gio-2.0" + "gobject-2.0" + "gthread-2.0" + ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 780a3e091dafb..a3c2e4618493d 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation ({ buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; env = { - linuxHeaders = if withLinuxHeaders then linuxHeaders else ""; + linuxHeaders = lib.optionalString withLinuxHeaders linuxHeaders; 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 diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 2d7e6614cecc9..e1a427e35b658 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -50,19 +50,21 @@ in # invocation does not work. hardeningDisable = [ "fortify" "pie" "stackprotector" ]; - NIX_CFLAGS_COMPILE = lib.concatStringsSep " " - (builtins.concatLists [ - (lib.optionals withGd gdCflags) - # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: - # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 - (lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - (lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ - # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'" - # New warning as of GCC 9 - # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805 - "-Wno-error=missing-attributes" - ]) - ]); + env = (previousAttrs.env or { }) // { + NIX_CFLAGS_COMPILE = (previousAttrs.env.NIX_CFLAGS_COMPILE or "") + lib.concatStringsSep " " + (builtins.concatLists [ + (lib.optionals withGd gdCflags) + # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: + # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 + (lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") + (lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ + # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'" + # New warning as of GCC 9 + # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805 + "-Wno-error=missing-attributes" + ]) + ]); + }; # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new @@ -76,11 +78,19 @@ in # - clang-wrapper in cross-compilation # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948 preInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then + 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 ''; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index d4c836b6912e5..8af09dcd6f6e9 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -28,10 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-fno-ipa-modref" # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 - ]; + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-fno-ipa-modref"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=OFF" diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index f50704bcb65c2..69243a13ef300 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"; @@ -15,12 +14,19 @@ stdenv.mkDerivation rec{ sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f"; }; + # needed since gcc12 + postPatch = '' + sed '1i#include <ctime>' -i \ + src/tests/{tag/tag_perf.cpp,zlib/zlib_perf.cpp} \ + src/examples/*.cpp + ''; + 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/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 6b58b171f7d3e..0cf7afd41e874 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.2"; 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-oLmrINKKY99s5+keq7Xjr4ZjC/UitaiZfASXG9VR1zA="; }; 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 43eb7a2ff3015..2028e3eaef632 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { webkitgtk_4_1 ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; separateDebugInfo = true; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index f1ec87ba008db..2c6e74d0fa1af 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,8 +5,21 @@ , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit -, withSecurity ? true, Security # darwin Security.framework +, Security # darwin Security.framework # certificate compression - only zlib now, more possible: zstd, brotli + +# for passthru.tests +, curlWithGnuTls +, emacs +, ffmpeg +, haskellPackages +, knot-resolver +, ngtcp2-gnutls +, ocamlPackages +, python3Packages +, qemu +, rsyslog +, samba }: assert guileBindings -> guile != null; @@ -22,11 +35,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.7.8"; + version = "3.8.0"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - sha256 = "sha256-xYrTmvBnDv5qiu5eOosjMaEgBBi2S3xRl3+zltRhcRQ="; + sha256 = "sha256-DqDRGhZgoeY/lg8Vexl6vm0MjLMlW+JOH7OBWTC5vcU="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -34,11 +47,7 @@ stdenv.mkDerivation rec { outputInfo = "devdoc"; outputDoc = "devdoc"; - patches = [ ./nix-ssl-cert-file.patch ] - # Disable native add_system_trust. - # FIXME: apparently it's not enough to drop the framework anymore; maybe related to - # https://gitlab.com/gnutls/gnutls/-/commit/c19cb93d492e45141bfef9b926dfeba36003261c - ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch; + patches = [ ./nix-ssl-cert-file.patch ]; # Skip some tests: # - pkg-config: building against the result won't work before installing (3.5.11) @@ -80,12 +89,11 @@ stdenv.mkDerivation rec { ++ lib.optional guileBindings guile; nativeBuildInputs = [ perl pkg-config ] - ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; propagatedBuildInputs = [ nettle ] # Builds dynamically linking against gnutls seem to need the framework now. - ++ lib.optional (isDarwin && withSecurity) Security; + ++ lib.optional isDarwin Security; inherit doCheck; # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests. @@ -105,6 +113,14 @@ stdenv.mkDerivation rec { --replace "-lunistring" "" ''; + passthru.tests = { + inherit ngtcp2-gnutls curlWithGnuTls ffmpeg emacs qemu knot-resolver; + inherit (ocamlPackages) ocamlnet; + haskell-gnutls = haskellPackages.gnutls; + python3-gnutls = python3Packages.python3-gnutls; + rsyslog = rsyslog.override { withGnutls = true; }; + }; + meta = with lib; { description = "The GNU Transport Layer Security Library"; diff --git a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch b/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch index 90d1e85ee8c02..c0f27f7b5a45b 100644 --- a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch +++ b/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch @@ -1,14 +1,13 @@ allow overriding system trust store location via $NIX_SSL_CERT_FILE -diff --git a/lib/system/certs.c b/lib/system/certs.c -index 611c645..6ef6edb 100644 --- a/lib/system/certs.c +++ b/lib/system/certs.c -@@ -369,6 +369,11 @@ gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list, +@@ -404,6 +404,10 @@ gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, unsigned int tl_vflags) { -- return add_system_trust(list, tl_flags|GNUTLS_TL_NO_DUPLICATES, tl_vflags); +- return add_system_trust(list, tl_flags | GNUTLS_TL_NO_DUPLICATES, +- tl_vflags); + tl_flags = tl_flags|GNUTLS_TL_NO_DUPLICATES; + const char *file = secure_getenv("NIX_SSL_CERT_FILE"); + return file @@ -16,4 +15,3 @@ index 611c645..6ef6edb 100644 + list, file, NULL/*CRL*/, GNUTLS_X509_FMT_PEM, tl_flags, tl_vflags) + : add_system_trust(list, tl_flags, tl_vflags); } - diff --git a/pkgs/development/libraries/gnutls/no-security-framework.patch b/pkgs/development/libraries/gnutls/no-security-framework.patch deleted file mode 100644 index 7f5808e50535e..0000000000000 --- a/pkgs/development/libraries/gnutls/no-security-framework.patch +++ /dev/null @@ -1,126 +0,0 @@ -commit 9bcdde1ab9cdff6a4471f9a926dd488ab70c7247 -Author: Daiderd Jordan <daiderd@gmail.com> -Date: Mon Apr 22 16:38:27 2019 +0200 - - Revert "gnutls_x509_trust_list_add_system_trust: Add macOS keychain support" - - This reverts commit c0eb46d3463cd21b3f822ac377ff37f067f66b8d. - -diff --git a/configure.ac b/configure.ac -index 8ad597bfd..8d14f26cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -781,7 +781,7 @@ dnl auto detect https://lists.gnu.org/archive/html/help-gnutls/2012-05/msg00004. - AC_ARG_WITH([default-trust-store-file], - [AS_HELP_STRING([--with-default-trust-store-file=FILE], - [use the given file default trust store])], with_default_trust_store_file="$withval", -- [if test "$build" = "$host" && test x$with_default_trust_store_pkcs11 = x && test x$with_default_trust_store_dir = x && test x$have_macosx = x;then -+ [if test "$build" = "$host" && test x$with_default_trust_store_pkcs11 = x && test x$with_default_trust_store_dir = x;then - for i in \ - /etc/ssl/ca-bundle.pem \ - /etc/ssl/certs/ca-certificates.crt \ -diff --git a/lib/Makefile.am b/lib/Makefile.am -index fe9cf63a2..745695f7e 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -203,10 +203,6 @@ if WINDOWS - thirdparty_libadd += -lcrypt32 - endif - --if MACOSX --libgnutls_la_LDFLAGS += -framework Security -framework CoreFoundation --endif -- - libgnutls_la_LIBADD += $(thirdparty_libadd) - - # C++ library -diff --git a/lib/system/certs.c b/lib/system/certs.c -index 611c645e0..912b0aa5e 100644 ---- a/lib/system/certs.c -+++ b/lib/system/certs.c -@@ -44,12 +44,6 @@ - # endif - #endif - --#ifdef __APPLE__ --# include <CoreFoundation/CoreFoundation.h> --# include <Security/Security.h> --# include <Availability.h> --#endif -- - /* System specific function wrappers for certificate stores. - */ - -@@ -276,72 +270,6 @@ int add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, - - return r; - } --#elif defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 --static --int osstatus_error(status) --{ -- CFStringRef err_str = SecCopyErrorMessageString(status, NULL); -- _gnutls_debug_log("Error loading system root certificates: %s\n", -- CFStringGetCStringPtr(err_str, kCFStringEncodingUTF8)); -- CFRelease(err_str); -- return GNUTLS_E_FILE_ERROR; --} -- --static --int add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, -- unsigned int tl_vflags) --{ -- int r=0; -- -- SecTrustSettingsDomain domain[] = { kSecTrustSettingsDomainUser, -- kSecTrustSettingsDomainAdmin, -- kSecTrustSettingsDomainSystem }; -- for (size_t d=0; d<sizeof(domain)/sizeof(*domain); d++) { -- CFArrayRef certs = NULL; -- OSStatus status = SecTrustSettingsCopyCertificates(domain[d], -- &certs); -- if (status == errSecNoTrustSettings) -- continue; -- if (status != errSecSuccess) -- return osstatus_error(status); -- -- int cert_count = CFArrayGetCount(certs); -- for (int i=0; i<cert_count; i++) { -- SecCertificateRef cert = -- (void*)CFArrayGetValueAtIndex(certs, i); -- CFDataRef der; -- status = SecItemExport(cert, kSecFormatX509Cert, 0, -- NULL, &der); -- if (status != errSecSuccess) { -- CFRelease(der); -- CFRelease(certs); -- return osstatus_error(status); -- } -- -- if (gnutls_x509_trust_list_add_trust_mem(list, -- &(gnutls_datum_t) { -- .data = (void*)CFDataGetBytePtr(der), -- .size = CFDataGetLength(der), -- }, -- NULL, -- GNUTLS_X509_FMT_DER, -- tl_flags, -- tl_vflags) > 0) -- r++; -- CFRelease(der); -- } -- CFRelease(certs); -- } -- --#ifdef DEFAULT_BLACKLIST_FILE -- ret = gnutls_x509_trust_list_remove_trust_file(list, DEFAULT_BLACKLIST_FILE, GNUTLS_X509_FMT_PEM); -- if (ret < 0) { -- _gnutls_debug_log("Could not load blacklist file '%s'\n", DEFAULT_BLACKLIST_FILE); -- } --#endif -- -- return r; --} - #else - - #define add_system_trust(x,y,z) GNUTLS_E_UNIMPLEMENTED_FEATURE diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4ab8cbbf9650a..f83b7c10819e4 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -21,6 +21,7 @@ , gobject-introspection-unwrapped , nixStoreDir ? builtins.storeDir , x11Support ? true +, testers }: # now that gobject-introspection creates large .gir files (eg gtk3 case) @@ -145,12 +146,14 @@ stdenv.mkDerivation (finalAttrs: { packageName = "gobject-introspection"; versionPolicy = "odd-unstable"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { description = "A middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]); + pkgConfigModules = [ "gobject-introspection-1.0" ]; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 9e2585d7ee036..21713000c6449 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.55"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J/1YeW+qHNTMASDDTqhTFaCJHscfVbxnk8FOzxaKP1c="; + sha256 = "FqIhGRhVpqbA0Gse+OSBzz9SBBplTsltNYFwRboama8="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 002d07cc33b76..da40c66e9fe53 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_XOPEN_SOURCE"; # some packages want to link to the static tcmalloc_minimal diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 050adad77cab0..d5882c861682b 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { # fit in the limit. https://github.com/NixOS/nix/pull/1085 ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; - NIX_CFLAGS_COMPILE = toString ( + env.NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless # debugging is disabled lib.optional (qtbase != null) "-DQT_NO_DEBUG" diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 8a3a936b14533..08de2cdf91301 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option" + lib.optionalString stdenv.isAarch64 "-Wno-error=format-security"; enableParallelBuilds = true; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 0d14630bda3b0..c9559476eff2d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "gsl"; version = "2.7.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnu/gsl/${pname}-${version}.tar.gz"; sha256 = "sha256-3LD71DBIgyt1f/mUJpGo3XACbV2g/4VgHlJof23us0s="; @@ -13,8 +15,12 @@ stdenv.mkDerivation rec { MACOSX_DEPLOYMENT_TARGET=10.16 '' else null; + postInstall = '' + moveToOutput bin/gsl-config "$dev" + ''; + # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux"; diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix index ec6646d98f572..5b3672650f197 100644 --- a/pkgs/development/libraries/gsmlib/default.nix +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -2,13 +2,21 @@ stdenv.mkDerivation rec { pname = "gsmlib"; version = "unstable-2017-10-06"; + src = fetchFromGitHub { owner = "x-logLT"; repo = "gsmlib"; rev = "4f794b14450132f81673f7d3570c5a859aecf7ae"; sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5"; }; + nativeBuildInputs = [ autoreconfHook ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-std=c++14" + ]; + meta = with lib; { description = "Library to access GSM mobile phones through GSM modems"; homepage = "https://github.com/x-logLT/gsmlib"; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index dd7852ac555bb..3eacad32f813d 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -1,18 +1,26 @@ -{ lib, stdenv, fetchurl -, withShishi ? !stdenv.isDarwin, shishi +{ lib +, stdenv +, fetchurl +, withShishi ? !stdenv.isDarwin +, shishi }: stdenv.mkDerivation rec { pname = "gss"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://gnu/gss/gss-${version}.tar.gz"; - sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; + hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM="; }; buildInputs = lib.optional withShishi shishi; + # ./stdint.h:89:5: error: expected value in expression + preConfigure = lib.optionalString stdenv.isDarwin '' + export GNULIBHEADERS_OVERRIDE_WINT_T=0 + ''; + configureFlags = [ "--${if withShishi then "enable" else "disable"}-kerberos5" ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 395708c2a680d..e03f9f0b844f0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -37,15 +37,18 @@ , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia , glib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; version = "1.20.3"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-fjCz3YGnA4D/dVT5mEcdaZb/drvm/FRHCW+FHiRHPJ8="; }; @@ -146,11 +149,19 @@ stdenv.mkDerivation rec { waylandEnabled = enableWayland; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Base GStreamer plug-ins and helper libraries"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-audio-1.0" + "gstreamer-base-1.0" + "gstreamer-net-1.0" + "gstreamer-video-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 41acd079583eb..80fc921a3679e 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -17,9 +17,10 @@ , lib , CoreServices , gobject-introspection +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; version = "1.20.3"; @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-YH2vZLu9X7GK+dF+IcDSLE1wL//oOyPLItGxryyiOio="; }; @@ -108,11 +111,16 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with lib ;{ + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { description = "Open source multimedia framework"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-controller-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel matthewbauer ]; }; -} +}) diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 049d202a71ec0..80013e3613d01 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, cmake, ninja, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, static ? stdenv.hostPlatform.isStatic, +}: stdenv.mkDerivation rec { pname = "gtest"; @@ -19,7 +25,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals ( + (stdenv.cc.isGNU && (lib.versionOlder stdenv.cc.version "11.0")) + || (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) + ) [ + # Enable C++17 support + # https://github.com/google/googletest/issues/3081 + "-DCMAKE_CXX_STANDARD=17" + ]; meta = with lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index acd2cae6abfce..450fdc6024d7e 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { }; }; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" - ]; + ]); meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 92a126bd7e8ff..92fc02bfa2c99 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, wayland-scanner , wayland , gtk3 , gobject-introspection @@ -26,6 +29,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; }; + patches = [ + # https://github.com/wmww/gtk-layer-shell/pull/146 + # Mark wayland-scanner as a build-time dependency + (fetchpatch { + url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch"; + hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM="; + }) + # https://github.com/wmww/gtk-layer-shell/pull/147 + # Remove redundant dependency check for gtk-doc + (fetchpatch { + url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch"; + hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs="; + }) + ]; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -35,6 +59,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 vala + wayland-scanner ]; buildInputs = [ @@ -51,6 +76,6 @@ stdenv.mkDerivation rec { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 3568bbfed4813..88dfc54094f3c 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -5,10 +5,9 @@ , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch, buildPackages +, testers }: -with lib; - let gtkCleanImmodulesCache = substituteAll { @@ -19,12 +18,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk+"; version = "2.24.33"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/2.24/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; }; @@ -39,12 +38,14 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; + nativeBuildInputs = finalAttrs.setupHooks ++ [ + perl pkg-config gettext gobject-introspection + ]; 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 +55,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 [ 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 +70,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gdktarget=${gdktarget}" "--with-xinput=yes" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-glibtest" "--disable-introspection" "--disable-visibility" @@ -92,13 +93,21 @@ stdenv.mkDerivation rec { $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache ''; # workaround for bug of nix-mode for Emacs */ ''; inherit gdktarget; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; - meta = { + meta = with lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; + pkgConfigModules = [ + "gdk-2.0" + "gtk+-2.0" + ] ++ lib.optionals (gdktarget == "x11") [ + "gdk-x11-2.0" + "gtk+-x11-2.0" + ]; platforms = platforms.all; longDescription = '' @@ -113,4 +122,4 @@ stdenv.mkDerivation rec { ''; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; -} +}) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 112158a47276d..af81a55fcaa15 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch2 , pkg-config , gettext , docbook-xsl-nons @@ -47,6 +46,7 @@ , QuartzCore , broadwaySupport ? true , wayland-scanner +, testers }: let @@ -59,9 +59,9 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.35"; + version = "3.24.36"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -71,24 +71,16 @@ stdenv.mkDerivation rec { gtkCleanImmodulesCache ]; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-7BD+bXEu8LPGO1+TJjnJ0a6Z/OlPUA9vBpZWKf72C9E="; + sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; }; patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch - - # Add accidentally non-dist’d build file. - # https://gitlab.gnome.org/GNOME/gtk/-/commit/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/66a199806ceb3daa5e2c7d3a5b45a86007cec46a.patch"; - includes = [ - "gdk/wayland/cursor/meson.build" - ]; - sha256 = "cOOcSB3yphff2+7l7YpFbGSswWjV8lJ2tk+Vjgl1ras="; - }) ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it @@ -110,7 +102,7 @@ stdenv.mkDerivation rec { python3 sassc gdk-pixbuf - ] ++ setupHooks ++ lib.optionals withGtkDoc [ + ] ++ finalAttrs.setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 docbook-xsl-nons gtk-doc @@ -121,7 +113,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes @@ -180,7 +171,7 @@ stdenv.mkDerivation rec { # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' # See https://github.com/NixOS/nixpkgs/issues/132259 @@ -224,7 +215,7 @@ stdenv.mkDerivation rec { for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done '' + lib.optionalString stdenv.isDarwin '' # a comment created a cycle between outputs @@ -237,6 +228,7 @@ stdenv.mkDerivation rec { attrPath = "gtk3"; freeze = true; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -254,7 +246,14 @@ stdenv.mkDerivation rec { homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; + pkgConfigModules = [ + "gdk-3.0" + "gtk+-3.0" + ] ++ lib.optionals x11Support [ + "gdk-x11-3.0" + "gtk+-x11-3.0" + ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; -} +}) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 11d00dfa1c058..764dc36d7db9c 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' files=( diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 447e7d061fdbc..704a7c3e9c545 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "3.24.11"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; @@ -42,10 +46,13 @@ stdenv.mkDerivation rec { make check ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-3.0" ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 95e6e8d2e1070..e824e1ed9c679 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -19,15 +19,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "4.8.4"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "fsnRj7KD0fhKOj7/O3pysJoQycAGWXs/uru1lYQgqH0="; }; @@ -101,11 +104,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-4" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 506dcefcff3bb..100e3e44a88f6 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -20,17 +20,20 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.6.1"; + version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZZ2cydA0oRTwfn4TTugNd97ASXyxUWrlNpEZwvy52hY="; + sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; patches = [ @@ -117,11 +120,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-5" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 9c5c2b614fa27..eb8b1363c32b7 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; - homepage = "http://gtkspell.sourceforge.net"; + homepage = "https://gtkspell.sourceforge.net"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index fc9fc1da08b97..9145420ad2523 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.2"; + 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-6QBZzIOAXa2T6DvkflOVjwdHHMRk+UQ5HntcgqpRoY8="; + sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index af24e46efe2af..4d6546f0e5be5 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 37a282c4ccad6..c4604a28a41ec 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 diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index ba08fc61f5682..a35a256b55059 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGVM_RUN_DIR=$out/run/gvm" + "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; meta = with lib; { diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index b199bb27397bf..ffaa53ccffe2a 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { command line interface or in a text-oriented interactive interface. ''; license = with licenses; [ gpl2Plus lgpl2Plus ]; - homepage = "http://hamlib.sourceforge.net"; + homepage = "https://hamlib.sourceforge.net"; maintainers = with maintainers; [ relrod ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 31b620ae5d2e9..9250a66c219e2 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { command line interface or in a text-oriented interactive interface. ''; license = with licenses; [ gpl2Plus lgpl2Plus ]; - homepage = "http://hamlib.sourceforge.net"; + homepage = "https://hamlib.sourceforge.net"; maintainers = with maintainers; [ relrod ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 9da8e8837bc1d..e0501bd50cdc4 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -10,6 +10,8 @@ , meson , ninja , gobject-introspection +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages , icu , graphite2 , harfbuzz # The icu variant uses and propagates the non-icu one. @@ -32,11 +34,11 @@ stdenv.mkDerivation rec { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "6.0.0"; + version = "7.0.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; - sha256 = "HRAQoXUdB21SkeQzwThQKnlNZ5p0mNEmjuIeLUoUDrQ="; + hash = "sha256-e0aFtwZsXGuNxs17AvY8VU+4zBxN3PxEvChO+jwgzyg="; }; postPatch = '' @@ -61,6 +63,7 @@ stdenv.mkDerivation rec { (lib.mesonEnable "coretext" withCoreText) (lib.mesonEnable "graphite" withGraphite2) (lib.mesonEnable "icu" withIcu) + (lib.mesonEnable "introspection" withIntrospection) ]; depsBuildBuild = [ @@ -70,16 +73,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - gobject-introspection libintl pkg-config python3 + glib gtk-doc docbook-xsl-nons docbook_xml_dtd_43 - ]; + ] ++ lib.optional withIntrospection gobject-introspection; - buildInputs = [ glib freetype gobject-introspection ] + buildInputs = [ glib freetype ] ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = lib.optional withGraphite2 graphite2 @@ -90,7 +93,6 @@ stdenv.mkDerivation rec { # Slightly hacky; some pkgs expect them in a single directory. 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 ${lib.optionalString stdenv.isDarwin '' ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.dylib @@ -108,6 +110,6 @@ stdenv.mkDerivation rec { homepage = "https://harfbuzz.github.io/"; maintainers = [ maintainers.eelco ]; license = licenses.mit; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index b29b64c2a7577..89cff8ef427c2 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -7,17 +7,18 @@ , udev , Cocoa , IOKit +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hidapi"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; - rev = "${pname}-${version}"; - sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; + sha256 = "sha256-CEZP5n8qEAzsqn8dz3u1nG0YoT7J1P+WfN7urkRTuVg="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -28,12 +29,20 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; maintainers = with maintainers; [ prusnak ]; # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) license = with licenses; [ bsd3 /* or */ gpl3Only ] ; + pkgConfigModules = lib.optionals stdenv.isDarwin [ + "hidapi" + ] ++ lib.optionals stdenv.isLinux [ + "hidapi-hidraw" + "hidapi-libusb" + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 146262a425822..dd1ea3559d7a0 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; patches = [ ./build-shared.patch ] ++ lib.optionals stdenv.isAarch32 [ diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 5e6cef2aff679..3d0ef7740e7fb 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "httplib"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-RTC2Q8T5tvi27BuZuH++wmKZ3bvIHL09S4F8YeO5Fbg="; + hash = "sha256-Qr8jaZSj5xPiTF8reur09/R2jrtDk5hxHKeVTccHbZQ="; }; # Header-only library. diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 66441a911607d..2f48bd668de47 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.2"; pname = "hunspell"; src = fetchFromGitHub { owner = "hunspell"; repo = "hunspell"; rev = "v${version}"; - sha256 = "sha256-J1kgNUElRO63mtU62qU7asf7hht9oyplMIO9I/E6BPU="; + sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8="; }; outputs = [ "bin" "dev" "out" "man" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - homepage = "http://hunspell.sourceforge.net"; + homepage = "https://hunspell.sourceforge.net"; description = "Spell checker"; longDescription = '' Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 3eee425d4be8e..09d68fa0199d2 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ lib, stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -878,4 +878,28 @@ rec { shortDescription = "Norwegian Nynorsk (Norway)"; license = with lib.licenses; [ gpl2Only ]; }; + + /* TOKI PONA */ + + tok = mkDict rec { + pname = "hunspell-dict-tok"; + version = "20220829"; + dictFileName = "tok"; + readmeFile = "README.en.adoc"; + + src = fetchzip { + url = "https://github.com/somasis/hunspell-tok/releases/download/${version}/hunspell-tok-${version}.tar.gz"; + sha256 = "sha256-RiAODKXPUeIcf8IFcU6Tacehq5S8GYuPTuxEiN2CXD0="; + }; + + dontBuild = true; + + meta = with lib; { + description = "Hunspell dictionary for Toki Pona"; + homepage = "https://github.com/somasis/hunspell-tok"; + license = with lib.licenses; [ cc0 publicDomain cc-by-sa-30 cc-by-sa-40 ]; + maintainers = with maintainers; [ somasis ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index d67fe23010395..01987ab718581 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/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 19838763f5b41..a83e2cd5f5ebe 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers +, buildRootOnly ? false +}: import ./base.nix { version = "63.1"; @@ -11,4 +13,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index a714e758bd883..c5e46fa4530d6 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -2,6 +2,7 @@ { stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot +, testers }: let @@ -45,6 +46,11 @@ let description = "Unicode and globalization support library"; homepage = "https://icu.unicode.org/"; maintainers = with maintainers; [ raskin ]; + pkgConfigModules = [ + "icu-i18n" + "icu-io" + "icu-uc" + ]; platforms = platforms.all; }; }; @@ -97,4 +103,6 @@ let then buildRootOnlyAttrs else realAttrs; in -stdenv.mkDerivation attrs +stdenv.mkDerivation (finalAttrs: attrs // { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; +}) diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 8f5512e94db59..e95f5e3cab2d6 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; - homepage = "http://id3lib.sourceforge.net"; + homepage = "https://id3lib.sourceforge.net"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 9aea9e545395d..3ebba3c50d0f9 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.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-+U8bo68Q6XX3p2sZiIChjidcRwA10gv9eWccRt4MoYM="; + hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk="; }; postPatch = '' diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index f656288443bcf..50495cb680e62 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.2"; + version = "1.89.3"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-NJRDVNnOCJ0lfxSXxzVpSo2m6DCppgdoRRGDYoRcajs="; + sha256 = "sha256-hPUOqXMpjKNuWVo2RUq2Nw5i+p8PE8qmlyATV7y3Lgg="; }; dontBuild = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 66092f4365098..c178da90a0df6 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -21,18 +21,19 @@ , fluxbox , enlightenment , xorg +, testers }: let inherit (lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; - hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM="; + url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + hash = "sha256-cnwak3yIXAgMNyF+R23Ii1o+YNc38b8ECzQ1ILeBy7o="; }; buildInputs = [ @@ -69,6 +70,8 @@ stdenv.mkDerivation rec { enlightenment; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Image manipulation library"; @@ -83,7 +86,8 @@ stdenv.mkDerivation rec { homepage = "https://docs.enlightenment.org/api/imlib2/html"; changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; license = licenses.imlib2; + pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; -} +}) diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index f75ade98c6d8e..9fe3575b7bc2a 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-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 7b948943345e7..17cdeb50b6b22 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "-DMEDIA_BUILD_FATAL_WARNINGS=OFF" ]; - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 5e6f628aa68e7..a6349d4f138c2 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.6.5"; + version = "23.1.2"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-W+lDqGZAenhRZ7tf4qfDNik/3rFNDM0DGSK/CdNRb8g="; + hash = "sha256-vtzcKPOxmfEl8IF7/hNGfeZmX+AdrHydeYsyYuB1B4o="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/iqueue/default.nix b/pkgs/development/libraries/iqueue/default.nix index 04fd7202d1d16..8803628f675a6 100644 --- a/pkgs/development/libraries/iqueue/default.nix +++ b/pkgs/development/libraries/iqueue/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd microsoft_gsl ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-parameter" + "-Wno-error=misleading-indentation" + ]; + meta = with lib; { homepage = "https://github.com/twosigma/iqueue"; description = "Indexed queue"; diff --git a/pkgs/development/libraries/irr1/default.nix b/pkgs/development/libraries/irr1/default.nix new file mode 100644 index 0000000000000..8740919ce3ae2 --- /dev/null +++ b/pkgs/development/libraries/irr1/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "irr1"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "berndporr"; + repo = "iir1"; + rev = version; + hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A DSP IIR realtime filter library written in C++"; + downloadPage = "https://github.com/berndporr/iir1"; + homepage = "http://berndporr.github.io/iir1/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index c38c72ccd04c2..aca509b3b036b 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -9,15 +9,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-QI95nfQTVGj6fKNetrBcQAS+pEPYHKWLibLkgkAagrs="; }; - patchPhase = '' - for i in `find . -name \*.py` - do - sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i - done - ''; - nativeBuildInputs = [ gettext python3 ]; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 0408aed50a054..78f4d56bfac6f 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -54,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/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index a93a646e21ac9..07afdabd89b28 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://httpunit.sourceforge.net"; + homepage = "https://httpunit.sourceforge.net"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f7f2a619a1c92..45f0302701524 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.24"; + version = "1.18.26"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-01hLwtsD8Fn5hPsKnBGarB+g2leKRI5p/D9os2WEx0k="; + sha256 = "sha256-KvH6g2hIdhtuUUQOxii0ncOAgOmHG7NScB+4yDWAh88="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/development/libraries/jbig2enc/default.nix new file mode 100644 index 0000000000000..26b21aa7c957f --- /dev/null +++ b/pkgs/development/libraries/jbig2enc/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, leptonica +, zlib +, libwebp +, giflib +, libjpeg +, libpng +, libtiff +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "jbig2enc"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "agl"; + repo = "jbig2enc"; + rev = version; + hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; + }; + + buildInputs = [ autoreconfHook ]; + propagatedBuildInputs = [ + leptonica + zlib + libwebp + giflib + libjpeg + libpng + libtiff + ]; + + patches = [ + (fetchpatch { + name = "fix-build-leptonica-1.83.patch"; + url = "https://github.com/agl/jbig2enc/commit/ea050190466f5336c69c6a11baa1cb686677fcab.patch"; + hash = "sha256-+kScjFgDEU9F7VOUNAhm2XBjGm49fzAH8hYhmTm8xv8="; + }) + ]; + + # This is necessary, because the resulting library has + # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib + # in its rpath, which means that patchelf --shrink-rpath removes + # the /nix/store one. By cleaning up before fixup, we ensure that + # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. + preFixup = '' + make clean + ''; + + meta = { + description = "Encoder for the JBIG2 image compression format"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + homepage = "https://github.com/agl/jbig2enc"; + }; +} diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index c461e168b20ca..2637ababbdd72 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-6"; + version = "5.1.2-8"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-YPw29cnScchL4Y2CEatUjzqUW/U9kOdi29Dr577Qy5A="; + sha256 = "sha256-0ne9Xj9MnB5WOkPRtPX7W30qG1osHd0tyua+5RMrnQc="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 420f414da6f7c..18c492dc93b83 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48" ; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; doCheck = true; diff --git a/pkgs/development/libraries/jpcre2/default.nix b/pkgs/development/libraries/jpcre2/default.nix new file mode 100644 index 0000000000000..51fbba13ba0c5 --- /dev/null +++ b/pkgs/development/libraries/jpcre2/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, pcre2 +}: + +stdenv.mkDerivation rec { + pname = "jpcre2"; + version = "10.32.01"; + rev = version; + + src = fetchFromGitHub { + owner = "jpcre2"; + repo = "jpcre2"; + rev = "refs/tags/${version}"; + hash = "sha256-CizjxAiajDLqajZKizMRAk5UEZA+jDeBSldPyIb6Ic8="; + }; + + buildInputs = [ pcre2 ]; + + meta = with lib; { + homepage = "https://docs.neuzunix.com/jpcre2/latest/"; + description = "C++ wrapper for PCRE2 Library"; + platforms = lib.platforms.all; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9885384e00e19..efac3690851e8 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/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index ac7f75f5e742f..dcd7a76acb33d 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -19,7 +19,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = "http://www.kde.org"; + homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c3d88103c2e37..fc58557021750 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.102/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.103/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 98f7e178fb646..9254043117ae5 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -11,4 +11,6 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; + + meta.homepage = "https://invent.kde.org/frameworks/kguiaddons"; } diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index cbdaf1da892d0..beec3e13cf715 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ilmbase, karchive, openexr, libavif, libheif, qtbase + ilmbase, karchive, openexr, libavif, libheif, libjxl, libraw, qtbase }: let inherit (lib) getDev; in @@ -10,7 +10,7 @@ mkDerivation { pname = "kimageformats"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive openexr libavif libheif qtbase ]; + buildInputs = [ karchive openexr libavif libheif libjxl libraw qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; cmakeFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix index c2063e22bba76..d2a7b5c1a4086 100644 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ b/pkgs/development/libraries/kde-frameworks/prison.nix @@ -1,13 +1,13 @@ { mkDerivation, extra-cmake-modules, - libdmtx, qrencode, qtbase, + libdmtx, qrencode, qtbase, qtmultimedia, zxing-cpp }: mkDerivation { pname = "prison"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ libdmtx qrencode ]; - propagatedBuildInputs = [ qtbase ]; + buildInputs = [ libdmtx qrencode zxing-cpp ]; + propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 3edab9894b95f..6aa97206e39ca 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/attica-5.102.0.tar.xz"; - sha256 = "1xph3l4if2vv2gdv9wjk0ls38g77jdzg3j81fyng8pvxsl32z1yv"; - name = "attica-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/attica-5.103.0.tar.xz"; + sha256 = "17b0kshlgi110v42zmvbsmcjjc48rn617l4dmviwd0ycd2kgqd1s"; + name = "attica-5.103.0.tar.xz"; }; }; baloo = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/baloo-5.102.0.tar.xz"; - sha256 = "0y6xc7dihzrcmpb75p8206832kz108l6irdzjv4m0pm0qdj3kb6x"; - name = "baloo-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/baloo-5.103.0.tar.xz"; + sha256 = "1055wv29dd4i7az79q2qdk65wk5xqyslwxnwhxr30xzyp60i9smk"; + name = "baloo-5.103.0.tar.xz"; }; }; bluez-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/bluez-qt-5.102.0.tar.xz"; - sha256 = "0023nhlsniqkkzqjif22fk1hrlzpmigdnc8v4v5z0qf488b0pyf3"; - name = "bluez-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/bluez-qt-5.103.0.tar.xz"; + sha256 = "1w6q3cna46ifv1gvnxp45n0z8civ2cab9sjbvsc3apks6w2iahzz"; + name = "bluez-qt-5.103.0.tar.xz"; }; }; breeze-icons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/breeze-icons-5.102.0.tar.xz"; - sha256 = "1673fjh2q5388764rkkjs5v7jsswr71xdw582irwwz4zic5dkcrd"; - name = "breeze-icons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/breeze-icons-5.103.0.tar.xz"; + sha256 = "1gas85qliib44j5cfpq47hfzni38afqyf9lxkgv1d0q7y87df9br"; + name = "breeze-icons-5.103.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - 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"; + url = "${mirror}/stable/frameworks/5.103/extra-cmake-modules-5.103.0.tar.xz"; + sha256 = "0ij3kjggmil995kcjbfirwy1fis60wgj6m7jxaynz59qrdajxjlj"; + name = "extra-cmake-modules-5.103.0.tar.xz"; }; }; frameworkintegration = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/frameworkintegration-5.102.0.tar.xz"; - sha256 = "00qr6n4h8fgm3vy64plj5762wyfanglh8r8qljvpk9jll74wm01d"; - name = "frameworkintegration-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/frameworkintegration-5.103.0.tar.xz"; + sha256 = "1gljch9nrnw28ix2q2hs29rk0bfzzr4pv0m1msdr0nm1lmyr7w93"; + name = "frameworkintegration-5.103.0.tar.xz"; }; }; kactivities = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kactivities-5.102.0.tar.xz"; - sha256 = "1kl1la4a4zagy7h1sf4l0wdwzg53v28z70sv73dwd6869dmmwygr"; - name = "kactivities-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kactivities-5.103.0.tar.xz"; + sha256 = "0dc89yx89kjjvmb6jycqmyb55pml46vy7xw24myin6xfisb8nckd"; + name = "kactivities-5.103.0.tar.xz"; }; }; kactivities-stats = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kactivities-stats-5.102.0.tar.xz"; - sha256 = "06v2qrd6g20028skh9dq2csw0nggf05qh8w8nz0zvx8q2q2fszhh"; - name = "kactivities-stats-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kactivities-stats-5.103.0.tar.xz"; + sha256 = "0ga51n9c64c4mhmbw1fisbxgcmy77qzi6bhvj3lgs1f829hi1r7r"; + name = "kactivities-stats-5.103.0.tar.xz"; }; }; kapidox = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kapidox-5.102.0.tar.xz"; - sha256 = "0jalyq3nzms4j55kqxmqbjyvbrdw0k1142mjpds24xjb87wgj1rq"; - name = "kapidox-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kapidox-5.103.0.tar.xz"; + sha256 = "0j1di36qxgl5p1ljp2jlgp60psgq2724q0ysfsxapl3p4h9swdy5"; + name = "kapidox-5.103.0.tar.xz"; }; }; karchive = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/karchive-5.102.0.tar.xz"; - sha256 = "0jnqrxpyfqwamq8gim270y5zg6l7inlplc50xdvig5dr0f4d1v20"; - name = "karchive-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/karchive-5.103.0.tar.xz"; + sha256 = "0lqkvp42dc7rd6s00dlfxv4zm81zqyr8ijn6nmiychyw3mlxyarp"; + name = "karchive-5.103.0.tar.xz"; }; }; kauth = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kauth-5.102.0.tar.xz"; - sha256 = "093c1rzgw3rh8ka1q5hdxnn56mxzrrn7v3r3yinr6cy0xif0c4ld"; - name = "kauth-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kauth-5.103.0.tar.xz"; + sha256 = "0m1x0b9ysl2rvm607q9qra6kwaalrgm8i8z4q7j8197a9njawffd"; + name = "kauth-5.103.0.tar.xz"; }; }; kbookmarks = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kbookmarks-5.102.0.tar.xz"; - sha256 = "1jg99z75bdkckahzia17ilbcfvnnamqg9ra0gx2lk1hlhzffi7ls"; - name = "kbookmarks-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kbookmarks-5.103.0.tar.xz"; + sha256 = "1b5dn6g54ix60dkvw6dmbxqjgimq6qy50qhrn2fj7r1rm6059pqs"; + name = "kbookmarks-5.103.0.tar.xz"; }; }; kcalendarcore = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcalendarcore-5.102.0.tar.xz"; - sha256 = "0s2m1d15py39nqagh1abprq6r099mdcci8sm28hp2c2cjwsr7xbk"; - name = "kcalendarcore-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcalendarcore-5.103.0.tar.xz"; + sha256 = "1pafc7iwin7lbh6n7b5qr1h7x3n6wdviqazcjl2z7ikysnqkphbp"; + name = "kcalendarcore-5.103.0.tar.xz"; }; }; kcmutils = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcmutils-5.102.0.tar.xz"; - sha256 = "1fiszfpay1cnyqhfyhl4mpw9j8jmknfisxgwqvd61qfa622ryhxj"; - name = "kcmutils-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcmutils-5.103.0.tar.xz"; + sha256 = "1xgrjv7r6zrlvjjqv07bqfb63f0vbhjj0sshi7qmf68k33g3c5fw"; + name = "kcmutils-5.103.0.tar.xz"; }; }; kcodecs = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcodecs-5.102.0.tar.xz"; - sha256 = "15k3rlbjb2dji8n7bxb4d8nc7cs7618fhv8x5k50x6kbx867rx88"; - name = "kcodecs-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcodecs-5.103.0.tar.xz"; + sha256 = "0fbgw84wf435ws0d9lldbgrmbscv6wz8pcws8dvfr7hkxkiwl52y"; + name = "kcodecs-5.103.0.tar.xz"; }; }; kcompletion = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcompletion-5.102.0.tar.xz"; - sha256 = "1jgr8an283l9d1zhl3cqpp66d90bscfv186jan01r8wan69awy2v"; - name = "kcompletion-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcompletion-5.103.0.tar.xz"; + sha256 = "0kvnrg3p7washajvll9qqsk81bw289s75vrqm5safgdvlb5p88yh"; + name = "kcompletion-5.103.0.tar.xz"; }; }; kconfig = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kconfig-5.102.0.tar.xz"; - sha256 = "0cxc2gfank22yzflxdjr766xn4lr2ij9b5v23g9y1mwfsc2ng3pn"; - name = "kconfig-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kconfig-5.103.0.tar.xz"; + sha256 = "065r7ggdh3yxnqas7x20kqhyv070d7xryvc8apj0xsz1cvsychaz"; + name = "kconfig-5.103.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kconfigwidgets-5.102.0.tar.xz"; - sha256 = "19vs2ydlw76v44xyzhfgl70dw0qan2g5z3dq0hzljf5pkc8mhr6p"; - name = "kconfigwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kconfigwidgets-5.103.0.tar.xz"; + sha256 = "0wx3dbqp3xhx3334qaxjv8hpixg25791lsnkbainhq2frhwfy77r"; + name = "kconfigwidgets-5.103.0.tar.xz"; }; }; kcontacts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcontacts-5.102.0.tar.xz"; - sha256 = "04xi28mk5i0l1jgvw0dbapjnk2c6j1y1fxldhhapg722kiw9566y"; - name = "kcontacts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcontacts-5.103.0.tar.xz"; + sha256 = "136ql3ycc1dw7njifxmqqsqkq2ig393206s0d0l6j7jlympng8sk"; + name = "kcontacts-5.103.0.tar.xz"; }; }; kcoreaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcoreaddons-5.102.0.tar.xz"; - sha256 = "0j09lb6lbyv5hvvw57i0s5pmd24cywzv9ncrd1chnbk0jcczkqw2"; - name = "kcoreaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcoreaddons-5.103.0.tar.xz"; + sha256 = "0sigfyznlnqba66i3qg22w1jl8lkhd1rjwd8da7gvgy2fh19vfdy"; + name = "kcoreaddons-5.103.0.tar.xz"; }; }; kcrash = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kcrash-5.102.0.tar.xz"; - sha256 = "1i6jm2jgvqrm95dqdml0w0z9jc9j9n7h48y8zck7s3vaww1v7a67"; - name = "kcrash-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kcrash-5.103.0.tar.xz"; + sha256 = "1rzbszkqirrgiiqjr468pw253c7a1d96bmhf0awhj9qnz5qs361m"; + name = "kcrash-5.103.0.tar.xz"; }; }; kdav = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdav-5.102.0.tar.xz"; - sha256 = "0prr27mv7mhcynvkp9kzk7a1xiawilvafvzv3a6xdkr5w91741bf"; - name = "kdav-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdav-5.103.0.tar.xz"; + sha256 = "0rm1nsbi6n6f6zvpja8cznz2lj4ca6jvzqjmvrd76pw2f2fii8il"; + name = "kdav-5.103.0.tar.xz"; }; }; kdbusaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdbusaddons-5.102.0.tar.xz"; - sha256 = "1lqskn739bix5fp1s40gb7fch66pa9bmlwxzfg9lyqa5xmpfxfzi"; - name = "kdbusaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdbusaddons-5.103.0.tar.xz"; + sha256 = "1qx4xcl6cakazpq7mpsnv2dl202y5agdypw0vvvw8j9bmc3bfxf6"; + name = "kdbusaddons-5.103.0.tar.xz"; }; }; kdeclarative = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdeclarative-5.102.0.tar.xz"; - sha256 = "0xvwr1mjviwixbs2i8yh3b37ds4jcgvfrv2z366dld40shs65m0a"; - name = "kdeclarative-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdeclarative-5.103.0.tar.xz"; + sha256 = "0lmjzxjm4hs4cb1m6704n6gqwpqvn8pib138mw8fvl8c03xmrjmn"; + name = "kdeclarative-5.103.0.tar.xz"; }; }; kded = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kded-5.102.0.tar.xz"; - sha256 = "0fjnb9wgpir91jwvl9dbnbvcf3c94l63vjs6ylvcd2w8lxasyxb7"; - name = "kded-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kded-5.103.0.tar.xz"; + sha256 = "13clr3d1rls3w4syr0bsiiqlvpv54lhvw9jwy0p7hpz1rsz619q0"; + name = "kded-5.103.0.tar.xz"; }; }; kdelibs4support = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdelibs4support-5.102.0.tar.xz"; - sha256 = "0s823mcwg7l72aq55q8vh48pyp3apk3hm87jh9lc1ijg9frgcgk4"; - name = "kdelibs4support-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdelibs4support-5.103.0.tar.xz"; + sha256 = "0lzq25a4q857j91496lxyhs4jf2l3p8s38xxnh0099f5la0akhpv"; + name = "kdelibs4support-5.103.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdesignerplugin-5.102.0.tar.xz"; - sha256 = "1nn2f0jln4qni2gaq0anchrv42fcf83m22ag9r3c4sy7vxr8irbc"; - name = "kdesignerplugin-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdesignerplugin-5.103.0.tar.xz"; + sha256 = "1jismdz12lnq6dkv3c44jicjjpl25hxm7ghl7yw4nh73c76xflhw"; + name = "kdesignerplugin-5.103.0.tar.xz"; }; }; kdesu = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdesu-5.102.0.tar.xz"; - sha256 = "0ps88rvvzagpw4qp4nj86wknyhm9mmdlkhs0i7cywf53pdr37afh"; - name = "kdesu-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdesu-5.103.0.tar.xz"; + sha256 = "19mbmnd1bl76dq8v0rm62lgkyl9b93a85g2zb1d9zkcqa5xcx2hi"; + name = "kdesu-5.103.0.tar.xz"; }; }; kdewebkit = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kdewebkit-5.102.0.tar.xz"; - sha256 = "137j897admfp5d8g1x1g5x9h4nmsp6padi17nx4y350kriyhxkkv"; - name = "kdewebkit-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kdewebkit-5.103.0.tar.xz"; + sha256 = "1kkmy641c4814aq8nfb56yq4ch724cwyv487wljpfly75migwcnz"; + name = "kdewebkit-5.103.0.tar.xz"; }; }; kdnssd = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdnssd-5.102.0.tar.xz"; - sha256 = "10awmh1j05hlg957ih7a1shapl6fgp1ma5b7qvbsp4fi5nh2k985"; - name = "kdnssd-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdnssd-5.103.0.tar.xz"; + sha256 = "1va56vqviic7y4b21g0kz6kdwf56bgylwv2wwrlbxcnz3dnsnyi6"; + name = "kdnssd-5.103.0.tar.xz"; }; }; kdoctools = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kdoctools-5.102.0.tar.xz"; - sha256 = "11g671mlva00fk7yfym5a73sfjdy0zkhh3a7h4zv0s763nnmkg13"; - name = "kdoctools-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kdoctools-5.103.0.tar.xz"; + sha256 = "1a74mkbfpxiyzs0p3q7hhndp1ricmc5mdbl96nd2c1i62pg84mxs"; + name = "kdoctools-5.103.0.tar.xz"; }; }; kemoticons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kemoticons-5.102.0.tar.xz"; - sha256 = "0arligy3i9qcqx9kapv692nz8dl1kimfv03392z3w3qqdwlpc9v5"; - name = "kemoticons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kemoticons-5.103.0.tar.xz"; + sha256 = "10psbw1myvvnj5d2ri5f4la4dqa3sj124qd7iyijw0k870hw5h8k"; + name = "kemoticons-5.103.0.tar.xz"; }; }; kfilemetadata = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kfilemetadata-5.102.0.tar.xz"; - sha256 = "0kv33rqp3wshhmv2pdayggxlxal6ihjam2als3d9a5hm1h5kz2fc"; - name = "kfilemetadata-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kfilemetadata-5.103.0.tar.xz"; + sha256 = "1h10jvdljlpasrkiidbdzfk8xs1gm5hm1j8m8nvz4mglhby9r329"; + name = "kfilemetadata-5.103.0.tar.xz"; }; }; kglobalaccel = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kglobalaccel-5.102.0.tar.xz"; - sha256 = "1l2mk7192wdb1qv62fqk9w1w6zbsmfr822gr5azg6nnzv4gdvadm"; - name = "kglobalaccel-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kglobalaccel-5.103.0.tar.xz"; + sha256 = "14jgs7nz4qw3d183s3rxkbz1mmbjamr57qdw7zi2xfpnma56ggls"; + name = "kglobalaccel-5.103.0.tar.xz"; }; }; kguiaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kguiaddons-5.102.0.tar.xz"; - sha256 = "1awgfnxmvghh70ldnpb1759wmy1i6rwsp3nggdj2ncdbdbgj04sv"; - name = "kguiaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kguiaddons-5.103.0.tar.xz"; + sha256 = "0cmjsp19q0c3cq433yq0id9habmrq0q8x3kvzi12pn64xzyq0cp6"; + name = "kguiaddons-5.103.0.tar.xz"; }; }; kholidays = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kholidays-5.102.0.tar.xz"; - sha256 = "01rznsqxg7crljzy0lcal6r03qvfg8qrh0zigh26073rdn56g5d1"; - name = "kholidays-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kholidays-5.103.0.tar.xz"; + sha256 = "1kahvipcxkcz3qql6rf3qlafpmqs51jj478icnb4hhfp8q2m9xda"; + name = "kholidays-5.103.0.tar.xz"; }; }; khtml = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/khtml-5.102.0.tar.xz"; - sha256 = "0az046m9n954cb70iqgx2isspbc0zb89fw97nhmw9szgfsliy8ab"; - name = "khtml-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/khtml-5.103.0.tar.xz"; + sha256 = "0d26ni10rdy6b368ij20j6bgf03hzdc7b7602fxnvwg0i0h54r4s"; + name = "khtml-5.103.0.tar.xz"; }; }; ki18n = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ki18n-5.102.0.tar.xz"; - sha256 = "0iwz3jwaqlbja338gkq7sz7f8sw2rp37grkqpvx62274qflq1qww"; - name = "ki18n-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ki18n-5.103.0.tar.xz"; + sha256 = "1rj0g12xjwm42qyrxb55mcpaz52s78b7i8ms9svrlza2gxi93siq"; + name = "ki18n-5.103.0.tar.xz"; }; }; kiconthemes = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kiconthemes-5.102.0.tar.xz"; - sha256 = "1q1fij7vn5b34k99cz4x58b5b8a04vrlkdckc8bxbbccpvy5xkyh"; - name = "kiconthemes-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kiconthemes-5.103.0.tar.xz"; + sha256 = "0khjzcy8b7rbf2pvpkin941a1cp1lsb2vr7n1ff3gdp33ra98828"; + name = "kiconthemes-5.103.0.tar.xz"; }; }; kidletime = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kidletime-5.102.0.tar.xz"; - sha256 = "159grvvw7zdp2hkiq20iz9zy8ilq6mfr3dmyq51pfq9741nd88qf"; - name = "kidletime-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kidletime-5.103.0.tar.xz"; + sha256 = "0hlq6jmkpdjmzcqzjdbhz3xw0b198cvd98zwyabirb8lf4v51wdh"; + name = "kidletime-5.103.0.tar.xz"; }; }; kimageformats = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kimageformats-5.102.0.tar.xz"; - sha256 = "1d29dnjca0fgwi5ri6x4gqgsp8h4x5yidf7ifnpf7qyhwm22r2x6"; - name = "kimageformats-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kimageformats-5.103.0.tar.xz"; + sha256 = "0zhyf9fh7i4jig8iryh2cp1m340ja2bzskayfisgx7fcm8bw8zfx"; + name = "kimageformats-5.103.0.tar.xz"; }; }; kinit = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kinit-5.102.0.tar.xz"; - sha256 = "03pzsnis8lpsglry5iwkwfvn6fnn82rdxn6pac1cs0jhxwhg9fdc"; - name = "kinit-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kinit-5.103.0.tar.xz"; + sha256 = "0y2xashdz2zv8gddaxr5w16l8yf1afi29b3a2rzh94ms9l0sln75"; + name = "kinit-5.103.0.tar.xz"; }; }; kio = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kio-5.102.0.tar.xz"; - sha256 = "0sviiq3axsxlf2nvxm0ccazbp7fw4dvky3dd87p82rng3v01g53a"; - name = "kio-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kio-5.103.0.tar.xz"; + sha256 = "0izljyzjzcbsf6hg4302b2vjjxvxkvs23nxs0x0cr2d4b8v3fj0b"; + name = "kio-5.103.0.tar.xz"; }; }; kirigami2 = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kirigami2-5.102.0.tar.xz"; - sha256 = "1ckmk0p0x5ymma3q5nkja3h6qz439qdxq0vchljg5yazxpiki08p"; - name = "kirigami2-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kirigami2-5.103.0.tar.xz"; + sha256 = "0i1pr1w1082i00zzxx5x9zhr3ijsyl3l9i5nzx4znxvp3qi7yrm6"; + name = "kirigami2-5.103.0.tar.xz"; }; }; kitemmodels = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kitemmodels-5.102.0.tar.xz"; - sha256 = "19iqg7lbln0h1fkssa2jj58c9j04lvwwbbzrq11ds1wzjvw77xsj"; - name = "kitemmodels-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kitemmodels-5.103.0.tar.xz"; + sha256 = "1jvhlcc0v3ww883rxb0nn4bh4pn91hmkdrr96vcwmwh8m1plsv1m"; + name = "kitemmodels-5.103.0.tar.xz"; }; }; kitemviews = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kitemviews-5.102.0.tar.xz"; - sha256 = "1c31qm059y7j0hskrbhm57qh6g2mm04qfjqbhili9qflp03fl69y"; - name = "kitemviews-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kitemviews-5.103.0.tar.xz"; + sha256 = "0klwci9dsa11f43q6nhcay506m800sk5gc03fkv0992y8mnh8sc0"; + name = "kitemviews-5.103.0.tar.xz"; }; }; kjobwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kjobwidgets-5.102.0.tar.xz"; - sha256 = "1r6xfi4hwfj9hn1hmgniyx17z3b1himh0fmc6bd45b89jzdvmqcl"; - name = "kjobwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kjobwidgets-5.103.0.tar.xz"; + sha256 = "11j8zx4lj04hw5g7jg7jyw6p34fd6qq9p813v2hlszfbjz3hldgs"; + name = "kjobwidgets-5.103.0.tar.xz"; }; }; kjs = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kjs-5.102.0.tar.xz"; - sha256 = "14w523kv5jfp4hzfbkawsf5pljahihj8jxkyjk5r707nrbnqzd3w"; - name = "kjs-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kjs-5.103.0.tar.xz"; + sha256 = "01wlv1lalmdspq2rgisv6csd4yxl0mxi476bcpr3i1zvvx9y2ijs"; + name = "kjs-5.103.0.tar.xz"; }; }; kjsembed = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kjsembed-5.102.0.tar.xz"; - sha256 = "179gr69n0v39lbxi95w1ckk20505h4zqhxsqmy6fjs9vxc3zja5s"; - name = "kjsembed-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kjsembed-5.103.0.tar.xz"; + sha256 = "0b44pxk01pk30rgqx2lxmwfq5x3nlj5yqcbc3qgfpj0hpfgkfl99"; + name = "kjsembed-5.103.0.tar.xz"; }; }; kmediaplayer = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kmediaplayer-5.102.0.tar.xz"; - sha256 = "0kmy4x9bi29nnd8sixrcdk4bhffh880a2p6pdcfz6sqp1i7n8v6s"; - name = "kmediaplayer-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kmediaplayer-5.103.0.tar.xz"; + sha256 = "1bwgy1l9qlx3cq2sjqva1g9d8j1di2mxs3cj9v6gjgn67cywm2sw"; + name = "kmediaplayer-5.103.0.tar.xz"; }; }; knewstuff = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knewstuff-5.102.0.tar.xz"; - sha256 = "127w4vfpinq7lm6ckszfisyw7mjzs9v6s2ga4xyd6y7lzyf33gz5"; - name = "knewstuff-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knewstuff-5.103.0.tar.xz"; + sha256 = "13mpx8frr9ypxx7p3567gi5w4g1ja40asp4cjs2qa9gs05y7kfj6"; + name = "knewstuff-5.103.0.tar.xz"; }; }; knotifications = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knotifications-5.102.0.tar.xz"; - sha256 = "1y5sjzx9nyamalwl08y5krxajj0rvhhqgfdyavwkqbr30jpnmklk"; - name = "knotifications-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knotifications-5.103.0.tar.xz"; + sha256 = "0dnrm3idaz8nnwr2va88xcf9pgxx5jrcxng5n7n8yh030dmcsg4g"; + name = "knotifications-5.103.0.tar.xz"; }; }; knotifyconfig = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/knotifyconfig-5.102.0.tar.xz"; - sha256 = "05s8nzc7a01w3rxjb9jg7d98v4rd2dnncpmmv7ap209z10i09qh8"; - name = "knotifyconfig-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/knotifyconfig-5.103.0.tar.xz"; + sha256 = "0z99s5ds619905dykw4ny8vsv2rkng6mw97kxma5padq2nspbfjs"; + name = "knotifyconfig-5.103.0.tar.xz"; }; }; kpackage = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpackage-5.102.0.tar.xz"; - sha256 = "0mas3dq39lcij3nva0vmqrggm5b43grmmmszfjqd7hrmgpm93n43"; - name = "kpackage-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpackage-5.103.0.tar.xz"; + sha256 = "15cvd5hc8dzmvas803canqxq5b0azdi2mb2qa7yj7881bjz08nvb"; + name = "kpackage-5.103.0.tar.xz"; }; }; kparts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kparts-5.102.0.tar.xz"; - sha256 = "07vgc4fpwzkiylvlhniph7apggl563ma1hbnig9w1gkbwssyxjip"; - name = "kparts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kparts-5.103.0.tar.xz"; + sha256 = "0wdmjg7vmqb3z8sq0g7krf3c5kwp1kfaklfrp5spc8nbh722y3az"; + name = "kparts-5.103.0.tar.xz"; }; }; kpeople = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpeople-5.102.0.tar.xz"; - sha256 = "1wi08waz3jv1bz6yf8hbnkyx3k80hdgnwvq0s3hsr3hsaal46dv2"; - name = "kpeople-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpeople-5.103.0.tar.xz"; + sha256 = "0b1qg0cklwdalgal4vamlis3mn3vxv54spl9fv3nm36pz3ddxm8m"; + name = "kpeople-5.103.0.tar.xz"; }; }; kplotting = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kplotting-5.102.0.tar.xz"; - sha256 = "1qq8m4wc9zz4s6l7myarryn2z7kj89rk51knjnq7kkibhbhwwsqy"; - name = "kplotting-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kplotting-5.103.0.tar.xz"; + sha256 = "14kb103jrzy8x5w0k62p2wi8pwdvivvi3chhrh71rsq3h4k56ddv"; + name = "kplotting-5.103.0.tar.xz"; }; }; kpty = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kpty-5.102.0.tar.xz"; - sha256 = "0f57fvljv7vmd89yyzbnj8lnafp495j3ial6dmh7wxfmbifw75gz"; - name = "kpty-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kpty-5.103.0.tar.xz"; + sha256 = "0jgah1sn4rfdrwldlp0xdzxwhnwdhk68lfcxyigyq5zig29zirls"; + name = "kpty-5.103.0.tar.xz"; }; }; kquickcharts = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kquickcharts-5.102.0.tar.xz"; - sha256 = "0w4h3jz5ki38y54papms2j1z57b0vna7ac89diffbld04aigjr40"; - name = "kquickcharts-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kquickcharts-5.103.0.tar.xz"; + sha256 = "198xnsdf6iaiqqvz38q1fh72yc8cjycfndwngvwnzy8cplgqxbd8"; + name = "kquickcharts-5.103.0.tar.xz"; }; }; kross = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kross-5.102.0.tar.xz"; - sha256 = "0hdbz4ki5ccjpsi8m1x31v9k6c4kl63ak4pfnqllaxjlmpz6yyw3"; - name = "kross-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kross-5.103.0.tar.xz"; + sha256 = "03gw42lfjr6fl159vnlsppax4pklkxccrxmfjajr8xa3vwm8fqyq"; + name = "kross-5.103.0.tar.xz"; }; }; krunner = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/krunner-5.102.0.tar.xz"; - sha256 = "0gvbmb8j7pqah1lvjcykr6i00q8zhybnc6b7x0ajndlqll72qzff"; - name = "krunner-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/krunner-5.103.0.tar.xz"; + sha256 = "0wna2p6flqg2xmky7j19ifwysrihnc738gzignygijlnz6jrxs05"; + name = "krunner-5.103.0.tar.xz"; }; }; kservice = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kservice-5.102.0.tar.xz"; - sha256 = "1plsv4bbmq7xq3y1cnqzvm85wjxp4ivlwnd4snis55ch2qpqcqvh"; - name = "kservice-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kservice-5.103.0.tar.xz"; + sha256 = "0f8axm47qk6x6l75mjvj879sfcndpyazx7wf16a6af1vklqkp86q"; + name = "kservice-5.103.0.tar.xz"; }; }; ktexteditor = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ktexteditor-5.102.0.tar.xz"; - sha256 = "1kvki86rnkabrjbgkf7jbrj8lrn83nb4gw9j4h5jmyiam8ybkj2w"; - name = "ktexteditor-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ktexteditor-5.103.0.tar.xz"; + sha256 = "03z5xsxrk48whm976ci8w44s23fxr98bx86m2in9amfymcfnab32"; + name = "ktexteditor-5.103.0.tar.xz"; }; }; ktextwidgets = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/ktextwidgets-5.102.0.tar.xz"; - sha256 = "1cipla0shfqpkx2gvvsxncsx4h9bc4zf078p1r9kf3v57pfdr0jc"; - name = "ktextwidgets-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/ktextwidgets-5.103.0.tar.xz"; + sha256 = "1rxmd7chc2ld767bdkm1qmigbasxcjbif90vksf6d00vmsm2kq4m"; + name = "ktextwidgets-5.103.0.tar.xz"; }; }; kunitconversion = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kunitconversion-5.102.0.tar.xz"; - sha256 = "11wdgzw5rsd0zbi24c6qvyavlx3hrnifq89ajyx1dpfsm1n21md3"; - name = "kunitconversion-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kunitconversion-5.103.0.tar.xz"; + sha256 = "0xxhzi4nq77941bcpx4833sk7p6fpigc21jzszy4400kzkjr3rzd"; + name = "kunitconversion-5.103.0.tar.xz"; }; }; kwallet = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwallet-5.102.0.tar.xz"; - sha256 = "10q9ckqybxdk14y7gy0fzaharz62axd965g17b0x18z9ln0g04d3"; - name = "kwallet-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwallet-5.103.0.tar.xz"; + sha256 = "0gzjzqpqpngk3syx802s8y8z0gmbzd09qmkrwrwfb0ssf9dyk5ra"; + name = "kwallet-5.103.0.tar.xz"; }; }; kwayland = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwayland-5.102.0.tar.xz"; - sha256 = "1k5109pjl4fdsiqw4dzg8pl8nw4y59gbgf8cn6w2wp1b42kz89l6"; - name = "kwayland-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwayland-5.103.0.tar.xz"; + sha256 = "1ad2697vymr0kw1zm9risy84izc402gma0ji1mhqcmrhfgn28807"; + name = "kwayland-5.103.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwidgetsaddons-5.102.0.tar.xz"; - sha256 = "1lnnn8y2d72qpiq76mr9vk4037a6g59x1cjyvrpxymb3k0i9gmji"; - name = "kwidgetsaddons-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwidgetsaddons-5.103.0.tar.xz"; + sha256 = "0hb4ikk7i4b0nl2cmi2p8iw3n5v69i9lpd0452zzpl98idzcq22c"; + name = "kwidgetsaddons-5.103.0.tar.xz"; }; }; kwindowsystem = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kwindowsystem-5.102.0.tar.xz"; - sha256 = "1qb8mb9mgqwdbrd2g4r7x7f2qfmdm54i77r2157n7by9j6j9n36r"; - name = "kwindowsystem-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kwindowsystem-5.103.0.tar.xz"; + sha256 = "198kpz69zy7qzl4z69pxk06j2yf6z2zmg85i544i979rskpzhspc"; + name = "kwindowsystem-5.103.0.tar.xz"; }; }; kxmlgui = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/kxmlgui-5.102.0.tar.xz"; - sha256 = "06hk6j8hsc05cy6d8i3a6xjxxzwrvshjb3ij6ji1yvcbmfs2rrrp"; - name = "kxmlgui-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/kxmlgui-5.103.0.tar.xz"; + sha256 = "0134n806z7d2qy2wijg8mzwl6xv0dwjkz0yym58vafgh6l085pv0"; + name = "kxmlgui-5.103.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/portingAids/kxmlrpcclient-5.102.0.tar.xz"; - sha256 = "06bjxi3k9q3n261rsc0qil5zzf4lxqfizd9b0jny8ygvvjs9han4"; - name = "kxmlrpcclient-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/portingAids/kxmlrpcclient-5.103.0.tar.xz"; + sha256 = "14vnhm1kllcgpgrcjbf14hmzw4bi63k93fixkskfbb6gkh0ikxz7"; + name = "kxmlrpcclient-5.103.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/modemmanager-qt-5.102.0.tar.xz"; - sha256 = "195p7xmc8fzywna6j9ppaajqav27prjkl8slwggnsyjbh5bb3a76"; - name = "modemmanager-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/modemmanager-qt-5.103.0.tar.xz"; + sha256 = "0p744iw9b8x4lkcmkncm7mfs2yvg9j95n3as6bmvqhfwyx4p3c88"; + name = "modemmanager-qt-5.103.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/networkmanager-qt-5.102.0.tar.xz"; - sha256 = "12q7fkhpidyyxa4byb88vsrkahgr4l2x3s9zylknb60cy86qpp69"; - name = "networkmanager-qt-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/networkmanager-qt-5.103.0.tar.xz"; + sha256 = "1ki1n0qm54fzdy8qc4mvb850h9jf1hpfx02zw8qwxx4a15by7jhx"; + name = "networkmanager-qt-5.103.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/oxygen-icons5-5.102.0.tar.xz"; - sha256 = "05mwijl3day3vm8gs085cg3g04xi1x8ypwd87nc80jw7pz1m7mf4"; - name = "oxygen-icons5-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/oxygen-icons5-5.103.0.tar.xz"; + sha256 = "134nhzackrqalb4dwlf9h75xx1zxmdfa08m91fp7msqis62bwzrq"; + name = "oxygen-icons5-5.103.0.tar.xz"; }; }; plasma-framework = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/plasma-framework-5.102.0.tar.xz"; - sha256 = "14al5i40bpjw73wk0by9ca88s26hbns7msa4kil6zinzh8pvbkfk"; - name = "plasma-framework-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/plasma-framework-5.103.0.tar.xz"; + sha256 = "1qca3r1sg0xximb5z6sdr6fxvyrfdcsjy3gv9ynj5fzqwk6cxcx0"; + name = "plasma-framework-5.103.0.tar.xz"; }; }; prison = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/prison-5.102.0.tar.xz"; - sha256 = "1iw14s4hf2ap8qfrj7kf5xicsz78b4lwydg58ymv6z70jcl329nn"; - name = "prison-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/prison-5.103.0.tar.xz"; + sha256 = "127jn03kc78p3r0y0h0ga0fm7csq3dmg59msnapfchf0z81gkia4"; + name = "prison-5.103.0.tar.xz"; }; }; purpose = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/purpose-5.102.0.tar.xz"; - sha256 = "1a50nx7ldgx3gaqfh0k8lc6fx2ww7k07glg2qah5crwlwqxv70iw"; - name = "purpose-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/purpose-5.103.0.tar.xz"; + sha256 = "0ah0vfpk96snpavjsazv2h2cym2i0pp0hnkfydl1840h6kybs27k"; + name = "purpose-5.103.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - 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"; + url = "${mirror}/stable/frameworks/5.103/qqc2-desktop-style-5.103.0.tar.xz"; + sha256 = "1998nwbkv9pqxkpdrmnl2a0ljg1490nfw23i7h9y5xg6m46bm3pi"; + name = "qqc2-desktop-style-5.103.0.tar.xz"; }; }; solid = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/solid-5.102.0.tar.xz"; - sha256 = "0cmik9c9s3nhqd5imkj4m9510whsf55nmw85xjsrnlh0fk6d7qq6"; - name = "solid-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/solid-5.103.0.tar.xz"; + sha256 = "0i6kwd2gsmikqnnl4wlhpbvws3z23s836yyzpz98vlf9rxxhhrz0"; + name = "solid-5.103.0.tar.xz"; }; }; sonnet = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/sonnet-5.102.0.tar.xz"; - sha256 = "04dci8l0v3v3s8fgn39sk67dbz44ah8qj5yvl5zn1xpwcfvj3ahf"; - name = "sonnet-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/sonnet-5.103.0.tar.xz"; + sha256 = "0kryq5icfqhyvavyxbbiv237gckk6cqay0iyh29snr20d0h2yf4k"; + name = "sonnet-5.103.0.tar.xz"; }; }; syndication = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/syndication-5.102.0.tar.xz"; - sha256 = "1w08fn43hr4mnff62kzay4rblxbg4p6fghcp5bnziaddl0jpr799"; - name = "syndication-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/syndication-5.103.0.tar.xz"; + sha256 = "107nfbh4kcwgnw46sfyb6vrr9gvpgi44rgh9s9vpmwrcvh388nng"; + name = "syndication-5.103.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/syntax-highlighting-5.102.0.tar.xz"; - sha256 = "03zjf58y9n6fq3zhybp86fqh65vxk2i4pqrrv4lwm6wz9pj289rg"; - name = "syntax-highlighting-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/syntax-highlighting-5.103.0.tar.xz"; + sha256 = "081nkc00ii78bj5hy88bd46w1ma4ckgg25w8xh3q6gqq4nnqy6a9"; + name = "syntax-highlighting-5.103.0.tar.xz"; }; }; threadweaver = { - version = "5.102.0"; + version = "5.103.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.102/threadweaver-5.102.0.tar.xz"; - sha256 = "1jxn1mf7xz3j9lz69kgcrqam87fxzyxp250vzl9hrs26jvw7lagr"; - name = "threadweaver-5.102.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.103/threadweaver-5.103.0.tar.xz"; + sha256 = "10pc8wx53yrizbh5nzqd5s7ly2qpiha5l1dbz5m8nxbli6hm7g19"; + name = "threadweaver-5.103.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 792d4b102f4d7..e4a61a3c0731c 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 22b29151caa5b..4caea890e7051 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { sourceRoot = "krb5-${version}/src"; + postPatch = '' + substituteInPlace config/shlib.conf \ + --replace "'ld " "'${stdenv.cc.targetPrefix}ld " + ''; + libFolders = [ "util" "include" "lib" "build-tools" ]; buildPhase = lib.optionalString libOnly '' diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix new file mode 100644 index 0000000000000..bea9f86fc90da --- /dev/null +++ b/pkgs/development/libraries/kuserfeedback/default.nix @@ -0,0 +1,23 @@ +{ lib +, mkDerivation +, fetchurl +, extra-cmake-modules +, qttools +}: +mkDerivation rec { + pname = "kuserfeedback"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-dqrJIrFTJJsnRoCm9McsI47xTj3wS60Ay2QVixBj8mQ="; + }; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + + meta = with lib; { + license = [ licenses.mit ]; + maintainers = [ maintainers.k900 ]; + description = "Framework for collecting user feedback for apps via telemetry and surveys"; + }; +} diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 674defc42e2a7..bdc173507c05d 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,25 +24,25 @@ 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") - (if debugSupport then "--enable-debug=alot" else "") + (lib.enableFeature mp3rtpSupport "mp3rtp") + (lib.optionalString debugSupport "--enable-debug=alot") ]; preConfigure = '' @@ -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/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index d81e3eeabe6d1..234ec77a4a5d3 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,15 +12,16 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, libxcrypt }: stdenv.mkDerivation rec { pname = "ldb"; - version = "2.3.0"; + version = "2.6.1"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4"; + sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk="; }; outputs = [ "out" "dev" ]; @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 + tdb + tevent ]; buildInputs = [ @@ -42,8 +45,16 @@ stdenv.mkDerivation rec { tevent popt cmocka + libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ @@ -52,6 +63,11 @@ stdenv.mkDerivation rec { "--without-ldb-lmdb" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + stripDebugList = [ "bin" "lib" "modules" ]; meta = with lib; { diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 4b84584d53e20..4bae576bd1882 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 448a22f54997d..fd020603b523a 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.82.0"; + version = "1.83.0"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVMC7pFGaMJ7b+PKn/LaY7JF9tYvMGHI8nVjd0uK4tY="; + sha256 = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index a5c37dd0f04f1..e0bd674e4daad 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open source clone of the Motif widget set"; - homepage = "http://lesstif.sourceforge.net"; + homepage = "https://lesstif.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index b301ac13c2d80..56af02785979e 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf" + "-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf" "-DUSE_INCLUDED_ZLIB=OFF" "-DUSE_INCLUDED_LIBZIP=OFF" "-DUSE_INCLUDED_GTEST=OFF" @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { postPatch = '' # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in + sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in + # replace bundled binaries for i in AutomaticComponentToolkit/bin/act.*; do diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 46929cee9a460..0e8c44a9d0d4f 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ABI Generic Analysis and Instrumentation Library"; homepage = "https://sourceware.org/libabigail/"; - license = with licenses; [ asl20 llvm-exception ]; + license = licenses.asl20-llvm; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 7b08005133ad0..d6917fe7f2dac 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.1"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-FJmH/DTTn01UlATgxC0d7vrpVLwAot6Y4cZralQz2nU="; + hash = "sha256-ftq7PLbTmhAAAhAYfrwicWn8t88+dG45G8q/vQa2cKw="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 19efea263c07d..96574ca118878 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { # ld: textdlg.o:(.bss+0x0): multiple definition of `someString'; # configsettings.o:(.bss+0x0): first defined here # TODO: the workaround can be removed once nixpkgs updates to 1.6.0. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' substituteInPlace configure.in \ diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index c9d396bf2e376..ab7454403e796 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.19"; + version = "4.3.20"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-YyWpXh/8gNYTiGAJWr8lRPhstBD0eEVRBg8IlYk8o3w="; + sha256 = "sha256-Eby+gwcvsN5lcB+oxiqqcJiJAgTf2SQud4i1VTCXXKE="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index a6b9d531abf69..540fc10998e5d 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { composited rendering via XComposite, as well as support for rendering Cairo and Pango layouts. ''; + broken = stdenv.isDarwin; homepage = "https://github.com/atheme-legacy/libaosd"; license = licenses.mit; maintainers = with maintainers; [ unode ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 9df992a5763d0..8e68ea3f9cb63 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,5 +1,3 @@ -# TODO: Resolve the issues with the Mono bindings. - { stdenv, fetchgit, lib , pkg-config, autoreconfHook , glib, dbus-glib @@ -7,11 +5,16 @@ , gtk2, libindicator-gtk2, libdbusmenu-gtk2 , gtk3, libindicator-gtk3, libdbusmenu-gtk3 , gtk-doc, vala, gobject-introspection -, monoSupport ? false, mono, gtk-sharp-2_0 - }: +, monoSupport ? false, mono, gtk-sharp-2_0, gtk-sharp-3_0 +, testers +}: + +let + throwBadGtkVersion = throw "unknown GTK version ${gtkVersion}"; +in -stdenv.mkDerivation { - pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; +stdenv.mkDerivation (finalAttrs: { + pname = let postfix = if monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; @@ -25,16 +28,24 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook vala gobject-introspection gtk-doc ]; - propagatedBuildInputs = - if gtkVersion == "2" - then [ gtk2 libdbusmenu-gtk2 ] - else [ gtk3 libdbusmenu-gtk3 ]; + propagatedBuildInputs = { + "2" = [ gtk2 libdbusmenu-gtk2 ]; + "3" = [ gtk3 libdbusmenu-gtk3 ]; + }.${gtkVersion} or throwBadGtkVersion; buildInputs = [ glib dbus-glib - ] ++ (if gtkVersion == "2" - then [ libindicator-gtk2 ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ] - else [ libindicator-gtk3 ]); + { + "2" = libindicator-gtk2; + "3" = libindicator-gtk3; + }.${gtkVersion} or throwBadGtkVersion + ] ++ lib.optionals monoSupport [ + mono + { + "2" = gtk-sharp-2_0; + "3" = gtk-sharp-3_0; + }.${gtkVersion} or throwBadGtkVersion + ]; preAutoreconf = '' gtkdocize @@ -54,11 +65,19 @@ stdenv.mkDerivation { "localstatedir=\${TMPDIR}" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + 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 ]; + pkgConfigModules = { + "2" = [ "appindicator-0.1" ]; + "3" = [ "appindicator3-0.1" ]; + }.${gtkVersion} or throwBadGtkVersion; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; + # TODO: Resolve the issues with the Mono bindings. + broken = monoSupport; }; -} +}) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 381689f9cb653..c8f050c300ce9 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 @@ -29,7 +30,7 @@ let autoreconfHook = buildPackages.autoreconfHook269; in assert xarSupport -> libxml2 != null; -stdenv.mkDerivation (finalAttrs: { +(stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; version = "3.6.2"; @@ -118,4 +119,16 @@ stdenv.mkDerivation (finalAttrs: { 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/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 118238f5f5a96..7ed461516cc0b 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/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 3a00ca498cbe3..e2fbb3f9287cf 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ npth gettext ]; configureFlags = [ + # Required for cross-compilation. "--with-libgpg-error-prefix=${libgpg-error.dev}" ]; diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index a0d6d8db3a7cf..719f1b3e4275a 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "libayatana-appindicator"; - version = "0.5.91"; + version = "0.5.92"; outputs = [ "out" "dev" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; rev = version; - sha256 = "sha256-hOMnpBF0VaFLYvbiKp8n88F14wIeLqSCsT6GFR3ATys="; + sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA="; }; nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ]; diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index f58b0b273fb93..39a6305c6de09 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 a461f5039aa7e..9e507188aad39 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -4,16 +4,17 @@ , autoreconfHook , libtool , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libb2"; version = "0.98.1"; src = fetchFromGitHub { owner = "BLAKE2"; repo = "libb2"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; @@ -29,11 +30,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "The BLAKE2 family of cryptographic hash functions"; homepage = "https://blake2.net/"; + pkgConfigModules = [ "libb2" ]; platforms = platforms.all; maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 4b2c48824fb7c..2f453a38b8dee 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -46,6 +46,11 @@ in stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index b8f6aac0b3884..0c8040010e722 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, autoreconfHook, libmd }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, libmd +, gitUpdater +}: stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.11.6"; + version = "0.11.7"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-GbOPMXLq9pPm4caHFGNhkMfkiFHkUiTXILO1vASZtd8="; + hash = "sha256-m6oYYFnrvyXAYwjp+ZH9ox9xg8DySTGCbYOqar2KAmE="; }; outputs = [ "out" "dev" "man" ]; @@ -18,6 +24,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://gitlab.freedesktop.org/libbsd/libbsd.git"; + }; + meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 71a800520adc9..26d8c79443a04 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { (if x11Support then "--enable-x11" else "--disable-x11") ]; - NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index d03783f2fd903..b2ac4fa0aafd7 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE="; }; + outputs = [ "out" "dev" "doc" ]; + postPatch = '' patchShebangs utils/ ''; @@ -83,7 +85,7 @@ stdenv.mkDerivation rec { ]; # Fixes error on a deprecated declaration - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # Silence fontconfig warnings about missing config FONTCONFIG_FILE = makeFontsConf { fontDirectories = []; }; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 7a7edc5b122e1..8f8e33cbeab4d 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,22 +1,47 @@ -{ 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 = "unstable-2023-01-29"; # Musl fix hasn't been released yet. src = fetchFromGitHub { owner = "PJK"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk="; + repo = "libcbor"; + rev = "cb4162f40d94751141b4d43b07c4add83e738a68"; + sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cmocka ]; - doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + cmakeFlags = lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON" + ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON"; + + # Tests are restricted while pkgsStatic.cmocka is broken. Tracked at: + # https://github.com/NixOS/nixpkgs/issues/213623 + doCheck = !stdenv.hostPlatform.isStatic + && stdenv.hostPlatform == stdenv.buildPlatform; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; + 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 +49,4 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; -} +}) diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index dccad33dda93d..134f9d7f8f33d 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A portable library for controlling audio CDs"; - homepage = "http://libcdaudio.sourceforge.net"; + homepage = "https://libcdaudio.sourceforge.net"; platforms = lib.platforms.linux; license = lib.licenses.lgpl2; }; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index 36b591b0605b3..bd39cfb71cb3b 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ ]; mainProgram = "cd-paranoia"; - 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 34440d67818d8..1eda49ad3f97d 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/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 22cf5068f3934..ce113106ce566 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gperf rpcsvc-proto ]; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; buildInputs = diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 14a20a9579677..647079ae2fb42 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 = "14.0.6"; + version = "15.0.7"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; }; sourceRoot = "source/libclc"; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index da076a590e19a..982d34f1bdce4 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=address" + ]; + meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 0d39a5e55b261..40f259677ff4e 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; patchPhase = '' cd source diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 919ddcd3f0668..41c5565482fe7 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/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 50fc23aa5f109..821c739556695 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.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-kg/dVarfmDibZXLGY4zXfReNQ1DC4T/3g54g8zxNmEs="; + sha256 = "sha256-gyGlx43LdBkZvwN8EeZvaLzdTgYT3PFnSX9eZyAWNc4="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch index e12b584d16ebe..19aa27b549c26 100644 --- a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch +++ b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch @@ -17,7 +17,7 @@ index 4486e7b2..be5b28b4 100644 if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.2 2.3" ++ accepted_versions="1.2 1.4 2.0 2.2 2.3 2.4" AC_PATH_PROGS(GNUPG, [gpg gpg2], no) AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) ok="no" diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index dca7a6148f22b..e87dc0644021a 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -28,5 +28,5 @@ stdenv.mkDerivation rec { buildInputs = [ xercesc ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; } diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 257673b1a96d2..57d30124a6fd1 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv ]; preAutoreconf = let reports = "https://github.com/tlwg/libdatrie/issues"; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 7b0fca8583998..9efea659a651a 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -3,13 +3,16 @@ , glib, dbus-glib, json-glib , gobject-introspection, vala , gtkVersion ? null, gtk2, gtk3 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; version = "16.04.0"; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; @@ -18,7 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib json-glib - ] ++ lib.optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); + ] ++ lib.optional (gtkVersion != null) + { + "2" = gtk2; + "3" = gtk3; + }.${gtkVersion} or (throw "unknown GTK version ${gtkVersion}"); postPatch = '' for f in {configure,ltmain.sh,m4/libtool.m4}; do @@ -37,6 +44,7 @@ stdenv.mkDerivation rec { "CFLAGS=-Wno-error" "--sysconfdir=/etc" "--localstatedir=/var" + # TODO use `lib.withFeatureAs` (if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}") "--disable-scrollkeeper" ] ++ lib.optional (gtkVersion != "2") "--disable-dumper"; @@ -49,11 +57,17 @@ stdenv.mkDerivation rec { "typelibdir=${placeholder "out"}/lib/girepository-1.0" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Library for passing menu structures across DBus"; homepage = "https://launchpad.net/dbusmenu"; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; + pkgConfigModules = [ + "dbusmenu-glib-0.4" + "dbusmenu-jsonloader-0.4" + ] ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4"; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; }; -} +}) diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index d054e223cf0d0..c24209e4ab6c3 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -6,21 +6,20 @@ # for passthru.tests , imagemagick -, imagemagick6 , libheif , imlib2Full , gst_all_1 }: stdenv.mkDerivation rec { - version = "1.0.9"; + version = "1.0.11"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "sha256-OpiQapppuKCR27tIG5OW+KiNMP9ysv7CaobiBOW6VUI="; + sha256 = "sha256-0aRUh5h49fnjBjy42A5fWYHnhnQ4CFoeSIXZilZewW8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -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/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 39b80238b7191..acbed23326cc1 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -1,38 +1,28 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, fixDarwinDylibNames, pkgsStatic }: - +{ lib +, stdenv +, fetchFromGitHub +, fixDarwinDylibNames +, pkgsStatic +, cmake +}: stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.8"; + version = "1.17"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "sha256-P7YbuhP2/zJCpE9dxZev1yy5oda8WKAHY84ZLTL8gVs="; + sha256 = "sha256-tKs8feGbeodOID8FPIUc/1LfBz1p0oN1Jfkv2OnA2qc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ebiggers/libdeflate/commit/ee4d18872bfe09a32cfd031c716b9069a04a50a0.diff"; - sha256 = "0d2lllg60zbbbch0w0qrcqijrgski8xlsy5llg3i684d66ci538a"; - }) - ]; - - postPatch = '' - substituteInPlace Makefile --replace /usr/local $out - ''; - - makeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=1"]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - configurePhase = '' - make programs/config.h - ''; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; passthru.tests.static = pkgsStatic.libdeflate; + meta = with lib; { description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; license = licenses.mit; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 16ea50f6dd9a7..e1f4ff6373d69 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.106.0"; + version = "1.110.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; - rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + rev = "v${version}"; + hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Delta Chat Rust Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/"; - changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 35637512e0a55..0cba50c3a9243 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -13,16 +13,17 @@ , OpenGL , runtimeShell , withXorg ? true +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdevil"; version = "1.7.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz"; + url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; @@ -63,11 +64,14 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { 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; + pkgConfigModules = [ "IL" ]; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ ]; }; -} +}) diff --git a/pkgs/development/libraries/libdisplay-info/default.nix b/pkgs/development/libraries/libdisplay-info/default.nix new file mode 100644 index 0000000000000..fa499a0014649 --- /dev/null +++ b/pkgs/development/libraries/libdisplay-info/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, pkg-config +, ninja +, python3 +, hwdata +, edid-decode +}: + +stdenv.mkDerivation rec { + pname = "libdisplay-info"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = pname; + rev = version; + sha256 = "sha256-jfi7RpEtyQicW0WWhrQg28Fta60YWxTbpbmPHmXxDhw="; + }; + + nativeBuildInputs = [ meson pkg-config ninja edid-decode python3 ]; + + buildInputs = [ hwdata ]; + + postPatch = '' + patchShebangs tool/gen-search-table.py + ''; + + meta = with lib; { + description = "EDID and DisplayID library"; + homepage = "https://gitlab.freedesktop.org/emersion/libdisplay-info"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pedrohlc ]; + }; +} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 83a426a2afa4f..b34282dd37b10 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -20,12 +20,13 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstall-test-programs=true" - "-Domap=enabled" "-Dcairo-tests=disabled" - "-Dvalgrind=${if withValgrind then "enabled" else "disabled"}" + (lib.mesonEnable "omap" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "valgrind" withValgrind) ] ++ lib.optionals stdenv.hostPlatform.isAarch [ "-Dtegra=enabled" - "-Detnaviv=enabled" + ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + "-Detnaviv=disabled" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index b418279e477b8..8746ea42882c6 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -15,14 +15,17 @@ stdenv.mkDerivation rec { "-DDYND_BUILD_BENCHMARKS=OFF" ]; - # added to fix build with gcc7+ - NIX_CFLAGS_COMPILE = builtins.toString [ + env.NIX_CFLAGS_COMPILE = builtins.toString [ + # added to fix build with gcc7+ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" "-Wno-error=tautological-compare" "-Wno-error=class-memaccess" "-Wno-error=parentheses" "-Wno-error=deprecated-copy" + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + "-Wno-error=maybe-uninitialized" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index b3a1cab066e4a..42a3e1722b921 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; meta = with lib; { description = "Library for import of reflowable e-book formats"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix deleted file mode 100644 index d4a8b8f6f2194..0000000000000 --- 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 07873f4197e37..4002146d4d5c2 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 196ac1afaae53..c793df1670896 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -50,11 +50,13 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dtests=${if doCheck then "true" else "false"}" + "-Degl=${if x11Support then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" + "-Dtests=${lib.boolToString doCheck}" + "-Dx11=${lib.boolToString x11Support}" ]; - NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"''; # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) preCheck = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index ac501c660b02a..f44702582f27a 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, perl, coreutils }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, coreutils }: stdenv.mkDerivation rec { pname = "libfaketime"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "wolfcw"; repo = "libfaketime"; rev = "v${version}"; - sha256 = "sha256-P1guVggteGtoq8+eeE966hDPkRwsn0m7oLCohyPrIb4="; + sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="; }; patches = [ - ./no-date-in-gzip-man-page.patch ./nix-store-date.patch + (fetchpatch { + name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch"; + url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch"; + sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo="; + }) ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch @@ -31,7 +35,7 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; nativeCheckInputs = [ perl ]; diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/development/libraries/libfaketime/nix-store-date.patch index b88245dfe8fbf..e93a7ec765070 100644 --- a/pkgs/development/libraries/libfaketime/nix-store-date.patch +++ b/pkgs/development/libraries/libfaketime/nix-store-date.patch @@ -13,9 +13,9 @@ index af618f2..48e47da 100644 +++ b/src/faketime.c @@ -50,11 +50,7 @@ - const char version[] = "0.9.9"; + const char version[] = "0.9.10"; --#ifdef __APPLE__ +-#if (defined __APPLE__) || (defined __sun) -static const char *date_cmd = "gdate"; -#else -static const char *date_cmd = "date"; diff --git a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch b/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch deleted file mode 100644 index 7b7e362fbf0f8..0000000000000 --- a/pkgs/development/libraries/libfaketime/no-date-in-gzip-man-page.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libfaketime-0.9.5.orig/man/Makefile libfaketime-0.9.5/man/Makefile ---- libfaketime-0.9.5.orig/man/Makefile 2013-10-13 11:19:30.000000000 +0200 -+++ libfaketime-0.9.5/man/Makefile 2014-04-13 01:22:14.362296519 +0200 -@@ -6,7 +6,7 @@ - - install: - $(INSTALL) -Dm0644 faketime.1 "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" -- gzip -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" -+ gzip -9nf "${DESTDIR}${PREFIX}/share/man/man1/faketime.1" - - uninstall: - rm -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1.gz" diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 3f2398e19de7e..07de21a4120cc 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; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 963c93ffc592e..5c77e0139e8a8 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__unix"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 9384a7c976034..6fe2f398b25e6 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.7.12"; + version = "0.8"; src = fetchFromGitHub { owner = "pantoniou"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gmVjiwf8PsDYRt8jmXNrd+hJSL099hbLjq8Z0c1u2HE="; + hash = "sha256-b/jRKe23NIVSydoczI+Ax2VjBJLfAEwF8SW61vIDTwA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + outputs = [ "bin" "dev" "out" "man" ]; + doCheck = true; preCheck = '' diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index f059d6c73a2fd..c90d47dff5024 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; # https://sourceforge.net/p/libgaminggear/discussion/general/thread/b43a776b3a/ - NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${harfbuzz.dev}/include/harfbuzz" ]; postFixup = '' moveToOutput bin "$bin" diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index fef8ad6da4ef5..69166ab33feb2 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.31"; + version = "1.1.32"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-TrIBI72ammruYbDb46ZfjJ9p8hoqqlApC7ZvnUHK3S8="; + 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 c02c6116e6480..1f551ec9b4b1f 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 e29482a34d4e8..1ef0a397c8e77 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/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index cec611f366cf9..7863235e0211e 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,27 +1,46 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: - -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchurl +, autoconf +, vala +, pkg-config +, glib +, gobject-introspection +, gnome +}: + +stdenv.mkDerivation (finalAttrs: { pname = "libgee"; version = "0.20.6"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz"; sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; }; - doCheck = true; + nativeBuildInputs = [ + pkg-config + autoconf + vala + gobject-introspection + ]; - nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ]; - buildInputs = [ glib ]; + buildInputs = [ + glib + ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + doCheck = true; + + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgee"; versionPolicy = "odd-unstable"; }; }; @@ -33,4 +52,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 35b3fef3087d6..e6808b47ab096 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 bf43bb1b50e43..4047c7bbefd08 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-yXSuG8UwD5KZbn4ysDStTdOGD4uHigjOhazlHT9ndNs="; + sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "-Xlinker --version-script=$(VERSION_SCRIPT)" "-Xlinker" ''; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 3f5a5961ba0fe..775bcf2f2a432 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-keyring"; version = "2.32.0"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; @@ -14,9 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2 lgpl2 ]; }; -} +}) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index fcd7946a1351f..d8c5d87b16565 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,17 +17,22 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.45"; + version = "1.46"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Vw+O5PtL/3t0lc/5IMJ1ACrqIUfpodIgwGghMmf4CiY="; + sha256 = "sha256-t+EaZCRrvl7zd0jeQ7JFq9cs/NU8muXn/FylnxyBJo0="; }; postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure ''; + configureFlags = [ + # See https://dev.gnupg.org/T6257#164567 + "--enable-install-gpg-error-config" + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # deps want just the lib, most likely diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index ccf1c4703647b..ce5a4ac2833da 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-60RgcL4URP19MtMrvKU8Lzu7CiEZPbhhmM9gULeihEE="; + sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; }; patches = [ diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 799e1d0f84517..59df64e63558a 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection udev glib ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 0af6a910a5a24..ced064e70f822 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 = [ diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 8ecb6c6d96ce1..5d008f394e8f4 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 @@ -32,11 +33,27 @@ stdenv.mkDerivation rec { 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/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 230cd3fc9196a..f85181d376a9d 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { glib libxml2 icu - gobject-introspection ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 1df2a8abb82cc..6dd6654b35ad0 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpng openjpeg ]; - NIX_CFLAGS_COMPILE = [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; meta = with lib; { description = "Library for manipulation of the Mac OS icns resource format"; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 724778999f5f1..9d7babd01dd2f 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/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock new file mode 100644 index 0000000000000..6c1e8c61643a7 --- /dev/null +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -0,0 +1,322 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytemuck" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" + +[[package]] +name = "c_test" +version = "0.1.0" +dependencies = [ + "cc", + "imagequant-sys", +] + +[[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 = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.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 = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "fallible_collections" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f57ccc32870366ae684be48b32a1a2e196f98a42a9b4361fe77e13fd4a34755" +dependencies = [ + "hashbrown", +] + +[[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 = "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" +dependencies = [ + "ahash", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "imagequant" +version = "4.1.0" +dependencies = [ + "arrayvec", + "lodepng", + "noisy_float", + "num_cpus", + "once_cell", + "rayon", + "rgb", + "thread_local", +] + +[[package]] +name = "imagequant-sys" +version = "4.0.1" +dependencies = [ + "bitflags", + "imagequant", + "libc", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lodepng" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +dependencies = [ + "crc32fast", + "fallible_collections", + "flate2", + "libc", + "rgb", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "noisy_float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978fe6e6ebc0bf53de533cd456ca2d9de13de13856eda1518a285d7705a213af" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rgb" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[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 = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 5f4d500758956..825c442eb6c91 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,21 +1,48 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -stdenv.mkDerivation rec { +let + rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; +in +rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "2.17.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "sha256-ZoBCZsoUO66X4sDbMO89g4IX5+jqGMLGR7aC2UwD2tE="; + hash = "sha256-W9Q81AbFhWUe6c3csAnm8L5wLqURizrjwqcurWhPISI="; }; - preConfigure = '' - patchShebangs ./configure + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoHash = "sha256-0HOmItooNsGq6iTIb9M5IPXMwYh2nQ03qfjomkg0d00="; + + auditable = true; # TODO: remove when this is the default + + nativeBuildInputs = [ cargo-c ]; + + postBuild = '' + pushd imagequant-sys + cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + popd ''; - configureFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "--disable-sse" ]; + postInstall = '' + pushd imagequant-sys + cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + popd + ''; + + passthru.tests = { + inherit (python3.pkgs) pillow; + }; meta = with lib; { homepage = "https://pngquant.org/lib/"; diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 991b1733c9b3d..99b6542fa3e82 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkg-config +, pkg-config, glib , gtkVersion ? "3", gtk2, gtk3 }: stdenv.mkDerivation rec { @@ -11,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) ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 83034b8dd6202..268ddd3708104 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.21.0"; + version = "1.22.1"; outputs = [ "bin" "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - sha256 = "R94BdrjI4szNbVtQ+ydRNUg9clR8mkRL7+GE9b2FcDs="; + sha256 = "RgwEp60Anr+CpJws6srIv/Qzk2r9NoekeNQ0UT3FRZ0="; }; patches = [ @@ -113,8 +113,8 @@ stdenv.mkDerivation rec { test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh - # Don't create an empty /etc directory. - sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build + # Don't create an empty directory under /etc. + sed -i "/install_emptydir(dir_etc \/ 'libinput')/d" meson.build ''; passthru = { diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index eb34bc56f4437..6b9510a46ba5e 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "iODBC driver manager"; - homepage = "http://www.iodbc.org"; + homepage = "https://www.iodbc.org"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index ce99321028528..e62c456dd4aba 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # `ht_globals'; collector.o:/build/libipfix_110209/collector/../libmisc/misc.h:111: first defined here # TODO: drop the workaround when fix ix released: # https://sourceforge.net/p/libipfix/code/ci/a501612c6b8ac6f2df16b366f7a92211382bae6b/ - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { homepage = "https://libipfix.sourceforge.net/"; diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 3cc2e0eee8c3c..806a9729c574c 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # This problem is gone on libiscsi master. - NIX_CFLAGS_COMPILE = - lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"; + env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"); meta = with lib; { description = "iscsi client library and utilities"; diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix index 9d2732c44096f..4c61e3c48868d 100644 --- a/pkgs/development/libraries/libisds/default.nix +++ b/pkgs/development/libraries/libisds/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + meta = with lib; { description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; homepage = "http://xpisar.wz.cz/libisds/"; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 99de3acb38c73..18376f4b7f42d 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.12"; + version = "0.1.13"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-9+wtCJzvT9uAXRXj/koFG7asxm5JIDw0Ffp4wK6tbDk="; + sha256 = "sha256-VfI40dfZzNqR5sqTY4KvkYL8+3sLV0Z0u7w+QA34uek="; }; patches = [ diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index e2dd30fc616ff..8e80b9bd84059 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; + env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index 0a1a631a6b93c..30e36e9658583 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./install-fix.patch ]; nativeBuildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; preInstall = "mkdir -p $out/lib"; meta = with lib; { diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 1c03973fff96b..700223cd1a79e 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -34,6 +34,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # present in master + (fetchpatch { + name = "fix-test-failure-on-ia64-ppc64-riscv64"; + url = "https://github.com/libjxl/libjxl/commit/bb8eac5d6acec223e44cf8cc72ae02f0816de311.patch"; + hash = "sha256-DuUCStWEquhWo7bOss0RgZ7ouYE4FpWrIMFywYR424s="; + }) + ]; + nativeBuildInputs = [ cmake gtest diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 2f1b66116c7d9..c931489057e7f 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.4.8"; + version = "1.5.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg="; + 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-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc="; + hash = "sha256-T1nYzrzxEJaVBnI00CQPKoT2OYJxdW7y6WNkabNsQYI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ="; + 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 f602299e239da..13090776405ae 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -13,21 +13,21 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.8.1"; + version = "3.9.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME="; + hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg="; + hash = "sha256-moZ2LYLhZDb8Y8jgWbdgK6SbJ8lY8f356d5vKHc/54Q="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz"; - hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz"; + hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM="; }; preBuild = '' @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; platforms = [ "x86_64-linux" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index f1b6d18a86b24..56a8e59433cd7 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/pkgs/development/libraries/libks/default.nix @@ -6,17 +6,18 @@ , pkg-config , libuuid , openssl +, libossp_uuid }: stdenv.mkDerivation rec { pname = "libks"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bfp8+jqXu1utlaYuPewm+t3zHxaTWEw+cGZu1nFzkDk="; + sha256 = "sha256-TJ3q97K3m3zYGB1D5lLVyrh61L3vtnP5I64lP/DYzW4="; }; patches = [ @@ -33,16 +34,15 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ - libuuid - openssl - ]; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isLinux libuuid + ++ lib.optional stdenv.isDarwin libossp_uuid; meta = with lib; { description = "Foundational support for signalwire C products"; homepage = "https://github.com/signalwire/libks"; maintainers = with lib.maintainers; [ misuzu ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 68658d20ba6dd..7dcc3b0d0cc06 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,10 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - NIX_CFLAGS_COMPILE = - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-std=c++11" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 74d32a6cc7482..f25ee3afae4a4 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://liblastfm.sourceforge.net"; + homepage = "https://liblastfm.sourceforge.net"; description = "Unofficial C lastfm library"; license = lib.licenses.gpl3; }; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 10c2bfb272c80..fe3ddba36b863 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 4685b327ecd34..0000000000000 --- 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 <lorenz@brun.one> -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 da724aaac9b45..b9b61214462ca 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source braille translator and back-translator"; - homepage = "http://liblouis.org/"; + homepage = "https://liblouis.org/"; license = with licenses; [ lgpl21Plus # library gpl3Plus # tools diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 2320aa78bba7f..7629dd8a6f1ae 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib libgudev libevdev diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index eb32fca71641c..f9f15b683946a 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,46 +1,63 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, meson +, ninja , pkg-config , glib , python3 +, help2man , systemd +, bash-completion , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection }: stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.26.4"; + version = "1.28.2"; outputs = [ "out" "dev" "man" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-9ojOxMRYahdXX14ydEjOYvIADvagfJ5FiYc9SmhWitk="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libmbim"; + rev = version; + hash = "sha256-EtjUaSNBT1e/eeTX4oHzQolGrisbsGKBK8Cfl3rRQTQ="; }; - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - (lib.enableFeature withIntrospection "introspection") + mesonFlags = [ + "-Dudevdir=${placeholder "out"}/lib/udev" + (lib.mesonBool "introspection" withIntrospection) ]; nativeBuildInputs = [ + meson + ninja pkg-config python3 + help2man gobject-introspection ]; buildInputs = [ glib systemd + bash-completion ]; doCheck = true; + postPatch = '' + patchShebangs \ + build-aux/mbim-codegen/mbim-codegen + ''; + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; + maintainers = teams.freedesktop.members; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 953a6d03e5e6c..d1f048ee2c539 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"; + homepage = "https://mcrypt.sourceforge.net"; license = "GPL"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 5ae0c2b7edb0f..76e471e0c6486 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "22.06"; + version = "22.12"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY="; + sha256 = "sha256-D8bTLwbWzl4UQHTS5X4NuN+k4451LTEjraJ8yviWNLw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 099dab139c4f2..07fe854c777c3 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; meta = with lib; { homepage = "https://libmemcached.org"; diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index f569ce7fac753..0cccefb999803 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { following rfc2104 (HMAC). It also includes some key generation algorithms which are based on hash algorithms. ''; - homepage = "http://mhash.sourceforge.net"; + homepage = "https://mhash.sourceforge.net"; license = "LGPL"; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 8421a25030704..481f12e17526f 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/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index d8948b08672c8..5429dd62c802f 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.31"; + version = "8.0.32"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-HSF7yEybmzzDQvl1cwUZ/mlXqVXxnIHqg2a/HfJtELA="; + hash = "sha256-+9t/IUQnYy9CPoS6dZS+H5IF6sgSjGsYVyA7L1RVzvM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 86e8932c04d70..f2bc1619987c1 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/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index f1034781fb441..e047b34fa85a4 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -44,10 +44,6 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = lib.optionals withIntrospection [ - gobject-introspection - ]; - propagatedBuildInputs = [ gdk-pixbuf glib diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 67d9ec29b207c..3cfec00b13286 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - NIX_CFLAGS_COMPILE = + env.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"; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 9a44e84b136f7..118f283a0f9f4 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = lib.optionalString + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; diff --git a/pkgs/development/libraries/liboqs/default.nix b/pkgs/development/libraries/liboqs/default.nix new file mode 100644 index 0000000000000..908554a679dfc --- /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/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 3006efe9b2936..281aff548c8b6 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { "SYS=${stdenv.hostPlatform.uname.system}" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; meta = with lib; { description = "Helper library to program the performance monitoring events"; diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 254e5ca51e99d..95d615c5d24d5 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 = "15-4.1.0"; + version = "15-4.2.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - hash = "sha256-uZdszDE0UJVeegU1bi0ISYooC4ztNv7W4UQ2gWIjrH8="; + hash = "sha256-2fPdvsfuXKaRwkPjsPsBBfP0+yUgYXEUzQNFZfhyvGk="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index 682ff485d65c4..c0d24cb3cdf59 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchzip, autoreconfHook }: +{ lib +, stdenv +, fetchzip +, autoreconfHook +, dos2unix +}: stdenv.mkDerivation rec { pname = "libpgf"; - version = "7.21.2"; + version = "7.21.7"; src = fetchzip { url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}.zip"; - sha256 = "0l1j5b1d02jn27miggihlppx656i0pc70cn6x89j1rpj33zn0g9r"; + hash = "sha256-TAWIuikijfyeTRetZWoMMdB/FeGAR7ZjNssVxUevlVg="; }; - nativeBuildInputs = [ autoreconfHook ]; - - autoreconfPhase = '' + postPatch = '' + find . -type f | xargs dos2unix mv README.txt README - sh autogen.sh ''; + nativeBuildInputs = [ + autoreconfHook + dos2unix + ]; + meta = { homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 3dddc02aeabdc..10a12dbfa7713 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -25,11 +25,11 @@ let ; in stdenv.mkDerivation rec { pname = "libpsl"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz"; - sha256 = "1a9kp2rj71jb9q030lmp3zhy33rqxscawbfzhp288fxvazapahv4"; + sha256 = "sha256-qj1wbEUnhtE0XglNriAc022B8Dz4HWNtXPwQ02WQfxc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/development/libraries/libptytty/default.nix index 63f50de287c6e..3ed0cf6a39d0c 100644 --- a/pkgs/development/libraries/libptytty/default.nix +++ b/pkgs/development/libraries/libptytty/default.nix @@ -4,6 +4,12 @@ , cmake }: +let + isCross = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + isStatic = stdenv.hostPlatform.isStatic; + isMusl = stdenv.hostPlatform.isMusl; +in + stdenv.mkDerivation rec { pname = "libptytty"; version = "2.0"; @@ -15,12 +21,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional isStatic "-DBUILD_SHARED_LIBS=OFF" + ++ lib.optional (isCross || isStatic) "-DTTY_GID_SUPPORT=OFF" + # Musl lacks UTMP/WTMP built-in support + ++ lib.optionals isMusl [ + "-DUTMP_SUPPORT=OFF" + "-DWTMP_SUPPORT=OFF" + "-DLASTLOG_SUPPORT=OFF" + ]; + meta = with lib; { description = "OS independent and secure pty/tty and utmp/wtmp/lastlog"; homepage = "http://dist.schmorp.de/libptytty"; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; license = licenses.gpl2; + # pkgsMusl.pkgsStatic errors as: + # ln: failed to create symbolic link './include': File exists + broken = isStatic && isMusl; }; } diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index 76e379b45a6e7..d16c6f7f18397 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ defaultOptionals; # Needed for GCC on Linux - NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=return-type" ]; cmakeFlags = [ "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index b261967f5cf26..05a44980f83cc 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,40 +1,61 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch2 +, meson +, ninja , pkg-config , gobject-introspection , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, help2man , glib , python3 , libgudev +, bash-completion , libmbim , libqrtr-glib }: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.8"; + version = "1.32.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-hiSCzp460L1l0mQzTuMRzblLnfKGO1txNjCbQbisGZA="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libqmi"; + rev = version; + hash = "sha256-XIbeWgkPiJL8hN8Rb6KFt5Q5sG3KsiEQr0EnhwmI6h8="; }; + patches = [ + # Fix pkg-config file missing qrtr in Requires. + # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/99 + (fetchpatch2 { + url = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/7d08150910974c6bd2c29f887c2c6d4a3526e085.patch"; + hash = "sha256-LFrlm2ZqLqewLGO2FxL5kFYbZ7HaxdxvVHsFHYSgZ4Y="; + }) + ]; + nativeBuildInputs = [ + meson + ninja pkg-config gobject-introspection python3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + help2man ]; buildInputs = [ libgudev + bash-completion libmbim ]; @@ -43,16 +64,19 @@ stdenv.mkDerivation rec { libqrtr-glib ]; - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-gtk-doc=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}" - "--enable-introspection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}" + mesonFlags = [ + "-Dudevdir=${placeholder "out"}/lib/udev" + (lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform)) + (lib.mesonBool "introspection" (stdenv.buildPlatform == stdenv.hostPlatform)) ]; - enableParallelBuilding = true; - doCheck = true; + postPatch = '' + patchShebangs \ + build-aux/qmi-codegen/qmi-codegen + ''; + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/development/libraries/libqrtr-glib/default.nix index 6e01cda916256..9309c48a8c6a7 100644 --- a/pkgs/development/libraries/libqrtr-glib/default.nix +++ b/pkgs/development/libraries/libqrtr-glib/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index c2d91b1d5b734..10f4b43f9890a 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/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 758b00febf5fc..26d7616ba8f00 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libraw"; - version = "0.20.2.p2"; + version = "0.21.1"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; - rev = "fedad11e87daad7b7d389a3ef84ccf10b5e84710"; # current 0.20-stable branch - sha256 = "1mklf8lzybzyg75ja34822xlv6h9nw93griyrjjna7darl1dyvja"; + rev = version; + sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY"; }; outputs = [ "out" "lib" "dev" "doc" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; - license = licenses.gpl2Plus; + license = with licenses; [ cddl lgpl2Plus ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libraw/unstable.nix b/pkgs/development/libraries/libraw/unstable.nix deleted file mode 100644 index 3f19bb53c4e64..0000000000000 --- a/pkgs/development/libraries/libraw/unstable.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ libraw, fetchFromGitHub }: - -libraw.overrideAttrs (_: rec { - version = "unstable-2021-12-03"; - - src = fetchFromGitHub { - owner = "LibRaw"; - repo = "LibRaw"; - rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; - sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; - }; -}) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 7ed03f0af1179..9ddebe5b6b0bb 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; + enableParallelBuilding = true; meta = { description = "A library for real-time communications with async IO support and a complete SIP stack"; homepage = "https://github.com/baresip/re"; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index f343c4383c4ab..14641ad667223 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}" ; + enableParallelBuilding = true; meta = { description = "A library for real-time audio and video processing"; homepage = "https://github.com/baresip/rem"; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index e9f1a2d4bbdf3..bb8271cfb44eb 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -12,7 +12,13 @@ let then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec { + generic = + { version + , hash + , patches ? [] + , knownVulnerabilities ? [] + }: stdenv.mkDerivation rec + { pname = "libressl"; inherit version; @@ -80,6 +86,7 @@ let license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc openssl ]; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; + inherit knownVulnerabilities; }; }; @@ -87,11 +94,22 @@ in { libressl_3_4 = generic { version = "3.4.3"; hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; + knownVulnerabilities = [ "Support ended 2022-10-14." ]; + patches = [ + (fetchpatch { + # https://marc.info/?l=libressl&m=167582148932407&w=2 + name = "backport-type-confusion-fix.patch"; + url = "https://raw.githubusercontent.com/libressl/portable/30dc760ed1d7c70766b135500950d8ca9d17b13a/patches/x509_genn.c.diff"; + sha256 = "sha256-N9jsOueqposDWZwaR+n/v/cHgNiZbZ644d8/wKjN2/M="; + stripLen = 2; + extraPrefix = "crypto/"; + }) + ]; }; libressl_3_5 = generic { - version = "3.5.3"; - hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; + version = "3.5.4"; + hash = "sha256-A3naE0Si9xrUpOO+MO+dgu7N3Of43CrmZjGh3+FDQ6w="; patches = [ # Fix endianness detection on aarch64-darwin, issue #181187 @@ -104,7 +122,7 @@ in { }; libressl_3_6 = generic { - version = "3.6.1"; - hash = "sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q="; + version = "3.6.2"; + hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM="; }; } diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 627b7596c029e..1dd71d1e311b1 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "librevenge"; - version = "0.0.4"; + version = "0.0.5"; src = fetchurl { url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz"; - sha256 = "sha256-kz8HKfBCZ8w1S5oCvD6a/vpVEqO90LRfFZ7hSj4zR7I="; + sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 4fc6489130dc0..a1daa89ef787d 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.8.3"; + version = "1.8.5"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w="; + sha256 = "sha256-FkkZIxSuqlFFOjABBpnE5ax2Vdo9tzP0prM7ATDIIdk="; }; 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 cc80655c1f999..d9dc209a7139e 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # Ensure C/Fortran code is position-independent. - NIX_CFLAGS_COMPILE = [ "-fPIC" "-Ofast" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fPIC" "-Ofast" ]; FCFLAGS = [ "-fPIC" "-Ofast" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a60da602e0709..a78bf86a18c3e 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -71,8 +71,6 @@ stdenv.mkDerivation rec { bzip2 pango libintl - ] ++ lib.optionals withIntrospection [ - gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index cc9778a3ba7de..5139c397de3a3 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "sha256-GNwOIZ2UjvsYIthotiPDBrabYzCGFG/YVEbwVa9Nwi4="; + sha256 = "sha256-fiOby8tOhv0KJ+ZwAWfh/ynqHlYC9kNqKfxNl3IhzR8="; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the rsync remote-delta algorithm"; homepage = "https://librsync.sourceforge.net/"; + changelog = "https://github.com/librsync/librsync/releases/tag/v${version}"; license = licenses.lgpl2Plus; mainProgram = "rdiff"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/development/libraries/librtlsdr/default.nix deleted file mode 100644 index c09575924a0a1..0000000000000 --- a/pkgs/development/libraries/librtlsdr/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "librtlsdr"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "librtlsdr"; - repo = "librtlsdr"; - rev = "v${version}"; - sha256 = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" - - substituteInPlace rtl-sdr.rules \ - --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' - ''; - - nativeBuildInputs = [ pkg-config cmake ]; - - propagatedBuildInputs = [ libusb1 ]; - - meta = with lib; { - description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = "https://github.com/librtlsdr/librtlsdr"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index fd2cadf1602db..4a2ad99af4d9c 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt - gobject-introspection ]; propagatedBuildInputs = [ @@ -88,7 +87,7 @@ stdenv.mkDerivation rec { dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs + meson test --print-errorlogs --timeout-multiplier 0 runHook postCheck ''; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 400c9b25f78c4..75fc2afbf1877 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libshout"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "https://downloads.xiph.org/releases/libshout/${pname}-${version}.tar.gz"; - sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; + sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 315530bcfab29..84d0f01c15496 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.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-stfpyJC1AVmDh1Nk5c5Lv0j6ic2AU6mwY02L/IDr8tE="; + sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds="; }; postPatch = '' diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index f6a796f2561d3..ab36b271b3aea 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/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 6ae972b51d9f2..99e1a35a80e41 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -6,14 +6,14 @@ }: 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 = [ diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 438c278bfadc6..b7de8bf04e888 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=OFF" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes"; meta = with lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index df753b55b08c1..05bf4b15523f5 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 @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { "-Dsysprof=disabled" ]; - NIX_CFLAGS_COMPILE = "-lpthread"; + env.NIX_CFLAGS_COMPILE = "-lpthread"; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 203f2768e37b1..b7bef29735232 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/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index dd202d4a2954d..b1cb2fc4570c2 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.10.0"; + version = "0.10.4"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DcFYxTTNg4rQt4WoLexYbeQNp+CWUjrmwIybe9KvC1c="; + sha256 = "sha256-BzksVKthR2KI0cHwp8VXtQIReXrQDDTDryu8TbxL2X0="; }; postPatch = '' diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index ce7cb6bfd1ee1..47ca65e8490e8 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/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 1e88218aa0d40..0e0030558dba6 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/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 892ed71583d32..f2147632eb7c8 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitLab +, fetchpatch , nix-update-script , autoreconfHook @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { # libc++abi 11 has an `#include <version>`, this picks up files name # `version` in the project's include paths ./rename-version.patch + (fetchpatch { + name = "CVE-2022-48281.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/d1b6b9c1b3cae2d9e37754506c1ad8f4f7b646b5.diff"; + sha256 = "sha256-FWUlyJyHXac6fuM5f9PG33kcF5Bm4fyFmYnaDal46iM="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 929e62ca2b893..9bfd42e7a71c2 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"; }; + # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin + # upgrades to a newer SDK. + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + patches = [ (fetchpatch { name = "CVE-2019-17362.patch"; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 827e78c81971a..b6e129722a23c 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makefile = "makefile.shared"; - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-DTARGET_OS_IPHONE=0"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index bb49ad4472cf4..0a1e1e7f0a21e 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,19 +1,26 @@ -{ stdenv, lib, fetchgit, cmake, pkg-config, json_c }: +{ stdenv, lib, fetchgit, cmake, pkg-config, json_c, with_lua ? false, lua5_1, with_ustream_ssl ? false, ustream-ssl }: stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2021-03-09"; + version = "unstable-2023-01-03${lib.optionalString with_ustream_ssl "-${ustream-ssl.ssl_implementation.pname}"}"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "551d75b5662cccd0466b990d58136bdf799a804d"; - sha256 = "05cnjjqjv9nvrs1d8pg4xxxf27jryiv6xk8plmdpmm7r2wkvwn3r"; + rev = "eac92a4d5d82eb31e712157e7eb425af728b2c43"; + sha256 = "0w6mmwmd3ljhkqfk0qswq28dp63k30s3brlgf8lyi7vj7mrhvn3c"; }; - cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ json_c ]; + buildInputs = [ json_c ] ++ lib.optional with_lua lua5_1 ++ lib.optional with_ustream_ssl ustream-ssl; + + postInstall = lib.optionalString with_ustream_ssl '' + for fin in $(find ${ustream-ssl} -type f); do + fout="''${fin/"${ustream-ssl}"/"''${out}"}" + ln -s "$fin" "$fout" + done + ''; meta = with lib; { description = "C utility functions for OpenWrt"; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 72027b85ed438..086ca28676b3c 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/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 82f71f59070ce..13dc13e5e968e 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; # Patches from Gentoo portage patches = [ diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 7da2c46fafe23..8c899268f7d1c 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1) */ - enableParallelBuilding = false; + enableParallelChecking = false; + enableParallelBuilding = true; meta = { homepage = "https://www.gnu.org/software/libunistring/"; diff --git a/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch b/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch new file mode 100644 index 0000000000000..191f6ae8cd5ac --- /dev/null +++ b/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch @@ -0,0 +1,66 @@ +From d4714fd7aac9c5f499c406703bc437dc6cf72ef3 Mon Sep 17 00:00:00 2001 +From: Steffen <steffen.winter@proton.me> +Date: Mon, 13 Feb 2023 17:32:16 +0100 +Subject: [PATCH 1/3] Add custom error function for tests. + +On musl systems, liburing cannot build examples and tests due to +it's usage of error.h. t_error calls fprintf(stderr, ...) and +exits. + +Closes: #786 + +Signed-off-by: Steffen Winter <steffen.winter@proton.me> +--- + test/helpers.c | 18 ++++++++++++++++++ + test/helpers.h | 2 ++ + 2 files changed, 20 insertions(+) + +diff --git a/test/helpers.c b/test/helpers.c +index 8fb32b8..caa887e 100644 +--- a/test/helpers.c ++++ b/test/helpers.c +@@ -8,6 +8,7 @@ + #include <stdio.h> + #include <fcntl.h> + #include <unistd.h> ++#include <stdarg.h> + #include <sys/types.h> + + #include <arpa/inet.h> +@@ -266,3 +267,20 @@ bool t_probe_defer_taskrun(void) + io_uring_queue_exit(&ring); + return true; + } ++ ++/* ++ * Implementation of error(3), prints an error message and exits. ++ */ ++void t_error(int status, int errnum, const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ ++ vfprintf(stderr, format, args); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ ++ fprintf(stderr, "\n"); ++ va_end(args); ++ exit(status); ++} +diff --git a/test/helpers.h b/test/helpers.h +index 4375a9e..33b82cf 100644 +--- a/test/helpers.h ++++ b/test/helpers.h +@@ -87,6 +87,8 @@ bool t_probe_defer_taskrun(void); + + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + ++void t_error(int status, int errnum, const char *format, ...); ++ + #ifdef __cplusplus + } + #endif +-- +2.39.1 + diff --git a/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch b/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch new file mode 100644 index 0000000000000..676b006482c4f --- /dev/null +++ b/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch @@ -0,0 +1,109 @@ +From e84f40ca872f0bce72b5686c95a11739d9c89494 Mon Sep 17 00:00:00 2001 +From: Steffen <steffen.winter@proton.me> +Date: Mon, 13 Feb 2023 17:56:03 +0100 +Subject: [PATCH 2/3] test: Use t_error instead of glibc's error. + +On musl systems, liburing cannot build examples and tests due to +it's usage of error.h. Replacing calls to error() with t_error(). + +Closes: #786 + +Signed-off-by: Steffen Winter <steffen.winter@proton.me> +--- + test/defer-taskrun.c | 1 - + test/send-zerocopy.c | 1 - + test/single-issuer.c | 15 +++++++-------- + 3 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/test/defer-taskrun.c b/test/defer-taskrun.c +index 9283f28..87cd256 100644 +--- a/test/defer-taskrun.c ++++ b/test/defer-taskrun.c +@@ -4,7 +4,6 @@ + #include <unistd.h> + #include <stdlib.h> + #include <string.h> +-#include <error.h> + #include <sys/eventfd.h> + #include <signal.h> + #include <poll.h> +diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c +index 4db102b..be33094 100644 +--- a/test/send-zerocopy.c ++++ b/test/send-zerocopy.c +@@ -4,7 +4,6 @@ + #include <stdint.h> + #include <assert.h> + #include <errno.h> +-#include <error.h> + #include <limits.h> + #include <fcntl.h> + #include <unistd.h> +diff --git a/test/single-issuer.c b/test/single-issuer.c +index 1d13f47..d71cd74 100644 +--- a/test/single-issuer.c ++++ b/test/single-issuer.c +@@ -5,7 +5,6 @@ + #include <stdlib.h> + #include <string.h> + #include <fcntl.h> +-#include <error.h> + #include <sys/types.h> + #include <sys/wait.h> + +@@ -56,13 +55,13 @@ static int try_submit(struct io_uring *ring) + return ret; + + if (ret != 1) +- error(1, ret, "submit %i", ret); ++ t_error(1, ret, "submit %i", ret); + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) +- error(1, ret, "wait fail %i", ret); ++ t_error(1, ret, "wait fail %i", ret); + + if (cqe->res || cqe->user_data != 42) +- error(1, ret, "invalid cqe"); ++ t_error(1, ret, "invalid cqe"); + + io_uring_cqe_seen(ring, cqe); + return 0; +@@ -106,7 +105,7 @@ int main(int argc, char *argv[]) + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | + IORING_SETUP_R_DISABLED); + if (ret) +- error(1, ret, "ring init (2) %i", ret); ++ t_error(1, ret, "ring init (2) %i", ret); + + if (!fork_t()) { + io_uring_enable_rings(&ring); +@@ -122,7 +121,7 @@ int main(int argc, char *argv[]) + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | + IORING_SETUP_R_DISABLED); + if (ret) +- error(1, ret, "ring init (3) %i", ret); ++ t_error(1, ret, "ring init (3) %i", ret); + + io_uring_enable_rings(&ring); + if (!fork_t()) { +@@ -137,7 +136,7 @@ int main(int argc, char *argv[]) + /* test that anyone can submit to a SQPOLL|SINGLE_ISSUER ring */ + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER|IORING_SETUP_SQPOLL); + if (ret) +- error(1, ret, "ring init (4) %i", ret); ++ t_error(1, ret, "ring init (4) %i", ret); + + ret = try_submit(&ring); + if (ret) { +@@ -157,7 +156,7 @@ int main(int argc, char *argv[]) + /* test that IORING_ENTER_REGISTERED_RING doesn't break anything */ + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER); + if (ret) +- error(1, ret, "ring init (5) %i", ret); ++ t_error(1, ret, "ring init (5) %i", ret); + + if (!fork_t()) { + ret = try_submit(&ring); +-- +2.39.1 + diff --git a/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch b/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch new file mode 100644 index 0000000000000..ce92f16dcb18e --- /dev/null +++ b/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch @@ -0,0 +1,226 @@ +From 23704bbd1416ed1a051b32d5d44e46dd654b8ffe Mon Sep 17 00:00:00 2001 +From: Steffen <steffen.winter@proton.me> +Date: Mon, 13 Feb 2023 18:23:44 +0100 +Subject: [PATCH 3/3] examples: Use t_error instead of glibc's error. + +On musl systems, liburing cannot build examples and tests due to +it's usage of error.h. t_error copied from test/helpers.c. +Replacing calls to error() with t_error(). + +Closes: #786 + +Signed-off-by: Steffen Winter <steffen.winter@proton.me> +--- + examples/send-zerocopy.c | 61 +++++++++++++++++++++++++--------------- + 1 file changed, 39 insertions(+), 22 deletions(-) + +diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c +index 7f5f2b1..6092af9 100644 +--- a/examples/send-zerocopy.c ++++ b/examples/send-zerocopy.c +@@ -5,11 +5,11 @@ + #include <stdint.h> + #include <assert.h> + #include <errno.h> +-#include <error.h> + #include <limits.h> + #include <fcntl.h> + #include <unistd.h> + #include <stdbool.h> ++#include <stdarg.h> + #include <string.h> + + #include <arpa/inet.h> +@@ -57,6 +57,23 @@ static struct sockaddr_storage cfg_dst_addr; + + static char payload[IP_MAXPACKET] __attribute__((aligned(4096))); + ++/* ++ * Implementation of error(3), prints an error message and exits. ++ */ ++static void t_error(int status, int errnum, const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ ++ vfprintf(stderr, format, args); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ ++ fprintf(stderr, "\n"); ++ va_end(args); ++ exit(status); ++} ++ + static unsigned long gettimeofday_ms(void) + { + struct timeval tv; +@@ -68,7 +85,7 @@ static unsigned long gettimeofday_ms(void) + static void do_setsockopt(int fd, int level, int optname, int val) + { + if (setsockopt(fd, level, optname, &val, sizeof(val))) +- error(1, errno, "setsockopt %d.%d: %d", level, optname, val); ++ t_error(1, errno, "setsockopt %d.%d: %d", level, optname, val); + } + + static void setup_sockaddr(int domain, const char *str_addr, +@@ -84,7 +101,7 @@ static void setup_sockaddr(int domain, const char *str_addr, + addr4->sin_port = htons(cfg_port); + if (str_addr && + inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) != 1) +- error(1, 0, "ipv4 parse error: %s", str_addr); ++ t_error(1, 0, "ipv4 parse error: %s", str_addr); + break; + case PF_INET6: + memset(addr6, 0, sizeof(*addr6)); +@@ -92,10 +109,10 @@ static void setup_sockaddr(int domain, const char *str_addr, + addr6->sin6_port = htons(cfg_port); + if (str_addr && + inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) != 1) +- error(1, 0, "ipv6 parse error: %s", str_addr); ++ t_error(1, 0, "ipv6 parse error: %s", str_addr); + break; + default: +- error(1, 0, "illegal domain"); ++ t_error(1, 0, "illegal domain"); + } + } + +@@ -105,12 +122,12 @@ static int do_setup_tx(int domain, int type, int protocol) + + fd = socket(domain, type, protocol); + if (fd == -1) +- error(1, errno, "socket t"); ++ t_error(1, errno, "socket t"); + + do_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 1 << 21); + + if (connect(fd, (void *) &cfg_dst_addr, cfg_alen)) +- error(1, errno, "connect"); ++ t_error(1, errno, "connect"); + return fd; + } + +@@ -125,7 +142,7 @@ static inline struct io_uring_cqe *wait_cqe_fast(struct io_uring *ring) + + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) +- error(1, ret, "wait cqe"); ++ t_error(1, ret, "wait cqe"); + return cqe; + } + +@@ -143,17 +160,17 @@ static void do_tx(int domain, int type, int protocol) + + ret = io_uring_queue_init(512, &ring, IORING_SETUP_COOP_TASKRUN); + if (ret) +- error(1, ret, "io_uring: queue init"); ++ t_error(1, ret, "io_uring: queue init"); + + if (cfg_fixed_files) { + ret = io_uring_register_files(&ring, &fd, 1); + if (ret < 0) +- error(1, ret, "io_uring: files registration"); ++ t_error(1, ret, "io_uring: files registration"); + } + if (cfg_reg_ringfd) { + ret = io_uring_register_ring_fd(&ring); + if (ret < 0) +- error(1, ret, "io_uring: io_uring_register_ring_fd"); ++ t_error(1, ret, "io_uring: io_uring_register_ring_fd"); + } + + iov.iov_base = payload; +@@ -161,7 +178,7 @@ static void do_tx(int domain, int type, int protocol) + + ret = io_uring_register_buffers(&ring, &iov, 1); + if (ret) +- error(1, ret, "io_uring: buffer registration"); ++ t_error(1, ret, "io_uring: buffer registration"); + + tstop = gettimeofday_ms() + cfg_runtime_ms; + do { +@@ -193,14 +210,14 @@ static void do_tx(int domain, int type, int protocol) + + ret = io_uring_submit(&ring); + if (ret != cfg_nr_reqs) +- error(1, ret, "submit"); ++ t_error(1, ret, "submit"); + + for (i = 0; i < cfg_nr_reqs; i++) { + cqe = wait_cqe_fast(&ring); + + if (cqe->flags & IORING_CQE_F_NOTIF) { + if (cqe->flags & IORING_CQE_F_MORE) +- error(1, -EINVAL, "F_MORE notif"); ++ t_error(1, -EINVAL, "F_MORE notif"); + compl_cqes--; + i--; + io_uring_cqe_seen(&ring, cqe); +@@ -217,7 +234,7 @@ static void do_tx(int domain, int type, int protocol) + fprintf(stderr, "Connection failure"); + goto out_fail; + } else if (cqe->res != -EAGAIN) { +- error(1, cqe->res, "send failed"); ++ t_error(1, cqe->res, "send failed"); + } + io_uring_cqe_seen(&ring, cqe); + } +@@ -226,7 +243,7 @@ static void do_tx(int domain, int type, int protocol) + out_fail: + shutdown(fd, SHUT_RDWR); + if (close(fd)) +- error(1, errno, "close"); ++ t_error(1, errno, "close"); + + fprintf(stderr, "tx=%lu (MB=%lu), tx/s=%lu (MB/s=%lu)\n", + packets, bytes >> 20, +@@ -254,7 +271,7 @@ static void do_test(int domain, int type, int protocol) + + static void usage(const char *filepath) + { +- error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] " ++ t_error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] " + "(-4|-6) [-t<time s>] -D<dst_ip> udp", filepath); + } + +@@ -276,13 +293,13 @@ static void parse_opts(int argc, char **argv) + switch (c) { + case '4': + if (cfg_family != PF_UNSPEC) +- error(1, 0, "Pass one of -4 or -6"); ++ t_error(1, 0, "Pass one of -4 or -6"); + cfg_family = PF_INET; + cfg_alen = sizeof(struct sockaddr_in); + break; + case '6': + if (cfg_family != PF_UNSPEC) +- error(1, 0, "Pass one of -4 or -6"); ++ t_error(1, 0, "Pass one of -4 or -6"); + cfg_family = PF_INET6; + cfg_alen = sizeof(struct sockaddr_in6); + break; +@@ -311,9 +328,9 @@ static void parse_opts(int argc, char **argv) + } + + if (cfg_nr_reqs > MAX_SUBMIT_NR) +- error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR); ++ t_error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR); + if (cfg_payload_len > max_payload_len) +- error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); ++ t_error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); + + setup_sockaddr(cfg_family, daddr, &cfg_dst_addr); + +@@ -333,7 +350,7 @@ int main(int argc, char **argv) + else if (!strcmp(cfg_test, "udp")) + do_test(cfg_family, SOCK_DGRAM, 0); + else +- error(1, 0, "unknown cfg_test %s", cfg_test); ++ t_error(1, 0, "unknown cfg_test %s", cfg_test); + + return 0; + } +-- +2.39.1 + diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index c95ea31b3bfb8..cfcf8ae3dd66a 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,14 +4,27 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.2"; + version = "2.3"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-M/jfxZ+5DmFvlAt8sbXrjBTPf2gLd9UyTNymtjD+55g"; + sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k="; }; + patches = [ + # Backported portability fixes from liburing master, needed for pkgsMusl.liburing + ./0001-Add-custom-error-function-for-tests.patch + ./0002-test-Use-t_error-instead-of-glibc-s-error.patch + ./0003-examples-Use-t_error-instead-of-glibc-s-error.patch + + # More portability fixes, in the process of being upstreamed + (fetchpatch { + url = "https://github.com/axboe/liburing/pull/798/commits/0fbcc44fe1fb2dc6807660b2cff1c2995add095b.patch"; + hash = "sha256-xOMsw0VpYGst/+Isd2Tmq8CmBDK+uyLw3KNKPnsCSoA="; + }) + ]; + separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix index 3b63ef9386b33..717418e686b4f 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/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a350cd378bce9..8a86bc46d4da2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices, pkgsStatic }: stdenv.mkDerivation rec { version = "1.44.2"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-K6v+00basjI32ON27ZjC5spQi/zWCcslDwQwyosq2iY="; }; + patches = [ + # Fix tests for statically linked variant upstream PR is + # https://github.com/libuv/libuv/pull/3735 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/9d898acc564351dde74e9ed9865144e5c41f5beb.patch"; + sha256 = "sha256-6XsjrseD8a+ny887EKOX0NmHocLMXGf2YL13vkNHUZ0="; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -21,6 +30,10 @@ stdenv.mkDerivation rec { "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927 + + # Assertion failed in test/test-tcp-bind6-error.c on line 60: r == UV_EADDRINUSE + # Assertion failed in test/test-tcp-bind-error.c on line 99: r == UV_EADDRINUSE + "tcp_bind6_error_addrinuse" "tcp_bind_error_addrinuse_listen" ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should @@ -66,6 +79,8 @@ stdenv.mkDerivation rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; + passthru.tests.static = pkgsStatic.libuv; + meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index bad8e14d59e40..9f958efe71b34 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,13 +14,13 @@ 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" ]; diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index a6d9a68abba59..733a75e5fc902 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-11-25"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "fd7da37b96b5937a0bb5a41bacbae0a0ef59069f"; - sha256 = "1tjooO/f72lRdZDxXVSxBySWsUMNWuqI2yQOipa7zFY="; + rev = "c250212538dd48d3965826ad7fe669bb0f348cbd"; + sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc="; }; outputs = [ diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 8f84cd0eab806..ccf41038cca6a 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,24 +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 - gobject-introspection + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng ]; 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" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=pointer-sign" ]; meta = with lib; { description = "Library for working with virtual machines"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 2a56a0cde2094..b3e349beab14f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -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 @@ -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,7 +195,7 @@ stdenv.mkDerivation rec { readline xhtml1 yajl - ] ++ optionals isLinux [ + ] ++ lib.optionals isLinux [ acl attr audit @@ -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 @@ -271,7 +269,7 @@ stdenv.mkDerivation rec { (cfg "runstatedir" "/run") (cfg "init_script" (if isDarwin then "none" else "systemd")) - (cfg "qemu_datadir" (if isDarwin then "${qemu}/share/qemu" else "")) + (cfg "qemu_datadir" (lib.optionalString isDarwin "${qemu}/share/qemu")) (feat "apparmor" isLinux) (feat "attr" isLinux) @@ -292,7 +290,7 @@ stdenv.mkDerivation rec { (feat "libpcap" true) (feat "libssh2" true) (feat "login_shell" isLinux) - (feat "nss" isLinux) + (feat "nss" (isLinux && !stdenv.hostPlatform.isMusl)) (feat "numactl" isLinux) (feat "numad" isLinux) (feat "pciaccess" isLinux) @@ -348,7 +346,7 @@ stdenv.mkDerivation rec { # 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 @@ -372,7 +370,7 @@ stdenv.mkDerivation rec { passthru.tests.libvirtd = nixosTests.libvirtd; - meta = { + 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"; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 3e61ee8a6a134..046035a290cb1 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,22 +1,50 @@ -{ lib, stdenv, fetchurl, pkg-config, glib }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, SDL +, autoreconfHook +, glib +, pkg-config +}: stdenv.mkDerivation rec { pname = "libvisual"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz"; - sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; + hash = "sha256-qhKHdBf3bTZC2fTHIzAjgNgzF1Y51jpVZB0Bkopd230="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; + patches = [ + # pull upstream fix for SDL1 cross-compilation. + # https://github.com/Libvisual/libvisual/pull/238 + (fetchpatch { + name = "sdl-cross-prereq.patch"; + url = "https://github.com/Libvisual/libvisual/commit/7902d24aa1a552619a5738339b3823e90dd3b865.patch"; + hash = "sha256-84u8klHDAw/q4d+9L4ROAr7XsbXItHrhaEKkTEMSPcc="; + # remove extra libvisual prefix + stripLen = 1; + # pull in only useful configure.ac changes. + excludes = [ "Makefile.am" ]; + }) + (fetchpatch { + name = "sdl-cross-pc.patch"; + url = "https://github.com/Libvisual/libvisual/commit/f79a2e8d21ad1d7fe26e2aa83cea4c9f48f9e392.patch"; + hash = "sha256-8c7SdLxXC8K9BAwj7DzozsZAcbs5l1xuBqky9LJ1MfM="; + # remove extra libvisual prefix + stripLen = 1; + }) + ]; - hardeningDisable = [ "format" ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ SDL glib ]; configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" + # Remove once "sdl-cross-prereq.patch" patch above is removed. + "--disable-lv-tool" ]; meta = { diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index e7add08871a6c..c0fc4d1556f3c 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, nasm }: stdenv.mkDerivation rec { pname = "libvmaf"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sourceRoot = "source/libvmaf"; + patches = [ + # Backport fix for non-Linux, non-Darwin platforms. + (fetchpatch { + url = "https://github.com/Netflix/vmaf/commit/f47640f9ffee9494571bd7c9622e353660c93fc4.patch"; + stripLen = 1; + sha256 = "rsTKuqp8VJG5DBDpixPke3LrdfjKzUO945i+iL0n7CY="; + }) + ]; + nativeBuildInputs = [ meson ninja nasm ]; mesonFlags = [ "-Denable_avx512=true" ]; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 36fd026eeedd7..cbcba106b83d2 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/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index befbafd5a4ec8..643dcb4d8f401 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" else "8" else ""}-gcc" - (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index d82bf42bef610..1d791aec6fa6f 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { experimentalEmulateHardwareSupport) "experimental") ] ++ 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 "") + (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index ca16063cca6b9..bbbceab3ab78a 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3"; + version = "0.3.1"; src = fetchurl { url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-YesNZijFK98CkA39RGiqhqGnElIourimcyiYGIdIM1g="; + sha256 = "sha256-JaitnBVIU2jf0Kip3KGuyP6lwn2j+nTsUY1dN4fww5c="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 24092d3286958..dbc5008a1a491 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.4.0"; + version = "2.6.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-9uhnO+MqB7tAnSXjBcJWCzHGiz9izun4nVjFb17G8Gg="; + sha256 = "sha256-9zqW6zPrFcxv/yAAtFgdVavKVMXeDBoMP3E/XriUcT0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix new file mode 100644 index 0000000000000..6168686cf50b7 --- /dev/null +++ b/pkgs/development/libraries/libwacom/surface.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, libwacom +}: + +let + libwacom-surface = fetchFromGitHub { + owner = "linux-surface"; + repo = "libwacom-surface"; + rev = "v2.6.0-1"; + hash = "sha256-4UOO9LMyCJd4LkqU0uva/0Xc44fIVdIQi27tJOtNEFk="; + }; +in libwacom.overrideAttrs (old: { + pname = "libwacom-surface"; + + # These patches will not be included upstream: + # https://github.com/linux-surface/libwacom/issues/2 + patches = old.patches or [ ] ++ map (p: "${libwacom-surface}/patches/v2/${p}") [ + "0001-Add-support-for-BUS_VIRTUAL.patch" + "0002-Add-support-for-Intel-Management-Engine-bus.patch" + "0003-data-Add-Microsoft-Surface-Pro-3.patch" + "0004-data-Add-Microsoft-Surface-Pro-4.patch" + "0005-data-Add-Microsoft-Surface-Pro-5.patch" + "0006-data-Add-Microsoft-Surface-Pro-6.patch" + "0007-data-Add-Microsoft-Surface-Pro-7.patch" + "0008-data-Add-Microsoft-Surface-Book.patch" + "0009-data-Add-Microsoft-Surface-Book-2-13.5.patch" + "0010-data-Add-Microsoft-Surface-Book-2-15.patch" + "0011-data-Add-Microsoft-Surface-Book-3-13.5.patch" + "0012-data-Add-Microsoft-Surface-Book-3-15.patch" + ]; + + meta = old.meta // { + homepage = "https://github.com/linux-surface/libwacom-surface"; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +}) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 13ad9eb29c2ea..dff7abc7dd530 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/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 11950c634861f..455e59d89718c 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 7657cd4895275..abac656f8e473 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for importing WordPerfect documents"; - homepage = "http://libwpd.sourceforge.net"; + homepage = "https://libwpd.sourceforge.net"; license = with licenses; [ lgpl21 mpl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index bf0df220935c3..637de76169c75 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; meta = with lib; { - homepage = "http://libwpg.sourceforge.net"; + homepage = "https://libwpg.sourceforge.net"; description = "C++ library to parse WPG"; license = with licenses; [ lgpl21 mpl20 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 597370ad0e57f..fd62b98134357 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "libwps"; - version = "0.4.12"; + version = "0.4.13"; src = fetchurl { url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2"; - sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl"; + sha256 = "sha256-eVwva90EwLZgrMpRTcc2cAc9PG5wbXbV2GtK2BMpLrk="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost librevenge zlib ]; - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with lib; { homepage = "https://libwps.sourceforge.net/"; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 2d624256eabd7..ed936a9d0377b 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" ]; diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 6578a86e35b1b..6b375978a4b98 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { "--with-x-locale-root=${libX11.out}/share/X11/locale" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 's/,--version-script=.*$//' Makefile ''; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 6e8936f7ce63d..23123940057dc 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -11,7 +11,10 @@ , ncurses , findXMLCatalogs , libiconv -, pythonSupport ? enableShared +# Python limits cross-compilation to an allowlist of host OSes. +# https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562 +, pythonSupport ? enableShared && + (stdenv.hostPlatform == stdenv.buildPlatform || stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isWasi) , icuSupport ? false , icu , enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic 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 e379c34726790..0000000000000 --- 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 9b30ce19b1d8a..0000000000000 --- 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/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index f34834ae3166d..a4f358fa546ba 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/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index d3b7e5642546e..6ba8eaf6f1709 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -12,14 +12,15 @@ , openssl , withZstd ? false , zstd +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libzip"; version = "1.9.2"; src = fetchurl { - url = "https://libzip.org/download/${pname}-${version}.tar.gz"; + url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; }; @@ -41,11 +42,14 @@ stdenv.mkDerivation rec { patchShebangs regress ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://libzip.org/"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; + pkgConfigModules = [ "libzip" ]; platforms = platforms.unix; changelog = "https://github.com/nih-at/libzip/blob/v${version}/NEWS.md"; }; -} +}) diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index f94ceed78ae82..e7e8d2032ed56 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.lassulus ]; }; } diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 7ceb70bb8bcd4..1e6311692a055 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.12.01"; + 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-BXwdPcJMJrM+FMTcNZKIWt8iBAOh4SVeihAeIzxpwQg="; + sha256 = "sha256-p8ZJE/f3AHxf3CnqgR48p4HyYicbPkKv3UvBBB2G+pk="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index d89df53907bef..55be8f9451d1e 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { make build-shared ''; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; - homepage = "http://loki-lib.sourceforge.net"; + homepage = "https://loki-lib.sourceforge.net"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/libraries/maeparser/default.nix b/pkgs/development/libraries/maeparser/default.nix index 73b25bb014adc..16459987c13f9 100644 --- a/pkgs/development/libraries/maeparser/default.nix +++ b/pkgs/development/libraries/maeparser/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "maeparser"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "schrodinger"; repo = "maeparser"; rev = "v${version}"; - sha256 = "sha256-9KxCR/spIZzePjmZe8qihIi1hEhPvxg/9dAlYmHxZPs="; + sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix new file mode 100644 index 0000000000000..ccf439ca91906 --- /dev/null +++ b/pkgs/development/libraries/magic-enum/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub +, lib +, stdenv +, cmake +}: +stdenv.mkDerivation rec{ + pname = "magic-enum"; + version = "0.8.2"; + src = fetchFromGitHub { + owner = "Neargye"; + repo = "magic_enum"; + rev = "v${version}"; + sha256 = "sha256-k4zCEQxO0N/o1hDYxw5p9u0BMwP/5oIoe/4yw7oqEo0="; + }; + + nativeBuildInputs = [ cmake ]; + + # disable tests until upstream fixes build issues with gcc 12 + # see https://github.com/Neargye/magic_enum/issues/235 + doCheck = false; + cmakeFlags = [ + "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF" + ]; + + meta = with lib;{ + description = "Static reflection for enums (to string, from string, iteration) for modern C++"; + homepage = "https://github.com/Neargye/magic_enum"; + license = licenses.mit; + maintainers = with maintainers; [ Alper-Celik ]; + }; +} diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix index 47b9ba63fc2da..7b6bf1ddef0e3 100644 --- a/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -50,7 +50,7 @@ mkDerivation rec { "-DMBGL_WITH_QT_LIB_ONLY=ON" "-DMBGL_WITH_QT_HEADLESS=OFF" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; meta = with lib; { description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; diff --git a/pkgs/development/libraries/maplibre-gl-native/default.nix b/pkgs/development/libraries/maplibre-gl-native/default.nix index 568f3fbe64e2f..65a5c266ee6a6 100644 --- a/pkgs/development/libraries/maplibre-gl-native/default.nix +++ b/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -9,6 +9,7 @@ , libuv , glfw3 , rapidjson +, stdenv }: mkDerivation rec { @@ -55,6 +56,11 @@ mkDerivation rec { "-DMBGL_WITH_QT_HEADLESS=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=use-after-free" + ]); + meta = with lib; { description = "Open-source alternative to Mapbox GL Native"; homepage = "https://maplibre.org/"; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 1ef091a5d855b..9593781f2270e 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ - ./hdf5-1.12.patch + ./hdf5-1.14.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/medfile/hdf5-1.12.patch b/pkgs/development/libraries/medfile/hdf5-1.14.patch index ab73e00487ce7..294e87c023a7a 100644 --- a/pkgs/development/libraries/medfile/hdf5-1.12.patch +++ b/pkgs/development/libraries/medfile/hdf5-1.14.patch @@ -25,7 +25,7 @@ #error "Don't forget to update the test version here when you change the major version of the library !" #endif -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" #error "Cf. _MEDfileCreate ..." #endif @@ -36,7 +36,7 @@ * Un test autoconf permet de fixer un intervalle de version HDF à MED. */ -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif @@ -47,7 +47,7 @@ • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). */ -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif /* L'avantage de bloquer le modèle interne HDF5 @@ -58,7 +58,7 @@ } -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { @@ -69,7 +69,7 @@ * Un test autoconf permet de fixer un intervalle de version HDF à MED. */ -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif @@ -80,7 +80,7 @@ goto ERROR; } -#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 ++#if H5_VERS_MINOR > 14 #error "Don't forget to change the compatibility version of the library !" #endif if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index fd6df20fb8922..fade17507ca47 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 = [ diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index d2e92da0ea96f..1c08812db45cd 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: +{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glu"; version = "9.0.2"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; }; @@ -15,11 +19,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "OpenGL utility library"; homepage = "https://cgit.freedesktop.org/mesa/glu/"; license = lib.licenses.sgi-b-20; + pkgConfigModules = [ "glu" ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; }; -} +}) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c853c172d2401..480c2d8c85844 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 ? if (stdenv.isLinux && stdenv.isAarch64) then [ "swrast" "broadcom" "freedreno" "panfrost" ] else [ "auto" ] +, 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.hostPlatform.isx86 [ + "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86 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,10 +66,12 @@ , enablePatentEncumberedCodecs ? true , libclc , jdupes -, cmake , rustc , rust-bindgen -, spirv-llvm-translator_14 +, spirv-llvm-translator +, zstd +, directx-headers +, udev }: /** Packaging design: @@ -36,22 +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.3.3"; - branch = versions.major version; + version = "22.3.5"; + 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; @@ -64,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 = "sha256-vteZeIvyvZ7wedl82OCTSL9TywhoGFeOQHc7KxeBKSI="; + sha256 = "3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9"; }; # TODO: @@ -93,7 +149,11 @@ 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. @@ -115,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" "-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 rustc rust-bindgen' spirv-llvm-translator_14 ] + ++ 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 withLibdrm 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 @@ -199,7 +266,7 @@ 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/" \ @@ -219,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}" @@ -252,10 +323,10 @@ self = stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ "-UPIPE_SEARCH_DIR" "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" - ]; + ]); passthru = { inherit (libglvnd) driverLink; @@ -274,7 +345,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 02558aaa825dc..fb4da5cf7a0aa 100644 --- a/pkgs/development/libraries/mesa/opencl.patch +++ b/pkgs/development/libraries/mesa/opencl.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index e32338b3f9a..fae804fd41e 100644 +index 172c64a7c70..05961e56926 100644 --- a/meson.build +++ b/meson.build -@@ -1894,7 +1894,7 @@ endif +@@ -1900,7 +1900,7 @@ endif dep_clang = null_dep if with_clc @@ -29,51 +29,20 @@ index 6f307018815..ab84eb1006c 100644 'platforms', type : 'array', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 7af210b5693..ff6ac8c61ca 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 _shared_llvm or 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 -@@ -119,7 +120,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', diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix index 753ad1b91966b..f3ea263cc9ffe 100644 --- a/pkgs/development/libraries/mesa/stubs.nix +++ b/pkgs/development/libraries/mesa/stubs.nix @@ -1,8 +1,10 @@ { stdenv , libglvnd, mesa -, OpenGL }: +, OpenGL +, testers +}: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit (libglvnd) version; pname = "libGL"; outputs = [ "out" "dev" ]; @@ -72,4 +74,8 @@ stdenv.mkDerivation { genPkgConfig glesv1_cm GLESv1_CM genPkgConfig glesv2 GLESv2 ''; -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta.pkgConfigModules = [ "gl" "egl" "glesv1_cm" "glesv2" ]; +}) diff --git a/pkgs/development/libraries/migraphx/default.nix b/pkgs/development/libraries/migraphx/default.nix index 27caa1f94137d..15581e00e528f 100644 --- a/pkgs/development/libraries/migraphx/default.nix +++ b/pkgs/development/libraries/migraphx/default.nix @@ -7,7 +7,6 @@ , rocm-cmake , hip , clang-tools-extra -, cppcheck , openmp , rocblas , rocmlir @@ -70,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: { rocm-cmake hip clang-tools-extra - cppcheck python3Packages.python ] ++ lib.optionals buildDocs [ latex diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index ecb247de0ba40..905d8330fe4d4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -10,21 +10,35 @@ cyrus_sasl, libbson, snappy, + darwin, }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.1"; + version = "1.23.2"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; + sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf"; }; # https://github.com/NixOS/nixpkgs/issues/25585 preFixup = ''rm -rf "$(pwd)" ''; + # https://github.com/mongodb/mongo-c-driver/pull/1157 + # related: + # https://github.com/NixOS/nixpkgs/issues/144170 + # mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths. + postPatch = '' + substituteInPlace src/libmongoc/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + substituteInPlace src/libbson/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; nativeBuildInputs = [cmake pkg-config perl]; - buildInputs = [openssl zlib cyrus_sasl]; + buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security]; propagatedBuildInputs = [libbson snappy]; # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF @@ -35,6 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index b00b3517313ed..b9b0589bd80d3 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY="; }; - NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; + env.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/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 7d9e94c6f909e..e0a33e27c12c0 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -11,7 +11,7 @@ # files. stdenv.mkDerivation rec { - version = "4.1.1"; + version = "4.2.0"; pname = "mpfr"; src = fetchurl { @@ -19,16 +19,9 @@ stdenv.mkDerivation rec { "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; - hash = "sha256-/9GVvVZ9uv/DuYsj/QCq0FN2gMmJYXHkT+P/eeKKwz0="; + hash = "sha256-BqN43xNQEkjBsttaqXeiyBJq6Emp2be+JUb7Spwm2ZM="; }; - patches = [ - (fetchurl { # https://gitlab.inria.fr/mpfr/mpfr/-/issues/1 - url = "https://www.mpfr.org/mpfr-4.1.1/patch01"; - hash = "sha256-gKPCcJviGsqsEqnMmYiNY6APp3+3VXbyBf6LoZhP9Eo="; - }) - ]; - outputs = [ "out" "dev" "doc" "info" ]; strictDeps = true; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 14dddf1f29fdd..c4d26e0092752 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/mps/default.nix b/pkgs/development/libraries/mps/default.nix index f990d4de7d6b9..6298a1dfef636 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; # needed for 1.116.0 to build with gcc7 - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-implicit-fallthrough" "-Wno-error=clobbered" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 4a510762f7f0f..9e6a45e2975a6 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 a3b829a754a8f..ba31225c816a8 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - hash = "sha256-34iwYn9EOAl2c9UWERyzgwlZ+539jW9FygNYwgZ7ClU="; + hash = "sha256-r+bD2L5+3AwkdYa3FwsM+yf7V5w+6ZJC92CMdVeYLJQ="; }; postPatch = '' diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 0f358c2796280..987f4022f511a 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -14,11 +14,11 @@ assert builtins.elem network [ "ethernet" "infiniband" "omnipath" ]; stdenv.mkDerivation rec { pname = "mvapich"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-${version}.tar.gz"; - sha256 = "0jd28vy9ivl3rcpkxmhw73b6krzm0pd9jps8asw92wa00lm2z9mk"; + sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4="; }; nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2cfe41956a4b1..4e2c731d7e2b2 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,19 +8,16 @@ , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , mouseSupport ? false, gpm , unicodeSupport ? true +, testers }: -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}"; +stdenv.mkDerivation (finalAttrs: { + 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-${finalAttrs.version}.tar.gz"; + hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; outputs = [ "out" "dev" "man" ]; @@ -173,11 +170,20 @@ stdenv.mkDerivation rec { ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp! ''; license = licenses.mit; + pkgConfigModules = let + base = [ + "form" + "menu" + "ncurses" + "panel" + ] ++ lib.optional withCxx "ncurses++"; + in base ++ lib.optionals unicodeSupport (map (p: p + "w") base); platforms = platforms.all; }; passthru = { ldflags = "-lncurses"; inherit unicodeSupport abiVersion; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; -} +}) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee05d2606def8..c7977ed89d99c 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,38 +6,37 @@ , python3 , python3Packages , wafHook -, boost175 +, boost , openssl , sqlite }: stdenv.mkDerivation rec { pname = "ndn-cxx"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; rev = "${pname}-${version}"; - sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE="; + sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - buildInputs = [ boost175 openssl sqlite ]; + buildInputs = [ boost openssl sqlite ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; - - doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment checkPhase = '' runHook preCheck - LD_PRELOAD=build/ndn-cxx.so build/unit-tests + LD_PRELOAD=build/libndn-cxx.so build/unit-tests runHook postCheck ''; diff --git a/pkgs/development/libraries/neon/darwin-fix-configure.patch b/pkgs/development/libraries/neon/darwin-fix-configure.patch index 87222a9c0ce09..b8bbd288f7a2b 100644 --- a/pkgs/development/libraries/neon/darwin-fix-configure.patch +++ b/pkgs/development/libraries/neon/darwin-fix-configure.patch @@ -2,9 +2,9 @@ diff -Nuar neon-0.29.6/configure neon-0.29.6-darwin-fix-configure/configure --- neon-0.29.6/configure 2011-05-03 14:25:31.000000000 +0200 +++ neon-0.29.6-darwin-fix-configure/configure 2012-06-06 23:32:21.000000000 +0200 @@ -4184,7 +4184,7 @@ - $as_echo "$ne_cv_os_uname" >&6; } + case x"$ne_cv_os_uname" in #( + x"Darwin") : - if test "$ne_cv_os_uname" = "Darwin"; then - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS -flat_namespace" diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 827d7eb69799f..f26dbf5ace45d 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { - version = "0.32.3"; + version = "0.32.5"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-lMuHXcbb/N7ljwObdjxnSwIyiGzf16Xekb5c36K3WWo="; + sha256 = "sha256-SHLhL4Alct7dSwL4cAZYFLLVFB99va9wju2rgmtRpYo="; }; patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 82d0e8c132d00..5f0fade2566e1 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ netcdf hdf5 curl ]; - # 10 - cxx4_test_filter (Failed) - # Setting Filter....Caught unexpected exception. - doCheck = false; + doCheck = true; enableParallelChecking = false; + preCheck = '' + export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins + ''; meta = { description = "C++ API to manipulate netcdf files"; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 188dd586797ba..ed869275c9d28 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,6 +1,11 @@ { lib, stdenv , fetchurl, unzip , hdf5 +, bzip2 +, libzip +, zstd +, szipSupport ? false +, szip , libxml2 , m4 , curl # for DAP @@ -34,7 +39,10 @@ in stdenv.mkDerivation rec { hdf5 libxml2 mpi - ]; + bzip2 + libzip + zstd + ] ++ lib.optional szipSupport szip; passthru = { inherit mpiSupport mpi; @@ -45,9 +53,12 @@ in stdenv.mkDerivation rec { "--enable-dap" "--enable-shared" "--disable-dap-remote-tests" + "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins" ] ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + enableParallelBuilding = true; + disallowedReferences = [ stdenv.cc ]; postFixup = '' diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 6114c4c70d0f7..3ba07c7b5be9a 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "newt"; - version = "0.52.21"; + version = "0.52.23"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; + sha256 = "sha256-yqNykHsU7Oz+KY8NUSpi9B0zspBhAkSliu0Hu8WtoSo="; }; postPatch = '' diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index d267960e36dfe..2fae8135124e1 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -58,7 +58,10 @@ 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; @@ -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 af83fb29c01eb..8a396e40725eb 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, file , cunit, ncurses +, curlHTTP3 }: stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zexcfkf8Br3wduUpM3tcS68fEVO6reNxYSB3X3qUWKg="; + sha256 = "sha256-N4wgk21D1I0tNrKoTGWBtq3neeamCI8axQnFxdT1Txg="; }; outputs = [ "out" "dev" "doc" ]; @@ -26,6 +27,10 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; + passthru.tests = { + inherit curlHTTP3; + }; + meta = with lib; { homepage = "https://github.com/ngtcp2/nghttp3"; description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index dda067fd499f2..b100450b732d4 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -3,17 +3,18 @@ , libev, nghttp3, quictls , cunit, ncurses , withJemalloc ? false, jemalloc +, curlHTTP3 }: stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OnGzAUfIop/3/0qAAm5rgTlpCdZ/1fwWPJ/KLfGUy8U="; + sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; }; outputs = [ "out" "dev" "doc" ]; @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; + passthru.tests = { + inherit curlHTTP3; + }; + meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index ac8dec44412d2..ef73f06e34a17 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.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; + sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 7f0bd15aa542e..d7b021e7c494d 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.5.2"; + version = "1.6.0-prerelease"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "v${version}"; - sha256 = "sha256-qbjMLpPk5FxH710Mf8AIraY0mERbaxVVhTT94W0EV+k="; + rev = "539e559e65cd8f227c45e4b046ac41c0edcf6c32"; + sha256 = "sha256-86+f0um25Ywn78S2JrV54K7k3O6ots0q2dCco1aK0xM="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index 2a3b25bc58272..d9103f75399af 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.4"; + hash = "sha256-Skcdv6Wzo7fsB4U8b8CijNBmn2mEEp4k9VQeLOFdcdU="; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 89227b78f2f73..be2196d6d2fc0 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { -Dhost_arch=${host} \ -Duse_system_zlib=1 \ --enable-libpkix \ + -j $NIX_BUILD_CORES \ ${lib.optionalString enableFIPS "--enable-fips"} \ ${lib.optionalString stdenv.isDarwin "--clang"} \ ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tests"} @@ -103,11 +104,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" - + lib.optionalString stdenv.hostPlatform.isILP32 " -DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c - ; + env.NIX_CFLAGS_COMPILE = toString ([ + "-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 6f3e73639b9e3..0a74f9a386572 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.87"; - hash = "sha256-aKGJRJbT0Vi6vHX4pd2j9Vt8FWBXOTbjsQGhD6SsFS0="; + version = "3.88.1"; + hash = "sha256-J9JD7fh9HPG7nIYfA9OH4OkjDOUBf0MIyUH1WLVLNJY="; } diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index a6974295690ec..324c5269dfbc2 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.12"; + version = "1.1.15"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "sha256-zdBg/wnAO32i0wsMta00dSNNQ4rqJ5A9slwvFvVwIYY="; + sha256 = "sha256-Nvh0gypPIVjgT2mqd+VRXhbPbjv4GWjV3YSW231pBq0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index a10434d90b41b..3d8f057fc8035 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix index 64108c33b7c1b..b3a929545f24f 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/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix index 9b1635511ec62..40e81e195aa10 100644 --- a/pkgs/development/libraries/octomap/default.nix +++ b/pkgs/development/libraries/octomap/default.nix @@ -10,10 +10,16 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; + sourceRoot = "source/octomap"; nativeBuildInputs = [ cmake ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + ]; + meta = with lib; { description = "A probabilistic, flexible, and compact 3D mapping library for robotic systems"; homepage = "https://octomap.github.io/"; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index ebd1d89803c17..e5b5d1acc0298 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "13.6.0"; + version = "13.6.2"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - sha256 = "sha256-yPIrF0jSeWXQ67U/QDgeQnMPvxsyaecyiW964kLsDAE="; + hash = "sha256-4Jmhseg1+4g0b8Pa8A4YL+ixYMe/HxzXrDaXUfElh+k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 4e9e4d79dd2f1..975e005530e70 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = false; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-truncation" "-Wno-error=address-of-packed-member" "-Wno-array-bounds" diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 3e989561470c6..0cc752d993fb2 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12 + ''; + buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index a23382d3f892b..fe12bbffa531d 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; }; + postPatch = '' + sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12 + ''; + buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 5c262a3680c54..2934558b58752 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/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 2941a1a1e7cea..0355b99774489 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -26,7 +26,7 @@ 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" diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 4cf75039c49e7..3d8a5588043fe 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , expat -, libyamlcpp +, yaml-cpp , ilmbase , pystring , imath @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ expat - libyamlcpp + yaml-cpp ilmbase pystring imath diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 56b022d03b9b5..e1a13c9fe573f 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 @@ -216,7 +216,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config unzip ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 2c676e008f00d..ac021c2b61082 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -15,6 +15,7 @@ , ocl-icd , buildPackages , qimgv +, opencv4 , enableJPEG ? true , libjpeg @@ -31,8 +32,8 @@ , openjpeg , enableEigen ? true , eigen -, enableOpenblas ? true -, openblas +, enableBlas ? true +, blas , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 @@ -74,6 +75,7 @@ , CoreMedia , MediaToolbox , bzip2 +, callPackage }: let @@ -93,6 +95,13 @@ let sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE="; }; + testDataSrc = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_extra"; + rev = version; + sha256 = "sha256-6hAdJdaUgtRGQanQKuY/q6fcXWXFZ3K/oLbGxvksry0="; + }; + # Contrib must be built in order to enable Tesseract support: buildContrib = enableContrib || enableTesseract || enableOvis; @@ -171,10 +180,10 @@ let ade = rec { src = fetchurl { url = "https://github.com/opencv/ade/archive/${name}"; - sha256 = "04n9na2bph706bdxnnqfcbga4cyj8kd9s9ni7qyvnpj5v98jwvlm"; + sha256 = "sha256-TjLRbFbC7MDY9PxIy560ryviBI58cbQwqgc7A7uOHkg="; }; - name = "v0.1.1f.zip"; - md5 = "b624b995ec9c439cbc2e9e6ee940d3a2"; + name = "v0.1.2a.zip"; + md5 = "fa4b3e25167319cb0fa9432ef8281945"; dst = ".cache/ade"; }; @@ -208,13 +217,24 @@ let opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; + runAccuracyTests = true; + runPerformanceTests = false; printEnabled = enabled: if enabled then "ON" else "OFF"; + withOpenblas = (enableBlas && blas.provider.pname == "openblas"); + #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests + #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded + openblas_ = blas.provider.override { singleThreaded = true; }; in stdenv.mkDerivation { pname = "opencv"; inherit version src; + outputs = [ + "out" + "package_tests" + ]; + postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; @@ -263,12 +283,12 @@ stdenv.mkDerivation { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] - ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ lib.optional enableOvis ogre ++ lib.optional enableGPhoto2 libgphoto2 ++ lib.optional enableDC1394 libdc1394 ++ lib.optional enableEigen eigen - ++ lib.optional enableOpenblas openblas + ++ lib.optional enableBlas blas.provider # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. @@ -287,10 +307,11 @@ stdenv.mkDerivation { pythonPackages.setuptools ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. - OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; + OpenBLAS_HOME = lib.optionalString withOpenblas openblas_.dev; + OpenBLAS = lib.optionalString withOpenblas openblas_; cmakeFlags = [ "-DOPENCV_GENERATE_PKGCONFIG=ON" @@ -299,8 +320,9 @@ stdenv.mkDerivation { "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" - "-DBUILD_TESTS=OFF" - "-DBUILD_PERF_TESTS=OFF" + "-DBUILD_TESTS=${printEnabled runAccuracyTests}" + "-DBUILD_PERF_TESTS=${printEnabled runPerformanceTests}" + "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DBUILD_DOCS=${printEnabled enableDocs}" # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT" # but we have proper separation of build and host libs :), fixes cross @@ -334,6 +356,14 @@ stdenv.mkDerivation { make doxygen ''; + preInstall = + lib.optionalString (runAccuracyTests || runPerformanceTests) '' + mkdir $package_tests + cp -R $src/samples $package_tests/ + '' + + lib.optionalString runAccuracyTests "mv ./bin/*test* $package_tests/ \n" + + lib.optionalString runPerformanceTests "mv ./bin/*perf* $package_tests/"; + # By default $out/lib/pkgconfig/opencv4.pc looks something like this: # # prefix=/nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0 @@ -368,16 +398,23 @@ stdenv.mkDerivation { passthru = { tests = { - inherit qimgv; inherit (gst_all_1) gst-plugins-bad; - } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }; + } + // lib.optionalAttrs (!stdenv.isDarwin) { inherit qimgv; } + // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } + // lib.optionalAttrs (stdenv.buildPlatform != "x86_64-darwin") { + opencv4-tests = callPackage ./tests.nix { + inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; + inherit opencv4; + }; + }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; - maintainers = with maintainers; [ mdaiter basvandijk ]; + maintainers = with maintainers; [ basvandijk ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 73b0874dde5ae..059dc69df1202 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config unzip ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix new file mode 100644 index 0000000000000..5a155a9119b05 --- /dev/null +++ b/pkgs/development/libraries/opencv/tests.nix @@ -0,0 +1,70 @@ +{ opencv4 +, testDataSrc +, stdenv +, lib +, runCommand +, gst_all_1 +, runAccuracyTests +, runPerformanceTests +, enableGStreamer +, enableGtk2 +, enableGtk3 +, xvfb-run +}: +let + testNames = [ + "calib3d" + "core" + "features2d" + "flann" + "imgcodecs" + "imgproc" + "ml" + "objdetect" + "photo" + "stitching" + "video" + #"videoio" # - a lot of GStreamer warnings and failed tests + #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models + ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ] + ++ lib.optionals (enableGtk2 || enableGtk3) [ "highgui" ]; + perfTestNames = [ + "calib3d" + "core" + "features2d" + "imgcodecs" + "imgproc" + "objdetect" + "photo" + "stitching" + "video" + ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; + testRunner = if stdenv.isDarwin then "" else "${lib.getExe xvfb-run} -a "; + testsPreparation = '' + touch $out + # several tests want a write access, so we have to copy files + tmpPath="$(mktemp -d "/tmp/opencv_extra_XXXXXX")" + cp -R ${testDataSrc} $tmpPath/opencv_extra + chmod -R +w $tmpPath/opencv_extra + export OPENCV_TEST_DATA_PATH="$tmpPath/opencv_extra/testdata" + export OPENCV_SAMPLES_DATA_PATH="${opencv4.package_tests}/samples/data" + + #ignored tests because of gtest error - "Test code is not available due to compilation error with GCC 11" + export GTEST_FILTER="-AsyncAPICancelation/cancel*" + ''; + accuracyTests = lib.optionalString runAccuracyTests '' + ${ builtins.concatStringsSep "\n" + (map (test: "${testRunner}${opencv4.package_tests}/opencv_test_${test} --test_threads=$NIX_BUILD_CORES --gtest_filter=$GTEST_FILTER" ) testNames) + } + ''; + perfomanceTests = lib.optionalString runPerformanceTests '' + ${ builtins.concatStringsSep "\n" + (map (test: "${testRunner}${opencv4.package_tests}/opencv_perf_${test} --perf_impl=plain --perf_min_samples=10 --perf_force_samples=10 --perf_verify_sanity --skip_unstable=1 --gtest_filter=$GTEST_FILTER") perfTestNames) + } + ''; +in +runCommand "opencv4-tests" +{ + nativeBuildInputs = lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); +} + (testsPreparation + accuracyTests + perfomanceTests) diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 0460f012424c3..b7a4a34390d9a 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient postgresql sqlite ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-std=c++14" + ]; + meta = with lib; { broken = stdenv.isDarwin; description = "Extremely lightweight but extensible database access library written in C"; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 26a7676dd6155..c016b7635aa10 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.4.10"; + version = "2.4.12"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0="; + sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 47b2f6395478e..c961dfd069a6b 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { --replace g++ c++ ''; - NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR + env.NIX_CFLAGS_COMPILE = ''-I${ilmbase.dev}/include/OpenEXR -I${openexr.dev}/include/OpenEXR -I${openfx.dev}/include/OpenFX ''; diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix index 10f6abd79ef81..7b2901b69b76b 100644 --- a/pkgs/development/libraries/openimagedenoise/1_2_x.nix +++ b/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 8d02b976c91f2..532ee7a095718 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; + cmakeFlags = [ + "-DTBB_ROOT=${tbb}" + "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + ]; + meta = with lib; { homepage = "https://openimagedenoise.github.io"; description = "High-Performance Denoising Library for Ray Tracing"; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index ad4206eedfbb4..5c6d6b8a13467 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { ++ lib.optional (jpipLibSupport) jdk; doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 - + nativeCheckInputs = [ jpylyzer ]; checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ - --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " + --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"$(command -v jpylyzer)\" # " OPJ_SOURCE_DIR=.. ctest -S ../tools/ctest_scripts/travis-ci.cmake ''; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index ad4654d88b3e5..c89a8eb5db771 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "ac_cv_func_memcmp_working=yes" ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; - NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; makeFlags= [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 51194a36798f0..1a9a5deb0d9aa 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ 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 @@ -32,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/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 1f4ad96c2977b..28a8ab838c509 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch deleted file mode 100644 index 2acedda0e3a49..0000000000000 --- a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 -From: Pauli <pauli@openssl.org> -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 <beldmit@gmail.com> -Reviewed-by: Tomas Mraz <tomas@openssl.org> -(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/default.nix b/pkgs/development/libraries/openssl/default.nix index 4c322997963a6..efa19a2ce1973 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev +, withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic @@ -10,6 +11,7 @@ # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default , conf ? null , removeReferencesTo +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -19,12 +21,12 @@ let common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; + url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; inherit sha256; }; @@ -74,7 +76,8 @@ let buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. - ++ lib.optional withPerl perl; + ++ lib.optional withPerl perl + ++ lib.optional withZlib zlib; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -141,6 +144,7 @@ let # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. ++ lib.optional static "no-ct" + ++ lib.optional withZlib "zlib" ; makeFlags = [ @@ -204,20 +208,27 @@ let fi ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; + pkgConfigModules = [ + "libcrypto" + "libssl" + "openssl" + ]; platforms = platforms.all; } // extraMeta; - }; + }); in { openssl_1_1 = common { - version = "1.1.1s"; - sha256 = "sha256-xawB52Dub/Dath1rK70wFGck0GPrMiGAxvGKb3Tktqo="; + version = "1.1.1t"; + sha256 = "sha256-je6bJL2x3L8MPR6bAvuPa/IhZegH9Fret8lndTaFnTs="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -229,8 +240,8 @@ in { }; openssl_3 = common { - version = "3.0.7"; - sha256 = "sha256-gwSdBComDmlvYkBqxcCL9wb9hDg/lFzyG9YentlcOW4="; + version = "3.0.8"; + sha256 = "sha256-bBPSvzj98x6sPOKjRwc2c/XWMmM5jx9p0N9KQSU+Sz4="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -241,9 +252,6 @@ 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 46bbc079aeb81..9511f4f56f7ef 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-ejxQ5mGIIrEa/rAfkTrRbIRerrAvEPoWn7e0lIqS1JQ="; + sha256 = "sha256-pYD2HxAszE9Ux1xsSJ7s2R13U8ct5tDo3ZP7H0+F9Rc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/openvino/cmake.patch b/pkgs/development/libraries/openvino/cmake.patch new file mode 100644 index 0000000000000..0918baba918f3 --- /dev/null +++ b/pkgs/development/libraries/openvino/cmake.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/developer_package/linux_name.cmake b/cmake/developer_package/linux_name.cmake +index 3e8c775770..2d5e00fb8b 100644 +--- a/cmake/developer_package/linux_name.cmake ++++ b/cmake/developer_package/linux_name.cmake +@@ -6,25 +6,7 @@ include(target_flags) + + if(LINUX) + function(get_linux_name res_var) +- if(EXISTS "/etc/lsb-release") +- # linux version detection using cat /etc/lsb-release +- file(READ "/etc/lsb-release" release_data) +- set(name_regex "DISTRIB_ID=([^ \n]*)\n") +- set(version_regex "DISTRIB_RELEASE=([0-9]+(\\.[0-9]+)?)") +- else() +- execute_process(COMMAND find -L /etc/ -maxdepth 1 -type f -name *-release -exec cat {} \; +- OUTPUT_VARIABLE release_data +- RESULT_VARIABLE result) +- string(REPLACE "Red Hat" "CentOS" release_data "${release_data}") +- set(name_regex "NAME=\"([^ \"\n]*).*\"\n") +- set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") +- endif() +- +- string(REGEX MATCH ${name_regex} name ${release_data}) +- set(os_name ${CMAKE_MATCH_1}) +- +- string(REGEX MATCH ${version_regex} version ${release_data}) +- set(os_name "${os_name} ${CMAKE_MATCH_1}") ++ set(os_name "NixOS @version@") + + if(os_name) + set(${res_var} ${os_name} PARENT_SCOPE) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index e3ebb97cbdff4..2f8ecd5fc81e5 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -1,115 +1,167 @@ { lib -, addOpenGLRunpath -, autoPatchelfHook , stdenv , fetchFromGitHub , fetchpatch +, fetchurl +, substituteAll + +# build +, addOpenGLRunpath +, autoPatchelfHook , cmake , git +, libarchive +, pkg-config +, python +, shellcheck + +# runtime +, libusb1 +, libxml2 +, opencv , protobuf +, pugixml , tbb -, opencv -, unzip -, shellcheck -, srcOnly -, python -, enablePython ? false }: let + # See FIRMWARE_PACKAGE_VERSION in src/plugins/intel_myriad/myriad_dependencies.cmake + myriad_firmware_version = "20221129_35"; + myriad_usb_firmware = fetchurl { + url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_${myriad_firmware_version}.zip"; + hash = "sha256-HKNWbSlMjSafOgrS9WmenbsmeaJKRVssw0NhIwPYZ70="; + }; + myriad_pcie_firmware = fetchurl { + url = "https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_${myriad_firmware_version}.zip"; + hash = "sha256-VmfrAoKQ++ySIgAxWQul+Hd0p7Y4sTF44Nz4RHpO6Mo="; + }; - onnx_src = srcOnly { - name = "onnx-patched"; - src = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - rev = "v1.8.1"; - sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA="; - }; - patches = [ - # Fix build with protobuf 3.18+ - # Remove with onnx 1.9 release - (fetchpatch { - url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch"; - sha256 = "0vdsrklkzhdjaj8wdsl4icn93q3961g8dx35zvff0nhpr08wjb7y"; - }) - ]; + # See GNA_VERSION in cmake/dependencies.cmake + gna_version = "03.00.00.1910"; + gna = fetchurl { + url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; + hash = "sha256-iU3bwK40WfBFE7hTsMq8MokN1Oo3IooCK2oyEBvbt/g="; }; + tbbbind_version = "2_5"; + tbbbind = fetchurl { + url = "https://download.01.org/opencv/master/openvinotoolkit/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v2.tgz"; + hash = "sha256-hl54lMWEAiM8rw0bKIBW4OarK/fJ0AydxgVhxIS8kPQ="; + }; in + stdenv.mkDerivation rec { pname = "openvino"; - version = "2021.2"; + version = "2022.3.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; - rev = version; - sha256 = "pv4WTfY1U5GbA9Yj07UOLQifvVH3oDfWptxxYW5IwVQ="; + rev = "refs/tags/${version}"; fetchSubmodules = true; + hash = "sha256-Ie58zTNatiYZZQJ8kJh/+HlSetQjhAtf2Us83z1jGv4="; }; + outputs = [ + "out" + "python" + ]; + + nativeBuildInputs = [ + addOpenGLRunpath + autoPatchelfHook + cmake + git + libarchive + pkg-config + (python.withPackages (ps: with ps; [ + cython + pybind11 + setuptools + ])) + shellcheck + ]; + + patches = [ + (substituteAll { + src = ./cmake.patch; + inherit (lib) version; + }) + ]; + + postPatch = '' + mkdir -p temp/vpu/firmware/{pcie,usb}-ma2x8x + pushd temp/vpu/firmware + bsdtar -xf ${myriad_pcie_firmware} -C pcie-ma2x8x + echo "${myriad_pcie_firmware.url}" > pcie-ma2x8x/ie_dependency.info + bsdtar -xf ${myriad_usb_firmware} -C usb-ma2x8x + echo "${myriad_usb_firmware.url}" > usb-ma2x8x/ie_dependency.info + popd + + mkdir -p temp/gna_${gna_version} + pushd temp/ + bsdtar -xf ${gna} + autoPatchelf gna_${gna_version} + echo "${gna.url}" > gna_${gna_version}/ie_dependency.info + popd + + mkdir -p temp/tbbbind_${tbbbind_version} + pushd temp/tbbbind_${tbbbind_version} + bsdtar -xf ${tbbbind} + echo "${tbbbind.url}" > ie_dependency.info + popd + ''; + dontUseCmakeBuildDir = true; cmakeFlags = [ - "-DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL=ON" - "-DFETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON" - "-DFETCHCONTENT_SOURCE_DIR_EXT_ONNX:STRING=${onnx_src}" - "-DENABLE_VPU:BOOL=OFF" - "-DTBB_DIR:STRING=${tbb}" + "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" + "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" + "-DENABLE_LTO:BOOL=ON" + # protobuf + "-DENABLE_SYSTEM_PROTOBUF:BOOL=OFF" + "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" + # tbb + "-DENABLE_SYSTEM_TBB:BOOL=ON" + # opencv "-DENABLE_OPENCV:BOOL=ON" - "-DOPENCV:STRING=${opencv}" - "-DENABLE_GNA:BOOL=OFF" - "-DENABLE_SPEECH_DEMO:BOOL=OFF" + "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/" + # pugixml + "-DENABLE_SYSTEM_PUGIXML:BOOL=ON" + # onednn + "-DENABLE_ONEDNN_FOR_GPU:BOOL=OFF" + # intel gna + "-DENABLE_INTEL_GNA:BOOL=ON" + # python + "-DENABLE_PYTHON:BOOL=ON" + # tests + "-DENABLE_CPPLINT:BOOL=OFF" "-DBUILD_TESTING:BOOL=OFF" - "-DENABLE_CLDNN_TESTS:BOOL=OFF" - "-DNGRAPH_INTERPRETER_ENABLE:BOOL=ON" - "-DNGRAPH_TEST_UTIL_ENABLE:BOOL=OFF" - "-DNGRAPH_UNIT_TEST_ENABLE:BOOL=OFF" "-DENABLE_SAMPLES:BOOL=OFF" - "-DENABLE_CPPLINT:BOOL=OFF" - ] ++ lib.optionals enablePython [ - "-DENABLE_PYTHON:BOOL=ON" ]; - preConfigure = '' - # To make install openvino inside /lib instead of /python - substituteInPlace inference-engine/ie_bridges/python/CMakeLists.txt \ - --replace 'DESTINATION python/''${PYTHON_VERSION}/openvino' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino' \ - --replace 'DESTINATION python/''${PYTHON_VERSION}' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino' - substituteInPlace inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt \ - --replace 'python/''${PYTHON_VERSION}/openvino/inference_engine' 'lib/''${PYTHON_VERSION}/site-packages/openvino/inference_engine' - - # Used to download OpenCV based on Linux Distro and make it use system OpenCV - substituteInPlace inference-engine/cmake/dependencies.cmake \ - --replace 'include(linux_name)' ' ' \ - --replace 'if (ENABLE_OPENCV)' 'if (ENABLE_OPENCV AND NOT DEFINED OPENCV)' - - cmakeDir=$PWD - mkdir ../build - cd ../build - ''; - - autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; - - nativeBuildInputs = [ - cmake - autoPatchelfHook - addOpenGLRunpath - unzip + autoPatchelfIgnoreMissingDeps = [ + "libngraph_backend.so" ]; buildInputs = [ - git - protobuf + libusb1 + libxml2 opencv - python + protobuf + pugixml tbb - shellcheck - ] ++ lib.optionals enablePython (with python.pkgs; [ - cython - pybind11 - ]); + ]; + + enableParallelBuilding = true; + + postInstall = '' + pushd $out/python/python${lib.versions.majorMinor python.version} + mkdir -p $python + mv ./* $python/ + popd + rm -r $out/python + ''; postFixup = '' # Link to OpenCL @@ -130,8 +182,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = (stdenv.isLinux && stdenv.isx86_64) # at 2022-09-23 - || stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index e896717644aa4..cf75de2bf6f3c 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,13 +15,13 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; + hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; }; # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e6d9a6d7b89dc..50e2d5736ff0e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -16,15 +16,16 @@ , ninja , glib , python3 -, gobject-introspection , x11Support? !stdenv.isDarwin, libXft +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages, gobject-introspection }: stdenv.mkDerivation rec { pname = "pango"; version = "1.50.12"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -39,15 +40,15 @@ stdenv.mkDerivation rec { meson ninja glib # for glib-mkenum pkg-config - gobject-introspection - gi-docgen python3 + ] ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection ]; buildInputs = [ fribidi libthai - gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon @@ -65,9 +66,9 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" - ] ++ lib.optionals (!x11Support) [ - "-Dxft=disabled" # only works with x11 + (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "xft" x11Support) ]; # Fontconfig error: Cannot load default config file @@ -117,6 +118,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 95acc77922eee..04aa6c7afbc92 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 bbc2bd8cc6f32..385288ffdcbc3 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 c4bbcf2ddfd63..8bc1055279fa0 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/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 73c27e9d8c1bc..e0614c737417d 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"; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = let gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" (with gst_all_1; [ diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 877bf973194a2..48f4729ba16db 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}"; @@ -52,7 +50,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = "-fPIC"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 512398dde9a16..105a6b4953f77 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.in \ --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib" - '' + (if stdenv.isDarwin then '' + '' + (lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile.in \ --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib" - '' else ""); + ''); enableParallelBuilding = false; # broken diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index 8eae6fcaad55c..b589524113d2c 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr'; # libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "FORTRANOPTIONS=$(FFLAGS)" diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index a8d853a23b044..b3ba508220f50 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.3"; + version = "2.4.6.4"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-/NAH8RsQukryjQJyIrYxSNDrRP96CC7uNTvfkh+caEo="; + hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc="; }; prePatch = '' diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 60b5a0b581dc2..00f548806fc5e 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -9,6 +9,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; }; + patches = [ + # avoid silent compilation failures + (fetchpatch { + name = "lhapdf-propagate_returncode.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; + hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; + }) + + # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin + (fetchpatch { + name = "lhapdf-Wl_stack_size.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; + hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; + }) + ]; + # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index e7ecefb59c245..c477f98ae7b94 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; # 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"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite"; meta = { homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 991d2e661f144..8b5f33599cd2c 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E="; + sha256 = "sha256-p69go8KXQR21szPb+R1xuonyFj+ZJDunNeoU7M3zIsE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 4cf69bb795b14..b6f12e7f530d1 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "pinocchio"; - version = "2.6.14"; + version = "2.6.17"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-3dPGeWnIVIErLnd+mxwudTj4qHyN2k7H94EsHYmKV1I="; + hash = "sha256-P/2cwFMtVaxT+qt2RDa7qjUIFjDBJ7U6epRFahOKux4="; }; # error: use of undeclared identifier '__sincos' diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index 422bcb3e675b1..cf2448bddfcbc 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { # Workaround build on gcc-10+ and clang11+: # spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): # multiple definition of `spa_a2dp_sink_factory' - NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; mesonFlags = [ "-Ddocs=true" diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7dbb72d9833bd..29db9019b11c9 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , buildPackages , fetchFromGitLab +, fetchpatch , python3 , meson , ninja @@ -60,6 +61,8 @@ , x11Support ? true , libcanberra , xorg +, mysofaSupport ? true +, libmysofa }: let @@ -67,7 +70,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.64"; + version = "0.3.66"; outputs = [ "out" @@ -85,7 +88,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc="; + sha256 = "sha256-qx4mgNRhMdha+8ap+FhVfxpsHE9TcTx29uwQIHLyMHA="; }; patches = [ @@ -103,6 +106,7 @@ let ./0095-spa-data-dir.patch ]; + strictDeps = true; nativeBuildInputs = [ docutils doxygen @@ -111,6 +115,7 @@ let ninja pkg-config python3 + glib ]; buildInputs = [ @@ -136,7 +141,8 @@ let ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit - ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; + ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] + ++ lib.optional mysofaSupport libmysofa; # Valgrind binary is required for running one optional test. nativeCheckInputs = lib.optional withValgrind valgrind; @@ -171,7 +177,9 @@ let "-Dsession-managers=" "-Dvulkan=enabled" "-Dx11=${mesonEnableFeature x11Support}" + "-Dlibmysofa=${mesonEnableFeature mysofaSupport}" "-Dsdl2=disabled" # required only to build examples, causes dependency loop + "-Drlimits-install=false" # installs to /etc, we won't use this anyway ]; # Fontconfig error: Cannot load default config file @@ -222,6 +230,7 @@ let "nix-support/jack.conf.json" "nix-support/minimal.conf.json" "nix-support/pipewire.conf.json" + "nix-support/pipewire-aes67.conf.json" "nix-support/pipewire-pulse.conf.json" ]; paths-lib = [ @@ -237,7 +246,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/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 74e4f6c5100d5..d749744d51ede 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/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 8ed0c7a744be2..5479502abb233 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }: stdenv.mkDerivation rec { pname = "platform-folders"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix deleted file mode 100644 index 1f02bfa0dab30..0000000000000 --- a/pkgs/development/libraries/pmdk/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoconf, libndctl, pkg-config, gnum4, pandoc -}: - -stdenv.mkDerivation rec { - pname = "pmdk"; - version = "1.11.1"; - - src = fetchFromGitHub { - owner = "pmem"; - repo = "pmdk"; - rev = "refs/tags/${version}"; - hash = "sha256-8bnyLtgkKfgIjJkfY/ZS1I9aCYcrz0nrdY7m/TUVWAk="; - }; - - nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ]; - buildInputs = [ libndctl ]; - enableParallelBuilding = true; - - outputs = [ "out" "lib" "dev" "man" ]; - - patchPhase = "patchShebangs utils"; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - installPhase = '' - make install prefix=$out - - mkdir -p $lib $dev $man/share - mv $out/share/man $man/share/man - mv $out/include $dev/include - mv $out/lib $lib/lib - ''; - - meta = with lib; { - description = "Persistent Memory Development Kit"; - homepage = "https://github.com/pmem/pmdk"; - license = licenses.lgpl21; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = [ "x86_64-linux" ]; # aarch64 is experimental - }; -} diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 7791973bb1272..1f16ba86b3ba2 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/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index c4aab614915c2..1243763421c08 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://podofo.sourceforge.net"; + homepage = "https://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 5c67eb1b65db4..ec05f890f7794 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection expat pam dbus diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix index cdfd376add1c2..a0f0846069069 100644 --- a/pkgs/development/libraries/poly2tri-c/default.nix +++ b/pkgs/development/libraries/poly2tri-c/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { glib ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "--std=gnu99" "-Wno-error" ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index ccae3037e092f..d99e5150678e2 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg="; + hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 22ff1e450c192..589cf7cdf95c0 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , alsa-lib +, libjack2 , pkg-config , which , AudioUnit @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config which ]; - buildInputs = lib.optional (!stdenv.isDarwin) alsa-lib; + buildInputs = [ libjack2 ] ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib ]; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 01ab32577cb26..28b5c3fa85e13 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ]); nativeBuildInputs = [ cmake gcc ]; buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ]; diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/development/libraries/prime-server/default.nix index 4f30a9f005c92..946fbb0dff18b 100644 --- a/pkgs/development/libraries/prime-server/default.nix +++ b/pkgs/development/libraries/prime-server/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl zeromq czmq libsodium ]; # https://github.com/kevinkreiser/prime_server/issues/95 - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-variable" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=unused-variable" ]; meta = with lib; { description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq"; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 1dc4a3a838b5c..e6675ae995079 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -12,6 +12,7 @@ , gtest , nlohmann_json , python3 +, cacert }: stdenv.mkDerivation (finalAttrs: rec { @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ sqlite libtiff curl nlohmann_json ]; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ cacert gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix index 938d16d3776e9..f9f580c9717ce 100644 --- a/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/pkgs/development/libraries/prometheus-client-c/default.nix @@ -48,7 +48,7 @@ let # ld: CMakeFiles/prom.dir/src/prom_process_stat.c.o:(.bss+0x0): multiple definition of # `prom_process_start_time_seconds'; CMakeFiles/prom.dir/src/prom_collector.c.o:(.bss+0x0): first defined here # Should be fixed in 1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' cd ${subdir} diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 207017b5edd5e..dfe2a6d7a965d 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -79,7 +79,12 @@ let "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ]; + ] + # Tests fail to build on 32-bit platforms; fixed in 3.22 + # https://github.com/protocolbuffers/protobuf/issues/10418 + ++ lib.optional + (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") + "-Dprotobuf_BUILD_TESTS=OFF"; # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail doCheck = false; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 130f681d84967..cbe669ffd377f 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -53,8 +53,6 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { mainProgram = "protoc"; platforms = lib.platforms.unix; }; - - passthru.version = version; }; in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) then (mkProtobufDerivation null buildPackages.stdenv) diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d10ebbdd4b772..67d916dd14ee4 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 ]; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 4a288702e2f29..fb5c7570b75ba 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -1,5 +1,5 @@ { stdenv -, gcc11Stdenv +, gcc12Stdenv , lib , fetchFromGitHub , cmake @@ -9,7 +9,7 @@ , wrapQtAppsHook }: -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "qcoro"; version = "0.7.0"; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 2c62ea27d19b4..51e91499cbdba 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qca-qt5 ]; nativeBuildInputs = [ qmake ]; - NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; + env.NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 816b75039612d..68a300ac250dd 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = toString ( + env.NIX_CFLAGS_COMPILE = toString ( # with gcc7 the warnings blow the log over Hydra's limit [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 0e1e2bbe66a75..31de73b25edcf 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -64,6 +64,12 @@ let extraPrefix = "src/3rdparty/"; hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA="; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-gcc12.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + hash = "sha256-s4GsGMJTBNWw2gTJuIEP3tqT82AmTsR2mbj59m2p6rM="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch @@ -204,7 +210,8 @@ let ++ lib.optional (stdenv.isDarwin) qtmacextras); qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; + name = "qmake-hook"; + propagatedBuildInputs = [ self.qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; @@ -212,7 +219,8 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { - deps = [ self.qtbase.dev buildPackages.makeWrapper ] + name = "wrap-qt5-apps-hook"; + propagatedBuildInputs = [ 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 dcada3649078b..7225b432c574c 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/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 229bfabbece2c..3f6c616c39487 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -2,7 +2,7 @@ "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", "rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2", - "sha256": "0lh05j21acs8wz72g4cs092m1yglpbjkhh55ww1351fjrp5gbzrg" + "sha256": "13ixg0gx7sp90k0db2xn7r2rj1w3zw3vs84pav0v8fwfvph9ki98" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "9cf586d629a04040c9414c4f9e17abbc65c644eb", - "sha256": "1jvm92m3jz34yvzyn4vnihga2phpgszb2wqk0y7pr0ww6vs9kaf6" + "rev": "fa8dee92201448cc4eaa92f222b93d0b044d8ea5", + "sha256": "16b0q0anlgmfzbdm0jyakb8cxikrr295pj7avzny26x9609lzqga" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -36,8 +36,8 @@ }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9", - "sha256": "0xzdnrhqalsrc52a326c5baf3si815a4rb2p1a4djyf8anp9wcai" + "rev": "05c3f4921d81fb1b0eb497515c24ae56221d1e0a", + "sha256": "0101bbpnrj4rp51dcnn2gjcq7vw55g4c8y4lmg2nd5g69whmkl1c" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", @@ -62,7 +62,7 @@ "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", "rev": "f991e28cb0a670597f1955585c76ce8a26ce9e4b", - "sha256": "1vflnscqc0jidr68v5ikxr579rx7k5yhdik8dcmnfgvmz3fq4jlz" + "sha256": "0bvxjciisq2hixhbxxs68zdwfdyvljy8iq48rnwpynqsdrhh5rma" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", @@ -92,7 +92,7 @@ "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", "rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c", - "sha256": "1w4f02kch7p2jhn6dlzks6jpfcsm9ik04jnnaw6qvpxpsxwvcaah" + "sha256": "0kfwkxln3yz0c5rd1kfjmw0y2drwm1gg2s7f52kajfvg4274ha9c" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", @@ -181,8 +181,8 @@ }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "63fb8da1ecf8e48262cd515690cf71a425f92bf5", - "sha256": "0kjw5dsgn67897laana4h06czr9g8555jiqf1k3pkzv4fxzcqypn" + "rev": "90f3590c3c49a0820462af9a778dd13d8df42244", + "sha256": "1dxc3imh8455vy3pggrzjflb2v5382q9ha2fwplybxawld9wdw45" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", @@ -202,6 +202,6 @@ "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", "rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f", - "sha256": "1hjw5ymbc1fl4r4lym7n7ilmb953izmvyp6z8g5l8l7cz9sjz4ka" + "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 4bc04dbefd01e..0603ae077e478 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -14,7 +14,7 @@ let fetchgit { inherit (args) url rev sha256; fetchLFS = false; - fetchSubmodules = false; + fetchSubmodules = true; deepClone = false; leaveDotGit = false; }; @@ -22,19 +22,6 @@ let in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) // { - qt3d = { - inherit version; - src = fetchgit { - url = "https://invent.kde.org/qt/qt/qt3d.git"; - rev = "c3c7e6ebc29cce466d954f72f340a257d76b5ec2"; - sha256 = "sha256-KMWZ4N2OO7TBVpcgvQf/gweZRT62i9XABOnq0x94PY4="; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; - }; - # qtwebkit does not have an official release tarball on the qt mirror and is # mostly maintained by the community. qtwebkit = rec { @@ -55,7 +42,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) qtwebengine = let - branchName = "5.15.11"; + branchName = "5.15.12"; rev = "v${branchName}-lts"; in { @@ -63,7 +50,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "sha256-yrKPof18G10VjrwCn/4E/ywlpATJQZjvmVeM+9hLY0U="; + sha256 = "sha256-8EQqSvxw9rqf+64CIbcCb1VXhNx1GNC8eDIgLyYDyvk="; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index c085cdaca52ea..2127be5e0a2a0 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -34,7 +34,7 @@ qtHostPathHook() { qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir") fi } -addEnvHooks "$hostOffset" qtHostPathHook +addEnvHooks "$targetOffset" qtHostPathHook makeQtWrapper() { local original="$1" diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index 918eba5b71072..98d11864e452c 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -5,5 +5,5 @@ qtModule { qtInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; + env.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 44f72701854cc..ef1192e6b106f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -24,13 +24,14 @@ , debug ? false , developerBuild ? false , decryptSslTraffic ? false +, testers }: let debugSymbols = debug || developerBuild; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "qtbase"; inherit qtCompatVersion src version; debug = debugSymbols; @@ -175,7 +176,7 @@ stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' @@ -338,12 +339,33 @@ stdenv.mkDerivation { setupHook = ../hooks/qtbase-setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; + pkgConfigModules = [ + "Qt5Concurrent" + "Qt5Core" + "Qt5DBus" + "Qt5Gui" + "Qt5Network" + "Qt5OpenGL" + "Qt5OpenGLExtensions" + "Qt5PrintSupport" + #"Qt5Qml" + #"Qt5QmlModels" + #"Qt5Quick" + #"Qt5QuickTest" + #"Qt5QuickWidgets" + "Qt5Sql" + "Qt5Test" + "Qt5Widgets" + "Qt5Xml" + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 89d96eb29124f..93f3e130ee74b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -3,5 +3,5 @@ qtModule { pname = "qtserialport"; qtInputs = [ qtbase ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 27008f6714ed3..be96236d72850 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -36,7 +36,7 @@ qtModule { "bin/macdeployqt" ]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 6e4fb476d491c..bebfe37f686eb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -102,7 +102,7 @@ qtModule { --replace "-Wl,-fatal_warnings" "" '') + postPatch; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit "-Wno-class-memaccess" ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ @@ -111,7 +111,7 @@ qtModule { "-march=westmere" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-elaborated-enum-base" - ]; + ]); preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index cc2644edd4e68..a70ebd3fb74fc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -35,7 +35,7 @@ qtModule { "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString ([ # with gcc7 this warning blows the log over Hydra's limit "-Wno-expansion-to-defined" ] @@ -43,7 +43,7 @@ qtModule { ++ lib.optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit ++ lib.optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ lib.optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''; + ++ lib.optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''); doCheck = false; # fails 13 out of 13 tests (ctest) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 9664f005d7ee5..2577806b5c436 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -140,11 +140,13 @@ let }; wrapQtAppsHook = makeSetupHook { - deps = [ buildPackages.makeWrapper ]; + name = "wrap-qt6-apps-hook"; + propagatedBuildInputs = [ buildPackages.makeWrapper ]; } ./hooks/wrap-qt-apps-hook.sh; qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; + name = "qmake6-hook"; + propagatedBuildInputs = [ self.qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index ae89c223d2dff..e71b0a7613d99 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -253,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" @@ -271,7 +276,8 @@ stdenv.mkDerivation rec { # fixup .pc file (where to find 'moc' etc.) if [ -f "$dev/lib/pkgconfig/Qt6Core.pc" ]; then sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ - -e "/^bindir=/ c bindir=$dev/bin" + -e "/^bindir=/ c bindir=$dev/bin" \ + -e "/^libexecdir=/ c libexecdir=$dev/libexec" fi patchShebangs $out $dev diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 96ea3d18bab6d..5372def8aea1c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -30,7 +30,7 @@ qtModule { ++ lib.optionals stdenv.isLinux [ gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.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 94e6cb9920c56..34c17fc034538 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -8,6 +8,6 @@ qtModule { pname = "qtquick3dphysics"; qtInputs = [ qtbase qtquick3d ]; - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-faligned-allocation"; } diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index 16a7fc0c89d3a..e913cee041f42 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -14,7 +14,7 @@ qtModule { patches = [ ../patches/qttools-paths.patch ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DNIX_OUTPUT_DEV=\"${placeholder "dev"}\"" ]; diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 36e1948f09ec9..7807e41b606e3 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i"; }; - NIX_CFLAGS_COMPILE="-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; configurePhase = '' ./configure -prefix $out diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index b52837aa17056..1c39c004447e6 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.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + hash = "sha256-5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index f50f47413b4a9..4d0cbafe37318 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.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + sha256 = "5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix new file mode 100644 index 0000000000000..d2cda30b5da7d --- /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 f43a917665247..4221d24679c3b 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.2.313"; + version = "1.2.335"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-l8i/s9OuG9Fz+i1PcdSqP9X8stY6LTUcIfdE2gaePac="; + sha256 = "sha256-f9b6vDiE/CDsPE8/AseWVTXPZH14wOQtUskMv42Xhcg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 5676f54d4f359..a9c07232035f9 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.7+quic1"; + version = "3.0.8+quic"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${version}"; - sha256 = "sha256-ZRS0ZV+/U4PD2lVE+PsUAWSuk5EFg5mOKYlwgY3Ecus="; + sha256 = "sha256-6t23EY+Gk/MvLOcYpDbL5jEr0rMaaPYOsc+12WFgv1c="; }; patches = [ diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 4867c67277d89..aede57810aa2f 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i"; + sha256 = "sha256-6iI+s+iSKK8TeocvyOxou7cF9ZXlWr5prUbPhoHOoSM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index b5324abd6ced3..a500e5dbc045c 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rabbitmq-c"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "sha256-u1uOrZRiQOU/6vlLdQHypBRSCo3zw7FC1AI9v3NlBVE="; + sha256 = "sha256-4tSZ+eaLZAkSmFsGnIrRXNvn3xA/4sTKyYZ3hPUMcd0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 0fc885033e64e..e2dd81b13877c 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.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-qDLAEhknY+BB83OC6tfi7w/ZY/K492J5ZglLNUoBwbc="; + hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; @@ -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 diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 989a88f111e3b..b67824b5cc55b 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" - ]; - - nativeCheckInputs = [ - gtest - ]; - - checkPhase = '' - runHook preCheck - - ctest -E '.*valgrind.*' - - runHook postCheck - ''; + # 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" ]; - 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/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 2a00d96761003..5bacc5784355b 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.9.2"; + version = "2.0.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-G6rTvb2Z2O1Df5/6upEB9Eh049sx+LWhhDKvsZdDqsc="; + sha256 = "sha256-iEW+n1PSnDoCzQCVfl4T1nchc0kL2q/M3jKNYW2f9/8="; }; nativeBuildInputs = [ pkg-config python3 which ]; buildInputs = [ zlib zstd openssl ]; - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; postPatch = '' patchShebangs . diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index dafc91e6dcfa6..8b6d945d25529 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-12-01"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-RmPXfavSKVnnl/RJ5aTjc/GbkPz+EXiFg1n5e4s6wjw="; + hash = "sha256-YENgO5Ig6SLNdGEsdhKNb4THhocyAv1MMcg4FVYBB7U="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index 8cc4e35044087..3d4e8a5a66411 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-U__ARM_NEON__"; meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index ce76d92301f05..a27e93c4c35d5 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60="; + hash = "sha256-XhYpzBXviMnUdbF6lZi9g0LARKpzWLtDxJxLI3MuHiM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index b6a7b113d0a8e..4137050f5d26b 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocclr"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-tYFoGafOsJYnRQaOLAaFix6tPD0QPTidOtOicPxP2Vk="; + hash = "sha256-DbN7kL8oyaPeYQB19Q96L3wX66v62TMSWl0Yor7Q4kE="; }; patches = [ diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 375e6a7b432e0..986a34e9b1a69 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -19,9 +19,10 @@ }: let - rocfft = stdenv.mkDerivation (finalAttrs: { + # This is over 3GB, to allow hydra caching we separate it + rf = stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -35,7 +36,7 @@ let owner = "ROCmSoftwarePlatform"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-NsYeEoBQ/0z31ZQ32l7N+qavWEVkH37snkTHntot7nE="; + hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk="; }; nativeBuildInputs = [ @@ -112,29 +113,26 @@ let }; }); - rocfft-zero = runCommand "rocfft-zero" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-0* $out + rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-one = runCommand "rocfft-one" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-1* $out + rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-two = runCommand "rocfft-two" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-2* $out + rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-three = runCommand "rocfft-three" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-3* $out + rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; in stdenv.mkDerivation { - inherit (rocfft) pname version outputs src passthru meta; + inherit (rf) pname version outputs src passthru meta; dontUnpack = true; + dontPatch = true; dontConfigure = true; dontBuild = true; @@ -142,17 +140,34 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/lib - - for path in ${rocfft-zero} ${rocfft-one} ${rocfft-two} ${rocfft-three}; do - cp -as $path/* $out/lib - done - - cp -an ${rocfft}/* $out + 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 ${rocfft.test} $test + cp -a ${rf.test} $test '' + lib.optionalString buildBenchmarks '' - cp -a ${rocfft.benchmark} $benchmark + 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 057baafdc610d..4b7bd0b9fd945 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -8,7 +9,9 @@ , snappy , zlib , zstd -, enableJemalloc ? false, jemalloc +, windows +, enableJemalloc ? false +, jemalloc , enableLite ? false , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support @@ -29,15 +32,24 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - buildInputs = lib.optional enableJemalloc jemalloc; + buildInputs = lib.optional enableJemalloc jemalloc + ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads; 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"; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + "-Wno-error=deprecated-copy" + "-Wno-error=pessimizing-move" + # Needed with GCC 12 + "-Wno-error=format-truncation" + "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=unused-private-field" + "-faligned-allocation" + ]); cmakeFlags = [ "-DPORTABLE=1" @@ -65,7 +77,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $tools/bin - cp tools/{ldb,sst_dump} $tools/bin/ + cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $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) '' diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 8ec90b1f1e277..d475a9f9dce27 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -15,7 +15,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 3fba6da7f537e..fa60a4d3f9e46 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -14,7 +14,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 114245b7d7150..225236b0a961f 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 345a8c8d25d6d..d10f7811ccbb1 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.4.1"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index a083f57722db5..f22a72ac2b3e9 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 119153187f9fd..9b6ed7edc476a 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-VGTrMllQguIJKexdQNXC07KX7TxU/e5oT6VZdlSRcQY="; + hash = "sha256-Sqr3lbDMK1Gwucqmr/CHoxw/L6bGj3wlXoHzKTnTqoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix index 1b83ba1e28dd1..5128e17376c39 100644 --- a/pkgs/development/libraries/rocrand/default.nix +++ b/pkgs/development/libraries/rocrand/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5kqVLUINYk8WjnRJ+LqUiCPjLIHcbvIL0Z6BRsj9hvY="; + hash = "sha256-xK1JRTW+7odlXRQV9WC6ZfXqRKow/TQ9grHCigw+/us="; fetchSubmodules = true; # For inline hipRAND }; diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 9255e4f38f4ab..d821ee6938808 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo="; + hash = "sha256-jzHD55c4rlPab5IAj2UzHTJI9MKhTfevsLthSZKOEzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix index ee844bb417ba9..a81f7dc189614 100644 --- a/pkgs/development/libraries/roctracer/default.nix +++ b/pkgs/development/libraries/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -62,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + postPatch = '' export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode '' + lib.optionalString (!buildTests) '' diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix index 611f881e866b5..08667b6d3c929 100644 --- a/pkgs/development/libraries/rocwmma/default.nix +++ b/pkgs/development/libraries/rocwmma/default.nix @@ -36,7 +36,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" diff --git a/pkgs/development/libraries/rustc-demangle/Cargo.lock b/pkgs/development/libraries/rustc-demangle/Cargo.lock new file mode 100644 index 0000000000000..0268b3bdd4631 --- /dev/null +++ b/pkgs/development/libraries/rustc-demangle/Cargo.lock @@ -0,0 +1,67 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arbitrary" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691" + +[[package]] +name = "cc" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" + +[[package]] +name = "compiler_builtins" +version = "0.1.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "rustc-demangle" +version = "0.1.20" +dependencies = [ + "compiler_builtins", + "rustc-std-workspace-core", +] + +[[package]] +name = "rustc-demangle-capi" +version = "0.1.0" +dependencies = [ + "rustc-demangle", +] + +[[package]] +name = "rustc-demangle-fuzz" +version = "0.0.0" +dependencies = [ + "libfuzzer-sys", + "rustc-demangle", +] + +[[package]] +name = "rustc-std-workspace-core" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c" diff --git a/pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch b/pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch deleted file mode 100644 index 66e8bead8a26b..0000000000000 --- a/pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..0268b3b ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,67 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "arbitrary" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691" -+ -+[[package]] -+name = "cc" -+version = "1.0.69" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" -+ -+[[package]] -+name = "compiler_builtins" -+version = "0.1.49" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2" -+ -+[[package]] -+name = "libfuzzer-sys" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3" -+dependencies = [ -+ "arbitrary", -+ "cc", -+ "once_cell", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.20" -+dependencies = [ -+ "compiler_builtins", -+ "rustc-std-workspace-core", -+] -+ -+[[package]] -+name = "rustc-demangle-capi" -+version = "0.1.0" -+dependencies = [ -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "rustc-demangle-fuzz" -+version = "0.0.0" -+dependencies = [ -+ "libfuzzer-sys", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "rustc-std-workspace-core" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c" diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/development/libraries/rustc-demangle/default.nix index e0329085bd56e..6dd6d46e30bb6 100644 --- a/pkgs/development/libraries/rustc-demangle/default.nix +++ b/pkgs/development/libraries/rustc-demangle/default.nix @@ -11,12 +11,17 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI="; }; - cargoPatches = [ + cargoLock = { # generated using `cargo generate-lockfile` since repo is missing lockfile - ./add-Cargo.lock.patch - ]; - cargoSha256 = "sha256-1tW5TOap5MstxTXAFij3IB8TIpI+FryEX9TXlVXjRl4="; + lockFile = ./Cargo.lock; + }; + cargoBuildFlags = [ "-p" "rustc-demangle-capi" ]; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + postInstall = '' mkdir -p $out/lib cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 20ad2b81ee143..ddf4257afeee0 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.33"; + version = "1.3.37"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MfVRAv5Ss+QMjY3IhFJakUO05w6j5WaAM0cCdtLIgAk="; + sha256 = "sha256-NqOr2R61s4aUjHWI2QkyLpxUm/+c4vkAUg+UDduu3j4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index c4faadd2a5eb9..7144a17c18b40 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { --replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/lib/firmware" "lib/firmware" done + + sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12 ''; cmakeFlags = [ 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 0000000000000..b8ea4a55291a8 --- /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 4fd4c0c130f07..0344559f8a8f4 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, 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 ]; - buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + 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 d2615b391ffc5..de419dc3d5751 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/harminv/default.nix b/pkgs/development/libraries/science/chemistry/harminv/default.nix new file mode 100644 index 0000000000000..54c0d03979ab3 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/harminv/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gfortran +, blas +, lapack +}: + +assert !blas.isILP64; +assert !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "harminv"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + }; + + # File is missing in the git checkout but required by autotools + postPatch = '' + touch ChangeLog + ''; + + nativeBuildInputs = [ autoreconfHook gfortran ]; + + buildInputs = [ blas lapack ]; + + configureFlags = [ "--enable-shared" ]; + + meta = with lib; { + description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; + homepage = "https://github.com/NanoComp/harminv"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/pkgs/development/libraries/science/chemistry/libGDSII/default.nix new file mode 100644 index 0000000000000..c3257bad3e264 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/libGDSII/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "libGDSII"; + version = "0.21"; + + src = fetchFromGitHub { + owner = "HomerReid"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + }; + + # File is missing in the repo but automake requires it + postPatch = '' + touch ChangeLog + ''; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Library and command-line utility for reading GDSII geometry files"; + homepage = "https://github.com/HomerReid/libGDSII"; + license = [ licenses.gpl2Only ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index cd105a1133d06..ad3bb4f6ecd0e 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "7.7.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-2PYUGTMVQ5qVDeeABrwR45U3JIgo2xMXKlD6da7y3Dw="; + hash = "sha256-89ngeZHdjyL/OoGuQ+F5eaXE1/od0EEfIgw9eKdLtL8="; }; # "This test is stochastic and may occassionally fail". It does. @@ -78,12 +78,15 @@ stdenv.mkDerivation rec { "-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + 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 + ${python3Packages.python.pythonForBuild.interpreter} setup.py build + ${python3Packages.python.pythonForBuild.interpreter} setup.py install --prefix=$out ''; postFixup = '' diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index a20f6973384ad..6ac453aec2c03 100644 --- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -10,13 +10,13 @@ mkDerivation { pname = "qcsxcad"; - version = "unstable-2020-01-04"; + version = "unstable-2023-01-06"; src = fetchFromGitHub { owner = "thliebig"; repo = "QCSXCAD"; - rev = "0dabbaf2bc1190adec300871cf309791af842c8e"; - sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn"; + rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6"; + hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index f040873028257..962e8e8e6acef 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -16,7 +16,7 @@ }: let - threadingSuffix = if withOpenMP then "-mt" else ""; + threadingSuffix = lib.optionalString withOpenMP "-mt"; blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "amd-blis"; diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index fe9fc540902d7..c5efbb757df8a 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/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index ac22faeabb02c..81e4b76f21c6b 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -1,169 +1,80 @@ +# Support matrix can be found at +# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html +# Type aliases +# Release = { +# version: String, +# minCudaVersion: String, +# maxCudaVersion: String, +# url: String, +# hash: String, +# } final: prev: let - inherit (final) callPackage; - inherit (prev) cudatoolkit cudaVersion lib pkgs; - inherit (prev.lib.versions) major; + inherit (prev) cudaVersion; + inherit (prev.lib) attrsets lists versions strings trivial; + + # Utilities + # majorMinorPatch :: String -> String + majorMinorPatch = (trivial.flip trivial.pipe) [ + (versions.splitVersion) + (lists.take 3) + (strings.concatStringsSep ".") + ]; + + # Compute versioned attribute name to be used in this package set + # computeName :: String -> String + computeName = version: "cudnn_${strings.replaceStrings ["."] ["_"] (majorMinorPatch version)}"; - ### CuDNN + # Check whether a CUDNN release supports our CUDA version + # Thankfully we're able to do lexicographic comparison on the version strings + # isSupported :: Release -> Bool + isSupported = release: + strings.versionAtLeast cudaVersion release.minCudaVersion + && strings.versionAtLeast release.maxCudaVersion cudaVersion; - buildCuDnnPackage = args: - let - useCudatoolkitRunfile = lib.versionOlder cudaVersion "11.3.999"; - in - callPackage ./generic.nix { inherit useCudatoolkitRunfile; } args; + # useCudatoolkitRunfile :: Bool + useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999"; - toUnderscore = str: lib.replaceStrings ["."] ["_"] str; + # buildCuDnnPackage :: Release -> Derivation + buildCuDnnPackage = callPackage ./generic.nix {inherit useCudatoolkitRunfile;}; - majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); + # Reverse the list to have the latest release first + # cudnnReleases :: List Release + cudnnReleases = lists.reverseList (builtins.import ./releases.nix); - cuDnnPackages = with lib; let - # Check whether a file is supported for our cuda version - isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; - # Return the first file that is supported. In practice there should only ever be one anyway. - supportedFile = files: findFirst isSupported null files; - # Supported versions with versions as keys and file as value - supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) cuDnnVersions); - # Compute versioned attribute name to be used in this package set - computeName = version: "cudnn_${toUnderscore version}"; - # Add all supported builds as attributes - allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildCuDnnPackage (removeAttrs file ["fileVersion"]))) supportedVersions; - # Set the default attributes, e.g. cudnn = cudnn_8_3_1; - defaultBuild = { "cudnn" = if allBuilds ? ${computeName cuDnnDefaultVersion} - then allBuilds.${computeName cuDnnDefaultVersion} - else throw "cudnn-${cuDnnDefaultVersion} does not support your cuda version ${cudaVersion}"; }; - in allBuilds // defaultBuild; + # Check whether a CUDNN release supports our CUDA version + # supportedReleases :: NonEmptyList Release + supportedReleases = let + filtered = builtins.filter isSupported cudnnReleases; + nonEmptyFiltered = + trivial.throwIf (filtered == []) + '' + CUDNN does not support your cuda version ${cudaVersion} + '' + filtered; + in + nonEmptyFiltered; - cuDnnVersions = let - urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn"; - in { - "7.4.2" = [ - rec { - fileVersion = "10.0"; - fullVersion = "7.4.2.24"; - hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-10.0-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "10.0" ]; - } - ]; - "7.6.5" = [ - rec { - fileVersion = "10.0"; - fullVersion = "7.6.5.32"; - hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "10.0" ]; - } - rec { - fileVersion = "10.1"; - fullVersion = "7.6.5.32"; - hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "10.1" ]; - } - rec { - fileVersion = "10.2"; - fullVersion = "7.6.5.32"; - hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "10.2" ]; - } - ]; - "8.1.1" = [ - rec { - fileVersion = "10.2"; - fullVersion = "8.1.1.33"; - hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "10.2" ]; - } - rec { - fileVersion = "11.2"; - fullVersion = "8.1.1.33"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "11.2" ]; - } - ]; - "8.3.2" = [ - rec { - fileVersion = "10.2"; - fullVersion = "8.3.2.44"; - hash = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "10.2" ]; - } - rec { - fileVersion = "11.5"; - fullVersion = "8.3.2.44"; - hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; - } - ]; - "8.4.0" = [ - rec { - fileVersion = "10.2"; - fullVersion = "8.4.0.27"; - hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "10.2" ]; - } - rec { - fileVersion = "11.6"; - fullVersion = "8.4.0.27"; - hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; - } - ]; - "8.5.0" = [ - rec { - fileVersion = "10.2"; - fullVersion = "8.5.0.96"; - hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "10.2" ]; - } - rec { - fileVersion = "11.7"; - fullVersion = "8.5.0.96"; - hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; - } - ]; - "8.6.0" = [ - rec { - fileVersion = "10.2"; - fullVersion = "8.6.0.163"; - hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "10.2" ]; - } - rec { - fileVersion = "11.8"; - fullVersion = "8.6.0.163"; - hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; - url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; - } - ]; + # The latest release is the first element of the list and will be our default choice + # latestReleaseName :: String + latestReleaseName = computeName (builtins.head supportedReleases).version; + + # Function to transform our releases into build attributes + # toBuildAttrs :: Release -> { name: String, value: Derivation } + toBuildAttrs = release: { + name = computeName release.version; + value = buildCuDnnPackage release; }; - # Default attributes - cuDnnDefaultVersion = { - "10.0" = "7.4.2"; - "10.1" = "7.6.5"; - "10.2" = "8.6.0"; - "11.0" = "8.6.0"; - "11.1" = "8.6.0"; - "11.2" = "8.6.0"; - "11.3" = "8.6.0"; - "11.4" = "8.6.0"; - "11.5" = "8.6.0"; - "11.6" = "8.6.0"; - "11.7" = "8.6.0"; - "11.8" = "8.6.0"; - }.${cudaVersion} or "8.6.0"; + # Add all supported builds as attributes + # allBuilds :: AttrSet String Derivation + allBuilds = builtins.listToAttrs (builtins.map toBuildAttrs supportedReleases); + + # The latest release will be our default build + # defaultBuild :: AttrSet String Derivation + defaultBuild.cudnn = allBuilds.${latestReleaseName}; -in cuDnnPackages + # builds :: AttrSet String Derivation + builds = allBuilds // defaultBuild; +in + builds diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 773d130ba7350..d4e1f641a956e 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,113 +1,128 @@ -{ stdenv -, lib -, zlib -, useCudatoolkitRunfile ? false -, cudaVersion -, cudaMajorVersion -, cudatoolkit # if cuda>=11: only used for .cc -, libcublas ? null # cuda <11 doesn't ship redist packages -, autoPatchelfHook -, autoAddOpenGLRunpathHook -, fetchurl -, # The distributed version of CUDNN includes both dynamically liked .so files, +{ + stdenv, + lib, + zlib, + useCudatoolkitRunfile ? false, + cudaVersion, + cudaMajorVersion, + cudatoolkit, # if cuda>=11: only used for .cc + libcublas ? null, # cuda <11 doesn't ship redist packages + autoPatchelfHook, + autoAddOpenGLRunpathHook, + fetchurl, + # The distributed version of CUDNN includes both dynamically liked .so files, # as well as statically linked .a files. However, CUDNN is quite large # (multiple gigabytes), so you can save some space in your nix store by # removing the statically linked libraries if you are not using them. # # Setting this to true removes the statically linked .a files. # Setting this to false keeps these statically linked .a files. - removeStatic ? false + removeStatic ? false, +}: { + version, + url, + hash, + minCudaVersion, + maxCudaVersion, }: - -{ fullVersion -, url -, hash -, supportedCudaVersions ? [ ] -}: - -assert useCudatoolkitRunfile || (libcublas != null); - -let +assert useCudatoolkitRunfile || (libcublas != null); let inherit (cudatoolkit) cc; + inherit (lib) lists strings trivial versions; - majorMinorPatch = version: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); - version = majorMinorPatch fullVersion; + # majorMinorPatch :: String -> String + majorMinorPatch = (trivial.flip trivial.pipe) [ + (versions.splitVersion) + (lists.take 3) + (strings.concatStringsSep ".") + ]; + # versionTriple :: String + # Version with three components: major.minor.patch + versionTriple = majorMinorPatch version; + + # cudatoolkit_root :: Derivation cudatoolkit_root = if useCudatoolkitRunfile then cudatoolkit else libcublas; in -stdenv.mkDerivation { - pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; - inherit version; + stdenv.mkDerivation { + pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; + version = versionTriple; - src = fetchurl { - inherit url hash; - }; + src = fetchurl { + inherit url hash; + }; - # Check and normalize Runpath against DT_NEEDED using autoPatchelf. - # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") - nativeBuildInputs = [ - autoPatchelfHook - autoAddOpenGLRunpathHook - ]; + # Check and normalize Runpath against DT_NEEDED using autoPatchelf. + # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; - # Used by autoPatchelfHook - buildInputs = [ - cc.cc.lib # libstdc++ - zlib - cudatoolkit_root - ]; + # Used by autoPatchelfHook + buildInputs = [ + cc.cc.lib # libstdc++ + zlib + cudatoolkit_root + ]; - # We used to patch Runpath here, but now we use autoPatchelfHook - # - # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in - # version 8.3.2 it seems to have been renamed to simply "lib/". - installPhase = '' - runHook preInstall + # We used to patch Runpath here, but now we use autoPatchelfHook + # + # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in + # version 8.3.2 it seems to have been renamed to simply "lib/". + installPhase = + '' + runHook preInstall - mkdir -p $out - cp -a include $out/include - [ -d "lib/" ] && cp -a lib $out/lib - [ -d "lib64/" ] && cp -a lib64 $out/lib64 - '' + lib.optionalString removeStatic '' - rm -f $out/lib/*.a - rm -f $out/lib64/*.a - '' + '' - runHook postInstall - ''; + mkdir -p $out + cp -a include $out/include + [ -d "lib/" ] && cp -a lib $out/lib + [ -d "lib64/" ] && cp -a lib64 $out/lib64 + '' + + strings.optionalString removeStatic '' + rm -f $out/lib/*.a + rm -f $out/lib64/*.a + '' + + '' + runHook postInstall + ''; - # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. - postFixup = lib.optionalString (lib.versionAtLeast fullVersion "8.0.5") '' - patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - ''; + # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. + postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' + patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + ''; - passthru = { - inherit useCudatoolkitRunfile; + passthru = { + inherit useCudatoolkitRunfile; - cudatoolkit = lib.warn '' - cudnn.cudatoolkit passthru attribute is deprecated; - if your derivation uses cudnn directly, it should probably consume cudaPackages instead - '' - cudatoolkit; + cudatoolkit = + trivial.warn + '' + cudnn.cudatoolkit passthru attribute is deprecated; + if your derivation uses cudnn directly, it should probably consume cudaPackages instead + '' + cudatoolkit; - majorVersion = lib.versions.major version; - }; + majorVersion = versions.major versionTriple; + }; - meta = with lib; { - # Check that the cudatoolkit version satisfies our min/max constraints (both - # inclusive). We mark the package as broken if it fails to satisfies the - # official version constraints (as recorded in default.nix). In some cases - # you _may_ be able to smudge version constraints, just know that you're - # embarking into unknown and unsupported territory when doing so. - broken = !(elem cudaVersion supportedCudaVersions); - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - # TODO: consider marking unfreRedistributable when not using runfile - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter samuela ]; - }; -} + meta = with lib; { + # Check that the cudatoolkit version satisfies our min/max constraints (both + # inclusive). We mark the package as broken if it fails to satisfies the + # official version constraints (as recorded in default.nix). In some cases + # you _may_ be able to smudge version constraints, just know that you're + # embarking into unknown and unsupported territory when doing so. + broken = + strings.versionOlder cudaVersion minCudaVersion + || strings.versionOlder maxCudaVersion cudaVersion; + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + sourceProvenance = with sourceTypes; [binaryNativeCode]; + # TODO: consider marking unfreRedistributable when not using runfile + license = licenses.unfree; + platforms = ["x86_64-linux"]; + maintainers = with maintainers; [mdaiter samuela]; + }; + } diff --git a/pkgs/development/libraries/science/math/cudnn/releases.nix b/pkgs/development/libraries/science/math/cudnn/releases.nix new file mode 100644 index 0000000000000..9255ea9c24092 --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/releases.nix @@ -0,0 +1,170 @@ +[ + { + version = "7.4.2.24"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; + hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.1"; + maxCudaVersion = "10.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN="; + } + { + version = "8.0.5.39"; + minCudaVersion = "10.1"; + maxCudaVersion = "10.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; + } + { + version = "8.0.5.39"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; + } + { + version = "8.0.5.39"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.0-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M="; + } + { + version = "8.0.5.39"; + minCudaVersion = "11.1"; + maxCudaVersion = "11.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; + } + { + version = "8.1.1.33"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz"; + hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; + } + { + version = "8.1.1.33"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz"; + hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + } + { + version = "8.2.4.15"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz"; + hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; + } + { + version = "8.2.4.15"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.4"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz"; + hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; + } + { + version = "8.3.3.40"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz"; + hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; + } + { + version = "8.3.3.40"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.6"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz"; + hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; + } + { + version = "8.4.1.50"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz"; + hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; + } + { + version = "8.4.1.50"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz"; + hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; + } + { + version = "8.5.0.96"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz"; + hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; + } + { + version = "8.5.0.96"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz"; + hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; + } + { + version = "8.6.0.163"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz"; + hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; + } + { + version = "8.6.0.163"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz"; + hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; + } + { + version = "8.7.0.84"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz"; + hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; + } + { + version = "8.7.0.84"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda11-archive.tar.xz"; + hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920="; + } + { + version = "8.8.0.121"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.0.121_cuda11-archive.tar.xz"; + hash = "sha256-YgRkdgdtG0VfsT+3izjTSWusr7/bsElPszkiQKBEZuo="; + } + { + version = "8.8.0.121"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.0"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.0.121_cuda12-archive.tar.xz"; + hash = "sha256-oHkrZmyq9ZOp3UEwl5V4/Tp4Iw9EB2RcKVcA7456qvI="; + } +] diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index b9563346ada4c..3bf16057f835f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -6,16 +6,17 @@ , shared ? true # Compile with ILP64 interface , blas64 ? false +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblapack"; version = "3.11"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-AYD78u70y8cY19hmM/aDjQEzxO8u9lPWhCFxRe5cqXI="; }; @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = let canonicalExtension = if stdenv.hostPlatform.isLinux - then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major finalAttrs.version}" else stdenv.hostPlatform.extensions.sharedLibrary; in lib.optionalString blas64 '' ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension} @@ -65,15 +66,18 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ctest ${ctestArgs} + ctest ${finalAttrs.ctestArgs} runHook postCheck ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; maintainers = with maintainers; [ markuskowa ]; license = licenses.bsd3; + pkgConfigModules = [ "lapack" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b7223690f4354..9eb410595974d 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,83 +1,53 @@ -{ lib -, stdenv -, fetchurl -, cmake -, ninja -, gfortran -, libpthreadstubs -, lapack -, blas -, cudaPackages -, hip -, hipblas -, hipsparse -, openmp -, useCUDA ? true -, useROCM ? false -, gpuTargets ? [ ] +args@{ callPackage +, lib +, ... }: -let - inherit (cudaPackages) cudatoolkit cudaFlags; -in stdenv.mkDerivation (finalAttrs: { - pname = "magma"; - version = "2.6.2"; +# Type aliases +# Release = { +# version: String +# hash: String +# supportedGpuTargets: List String +# } - src = fetchurl { - 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="; +let + inherit (lib) lists strings trivial; + + computeName = version: "magma_${strings.replaceStrings [ "." ] [ "_" ] version}"; + + # buildMagmaPackage :: Release -> Derivation + buildMagmaPackage = magmaRelease: callPackage ./generic.nix ( + (builtins.removeAttrs args [ "callPackage" ]) // { + inherit magmaRelease; + } + ); + + # Reverse the list to have the latest release first + # magmaReleases :: List Release + magmaReleases = lists.reverseList (builtins.import ./releases.nix); + + # The latest release is the first element of the list and will be our default choice + # latestReleaseName :: String + latestReleaseName = computeName (builtins.head magmaReleases).version; + + # Function to transform our releases into build attributes + # toBuildAttrs :: Release -> { name: String, value: Derivation } + toBuildAttrs = release: { + name = computeName release.version; + value = buildMagmaPackage release; }; - nativeBuildInputs = [ - cmake - ninja - gfortran - ]; - - buildInputs = [ - libpthreadstubs - lapack - blas - ] ++ lib.optionals useCUDA [ - cudatoolkit - ] ++ lib.optionals useROCM [ - hip - hipblas - hipsparse - openmp - ]; + # Add all supported builds as attributes + # allBuilds :: AttrSet String Derivation + allBuilds = builtins.listToAttrs (lists.map toBuildAttrs magmaReleases); - 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)}" - ]; + # The latest release will be our default build + # defaultBuild :: AttrSet String Derivation + defaultBuild.magma = allBuilds.${latestReleaseName}; - buildFlags = [ - "magma" - "magma_sparse" - ]; + # builds :: AttrSet String Derivation + builds = allBuilds // defaultBuild; +in - doCheck = false; +builds - passthru = { - inherit cudatoolkit; - }; - - meta = with lib; { - description = "Matrix Algebra on GPU and Multicore Architectures"; - license = licenses.bsd3; - 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"; - }; -}) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix new file mode 100644 index 0000000000000..ab0a2125ec00e --- /dev/null +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -0,0 +1,160 @@ +# Type aliases +# Release = { +# version: String +# hash: String +# supportedGpuTargets: List String +# } + +{ blas +, cmake +, cudaPackages +, cudaSupport ? true +, fetchurl +, gfortran +, gpuTargets ? [ ] +, hip +, hipblas +, hipsparse +, lapack +, lib +, libpthreadstubs +, magmaRelease +, ninja +, openmp +, rocmSupport ? false +, stdenv +, symlinkJoin +}: + + +let + inherit (lib) lists strings trivial; + inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion; + inherit (magmaRelease) version hash supportedGpuTargets; + + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements + # of the first list *from* the second list. That means: + # lists.subtractLists a b = b - a + + # For CUDA + supportedCudaSmArches = lists.intersectLists cudaFlags.cudaRealArches supportedGpuTargets; + # Subtract the supported SM architectures from the real SM architectures to get the unsupported + # SM architectures. + unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.cudaRealArches; + + # For ROCm + # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.cudaRealArches. + # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must + # remove it. + rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets; + supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets; + unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches; + + supportedCustomGpuTargets = lists.intersectLists gpuTargets supportedGpuTargets; + unsupportedCustomGpuTargets = lists.subtractLists supportedCustomGpuTargets gpuTargets; + + # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. + gpuArchWarner = supported: unsupported: + trivial.throwIf (supported == [ ]) + ( + "No supported GPU targets specified. Requested GPU targets: " + + strings.concatStringsSep ", " unsupported + ) + supported; + + # Create the gpuTargetString. + gpuTargetString = strings.concatStringsSep "," ( + if gpuTargets != [ ] then + # If gpuTargets is specified, it always takes priority. + gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets + else if cudaSupport then + gpuArchWarner supportedCudaSmArches unsupportedCudaSmArches + else if rocmSupport then + gpuArchWarner supportedRocmArches unsupportedRocmArches + else + throw "No GPU targets specified" + ); + + cuda_joined = symlinkJoin { + name = "cuda-redist-${cudaVersion}"; + paths = with cudaPackages; [ + cuda_nvcc + cuda_cudart # cuda_runtime.h + libcublas + libcusparse + cuda_nvprof # <cuda_profiler_api.h> + ]; + }; +in + +stdenv.mkDerivation { + pname = "magma"; + inherit version; + + src = fetchurl { + name = "magma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; + inherit hash; + }; + + nativeBuildInputs = [ + cmake + ninja + gfortran + ]; + + buildInputs = [ + libpthreadstubs + lapack + blas + ] ++ lists.optionals cudaSupport [ + cuda_joined + ] ++ lists.optionals rocmSupport [ + hip + hipblas + hipsparse + openmp + ]; + + cmakeFlags = lists.optionals cudaSupport [ + "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++" + "-DMAGMA_ENABLE_CUDA=ON" + ] ++ lists.optionals rocmSupport [ + "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" + "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc" + "-DMAGMA_ENABLE_HIP=ON" + ]; + + # NOTE: We must set GPU_TARGET in preConfigure in this way because it may contain spaces. + preConfigure = '' + cmakeFlagsArray+=("-DGPU_TARGET=${gpuTargetString}") + '' + # NOTE: The stdenv's CXX is used when compiling the CMake test to determine the version of + # CUDA available. This isn't necessarily the same as cudatoolkit.cc, so we must set + # CUDAHOSTCXX. + + strings.optionalString cudaSupport '' + export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++ + ''; + + buildFlags = [ + "magma" + "magma_sparse" + ]; + + doCheck = false; + + passthru = { + inherit cudaPackages cudaSupport; + }; + + meta = with lib; { + description = "Matrix Algebra on GPU and Multicore Architectures"; + license = licenses.bsd3; + homepage = "http://icl.cs.utk.edu/magma/index.html"; + platforms = platforms.unix; + maintainers = with maintainers; [ tbenst ]; + # CUDA and ROCm are mutually exclusive + broken = cudaSupport && rocmSupport || cudaSupport && strings.versionOlder cudaVersion "9"; + }; +} diff --git a/pkgs/development/libraries/science/math/magma/releases.nix b/pkgs/development/libraries/science/math/magma/releases.nix new file mode 100644 index 0000000000000..3d08aa95d4d18 --- /dev/null +++ b/pkgs/development/libraries/science/math/magma/releases.nix @@ -0,0 +1,98 @@ +# NOTE: Order matters! Put the oldest version first, and the newest version last. +# NOTE: Make sure the supportedGpuTargets are in order of oldest to newest. +# You can update the supportedGpuTargets by looking at the CMakeLists.txt file. +# CUDA starts here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-175 +# HIP is here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-386 +[ + { + version = "2.6.2"; + hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; + supportedGpuTargets = [ + "sm_20" + "sm_30" + "sm_35" + "sm_37" + "sm_50" + "sm_52" + "sm_53" + "sm_60" + "sm_61" + "sm_62" + "sm_70" + "sm_71" + "sm_75" + "sm_80" + "700" + "701" + "702" + "703" + "704" + "705" + "801" + "802" + "803" + "805" + "810" + "900" + "902" + "904" + "906" + "908" + "909" + "90c" + "1010" + "1011" + "1012" + "1030" + "1031" + "1032" + "1033" + ]; + } + { + version = "2.7.1"; + hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA="; + supportedGpuTargets = [ + "sm_20" + "sm_30" + "sm_35" + "sm_37" + "sm_50" + "sm_52" + "sm_53" + "sm_60" + "sm_61" + "sm_62" + "sm_70" + "sm_71" + "sm_75" + "sm_80" + "sm_90" + "700" + "701" + "702" + "703" + "704" + "705" + "801" + "802" + "803" + "805" + "810" + "900" + "902" + "904" + "906" + "908" + "909" + "90c" + "1010" + "1011" + "1012" + "1030" + "1031" + "1032" + "1033" + ]; + } +] diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 41dddf2391ac2..99aed3a6a30ef 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: +{ lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }: + +let + inherit (cudaPackages) cudatoolkit; +in stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; - version = "2.12.10-1"; + version = "2.16.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; rev = "v${version}"; - sha256 = "sha256-QqORzm0gD+QG+P8rId8bQn2oZsxL5YyxCIobUVs85wE="; + hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; }; outputs = [ "out" "dev" ]; @@ -34,12 +38,12 @@ stdenv.mkDerivation rec { addOpenGLRunpath $out/lib/lib*.so ''; - NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; enableParallelBuilding = true; passthru = { - inherit cudatoolkit; + inherit cudaPackages; }; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f3ec52f6a5d75..0477f859eef52 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/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index b61cd84060641..713616b1a50ff 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; # Compile errors - NIX_CFLAGS_COMPILE = "-Wno-cast-qual"; + env.NIX_CFLAGS_COMPILE = "-Wno-cast-qual"; hardeningDisable = [ "format" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index eeb1d14b910a1..fbd9db6a419fb 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -5,7 +5,7 @@ }: let - dbg = if debugEnable then "-dbg" else ""; + dbg = lib.optionalString debugEnable "-dbg"; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; isOpenmpi = mpiSupport && mpi.pname == "openmpi"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; preConfigure = '' echo "2.8.0" > .tarball-version - ${if mpiSupport then "unset CC" else ""} + ${lib.optionalString mpiSupport "unset CC"} ''; configureFlags = [ "--enable-pthread=-pthread" ] diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index 9396a9144423e..a55c5fe573bff 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -9,7 +9,7 @@ let inherit (p4est-sc) debugEnable mpiSupport; - dbg = if debugEnable then "-dbg" else ""; + dbg = lib.optionalString debugEnable "-dbg"; withMetis = p4est-withMetis; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index ae95fefe0e631..c2fabae1c20b7 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { "--with-fc=mpif90" "--with-mpi=1" ''} - ${if withp4est then '' + ${lib.optionalString withp4est '' "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" "--with-zlib-lib=-L${zlib}/lib -lz" - '' else ""} + ''} "--with-blas=1" "--with-lapack=1" ) diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index e734ed8ff35a2..95eeaeb8abf38 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "LAPACK=-llapack" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -DNTIMER"; postInstall = '' # Build and install shared library diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index c31c705d39d0a..09ca356ccdc5b 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitLab +, fetchpatch , makeWrapper , which , autoconf @@ -20,7 +21,14 @@ stdenv.mkDerivation rec { sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; - patches = [ ./clean-extra-logfile-output-from-pari.patch ]; + patches = [ + ./clean-extra-logfile-output-from-pari.patch + (fetchpatch { + name = "null-terminate-dupdirname.patch"; + url = "https://gitlab.com/rezozer/forks/sympow/-/merge_requests/5.diff"; + sha256 = "sha256-yKjio+qN9teL8L+mb7WOBN/iv545vRIxW20FJU37oO4="; + }) + ]; postUnpack = '' patchShebangs . diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/development/libraries/sealcurses/default.nix index bde530dd9d752..ad1eb0bb276d6 100644 --- a/pkgs/development/libraries/sealcurses/default.nix +++ b/pkgs/development/libraries/sealcurses/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sealcurses"; - version = "unstable-2022-05-18"; # No release yet + version = "unstable-2023-02-06"; # No release yet src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = pname; - rev = "417d77d790ede990b4c149f21c58fd13b8f273cc"; - hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo="; + rev = "e11026ca34b03c5ab546512f82a6f705d0c29e95"; + hash = "sha256-N+Tvg2oIcfa68FC7rKuLxGgEKz1oBEEb8NGCiBuZ8y4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index a2be472cc3a5a..b1c5ea2408711 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-zeJGgtqEITK1fQtqFXwh+kpaS9Ky+RSY/uxZ2as8YyM="; + hash = "sha256-43THyqbujbXIW+y8KPkTiLg95XCV8l1fiWfd2V+/Fas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 5dd997352f139..84a165956d997 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--with-fastcgi" ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/development/libraries/sigslot/default.nix index e410c280a282e..8bc51fdd9ec50 100644 --- a/pkgs/development/libraries/sigslot/default.nix +++ b/pkgs/development/libraries/sigslot/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sigslot"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "palacaze"; repo = "sigslot"; rev = "v${version}"; - hash = "sha256-FXoKI0aTpZNHHYZnEoPduf3ctOQ/qKoQrrXZPviAvuY="; + hash = "sha256-MKtVZLHp8UfXW8KJ3QjPMhxnt46xV+pA9NMqAX0iqiA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 571e4e717d8f9..29730ddd806e1 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.0.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-e5u9+H4rILIDpnZxzVV9wbjhR9tRqnf11i2Kn39DTzo="; + sha256 = "sha256-Yc4P54cn7cvP+ythlmOMIkDz7PuutJXsgkGhNUcoxvc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 2990bc25e9d45..a09ac168ba46a 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk_5_2 }: +{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.1.1.2"; + version = "2.2.1"; outputs = [ "out" "dev" ]; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g="; + hash = "sha256-0YxmixUTXpjegZQv7DDCNTWFTH8QEWqQQszee7aQ5EI="; }; nativeBuildInputs = [ cmake swig4 ]; - buildInputs = [ lua itk_5_2 ]; + buildInputs = [ lua itk ]; # 2.0.0: linker error building examples cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix index 0181977873a98..478237f866cbc 100644 --- a/pkgs/development/libraries/smesh/default.nix +++ b/pkgs/development/libraries/smesh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; meta = with lib; { description = "Extension to OCE providing advanced meshing features"; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 19dfb62002e2b..f0f9596f95ddb 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 b3e91bd3fd132..5d5f1c2cf648e 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.10"; + version = "1.13.14"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0="; + sha256 = "sha256-L1OXmZCVWDPILhooIzw/bYK69zKwzkBluV9Tlf0vw4g="; }; 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 83442035d7b45..1a6a9770362e5 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/span-lite/default.nix b/pkgs/development/libraries/span-lite/default.nix new file mode 100644 index 0000000000000..1af8466a4d073 --- /dev/null +++ b/pkgs/development/libraries/span-lite/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "span-lite"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "span-lite"; + rev = "v${version}"; + hash = "sha256-WfoyyPLBqXSGGATWN/wny6P++3aCmQMOMLCARhB+R3c="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "A C++20-like span for C++98, C++11 and later in a single-file header-only library"; + homepage = "https://github.com/martinmoene/span-lite"; + license = lib.licenses.bsd1; + maintainers = with lib.maintainers; [ icewind1991 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index f2bc63d4f6d67..2c96e60c6d376 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" ]; configureFlags = [ diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 23464990d8699..31f65784061a3 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk'}" ]; - NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. + env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling NIX_LDFLAGS = "-lbsd"; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index e0ca78df79a41..3b34ab928295b 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of # `editline_history_file'; libestools.a(siodeditline.o):(.data.rel.local+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . ) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 2111b23a6f756..d54ffa3bd19b4 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -17,8 +17,6 @@ , libdrm , libjpeg_turbo , libopus -, withLibsoup2 ? false -, libsoup , libsoup_3 , libusb1 , lz4 @@ -27,7 +25,6 @@ , ninja , openssl , perl -, phodav_2_0 , phodav , pixman , pkg-config @@ -120,11 +117,11 @@ stdenv.mkDerivation rec { libcacard libjpeg_turbo libopus - (if withLibsoup2 then libsoup else libsoup_3) + libsoup_3 libusb1 lz4 openssl - (if withLibsoup2 then phodav_2_0 else phodav) + phodav pixman spice-protocol usbredir diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ed47a87ee1161..7f7493b2acc98 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { gdk-pixbuf ]; - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; mesonFlags = [ "-Dgstreamer=1.0" diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 78dc373d4ab6e..706d3449286e2 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.236.0"; + version = "1.3.239.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-eWI1MyIWxcg1JepRsnHBmitehDigDa+dR8kXvIkYejY="; + hash = "sha256-bjiWGSmpEbydXtCLP8fRZfPBvdCzBoJxKXTx3BroQbg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix index 75d70680fbf96..601bb6a5889fb 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 eb27c8c8b9eba..91f694649b004 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -9,14 +9,12 @@ , enableDeserialize ? false }: -with lib; - let archiveVersion = import ./archive-version.nix lib; in stdenv.mkDerivation rec { - pname = "sqlite${optionalString interactive "-interactive"}"; + pname = "sqlite${lib.optionalString interactive "-interactive"}"; version = "3.40.1"; # nixpkgs-update: no auto update @@ -29,16 +27,16 @@ stdenv.mkDerivation rec { 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 ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-DSQLITE_ENABLE_COLUMN_METADATA" "-DSQLITE_ENABLE_DBSTAT_VTAB" "-DSQLITE_ENABLE_JSON1" @@ -94,7 +92,7 @@ stdenv.mkDerivation rec { 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/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix index f4b2ee9e9a95c..aad1ee34e5c46 100644 --- a/pkgs/development/libraries/sqlitecpp/default.nix +++ b/pkgs/development/libraries/sqlitecpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, sqlite, cppcheck, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, sqlite, gtest }: stdenv.mkDerivation rec { pname = "sqlitecpp"; @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ cppcheck ]; buildInputs = [ sqlite gtest ]; doCheck = true; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 2e1a96eebbdeb..97e55a03033a6 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/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 1ed1a05004b68..845e815be5902 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; }; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildInputs = [ ncurses libiconv ]; preBuild = '' @@ -16,12 +18,22 @@ stdenv.mkDerivation rec { sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h '' + lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile - ''; + '' + # upstream builds shared library unconditionally. Also, it has no + # support for cross-compilation. + + lib.optionalString stdenv.hostPlatform.isStatic '' + sed -i 's/all:.*/all: libstfl.a stfl.pc/' Makefile + sed -i 's/\tar /\t${stdenv.cc.targetPrefix}ar /' Makefile + sed -i 's/\tranlib /\t${stdenv.cc.targetPrefix}ranlib /' Makefile + sed -i '/install -m 644 libstfl.so./d' Makefile + sed -i '/ln -fs libstfl.so./d' Makefile + '' ; installPhase = '' DESTDIR=$out prefix=\"\" make install - - # some programs rely on libstfl.so.0 to be present, so link it + '' + # some programs rely on libstfl.so.0 to be present, so link it + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 ''; 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 76cc0d3e30ef9..0000000000000 --- 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/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 2c508a3735f96..cfcccd018f9d0 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 jq ]; buildInputs = [ libX11 libXext zlib ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + "-Wno-error=uninitialized" + ]; + # Make sure we include the drivers and icd files in the output as the cmake # generated install command only puts in the spirv-tools stuff. installPhase = '' diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index fb52f75f8c101..cf29e432e2266 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "talloc"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo="; + sha256 = "sha256-bfNoYsQkZu+I82BERROHDvRpNPkBbIQ4PMQAin0MRro="; }; nativeBuildInputs = [ @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 21fddb1656270..ec22952cc42b9 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { pname = "tbb"; version = "2020.3"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneTBB"; @@ -99,6 +101,6 @@ stdenv.mkDerivation rec { details and threading mechanisms for scalability and performance. ''; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice dizfer ]; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 9a534c4c14652..774168847b943 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws="; + sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4="; }; nativeBuildInputs = [ @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 259d596465567..3b228b6c6250f 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/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 568751f48aa33..7b798d00b01e1 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -2,6 +2,7 @@ , fetchurl , python3 , pkg-config +, cmocka , readline , talloc , libxslt @@ -9,15 +10,16 @@ , docbook_xml_dtd_42 , which , wafHook +, libxcrypt }: stdenv.mkDerivation rec { pname = "tevent"; - version = "0.10.2"; + version = "0.13.0"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "15k6i8ad5lpxfjsjyq9h64zlyws8d3cm0vwdnaw8z1xjwli7hhpq"; + sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw="; }; nativeBuildInputs = [ @@ -32,10 +34,19 @@ stdenv.mkDerivation rec { buildInputs = [ python3 + cmocka readline # required to build python talloc + libxcrypt ]; + # otherwise the configure script fails with + # PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make! + preConfigure = '' + export PKGCONFIG="$PKG_CONFIG" + export PYTHONHASHSEED=1 + ''; + wafPath = "buildtools/bin/waf"; wafConfigureFlags = [ @@ -43,6 +54,11 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 95ea916e09b99..2970fb3c84a7c 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-wPFBKc20/ED58RFpDhmPnlSHCf3FG5sD2ubQOl5NF+o="; + hash = "sha256-+V2WJYEmIZWpioNvvZMiw7Vt9ogEnEcjq+vR7UiBTO0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 76d8cc2ff54e8..fd6b21a94f72e 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-snLBeIuxZdmVIaJZmzG5f6aeWTHQmQFdka4QegsMxY8="; + hash = "sha256-fBk4nLeRCiDli45GkDyMGjY1MAj5/MGwP3SKzPm18+E="; }; # Workaround to make the Python wrapper not drop this package: @@ -36,11 +36,14 @@ stdenv.mkDerivation rec { buildInputs = [ boost + ] ++ lib.optionals (!static) [ + (python3.withPackages (ps: [ps.twisted])) + ]; + + propagatedBuildInputs = [ libevent openssl zlib - ] ++ lib.optionals (!static) [ - (python3.withPackages (ps: [ps.twisted])) ]; postPatch = '' @@ -66,6 +69,16 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff"; hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0="; }) + (fetchpatch { + name = "thrift-install-FindLibevent.patch"; # https://github.com/apache/thrift/pull/2726 + url = "https://github.com/apache/thrift/commit/2ab850824f75d448f2ba14a468fb77d2594998df.diff"; + hash = "sha256-ejMKFG/cJgoPlAFzVDPI4vIIL7URqaG06/IWdQ2NkhY="; + }) + (fetchpatch { + name = "thrift-fix-tests-OpenSSL3.patch"; # https://github.com/apache/thrift/pull/2760 + url = "https://github.com/apache/thrift/commit/eae3ac418f36c73833746bcd53e69ed8a12f0e1a.diff"; + hash = "sha256-0jlN4fo94cfGFUKcLFQgVMI/x7uxn5OiLiFk6txVPzs="; + }) ]; cmakeFlags = [ @@ -82,6 +95,7 @@ stdenv.mkDerivation rec { disabledTests = [ "PythonTestSSLSocket" + "PythonThriftTNonblockingServer" ] ++ lib.optionals stdenv.isDarwin [ # Tests that hang up in the Darwin sandbox "SecurityTest" @@ -98,7 +112,6 @@ stdenv.mkDerivation rec { "StressTest" "StressTestConcurrent" "StressTestNonBlocking" - "PythonThriftTNonblockingServer" ]; doCheck = !static; diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index 65cd814c1e6cd..fa9d79aed1a7a 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.8.2"; + version = "2.8.3"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-0O+Vfsd1omCXeSGdjLZ29yTutC+527NCIBm6hU3qKj4="; + sha256 = "sha256-6rfC5nXGseXtqh2IonZto+DM8ZV/t5U1ulZ3GFHwoeg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index c576405bb3b6d..93500e17b7d41 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/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index e8c5dd1dacdf6..ebfd8e5670ff6 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index c7cb92440ee8e..79af37f58e6f8 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tl-expected-unstable"; - version = "2019-11-11"; # 5 commits ahead of version 1.0.0 + version = "2023-02-15"; # 37 commits ahead of version 1.0.0 src = fetchFromGitHub { owner = "TartanLlama"; repo = "expected"; - rev = "1d9c5d8c0da84b8ddc54bd3d90d632eec95c1f13"; + rev = "9d812f5e3b5bc68023f6e31d29489cdcaacef606"; fetchSubmodules = true; - sha256 = "0rzfn9yyg70zwpxbmv22qy0015baymi2rdd65ixmcb31fgnap68i"; + hash = "sha256-ZokcGQgHH37nmTMLmxFcun4S1RjXuXb9NfWHet8Fbc4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index be1c4b7d9c81e..a865f88f707dc 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -1,22 +1,23 @@ { lib , stdenv , meson +, cmake , ninja , fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tomlplusplus"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "marzer"; repo = pname; rev = "v${version}"; - hash = "sha256-nohO4eySs73BSgjvq+uzybiE5lw2rFY5YqGbl/oqGek="; + hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; }; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson cmake ninja ]; meta = with lib;{ homepage = "https://github.com/marzer/tomlplusplus"; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 32225a7bb0d80..59aa84b9518a5 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.2"; + version = "3.4.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EB42CPHCi/7YriVSL3pyC1WfiJp24oCvvlCk2LBk+Sw="; + sha256 = "jk85dkcmQbZI0PjyDeuuGxYpyltWC4YW4RfSnXVvvus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index e5ea8b17f6aaf..9027c14de90c4 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib libxml2 sqlite diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index 5aef7e9d8f4e5..048f35868cdad 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # needed to successfully compile with gcc 6 - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c90"; meta = { homepage = "http://www.oberhumer.com/opensource/ucl/"; diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/development/libraries/uclient/default.nix new file mode 100644 index 0000000000000..458d726f2ca6a --- /dev/null +++ b/pkgs/development/libraries/uclient/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchgit, cmake, pkg-config, libubox }: + +stdenv.mkDerivation { + pname = "uclient"; + version = "unstable-2022-02-24"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uclient.git"; + rev = "644d3c7e13c6a64bf5cb628137ee5bd4dada4b74"; + sha256 = "0vy4whs64699whp92d1zl7a8kh16yrfywqq0yp2y809l9z19sw22"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buidInputs = [ libubox ]; + + preConfigure = '' + sed -e 's|ubox_include_dir libubox/ustream-ssl.h|ubox_include_dir libubox/ustream-ssl.h HINTS ${libubox}/include|g' \ + -e 's|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox}/lib|g' \ + -i CMakeLists.txt + ''; + + meta = with lib; { + description = "Tiny OpenWrt fork of libnl"; + homepage = "https://git.openwrt.org/?p=project/uclient.git;a=summary"; + license = licenses.isc; + maintainers = with maintainers; [ mkg20001 ]; + mainProgram = "uclient-fetch"; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index a6e1b43f5db4f..b7c76434392fc 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Unified Communication X library"; - homepage = "http://www.openucx.org"; + homepage = "https://www.openucx.org"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index da0554d49e607..518ed432b723f 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -19,14 +19,10 @@ stdenv.mkDerivation rec { # udns uses a very custom build and hardcodes a .so name in a few places. # Instead of fighting with it to apply the standard dylib script, change # the right place in the Makefile itself. - postPatch = - if stdenv.isDarwin - then - '' - substituteInPlace Makefile.in \ - --replace --soname, -install_name,$out/lib/ - '' - else ""; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.in \ + --replace --soname, -install_name,$out/lib/ + ''; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index da2ba16dedc1e..a6d2a9ea00cd6 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.15"; + 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 = "7UGO4rv7B4H0skuXKe8nCtg83czWaln/lEsFnvE2j+8="; + sha256 = "sha256-T0BbjOkhn4EX2GBezYFbiUHNgp2uEbSiaxpJ/36jriY="; }; patches = [ @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib systemd libgudev diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index d185d32c816fa..e9f67a74f9a3e 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -1,6 +1,9 @@ -{lib, stdenv, fetchFromGitHub, cmake}: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: stdenv.mkDerivation rec { pname = "unittest-cpp"; @@ -13,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; + patches = [ + # GCC12 Patch + (fetchpatch { + url = "https://github.com/unittest-cpp/unittest-cpp/pull/185/commits/f361c2a1034c02ba8059648f9a04662d6e2b5553.patch"; + hash = "sha256-xyhV2VBelw/uktUXSZ3JBxgG+8/Mout/JiXEZVV2+2Y="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = false; @@ -20,7 +31,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 2ab717782e518..90398e5aef255 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,21 +2,21 @@ 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" + "https://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; + sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; meta = with lib; { description = "ODBC driver manager for Unix"; - homepage = "http://www.unixodbc.org/"; + homepage = "https://www.unixodbc.org/"; license = licenses.lgpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 980d073f1281e..51c2bcd59a57b 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=parentheses"; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=parentheses" + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + "-Wno-error=nonnull" + ]; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 797c32cb6d2d9..c7e8a361ee16e 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "sha256-OVLc3FWLBjWJnqIhhe6k+pl/HsJGzqD6xp/fXXEgRwY="; + sha256 = "sha256-zehf0DkqSSvmatbk/UB1oySjyqiFUYTuIhqb5xKeK7I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index 564a996949d8a..b0e4ab6c064e3 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./va_args.patch ]; # Work around gcc5 switch to gnu11 - NIX_CFLAGS_COMPILE = "-std=gnu89"; + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; # Fix detection of stdint.h postPatch = '' diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix new file mode 100644 index 0000000000000..007ebc9c45738 --- /dev/null +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchgit, cmake, pkg-config, libubox-nossl, ssl_implementation }: + +stdenv.mkDerivation { + pname = "ustream-ssl"; + version = "unstable-2022-12-08-${ssl_implementation.pname}"; + + src = fetchgit { + url = "https://git.openwrt.org/project/ustream-ssl.git"; + rev = "9217ab46536353c7c792951b57163063f5ec7a3b"; + sha256 = "1ldyyb3is213iljyccx98f56rb69rfpgdcb1kjxw9a176hvpipdd"; + }; + + preConfigure = '' + sed -r \ + -e "s|ubox_include_dir libubox/ustream.h|ubox_include_dir libubox/ustream.h HINTS ${libubox-nossl}/include|g" \ + -e "s|ubox_library NAMES ubox|ubox_library NAMES ubox HINTS ${libubox-nossl}/lib|g" \ + -e "s|^ FIND_LIBRARY\((.+)\)| FIND_LIBRARY\(\1 HINTS ${if ssl_implementation ? lib then ssl_implementation.lib else ssl_implementation.out}\)|g" \ + -i CMakeLists.txt + ''; + + cmakeFlags = [ "-D${lib.toUpper ssl_implementation.pname}=ON" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ssl_implementation ]; + + passthru = { + inherit ssl_implementation; + }; + + meta = with lib; { + description = "ustream SSL wrapper"; + homepage = "https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary"; + license = licenses.isc; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index b5184bafcbff9..67187a5ec101b 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; - NIX_CFLAGS_COMPILE = "-O2"; + env.NIX_CFLAGS_COMPILE = "-O2"; FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; nativeBuildInputs = [ @@ -162,9 +162,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + broken = stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"; }; } diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7ca5080cb74ca..73ff840340060 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { --replace "-Wl,-fatal_warnings" "" ''} touch build/config/gclient_args.gni + sed '1i#include <utility>' -i src/heap/cppgc/prefinalizer-handler.h # gcc12 ''; llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; }; @@ -134,7 +135,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' ++ lib.optional stdenv.isDarwin ''use_lld=false''; - NIX_CFLAGS_COMPILE = "-O2"; + env.NIX_CFLAGS_COMPILE = "-O2"; FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; nativeBuildInputs = [ @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index ca40d42609458..aec3bcc6af2e0 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Workaround build failure on -fno-common toolchains like upstream gcc-10. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ "--enable-drm" diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 32b97f8ea2d3c..320b43f0e51b5 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og="; }; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix index ef76d6db9dbc7..bc43da3567d8d 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.6"; + version = "0.7"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; rev = "v${version}"; - sha256 = "sha256-T24SCJSGta4yuK58NcQnMeiO3sg9P9/O3kaFJFO/eOE="; + hash = "sha256-X3ANqfplrCF1R494+H5/plcwMH7rbW6zpLA4MZrYaoE="; }; postPatch = '' diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index cc0049ef756c2..2c2774521762a 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/default.nix b/pkgs/development/libraries/vte/default.nix index 3a82bafa3e124..d331391ce0ed0 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.2"; + version = "0.70.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-TRW0OA3j9WTVfqvQBjicQHxwXfWwxwAw/cwklxozTYA="; + sha256 = "sha256-lFcTSgLzFX/KBPfg05vbDzCZvgo86CtxOdDJioB0jyM="; }; patches = [ @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ]; # error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument] - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument"; postPatch = '' patchShebangs perf/* diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 3a5032efdce3c..7f7fc22f549bc 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/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 8f1202088e58e..e34cf98d5106e 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.236.0"; + version = "1.3.239.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - hash = "sha256-b1q9QugFH4lieS8CTOyZ3uoQ7bd44G8NPEwRtUPD+24="; + hash = "sha256-mzxT6s4ZHShB9tGyyf8jDtVWVEclHPYW+9oKy7v0bC4="; }; meta = with lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8d38f725a64d6..b45bf4c66be85 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.236.0"; + version = "1.3.239.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - hash = "sha256-Y6OakowZlb40ZatITQCFBK/qSZqSdgTNew1XUFD/jMo="; + hash = "sha256-4oxynsbFLmsrpI5NEs7gI50g0XVcaUWuZRn6JKB/+hA="; }); patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index b5c3bf4428ab4..42295a67d4667 100644 --- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,10 +5,10 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ - + Name: @CMAKE_PROJECT_NAME@ Description: Vulkan Loader diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix new file mode 100644 index 0000000000000..54cdee3f7aa44 --- /dev/null +++ b/pkgs/development/libraries/wangle/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, boost +, libevent +, double-conversion +, glog +, fmt_8 +, gflags +, openssl +, fizz +, folly +, gtest +, libsodium +, zlib +}: + +stdenv.mkDerivation rec { + pname = "wangle"; + version = "2023.02.27.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "wangle"; + rev = "v${version}"; + sha256 = "sha256-r+hS9BJWgIYIHZ0xgLosJrLZT/bQCQdwzNlXxxk5xLU="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeDir = "../wangle"; + + cmakeFlags = [ + "-Wno-dev" + ] ++ lib.optionals stdenv.isDarwin [ + "-DBUILD_TESTS=off" # Tests fail on Darwin due to missing utimensat + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + fmt_8 + libsodium + zlib + boost + double-conversion + fizz + folly + gtest + glog + gflags + libevent + openssl + ]; + + meta = with lib; { + description = "An open-source C++ networking library"; + longDescription = '' + Wangle is a framework providing a set of common client/server + abstractions for building services in a consistent, modular, and + composable way. + ''; + homepage = "https://github.com/facebook/wangle"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ pierreis kylesferrazza ]; + }; +} diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index d978e911c3a88..0dce309ef5c7c 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "17"; + version = "19"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-h2X78icCmnn6Y6baOxp8Xm7F2+RZZgaV2fszzi2q/iA="; + hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; fetchSubmodules = true; }; @@ -63,6 +63,6 @@ stdenv.mkDerivation { homepage = "https://wasi.dev"; platforms = platforms.wasi; maintainers = with maintainers; [ matthewbauer rvolosatovs ]; - license = with licenses; [ asl20 mit llvm-exception ]; + license = with licenses; [ asl20-llvm mit ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 4e22df60f5336..73073a6b7117e 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,11 +64,12 @@ , enableGeoLocation ? true , withLibsecret ? true , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, testers }: stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.3"; + version = "2.38.5"; 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 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo="; + hash = "sha256-QMIMQwIidN9Yk/IrEFT6iUw+6gVzibsIruCMWwuwwac="; }; patches = lib.optionals stdenv.isLinux [ @@ -232,10 +233,17 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; + pkgConfigModules = [ + "javascriptcoregtk-4.0" + "webkit2gtk-4.0" + "webkit2gtk-web-extension-4.0" + ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 5e8adaf0c4258..8877365e1dd6a 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wildmidi"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "Mindwerks"; repo = "wildmidi"; rev = "${pname}-${version}"; - sha256 = "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167"; + sha256 = "sha256-5El8aDpAgjrW0/4lphZEF+Hfv9Xr7J4DMk1b/Tb+0TU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 9d03d193d81ce..8e0ebab220af1 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.1"; - hash = "sha256-UyPN7zmytre4emwx/ztZ4JefXHwixPV6UEEqnhSLbIY="; + version = "0.16.2"; + hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; extraBuildInputs = [ vulkan-loader ]; extraNativeBuildInputs = [ glslang ]; extraPatch = '' diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 543c6fb4e0552..8dbc6f87061d2 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -53,25 +53,15 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.1"; + version = "3.2.2.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-k6td/8pF7ad7+gVm7L0jX79fHKwR7/qrOBpSFggyaI0="; + hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA="; }; - # 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/wxwidgets/wxmac30.nix b/pkgs/development/libraries/wxwidgets/wxmac30.nix index 73bf013452a51..d4509295969dc 100644 --- a/pkgs/development/libraries/wxwidgets/wxmac30.nix +++ b/pkgs/development/libraries/wxwidgets/wxmac30.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ./wx-config --libs ''; - NIX_CFLAGS_COMPILE = "-Wno-undef"; + env.NIX_CFLAGS_COMPILE = "-Wno-undef"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/development/libraries/xeus/default.nix new file mode 100644 index 0000000000000..3231fa2744c74 --- /dev/null +++ b/pkgs/development/libraries/xeus/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doctest +, nlohmann_json +, libuuid +, xtl +}: + +stdenv.mkDerivation rec { + pname = "xeus"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = pname; + rev = version; + sha256 = "sha256-LeU4PJ1UKfGqkRKq0/Mn9gjwNmXCy0/2SbjWJrjlOyU="; + }; + + nativeBuildInputs = [ + cmake + doctest + ]; + + buildInputs = [ + nlohmann_json + libuuid + xtl + ]; + + cmakeFlags = [ + "-DXEUS_BUILD_TESTS=ON" + ]; + + doCheck = true; + preCheck = ''export LD_LIBRARY_PATH=$PWD''; + + meta = with lib; { + homepage = "https://xeus.readthedocs.io"; + description = "C++ implementation of the Jupyter Kernel protocol"; + license = licenses.bsd3; + maintainers = with maintainers; [ serge_sans_paille ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index bf2825b5967ec..3fbbb9d1f8cfc 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -7,63 +7,132 @@ , doCheck ? true , cudaSupport ? config.cudaSupport or false , ncclSupport ? false +, rLibrary ? false , cudaPackages , llvmPackages +, R +, rPackages }: assert ncclSupport -> cudaSupport; +# Disable regular tests when building the R package +# because 1) the R package runs its own tests and +# 2) the R package creates a different binary shared +# object that isn't compatible with the regular CLI +# tests. +assert rLibrary -> doCheck != true; stdenv.mkDerivation rec { - pname = "xgboost"; - version = "1.7.3"; + pnameBase = "xgboost"; + # prefix with r when building the R library + # The R package build results in a special xgboost.so file + # that contains a subset of the .so file use for the CLI + # and python version. In general, the CRAN version from + # nixpkgs's r-modules should be used, but this non-standard + # build allows for enabling CUDA and NCCL support which aren't + # included in the CRAN release. Build with: + # nix-build -E "with (import $NIXPKGS{}); \ + # let \ + # xgb = xgboost.override{rLibrary = true; doCheck = false;}; \ + # in \ + # rWrapper.override{ packages = [ xgb ]; }" + pname = lib.optionalString rLibrary "r-" + pnameBase; + version = "1.7.4"; src = fetchFromGitHub { owner = "dmlc"; - repo = pname; + repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE="; + hash = "sha256-HGS9w4g2+Aw5foKjHK/XQvSCnFHUswhzAsQf6XkdvOI="; }; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages.openmp - ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook - ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ] + ++ lib.optionals rLibrary [ R ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit - ++ lib.optional ncclSupport cudaPackages.nccl; + ++ lib.optional ncclSupport cudaPackages.nccl; + + propagatedBuildInputs = lib.optionals rLibrary [ + rPackages.data_table + rPackages.jsonlite + rPackages.Matrix + ]; cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] - ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] - ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; + ++ lib.optionals cudaSupport [ + "-DUSE_CUDA=ON" + # Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler. + # https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145 + "-DCMAKE_C_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/gcc" + "-DCMAKE_CXX_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/g++" + ] ++ lib.optionals + (cudaSupport + && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") + [ "-DBUILD_WITH_CUDA_CUB=ON" ] + ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] + ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; + + preConfigure = lib.optionals rLibrary '' + substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library" + export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" + ''; inherit doCheck; # By default, cmake build will run ctests with all checks enabled # If we're building with cuda, we run ctest manually so that we can skip the GPU tests checkPhase = lib.optionalString cudaSupport '' - ctest --force-new-ctest-process ${lib.optionalString cudaSupport "-E TestXGBoostLib"} + ctest --force-new-ctest-process ${ + lib.optionalString cudaSupport "-E TestXGBoostLib" + } ''; - installPhase = let - libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; - in '' - 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 + # Disable finicky tests from dmlc core that fail in Hydra. XGboost team + # confirmed xgboost itself does not use this part of the dmlc code. + GTEST_FILTER = + let + # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456 + filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "ThreadGroup.TimerThread" + "ThreadGroup.TimerThreadSimple" + ]; + in + "-${builtins.concatStringsSep ":" filteredTests}"; + + installPhase = + let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' + runHook preInstall + mkdir -p $out + cp -r ../include $out + cp -r ../dmlc-core/include/dmlc $out/include + cp -r ../rabit/include/rabit $out/include + '' + lib.optionalString (!rLibrary) '' + install -Dm755 ../lib/${libname} $out/lib/${libname} + install -Dm755 ../xgboost $out/bin/xgboost + '' + # the R library option builds a completely different binary xgboost.so instead of + # libxgboost.so, which isn't full featured for python and CLI + + lib.optionalString rLibrary '' + mkdir $out/library + export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" + make install -l $out/library + '' + '' + runHook postInstall + ''; + + postFixup = lib.optionalString rLibrary '' + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + fi ''; meta = with lib; { - description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; + description = + "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 39e25241c9430..dcd35d187f9d5 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix index 7bd07c2433d4b..694f6511f0c50 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; - nativeCheckInputs = [ 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 57f2403cfe3f9..82520572c3764 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/yaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix new file mode 100644 index 0000000000000..fad3397b74b6f --- /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 0000000000000..c9468b10b99be --- /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 43b181fc348f9..286b34379dc25 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.17"; + version = "1.4.19"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc="; + sha256 = "sha256-KP79i1yYJ6jrsdtS85fHOmJV+oAL/MNgc9On4RfOTwo="; }; patches = [ diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index fc6fd501c4d85..15aecee196d04 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -12,17 +12,15 @@ stdenv.mkDerivation rec { pname = "zint"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "zint"; repo = "zint"; rev = version; - sha256 = "sha256-ozhXy7ftmGz1XvmF8AS1ifWJ3Q5hLSsysB8qLUP60n8="; + hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk="; }; - patches = [ ./qobject.patch ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/zint/qobject.patch b/pkgs/development/libraries/zint/qobject.patch deleted file mode 100644 index f991d52648f3b..0000000000000 --- a/pkgs/development/libraries/zint/qobject.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/backend_qt/qzint.h b/backend_qt/qzint.h -index d57ab6a..62fb0a4 100644 ---- a/backend_qt/qzint.h -+++ b/backend_qt/qzint.h -@@ -19,6 +19,7 @@ - #ifndef QZINT_H - #define QZINT_H - -+#include <QObject> - #include <QColor> - #include <QPainter> - #include "zint.h" diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 52654b6541e3e..85d125be099df 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,6 +8,7 @@ # the `.pc` file lists only the main output's lib dir. # If false, and if `{ static = true; }`, the .a stays in the main output. , splitStaticOutput ? shared && static +, testers }: # Without either the build will actually still succeed because the build @@ -21,11 +22,13 @@ assert shared || static; assert splitStaticOutput -> static; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zlib"; version = "1.2.13"; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { urls = [ # This URL works for 1.2.13 only; hopefully also for future releases. "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.gz" @@ -99,7 +102,7 @@ stdenv.mkDerivation rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; # We don't strip on static cross-compilation because of reports that native # stripping corrupted the target library; see commit 12e960f5 for the report. @@ -125,10 +128,13 @@ stdenv.mkDerivation rec { "SHARED_MODE=1" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://zlib.net"; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; + pkgConfigModules = [ "zlib" ]; }; -} +}) diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index aa04a8dce2e2e..f65a55dae117d 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -51,6 +51,9 @@ let nativeBuildInputs = [ pkgs.libdevil ]; nativeLibs = [ pkgs.libdevil ]; }; + cl-freeimage = pkg: { + nativeLibs = [ freeimage ]; + }; cl-freetype2 = pkg: { nativeLibs = [ freetype ]; nativeBuildInputs = [ freetype ]; @@ -144,6 +147,7 @@ let }; classimp = pkg: { nativeLibs = [ assimp ]; + meta.broken = true; # Requires assimp ≤ 5.0.x. }; clsql-postgresql = pkg: { nativeLibs = [ postgresql.lib ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 31891967df4fd..189e896dfaeae 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -8,9 +8,7 @@ You can customize the generated packages in pkgs/development/lua-modules/overrid { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: final: prev: { -alt-getopt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +alt-getopt = callPackage({ luaAtLeast, lua, luaOlder, fetchgit, buildLuarocksPackage }: buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; @@ -31,7 +29,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -42,9 +40,7 @@ buildLuarocksPackage { }; }) {}; -argparse = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +argparse = callPackage({ luaOlder, buildLuarocksPackage, luaAtLeast, lua, fetchgit }: buildLuarocksPackage { pname = "argparse"; version = "scm-2"; @@ -62,7 +58,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -72,9 +68,7 @@ buildLuarocksPackage { }; }) {}; -basexx = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +basexx = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: buildLuarocksPackage { pname = "basexx"; version = "scm-0"; @@ -85,7 +79,7 @@ buildLuarocksPackage { sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -95,9 +89,7 @@ buildLuarocksPackage { }; }) {}; -binaryheap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +binaryheap = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; @@ -107,7 +99,7 @@ buildLuarocksPackage { sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -118,9 +110,7 @@ buildLuarocksPackage { }; }) {}; -bit32 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +bit32 = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; @@ -141,7 +131,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -152,9 +142,7 @@ buildLuarocksPackage { }; }) {}; -busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, dkjson, lua, lua-term, lua_cliargs, luafilesystem, luassert, luasystem, mediator_lua, penlight, say -}: +busted = callPackage({ buildLuarocksPackage, luafilesystem, luasystem, fetchgit, luaOlder, lua-term, say, mediator_lua, penlight, luassert, lua_cliargs, lua, dkjson }: buildLuarocksPackage { pname = "busted"; version = "2.1.1-1"; @@ -175,7 +163,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luafilesystem luassert luasystem mediator_lua penlight say ]; meta = { @@ -185,9 +173,7 @@ buildLuarocksPackage { }; }) {}; -cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, penlight -}: +cassowary = callPackage({ buildLuarocksPackage, fetchgit, penlight, luaOlder, lua }: buildLuarocksPackage { pname = "cassowary"; version = "2.3.2-1"; @@ -208,7 +194,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; meta = { @@ -219,9 +205,7 @@ buildLuarocksPackage { }; }) {}; -cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, penlight -}: +cldr = callPackage({ penlight, luaOlder, lua, fetchgit, buildLuarocksPackage }: buildLuarocksPackage { pname = "cldr"; version = "0.3.0-0"; @@ -242,7 +226,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; meta = { @@ -253,9 +237,7 @@ buildLuarocksPackage { }; }) {}; -compat53 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua -}: +compat53 = callPackage({ lua, luaAtLeast, fetchzip, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; @@ -268,7 +250,7 @@ buildLuarocksPackage { sha256 = "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -279,9 +261,7 @@ buildLuarocksPackage { }; }) {}; -cosmo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lpeg -}: +cosmo = callPackage({ buildLuarocksPackage, fetchgit, lpeg }: buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; @@ -312,8 +292,7 @@ buildLuarocksPackage { }; }) {}; -coxpcall = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit}: +coxpcall = callPackage({ buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; @@ -342,9 +321,7 @@ buildLuarocksPackage { }; }) {}; -cqueues = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +cqueues = callPackage({ fetchurl, buildLuarocksPackage, lua }: buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; @@ -357,7 +334,7 @@ buildLuarocksPackage { sha256 = "0lhd02ag3r1sxr2hx847rdjkddm04l1vf5234v5cz9bd4kfjw4cy"; }; - disabled = with lua; (luaversion != "5.2"); + disabled = (lua.luaversion != "5.2"); propagatedBuildInputs = [ lua ]; meta = { @@ -368,22 +345,20 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, luafilesystem, tl -}: +cyan = callPackage({ argparse, buildLuarocksPackage, tl, fetchgit, luafilesystem }: buildLuarocksPackage { pname = "cyan"; - version = "0.2.0-1"; + version = "0.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/cyan-0.2.0-1.rockspec"; - sha256 = "06v9arib8slcllqxxx0a1z7wqmb184v7klrisvkdqqhpbrry7ys5"; + url = "mirror://luarocks/cyan-0.3.0-1.rockspec"; + sha256 = "1bs5gwgdhibj2gm8y3810b0hh6s9n00fgij8nnjag9kpqrd80vsj"; }).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", + "rev": "31c9eccfc5bf26725e4e8a76ff5d5beaa175da8d", + "date": "2023-02-19T18:58:20-06:00", + "path": "/nix/store/smpj81z2a2blb3qfpjwx9n52d50rp39w-cyan", + "sha256": "0pskargvjn2phgz481b08ndhp3z23s7lqfs8qlwailr7a4f2fc7h", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -400,9 +375,7 @@ buildLuarocksPackage { }; }) {}; -cyrussasl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +cyrussasl = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "cyrussasl"; version = "1.1.0-1"; @@ -420,29 +393,27 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/JorjBauer/lua-cyrussasl"; + homepage = "http://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; license.fullName = "BSD"; }; }) {}; -digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lpeg, lua -}: +digestif = callPackage({ luafilesystem, fetchgit, lpeg, lua, buildLuarocksPackage, luaOlder }: buildLuarocksPackage { pname = "digestif"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "f1b4202928a49e8c20f84ed14deafd0f6b798e2f", - "date": "2022-12-07T18:12:23+01:00", - "path": "/nix/store/ss4kfahp9gnz2y826fr5w6dqxyxs25sn-digestif", - "sha256": "1jb8h7yks8bp74jpq85sz69d2k69vhp6gliajz8ximl3hbhdq17i", + "rev": "8f8448fa3f27611b32fe6398fe22ef24b8602ec9", + "date": "2023-02-24T22:38:11+01:00", + "path": "/nix/store/s7wxqcj3k8pgb3m86d8rs2ggpl63jxwn-digestif", + "sha256": "0k3srmilrz3ajj76kklksmifkgqrm0y7gr25h0vrrldrf1xp4pk0", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -450,8 +421,8 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.3"); - propagatedBuildInputs = [ lpeg lua ]; + disabled = (luaOlder "5.3"); + propagatedBuildInputs = [ lpeg lua luafilesystem ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -460,9 +431,7 @@ buildLuarocksPackage { }; }) {}; -dkjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +dkjson = callPackage({ buildLuarocksPackage, lua, luaAtLeast, luaOlder, fetchurl }: buildLuarocksPackage { pname = "dkjson"; version = "2.6-1"; @@ -475,7 +444,7 @@ buildLuarocksPackage { sha256 = "0wwpdz20fvg5j36902892mnb99craf22697r6v7xdblqnd7fw1xx"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -485,22 +454,20 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +fennel = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "fennel"; - version = "1.2.1-1"; + version = "1.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.2.1-1.rockspec"; - sha256 = "0v4gh7a767zlng3pxpl2bkr3cpqa39k8ljvvspfwkhc9g176r49z"; + url = "mirror://luarocks/fennel-1.3.0-1.rockspec"; + sha256 = "1by78423n8k8i5sz7ji6w5igm8jkmyvd5x1y519hzmknphjqa263"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.2.1.tar.gz"; - sha256 = "0ihxvrz1p4p4f1bid39wy30y9x52qa2z6rx3kxanmd8bqw787ai7"; + url = "https://fennel-lang.org/downloads/fennel-1.3.0.tar.gz"; + sha256 = "0m754c74pj10c1qmc4zl89ifjiqcwafn8qagzfpfmcqv6r46pr23"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -511,9 +478,7 @@ buildLuarocksPackage { }; }) {}; -fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua -}: +fifo = callPackage({ fetchzip, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; @@ -535,9 +500,7 @@ buildLuarocksPackage { }; }) {}; -fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, cldr, lua, luaepnf, penlight -}: +fluent = callPackage({ lua, luaepnf, fetchgit, cldr, buildLuarocksPackage, penlight, luaOlder }: buildLuarocksPackage { pname = "fluent"; version = "0.2.0-0"; @@ -558,7 +521,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ cldr lua luaepnf penlight ]; meta = { @@ -569,19 +532,17 @@ buildLuarocksPackage { }; }) {}; -gitsigns-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +gitsigns-nvim = callPackage({ lua, fetchgit, buildLuarocksPackage }: buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "2ab3bdf0a40bab53033048c6be75bda86316b55d", - "date": "2022-12-19T14:51:38+00:00", - "path": "/nix/store/hdjmih6vd3707wdfvycnvq1ig2q349xx-gitsigns.nvim", - "sha256": "13j5cmrd54cx9d8rirmys01xgmf90ylc3wb5dzmsdjc7hy0viha2", + "rev": "f388995990aba04cfdc7c3ab870c33e280601109", + "date": "2023-02-16T11:22:47+00:00", + "path": "/nix/store/i4acpc5h3sv909gyppm1qv2vqjq84xs1-gitsigns.nvim", + "sha256": "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -589,19 +550,17 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaversion != "5.1"); + disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/lewis6991/gitsigns.nvim"; + homepage = "http://github.com/lewis6991/gitsigns.nvim"; description = "Git signs written in pure lua"; license.fullName = "MIT/X11"; }; }) {}; -http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, basexx, binaryheap, bit32, compat53, cqueues, fifo, lpeg, lpeg_patterns, lua, luaossl -}: +http = callPackage({ fetchzip, lua, fifo, luaossl, lpeg_patterns, lpeg, basexx, buildLuarocksPackage, cqueues, bit32, binaryheap, luaOlder, compat53 }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -614,7 +573,7 @@ buildLuarocksPackage { sha256 = "1pqxxxifl2j1cik3kgayx43v6py5jp6r22myhvxfffysb3b84a2l"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ basexx binaryheap bit32 compat53 cqueues fifo lpeg lpeg_patterns lua luaossl ]; meta = { @@ -625,9 +584,7 @@ buildLuarocksPackage { }; }) {}; -inspect = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +inspect = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; version = "3.1.3-0"; @@ -640,7 +597,7 @@ buildLuarocksPackage { sha256 = "1sqylz5hmj5sbv4gi9988j6av3cb5lwkd7wiyim1h5lr7xhnlf23"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -650,22 +607,20 @@ buildLuarocksPackage { }; }) {}; -jsregexp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +jsregexp = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit }: buildLuarocksPackage { pname = "jsregexp"; - version = "0.0.5-1"; + version = "0.0.6-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/jsregexp-0.0.5-1.rockspec"; - sha256 = "03zln61vxrgml71chrqdz8id076610rb0n9f2yah2nvjfpqpla68"; + url = "mirror://luarocks/jsregexp-0.0.6-1.rockspec"; + sha256 = "1m3vqv1p44akk020c3l3n8pdxs30rl5509gbs3rr13hmqlvil4cs"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/kmarius/jsregexp.git", - "rev": "dd65498ae2c29b882d6c02c0a30577b08d660b94", - "date": "2022-08-16T21:04:46+02:00", - "path": "/nix/store/6kalvlazs50gna9k4ah0wg2avlah6nmr-jsregexp", - "sha256": "01hxql0z3yyzd17r3kyjx2kx0ng7zjc8dp2h2gqmpmjb9ssd4sf1", + "rev": "b5a81e21d0875667ba2458ac8ae903afd5568698", + "date": "2023-02-12T14:19:03+01:00", + "path": "/nix/store/aj42wy1yp53w406id33dyxpv1ws23g4b-jsregexp", + "sha256": "0l7hn5f2jl4n2bpikb72szfzgc192jy3ig5pxx9061j44amyq89m", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -673,7 +628,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -683,9 +638,7 @@ buildLuarocksPackage { }; }) {}; -ldbus = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +ldbus = callPackage({ luaOlder, fetchgit, lua, luaAtLeast, buildLuarocksPackage }: buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; @@ -706,7 +659,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -716,9 +669,7 @@ buildLuarocksPackage { }; }) {}; -ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, markdown, penlight -}: +ldoc = callPackage({ fetchgit, buildLuarocksPackage, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; version = "scm-3"; @@ -745,9 +696,7 @@ buildLuarocksPackage { }; }) {}; -lgi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lgi = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua }: buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; @@ -768,7 +717,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -778,9 +727,7 @@ buildLuarocksPackage { }; }) {}; -linenoise = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +linenoise = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -790,7 +737,7 @@ buildLuarocksPackage { sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -800,9 +747,7 @@ buildLuarocksPackage { }; }) {}; -ljsyscall = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +ljsyscall = callPackage({ lua, fetchurl, buildLuarocksPackage }: buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; @@ -815,7 +760,7 @@ buildLuarocksPackage { sha256 = "1w9g36nhxv92cypjia7igg1xpfrn3dbs3hfy6gnnz5mx14v50abf"; }; - disabled = with lua; (luaversion != "5.1"); + disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -826,9 +771,7 @@ buildLuarocksPackage { }; }) {}; -lmathx = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lmathx = callPackage({ fetchurl, buildLuarocksPackage, lua }: buildLuarocksPackage { pname = "lmathx"; version = "20150624-1"; @@ -851,9 +794,7 @@ buildLuarocksPackage { }; }) {}; -lmpfrlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, lua, luaOlder }: buildLuarocksPackage { pname = "lmpfrlib"; version = "20170112-2"; @@ -866,7 +807,7 @@ buildLuarocksPackage { sha256 = "00d32cwvk298k3vyrjkdmfjgc69x1fwyks3hs7dqr2514zdhgssm"; }; - disabled = with lua; (luaOlder "5.3") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.3") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -877,9 +818,7 @@ buildLuarocksPackage { }; }) {}; -loadkit = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +loadkit = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "loadkit"; version = "1.1.0-1"; @@ -900,7 +839,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -911,9 +850,7 @@ buildLuarocksPackage { }; }) {}; -lpeg = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lpeg = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "lpeg"; version = "1.0.2-1"; @@ -926,7 +863,7 @@ buildLuarocksPackage { sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -937,9 +874,7 @@ buildLuarocksPackage { }; }) {}; -lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lpeg, lua -}: +lpeg_patterns = callPackage({ lpeg, fetchzip, buildLuarocksPackage, lua }: buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -961,9 +896,7 @@ buildLuarocksPackage { }; }) {}; -lpeglabel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lpeglabel = callPackage({ fetchurl, lua, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; @@ -976,7 +909,7 @@ buildLuarocksPackage { sha256 = "1i02lsxj20iygqm8fy6dih1gh21lqk5qj1mv14wlrkaywnv35wcv"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -986,9 +919,7 @@ buildLuarocksPackage { }; }) {}; -lpty = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lpty = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: buildLuarocksPackage { pname = "lpty"; version = "1.2.2-1"; @@ -1001,7 +932,7 @@ buildLuarocksPackage { sha256 = "071mvz79wi9vr6hvrnb1rv19lqp1bh2fi742zkpv2sm1r9gy5rav"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1011,9 +942,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchgit }: buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; @@ -1034,19 +963,17 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; }) {}; -lrexlib-pcre = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lrexlib-pcre = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; @@ -1067,20 +994,18 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; }; }) {}; -lrexlib-posix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lrexlib-posix = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; @@ -1101,19 +1026,17 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; + homepage = "http://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; }) {}; -lua-cjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-cjson = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.10-1"; @@ -1134,7 +1057,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1144,9 +1067,7 @@ buildLuarocksPackage { }; }) {}; -lua-cmsgpack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-cmsgpack = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -1167,19 +1088,17 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/antirez/lua-cmsgpack"; + homepage = "http://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; }) {}; -lua-iconv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }: buildLuarocksPackage { pname = "lua-iconv"; version = "7-3"; @@ -1192,7 +1111,7 @@ buildLuarocksPackage { sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1202,9 +1121,7 @@ buildLuarocksPackage { }; }) {}; -lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, dkjson, inspect, lpeglabel, lua -}: +lua-lsp = callPackage({ fetchgit, inspect, lua, lpeglabel, dkjson, luaAtLeast, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; @@ -1225,7 +1142,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ dkjson inspect lpeglabel lua ]; meta = { @@ -1235,9 +1152,7 @@ buildLuarocksPackage { }; }) {}; -lua-messagepack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lua-messagepack = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-messagepack"; version = "0.5.2-1"; @@ -1250,7 +1165,7 @@ buildLuarocksPackage { sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1260,9 +1175,7 @@ buildLuarocksPackage { }; }) {}; -lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-protobuf = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: buildLuarocksPackage { pname = "lua-protobuf"; version = "0.4.1-1"; @@ -1283,7 +1196,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1294,9 +1207,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-resty-http = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-resty-http"; version = "0.17.0.beta.1-0"; @@ -1317,7 +1228,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1327,9 +1238,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-jwt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lua-resty-openssl -}: +lua-resty-jwt = callPackage({ luaOlder, lua-resty-openssl, fetchgit, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; @@ -1350,7 +1259,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; meta = { @@ -1360,22 +1269,20 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lua-resty-http, lua-resty-jwt, lua-resty-session -}: +lua-resty-openidc = callPackage({ lua-resty-http, buildLuarocksPackage, fetchgit, lua-resty-session, luaOlder, lua, lua-resty-jwt }: buildLuarocksPackage { pname = "lua-resty-openidc"; - version = "1.7.5-1"; + version = "1.7.6-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openidc-1.7.5-1.rockspec"; - sha256 = "14z69c0v35hmhlqvg7kndagpqxa4j7i3cgkm0iyfradqlvgamab4"; + url = "mirror://luarocks/lua-resty-openidc-1.7.6-3.rockspec"; + sha256 = "08nq24kxw51xiyyp5jailyqjfsgz4m4fzy4hb7g3fv76vcsf8msp"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/zmartzone/lua-resty-openidc", - "rev": "85e30a13e08156ef3d782ecf7236758334234c6c", - "date": "2021-12-21T16:23:45+01:00", - "path": "/nix/store/yr827kcbbrvxpymny5sa43sb1wf0vzqj-lua-resty-openidc", - "sha256": "111mnnl639mnyig105zp5bfynjsdnvs201wpg68zd218bh5f362l", + "rev": "5a7b9e2cfe4f5aab7c60032e6ca94d2d534f7d19", + "date": "2023-01-30T19:06:51+01:00", + "path": "/nix/store/nyd2jqhlq8gx4chapqyxk2q4dsxgm8hz-lua-resty-openidc", + "sha256": "15dh9z7y84n840x02xsn2m9h9hdakbbv4p1z7dfz85v5w5i6c86p", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1383,7 +1290,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; meta = { @@ -1393,21 +1300,20 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openssl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit}: +lua-resty-openssl = callPackage({ fetchgit, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.15-1"; + version = "0.8.17-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.15-1.rockspec"; - sha256 = "1i5nvii1wjgs28lcg8gk1axh394fz773br23jppa7rcan7lvrs4j"; + url = "mirror://luarocks/lua-resty-openssl-0.8.17-1.rockspec"; + sha256 = "1b4dv9mdb90n0f6982pnjb05rgb12nkn1j66a1ywcs5fqcmj4sb5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "fadbea797bed4227269128a14fdabd4dee7cc486", - "date": "2022-10-28T12:17:38+08:00", - "path": "/nix/store/a6qqhb2p408mldvm1rqya09rjn04bbkj-lua-resty-openssl", - "sha256": "0w03fggfnqch6q90lwsig803i3rv74vsdxlfdbfb4si2yssjyxsz", + "rev": "dc17f6b2ff3adaa3bcb586f1d09073a4f4f4ec9d", + "date": "2023-01-20T01:36:57+08:00", + "path": "/nix/store/hh9i8ndb861iplkf9mz6vs2akkyibazn-lua-resty-openssl", + "sha256": "14xmxskbw3clqr97y69d311rs6i97vl7dg8pzixsqf4ypgllzvig", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1423,22 +1329,20 @@ buildLuarocksPackage { }; }) {}; -lua-resty-session = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-resty-session = callPackage({ lua_pack, buildLuarocksPackage, fetchgit, luaOlder, lua, lua-ffi-zlib, lua-resty-openssl }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "3.10-1"; + version = "4.0.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-3.10-1.rockspec"; - sha256 = "1a939ndnyqdn633dxv9nsfkgj59ig71822syx9qk0ai3v6426mw3"; + url = "mirror://luarocks/lua-resty-session-4.0.3-1.rockspec"; + sha256 = "17q8gf0zjdbfgphvjsnlzw1d6158v4ppiqxap6hjqr0prqa5yyfq"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/bungle/lua-resty-session.git", - "rev": "e6bf2630c90df7b3db35e859f0aa7e096af3e918", - "date": "2022-01-14T20:16:34+02:00", - "path": "/nix/store/76fxliqmhghj6r5qg5q2r59n6nzapra5-lua-resty-session", - "sha256": "1lx0pbb5swyl0fhxycqx0fs3r158rczb78fav02wlz43yc3nbfax", + "rev": "3373d8138930b6d1e255bb80d9127503019301d7", + "date": "2023-02-21T20:52:32+02:00", + "path": "/nix/store/pdwd03w7505wkv4fw79a3mdlfijk9ngd-lua-resty-session", + "sha256": "1d105785jzn9x3by4r0baaffr5xmc2ilgd7z7izcwq9z29pnfv02", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1446,19 +1350,17 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl lua_pack ]; meta = { homepage = "https://github.com/bungle/lua-resty-session"; - description = "Session Library for OpenResty – Flexible and Secure"; + description = "Session Library for OpenResty - Flexible and Secure"; license.fullName = "BSD"; }; }) {}; -lua-subprocess = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-subprocess = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: buildLuarocksPackage { pname = "subprocess"; version = "scm-1"; @@ -1476,7 +1378,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1487,8 +1389,7 @@ buildLuarocksPackage { }; }) {}; -lua-term = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl}: +lua-term = callPackage({ fetchurl, buildLuarocksPackage }: buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; @@ -1509,9 +1410,7 @@ buildLuarocksPackage { }; }) {}; -lua-toml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-toml = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; @@ -1532,7 +1431,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1542,9 +1441,7 @@ buildLuarocksPackage { }; }) {}; -lua-yajl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-yajl = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; @@ -1565,20 +1462,18 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/brimworks/lua-yajl"; + homepage = "http://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT/X11"; }; }) {}; -lua-zlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lua-zlib = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-2"; @@ -1599,7 +1494,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1610,9 +1505,7 @@ buildLuarocksPackage { }; }) {}; -lua_cliargs = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +lua_cliargs = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; @@ -1622,7 +1515,7 @@ buildLuarocksPackage { sha256 = "0vhpgmy9a8wlxp8a15pnfqfk0aj7pyyb5m41nnfxynx580a6y7cp"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1632,9 +1525,7 @@ buildLuarocksPackage { }; }) {}; -luabitop = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luabitop = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -1652,7 +1543,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.3"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; meta = { @@ -1662,9 +1553,7 @@ buildLuarocksPackage { }; }) {}; -luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, lua, luafilesystem -}: +luacheck = callPackage({ argparse, luafilesystem, lua, luaOlder, fetchgit, buildLuarocksPackage }: buildLuarocksPackage { pname = "luacheck"; version = "1.1.0-1"; @@ -1685,7 +1574,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lua luafilesystem ]; meta = { @@ -1695,9 +1584,7 @@ buildLuarocksPackage { }; }) {}; -luacov = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luacov = callPackage({ luaAtLeast, buildLuarocksPackage, luaOlder, lua, fetchgit }: buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; @@ -1718,7 +1605,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -1728,9 +1615,7 @@ buildLuarocksPackage { }; }) {}; -luadbi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luadbi = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; @@ -1751,7 +1636,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -1761,9 +1646,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luadbi -}: +luadbi-mysql = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit, luadbi, luaAtLeast }: buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; @@ -1784,7 +1667,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; meta = { @@ -1794,9 +1677,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-postgresql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luadbi -}: +luadbi-postgresql = callPackage({ lua, fetchgit, buildLuarocksPackage, luaOlder, luaAtLeast, luadbi }: buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; @@ -1817,7 +1698,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; meta = { @@ -1827,9 +1708,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luadbi -}: +luadbi-sqlite3 = callPackage({ luaAtLeast, lua, luaOlder, buildLuarocksPackage, fetchgit, luadbi }: buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; @@ -1850,7 +1729,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; meta = { @@ -1860,9 +1739,7 @@ buildLuarocksPackage { }; }) {}; -luaepnf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lpeg, lua -}: +luaepnf = callPackage({ luaOlder, buildLuarocksPackage, lpeg, luaAtLeast, lua, fetchgit }: buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; @@ -1883,7 +1760,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lpeg lua ]; meta = { @@ -1893,9 +1770,7 @@ buildLuarocksPackage { }; }) {}; -luaevent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +luaevent = callPackage({ lua, fetchurl, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; @@ -1908,7 +1783,7 @@ buildLuarocksPackage { sha256 = "0pbh315d3p7hxgzmbhphkcldxv2dadbka96131b8j5914nxvl4nx"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1918,9 +1793,7 @@ buildLuarocksPackage { }; }) {}; -luaexpat = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luaexpat = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua }: buildLuarocksPackage { pname = "luaexpat"; version = "1.4.1-1"; @@ -1941,7 +1814,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1952,9 +1825,7 @@ buildLuarocksPackage { }; }) {}; -luaffi = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luaffi = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; @@ -1975,7 +1846,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -1985,9 +1856,7 @@ buildLuarocksPackage { }; }) {}; -luafilesystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luafilesystem = callPackage({ luaOlder, lua, fetchgit, buildLuarocksPackage }: buildLuarocksPackage { pname = "luafilesystem"; version = "1.8.0-1"; @@ -2008,7 +1877,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2019,9 +1888,7 @@ buildLuarocksPackage { }; }) {}; -lualdap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +lualdap = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "lualdap"; version = "1.3.0-1"; @@ -2042,7 +1909,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2053,22 +1920,20 @@ buildLuarocksPackage { }; }) {}; -lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luasocket -}: +lualogging = callPackage({ luasocket, buildLuarocksPackage, fetchgit }: buildLuarocksPackage { pname = "lualogging"; - version = "1.8.0-1"; + version = "1.8.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualogging-1.8.0-1.rockspec"; - sha256 = "0q1719r8lg8rnql809ylm6dbnja85f6nwyqir6f9giq3kcbvnsaq"; + url = "mirror://luarocks/lualogging-1.8.2-1.rockspec"; + sha256 = "164c4xgwkv2ya8fbb22wm48ywc4gx939b574r6bgl8zqayffdqmx"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/lualogging.git", - "rev": "1c6fcf5f68e4d0324c5977f1a27083c06f4d1b8f", - "date": "2022-10-22T09:15:52+02:00", - "path": "/nix/store/yi5v7b8jyplgylsjamjg9c0iswjpzrfj-lualogging", - "sha256": "17y84wrbijfm1z91p8i41ijq9py69qn0k6c5in9yl2mha7s1vndh", + "rev": "465c994788f1bc18fca950934fa5ec9a909f496c", + "date": "2023-01-27T20:29:41+01:00", + "path": "/nix/store/pvb3yq11xgqhq6559sjd8rkf1x991rrz-lualogging", + "sha256": "1mz5iiv9pfikkm4ay7j0q6mk3bmcxylnlg9piwda47xxc1zyb1j4", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2085,9 +1950,7 @@ buildLuarocksPackage { }; }) {}; -luaossl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua -}: +luaossl = callPackage({ buildLuarocksPackage, lua, fetchzip }: buildLuarocksPackage { pname = "luaossl"; version = "20220711-0"; @@ -2109,9 +1972,7 @@ buildLuarocksPackage { }; }) {}; -luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, bit32, lua -}: +luaposix = callPackage({ bit32, lua, luaOlder, fetchzip, luaAtLeast, buildLuarocksPackage }: buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; @@ -2120,24 +1981,22 @@ buildLuarocksPackage { sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; }).outPath; src = fetchzip { - url = "https://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua ]; meta = { - homepage = "https://github.com/luaposix/luaposix/"; + homepage = "http://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; }; }) {}; -luarepl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +luarepl = callPackage({ buildLuarocksPackage, fetchurl, luaOlder, lua }: buildLuarocksPackage { pname = "luarepl"; version = "0.10-1"; @@ -2150,7 +2009,7 @@ buildLuarocksPackage { sha256 = "0wv37h9w6y5pgr39m7yxbf8imkwvaila6rnwjcp0xsxl5c1rzfjm"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2160,9 +2019,7 @@ buildLuarocksPackage { }; }) {}; -luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luasocket -}: +luasec = callPackage({ fetchgit, luaOlder, luasocket, buildLuarocksPackage, lua }: buildLuarocksPackage { pname = "luasec"; version = "1.2.0-1"; @@ -2183,7 +2040,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; meta = { @@ -2194,9 +2051,7 @@ buildLuarocksPackage { }; }) {}; -luasocket = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luasocket = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "luasocket"; version = "3.1.0-1"; @@ -2217,7 +2072,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2227,9 +2082,7 @@ buildLuarocksPackage { }; }) {}; -luasql-sqlite3 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luasql-sqlite3 = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: buildLuarocksPackage { pname = "luasql-sqlite3"; version = "2.6.0-1"; @@ -2250,7 +2103,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2261,9 +2114,7 @@ buildLuarocksPackage { }; }) {}; -luassert = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, say -}: +luassert = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua, say }: buildLuarocksPackage { pname = "luassert"; version = "1.9.0-1"; @@ -2284,7 +2135,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; meta = { @@ -2294,9 +2145,7 @@ buildLuarocksPackage { }; }) {}; -luasystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +luasystem = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchurl }: buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; @@ -2309,7 +2158,7 @@ buildLuarocksPackage { sha256 = "150bbklchh02gsvpngv56xrrlxxvwpqwrh0yy6z95fnvks7gd0qb"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2319,9 +2168,7 @@ buildLuarocksPackage { }; }) {}; -luaunbound = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +luaunbound = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luaunbound"; version = "1.0.0-1"; @@ -2334,7 +2181,7 @@ buildLuarocksPackage { sha256 = "1lsh0ylp5xskygxl5qdv6mhkm1x8xp0vfd5prk5hxkr19jk5mr3d"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -2344,9 +2191,7 @@ buildLuarocksPackage { }; }) {}; -luaunit = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua -}: +luaunit = callPackage({ buildLuarocksPackage, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunit"; version = "3.4-1"; @@ -2359,46 +2204,42 @@ buildLuarocksPackage { sha256 = "0qf07y3229lq3qq1mfkv83gzbc7dgyr67hysqjb5bbk333flv56r"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/bluebird75/luaunit"; + homepage = "http://github.com/bluebird75/luaunit"; description = "A unit testing framework for Lua"; maintainers = with lib.maintainers; [ lockejan ]; license.fullName = "BSD"; }; }) {}; -luautf8 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +luautf8 = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: buildLuarocksPackage { pname = "luautf8"; - version = "0.1.5-1"; + version = "0.1.5-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luautf8-0.1.5-1.rockspec"; - sha256 = "0b2fzb3ignpb028j35np3mkkydg73dpm0lqr4z89gzy2gfjm0iy7"; + url = "mirror://luarocks/luautf8-0.1.5-2.rockspec"; + sha256 = "0v788kk1aj7r70w9fgjlp3qrpjbpa9z9l1m7d13csk0pgfkm5iqz"; }).outPath; src = fetchurl { - url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.4.tar.gz"; - sha256 = "08r4swiipzs0fif3311rr493j4lb3pyapl0sp70pl8s4rmknm43h"; + url = "https://github.com/starwing/luautf8/archive/refs/tags/0.1.5.tar.gz"; + sha256 = "077ji840wfmy7hq0y13l01dv6jhasznykf89gk9m672jhz6dxggl"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/starwing/luautf8"; + homepage = "http://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT"; }; }) {}; -luazip = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +luazip = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, lua, fetchgit }: buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -2419,7 +2260,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -2429,19 +2270,17 @@ buildLuarocksPackage { }; }) {}; -lush-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -, moonscript}: +lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, luaAtLeast, luaOlder, lua }: buildLuarocksPackage { pname = "lush.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "4cc81a12731fbefce1582a940b755691eb3eb6d1", - "date": "2022-12-16T22:20:07+11:00", - "path": "/nix/store/2h8v2ff1bha580jzyrhhwa9lnj98f327-lush.nvim", - "sha256": "0zwb9d8makr9k20cdf7fajhk3frbh4n4p1zajxig0f3ws867zjqx", + "rev": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d", + "date": "2023-01-03T10:45:29+11:00", + "path": "/nix/store/wpnvi5bjlp7sl8g2li21qkcd7m1f3d3w-lush.nvim", + "sha256": "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2449,9 +2288,8 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - nativeCheckInputs = [ moonscript ]; meta = { homepage = "https://github.com/rktjmp/lush.nvim"; @@ -2461,9 +2299,7 @@ buildLuarocksPackage { }; }) {}; -luuid = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +luuid = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -2476,7 +2312,7 @@ buildLuarocksPackage { sha256 = "1bfkj613d05yps3fivmz0j1bxf2zkg9g1yl0ifffgw0vy00hpnvm"; }; - disabled = with lua; (luaOlder "5.2") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -2486,9 +2322,7 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -, cmake}: +luv = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luv"; version = "1.43.0-0"; @@ -2501,8 +2335,7 @@ buildLuarocksPackage { sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; }; - disabled = with lua; (luaOlder "5.1"); - nativeBuildInputs = [ cmake ]; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2512,9 +2345,7 @@ buildLuarocksPackage { }; }) {}; -lyaml = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua -}: +lyaml = callPackage({ buildLuarocksPackage, fetchzip, lua, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "lyaml"; version = "6.2.8-1"; @@ -2523,24 +2354,22 @@ buildLuarocksPackage { sha256 = "0d0h70kjl5fkq589y1sx8qy8as002dhcf88pf60pghvch002ryi1"; }).outPath; src = fetchzip { - url = "https://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; + url = "http://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "https://github.com/gvvaughan/lyaml"; + homepage = "http://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; }; }) {}; -markdown = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +markdown = callPackage({ buildLuarocksPackage, luaAtLeast, fetchgit, luaOlder, lua }: buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; @@ -2561,7 +2390,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -2571,9 +2400,7 @@ buildLuarocksPackage { }; }) {}; -mediator_lua = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua -}: +mediator_lua = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; @@ -2586,7 +2413,7 @@ buildLuarocksPackage { sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2596,9 +2423,7 @@ buildLuarocksPackage { }; }) {}; -moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, lpeg, lua, luafilesystem -}: +moonscript = callPackage({ lpeg, luaOlder, fetchgit, lua, buildLuarocksPackage, argparse, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; version = "dev-1"; @@ -2616,7 +2441,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; meta = { @@ -2627,8 +2452,7 @@ buildLuarocksPackage { }; }) {}; -mpack = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl}: +mpack = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "mpack"; version = "1.0.9-0"; @@ -2649,9 +2473,7 @@ buildLuarocksPackage { }; }) {}; -nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, coxpcall, lua, luv, mpack -}: +nvim-client = callPackage({ coxpcall, fetchurl, mpack, lua, luaOlder, luv, buildLuarocksPackage }: buildLuarocksPackage { pname = "nvim-client"; version = "0.2.4-1"; @@ -2661,7 +2483,7 @@ buildLuarocksPackage { sha256 = "0sk1lmj0r7pyj9k3p6n0wqjbd95br44ansz0ck3amp6ql8f9kprf"; }; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ coxpcall lua luv mpack ]; meta = { @@ -2671,19 +2493,17 @@ buildLuarocksPackage { }; }) {}; -nvim-cmp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +nvim-cmp = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "8bbaeda725d5db6e4e1be2867a64b43bf547cf06", - "date": "2022-12-15T20:27:02+09:00", - "path": "/nix/store/bd3da1ahlp53p3b12780h2x29amr8a3h-nvim-cmp", - "sha256": "1ldbvspz6aam78d47ldpa7bv4z419bzsk5nhli75mz0vzidfvrw5", + "rev": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40", + "date": "2023-02-24T12:23:36+09:00", + "path": "/nix/store/s1qark9y2zkbwyl2mzg60z9r0h4hajf4-nvim-cmp", + "sha256": "0cy93aj02nkspr83sqsrix12jcnhkl5s2mbpjr5ffhpcrk19vlmx", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2691,7 +2511,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; meta = { @@ -2701,19 +2521,17 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luafilesystem -, busted}: +penlight = callPackage({ luafilesystem, luaOlder, fetchgit, buildLuarocksPackage, lua }: buildLuarocksPackage { pname = "penlight"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "b101290c532c2901764de57367d3f2b84127286d", - "date": "2022-10-23T07:52:51+03:00", - "path": "/nix/store/k2jh5076dwb8dp6h05vbdj9jpa87gl1f-penlight", - "sha256": "10pb55cfqrpc9a112pvldkanh63s8dww452gl2rkjnrsh9b9gw4b", + "rev": "7e67bcb1c4d95e7ca817356533419b4a72049b96", + "date": "2022-12-28T23:34:46+01:00", + "path": "/nix/store/14kax7nswd7in005cgb0f0r8194s9nsd-penlight", + "sha256": "17gcfi8hqpdp8m0f1nr9n5p1mzxxpq2qwf8zkqvjkb7qv1zqabj1", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2721,9 +2539,8 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - nativeCheckInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -2733,19 +2550,17 @@ buildLuarocksPackage { }; }) {}; -plenary-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luassert -}: +plenary-nvim = callPackage({ lua, fetchgit, luaOlder, luaAtLeast, luassert, buildLuarocksPackage }: buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd", - "date": "2023-01-06T19:47:51+01:00", - "path": "/nix/store/r6a56xvn5dkrsnswpg7297ihdfc1qsgy-plenary.nvim", - "sha256": "0y3qn0rwlwp720517lwg35f09b30b591hprbvb6hgvn1waw2ljzc", + "rev": "253d34830709d690f013daf2853a9d21ad7accab", + "date": "2023-02-19T10:05:49+01:00", + "path": "/nix/store/dnzlin3gqpvd35a8c5g5hwg3fl28vxgs-plenary.nvim", + "sha256": "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2753,19 +2568,17 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; meta = { - homepage = "https://github.com/nvim-lua/plenary.nvim"; + homepage = "http://github.com/nvim-lua/plenary.nvim"; description = "lua functions you don't want to write "; license.fullName = "MIT/X11"; }; }) {}; -rapidjson = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -, cmake}: +rapidjson = callPackage({ lua, buildLuarocksPackage, luaOlder, fetchgit }: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2783,8 +2596,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); - nativeBuildInputs = [ cmake ]; + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -2794,9 +2606,7 @@ buildLuarocksPackage { }; }) {}; -readline = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, lua, luaposix -}: +readline = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: buildLuarocksPackage { pname = "readline"; version = "3.2-0"; @@ -2809,19 +2619,17 @@ buildLuarocksPackage { sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua luaposix ]; meta = { - homepage = "https://pjb.com.au/comp/lua/readline.html"; + homepage = "http://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; }; }) {}; -rest-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua, plenary-nvim -}: +rest-nvim = callPackage({ lua, luaAtLeast, buildLuarocksPackage, luaOlder, fetchzip, plenary-nvim }: buildLuarocksPackage { pname = "rest.nvim"; version = "0.1-2"; @@ -2834,7 +2642,7 @@ buildLuarocksPackage { sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua plenary-nvim ]; meta = { @@ -2845,9 +2653,7 @@ buildLuarocksPackage { }; }) {}; -say = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -, busted}: +say = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: buildLuarocksPackage { pname = "say"; version = "scm-1"; @@ -2865,9 +2671,8 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - nativeCheckInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/say"; @@ -2876,9 +2681,7 @@ buildLuarocksPackage { }; }) {}; -serpent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +serpent = callPackage({ fetchgit, luaAtLeast, lua, buildLuarocksPackage, luaOlder }: buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; @@ -2899,7 +2702,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -2910,9 +2713,7 @@ buildLuarocksPackage { }; }) {}; -sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luv -, plenary-nvim}: +sqlite = callPackage({ fetchgit, buildLuarocksPackage, luv }: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -2934,7 +2735,6 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ luv ]; - nativeCheckInputs = [ plenary-nvim ]; meta = { homepage = "https://github.com/tami5/sqlite.lua"; @@ -2943,19 +2743,17 @@ buildLuarocksPackage { }; }) {}; -std-_debug = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +std-_debug = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: buildLuarocksPackage { pname = "std._debug"; version = "git-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lua-stdlib/_debug.git", - "rev": "6ab5e78ef21ad9877e9733a178df4799b983e178", - "date": "2022-06-29T11:27:54-07:00", - "path": "/nix/store/c3p5jq6bawdmfnq1ayw6d7kwwc9sqmig-_debug", - "sha256": "1q0gvwwjclf4galz9c9h2xbzh799xswr9z9b7lncmwb5ky2jwpcy", + "rev": "8b80b14bbbe7259a47c160176546bb152bb2d6f1", + "date": "2023-01-31T16:39:35-07:00", + "path": "/nix/store/i24iz2hvnjp18iz9z8kljsy9iv17m2zl-_debug", + "sha256": "07z5lz3gy8wzzks79r3v68vckj42i3sybhfmqx7h2s58ld2kn5fd", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -2963,7 +2761,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -2973,9 +2771,7 @@ buildLuarocksPackage { }; }) {}; -std-normalize = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, std-_debug -}: +std-normalize = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, std-_debug, luaOlder }: buildLuarocksPackage { pname = "std.normalize"; version = "git-1"; @@ -2993,7 +2789,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; meta = { @@ -3003,9 +2799,7 @@ buildLuarocksPackage { }; }) {}; -stdlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua -}: +stdlib = callPackage({ buildLuarocksPackage, luaAtLeast, fetchzip, lua, luaOlder }: buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; @@ -3018,7 +2812,7 @@ buildLuarocksPackage { sha256 = "0ry6k0wh4vyar1z68s0qmqzkdkfn9lcznsl8av7x78qz6l16wfw4"; }; - disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; meta = { @@ -3029,9 +2823,7 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, cyan, dkjson, luafilesystem -}: +teal-language-server = callPackage({ luafilesystem, buildLuarocksPackage, dkjson, cyan, fetchgit }: buildLuarocksPackage { pname = "teal-language-server"; version = "dev-1"; @@ -3041,10 +2833,10 @@ buildLuarocksPackage { }).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", + "rev": "67b5d7cad60b9df472851a2c61591f2aab97da47", + "date": "2022-12-21T20:33:53-06:00", + "path": "/nix/store/qyaz38njm8qgyfxca6m6f8i4lkfcfdb0-teal-language-server", + "sha256": "12nqarykmdvxxci9l6gq2yhn4pjzzqlxyrl2c8svb97hka68wjvx", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -3061,22 +2853,20 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, compat53, luafilesystem -, dkjson}: +tl = callPackage({ compat53, buildLuarocksPackage, argparse, luafilesystem, fetchgit }: buildLuarocksPackage { pname = "tl"; - version = "0.14.1-1"; + version = "0.15.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.14.1-1.rockspec"; - sha256 = "09nm8vgn1j33bj6612h48jqv7vd72qm06f6rly0angkpcdzb2cd7"; + url = "mirror://luarocks/tl-0.15.1-1.rockspec"; + sha256 = "0f9wr91pxcvx43jp9ma4yb6f0r9yrc2fm437nx7xm0dyh7kac9p6"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/teal-language/tl", - "rev": "2a0426ed42a3616981410bab0ef1faa55ab9795d", - "date": "2022-08-23T02:17:01-03:00", - "path": "/nix/store/50p7nazikq1n1nffl84lnh8l39nm18pq-tl", - "sha256": "04bbls8dc0jg7vbqwafn24gqna4swk3aa760i98hnrbmax39pzh2", + "rev": "a10fb2c69827c1b0f8e1b8a5c848a06d6da5d3be", + "date": "2023-01-23T18:14:26-03:00", + "path": "/nix/store/x5p9v443g53sz2c8rvxa465gzfiv47wb-tl", + "sha256": "0hql1274wxji54cadalv4j3k82vd9xasvi119cdnm16mh85ir70s", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -3085,7 +2875,6 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; - nativeCheckInputs = [ dkjson ]; meta = { homepage = "https://github.com/teal-language/tl"; @@ -3095,9 +2884,7 @@ buildLuarocksPackage { }; }) {}; -vstruct = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua -}: +vstruct = callPackage({ fetchgit, lua, buildLuarocksPackage, luaOlder }: buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; @@ -3115,7 +2902,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - disabled = with lua; (luaOlder "5.1"); + disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { @@ -3124,22 +2911,20 @@ buildLuarocksPackage { }; }) {}; -vusted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, busted -}: +vusted = callPackage({ buildLuarocksPackage, fetchgit, busted }: buildLuarocksPackage { pname = "vusted"; - version = "2.1.1-1"; + version = "2.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.1.1-1.rockspec"; - sha256 = "12zw09ib3mmwh1kvcj228dhws2ldvwzymr7qbsq6l5kysaahhjm3"; + url = "mirror://luarocks/vusted-2.2.0-1.rockspec"; + sha256 = "1ri96pdwhck1sbdnkqj9ksv9hs86pv8v2f6vl25696v9snp9jkzs"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/notomo/vusted.git", - "rev": "9607444b9e259b82c0615caabb5fea8cea918edc", - "date": "2022-09-12T21:55:42+09:00", - "path": "/nix/store/pb5inf25lr63bbc1mvx8aqlh83i4ynwd-vusted", - "sha256": "0wv5lmzf36ga0lmyh0xaw4g2jz9hmw4766xmpznbhn2p64lm9kyl", + "rev": "f142170d3b802f6cedfcff67b945a260087ecf65", + "date": "2023-01-03T11:23:56+09:00", + "path": "/nix/store/la7h2a39wnjkdg1fzhkgw3hbrhs4c5kf-vusted", + "sha256": "17pdwaqjfkv2b7a801k5fdg2s0s75miiilfdjgmsyv7phighvkvw", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index d25bb93d49f4c..3dd4776a146de 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.197"; + version = "0.6.207"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+elot37F8VW7BP18zB8wHbxTHLgnTlXLUJlr82/Y05w="; + sha256 = "sha256-7WPyhhhy9BspbqlfV5mFvD8ny2RIbnONrBguhWIgL2w="; }; - vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; + vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 5b64ec328ae62..3558599c2de04 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 891e7d980b4a9..75dd08805f3f7 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"; @@ -26,14 +25,14 @@ in stdenv.mkDerivation { libName = "libmsp430${stdenv.hostPlatform.extensions.sharedLibrary}"; makeFlags = [ "OUTPUT=$(libName)" "HIDOBJ=" ]; NIX_LDFLAGS = [ "-lpugixml" "-lhidapi${hidapiDriver}" ]; - NIX_CFLAGS_COMPILE = [ "-I${hidapi}/include/hidapi" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${hidapi}/include/hidapi" ]; patches = [ ./bsl430.patch ]; 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 b2480d4b098f0..18d98f364f282 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -252,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/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index d9659513996d9..de3ac08ec99da 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -9,8 +9,7 @@ , # py-yajl deps git , # oil deps - readline -, cmark + cmark , file , glibcLocales , six @@ -36,12 +35,12 @@ 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 @@ -60,9 +59,9 @@ rec { 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 @@ -73,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" @@ -91,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 = [ six typing ]; + propagatedBuildInputs = [ six typing py-yajl ]; doCheck = true; @@ -106,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' ''; /* @@ -120,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/source.nix b/pkgs/development/misc/resholve/source.nix index d8f7578f68b46..70182722bde46 100644 --- a/pkgs/development/misc/resholve/source.nix +++ b/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.8.5"; + 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-DX1xe3YC0PlhwbjsvbmUzNjrwhxFpbZW87WWbKcD0us="; + hash = "sha256-FRdCeeC2c3bMEXekEyilgW0PwFfUWGstZ5mXdmRPM5w="; }; } diff --git a/pkgs/development/mobile/androidenv/README.md b/pkgs/development/mobile/androidenv/README.md index 159265abb4802..04cb157dba566 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-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 2b094df034553..018298d322e85 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}: deployAndroidPackage { inherit package os; @@ -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 0000000000000..b3ca1c171b659 --- /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 a862aef1f3c13..d27c1bb1cdc95 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -2,7 +2,8 @@ , licenseAccepted ? false }: -{ toolsVersion ? "26.1.1" +{ cmdLineToolsVersion ? "8.0" +, toolsVersion ? "26.1.1" , platformToolsVersion ? "33.0.3" , buildToolsVersions ? [ "33.0.1" ] , includeEmulator ? false @@ -132,16 +133,40 @@ rec { 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: callPackage ./build-tools.nix { inherit deployAndroidPackage os; package = packages.build-tools.${version}; + + postInstall = '' + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ''; } ) buildToolsVersions; emulator = callPackage ./emulator.nix { inherit deployAndroidPackage os; package = packages.emulator.${emulatorVersion}; + + postInstall = '' + ${linkSystemImages { images = system-images; check = includeSystemImages; }} + ''; }; platforms = map (version: @@ -161,7 +186,7 @@ rec { system-images = lib.flatten (map (apiVersion: map (type: map (abiVersion: - if lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages then + lib.optionals (lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages) ( deployAndroidPackage { inherit os; package = system-images-packages.${apiVersion}.${type}.${abiVersion}; @@ -172,7 +197,7 @@ rec { sed -i '/^Addon.Vendor/d' source.properties ''; } - else [] + ) ) abiVersions ) systemImageTypes ) platformVersions); @@ -192,7 +217,7 @@ rec { }; # All NDK bundles. - ndk-bundles = if includeNDK then map makeNdkBundle ndkVersions else []; + ndk-bundles = lib.optionals includeNDK (map makeNdkBundle ndkVersions); # The "default" NDK bundle. ndk-bundle = if includeNDK then lib.findFirst (x: x != null) null ndk-bundles else null; @@ -238,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 '' @@ -260,12 +295,16 @@ rec { ${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames} by setting nixpkgs config option 'android_sdk.accept_license = true;'. - '' else callPackage ./tools.nix { - inherit deployAndroidPackage packages toolsVersion os; + '' 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; }} @@ -273,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; }} @@ -304,27 +333,19 @@ 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 - # the emulator auto-linked from platform-tools does not find its local qemu, while this one does - ${lib.optionalString includeEmulator '' - rm $out/bin/emulator - ln -s $out/libexec/android-sdk/emulator/emulator $out/bin - ''} - # Write licenses mkdir -p licenses ${lib.concatMapStrings (licenseName: diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 90064becfb5b5..9bd9fb9a543b1 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -19,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-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix index d495f2afd4663..aaedae1eb4bf1 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -4,6 +4,59 @@ 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}</${tag}>" 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 }</${tag}>" + else if hasXmlAttrs && !hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}/>" + else if !hasXmlAttrs && hasXmlValues then "<${tag}>${mkXmlValues xmlValues}</${tag}>" + else "<${tag}/>"; + mkXmlPackage = package: '' + <?xml version="1.0" encoding="UTF-8" standalone="yes"?> + <ns2:repository + xmlns:ns2="http://schemas.android.com/repository/android/common/02" + xmlns:ns3="http://schemas.android.com/repository/android/common/01" + xmlns:ns4="http://schemas.android.com/repository/android/generic/01" + xmlns:ns5="http://schemas.android.com/repository/android/generic/02" + xmlns:ns6="http://schemas.android.com/sdk/android/repo/addon2/01" + xmlns:ns7="http://schemas.android.com/sdk/android/repo/addon2/02" + xmlns:ns8="http://schemas.android.com/sdk/android/repo/addon2/03" + xmlns:ns9="http://schemas.android.com/sdk/android/repo/repository2/01" + xmlns:ns10="http://schemas.android.com/sdk/android/repo/repository2/02" + xmlns:ns11="http://schemas.android.com/sdk/android/repo/repository2/03" + xmlns:ns12="http://schemas.android.com/sdk/android/repo/sys-img2/03" + xmlns:ns13="http://schemas.android.com/sdk/android/repo/sys-img2/02" + xmlns:ns14="http://schemas.android.com/sdk/android/repo/sys-img2/01" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <license id="${package.license}" type="text">${lib.concatStringsSep "---" (mkLicenses package.license)}</license> + <localPackage path="${builtins.replaceStrings [ "/" ] [ ";" ] package.path}" obsolete="${ + if (lib.hasAttrByPath [ "obsolete" ] package) + then package.obsolete else "false" + }"> + ${mkXmlDoc "type-details" package.type-details} + ${mkXmlDoc "revision" package.revision-details} + ${lib.optionalString (lib.hasAttrByPath [ "dependencies" ] package) + (mkXmlDoc "dependencies" package.dependencies) + } + <display-name>${package.displayName}</display-name> + <uses-license ref="${package.license}"/> + </localPackage> + </ns2:repository> + ''; in stdenv.mkDerivation ({ inherit buildInputs; @@ -44,6 +97,12 @@ stdenv.mkDerivation ({ 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. diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 0a680fd360f58..273cc3d8a8a54 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, pkgsi686Linux }: +{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }: deployAndroidPackage { inherit package os; @@ -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 36c3d4da0c8e2..8c51ba09e53ce 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -25,7 +25,7 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - tools = "26.1.1"; + cmdLineToolsVersion = "8.0"; platformTools = "33.0.3"; buildTools = "30.0.3"; ndk = [ @@ -60,7 +60,7 @@ let }; androidComposition = androidEnv.composeAndroidPackages { - toolsVersion = android.versions.tools; + cmdLineToolsVersion = android.versions.cmdLineToolsVersion; platformToolsVersion = android.versions.platformTools; buildToolsVersions = [android.versions.buildTools]; platformVersions = android.platforms; @@ -138,11 +138,55 @@ pkgs.mkShell rec { # Write out local.properties for Android Studio. cat <<EOF > 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 06ed081dc7241..fa813301558fc 100644 --- a/pkgs/development/mobile/androidenv/mkrepo.rb +++ b/pkgs/development/mobile/androidenv/mkrepo.rb @@ -29,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') @@ -148,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. @@ -189,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] ||= {}) @@ -199,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 @@ -218,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}" @@ -230,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 @@ -249,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' @@ -278,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 diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f57a5c08422b1..cc99dfb2971c7 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -49,7 +49,7 @@ deployAndroidPackage { done # Patch executables - if [ -d prebuild/linux-x86_64 ]; then + if [ -d prebuilt/linux-x86_64 ]; then autoPatchelf prebuilt/linux-x86_64 fi diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix new file mode 100644 index 0000000000000..9fd112063cb86 --- /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 49bc8da92a8b8..eed3b896bfca3 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -4,6 +4,7 @@ deployAndroidPackage { inherit package os; 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 e27ec0bc30425..0a4a733a49e0f 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,11 +2212,30 @@ "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": { @@ -926,14 +2247,36 @@ "os": "all", "sha1": "8537616a7add47cce24c60f18bc2429e3dc90ae3", "size": 67927049, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-10_r05.zip" + "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": "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": [ @@ -941,14 +2284,36 @@ "os": "all", "sha1": "a166d5ccbb165e1dd5464fbfeec30a61f77790d8", "size": 75386095, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-10_r05.zip" + "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": "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": { @@ -961,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": [ @@ -976,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" + } + } } } }, @@ -992,14 +2407,29 @@ "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" + } + } } } }, @@ -1011,14 +2441,36 @@ "os": "all", "sha1": "03d7ed95a9d3b107e3f2e5b166d017ea12529e70", "size": 102452069, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-15_r05.zip" + "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": "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": [ @@ -1026,14 +2478,36 @@ "os": "all", "sha1": "61381aef3fd0cdc8255cb3298072a920c80186ca", "size": 116030933, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-15_r07.zip" + "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": "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": { @@ -1046,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": [ @@ -1061,11 +2560,36 @@ "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" + } + } } } }, @@ -1077,14 +2601,36 @@ "os": "all", "sha1": "69b944b0d5a18c8563fa80d7d229af64890f724e", "size": 118646340, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-16_r06.zip" + "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": "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": [ @@ -1092,14 +2638,29 @@ "os": "all", "sha1": "67943c54fb3943943ffeb05fdd39c0b753681f6e", "size": 122482530, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_mips-16_r04.zip" + "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": "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": [ @@ -1107,14 +2668,36 @@ "os": "all", "sha1": "ee6718e7556c8f8bd8d3f470b34f2c5dbf9bcff4", "size": 135305313, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-16_r07.zip" + "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": "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": { @@ -1127,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": [ @@ -1142,11 +2750,36 @@ "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" + } + } } } }, @@ -1158,14 +2791,36 @@ "os": "all", "sha1": "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6", "size": 124437041, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-17_r06.zip" + "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": "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": [ @@ -1173,14 +2828,29 @@ "os": "all", "sha1": "f0c6e153bd584c29e51b5c9723cfbf30f996a05d", "size": 131781761, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_mips-17_r01.zip" + "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": "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": [ @@ -1188,14 +2858,39 @@ "os": "all", "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", "size": 194811128, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-17_r07.zip" + "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": "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": { @@ -1208,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": [ @@ -1223,11 +2943,36 @@ "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" + } + } } } }, @@ -1239,14 +2984,36 @@ "os": "all", "sha1": "580b583720f7de671040d5917c8c9db0c7aa03fd", "size": 130590545, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-18_r05.zip" + "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": "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": [ @@ -1254,14 +3021,36 @@ "os": "all", "sha1": "7a4ced4d9b0ab48047825491b4072dc2eb9b610e", "size": 150097655, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-18_r04.zip" + "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": "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": { @@ -1274,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": [ @@ -1289,11 +3103,36 @@ "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" + } + } } } }, @@ -1305,14 +3144,36 @@ "os": "all", "sha1": "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa", "size": 159871567, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-19_r05.zip" + "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": "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": [ @@ -1320,14 +3181,36 @@ "os": "all", "sha1": "2ac82153aae97f7eae4c5a0761224fe04321d03d", "size": 185886274, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-19_r06.zip" + "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": "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": { @@ -1340,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": [ @@ -1355,11 +3263,36 @@ "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" + } + } } } }, @@ -1378,7 +3311,21 @@ "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": "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": [ @@ -1393,7 +3340,21 @@ "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": "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": { @@ -1403,14 +3364,29 @@ "os": "all", "sha1": "c4375f1b4b4cd21a8617660e25f621cedcbd8332", "size": 211426314, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-21_r04.zip" + "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": "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": [ @@ -1418,14 +3394,36 @@ "os": "all", "sha1": "8c606f81306564b65e41303d2603e4c42ded0d10", "size": 187163871, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-21_r04.zip" + "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": "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": [ @@ -1433,14 +3431,36 @@ "os": "all", "sha1": "00f0eb0a1003efe3316347f762e20a85d8749cff", "size": 208212529, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-21_r05.zip" + "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": "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": [ @@ -1448,14 +3468,36 @@ "os": "all", "sha1": "9078a095825a69e5e215713f0866c83cef65a342", "size": 292623982, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-21_r05.zip" + "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": "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": { @@ -1472,7 +3514,25 @@ "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": "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": [ @@ -1483,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": [ @@ -1498,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": [ @@ -1513,11 +3623,36 @@ "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" + } + } } } }, @@ -1536,7 +3671,21 @@ "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": "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": { @@ -1546,14 +3695,29 @@ "os": "all", "sha1": "703e27a9a4fb7a6e763cb7d713b89e5249a8fc99", "size": 219124634, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-22_r02.zip" + "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": "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": [ @@ -1561,14 +3725,36 @@ "os": "all", "sha1": "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1", "size": 194596267, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-22_r02.zip" + "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": "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": [ @@ -1576,14 +3762,36 @@ "os": "all", "sha1": "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e", "size": 214268954, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-22_r06.zip" + "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": "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": [ @@ -1591,14 +3799,36 @@ "os": "all", "sha1": "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4", "size": 299976630, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-22_r06.zip" + "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": "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": { @@ -1615,7 +3845,25 @@ "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": "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": [ @@ -1626,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": [ @@ -1641,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": [ @@ -1656,11 +3954,36 @@ "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" + } + } } } }, @@ -1679,7 +4002,21 @@ "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": "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": [ @@ -1690,11 +4027,32 @@ "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": "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": { @@ -1704,14 +4062,29 @@ "os": "all", "sha1": "ac18f3bd717e02804eee585e029f5dbc1a2616bf", "size": 253807785, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-23_r07.zip" + "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": "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": [ @@ -1719,14 +4092,36 @@ "os": "all", "sha1": "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d", "size": 238333358, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-23_r06.zip" + "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": "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": [ @@ -1734,14 +4129,36 @@ "os": "all", "sha1": "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb", "size": 260804863, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-23_r10.zip" + "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": "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": [ @@ -1749,14 +4166,36 @@ "os": "all", "sha1": "7cbc291483ca07dc67b71268c5f08a5755f50f51", "size": 365009313, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-23_r10.zip" + "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": "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": { @@ -1773,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": [ @@ -1784,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": [ @@ -1799,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": [ @@ -1814,11 +4321,36 @@ "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" + } + } } } }, @@ -1833,11 +4365,32 @@ "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": "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": { @@ -1847,14 +4400,29 @@ "os": "all", "sha1": "e88ebdf4533efa0370603ee4ab0e7834e0cc364f", "size": 305854153, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-24_r09.zip" + "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": "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": [ @@ -1862,14 +4430,36 @@ "os": "all", "sha1": "e22c47afd06398b35f2705ca2e7fa85323351568", "size": 782997866, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-24_r07.zip" + "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": "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": [ @@ -1877,14 +4467,36 @@ "os": "all", "sha1": "c1cae7634b0216c0b5990f2c144eb8ca948e3511", "size": 313489224, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-24_r08.zip" + "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": "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": [ @@ -1892,14 +4504,36 @@ "os": "all", "sha1": "f6559e1949a5879f31a9662f4f0e50ad60181684", "size": 419261998, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-24_r08.zip" + "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": "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": { @@ -1912,11 +4546,36 @@ "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": "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": [ @@ -1927,11 +4586,36 @@ "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": "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": [ @@ -1942,11 +4626,36 @@ "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": "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": { @@ -1959,11 +4668,36 @@ "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" + } + } } } }, @@ -1978,11 +4712,32 @@ "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": "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": { @@ -1995,11 +4750,32 @@ "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": "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": [ @@ -2010,11 +4786,32 @@ "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": "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": { @@ -2024,14 +4821,29 @@ "os": "all", "sha1": "b39d359623323a1b4906c071dec396040016ea73", "size": 308416103, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-25_r02.zip" + "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": "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": [ @@ -2039,14 +4851,36 @@ "os": "all", "sha1": "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f", "size": 316695942, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-25_r01.zip" + "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": "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": [ @@ -2054,14 +4888,36 @@ "os": "all", "sha1": "7093d7b39216020226ff430a3b7b81c94d31ad37", "size": 422702097, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-25_r01.zip" + "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": "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": { @@ -2078,7 +4934,25 @@ "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": "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": [ @@ -2089,11 +4963,36 @@ "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": "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": [ @@ -2104,11 +5003,36 @@ "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": "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": [ @@ -2119,11 +5043,36 @@ "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": "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": { @@ -2136,11 +5085,36 @@ "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" + } + } } } }, @@ -2155,11 +5129,42 @@ "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": "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": { @@ -2172,11 +5177,32 @@ "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": "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": { @@ -2186,14 +5212,40 @@ "os": "all", "sha1": "c3199baf49790fc65f90f7ce734435d5778f6a30", "size": 328910124, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-26_r01.zip" + "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": "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": [ @@ -2201,14 +5253,35 @@ "os": "all", "sha1": "e613d6e0da668e30daf547f3c6627a6352846f90", "size": 350195807, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-26_r01.zip" + "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": "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": [ @@ -2216,14 +5289,35 @@ "os": "all", "sha1": "432f149c048bffce7f9de526ec65b336daf7a0a3", "size": 474178332, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-26_r01.zip" + "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": "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": { @@ -2236,11 +5330,41 @@ "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": "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": [ @@ -2251,11 +5375,46 @@ "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": "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": [ @@ -2266,11 +5425,46 @@ "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": "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": { @@ -2283,11 +5477,46 @@ "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" + } + } } } }, @@ -2302,11 +5531,32 @@ "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": "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": { @@ -2316,14 +5566,40 @@ "os": "all", "sha1": "cb01199edae33ce375c6d8e08aea08911ff0d583", "size": 331796092, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-27_r01.zip" + "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": "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": [ @@ -2331,14 +5607,35 @@ "os": "all", "sha1": "4ec990fac7b62958decd12e18a4cd389dfe7c582", "size": 360984187, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-27_r01.zip" + "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": "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": [ @@ -2346,14 +5643,35 @@ "os": "all", "sha1": "2878261011a59ca3de29dc5b457a495fdb268d60", "size": 491675204, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-27_r01.zip" + "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": "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": { @@ -2366,11 +5684,41 @@ "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": "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": [ @@ -2381,11 +5729,46 @@ "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": "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": { @@ -2398,11 +5781,46 @@ "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" + } + } } } }, @@ -2417,11 +5835,32 @@ "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": "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": { @@ -2434,11 +5873,32 @@ "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": "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": { @@ -2448,14 +5908,40 @@ "os": "all", "sha1": "4de0491612ca12097be7deb76af835ebabadefca", "size": 425671679, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-28_r01.zip" + "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": "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": [ @@ -2463,14 +5949,28 @@ "os": "all", "sha1": "ce03c42d80c0fc6dc47f6455dbee7aa275d02780", "size": 437320152, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-28_r04.zip" + "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": "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": [ @@ -2478,14 +5978,28 @@ "os": "all", "sha1": "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0", "size": 564792723, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-28_r04.zip" + "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": "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": { @@ -2498,11 +6012,41 @@ "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": "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": [ @@ -2513,11 +6057,46 @@ "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": "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": [ @@ -2528,11 +6107,46 @@ "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": "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": { @@ -2545,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": [ @@ -2560,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": [ @@ -2575,11 +6254,46 @@ "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" + } + } } } }, @@ -2594,11 +6308,42 @@ "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": "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": { @@ -2608,14 +6353,28 @@ "os": "all", "sha1": "fa0d67d7430fcc84b2fe2508ea81e92ac644e264", "size": 498049256, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-29_r08.zip" + "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": "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": [ @@ -2623,26 +6382,52 @@ "os": "windows", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-windows.zip" + "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/default/x86-29_r08-darwin.zip" + "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/default/x86-29_r08-linux.zip" + "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": "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": [ @@ -2650,26 +6435,52 @@ "os": "windows", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-windows.zip" + "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/default/x86_64-29_r08-darwin.zip" + "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/default/x86_64-29_r08-linux.zip" + "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": "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": { @@ -2682,11 +6493,41 @@ "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": "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": [ @@ -2697,11 +6538,41 @@ "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": "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": [ @@ -2712,11 +6583,41 @@ "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": "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": { @@ -2735,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": [ @@ -2762,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": [ @@ -2789,11 +6755,46 @@ "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" + } + } } } }, @@ -2808,11 +6809,42 @@ "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": "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": { @@ -2825,11 +6857,32 @@ "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": "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": [ @@ -2840,11 +6893,32 @@ "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": "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": { @@ -2854,14 +6928,28 @@ "os": "all", "sha1": "2462af138023fbbd1114421818890884d4ebceab", "size": 548363604, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-30_r01.zip" + "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": "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": [ @@ -2869,14 +6957,40 @@ "os": "all", "sha1": "e08119b65d2c188ef69f127028eb4c8cc632cd8f", "size": 676379913, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-30_r10.zip" + "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": "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": { @@ -2889,11 +7003,41 @@ "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": "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": [ @@ -2904,11 +7048,46 @@ "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": "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": [ @@ -2919,11 +7098,46 @@ "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": "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": { @@ -2942,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": [ @@ -2969,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": [ @@ -2996,11 +7275,46 @@ "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" + } + } } } }, @@ -3015,11 +7329,42 @@ "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": "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": [ @@ -3030,11 +7375,42 @@ "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": "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": { @@ -3044,14 +7420,40 @@ "os": "all", "sha1": "1052df2d0afc8fe57138db19d5ebd82d10c607da", "size": 635481190, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-31_r03.zip" + "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": "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": [ @@ -3059,14 +7461,40 @@ "os": "all", "sha1": "1200d6983af477fd6439f11cc5cabf9866bc4a16", "size": 657244568, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-31_r03.zip" + "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": "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": { @@ -3079,11 +7507,46 @@ "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": "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": [ @@ -3094,11 +7557,46 @@ "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": "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": { @@ -3117,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": [ @@ -3132,11 +7665,46 @@ "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" + } + } } } }, @@ -3151,11 +7719,46 @@ "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": "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": { @@ -3174,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": [ @@ -3201,11 +7839,46 @@ "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" + } + } } } }, @@ -3220,11 +7893,42 @@ "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-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", - "revision": "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": [ @@ -3235,11 +7939,42 @@ "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-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", - "revision": "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": { @@ -3252,11 +7987,46 @@ "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": "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": [ @@ -3267,11 +8037,46 @@ "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": "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": { @@ -3290,11 +8095,46 @@ "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": "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": [ @@ -3305,11 +8145,46 @@ "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": "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" + } + } } } }, @@ -3330,11 +8205,47 @@ "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": [ @@ -3345,11 +8256,47 @@ "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" + } + } } } } @@ -3403,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": [ @@ -3430,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": [ @@ -3457,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": [ @@ -3484,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": [ @@ -3511,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": [ @@ -3538,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": [ @@ -3565,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": [ @@ -3592,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": [ @@ -3619,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": [ @@ -3646,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": [ @@ -3673,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": [ @@ -3700,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": [ @@ -3727,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": [ @@ -3754,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": [ @@ -3781,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": [ @@ -3808,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": [ @@ -3835,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": [ @@ -3862,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": [ @@ -3889,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": [ @@ -3916,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": [ @@ -3943,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": [ @@ -3970,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": [ @@ -3997,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": [ @@ -4024,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": [ @@ -4051,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": [ @@ -4078,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": [ @@ -4105,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": [ @@ -4132,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": [ @@ -4159,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": [ @@ -4186,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": [ @@ -4213,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": [ @@ -4240,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": [ @@ -4267,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": [ @@ -4294,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": [ @@ -4321,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": [ @@ -4348,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": [ @@ -4375,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": [ @@ -4402,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": [ @@ -4429,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": [ @@ -4456,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": [ @@ -4483,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": [ @@ -4510,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": [ @@ -4537,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": [ @@ -4564,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": [ @@ -4591,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": [ @@ -4618,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": [ @@ -4645,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": [ @@ -4672,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": [ @@ -4699,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": [ @@ -4726,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": [ @@ -4753,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": [ @@ -4780,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": [ @@ -4807,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": [ @@ -4834,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": [ @@ -4861,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": [ @@ -4892,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": [ @@ -4919,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": [ @@ -4946,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": [ @@ -4973,7 +10911,17 @@ "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": [ @@ -5000,7 +10948,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", - "revision": "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": { @@ -5029,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": [ @@ -5056,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": [ @@ -5083,7 +11061,17 @@ "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": [ @@ -5110,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": { @@ -5139,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": [ @@ -5165,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": [ @@ -5193,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": [ @@ -5220,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": [ @@ -5247,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": [ @@ -5274,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": [ @@ -5301,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": [ @@ -5328,7 +11390,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", - "revision": "7.0" + "revision": "7.0", + "revision-details": { + "major:0": "7", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "8.0": { "archives": [ @@ -5355,7 +11426,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", - "revision": "8.0" + "revision": "8.0", + "revision-details": { + "major:0": "8", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "emulator": { @@ -5380,11 +11460,28 @@ "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.3.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.14": { "archives": [ @@ -5407,11 +11504,28 @@ "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": "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": [ @@ -5434,11 +11548,28 @@ "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": "32.1.8" + "revision": "32.1.8", + "revision-details": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -5467,7 +11598,16 @@ "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": [ @@ -5494,7 +11634,16 @@ "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.1" + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk": { @@ -5519,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": [ @@ -5546,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": [ @@ -5573,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": [ @@ -5600,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": [ @@ -5627,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": [ @@ -5654,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": [ @@ -5681,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": [ @@ -5708,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": [ @@ -5735,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": [ @@ -5762,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": [ @@ -5789,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": [ @@ -5816,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": [ @@ -5843,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": [ @@ -5870,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": [ @@ -5897,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": [ @@ -5924,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": [ @@ -5951,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": [ @@ -5978,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": [ @@ -6005,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": [ @@ -6032,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": [ @@ -6059,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": [ @@ -6086,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": [ @@ -6113,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": [ @@ -6140,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": [ @@ -6167,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": [ @@ -6194,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": [ @@ -6221,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": [ @@ -6248,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": [ @@ -6275,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": [ @@ -6302,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": [ @@ -6329,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": [ @@ -6356,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": [ @@ -6383,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": [ @@ -6410,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": [ @@ -6437,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": [ @@ -6464,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": [ @@ -6491,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": [ @@ -6518,11 +13318,29 @@ "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": [ @@ -6545,11 +13363,28 @@ "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": "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": [ @@ -6572,11 +13407,28 @@ "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": "25.1.8937393", + "revision-details": { + "major:0": "25", + "micro:2": "8937393", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -6601,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": [ @@ -6628,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": [ @@ -6655,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": [ @@ -6682,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": [ @@ -6709,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": [ @@ -6736,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": [ @@ -6763,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": [ @@ -6790,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": [ @@ -6817,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": [ @@ -6844,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": [ @@ -6871,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": [ @@ -6898,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": [ @@ -6925,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": [ @@ -6952,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": [ @@ -6979,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": [ @@ -7006,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": [ @@ -7033,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": [ @@ -7060,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": [ @@ -7087,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": [ @@ -7114,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": [ @@ -7141,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": [ @@ -7168,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": [ @@ -7195,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": [ @@ -7222,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": [ @@ -7249,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": { @@ -7270,7 +14561,15 @@ "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": { @@ -7299,7 +14598,17 @@ "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "33.0.3" + "revision": "33.0.3", + "revision-details": { + "major:0": "33", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -7316,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": [ @@ -7331,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": [ @@ -7346,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": [ @@ -7361,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": [ @@ -7376,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": [ @@ -7391,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": [ @@ -7406,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": [ @@ -7421,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": [ @@ -7436,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": [ @@ -7451,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": [ @@ -7477,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": [ @@ -7493,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": [ @@ -7508,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": [ @@ -7523,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": [ @@ -7538,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": [ @@ -7553,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": [ @@ -7568,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": [ @@ -7583,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": [ @@ -7598,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": [ @@ -7613,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": [ @@ -7628,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": [ @@ -7654,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": [ @@ -7670,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": [ @@ -7685,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": [ @@ -7700,7 +15395,23 @@ "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": [ @@ -7715,7 +15426,23 @@ "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": [ @@ -7741,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": [ @@ -7768,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": [ @@ -7795,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": [ @@ -7811,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": [ @@ -7826,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": [ @@ -7841,7 +15651,23 @@ "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": [ @@ -7856,7 +15682,22 @@ "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": { @@ -7885,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": [ @@ -7912,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": [ @@ -7939,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": { @@ -7955,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": [ @@ -7971,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": [ @@ -7986,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": [ @@ -8001,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": [ @@ -8016,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": [ @@ -8031,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": [ @@ -8046,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": [ @@ -8061,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": [ @@ -8076,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": [ @@ -8091,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": [ @@ -8106,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": [ @@ -8121,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": [ @@ -8136,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": [ @@ -8151,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": [ @@ -8166,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": [ @@ -8181,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": [ @@ -8196,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": [ @@ -8211,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": [ @@ -8226,7 +16290,18 @@ "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": [ @@ -8241,7 +16316,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", - "revision": "33" + "revision": "33", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -8266,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 0000000000000..d063b73ccb40b --- /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 36e7e52b80a5d..091b94489479b 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -1,26 +1,42 @@ -{deployAndroidPackage, requireFile, lib, packages, toolsVersion, os, callPackage, postInstall ? ""}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}: -if toolsVersion == "26.0.1" then callPackage ./tools/26.nix { - inherit deployAndroidPackage lib os 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 callPackage ./tools/26.nix { - inherit deployAndroidPackage lib os postInstall; - package = packages.tools.${toolsVersion}; -} else callPackage ./tools/25.nix { - inherit deployAndroidPackage lib os 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 85a114fbc29c4..0000000000000 --- a/pkgs/development/mobile/androidenv/tools/25.nix +++ /dev/null @@ -1,62 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, 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 pkgsi686Linux.glibc pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig pkgsi686Linux.freetype pkgsi686Linux.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 527d36027183b..0000000000000 --- a/pkgs/development/mobile/androidenv/tools/26.nix +++ /dev/null @@ -1,45 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, 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 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 [ 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 d0894d5ceeb57..0f89dbe934df9 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.21.0"; + version = "1.23.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "13b2ykphc7szdanlkk34agf7p0lx78mavk5pjfls48d1k5hllslc"; + sha256 = "0g508x79vhn7phmk4vlr3c213k0vi6yk0mpfcz5jcg4mpdapfmri"; }; dontUnpack = true; diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index e4c3062cf5315..fa2eeae00b559 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation ({ echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products '' else if target == "iphone" then - if release then '' + lib.optionalString release '' mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products @@ -180,7 +180,6 @@ stdenv.mkDerivation ({ echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} '' - else "" else throw "Target: ${target} is not supported!"} ''; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index 4c8a63a0a5285..a42a9c20923d9 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -103,10 +103,9 @@ stdenv.mkDerivation { '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 '' - else if stdenv.system == "x86_64-linux" then - '' + else lib.optionalString (stdenv.system == "x86_64-linux") '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 '' - else ""} + } ''; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index e51775b8c6df6..a0907881d1685 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -105,10 +105,9 @@ stdenv.mkDerivation { '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 '' - else if stdenv.system == "x86_64-linux" then - '' + else lib.optionalString (stdenv.system == "x86_64-linux") '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 '' - else ""} + } ''; } diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 5e12fb5ce8a33..3d9eb8de1030a 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: src/host/usb-linux.c:82: multiple definition of `t_recovery_queue'; # src/host/recovery.c:45: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 4bef0ba2db0e9..6120025d5e3e9 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} ${lib.optionalString release '' ${lib.optionalString generateIPA '' diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index e23ed132ce443..efd8d538c0906 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of # `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' rm BUILD # otherwise `mkdir build` fails on case insensitive file systems diff --git a/pkgs/development/nim-packages/base45/default.nix b/pkgs/development/nim-packages/base45/default.nix new file mode 100644 index 0000000000000..b63f3073e7741 --- /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/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c687e763c2844..c4213f0b8c839 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -39,6 +39,7 @@ , "awesome-lint" , "balanceofsatoshis" , "bash-language-server" +, "bibtex-tidy" , "bower" , "bower2nix" , "browserify" @@ -183,7 +184,6 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9c30ac4dc6d9d..1314cb690198c 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.2" = { + "@adobe/css-tools-4.2.0" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.0.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.2.tgz"; - sha512 = "Fx6tYjk2wKUgLi8uMANZr8GNZx05u44ArIJldn9VxLvolzlJVgHbTUCbwhMd6bcYky178+WUSxPHO3DAtGLWpw=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; + sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; }; }; "@akryum/winattr-3.0.0" = { @@ -148,13 +148,13 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1501.1" = { + "@angular-devkit/architect-0.1502.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1501.1"; + version = "0.1502.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.1.tgz"; - sha512 = "2uDa/+nVGwQ5X6UJtB14V37SbD/64WSg0hKyX5z1yp6wYrSuk7PWV8hddIsiYM3aIT5wTGqfLil6NkV4G/BzQw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.0.tgz"; + sha512 = "/HmyAQhb4BNbcVRL2uaLwrJAAeYVUD42Bipoq8+kUNzoRv9QqJTIOx+2fSsmwBk8C+Jx3184UD3SfUmEnFPt4g=="; }; }; "@angular-devkit/core-15.0.4" = { @@ -166,13 +166,22 @@ let sha512 = "4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA=="; }; }; - "@angular-devkit/core-15.1.1" = { + "@angular-devkit/core-15.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "15.1.1"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.1.tgz"; - sha512 = "wss76zfw4oPHs+Dd0OIbLv8os/BXDkDErj9hCjBbycQN768EqF8z7EBNGy6SKHYhmfXJy9REUkEgt9qPMJb4CQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.4.tgz"; + sha512 = "PW5MRmd9DHJR4FaXchwQtj9pXnsghSTnwRvfZeCRNYgU2sv0DKyTV+YTSJB+kNXnoPNG1Je6amDEkiXecpspXg=="; + }; + }; + "@angular-devkit/core-15.2.0" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "15.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.0.tgz"; + sha512 = "kUE5XvQzn+fiEvFqIk8x0q4hvRD+dKfAMM7p0uPQ69O9cj2b8c01oDvLOskvwhIJOnKTxnK/1d2gFQLupPci4A=="; }; }; "@angular-devkit/schematics-15.0.4" = { @@ -184,22 +193,31 @@ let sha512 = "/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig=="; }; }; - "@angular-devkit/schematics-15.1.1" = { + "@angular-devkit/schematics-15.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "15.1.1"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.1.tgz"; - sha512 = "ullwoxFT9aMhQR2aNwb/66A6l4HTgp4I6thbBywt86nn+ZGbJCzLKRdv2vmYh9JaxZYh1pydxWjKLEUdlycKXg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.4.tgz"; + sha512 = "jpddxo9Qd2yRQ1t9FLhAx5S+luz6HkyhDytq0LFKbxf9ikf1J4oy9riPBFl4pRmrNARWcHZ6GbD20/Ky8PjmXQ=="; }; }; - "@angular-devkit/schematics-cli-15.0.4" = { + "@angular-devkit/schematics-15.2.0" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "15.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.0.tgz"; + sha512 = "LrsbQWaMRrLPBCgTOw7F+BvA4mjCljC+42NmiId/GXdU9FljEw/Ly1+u7LJREnE1yYqGQeR8zd8xjgIS0mTc3A=="; + }; + }; + "@angular-devkit/schematics-cli-15.1.4" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "15.0.4"; + version = "15.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.0.4.tgz"; - sha512 = "rEzkpjiQcJqCgbZ1Ns8jn1BL4724jcj+YFS7Qw5d4v6yQYA8iSLz12HDTH0TiNEv7u5S55fYuRz2QreI0QUT8A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-15.1.4.tgz"; + sha512 = "qkM5Mfs28jZzNcJnSM6RlyrKkYvzhQmWFTxBXnn15k5T4EnSs1gI6O054Xn7jo/senfwNNt7h2Mlz2OmBLo6+w=="; }; }; "@antora/asciidoc-loader-3.1.2" = { @@ -364,13 +382,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apidevtools/json-schema-ref-parser-9.1.0" = { + "@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.0"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.0.tgz"; - sha512 = "teB30tFooE3iQs2HQIKJ02D8UZA1Xy1zaczzhUjJs0CymYxeC0g+y5rCY2p8NHBM6DBUVoR8rSM4kHLj1WE9mQ=="; + 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" = { @@ -553,13 +571,22 @@ let sha512 = "6bBFeDTtPOn4jZaiD3p0f05MEGQL9pw2Zbfj546oFETNmjJFWO3nzHz6/m+P53calknCvyVzZ5YhoBLIvzn5iw=="; }; }; - "@asyncapi/specs-3.2.1" = { + "@astrojs/compiler-1.1.2" = { + name = "_at_astrojs_slash_compiler"; + packageName = "@astrojs/compiler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.1.2.tgz"; + sha512 = "L3/JrdNwBFKcoDeStmRgJWvI2t/5nNJm7HnGjDy4e8BH3qKv8iQYdpvuQjeYRA00k6I1lxZGBm/0wU+Lg7HPiQ=="; + }; + }; + "@asyncapi/specs-4.1.1" = { name = "_at_asyncapi_slash_specs"; packageName = "@asyncapi/specs"; - version = "3.2.1"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.1.tgz"; - sha512 = "FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="; + url = "https://registry.npmjs.org/@asyncapi/specs/-/specs-4.1.1.tgz"; + sha512 = "CtJdKTQnzX3UwHVBgwrzLIwmnlxl1VKsLNG9ORgdUoD7BFB1fEh9hjdCD3Qh3eHhvlfizLtlFlGet1yQBSi1mg=="; }; }; "@aws-crypto/crc32-2.0.0" = { @@ -661,40 +688,40 @@ let sha512 = "JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA=="; }; }; - "@aws-sdk/client-s3-3.252.0" = { + "@aws-sdk/client-s3-3.241.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.252.0.tgz"; - sha512 = "VsTDuztgrwwBnkTZKm3t3cyXNTnWRCxDN4fCeEabw8/GB6KKSrs1a9pYXyWXuXtuvV5lFG4tIZMcXF7UkVXqyg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.241.0.tgz"; + sha512 = "GxkiX4f+FUW2Lr3PySc1wuYlfU8QV2nx6KlBY8L8yf2txtajEL0/hhfo5Pbo4Uw1ZZlTv4iPHUOiTrm2R9Rhyg=="; }; }; - "@aws-sdk/client-sso-3.252.0" = { + "@aws-sdk/client-sso-3.241.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.252.0.tgz"; - sha512 = "VgBqJvvCU4y9zAHJwYj5nOeNGcCxKdCO4edUxWQVHcpLsVWu49maOVtWuteq9MOrHYeWfQi8bVWGt8MPvv9+bA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.241.0.tgz"; + sha512 = "Jm4HR+RYAqKMEYZvvWaq0NYUKKonyInOeubObXH4BLXZpmUBSdYCSjjLdNJY3jkQoxbDVPVMIurVNh5zT5SMRw=="; }; }; - "@aws-sdk/client-sso-oidc-3.252.0" = { + "@aws-sdk/client-sso-oidc-3.241.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.252.0.tgz"; - sha512 = "OOwfEXFS+UliGZorEleARsXXUp3ObZSXo9/YY+8XF7/8froAqYjKCEi0tflghgYlh7d6qe7wzD7/6gDL1a/qgA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.241.0.tgz"; + sha512 = "/Ml2QBGpGfUEeBrPzBZhSTBkHuXFD2EAZEIHGCBH4tKaURDI6/FoGI8P1Rl4BzoFt+II/Cr91Eox6YT9EwChsQ=="; }; }; - "@aws-sdk/client-sts-3.252.0" = { + "@aws-sdk/client-sts-3.241.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.252.0.tgz"; - sha512 = "wzfsWOlDFLdmeML8R7DUJWGl9wcRKf2uiunfB1aWzpdlgms0Z7FkHWgkDYHjCPyYHL6EBm84ajGl1UkE7AcmqQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.241.0.tgz"; + sha512 = "vmlG8cJzRf8skCtTJbA2wBvD2c3NQ5gZryzJvTKDS06KzBzcEpnjlLseuTekcnOiRNekbFUX5hRu5Zj3N2ReLg=="; }; }; "@aws-sdk/config-resolver-3.234.0" = { @@ -724,22 +751,22 @@ let sha512 = "//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q=="; }; }; - "@aws-sdk/credential-provider-ini-3.252.0" = { + "@aws-sdk/credential-provider-ini-3.241.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.252.0.tgz"; - sha512 = "OfpU8xMYK7+6XQ2dUO4rN0gUhhb/ZLV7iwSL6Ji2pI9gglGhKdOSfmbn6fBfCB50kzWZRNoiQJVaBu/d0Kr0EQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.241.0.tgz"; + sha512 = "CI+mu6h74Kzmscw35TvNkc/wYHsHPGAwP7humSHoWw53H9mVw21Ggft/dT1iFQQZWQ8BNXkzuXlNo1IlqwMgOA=="; }; }; - "@aws-sdk/credential-provider-node-3.252.0" = { + "@aws-sdk/credential-provider-node-3.241.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.252.0.tgz"; - sha512 = "Jt854JnB7izkJ/gb3S0hBFqAQPUNUP3eL8gXX2uqk9A9bQFQdS57/Ci0FXaEPwOXzJwAAPazD8dTf6HXMhnm3w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.241.0.tgz"; + sha512 = "08zPQcD5o9brQmzEipWHeHgU85aQcEF8MWLfpeyjO6e1/l7ysQ35NsS+PYtv77nLpGCx/X+ZuW/KXWoRrbw77w=="; }; }; "@aws-sdk/credential-provider-process-3.226.0" = { @@ -751,13 +778,13 @@ let sha512 = "iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng=="; }; }; - "@aws-sdk/credential-provider-sso-3.252.0" = { + "@aws-sdk/credential-provider-sso-3.241.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.252.0.tgz"; - sha512 = "2JGoojMOBjG9/DenctEszjdPechq0uDTpH5nx+z1xxIAugA5+HYG/ncNfpwhmUBCrnOxpRaQViTNqXddEPHlAg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.241.0.tgz"; + sha512 = "6Bjd6eEIrVomRTrPrM4dlxusQm+KMJ9hLYKECCpFkwDKIK+pTgZNLRtQdalHyzwneHJPdimrm8cOv1kUQ8hPoA=="; }; }; "@aws-sdk/credential-provider-web-identity-3.226.0" = { @@ -1084,13 +1111,22 @@ let sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; }; }; - "@aws-sdk/s3-request-presigner-3.252.0" = { + "@aws-sdk/querystring-parser-3.272.0" = { + name = "_at_aws-sdk_slash_querystring-parser"; + packageName = "@aws-sdk/querystring-parser"; + version = "3.272.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.272.0.tgz"; + sha512 = "5oS4/9n6N1LZW9tI3qq/0GnCuWoOXRgcHVB+AJLRBvDbEe+GI+C/xK1tKLsfpDNgsQJHc4IPQoIt4megyZ/1+A=="; + }; + }; + "@aws-sdk/s3-request-presigner-3.241.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.252.0.tgz"; - sha512 = "9V94Fi30Yz5pYPd3aDlbzRYMCUfe7C5D5srMeygZ/XPFsvKC+B16xGKYc2fXb74V+gm68W+6pUVCshOT/AThzA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.241.0.tgz"; + sha512 = "8W9F/do9ufnDVZ7hEL7VwTyqN6FLNv1p8h8XmMUbvJvb0iASsly5s2BgMcMVuQNiH1olUPmZQsfL6upqItGecg=="; }; }; "@aws-sdk/service-error-classification-3.229.0" = { @@ -1120,13 +1156,22 @@ let sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; }; }; - "@aws-sdk/signature-v4-crt-3.226.0" = { + "@aws-sdk/signature-v4-3.272.0" = { + name = "_at_aws-sdk_slash_signature-v4"; + packageName = "@aws-sdk/signature-v4"; + version = "3.272.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.272.0.tgz"; + sha512 = "pWxnHG1NqJWMwlhJ6NHNiUikOL00DHROmxah6krJPMPq4I3am2KY2Rs/8ouWhnEXKaHAv4EQhSALJ+7Mq5S4/A=="; + }; + }; + "@aws-sdk/signature-v4-crt-3.272.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.226.0"; + version = "3.272.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.226.0.tgz"; - sha512 = "zaosVAgCnPzIv2qXPi1PGa9RrD3DZ7zfKg/ZGCsYhvFku8+zMK/Ky29+2lS+QB1OzGBW8+ddSuZxJcg0xQi36g=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.272.0.tgz"; + sha512 = "egTOzuMoQvKXR8B1kT0Ym6He0BrADj5S2nJxhmIqmuANLXulUVfi9yxdlPfI9eWGimzOCzVsyd8Pl7HYU67FSA=="; }; }; "@aws-sdk/signature-v4-multi-region-3.226.0" = { @@ -1147,13 +1192,13 @@ let sha512 = "8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ=="; }; }; - "@aws-sdk/token-providers-3.252.0" = { + "@aws-sdk/token-providers-3.241.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.252.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.252.0.tgz"; - sha512 = "xi3pUP31tyKF4lJFCOgtkwSWESE9W1vE23Vybsq53wzXEYfnRql8RP+C9FFkUouAR6ixPHEcEYplB+l92CY49g=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.241.0.tgz"; + sha512 = "79okvuOS7V559OIL/RalIPG98wzmWxeFOChFnbEjn2pKOyGQ6FJRwLPYZaVRtNdAtnkBNgRpmFq9dX843QxhtQ=="; }; }; "@aws-sdk/types-3.226.0" = { @@ -1165,6 +1210,15 @@ let sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; }; }; + "@aws-sdk/types-3.272.0" = { + name = "_at_aws-sdk_slash_types"; + packageName = "@aws-sdk/types"; + version = "3.272.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.272.0.tgz"; + sha512 = "MmmL6vxMGP5Bsi+4wRx4mxYlU/LX6M0noOXrDh/x5FfG7/4ZOar/nDxqDadhJtNM88cuWVHZWY59P54JzkGWmA=="; + }; + }; "@aws-sdk/url-parser-3.226.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; @@ -1255,13 +1309,13 @@ let sha512 = "UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w=="; }; }; - "@aws-sdk/util-endpoints-3.245.0" = { + "@aws-sdk/util-endpoints-3.241.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.245.0"; + version = "3.241.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.245.0.tgz"; - sha512 = "UNOFquB1tKx+8RT8n82Zb5tIwDyZHVPBg/m0LB0RsLETjr6krien5ASpqWezsXKIR1hftN9uaxN4bvf2dZrWHg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.241.0.tgz"; + sha512 = "jVf8bKrN22Ey0xLmj75sL7EUvm5HFpuOMkXsZkuXycKhCwLBcEUWlvtJYtRjOU1zScPQv9GMJd2QXQglp34iOQ=="; }; }; "@aws-sdk/util-format-url-3.226.0" = { @@ -1300,6 +1354,15 @@ let sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; }; }; + "@aws-sdk/util-middleware-3.272.0" = { + name = "_at_aws-sdk_slash_util-middleware"; + packageName = "@aws-sdk/util-middleware"; + version = "3.272.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.272.0.tgz"; + sha512 = "Abw8m30arbwxqmeMMha5J11ESpHUNmCeSqSzE8/C4B8jZQtHY4kq7f+upzcNIQ11lsd+uzBEzNG3+dDRi0XOJQ=="; + }; + }; "@aws-sdk/util-retry-3.229.0" = { name = "_at_aws-sdk_slash_util-retry"; packageName = "@aws-sdk/util-retry"; @@ -1354,6 +1417,15 @@ let sha512 = "othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A=="; }; }; + "@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.188.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; @@ -1390,22 +1462,22 @@ let sha512 = "brRdB1wwMgjWEnOQsv7zSUhIQuh7DEicrfslAqHop4S4FtSI3GQAShpQqgOpMTNFYcpaWKmE/Y1MJmNY7xLCnw=="; }; }; - "@azu/format-text-1.0.1" = { + "@azu/format-text-1.0.2" = { name = "_at_azu_slash_format-text"; packageName = "@azu/format-text"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azu/format-text/-/format-text-1.0.1.tgz"; - sha512 = "fyPhr8C1DHQqq/xC8gIg2jmYTw/SoY+KgtVFs6H+DFhfh4Hr4OSDeQZuK1eGpOjhuckWy9A1Hhq84+uRjoznLQ=="; + url = "https://registry.npmjs.org/@azu/format-text/-/format-text-1.0.2.tgz"; + sha512 = "Swi4N7Edy1Eqq82GxgEECXSSLyn6GOb5htRFPzBDdUkECGXtlf12ynO5oJSpWKPwCaUssOu7NfhDcCWpIC6Ywg=="; }; }; - "@azu/style-format-1.0.0" = { + "@azu/style-format-1.0.1" = { name = "_at_azu_slash_style-format"; packageName = "@azu/style-format"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azu/style-format/-/style-format-1.0.0.tgz"; - sha512 = "L7iaxNrk0OLsH7kw3yx3KVQTKhc2zeW0D9SLrRCqbTZi3XtvSVmmjqO73kR4EnWbTRZ18mwdAikbFYJ0coZ55Q=="; + url = "https://registry.npmjs.org/@azu/style-format/-/style-format-1.0.1.tgz"; + sha512 = "AHcTojlNBdD/3/KxIKlg8sxIWHfOtQszLvOpagLTO+bjC3u7SAszu1lf//u7JJC50aUSH+BVWDD/KvaA6Gfn5g=="; }; }; "@azure/abort-controller-1.1.0" = { @@ -1426,13 +1498,13 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.0" = { + "@azure/core-client-1.7.2" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; - sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz"; + sha512 = "ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag=="; }; }; "@azure/core-http-2.3.1" = { @@ -1453,22 +1525,22 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.5.0" = { + "@azure/core-lro-2.5.1" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; - sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; + sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; }; }; - "@azure/core-paging-1.4.0" = { + "@azure/core-paging-1.5.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; - sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; + sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; "@azure/core-rest-pipeline-1.10.1" = { @@ -1534,40 +1606,40 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.32.2" = { + "@azure/msal-browser-2.33.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.2"; + version = "2.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; - sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; + sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; }; }; - "@azure/msal-common-7.6.0" = { + "@azure/msal-common-10.0.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "7.6.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.6.0.tgz"; - sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; + sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; }; }; - "@azure/msal-common-9.1.0" = { + "@azure/msal-common-7.6.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.1.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.0.tgz"; - sha512 = "Ai7SUJPkHOVUNAjepKp753ZXI8Haw5snTNIu+Vi6fdNPAH1KCuxSyWeBZT6hLDJSgfmYf/kazZqz7Q0BjyAGTA=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.6.0.tgz"; + sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.14.6" = { + "@azure/msal-node-1.15.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.6"; + version = "1.15.0"; 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=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; + sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -1579,13 +1651,13 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/cli-7.20.7" = { + "@babel/cli-7.21.0" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.20.7.tgz"; - sha512 = "WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.21.0.tgz"; + sha512 = "xi7CxyS8XjSyiwUGCfwf+brtJxjW1/ZTcBUkP10xawIEXLX5HzLn+3aXkgxozcP2UhRhtKTmQurw9Uaes7jZrA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1615,13 +1687,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.10" = { + "@babel/compat-data-7.21.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.10"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz"; - sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz"; + sha512 = "gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="; }; }; "@babel/core-7.0.0" = { @@ -1633,22 +1705,13 @@ let sha512 = "nrvxS5u6QUN5gLl1GEakIcmOeoUHT1/gQtdMRq18WFURJ5osn4ppJLVSseMQo4zVWKJfBTF4muIYijXUnKlRLQ=="; }; }; - "@babel/core-7.20.12" = { + "@babel/core-7.21.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.12"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; - sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; - }; - }; - "@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=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz"; + sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA=="; }; }; "@babel/generator-7.18.2" = { @@ -1660,13 +1723,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.20.7" = { + "@babel/generator-7.21.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.7"; + version = "7.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz"; + sha512 = "1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -1696,22 +1759,22 @@ let sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.20.12" = { + "@babel/helper-create-class-features-plugin-7.21.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.20.12"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz"; - sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz"; + sha512 = "Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.20.5" = { + "@babel/helper-create-regexp-features-plugin-7.21.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.20.5"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz"; - sha512 = "m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz"; + sha512 = "N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg=="; }; }; "@babel/helper-define-polyfill-provider-0.3.3" = { @@ -1741,13 +1804,13 @@ let sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.19.0" = { + "@babel/helper-function-name-7.21.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; + sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; }; }; "@babel/helper-hoist-variables-7.18.6" = { @@ -1759,13 +1822,13 @@ let sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.20.7" = { + "@babel/helper-member-expression-to-functions-7.21.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz"; - sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"; + sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q=="; }; }; "@babel/helper-module-imports-7.18.6" = { @@ -1777,13 +1840,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.11" = { + "@babel/helper-module-transforms-7.21.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.11"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; - sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"; + sha512 = "79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -1867,13 +1930,13 @@ let sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; }; - "@babel/helper-validator-option-7.18.6" = { + "@babel/helper-validator-option-7.21.0" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"; + sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="; }; }; "@babel/helper-wrap-function-7.20.5" = { @@ -1885,13 +1948,13 @@ let sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.20.7" = { + "@babel/helpers-7.21.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"; + sha512 = "XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA=="; }; }; "@babel/highlight-7.18.6" = { @@ -1930,13 +1993,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.20.7" = { + "@babel/parser-7.21.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; + sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -1984,22 +2047,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.20.7" = { + "@babel/plugin-proposal-class-static-block-7.21.0" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"; + sha512 = "XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw=="; }; }; - "@babel/plugin-proposal-decorators-7.20.7" = { + "@babel/plugin-proposal-decorators-7.21.0" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz"; - sha512 = "JB45hbUweYpwAGjkiM7uCyXMENH2lG+9r3G2E+ttc2PRXAoEkpfd/KW5jDg4j8RS6tLtTG1jZi9LbHZVSfs1/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz"; + sha512 = "MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -2092,13 +2155,13 @@ let sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.20.7" = { + "@babel/plugin-proposal-optional-chaining-7.21.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz"; - sha512 = "T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"; + sha512 = "p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA=="; }; }; "@babel/plugin-proposal-private-methods-7.18.6" = { @@ -2110,13 +2173,13 @@ let sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.20.5" = { + "@babel/plugin-proposal-private-property-in-object-7.21.0" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.20.5"; + version = "7.21.0"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"; + sha512 = "ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { @@ -2155,13 +2218,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.19.0" = { + "@babel/plugin-syntax-decorators-7.21.0" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz"; - sha512 = "xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz"; + sha512 = "tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w=="; }; }; "@babel/plugin-syntax-dynamic-import-7.0.0" = { @@ -2344,22 +2407,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.11" = { + "@babel/plugin-transform-block-scoping-7.21.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.11"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz"; - sha512 = "tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"; + sha512 = "Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ=="; }; }; - "@babel/plugin-transform-classes-7.20.7" = { + "@babel/plugin-transform-classes-7.21.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz"; - sha512 = "LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"; + sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ=="; }; }; "@babel/plugin-transform-computed-properties-7.20.7" = { @@ -2407,22 +2470,22 @@ let sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.19.0" = { + "@babel/plugin-transform-flow-strip-types-7.21.0" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz"; - sha512 = "sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz"; + sha512 = "FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w=="; }; }; - "@babel/plugin-transform-for-of-7.18.8" = { + "@babel/plugin-transform-for-of-7.21.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.8"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"; + sha512 = "LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ=="; }; }; "@babel/plugin-transform-function-name-7.18.9" = { @@ -2461,13 +2524,13 @@ let sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.20.11" = { + "@babel/plugin-transform-modules-commonjs-7.21.2" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.20.11"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz"; - sha512 = "S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"; + sha512 = "Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA=="; }; }; "@babel/plugin-transform-modules-systemjs-7.20.11" = { @@ -2542,13 +2605,13 @@ let sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.20.7" = { + "@babel/plugin-transform-react-jsx-7.21.0" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; - sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz"; + sha512 = "6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg=="; }; }; "@babel/plugin-transform-react-jsx-development-7.18.6" = { @@ -2560,13 +2623,13 @@ let sha512 = "SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.18.6" = { + "@babel/plugin-transform-react-jsx-self-7.21.0" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.18.6.tgz"; - sha512 = "A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.21.0.tgz"; + sha512 = "f/Eq+79JEu+KUANFks9UZCcvydOOGMgF7jBrcwjHa5jTZD8JivnhCJYvmlhR/WTXBWonDExPoW0eO/CR4QJirA=="; }; }; "@babel/plugin-transform-react-jsx-source-7.19.6" = { @@ -2614,13 +2677,13 @@ let sha512 = "yECRVxRu25Nsf6IY5v5XrXhcW9ZHomUQiq30VO8H7r3JYPcBJDTcxZmT+6v1O3QKKrDp1Wp40LinGbcd+jlp9A=="; }; }; - "@babel/plugin-transform-runtime-7.19.6" = { + "@babel/plugin-transform-runtime-7.21.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.19.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz"; - sha512 = "PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz"; + sha512 = "ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.18.6" = { @@ -2668,13 +2731,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.20.7" = { + "@babel/plugin-transform-typescript-7.21.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz"; - sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz"; + sha512 = "xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -2767,22 +2830,31 @@ let sha512 = "+l6FlG1j73t4wh78W41StbcCz0/9a1/y+vxfnjtHl060kSmcgMfGzK9MEkLvrCOXfhp9RCX+d88sm6rOqxEIEQ=="; }; }; - "@babel/preset-typescript-7.18.6" = { + "@babel/preset-typescript-7.21.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; - sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz"; + sha512 = "myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg=="; }; }; - "@babel/register-7.18.9" = { + "@babel/register-7.21.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.18.9"; + version = "7.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/register/-/register-7.21.0.tgz"; + sha512 = "9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw=="; + }; + }; + "@babel/regjsgen-0.8.0" = { + name = "_at_babel_slash_regjsgen"; + packageName = "@babel/regjsgen"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.18.9.tgz"; - sha512 = "ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw=="; + url = "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"; + sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; "@babel/runtime-7.0.0" = { @@ -2794,22 +2866,31 @@ let sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.12.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.12.1"; 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.12.1.tgz"; + sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; }; }; - "@babel/runtime-7.20.7" = { + "@babel/runtime-7.20.13" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.7"; + version = "7.20.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; + sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; + }; + }; + "@babel/runtime-7.21.0" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; - sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz"; + sha512 = "xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw=="; }; }; "@babel/runtime-7.9.0" = { @@ -2830,15 +2911,6 @@ let sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA=="; }; }; - "@babel/runtime-corejs3-7.20.7" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz"; - sha512 = "jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg=="; - }; - }; "@babel/template-7.0.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -2857,13 +2929,13 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.12" = { + "@babel/traverse-7.21.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.12"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; - sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz"; + sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; }; }; "@babel/types-7.18.4" = { @@ -2875,13 +2947,13 @@ let sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; }; }; - "@babel/types-7.20.7" = { + "@babel/types-7.21.2" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz"; + sha512 = "3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw=="; }; }; "@bmewburn/js-beautify-1.14.7" = { @@ -2911,40 +2983,40 @@ let sha512 = "Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg=="; }; }; - "@cdktf/cli-core-0.15.0" = { + "@cdktf/cli-core-0.15.5" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.0.tgz"; - sha512 = "1N1N66dMl1kfAXcxTgKgePO9RfhB/p5T4dCAhfMCzLe+R0rOO1xfYQcIEXWqoORwRiIE2EyW9O9OSkxLx0DuyQ=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.5.tgz"; + sha512 = "9RdxpWrswkd6mvpjePYfQU+9C41Pm9Ikx87TKmZ7UmmY1sgB7jMySqOnCUatghEuzvBiuez2qyqrOU+LUCQG+Q=="; }; }; - "@cdktf/commons-0.15.0" = { + "@cdktf/commons-0.15.5" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.0.tgz"; - sha512 = "c3NB2X4OsUGUicpUMJSV9MGnmU+/nYNs0n7G98c/N7nctxWpm1oPoXkoSC8GsDbc3n44cuokBDgW2JiscB/YRA=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.5.tgz"; + sha512 = "rwmQARfqxFDmAFQbCFsE6uYr5FPNcur6U5TOLa03/ruQecoq4tjKlPiB4tOEHp8FAk86V6K38JQ6a81+/3VVtQ=="; }; }; - "@cdktf/hcl2cdk-0.15.0" = { + "@cdktf/hcl2cdk-0.15.5" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.0.tgz"; - sha512 = "X88IejdGoYpB7DkAf09v8YLMQiYu1VTKWVvggiGkS0q7DgFb79Q/S9aFfC5RfPrMNhZSV01Jrt/pDCQdcFJQ1A=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.5.tgz"; + sha512 = "Aqf7cKeozoiaCzyHd3dUE0/9uyd3xHavdsbkah/1+u1I3vo3Oav1aidbSrOOhOgOewTgmokDfyo2wX/I4JwX0g=="; }; }; - "@cdktf/hcl2json-0.15.0" = { + "@cdktf/hcl2json-0.15.5" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.0.tgz"; - sha512 = "pVYjTosthO0Mro/VD5x4iUM6TcVk0hdeNzk8uaaxk49/XnJB4DiwHbvIdjKJk4BuY2YuW+bCsz6X2QjKJmz2jA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.5.tgz"; + sha512 = "bnQ8OMrycCadjfkU9AzG/7RRZgOpuLnFg5GDgnM+rckySR3JedGAUm0BItXYH4Oyyuk+BbLmEU88fJUS5TYgZg=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" = { @@ -2956,13 +3028,13 @@ let sha512 = "5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ=="; }; }; - "@cdktf/provider-generator-0.15.0" = { + "@cdktf/provider-generator-0.15.5" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.0.tgz"; - sha512 = "YY2ANbC9xuhq1yXc6dhVPvMCCKMjcXNRBUP6BqvlE2smD0RWx1s0uWKAG5Tw4D4kx4Nb6EXYpvFHRIEnjVJ4wA=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.5.tgz"; + sha512 = "UVHWEG7P+TN9eMhGaJNYkivoZcj2U571ylOGnmwuiloa7qs/8jTptO8VKOLSzk6ePQQaZ8lhM95GsFfDUEjUWA=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3010,22 +3082,22 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; - "@commitlint/config-validator-17.4.0" = { + "@commitlint/config-validator-17.4.4" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "17.4.0"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.4.0.tgz"; - sha512 = "Sa/+8KNpDXz4zT4bVbz2fpFjvgkPO6u2V2fP4TKgt6FjmOw2z3eEX859vtfeaTav/ukBw0/0jr+5ZTZp9zCBhA=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.4.4.tgz"; + sha512 = "bi0+TstqMiqoBAQDvdEP4AFh0GaKyLFlPPEObgI29utoKEYoPQTvF0EYqIwYYLEoJYhj5GfMIhPHJkTJhagfeg=="; }; }; - "@commitlint/ensure-17.4.0" = { + "@commitlint/ensure-17.4.4" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "17.4.0"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.4.0.tgz"; - sha512 = "7oAxt25je0jeQ/E0O/M8L3ADb1Cvweu/5lc/kYF8g/kXatI0wxGE5La52onnAUAWeWlsuvBNar15WcrmDmr5Mw=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.4.4.tgz"; + sha512 = "AHsFCNh8hbhJiuZ2qHv/m59W/GRE9UeOXbkOqxYMNNg9pJ7qELnFcwj5oYpa6vzTSHtPGKf3C2yUFNy1GGHq6g=="; }; }; "@commitlint/execute-rule-17.4.0" = { @@ -3037,40 +3109,40 @@ let sha512 = "LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA=="; }; }; - "@commitlint/format-17.4.0" = { + "@commitlint/format-17.4.4" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "17.4.0"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-17.4.0.tgz"; - sha512 = "Z2bWAU5+f1YZh9W76c84J8iLIWIvvm+mzqogTz0Nsc1x6EHW0Z2gI38g5HAjB0r0I3ZjR15IDEJKhsxyblcyhA=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-17.4.4.tgz"; + sha512 = "+IS7vpC4Gd/x+uyQPTAt3hXs5NxnkqAZ3aqrHd5Bx/R9skyCAWusNlNbw3InDbAK6j166D9asQM8fnmYIa+CXQ=="; }; }; - "@commitlint/is-ignored-17.4.2" = { + "@commitlint/is-ignored-17.4.4" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.2.tgz"; - sha512 = "1b2Y2qJ6n7bHG9K6h8S4lBGUl6kc7mMhJN9gy1SQfUZqe92ToDjUTtgNWb6LbzR1X8Cq4SEus4VU8Z/riEa94Q=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.4.tgz"; + sha512 = "Y3eo1SFJ2JQDik4rWkBC4tlRIxlXEFrRWxcyrzb1PUT2k3kZ/XGNuCDfk/u0bU2/yS0tOA/mTjFsV+C4qyACHw=="; }; }; - "@commitlint/lint-17.4.2" = { + "@commitlint/lint-17.4.4" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.2.tgz"; - sha512 = "HcymabrdBhsDMNzIv146+ZPNBPBK5gMNsVH+el2lCagnYgCi/4ixrHooeVyS64Fgce2K26+MC7OQ4vVH8wQWVw=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.4.tgz"; + sha512 = "qgkCRRFjyhbMDWsti/5jRYVJkgYZj4r+ZmweZObnbYqPUl5UKLWMf9a/ZZisOI4JfiPmRktYRZ2JmqlSvg+ccw=="; }; }; - "@commitlint/load-17.4.2" = { + "@commitlint/load-17.4.4" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-17.4.2.tgz"; - sha512 = "Si++F85rJ9t4hw6JcOw1i2h0fdpdFQt0YKwjuK4bk9KhFjyFkRxvR3SB2dPaMs+EwWlDrDBGL+ygip1QD6gmPw=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-17.4.4.tgz"; + sha512 = "z6uFIQ7wfKX5FGBe1AkOF4l/ShOQsaa1ml/nLMkbW7R/xF8galGS7Zh0yHvzVp/srtfS0brC+0bUfQfmpMPFVQ=="; }; }; "@commitlint/message-17.4.2" = { @@ -3082,40 +3154,40 @@ let sha512 = "3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q=="; }; }; - "@commitlint/parse-17.4.2" = { + "@commitlint/parse-17.4.4" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.2.tgz"; - sha512 = "DK4EwqhxfXpyCA+UH8TBRIAXAfmmX4q9QRBz/2h9F9sI91yt6mltTrL6TKURMcjUVmgaB80wgS9QybNIyVBIJA=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.4.tgz"; + sha512 = "EKzz4f49d3/OU0Fplog7nwz/lAfXMaDxtriidyGF9PtR+SRbgv4FhsfF310tKxs6EPj8Y+aWWuX3beN5s+yqGg=="; }; }; - "@commitlint/read-17.4.2" = { + "@commitlint/read-17.4.4" = { name = "_at_commitlint_slash_read"; packageName = "@commitlint/read"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-17.4.2.tgz"; - sha512 = "hasYOdbhEg+W4hi0InmXHxtD/1favB4WdwyFxs1eOy/DvMw6+2IZBmATgGOlqhahsypk4kChhxjAFJAZ2F+JBg=="; + url = "https://registry.npmjs.org/@commitlint/read/-/read-17.4.4.tgz"; + sha512 = "B2TvUMJKK+Svzs6eji23WXsRJ8PAD+orI44lVuVNsm5zmI7O8RSGJMvdEZEikiA4Vohfb+HevaPoWZ7PiFZ3zA=="; }; }; - "@commitlint/resolve-extends-17.4.0" = { + "@commitlint/resolve-extends-17.4.4" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "17.4.0"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.4.0.tgz"; - sha512 = "3JsmwkrCzoK8sO22AzLBvNEvC1Pmdn/65RKXzEtQMy6oYMl0Snrq97a5bQQEFETF0VsvbtUuKttLqqgn99OXRQ=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.4.4.tgz"; + sha512 = "znXr1S0Rr8adInptHw0JeLgumS11lWbk5xAWFVno+HUFVN45875kUtqjrI6AppmD3JI+4s0uZlqqlkepjJd99A=="; }; }; - "@commitlint/rules-17.4.2" = { + "@commitlint/rules-17.4.4" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.2.tgz"; - sha512 = "OGrPsMb9Fx3/bZ64/EzJehY9YDSGWzp81Pj+zJiY+r/NSgJI3nUYdlS37jykNIugzazdEXfMtQ10kmA+Kx2pZQ=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.4.tgz"; + sha512 = "0tgvXnHi/mVcyR8Y8mjTFZIa/FEQXA4uEutXS/imH2v1UNkYDSEMsK/68wiXRpfW1euSgEdwRkvE1z23+yhNrQ=="; }; }; "@commitlint/to-lines-17.4.0" = { @@ -3136,13 +3208,13 @@ let sha512 = "/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g=="; }; }; - "@commitlint/types-17.4.0" = { + "@commitlint/types-17.4.4" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "17.4.0"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-17.4.0.tgz"; - sha512 = "2NjAnq5IcxY9kXtUeO2Ac0aPpvkuOmwbH/BxIm36XXK5LtWFObWJWjXOA+kcaABMrthjWu6la+FUpyYFMHRvbA=="; + url = "https://registry.npmjs.org/@commitlint/types/-/types-17.4.4.tgz"; + sha512 = "amRN8tRLYOsxRr6mTnGGGvB5EmW/4DDjLMgiwK3CCVEmN6Sr/6xePGEpWaspKkckILuUORCwe6VfDBw6uj4axQ=="; }; }; "@cronvel/get-pixels-3.4.1" = { @@ -3154,40 +3226,40 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.19.2" = { + "@cspell/cspell-bundled-dicts-6.27.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.19.2.tgz"; - sha512 = "dbzMGK1JHRTUJ8Pkw/EYbj02RMYhM1/vfrAzgRpqogj83m0cfBC/0IHELkVIl3taC1KdFZ1XHXPp7310LZ6+ww=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.27.0.tgz"; + sha512 = "udRkEUz0QIAecCUECVac8IBCu7f5siCrxUZmsoZINgqLlSh0ppmn4/CiiA+sefj99rOq/vB4VEEQCnMShfl5qw=="; }; }; - "@cspell/cspell-pipe-6.19.2" = { + "@cspell/cspell-pipe-6.27.0" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.19.2.tgz"; - sha512 = "OS+hUdSXU8408OjzBl1EgQ0R4OCXSFAthkN2nqByuQvIa2Ho0yRtXB9BgGCwfcAaffNzdLyTzzQsHhLjjRO0gg=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.27.0.tgz"; + sha512 = "lS3kIew5+ETExORdPcJkEA03ylrEL9CHaJ1xE7SSezU3mqoUgbVW5/f2+PCIWPu1mVvUpWef2X1ODddiPPp9NQ=="; }; }; - "@cspell/cspell-service-bus-6.19.2" = { + "@cspell/cspell-service-bus-6.27.0" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.19.2.tgz"; - sha512 = "PVv8q1y2KtuYIXd7tbWujJHNrIgd93k5aOEB9ffIMrrw1MhDFnuuB1l4rDN83zykLlab2dWPU29zhaGnH/EtMw=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.27.0.tgz"; + sha512 = "GC3WseMeBE1xtIftBgfTOQxgAMHmLF5HhjHo2rVIfCKv3uyQXuNsGYmtqY7dm4GDrBx1vIYjOoT2xtEaSLoUPw=="; }; }; - "@cspell/cspell-types-6.19.2" = { + "@cspell/cspell-types-6.27.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.19.2.tgz"; - sha512 = "Eyivx0MAuYdOAOXrNC/oksMx5QL9NBi9Vvb+7CWPJSFk7p66B5sjcxAz6ujZcQ1WVBLoAqL75BoIqF+lgma9aA=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.27.0.tgz"; + sha512 = "eHKpAhIUYIjssqF20IrihzNAPDTWJsFpBzg7UznX03Z4Y77JrGAgdRZ6h69uaIafQb7uotNYWnDazpVSkMpikQ=="; }; }; "@cspell/dict-ada-4.0.1" = { @@ -3244,13 +3316,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.6" = { + "@cspell/dict-companies-3.0.8" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.6.tgz"; - sha512 = "6rWuwZxPisn/MP41DzBtChVgbz9b6HSjBH3X0s3k7zlBaxrw6xFAZGKH9KGFSPTiV+WD9j+IIn2/ITXERGjNLA=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.8.tgz"; + sha512 = "tQPpkxgog+7xGN3dA9p2Hd4O95+hFYfJuHeY9GgxNahBQyq3bv0REAc6xlqdtkIpfV2ga93B0l37mQr1p107Iw=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3262,13 +3334,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-4.0.1" = { + "@cspell/dict-cpp-4.0.3" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-4.0.1.tgz"; - sha512 = "mD6mn0XFCqHCz2j6p/7OQm3yNFn1dlQq6vip1pLynvNWDRz5yKYDVRUQCTEORT7ThS0dLpI4BjCX84YUKNhibA=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-4.0.3.tgz"; + sha512 = "gbXY9cUgRpb5mpw19VBy+YNUqNMlT5Dj70d8V1yIFbqPVHxccmxwdU4rlNaRyYrC41kDZwxmG7QQwcng6FdGcg=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3316,22 +3388,22 @@ let sha512 = "HU8RbFRoGanFH85mT01Ot/Ay48ixr/gG25VPLtdq56QTrmPsw79gxYm/5Qay16eQbpoPIxaj5CAWNam+DX4GbA=="; }; }; - "@cspell/dict-css-4.0.2" = { + "@cspell/dict-css-4.0.5" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "4.0.2"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.2.tgz"; - sha512 = "0NxBcB36b1Jy23Tf5YLrD8+PvBhE3FgBci3rwtw2DEqVigEX6uodecfoh9I4kcU8PZlVsDujrUfwgzYCWh/feQ=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.5.tgz"; + sha512 = "z5vw8nJSyKd6d3i5UmMNoVcAp0wxvs9OHWOmAeJKT9fO3tok02gK24VZhcJ0NJtiKdHQ2zRuzdfWl51wdAiY6A=="; }; }; - "@cspell/dict-dart-2.0.1" = { + "@cspell/dict-dart-2.0.2" = { name = "_at_cspell_slash_dict-dart"; packageName = "@cspell/dict-dart"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.1.tgz"; - sha512 = "YRuDX9k2qPSWDEsM26j8o7KMvaZ0DXc74ijK/VRwaksm1CBRPBW289pe2TE2K7y4SJjTKXgQ9urOVlozeQDpuA=="; + url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.2.tgz"; + sha512 = "jigcODm7Z4IFZ4vParwwP3IT0fIgRq/9VoxkXfrxBMsLBGGM2QltHBj7pl+joX+c4cOHxfyZktGJK1B1wFtR4Q=="; }; }; "@cspell/dict-django-1.0.26" = { @@ -3343,22 +3415,22 @@ let sha512 = "mn9bd7Et1L2zuibc08GVHTiD2Go3/hdjyX5KLukXDklBkq06r+tb0OtKtf1zKodtFDTIaYekGADhNhA6AnKLkg=="; }; }; - "@cspell/dict-django-4.0.1" = { + "@cspell/dict-django-4.0.2" = { name = "_at_cspell_slash_dict-django"; packageName = "@cspell/dict-django"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.0.1.tgz"; - sha512 = "q3l7OH39qzeN2Y64jpY39SEAqki5BUzPTypnhzM40yT+LOGSWqSh9Ix5UecejtXPDVrD8vML+m7Bp5070h52HQ=="; + url = "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.0.2.tgz"; + sha512 = "L0Yw6+Yh2bE9/FAMG4gy9m752G4V8HEBjEAGeRIQ9qvxDLR9yD6dPOtgEFTjv7SWlKSrLb9wA/W3Q2GKCOusSg=="; }; }; - "@cspell/dict-docker-1.1.5" = { + "@cspell/dict-docker-1.1.6" = { name = "_at_cspell_slash_dict-docker"; packageName = "@cspell/dict-docker"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.5.tgz"; - sha512 = "SNEohOScQ+0+y9dp/jKTx60OOJQrf5es5BJ32gh5Ck3jKXNo4wd9KLgPOmQMUpencb5SGjrBsC4rr1fyfCwytg=="; + url = "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.6.tgz"; + sha512 = "zCCiRTZ6EOQpBnSOm0/3rnKW1kCcAUDUA7SxJG3SuH6iZvKi3I8FEg8+O83WQUeXg0SyPNerD9F40JLnnJjJig=="; }; }; "@cspell/dict-dotnet-1.0.32" = { @@ -3370,13 +3442,13 @@ let sha512 = "9H9vXrgJB4KF8xsyTToXO53cXD33iyfrpT4mhCds+YLUw3P3x3E9myszgJzshnrxYBvQZ+QMII57Qr6SjZVk4Q=="; }; }; - "@cspell/dict-dotnet-4.0.1" = { + "@cspell/dict-dotnet-4.0.2" = { name = "_at_cspell_slash_dict-dotnet"; packageName = "@cspell/dict-dotnet"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-4.0.1.tgz"; - sha512 = "l11TqlUX8cDgsE/1Zrea1PqLn63s20MY3jKWMbQVB5DMDPDO2f8Pukckkwxq5p/cxDABEjuGzfF1kTX3pAakBw=="; + url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-4.0.2.tgz"; + sha512 = "Cu+Ob142tBQ2cYrpK/d3tjm/FvNXQXwdUShRIPKx03HbtUk9BoTdeFY5bX+Zz7GeV66OJCMrmpFANrtKpB8NTg=="; }; }; "@cspell/dict-elixir-1.0.26" = { @@ -3388,13 +3460,22 @@ let sha512 = "hz1yETUiRJM7yjN3mITSnxcmZaEyaBbyJhpZPpg+cKUil+xhHeZ2wwfbRc83QHGmlqEuDWbdCFqKSpCDJYpYhg=="; }; }; - "@cspell/dict-elixir-4.0.1" = { + "@cspell/dict-elixir-4.0.2" = { name = "_at_cspell_slash_dict-elixir"; packageName = "@cspell/dict-elixir"; - version = "4.0.1"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.2.tgz"; + sha512 = "/YeHlpZ1pE9VAyxp3V0xyUPapNyC61WwFuw2RByeoMqqYaIfS3Hw+JxtimOsAKVhUvgUH58zyKl5K5Q6FqgCpw=="; + }; + }; + "@cspell/dict-en-common-misspellings-1.0.2" = { + name = "_at_cspell_slash_dict-en-common-misspellings"; + packageName = "@cspell/dict-en-common-misspellings"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.1.tgz"; - sha512 = "IejBqiTTWSXpvBm6yg4qUfnJR0LwbUUCJcK5wXOMKEJitu3yDfrT9GPc6NQJXgokbg9nBjEyxVIzNcLgx2x3/Q=="; + url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-1.0.2.tgz"; + sha512 = "jg7ZQZpZH7+aAxNBlcAG4tGhYF6Ksy+QS5Df73Oo+XyckBjC9QS+PrRwLTeYoFIgXy5j3ICParK5r3MSSoL4gw=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -3415,13 +3496,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.2.0" = { + "@cspell/dict-en_us-4.3.0" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.2.0.tgz"; - sha512 = "n5hz8vQ6FAp4f+ZW/raN/f4G69V1LrhNZ7kgXM+Nirmkrz16oXmd1defTulbd7yf2T2XU8DmsrTnkuRG9mSQKw=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.0.tgz"; + sha512 = "lQ4r8tBiylNjmYwrWz4xUgBtVC0CciKpddMUVosdusHonFE0KjlvkZK6PFtROBupmRLMBBMjxvtpbq8SdFBqCw=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3451,13 +3532,13 @@ let sha512 = "VhIX+FVYAnqQrOuoFEtya6+H72J82cIicz9QddgknsTqZQ3dvgp6lmVnsQXPM3EnzA8n1peTGpLDwHzT7ociLA=="; }; }; - "@cspell/dict-fonts-3.0.0" = { + "@cspell/dict-fonts-3.0.1" = { name = "_at_cspell_slash_dict-fonts"; packageName = "@cspell/dict-fonts"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-3.0.0.tgz"; - sha512 = "zTZni0AbwBVG1MKA0WpwPyIJPVF+gp6neXDQzHcu4RUnuQ4uDu0PVEuZjGHCJWwwFoR5JmkqZxVSg1y3ufJODA=="; + url = "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-3.0.1.tgz"; + sha512 = "o2zVFKT3KcIBo88xlWhG4yOD0XQDjP7guc7C30ZZcSN8YCwaNc1nGoxU3QRea8iKcwk3cXH0G53nrQur7g9DjQ=="; }; }; "@cspell/dict-fullstack-1.0.39" = { @@ -3469,13 +3550,13 @@ let sha512 = "Mbi+zWdiP9yzL+X4YD9Tgcm5YQ95Ql+Y3vF2LRnOY6g2QWaijTRN1rgksVuxzpFqHi//+bx2uoUb0XEKBYDi8g=="; }; }; - "@cspell/dict-fullstack-3.1.1" = { + "@cspell/dict-fullstack-3.1.4" = { name = "_at_cspell_slash_dict-fullstack"; packageName = "@cspell/dict-fullstack"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.1.tgz"; - sha512 = "w2n3QvqEiufmvlBuNduury/pySrhfOcWFfCvvpUXTJvWbfRVGkt6ANZuTuy3/7Z2q4GYUqsd139te4Q8m0jRHQ=="; + url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.4.tgz"; + sha512 = "OnCIn3GgAhdhsU6xMYes7/WXnbV6R/5k/zRAu/d+WZP4Ltf48z7oFfNFjHXH6b8ZwnMhpekLAnCeIfT5dcxRqw=="; }; }; "@cspell/dict-gaming-terms-1.0.4" = { @@ -3505,13 +3586,13 @@ let sha512 = "qq3Cjnx2U1jpeWAGJL1GL0ylEhUMqyaR36Xij6Y6Aq4bViCRp+HRRqk0x5/IHHbOrti45h3yy7ii1itRFo+Xkg=="; }; }; - "@cspell/dict-golang-5.0.1" = { + "@cspell/dict-golang-5.0.2" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-5.0.1.tgz"; - sha512 = "djsJC7OVKUpFdRm/aqBJEUSGP3kw/MDhAt7udYegnyQt2WjL3ZnVoG7r5eOEhPEEKzWVBYoi6UKSNpdQEodlbg=="; + url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-5.0.2.tgz"; + sha512 = "TNOQzsiLv4I56w5188OnJW+2ttjekoBl8IyPpI25GeV3dky4d+TX5pujayvcKQ+SM8vV8u2lpQpvyr4YePhiQg=="; }; }; "@cspell/dict-haskell-1.0.13" = { @@ -3541,13 +3622,13 @@ let sha512 = "vvnYia0tyIS5Fdoz+gEQm77MGZZE66kOJjuNpIYyRHCXFAhWdYz3SmkRm6YKJSWSvuO+WBJYTKDvkOxSh3Fx/w=="; }; }; - "@cspell/dict-html-4.0.2" = { + "@cspell/dict-html-4.0.3" = { name = "_at_cspell_slash_dict-html"; packageName = "@cspell/dict-html"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.2.tgz"; - sha512 = "BskOE2K3AtGLkcjdJmo+H6/fjdfDP4XYAsEGXpB26rvdnXAnGEstE/Q8Do6UfJCvgOVYCpdUZLcMIEpoTy7QhQ=="; + url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.3.tgz"; + sha512 = "Gae8i8rrArT0UyG1I6DHDK62b7Be6QEcBSIeWOm4VIIW1CASkN9B0qFgSVnkmfvnu1Y3H7SSaaEynKjdj3cs8w=="; }; }; "@cspell/dict-html-symbol-entities-1.0.23" = { @@ -3577,22 +3658,22 @@ let sha512 = "LcOg9srYLDoNGd8n3kbfDBlZD+LOC9IVcnFCdua1b/luCHNVmlgBx7e677qPu7olpMYOD5TQIVW2OmM1+/6MFA=="; }; }; - "@cspell/dict-java-5.0.4" = { + "@cspell/dict-java-5.0.5" = { name = "_at_cspell_slash_dict-java"; packageName = "@cspell/dict-java"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.4.tgz"; - sha512 = "43VrLOLcBxavv6eyL4BpsnHrhVOgyYYeJqQRJG5XKObcpWy3+Lpadj58CfTVOr7M/Je3pUpd4tvsUhf/lWXMVA=="; + url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.5.tgz"; + sha512 = "X19AoJgWIBwJBSWGFqSgHaBR/FEykBHTMjL6EqOnhIGEyE9nvuo32tsSHjXNJ230fQxQptEvRZoaldNLtKxsRg=="; }; }; - "@cspell/dict-k8s-1.0.0" = { + "@cspell/dict-k8s-1.0.1" = { name = "_at_cspell_slash_dict-k8s"; packageName = "@cspell/dict-k8s"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.0.tgz"; - sha512 = "XqIql+nd2DiuPuL+qPc24bN/L1mZY75kAYcuMBMW5iYgBoivkiVOg7br/aofX3ApajvHDln6tNkPZhmhsOg6Ww=="; + url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.1.tgz"; + sha512 = "gc5y4Nm3hVdMZNBZfU2M1AsAmObZsRWjCUk01NFPfGhFBXyVne41T7E62rpnzu5330FV/6b/TnFcPgRmak9lLw=="; }; }; "@cspell/dict-latex-1.0.25" = { @@ -3640,13 +3721,13 @@ let sha512 = "YiHDt8kmHJ8nSBy0tHzaxiuitYp+oJ66ffCYuFWTNB3//Y0SI4OGHU3omLsQVeXIfCeVrO4DrVvRDoCls9B5zQ=="; }; }; - "@cspell/dict-lua-4.0.0" = { + "@cspell/dict-lua-4.0.1" = { name = "_at_cspell_slash_dict-lua"; packageName = "@cspell/dict-lua"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.0.tgz"; - sha512 = "aQPyc/nP67tOlW6ACpio9Q5mZ/Z1hqwXC5rt5tkoQ2GsnCqeyIXDrX0CN+RGK53Lj4P02Jz/dPxs/nX8eDUFsw=="; + url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.1.tgz"; + sha512 = "j0MFmeCouSoC6EdZTbvGe1sJ9V+ruwKSeF+zRkNNNload7R72Co5kX1haW2xLHGdlq0kqSy1ODRZKdVl0e+7hg=="; }; }; "@cspell/dict-node-1.0.12" = { @@ -3676,13 +3757,13 @@ let sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; }; }; - "@cspell/dict-npm-5.0.3" = { + "@cspell/dict-npm-5.0.5" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.3.tgz"; - sha512 = "fEX67zIJISbS3gXVk/y/ZUvDIVtjc/CYJK7Mz0iTVrmlCKnLiD41lApe8v4g/12eE7hLfx/sfCXDrUWyzXVq1A=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.5.tgz"; + sha512 = "eirZm4XpJNEcbmLGIwI2qXdRRlCKwEsH9mT3qCUytmbj6S6yn63F+8bShMW/yQBedV7+GXq9Td+cJdqiVutOiA=="; }; }; "@cspell/dict-php-1.0.25" = { @@ -3712,13 +3793,13 @@ let sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A=="; }; }; - "@cspell/dict-powershell-4.0.0" = { + "@cspell/dict-powershell-4.0.2" = { name = "_at_cspell_slash_dict-powershell"; packageName = "@cspell/dict-powershell"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-4.0.0.tgz"; - sha512 = "1Lbm+3+Sx63atl4MM3lPeCUc90JjRyKP9+exmy2cQimXNju9ngtuDWwapHUnhQ47qnzrsBY4ydm36KCfJarXJA=="; + url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-4.0.2.tgz"; + sha512 = "3Wk2Z0fxpewML0zq4a9W5IsPZ0YwvzA8c6ykFdwQ0xcBQc/xRfdb9Z5drYXf9bobck1+MacGrprSeQXrmeByNQ=="; }; }; "@cspell/dict-public-licenses-2.0.1" = { @@ -3766,13 +3847,13 @@ let sha512 = "I76hJA///lc1pgmDTGUFHN/O8KLIZIU/8TgIYIGI6Ix/YzSEvWNdQYbANn6JbCynS0X+7IbZ2Ft+QqvmGtIWuA=="; }; }; - "@cspell/dict-ruby-4.0.1" = { + "@cspell/dict-ruby-4.0.2" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-4.0.1.tgz"; - sha512 = "p9nLDsffPadPLLwdLQj4Gk0IsZ64iCSxnSCaeFXslFiD17FtJVh1YMHP7KE9M73u22Hprq+a1Yw25/xp6Tkt3g=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-4.0.2.tgz"; + sha512 = "fCoQHvLhTAetzXCUZMpyoCUPFMiyLHuECIPOiuYW6TGnP2eGV9y4j2J8HAOVtkyxOKUoyK+zZgtrma64yTUMkg=="; }; }; "@cspell/dict-rust-1.0.23" = { @@ -3784,13 +3865,13 @@ let sha512 = "lR4boDzs79YD6+30mmiSGAMMdwh7HTBAPUFSB0obR3Kidibfc3GZ+MHWZXay5dxZ4nBKM06vyjtanF9VJ8q1Iw=="; }; }; - "@cspell/dict-rust-4.0.0" = { + "@cspell/dict-rust-4.0.1" = { name = "_at_cspell_slash_dict-rust"; packageName = "@cspell/dict-rust"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.0.tgz"; - sha512 = "nzJsgLR6/JXtM41Cr5FG89r8sBKW6aFjvCqPxeaBJYLAL0JuvsVUcd16rW2lTsdbx5J8yUQDD7mgCZFk6merJQ=="; + url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.1.tgz"; + sha512 = "xJSSzHDK2z6lSVaOmMxl3PTOtfoffaxMo7fTcbZUF+SCJzfKbO6vnN9TCGX2sx1RHFDz66Js6goz6SAZQdOwaw=="; }; }; "@cspell/dict-scala-1.0.21" = { @@ -3802,13 +3883,13 @@ let sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA=="; }; }; - "@cspell/dict-scala-4.0.0" = { + "@cspell/dict-scala-4.0.1" = { name = "_at_cspell_slash_dict-scala"; packageName = "@cspell/dict-scala"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-4.0.0.tgz"; - sha512 = "ugdjt66/Ah34yF3u3DUNjCHXnBqIuxUUfdeBobbGxfm29CNgidrISV1NUh+xi8tPynMzSTpGbBiArFBH6on5XQ=="; + url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-4.0.1.tgz"; + sha512 = "UvdQpAugrCqRC+2wfqJ4FFKpJr+spLrrrAmqdWEgAyZNMz8ib9FkO+yoIQnNFeodzI9xVPN9Hror+MjXbb2soQ=="; }; }; "@cspell/dict-software-terms-1.0.48" = { @@ -3820,22 +3901,22 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.1.0" = { + "@cspell/dict-software-terms-3.1.5" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.1.0"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.0.tgz"; - sha512 = "KQVpHmuGJprkriClbwTf1TfCjkCkS+GqLBO8ytltmYylCHZumJMfA3sM10e3zmsVIlungrtNLG9xz5opIdm/2A=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.5.tgz"; + sha512 = "wmkWHHkp2AN9EDWNBLB0VASB5OtsC3KnhoAHxCJzC6AB3xjYoBfKsvgI/o50gfbsCVQceHpqXjOEYSw/xxTKNw=="; }; }; - "@cspell/dict-sql-2.0.1" = { + "@cspell/dict-sql-2.0.2" = { name = "_at_cspell_slash_dict-sql"; packageName = "@cspell/dict-sql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.0.1.tgz"; - sha512 = "7fvVcvy751cl31KMD5j04yMGq2UKj018/1hx3FNtdUI9UuUTMvhBrTAqHEEemR3ZeIC9i/5p5SQjwQ13bn04qw=="; + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.0.2.tgz"; + sha512 = "XxUoamMFU9OGcDHLY6+pTlQDsqq9wcY7Oc4C55hqmotxFeFaaqinoD1UIAm1yDngRP7fKK4mVPPFmJI6bmspHg=="; }; }; "@cspell/dict-svelte-1.0.2" = { @@ -3865,13 +3946,13 @@ let sha512 = "yIuGeeZtQA2gqpGefGjZqBl8iGJpIYWz0QzDqsscNi2qfSnLsbjM0RkRbTehM8y9gGGe7xfgUP5adxceJa5Krg=="; }; }; - "@cspell/dict-typescript-3.1.0" = { + "@cspell/dict-typescript-3.1.1" = { name = "_at_cspell_slash_dict-typescript"; packageName = "@cspell/dict-typescript"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.0.tgz"; - sha512 = "4hdLlQMOYrUbGfJg2cWnbsBUevObwgL76TLVC0rwnrkSwzOxAxiGaG39VtRMvgAAe2lX6L+jka3fy0MmxzFOHw=="; + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.1.tgz"; + sha512 = "N9vNJZoOXmmrFPR4ir3rGvnqqwmQGgOYoL1+y6D4oIhyr7FhaYiyF/d7QT61RmjZQcATMa6PSL+ZisCeRLx9+A=="; }; }; "@cspell/dict-vue-3.0.0" = { @@ -3883,13 +3964,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/strong-weak-map-6.19.2" = { + "@cspell/dynamic-import-6.27.0" = { + name = "_at_cspell_slash_dynamic-import"; + packageName = "@cspell/dynamic-import"; + version = "6.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.27.0.tgz"; + sha512 = "PrBAH0+6OERWeY57PUH+9WmxYtUBnBjTYmm+3Zpg3SUd/ToD0cNf83OJCrcDF7KNQYE9rjCPUfVdsOe3aJlIHw=="; + }; + }; + "@cspell/strong-weak-map-6.27.0" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.19.2.tgz"; - sha512 = "0P2f1JNGw+lEyqz0jxj1ob+772HgbQEIrXXuWF9vQXKdYx0kVzkSNVAUGZjqWiO+ieGFJVr0pqHA+wGcIx1VAQ=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.27.0.tgz"; + sha512 = "4hel0Dik7GTX8yVOjOXlumIOzYD8mWzDeyMEhEJb3qwDfsTPeeYo1EMTSgtS+oJXR6kQ09qBrF1lok44v6NOAQ=="; }; }; "@cspotcode/source-map-consumer-0.8.0" = { @@ -3919,13 +4009,40 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@csstools/selector-specificity-2.0.2" = { + "@csstools/css-parser-algorithms-2.0.1" = { + name = "_at_csstools_slash_css-parser-algorithms"; + packageName = "@csstools/css-parser-algorithms"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.0.1.tgz"; + sha512 = "B9/8PmOtU6nBiibJg0glnNktQDZ3rZnGn/7UmDfrm2vMtrdlXO3p7ErE95N0up80IRk9YEtB5jyj/TmQ1WH3dw=="; + }; + }; + "@csstools/css-tokenizer-2.1.0" = { + name = "_at_csstools_slash_css-tokenizer"; + packageName = "@csstools/css-tokenizer"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.1.0.tgz"; + sha512 = "dtqFyoJBHUxGi9zPZdpCKP1xk8tq6KPHJ/NY4qWXiYo6IcSGwzk3L8x2XzZbbyOyBs9xQARoGveU2AsgLj6D2A=="; + }; + }; + "@csstools/media-query-list-parser-2.0.1" = { + name = "_at_csstools_slash_media-query-list-parser"; + packageName = "@csstools/media-query-list-parser"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.1.tgz"; + sha512 = "X2/OuzEbjaxhzm97UJ+95GrMeT29d1Ib+Pu+paGLuRWZnWRK9sI9r3ikmKXPWGA1C4y4JEdBEFpp9jEqCvLeRA=="; + }; + }; + "@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" = { @@ -4081,85 +4198,85 @@ let sha512 = "BOLrAX8IWHRXu1siZocwLguKJPEUv7cr+rG8tI4hvHgMdIsBWHJlLeB8EjuUVnIURFrUiM49lVKn8DRrECmngw=="; }; }; - "@electron-forge/core-6.0.4" = { + "@electron-forge/core-6.0.5" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.4.tgz"; - sha512 = "l3OiXB/9ebtZZtcQAbofaTmivQUqUVv8TKoxQ8GJbH48Eyk//mphbo7hDC5kb5Tyd0UedMOM9MxJrYjnd6jRnA=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.5.tgz"; + sha512 = "lMtm3x2ZFEBOU7/JTIo2oI5dXm2hKqpdc4opHA7iOxja5YYDDvnqKt+tACJSCdnCOxYLS+0OSoaz/DJ8SNyStw=="; }; }; - "@electron-forge/core-utils-6.0.4" = { + "@electron-forge/core-utils-6.0.5" = { name = "_at_electron-forge_slash_core-utils"; packageName = "@electron-forge/core-utils"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-6.0.4.tgz"; - sha512 = "nOCjmm8Qr/bYkVNfEiXSk/LKjtv6iBrKcyhKIanNM3n7MJRuTH0ksvuajFBqg+V+EHplMb7y6acDvI+TTRDUxg=="; + url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-6.0.5.tgz"; + sha512 = "KCxTQOGRGITUwdxMu63xFn4SkuBE6Fvn188MjZHyztAHimiKBWdNGBrBHgjR2WyYTziT8y6JXcAntAW5d+jYHQ=="; }; }; - "@electron-forge/maker-base-6.0.4" = { + "@electron-forge/maker-base-6.0.5" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.4.tgz"; - sha512 = "qJJ2oPFlyt6u/H67WLfZL0JclSpFj4VwxPfwxqNL/HcwXULJcOeat7oqJLY9UKBE4U2j+++xbA3LSoPAErroIg=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.5.tgz"; + sha512 = "m3xS/Gd2XlYUjXO4o8bxZEcwN9AulMDjuIzq68FRH5VB1vuESJKtVZjSa331IjaA+0aRXbSCa108FLy8g5Qlaw=="; }; }; - "@electron-forge/plugin-base-6.0.4" = { + "@electron-forge/plugin-base-6.0.5" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.4.tgz"; - sha512 = "iILzbFzmUIGggsTNL9PO1ma6e4OuuhKunNnOkpkoyg6jIaz8Oh1WSHhOALMztlBn2FhreabZnBRy7JsvHVDXlg=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.5.tgz"; + sha512 = "Q2ywNq6Qzb9K1W59qzbJvI+NZaDPrHz7iq9W8UfyHoEDYLJsD368PzHtNaQFJx+ofZNgsSpukXoL9mGvN1lVbA=="; }; }; - "@electron-forge/publisher-base-6.0.4" = { + "@electron-forge/publisher-base-6.0.5" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.4.tgz"; - sha512 = "0C86jnOSTo0z/W58zRx6BijuR4lscB0F6yXaBCFA5xaJ8+fVIsgz29kmVlLrp+YFRgatDCljvk+1+qVRM/Mfpg=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.5.tgz"; + sha512 = "gwOaMC3RKPO1mq3dqP9ko8kJptO41XU+I+pM66W/wvCNIQzisFCqrsx3d8A9RWsMJug0I1xNsYdBt99j1/2haA=="; }; }; - "@electron-forge/shared-types-6.0.4" = { + "@electron-forge/shared-types-6.0.5" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.4.tgz"; - sha512 = "lILLKcGZqfJYVI1x6RssVh37E934rCOaSdBQ9I7LypdfI2NWL+5PLLoUqvXbok1V28m3/O5JrXdigwEIZdhjzQ=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.5.tgz"; + sha512 = "FrJI11afw/Cxk0JwgWyKg9aPoHOdmMi4JHTY6pnmi95MjarQ1d0SIqKJUzX7q2lXPUAxqPKA2Wmykg6F2CThlg=="; }; }; - "@electron-forge/template-base-6.0.4" = { + "@electron-forge/template-base-6.0.5" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.4.tgz"; - sha512 = "23/b0n+ls0+c2+OG1XrHROk6i3PseONLJY3tcR42uFaP/yGZL8nJfgXE2qTKBwUyFQ0tCgUAD3a4vYkMPLKrwg=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.5.tgz"; + sha512 = "/3nOKPltnL8nVdZS2EpnKx1VMBqgLjW8TLRt8vtc+WdHtCVJBiU1Pt0JxTYDM3Raq/CclWGqVFb1svqorAon7Q=="; }; }; - "@electron-forge/template-webpack-6.0.4" = { + "@electron-forge/template-webpack-6.0.5" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.4.tgz"; - sha512 = "mrzNzkhsLfD20y/vfTYVBFSkptmgSEwqn4zh4vnzP9tzAJ4eMbvhfVtkK/XQfm8ZspPjs+RZSzRrRNo+e0iEaw=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.5.tgz"; + sha512 = "fDINYYCJ3D8rMYgS5tTHhgC8d73pRpQKtyBCQFC9KkfdNMYJr9MPZeep5pYQqrOMjSgBpgaYSBL9Unsa5I1F2g=="; }; }; - "@electron-forge/template-webpack-typescript-6.0.4" = { + "@electron-forge/template-webpack-typescript-6.0.5" = { name = "_at_electron-forge_slash_template-webpack-typescript"; packageName = "@electron-forge/template-webpack-typescript"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-6.0.4.tgz"; - sha512 = "Z9fJ0JfZw9w5OVZgy0qVGapGMQqfaLyQSHzEfm2HQdGGJrHkeXJkMn8Yd1E8h5EPMb3jF5tHRw3VopelzcPQxQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-6.0.5.tgz"; + sha512 = "YjKVszYRT4S3Sw3AOEpJokU7KPpmr0HWuO14+WHMO0FhQ1gaTMfPoz6QRHg0F1Ulz73mm6b3MLb9ID5igZv7Mw=="; }; }; "@electron/asar-3.2.3" = { @@ -4252,6 +4369,15 @@ let sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA=="; }; }; + "@emotion/hash-0.9.0" = { + name = "_at_emotion_slash_hash"; + packageName = "@emotion/hash"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz"; + sha512 = "14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="; + }; + }; "@emotion/is-prop-valid-1.2.0" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -4324,6 +4450,186 @@ let sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; }; }; + "@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-arm-0.16.3" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.3.tgz"; + sha512 = "mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA=="; + }; + }; + "@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-arm64-0.16.3" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.3.tgz"; + sha512 = "RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg=="; + }; + }; + "@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/android-x64-0.16.3" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.3.tgz"; + sha512 = "SFpTUcIT1bIJuCCBMCQWq1bL2gPTjWoLZdjmIhjdcQHaUfV41OQfho6Ici5uvvkMmZRXIUGpM3GxysP/EU7ifQ=="; + }; + }; + "@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-arm64-0.16.3" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.3.tgz"; + sha512 = "DO8WykMyB+N9mIDfI/Hug70Dk1KipavlGAecxS3jDUwAbTpDXj0Lcwzw9svkhxfpCagDmpaTMgxWK8/C/XcXvw=="; + }; + }; + "@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/darwin-x64-0.16.3" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.3.tgz"; + sha512 = "uEqZQ2omc6BvWqdCiyZ5+XmxuHEi1SPzpVxXCSSV2+Sh7sbXbpeNhHIeFrIpRjAs0lI1FmA1iIOxFozKBhKgRQ=="; + }; + }; + "@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-arm64-0.16.3" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.3.tgz"; + sha512 = "nJansp3sSXakNkOD5i5mIz2Is/HjzIhFs49b1tjrPrpCmwgBmH9SSzhC/Z1UqlkivqMYkhfPwMw1dGFUuwmXhw=="; + }; + }; + "@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/freebsd-x64-0.16.3" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.3.tgz"; + sha512 = "TfoDzLw+QHfc4a8aKtGSQ96Wa+6eimljjkq9HKR0rHlU83vw8aldMOUSJTUDxbcUdcgnJzPaX8/vGWm7vyV7ug=="; + }; + }; + "@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-arm-0.16.3" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.3.tgz"; + sha512 = "VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ=="; + }; + }; + "@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-arm64-0.16.3" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.3.tgz"; + sha512 = "7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ=="; + }; + }; + "@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-ia32-0.16.3" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.3.tgz"; + sha512 = "X8FDDxM9cqda2rJE+iblQhIMYY49LfvW4kaEjoFbTTQ4Go8G96Smj2w3BRTwA8IHGoi9dPOPGAX63dhuv19UqA=="; + }; + }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4333,6 +4639,222 @@ let 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-loong64-0.16.3" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.3.tgz"; + sha512 = "hIbeejCOyO0X9ujfIIOKjBjNAs9XD/YdJ9JXAy1lHA+8UXuOqbFe4ErMCqMr8dhlMGBuvcQYGF7+kO7waj2KHw=="; + }; + }; + "@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-mips64el-0.16.3" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.3.tgz"; + sha512 = "znFRzICT/V8VZQMt6rjb21MtAVJv/3dmKRMlohlShrbVXdBuOdDrGb+C2cZGQAR8RFyRe7HS6klmHq103WpmVw=="; + }; + }; + "@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-ppc64-0.16.3" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.3.tgz"; + sha512 = "EV7LuEybxhXrVTDpbqWF2yehYRNz5e5p+u3oQUS2+ZFpknyi1NXxr8URk4ykR8Efm7iu04//4sBg249yNOwy5Q=="; + }; + }; + "@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-riscv64-0.16.3" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.3.tgz"; + sha512 = "uDxqFOcLzFIJ+r/pkTTSE9lsCEaV/Y6rMlQjUI9BkzASEChYL/aSQjZjchtEmdnVxDKETnUAmsaZ4pqK1eE5BQ=="; + }; + }; + "@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-s390x-0.16.3" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.3.tgz"; + sha512 = "NbeREhzSxYwFhnCAQOQZmajsPYtX71Ufej3IQ8W2Gxskfz9DK58ENEju4SbpIj48VenktRASC52N5Fhyf/aliQ=="; + }; + }; + "@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/linux-x64-0.16.3" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.3.tgz"; + sha512 = "SDiG0nCixYO9JgpehoKgScwic7vXXndfasjnD5DLbp1xltANzqZ425l7LSdHynt19UWOcDjG9wJJzSElsPvk0w=="; + }; + }; + "@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/netbsd-x64-0.16.3" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.3.tgz"; + sha512 = "AzbsJqiHEq1I/tUvOfAzCY15h4/7Ivp3ff/o1GpP16n48JMNAtbW0qui2WCgoIZArEHD0SUQ95gvR0oSO7ZbdA=="; + }; + }; + "@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/openbsd-x64-0.16.3" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.3.tgz"; + sha512 = "gSABi8qHl8k3Cbi/4toAzHiykuBuWLZs43JomTcXkjMZVkp0gj3gg9mO+9HJW/8GB5H89RX/V0QP4JGL7YEEVg=="; + }; + }; + "@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/sunos-x64-0.16.3" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.3.tgz"; + sha512 = "SF9Kch5Ete4reovvRO6yNjMxrvlfT0F0Flm+NPoUw5Z4Q3r1d23LFTgaLwm3Cp0iGbrU/MoUI+ZqwCv5XJijCw=="; + }; + }; + "@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-arm64-0.16.3" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.3.tgz"; + sha512 = "u5aBonZIyGopAZyOnoPAA6fGsDeHByZ9CnEzyML9NqntK6D/xl5jteZUKm/p6nD09+v3pTM6TuUIqSPcChk5gg=="; + }; + }; + "@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-ia32-0.16.3" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.3.tgz"; + sha512 = "GlgVq1WpvOEhNioh74TKelwla9KDuAaLZrdxuuUgsP2vayxeLgVc+rbpIv0IYF4+tlIzq2vRhofV+KGLD+37EQ=="; + }; + }; + "@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=="; + }; + }; + "@esbuild/win32-x64-0.16.3" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.3.tgz"; + sha512 = "5/JuTd8OWW8UzEtyf19fbrtMJENza+C9JoPIkvItgTBQ1FO2ZLvjbPO6Xs54vk0s5JB5QsfieUEshRQfu7ZHow=="; + }; + }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -4351,6 +4873,24 @@ let sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; }; + "@eslint/eslintrc-2.0.0" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz"; + sha512 = "fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A=="; + }; + }; + "@eslint/js-8.35.0" = { + name = "_at_eslint_slash_js"; + packageName = "@eslint/js"; + version = "8.35.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz"; + sha512 = "JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw=="; + }; + }; "@esm2cjs/cacheable-lookup-7.0.0" = { name = "_at_esm2cjs_slash_cacheable-lookup"; packageName = "@esm2cjs/cacheable-lookup"; @@ -4360,13 +4900,13 @@ let sha512 = "5HzrA5N0lSMtx2RdXfD9Z4HUFaRGwVOFs7jsFG8jDivoZjYYwZFsSqvA17TaNZYFcwBrkSCqHlxDu2YDpjjUBA=="; }; }; - "@esm2cjs/cacheable-request-10.2.5" = { + "@esm2cjs/cacheable-request-10.2.8" = { name = "_at_esm2cjs_slash_cacheable-request"; packageName = "@esm2cjs/cacheable-request"; - version = "10.2.5"; + version = "10.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.5.tgz"; - sha512 = "fen7CINhjqLjNCVtleKzDJxc1P0gLMR4KXEq5dh1CxkHZ2X8KvM0km1DwdAuLRRBusmPwgj6jqZDDtPZpIOi5Q=="; + url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.8.tgz"; + sha512 = "mRdlYB2T9mitspkBM9LbmHjDgXBzwiRp891nSRQYsz6n74CI9MvdqLj/DaxipJ+WUAic3as/iq3DtS99vVLSdA=="; }; }; "@esm2cjs/form-data-encoder-2.1.4" = { @@ -4486,22 +5026,22 @@ let sha512 = "dGGHpb61hLwifAu7sotuHFDBw6GTdpG8aKC0fsK17EuTzMRvUrH7lEAr6LTJ+sx3AZYed9yZ77rltVDHyg2hRg=="; }; }; - "@expo/apple-utils-0.0.0-alpha.31" = { + "@expo/apple-utils-0.0.0-alpha.37" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "0.0.0-alpha.31"; + version = "0.0.0-alpha.37"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.31.tgz"; - sha512 = "lGJOS8eAPcZhaRl5GZFIg4ZNSRY1k10wYeYXjHUbHxbZGE9lkzrATY8OvrVpcu8qQh3lvPguel63V4mrnoAuOA=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.37.tgz"; + sha512 = "/v7adya/u6GDBj7py+HsnKmA11VwG34z4/7peJdMfu8M3LZ2G14dsaxEqdndrCAuEyJ6gQ88sggjcjPjzQXdmg=="; }; }; - "@expo/apple-utils-0.0.0-alpha.34" = { + "@expo/apple-utils-1.1.0" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "0.0.0-alpha.34"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.34.tgz"; - sha512 = "GRHN1xhI3Yjb76aFVLhxE7o/Pdx8D78Gm2HaRHxdFRSSdYK5lPw2/1y1/GhDH7DoXqqGwo2uQSevd6ywlj657g=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.1.0.tgz"; + sha512 = "caw0o9HeQHX7xeXppkXI3B/PmPyVOkEjWgXdv0dYzgW/rwvZRLwtMNFXX5t+dJy2hd2UpZlrixaoYyvxuXPtbQ=="; }; }; "@expo/bunyan-4.0.0" = { @@ -4513,13 +5053,13 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/cli-0.4.11" = { + "@expo/cli-0.6.2" = { name = "_at_expo_slash_cli"; packageName = "@expo/cli"; - version = "0.4.11"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/cli/-/cli-0.4.11.tgz"; - sha512 = "L9Ci9RBh0aPFEDF1AjDYPk54OgeUJIKzxF3lRgITm+lQpI3IEKjAc9LaYeQeO1mlZMUQmPkHArF8iyz1eOeVoQ=="; + url = "https://registry.npmjs.org/@expo/cli/-/cli-0.6.2.tgz"; + sha512 = "uhmrXNemXTbCTKP/ycyJHOU/KLGdFwVCrWNBzz1VkwnmL8yJV5F3C18a83ybFFnUNfkGHeH5LtID7CSNbbTWKg=="; }; }; "@expo/code-signing-certificates-0.0.5" = { @@ -4531,6 +5071,15 @@ let sha512 = "BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw=="; }; }; + "@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/config/-/config-6.0.20.tgz"; + sha512 = "m2T1/hB4TyLkQElOUwOajn/7gBcPaGyfVwoVsuJMEh0yrNvNFtXP+nl87Cm53g5q+VyfwJUgbewPQ3j/UXkI6Q=="; + }; + }; "@expo/config-6.0.24" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; @@ -4549,6 +5098,24 @@ let sha512 = "joVtB5o+NF40Tmsdp65UzryRtbnCuMbXkVO4wJnNJO4aaK0EYLdHCYSewORVqNcDfGN0LphQr8VTG2npbd9CJA=="; }; }; + "@expo/config-8.0.2" = { + name = "_at_expo_slash_config"; + packageName = "@expo/config"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config/-/config-8.0.2.tgz"; + sha512 = "WubrzTNNdAXy1FU8TdyQ7D9YtDj2tN3fWXDq+C8In+nB7Qc08zwH9cVdaGZ+rBVmjFZBh5ACfObKq/m9cm4QQA=="; + }; + }; + "@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"; @@ -4567,6 +5134,24 @@ let sha512 = "vzUcVpqOMs3h+hyRdhGwk+eGIOhXa5xYdd92yO17RMNHav3v/+ekMbs7XA2c3lepMO8Yd4/5hqmRw9ZTL6jGzg=="; }; }; + "@expo/config-plugins-6.0.1" = { + name = "_at_expo_slash_config-plugins"; + packageName = "@expo/config-plugins"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.1.tgz"; + sha512 = "6mqZutxeibXFeqFfoZApFUEH2n1RxGXYMHCdJrDj4eXDBBFZ3aJ0XBoroZcHHHvfRieEsf54vNyJoWp7JZGj8g=="; + }; + }; + "@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"; @@ -4585,22 +5170,31 @@ let sha512 = "r0pWfuhkv7KIcXMUiNACJmJKKwlTBGMw9VZHNdppS8/0Nve8HZMTkNRFQzTHW1uH3pBj8jEXpyw/2vSWDHex9g=="; }; }; - "@expo/dev-server-0.1.115" = { + "@expo/config-types-48.0.0" = { + name = "_at_expo_slash_config-types"; + packageName = "@expo/config-types"; + version = "48.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz"; + sha512 = "DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A=="; + }; + }; + "@expo/dev-server-0.2.0" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.115"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.115.tgz"; - sha512 = "kqr71GAXzBVmjT+qSmqckBKY6Y9lFf4Oy1S4aVygx72CNgyzVTw4CPqT5RsNhcvQEEdACgarczDbPnNkmrm7GQ=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.2.0.tgz"; + sha512 = "1XG8TS48M2oJyTVF6lYd3NX0hTauCjYfdMiDp3ZLFDV6Xoq+YXMKSKCD+kEtB8SefEmtJcFrstFXkpy9KTvk4w=="; }; }; - "@expo/dev-server-0.1.124" = { + "@expo/dev-server-0.2.3" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.124"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.124.tgz"; - sha512 = "iHczVcf+rgWupCY/3b3ePIizNtzsy1O/w8jdKv3bKvoOfXiVIVOo4KGiVDpAJOahKiMOsRlbKeemB8OLNKzdSA=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.2.3.tgz"; + sha512 = "9+6QGRdymj3dmTp1vUpROvWJ+Ezz6Qp9xHafAcaRHzw322pUCOiRKxTYqDqYYZ/72shrHPGQ2CiIXTnV1vM2tA=="; }; }; "@expo/devcert-1.1.0" = { @@ -4612,22 +5206,22 @@ let sha512 = "ghUVhNJQOCTdQckSGTHctNp/0jzvVoMMkVh+6SHn+TZj8sU15U/npXIDt8NtQp0HedlPaCgkVdMu8Sacne0aEA=="; }; }; - "@expo/eas-build-job-0.2.102" = { + "@expo/eas-build-job-0.2.106" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "0.2.102"; + version = "0.2.106"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.2.102.tgz"; - sha512 = "1gav4gHhZCnRDIscd0/sat/fjts543QmexiWXUWDv15uzCxx/NnewN13tcmOwMV0K3Z3agOlJLRPN2t6UvIMAg=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.2.106.tgz"; + sha512 = "V7ihSFNFaATM31P1b/tGrGG7sjuXBT5ZAzKnybTWr5Xl1ODOdEpSC1c9bzs9SUr2iWUFVsxyd2/7+f2+7r/l4A=="; }; }; - "@expo/eas-json-3.3.2" = { + "@expo/eas-json-3.7.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "3.3.2"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.3.2.tgz"; - sha512 = "O85CbdCXUjzUOyXITpVT7qnnIqdRaaEiaY7gCeYYW4c9KUO0fNobiePKBAYTFzoSJMt5bJT9jkwKNk3dML8zkQ=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.7.0.tgz"; + sha512 = "9+K0lDvwHXXjXcn5a8mrNDUXiX5RIIP4UZdLvF8JReNl8tSv21syqCZ6dPXB+1G3KmOfImHn1PaWW4reFEGOdg=="; }; }; "@expo/image-utils-0.3.21" = { @@ -4657,6 +5251,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"; @@ -4675,22 +5278,22 @@ let sha512 = "YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q=="; }; }; - "@expo/metro-config-0.3.18" = { + "@expo/metro-config-0.6.0" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.3.18"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.18.tgz"; - sha512 = "DWtwV67kD8X2uOKIs5QyHlHD+6L6RAgudZZDBmu433ZvL62HAUYfjEi3+i0jeMiUqN85o1vbXg6xqWnBCpS50g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.6.0.tgz"; + sha512 = "AqiWCyD6MGQuddZuitdpNVpPUO7JZEjPmLaDabAf/hEP6Uo9UJ4flx0OGcJRBkZTRSZ3Z3WwSBtq0LWvABJzrA=="; }; }; - "@expo/metro-config-0.5.2" = { + "@expo/metro-config-0.7.1" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.5.2"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.5.2.tgz"; - sha512 = "W1qsZPA5BXuRBkNLydKBYQ1+ubObhOK0gk2Fpc+XnhW+UUIHC9sDR5pZRYGNSnDDc3rG8y7c32UzSW9nlK+mog=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.7.1.tgz"; + sha512 = "vGWU62Zp5pRGw5IEHDNdqvsy62/hu/Na7bswePYVjoaItOjJY7+qilFeF0AAK+3V8qAM8fpltH3ByylKfWaA7A=="; }; }; "@expo/multipart-body-parser-1.1.0" = { @@ -4729,6 +5332,15 @@ let sha512 = "Y4RpSL9EqaPF+Vd2GrK6r7Xx7Dv0Xdq3AGAD9C0KwV21WqP/scj/dpjxFY+ABwmdhNsFzYXb8fmDyh4tiKenPQ=="; }; }; + "@expo/package-manager-1.0.1" = { + name = "_at_expo_slash_package-manager"; + packageName = "@expo/package-manager"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-1.0.1.tgz"; + sha512 = "ue6NIIsNafa2bK7zUl7Y61YNtkPsg7sJcTOyQo/87Yqf6Q+2bOrvdw1xjviaFrMsTZcpOPVf+ZIEYtE0lw0k6A=="; + }; + }; "@expo/pkcs12-0.0.8" = { name = "_at_expo_slash_pkcs12"; packageName = "@expo/pkcs12"; @@ -4792,6 +5404,15 @@ let sha512 = "D+TBpJUHe4+oTGFPb4o0rrw/h1xxc6wF+abJnbDHUkhnaeiHkE2O3ByS7FdiZ2FT36t0OKqeSKG/xFwWT3m1Ew=="; }; }; + "@expo/prebuild-config-6.0.0" = { + name = "_at_expo_slash_prebuild-config"; + packageName = "@expo/prebuild-config"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-6.0.0.tgz"; + sha512 = "UW0QKAoRelsalVMhAG1tmegwS+2tbefvUi6/0QiKPlMLg8GFDQ5ZnzsSmuljD0SzT5yGg8oSpKYhnrXJ6pRmIQ=="; + }; + }; "@expo/results-1.0.0" = { name = "_at_expo_slash_results"; packageName = "@expo/results"; @@ -4810,13 +5431,13 @@ let sha512 = "uy/hS/awclDJ1S88w9UGpc6Nm9XnNUjzOAAib1A3PVAnGQIwebg8DpFqOthFBTlZxeuV/BKbZ5jmTbtNZkp1WQ=="; }; }; - "@expo/schemer-1.4.4" = { + "@expo/schemer-1.4.5" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.4.4.tgz"; - sha512 = "cZo7hhjuEpOl5qf8nidZPlusRX4GXWRh24pOkM6LP2FGLMNdfazcJj1TU6h3h9FY5G6xLfGxpDhF/JETL9Qj+A=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.4.5.tgz"; + sha512 = "i96A2GaZWLE7K1McRt8Vf7vsMKzzM/1t+xUXOTdBEiGH2ffiJjU69ufbTI0OwjLFCUCzPI2LzXwAHVnSP+Rkog=="; }; }; "@expo/sdk-runtime-versions-1.0.0" = { @@ -4864,13 +5485,13 @@ let sha512 = "TI+l71+5aSKnShYclFa14Kum+hQMZ86b95SH6tQUG3qZEmLTarvWpKwqtTwQKqvlJSJrpFiSFu3eCuZokY6zWA=="; }; }; - "@expo/webpack-config-0.17.4" = { + "@expo/webpack-config-18.0.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.17.4"; + version = "18.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.17.4.tgz"; - sha512 = "vn37RDhYowfLc2oRaXhmbI/9FStjQFXPONG3yRLfwUnA4dRtfXapJUSKHJKRwOy4fBBmTrb2tthtsdb4zeWmsw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-18.0.1.tgz"; + sha512 = "0C+wjmmQ0usySdhtzeRp0yYuf9zkUZ/kNgA6AHQ9N7eG4JIr0DM1c87g119smxcJTbd8N+//mv5znPxSJqBqmg=="; }; }; "@expo/xcpretty-4.2.2" = { @@ -4918,157 +5539,157 @@ let sha512 = "vwNCNjokH8hfkbl6m95zICHwkSzhEvDC3GVBcUp5HX8+4wsX10SP3B+bGur7XUzTIZ4cQpgJmEIAx6TUwRepMg=="; }; }; - "@ffprobe-installer/darwin-x64-5.0.0" = { + "@ffprobe-installer/darwin-x64-5.1.0" = { name = "_at_ffprobe-installer_slash_darwin-x64"; packageName = "@ffprobe-installer/darwin-x64"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/darwin-x64/-/darwin-x64-5.0.0.tgz"; - sha512 = "Zl0UkZ+wW/eyMKBPLTUCcNQch2VDnZz/cBn1DXv3YtCBVbYd9aYzGj4MImdxgWcoE0+GpbfbO6mKGwMq5HCm6A=="; + url = "https://registry.npmjs.org/@ffprobe-installer/darwin-x64/-/darwin-x64-5.1.0.tgz"; + sha512 = "J+YGscZMpQclFg31O4cfVRGmDpkVsQ2fZujoUdMAAYcP0NtqpC49Hs3SWJpBdsGB4VeqOt5TTm1vSZQzs1NkhA=="; }; }; - "@ffprobe-installer/ffprobe-1.4.1" = { + "@ffprobe-installer/ffprobe-1.4.2" = { name = "_at_ffprobe-installer_slash_ffprobe"; packageName = "@ffprobe-installer/ffprobe"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/ffprobe/-/ffprobe-1.4.1.tgz"; - sha512 = "3WJvxU0f4d7IOZdzoVCAj9fYtiQNC6E0521FJFe9iP5Ej8auTXU7TsrUzIAG1CydeQI+BnM3vGog92SCcF9KtA=="; + url = "https://registry.npmjs.org/@ffprobe-installer/ffprobe/-/ffprobe-1.4.2.tgz"; + sha512 = "Jowoycg4aGeDVVaz+25hRSjdIDuDDXYMJjbOLvlKq9WF1n9rkAGR7Scce+bFeoRw0QwSPrpPnEH1weTWZU8CQA=="; }; }; - "@ffprobe-installer/linux-arm-5.0.0" = { + "@ffprobe-installer/linux-arm-5.1.0" = { name = "_at_ffprobe-installer_slash_linux-arm"; packageName = "@ffprobe-installer/linux-arm"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/linux-arm/-/linux-arm-5.0.0.tgz"; - sha512 = "mM1PPxP2UX5SUvhy0urcj5U8UolwbYgmnXA/eBWbW78k6N2Wk1COvcHYzOPs6c5yXXL6oshS2rZHU1kowigw7g=="; + url = "https://registry.npmjs.org/@ffprobe-installer/linux-arm/-/linux-arm-5.1.0.tgz"; + sha512 = "y34AEive/M5/++RcuRJZciICYYRkmTh5gK6th7raydgfQhIYy/8AXAIGKqD5Hn855i6o/RpEIPjk7DWpEuwrdA=="; }; }; - "@ffprobe-installer/linux-arm64-5.0.0" = { + "@ffprobe-installer/linux-arm64-5.1.0" = { name = "_at_ffprobe-installer_slash_linux-arm64"; packageName = "@ffprobe-installer/linux-arm64"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/linux-arm64/-/linux-arm64-5.0.0.tgz"; - sha512 = "IwFbzhe1UydR849YXLPP0RMpHgHXSuPO1kznaCHcU5FscFBV5gOZLkdD8e/xrcC8g/nhKqy0xMjn5kv6KkFQlQ=="; + url = "https://registry.npmjs.org/@ffprobe-installer/linux-arm64/-/linux-arm64-5.1.0.tgz"; + sha512 = "u5b3r3/39eZmEV0X4OKUfp6gO3lOyVIpRO4WU+5Eb6omWYy+k0OkVbRffK4qJF1Uz8irwzyiDsmUZ6vE13/abQ=="; }; }; - "@ffprobe-installer/linux-ia32-5.0.0" = { + "@ffprobe-installer/linux-ia32-5.1.0" = { name = "_at_ffprobe-installer_slash_linux-ia32"; packageName = "@ffprobe-installer/linux-ia32"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/linux-ia32/-/linux-ia32-5.0.0.tgz"; - sha512 = "c3bWlWEDMST59SAZycVh0oyc2eNS/CxxeRjoNryGRgqcZX3EJWJJQL1rAXbpQOMLMi8to1RqnmMuwPJgLLjjUA=="; + url = "https://registry.npmjs.org/@ffprobe-installer/linux-ia32/-/linux-ia32-5.1.0.tgz"; + sha512 = "Uqk4sYYQxz0KQmEQ2xxbVu/KiDX7Pw6wRDpCYv0sW49GI3wpX2Umqi/Kmtr0tpCvxctVoCdf/U71EAxH2Lztdg=="; }; }; - "@ffprobe-installer/linux-x64-5.0.0" = { + "@ffprobe-installer/linux-x64-5.1.0" = { name = "_at_ffprobe-installer_slash_linux-x64"; packageName = "@ffprobe-installer/linux-x64"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/linux-x64/-/linux-x64-5.0.0.tgz"; - sha512 = "zgLnWJFvMGCaw1txGtz84sMEQt6mQUzdw86ih9S/kZOWnp06Gj/ams/EXxEkAxgAACCVM6/O0mkDe/6biY5tgA=="; + url = "https://registry.npmjs.org/@ffprobe-installer/linux-x64/-/linux-x64-5.1.0.tgz"; + sha512 = "r7cGOjNb8AMnKAEvz5f8N/WsWsre02LhAfDKZX0m5J0bsrYgs2HUlnnQiwjRCH9CYXYerjYqq592o/GXvxDS+Q=="; }; }; - "@ffprobe-installer/win32-ia32-5.0.0" = { + "@ffprobe-installer/win32-ia32-5.1.0" = { name = "_at_ffprobe-installer_slash_win32-ia32"; packageName = "@ffprobe-installer/win32-ia32"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/win32-ia32/-/win32-ia32-5.0.0.tgz"; - sha512 = "NnDdAZD6ShFXzJeCkAFl2ZjAv7GcJWYudLA+0T/vjZwvskBop+sq1PGfdmVltfFDcdQiomoThRhn9Xiy9ZC71g=="; + url = "https://registry.npmjs.org/@ffprobe-installer/win32-ia32/-/win32-ia32-5.1.0.tgz"; + sha512 = "5O3vOoNRxmut0/Nu9vSazTdSHasrr+zPT2B3Hm7kjmO3QVFcIfVImS6ReQnZeSy8JPJOqXts5kX5x/3KOX54XQ=="; }; }; - "@ffprobe-installer/win32-x64-5.0.0" = { + "@ffprobe-installer/win32-x64-5.1.0" = { name = "_at_ffprobe-installer_slash_win32-x64"; packageName = "@ffprobe-installer/win32-x64"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ffprobe-installer/win32-x64/-/win32-x64-5.0.0.tgz"; - sha512 = "P4ZMRFxVMnfMsOyTfBM/+nkTodLeOUfXNPo+X1bKEWBiZxRErqX/IHS5sLA0yAH8XmtKZcL7Cu6M26ztGcQYxw=="; + url = "https://registry.npmjs.org/@ffprobe-installer/win32-x64/-/win32-x64-5.1.0.tgz"; + sha512 = "jMGYeAgkrdn4e2vvYt/qakgHRE3CPju4bn5TmdPfoAm1BlX1mY9cyMd8gf5vSzI8gH8Zq5WQAyAkmekX/8TSTg=="; }; }; - "@fluentui/date-time-utilities-8.5.4" = { + "@fluentui/date-time-utilities-8.5.5" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.5.4"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.4.tgz"; - sha512 = "PHLrbKs/s80xVkvFLQkaYb78a9nRUlohj8FCDBFQ8F1qPJj3iVH1RuSLyTiCIRJy/v1hW6KMEIXqLu/EoMefXw=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.5.tgz"; + sha512 = "P/qfyMIF1aWPVaZvgAE0u166Rp1Rfpymv63/NKQT1o56cc5LzfWTzjD2Ey1GyA+tn6dCf7g1ZXTpKo5H+CuM4Q=="; }; }; - "@fluentui/dom-utilities-2.2.4" = { + "@fluentui/dom-utilities-2.2.5" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.4.tgz"; - sha512 = "X4fN5zbvAETw9LE8bw9x5otKcpS3A3cB9wn/BookbTD4hkBESx06SzmX/WdabFq7qqbDqbURiQMpmdGUUlLsqw=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.5.tgz"; + sha512 = "VGCtAmPU/3uj/QV4Kx7gO/H2vNrhNSB346sE7xM+bBtxj+hf/owaGTvN6/tuZ8HXQu8tjTf8+ubQ3d7D7DUIjA=="; }; }; - "@fluentui/font-icons-mdl2-8.5.6" = { + "@fluentui/font-icons-mdl2-8.5.9" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.6"; + version = "8.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.6.tgz"; - sha512 = "6yGZcc/fIeT/HDPjnn003TNuC/EUoiZTiyZQyPSSQl5PeOzkmNOqG8nq/l8s+qXHs4uZC/FH081vxPxSwA2qWA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.9.tgz"; + sha512 = "u2a45ZE7GDLOSLpKPIDykVfbZs48oLT1m12JUdz4oGTkR9bR0+l8cnQL/+rYTu0KcJp2V5F9zLyTpJdlZnV36w=="; }; }; - "@fluentui/foundation-legacy-8.2.26" = { + "@fluentui/foundation-legacy-8.2.29" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.26"; + version = "8.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.26.tgz"; - sha512 = "7XKz23HB7IeIIXORS1os2fIakYTLTTGFcs+mnK5f/b4xFJAOxxdte6i10f2WsPPFiTjW1kLOzICsRsfwuHAVRw=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.29.tgz"; + sha512 = "apO4PcZtU8N4zFW9fLE6aEb6JdlPyssI98MHSvCWKMiUqWSUhimvIgJ75CT3XmbKdI3bXu/miKjWSOMIHsZkiQ=="; }; }; - "@fluentui/keyboard-key-0.4.4" = { + "@fluentui/keyboard-key-0.4.5" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.4.tgz"; - sha512 = "nx0bQ9B5QtUym9a21ig5eHPt2T6EWaqrleFb37d6ImikP6xVXUHrWQJFuVS1CSg0n63KOPsmh1QvAUfxfmyLhw=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.5.tgz"; + sha512 = "c+B+mdEgj0B6fhYIjznesGi8Al1rTpdFNudpNmFoVjlhCle5qj5RBtM4WaT8XygdzAVQq7oHSXom0vd32+zAZg=="; }; }; - "@fluentui/merge-styles-8.5.5" = { + "@fluentui/merge-styles-8.5.6" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.5.5"; + version = "8.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.5.tgz"; - sha512 = "+cyN28iRAn8BWlZkMSEWzXpsJJiy3wWFxdJx5UnvU3iLK1slwog94inJak/BmnQKk3dFXK9vVPtDp2s3l+2/hg=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.6.tgz"; + sha512 = "i9Wy+7V+lKfX+UWRTrrK+3xm4aa8jl9tK2/7Ku696yWJ5v3D6xjRcMevfxUZDrZ3xS4/GRFfWKPHkAjzz/BQoQ=="; }; }; - "@fluentui/react-8.104.5" = { + "@fluentui/react-8.106.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.104.5"; + version = "8.106.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.5.tgz"; - sha512 = "BdyDS6yEccDuzUzYQ1h1idO2wrKLi9iMkErg1wJfODlnnqVVU5x+3x8cjkH8xHndScQ0zaVBuw84xxqP7ZCPFA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.106.1.tgz"; + sha512 = "cLagkBBsknKOYFXBeWBwAm5VryPeJFVUIgLa0XlXcxmeOco/IhmWlhY5gEEQ9YoX1dFyNVcYXWxNFR55KUpZoA=="; }; }; - "@fluentui/react-focus-8.8.12" = { + "@fluentui/react-focus-8.8.15" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.12"; + version = "8.8.15"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.12.tgz"; - sha512 = "2uuU/CQ371YnNxKqUVfnxahW93OT3y2Tp8calmBVxzmyBwZxGpI5JF+PdNorNWhDSaruX+j31QwxoXUNz1vI9Q=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.15.tgz"; + sha512 = "TRYOSkQ6hQmZnfiM8k8Uw7bVAi69iguFc4V6lO90QHZ3fHQxlIHBHEmBzysYDORKMwQbtbllCtkm9ImlhsxEJw=="; }; }; - "@fluentui/react-hooks-8.6.15" = { + "@fluentui/react-hooks-8.6.17" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.15"; + version = "8.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.15.tgz"; - sha512 = "oh1OdXAUwPyhMRum8TU2/C8V4hb69qGFTh/XYzyfiAwa0UzODszq/LoaDyVThEJEi5OBPdeuXturAvgqCT8kNw=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.17.tgz"; + sha512 = "UdsK3YZ6Rx5fCNFfIcyJ2il8j5Ypb7OQY+0Qe2nmrn+/NKrtCeFVCIAs+i5MzjlL5wOsX27YXZwqby2DBUuSPg=="; }; }; "@fluentui/react-portal-compat-context-9.0.4" = { @@ -5080,58 +5701,58 @@ let sha512 = "qw2lmkxZ2TmgC0pB2dvFyrzVffxBdpCx1BdWRaF+MRGUlTxRtqfybSx3Edsqa6NMewc3J0ThLMFdVFBQ5Yafqw=="; }; }; - "@fluentui/react-window-provider-2.2.5" = { + "@fluentui/react-window-provider-2.2.6" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.5.tgz"; - sha512 = "uct8xpHLFoECeoM8xRsw98yrxLV1MY2rA/Ml0M65JSWREdDUk+btgu7HLZp4QV/GpfPvP1WiNFLSLhrZFSnIAg=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.6.tgz"; + sha512 = "bcQM5mdi4ugVb30GNtde8sP173F+l9p7uQfgK/I8O07EfKHUHZeY4wj5arD53s1cUIQI0kxWJ5RD7upZNRQeQA=="; }; }; - "@fluentui/set-version-8.2.4" = { + "@fluentui/set-version-8.2.5" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.2.4"; + version = "8.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.4.tgz"; - sha512 = "v12VUrpThYcJESFrnu3LdL7/s957hoSCJ3t8C014Hp2IOmk3dnZRZJymf1k/RAOXztS4w9dF2Zhs8uP31qwcZw=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.5.tgz"; + sha512 = "DwJq9wIXLc8WkeJ/lqYM4Sv+R0Ccb6cy3cY1Bqaa5POsroVKIfL6W+njvAMOj3LO3+DaXo2aDeiUnnw70M8xIw=="; }; }; - "@fluentui/style-utilities-8.8.5" = { + "@fluentui/style-utilities-8.9.2" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.8.5"; + version = "8.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.8.5.tgz"; - sha512 = "qUi+1a2v0nWo3LB4c13Qf81qQH1yO9YHAgfbRNLqs4w7Oie7NDBDkq7UgRmLErpSVEafvlcCZeCSKW5pvSxz5w=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.2.tgz"; + sha512 = "cnP3p73+9RDE91Dy6aWHgkkBLbtv9Ct66YD6Hgr/tU3th3Z/CJU2TcJ4EN8RqiIBCiO4LU+W2jrFFZNnXTAxEw=="; }; }; - "@fluentui/theme-2.6.21" = { + "@fluentui/theme-2.6.23" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.21"; + version = "2.6.23"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.21.tgz"; - sha512 = "jqPOo375pt1bQ4WuzP2GP5gfgeBK/PDHUf4+DxDTZ9y0TXp8KxV4jCp5Rq2rnVYlXi51JQ2Y+snFtMDcMTyfRQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.23.tgz"; + sha512 = "xuX3jHsIrB/LbgVwmZwiXkmCT+EY8c7b97wV2SGDpVUSsFDSQMQPZgQ3eAfXNA1ZLbgYcxBycm5f+gDxjlKA8g=="; }; }; - "@fluentui/utilities-8.13.5" = { + "@fluentui/utilities-8.13.7" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.13.5"; + version = "8.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.5.tgz"; - sha512 = "YusKxwTEQmsJidEWxn8blf5ehBmBDMZDrOjQkSX4piCvi/57MfigQZ57L3Bdic8kDKsabVtS1IVMHLZzGy4zcQ=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.13.7.tgz"; + sha512 = "whH09ttg7DGzANijSFXTF//xJNYjTrMB6TcgC7ge+5suI7VVwsh3NZc9lYN2mKKUveHEOjLgeunEhQ3neAvn5Q=="; }; }; - "@forge/api-2.9.1" = { + "@forge/api-2.11.1" = { name = "_at_forge_slash_api"; packageName = "@forge/api"; - version = "2.9.1"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/api/-/api-2.9.1.tgz"; - sha512 = "ZGW5WW9NmWkYaGXLqbZ7HwAvYO0sSCY7j8IX0ij7vMuQb7myFXk5jCFYxaA3a4uI2RnYf2v0ROZxfPx4kxd5Aw=="; + url = "https://registry.npmjs.org/@forge/api/-/api-2.11.1.tgz"; + sha512 = "zmJudUCowc7BVacJbobXOnrxXPajQH1h7Ufm8EDhQzf1VrnQVCFWYwiB0Lu/PGJX0f7JYt0nGUbDxFxl4sfJNg=="; }; }; "@forge/auth-0.0.1" = { @@ -5143,76 +5764,103 @@ let sha512 = "twZjWbIk+PrW2XzrUfVCzYhh1qe5igS4h9NpapZLHNm2CaCi1gjh8klVcGJijcYJWT1Sj6Qr9gBUtkZjCinJXw=="; }; }; - "@forge/babel-plugin-transform-ui-1.1.0" = { + "@forge/babel-plugin-transform-ui-1.1.1" = { name = "_at_forge_slash_babel-plugin-transform-ui"; packageName = "@forge/babel-plugin-transform-ui"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.0.tgz"; - sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="; + url = "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.1.tgz"; + sha512 = "kBvxvnVcFHq0Tz8NV5LhAeO0Gt0fg6Vt2AxE803ro9MHJ6S/ca7BqRDPnKnROoKZ0gAV2ymr27XvBMEq55wv6g=="; }; }; - "@forge/bundler-4.2.0" = { + "@forge/bundler-4.5.0" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "4.2.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.2.0.tgz"; - sha512 = "4xL9ZjPVgIrrpVeg1S3187FhDbCB4EBa/9nhCBAG8abDujb+D8/zJuiapin5AmUkWl6bFS1PjTBmetanBD4gcA=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.5.0.tgz"; + sha512 = "wDFHAK0DcomvvCglvB3sDoD6ugqud+AUI36vjNHnfu/6TnTVDlmbCFt4WiDtnvUC2w9Ny0Pf1o4px/sg0i7FXg=="; }; }; - "@forge/cli-shared-3.5.0" = { + "@forge/cli-shared-3.6.1" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "3.5.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.5.0.tgz"; - sha512 = "n7CSsL55BCAm3s4g/duDpk/khlARggcjGoTT3KhVYe0duZ0okN47XtRo2D7mSnfM/a3jHac5zCiv+BOEFyYSag=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.6.1.tgz"; + sha512 = "l8PPPyHph5i9WiXOETw+kWn3PyzxhlvA82/OXSZmkgjETD29ZCK1lR4BfT7cHVE8rh92v2cg90+2VCVUO0bafQ=="; }; }; - "@forge/egress-1.1.1" = { + "@forge/csp-2.1.1" = { + name = "_at_forge_slash_csp"; + packageName = "@forge/csp"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@forge/csp/-/csp-2.1.1.tgz"; + sha512 = "Af69CNaZwVSGSlO0lm1Z737QFB9K5NOT6AQxfv4pTx+KeAIGTmP8AgYhKpgDx82IQb2EZeV0IJa9UbiXap8M3A=="; + }; + }; + "@forge/egress-1.1.2" = { name = "_at_forge_slash_egress"; packageName = "@forge/egress"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/egress/-/egress-1.1.1.tgz"; - sha512 = "ycnIIOKyurzchlocjjvTwqtQNsCF98XRT+YvwVwZWwKZ0OmSzPcXPZImrIFw3dF1qySwRwRL31R0xZ1HYUEs8w=="; + url = "https://registry.npmjs.org/@forge/egress/-/egress-1.1.2.tgz"; + sha512 = "gyDuvsz3VRh6Cb++WLJNRcucD/FBgAu9txHLGB1cYzb49094w5mgrte2BaAYGBNNjy3ZdgbgoRt+UclEX6EqKA=="; }; }; - "@forge/lint-3.2.12" = { + "@forge/lint-3.2.15" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.2.12"; + version = "3.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.12.tgz"; - sha512 = "Z1dRnj3zRf+Rf9BMA2ompNYQdAAXYwOVw2NHBrYK0zwQjfnKC7Aco1tAyvYjkSbnyXnDSLlWAsFocgzJ7pX5Cw=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.15.tgz"; + sha512 = "yvNwta0i9bDT9cMTiyLrqEjQKKE58HkYJiZ0OLCXI7f1qYuBouyoSeUXzNKDzh5Az91C7Ot7AyfLtXTbmTTgIw=="; }; }; - "@forge/manifest-4.5.3" = { + "@forge/manifest-4.7.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "4.5.3"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.5.3.tgz"; - sha512 = "px02/hJJk31JiEdMhm4kUgZwNlr6b7wAyL72cxnul2PjQ9bsMUXoP22/nSCV1uIzNznqGbXNnKJ+GKGqIhyQ1g=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.7.0.tgz"; + sha512 = "Pf3UW/sgli44VpDx4ysKG9XIixCVKHrSlrioqGQaLGegVCrPIzWCS8FZmDjL3WnU/haMWOWq524kkkDgkRU3Ow=="; }; }; - "@forge/storage-1.3.1" = { + "@forge/runtime-4.2.0" = { + name = "_at_forge_slash_runtime"; + packageName = "@forge/runtime"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@forge/runtime/-/runtime-4.2.0.tgz"; + sha512 = "Pgiizv+e+iSmwDFuVzQnTGrNTMcK2Y1/Te3I1NjyB2a1oifaWM3n+gPO8Jz/ubOVtGq1a66UmlBIzAMzsHLFxQ=="; + }; + }; + "@forge/storage-1.3.2" = { name = "_at_forge_slash_storage"; packageName = "@forge/storage"; - version = "1.3.1"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@forge/storage/-/storage-1.3.2.tgz"; + sha512 = "+VgbIpeN+t+bfpIVUSuJoclkywmdh+pQsnKNjgS+hb/9IiKNSPhtgy1NIhB2rwARREXO7atqH5estbIhzd1lkA=="; + }; + }; + "@forge/tunnel-3.1.1" = { + name = "_at_forge_slash_tunnel"; + packageName = "@forge/tunnel"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/storage/-/storage-1.3.1.tgz"; - sha512 = "BU1qU0R08FH68MynaF409sp6mt3Ps8+XxyMk4Lsh9PYwYxMOpz5ynczv/DY0331G2n0LMBS1nVsJ9q88PFxI/Q=="; + url = "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.1.1.tgz"; + sha512 = "Vqz77m5SmYGQ19vLO7QqLbqSj7kOmUlkzThkLuuUrm2Jqi/RT8G9XzpbxWSFfsAPca/CcrmYf6Pj5tyLXTRr8Q=="; }; }; - "@forge/util-1.2.0" = { + "@forge/util-1.2.1" = { name = "_at_forge_slash_util"; packageName = "@forge/util"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/util/-/util-1.2.0.tgz"; - sha512 = "oi3SxvXIpW/9oH+IHCP3O50B47HaEkBNxI/i+WxF6W8q5K6qSE7pXyd2JVYpboo/9Ph+18VAwyRqtrZbcaWzBQ=="; + url = "https://registry.npmjs.org/@forge/util/-/util-1.2.1.tgz"; + sha512 = "/ADu8DznWoa3MuIdeGlcBlOX6FjaixD3cJl7PWKD2xdn9+jKaxBDTk7mHvMH6kheKDMEDMLFVosNK0mTiXqvxA=="; }; }; "@gar/promisify-1.1.3" = { @@ -5296,13 +5944,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" = { @@ -5314,13 +5962,13 @@ let sha512 = "/LDNozZ+6qTS0yqMXo/ki6yJqTVx2s6ncOM/m/t4PjqeXrN8ejTwoiNDoDVZq18bsHjZBPP4o03M2goFYWJCHA=="; }; }; - "@grammyjs/types-2.11.2" = { + "@grammyjs/types-2.12.1" = { name = "_at_grammyjs_slash_types"; packageName = "@grammyjs/types"; - version = "2.11.2"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.11.2.tgz"; - sha512 = "qglunvUIL8mz/TS0vqdcg2uABwM34UkSkUQcZVWjxWH34c9ptsMvY3zO0n9P0eLBaRLV4BwnD8MBx35BN2FFNw=="; + url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.12.1.tgz"; + sha512 = "1hO6esfdo42mSvyArPHrlgSY/fgerTuVNAbSD5ZKHS/w5ZyrkA4pRp3VHK2XE3fm9/uMBT/39i8pPvx0+Kbxjg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -5350,13 +5998,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.5.15" = { + "@graphql-tools/batch-execute-8.5.18" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.5.15"; + version = "8.5.18"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.15.tgz"; - sha512 = "qb12M8XCK6SBJmZDS8Lzd4PVJFsIwNUkYmFuqcTiBqOI/WsoDlQDZI++ghRpGcusLkL9uzcIOTT/61OeHhsaLg=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.18.tgz"; + sha512 = "mNv5bpZMLLwhkmPA6+RP81A6u3KF4CSKLf3VX9hbomOkQR4db8pNs8BOvpZU54wKsUzMzdlws/2g/Dabyb2Vsg=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -5368,49 +6016,49 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-9.0.22" = { + "@graphql-tools/delegate-9.0.28" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "9.0.22"; + version = "9.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.22.tgz"; - sha512 = "dWJGMN8V7KORtbI8eDAjHYTWiMyis/md27M6pPhrlYVlcsDk3U0jbNdgkswBBUEBvqumPRCv8pVOxKcLS4caKA=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.28.tgz"; + sha512 = "8j23JCs2mgXqnp+5K0v4J3QBQU/5sXd9miaLvMfRf/6963DznOXTECyS9Gcvj1VEeR5CXIw6+aX/BvRDKDdN1g=="; }; }; - "@graphql-tools/executor-0.0.12" = { + "@graphql-tools/executor-0.0.15" = { name = "_at_graphql-tools_slash_executor"; packageName = "@graphql-tools/executor"; - version = "0.0.12"; + version = "0.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-0.0.12.tgz"; - sha512 = "bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-0.0.15.tgz"; + sha512 = "6U7QLZT8cEUxAMXDP4xXVplLi6RBwx7ih7TevlBto66A/qFp3PDb6o/VFo07yBKozr8PGMZ4jMfEWBGxmbGdxA=="; }; }; - "@graphql-tools/executor-graphql-ws-0.0.6" = { + "@graphql-tools/executor-graphql-ws-0.0.11" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "0.0.6"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.6.tgz"; - sha512 = "n6JvIviYO8iiasV/baclimQqNkYGP7JRlkNSnphNG5LULmVpQ2WsyvbgJHV7wtlTZ8ZQ3+dILgQF83PFyLsfdA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.11.tgz"; + sha512 = "muRj6j897ks2iKqe3HchWFFzd+jFInSRuLPvHJ7e4WPrejFvaZx3BQ9gndfJvVkfYUZIFm13stCGXaJJTbVM0Q=="; }; }; - "@graphql-tools/executor-http-0.1.1" = { + "@graphql-tools/executor-http-0.1.9" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "0.1.1"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-0.1.1.tgz"; - sha512 = "bFE6StI7CJEIYGRkAnTYxutSV4OtC1c4MQU3nStOYZZO7KmzIgEQZ4ygPSPrRb+jtRsMCBEqPqlYOD4Rq02aMw=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-0.1.9.tgz"; + sha512 = "tNzMt5qc1ptlHKfpSv9wVBVKCZ7gks6Yb/JcYJluxZIT4qRV+TtOFjpptfBU63usgrGVOVcGjzWc/mt7KhmmpQ=="; }; }; - "@graphql-tools/executor-legacy-ws-0.0.6" = { + "@graphql-tools/executor-legacy-ws-0.0.9" = { name = "_at_graphql-tools_slash_executor-legacy-ws"; packageName = "@graphql-tools/executor-legacy-ws"; - version = "0.0.6"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.6.tgz"; - sha512 = "L1hRuSvBUCNerYDhfeSZXFeqliDlnNXa3fDHTp7efI3Newpbevqa19Fm0mVzsCL7gqIKOwzrPORwh7kOVE/vew=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.9.tgz"; + sha512 = "L7oDv7R5yoXzMH+KLKDB2WHVijfVW4dB2H+Ae1RdW3MFvwbYjhnIB6QzHqKEqksjp/FndtxZkbuTIuAOsYGTYw=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -5422,22 +6070,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.5.14" = { + "@graphql-tools/graphql-file-loader-7.5.16" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.5.14"; + version = "7.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.14.tgz"; - sha512 = "JGer4g57kq4wtsvqv8uZsT4ZG1lLsz1x5yHDfSj2OxyiWw2f1jFkzgby7Ut3H2sseJiQzeeDYZcbm06qgR32pg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.16.tgz"; + sha512 = "lK1N3Y2I634FS12nd4bu7oAJbai3bUc28yeX+boT+C83KTO4ujGHm+6hPC8X/FRGwhKOnZBxUM7I5nvb3HiUxw=="; }; }; - "@graphql-tools/import-6.7.15" = { + "@graphql-tools/import-6.7.17" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.7.15"; + version = "6.7.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.15.tgz"; - sha512 = "WNhvauAt2I2iUg+JdQK5oQebKLXqUZWe8naP13K1jOkbTQT7hK3P/4I9AaVmzt0KXRJW5Uow3RgdHZ7eUBKVsA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.17.tgz"; + sha512 = "bn9SgrECXq3WIasgNP7ful/uON51wBajPXtxdY+z/ce7jLWaFE6lzwTDB/GAgiZ+jo7nb0ravlxteSAz2qZmuA=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -5449,13 +6097,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.4.15" = { + "@graphql-tools/json-file-loader-7.4.17" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.4.15"; + version = "7.4.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.15.tgz"; - sha512 = "pH+hbsDetcEpj+Tmi7ZRUkxzJez2DLdSQuvK5Qi38FX/Nz/5nZKRfW9nqIptGYbuS9+2JPrt9WWNn1aGtegIFQ=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.17.tgz"; + sha512 = "KOSTP43nwjPfXgas90rLHAFgbcSep4nmiYyR9xRVz4ZAmw8VYHcKhOLTSGylCAzi7KUfyBXajoW+6Z7dQwdn3g=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -5467,13 +6115,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.8.9" = { + "@graphql-tools/load-7.8.12" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.8.9"; + version = "7.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.9.tgz"; - sha512 = "/eHRv6OCTI/Ir5XcbtSx0XbW3zOQVscp2MZQFGZKDzqCcGD+NVy4mLCoBwR/OsOUpvWAwMnc+Llb4SDKAYGmjQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.12.tgz"; + sha512 = "JwxgNS2c6i6oIdKttcbXns/lpKiyN7c6/MkkrJ9x2QE9rXk5HOhSJxRvPmOueCuAin1542xUrcDRGBXJ7thSig=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -5494,22 +6142,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.3.15" = { + "@graphql-tools/merge-8.3.18" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.3.15"; + version = "8.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.15.tgz"; - sha512 = "hYYOlsqkUlL6oOo7zzuk6hIv7xQzy+x21sgK84d5FWaiWYkLYh9As8myuDd9SD5xovWWQ9m/iRhIOVDEMSyEKA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.18.tgz"; + sha512 = "R8nBglvRWPAyLpZL/f3lxsY7wjnAeE0l056zHhcO/CgpvK76KYUt9oEkR05i8Hmt8DLRycBN0FiotJ0yDQWTVA=="; }; }; - "@graphql-tools/mock-8.7.15" = { + "@graphql-tools/mock-8.7.18" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.7.15"; + version = "8.7.18"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.15.tgz"; - sha512 = "0zImG5tuObhowqtijlB6TMAIVtCIBsnGGwNW8gnCOa+xZAqfGdUMsSma17tHC2XuI7xhv7A0O8pika9e3APLUg=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.18.tgz"; + sha512 = "ZbXMp86V0DmfgUZhr5aGHtNIS2hBazhvTpPlFCyNOP+RMio3ErKnSsma3T1jV1ZyMo11l7QrxV9Xxn3uA0dv+w=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5530,13 +6178,13 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.13" = { + "@graphql-tools/schema-9.0.16" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "9.0.13"; + version = "9.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.13.tgz"; - sha512 = "guRA3fwAtv+M1Kh930P4ydH9aKJTWscIkhVFcWpj/cnjYYxj88jkEJ15ZNiJX/2breNY+sbVgmlgLKb6aXi/Jg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.16.tgz"; + sha512 = "kF+tbYPPf/6K2aHG3e1SWIbapDLQaqnIHVRG6ow3onkFoowwtKszvUyOASL6Krcv2x9bIMvd1UkvRf9OaoROQQ=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -5548,13 +6196,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.17.2" = { + "@graphql-tools/url-loader-7.17.13" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.17.2"; + version = "7.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.2.tgz"; - sha512 = "VgCXa5vQzcM13+loJvVHLXltp3qN8PHUTeth50cImUhCm3qtRwOeuSYjpph38vllPb8DKxsZkNFxzYgzscWIow=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.13.tgz"; + sha512 = "FEmbvw68kxeZLn4VYGAl+NuBPk09ZnxymjW07A6mCtiDayFgYfHdWeRzXn/iM5PzsEuCD73R1sExtNQ/ISiajg=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5602,13 +6250,13 @@ let sha512 = "pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg=="; }; }; - "@graphql-tools/utils-9.1.4" = { + "@graphql-tools/utils-9.2.1" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "9.1.4"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.1.4.tgz"; - sha512 = "hgIeLt95h9nQgQuzbbdhuZmh+8WV7RZ/6GbTj6t3IU4Zd2zs9yYJ2jgW/krO587GMOY8zCwrjNOMzD40u3l7Vg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-9.2.1.tgz"; + sha512 = "WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -5620,58 +6268,58 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-9.3.1" = { + "@graphql-tools/wrap-9.3.7" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "9.3.1"; + version = "9.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.1.tgz"; - sha512 = "uzY1HKc7qMErWL3ybv8bFG3hI1rTJPVYQ8WeJkCF/r/+aHEkUj0Bo2PYZrZTX1UIr3Tb4P5GyhqYBgZOXraZjw=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.7.tgz"; + sha512 = "gavfiWLKgvmC2VPamnMzml3zmkBoo0yt+EmOLIHY6O92o4uMTR281WGM77tZIfq+jzLtjoIOThUSjC/cN/6XKg=="; }; }; - "@graphql-typed-document-node/core-3.1.1" = { + "@graphql-typed-document-node/core-3.1.2" = { name = "_at_graphql-typed-document-node_slash_core"; packageName = "@graphql-typed-document-node/core"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.1.tgz"; - sha512 = "NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg=="; + url = "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.2.tgz"; + sha512 = "9anpBMM9mEgZN4wr2v8wHJI2/u5TnnggewRN6OlvXTTnuVyoY19X6rOv9XTqKRw6dcGKwZsBi8n0kDE2I5i4VA=="; }; }; - "@grpc/grpc-js-1.7.3" = { + "@grpc/grpc-js-1.8.1" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.7.3"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz"; - sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.1.tgz"; + sha512 = "mdqYADWl/9Kb75XLstt6pvBnS1DpxSDFRKrbadkY1ymUd29hq49nP6tLcL7a7qLydgqFCpjNwa2RsyrqB3MsXA=="; }; }; - "@grpc/grpc-js-1.8.0" = { + "@grpc/grpc-js-1.8.11" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.8.0"; + version = "1.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.0.tgz"; - sha512 = "ySMTXQuMvvswoobvN+0LsaPf7ITO2JVfJmHxQKI4cGehNrrUms+n81BlHEX7Hl/LExji6XE3fnI9U04GSkRruA=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.11.tgz"; + sha512 = "f/xC+6Z2QKsRJ+VSSFlt4hA5KSRm+PKvMWV8kMPkMgGlFidR6PeIkXrOasIY2roe+WROM6GFQLlgDKfeEZo2YQ=="; }; }; - "@grpc/grpc-js-1.8.1" = { + "@grpc/grpc-js-1.8.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.8.1"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.1.tgz"; - sha512 = "mdqYADWl/9Kb75XLstt6pvBnS1DpxSDFRKrbadkY1ymUd29hq49nP6tLcL7a7qLydgqFCpjNwa2RsyrqB3MsXA=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.4.tgz"; + sha512 = "oaETBotls7FTBpySg5dhyUCyXSxSeCMmkBBXHXG1iw57MiNoB6D7VRhkrXYbwyHM3Q3Afjp4KlsBX0Zb+ELZXw=="; }; }; - "@grpc/grpc-js-1.8.4" = { + "@grpc/grpc-js-1.8.9" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.8.4"; + version = "1.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.4.tgz"; - sha512 = "oaETBotls7FTBpySg5dhyUCyXSxSeCMmkBBXHXG1iw57MiNoB6D7VRhkrXYbwyHM3Q3Afjp4KlsBX0Zb+ELZXw=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.9.tgz"; + sha512 = "xzsl2HamhovnZddS/2pMF4Q+FgwINaBvxoFGQ+G54Lo7Xsge36VvfDO/TDkL7FofmrRK/X5weRvwlJh7rKwN4w=="; }; }; "@grpc/proto-loader-0.7.4" = { @@ -5683,6 +6331,15 @@ let sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; }; }; + "@grpc/proto-loader-0.7.5" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.5.tgz"; + sha512 = "mfcTuMbFowq1wh/Rn5KQl6qb95M21Prej3bewD9dUQMurYGVckGO/Pbe2Ocwto6sD05b/mxZLspvqwx60xO2Rg=="; + }; + }; "@gulp-sourcemaps/identity-map-2.0.1" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -6097,76 +6754,355 @@ let sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; - "@joplin/fork-htmlparser2-4.1.41" = { + "@jimp/bmp-0.16.13" = { + name = "_at_jimp_slash_bmp"; + packageName = "@jimp/bmp"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.13.tgz"; + sha512 = "9edAxu7N2FX7vzkdl5Jo1BbACfycUtBQX+XBMcHA2bk62P8R0otgkHg798frgAk/WxQIzwxqOH6wMiCwrlAzdQ=="; + }; + }; + "@jimp/core-0.16.13" = { + name = "_at_jimp_slash_core"; + packageName = "@jimp/core"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/core/-/core-0.16.13.tgz"; + sha512 = "qXpA1tzTnlkTku9yqtuRtS/wVntvE6f3m3GNxdTdtmc+O+Wcg9Xo2ABPMh7Nc0AHbMKzwvwgB2JnjZmlmJEObg=="; + }; + }; + "@jimp/custom-0.16.13" = { + name = "_at_jimp_slash_custom"; + packageName = "@jimp/custom"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.13.tgz"; + sha512 = "LTATglVUPGkPf15zX1wTMlZ0+AU7cGEGF6ekVF1crA8eHUWsGjrYTB+Ht4E3HTrCok8weQG+K01rJndCp/l4XA=="; + }; + }; + "@jimp/gif-0.16.13" = { + name = "_at_jimp_slash_gif"; + packageName = "@jimp/gif"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.13.tgz"; + sha512 = "yFAMZGv3o+YcjXilMWWwS/bv1iSqykFahFMSO169uVMtfQVfa90kt4/kDwrXNR6Q9i6VHpFiGZMlF2UnHClBvg=="; + }; + }; + "@jimp/jpeg-0.16.13" = { + name = "_at_jimp_slash_jpeg"; + packageName = "@jimp/jpeg"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.13.tgz"; + sha512 = "BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA=="; + }; + }; + "@jimp/plugin-blit-0.16.13" = { + name = "_at_jimp_slash_plugin-blit"; + packageName = "@jimp/plugin-blit"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.13.tgz"; + sha512 = "8Z1k96ZFxlhK2bgrY1JNWNwvaBeI/bciLM0yDOni2+aZwfIIiC7Y6PeWHTAvjHNjphz+XCt01WQmOYWCn0ML6g=="; + }; + }; + "@jimp/plugin-blur-0.16.13" = { + name = "_at_jimp_slash_plugin-blur"; + packageName = "@jimp/plugin-blur"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.13.tgz"; + sha512 = "PvLrfa8vkej3qinlebyhLpksJgCF5aiysDMSVhOZqwH5nQLLtDE9WYbnsofGw4r0VVpyw3H/ANCIzYTyCtP9Cg=="; + }; + }; + "@jimp/plugin-circle-0.16.13" = { + name = "_at_jimp_slash_plugin-circle"; + packageName = "@jimp/plugin-circle"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.13.tgz"; + sha512 = "RNave7EFgZrb5V5EpdvJGAEHMnDAJuwv05hKscNfIYxf0kR3KhViBTDy+MoTnMlIvaKFULfwIgaZWzyhuINMzA=="; + }; + }; + "@jimp/plugin-color-0.16.13" = { + name = "_at_jimp_slash_plugin-color"; + packageName = "@jimp/plugin-color"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.13.tgz"; + sha512 = "xW+9BtEvoIkkH/Wde9ql4nAFbYLkVINhpgAE7VcBUsuuB34WUbcBl/taOuUYQrPEFQJ4jfXiAJZ2H/rvKjCVnQ=="; + }; + }; + "@jimp/plugin-contain-0.16.13" = { + name = "_at_jimp_slash_plugin-contain"; + packageName = "@jimp/plugin-contain"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.13.tgz"; + sha512 = "QayTXw4tXMwU6q6acNTQrTTFTXpNRBe+MgTGMDU0lk+23PjlFCO/9sacflelG8lsp7vNHhAxFeHptDMAksEYzg=="; + }; + }; + "@jimp/plugin-cover-0.16.13" = { + name = "_at_jimp_slash_plugin-cover"; + packageName = "@jimp/plugin-cover"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.13.tgz"; + sha512 = "BSsP71GTNaqWRcvkbWuIVH+zK7b3TSNebbhDkFK0fVaUTzHuKMS/mgY4hDZIEVt7Rf5FjadAYtsujHN9w0iSYA=="; + }; + }; + "@jimp/plugin-crop-0.16.13" = { + name = "_at_jimp_slash_plugin-crop"; + packageName = "@jimp/plugin-crop"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.13.tgz"; + sha512 = "WEl2tPVYwzYL8OKme6Go2xqiWgKsgxlMwyHabdAU4tXaRwOCnOI7v4021gCcBb9zn/oWwguHuKHmK30Fw2Z/PA=="; + }; + }; + "@jimp/plugin-displace-0.16.13" = { + name = "_at_jimp_slash_plugin-displace"; + packageName = "@jimp/plugin-displace"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.13.tgz"; + sha512 = "qt9WKq8vWrcjySa9DyQ0x/RBMHQeiVjdVSY1SJsMjssPUf0pS74qorcuAkGi89biN3YoGUgPkpqECnAWnYwgGA=="; + }; + }; + "@jimp/plugin-dither-0.16.13" = { + name = "_at_jimp_slash_plugin-dither"; + packageName = "@jimp/plugin-dither"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.13.tgz"; + sha512 = "5/N3yJggbWQTlGZHQYJPmQXEwR52qaXjEzkp1yRBbtdaekXE3BG/suo0fqeoV/csf8ooI78sJzYmIrxNoWVtgQ=="; + }; + }; + "@jimp/plugin-fisheye-0.16.13" = { + name = "_at_jimp_slash_plugin-fisheye"; + packageName = "@jimp/plugin-fisheye"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.13.tgz"; + sha512 = "2rZmTdFbT/cF9lEZIkXCYO0TsT114Q27AX5IAo0Sju6jVQbvIk1dFUTnwLDadTo8wkJlFzGqMQ24Cs8cHWOliA=="; + }; + }; + "@jimp/plugin-flip-0.16.13" = { + name = "_at_jimp_slash_plugin-flip"; + packageName = "@jimp/plugin-flip"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.13.tgz"; + sha512 = "EmcgAA74FTc5u7Z+hUO/sRjWwfPPLuOQP5O64x5g4j0T12Bd29IgsYZxoutZo/rb3579+JNa/3wsSEmyVv1EpA=="; + }; + }; + "@jimp/plugin-gaussian-0.16.13" = { + name = "_at_jimp_slash_plugin-gaussian"; + packageName = "@jimp/plugin-gaussian"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.13.tgz"; + sha512 = "A1XKfGQD0iDdIiKqFYi8nZMv4dDVYdxbrmgR7y/CzUHhSYdcmoljLIIsZZM3Iks/Wa353W3vtvkWLuDbQbch1w=="; + }; + }; + "@jimp/plugin-invert-0.16.13" = { + name = "_at_jimp_slash_plugin-invert"; + packageName = "@jimp/plugin-invert"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.13.tgz"; + sha512 = "xFMrIn7czEZbdbMzZWuaZFnlLGJDVJ82y5vlsKsXRTG2kcxRsMPXvZRWHV57nSs1YFsNqXSbrC8B98n0E32njQ=="; + }; + }; + "@jimp/plugin-mask-0.16.13" = { + name = "_at_jimp_slash_plugin-mask"; + packageName = "@jimp/plugin-mask"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.13.tgz"; + sha512 = "wLRYKVBXql2GAYgt6FkTnCfE+q5NomM7Dlh0oIPGAoMBWDyTx0eYutRK6PlUrRK2yMHuroAJCglICTbxqGzowQ=="; + }; + }; + "@jimp/plugin-normalize-0.16.13" = { + name = "_at_jimp_slash_plugin-normalize"; + packageName = "@jimp/plugin-normalize"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.13.tgz"; + sha512 = "3tfad0n9soRna4IfW9NzQdQ2Z3ijkmo21DREHbE6CGcMIxOSvfRdSvf1qQPApxjTSo8LTU4MCi/fidx/NZ0GqQ=="; + }; + }; + "@jimp/plugin-print-0.16.13" = { + name = "_at_jimp_slash_plugin-print"; + packageName = "@jimp/plugin-print"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.13.tgz"; + sha512 = "0m6i3p01PGRkGAK9r53hDYrkyMq+tlhLOIbsSTmZyh6HLshUKlTB7eXskF5OpVd5ZUHoltlNc6R+ggvKIzxRFw=="; + }; + }; + "@jimp/plugin-resize-0.16.13" = { + name = "_at_jimp_slash_plugin-resize"; + packageName = "@jimp/plugin-resize"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.13.tgz"; + sha512 = "qoqtN8LDknm3fJm9nuPygJv30O3vGhSBD2TxrsCnhtOsxKAqVPJtFVdGd/qVuZ8nqQANQmTlfqTiK9mVWQ7MiQ=="; + }; + }; + "@jimp/plugin-rotate-0.16.13" = { + name = "_at_jimp_slash_plugin-rotate"; + packageName = "@jimp/plugin-rotate"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.13.tgz"; + sha512 = "Ev+Jjmj1nHYw897z9C3R9dYsPv7S2/nxdgfFb/h8hOwK0Ovd1k/+yYS46A0uj/JCKK0pQk8wOslYBkPwdnLorw=="; + }; + }; + "@jimp/plugin-scale-0.16.13" = { + name = "_at_jimp_slash_plugin-scale"; + packageName = "@jimp/plugin-scale"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.13.tgz"; + sha512 = "05POQaEJVucjTiSGMoH68ZiELc7QqpIpuQlZ2JBbhCV+WCbPFUBcGSmE7w4Jd0E2GvCho/NoMODLwgcVGQA97A=="; + }; + }; + "@jimp/plugin-shadow-0.16.13" = { + name = "_at_jimp_slash_plugin-shadow"; + packageName = "@jimp/plugin-shadow"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.13.tgz"; + sha512 = "nmu5VSZ9hsB1JchTKhnnCY+paRBnwzSyK5fhkhtQHHoFD5ArBQ/5wU8y6tCr7k/GQhhGq1OrixsECeMjPoc8Zw=="; + }; + }; + "@jimp/plugin-threshold-0.16.13" = { + name = "_at_jimp_slash_plugin-threshold"; + packageName = "@jimp/plugin-threshold"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.13.tgz"; + sha512 = "+3zArBH0OE3Rhjm4HyAokMsZlIq5gpQec33CncyoSwxtRBM2WAhUVmCUKuBo+Lr/2/4ISoY4BWpHKhMLDix6cA=="; + }; + }; + "@jimp/plugins-0.16.13" = { + name = "_at_jimp_slash_plugins"; + packageName = "@jimp/plugins"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.13.tgz"; + sha512 = "CJLdqODEhEVs4MgWCxpWL5l95sCBlkuSLz65cxEm56X5akIsn4LOlwnKoSEZioYcZUBvHhCheH67AyPTudfnQQ=="; + }; + }; + "@jimp/png-0.16.13" = { + name = "_at_jimp_slash_png"; + packageName = "@jimp/png"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/png/-/png-0.16.13.tgz"; + sha512 = "8cGqINvbWJf1G0Her9zbq9I80roEX0A+U45xFby3tDWfzn+Zz8XKDF1Nv9VUwVx0N3zpcG1RPs9hfheG4Cq2kg=="; + }; + }; + "@jimp/tiff-0.16.13" = { + name = "_at_jimp_slash_tiff"; + packageName = "@jimp/tiff"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.13.tgz"; + sha512 = "oJY8d9u95SwW00VPHuCNxPap6Q1+E/xM5QThb9Hu+P6EGuu6lIeLaNBMmFZyblwFbwrH+WBOZlvIzDhi4Dm/6Q=="; + }; + }; + "@jimp/types-0.16.13" = { + name = "_at_jimp_slash_types"; + packageName = "@jimp/types"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/types/-/types-0.16.13.tgz"; + sha512 = "mC0yVNUobFDjoYLg4hoUwzMKgNlxynzwt3cDXzumGvRJ7Kb8qQGOWJQjQFo5OxmGExqzPphkirdbBF88RVLBCg=="; + }; + }; + "@jimp/utils-0.16.13" = { + name = "_at_jimp_slash_utils"; + packageName = "@jimp/utils"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.13.tgz"; + sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA=="; + }; + }; + "@joplin/fork-htmlparser2-4.1.43" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.41"; + version = "4.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.41.tgz"; - sha512 = "kESOGrSvP4NnClZHSmiFRi8dNYTqlsKrlpV8ds+al26Otw5/j/wljd13EVTfRxmc0EuBRPLJONBF+Of9hTF89g=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.43.tgz"; + sha512 = "JZzmjx04/Fg8zp7LYcj0a9ZSAjZ6puGnE2vku4yAvhsSZzHWuiOX/szr4I9pnqW1U1Z0ysls/b5k3iBjoO9xuQ=="; }; }; - "@joplin/fork-sax-1.2.45" = { + "@joplin/fork-sax-1.2.47" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.45"; + version = "1.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.45.tgz"; - sha512 = "mE1Mdqk8tDixtQsmDfYeZspJzuoaoW79XM4HAEnpzS9WyLRhmS84ReTRx/PUaesYrB8yEDHAihgHEkaRfhM1bg=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.47.tgz"; + sha512 = "T+z8PDlJVoBkpT1/cxfYlil5oVgjl7DOkX7JHoWCqAteNzTVtC6+1sunXicgBQBi7pu0PKCHx+E1n222RTWs+Q=="; }; }; - "@joplin/fork-uslug-1.0.6" = { + "@joplin/fork-uslug-1.0.8" = { name = "_at_joplin_slash_fork-uslug"; packageName = "@joplin/fork-uslug"; - version = "1.0.6"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.6.tgz"; - sha512 = "T1GeffoLrX+7zQ1ChseusRrTPqgNp782lMh2ZTVzFz3FWrqIn1/vtsj3VA+Wu2v1CQRew+BFV/Ojh9Lsppf/lA=="; + url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.8.tgz"; + sha512 = "udKbIKJMQeBla8gbwEC9eX0cUcrS67foQRT2cnIPpdFqkE7FMpqDg68AEq26CxjFuo2bojlyBI83hg4Qw0cGHQ=="; }; }; - "@joplin/htmlpack-2.9.1" = { + "@joplin/htmlpack-2.10.2" = { name = "_at_joplin_slash_htmlpack"; packageName = "@joplin/htmlpack"; - version = "2.9.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-2.9.1.tgz"; - sha512 = "VLNsLkmf7VfmlppnA62zm+dl5oG1v0RUqfekO4GE3+d9kjpyF1+z4/314tUmrJDIXa3VJDH4wQyhHQ5o/Ss8Yg=="; + url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-2.10.2.tgz"; + sha512 = "4hoF8dXz5XUuYd3d5K1FAFTeGRNgY4nlu3fGMy82/6YmraqiksNSpHkKqr4UaAiLENBr9iIT5H41uax3ijXTdA=="; }; }; - "@joplin/lib-2.9.1" = { + "@joplin/lib-2.10.2" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "2.9.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.9.1.tgz"; - sha512 = "PjZxaVw2gD3SVRiiz04kS0DVnPPQ6/aPOjtY1/CeJ5+CbWekee2RlU5dAsmMh7WYiP3H+Dsn0/kTvg/gta9Kmw=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.10.2.tgz"; + sha512 = "01ZUJLAUocrLCi1x+JxGOz/FHceGbRwuiMMg9Uzht2M2NvayENYVjWWb5Yqv+km9qJ0P7+RLFrS3ijAuIgWqwg=="; }; }; - "@joplin/renderer-2.9.1" = { + "@joplin/renderer-2.10.2" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "2.9.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.9.1.tgz"; - sha512 = "zxno3My11uPOPo7dJbKTgZhctWEmMUtsdNpwzmBppi8mN36AfUjwgNHvhKwiu97iSNVvg81bDFsE14yMi/bkiA=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.10.2.tgz"; + sha512 = "Wnx2wNDt7i/PcTydPokKpjv7LDYJ7npdOBKhjqYn2a4ZStwfHMQSWyMs0Sezdr3gVqCAlUyI4xGOLWqEUPjbug=="; }; }; - "@joplin/turndown-4.0.63" = { + "@joplin/turndown-4.0.65" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.63"; + version = "4.0.65"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.63.tgz"; - sha512 = "2Qch4BkiMVSMT0p38ontt7DB9lGreByxbDJmFZW+Iiyq3kxQFh2Js+DzmE+djkX7C1qmvXRfESEXTYQYKUj5iA=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.65.tgz"; + sha512 = "Lyvjx3kmUkKe/f5SjcHDXlwUWgUJ6MimVyrbrwXh0sxkF9jIUofALxvmsqDn5uYi1znpPI5QVJQ9uncu98+1MA=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.45" = { + "@joplin/turndown-plugin-gfm-1.0.47" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.45"; + version = "1.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.45.tgz"; - sha512 = "RUQfMrFqFp2wB0mOZPGOTq6LVUVBOhQg87+ecv1+qF2gTHZm3jQd77iV5Eddbg2WjCj06eCG99et3kdPf0YwVw=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.47.tgz"; + sha512 = "VjY7ER5O+AUfhPkaxY25hh4N8PnZEc6311kJj040CHIXV9EYH7xuaS/MLeZL296FNLbsPaHbl5aQiOQ3xwTLJw=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -6295,22 +7231,40 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.73.0" = { + "@jsii/check-node-1.76.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.73.0.tgz"; - sha512 = "oneDKgjplUw2Ivk78iAb9lCsAasxkuQ6Ii15qzXsw16CPSRCqQlE78lUVV7pr+rxx/vQDWBAa8ycRbuVghC6TQ=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.76.0.tgz"; + sha512 = "iAQohlms0FQNtmAsXOV9Rrd7QDikkLw68R2TPwhlVKuLPdHPKIK3gyeN0jqZzc0luNQ9h+3P7kSqfpKd+Kr79Q=="; }; }; - "@jsii/spec-1.73.0" = { + "@jsii/spec-1.76.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.73.0.tgz"; - sha512 = "h0BeA6WQfxvYl5BaacmlvB5bAIdhlgf9SInJljxtERn2eYN+VjgMyU/1iv0Ww4Lp71xMGL96bmfXpdlFgRQFEg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.76.0.tgz"; + sha512 = "7L8KeG44ECq0ulKYWaOr0FQvnFW7RavjxEGvMAdKfIOXb5mZyGERnj5pKl5kmq2m1lWE2VBZELoTfM7dDlAPtg=="; + }; + }; + "@json2csv/formatters-6.1.2" = { + name = "_at_json2csv_slash_formatters"; + packageName = "@json2csv/formatters"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@json2csv/formatters/-/formatters-6.1.2.tgz"; + sha512 = "l8i5EdQvHZHrtSgRFEXMkRnIn8CBopT/ecZSIyPKuee9+pm/Sxcb/r/N2jQWARnOQc7uyqQWAtpPpxU7HhZ2tg=="; + }; + }; + "@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" = { @@ -6358,13 +7312,13 @@ let sha512 = "4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA=="; }; }; - "@ledgerhq/devices-7.0.7" = { + "@ledgerhq/devices-8.0.0" = { name = "_at_ledgerhq_slash_devices"; packageName = "@ledgerhq/devices"; - version = "7.0.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-7.0.7.tgz"; - sha512 = "PZ9TtaTGBYUm/g0qNKPbECZt7DDNvqM3ILS5wAtOMna2cBR+mrywUGXrkjuOWlHpuqZ8wenaAKveQBbzF2ba8w=="; + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.0.tgz"; + sha512 = "gSnRT0KPca+LIpaC6D/WZQjOAlSI5uCvK1dmxXtKhODLAj735rX5Z3SnGnLUavRCHNbUi44FzgvloF5BKTkh7A=="; }; }; "@ledgerhq/errors-5.50.0" = { @@ -6394,31 +7348,31 @@ let sha512 = "6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw=="; }; }; - "@ledgerhq/hw-transport-6.27.10" = { + "@ledgerhq/hw-transport-6.28.1" = { name = "_at_ledgerhq_slash_hw-transport"; packageName = "@ledgerhq/hw-transport"; - version = "6.27.10"; + version = "6.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.10.tgz"; - sha512 = "3cmwQZsiRKe6VcHA1kAtC8+Wt0xjCa9Y0TO/Ns2k4BmEhIlG143I4H1dJntkX6XhDpE1pK9Xn2niBQsTTeGhqA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.1.tgz"; + sha512 = "RaZe+abn0zBIz82cE9tp7Y7aZkHWWbEaE2yJpfxT8AhFz3fx+BU0kLYzuRN9fmA7vKueNJ1MTVUCY+Ex9/CHSQ=="; }; }; - "@ledgerhq/hw-transport-node-hid-6.27.10" = { + "@ledgerhq/hw-transport-node-hid-6.27.12" = { name = "_at_ledgerhq_slash_hw-transport-node-hid"; packageName = "@ledgerhq/hw-transport-node-hid"; - version = "6.27.10"; + version = "6.27.12"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.10.tgz"; - sha512 = "+08Js51ED1OvnqS+qMnC0bxTYVQ1X3GBvKXRbh3w2IOAdp7ji8srD2VnSe1fz2iXJ19OR7KZL5quRpcv+TOWQw=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.12.tgz"; + sha512 = "Y3GGgZK27K587P3671bCF4pbbfFYq6eVECnxoxtVwt0kdquRfpt3mxWlU51LIL+XgDEwBwt2QdB+6eyLHmWKQA=="; }; }; - "@ledgerhq/hw-transport-node-hid-noevents-6.27.10" = { + "@ledgerhq/hw-transport-node-hid-noevents-6.27.12" = { name = "_at_ledgerhq_slash_hw-transport-node-hid-noevents"; packageName = "@ledgerhq/hw-transport-node-hid-noevents"; - version = "6.27.10"; + version = "6.27.12"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.10.tgz"; - sha512 = "IyZO88VJubSnfDePSiOG83Ly1n7xfvvErtf7ESQxFhwCrkObkUczQDarYo8XJLCJBDuRr2UgiOfb/yAZrlf+vA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.12.tgz"; + sha512 = "f99lIcdEz78jHVfr57Vl9sgP/WpAuM3X26lLDSTKmNHDxLSx7IQaK/eJOcFG4XLk5K7dK/zoyXqq13zcLL2tPg=="; }; }; "@ledgerhq/hw-transport-u2f-5.36.0-deprecated" = { @@ -6475,544 +7429,22 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/add-6.4.1" = { - name = "_at_lerna_slash_add"; - packageName = "@lerna/add"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-6.4.1.tgz"; - sha512 = "YSRnMcsdYnQtQQK0NSyrS9YGXvB3jzvx183o+JTH892MKzSlBqwpBHekCknSibyxga1HeZ0SNKQXgsHAwWkrRw=="; - }; - }; - "@lerna/bootstrap-6.4.1" = { - name = "_at_lerna_slash_bootstrap"; - packageName = "@lerna/bootstrap"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-6.4.1.tgz"; - sha512 = "64cm0mnxzxhUUjH3T19ZSjPdn28vczRhhTXhNAvOhhU0sQgHrroam1xQC1395qbkV3iosSertlu8e7xbXW033w=="; - }; - }; - "@lerna/changed-6.4.1" = { - name = "_at_lerna_slash_changed"; - packageName = "@lerna/changed"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-6.4.1.tgz"; - sha512 = "Z/z0sTm3l/iZW0eTSsnQpcY5d6eOpNO0g4wMOK+hIboWG0QOTc8b28XCnfCUO+33UisKl8PffultgoaHMKkGgw=="; - }; - }; - "@lerna/check-working-tree-6.4.1" = { - name = "_at_lerna_slash_check-working-tree"; - packageName = "@lerna/check-working-tree"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-6.4.1.tgz"; - sha512 = "EnlkA1wxaRLqhJdn9HX7h+JYxqiTK9aWEFOPqAE8lqjxHn3RpM9qBp1bAdL7CeUk3kN1lvxKwDEm0mfcIyMbPA=="; - }; - }; - "@lerna/child-process-6.4.1" = { + "@lerna/child-process-6.5.1" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-6.4.1.tgz"; - sha512 = "dvEKK0yKmxOv8pccf3I5D/k+OGiLxQp5KYjsrDtkes2pjpCFfQAMbmpol/Tqx6w/2o2rSaRrLsnX8TENo66FsA=="; - }; - }; - "@lerna/clean-6.4.1" = { - name = "_at_lerna_slash_clean"; - packageName = "@lerna/clean"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-6.4.1.tgz"; - sha512 = "FuVyW3mpos5ESCWSkQ1/ViXyEtsZ9k45U66cdM/HnteHQk/XskSQw0sz9R+whrZRUDu6YgYLSoj1j0YAHVK/3A=="; - }; - }; - "@lerna/cli-6.4.1" = { - name = "_at_lerna_slash_cli"; - packageName = "@lerna/cli"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-6.4.1.tgz"; - sha512 = "2pNa48i2wzFEd9LMPKWI3lkW/3widDqiB7oZUM1Xvm4eAOuDWc9I3RWmAUIVlPQNf3n4McxJCvsZZ9BpQN50Fg=="; - }; - }; - "@lerna/collect-uncommitted-6.4.1" = { - name = "_at_lerna_slash_collect-uncommitted"; - packageName = "@lerna/collect-uncommitted"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-6.4.1.tgz"; - sha512 = "5IVQGhlLrt7Ujc5ooYA1Xlicdba/wMcDSnbQwr8ufeqnzV2z4729pLCVk55gmi6ZienH/YeBPHxhB5u34ofE0Q=="; - }; - }; - "@lerna/collect-updates-6.4.1" = { - name = "_at_lerna_slash_collect-updates"; - packageName = "@lerna/collect-updates"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-6.4.1.tgz"; - sha512 = "pzw2/FC+nIqYkknUHK9SMmvP3MsLEjxI597p3WV86cEDN3eb1dyGIGuHiKShtjvT08SKSwpTX+3bCYvLVxtC5Q=="; - }; - }; - "@lerna/command-6.4.1" = { - name = "_at_lerna_slash_command"; - packageName = "@lerna/command"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-6.4.1.tgz"; - sha512 = "3Lifj8UTNYbRad8JMP7IFEEdlIyclWyyvq/zvNnTS9kCOEymfmsB3lGXr07/AFoi6qDrvN64j7YSbPZ6C6qonw=="; - }; - }; - "@lerna/conventional-commits-6.4.1" = { - name = "_at_lerna_slash_conventional-commits"; - packageName = "@lerna/conventional-commits"; - version = "6.4.1"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-6.4.1.tgz"; - sha512 = "NIvCOjStjQy5O8VojB7/fVReNNDEJOmzRG2sTpgZ/vNS4AzojBQZ/tobzhm7rVkZZ43R9srZeuhfH9WgFsVUSA=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-6.5.1.tgz"; + sha512 = "QfyleXSD9slh4qM54wDaqKVPvtUH1NJMgsFc9BabqSHO1Ttpandv1EAvTCN9Lu73RbCX3LJpn+BfJmnjHbjCyw=="; }; }; - "@lerna/create-6.4.1" = { + "@lerna/create-6.5.1" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-6.4.1.tgz"; - sha512 = "qfQS8PjeGDDlxEvKsI/tYixIFzV2938qLvJohEKWFn64uvdLnXCamQ0wvRJST8p1ZpHWX4AXrB+xEJM3EFABrA=="; - }; - }; - "@lerna/create-symlink-6.4.1" = { - name = "_at_lerna_slash_create-symlink"; - packageName = "@lerna/create-symlink"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-6.4.1.tgz"; - sha512 = "rNivHFYV1GAULxnaTqeGb2AdEN2OZzAiZcx5CFgj45DWXQEGwPEfpFmCSJdXhFZbyd3K0uiDlAXjAmV56ov3FQ=="; - }; - }; - "@lerna/describe-ref-6.4.1" = { - name = "_at_lerna_slash_describe-ref"; - packageName = "@lerna/describe-ref"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-6.4.1.tgz"; - sha512 = "MXGXU8r27wl355kb1lQtAiu6gkxJ5tAisVJvFxFM1M+X8Sq56icNoaROqYrvW6y97A9+3S8Q48pD3SzkFv31Xw=="; - }; - }; - "@lerna/diff-6.4.1" = { - name = "_at_lerna_slash_diff"; - packageName = "@lerna/diff"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-6.4.1.tgz"; - sha512 = "TnzJsRPN2fOjUrmo5Boi43fJmRtBJDsVgwZM51VnLoKcDtO1kcScXJ16Od2Xx5bXbp5dES5vGDLL/USVVWfeAg=="; - }; - }; - "@lerna/exec-6.4.1" = { - name = "_at_lerna_slash_exec"; - packageName = "@lerna/exec"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-6.4.1.tgz"; - sha512 = "KAWfuZpoyd3FMejHUORd0GORMr45/d9OGAwHitfQPVs4brsxgQFjbbBEEGIdwsg08XhkDb4nl6IYVASVTq9+gA=="; - }; - }; - "@lerna/filter-options-6.4.1" = { - name = "_at_lerna_slash_filter-options"; - packageName = "@lerna/filter-options"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-6.4.1.tgz"; - sha512 = "efJh3lP2T+9oyNIP2QNd9EErf0Sm3l3Tz8CILMsNJpjSU6kO43TYWQ+L/ezu2zM99KVYz8GROLqDcHRwdr8qUA=="; - }; - }; - "@lerna/filter-packages-6.4.1" = { - name = "_at_lerna_slash_filter-packages"; - packageName = "@lerna/filter-packages"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_get-npm-exec-opts"; - packageName = "@lerna/get-npm-exec-opts"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_get-packed"; - packageName = "@lerna/get-packed"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-6.4.1.tgz"; - sha512 = "uaDtYwK1OEUVIXn84m45uPlXShtiUcw6V9TgB3rvHa3rrRVbR7D4r+JXcwVxLGrAS7LwxVbYWEEO/Z/bX7J/Lg=="; - }; - }; - "@lerna/github-client-6.4.1" = { - name = "_at_lerna_slash_github-client"; - packageName = "@lerna/github-client"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-6.4.1.tgz"; - sha512 = "ridDMuzmjMNlcDmrGrV9mxqwUKzt9iYqCPwVYJlRYrnE3jxyg+RdooquqskVFj11djcY6xCV2Q2V1lUYwF+PmA=="; - }; - }; - "@lerna/gitlab-client-6.4.1" = { - name = "_at_lerna_slash_gitlab-client"; - packageName = "@lerna/gitlab-client"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-6.4.1.tgz"; - sha512 = "AdLG4d+jbUvv0jQyygQUTNaTCNSMDxioJso6aAjQ/vkwyy3fBJ6FYzX74J4adSfOxC2MQZITFyuG+c9ggp7pyQ=="; - }; - }; - "@lerna/global-options-6.4.1" = { - name = "_at_lerna_slash_global-options"; - packageName = "@lerna/global-options"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_has-npm-version"; - packageName = "@lerna/has-npm-version"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-6.4.1.tgz"; - sha512 = "vW191w5iCkwNWWWcy4542ZOpjKYjcP/pU3o3+w6NM1J3yBjWZcNa8lfzQQgde2QkGyNi+i70o6wIca1o0sdKwg=="; - }; - }; - "@lerna/import-6.4.1" = { - name = "_at_lerna_slash_import"; - packageName = "@lerna/import"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-6.4.1.tgz"; - sha512 = "oDg8g1PNrCM1JESLsG3rQBtPC+/K9e4ohs0xDKt5E6p4l7dc0Ib4oo0oCCT/hGzZUlNwHxrc2q9JMRzSAn6P/Q=="; - }; - }; - "@lerna/info-6.4.1" = { - name = "_at_lerna_slash_info"; - packageName = "@lerna/info"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/info/-/info-6.4.1.tgz"; - sha512 = "Ks4R7IndIr4vQXz+702gumPVhH6JVkshje0WKA3+ew2qzYZf68lU1sBe1OZsQJU3eeY2c60ax+bItSa7aaIHGw=="; - }; - }; - "@lerna/init-6.4.1" = { - name = "_at_lerna_slash_init"; - packageName = "@lerna/init"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-6.4.1.tgz"; - sha512 = "CXd/s/xgj0ZTAoOVyolOTLW2BG7uQOhWW4P/ktlwwJr9s3c4H/z+Gj36UXw3q5X1xdR29NZt7Vc6fvROBZMjUQ=="; - }; - }; - "@lerna/link-6.4.1" = { - name = "_at_lerna_slash_link"; - packageName = "@lerna/link"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-6.4.1.tgz"; - sha512 = "O8Rt7MAZT/WT2AwrB/+HY76ktnXA9cDFO9rhyKWZGTHdplbzuJgfsGzu8Xv0Ind+w+a8xLfqtWGPlwiETnDyrw=="; - }; - }; - "@lerna/list-6.4.1" = { - name = "_at_lerna_slash_list"; - packageName = "@lerna/list"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-6.4.1.tgz"; - sha512 = "7a6AKgXgC4X7nK6twVPNrKCiDhrCiAhL/FE4u9HYhHqw9yFwyq8Qe/r1RVOkAOASNZzZ8GuBvob042bpunupCw=="; - }; - }; - "@lerna/listable-6.4.1" = { - name = "_at_lerna_slash_listable"; - packageName = "@lerna/listable"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-6.4.1.tgz"; - sha512 = "L8ANeidM10aoF8aL3L/771Bb9r/TRkbEPzAiC8Iy2IBTYftS87E3rT/4k5KBEGYzMieSKJaskSFBV0OQGYV1Cw=="; - }; - }; - "@lerna/log-packed-6.4.1" = { - name = "_at_lerna_slash_log-packed"; - packageName = "@lerna/log-packed"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_npm-conf"; - packageName = "@lerna/npm-conf"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_npm-dist-tag"; - packageName = "@lerna/npm-dist-tag"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-6.4.1.tgz"; - sha512 = "If1Hn4q9fn0JWuBm455iIZDWE6Fsn4Nv8Tpqb+dYf0CtoT5Hn+iT64xSiU5XJw9Vc23IR7dIujkEXm2MVbnvZw=="; - }; - }; - "@lerna/npm-install-6.4.1" = { - name = "_at_lerna_slash_npm-install"; - packageName = "@lerna/npm-install"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-6.4.1.tgz"; - sha512 = "7gI1txMA9qTaT3iiuk/8/vL78wIhtbbOLhMf8m5yQ2G+3t47RUA8MNgUMsq4Zszw9C83drayqesyTf0u8BzVRg=="; - }; - }; - "@lerna/npm-publish-6.4.1" = { - name = "_at_lerna_slash_npm-publish"; - packageName = "@lerna/npm-publish"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-6.4.1.tgz"; - sha512 = "lbNEg+pThPAD8lIgNArm63agtIuCBCF3umxvgTQeLzyqUX6EtGaKJFyz/6c2ANcAuf8UfU7WQxFFbOiolibXTQ=="; - }; - }; - "@lerna/npm-run-script-6.4.1" = { - name = "_at_lerna_slash_npm-run-script"; - packageName = "@lerna/npm-run-script"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_otplease"; - packageName = "@lerna/otplease"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-6.4.1.tgz"; - sha512 = "ePUciFfFdythHNMp8FP5K15R/CoGzSLVniJdD50qm76c4ATXZHnGCW2PGwoeAZCy4QTzhlhdBq78uN0wAs75GA=="; - }; - }; - "@lerna/output-6.4.1" = { - name = "_at_lerna_slash_output"; - packageName = "@lerna/output"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-6.4.1.tgz"; - sha512 = "A1yRLF0bO+lhbIkrryRd6hGSD0wnyS1rTPOWJhScO/Zyv8vIPWhd2fZCLR1gI2d/Kt05qmK3T/zETTwloK7Fww=="; - }; - }; - "@lerna/pack-directory-6.4.1" = { - name = "_at_lerna_slash_pack-directory"; - packageName = "@lerna/pack-directory"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-6.4.1.tgz"; - sha512 = "kBtDL9bPP72/Nl7Gqa2CA3Odb8CYY1EF2jt801f+B37TqRLf57UXQom7yF3PbWPCPmhoU+8Fc4RMpUwSbFC46Q=="; - }; - }; - "@lerna/package-6.4.1" = { - name = "_at_lerna_slash_package"; - packageName = "@lerna/package"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-6.4.1.tgz"; - sha512 = "TrOah58RnwS9R8d3+WgFFTu5lqgZs7M+e1dvcRga7oSJeKscqpEK57G0xspvF3ycjfXQwRMmEtwPmpkeEVLMzA=="; - }; - }; - "@lerna/package-graph-6.4.1" = { - name = "_at_lerna_slash_package-graph"; - packageName = "@lerna/package-graph"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-6.4.1.tgz"; - sha512 = "fQvc59stRYOqxT3Mn7g/yI9/Kw5XetJoKcW5l8XeqKqcTNDURqKnN0qaNBY6lTTLOe4cR7gfXF2l1u3HOz0qEg=="; - }; - }; - "@lerna/prerelease-id-from-version-6.4.1" = { - name = "_at_lerna_slash_prerelease-id-from-version"; - packageName = "@lerna/prerelease-id-from-version"; - version = "6.4.1"; - src = fetchurl { - 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.4.1" = { - name = "_at_lerna_slash_profiler"; - packageName = "@lerna/profiler"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-6.4.1.tgz"; - sha512 = "dq2uQxcu0aq6eSoN+JwnvHoAnjtZAVngMvywz5bTAfzz/sSvIad1v8RCpJUMBQHxaPtbfiNvOIQgDZOmCBIM4g=="; - }; - }; - "@lerna/project-6.4.1" = { - name = "_at_lerna_slash_project"; - packageName = "@lerna/project"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-6.4.1.tgz"; - sha512 = "BPFYr4A0mNZ2jZymlcwwh7PfIC+I6r52xgGtJ4KIrIOB6mVKo9u30dgYJbUQxmSuMRTOnX7PJZttQQzSda4gEg=="; - }; - }; - "@lerna/prompt-6.4.1" = { - name = "_at_lerna_slash_prompt"; - packageName = "@lerna/prompt"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-6.4.1.tgz"; - sha512 = "vMxCIgF9Vpe80PnargBGAdS/Ib58iYEcfkcXwo7mYBCxEVcaUJFKZ72FEW8rw+H5LkxBlzrBJyfKRoOe0ks9gQ=="; - }; - }; - "@lerna/publish-6.4.1" = { - name = "_at_lerna_slash_publish"; - packageName = "@lerna/publish"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-6.4.1.tgz"; - sha512 = "/D/AECpw2VNMa1Nh4g29ddYKRIqygEV1ftV8PYXVlHpqWN7VaKrcbRU6pn0ldgpFlMyPtESfv1zS32F5CQ944w=="; - }; - }; - "@lerna/pulse-till-done-6.4.1" = { - name = "_at_lerna_slash_pulse-till-done"; - packageName = "@lerna/pulse-till-done"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-6.4.1.tgz"; - sha512 = "efAkOC1UuiyqYBfrmhDBL6ufYtnpSqAG+lT4d/yk3CzJEJKkoCwh2Hb692kqHHQ5F74Uusc8tcRB7GBcfNZRWA=="; - }; - }; - "@lerna/query-graph-6.4.1" = { - name = "_at_lerna_slash_query-graph"; - packageName = "@lerna/query-graph"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-6.4.1.tgz"; - sha512 = "gBGZLgu2x6L4d4ZYDn4+d5rxT9RNBC+biOxi0QrbaIq83I+JpHVmFSmExXK3rcTritrQ3JT9NCqb+Yu9tL9adQ=="; - }; - }; - "@lerna/resolve-symlink-6.4.1" = { - name = "_at_lerna_slash_resolve-symlink"; - packageName = "@lerna/resolve-symlink"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-6.4.1.tgz"; - sha512 = "gnqltcwhWVLUxCuwXWe/ch9WWTxXRI7F0ZvCtIgdfOpbosm3f1g27VO1LjXeJN2i6ks03qqMowqy4xB4uMR9IA=="; - }; - }; - "@lerna/rimraf-dir-6.4.1" = { - name = "_at_lerna_slash_rimraf-dir"; - packageName = "@lerna/rimraf-dir"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-6.4.1.tgz"; - sha512 = "5sDOmZmVj0iXIiEgdhCm0Prjg5q2SQQKtMd7ImimPtWKkV0IyJWxrepJFbeQoFj5xBQF7QB5jlVNEfQfKhD6pQ=="; - }; - }; - "@lerna/run-6.4.1" = { - name = "_at_lerna_slash_run"; - packageName = "@lerna/run"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-6.4.1.tgz"; - sha512 = "HRw7kS6KNqTxqntFiFXPEeBEct08NjnL6xKbbOV6pXXf+lXUQbJlF8S7t6UYqeWgTZ4iU9caIxtZIY+EpW93mQ=="; - }; - }; - "@lerna/run-lifecycle-6.4.1" = { - name = "_at_lerna_slash_run-lifecycle"; - packageName = "@lerna/run-lifecycle"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-6.4.1.tgz"; - sha512 = "42VopI8NC8uVCZ3YPwbTycGVBSgukJltW5Saein0m7TIqFjwSfrcP0n7QJOr+WAu9uQkk+2kBstF5WmvKiqgEA=="; - }; - }; - "@lerna/run-topologically-6.4.1" = { - name = "_at_lerna_slash_run-topologically"; - packageName = "@lerna/run-topologically"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-6.4.1.tgz"; - sha512 = "gXlnAsYrjs6KIUGDnHM8M8nt30Amxq3r0lSCNAt+vEu2sMMEOh9lffGGaJobJZ4bdwoXnKay3uER/TU8E9owMw=="; - }; - }; - "@lerna/symlink-binary-6.4.1" = { - name = "_at_lerna_slash_symlink-binary"; - packageName = "@lerna/symlink-binary"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-6.4.1.tgz"; - sha512 = "poZX90VmXRjL/JTvxaUQPeMDxFUIQvhBkHnH+dwW0RjsHB/2Tu4QUAsE0OlFnlWQGsAtXF4FTtW8Xs57E/19Kw=="; - }; - }; - "@lerna/symlink-dependencies-6.4.1" = { - name = "_at_lerna_slash_symlink-dependencies"; - packageName = "@lerna/symlink-dependencies"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-6.4.1.tgz"; - sha512 = "43W2uLlpn3TTYuHVeO/2A6uiTZg6TOk/OSKi21ujD7IfVIYcRYCwCV+8LPP12R3rzyab0JWkWnhp80Z8A2Uykw=="; - }; - }; - "@lerna/temp-write-6.4.1" = { - name = "_at_lerna_slash_temp-write"; - packageName = "@lerna/temp-write"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-6.4.1.tgz"; - sha512 = "7uiGFVoTyos5xXbVQg4bG18qVEn9dFmboXCcHbMj5mc/+/QmU9QeNz/Cq36O5TY6gBbLnyj3lfL5PhzERWKMFg=="; - }; - }; - "@lerna/timer-6.4.1" = { - name = "_at_lerna_slash_timer"; - packageName = "@lerna/timer"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/timer/-/timer-6.4.1.tgz"; - sha512 = "ogmjFTWwRvevZr76a2sAbhmu3Ut2x73nDIn0bcwZwZ3Qc3pHD8eITdjs/wIKkHse3J7l3TO5BFJPnrvDS7HLnw=="; - }; - }; - "@lerna/validation-error-6.4.1" = { - name = "_at_lerna_slash_validation-error"; - packageName = "@lerna/validation-error"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-6.4.1.tgz"; - sha512 = "fxfJvl3VgFd7eBfVMRX6Yal9omDLs2mcGKkNYeCEyt4Uwlz1B5tPAXyk/sNMfkKV2Aat/mlK5tnY13vUrMKkyA=="; - }; - }; - "@lerna/version-6.4.1" = { - name = "_at_lerna_slash_version"; - packageName = "@lerna/version"; - version = "6.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-6.4.1.tgz"; - sha512 = "1/krPq0PtEqDXtaaZsVuKev9pXJCkNC1vOo2qCcn6PBkODw/QTAvGcUi0I+BM2c//pdxge9/gfmbDo1lC8RtAQ=="; - }; - }; - "@lerna/write-log-file-6.4.1" = { - name = "_at_lerna_slash_write-log-file"; - packageName = "@lerna/write-log-file"; - version = "6.4.1"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-6.4.1.tgz"; - sha512 = "LE4fueQSDrQo76F4/gFXL0wnGhqdG7WHVH8D8TrKouF2Afl4NHltObCm4WsSMPjcfciVnZQFfx1ruxU4r/enHQ=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-6.5.1.tgz"; + sha512 = "ejERJnfA36jEuKrfM+94feLiyf2/hF2NoG923N0rE4rsmvRFPr1XLVPvAKleXW+Gdi/t1p410lJ7NKaLRMYCYw=="; }; }; "@lezer/common-0.15.12" = { @@ -7204,157 +7636,157 @@ let sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; }; }; - "@mdn/browser-compat-data-5.2.17" = { + "@mdn/browser-compat-data-5.2.29" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "5.2.17"; + version = "5.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.17.tgz"; - sha512 = "aA+rFHhXmq14GVIcEWNk8OntLEOQFwEZk9ZgG5VcDquz+pQhIjJPXacR+rwL9Z0Elfg909EcRRHC96p06/CNUg=="; + 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.68" = { + "@medable/mdctl-api-1.0.69" = { name = "_at_medable_slash_mdctl-api"; packageName = "@medable/mdctl-api"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.68.tgz"; - sha512 = "XQ0NM1IpYKYStn2I3o1KIiIoBU0iYr/DAV1XTLNmhYkMbXATlPCq7Bnw857xKnr5iaKQ5Wtx8xwI/W+1MH7ong=="; + url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.69.tgz"; + sha512 = "gOzJk6BGKV/saW63860NSP1UTHBWw7g8snTGK4H3ViKJpqnutJf+n9VFui9jDvPZKm6Ms/fd/Psz7ZTukjs+5g=="; }; }; - "@medable/mdctl-api-driver-1.0.68" = { + "@medable/mdctl-api-driver-1.0.69" = { name = "_at_medable_slash_mdctl-api-driver"; packageName = "@medable/mdctl-api-driver"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-api-driver/-/mdctl-api-driver-1.0.68.tgz"; - sha512 = "qNhBzKujy7FR3CAzko2qJXk5DVrjZzyvHabaHaDZDK7qSoxXbzacTwDJg/pnC2hUTXS22TpJIDkzPHuufK5SIA=="; + url = "https://registry.npmjs.org/@medable/mdctl-api-driver/-/mdctl-api-driver-1.0.69.tgz"; + sha512 = "44kkYFGZcvNDNdFX6AdZkCF1q83i4GbGY8tNg98jV30kNyKbosaz9j76XZcJiSY7haIcyArDWd0YTdg1Xlzy3Q=="; }; }; - "@medable/mdctl-axon-tools-1.0.68" = { + "@medable/mdctl-axon-tools-1.0.69" = { name = "_at_medable_slash_mdctl-axon-tools"; packageName = "@medable/mdctl-axon-tools"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-axon-tools/-/mdctl-axon-tools-1.0.68.tgz"; - sha512 = "2C6sn7kXck8A5GooUadNtcViA5C194rKXHh/odmRcw8MrCY+B6ei9QD+EnI/6BgIWcj4MZmHrvOfmmVqzzRc/Q=="; + url = "https://registry.npmjs.org/@medable/mdctl-axon-tools/-/mdctl-axon-tools-1.0.69.tgz"; + sha512 = "0RLCaFP1G7UOK+EisrjGDzmb2b+rMP4cGs+CDcVQamyEQ5NEeqE2KH0M+pIxEFmYwebCQbIJOBAd2BteN6PNGA=="; }; }; - "@medable/mdctl-core-1.0.68" = { + "@medable/mdctl-core-1.0.69" = { name = "_at_medable_slash_mdctl-core"; packageName = "@medable/mdctl-core"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.68.tgz"; - sha512 = "Zqu1aeGIkp8bzq/pBlANYEJTMkRE6RVkchvxGAI4P+pKtEDwFlud76ezzlwda6dkN9AvrVb0HWYqgIizTmztAw=="; + url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.69.tgz"; + sha512 = "eNTbsLnbBLJee72eZlt+OaJgf9fm0jxmLBpi2S/PHfsgl79vkZgGz5gxPXUhKrGxh1DioGW/PXRBaJhPaZMARQ=="; }; }; - "@medable/mdctl-core-schemas-1.0.68" = { + "@medable/mdctl-core-schemas-1.0.69" = { name = "_at_medable_slash_mdctl-core-schemas"; packageName = "@medable/mdctl-core-schemas"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.68.tgz"; - sha512 = "9vnNutnIWhSO4iInYsyfmcUDde+TkPYrFCvDarN25Mj7Xv+SQiOAwSDTB+KYSJD2Nz/SHL8WJeT5YAh1L66KHA=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.69.tgz"; + sha512 = "KAo6o4OFPxAZMq+S8YrQnBX762WTp06LJmj814gEpFatQhp/3p69mNoYnWJ0H8M1mBk519ROEx6WuEP0WPDLOw=="; }; }; - "@medable/mdctl-core-utils-1.0.68" = { + "@medable/mdctl-core-utils-1.0.69" = { name = "_at_medable_slash_mdctl-core-utils"; packageName = "@medable/mdctl-core-utils"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.68.tgz"; - sha512 = "6Sy5H9mIwmfTKkfv6EH0O4lnsobRAMz/y8kWaRKwjMwQcARm8TTZKO4UCsZgK3Oph5/VqPYP1mP1YqUmKyoAqg=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.69.tgz"; + sha512 = "PUKxOfWrO0Vm+GZFMgNqUK2rTcvdjzi5kYOZZboyZei6YV1ZcgPmx/BXb/eWFqms4DxTHs2tO39vn4mJQHMUHA=="; }; }; - "@medable/mdctl-credentials-provider-keychain-1.0.68" = { + "@medable/mdctl-credentials-provider-keychain-1.0.69" = { name = "_at_medable_slash_mdctl-credentials-provider-keychain"; packageName = "@medable/mdctl-credentials-provider-keychain"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.68.tgz"; - sha512 = "B+QCznxeZrZSZbAulbRLZIWVsLd1sFVMgNISW3b4l417ZAPYRzYOra36AMIJhbwE/jOE0fDSd00j7ymGJzrx+Q=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.69.tgz"; + sha512 = "72j0ya1iEyITUGOxKhSCmG0rH31NXzP+h5SboSv/7WkACWBNlk28kC2cdXOukGBo8Wuhj1w6ajG430wzXpcQnQ=="; }; }; - "@medable/mdctl-credentials-provider-pouchdb-1.0.68" = { + "@medable/mdctl-credentials-provider-pouchdb-1.0.69" = { name = "_at_medable_slash_mdctl-credentials-provider-pouchdb"; packageName = "@medable/mdctl-credentials-provider-pouchdb"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.68.tgz"; - sha512 = "ohvFzZ6KiH/xlQ8Rc62DxTW62rhYEki4fqLAF668hQvz951YS9diB44TCGyuqcdojwJ2CH+RrbAwT52DEKJBIg=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.69.tgz"; + sha512 = "IlAbJCIdsYLCzyoKKNkwefdjqjgpyIHlEDBraP30FSl/O4RgzJyexdwCoO55Hx8a33uoCpjZuCGUFLW4ewDG0g=="; }; }; - "@medable/mdctl-docs-1.0.68" = { + "@medable/mdctl-docs-1.0.69" = { name = "_at_medable_slash_mdctl-docs"; packageName = "@medable/mdctl-docs"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.68.tgz"; - sha512 = "jIYBRpXnGNz/k93L4U1+fz3aov+lf/eszJt1TTsnarg2yWb5BUWbsILbP48StX/ZN2RybSEiCseUePWnlhHDLg=="; + url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.69.tgz"; + sha512 = "gTs8xLo3f+grM8Zsii0hPToJ9X1CweQg0rxefJc0OKyP8DTN9e27dAFmK0rj6YPxDTUbcSPDu8Ky55dAQ+y0cg=="; }; }; - "@medable/mdctl-export-adapter-console-1.0.68" = { + "@medable/mdctl-export-adapter-console-1.0.69" = { name = "_at_medable_slash_mdctl-export-adapter-console"; packageName = "@medable/mdctl-export-adapter-console"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.68.tgz"; - sha512 = "K1LIGRL7OLbY9+cqlUbK4w63TSwEaXMd4VrYo8H7mh8PytpTOoGHyessWCfGizDzpfBeI/c8zzN8ZDvO+u3cKA=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.69.tgz"; + sha512 = "2cgeFTItrgna2uXbhbd9fbWfYXCwmeXRQ9hqX2ZV+Ofw5QxpMYMlnp6PjgLUAQTSjWyD6+H/BGkxAdcVB0pubQ=="; }; }; - "@medable/mdctl-export-adapter-tree-1.0.68" = { + "@medable/mdctl-export-adapter-tree-1.0.69" = { name = "_at_medable_slash_mdctl-export-adapter-tree"; packageName = "@medable/mdctl-export-adapter-tree"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.69.tgz"; + sha512 = "Z1ydLJhWITjcBE2b0y1lSxBgcsP6gg94Zr9WH+idVEeI7T0nWxMkqcfM/ZS6ZL5d8Q4esv2L6B0QYKWzy0ESDA=="; }; }; - "@medable/mdctl-import-adapter-1.0.68" = { + "@medable/mdctl-import-adapter-1.0.69" = { name = "_at_medable_slash_mdctl-import-adapter"; packageName = "@medable/mdctl-import-adapter"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.68.tgz"; - sha512 = "vQ+6dW8o9pykza+ExJodwaMigUudcj2eCS3rF4Fx4m0k18dazuaBqg46WVtjY4M/9IEktR3A9GM8vUlbCjsqLw=="; + url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.69.tgz"; + sha512 = "Bak0DysIx5qgNN91KeTt1I3xeYm9lC5tMssMwMQsM72xVnhPIOAsAq8/16eHFUKbZB4hREd+0xvNJ6PXvEEzsA=="; }; }; - "@medable/mdctl-manifest-1.0.68" = { + "@medable/mdctl-manifest-1.0.69" = { name = "_at_medable_slash_mdctl-manifest"; packageName = "@medable/mdctl-manifest"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.68.tgz"; - sha512 = "dRmQurCFESPHt5jJvrVLl0lYskKRktCcwaMt8LW7MOfvbOLH00HScpcZGodX48ys4iJlteMkaheu/c8cD7bIZA=="; + url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.69.tgz"; + sha512 = "iJ2h8QPhL+SACsFbU+AwfjQAD/Y7k46qx8tamZeNqsaGuDApGjvewAkqrg3hqJt9oTDXpcO0bcYbM3ydGN3v2g=="; }; }; - "@medable/mdctl-node-utils-1.0.68" = { + "@medable/mdctl-node-utils-1.0.69" = { name = "_at_medable_slash_mdctl-node-utils"; packageName = "@medable/mdctl-node-utils"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.68.tgz"; - sha512 = "yYzGJFgd4mahGZ5cwFOkYEwUdAzyB7CMj3mYzS4dXWAlYORQHIcD7kIHGh+RC0QzPoSQAT5TMmTiicFeMwvSrQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.69.tgz"; + sha512 = "dB9ZX9QCdstWGkTTKFCEVvPPajQs7UwMcjGK5zgpJjbJQ6J9uz35TErGjdw5ZD7mHTuSRs0dFp2s/tV2J38rwA=="; }; }; - "@medable/mdctl-sandbox-1.0.68" = { + "@medable/mdctl-sandbox-1.0.69" = { name = "_at_medable_slash_mdctl-sandbox"; packageName = "@medable/mdctl-sandbox"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.68.tgz"; - sha512 = "2Jwk4v9CFGC9iXzOrP1BDHL1yAySjpgtIPjnTg1TlhUMEpJIEFA0ezFRIJTYGFbRx1wvF1FAH8GE+0G/gEgVeA=="; + url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.69.tgz"; + sha512 = "XMnKw1LlhFnPLhLuB+bGiPEpfEXowV1IGjXFfoBNcalDpe6Qjr7UgMfLfxYiK5THBc2V5imoVkp43Mf/T/bnZA=="; }; }; - "@medable/mdctl-secrets-1.0.68" = { + "@medable/mdctl-secrets-1.0.69" = { name = "_at_medable_slash_mdctl-secrets"; packageName = "@medable/mdctl-secrets"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.68.tgz"; - sha512 = "2uD8pHWjV1tWeFpwkzHb970Xf2yhO4e217umCd+KO4klzEgqk7/7YteGOOewDwHo6ICyySek3+bdwtGC6H4Isg=="; + url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.69.tgz"; + sha512 = "9avo4cGSedwOwLWp+GC4RBQ26APZ0IClV3j1gUxN/B11GsgXRl0zNOVtprSN7srmxYMdep5DfKhgMGGM2bTBYA=="; }; }; "@medv/blessed-2.0.1" = { @@ -7393,184 +7825,184 @@ let sha512 = "W+IzEBw8a6LOOfRJM02dTT7BDZijxm+Z7lhtOAz1+y9vQm1Kdz9jlAO+qCEKsfxtUOmKilW8DIRqFw2aUgKeGg=="; }; }; - "@microsoft/rush-lib-5.88.0" = { + "@microsoft/rush-lib-5.93.1" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.88.0"; + version = "5.93.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.88.0.tgz"; - sha512 = "YgZPnp/hAD43jclvGMMy6B84JR0pB1odK+Cfe2Ag7s4omwe/+u6gJjGfHme6vzB4Hs7jpEkmRe76R3nyVKcFoA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.93.1.tgz"; + sha512 = "8ZCSW4He9VPAAsF2T/OxVaTN06wLbzeEveOvEuwNJ5h6AQYPTtlH0yv8cDDuZqSEVgOv/gK4D+kAExOszYm06A=="; }; }; - "@miniflare/cache-2.11.0" = { + "@miniflare/cache-2.12.1" = { name = "_at_miniflare_slash_cache"; packageName = "@miniflare/cache"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/cache/-/cache-2.11.0.tgz"; - sha512 = "L/kc9AzidPwFuk2fwHpAEePi0kNBk6FWUq3ln+9beRCDrPEpfVrDRFpNleF1NFZz5//oeVMuo8F0IVUQGzR7+Q=="; + url = "https://registry.npmjs.org/@miniflare/cache/-/cache-2.12.1.tgz"; + sha512 = "6Pj5avy53qULTa13gWxGTDBuwX0yAzr4Zkzb0ZBh40bcbHp4vRkOk7PvHBoxV0M76JxQDHotGaW+ik510z5Xrg=="; }; }; - "@miniflare/cli-parser-2.11.0" = { + "@miniflare/cli-parser-2.12.1" = { name = "_at_miniflare_slash_cli-parser"; packageName = "@miniflare/cli-parser"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/cli-parser/-/cli-parser-2.11.0.tgz"; - sha512 = "JUmyRzEGAS6CouvXJwBh8p44onfw3KRpfq5JGXEuHModOGjTp6li7PQyCTNPV2Hv/7StAXWnTFGXeAqyDHuTig=="; + url = "https://registry.npmjs.org/@miniflare/cli-parser/-/cli-parser-2.12.1.tgz"; + sha512 = "iCh4wEyQow8Dha+zpKhjCCXEp6QWbsvE18H5CgeUFT1pX4B+akYIHzdn47Cr5zpuYyjenoL78bAz0IIHIeyeWw=="; }; }; - "@miniflare/core-2.11.0" = { + "@miniflare/core-2.12.1" = { name = "_at_miniflare_slash_core"; packageName = "@miniflare/core"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/core/-/core-2.11.0.tgz"; - sha512 = "UFMFiCG0co36VpZkgFrSBnrxo71uf1x+cjlzzJi3khmMyDlnLu4RuIQsAqvKbYom6fi3G9Q8lTgM7JuOXFyjhw=="; + url = "https://registry.npmjs.org/@miniflare/core/-/core-2.12.1.tgz"; + sha512 = "729xXL6uoMgtja5J7B2WdWAjFfxb74Pk2QqM3VqkWqY3XNlKWI7+ofvb8S6kI6uFEPGj4ma263uYkEAgsvzBWg=="; }; }; - "@miniflare/d1-2.11.0" = { + "@miniflare/d1-2.12.1" = { name = "_at_miniflare_slash_d1"; packageName = "@miniflare/d1"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/d1/-/d1-2.11.0.tgz"; - sha512 = "aDdBVQZ2C0Zs3+Y9ZbRctmuQxozPfpumwJ/6NG6fBadANvune/hW7ddEoxyteIEU9W3IgzVj8s4by4VvasX90A=="; + url = "https://registry.npmjs.org/@miniflare/d1/-/d1-2.12.1.tgz"; + sha512 = "2ldT7xEC7KxoaEJ7nCY9/AB/xwPjbm3mrmpiIspT0b5OgS640Pe9EU4c5bSmzGoUbLvwF+jb+LhLE1QaEbWkBw=="; }; }; - "@miniflare/durable-objects-2.11.0" = { + "@miniflare/durable-objects-2.12.1" = { name = "_at_miniflare_slash_durable-objects"; packageName = "@miniflare/durable-objects"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/durable-objects/-/durable-objects-2.11.0.tgz"; - sha512 = "0cKJaMgraTEU1b4kqK8cjD2oTeOjA6QU3Y+lWiZT/k1PMHZULovrSFnjii7qZ8npf4VHSIN6XYPxhyxRyEM65Q=="; + url = "https://registry.npmjs.org/@miniflare/durable-objects/-/durable-objects-2.12.1.tgz"; + sha512 = "/n9WIxvHavVUgT+Nf280wNOcmJQBG+eZuqOlORWW9RmXXbAzqzS2Mk2lmRDCzbq3xTXAcsndx6cdarQLNRUzBg=="; }; }; - "@miniflare/html-rewriter-2.11.0" = { + "@miniflare/html-rewriter-2.12.1" = { name = "_at_miniflare_slash_html-rewriter"; packageName = "@miniflare/html-rewriter"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/html-rewriter/-/html-rewriter-2.11.0.tgz"; - sha512 = "olTqmuYTHnoTNtiA0vjQ/ixRfbwgPzDrAUbtXDCYW45VFbHfDVJrJGZX3Jg0HpSlxy86Zclle1SUxGbVDzxsBg=="; + url = "https://registry.npmjs.org/@miniflare/html-rewriter/-/html-rewriter-2.12.1.tgz"; + sha512 = "yezYzGRBxy7d/oomAUEftdnL4fq6YIek82LtQlXgzcdcbBDnkYADj8WqGV41tAI+V2+rjrFEc1RuCXx/I1yISw=="; }; }; - "@miniflare/http-server-2.11.0" = { + "@miniflare/http-server-2.12.1" = { name = "_at_miniflare_slash_http-server"; packageName = "@miniflare/http-server"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/http-server/-/http-server-2.11.0.tgz"; - sha512 = "sMLcrDFzqqAvnQmAUH0hRTo8sBjW79VZYfnIH5FAGSGcKX6kdAGs9RStdYZ4CftQCBAEQScX0KBsMx5FwJRe9Q=="; + url = "https://registry.npmjs.org/@miniflare/http-server/-/http-server-2.12.1.tgz"; + sha512 = "nC6POgDKFHxnyXbKCdR9FGZSsu5frXQUETvSVcoETd5RP+Iws0xZ+XkzVMqiiIZk3ifUC9LzdGUOD0J2PlhHJw=="; }; }; - "@miniflare/kv-2.11.0" = { + "@miniflare/kv-2.12.1" = { name = "_at_miniflare_slash_kv"; packageName = "@miniflare/kv"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/kv/-/kv-2.11.0.tgz"; - sha512 = "3m9dL2HBBN170V1JvwjjucR5zl4G3mlcsV6C1E7A2wLl2Z2TWvIx/tSY9hrhkD96dFnejwJ9qmPMbXMMuynhjg=="; + url = "https://registry.npmjs.org/@miniflare/kv/-/kv-2.12.1.tgz"; + sha512 = "8h8wLDMEaWaKAqYTwrckOcNjAz52bzDyLmU4t/lh1/AQOE9eSg/T+H6xQCv0fPGrWPeHmG8iXaFI1JQ+CtkcHw=="; }; }; - "@miniflare/queues-2.11.0" = { + "@miniflare/queues-2.12.1" = { name = "_at_miniflare_slash_queues"; packageName = "@miniflare/queues"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/queues/-/queues-2.11.0.tgz"; - sha512 = "fLHjdrNLKhn0LZM/aii/9GsAttFd+lWlGzK8HOg1R0vhfKBwEub4zntjMmOfFbDm1ntc21tdMK7n3ldUphwh5w=="; + url = "https://registry.npmjs.org/@miniflare/queues/-/queues-2.12.1.tgz"; + sha512 = "L/YJkWWvg1RS3sCB5DLZOsf/kAmkwhvshpl+LmGQT7z/PYXlplbBmuhPwVBXaHqZdYE7063XfTzgAIhVPoo72Q=="; }; }; - "@miniflare/r2-2.11.0" = { + "@miniflare/r2-2.12.1" = { name = "_at_miniflare_slash_r2"; packageName = "@miniflare/r2"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/r2/-/r2-2.11.0.tgz"; - sha512 = "MKuyJ/gGNsK3eWbGdygvozqcyaZhM3C6NGHvoaZwH503dwN569j5DpatTWiHGFeDeSu64VqcIsGehz05GDUaag=="; + url = "https://registry.npmjs.org/@miniflare/r2/-/r2-2.12.1.tgz"; + sha512 = "xp8fSSap6o5xSAWp9BtOGgZ4tuf5iHTqrfbAH66LF151j8y69eQtQJ5pxpSvrDJok/F1VOLGc4ihSLmUqxyXhw=="; }; }; - "@miniflare/runner-vm-2.11.0" = { + "@miniflare/runner-vm-2.12.1" = { name = "_at_miniflare_slash_runner-vm"; packageName = "@miniflare/runner-vm"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/runner-vm/-/runner-vm-2.11.0.tgz"; - sha512 = "bkVSuvCf5+VylqN8lTiLxIYqYcKFbl+BywZGwGQndPC/3wh42J00mM0jw4hRbvXgwuBhlUyCVpEXtYlftFFT/g=="; + url = "https://registry.npmjs.org/@miniflare/runner-vm/-/runner-vm-2.12.1.tgz"; + sha512 = "pGY/aoQzbvyXOGR6/d3hv5/QsyUXGGbOxAyXdvjlz8h7ZiKOX4dBRS5TUAPS0kb/ofUWCyoYJi8dCVwRGdTYRw=="; }; }; - "@miniflare/scheduler-2.11.0" = { + "@miniflare/scheduler-2.12.1" = { name = "_at_miniflare_slash_scheduler"; packageName = "@miniflare/scheduler"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/scheduler/-/scheduler-2.11.0.tgz"; - sha512 = "DPdzINhdWeS99eIicGoluMsD4pLTTAWNQbgCv3CTwgdKA3dxdvMSCkNqZzQLiALzvk9+rSfj46FlH++HE7o7/w=="; + url = "https://registry.npmjs.org/@miniflare/scheduler/-/scheduler-2.12.1.tgz"; + sha512 = "AbOP8YpWNqR/t7zMuTmn6q27USCDBQaYaULRVaNNfCsxMTXAUjYfM85iFvnV9mshw+K0HIEU4zR4Xjd2FeJubg=="; }; }; - "@miniflare/shared-2.11.0" = { + "@miniflare/shared-2.12.1" = { name = "_at_miniflare_slash_shared"; packageName = "@miniflare/shared"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/shared/-/shared-2.11.0.tgz"; - sha512 = "fWMqq3ZkWAg+k7CnyzMV/rZHugwn+/JxvVzCxrtvxzwotTN547THlOxgZe8JAP23U9BiTxOfpTfnLvFEjAmegw=="; + url = "https://registry.npmjs.org/@miniflare/shared/-/shared-2.12.1.tgz"; + sha512 = "N8sHNM5vcvjvO+znQ7Mbqf0FChRlWxy/svUpQf1GGpii9aTXzOTWB+WkFvJrJNx44SUReEGxUAzxpdeWnHahmA=="; }; }; - "@miniflare/sites-2.11.0" = { + "@miniflare/sites-2.12.1" = { name = "_at_miniflare_slash_sites"; packageName = "@miniflare/sites"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/sites/-/sites-2.11.0.tgz"; - sha512 = "qbefKdWZUJgsdLf+kCw03sn3h/92LZgJAbkOpP6bCrfWkXlJ37EQXO4KWdhn4Ghc7A6GwU1s1I/mdB64B3AewQ=="; + url = "https://registry.npmjs.org/@miniflare/sites/-/sites-2.12.1.tgz"; + sha512 = "LW4r82cfGJvmJFwoBdXfsRcdDggVf8ppjMZGU3zk7xo+u5yD1uHzO2Arf3XbKNiOp7f9WyC/mXxs4zxF605iLA=="; }; }; - "@miniflare/storage-file-2.11.0" = { + "@miniflare/storage-file-2.12.1" = { name = "_at_miniflare_slash_storage-file"; packageName = "@miniflare/storage-file"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/storage-file/-/storage-file-2.11.0.tgz"; - sha512 = "beWF/lTX74x7AiaSB+xQxywPSNdhtEKvqDkRui8eOJ5kqN2o4UaleLKQGgqmCw3WyHRIsckV7If1qpbNiLtWMw=="; + url = "https://registry.npmjs.org/@miniflare/storage-file/-/storage-file-2.12.1.tgz"; + sha512 = "eq5wzBwxQC5GVxBfji9svb9FRdSOlA8D8DTgzL29DDjuOYtG9j8ydOlo0J7/2MB/Gq0HYFUHYWHhrklzzwdKQQ=="; }; }; - "@miniflare/storage-memory-2.11.0" = { + "@miniflare/storage-memory-2.12.1" = { name = "_at_miniflare_slash_storage-memory"; packageName = "@miniflare/storage-memory"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/storage-memory/-/storage-memory-2.11.0.tgz"; - sha512 = "s0AhPww7fq/Jz80NbPb+ffhcVRKnfPi7H1dHTRTre2Ud23EVJjAWl2gat42x8NOT/Fu3/o/7A72DWQQJqfO98A=="; + url = "https://registry.npmjs.org/@miniflare/storage-memory/-/storage-memory-2.12.1.tgz"; + sha512 = "E9jbrX0L9N7YIHXj2G4td1EKboVLBdHkwh7RvKEZBwOhxDze5h+jMOou57NIbfC5kLOZPOC1fGXjzpp7xUUE6w=="; }; }; - "@miniflare/storage-redis-2.11.0" = { + "@miniflare/storage-redis-2.12.1" = { name = "_at_miniflare_slash_storage-redis"; packageName = "@miniflare/storage-redis"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/storage-redis/-/storage-redis-2.11.0.tgz"; - sha512 = "cY/ZehxwuhGON0jjlkyKzNcSxffSJ6fJw0EkXalmrwcL3PJCpTLuBogqeZkrSOu2xSr2wk4nC45bt2loka2HoA=="; + url = "https://registry.npmjs.org/@miniflare/storage-redis/-/storage-redis-2.12.1.tgz"; + sha512 = "y9E7fL3sg8paBVuefPFHV8CyaMlwaawuvsOMw1+weux7yABZAVnoNOyHPIxoJ1Sx58tFHdrsHViG+EJxZHxCPg=="; }; }; - "@miniflare/watcher-2.11.0" = { + "@miniflare/watcher-2.12.1" = { name = "_at_miniflare_slash_watcher"; packageName = "@miniflare/watcher"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/watcher/-/watcher-2.11.0.tgz"; - sha512 = "RUfjz2iYcsQXLcGySemJl98CJ2iierbWsPGWZhIVZI+NNhROkEy77g/Q+lvP2ATwexG3/dUSfdJ3P8aH+sI4Ig=="; + url = "https://registry.npmjs.org/@miniflare/watcher/-/watcher-2.12.1.tgz"; + sha512 = "3IG/6g38id5ppbZHB/gMfEvoIEFYdmTTLRsHaPNyWIk/r3LMhHLluVsMcs+Lr/fphkPk6Diou4cBLD2GeeoP7A=="; }; }; - "@miniflare/web-sockets-2.11.0" = { + "@miniflare/web-sockets-2.12.1" = { name = "_at_miniflare_slash_web-sockets"; packageName = "@miniflare/web-sockets"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@miniflare/web-sockets/-/web-sockets-2.11.0.tgz"; - sha512 = "NC8RKrmxrO0hZmwpzn5g4hPGA2VblnFTIBobmWoxuK95eW49zfs7dtE/PyFs+blsGv3CjTIjHVSQ782K+C6HFA=="; + url = "https://registry.npmjs.org/@miniflare/web-sockets/-/web-sockets-2.12.1.tgz"; + sha512 = "Z+zqZqhVdrbmTQf+ETP5H1TPdXC2tUiYPiHRLWTHUks6VVkuwnUtIKxNPBEBXjCjKYYEm8VLclUAt+0yTucLWA=="; }; }; "@mischnic/json-sourcemap-0.1.0" = { @@ -7627,58 +8059,58 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-arm64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.1" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-arm64"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz"; - sha512 = "Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.1.tgz"; + sha512 = "5o52DqsMswZhfFIsuqLYUXlSpYdwpTyPxGNdByvuWKp2ZMFkI2qne9FAbsYWkLYKTY0b5OnuFRasvGO4VwZhJw=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-x64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.1" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-x64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-x64"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz"; - sha512 = "vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.1.tgz"; + sha512 = "/UbtGNtEkfoqdLmNbHx2r+g5YPARwxmB4PoG47q3a/4qnAU/3cSJFo3oidDRZzB5KD3+lYvq29HRA4+nXJ0LNw=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-linux-arm-3.0.1" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz"; - sha512 = "SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.1.tgz"; + sha512 = "WCFK1OVoXXTHDGEkpVTKxWsKphfutyrrU2HtIDaecgKfTCI/kBoT6FVMQrm7mSdVcBuxpsBkL25L6k2fz2wFlQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.1" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm64"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz"; - sha512 = "hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.1.tgz"; + sha512 = "2aCdVMgx8BrNOP0E6Xf00z2C5+pGUgQpS7F5rTGhWWnyAsCNKOScBxj7waWKBOz6K5mPTFLQcV+yoAf3iGMBSA=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-linux-x64-3.0.1" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-x64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-x64"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.1.tgz"; + sha512 = "VQr5D19ssachwhvVWWiTLZlB8pD+rD/XLlcCU3iOlSsb6O2OIfmSrVCqPS59KtP61EW4hTOovnmtJv+9EqcMFA=="; }; }; - "@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" = { + "@msgpackr-extract/msgpackr-extract-win32-x64-3.0.1" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-win32-x64"; packageName = "@msgpackr-extract/msgpackr-extract-win32-x64"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz"; - sha512 = "XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.1.tgz"; + sha512 = "2gqEM4ybMpI51HPOiYgI63n9UDF7qvwZB2w92RQJQVb27gLUeUtTL7kJx/NpZvuNC4dcPJDY7kU7p5GWZ6Z5Qw=="; }; }; "@nestjs/schematics-9.0.4" = { @@ -7951,13 +8383,13 @@ let sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; }; }; - "@npmcli/config-6.1.1" = { + "@npmcli/config-6.1.3" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "6.1.1"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-6.1.1.tgz"; - sha512 = "R09ig+5UGrA1lxTWMyfyUwwzR9OAtJwMHGF4opu0/ysM3nMujzVvp0DVD/BnbmcQ0w6jM4IrsCSsq6ZdcvLW/Q=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-6.1.3.tgz"; + sha512 = "c8uOXPbRq1K8YeyUszj6MBWIdB6bx6x3K/UbGmc5GF7qpv1mB893Y5SuyrH/J7Kcw24Im4ASrsztk38ZBWFS2Q=="; }; }; "@npmcli/fs-1.1.1" = { @@ -8023,13 +8455,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/installed-package-contents-2.0.1" = { + "@npmcli/installed-package-contents-2.0.2" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz"; - sha512 = "GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA=="; + url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz"; + sha512 = "xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ=="; }; }; "@npmcli/map-workspaces-2.0.4" = { @@ -8041,13 +8473,13 @@ let sha512 = "bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg=="; }; }; - "@npmcli/map-workspaces-3.0.1" = { + "@npmcli/map-workspaces-3.0.2" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.1.tgz"; - sha512 = "QXwE2p5zRTP6X8Irgf/swYwwdQEalSA1GBm0IGE/86R5EJbUGgKMOP0kOjaJWJxaWPkSqyhM8N50SPxFHTfkNg=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.2.tgz"; + sha512 = "bCEC4PG7HbadtAYkW/TTUVNEOSr5Dhfmv6yGLgByJgCvdCqq7teq09cjvJ1LhzJU/euWjvYMcQxsfj7yDD2ikg=="; }; }; "@npmcli/metavuln-calculator-2.0.0" = { @@ -8194,13 +8626,13 @@ let sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; - "@npmcli/run-script-4.2.1" = { + "@npmcli/run-script-4.1.7" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "4.2.1"; + version = "4.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-4.2.1.tgz"; - sha512 = "7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-4.1.7.tgz"; + sha512 = "WXr/MyM4tpKA4BotB81NccGAv8B48lNH0gRoILucbcAhTQXLCoi6HflMV3KdXubIqvP9SuLsFn68Z7r4jl+ppw=="; }; }; "@npmcli/run-script-6.0.0" = { @@ -8212,31 +8644,112 @@ let sha512 = "ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ=="; }; }; - "@nrwl/cli-15.5.2" = { + "@nrwl/cli-15.7.2" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "15.5.2"; + version = "15.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.5.2.tgz"; - sha512 = "T0nN2hYDtkY9SsbtZqFwRSYC8Td2zPqQ7dj6FrwvjFGbHLAxN6rknVPPKN4S7Dt6feXX1Woe8XYwWouk9Cg6nw=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.7.2.tgz"; + sha512 = "A/72FAW1e0ku8YB/PaCqN9BpVvciO83MS5F5bvX5PA8xCNqe1+iXp/5T2ASnN2lB9zR3fQJmvR7mHKTKQlqQQQ=="; }; }; - "@nrwl/devkit-15.5.2" = { + "@nrwl/devkit-15.7.2" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "15.5.2"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.7.2.tgz"; + sha512 = "HMGi7L6w2g4IrYwhb04snD8Zr24Z/gzau5i9WUNkwzrjeR1xAm0Cc9WRre221zaeohtK11gyBt7BerT1tgkNwA=="; + }; + }; + "@nrwl/nx-darwin-arm64-15.7.2" = { + name = "_at_nrwl_slash_nx-darwin-arm64"; + packageName = "@nrwl/nx-darwin-arm64"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.7.2.tgz"; + sha512 = "F82exjuqkAkElSTxEcTFeLMhHpbGiccfTQh2VjXMS+ONldxM+Kd7atJjtUG8wKNXfg0lxxjjAdnzLy3iBuN/HQ=="; + }; + }; + "@nrwl/nx-darwin-x64-15.7.2" = { + name = "_at_nrwl_slash_nx-darwin-x64"; + packageName = "@nrwl/nx-darwin-x64"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.7.2.tgz"; + sha512 = "MNT7Bxz6yhoVLCgGpR0NtVkj20SER1CbrCaY7tmsKVNY9iA/EOZhz9qa3LeA1KZ4lw8Gpi2vD42mOngn7Mwr7w=="; + }; + }; + "@nrwl/nx-linux-arm-gnueabihf-15.7.2" = { + name = "_at_nrwl_slash_nx-linux-arm-gnueabihf"; + packageName = "@nrwl/nx-linux-arm-gnueabihf"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.7.2.tgz"; + sha512 = "QGyPkYnZ9LnUnuCzrP50bwsMJ9n6r8K2bNC1sQQwioijY+4MHNL+bMTOGWc8+lYBP7Ju3gpTqozGV3FQVkaM2w=="; + }; + }; + "@nrwl/nx-linux-arm64-gnu-15.7.2" = { + name = "_at_nrwl_slash_nx-linux-arm64-gnu"; + packageName = "@nrwl/nx-linux-arm64-gnu"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.7.2.tgz"; + sha512 = "HqufFVIvuunfChEFGkIhsLhhQjWLTFcCH2aQBSNesHpm6AhFVRGyokNu+PT6NNobr+BTrqJMocBqNQR1uvSyRQ=="; + }; + }; + "@nrwl/nx-linux-arm64-musl-15.7.2" = { + name = "_at_nrwl_slash_nx-linux-arm64-musl"; + packageName = "@nrwl/nx-linux-arm64-musl"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.7.2.tgz"; + sha512 = "9B8q6I/OVyQuYe+Yg2wNyxza/CsbvejIUsrK3QGGWUwHlkklqOSmUOHyTrcyMHUSped6CWPyKdIywngYOQzltQ=="; + }; + }; + "@nrwl/nx-linux-x64-gnu-15.7.2" = { + name = "_at_nrwl_slash_nx-linux-x64-gnu"; + packageName = "@nrwl/nx-linux-x64-gnu"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.7.2.tgz"; + sha512 = "8/6WtQn4derYKUWu5SxWWM+1dGihSZXMhDW9l/sXOr/qbMZu3XBmM2XZSguw/+p9gEVHcMmN0+D+Cai+q6/vDQ=="; + }; + }; + "@nrwl/nx-linux-x64-musl-15.7.2" = { + name = "_at_nrwl_slash_nx-linux-x64-musl"; + packageName = "@nrwl/nx-linux-x64-musl"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.7.2.tgz"; + sha512 = "c5SbqYZZBeBHhH5E30xwb4cHzCMVa/GQMCyTpZgsS/AHAPHbdkv+pO6bxxALvLPTyimcub7V+xbLCL7rgALzyw=="; + }; + }; + "@nrwl/nx-win32-arm64-msvc-15.7.2" = { + name = "_at_nrwl_slash_nx-win32-arm64-msvc"; + packageName = "@nrwl/nx-win32-arm64-msvc"; + version = "15.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.7.2.tgz"; + sha512 = "gWD/+gSO3XBma8PHX1Dp86fM6EcntHFfa7n/BISwDFkZ19MfV/gK6HbO847fkD6I34/IcDM/z1PsFwoIpTeoow=="; + }; + }; + "@nrwl/nx-win32-x64-msvc-15.7.2" = { + name = "_at_nrwl_slash_nx-win32-x64-msvc"; + packageName = "@nrwl/nx-win32-x64-msvc"; + version = "15.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.5.2.tgz"; - sha512 = "rvxuiYVpGDB9RzjOAWTNm7IBPwuYG6kL24LkJMUS8gCNqLBNNlYUsdkpa0PLRt5eNeGLKqpSDB8BpA+e1ty/zA=="; + url = "https://registry.npmjs.org/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.7.2.tgz"; + sha512 = "ARE4qGPgk+e+pSm0uPhHan5UCRtwNYc5ddVNS88NFrVoDTPm5MxYLGdvLnshWWio/Bx526FcwUMSCBWSW8HIFw=="; }; }; - "@nrwl/tao-15.5.2" = { + "@nrwl/tao-15.7.2" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "15.5.2"; + version = "15.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.5.2.tgz"; - sha512 = "1thpCNcdpHfTf+o3p+VB6v8TEj6to3YVhA9d+3VhDKN9mq/RVcoMQQRIAgNOKbYWYNo8eC8MvuNqxgRPz2ESyg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.7.2.tgz"; + sha512 = "srx9heMIt/QIyuqfewiVYbRpFcD/2pHkTkrEEUKspPd25kzAL2adcAITQKVCHI7/VS2sPdDR67pVsGQPZFBMRQ=="; }; }; "@oclif/command-1.8.0" = { @@ -8248,13 +8761,13 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/command-1.8.21" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; - sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.17.0" = { @@ -8284,6 +8797,15 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; + "@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.23.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; @@ -8338,13 +8860,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" = { @@ -8419,13 +8941,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" = { @@ -8437,13 +8959,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" = { @@ -8455,13 +8977,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" = { @@ -8473,13 +8995,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" = { @@ -8500,6 +9022,15 @@ let sha512 = "HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="; }; }; + "@octokit/openapi-types-16.0.0" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "16.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz"; + sha512 = "JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="; + }; + }; "@octokit/plugin-enterprise-rest-6.0.1" = { name = "_at_octokit_slash_plugin-enterprise-rest"; packageName = "@octokit/plugin-enterprise-rest"; @@ -8518,13 +9049,13 @@ let sha512 = "aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw=="; }; }; - "@octokit/plugin-paginate-rest-5.0.1" = { + "@octokit/plugin-paginate-rest-3.1.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "5.0.1"; + version = "3.1.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-3.1.0.tgz"; + sha512 = "+cfc40pMzWcLkoDcLb1KXqjX0jTGYXjKuQdFQDc6UAknISJHnZTiBqld6HDwRJvD4DsouDKrWXNbNV0lE/3AXA=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -8545,13 +9076,13 @@ let sha512 = "8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw=="; }; }; - "@octokit/plugin-rest-endpoint-methods-6.7.0" = { + "@octokit/plugin-rest-endpoint-methods-6.8.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "6.7.0"; + version = "6.8.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-6.8.1.tgz"; + sha512 = "QrlaTm8Lyc/TbU7BL/8bO49vp+RZ6W3McxxmmQTgYxf2sWkO8ZKuj4dLhPNJD6VCUW1hetCmeIM0m6FTVpDiEg=="; }; }; "@octokit/plugin-retry-3.0.9" = { @@ -8581,13 +9112,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" = { @@ -8599,13 +9130,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" = { @@ -8617,13 +9148,13 @@ let sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; }; }; - "@octokit/rest-19.0.5" = { + "@octokit/rest-19.0.3" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "19.0.5"; + version = "19.0.3"; 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.3.tgz"; + sha512 = "5arkTsnnRT7/sbI4fqgSJ35KiFaN7zQm0uQiQtivNQLI8RQx8EHwJCajcTUwmaCMNDg7tdCvqAnc7uvHHPxrtQ=="; }; }; "@octokit/types-6.41.0" = { @@ -8635,13 +9166,22 @@ let sha512 = "eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg=="; }; }; - "@octokit/types-8.1.1" = { + "@octokit/types-8.2.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "8.1.1"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/types/-/types-8.2.1.tgz"; + sha512 = "8oWMUji8be66q2B9PmEIUyQm00VPDPun07umUWSaCwxmeaquFBro4Hcc3ruVoDo3zkQyZBlRvhIMEYS3pBhanw=="; + }; + }; + "@octokit/types-9.0.0" = { + name = "_at_octokit_slash_types"; + packageName = "@octokit/types"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-8.1.1.tgz"; - sha512 = "7tjk+6DyhYAmei8FOEwPfGKc0VE1x56CKPJ+eE44zhDbOyMT+9yan8apfQFxo8oEFsy+0O7PiBtH8w0Yo0Y9Kw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz"; + sha512 = "LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw=="; }; }; "@opencensus/core-0.0.8" = { @@ -8698,31 +9238,31 @@ let sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; }; }; - "@opentelemetry/core-1.9.0" = { + "@opentelemetry/core-1.9.1" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.9.0.tgz"; - sha512 = "Koy1ApRUp5DB5KpOqhDk0JjO9x6QeEkmcePl8qQDsXZGF4MuHUBShXibd+J2tRNckTsvgEHi1uEuUckDgN+c/A=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.9.1.tgz"; + sha512 = "6/qon6tw2I8ZaJnHAQUUn4BqhTbTNRS0WP8/bA0ynaX+Uzp/DDbd0NS0Cq6TMlh8+mrlsyqDE7mO50nmv2Yvlg=="; }; }; - "@opentelemetry/resources-1.9.0" = { + "@opentelemetry/resources-1.9.1" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.9.0.tgz"; - sha512 = "zCyien0p3XWarU6zv72c/JZ6QlG5QW/hc61Nh5TSR1K9ndnljzAGrH55x4nfyQdubfoh9QxLNh9FXH0fWK6vcg=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.9.1.tgz"; + sha512 = "VqBGbnAfubI+l+yrtYxeLyOoL358JK57btPMJDd3TCOV3mV5TNBmzvOfmesM4NeTyXuGJByd3XvOHvFezLn3rQ=="; }; }; - "@opentelemetry/sdk-trace-base-1.9.0" = { + "@opentelemetry/sdk-trace-base-1.9.1" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.0.tgz"; - sha512 = "glNgtJjxAIrDku8DG5Xu3nBK25rT+hkyg7yuXh8RUurp/4BcsXjMyVqpyJvb2kg+lxAX73VJBhncRKGHn9t8QQ=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.1.tgz"; + sha512 = "Y9gC5M1efhDLYHeeo2MWcDDMmR40z6QpqcWnPCm4Dmh+RHAMf4dnEBBntIe1dDpor686kyU6JV1D29ih1lZpsQ=="; }; }; "@opentelemetry/semantic-conventions-1.3.1" = { @@ -8734,463 +9274,139 @@ let sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; - "@opentelemetry/semantic-conventions-1.9.0" = { + "@opentelemetry/semantic-conventions-1.9.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.0.tgz"; - sha512 = "po7penSfQ/Z8352lRVDpaBrd9znwA5mHGqXR7nDEiVnxkDFkBIhVf/tKeAJDIq/erFpcRowKFeCsr5eqqcSyFQ=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.1.tgz"; + sha512 = "oPQdbFDmZvjXk5ZDoBGXG8B4tSB/qW5vQunJWQMFUBp7Xe8O1ByPANueJ+Jzg58esEBegyyxZ7LRmfJr7kFcFg=="; }; }; - "@orval/angular-6.11.0" = { + "@orval/angular-6.12.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.11.0.tgz"; - sha512 = "4mYJ1KIloPn8W+ZWRszNJBxiV2AE2mCQ3KfQnUa/jh4YllOOjWto03GA3sr3IRGdJXwlN3/Esp6dQNQjto5Z+w=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.12.0.tgz"; + sha512 = "PtJYqmf666csQn90fb+3/lcG8uOEFOYXJIO8aeKzeEVgLeYw3sLXY5qje6KTWP6uxQKPVlmvNskdIPazobQCeQ=="; }; }; - "@orval/axios-6.11.0" = { + "@orval/axios-6.12.0" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.11.0.tgz"; - sha512 = "SSuWbS68v/nfcvxDdXntyPxRY0lCAbgMwnZ+V0cnq00G9Lgljiql2gPKOO3cnQhmpAiYIf8Zs6skSeIzrXxfiA=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.12.0.tgz"; + sha512 = "O3IzwtN0qzlUfJ0mOpS7HauoNKtaHq4fJ4IpUvGC8O9ZhnleVlVxd5Q0Ua+5vQSPSTeR8rqHGFOgH49N8UgN7g=="; }; }; - "@orval/core-6.11.0" = { + "@orval/core-6.12.0" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.11.0.tgz"; - sha512 = "PbH2PbpHbnLXrQWvLHUAm0lZHiD+Np7IGcVTLyXdDE9lGDpMY7jVxMLAB2aYhTZiSiyI6tIhSeaXPOykgVL8+g=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.12.0.tgz"; + sha512 = "zLO9k2IpzAGkafBj/uqCwiNH5n3h97uV29o3Rxq6YFyV67xMUFxhQN4mhiK/Lm1z+ZfYrdUyoJxfiXVLXqdYqA=="; }; }; - "@orval/msw-6.11.0" = { + "@orval/msw-6.12.0" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.11.0.tgz"; - sha512 = "g9oHX6IgqEQIJS6J0SJa3dUkDeZe/Iv6dgZ5Y0LorOgYfduAcfVjRepG/vnNu6mxmHbh5d2ZrxrSDZmxmuWU6Q=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.12.0.tgz"; + sha512 = "r6ABZ9frp607xcIPeMTNjai+9RzOYcRAiztk3S7nVTcEEvQWBpvr63wzXkKu1yyUjN5UxUXSGYgfLS7McDbLdA=="; }; }; - "@orval/query-6.11.0" = { + "@orval/query-6.12.0" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.11.0.tgz"; - sha512 = "nYgHVpEc3reHGryWhyap74+NoZlCAqZh0aULKcJD5jYCIXn8+SNt3kEeB1tjIzTbiESc5DGa3pUzEP8hJ7FN9Q=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.12.0.tgz"; + sha512 = "0S54tRrFQbyWbiwZPkGSud56dufVukGUmxy9UAx0oBz6PE6dCpSwGTsqta1POhr3oIPjGXEumW0ED3NivaMRtA=="; }; }; - "@orval/swr-6.11.0" = { + "@orval/swr-6.12.0" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.11.0.tgz"; - sha512 = "ONwjmk6Hxt+ozVVZast4pvc/hnhBzC+KkWPmpdFdoyrpgvIkAsulkuWQV12Sgo3KwSDH5abIOvexgeha7UaZxA=="; - }; - }; - "@ot-builder/bin-composite-types-1.5.5" = { - name = "_at_ot-builder_slash_bin-composite-types"; - packageName = "@ot-builder/bin-composite-types"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.5.tgz"; - sha512 = "CK8DmpDC/BILM57mX5jq1aAKRGqHPIRknnBTOtr+kAEdyYPJ28ATAojk7jcBb+tw6WPCdDRmmAj9XvKkXfwTdg=="; - }; - }; - "@ot-builder/bin-util-1.5.5" = { - name = "_at_ot-builder_slash_bin-util"; - packageName = "@ot-builder/bin-util"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.5.tgz"; - sha512 = "YilwtBHMAcqa+C/8gCqekM4nZkIGkdS64Sd/N4Q2aw68ly3l94hgPOioNRq7Ixju+reg1HHQrn6e/ug8UJ1F4A=="; - }; - }; - "@ot-builder/cli-help-shower-1.5.5" = { - name = "_at_ot-builder_slash_cli-help-shower"; - packageName = "@ot-builder/cli-help-shower"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.5.tgz"; - sha512 = "TwopK3Xwhhsw8o9rEz4eV4Fov9AvAA4bWSfCpt7vv1E8Ri+oXGVGZKiStjnrQJSr2WaZ4KqZcEvZew8F+ZYDbQ=="; - }; - }; - "@ot-builder/cli-proc-1.5.5" = { - name = "_at_ot-builder_slash_cli-proc"; - packageName = "@ot-builder/cli-proc"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.5.tgz"; - sha512 = "kxwViISxgMpK00eronqF+StDAfWcqF0nIm2l84zs4qJY6ddsBbhVgSNtY19DfDDjJPEEHDoNGEOJYAeyxquRIg=="; - }; - }; - "@ot-builder/cli-shared-1.5.5" = { - name = "_at_ot-builder_slash_cli-shared"; - packageName = "@ot-builder/cli-shared"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.5.tgz"; - sha512 = "lqIaWGEJ+Xw3tJLF7faX5gH7GWaNLjRnnadiR/fK6o2wdRhjEiw+DQa4hmE9mXdBCNaAxPSDkRR3GA6hvsw4lA=="; - }; - }; - "@ot-builder/common-impl-1.5.5" = { - name = "_at_ot-builder_slash_common-impl"; - packageName = "@ot-builder/common-impl"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.5.tgz"; - sha512 = "BhNB6m/dIaXMUbRlYLcmnEYwFoPVcvUD7fpij2wL/sbuSXh5IVj/wvcGqNDaRMJN7jWF1iApoWYb25s2cMI0eg=="; - }; - }; - "@ot-builder/errors-1.5.5" = { - name = "_at_ot-builder_slash_errors"; - packageName = "@ot-builder/errors"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.5.tgz"; - sha512 = "r1/31jN6MXb+sUMgFa7fl7cvh6WbyUrWHtU2aWNXo+v3ANF02pAANm3kHRYeo1A5hbsPdpYGT59eA2wKsFv6pg=="; - }; - }; - "@ot-builder/io-bin-cff-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-cff"; - packageName = "@ot-builder/io-bin-cff"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.5.tgz"; - sha512 = "fZXVdnCsV2xGd12ixn/ZD7I73NUJty2RzAru0/SPcKh9+MM9+0WAaC8K2959JoK1k+uWTwkm9GfVFWBrqgkm1Q=="; - }; - }; - "@ot-builder/io-bin-encoding-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-encoding"; - packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.5.tgz"; - sha512 = "f9H94M2v3DaLQpWV9sG2e5vYubzI+I2AXlRCKplexfSWoIU7Wsusb3ZNXs+rWB3tFKTOVjwZ2c8prSNsKVPZWA=="; - }; - }; - "@ot-builder/io-bin-ext-private-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-ext-private"; - packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.5.tgz"; - sha512 = "kuybGd55HbVW+6E05yZLmR98IhH+BiwjHgyOq2+/DiD5iSE/SCqtqHJ7Gs94UfJp16PaCCnWDXjcJdkSPMhqKg=="; - }; - }; - "@ot-builder/io-bin-font-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-font"; - packageName = "@ot-builder/io-bin-font"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.5.tgz"; - sha512 = "JCAYsJIXiV0nYrWZHK9WV1YgGkz+nNbngziQyTNoO4qp8qmrvuc0cCwd6TOwuBapgfd7WJTyW2h5RVqbICxZ3g=="; - }; - }; - "@ot-builder/io-bin-glyph-store-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-glyph-store"; - packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.5.tgz"; - sha512 = "9NurbkwdnmlnHEKzFRcrwleTU2PL8T++Gjl8TqDUZ+O2+RoNDOjZ8j0JnARv6+yj7w1+uFZlrdDd2r+/Hox5bQ=="; - }; - }; - "@ot-builder/io-bin-layout-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-layout"; - packageName = "@ot-builder/io-bin-layout"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.5.tgz"; - sha512 = "mbI3XHVw++lUJPxtiUEBP+Cxxr38cJ9fdENH00snSyBAaM4NifYUcVab51Hw1idYqGhtT+HdXUDql5fHqmGLrg=="; - }; - }; - "@ot-builder/io-bin-metadata-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-metadata"; - packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.5.tgz"; - sha512 = "avWLjS2IQ/g1qv+rDDuNovuu7lvmQSOr6rShk9uJNcSXU+w54n0auWquLyok42RFoW7YYmmPebgsJsTypSEUDQ=="; - }; - }; - "@ot-builder/io-bin-metric-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-metric"; - packageName = "@ot-builder/io-bin-metric"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.5.tgz"; - sha512 = "jjfyuHLwgQhyZEHP7hHVl3jX20i3dPbmDb2E7X3GbTmW+rTxodXrHN6OqnEzT+qluK+6RcQs5jdJ5GTW9r21wA=="; - }; - }; - "@ot-builder/io-bin-name-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-name"; - packageName = "@ot-builder/io-bin-name"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.5.tgz"; - sha512 = "pUjKYAXczvqsFfwki8IGJe6PkdxO28GR+4nLrIxyiK6ZSePtMjauDfTUC/mWAVHQZ0uI+tr7n9Un5BONM5PPOg=="; - }; - }; - "@ot-builder/io-bin-sfnt-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-sfnt"; - packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.5.tgz"; - sha512 = "SiZRMR1jXhFFPQvBZgJuOb4kSrpaWtwAOQaq13Atmxsc855rTbC5u/p7ll55lj8RGcLBsZjwsw9fe4l/0NEJDw=="; - }; - }; - "@ot-builder/io-bin-ttf-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-ttf"; - packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.5.tgz"; - sha512 = "6idmtX8UHM7mqUt4J2o/I/102RksvitKlinOrvUUNj64JtS/Mjy82ugFObLPDZAhXm0CjQIuIOYDS7ULHMtQqg=="; - }; - }; - "@ot-builder/io-bin-vtt-private-1.5.5" = { - name = "_at_ot-builder_slash_io-bin-vtt-private"; - packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.5.tgz"; - sha512 = "TAdtW8L8iBOUY8L5HfiNo1fGVKbugw4Oy0k5jomA+nob4Jt87G1MCNof03Tzudw+ncTI0WfhqMAqpp/Z5DIqIw=="; - }; - }; - "@ot-builder/ot-1.5.5" = { - name = "_at_ot-builder_slash_ot"; - packageName = "@ot-builder/ot"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.5.tgz"; - sha512 = "Kbn1lGkQi/jfKdOU/72KZe5joNLtCIkuS/+RM37OimOGSBCZqrnHyldCBv3U+ANPXREUqoBsSug4ar53fwROIQ=="; - }; - }; - "@ot-builder/ot-encoding-1.5.5" = { - name = "_at_ot-builder_slash_ot-encoding"; - packageName = "@ot-builder/ot-encoding"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.5.tgz"; - sha512 = "WvtRzUCkYZ1t6hc6tBYFdgECuYGUT2sJ00qV0RHA/4k5KfofblavvduMD7DaTjMG+CP13lK1Hf2nZthY6Sjwvg=="; - }; - }; - "@ot-builder/ot-ext-private-1.5.5" = { - name = "_at_ot-builder_slash_ot-ext-private"; - packageName = "@ot-builder/ot-ext-private"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.5.tgz"; - sha512 = "kJ7/bR83V73+WMDE59Uy22zb4po54/gCnrUDoWTDdo8jnhri9wHtFpuL5W1RMQSsegI9PnYTFgTXwAuCmX8EBg=="; - }; - }; - "@ot-builder/ot-glyphs-1.5.5" = { - name = "_at_ot-builder_slash_ot-glyphs"; - packageName = "@ot-builder/ot-glyphs"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.5.tgz"; - sha512 = "8BIjHFzzsRjF0N+lRzna6mwmcQS61MIBFrRY2/hKzQVNqfmXfDRKPkFhbn/5tRb1mmvqNnLM7DrnQcz2r7sMew=="; - }; - }; - "@ot-builder/ot-layout-1.5.5" = { - name = "_at_ot-builder_slash_ot-layout"; - packageName = "@ot-builder/ot-layout"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.5.tgz"; - sha512 = "ABRaW09S1ynrEa61ZF5LuznpDqv6Q/zWVocrU4zaO6v42b5ZR87shbXDuYBTu10Ho+ieveMJkIgomjWWHSW4OQ=="; - }; - }; - "@ot-builder/ot-metadata-1.5.5" = { - name = "_at_ot-builder_slash_ot-metadata"; - packageName = "@ot-builder/ot-metadata"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.5.tgz"; - sha512 = "PHg5FS/4ayQcbRL2leT5PfWj/tw7hQsCJGYL0RNg+QvkY/IeExq+fHKzbC5HwLYZFCsVKdi5++cWM1rSaPCJIQ=="; - }; - }; - "@ot-builder/ot-name-1.5.5" = { - name = "_at_ot-builder_slash_ot-name"; - packageName = "@ot-builder/ot-name"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.5.tgz"; - sha512 = "HNHZbc2TFzFyJ1FHVlxV3sGQJqGQjdlTBW4CfgVxxHhbSe59/DMsX1oiplRQ3w7kYQ6SCfU2qp1JXVSXgVBPZw=="; - }; - }; - "@ot-builder/ot-sfnt-1.5.5" = { - name = "_at_ot-builder_slash_ot-sfnt"; - packageName = "@ot-builder/ot-sfnt"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.5.tgz"; - sha512 = "B3vMza3hSdGyOlzhIKsNVUHe6knOKpQlWuAZUQXIQCTuKdLGcDAsYBFuTEZEtLhpRzm+jSfEyGZ87V0YV2nUBg=="; - }; - }; - "@ot-builder/ot-standard-glyph-namer-1.5.5" = { - name = "_at_ot-builder_slash_ot-standard-glyph-namer"; - packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.5.tgz"; - sha512 = "L+quAs3jQ1I4U3byONrPp9i8jTf8YT7CuF4ONUiExGyJnK9WIvD5NaVKdI/MPkxVUb1Udc9SaBYtoUm9ImUHQQ=="; - }; - }; - "@ot-builder/ot-vtt-private-1.5.5" = { - name = "_at_ot-builder_slash_ot-vtt-private"; - packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.5.tgz"; - sha512 = "l8lY6BD1dzlHTW93TlBLcAxxRLHUjlRuFN7w+1Akmtfq/l15AWEW3OqxzxrGAw7TX7Q9Np7HhN0QGbTYjrul3g=="; - }; - }; - "@ot-builder/prelude-1.5.5" = { - name = "_at_ot-builder_slash_prelude"; - packageName = "@ot-builder/prelude"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.5.tgz"; - sha512 = "sTecdvnGlYdQ6Qbu4NSyYIzil72k7gwGaVJiFRZyudNouGiurijHt5F+RiWl05U83zrlcdpcN7iiXzHfr5NnWQ=="; - }; - }; - "@ot-builder/primitive-1.5.5" = { - name = "_at_ot-builder_slash_primitive"; - packageName = "@ot-builder/primitive"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.5.tgz"; - sha512 = "AKrFDof1e6r7K5EC71wGhOfAjujf9GuJ0g56CKGps4FfDw7CwFg77KFwpqsFWjyt6t1fmvFAlKdhVXuNyH4c2Q=="; - }; - }; - "@ot-builder/rectify-1.5.5" = { - name = "_at_ot-builder_slash_rectify"; - packageName = "@ot-builder/rectify"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.5.tgz"; - sha512 = "nrx6Ubt7IX9IKUMJcAmNrHyi0kC83laGpnHKCGiBWGVfn/BdmFogRUGNR0NUpEImIVWTq0Y8Ae/tf/i9yI5eZQ=="; - }; - }; - "@ot-builder/stat-glyphs-1.5.5" = { - name = "_at_ot-builder_slash_stat-glyphs"; - packageName = "@ot-builder/stat-glyphs"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.5.tgz"; - sha512 = "DgWbUPy5de/2fL0JJ94UXJ5fibvDAtVWtjHUmgy38i+3vHYcQ14WPjq3sLxyOKRrrvBQ7CK7Z92N9JjBN+a5ZQ=="; - }; - }; - "@ot-builder/trace-1.5.5" = { - name = "_at_ot-builder_slash_trace"; - packageName = "@ot-builder/trace"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.5.tgz"; - sha512 = "hOH55nKImSbq/5ZgZ8pya1/yIvC3IDRfqfWL/3Uz0Zp0StD6/9xhegK+9bM3Qs/llmDXZd7JYOsyWETw8f1iIg=="; - }; - }; - "@ot-builder/var-store-1.5.5" = { - name = "_at_ot-builder_slash_var-store"; - packageName = "@ot-builder/var-store"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.5.tgz"; - sha512 = "H18j0yR9qrwXC665lHDq07DBRKkxxlB3mcjUXYX8xElkv/UcD42FOI5lTlvLYV39e3f8uBTf9IhVYPNTYtZHmg=="; - }; - }; - "@ot-builder/variance-1.5.5" = { - name = "_at_ot-builder_slash_variance"; - packageName = "@ot-builder/variance"; - version = "1.5.5"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.5.tgz"; - sha512 = "Jp20Ro43mLR32erJkLolduF1Q+jBYwDJitcEaGztVEmNGLbJNHb++jFIQSswIFDUrmj/3pKgret4ASiLc4WIkw=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.12.0.tgz"; + sha512 = "dTmzvOWZhoMlcy2dEnNH5FpKV8fJdAW3BX3gX5KP/S8xFH8IPNlRZTUOLNb1AagMzzmRjEL4E29DhhuAQi4p0g=="; }; }; - "@parcel/bundler-default-2.8.2" = { + "@parcel/bundler-default-2.8.3" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.2.tgz"; - sha512 = "/7ao0vc/v8WGHZaS1SyS5R8wzqmmXEr9mhIIB2cbLQ4LA2WUtKsYcvZ2gjJuiAAN1CHC6GxqwYjIJScQCk/QXg=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.3.tgz"; + sha512 = "yJvRsNWWu5fVydsWk3O2L4yIy3UZiKWO2cPDukGOIWMgp/Vbpp+2Ct5IygVRtE22bnseW/E/oe0PV3d2IkEJGg=="; }; }; - "@parcel/cache-2.8.2" = { + "@parcel/cache-2.8.3" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.2.tgz"; - sha512 = "kiyoOgh1RXp5qp+wlb8Pi/Z7o9D82Oj5RlHnKSAauyR7jgnI8Vq8JTeBmlLqrf+kHxcDcp2p86hidSeANhlQNg=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.3.tgz"; + sha512 = "k7xv5vSQrJLdXuglo+Hv3yF4BCSs1tQ/8Vbd6CHTkOhf7LcGg6CPtLw053R/KdMpd/4GPn0QrAsOLdATm1ELtQ=="; }; }; - "@parcel/codeframe-2.8.2" = { + "@parcel/codeframe-2.8.3" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.2.tgz"; - sha512 = "U2GT9gq1Zs3Gr83j8JIs10bLbGOHFl57Y8D57nrdR05F4iilV/UR6K7jkhdoiFc9WiHh3ewvrko5+pSdAVFPgQ=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.3.tgz"; + sha512 = "FE7sY53D6n/+2Pgg6M9iuEC6F5fvmyBkRE4d9VdnOoxhTXtkEqpqYgX7RJ12FAQwNlxKq4suBJQMgQHMF2Kjeg=="; }; }; - "@parcel/compressor-raw-2.8.2" = { + "@parcel/compressor-raw-2.8.3" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.2.tgz"; - sha512 = "EFPTer/P+3axifH6LtYHS3E6ABgdZnjZomJZ/Nl19lypZh/NgZzmMZlINlEVqyYhCggoKfXzgeTgkIHPN2d5Vw=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.3.tgz"; + sha512 = "bVDsqleBUxRdKMakWSlWC9ZjOcqDKE60BE+Gh3JSN6WJrycJ02P5wxjTVF4CStNP/G7X17U+nkENxSlMG77ySg=="; }; }; - "@parcel/config-default-2.8.2" = { + "@parcel/config-default-2.8.3" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.2.tgz"; - sha512 = "1ELJAHx37fKSZZkYKWy6UdcuLRv5vrZJc89tVS6eRvvMt+udbIoSgIUzPXu7XemkcchF7Tryw3u2pRyxyLyL3w=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.3.tgz"; + sha512 = "o/A/mbrO6X/BfGS65Sib8d6SSG45NYrNooNBkH/o7zbOBSRQxwyTlysleK1/3Wa35YpvFyLOwgfakqCtbGy4fw=="; }; }; - "@parcel/core-2.8.2" = { + "@parcel/core-2.8.3" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.2.tgz"; - sha512 = "ZGuq6p+Lzx6fgufaVsuOBwgpU3hgskTvIDIMdIDi9gOZyhGPK7U2srXdX+VYUL5ZSGbX04/P6QlB9FMAXK+nEg=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.3.tgz"; + sha512 = "Euf/un4ZAiClnlUXqPB9phQlKbveU+2CotZv7m7i+qkgvFn5nAGnrV4h1OzQU42j9dpgOxWi7AttUDMrvkbhCQ=="; }; }; - "@parcel/diagnostic-2.8.2" = { + "@parcel/diagnostic-2.8.3" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.2.tgz"; - sha512 = "tGSMwM2rSYLjJW0fCd9gb3tNjfCX/83PZ10/5u2E33UZVkk8OIHsQmsrtq2H2g4oQL3rFxkfEx6nGPDGHwlx7A=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.3.tgz"; + sha512 = "u7wSzuMhLGWZjVNYJZq/SOViS3uFG0xwIcqXw12w54Uozd6BH8JlhVtVyAsq9kqnn7YFkw6pXHqAo5Tzh4FqsQ=="; }; }; - "@parcel/events-2.8.2" = { + "@parcel/events-2.8.3" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.2.tgz"; - sha512 = "o5etrsKm16y8iRPnjtEBNy4lD0WAigD66yt/RZl9Rx0vPVDly/63Rr9+BrXWVW7bJ7x0S0VVpWW4j3f/qZOsXg=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.3.tgz"; + sha512 = "hoIS4tAxWp8FJk3628bsgKxEvR7bq2scCVYHSqZ4fTi/s0+VymEATrRCUqf+12e5H47uw1/ZjoqrGtBI02pz4w=="; }; }; "@parcel/fs-1.11.0" = { @@ -9202,40 +9418,40 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; - "@parcel/fs-2.8.2" = { + "@parcel/fs-2.8.3" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.2.tgz"; - sha512 = "aN8znbMndSqn1xwZEmMblzqmJsxcExv2jKLl/a9RUHAP7LaPYcPZIykDL3YwGCiKTCzjmRpXnNoyosjFFeBaHA=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.3.tgz"; + sha512 = "y+i+oXbT7lP0e0pJZi/YSm1vg0LDsbycFuHZIL80pNwdEppUAtibfJZCp606B7HOjMAlNZOBo48e3hPG3d8jgQ=="; }; }; - "@parcel/fs-search-2.8.2" = { + "@parcel/fs-search-2.8.3" = { name = "_at_parcel_slash_fs-search"; packageName = "@parcel/fs-search"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.2.tgz"; - sha512 = "ovQnupRm/MoE/tbgH0Ivknk0QYenXAewjcog+T5umDmUlTmnIRZjURrgDf5Xtw8T/CD5Xv+HmIXpJ9Ez/LzJpw=="; + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.3.tgz"; + sha512 = "DJBT2N8knfN7Na6PP2mett3spQLTqxFrvl0gv+TJRp61T8Ljc4VuUTb0hqBj+belaASIp3Q+e8+SgaFQu7wLiQ=="; }; }; - "@parcel/graph-2.8.2" = { + "@parcel/graph-2.8.3" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.2.tgz"; - sha512 = "SLEvBQBgfkXgU4EBu30+CNanpuKjcNuEv/x8SwobCF0i3Rk+QKbe7T36bNR7727mao++2Ha69q93Dd9dTPw0kQ=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.3.tgz"; + sha512 = "26GL8fYZPdsRhSXCZ0ZWliloK6DHlMJPWh6Z+3VVZ5mnDSbYg/rRKWmrkhnr99ZWmL9rJsv4G74ZwvDEXTMPBg=="; }; }; - "@parcel/hash-2.8.2" = { + "@parcel/hash-2.8.3" = { name = "_at_parcel_slash_hash"; packageName = "@parcel/hash"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.2.tgz"; - sha512 = "NBnP8Hu0xvAqAfZXRaMM66i8nJyxpKS86BbhwkbgTGbwO1OY87GERliHeREJfcER0E0ZzwNow7MNR8ZDm6IvJQ=="; + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.3.tgz"; + sha512 = "FVItqzjWmnyP4ZsVgX+G00+6U2IzOvqDtdwQIWisCcVoXJFCqZJDy6oa2qDDFz96xCCCynjRjPdQx2jYBCpfYw=="; }; }; "@parcel/logger-1.11.1" = { @@ -9247,211 +9463,211 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; - "@parcel/logger-2.8.2" = { + "@parcel/logger-2.8.3" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.2.tgz"; - sha512 = "zlhK6QHxfFJMlVJxxcCw0xxBDrYPFPOhMxSD6p6b0z9Yct1l3NdpmfabgjKX8wnZmHokFsil6daleM+M80n2Ew=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.3.tgz"; + sha512 = "Kpxd3O/Vs7nYJIzkdmB6Bvp3l/85ydIxaZaPfGSGTYOfaffSOTkhcW9l6WemsxUrlts4za6CaEWcc4DOvaMOPA=="; }; }; - "@parcel/markdown-ansi-2.8.2" = { + "@parcel/markdown-ansi-2.8.3" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.2.tgz"; - sha512 = "5y29TXgRgG0ybuXaDsDk4Aofg/nDUeAAyVl9/toYCDDhxpQV4yZt8WNPu4PaNYKGLuNgXwsmz+ryZQHGmfbAIQ=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.3.tgz"; + sha512 = "4v+pjyoh9f5zuU/gJlNvNFGEAb6J90sOBwpKJYJhdWXLZMNFCVzSigxrYO+vCsi8G4rl6/B2c0LcwIMjGPHmFQ=="; }; }; - "@parcel/namer-default-2.8.2" = { + "@parcel/namer-default-2.8.3" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.2.tgz"; - sha512 = "sMLW/bDWXA6IE7TQKOsBnA5agZGNvZ9qIXKZEUTsTloUjMdAWI8NYA1s0i9HovnGxI5uGlgevrftK4S5V4AdkA=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.3.tgz"; + sha512 = "tJ7JehZviS5QwnxbARd8Uh63rkikZdZs1QOyivUhEvhN+DddSAVEdQLHGPzkl3YRk0tjFhbqo+Jci7TpezuAMw=="; }; }; - "@parcel/node-resolver-core-2.8.2" = { + "@parcel/node-resolver-core-2.8.3" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.8.2.tgz"; - sha512 = "D/NJEz/h/C3RmUOWSTg0cLwG3uRVHY9PL+3YGO/c8tKu8PlS2j55XtntdiVfwkK+P6avLCnrJnv/gwTa79dOPw=="; + 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.8.2" = { + "@parcel/optimizer-css-2.8.3" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.2.tgz"; - sha512 = "pQEuKhk0PJuYI3hrXlf4gpuuPy+MZUDzC44ulQM7kVcVJ0OofuJQQeHfTLE+v5wClFDd29ZQZ7RsLP5RyUQ+Lg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.3.tgz"; + sha512 = "JotGAWo8JhuXsQDK0UkzeQB0UR5hDAKvAviXrjqB4KM9wZNLhLleeEAW4Hk8R9smCeQFP6Xg/N/NkLDpqMwT3g=="; }; }; - "@parcel/optimizer-htmlnano-2.8.2" = { + "@parcel/optimizer-htmlnano-2.8.3" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.8.2.tgz"; - sha512 = "4+3wi+Yi+hsf5/LolX59JXFe/7bLpI6NetUBgtoxOVm/EzFg1NGSNOcrthzEcgGj6+MMSdzBAxRTPObAfDxJCA=="; + 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.8.2" = { + "@parcel/optimizer-image-2.8.3" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.8.2.tgz"; - sha512 = "/ICYG0smbMkli+su4m/ENQPxQDCPYYTJTjseKwl+t1vyj6wqNF99mNI4c0RE2TIPuDneGwSz7PlHhC2JmdgxfQ=="; + 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.8.2" = { + "@parcel/optimizer-svgo-2.8.3" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.2.tgz"; - sha512 = "nFWyM+CBtgBixqknpbN4R92v8PK7Gjlrsb8vxN/IIr/3Pjk+DfoT51DnynhU7AixvDylYkgjjqrQ7uFYYl0OKA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.3.tgz"; + sha512 = "9KQed99NZnQw3/W4qBYVQ7212rzA9EqrQG019TIWJzkA9tjGBMIm2c/nXpK1tc3hQ3e7KkXkFCQ3C+ibVUnHNA=="; }; }; - "@parcel/optimizer-terser-2.8.2" = { + "@parcel/optimizer-terser-2.8.3" = { name = "_at_parcel_slash_optimizer-terser"; packageName = "@parcel/optimizer-terser"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.2.tgz"; - sha512 = "jFAOh9WaO6oNc8B9qDsCWzNkH7nYlpvaPn0w3ZzpMDi0HWD+w+xgO737rWLJWZapqUDSOs0Q/hDFEZ82/z0yxA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.3.tgz"; + sha512 = "9EeQlN6zIeUWwzrzu6Q2pQSaYsYGah8MtiQ/hog9KEPlYTP60hBv/+utDyYEHSQhL7y5ym08tPX5GzBvwAD/dA=="; }; }; - "@parcel/package-manager-2.8.2" = { + "@parcel/package-manager-2.8.3" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.2.tgz"; - sha512 = "hx4Imi0yhsSS0aNZkEANPYNNKqBuR63EUNWSxMyHh4ZOvbHoOXnMn1ySGdx6v0oi9HvKymNsLMQ1T5CuI4l4Bw=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.3.tgz"; + sha512 = "tIpY5pD2lH53p9hpi++GsODy6V3khSTX4pLEGuMpeSYbHthnOViobqIlFLsjni+QA1pfc8NNNIQwSNdGjYflVA=="; }; }; - "@parcel/packager-css-2.8.2" = { + "@parcel/packager-css-2.8.3" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.2.tgz"; - sha512 = "l2fR5qr1moUWLOqQZPxtH6DBKbaKcxzEPAmQ+f15dHt8eQxU15MyQ4DHX41b5B7HwaumgCqe0NkuTF3DedpJKg=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.3.tgz"; + sha512 = "WyvkMmsurlHG8d8oUVm7S+D+cC/T3qGeqogb7sTI52gB6uiywU7lRCizLNqGFyFGIxcVTVHWnSHqItBcLN76lA=="; }; }; - "@parcel/packager-html-2.8.2" = { + "@parcel/packager-html-2.8.3" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.2.tgz"; - sha512 = "/oiTsKZ5OyF9OwAVGHANNuW2TB3k3cVub1QfttSKJgG3sAhrOifb1dP8zBHMxvUrB0CJdYhGlgi1Jth9kjACCg=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.3.tgz"; + sha512 = "OhPu1Hx1RRKJodpiu86ZqL8el2Aa4uhBHF6RAL1Pcrh2EhRRlPf70Sk0tC22zUpYL7es+iNKZ/n0Rl+OWSHWEw=="; }; }; - "@parcel/packager-js-2.8.2" = { + "@parcel/packager-js-2.8.3" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.2.tgz"; - sha512 = "48LtHP4lJn8J1aBeD4Ix/YjsRxrBUkzbx7czdUeRh2PlCqY4wwIhciVlEFipj/ANr3ieSX44lXyVPk/ttnSdrw=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.3.tgz"; + sha512 = "0pGKC3Ax5vFuxuZCRB+nBucRfFRz4ioie19BbDxYnvBxrd4M3FIu45njf6zbBYsI9eXqaDnL1b3DcZJfYqtIzw=="; }; }; - "@parcel/packager-raw-2.8.2" = { + "@parcel/packager-raw-2.8.3" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.2.tgz"; - sha512 = "dGonfFptNV1lgqKaD17ecXBUyIfoG6cJI1cCE1sSoYCEt7r+Rq56X/Gq8oiA3+jjMC7QTls+SmFeMZh26fl77Q=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.3.tgz"; + sha512 = "BA6enNQo1RCnco9MhkxGrjOk59O71IZ9DPKu3lCtqqYEVd823tXff2clDKHK25i6cChmeHu6oB1Rb73hlPqhUA=="; }; }; - "@parcel/packager-svg-2.8.2" = { + "@parcel/packager-svg-2.8.3" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.2.tgz"; - sha512 = "k7LymTJ4XQA+UcPwFYqJfWs5/Awa4GirNxRWfiFflLqH3F1XvMiKSCIQXmrDM6IaeIqqDDsu6+P5U6YDAzzM3A=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.3.tgz"; + sha512 = "mvIoHpmv5yzl36OjrklTDFShLUfPFTwrmp1eIwiszGdEBuQaX7JVI3Oo2jbVQgcN4W7J6SENzGQ3Q5hPTW3pMw=="; }; }; - "@parcel/plugin-2.8.2" = { + "@parcel/plugin-2.8.3" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.2.tgz"; - sha512 = "YG7TWfKsoNm72jbz3b3TLec0qJHVkuAWSzGzowdIhX37cP1kRfp6BU2VcH+qYPP/KYJLzhcZa9n3by147mGcxw=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.3.tgz"; + sha512 = "jZ6mnsS4D9X9GaNnvrixDQwlUQJCohDX2hGyM0U0bY2NWU8Km97SjtoCpWjq+XBCx/gpC4g58+fk9VQeZq2vlw=="; }; }; - "@parcel/reporter-cli-2.8.2" = { + "@parcel/reporter-cli-2.8.3" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.2.tgz"; - sha512 = "OIRlBqpKqPpMWRHATT8az8fUAqfceLWlWqgX/CW5cG1i6gefbBWFq2qYxDVBEk1bPDLIUCtqNLhfO8hLyweMjA=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.3.tgz"; + sha512 = "3sJkS6tFFzgIOz3u3IpD/RsmRxvOKKiQHOTkiiqRt1l44mMDGKS7zANRnJYsQzdCsgwc9SOP30XFgJwtoVlMbw=="; }; }; - "@parcel/reporter-dev-server-2.8.2" = { + "@parcel/reporter-dev-server-2.8.3" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.8.2.tgz"; - sha512 = "A16pAQSAT8Yilo1yCPZcrtWbRhwyiMopEz0mOyGobA1ZDy6B3j4zjobIWzdPQCSIY7+v44vtWMDGbdGrxt6M1Q=="; + 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.8.2" = { + "@parcel/resolver-default-2.8.3" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.8.2.tgz"; - sha512 = "mlowJMjFjyps9my8wd13kgeExJ5EgkPAuIxRSSWW+GPR7N3uA5DBJ+SB/CzdhCkPrXR6kwVWxNkkOch38pzOQQ=="; + 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.8.2" = { + "@parcel/runtime-browser-hmr-2.8.3" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.2.tgz"; - sha512 = "VRM8mxakMglqRB0f5eAuwCigjJ5vlaJMwHy+JuzOsn/yVSELOb+6psRKl2B9hhxp9sJPt4IU6KDdH2IOrgx87Q=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.3.tgz"; + sha512 = "2O1PYi2j/Q0lTyGNV3JdBYwg4rKo6TEVFlYGdd5wCYU9ZIN9RRuoCnWWH2qCPj3pjIVtBeppYxzfVjPEHINWVg=="; }; }; - "@parcel/runtime-js-2.8.2" = { + "@parcel/runtime-js-2.8.3" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.2.tgz"; - sha512 = "Vk3Gywn2M9qP5X4lF6tu8QXP4xNI90UOSOhKHQ9W5pCu+zvD0Gdvu7qwQPFuFjIAq08xU7+PvZzGnlnM+8NyRw=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.3.tgz"; + sha512 = "IRja0vNKwvMtPgIqkBQh0QtRn0XcxNC8HU1jrgWGRckzu10qJWO+5ULgtOeR4pv9krffmMPqywGXw6l/gvJKYQ=="; }; }; - "@parcel/runtime-react-refresh-2.8.2" = { + "@parcel/runtime-react-refresh-2.8.3" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.8.2.tgz"; - sha512 = "JjaMvBVx6v0zB1KHa7AopciIsl3FpjUMttr2tb6L7lzocti2muQGE6GBfinXOmD5oERwCf8HwGJ8SNFcIF0rKA=="; + 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.8.2" = { + "@parcel/runtime-service-worker-2.8.3" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.8.2.tgz"; - sha512 = "KSxbOKV8nuH5JjFvcUlCtBYnVVlmxreXpMxRUPphPwJnyxRGA4E0jofbQxWY5KPgp7x/ZnZU/nyzCvqURH3kHA=="; + 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" = { @@ -9463,112 +9679,112 @@ let sha512 = "Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew=="; }; }; - "@parcel/transformer-babel-2.8.2" = { + "@parcel/transformer-babel-2.8.3" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.2.tgz"; - sha512 = "oL2BpvrPMwFiU9jUZ9UYGD1gRgvq9jLsOq+/PJl4GvPbOBVedIBE2nbHP/mYuWRpRnTTTiJQ/ItyOS0R2VQl7A=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.3.tgz"; + sha512 = "L6lExfpvvC7T/g3pxf3CIJRouQl+sgrSzuWQ0fD4PemUDHvHchSP4SNUVnd6gOytF3Y1KpnEZIunQGi5xVqQCQ=="; }; }; - "@parcel/transformer-css-2.8.2" = { + "@parcel/transformer-css-2.8.3" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.2.tgz"; - sha512 = "q8UDlX/TTCbuFBMU45q12/p92JNIz8MHkkH104dWDzXbRtvMKMg8jgNmr8S2bouZjtXMsSb2c54EO88DSM9G4A=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.3.tgz"; + sha512 = "xTqFwlSXtnaYen9ivAgz+xPW7yRl/u4QxtnDyDpz5dr8gSeOpQYRcjkd4RsYzKsWzZcGtB5EofEk8ayUbWKEUg=="; }; }; - "@parcel/transformer-html-2.8.2" = { + "@parcel/transformer-html-2.8.3" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.2.tgz"; - sha512 = "QDgDw6+DAcllaRQiRteMX0VgPIsxRUTXFS8jcXhbGio41LbUkLcT09M04L/cfJAAzvIKhXqiOxfNnyajTvCPDQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.3.tgz"; + sha512 = "kIZO3qsMYTbSnSpl9cnZog+SwL517ffWH54JeB410OSAYF1ouf4n5v9qBnALZbuCCmPwJRGs4jUtE452hxwN4g=="; }; }; - "@parcel/transformer-image-2.8.2" = { + "@parcel/transformer-image-2.8.3" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.2.tgz"; - sha512 = "B/D9v/BVyN5jxoi+wHPbIRfMIylmC6adp8GP+BtChjbuRjukgGT8RlAVz4vDm1l0bboeyPL2IuoWRQgXKGuPVg=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.3.tgz"; + sha512 = "cO4uptcCGTi5H6bvTrAWEFUsTNhA4kCo8BSvRSCHA2sf/4C5tGQPHt3JhdO0GQLPwZRCh/R41EkJs5HZ8A8DAg=="; }; }; - "@parcel/transformer-js-2.8.2" = { + "@parcel/transformer-js-2.8.3" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.2.tgz"; - sha512 = "mLksi6gu/20JdCFDNPl7Y0HTwJOAvf2ybC2HaJcy69PJCeUrrstgiFTjsCwv1eKcesgEHi9kKX+sMHVAH3B/dA=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.3.tgz"; + sha512 = "9Qd6bib+sWRcpovvzvxwy/PdFrLUXGfmSW9XcVVG8pvgXsZPFaNjnNT8stzGQj1pQiougCoxMY4aTM5p1lGHEQ=="; }; }; - "@parcel/transformer-json-2.8.2" = { + "@parcel/transformer-json-2.8.3" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.2.tgz"; - sha512 = "eZuaY5tMxcMDJwpHJbPVTgSaBIO4mamwAa3VulN9kRRaf29nc+Q0iM7zMFVHWFQAi/mZZ194IIQXbDX3r6oSSQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.3.tgz"; + sha512 = "B7LmVq5Q7bZO4ERb6NHtRuUKWGysEeaj9H4zelnyBv+wLgpo4f5FCxSE1/rTNmP9u1qHvQ3scGdK6EdSSokGPg=="; }; }; - "@parcel/transformer-postcss-2.8.2" = { + "@parcel/transformer-postcss-2.8.3" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.2.tgz"; - sha512 = "0Vb4T2e0QinNDps1/PxYsZwEzWieVxoW++AAUD3gzg0MfSyRc72MPc27CLOnziiRDyOUl+62gqpnNzq9xaKExA=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.3.tgz"; + sha512 = "e8luB/poIlz6jBsD1Izms+6ElbyzuoFVa4lFVLZnTAChI3UxPdt9p/uTsIO46HyBps/Bk8ocvt3J4YF84jzmvg=="; }; }; - "@parcel/transformer-posthtml-2.8.2" = { + "@parcel/transformer-posthtml-2.8.3" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.2.tgz"; - sha512 = "Ub7o6QlH7+xHHHdhvR7MxTqjyLVqeJopPSzy4yP+Bd72tWVjaVm7f76SUl+p7VjhLTMkmczr9OxG3k0SFHEbGw=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.3.tgz"; + sha512 = "pkzf9Smyeaw4uaRLsT41RGrPLT5Aip8ZPcntawAfIo+KivBQUV0erY1IvHYjyfFzq1ld/Fo2Ith9He6mxpPifA=="; }; }; - "@parcel/transformer-raw-2.8.2" = { + "@parcel/transformer-raw-2.8.3" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.8.2.tgz"; - sha512 = "xSzyZtrfisbx0R7xkuFJ/FksKyWaUFN18F9/0bLF8wo5LrOTQoYQatjun7/Rbq5mELBK/0ZPp7uJ02OqLRd2mA=="; + 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.8.2" = { + "@parcel/transformer-react-refresh-wrap-2.8.3" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.8.2.tgz"; - sha512 = "UXBILYFXaj5zh1DzoYXoS3Wuq1+6WjoRQaFTUA5xrF3pjJb6LAXxWru3R20zR5INHIZXPxdQJB0b+epnmyjK4w=="; + 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.8.2" = { + "@parcel/transformer-svg-2.8.3" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.2.tgz"; - sha512 = "FyliRrNHOF6tGzwHSzA2CTbkq3iMvS27eozf1kFj6gbO8gfJ5HXYoppQrTb237YZ/WXCHqe/3HVmGyJDZiLr+Q=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.3.tgz"; + sha512 = "3Zr/gBzxi1ZH1fftH/+KsZU7w5GqkmxlB0ZM8ovS5E/Pl1lq1t0xvGJue9m2VuQqP8Mxfpl5qLFmsKlhaZdMIQ=="; }; }; - "@parcel/types-2.8.2" = { + "@parcel/types-2.8.3" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.2.tgz"; - sha512 = "HAYhokWxM10raIhqaYj9VR9eAvJ+xP2sNfQ1IcQybHpq3qblcBe/4jDeuUpwIyKeQ4gorp7xY+q8KDoR20j43w=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.3.tgz"; + sha512 = "FECA1FB7+0UpITKU0D6TgGBpGxYpVSMNEENZbSJxFSajNy3wrko+zwBKQmFOLOiPcEtnGikxNs+jkFWbPlUAtw=="; }; }; "@parcel/utils-1.11.0" = { @@ -9580,13 +9796,13 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; - "@parcel/utils-2.8.2" = { + "@parcel/utils-2.8.3" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.2.tgz"; - sha512 = "Ufax7wZxC9FNsUpR0EU7Z22LEY/q9jjsDTwswctCdfpWb7TE/NudOfM9myycfRvwBVEYN50lPbkt1QltEVnXQQ=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.3.tgz"; + sha512 = "IhVrmNiJ+LOKHcCivG5dnuLGjhPYxQ/IzbnF2DKNQXWBTsYlHkJZpmz7THoeLtLliGmSOZ3ZCsbR8/tJJKmxjA=="; }; }; "@parcel/watcher-1.12.1" = { @@ -9625,13 +9841,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@parcel/workers-2.8.2" = { + "@parcel/workers-2.8.3" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.2.tgz"; - sha512 = "Eg6CofIrJSNBa2fjXwvnzVLPKwR/6fkfQTFAm3Jl+4JYLVknBtTSFzQNp/Fa+HUEG889H9ucTk2CBi/fVPBAFw=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.3.tgz"; + sha512 = "+AxBnKgjqVpUHBcHLWIHcjYgKIvHIpZjN33mG5LG9XXvrZiqdWvouEzqEXlVLq5VzzVbKIQQcmsvRy138YErkg=="; }; }; "@peculiar/asn1-schema-2.3.3" = { @@ -9661,6 +9877,15 @@ let sha512 = "eK4C6WTNYxoI7JOabMoZICiyqRRtJB220bh0Mbj5RwRycleZf9BPyZoxsTvpP0FpmVS2aS13NKOuh5/tN3sIRw=="; }; }; + "@phc/format-1.0.0" = { + name = "_at_phc_slash_format"; + packageName = "@phc/format"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz"; + sha512 = "m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ=="; + }; + }; "@phenomnomnominal/tsquery-4.1.1" = { name = "_at_phenomnomnominal_slash_tsquery"; packageName = "@phenomnomnominal/tsquery"; @@ -9715,6 +9940,15 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; + "@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/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"; @@ -9796,6 +10030,15 @@ let 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"; @@ -9823,31 +10066,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.9.0" = { + "@prisma/engines-4.10.1" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "4.9.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.9.0.tgz"; - sha512 = "t1pt0Gsp+HcgPJrHFc+d/ZSAaKKWar2G/iakrE07yeKPNavDP3iVKPpfXP22OTCHZUWf7OelwKJxQgKAm5hkgw=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.10.1.tgz"; + sha512 = "B3tcTxjx196nuAu1GOTKO9cGPUgTFHYRdkPkTS4m5ptb2cejyBlH9X7GOfSt3xlI7p4zAJDshJP4JJivCg9ouA=="; }; }; - "@prisma/prisma-fmt-wasm-4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5" = { + "@prisma/prisma-fmt-wasm-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5"; + version = "4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5.tgz"; - sha512 = "G754IrVEiv0OuhD47d16Jzu3yjFzoQobP97N0nqzFnOAsJehn9KiSNiJ/DM4kp3uL+MqcJzb+YW4l8OqrBoV5A=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19.tgz"; + sha512 = "BUIxpsKel5dwplRrb3JzfLRnRqTStWg1TfJ1is5xYMexJ0U2y1n7O6XRwiuUCQgJjoerPDJ5eZ8X++q1geSUWA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -9940,13 +10183,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@putdotio/api-client-8.33.0" = { + "@putdotio/api-client-8.33.1" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.33.0"; + version = "8.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.0.tgz"; - sha512 = "8GdqRQGfquU8WX1XNOuHnKqG4PJb2fgfS+7OH2g5wHRPKXdeStVbVYIVFxttwIeIcNPNtvjYHKyWhhWkFImEnQ=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.1.tgz"; + sha512 = "16mQ2diUm2/smxLG0PummI3G66GY3Fqtd1D6K64knPvaZUR1bRYhEJaXHdgiQLpl2PNYZl4MCyHXJ217t2RK2w=="; }; }; "@reach/router-1.3.4" = { @@ -9976,13 +10219,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" = { @@ -9994,13 +10237,13 @@ let sha512 = "a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg=="; }; }; - "@redis/client-1.4.2" = { + "@redis/client-1.5.6" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.4.2"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.4.2.tgz"; - sha512 = "oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.6.tgz"; + sha512 = "dFD1S6je+A47Lj22jN/upVU2fj4huR7S9APd7/ziUXsIXDL+11GPYti4Suv5y8FuXaN+0ZG4JF+y1houEJ7ToA=="; }; }; "@redis/graph-1.0.1" = { @@ -10048,13 +10291,13 @@ let sha512 = "pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA=="; }; }; - "@redis/search-1.1.0" = { + "@redis/search-1.1.2" = { name = "_at_redis_slash_search"; packageName = "@redis/search"; - version = "1.1.0"; + version = "1.1.2"; 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.2.tgz"; + sha512 = "/cMfstG/fOh/SsE+4/BQGeuH/JJloeWuH+qJzM8dbxuWvdWibWAOAHHCZTMPhV3xIlH4/cUEIA8OV5QnYpaVoA=="; }; }; "@redis/time-series-1.0.3" = { @@ -10084,13 +10327,112 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.120" = { + "@redocly/openapi-core-1.0.0-beta.123" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.120"; + version = "1.0.0-beta.123"; + src = fetchurl { + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.123.tgz"; + sha512 = "W6MbUWpb/VaV+Kf0c3jmMIJw3WwwF7iK5nAfcOS+ZwrlbxtIl37+1hEydFlJ209vCR9HL12PaMwdh2Vpihj6Jw=="; + }; + }; + "@remix-run/dev-1.13.0" = { + name = "_at_remix-run_slash_dev"; + packageName = "@remix-run/dev"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/dev/-/dev-1.13.0.tgz"; + sha512 = "hPqUjM9RRcz3inBOWqP3GKhggVz0a0ikWaRZpdKrhpQNCNiF6Hunbx876mJERj2YrmIzJ05eoeQmmdF6xcr4qg=="; + }; + }; + "@remix-run/express-1.13.0" = { + name = "_at_remix-run_slash_express"; + packageName = "@remix-run/express"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/express/-/express-1.13.0.tgz"; + sha512 = "MX80PdQu3k1HlQsHlUjPBZe5rpTdn4FqZ5Fg4d85cVi+GMfu3x8n8hB0xbCDLhmRbKTR01PQ01j3UUNtsWWikg=="; + }; + }; + "@remix-run/node-1.13.0" = { + name = "_at_remix-run_slash_node"; + packageName = "@remix-run/node"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/node/-/node-1.13.0.tgz"; + sha512 = "FDvPGaoDyon8UGYQ9DroLtiX8vFa0efBQQSHV3az0s7HbUpugw7BcA6NBW5pIs2z5sszCCeRbAgSIXcETLzfhw=="; + }; + }; + "@remix-run/router-1.3.2" = { + name = "_at_remix-run_slash_router"; + packageName = "@remix-run/router"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz"; + sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA=="; + }; + }; + "@remix-run/serve-1.13.0" = { + name = "_at_remix-run_slash_serve"; + packageName = "@remix-run/serve"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/serve/-/serve-1.13.0.tgz"; + sha512 = "ondApr1ZUbQR6iy1iGvdarBGqvTZdET4wSNFb2+2NrbxW9Y9E3RZ7q+5M5/iiuy1qbdqubqsoq2N7uFk+gDGxw=="; + }; + }; + "@remix-run/server-runtime-1.13.0" = { + name = "_at_remix-run_slash_server-runtime"; + packageName = "@remix-run/server-runtime"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.13.0.tgz"; + sha512 = "gjIW3XCeIlOt3rrOZMD6HixQydRgs1SwYjP99ZAVruG2+gNq/tL2OusMFYTLvtWrybt215tPROyF/6iTLsaO3g=="; + }; + }; + "@remix-run/web-blob-3.0.4" = { + name = "_at_remix-run_slash_web-blob"; + packageName = "@remix-run/web-blob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/web-blob/-/web-blob-3.0.4.tgz"; + sha512 = "AfegzZvSSDc+LwnXV+SwROTrDtoLiPxeFW+jxgvtDAnkuCX1rrzmVJ6CzqZ1Ai0bVfmJadkG5GxtAfYclpPmgw=="; + }; + }; + "@remix-run/web-fetch-4.3.2" = { + name = "_at_remix-run_slash_web-fetch"; + packageName = "@remix-run/web-fetch"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.120.tgz"; - sha512 = "BvasunpVWm5O9F/mW6JmxUqat4XFU5zNnKJkMY6GJ9UYH2UxgKnGaMLWXKtbJEOBnMT12S/p9yeqrQHnk8rGhQ=="; + url = "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.3.2.tgz"; + sha512 = "aRNaaa0Fhyegv/GkJ/qsxMhXvyWGjPNgCKrStCvAvV1XXphntZI0nQO/Fl02LIQg3cGL8lDiOXOS1gzqDOlG5w=="; + }; + }; + "@remix-run/web-file-3.0.2" = { + name = "_at_remix-run_slash_web-file"; + packageName = "@remix-run/web-file"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/web-file/-/web-file-3.0.2.tgz"; + sha512 = "eFC93Onh/rZ5kUNpCQersmBtxedGpaXK2/gsUl49BYSGK/DvuPu3l06vmquEDdcPaEuXcsdGP0L7zrmUqrqo4A=="; + }; + }; + "@remix-run/web-form-data-3.0.4" = { + name = "_at_remix-run_slash_web-form-data"; + packageName = "@remix-run/web-form-data"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/web-form-data/-/web-form-data-3.0.4.tgz"; + sha512 = "UMF1jg9Vu9CLOf8iHBdY74Mm3PUvMW8G/XZRJE56SxKaOFWGSWlfxfG+/a3boAgHFLTkP7K4H1PxlRugy1iQtw=="; + }; + }; + "@remix-run/web-stream-1.0.3" = { + name = "_at_remix-run_slash_web-stream"; + packageName = "@remix-run/web-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/web-stream/-/web-stream-1.0.3.tgz"; + sha512 = "wlezlJaA5NF6SsNMiwQnnAW6tnPzQ5I8qk0Y0pSohm0eHKa2FQ1QhEKLVVcDDu02TmkfHgnux0igNfeYhDOXiA=="; }; }; "@repeaterjs/repeater-3.0.4" = { @@ -10102,6 +10444,123 @@ let sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; }; }; + "@resvg/resvg-js-2.4.1" = { + name = "_at_resvg_slash_resvg-js"; + packageName = "@resvg/resvg-js"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.4.1.tgz"; + sha512 = "wTOf1zerZX8qYcMmLZw3czR4paI4hXqPjShNwJRh5DeHxvgffUS5KM7XwxtbIheUW6LVYT5fhT2AJiP6mU7U4A=="; + }; + }; + "@resvg/resvg-js-android-arm-eabi-2.4.1" = { + name = "_at_resvg_slash_resvg-js-android-arm-eabi"; + packageName = "@resvg/resvg-js-android-arm-eabi"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.4.1.tgz"; + sha512 = "AA6f7hS0FAPpvQMhBCf6f1oD1LdlqNXKCxAAPpKh6tR11kqV0YIB9zOlIYgITM14mq2YooLFl6XIbbvmY+jwUw=="; + }; + }; + "@resvg/resvg-js-android-arm64-2.4.1" = { + name = "_at_resvg_slash_resvg-js-android-arm64"; + packageName = "@resvg/resvg-js-android-arm64"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.4.1.tgz"; + sha512 = "/QleoRdPfsEuH9jUjilYcDtKK/BkmWcK+1LXM8L2nsnf/CI8EnFyv7ZzCj4xAIvZGAy9dTYr/5NZBcTwxG2HQg=="; + }; + }; + "@resvg/resvg-js-darwin-arm64-2.4.1" = { + name = "_at_resvg_slash_resvg-js-darwin-arm64"; + packageName = "@resvg/resvg-js-darwin-arm64"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.4.1.tgz"; + sha512 = "U1oMNhea+kAXgiEXgzo7EbFGCD1Edq5aSlQoe6LMly6UjHzgx2W3N5kEXCwU/CgN5FiQhZr7PlSJSlcr7mdhfg=="; + }; + }; + "@resvg/resvg-js-darwin-x64-2.4.1" = { + name = "_at_resvg_slash_resvg-js-darwin-x64"; + packageName = "@resvg/resvg-js-darwin-x64"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.4.1.tgz"; + sha512 = "avyVh6DpebBfHHtTQTZYSr6NG1Ur6TEilk1+H0n7V+g4F7x7WPOo8zL00ZhQCeRQ5H4f8WXNWIEKL8fwqcOkYw=="; + }; + }; + "@resvg/resvg-js-linux-arm-gnueabihf-2.4.1" = { + name = "_at_resvg_slash_resvg-js-linux-arm-gnueabihf"; + packageName = "@resvg/resvg-js-linux-arm-gnueabihf"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.4.1.tgz"; + sha512 = "isY/mdKoBWH4VB5v621co+8l101jxxYjuTkwOLsbW+5RK9EbLciPlCB02M99ThAHzI2MYxIUjXNmNgOW8btXvw=="; + }; + }; + "@resvg/resvg-js-linux-arm64-gnu-2.4.1" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-gnu"; + packageName = "@resvg/resvg-js-linux-arm64-gnu"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.4.1.tgz"; + sha512 = "uY5voSCrFI8TH95vIYBm5blpkOtltLxLRODyhKJhGfskOI7XkRw5/t1u0sWAGYD8rRSNX+CA+np86otKjubrNg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-musl-2.4.1" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-musl"; + packageName = "@resvg/resvg-js-linux-arm64-musl"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.4.1.tgz"; + sha512 = "6mT0+JBCsermKMdi/O2mMk3m7SqOjwi9TKAwSngRZ/nQoL3Z0Z5zV+572ztgbWr0GODB422uD8e9R9zzz38dRQ=="; + }; + }; + "@resvg/resvg-js-linux-x64-gnu-2.4.1" = { + name = "_at_resvg_slash_resvg-js-linux-x64-gnu"; + packageName = "@resvg/resvg-js-linux-x64-gnu"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.4.1.tgz"; + sha512 = "60KnrscLj6VGhkYOJEmmzPlqqfcw1keDh6U+vMcNDjPhV3B5vRSkpP/D/a8sfokyeh4VEacPSYkWGezvzS2/mg=="; + }; + }; + "@resvg/resvg-js-linux-x64-musl-2.4.1" = { + name = "_at_resvg_slash_resvg-js-linux-x64-musl"; + packageName = "@resvg/resvg-js-linux-x64-musl"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.4.1.tgz"; + sha512 = "0AMyZSICC1D7ge115cOZQW8Pcad6PjWuZkBFF3FJuSxC6Dgok0MQnLTs2MfMdKBlAcwO9dXsf3bv9tJZj8pATA=="; + }; + }; + "@resvg/resvg-js-win32-arm64-msvc-2.4.1" = { + name = "_at_resvg_slash_resvg-js-win32-arm64-msvc"; + packageName = "@resvg/resvg-js-win32-arm64-msvc"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.4.1.tgz"; + sha512 = "76XDFOFSa3d0QotmcNyChh2xHwk+JTFiEQBVxMlHpHMeq7hNrQJ1IpE1zcHSQvrckvkdfLboKRrlGB86B10Qjw=="; + }; + }; + "@resvg/resvg-js-win32-ia32-msvc-2.4.1" = { + name = "_at_resvg_slash_resvg-js-win32-ia32-msvc"; + packageName = "@resvg/resvg-js-win32-ia32-msvc"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.4.1.tgz"; + sha512 = "odyVFGrEWZIzzJ89KdaFtiYWaIJh9hJRW/frcEcG3agJ464VXkN/2oEVF5ulD+5mpGlug9qJg7htzHcKxDN8sg=="; + }; + }; + "@resvg/resvg-js-win32-x64-msvc-2.4.1" = { + name = "_at_resvg_slash_resvg-js-win32-x64-msvc"; + packageName = "@resvg/resvg-js-win32-x64-msvc"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.4.1.tgz"; + sha512 = "vY4kTLH2S3bP+puU5x7hlAxHv+ulFgcK6Zn3efKSr0M0KnZ9A3qeAjZteIpkowEFfUeMPNg2dvvoFRJA9zqxSw=="; + }; + }; "@rollup/plugin-commonjs-22.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -10129,94 +10588,94 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rushstack/heft-config-file-0.11.4" = { + "@rushstack/heft-config-file-0.11.9" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.11.4"; + version = "0.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.4.tgz"; - sha512 = "EmXZbqc1akLjcVPagDKlX/rJFtNlkHwhIsd/GGpOPUgytuYNRmhvdXIy6aGLpGHvJpaDqvDmY6powbeOPrs52A=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.9.tgz"; + sha512 = "01JFmD+G44v5btO0fVIbVBJCfGWLTN2l4Y/+IVU8D9eR14+wYJjV5CO25uxydDynMr334URFcITuzG21L9L0GA=="; }; }; - "@rushstack/node-core-library-3.53.3" = { + "@rushstack/node-core-library-3.55.2" = { name = "_at_rushstack_slash_node-core-library"; packageName = "@rushstack/node-core-library"; - version = "3.53.3"; + version = "3.55.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.53.3.tgz"; - sha512 = "H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q=="; + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.55.2.tgz"; + sha512 = "SaLe/x/Q/uBVdNFK5V1xXvsVps0y7h1sN7aSJllQyFbugyOaxhNRF25bwEDnicARNEjJw0pk0lYnJQ9Kr6ev0A=="; }; }; - "@rushstack/package-deps-hash-3.2.66" = { + "@rushstack/package-deps-hash-4.0.8" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "3.2.66"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-3.2.66.tgz"; - sha512 = "LpsJZ8H7bmEvPEluw9/6Ucf92xiqomZ0P4RSw1YGABYfwt/eOGBYQ2VhyBJsfkQFTRBlIOGCy3GvwvRMRUKz+A=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.8.tgz"; + sha512 = "ad2ZnGWLlcga4GVRVo3mibkTrrnDs8xvABTr79z7zwA43htaVbddwFs3Y+tyqaPo8s92Tqh47jzrGDJTqm6Vyg=="; }; }; - "@rushstack/rig-package-0.3.17" = { + "@rushstack/rig-package-0.3.18" = { name = "_at_rushstack_slash_rig-package"; packageName = "@rushstack/rig-package"; - version = "0.3.17"; + version = "0.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.17.tgz"; - sha512 = "nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA=="; + url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.18.tgz"; + sha512 = "SGEwNTwNq9bI3pkdd01yCaH+gAsHqs0uxfGvtw9b0LJXH52qooWXnrFTRRLG1aL9pf+M2CARdrA9HLHJys3jiQ=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.88.0" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.93.1" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.88.0"; + version = "5.93.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.88.0.tgz"; - sha512 = "gHJZxMNOHnuCCr0MVnWumdHwn3/L9QJYwsw1gmPQ8bIH7sNoXDRNNLTH2PsrpsKdrfZIc1wJx9i//ZoBTUZy0g=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.93.1.tgz"; + sha512 = "urEQ+u7oSdfQnbuuVURbTE3RaJVh7rOSyB8RN2xAYh88HveYMeduq3EU5/0afHKnRs/UJG/iwt6EqCbXRR0J+w=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.88.0" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.93.1" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.88.0"; + version = "5.93.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.88.0.tgz"; - sha512 = "zya+KZVm0Z0OWn+yK4PcBVvUGcygNCU3AqcEy9t/dZJ5iw9uWSvWig4dMgmuJPRtqTL2zDHzGGpxxRzVcl2JhQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.93.1.tgz"; + sha512 = "urbl28yUit+GJ4cgU9iAfWEhu6bP0/kdBaQEsOTYoLYRGnF0uBJ6O+46aMOp4WsqxAk+K+xL6ixw1ZE1BTix6g=="; }; }; - "@rushstack/rush-sdk-5.88.0" = { + "@rushstack/rush-sdk-5.93.1" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.88.0"; + version = "5.93.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.88.0.tgz"; - sha512 = "2oiD3/9XOdsq1uH5TkPIlp8Bur/60QbAEyAjSiHAlaHwFCXBfIpfRwEU5Yqso2QJz4Wk15yKJaOW8or8bF+m1A=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.93.1.tgz"; + sha512 = "rHfGvxyiR6nO5nqruqz/0N3GpAIi4P565FYcadnHsK791ncoh60lBHvQU9b9oRdpZjl2dHjoAQrr+pgSgOY/vw=="; }; }; - "@rushstack/stream-collator-4.0.219" = { + "@rushstack/stream-collator-4.0.227" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.0.219"; + version = "4.0.227"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.219.tgz"; - sha512 = "dY3srmUXpPbrtFoqrXmRzkum6+TGl9XQkkQLM18ZvSQfihg1iNbkR4vxOUlw0YvkQq373TI5lHBoDbfUZB7Mmw=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.227.tgz"; + sha512 = "SLHwjWqUlEfqA6KfLkSmZSr28/2Z5BxWnqtXqtLDFndZUuHUiUDg85w8GtS9MyZXMOfAjj9pS7Xi764bjsOKBA=="; }; }; - "@rushstack/terminal-0.3.88" = { + "@rushstack/terminal-0.5.2" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.3.88"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.3.88.tgz"; - sha512 = "ZY6VqeOG+2mdis+6aV0EMay/aBE5OpQo931b7+YZuP2CxknljUuW/H/WGnnaSvbb54mvX3lmzK088hPfH4XrRQ=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.5.2.tgz"; + sha512 = "zyzUQLUkDhRdKIvEk94WforJHCITedizbr1215pSONRwWS8MQEMTcDY+dBz+U8Ar4s/4oJAtFuT5cHP/uTYYdw=="; }; }; - "@rushstack/ts-command-line-4.13.1" = { + "@rushstack/ts-command-line-4.13.2" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.13.1"; + version = "4.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz"; - sha512 = "UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.2.tgz"; + sha512 = "bCU8qoL9HyWiciltfzg7GqdfODUeda/JpI0602kbN5YH22rzTxyqYvv7aRLENCM7XCQ1VRs7nMkEqgJUOU8Sag=="; }; }; "@sailshq/lodash-3.10.4" = { @@ -10246,22 +10705,22 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@sap/hana-client-2.15.19" = { + "@sap/hana-client-2.15.22" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.15.19"; + version = "2.15.22"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.19.tgz"; - sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.22.tgz"; + sha512 = "mzqWiZ5Its8aCXGdv9EA4ROgwoLdqKoEgbKOnLjUtk2xuliGJ2L9Y54xcMSTtzDAUUEhZCKMDPTXloCqYAUpCQ=="; }; }; - "@schematics/angular-15.1.1" = { + "@schematics/angular-15.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "15.1.1"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.1.tgz"; - sha512 = "Ujo4vt/r3WzIhGn2I2Lt3eOTWSsVxoXfcXxFRuxl3cil/9mH1X66hDTQ2DVYiXPFGcQMjcNaDwlQxyor4yGbqA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.0.tgz"; + sha512 = "KnsG7xyEbjg+6zflANkdynXdS3wi9rSCg+8Y7erKdygD90O/JcT68PcanvTU2GfawDkBtvAR5VMURw2TIfCTnw=="; }; }; "@segment/ajv-human-errors-2.2.0" = { @@ -10300,13 +10759,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.31.1" = { + "@sentry/core-7.39.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.31.1"; + version = "7.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.31.1.tgz"; - sha512 = "quaNU6z8jabmatBTDi28Wpff2yzfWIp/IU4bbi2QOtEiCNT+TQJXqlRTRMu9xLrX7YzyKCL5X2gbit/85lyWUg=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.39.0.tgz"; + sha512 = "45WJIcWWCQnZ8zhHtcrkJjQ4YydmzMWY4pmRuBG7Qp+zrCT6ISoyODcjY+SCHFdvXkiYFi8+bFZa1qG3YQnnYw=="; }; }; "@sentry/hub-6.19.7" = { @@ -10318,13 +10777,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.31.1" = { + "@sentry/integrations-7.39.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.31.1"; + version = "7.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.31.1.tgz"; - sha512 = "El+qzwbiXHPDWg8ZmX+W/kCheoaYoaAJuaG2+l3D5Y4ny8JNYfSMCum9qXVEb8oB98fFHfSEoFzB+z54pH+p3w=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.39.0.tgz"; + sha512 = "NJzPSAI8/YqlHj0ZbrIQrRRb4CE0IhH2UAmp96HbSqXyfiSBrGrEjPurgjKPjkYiWDpUiSolN5bhAxRG5xbe/w=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10345,13 +10804,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.31.1" = { + "@sentry/node-7.39.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.31.1"; + version = "7.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.31.1.tgz"; - sha512 = "4VzfOU1YHeoGkBQmkVXlXoXITf+1NkZEREKhdzgpVAkVjb2Tk3sMoFov4wOKWnNTTj4ka50xyaw/ZmqApgQ4Pw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.39.0.tgz"; + sha512 = "oe1OBxgs6t/FizjxkSPtuvJv5wJMO+mLENZkiE0PpBD56JyZrWK48kYIt2ccWAfk6Vh235/oIpmqET150xB4lQ=="; }; }; "@sentry/types-6.19.7" = { @@ -10363,13 +10822,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.31.1" = { + "@sentry/types-7.39.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.31.1"; + version = "7.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.31.1.tgz"; - sha512 = "1uzr2l0AxEnxUX/S0EdmXUQ15/kDsam8Nbdw4Gai8SU764XwQgA/TTjoewVP597CDI/AHKan67Y630/Ylmkx9w=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.39.0.tgz"; + sha512 = "5Y83Y8O3dT5zT2jTKEIPMcpn5lUm05KRMaCXuw0sRsv4r9TbBUKeqiSU1LjowT8rB/XNy8m7DHav8+NmogPaJw=="; }; }; "@sentry/utils-6.19.7" = { @@ -10381,13 +10840,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.31.1" = { + "@sentry/utils-7.39.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.31.1"; + version = "7.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.31.1.tgz"; - sha512 = "ZsIPq29aNdP9q3R7qIzJhZ9WW+4DzE9g5SfGwx3UjTIxoRRBfdUJUbf7S+LKEdvCkKbyoDt6FLt5MiSJV43xBA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.39.0.tgz"; + sha512 = "/ZxlPgm1mGgmuMckCTc9iyqDuFTEYNEoMB53IjVFz8ann+37OiWB7Py/QV1rEEsv3xKrGbA8thhRhV9E1sjTlQ=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -10516,13 +10975,13 @@ let 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" = { @@ -10849,13 +11308,13 @@ let sha512 = "0p9uXkuB22qGdNfy3VeEhxkU5uwvp/KrBTAbrLBURv6ilxIVwanKwjMc41lQfIVgPGcOkmLbTolfFrSsueu7zA=="; }; }; - "@stoplight/json-3.20.1" = { + "@stoplight/json-3.20.2" = { name = "_at_stoplight_slash_json"; packageName = "@stoplight/json"; - version = "3.20.1"; + version = "3.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json/-/json-3.20.1.tgz"; - sha512 = "FXfud+uWgIj1xv6nUO9WnmgmnVikaxJcbtR4XQt4C42n5c2qua3U05Z/3B57hP5TJRSj+tpn9ID6/bFeyYYlEg=="; + url = "https://registry.npmjs.org/@stoplight/json/-/json-3.20.2.tgz"; + sha512 = "e3Eb/DdLSpJVAsxAG1jKSnl4TVZLl2pH8KsJBWKf5GPCeI58Eo0ZpRTX3HcZ0gBaHWH6CnEHJkCRCONhoFbDIA=="; }; }; "@stoplight/json-ref-readers-1.2.2" = { @@ -10903,22 +11362,22 @@ let sha512 = "z46fnrvraaWMio8Y9RYYkLO+XdmtxOWpy5qNJF3CsmWua0FZ4iOTryb5Cm3GkB0wEtqxNUCBUHvoo4hS6Noyqg=="; }; }; - "@stoplight/spectral-core-1.16.0" = { + "@stoplight/spectral-core-1.16.1" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.16.0.tgz"; - sha512 = "W/NG+wV2UffwLExboqEa04/JbjGhiSTOl7GghLWYP4NKxZGaO6karP6fIxRBOnm34n1qyoZv9thsjSe92MWcDw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.16.1.tgz"; + sha512 = "zPTM/OpjUySMRLPx6ZYy9Gtw+Rkuwg1/gQTKWta+AaJjVTHrNznYQ05gFLYjWwD/LGJMdjwE2IMi7T+Ntef+kw=="; }; }; - "@stoplight/spectral-formats-1.4.0" = { + "@stoplight/spectral-formats-1.5.0" = { name = "_at_stoplight_slash_spectral-formats"; packageName = "@stoplight/spectral-formats"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.4.0.tgz"; - sha512 = "j9VQukDzgqDSi26rK9LqsbXrqtkeIsPSPgEf5/sxRsmeF2bwWUhSjYXgYin4flSZ7owFZjZWQ3o0Qq3iApi2JQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.5.0.tgz"; + sha512 = "VskkdU3qBSvI1dfJ79ysjvTssfNlbA6wrf/XkXK6iTyjfIVqOAWVtjypTb2U95tN/X8IjIBBhNWtZ4tNVZilrA=="; }; }; "@stoplight/spectral-functions-1.7.2" = { @@ -10948,31 +11407,31 @@ let sha512 = "ah6NIB/O1EdEaEu89So3LmtbKRXPVnSElgQ7oBRE9S4/VOedSqyXn+qqMd40tGnO2CsKgZaFUYXdSEHOshpHYw=="; }; }; - "@stoplight/spectral-ruleset-bundler-1.5.0" = { + "@stoplight/spectral-ruleset-bundler-1.5.1" = { name = "_at_stoplight_slash_spectral-ruleset-bundler"; packageName = "@stoplight/spectral-ruleset-bundler"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.5.0.tgz"; - sha512 = "I1ZbhnJtRTi0lG6oXA1r8J6KLxoZKkNB3aSdrNJJTHoo/AccMSMhV4ey8zbLsYNsJ/9ywR5ttkBAbyGuo3Jtxg=="; + url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.5.1.tgz"; + sha512 = "gvlBXkyxLBNdslN/5HEYvCqMr0dvKQwJbbJCKbOvvRTZhhPVzmLb7yavWXjOnRhYn6IAhGAs7u4yhxn7cX/FtQ=="; }; }; - "@stoplight/spectral-ruleset-migrator-1.9.1" = { + "@stoplight/spectral-ruleset-migrator-1.9.2" = { name = "_at_stoplight_slash_spectral-ruleset-migrator"; packageName = "@stoplight/spectral-ruleset-migrator"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.1.tgz"; - sha512 = "TiH7UZIuHX+yb6EsWA9Z2ou455Wtki3z7SCkVRgd7WdzkD7O13R8ywqKoCUJ44UP7iuo1Ejnog18Rw4qJJE/fg=="; + url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.2.tgz"; + sha512 = "FbXsPFt+nikggCF1x+kfaNXpE7Ol/0Um1eR0S1/mNyf/L5R0RBnyqZLvJwC6cU6O49CLAjYy7fCbxgrjNcZvbg=="; }; }; - "@stoplight/spectral-rulesets-1.14.1" = { + "@stoplight/spectral-rulesets-1.15.0" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; - version = "1.14.1"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.14.1.tgz"; - sha512 = "tn6a5fYPFDwEY+/YyK/hcq2gcR5nSIBt7l+JGELb/2RdTzD5ikj2mfl2ua3uxbqOZytftFoOX5ewGZ0qQNrudw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.15.0.tgz"; + sha512 = "xgltt54aQPSKKAxPZ2oCA25X/xmDPVCV1e4qxqH5bw/t7LvDWVusBFUrtcl/5HAJIIgkpxOKXKEc2XRC0ea8HQ=="; }; }; "@stoplight/spectral-runtime-1.1.2" = { @@ -11002,13 +11461,13 @@ let sha512 = "dzyuzvUjv3m1wmhPfq82lCVYGcXG0xUYgqnWfCq3PCVR4BKFhjdkHrnJ+jIDoMKvXb05AZP/ObQF6+NpDo29IQ=="; }; }; - "@stoplight/types-13.8.0" = { + "@stoplight/types-13.9.1" = { name = "_at_stoplight_slash_types"; packageName = "@stoplight/types"; - version = "13.8.0"; + version = "13.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/types/-/types-13.8.0.tgz"; - sha512 = "5glKswz7y9aACh+a+JegID+4xX//4TsIdv7iPl29hWnOoWrnlPbg3Gjc4nYUXXgMSaSlSsA15JU/0+rE89fR4A=="; + url = "https://registry.npmjs.org/@stoplight/types/-/types-13.9.1.tgz"; + sha512 = "IiInrb/xux6Xf+IQW6I8crbsoxLtNa1mDGQyUDbd6Tyfb9fXAGjIaA1Yb5JXNR3ChLypmd3ROUHEUNAanegGVw=="; }; }; "@stoplight/yaml-4.2.3" = { @@ -11029,6 +11488,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"; @@ -11056,130 +11524,229 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc-node/core-1.9.2" = { + "@swc-node/core-1.10.1" = { name = "_at_swc-node_slash_core"; packageName = "@swc-node/core"; - version = "1.9.2"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/core/-/core-1.9.2.tgz"; - sha512 = "tInCla6NO1HEQwhIc/K7PCOu4X3ppqw5xYNEMD7i41SyRuH7yp3u8x7x2cqeAD+6IAhJ5jKDPv2QRLPz7Xt3EA=="; + url = "https://registry.npmjs.org/@swc-node/core/-/core-1.10.1.tgz"; + sha512 = "4aiqLb5Uz+zDt7oIMAtH69+l1BvKV3k7fMYNNLjgdSM7qmFwrpHwu+Ss9nOYPTCFlbKCUMP/70aD5Gt2skmJaw=="; }; }; - "@swc-node/register-1.5.5" = { + "@swc-node/register-1.6.2" = { name = "_at_swc-node_slash_register"; packageName = "@swc-node/register"; - version = "1.5.5"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/register/-/register-1.5.5.tgz"; - sha512 = "SNpbRG8EOXShk3YAnC4suAVovYQ7oFOFdCVBA3J8hkO5qy0WHPVnlnMojTYI+8UT1CrfQ1QSUySaAARRvEdwjg=="; + url = "https://registry.npmjs.org/@swc-node/register/-/register-1.6.2.tgz"; + sha512 = "7kzUOrw5RhSW23VU9RtEOlH71MQZ4cfUPgu245f3tKjYIu1CkxNJVX48FAiGJ6+3QgJMXLr1anT9FeeCmX12xw=="; }; }; - "@swc-node/sourcemap-support-0.2.3" = { + "@swc-node/sourcemap-support-0.3.0" = { name = "_at_swc-node_slash_sourcemap-support"; packageName = "@swc-node/sourcemap-support"; - version = "0.2.3"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.3.0.tgz"; + sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; + }; + }; + "@swc/core-1.3.36" = { + name = "_at_swc_slash_core"; + packageName = "@swc/core"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.2.3.tgz"; - sha512 = "LOC/z9HDUmTqSAF08YIRLThGGNZLdRrjcEdoQu/EANxPSVRedYgh4AiZlOX8sY8Rp1p7S/StOmZogJLuvR4mcA=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.36.tgz"; + sha512 = "Ogrd9uRNIj7nHjXxG66UlKBIcXESUenJ7OD6K2a8p82qlg6ne7Ne5Goiipm/heHYhSfVmjcnRWL9ZJ4gv+YCPA=="; }; }; - "@swc/core-1.3.27" = { + "@swc/core-1.3.37" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.27"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz"; - sha512 = "praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.37.tgz"; + sha512 = "VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw=="; }; }; - "@swc/core-darwin-arm64-1.3.27" = { + "@swc/core-darwin-arm64-1.3.36" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.27"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz"; - sha512 = "IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.36.tgz"; + sha512 = "lsP+C8p9cC/Vd9uAbtxpEnM8GoJI/MMnVuXak7OlxOtDH9/oTwmAcAQTfNGNaH19d2FAIRwf+5RbXCPnxa2Zjw=="; }; }; - "@swc/core-darwin-x64-1.3.27" = { + "@swc/core-darwin-arm64-1.3.37" = { + name = "_at_swc_slash_core-darwin-arm64"; + packageName = "@swc/core-darwin-arm64"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.37.tgz"; + sha512 = "iIyVqqioUpVeT/hbBVfkrsjfCyL4idNH+LVKGmoTAWaTTSB0+UNhNuA7Wh2CqIHWh1Mv7IlumitWPcqsVDdoEw=="; + }; + }; + "@swc/core-darwin-x64-1.3.36" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.27"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz"; - sha512 = "MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.36.tgz"; + sha512 = "jaLXsozWN5xachl9fPxDMi5nbWq1rRxPAt6ISeiYB6RJk0MQKH1634pOweBBem2pUDDzwDFXFw6f22LTm/cFvA=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.27" = { + "@swc/core-darwin-x64-1.3.37" = { + name = "_at_swc_slash_core-darwin-x64"; + packageName = "@swc/core-darwin-x64"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.37.tgz"; + sha512 = "dao5nXPWKxtaxqak4ZkRyBoApNIelW/glantQhPhj0FjMjuIQc+v03ldJ8XDByWOG+6xuVUTheANCtEccxoQBw=="; + }; + }; + "@swc/core-linux-arm-gnueabihf-1.3.36" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.27"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz"; - sha512 = "XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.36.tgz"; + sha512 = "vcBdTHjoEpvJDbFlgto+S6VwAHzLA9GyCiuNcTU2v4KNQlFzhbO4A4PMfMCb/Z0RLJEr16tirfHdWIxjU3h8nw=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.27" = { + "@swc/core-linux-arm-gnueabihf-1.3.37" = { + name = "_at_swc_slash_core-linux-arm-gnueabihf"; + packageName = "@swc/core-linux-arm-gnueabihf"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.37.tgz"; + sha512 = "/mVrc8H/f062CUkqKGmBiil2VIYu4mKawHxERfeP1y38X5K/OwjG5s9MgO9TVxy+Ly6vejwj70kRhSa3hVp1Bw=="; + }; + }; + "@swc/core-linux-arm64-gnu-1.3.36" = { + name = "_at_swc_slash_core-linux-arm64-gnu"; + packageName = "@swc/core-linux-arm64-gnu"; + version = "1.3.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.36.tgz"; + sha512 = "o7f5OsvwWppJo+qIZmrGO5+XC6DPt6noecSbRHjF6o1YAcR13ETPC14k1eC9H1YbQwpyCFNVAFXyNcUbCeQyrQ=="; + }; + }; + "@swc/core-linux-arm64-gnu-1.3.37" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.27"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.37.tgz"; + sha512 = "eRQ3KaZI0j5LidTfOIi/kUVOOMuVmw1HCdt/Z1TAUKoHMLVxY8xcJ3pEE3/+ednI60EmHpwpJRs6LelXyL6uzQ=="; + }; + }; + "@swc/core-linux-arm64-musl-1.3.36" = { + name = "_at_swc_slash_core-linux-arm64-musl"; + packageName = "@swc/core-linux-arm64-musl"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz"; - sha512 = "O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.36.tgz"; + sha512 = "FSHPngMi3c0fuGt9yY2Ubn5UcELi3EiPLJxBSC3X8TF9atI/WHZzK9PE9Gtn0C/LyRh4CoyOugDtSOPzGYmLQg=="; }; }; - "@swc/core-linux-arm64-musl-1.3.27" = { + "@swc/core-linux-arm64-musl-1.3.37" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.27"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.37.tgz"; + sha512 = "w2BRLODyxNQY2rfHZMZ5ir6QrrnGBPlnIslTrgKmVbn1OjZoxUCtuqhrYnCmybaAc4DOkeH02TqynEFXrm+EMw=="; + }; + }; + "@swc/core-linux-x64-gnu-1.3.36" = { + name = "_at_swc_slash_core-linux-x64-gnu"; + packageName = "@swc/core-linux-x64-gnu"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz"; - sha512 = "Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.36.tgz"; + sha512 = "PHSsH2rek5pr3e0K09VgWAbrWK2vJhaI7MW9TPoTjyACYjcs3WwjcjQ30MghXUs2Dc/bXjWAOi9KFTjq/uCyFg=="; }; }; - "@swc/core-linux-x64-gnu-1.3.27" = { + "@swc/core-linux-x64-gnu-1.3.37" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.27"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz"; - sha512 = "S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.37.tgz"; + sha512 = "CfoH8EsZJZ9kunjMUjBNYD5fFuO86zw+K/o4wEw72Yg6ZEiqPmeIlCKU8tpTv4sK+CbhUXrmVzMB5tqsb2jALQ=="; }; }; - "@swc/core-linux-x64-musl-1.3.27" = { + "@swc/core-linux-x64-musl-1.3.36" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.27"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz"; - sha512 = "6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.36.tgz"; + sha512 = "4LfMYQHzozHCKkIcmQy83b+4SpI+mOp6sYNbXqSRz5dYvTVjegKZXe596P1U/87cK2cgR4uYvkgkgBXquaWvwQ=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.27" = { + "@swc/core-linux-x64-musl-1.3.37" = { + name = "_at_swc_slash_core-linux-x64-musl"; + packageName = "@swc/core-linux-x64-musl"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.37.tgz"; + sha512 = "9YPrHYNdoG7PK11gV51GfL45biI2dic+YTqHUDKyykemsD7Ot1zUFX7Ty//pdvpKcKSff6SrHbfFACD5ziNirA=="; + }; + }; + "@swc/core-win32-arm64-msvc-1.3.36" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.27"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz"; - sha512 = "baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.36.tgz"; + sha512 = "7y3dDcun79TAjCyk3Iv0eOMw1X/KNQbkVyKOGqnEgq9g22F8F1FoUGKHNTzUqVdzpHeJSsHgW5PlkEkl3c/d9w=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.27" = { + "@swc/core-win32-arm64-msvc-1.3.37" = { + name = "_at_swc_slash_core-win32-arm64-msvc"; + packageName = "@swc/core-win32-arm64-msvc"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.37.tgz"; + sha512 = "h17Ek8/wCDje6BrXOvCXBM80oBRmTSMMdLyt87whTl5xqYlWYYs9oQIzZndNRTlNpTgjGO8Ns2eo4kwVxIkBIA=="; + }; + }; + "@swc/core-win32-ia32-msvc-1.3.36" = { + name = "_at_swc_slash_core-win32-ia32-msvc"; + packageName = "@swc/core-win32-ia32-msvc"; + version = "1.3.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.36.tgz"; + sha512 = "zK0VR3B4LX5hzQ+7eD+K+FkxJlJg5Lo36BeahMzQ+/i0IURpnuyFlW88sdkFkMsc2swdU6bpvxLZeIRQ3W4OUg=="; + }; + }; + "@swc/core-win32-ia32-msvc-1.3.37" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.27"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz"; - sha512 = "7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.37.tgz"; + sha512 = "1BR175E1olGy/zdt94cgdb6ps/lBNissAOaxyBk8taFpcjy3zpdP30yAoH0GIsC6isnZ5JfArbOJNRXXO5tE0Q=="; }; }; - "@swc/core-win32-x64-msvc-1.3.27" = { + "@swc/core-win32-x64-msvc-1.3.36" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.27"; + version = "1.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz"; - sha512 = "mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.36.tgz"; + sha512 = "2bIjr9DhAckGiXZEvj6z2z7ECPcTimG+wD0VuQTvr+wkx46uAJKl5Kq+Zk+dd15ErL7JGUtCet1T7bf1k4FwvQ=="; + }; + }; + "@swc/core-win32-x64-msvc-1.3.37" = { + name = "_at_swc_slash_core-win32-x64-msvc"; + packageName = "@swc/core-win32-x64-msvc"; + version = "1.3.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.37.tgz"; + sha512 = "1siDQ7dccQ1pesJmgAL3BUBbRPtfbNInOWnZOkiie/DfFqGQ117QKnCVyjUvwFKfTQx1+3UUTDmMSlRd00SlXg=="; }; }; "@swc/helpers-0.4.14" = { @@ -11191,13 +11758,22 @@ let sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.27" = { + "@swc/wasm-1.3.36" = { + name = "_at_swc_slash_wasm"; + packageName = "@swc/wasm"; + version = "1.3.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.36.tgz"; + sha512 = "ZNxKASN36p6GTg2whIRdxQjiQHiDA9JjovRTB3iiHF1cTAEskyrbAdrxFOTrgD0swaSi4+KCujPwpAPpJVyMJg=="; + }; + }; + "@swc/wasm-1.3.37" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.27"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.27.tgz"; - sha512 = "bSFeKxGU2zY/xC3K7Y4sjdtHMgbv6gM2Z01PTMGoC8b2PVubPKeW+BYmprZFSf2eCOsNLZaVzVufdVTQB/ORfg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.37.tgz"; + sha512 = "cRlyLuQrMKE6ppo07jVcYAEK69l+O+g+u5xZBon466vA416IK86jHYxGZqXRP+HEF6P/imntLbJgj9F/AGFEBA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -11236,22 +11812,22 @@ 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.3.0" = { + "@textlint/ast-node-types-13.3.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.3.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.3.0.tgz"; - sha512 = "ke5hlKy/xZ/vQt6j+h4k9GradJPDsV3FKsUqWpCpF/X8qWCU2zM4e1SMUAFjoUcLuF9in+eXIQ71Qm/AdjjkZQ=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.3.1.tgz"; + sha512 = "/qeEjW3hIFpGwESsCkJRroja7mBOlo9wqyx8G4fwayq4FZRvJMm/9DhIo77jd/4wm/VSJcVVr+fs+rVa4jrY5A=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -11263,139 +11839,139 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.5.0" = { + "@textlint/ast-tester-13.3.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.5.0.tgz"; - sha512 = "osHf1OFLC3RnjGyoSBynn2u5pgj7qkik8TNaxgPekVwlLWtJTcyh22PHo+mXPF47XWM5gJQmy/72nUrqtbDMPg=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.3.1.tgz"; + sha512 = "SB41tqnXTkI5qynb0J8Rq1asn8An815I2s/siTBSmuwXD4tmChl6r+mJmAgufMEWVZHfOVCj3lb4eBnFhxUzQA=="; }; }; - "@textlint/ast-traverse-12.5.0" = { + "@textlint/ast-traverse-13.3.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.5.0.tgz"; - sha512 = "TAbfxz8x8Q/sn7D/h7OikzYp5NqPDrRExm3N+3v9yj+gq++fxHtskas48tm1TYcChTMq6BbPU+EGbdlMo3rWWA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.3.1.tgz"; + sha512 = "+aAJMXn+UlpepNAwtcngCfUiBIkoPVUAub1qMM4AL1ZHVh+B5/jyH7OTBuNtTG8Dx7h/1ieUBqrLKWBYvJUwSQ=="; }; }; - "@textlint/config-loader-12.5.0" = { + "@textlint/config-loader-13.3.1" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-12.5.0.tgz"; - sha512 = "g706+XwdsUGpVXzqW7OFcBO8XdxH1AqbD0D3UYEjlfUONXD0c4Bymctdjk49hzOwTVDGqj+CCyvL+cB/X2bG+Q=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.3.1.tgz"; + sha512 = "epA6SgAmKlKZjMVFvGceDl04gsarbfQjuvjoStjPyfUL6oGHUzrSIJmyyPEd3vzLf8bPexj6d5QiyO/sRtfhAQ=="; }; }; - "@textlint/feature-flag-12.5.0" = { + "@textlint/feature-flag-13.3.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.5.0.tgz"; - sha512 = "GdyRbbIsWRuZieWKvRxQA8j5wX5hzq+QqEmuputBrU/KKapNfkg6uNY2GOY6SWvC8QcwD0dYh3Dy1x2txT8p8Q=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.3.1.tgz"; + sha512 = "4L4exU9z5WkKueUEOJ2bLueHgBI9LE/Y8xvEuTDrYwrnftUeqQHS9Ibg9CofJ4dGO+3/vvp0kkV+pLe3+Gn8nw=="; }; }; - "@textlint/fixer-formatter-12.5.1" = { + "@textlint/fixer-formatter-13.3.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.5.1"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.5.1.tgz"; - sha512 = "dzOsgpkl5lIB25BHgW0saAohRW4ZF0s/SyK/FbweYtkDGd190USLGpCibx2M8/mAEFDs5YsnTqZlkbp1FLLuyQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.3.1.tgz"; + sha512 = "7UTmmExilGjqmS3BDgmaA6bZWI2oAs8SELmEN1ykmq/AOpg/EBNaDH8JshUkGgVSfOBmZB2KdliRMaqOx3QZfQ=="; }; }; - "@textlint/kernel-12.5.0" = { + "@textlint/kernel-13.3.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.5.0.tgz"; - sha512 = "9UspUHtS2FShTO9pWnrZjadjIvJzFIdIZDKIYCdZuUdU8dEhJqwOdYosqM4N5Wy40aMKnv4Voxp80Ssaq7zZaA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.3.1.tgz"; + sha512 = "FdLYOJUaa6AWLyj9XgDNnT9SC+W6IWGC4uGYDILumVz8roYAeb1BaA4wXc9Igv2Ja6k7uIdmRSW62jXPP42fAw=="; }; }; - "@textlint/linter-formatter-12.5.0" = { + "@textlint/linter-formatter-13.3.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.5.0.tgz"; - sha512 = "cJ87VGmyqDyjxT2aL3492g/YyGh6AU7/3QqxKN9q8rxJtzaY2e1uJrUKdpj0oOj1xZzYYv8zPeIpFaiFtNW02Q=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.3.1.tgz"; + sha512 = "8FhkQlAi8BvmS2ULygYQ/vLaZb/5nM1uCrMvgIQTqXk1X03Sj1re+XTSylznC7apwQ4Nmxjc7d+28D3eO9jTHQ=="; }; }; - "@textlint/markdown-to-ast-12.5.0" = { + "@textlint/markdown-to-ast-13.3.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.5.0.tgz"; - sha512 = "+fUslPm0+ukMnRVMPUQwKv1DEwmDP/rXFuzc5+k5tCMhighZ/Fv/e3Y9MUe7SgNDte7ilajTa3/uP0Iurr60WA=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.3.1.tgz"; + sha512 = "Xvhg/X1wgS9n3UHExZNgr1PY6cWtzGfObq2yc5A+P/VmagupDFaEBk8kyuARRKf9d7EPnwS6bgqNXvKMCrqYOA=="; }; }; - "@textlint/module-interop-12.5.0" = { + "@textlint/module-interop-13.3.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.5.0.tgz"; - sha512 = "NmkHL5tt+HEqLm00JSW1f03KTbEqOzupliboSZ2HeNhOqZxSX4wR3lBlGqVeVi5dImMWrt40oa+AbkqkD78b9Q=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.3.1.tgz"; + sha512 = "xF6v/RPAgmeEn7JJTYZswyVLvLbB3vKWMr1zgCLjrNaLgFgui5R7bM5Nx2EonY52fkMOTLohyKexCCEX+WiDIw=="; }; }; - "@textlint/source-code-fixer-12.5.0" = { + "@textlint/source-code-fixer-13.3.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.5.0.tgz"; - sha512 = "7LebJ6Y64Rb4fVYyokpU8FnjNLdx+TehcHQJ9L/fi8PYVjpS/08klYtYfRtKWmi/vrWED7U0aGhb8Xr26NuWFw=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.3.1.tgz"; + sha512 = "Kp33HQoPcky04GCYxwfLCRqzu4MLct/s+ar3/wX36hNNZeLoTs7Q3ry8q7ZYZID57hrzEO43/64GjhAJhOxo7Q=="; }; }; - "@textlint/text-to-ast-12.5.0" = { + "@textlint/text-to-ast-13.3.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.5.0.tgz"; - sha512 = "wOWYX+d821ThwNYNk5hfxOBxvkqKUpNOBKkDaic4V+dkuBoAS0D9lE9fA9Ps62kL/I1uQwhU5d4qsAHWnFmQkw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.3.1.tgz"; + sha512 = "jh5v8q9vH37G/sr1z7e/HW6QLqsgwkcC7bCTw8hqCErdJ3SbFFWl8BbwilPN+7aaujFEAc2HbxHfbvEu4/j8Iw=="; }; }; - "@textlint/textlint-plugin-markdown-12.5.0" = { + "@textlint/textlint-plugin-markdown-13.3.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.5.0.tgz"; - sha512 = "1B4mTmA1NOvK2kAk4Rl/TW3QFB80iwhsOKSJ16nCH/yvF82xgH+Gu4gQB/prNpACb4TivmzwvBRYp7rzhOTTyA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.3.1.tgz"; + sha512 = "w3Vjlc064VqKx7y1FNSyh0WeQUfXKbe5uqRQPU/+inzkNs9BWMHofDp36hDZiI4nojQLhm5juBcJbxv7F0g5eg=="; }; }; - "@textlint/textlint-plugin-text-12.5.0" = { + "@textlint/textlint-plugin-text-13.3.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.5.0.tgz"; - sha512 = "ec3rZaJYytoscwpAtuxD4UM3bUPqNAeWKia+LMaVMWREULwKfntlSAqSNmudujEkxdsKr028CkzYuP78q8Xmuw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.3.1.tgz"; + sha512 = "+3AyR+FiJzeZil1N+zyOKF+Tv172p3YKGIMa4QgpeZRupZWqif5/C5n6XmdTDPgrAMXR26kHxaN/S8Ai58UOWA=="; }; }; - "@textlint/types-12.5.0" = { + "@textlint/types-13.3.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.5.0.tgz"; - sha512 = "Po5qOubilL/g3dx+ZUgaQzNXbROADBF4Z5xy7qqgV6pBQIEE/06INZDmmLE1Eesm2zoDpygoG/1f/0/Cy5Yupw=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-13.3.1.tgz"; + sha512 = "iz70e0adTl8ORoBXF9+nZPBdB+qEeXvbkMAoSzF7YEfjMgEbbK5+S+wr7NorS6Mxp/0Vy3VyIjBoKo/b7FPrLA=="; }; }; - "@textlint/utils-12.5.0" = { + "@textlint/utils-13.3.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.5.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.5.0.tgz"; - sha512 = "bQWrQ7Xaru1DRLQhAQQJgNnfGQIwgTgWUigdS5wSwpbmfLDnaMzHu3AG0lk5hEnELMKTCIej5uCR0+YscyUckg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.3.1.tgz"; + sha512 = "gPGSVwWlu+F1jjB5kn9SenNPXvipT/wPIqqME057T2xbYTEV2PjhhS7nD17i0PqplUV4TCu0+Mrq8nyLSO819A=="; }; }; "@tokenizer/token-0.1.1" = { @@ -11767,13 +12343,13 @@ let sha512 = "n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ=="; }; }; - "@types/ejs-3.1.1" = { + "@types/ejs-3.1.2" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz"; - sha512 = "RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA=="; + url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.2.tgz"; + sha512 = "ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g=="; }; }; "@types/es-aggregate-error-1.0.2" = { @@ -11794,13 +12370,13 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.4.10" = { + "@types/eslint-8.21.1" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.4.10"; + version = "8.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz"; - sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.1.tgz"; + sha512 = "rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ=="; }; }; "@types/eslint-scope-3.7.4" = { @@ -11848,6 +12424,15 @@ let sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; }; }; + "@types/estree-jsx-0.0.1" = { + name = "_at_types_slash_estree-jsx"; + packageName = "@types/estree-jsx"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-0.0.1.tgz"; + sha512 = "gcLAYiMfQklDCPjQegGn0TBAn9it05ISEsEhlKQUddIk7o2XDokOcTN7HBO8tznM0D9dGezvHEfRZBfZf6me0A=="; + }; + }; "@types/estree-jsx-1.0.0" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; @@ -11893,6 +12478,15 @@ let sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; + "@types/express-4.17.17" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; + }; + }; "@types/express-serve-static-core-4.17.31" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -11902,13 +12496,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.32" = { + "@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.32"; + version = "4.17.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; - sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; + 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" = { @@ -11920,13 +12514,13 @@ let sha512 = "oq0fy8Jqj19HofanFsZ56o5anMDUQtFO9B3wfLqM9o42RyCe1WT+wRbSvRbL2l8ARZXNaJturHk0b442+0yi+g=="; }; }; - "@types/fs-extra-9.0.13" = { + "@types/fs-extra-11.0.1" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; - version = "9.0.13"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; + url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.1.tgz"; + sha512 = "MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA=="; }; }; "@types/get-stdin-5.0.1" = { @@ -11947,6 +12541,15 @@ let sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; + "@types/glob-8.1.0" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz"; + sha512 = "IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w=="; + }; + }; "@types/hast-2.3.4" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; @@ -11965,15 +12568,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"; @@ -11992,13 +12586,13 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.9" = { + "@types/http-proxy-1.17.10" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.9"; + version = "1.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; - sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz"; + sha512 = "Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g=="; }; }; "@types/inquirer-6.5.0" = { @@ -12010,13 +12604,13 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.5" = { + "@types/inquirer-8.2.6" = { name = "_at_types_slash_inquirer"; packageName = "@types/inquirer"; - version = "8.2.5"; + version = "8.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.5.tgz"; - sha512 = "QXlzybid60YtAwfgG3cpykptRYUx2KomzNutMlWsQC64J/WG/gQSl+P4w7A21sGN0VIxRVava4rgnT7FQmFCdg=="; + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.6.tgz"; + sha512 = "3uT88kxg8lNzY8ay2ZjP44DKcRaTGztqeIvN2zHvhzIBH/uAPaL75aBtdNRKbA7xXoMbBt5kX0M00VKAnfOYlA=="; }; }; "@types/is-empty-1.2.1" = { @@ -12136,6 +12730,15 @@ let sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; }; }; + "@types/jsonfile-6.1.1" = { + name = "_at_types_slash_jsonfile"; + packageName = "@types/jsonfile"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.1.tgz"; + sha512 = "GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png=="; + }; + }; "@types/keyv-3.1.4" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; @@ -12343,15 +12946,6 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-12.20.24" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "12.20.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz"; - sha512 = "yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ=="; - }; - }; "@types/node-14.17.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -12397,22 +12991,22 @@ let sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-16.18.11" = { + "@types/node-16.18.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.11"; + version = "16.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz"; - sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.13.tgz"; + sha512 = "l0/3XZ153UTlNOnZK8xSNoJlQda9/WnYgiTdcKKPJSZjdjI9MU+A9oMXOesAWLSnqAaaJhj3qfQsU07Dr8OUwg=="; }; }; - "@types/node-18.11.16" = { + "@types/node-16.9.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.16"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.16.tgz"; - sha512 = "6T7P5bDkRhqRxrQtwj7vru+bWTpelgtcETAZEUSdq0YISKz8WKdoBukQLYQQ6DFHvU9JRsbFq0JH5C51X2ZdnA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz"; + sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; "@types/node-18.11.18" = { @@ -12424,6 +13018,24 @@ let sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; + "@types/node-18.13.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"; + sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; + }; + }; + "@types/node-18.14.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz"; + sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -12433,13 +13045,13 @@ 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"; + "@types/node-8.10.66" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.66"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-1.6.9.tgz"; - sha512 = "n2r6WLoY7+uuPT7pnEtKJCmPUGyJ+cbyBR8Avnu4+m1nzz7DwBVuyIvvlBzCZ/nrpC7rIgb3D6pNavL7rFEa9g=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz"; + sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; }; }; "@types/node-fetch-2.6.2" = { @@ -12532,15 +13144,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,31 +13153,31 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@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.26" = { + "@types/react-18.0.28" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.0.26"; + version = "18.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz"; - sha512 = "hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz"; + sha512 = "RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew=="; }; }; - "@types/react-dom-18.0.10" = { + "@types/react-dom-18.0.11" = { name = "_at_types_slash_react-dom"; packageName = "@types/react-dom"; - version = "18.0.10"; + version = "18.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz"; - sha512 = "E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg=="; + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz"; + sha512 = "O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw=="; }; }; "@types/request-2.48.8" = { @@ -12613,6 +13216,15 @@ let sha512 = "XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="; }; }; + "@types/rimraf-3.0.2" = { + name = "_at_types_slash_rimraf"; + packageName = "@types/rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ=="; + }; + }; "@types/sass-1.43.1" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; @@ -12667,13 +13279,13 @@ let sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; }; }; - "@types/serve-static-1.15.0" = { + "@types/serve-static-1.15.1" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"; + sha512 = "NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ=="; }; }; "@types/sizzle-2.3.3" = { @@ -12766,15 +13378,6 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/structured-source-3.0.0" = { - name = "_at_types_slash_structured-source"; - packageName = "@types/structured-source"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/structured-source/-/structured-source-3.0.0.tgz"; - sha512 = "8u+Wo5+GEXe4jZyQ8TplLp+1A7g32ZcVoE7VZu8VcxnlaEm5I/+T579R7q3qKN76jmK0lRshpo4hl4bj/kEPKA=="; - }; - }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -12829,6 +13432,15 @@ let sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; }; }; + "@types/triple-beam-1.3.2" = { + name = "_at_types_slash_triple-beam"; + packageName = "@types/triple-beam"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz"; + sha512 = "txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="; + }; + }; "@types/tunnel-0.0.3" = { name = "_at_types_slash_tunnel"; packageName = "@types/tunnel"; @@ -12964,13 +13576,13 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; - "@types/which-2.0.1" = { + "@types/which-2.0.2" = { name = "_at_types_slash_which"; packageName = "@types/which"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/which/-/which-2.0.1.tgz"; - sha512 = "Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ=="; + url = "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz"; + sha512 = "113D3mDkZDjo+EeUEHCFy0qniNc1ZpecGiAU7WSo7YDoSzolZIQKpYFHrPpjkB2nuyahcKfrmLXeQlh7gqJYdw=="; }; }; "@types/ws-6.0.4" = { @@ -12982,15 +13594,6 @@ let sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; - "@types/ws-8.5.3" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - }; "@types/ws-8.5.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -13054,13 +13657,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.48.2" = { + "@typescript-eslint/eslint-plugin-5.54.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.2.tgz"; - sha512 = "sR0Gja9Ky1teIq4qJOl0nC+Tk64/uYdX+mi+5iB//MH8gwyx8e3SOyhEzeLZEFEEfCaLf8KJq+Bd/6je1t+CAg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz"; + sha512 = "+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13081,13 +13684,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.48.2" = { + "@typescript-eslint/parser-5.54.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.2.tgz"; - sha512 = "38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz"; + sha512 = "aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13099,22 +13702,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.48.2" = { + "@typescript-eslint/scope-manager-5.54.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz"; - sha512 = "zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz"; + sha512 = "VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg=="; }; }; - "@typescript-eslint/type-utils-5.48.2" = { + "@typescript-eslint/type-utils-5.54.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz"; - sha512 = "QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz"; + sha512 = "WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13126,13 +13729,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.48.2" = { + "@typescript-eslint/types-5.54.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz"; - sha512 = "hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz"; + sha512 = "nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13144,22 +13747,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.48.2" = { + "@typescript-eslint/typescript-estree-5.54.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz"; - sha512 = "bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz"; + sha512 = "X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ=="; }; }; - "@typescript-eslint/utils-5.48.2" = { + "@typescript-eslint/utils-5.54.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz"; - sha512 = "2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz"; + sha512 = "cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -13171,13 +13774,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.48.2" = { + "@typescript-eslint/visitor-keys-5.54.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.48.2"; + version = "5.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz"; - sha512 = "z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz"; + sha512 = "xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13225,40 +13828,94 @@ let sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; }; }; - "@vercel/build-utils-5.9.0" = { + "@vanilla-extract/babel-plugin-debug-ids-1.0.1" = { + name = "_at_vanilla-extract_slash_babel-plugin-debug-ids"; + packageName = "@vanilla-extract/babel-plugin-debug-ids"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.1.tgz"; + sha512 = "ynyKqsJiMzM1/yiIJ6QdqpWKlK4IMJJWREpPtaemZrE1xG1B4E/Nfa6YazuDWjDkCJC1tRIpEGnVs+pMIjUxyw=="; + }; + }; + "@vanilla-extract/css-1.9.5" = { + name = "_at_vanilla-extract_slash_css"; + packageName = "@vanilla-extract/css"; + version = "1.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.9.5.tgz"; + sha512 = "aVSv6q24zelKRtWx/l9yshU3gD1uCDMZ2ZGcIiYnAcPfyLryrG/1X5DxtyiPKcyI/hZWoteHofsN//2q9MvzOA=="; + }; + }; + "@vanilla-extract/integration-6.1.0" = { + name = "_at_vanilla-extract_slash_integration"; + packageName = "@vanilla-extract/integration"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.1.0.tgz"; + sha512 = "7gDkOibk/DraG35ZpiAYqWd33wLA6YRnieC5vw7ItoFEzCv9bUaS9c+ZyktyWW3nRnL+e7Pc6FS6l7MKgEsX1w=="; + }; + }; + "@vanilla-extract/private-1.0.3" = { + name = "_at_vanilla-extract_slash_private"; + packageName = "@vanilla-extract/private"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz"; + sha512 = "17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ=="; + }; + }; + "@vercel/build-utils-6.3.1" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "5.9.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-5.9.0.tgz"; - sha512 = "LJRhd/ritLGHH+YvZ+DC7AW3Jr87UZHFHz2h2ENULDZ8qAo5LJH+y+Cg11uxfXkhQKK2f/AZQJXyKVyu1BBwdQ=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.3.1.tgz"; + sha512 = "mFd6QZJX1SaweTa9BB+zO6OyGeQWsk+z0LFhsSblnWue2wjmeZ3z3TBt8V/Wlae5NMg4+E2AFcDf/lr3ENeCfg=="; }; }; - "@vercel/go-2.2.30" = { + "@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.1.9" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; + packageName = "@vercel/gatsby-plugin-vercel-builder"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.1.9.tgz"; + sha512 = "Djd8a59niZeZL4iX1by+zeD0LM1HIkBi8SE/9owKlt8e1CJbo0VBat+uVEUTQ+Vfq+E2gcCDodimSlbNz09JnA=="; + }; + }; + "@vercel/go-2.3.8" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.2.30"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.30.tgz"; - sha512 = "ODz5UrlBzYIpPVjfMZVofQGfsqHSn2WjLdHGw58UAgQH+rUYSWBwqsXvIcYT3QXy2hKCZGguahqeT0qXSqBpTw=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.3.8.tgz"; + sha512 = "gL+bqelYG/YBiZFc1A+XNOOrHwd7EBoGH4KeqQi9I2NH6gn5sMg7/dvg2C92nf8Hzz6Q4BkVx1QB4Qo0ldazXQ=="; }; }; - "@vercel/hydrogen-0.0.44" = { + "@vercel/hydrogen-0.0.54" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "0.0.44"; + version = "0.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.44.tgz"; - sha512 = "7RnSk10nE0tNLHcTCUTWCpO5rfcMQ7N6ECTaeozWcYWs2/Fol7tLjc9Uowo1ZqnV7wTm5mE/ooCD2FNlaKmiaA=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.54.tgz"; + sha512 = "oNgwer0JlmRS9MomYE202basrsHpMrA4uU+LEC2uPyhLk7HMac4DiIXXt59ddY/UJUiN6+F1UX48x1UXdmAW8Q=="; }; }; - "@vercel/next-3.3.15" = { + "@vercel/next-3.6.1" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.3.15"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.15.tgz"; - sha512 = "zfJ54JkalkMvxE4e0/OAL0sPEm9AplUCBR2Bq6JhGrOEaxBGdCyv2RPBAyZOV1JL+m9y06hJpWyFQGsOtI5RgA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.6.1.tgz"; + sha512 = "aEtq99LHqnZ5fYdodaKPKGGgoKnzRYJPYhl5WX+j0cpF3LTYlnKbMnmelY5RGbfyYvkKzLCrLTg40qhMi+JFGg=="; }; }; "@vercel/nft-0.22.5" = { @@ -13270,85 +13927,85 @@ let sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.8.13" = { + "@vercel/node-2.9.8" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.8.13"; + version = "2.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.13.tgz"; - sha512 = "RI0Ig2v7MK4N3EVPHKNEj3IK+D0/GtIbMFZB0WcUgE77UvdD++tf5JWTlqrwxPOYOxO/J0/0L8WZXTAzpPgdGA=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.9.8.tgz"; + sha512 = "GqRqUmdT5/l8XY68ulUJKgijCrWw/p2sgxzrq5Mj40B2nOC5CQa0HLLiNd/Q+jnIrrJkdBpB1xeVkebEv1mgng=="; }; }; - "@vercel/node-bridge-3.1.9" = { + "@vercel/node-bridge-3.1.12" = { name = "_at_vercel_slash_node-bridge"; packageName = "@vercel/node-bridge"; - version = "3.1.9"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.9.tgz"; - sha512 = "07Bgb6jm8OMTlxGRC4kOY0ewi4xLtMcK3z45T+GKRO7oKeA4vhRGFbT5BsJKF3V5/nj6TYAsWsErBf4RGVSBcw=="; + url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.12.tgz"; + sha512 = "RYMYzyR/QyT+1JeOHBtBxwDc8XszYbChq0b18uqt4/PQ8rUWdcHMUkUoNjScB6RmqScX+vTzYj8eLS8UfHxnaQ=="; }; }; - "@vercel/python-3.1.40" = { + "@vercel/python-3.1.50" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.40"; + version = "3.1.50"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.40.tgz"; - sha512 = "Cns+KTVBloQXtls72KaaXQ2gHgsH5/Mm7lwv80ysTZvp5x6loh+Faf6QJq93LxYh9lz2wqWjO+nq3XJ77N5twg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.50.tgz"; + sha512 = "J9DMiQNoED+gVzX4T7MjdOeMn9Fy+BhXC0zT+EkxFoTWpEDYx6zzACdOMwiKgjetLujRWeMWQXT++64oeArBHA=="; }; }; - "@vercel/redwood-1.0.51" = { + "@vercel/redwood-1.1.6" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.0.51"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.51.tgz"; - sha512 = "0i9+qe4branWzMfeLbIazvomxCX7scASJ9bqm2oMCdMxZrXeB3/hwRCUUdGJGXmRsrGp7ATsXjxynd+D1wZymw=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.1.6.tgz"; + sha512 = "b+G/bptoxoqVnA+CvZn1AwiPc0ODjXEX7vb+qwJ3CDD7FP4axF6gNM100g5Q6W+qhEWoQ7ssIY/njnpQgPWrmQ=="; }; }; - "@vercel/remix-1.2.5" = { + "@vercel/remix-1.4.1" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.2.5"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.5.tgz"; - sha512 = "jbTDy+Ar+DRbk2UJqazOcGs1lgWhTSf5yvO27ZyN+mM4diTKg834McjJ9IUhpEyBGejS3+dPaz7U9dn+Bfbztw=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.4.1.tgz"; + sha512 = "Tmq8zDZIW3feYMzVcMVTDF1hKiHdZXXvwQpNXy5oPJOK6j1mNXcr51z0LZMPIcxLUns8ZC1h18xvDl0x04j63A=="; }; }; - "@vercel/routing-utils-2.1.8" = { + "@vercel/routing-utils-2.1.9" = { name = "_at_vercel_slash_routing-utils"; packageName = "@vercel/routing-utils"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.1.8.tgz"; - sha512 = "rng+qyQ0VpnBjO2R7GQlpAdEx+yyvrcEp6XNe+4q6e+oW0n2H6dm6SLFEBA6B1QmHX4OTTCkq1GIiKsK6ENw4Q=="; + url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.1.9.tgz"; + sha512 = "DVE9coIpicZQBKWL0DgIe5wnZsi4SRPbD51XxFCvvnRyYxG34DY09R0aMz4ZQQdPK2asJF57i5rbcplXYaEOkg=="; }; }; - "@vercel/ruby-1.3.56" = { + "@vercel/ruby-1.3.67" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.56"; + version = "1.3.67"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.56.tgz"; - sha512 = "fYjyU8ZhsouRC5WWZBuN8FQG+eHGTFzl8sCwCGdeaykJOpVa0FW9Xl/fDjBpAQoicbrdZhDH2HaEfnjBkLVIeA=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.67.tgz"; + sha512 = "2j9QO8U59wRBbOWwcbnjpqteguD11GbPhJLNRZ9zJsp5Ku1YGF2NY975EwIKlDMra8WCehHAkm7JuvNCPunwRg=="; }; }; - "@vercel/static-build-1.1.7" = { + "@vercel/static-build-1.3.12" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.1.7"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.1.7.tgz"; - sha512 = "l0QBOuRD6NjewHyPTSMxk96MVJbeem46cjqKb9AB9Ochf2nb20JGZaON0VSqeJRtrQR19gWiqgTT+glz1G098A=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.12.tgz"; + sha512 = "KufcZlf4qamzUuBVa3+7UHy62WfvMqrP5xid91DNCVFLnTzauoViMhufMU601SwERxH1fPYS78mzsQd1h+5Mfw=="; }; }; - "@vercel/static-config-2.0.11" = { + "@vercel/static-config-2.0.13" = { name = "_at_vercel_slash_static-config"; packageName = "@vercel/static-config"; - version = "2.0.11"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.11.tgz"; - sha512 = "dw6CAJ7U2AcQpjZV9YfOyz2wTseSFdkT3qivBg2GjHtVyd5wdY7vkQ9seLKEckYhFx3CjQ29IhzhDND9F5oINw=="; + url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.13.tgz"; + sha512 = "09bVISGyhRMoL6gQTfM7n89SeUmyOlIzVMo2oNOj3thy4AIKGuN0SzEp0qNRw8d9j07rifp9JPD4rOuDRx4+eA=="; }; }; "@vscode/emmet-helper-2.8.6" = { @@ -13369,13 +14026,22 @@ let sha512 = "E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="; }; }; - "@vscode/test-electron-2.2.2" = { + "@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.3" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.2.tgz"; - sha512 = "s5d2VtMySvff0UgqkJ0BMCr1es+qREE194EAodGIefq518W53ifvv69e80l9e2MrYJEqUUKwukE/w3H9o15YEw=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.3.tgz"; + sha512 = "7DmdGYQTqRNaLHKG3j56buc9DkstriY4aV0S3Zj32u0U9/T0L8vwWAC9QGCh1meu1VXDEla1ze27TkqysHGP0Q=="; }; }; "@vue/cli-overlay-4.5.19" = { @@ -13477,22 +14143,22 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.2.45" = { + "@vue/compiler-core-3.2.47" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz"; - sha512 = "rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.47.tgz"; + sha512 = "p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig=="; }; }; - "@vue/compiler-dom-3.2.45" = { + "@vue/compiler-dom-3.2.47" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"; - sha512 = "tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz"; + sha512 = "dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ=="; }; }; "@vue/compiler-sfc-2.7.14" = { @@ -13504,22 +14170,22 @@ let sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; }; }; - "@vue/compiler-sfc-3.2.45" = { + "@vue/compiler-sfc-3.2.47" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"; - sha512 = "1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz"; + sha512 = "rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ=="; }; }; - "@vue/compiler-ssr-3.2.45" = { + "@vue/compiler-ssr-3.2.47" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"; - sha512 = "6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz"; + sha512 = "wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -13558,22 +14224,22 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/reactivity-transform-3.2.45" = { + "@vue/reactivity-transform-3.2.47" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz"; - sha512 = "BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz"; + sha512 = "m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA=="; }; }; - "@vue/shared-3.2.45" = { + "@vue/shared-3.2.47" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.45"; + version = "3.2.47"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz"; - sha512 = "Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz"; + sha512 = "BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="; }; }; "@vue/web-component-wrapper-1.3.0" = { @@ -13585,6 +14251,15 @@ let sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; }; }; + "@web3-storage/multipart-parser-1.0.0" = { + name = "_at_web3-storage_slash_multipart-parser"; + packageName = "@web3-storage/multipart-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz"; + sha512 = "BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw=="; + }; + }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -14305,13 +14980,31 @@ let sha512 = "GWZQKroPES4z91Ijx6zsOsb7+USOxjy66s8AoTWg0HiBBdfnbtf9aeh3Uav0MgYn4BL8Q7tVSUpd0gGpngKGEQ=="; }; }; - "@whatwg-node/fetch-0.6.2" = { + "@whatwg-node/events-0.0.2" = { + name = "_at_whatwg-node_slash_events"; + packageName = "@whatwg-node/events"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@whatwg-node/events/-/events-0.0.2.tgz"; + sha512 = "WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w=="; + }; + }; + "@whatwg-node/fetch-0.8.1" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.6.2"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.6.2.tgz"; - sha512 = "fCUycF1W+bI6XzwJFnbdDuxIldfKM3w8+AzVCLGlucm0D+AQ8ZMm2j84hdcIhfV6ZdE4Y1HFVrHosAxdDZ+nPw=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.8.1.tgz"; + sha512 = "Fkd1qQHK2tAWxKlC85h9L86Lgbq3BzxMnHSnTsnzNZMMzn6Xi+HlN8/LJ90LxorhSqD54td+Q864LgwUaYDj1Q=="; + }; + }; + "@whatwg-node/node-fetch-0.3.0" = { + name = "_at_whatwg-node_slash_node-fetch"; + packageName = "@whatwg-node/node-fetch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.0.tgz"; + sha512 = "mPM8WnuHiI/3kFxDeE0SQQXAElbz4onqmm64fEGCwYEcBes2UsvIDI8HwQIqaXCH42A9ajJUPv4WsYoN/9oG6w=="; }; }; "@withgraphite/graphite-cli-routes-0.23.0" = { @@ -14656,22 +15349,22 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.35" = { + "@yarnpkg/parsers-3.0.0-rc.39" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.35"; + version = "3.0.0-rc.39"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.35.tgz"; - sha512 = "J6ySgEdQUqAmlttvZOoXOEsrDTAnHyR/MtEvuAG5a+gwKY/2Cc7xn4CWcpgfuwkp+0a4vXmt2BDwzacDoGDN1g=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.39.tgz"; + sha512 = "BsD4zq3EVmaHqlynXTceNuEFAtrfToV4fI9GA54moKlWZL4Eb2eXrhgf1jV2nMYx18SZxYO4Jc5Kf1sCDNRjOg=="; }; }; - "@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,13 +15376,13 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; - "@zkochan/cmd-shim-5.4.0" = { + "@zkochan/cmd-shim-5.4.1" = { name = "_at_zkochan_slash_cmd-shim"; packageName = "@zkochan/cmd-shim"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-5.4.0.tgz"; - sha512 = "Ldv5OxVJNNoHgwDPkJVdTT4l31hA4YLhJxpNNx3I5C9E3xXej66w6sQTL9Q/ZNVVTLplqDxTy+UjcnPx6cxwuA=="; + 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" = { @@ -14701,76 +15394,85 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-10.4.0" = { + "@zwave-js/cc-10.10.0" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.4.0.tgz"; - sha512 = "qKisjEz2fOCCNp8LREYyRZu0pib38lqO+pnJwZs5Gjni0EnEC3A1FW470AXPUVJw2cbGtFDaYnGfTW72xeJSpg=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.10.0.tgz"; + sha512 = "ZT+V5+llCZknSe5CwaVom5PpEFbFfm6pXbzS6nJ2Nt5m7//G4qExK+356qOfE7vsEz9KgIDEbDGfEtfhq/heUQ=="; }; }; - "@zwave-js/config-10.4.0" = { + "@zwave-js/config-10.10.0" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.4.0.tgz"; - sha512 = "Z3Gc8gmgUJUwP/on/EDgobksfazOxOxfxUGHDH/jfqxsF0adFSdhSeatF9cCfh5YM+UWFYEZLgVykbKtIW9XoA=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.10.0.tgz"; + sha512 = "nlCYS8SZol0IM66OFgOF2eFC0NRc4qreVrC2NfUTdxy3plClSOhsQeZsREyvXyxEtrhMaW5G93M6Ad7+YbIh7Q=="; }; }; - "@zwave-js/core-10.4.0" = { + "@zwave-js/core-10.10.0" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.4.0.tgz"; - sha512 = "/3gKj8dzxn1T3ymiMjNPN/ficAEti9cnCVxQvjjRyqNsBe6onsN+n4Te+Ed7LuSybGH+v9G8iH29YkjjgzU66g=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.10.0.tgz"; + sha512 = "jwejHy/HEAHTCIJJkAF+4b8F1mTK2xVLdZzdPNh4t9RBRpFH+cxuKS4DP7iEHAyDROvyOmzW//QOxZMHEmbqwg=="; }; }; - "@zwave-js/host-10.4.0" = { + "@zwave-js/host-10.10.0" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.4.0.tgz"; - sha512 = "NLL18cmaXZcbT/rQ/vdVCvRo9GQF5xYWGDxgja6zjuAR5xrsYyfyvI1lJuiOD9i9iPmTiu1XFv1PfJl54Ird3A=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.10.0.tgz"; + sha512 = "SrbfE3um8S1lFhW9WaZcbIIzqCirB0ej6U64azhxSQLRWDj0mbkqso1FZvbqzOgT67HTFejiICDe6MqVnl2beA=="; }; }; - "@zwave-js/nvmedit-10.4.0" = { + "@zwave-js/nvmedit-10.10.0" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.4.0.tgz"; - sha512 = "fxhIxRHBcDESafhdE6Qnil+IbQig+XncUMcVXm1m77/fT8Ee3QXLPbqte0O1+10KcnHdult3t9cB0hlBIk2OhA=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.10.0.tgz"; + sha512 = "EGSXNUptfwQPONtrZPkYkV3wefaKrheEx2GheH11L9v4Bg1KfxVMLJh92p9c0/sGZTayZnAR0q5Pt41BeuMhBA=="; }; }; - "@zwave-js/serial-10.4.0" = { + "@zwave-js/serial-10.10.0" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.4.0.tgz"; - sha512 = "8NPH7MqjSpd8HeGTJYfw+bmCPpadMebpSlJsf2n/vAbMU6E8Sp1Gi3X347MzdMxDAQOzF3YaV9UBmGcRcxvfBQ=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.10.0.tgz"; + sha512 = "3Bp9lR3uojiEyZV6wtj8RDijRDhcGPhK3xu0wQZ2OEYZOKuGyGB1XNpVaRhowj26UQ2e6ztcz8S/tr8poNRDXA=="; }; }; - "@zwave-js/shared-10.4.0" = { + "@zwave-js/shared-10.10.0" = { name = "_at_zwave-js_slash_shared"; packageName = "@zwave-js/shared"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.4.0.tgz"; - sha512 = "uuLYDDNqIkagJ40piNMhljVG9OepI31/labLnivJByxGdELJnIXGRKLQ8ZKvm/5Ba8qXpEw/t7UrV2plfP/QCg=="; + url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-10.10.0.tgz"; + sha512 = "UOEyaQ60nRO9zWlsOyK3prYZCUtjfbXNPd/mZSzWrWeZcNzKcU5VdZGHHJnbCDf3wS0zyOhB66afBlY7O0RpuQ=="; }; }; - "@zwave-js/testing-10.4.0" = { + "@zwave-js/testing-10.10.0" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.4.0.tgz"; - sha512 = "5rCxp7EJXK6B8td4SdVyqmZL+4WL3p7blVLKjT3LpZXcMolOTeEEptggJ9yhmFm2pUhkOHSoE12FwroJbRObXw=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.10.0.tgz"; + sha512 = "VylUNmdrGMVaUFOvFqZuQGa9fLmZ6HPhrgLHcECbn7YBjgk7kz2Ha+irrsfny73zYT0t/BtYlZl3M54I2S5ahQ=="; + }; + }; + "@zxing/text-encoding-0.9.0" = { + name = "_at_zxing_slash_text-encoding"; + packageName = "@zxing/text-encoding"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz"; + sha512 = "U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA=="; }; }; "CSSselect-0.4.1" = { @@ -15034,13 +15736,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=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; }; "acorn-dynamic-import-3.0.0" = { @@ -15088,6 +15790,15 @@ let sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; }; + "acorn-globals-7.0.1" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz"; + sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; + }; + }; "acorn-import-assertions-1.8.0" = { name = "acorn-import-assertions"; packageName = "acorn-import-assertions"; @@ -15205,13 +15916,13 @@ let sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; }; }; - "addons-linter-5.23.0" = { + "addons-linter-5.27.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "5.23.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.23.0.tgz"; - sha512 = "Vo6+5YlM2Ge3yYMY+gNg9Smcfcl1J0ZMfGVXnGJjUwDVHuszHVIvurunQuJURnO4FR1gi4Vy1sWye8ArRL5LOw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.27.0.tgz"; + sha512 = "gDgl0FcmhZ5cs3St0qAaO9J1BoektwnY+p4dVgcvPu8WaBqH9MG2fk0gL/evCpoHSXeSw15GA87n8Y7zy7raVQ=="; }; }; "addons-moz-compare-1.3.0" = { @@ -15223,13 +15934,13 @@ let 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" = { @@ -15241,15 +15952,6 @@ let sha512 = "ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="; }; }; - "address-1.1.2" = { - name = "address"; - packageName = "address"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.1.2.tgz"; - sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; - }; - }; "address-1.2.2" = { name = "address"; packageName = "address"; @@ -15349,13 +16051,13 @@ let sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; }; }; - "aglfn-1.0.2" = { - name = "aglfn"; - packageName = "aglfn"; + "ahocorasick-1.0.2" = { + name = "ahocorasick"; + packageName = "ahocorasick"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/aglfn/-/aglfn-1.0.2.tgz"; - sha512 = "HUvXd7sNFa1aHtYgJnln2jPwzq7UAAOXhYH/+AY6BMdfXxprMxG8IrczlZn6MjjIWpYhpKR5mHwDWTgehZKO4g=="; + url = "https://registry.npmjs.org/ahocorasick/-/ahocorasick-1.0.2.tgz"; + sha512 = "hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA=="; }; }; "airplay-js-0.2.16" = { @@ -15439,15 +16141,6 @@ 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.12.0" = { name = "ajv"; packageName = "ajv"; @@ -15538,15 +16231,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 +16681,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"; @@ -16420,6 +17113,15 @@ let sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="; }; }; + "argon2-0.30.3" = { + name = "argon2"; + packageName = "argon2"; + version = "0.30.3"; + src = fetchurl { + url = "https://registry.npmjs.org/argon2/-/argon2-0.30.3.tgz"; + sha512 = "DoH/kv8c9127ueJSBxAVJXinW9+EuPA3EMUxoV2sAY1qDE5H9BjTyVF/aD2XyHqbqUWabgBkIfcP3ZZuGhbJdg=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -17194,6 +17896,15 @@ let sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; }; }; + "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=="; + }; + }; "ast-types-0.8.15" = { name = "ast-types"; packageName = "ast-types"; @@ -17365,13 +18076,13 @@ let sha512 = "uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw=="; }; }; - "async-each-1.0.3" = { + "async-each-1.0.6" = { name = "async-each"; packageName = "async-each"; - version = "1.0.3"; + version = "1.0.6"; 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.6.tgz"; + sha512 = "c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg=="; }; }; "async-each-series-0.1.1" = { @@ -17464,22 +18175,31 @@ let sha512 = "coglx5yIWuetakm3/1dsX9hxCNox22h7+V80RQOu2XUUMidtArxKoZoOtHUPuR84SycKTXzgGzAUR5hJxujyJQ=="; }; }; - "async-mutex-0.1.4" = { + "async-mutex-0.3.2" = { name = "async-mutex"; packageName = "async-mutex"; - version = "0.1.4"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.4.tgz"; - sha512 = "zVWTmAnxxHaeB2B1te84oecI8zTDJ/8G49aVBblRX6be0oq6pAybNcUSxwfgVOmOjSCvN4aYZAqwtyNI8e1YGw=="; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz"; + sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA=="; }; }; - "async-mutex-0.3.2" = { + "async-mutex-0.4.0" = { name = "async-mutex"; packageName = "async-mutex"; - version = "0.3.2"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz"; - sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA=="; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.0.tgz"; + sha512 = "eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA=="; + }; + }; + "async-request-handler-0.8.8" = { + name = "async-request-handler"; + packageName = "async-request-handler"; + version = "0.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/async-request-handler/-/async-request-handler-0.8.8.tgz"; + sha512 = "B2vn6+gVOWTlRGfpTSWi0Ye/oWwaQ7LFKm1NzkQQFGIQijnz4v+DopeTu4uveqoQf1xQaQP5QaZNQJnWQxs/3w=="; }; }; "async-retry-1.3.3" = { @@ -17527,15 +18247,6 @@ let sha512 = "eKEYj1+jDgQ15jazjmelcPGXO77pa5epzlyXyEQcwwLtnACtBTCrxaW+96uXF2j4rzIikmUtVlzXwejx6iIhWw=="; }; }; - "asyncjs-util-1.2.10" = { - name = "asyncjs-util"; - packageName = "asyncjs-util"; - version = "1.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.10.tgz"; - sha512 = "p4U6HQUw4k/xZKrwEQO7ZuF+8/OkzAQS4iAMhFUBGtSD8p3KkKBaTBuUTEH8TWKB3ArNbrP0401TGE2vIiU7uQ=="; - }; - }; "asyncjs-util-1.2.11" = { name = "asyncjs-util"; packageName = "asyncjs-util"; @@ -17644,6 +18355,15 @@ let sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; }; }; + "atomically-2.0.1" = { + name = "atomically"; + packageName = "atomically"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/atomically/-/atomically-2.0.1.tgz"; + sha512 = "sxBhVZUFBFhqSAsYMM3X2oaUi2NVDJ8U026FsIusM8gYXls9AYs/eXzgGrufs1Qjpkxi9zunds+75QUFz+m7UQ=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -17716,13 +18436,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.15.7" = { + "aws-crt-1.15.9" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.15.7"; + version = "1.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.7.tgz"; - sha512 = "wq26kPlK6PYfJ1A4ckW5HDaf+mgkKqjDf3GoYdvQhGR97riO7mLltRRtbe1sPJ0CRUolA1ypt49HRvf1N/yp2g=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.9.tgz"; + sha512 = "tInTJwASvrj+iIQZd+p/S3fUf2nWp3mNQv+TJHndZIllCQg3tcy8vF6pkXR++3fF/eAIOYnr7adf7z2/JneJ8g=="; }; }; "aws-sdk-1.18.0" = { @@ -17743,13 +18463,22 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1296.0" = { + "aws-sdk-2.1290.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1296.0"; + version = "2.1290.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1296.0.tgz"; - sha512 = "6Nm6zQexyne8lVy+BW8jklGpS36mXJjq67zlsn5XuyB3+qAMlolzar9nxgtuabvb/tSQTP4RSwlhkVzOct+MvA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1290.0.tgz"; + sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ=="; + }; + }; + "aws-sdk-2.1324.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1324.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1324.0.tgz"; + sha512 = "7T9Jn6qtzCANdqRcdhxZ9Fx31/U+h/VPFxEU3+sFEnC7WtGtRlgmsJOY2lIdFKRXkHYT3Jw5MqDyjnb/i1QqbA=="; }; }; "aws-sign2-0.6.0" = { @@ -17779,13 +18508,13 @@ let sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; - "axe-core-4.6.2" = { + "axe-core-4.6.3" = { name = "axe-core"; packageName = "axe-core"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz"; - sha512 = "b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg=="; + url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz"; + sha512 = "/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="; }; }; "axios-0.19.2" = { @@ -17851,13 +18580,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.2.3" = { + "axios-1.3.4" = { name = "axios"; packageName = "axios"; - version = "1.2.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz"; - sha512 = "pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw=="; + url = "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz"; + sha512 = "toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ=="; }; }; "axios-cookiejar-support-0.5.1" = { @@ -17941,15 +18670,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"; @@ -18013,13 +18733,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" = { @@ -18076,13 +18796,13 @@ let sha512 = "VTtHsmvwRBkX3yLK4e+pFwk88BC6iNFqS2J8CCx2ddQc7RjXoRhuXXIgYCng21DYNty9IicCwDdTDjdr+TM7eg=="; }; }; - "babel-preset-expo-9.2.2" = { + "babel-preset-expo-9.3.0" = { name = "babel-preset-expo"; packageName = "babel-preset-expo"; - version = "9.2.2"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-9.2.2.tgz"; - sha512 = "69cSPObZWFz0AaUT6IhCu2VzPVTICUtXzhX5ecoDttFe+9wb9yMV8m7rBNZptJQ3wtiKB5iEL7/wvtKygPz/mQ=="; + url = "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-9.3.0.tgz"; + sha512 = "cIz+5TVBkcZgtfpTyFPo1peswr2dvQj2VIwdj5vY37/zESsYBHfaZ+u/A11yb1WnuZHcYD/ZoSLNwmWr20jp4Q=="; }; }; "babel-runtime-6.26.0" = { @@ -18247,15 +18967,6 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; - "base-64-0.1.0" = { - name = "base-64"; - packageName = "base-64"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz"; - sha512 = "Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA=="; - }; - }; "base-64-1.0.0" = { name = "base-64"; packageName = "base-64"; @@ -18391,13 +19102,13 @@ let sha512 = "ZNB4525U7BxT6v9C8LEtywyCgB4Pjnm7/bh+ru/Z9Ecxvg3fDjaJ6z305z9a61orQdbB1zqYHh5JbUqx4s4K0g=="; }; }; - "bash-language-server-3.0.3" = { + "bash-language-server-4.7.0" = { name = "bash-language-server"; packageName = "bash-language-server"; - version = "3.0.3"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-3.0.3.tgz"; - sha512 = "UhYd0YYaXjYn0M3dVeL6jv1X9L2VR8dJp3fUCcdyHTgzJOvmntpUrkjcoKASV0qqZt0u8DSPT4xE+HjegQoEvQ=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.7.0.tgz"; + sha512 = "JLe8bk0/FtOiGIdFWg/2JoAGJctYQyrYpmj24dhCSEAjIq9HHqr9I6L9k32fh9WkWjHcrh6v70Epiv6m+SxvDQ=="; }; }; "basic-auth-1.1.0" = { @@ -18634,13 +19345,13 @@ let sha512 = "pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g=="; }; }; - "better-sqlite3-8.0.1" = { + "better-sqlite3-8.1.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; - sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; + sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; }; }; "bevent-0.1.5" = { @@ -18958,13 +19669,13 @@ let sha512 = "B/d8IADy5Y4v/CTMRWxLD8ONd2qRkF+2DbZLeIUql7PukfAiBhlGlw5qJcIU03l21qMEyvbi4PdntatH+j40vA=="; }; }; - "bit-field-1.7.0" = { + "bit-field-1.8.0" = { name = "bit-field"; packageName = "bit-field"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.7.0.tgz"; - sha512 = "JydkgvuMioH3Oe3mnnHFVHGBzGZJIph98d1IpotpJ7svjGmkQf8uR9k0LAY/mPEphaq+nSIrgzMs/rK9WYdzzQ=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.8.0.tgz"; + sha512 = "xChg+vwCPZckjT1s0bJU5KbGWVqA+LDsi4YOiXVFntl+yzlPpBMdyeDU/wTTqoKAZAdOMDfGjpOUyP+untdOWQ=="; }; }; "bitcoin-ops-1.4.1" = { @@ -18985,15 +19696,6 @@ let sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ=="; }; }; - "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=="; - }; - }; "bitcoinjs-lib-6.1.0" = { name = "bitcoinjs-lib"; packageName = "bitcoinjs-lib"; @@ -19354,6 +20056,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"; @@ -19507,6 +20218,15 @@ let sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; + "body-parser-1.20.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz"; + sha512 = "ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA=="; + }; + }; "bolt01-1.2.6" = { name = "bolt01"; packageName = "bolt01"; @@ -19525,15 +20245,6 @@ let sha512 = "7KQAp+lrtogthZ5UCkqhT3SBfVanGKmBnI4hYdQfcvNcGor4zZdyegUcovf7NmAXhx0c7pc0QiTjkPHFMvQ3mw=="; }; }; - "bolt07-1.8.2" = { - name = "bolt07"; - packageName = "bolt07"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.8.2.tgz"; - sha512 = "jq1b/ZdMambhh+yi+pm+1PJBAnlYvQYljaBgSajvVAINHrHg32ovCBra8d0ADE3BAoj6G/tK7OSV4t/yT9A+/g=="; - }; - }; "bolt07-1.8.3" = { name = "bolt07"; packageName = "bolt07"; @@ -19543,15 +20254,6 @@ let sha512 = "NXML2vzFmxRrdWt+wNqphU6f8FmS7tkebqDLIhfc8xKoOcGFv4Kf7WuJbKBqcfFDQVXpCpKAF7FQAgTIN2/30A=="; }; }; - "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=="; - }; - }; "bolt09-0.2.5" = { name = "bolt09"; packageName = "bolt09"; @@ -19984,22 +20686,22 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browser-sync-client-2.27.11" = { + "browser-sync-client-2.28.1" = { name = "browser-sync-client"; packageName = "browser-sync-client"; - version = "2.27.11"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.11.tgz"; - sha512 = "okMNfD2NasL/XD1/BclP3onXjhahisk3e/kTQ5HPDT/lLqdBqNDd6QFcjI5I1ak7na2hxKQSLjryql+7fp5gKQ=="; + url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.28.1.tgz"; + sha512 = "srFIhUU6CtsLtvBsVmTgRtFt/kFbcl/PYvenpfxPIKTDSxQf35cCjYwYF1osyJdvRoeKoDlaK/fv6eN6/cXRKw=="; }; }; - "browser-sync-ui-2.27.11" = { + "browser-sync-ui-2.28.1" = { name = "browser-sync-ui"; packageName = "browser-sync-ui"; - version = "2.27.11"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.11.tgz"; - sha512 = "1T/Y8Pp1R68aUL7zVSFq0nxtr258xWd/nTasCAHX2M6EsGaswVOFtXsw3bKqsr35z+J+LfVfOdz1HFLYKxdgrA=="; + url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.28.1.tgz"; + sha512 = "yPylRdTE8HS/MxcgGpYfcW/JVde+tVnoTIwotVqzqybW8Kg0e3GfFlS7fD0W+KtI/rS4U5GxVsqERxdqpAjCoQ=="; }; }; "browserify-16.5.2" = { @@ -20110,22 +20812,13 @@ 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" = { + "browserslist-4.21.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.4"; + version = "4.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"; + sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w=="; }; }; "brq-0.1.8" = { @@ -20588,6 +21281,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"; @@ -20732,13 +21434,13 @@ 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.12" = { @@ -20750,13 +21452,13 @@ let sha512 = "ctj1FnoTF+7/dRiRYVVwY/6lV/NYQ5Gz8HS0LsyUxae7fMJGKx2geHHIcIXeZ5DolS49Xq9e4rh29aG/vAJrWw=="; }; }; - "byte-size-7.0.1" = { + "byte-size-7.0.0" = { name = "byte-size"; packageName = "byte-size"; - version = "7.0.1"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz"; - sha512 = "crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A=="; + url = "https://registry.npmjs.org/byte-size/-/byte-size-7.0.0.tgz"; + sha512 = "NNiBxKgxybMBtWdmvx7ZITJi4ZG+CYUgwOSZTfqB1qogkRHrhbQE/R2r5Fh94X+InN5MCYz6SvB/ejHMj/HbsQ=="; }; }; "bytebuffer-3.5.5" = { @@ -20966,13 +21668,13 @@ let sha512 = "+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="; }; }; - "cacheable-request-10.2.5" = { + "cacheable-request-10.2.8" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "10.2.5"; + version = "10.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.5.tgz"; - sha512 = "5RwYYCfzjNPsyJxb/QpaM0bfzx+kw5/YpDhZPm9oMIDntHFQ9YXeyV47ZvzlTE0XrrrbyO2UITJH4GF9eRLdXQ=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.8.tgz"; + sha512 = "IDVO5MJ4LItE6HKFQTqT2ocAQsisOoCTUDu1ddCmnhyiwFQjXNPp4081Xj23N4tO+AFEFNzGuNEf/c8Gwwt15A=="; }; }; "cacheable-request-2.1.4" = { @@ -21236,15 +21938,6 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "camelcase-7.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz"; - sha512 = "JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ=="; - }; - }; "camelcase-7.0.1" = { name = "camelcase"; packageName = "camelcase"; @@ -21326,13 +22019,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001445" = { + "caniuse-lite-1.0.30001458" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001445"; + version = "1.0.30001458"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz"; - sha512 = "8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"; + sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w=="; }; }; "canvas-2.11.0" = { @@ -21344,15 +22037,6 @@ let sha512 = "bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g=="; }; }; - "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=="; - }; - }; "capability-0.2.5" = { name = "capability"; packageName = "capability"; @@ -21497,31 +22181,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.6.22" = { + "cdk8s-2.7.14" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.6.22"; + version = "2.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.22.tgz"; - sha512 = "mVeo+zJMJIwbQP/5p8grhxcIpl6Ff59IkOkUyF9JV89zTXD3D5HwoG4VYfhZxjDhgCzftXi31cqmQ8u+8XhgHQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.7.14.tgz"; + sha512 = "MJXV6Fqp6m6t9iYOqR5Vw2748/xIr3AHMXSD4uItAHuYRnAXJAyrp4WtbxiOyRk0qnCH8MNNEWZBc1mb0PJgEQ=="; }; }; - "cdk8s-plus-25-2.3.27" = { + "cdk8s-plus-25-2.4.37" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.3.27"; + version = "2.4.37"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.3.27.tgz"; - sha512 = "GKBcvio3iYVYXHTZkH0IaR08omt2M2IdnUpcGnkTrlnxdbkZICRDLVqr1hTw+uq+DgyUSi+ThPy5FgokU00MHQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.37.tgz"; + sha512 = "vVtsOLBUxyqa1m7/Ip4PuT9GvxaHavp5hW7ndSc96dFFPvLvZRvE7CBZZQwe9MY8GPfXC12Y9oiVxmE5pb0LPQ=="; }; }; - "cdktf-0.15.0" = { + "cdktf-0.15.5" = { name = "cdktf"; packageName = "cdktf"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.0.tgz"; - sha512 = "Dzv/pfJWTFzxMxjcgI3cttK7hPLy69bUPzcZgUK0sI+k3kY4I67pmxKuXDh1XVK9AX+pCaiZT7wzQbCznTrQkQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.5.tgz"; + sha512 = "fcamLs7SKz+kTbQFf+fOXDGvmwT5bH4bHwp+jkVKjGTRsu6C8z5oFVAjKYm+aP1tC7sSWG967+ihSx6+uPNAGw=="; }; }; "center-align-0.1.3" = { @@ -22172,6 +22856,15 @@ let sha512 = "Pa5nrrCMWukBafWxQ8wwmeRuqs/6nVFAdhRXYcxpDePduAbZZ8lXNZhtGZ5/mmWI1rzrSR6tpRR9J3BtR84yUw=="; }; }; + "chromium-bidi-0.4.4" = { + name = "chromium-bidi"; + packageName = "chromium-bidi"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.4.tgz"; + sha512 = "4BX5cSaponuvVT1+SbLYTOAgDoVtX/Khoc9UsbFJ/AsPVUeFAM3RiIDFI6XFhLYMi9WmVJqh1ZH+dRpNKkKwiQ=="; + }; + }; "chromium-pickle-js-0.2.0" = { name = "chromium-pickle-js"; packageName = "chromium-pickle-js"; @@ -22208,13 +22901,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.7.1" = { + "ci-info-3.8.0" = { name = "ci-info"; packageName = "ci-info"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz"; - sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"; + sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; }; }; "cipher-base-1.0.4" = { @@ -22316,13 +23009,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" = { @@ -22361,13 +23054,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" = { @@ -22487,6 +23180,15 @@ let sha512 = "lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA=="; }; }; + "cli-progress-3.12.0" = { + name = "cli-progress"; + packageName = "cli-progress"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz"; + sha512 = "tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A=="; + }; + }; "cli-progress-footer-2.3.2" = { name = "cli-progress-footer"; packageName = "cli-progress-footer"; @@ -22721,15 +23423,6 @@ let sha512 = "Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg=="; }; }; - "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=="; - }; - }; "cliss-0.0.2" = { name = "cliss"; packageName = "cliss"; @@ -22982,15 +23675,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"; @@ -23162,13 +23846,13 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; - "codemaker-1.73.0" = { + "codemaker-1.76.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.73.0.tgz"; - sha512 = "pgVFCAbR0Yw/qTrV/W8R7cXWJouhONMRf8sNCjmAGJyV3MFaLN4sUPdUkzYUu7LCkuHPh0nvYRlExWzrkhm7vw=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.76.0.tgz"; + sha512 = "EqnBOOiEV+kjyRghA5Z0TX22VnVH2Mgo2diOSYelcmntlTSiQkZimGof6jxE5j1buzjEVBK1d1W7bhRKYGegUg=="; }; }; "codepage-1.4.0" = { @@ -23243,22 +23927,22 @@ let sha512 = "lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="; }; }; - "color-3.1.2" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; - sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; - "color-3.2.1" = { + "color-4.2.3" = { name = "color"; packageName = "color"; - version = "3.2.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; - sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; + url = "https://registry.npmjs.org/color/-/color-4.2.3.tgz"; + sha512 = "1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A=="; }; }; "color-convert-1.9.3" = { @@ -23999,6 +24683,15 @@ let sha512 = "8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="; }; }; + "conf-11.0.1" = { + name = "conf"; + packageName = "conf"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-11.0.1.tgz"; + sha512 = "WlLiQboEjKx0bYx2IIRGedBgNjLAxtwPaCSnsjWPST5xR0DB4q8lcsO/bEH9ZRYNcj63Y9vj/JG/5Fg6uWzI0Q=="; + }; + }; "conf-6.2.4" = { name = "conf"; packageName = "conf"; @@ -24026,6 +24719,15 @@ let sha512 = "Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA=="; }; }; + "config-chain-1.1.12" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + }; + }; "config-chain-1.1.13" = { name = "config-chain"; packageName = "config-chain"; @@ -24269,13 +24971,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.223" = { + "constructs-10.1.263" = { name = "constructs"; packageName = "constructs"; - version = "10.1.223"; + version = "10.1.263"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.223.tgz"; - sha512 = "m/+jkHuVZiHmGpEaNwoB3toYdKu/EOd9xVlZ0uYivnWm7uertOPSTXl/Z1f35DXY518ir8X0VBOREAjtIT4F/g=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.263.tgz"; + sha512 = "lJq4n2iukIQE/XtSfMMwnOE33n67kSzNi6rF3C83RrHYtrQYRswOcAv3XJciCQoznxn99pKmgsxAQBYJlYcwFg=="; }; }; "consume-http-header-1.0.0" = { @@ -24332,6 +25034,15 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; + "content-security-policy-parser-0.3.0" = { + name = "content-security-policy-parser"; + packageName = "content-security-policy-parser"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-security-policy-parser/-/content-security-policy-parser-0.3.0.tgz"; + sha512 = "ub90B4t9EfDPv3DCH7vEwGe4tVMkSm4Ow1HsmvmEQwinDfpTEDmkuJVa5WpzHDTt2bUirNRZuzL6S0msASlJhg=="; + }; + }; "content-type-1.0.4" = { name = "content-type"; packageName = "content-type"; @@ -24341,13 +25052,22 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; + "content-type-1.0.5" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; + sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; + }; + }; "content-type-git+https://github.com/wikimedia/content-type.git#master" = { name = "content-type"; packageName = "content-type"; version = "1.0.1"; src = fetchgit { url = "https://github.com/wikimedia/content-type.git"; - rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; + rev = "cd73e64490f9620329fe4ed6e3ac383abb6bdee0"; sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; @@ -24432,6 +25152,15 @@ let sha512 = "ryhi3fd1mKf3fSjbLXOfK2D06YwKNic1nC9mWqybBHdObPd8KJ2vjaXZfYj1U23t+V8T8n0d7gwnc9XbIdFbyQ=="; }; }; + "conventional-changelog-angular-5.0.12" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "5.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz"; + sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw=="; + }; + }; "conventional-changelog-angular-5.0.13" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -24738,6 +25467,15 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; + "cookie-signature-1.2.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.1.tgz"; + sha512 = "78KWk9T26NhzXtuL26cIJ8/qNHANyJ/ZYrmEXFzUmhZdjpBv+DlWlOANRTGBt48YcyslsLrj0bMLFTmXvLRCOw=="; + }; + }; "cookiejar-2.0.6" = { name = "cookiejar"; packageName = "cookiejar"; @@ -24810,22 +25548,22 @@ let sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; - "copy-webpack-plugin-5.1.2" = { + "copy-webpack-plugin-10.2.4" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "5.1.2"; + version = "10.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; - sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; + sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; }; }; - "copy-webpack-plugin-6.0.4" = { + "copy-webpack-plugin-5.1.2" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.0.4"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz"; - sha512 = "zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; }; }; "cordova-app-hello-world-6.0.0" = { @@ -24873,13 +25611,13 @@ let sha512 = "/XM+/wFag72bD4SNSxwX8b3OWatHNNlnmJpgb5pepp2Pobb957nWyR0GPwIkKyOyszdZesWM3Vv8uH9e2Z1k2w=="; }; }; - "cordova-serve-4.0.0" = { + "cordova-serve-4.0.1" = { name = "cordova-serve"; packageName = "cordova-serve"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.0.tgz"; - sha512 = "gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw=="; + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz"; + sha512 = "YbfXaZ60yr5dkqmDFQgrU7TSKnzCqYsxHgIUzDeX8RggZb6mz1F9jMfUBbaYyaU7JjcuJ0aoRPYLvwSGQVhGkw=="; }; }; "core-js-2.6.12" = { @@ -24891,15 +25629,6 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.3" = { - name = "core-js"; - packageName = "core-js"; - version = "3.25.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz"; - sha512 = "y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ=="; - }; - }; "core-js-3.27.1" = { name = "core-js"; packageName = "core-js"; @@ -24909,22 +25638,22 @@ let sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; }; }; - "core-js-compat-3.27.1" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.27.1"; + "core-js-3.29.0" = { + name = "core-js"; + packageName = "core-js"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.1.tgz"; - sha512 = "Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; + sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; }; - "core-js-pure-3.27.1" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.27.1"; + "core-js-compat-3.29.0" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.1.tgz"; - sha512 = "BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz"; + sha512 = "ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ=="; }; }; "core-util-is-1.0.2" = { @@ -25044,6 +25773,15 @@ let sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ=="; }; }; + "cosmiconfig-8.1.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.0.tgz"; + sha512 = "0tLZ9URlPGU7JsKq0DQOQ3FoRsYX8xDZ7xMiATQfaiGMz7EHowNkbU9u1coAOmnh9p/1ySpm0RB3JNWRXM5GCg=="; + }; + }; "cosmiconfig-toml-loader-1.0.0" = { name = "cosmiconfig-toml-loader"; packageName = "cosmiconfig-toml-loader"; @@ -25179,13 +25917,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-3.4.0" = { + "create-gatsby-3.7.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.4.0.tgz"; - sha512 = "WD9WtsXzqa+5vMBF56iiq8IGdJQT7TlWGYLv1qeM5jgK7tCCFxHnzHZ/MnvTnwspeKGRQuFgWpbrnSgD4YyQdA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.7.0.tgz"; + sha512 = "6v6HBa2UW/xZ0Y4VFHVSTudH3QXT+KZtxpl0JhVpILyY2VK/hqVH1RDbicuFWrq1/Z6fmb7H+QUmJJITZF7juw=="; }; }; "create-graphback-1.0.1" = { @@ -25467,22 +26205,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-6.19.2" = { + "cspell-dictionary-6.27.0" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.19.2.tgz"; - sha512 = "XLVIsoiy97VAtC4V3tNJkYU7CqWuSejrXIyLdzIaN4yBsC1kOrV1fwJ3vaAuSIqQauDYeST2gBIsHcDuGYEcew=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.27.0.tgz"; + sha512 = "u2HZ6Yl0tIBzflJ9Rt5i15kP1KN41XtyKfqCCntugX3gYtfbQ1t/HvAPcq4g7EDZV2tzqSKGcNvzuJgHJyxxFw=="; }; }; - "cspell-gitignore-6.19.2" = { + "cspell-gitignore-6.27.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.19.2.tgz"; - sha512 = "dPxGxakkBs5dmD+nCom6t74ejWsd6RJJkgs0sccPDFKULXAInjeKMeTraskYTg4wXqybbiuXCB2sOIdeQmNq6w=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.27.0.tgz"; + sha512 = "aXIuSMtm2pW8Z0y4SHBqvXwY4Hk3lz4b3PD50IU1gn2mjk8GioEYAnWlN/FANeOuMjOXiRfLaX0McvNErnZxdw=="; }; }; "cspell-glob-0.1.25" = { @@ -25494,22 +26232,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-6.19.2" = { + "cspell-glob-6.27.0" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.19.2.tgz"; - sha512 = "raco5vbd3Exb1uQaD5Bn6aS0KpRbNM7etmn/Q2T2KSwhvH+DRSEMTAkSG3rb0+y0ixkA/Qspjt68QnYxsbFPmw=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.27.0.tgz"; + sha512 = "YzS9SiNU5iFIdEMCeVOsGlCvffCM7M51io9ylkkY6138NLCnqWw/DSePzIAAsuLqh9nsJt8xiXrHPerKiPnN3g=="; }; }; - "cspell-grammar-6.19.2" = { + "cspell-grammar-6.27.0" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.19.2.tgz"; - sha512 = "f1IswIPxHX0uQaFzmDWJtgWVd3KkFElTnxj0cgvSZs8ehEaC+/jT30q4K36oVA7jgLtdLuDXafQf9Lp2FHf9bA=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.27.0.tgz"; + sha512 = "03SH0+bWazhkzUUK+t6ywUZvWuDcqj4J171oIdA3fvdG7nBpTqyFc1/vU1mReZK7CDde16BUaqCkWgf+El+N1w=="; }; }; "cspell-io-4.1.7" = { @@ -25521,13 +26259,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-6.19.2" = { + "cspell-io-6.27.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.19.2.tgz"; - sha512 = "ZVyygx4N8cTF2HeNUXV7IpX/LXSOSCNE+W3gY4/fju1PJWh+roTf7pVDURGtMxpSV7cq44ewYA3/qCgnF8QnkA=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.27.0.tgz"; + sha512 = "WsvXjbbWwIQVembEtlNuC8cJrGtyUuk8GvZzL9bBpSofU2UXvFjaQ9bAZjIeHibGQrIIuOM0ra0CqOcLb5mShA=="; }; }; "cspell-lib-4.3.12" = { @@ -25539,13 +26277,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-6.19.2" = { + "cspell-lib-6.27.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.19.2.tgz"; - sha512 = "phPyt68bKeTUZKdmnjke2ffnIJPaXLdiUFAeU0kMNk15ljkczjMR4J6WkgYCKc+SCNQjYJSS+z4nLbtQivqDxg=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.27.0.tgz"; + sha512 = "wwi3VCFiWaVFrV/ycm4yNBjjPY3pyhWud4lVJs51p2IkKqJbmR7hZ+bSIyw6d9MVzPKRD67eMaNBYXFGDaNHGQ=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -25557,13 +26295,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-6.19.2" = { + "cspell-trie-lib-6.27.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.19.2.tgz"; - sha512 = "4rfiq0FeSlLG1hBQv5DpOgsbOzNs5hGz/V6Kmv0gbqaxRZyw+8sYECqdTNDx+0OXMgSRhUrwMoCpCMyWiq7tBA=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.27.0.tgz"; + sha512 = "kelDXszZKzlWbk7hV3cTtWYd2Gs3MXqTNSL3udtN4Oow74ik+h1bWsOOmXKKjtKvRctx4omWC1JdriQXfhBMBA=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -25674,6 +26412,24 @@ let sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; }; }; + "css-loader-6.7.3" = { + name = "css-loader"; + packageName = "css-loader"; + version = "6.7.3"; + src = fetchurl { + 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" = { name = "css-modules-loader-core"; packageName = "css-modules-loader-core"; @@ -25755,13 +26511,13 @@ let sha512 = "jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg=="; }; }; - "css-to-react-native-3.1.0" = { + "css-to-react-native-3.2.0" = { name = "css-to-react-native"; packageName = "css-to-react-native"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.1.0.tgz"; - sha512 = "AryfkFA29b4I3vG7N4kxFboq15DxwSXzhXM37XNEjwJMgjYIc8BcqfiprpAqX0zadI5PMByEIwAMzXxk5Vcc4g=="; + url = "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz"; + sha512 = "e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ=="; }; }; "css-tree-1.0.0-alpha.37" = { @@ -25827,6 +26583,15 @@ let sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; + "css-what-5.1.0" = { + name = "css-what"; + packageName = "css-what"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"; + sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; + }; + }; "css-what-6.1.0" = { name = "css-what"; packageName = "css-what"; @@ -25872,13 +26637,13 @@ let sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; }; - "cssnano-5.1.14" = { + "cssnano-5.1.15" = { name = "cssnano"; packageName = "cssnano"; - version = "5.1.14"; + version = "5.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz"; - sha512 = "Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz"; + sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="; }; }; "cssnano-preset-default-4.0.8" = { @@ -25890,13 +26655,13 @@ let sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; }; - "cssnano-preset-default-5.2.13" = { + "cssnano-preset-default-5.2.14" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "5.2.13"; + version = "5.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz"; - sha512 = "PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz"; + sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="; }; }; "cssnano-util-get-arguments-4.0.0" = { @@ -26070,13 +26835,13 @@ let sha512 = "byxnDBxM1AVF3YfmsK7Smop9/usNz7gAZYSo9eYp61TGcNXraJby1rAiLyJSt1/8Iho2qaxZOtZCOvQMXogPtg=="; }; }; - "csv-parse-5.3.3" = { + "csv-parse-5.3.5" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.3.3"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.3.tgz"; - sha512 = "kEWkAPleNEdhFNkHQpFHu9RYPogsFj3dx6bCxL847fsiLgidzWg0z/O0B1kVWMJUc5ky64zGp18LX2T3DQrOfw=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.5.tgz"; + sha512 = "8O5KTIRtwmtD3+EVfW6BCgbwZqJbhTYsQZry12F1TP5RUp0sD9tp1UnCWic3n0mLOhzeocYaCZNYxOGSg3dmmQ=="; }; }; "csv-stream-0.2.0" = { @@ -26223,13 +26988,31 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; - "d3-7.8.1" = { + "d3-5.16.0" = { name = "d3"; packageName = "d3"; - version = "7.8.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.8.1.tgz"; - sha512 = "fdipulGWUYTZTxxU9gDJ2P4mpZL2u7Oqe6n2FI95Q8UY0AjbKNYjPHvhLOsvR+HcSao4vo3YYy4Bk9CWOrt1Vw=="; + url = "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz"; + sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; + }; + }; + "d3-7.8.2" = { + name = "d3"; + packageName = "d3"; + version = "7.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz"; + sha512 = "WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ=="; + }; + }; + "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=="; }; }; "d3-array-3.1.1" = { @@ -26241,13 +27024,22 @@ let sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; }; }; - "d3-array-3.2.1" = { + "d3-array-3.2.2" = { name = "d3-array"; packageName = "d3-array"; - version = "3.2.1"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; + sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; + }; + }; + "d3-axis-1.0.12" = { + name = "d3-axis"; + packageName = "d3-axis"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.1.tgz"; - sha512 = "gUY/qeHq/yNqqoCKNq4vtpFLdoCdvyNpWoC/KNjhGbhDuQpAM9sIQQKkXSNpXa9h5KySs/gzm7R88WkUutgwWQ=="; + url = "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz"; + sha512 = "ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="; }; }; "d3-axis-3.0.0" = { @@ -26259,6 +27051,15 @@ 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"; @@ -26268,6 +27069,15 @@ 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"; @@ -26277,6 +27087,24 @@ 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"; @@ -26295,6 +27123,15 @@ let sha512 = "zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="; }; }; + "d3-contour-1.3.2" = { + name = "d3-contour"; + packageName = "d3-contour"; + version = "1.3.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.2" = { name = "d3-contour"; packageName = "d3-contour"; @@ -26313,6 +27150,15 @@ 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"; @@ -26331,6 +27177,15 @@ 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"; @@ -26349,6 +27204,15 @@ 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"; @@ -26358,6 +27222,15 @@ 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"; @@ -26376,6 +27249,15 @@ 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"; @@ -26385,6 +27267,15 @@ 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"; @@ -26394,6 +27285,15 @@ 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"; @@ -26412,6 +27312,15 @@ let sha512 = "YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="; }; }; + "d3-geo-1.12.1" = { + name = "d3-geo"; + packageName = "d3-geo"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz"; + sha512 = "XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg=="; + }; + }; "d3-geo-3.1.0" = { name = "d3-geo"; packageName = "d3-geo"; @@ -26439,6 +27348,15 @@ let sha512 = "qEhZB19Tv7oNV92Hys/aY+XkVCyHAzM+VjqbjJoHK5YXLC3tRtZoSFr64tdrURl8qRsKnphtvPeFpHeJAbOgSQ=="; }; }; + "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=="; + }; + }; "d3-hierarchy-3.1.2" = { name = "d3-hierarchy"; packageName = "d3-hierarchy"; @@ -26448,6 +27366,15 @@ 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"; @@ -26466,6 +27393,15 @@ 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"; @@ -26484,6 +27420,15 @@ let sha512 = "p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="; }; }; + "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=="; + }; + }; "d3-polygon-3.0.1" = { name = "d3-polygon"; packageName = "d3-polygon"; @@ -26493,6 +27438,15 @@ 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"; @@ -26502,6 +27456,15 @@ 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"; @@ -26511,6 +27474,15 @@ 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"; @@ -26520,6 +27492,15 @@ 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"; @@ -26529,6 +27510,15 @@ 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"; @@ -26547,6 +27537,15 @@ let sha512 = "fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="; }; }; + "d3-shape-1.3.7" = { + name = "d3-shape"; + packageName = "d3-shape"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz"; + sha512 = "EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="; + }; + }; "d3-shape-3.2.0" = { name = "d3-shape"; packageName = "d3-shape"; @@ -26556,6 +27555,15 @@ let sha512 = "SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA=="; }; }; + "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.1.0" = { name = "d3-time"; packageName = "d3-time"; @@ -26565,6 +27573,15 @@ let sha512 = "VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q=="; }; }; + "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=="; + }; + }; "d3-time-format-4.1.0" = { name = "d3-time-format"; packageName = "d3-time-format"; @@ -26574,6 +27591,15 @@ 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"; @@ -26592,6 +27618,15 @@ 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"; @@ -26610,6 +27645,24 @@ 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"; @@ -26637,13 +27690,22 @@ let sha512 = "+LSAiGFwQ9dRnRdOeaj7g47ZFJcOUPukAP8J3A3fuZ1g9Y44BG+P1sgApjLXTQPOzC4+7S9Wr8kXsfpINM4jpw=="; }; }; - "dagre-d3-es-7.0.6" = { - name = "dagre-d3-es"; - packageName = "dagre-d3-es"; - version = "7.0.6"; + "dagre-0.8.5" = { + name = "dagre"; + packageName = "dagre"; + version = "0.8.5"; + 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-es/-/dagre-d3-es-7.0.6.tgz"; - sha512 = "CaaE/nZh205ix+Up4xsnlGmpog5GGm81Upi2+/SBHxwNwrccBb3K51LzjZ1U6hgvOlAEUsVWf1xSTzCyKpJ6+Q=="; + url = "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz"; + sha512 = "e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ=="; }; }; "damerau-levenshtein-1.0.8" = { @@ -26862,13 +27924,13 @@ let sha512 = "YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="; }; }; - "dataloader-2.1.0" = { + "dataloader-2.2.2" = { name = "dataloader"; packageName = "dataloader"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dataloader/-/dataloader-2.1.0.tgz"; - sha512 = "qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ=="; + url = "https://registry.npmjs.org/dataloader/-/dataloader-2.2.2.tgz"; + sha512 = "8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g=="; }; }; "datauri-4.1.0" = { @@ -27033,6 +28095,15 @@ let sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; }; }; + "debounce-fn-5.1.2" = { + name = "debounce-fn"; + packageName = "debounce-fn"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-5.1.2.tgz"; + sha512 = "Sr4SdOZ4vw6eQDvPYNxHogvrxmCIld/VenC5JbNrFwMiwd7lY/Z18ZFfo+EWNG4DD9nFlAujWAo/wGuOPHmy5A=="; + }; + }; "debounced-seeker-1.0.0" = { name = "debounced-seeker"; packageName = "debounced-seeker"; @@ -27465,15 +28536,6 @@ let sha512 = "Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg=="; }; }; - "deep-is-0.1.2" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.2.tgz"; - sha512 = "+ykBpFL44/E8TlSBn0kDHZ1+IseXxUu/Om3bS2nqNscaeYWzxx54R9CewU6pLrsXLmEeTRZsGMTQIHfSUEEcUw=="; - }; - }; "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; @@ -27483,6 +28545,15 @@ let sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; + "deep-object-diff-1.1.9" = { + name = "deep-object-diff"; + packageName = "deep-object-diff"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.9.tgz"; + sha512 = "Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA=="; + }; + }; "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; @@ -27537,6 +28608,15 @@ let sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; + "deepmerge-4.3.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; + sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -27663,13 +28743,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.4" = { + "define-properties-1.2.0" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; "define-property-0.2.5" = { @@ -27888,6 +28968,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"; @@ -28041,15 +29130,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"; @@ -28077,13 +29157,13 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; - "devtools-protocol-0.0.1068969" = { + "devtools-protocol-0.0.1094867" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1068969"; + version = "0.0.1094867"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz"; - sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1094867.tgz"; + sha512 = "pmMDBKiRVjh0uKK6CT1WqZmM3hBVSgD+N2MrgyV1uNizAZMw4tx6i/RTc+/uCsKSCmg0xXx7arCP/OFcIwTsiQ=="; }; }; "devtools-protocol-0.0.981744" = { @@ -28230,13 +29310,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.29" = { + "diff2html-3.4.31" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.29"; + version = "3.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.29.tgz"; - sha512 = "xS7LQgUEd5ALH9X5TTPP8nnSmaa7mm+cAt5pZE5hSnEEvXSdoYBTStTkLBHOHJu9rZmGXs4jdFRsU8q90VfWkg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.31.tgz"; + sha512 = "bgL4kUUChpBqyFykgalwXRXbeW+zCkGmoH4Ftw6+WFP5JccBUJPNMapfX2WDEb+KOLflrE7eJwvb5r8+zutetw=="; }; }; "diff3-0.0.3" = { @@ -28455,15 +29535,6 @@ let sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; }; }; - "dockerfile-ast-0.1.0" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz"; - sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ=="; - }; - }; "dockerfile-ast-0.4.2" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -28473,22 +29544,13 @@ let sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA=="; }; }; - "dockerfile-language-server-nodejs-0.2.2" = { + "dockerfile-language-server-nodejs-0.9.0" = { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.2.2.tgz"; - sha512 = "PdDtFhzVywa2bZK6OFQhIPMSNPNJQa03Ri3ONxBJpxtOwtAaDSnh95iGj/bdPqQLJGoj1Y/yTheDTxLOTTe5JA=="; - }; - }; - "dockerfile-language-service-0.1.1" = { - name = "dockerfile-language-service"; - packageName = "dockerfile-language-service"; - version = "0.1.1"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.1.1.tgz"; - sha512 = "Lw4QlxJoy9F1559wxX+0xe5iSNK95Fbzx/YhdmAzfwgbPvdPzvFouIuuMyMPj/Q5JyFH1QAr7VeagOe24w0cqg=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.9.0.tgz"; + sha512 = "QPWcUxbbNTaWaRQrJKUBmCXI6iE8l7f81bCVaZizCIkVg4py/4o2mho+AKlLUsZcCml5ss8MkJ257SFV2BZWCg=="; }; }; "dockerfile-language-service-0.9.0" = { @@ -28500,15 +29562,6 @@ let sha512 = "sDUkTR4LUimEAWXDIbUTEx2CytCBlx+XlJkg4B2Ptvak9HkwPD4JpXesaWxXPpp6YHCzxqwsTDY7Gf79ic340g=="; }; }; - "dockerfile-utils-0.1.1" = { - name = "dockerfile-utils"; - packageName = "dockerfile-utils"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.1.1.tgz"; - sha512 = "ddAA8PCAcT4pBQ1AFRnPjetJ31/7BqNKLHQkZebNE0hBAiOr8SzrnIWvJUcBDHrVbASCVl1Ye37hbaTsUmYHsw=="; - }; - }; "dockerfile-utils-0.10.0" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; @@ -28725,15 +29778,6 @@ let sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; - "domhandler-3.0.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz"; - sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; - }; - }; "domhandler-3.3.0" = { name = "domhandler"; packageName = "domhandler"; @@ -28770,22 +29814,22 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.4.1" = { + "dompurify-2.4.0" = { name = "dompurify"; packageName = "dompurify"; - version = "2.4.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz"; - sha512 = "ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz"; + sha512 = "Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="; }; }; - "dompurify-2.4.3" = { + "dompurify-2.4.4" = { name = "dompurify"; packageName = "dompurify"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz"; - sha512 = "q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.4.tgz"; + sha512 = "1e2SpqHiRx4DPvmRuXU5J0di3iQACwJM+mFGE2HAkkK7Tbnfk9WcghcAmyWc9CRrjyRRUpmuhPUH6LphQQR3EQ=="; }; }; "domutils-1.4.3" = { @@ -28878,6 +29922,15 @@ let sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; }; }; + "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-10.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -29211,13 +30264,13 @@ let sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; }; }; - "eazy-logger-3.1.0" = { + "eazy-logger-4.0.0" = { name = "eazy-logger"; packageName = "eazy-logger"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz"; - sha512 = "/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ=="; + url = "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.0.tgz"; + sha512 = "ZnYemMI98cKlJt0Fkrw/7zVJYlnzVY22pbQJXmT1ZMmxnC732o7US9KaLXlf3x/g/ImS+uLIvF2R6nbcWP1uWw=="; }; }; "ecc-jsbn-0.1.2" = { @@ -29355,13 +30408,13 @@ let sha512 = "r1NDtlajsq7gf2EXgjRfblCVPquvD2yeg+6XGErOKblvxOpDi0iulZLVhgYDP4AEF1P5/HgbX/vwjlkEv7PEIQ=="; }; }; - "electron-to-chromium-1.4.284" = { + "electron-to-chromium-1.4.313" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.284"; + version = "1.4.313"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.313.tgz"; + sha512 = "QckB9OVqr2oybjIrbMI99uF+b9+iTja5weFe0ePbqLb5BHqXOJUO1SG6kDj/1WtWPRIBr51N153AEq8m7HuIaA=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -29564,6 +30617,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"; @@ -29699,6 +30761,15 @@ let sha512 = "ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA=="; }; }; + "engine.io-6.4.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.4.1.tgz"; + sha512 = "JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -29735,13 +30806,13 @@ let sha512 = "IH8ZhDIwiLv0d/wXVzmjfV9Y82hbJIDhCGSVUV8o1kcpDe2I6Y3bZA3ZbJy4Ls7k7IVmcy/qn4k9RKWFhUGf5w=="; }; }; - "engine.io-client-6.2.3" = { + "engine.io-client-6.4.0" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "6.2.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz"; - sha512 = "aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz"; + sha512 = "GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g=="; }; }; "engine.io-parser-1.0.6" = { @@ -29915,6 +30986,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=="; + }; + }; "env-string-1.0.1" = { name = "env-string"; packageName = "env-string"; @@ -30249,22 +31329,31 @@ let sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA=="; }; }; - "esbuild-0.14.51" = { + "esbuild-0.15.18" = { name = "esbuild"; packageName = "esbuild"; - version = "0.14.51"; + version = "0.15.18"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.14.51.tgz"; - sha512 = "+CvnDitD7Q5sT7F+FM65sWkF8wJRf+j9fPcprxYV4j+ohmzVj2W7caUqH2s5kCaCJAfcAICjSlKhDCcvDpU7nw=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"; + sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; }; }; - "esbuild-0.15.18" = { + "esbuild-0.16.17" = { name = "esbuild"; packageName = "esbuild"; - version = "0.15.18"; + version = "0.16.17"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"; - sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz"; + sha512 = "G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg=="; + }; + }; + "esbuild-0.16.3" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.16.3.tgz"; + sha512 = "71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg=="; }; }; "esbuild-android-64-0.14.47" = { @@ -30276,15 +31365,6 @@ let sha512 = "R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g=="; }; }; - "esbuild-android-64-0.14.51" = { - name = "esbuild-android-64"; - packageName = "esbuild-android-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.51.tgz"; - sha512 = "6FOuKTHnC86dtrKDmdSj2CkcKF8PnqkaIXqvgydqfJmqBazCPdw+relrMlhGjkvVdiiGV70rpdnyFmA65ekBCQ=="; - }; - }; "esbuild-android-64-0.15.18" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -30303,15 +31383,6 @@ let sha512 = "OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ=="; }; }; - "esbuild-android-arm64-0.14.51" = { - name = "esbuild-android-arm64"; - packageName = "esbuild-android-arm64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.51.tgz"; - sha512 = "vBtp//5VVkZWmYYvHsqBRCMMi1MzKuMIn5XDScmnykMTu9+TD9v0NMEDqQxvtFToeYmojdo5UCV2vzMQWJcJ4A=="; - }; - }; "esbuild-android-arm64-0.15.18" = { name = "esbuild-android-arm64"; packageName = "esbuild-android-arm64"; @@ -30330,15 +31401,6 @@ let sha512 = "R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA=="; }; }; - "esbuild-darwin-64-0.14.51" = { - name = "esbuild-darwin-64"; - packageName = "esbuild-darwin-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.51.tgz"; - sha512 = "YFmXPIOvuagDcwCejMRtCDjgPfnDu+bNeh5FU2Ryi68ADDVlWEpbtpAbrtf/lvFTWPexbgyKgzppNgsmLPr8PA=="; - }; - }; "esbuild-darwin-64-0.15.18" = { name = "esbuild-darwin-64"; packageName = "esbuild-darwin-64"; @@ -30357,15 +31419,6 @@ let sha512 = "seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw=="; }; }; - "esbuild-darwin-arm64-0.14.51" = { - name = "esbuild-darwin-arm64"; - packageName = "esbuild-darwin-arm64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.51.tgz"; - sha512 = "juYD0QnSKwAMfzwKdIF6YbueXzS6N7y4GXPDeDkApz/1RzlT42mvX9jgNmyOlWKN7YzQAYbcUEJmZJYQGdf2ow=="; - }; - }; "esbuild-darwin-arm64-0.15.18" = { name = "esbuild-darwin-arm64"; packageName = "esbuild-darwin-arm64"; @@ -30384,15 +31437,6 @@ let sha512 = "ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ=="; }; }; - "esbuild-freebsd-64-0.14.51" = { - name = "esbuild-freebsd-64"; - packageName = "esbuild-freebsd-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.51.tgz"; - sha512 = "cLEI/aXjb6vo5O2Y8rvVSQ7smgLldwYY5xMxqh/dQGfWO+R1NJOFsiax3IS4Ng300SVp7Gz3czxT6d6qf2cw0g=="; - }; - }; "esbuild-freebsd-64-0.15.18" = { name = "esbuild-freebsd-64"; packageName = "esbuild-freebsd-64"; @@ -30411,15 +31455,6 @@ let sha512 = "ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ=="; }; }; - "esbuild-freebsd-arm64-0.14.51" = { - name = "esbuild-freebsd-arm64"; - packageName = "esbuild-freebsd-arm64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.51.tgz"; - sha512 = "TcWVw/rCL2F+jUgRkgLa3qltd5gzKjIMGhkVybkjk6PJadYInPtgtUBp1/hG+mxyigaT7ib+od1Xb84b+L+1Mg=="; - }; - }; "esbuild-freebsd-arm64-0.15.18" = { name = "esbuild-freebsd-arm64"; packageName = "esbuild-freebsd-arm64"; @@ -30438,15 +31473,6 @@ let sha512 = "FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw=="; }; }; - "esbuild-linux-32-0.14.51" = { - name = "esbuild-linux-32"; - packageName = "esbuild-linux-32"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.51.tgz"; - sha512 = "RFqpyC5ChyWrjx8Xj2K0EC1aN0A37H6OJfmUXIASEqJoHcntuV3j2Efr9RNmUhMfNE6yEj2VpYuDteZLGDMr0w=="; - }; - }; "esbuild-linux-32-0.15.18" = { name = "esbuild-linux-32"; packageName = "esbuild-linux-32"; @@ -30465,15 +31491,6 @@ let sha512 = "nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw=="; }; }; - "esbuild-linux-64-0.14.51" = { - name = "esbuild-linux-64"; - packageName = "esbuild-linux-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.51.tgz"; - sha512 = "dxjhrqo5i7Rq6DXwz5v+MEHVs9VNFItJmHBe1CxROWNf4miOGoQhqSG8StStbDkQ1Mtobg6ng+4fwByOhoQoeA=="; - }; - }; "esbuild-linux-64-0.15.18" = { name = "esbuild-linux-64"; packageName = "esbuild-linux-64"; @@ -30492,15 +31509,6 @@ let sha512 = "ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA=="; }; }; - "esbuild-linux-arm-0.14.51" = { - name = "esbuild-linux-arm"; - packageName = "esbuild-linux-arm"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.51.tgz"; - sha512 = "LsJynDxYF6Neg7ZC7748yweCDD+N8ByCv22/7IAZglIEniEkqdF4HCaa49JNDLw1UQGlYuhOB8ZT/MmcSWzcWg=="; - }; - }; "esbuild-linux-arm-0.15.18" = { name = "esbuild-linux-arm"; packageName = "esbuild-linux-arm"; @@ -30519,15 +31527,6 @@ let sha512 = "ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw=="; }; }; - "esbuild-linux-arm64-0.14.51" = { - name = "esbuild-linux-arm64"; - packageName = "esbuild-linux-arm64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.51.tgz"; - sha512 = "D9rFxGutoqQX3xJPxqd6o+kvYKeIbM0ifW2y0bgKk5HPgQQOo2k9/2Vpto3ybGYaFPCE5qTGtqQta9PoP6ZEzw=="; - }; - }; "esbuild-linux-arm64-0.15.18" = { name = "esbuild-linux-arm64"; packageName = "esbuild-linux-arm64"; @@ -30546,15 +31545,6 @@ let sha512 = "mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg=="; }; }; - "esbuild-linux-mips64le-0.14.51" = { - name = "esbuild-linux-mips64le"; - packageName = "esbuild-linux-mips64le"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.51.tgz"; - sha512 = "vS54wQjy4IinLSlb5EIlLoln8buh1yDgliP4CuEHumrPk4PvvP4kTRIG4SzMXm6t19N0rIfT4bNdAxzJLg2k6A=="; - }; - }; "esbuild-linux-mips64le-0.15.18" = { name = "esbuild-linux-mips64le"; packageName = "esbuild-linux-mips64le"; @@ -30573,15 +31563,6 @@ let sha512 = "WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w=="; }; }; - "esbuild-linux-ppc64le-0.14.51" = { - name = "esbuild-linux-ppc64le"; - packageName = "esbuild-linux-ppc64le"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.51.tgz"; - sha512 = "xcdd62Y3VfGoyphNP/aIV9LP+RzFw5M5Z7ja+zdpQHHvokJM7d0rlDRMN+iSSwvUymQkqZO+G/xjb4/75du8BQ=="; - }; - }; "esbuild-linux-ppc64le-0.15.18" = { name = "esbuild-linux-ppc64le"; packageName = "esbuild-linux-ppc64le"; @@ -30600,15 +31581,6 @@ let sha512 = "1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g=="; }; }; - "esbuild-linux-riscv64-0.14.51" = { - name = "esbuild-linux-riscv64"; - packageName = "esbuild-linux-riscv64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.51.tgz"; - sha512 = "syXHGak9wkAnFz0gMmRBoy44JV0rp4kVCEA36P5MCeZcxFq8+fllBC2t6sKI23w3qd8Vwo9pTADCgjTSf3L3rA=="; - }; - }; "esbuild-linux-riscv64-0.15.18" = { name = "esbuild-linux-riscv64"; packageName = "esbuild-linux-riscv64"; @@ -30627,15 +31599,6 @@ let sha512 = "eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw=="; }; }; - "esbuild-linux-s390x-0.14.51" = { - name = "esbuild-linux-s390x"; - packageName = "esbuild-linux-s390x"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.51.tgz"; - sha512 = "kFAJY3dv+Wq8o28K/C7xkZk/X34rgTwhknSsElIqoEo8armCOjMJ6NsMxm48KaWY2h2RUYGtQmr+RGuUPKBhyw=="; - }; - }; "esbuild-linux-s390x-0.15.18" = { name = "esbuild-linux-s390x"; packageName = "esbuild-linux-s390x"; @@ -30654,15 +31617,6 @@ let sha512 = "Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ=="; }; }; - "esbuild-netbsd-64-0.14.51" = { - name = "esbuild-netbsd-64"; - packageName = "esbuild-netbsd-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.51.tgz"; - sha512 = "ZZBI7qrR1FevdPBVHz/1GSk1x5GDL/iy42Zy8+neEm/HA7ma+hH/bwPEjeHXKWUDvM36CZpSL/fn1/y9/Hb+1A=="; - }; - }; "esbuild-netbsd-64-0.15.18" = { name = "esbuild-netbsd-64"; packageName = "esbuild-netbsd-64"; @@ -30681,15 +31635,6 @@ let sha512 = "QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw=="; }; }; - "esbuild-openbsd-64-0.14.51" = { - name = "esbuild-openbsd-64"; - packageName = "esbuild-openbsd-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.51.tgz"; - sha512 = "7R1/p39M+LSVQVgDVlcY1KKm6kFKjERSX1lipMG51NPcspJD1tmiZSmmBXoY5jhHIu6JL1QkFDTx94gMYK6vfA=="; - }; - }; "esbuild-openbsd-64-0.15.18" = { name = "esbuild-openbsd-64"; packageName = "esbuild-openbsd-64"; @@ -30708,15 +31653,6 @@ let sha512 = "uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ=="; }; }; - "esbuild-sunos-64-0.14.51" = { - name = "esbuild-sunos-64"; - packageName = "esbuild-sunos-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.51.tgz"; - sha512 = "HoHaCswHxLEYN8eBTtyO0bFEWvA3Kdb++hSQ/lLG7TyKF69TeSG0RNoBRAs45x/oCeWaTDntEZlYwAfQlhEtJA=="; - }; - }; "esbuild-sunos-64-0.15.18" = { name = "esbuild-sunos-64"; packageName = "esbuild-sunos-64"; @@ -30735,15 +31671,6 @@ let sha512 = "H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ=="; }; }; - "esbuild-windows-32-0.14.51" = { - name = "esbuild-windows-32"; - packageName = "esbuild-windows-32"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.51.tgz"; - sha512 = "4rtwSAM35A07CBt1/X8RWieDj3ZUHQqUOaEo5ZBs69rt5WAFjP4aqCIobdqOy4FdhYw1yF8Z0xFBTyc9lgPtEg=="; - }; - }; "esbuild-windows-32-0.15.18" = { name = "esbuild-windows-32"; packageName = "esbuild-windows-32"; @@ -30762,15 +31689,6 @@ let sha512 = "/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ=="; }; }; - "esbuild-windows-64-0.14.51" = { - name = "esbuild-windows-64"; - packageName = "esbuild-windows-64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.51.tgz"; - sha512 = "HoN/5HGRXJpWODprGCgKbdMvrC3A2gqvzewu2eECRw2sYxOUoh2TV1tS+G7bHNapPGI79woQJGV6pFH7GH7qnA=="; - }; - }; "esbuild-windows-64-0.15.18" = { name = "esbuild-windows-64"; packageName = "esbuild-windows-64"; @@ -30789,15 +31707,6 @@ let sha512 = "HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ=="; }; }; - "esbuild-windows-arm64-0.14.51" = { - name = "esbuild-windows-arm64"; - packageName = "esbuild-windows-arm64"; - version = "0.14.51"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.51.tgz"; - sha512 = "JQDqPjuOH7o+BsKMSddMfmVJXrnYZxXDHsoLHc0xgmAZkOOCflRmC43q31pk79F9xuyWY45jDBPolb5ZgGOf9g=="; - }; - }; "esbuild-windows-arm64-0.15.18" = { name = "esbuild-windows-arm64"; packageName = "esbuild-windows-arm64"; @@ -30996,22 +31905,22 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.28.0" = { + "eslint-8.32.0" = { name = "eslint"; packageName = "eslint"; - version = "8.28.0"; + version = "8.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz"; - sha512 = "S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz"; + sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; }; - "eslint-8.32.0" = { + "eslint-8.35.0" = { name = "eslint"; packageName = "eslint"; - version = "8.32.0"; + version = "8.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz"; - sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; + sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; }; }; "eslint-config-prettier-6.15.0" = { @@ -31032,6 +31941,24 @@ let sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; }; + "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-config-standard-jsx-11.0.0" = { + name = "eslint-config-standard-jsx"; + packageName = "eslint-config-standard-jsx"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz"; + sha512 = "+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ=="; + }; + }; "eslint-formatter-pretty-4.1.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; @@ -31068,6 +31995,15 @@ let sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; }; }; + "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-import-2.27.5" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; @@ -31086,13 +32022,22 @@ let sha512 = "63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA=="; }; }; - "eslint-plugin-no-unsanitized-4.0.1" = { + "eslint-plugin-n-15.6.1" = { + name = "eslint-plugin-n"; + packageName = "eslint-plugin-n"; + version = "15.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz"; + sha512 = "R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA=="; + }; + }; + "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=="; + 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" = { @@ -31104,13 +32049,22 @@ let sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; }; }; - "eslint-plugin-react-7.32.1" = { + "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.32.2" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; - version = "7.32.1"; + version = "7.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz"; - sha512 = "vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www=="; + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz"; + sha512 = "t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg=="; }; }; "eslint-plugin-react-hooks-4.6.0" = { @@ -31140,6 +32094,15 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; + "eslint-plugin-vue-9.9.0" = { + name = "eslint-plugin-vue"; + packageName = "eslint-plugin-vue"; + version = "9.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz"; + sha512 = "YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ=="; + }; + }; "eslint-rule-docs-1.1.235" = { name = "eslint-rule-docs"; packageName = "eslint-rule-docs"; @@ -31374,13 +32337,13 @@ let sha512 = "m7OsYzocA8OQ3+9CxmhIv7NPHtyDR2ixaLCO7kLZ+YH+xQ/BpaZmll9EXmc+kBxzWA8BRBXbNEuEQqQ6vfsgDw=="; }; }; - "esquery-1.4.0" = { + "esquery-1.4.2" = { name = "esquery"; packageName = "esquery"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"; + sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng=="; }; }; "esrecurse-4.3.0" = { @@ -31419,22 +32382,58 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "estree-util-is-identifier-name-2.0.1" = { + "estree-util-attach-comments-2.1.1" = { + name = "estree-util-attach-comments"; + packageName = "estree-util-attach-comments"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-2.1.1.tgz"; + sha512 = "+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w=="; + }; + }; + "estree-util-build-jsx-2.2.2" = { + name = "estree-util-build-jsx"; + packageName = "estree-util-build-jsx"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-util-build-jsx/-/estree-util-build-jsx-2.2.2.tgz"; + sha512 = "m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg=="; + }; + }; + "estree-util-is-identifier-name-1.1.0" = { name = "estree-util-is-identifier-name"; packageName = "estree-util-is-identifier-name"; - version = "2.0.1"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz"; + sha512 = "OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ=="; + }; + }; + "estree-util-is-identifier-name-2.1.0" = { + name = "estree-util-is-identifier-name"; + packageName = "estree-util-is-identifier-name"; + 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-value-to-estree-1.3.0" = { + name = "estree-util-value-to-estree"; + packageName = "estree-util-value-to-estree"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-1.3.0.tgz"; + sha512 = "Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw=="; + }; + }; + "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" = { @@ -31464,6 +32463,15 @@ let sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; }; }; + "estree-walker-3.0.3" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz"; + sha512 = "7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="; + }; + }; "esutils-2.0.3" = { name = "esutils"; packageName = "esutils"; @@ -31518,6 +32526,15 @@ let sha512 = "/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw=="; }; }; + "eval-0.1.6" = { + name = "eval"; + packageName = "eval"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz"; + sha512 = "o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ=="; + }; + }; "eve-0.5.4" = { name = "eve"; packageName = "eve"; @@ -31536,13 +32553,13 @@ let sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; }; }; - "event-lite-0.1.2" = { + "event-lite-0.1.3" = { name = "event-lite"; packageName = "event-lite"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/event-lite/-/event-lite-0.1.2.tgz"; - sha512 = "HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="; + url = "https://registry.npmjs.org/event-lite/-/event-lite-0.1.3.tgz"; + sha512 = "8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw=="; }; }; "event-loop-stats-1.4.1" = { @@ -31743,15 +32760,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"; @@ -31860,6 +32868,15 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; + "execa-5.0.0" = { + name = "execa"; + packageName = "execa"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; + sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + }; + }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -31878,6 +32895,15 @@ let sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA=="; }; }; + "execa-7.0.0" = { + name = "execa"; + packageName = "execa"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-7.0.0.tgz"; + sha512 = "tQbH0pH/8LHTnwTrsKWideqi6rFB/QNUawEwrn+WHyz7PX1Tuz2u7wfTvbaNBdP5JD5LVWxNo8/A8CHNZ3bV6g=="; + }; + }; "execall-1.0.0" = { name = "execall"; packageName = "execall"; @@ -32022,76 +33048,67 @@ let sha512 = "/wSgNMxFusiYRy1rd19LT2SQlIXDppHpumpWo06wxjflD1OYxDLbl6rMVw+U3bxD5Nuhex4TKqv9Aem4D0lVzQ=="; }; }; - "expo-47.0.13" = { + "expo-48.0.4" = { name = "expo"; packageName = "expo"; - version = "47.0.13"; + version = "48.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/expo/-/expo-47.0.13.tgz"; - sha512 = "9VjjGdViCJ9NfWbUE7brkwFBDvKuA35V345vMtHFYNKoGJjXib36yitmawreMDQFv0kMTqTnzc7T2191Pod7Ng=="; + url = "https://registry.npmjs.org/expo/-/expo-48.0.4.tgz"; + sha512 = "FGxaxqI8u0r3CvFQAEx/kpqZP4cA7q9ymMoIrrjtOsWvKsuk5Dt3gLEJpymGp6aicPuDXn3xBxo2dsRZF5NkUw=="; }; }; - "expo-application-5.0.1" = { + "expo-application-5.1.1" = { name = "expo-application"; packageName = "expo-application"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-application/-/expo-application-5.0.1.tgz"; - sha512 = "bThxK5zH/Lc2tkCvEXGjfM7ayvOVmPWYcWzXsMIU1RtG73TyXo4cq+73FvfDNIWn6gKS0WyMcmoPB3WXEV/jsw=="; + url = "https://registry.npmjs.org/expo-application/-/expo-application-5.1.1.tgz"; + sha512 = "aDatTcTTCdTbHw8h4/Tq2ilc6InM5ntF9xWCJdOcnUEcglxxGphVI/lzJKBaBF6mJECA8mEOjpVg2EGxOctTwg=="; }; }; - "expo-asset-8.7.0" = { + "expo-asset-8.9.0" = { name = "expo-asset"; packageName = "expo-asset"; - version = "8.7.0"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-asset/-/expo-asset-8.7.0.tgz"; - sha512 = "lkoNsHK6vf+outISB6/37SonXcAL6Buw0ycjiwQVFfpOBKpkQa+zw5wm1m3KwjH2txmR3xdIzcpWsJkgovYCvQ=="; + url = "https://registry.npmjs.org/expo-asset/-/expo-asset-8.9.0.tgz"; + sha512 = "zenkZrYcsJAcTVl478mCarVmaOE9r2GbTlVvKZaXL8UJIL4rnspk63xUSJLAGMArZIdHzsGFQMXlQG3pgEfzrg=="; }; }; - "expo-constants-14.0.2" = { + "expo-constants-14.2.1" = { name = "expo-constants"; packageName = "expo-constants"; - version = "14.0.2"; + version = "14.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-constants/-/expo-constants-14.0.2.tgz"; - sha512 = "wzV3nrzTXTI8yG0tfas3fnqCfKV6YE+1GphEREyVDAShEB6mBInX1b6HgtpHFy2wOtnml+lPVmTCeGtjjLnZhA=="; + url = "https://registry.npmjs.org/expo-constants/-/expo-constants-14.2.1.tgz"; + sha512 = "DD5u4QmBds2U7uYo409apV7nX+XjudARcgqe7S9aRFJ/6kyftmuxvk1DpaU4X42Av8z/tfKwEpuxl+vl7HHx/Q=="; }; }; - "expo-error-recovery-4.0.1" = { - name = "expo-error-recovery"; - packageName = "expo-error-recovery"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/expo-error-recovery/-/expo-error-recovery-4.0.1.tgz"; - sha512 = "wceptnRX+N3qCSVTNbIchUFu3GmY30onRH5L66OF8HMLpAIQfrZMLxJfz7SAMJTcr3jxsJ11vSa2l2RaPKgHsQ=="; - }; - }; - "expo-file-system-15.1.1" = { + "expo-file-system-15.2.2" = { name = "expo-file-system"; packageName = "expo-file-system"; - version = "15.1.1"; + version = "15.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.1.1.tgz"; - sha512 = "MYYDKxjLo9VOkvGHqym5EOAUS+ero9O66X5zI+EXJzqNznKvnfScdXeeAaQzShmWtmLkdVDCoYFGOaTvTA1wTQ=="; + url = "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.2.2.tgz"; + sha512 = "LFkOLcWwlmnjkURxZ3/0ukS35OswX8iuQknLHRHeyk8mUA8fpRPPelD/a1lS+yclqfqavMJmTXVKM1Nsq5XVMA=="; }; }; - "expo-font-11.0.1" = { + "expo-font-11.1.1" = { name = "expo-font"; packageName = "expo-font"; - version = "11.0.1"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-font/-/expo-font-11.0.1.tgz"; - sha512 = "LGAIluWZfru0J0n87dzb6pwAB6TVMTEiLcsd/ktozzbn4DlN7SeQy40+ruU6bvAKCOGrnRneYbKSIOGkrd7oNg=="; + url = "https://registry.npmjs.org/expo-font/-/expo-font-11.1.1.tgz"; + sha512 = "X+aICqYY69hiiDDtcNrjq8KutHrH2TrHuMqk0Rfq0P7hF6hMd+YefwLBNkvIrqrgmTAuqiLjMUwj2rHLqmgluw=="; }; }; - "expo-keep-awake-11.0.1" = { + "expo-keep-awake-12.0.1" = { name = "expo-keep-awake"; packageName = "expo-keep-awake"; - version = "11.0.1"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-11.0.1.tgz"; - sha512 = "44ZjgLE4lnce2d40Pv8xsjMVc6R5GvgHOwZfkLYtGmgYG9TYrEJeEj5UfSeweXPL3pBFhXKfFU8xpGYMaHdP0A=="; + url = "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-12.0.1.tgz"; + sha512 = "hqeCnb4033TyuZaXs93zTK7rjVJ3bywXATyMmKmKkLEsH2PKBAl/VmjlCOPQL/2Ncqz6aj7Wo//tjeJTARBD4g=="; }; }; "expo-modules-autolinking-0.8.1" = { @@ -32103,22 +33120,22 @@ let sha512 = "S8qfaXCv//7tQWV9M+JKx3CF7ypYhDdSUbkUQdaVO/r8D76/aRTArY/aRw1yEfaAOzyK8C8diDToV1itl51DfQ=="; }; }; - "expo-modules-autolinking-1.0.2" = { + "expo-modules-autolinking-1.1.2" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.0.2.tgz"; - sha512 = "skAUXERKw1gtSw8xsvft9DE0KVhBvw4dujAtgCZoG2l513fN7ds+B5+30ZVgZATMC+EjtlmjKXzhp5QS44DCFA=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.1.2.tgz"; + sha512 = "oOlkAccVnHwwR5ccvF/F/x4Omj9HWzSimMUlIVz0SVGdNBEqTPyn0L/d4uIufhyQbEWvrarqL8o5Yz11wEI0SQ=="; }; }; - "expo-modules-core-1.1.1" = { + "expo-modules-core-1.2.3" = { name = "expo-modules-core"; packageName = "expo-modules-core"; - version = "1.1.1"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.1.1.tgz"; - sha512 = "+AcaYmaWphIfkBcccu65dyOhWnpOJ3+SQpoI4lI/Plg1nNjOLuBjmrdVvpiJOvkN+CqbNGsJ5Yll8LLk+C107Q=="; + url = "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.2.3.tgz"; + sha512 = "bYWxL60NPzDTuvlBrNLlwu7K6H7GqlRKJJpF1c3lqHsMw9vusu3StHZhAXB2noMPD+Ww/pGa/A9tfTtieqvbcg=="; }; }; "expo-pwa-0.0.124" = { @@ -32130,13 +33147,13 @@ let sha512 = "hYvQQhxATNTivWSRc9nrd1WVYJJnBG8P/SVrJ4PPu0pmsS7ZIvWt981IXYG461y9UWnTbXdZEG4UOt0Thak1Gg=="; }; }; - "exponential-backoff-3.1.0" = { + "exponential-backoff-3.1.1" = { name = "exponential-backoff"; packageName = "exponential-backoff"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.0.tgz"; - sha512 = "oBuz5SYz5zzyuHINoe9ooePwSu0xApKWgeNzok4hZ5YKXFh9zrQBEM15CXqoZkJJPuI2ArvqjPQd8UKJA753XA=="; + url = "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz"; + sha512 = "dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="; }; }; "express-2.5.11" = { @@ -32238,6 +33255,15 @@ let sha512 = "swxwm3aP8vrOOvlzOdZvHlSZtJGwHKaY94J6AkrAgCTmcbko3IRwbkhLv2wKV1WeZhjxX58aLMpP3atDBnKuZg=="; }; }; + "express-intercept-0.8.10" = { + name = "express-intercept"; + packageName = "express-intercept"; + version = "0.8.10"; + src = fetchurl { + url = "https://registry.npmjs.org/express-intercept/-/express-intercept-0.8.10.tgz"; + sha512 = "uELMFWh54F4LLxH18nwaVQ/SBAMcnX5llxchAvr5bfy9zwMMwsAXZI2VaRgRr4pqVFayBthOFHphwqDlEFxkbw=="; + }; + }; "express-interceptor-1.2.0" = { name = "express-interceptor"; packageName = "express-interceptor"; @@ -32319,13 +33345,13 @@ let sha512 = "ytpHAAOQ/G5Nm7jyyEKzaoGiDhrUGPHeeJfyI2q7jii5dcPCLogf8EyWzSNcxAX8FZy1U6gfGY46SMmEhP3lMw=="; }; }; - "express-validator-6.14.2" = { + "express-validator-6.15.0" = { name = "express-validator"; packageName = "express-validator"; - version = "6.14.2"; + version = "6.15.0"; 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.15.0.tgz"; + sha512 = "r05VYoBL3i2pswuehoFSy+uM8NBuVaY7avp5qrYjQBDzagx2Z5A77FZqPT8/gNLF3HopWkIzaTFaC4JysWXLqg=="; }; }; "express-ws-2.0.0" = { @@ -32652,13 +33678,22 @@ let sha512 = "wdRazMMeM2pl8hq1lFG8fzix8p1VLAJunTTE2RADiFBwbUfZwybUm6IwPrmMS7qTthiayr166NoXeqWe3hfR5w=="; }; }; - "fast-copy-3.0.0" = { + "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.1" = { name = "fast-copy"; packageName = "fast-copy"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.0.tgz"; - sha512 = "4HzS+9pQ5Yxtv13Lhs1Z1unMXamBdn5nA4bEi1abYpDNSpSp7ODYQ1KPMF6nTatfEzgH6/zPvXKU1zvHiUjWlA=="; + url = "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.1.tgz"; + sha512 = "Knr7NOtK3HWRYGtHoJrjkaWepqT8thIVGAwt0p0aUs1zqkAzXZV4vo9fFNwyb5fcqK1GKYFYxldQdIDVKhUAfA=="; }; }; "fast-csv-4.3.6" = { @@ -32670,6 +33705,15 @@ let sha512 = "2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw=="; }; }; + "fast-decode-uri-component-1.0.1" = { + name = "fast-decode-uri-component"; + packageName = "fast-decode-uri-component"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz"; + sha512 = "WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg=="; + }; + }; "fast-deep-equal-1.1.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -32733,6 +33777,15 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; + "fast-glob-3.2.11" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; + }; + }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -32823,6 +33876,15 @@ let sha512 = "d9cEfo/WcOezgPLAC/8t8wGb6YOD6JTCPMw2QcG2nAdFmyY+9rTUizCTaGjIZAloWENTEUMAPpkUAIJJJ0i96A=="; }; }; + "fast-querystring-1.1.1" = { + name = "fast-querystring"; + packageName = "fast-querystring"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.1.tgz"; + sha512 = "qR2r+e3HvhEFmpdHMv//U8FnFlnYjaC6QKDuaXALDkw2kvHO8WDjxH+f/rHGR4Me4pnk8p9JAkRNTjYHAKRn2Q=="; + }; + }; "fast-readable-async-iterator-1.1.1" = { name = "fast-readable-async-iterator"; packageName = "fast-readable-async-iterator"; @@ -32967,22 +34029,13 @@ let sha512 = "WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ=="; }; }; - "faunadb-4.7.1" = { + "faunadb-4.8.0" = { name = "faunadb"; packageName = "faunadb"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.7.1.tgz"; - sha512 = "36frUeNww/TF3mMCSyLMjSy0BLD+ZURrmev6M/Tf1Q+Bu8K1Bk1tHJI9Uf2+di8oxe/38Xzo37Mi4EGaekbrAg=="; - }; - }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha512 = "Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.8.0.tgz"; + sha512 = "pjl5WUYQ8GqM4ESk3mv0RXfxtQMHWb92XWkxjf3nWiAkf2HVtsENfTbyGPunzw4zDbdhn9aQSSxbwahaLLDR7Q=="; }; }; "faye-websocket-0.11.4" = { @@ -33282,15 +34335,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"; @@ -33498,15 +34542,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"; @@ -33957,13 +34992,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.197.0" = { + "flow-parser-0.200.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.197.0"; + version = "0.200.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.197.0.tgz"; - sha512 = "yhwkJPxH1JBg0aJunk/jVRy5p3UhVZBGkzL1hq/GK+GaBh6bKr2YKkv6gDuiufaw+i3pKWQgOLtD++1cvrgXLA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.200.1.tgz"; + sha512 = "N6gxgo0iQx0G2m3aJjg3RLxNLUG3EBYgBN/xDDPGQXSjvqNkTdEd2t1myE36Xi7GndZQWngDP7jf0GvxdL6pRg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -33975,13 +35010,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" = { @@ -34254,22 +35289,13 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-4.1.6" = { + "fork-ts-checker-webpack-plugin-7.3.0" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "4.1.6"; - 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.14" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "7.2.14"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz"; - sha512 = "Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.3.0.tgz"; + sha512 = "IN+XTzusCjR5VgntYFgxbxVx3WraPRnKehBFrf00cMSrtUuW9MsG9dhL6MWpY6MkjC3wVwoujfCDgZZCQwbswA=="; }; }; "fork-ts-checker-webpack-plugin-v5-5.2.1" = { @@ -34335,15 +35361,6 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "form-data-encoder-1.7.2" = { - name = "form-data-encoder"; - packageName = "form-data-encoder"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz"; - sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; - }; - }; "form-data-encoder-2.1.4" = { name = "form-data-encoder"; packageName = "form-data-encoder"; @@ -34380,15 +35397,6 @@ let sha512 = "varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="; }; }; - "formdata-node-4.4.1" = { - name = "formdata-node"; - packageName = "formdata-node"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz"; - sha512 = "0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ=="; - }; - }; "formdata-polyfill-4.0.10" = { name = "formdata-polyfill"; packageName = "formdata-polyfill"; @@ -34749,13 +35757,13 @@ let sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; }; - "fs-minipass-3.0.0" = { + "fs-minipass-3.0.1" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.0.tgz"; - sha512 = "EUojgQaSPy6sxcqcZgQv6TVF6jiKvurji3AxhAivs/Ep4O1UpS8TusaxpybfFHZ2skRhLqzk6WR8nqNYIMMDeA=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz"; + sha512 = "MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw=="; }; }; "fs-mkdirp-stream-1.0.0" = { @@ -34884,13 +35892,13 @@ let sha512 = "xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw=="; }; }; - "fswin-3.22.106" = { + "fswin-3.23.119" = { name = "fswin"; packageName = "fswin"; - version = "3.22.106"; + version = "3.23.119"; src = fetchurl { - url = "https://registry.npmjs.org/fswin/-/fswin-3.22.106.tgz"; - sha512 = "j/fa7L2fiwEZkyLHRVecd2d5iZAvFUIS8VcvqaSN1SQe5WlL9xfQT4wZFUl8YafH9vTGZlNohJyI3p/Hrtu1WQ=="; + url = "https://registry.npmjs.org/fswin/-/fswin-3.23.119.tgz"; + sha512 = "OzyPAua0GO/ii2z+uB2IdqU+5rvWJy1dX6/K0PQm82tPl/gh59Js84RArk06TxpPq7/WiHOpM56Fo8UnphPhow=="; }; }; "ftp-0.3.10" = { @@ -35010,22 +36018,22 @@ let sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; - "gatsby-core-utils-4.4.0" = { + "gatsby-core-utils-4.7.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "4.4.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.4.0.tgz"; - sha512 = "/ibilcGENKH6qqkcT17SIZgc2kjZn3HiGpD+ixbXYkMGqHiM5pj9XIHjy3DfvZvDt2ujkYV5EinmUdqx7CI81w=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.7.0.tgz"; + sha512 = "J8bjc+ASIfkrNbbOTvHbqgPtj/scgmLVB9rGuItZrbJyyHqyB6NLNbJeN8tHL//fjQ8B3vwyoHy6B09TMLQitQ=="; }; }; - "gatsby-telemetry-4.4.0" = { + "gatsby-telemetry-4.7.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "4.4.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.4.0.tgz"; - sha512 = "rcGMNa4fWIQSDqaUYjMXccrtVr71YQNzw01BfDZ6jxnSc7j29tZ8YXZZh+caS9Fc9cdLpQ2UabFcIp5vAtKQqA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.7.0.tgz"; + sha512 = "+7HeJbRUl0ZT/As6uShnIZ5RHgHHihNiCRtfKyKsX02pjZdJ44tUYw26j2IUIAVrtzQgYiB5mPXAaUvQQzoO3Q=="; }; }; "gauge-1.2.7" = { @@ -35163,6 +36171,15 @@ let sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ=="; }; }; + "generic-names-4.0.0" = { + name = "generic-names"; + packageName = "generic-names"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz"; + sha512 = "ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A=="; + }; + }; "generic-pool-3.8.2" = { name = "generic-pool"; packageName = "generic-pool"; @@ -35280,13 +36297,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" = { @@ -35451,6 +36468,15 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; + "get-stream-6.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz"; + sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg=="; + }; + }; "get-stream-6.0.1" = { name = "get-stream"; packageName = "get-stream"; @@ -35532,6 +36558,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"; @@ -35559,6 +36594,15 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; + "git-hooks-list-1.0.3" = { + name = "git-hooks-list"; + packageName = "git-hooks-list"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-1.0.3.tgz"; + sha512 = "Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ=="; + }; + }; "git-node-fs-1.0.0" = { name = "git-node-fs"; packageName = "git-node-fs"; @@ -35874,6 +36918,15 @@ let sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; }; + "glob-9.0.1" = { + name = "glob"; + packageName = "glob"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-9.0.1.tgz"; + sha512 = "psRdn8MI0gRcH0xow0VOhYxXD/6ZaRGmgtfN0oWN/hCgjxpRQBMCl7wE4JRJSAUTdJsW+FmD0EtE0CgJhKqSVw=="; + }; + }; "glob-base-0.3.0" = { name = "glob-base"; packageName = "glob-base"; @@ -36154,13 +37207,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.19.0" = { + "globals-13.20.0" = { name = "globals"; packageName = "globals"; - version = "13.19.0"; + version = "13.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; - sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; }; }; "globals-9.18.0" = { @@ -36190,6 +37243,15 @@ let sha512 = "40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="; }; }; + "globby-10.0.0" = { + name = "globby"; + packageName = "globby"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-10.0.0.tgz"; + sha512 = "3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw=="; + }; + }; "globby-10.0.2" = { name = "globby"; packageName = "globby"; @@ -36217,6 +37279,15 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; + "globby-12.2.0" = { + name = "globby"; + packageName = "globby"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; + sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; + }; + }; "globby-13.1.3" = { name = "globby"; packageName = "globby"; @@ -36334,15 +37405,6 @@ let sha512 = "YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg=="; }; }; - "goldengate-12.0.1" = { - name = "goldengate"; - packageName = "goldengate"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-12.0.1.tgz"; - sha512 = "Ku6nujmXs0JWj1/Z6ZLN7Mtq3S4inAW8JSv6EtsNRORCofJ8r8BlwxDDV3EDYfZvOmttc2JbnfGFtcKoXKz/BA=="; - }; - }; "goldengate-12.0.2" = { name = "goldengate"; packageName = "goldengate"; @@ -36379,13 +37441,13 @@ let sha512 = "1M0NG5VDIvJZEnstHbRdckLZESoJwguinwN8Dhae0j2ZKIQFIV63zxm6Fo6nM4xkgqUr2bbMtV5Dgo+Hy6oo0Q=="; }; }; - "google-gax-3.5.2" = { + "google-gax-3.5.7" = { name = "google-gax"; packageName = "google-gax"; - version = "3.5.2"; + version = "3.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-3.5.2.tgz"; - sha512 = "AyP53w0gHcWlzxm+jSgqCR3Xu4Ld7EpSjhtNBnNhzwwWaIUyphH9kBGNIEH+i4UGkTUXOY29K/Re8EiAvkBRGw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-3.5.7.tgz"; + sha512 = "taDGwR9Ry5y6NkcPYKe0B3wr7rCwaImZZIuWajUcFe9Y8L71eBtaq0+ZJ62JByzr/2cJkd9EN1rr52rD6V/UDA=="; }; }; "google-p12-pem-3.1.4" = { @@ -36613,31 +37675,31 @@ let sha512 = "vH2bsdjoJLQ33sZCquG1GyiFyK+Qk8n04NzqHLWTnY9l8lg08AGUyA8ZgeZHdi3I81nrdcGO13V9qYyP6sdshw=="; }; }; - "grammy-1.13.0" = { + "grammy-1.13.1" = { name = "grammy"; packageName = "grammy"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.13.0.tgz"; - sha512 = "3C9ClsH05NogyZ68MXGDjS3rsieIWsEfx904CR48cfwG1m8fAgSLRi2HLuZOF6HPMEHsyYFwjtvOU312QcADdw=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.13.1.tgz"; + sha512 = "kAxja6QDjw5oTJOFtrqhaQlLfCco3AwO4Mb4YRdP8A+v59roJA8mgEd0S5dOgFPyn74bPp8VWaKCI+of8wnPow=="; }; }; - "grammy-1.13.1" = { + "grammy-1.14.1" = { name = "grammy"; packageName = "grammy"; - version = "1.13.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.13.1.tgz"; - sha512 = "kAxja6QDjw5oTJOFtrqhaQlLfCco3AwO4Mb4YRdP8A+v59roJA8mgEd0S5dOgFPyn74bPp8VWaKCI+of8wnPow=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.14.1.tgz"; + sha512 = "hFIW2DE2xF5yuYL5a65i/0lvqsAwQsIaJO64Fk0N7v696nTSu7g0LqnQnHapmydRkNMoZVbwn25M80LKZzUkxw=="; }; }; - "grant-4.7.0" = { + "grant-5.4.21" = { name = "grant"; packageName = "grant"; - version = "4.7.0"; + version = "5.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/grant/-/grant-4.7.0.tgz"; - sha512 = "QGPjCYDrBnb/OIiTRxbK3TnNOE6Ycgfc/GcgPzI4vyNIr+b7yisEexYp7VM74zj6bxr+mDTzfGONRLzzsVPJIA=="; + url = "https://registry.npmjs.org/grant/-/grant-5.4.21.tgz"; + sha512 = "QaoZudI9Gmh2W415gd71Iul6gpVH9sG1SkjfnGHtqYZopQDQ5PUVxRol5zFCrwGi9S0EbExbelHlZScgdChg2w=="; }; }; "grapheme-breaker-0.3.2" = { @@ -36766,22 +37828,22 @@ let sha512 = "Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg=="; }; }; - "graphql-config-4.4.0" = { + "graphql-config-4.4.1" = { name = "graphql-config"; packageName = "graphql-config"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.4.0.tgz"; - sha512 = "QUrX7R4htnTBTi83a0IlIilWVfiLEG8ANFlHRcxoZiTvOXTbgan67SUdGe1OlopbDuyNgtcy4ladl3Gvk4C36A=="; + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.4.1.tgz"; + sha512 = "B8wlvfBHZ5WnI4IiuQZRqql6s+CKz7S+xpUeTb28Z8nRBi8tH9ChEBgT5FnTyE05PUhHlrS2jK9ICJ4YBl9OtQ=="; }; }; - "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" = { @@ -36802,13 +37864,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.9.4" = { + "graphql-language-service-server-2.9.5" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.4.tgz"; - sha512 = "26PediCh1HWP6vIwiqCCUkh1QzKoLVFeEX79SerI3ETsfCS4RYyFAX4SiiFPLj0JKKM8Xmg7OBjRgiwwa1AdYw=="; + 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" = { @@ -36883,13 +37945,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.11.2" = { + "graphql-ws-5.11.3" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.11.2"; + version = "5.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.11.2.tgz"; - sha512 = "4EiZ3/UXYcjm+xFGP544/yW1+DVI8ZpKASFbzrV5EDTFWJp0ZvLl4Dy2fSZAzz9imKp5pZMIcjB0x/H69Pv/6w=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.11.3.tgz"; + sha512 = "fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ=="; }; }; "gray-matter-4.0.3" = { @@ -37477,6 +38539,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"; @@ -37558,13 +38629,13 @@ let sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA=="; }; }; - "hast-util-from-parse5-7.1.1" = { + "hast-util-from-parse5-7.1.2" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.1.tgz"; - sha512 = "R6PoNcUs89ZxLJmMWsVbwSWuz95/9OriyQZ3e2ybwqGsRXzhA6gv49rgGmQvLbZuSNDv9fCg7vV7gXUsvtUFaA=="; + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-7.1.2.tgz"; + sha512 = "Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw=="; }; }; "hast-util-has-property-1.0.4" = { @@ -37657,6 +38728,15 @@ let sha512 = "yGkCfPkkfCyiLfK6KEl/orMDr/zgCnq/NaO9HfULx6/Zga5fso5eqQA5Ov/JZVqACygvw9shRYWgXNcG2ilo7w=="; }; }; + "hast-util-to-estree-2.3.2" = { + name = "hast-util-to-estree"; + packageName = "hast-util-to-estree"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-2.3.2.tgz"; + sha512 = "YYDwATNdnvZi3Qi84iatPIl1lWpXba1MeNrNbDfJfVzEBZL8uUmtR7mt7bxKBC8kuAuvb0bkojXYZzsNHyHCLg=="; + }; + }; "hast-util-to-nlcst-1.2.8" = { name = "hast-util-to-nlcst"; packageName = "hast-util-to-nlcst"; @@ -37936,15 +39016,6 @@ let sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; - "highlight.js-11.1.0" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.1.0.tgz"; - sha512 = "X9VVhYKHQPPuwffO8jk4bP/FVj+ibNCy3HxZZNDXFtJrq4O5FdcdCDRIkDis5MiMnjh7UwEdHgRZJcHFYdzDdA=="; - }; - }; "highlight.js-11.7.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -38152,6 +39223,15 @@ let sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; }; }; + "hpagent-0.1.2" = { + name = "hpagent"; + packageName = "hpagent"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz"; + sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="; + }; + }; "hpagent-1.0.0" = { name = "hpagent"; packageName = "hpagent"; @@ -38278,15 +39358,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"; @@ -38296,13 +39367,13 @@ 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"; + "html-minifier-4.0.0" = { + name = "html-minifier"; + packageName = "html-minifier"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz"; + sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; }; }; "html-minifier-terser-6.1.0" = { @@ -38341,13 +39412,13 @@ let sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg=="; }; }; - "html-to-text-9.0.3" = { + "html-to-text-9.0.4" = { name = "html-to-text"; packageName = "html-to-text"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.3.tgz"; - sha512 = "hxDF1kVCF2uw4VUJ3vr2doc91pXf2D5ngKcNviSitNkhP9OMOaJkDrFIFL6RMvko7NisWTEiqGpQ9LAxcVok1w=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.4.tgz"; + sha512 = "ckrQ5N2yZS7qSgKxUbqrBZ02NxD5cSy7KuYjCNIf+HWbdzY3fbjYjQsoRIl6TiaZ4+XWOi0ggFP8/pmgCK/o+A=="; }; }; "html-void-elements-1.0.5" = { @@ -38368,15 +39439,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"; @@ -38449,15 +39511,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"; @@ -38521,13 +39574,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" = { @@ -38890,6 +39943,15 @@ let sha512 = "rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="; }; }; + "human-signals-4.3.0" = { + name = "human-signals"; + packageName = "human-signals"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-4.3.0.tgz"; + sha512 = "zyzVyMjpGBX2+6cDVZeFPCdtOtdsxOeseRhB9tkQ6xXmGUNrcnBzdEKPy3VPNYz+4gy1oukVOXcrJCunSyc6QQ=="; + }; + }; "humanize-0.0.9" = { name = "humanize"; packageName = "humanize"; @@ -39106,6 +40168,15 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; + "icss-utils-5.1.0" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + }; "idb-keyval-6.2.0" = { name = "idb-keyval"; packageName = "idb-keyval"; @@ -39223,13 +40294,13 @@ let sha512 = "yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw=="; }; }; - "ignore-walk-6.0.0" = { + "ignore-walk-6.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.0.tgz"; - sha512 = "bTf9UWe/UP1yxG3QUrj/KOvEhTAUWPcv+WvbFZ28LcqznXabp7Xu6o9y1JEC18+oqODuS7VhTpekV5XvFwsxJg=="; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.1.tgz"; + sha512 = "/c8MxUAqpRccq+LyDOecwF+9KqajueJHh8fz7g3YqjMZt+NSfJzx05zrKiXwa2sKwFCzaiZ5qUVfRj0pmxixEA=="; }; }; "image-data-uri-2.0.1" = { @@ -39241,6 +40312,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"; @@ -39340,22 +40420,13 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; - "immer-8.0.1" = { - name = "immer"; - packageName = "immer"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"; - sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; - }; - }; - "immer-9.0.18" = { + "immer-9.0.19" = { name = "immer"; packageName = "immer"; - version = "9.0.18"; + version = "9.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz"; - sha512 = "eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="; + url = "https://registry.npmjs.org/immer/-/immer-9.0.19.tgz"; + sha512 = "eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="; }; }; "immutable-3.8.2" = { @@ -39367,13 +40438,13 @@ let sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="; }; }; - "immutable-4.2.2" = { + "immutable-4.2.4" = { name = "immutable"; packageName = "immutable"; - version = "4.2.2"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz"; - sha512 = "fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.2.4.tgz"; + sha512 = "WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w=="; }; }; "import-cwd-2.1.0" = { @@ -39790,6 +40861,15 @@ let sha512 = "0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA=="; }; }; + "inline-style-parser-0.1.1" = { + name = "inline-style-parser"; + packageName = "inline-style-parser"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz"; + sha512 = "7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="; + }; + }; "innertext-1.0.3" = { name = "innertext"; packageName = "innertext"; @@ -40087,13 +41167,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.4" = { + "internal-slot-1.0.5" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; + sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; }; }; "internmap-2.0.3" = { @@ -40231,15 +41311,6 @@ let sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="; }; }; - "invoices-2.2.2" = { - name = "invoices"; - packageName = "invoices"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-2.2.2.tgz"; - sha512 = "flSBneW7IYRS2K7eVoL6Uemo5LkXkv++6wul8ZBbDz48j3GSGb1pVLdHUo1nvU9+WGNU3/Pqq27r99okyCnHdQ=="; - }; - }; "invoices-2.2.3" = { name = "invoices"; packageName = "invoices"; @@ -40258,6 +41329,15 @@ let sha512 = "Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA=="; }; }; + "io-ts-reporters-1.2.2" = { + name = "io-ts-reporters"; + packageName = "io-ts-reporters"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/io-ts-reporters/-/io-ts-reporters-1.2.2.tgz"; + sha512 = "igASwWWkDY757OutNcM6zTtdJf/eTZYkoe2ymsX2qpm5bKZLo74FJYjsCtMQOEdY7dRHLLEulCyFQwdN69GBCg=="; + }; + }; "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; @@ -40267,13 +41347,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.5" = { + "ioredis-5.3.1" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.5"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"; - sha512 = "7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.1.tgz"; + sha512 = "C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg=="; }; }; "iota-array-1.0.0" = { @@ -40465,13 +41545,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" = { @@ -40492,15 +41572,6 @@ let sha512 = "Xi9/ZSn4NFapG8RP98iNPMOeaV3mXPisxKxzKtHVqr3g56j/fBn+yZmnxSVAA8lmZbl2J9b/a4kJvfU3hqQYgA=="; }; }; - "is-absolute-0.2.6" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; - sha512 = "7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ=="; - }; - }; "is-absolute-1.0.0" = { name = "is-absolute"; packageName = "is-absolute"; @@ -41698,6 +42769,15 @@ let sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; }; }; + "is-reference-3.0.1" = { + name = "is-reference"; + packageName = "is-reference"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz"; + sha512 = "baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w=="; + }; + }; "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; @@ -41734,15 +42814,6 @@ let sha512 = "wBOr+rNM4gkAZqoLRJI4myw5WzzIdQosFAAbnvfXP5z1LyzgAI3ivOKehC5KfqlQJZoihVhirgtCBj378Eg8GA=="; }; }; - "is-relative-0.2.1" = { - name = "is-relative"; - packageName = "is-relative"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; - sha512 = "9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw=="; - }; - }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -41842,6 +42913,15 @@ let sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; @@ -41932,15 +43012,6 @@ let sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; }; }; - "is-unc-path-0.1.2" = { - name = "is-unc-path"; - packageName = "is-unc-path"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz"; - sha512 = "HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w=="; - }; - }; "is-unc-path-1.0.0" = { name = "is-unc-path"; packageName = "is-unc-path"; @@ -42139,15 +43210,6 @@ let sha512 = "/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ=="; }; }; - "is2-0.0.9" = { - name = "is2"; - packageName = "is2"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/is2/-/is2-0.0.9.tgz"; - sha512 = "coTlYFtfW9GLTi5Ub86408bKfV3/tSikXWMo0oENBCSz+RhBeOzjm0rOIerdBmcykbywUH5xMUuBtMDj1HTisQ=="; - }; - }; "is2-2.0.9" = { name = "is2"; packageName = "is2"; @@ -42202,6 +43264,15 @@ let sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; }; + "isbinaryfile-5.0.0" = { + name = "isbinaryfile"; + packageName = "isbinaryfile"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; + sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; + }; + }; "isemail-3.2.0" = { name = "isemail"; packageName = "isemail"; @@ -42544,15 +43615,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"; @@ -42562,6 +43624,15 @@ let sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; + "jimp-0.16.13" = { + name = "jimp"; + packageName = "jimp"; + version = "0.16.13"; + src = fetchurl { + url = "https://registry.npmjs.org/jimp/-/jimp-0.16.13.tgz"; + sha512 = "Bxz8q7V4rnCky9A0ktTNGA9SkNFVWRHodddI/DaAWZJzF7sVUlFYKQ60y9JGqrKpi48ECA/TnfMzzc5C70VByA=="; + }; + }; "jimp-compact-0.16.1" = { name = "jimp-compact"; packageName = "jimp-compact"; @@ -42634,6 +43705,15 @@ let sha512 = "1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg=="; }; }; + "joi-17.8.3" = { + name = "joi"; + packageName = "joi"; + version = "17.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/joi/-/joi-17.8.3.tgz"; + sha512 = "q5Fn6Tj/jR8PfrLrx4fpGH4v9qM6o+vDUfD4/3vxxyg34OmKcNqYZ1qn2mpLza96S8tL0p0rIw2gOZX+/cTg9w=="; + }; + }; "join-async-iterator-1.1.1" = { name = "join-async-iterator"; packageName = "join-async-iterator"; @@ -42661,13 +43741,13 @@ let sha512 = "jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA=="; }; }; - "jose-4.11.1" = { + "jose-4.11.2" = { name = "jose"; packageName = "jose"; - version = "4.11.1"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.11.1.tgz"; - sha512 = "YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q=="; + url = "https://registry.npmjs.org/jose/-/jose-4.11.2.tgz"; + sha512 = "njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A=="; }; }; "joycon-3.1.1" = { @@ -42743,13 +43823,13 @@ let sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; }; }; - "jquery.terminal-2.35.2" = { + "jquery.terminal-2.35.3" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.35.2"; + version = "2.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.35.2.tgz"; - sha512 = "ZPZ1JDpDskfZVqiA2xwltTzNLXqpc6GCO0NZcZ784u0Rt/zk1cliTS9sjOMklmqvI0Z2v0xLjfIJnZDSJEKrYA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.35.3.tgz"; + sha512 = "McYaOivaUB2Gubn8IBhQY7zxjGWXg4ENSofL11rt7HACWUDjqncXxakShuqq7Ma0y+BwCcYdltPl1e+WpDJkeg=="; }; }; "js-base64-2.6.3" = { @@ -42770,13 +43850,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-base64-3.7.4" = { + "js-base64-3.7.5" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; - sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; + sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; "js-beautify-1.14.7" = { @@ -42833,22 +43913,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"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz"; - sha512 = "Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="; - }; - }; - "js-sdsl-4.2.0" = { - name = "js-sdsl"; - packageName = "js-sdsl"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz"; - sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; + 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" = { @@ -43040,6 +44111,15 @@ let sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; }; + "jsdoc-4.0.2" = { + name = "jsdoc"; + packageName = "jsdoc"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz"; + sha512 = "e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg=="; + }; + }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -43049,15 +44129,6 @@ let sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng=="; }; }; - "jsdom-15.2.1" = { - name = "jsdom"; - packageName = "jsdom"; - version = "15.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz"; - sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; - }; - }; "jsdom-16.7.0" = { name = "jsdom"; packageName = "jsdom"; @@ -43076,6 +44147,15 @@ let sha512 = "RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A=="; }; }; + "jsdom-21.0.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "21.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-21.0.0.tgz"; + sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -43121,49 +44201,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.73.0" = { + "jsii-1.76.0" = { name = "jsii"; packageName = "jsii"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.73.0.tgz"; - sha512 = "6GLXJv+XDPNPw4JRAMr6NicWgLorFcKmAZB6x+gqCnrkA6FqZlgDPohFdcqAkxE5Px9K3oAFIsnEH/xV3HuGrg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.76.0.tgz"; + sha512 = "IlQmxPPnscn2Va/cnnXRnQ7bnxEkO8ImKW0MBlEr66oqxhFQ9jy9+FWzOp/5kfHzhyyyM5mcqitB8O6fr1moIw=="; }; }; - "jsii-pacmak-1.73.0" = { + "jsii-pacmak-1.76.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.73.0.tgz"; - sha512 = "zz3z+AoKXciKxBcmFt4PHPQPhbkjRUgN0hkrC6XhqugbpGprICtLNimU4qAQywHA+T0024TX8fnCCuymQ1sJPg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.76.0.tgz"; + sha512 = "70h0puIRpDeDyYk/jLxQk7vPbg3w3ppJRATlF0qPntMk/WnSo4uvr8hlz1BmRzOOvQ7JqXBuNOaVd+bp7Xolbw=="; }; }; - "jsii-reflect-1.73.0" = { + "jsii-reflect-1.76.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.73.0.tgz"; - sha512 = "RNnejItM5DUvTpMNBhL095Yt87a6mLWTse9rYZmR+XglJ8WdyNW8mmDftz8gq58TKr5mDVUtq5vpRApCEm0Viw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.76.0.tgz"; + sha512 = "voS5WyeitP3o0knus00v00NlxVLbaU9ykvEDamFw5KPEc4z4wvAwDG9wBfNmdO1OulXgID41WhMzJOEJFKle6A=="; }; }; - "jsii-rosetta-1.73.0" = { + "jsii-rosetta-1.76.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.73.0.tgz"; - sha512 = "UrXBaM/7jJldrlDN2aV/vaIurIZJM4ikJtcE/ugSoAuJUW42Hpi0Qd5k9MiSaE/k+KNxRpihS+skRa2TETT3Cg=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.76.0.tgz"; + sha512 = "y3OcYebjMdK/4Yxt8P9tMalK9Szmq8Xc4VXD3kGDIEulMjUxo3TpEUZc9WEfzVu6A+lSl/WRAwV50ZgzQyVWZg=="; }; }; - "jsii-srcmak-0.1.797" = { + "jsii-srcmak-0.1.838" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.797"; + version = "0.1.838"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.797.tgz"; - sha512 = "SF41dMMOlMYWHDrvJ0PgTPzHR+RGxoyUBk+kUaAazE2WaWINLqwFxeT5rbrrXqcYNQ/JiprlrES69TllyWVAVA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.838.tgz"; + sha512 = "5GJi0TGtO4NyTS5lT7rYnlpr4WD14rkUry5+3aMg/MYtECoX0IyTTHy/RBEFCQBZ47i7tZkQC9m5EIpGSSKpjA=="; }; }; "json-bigint-1.0.0" = { @@ -43454,6 +44534,15 @@ let sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; }; }; + "json-schema-typed-8.0.1" = { + name = "json-schema-typed"; + packageName = "json-schema-typed"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.1.tgz"; + sha512 = "XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg=="; + }; + }; "json-server-0.8.23" = { name = "json-server"; packageName = "json-server"; @@ -43526,22 +44615,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.247" = { + "json2jsii-0.3.290" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.247"; + version = "0.3.290"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.247.tgz"; - sha512 = "0TJVNcWTd3dRYT1Zz9thhceNAEYnK/k7TIhwfmyWP1KaqdZq1tvxLOWkBrzQX6rIEXFU7l8EX6u+Y7bWXP/oFA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.290.tgz"; + sha512 = "aG3lEpWDluFecGHE+GbxzjSQBkQslgLjiw8S6ZZc5RRrI0ShDNj0bv8AXlPES4EwmBcv2w1jkjBxtWMLR4KxMw=="; }; }; "json3-3.2.6" = { @@ -43553,15 +44633,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"; @@ -43931,13 +45002,13 @@ let sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; }; - "jszip-3.7.1" = { + "jszip-3.8.0" = { name = "jszip"; packageName = "jszip"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; - sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.8.0.tgz"; + sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw=="; }; }; "junk-1.0.3" = { @@ -44021,6 +45092,15 @@ let sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; }; }; + "jwk-to-pem-2.0.5" = { + name = "jwk-to-pem"; + packageName = "jwk-to-pem"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz"; + sha512 = "L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A=="; + }; + }; "jws-3.2.2" = { name = "jws"; packageName = "jws"; @@ -45092,13 +46172,13 @@ let sha512 = "DbiwHL8454goYRp5Xn9vUA5XU6x8rNh8BmZ7ywSTUhVBIiDS7ev/FT6+AwU2/ZKW2jEOC7WKhpkJfExaQwosRA=="; }; }; - "libnpmaccess-6.0.4" = { + "libnpmaccess-6.0.3" = { name = "libnpmaccess"; packageName = "libnpmaccess"; - version = "6.0.4"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-6.0.4.tgz"; - sha512 = "qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag=="; + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-6.0.3.tgz"; + sha512 = "4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg=="; }; }; "libnpmconfig-1.2.1" = { @@ -45110,13 +46190,13 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libnpmpublish-6.0.5" = { + "libnpmpublish-6.0.4" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "6.0.5"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-6.0.5.tgz"; - sha512 = "LUR08JKSviZiqrYTDfywvtnsnxr+tOvBU0BF8H+9frt7HMvc6Qn6F8Ubm72g5hDTHbq8qupKfDvDAln2TVPvFg=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-6.0.4.tgz"; + sha512 = "lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg=="; }; }; "libpq-1.8.12" = { @@ -45128,22 +46208,22 @@ let sha512 = "4lUY9BD9suz76mVS0kH4rRgRy620g/c9YZH5GYC3smfIpjtj6KiPuQ4IwQSHSZMMMhMM3tBFrYUrw8mHOOZVeg=="; }; }; - "libsodium-0.7.10" = { + "libsodium-0.7.11" = { name = "libsodium"; packageName = "libsodium"; - version = "0.7.10"; + version = "0.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz"; - sha512 = "eY+z7hDrDKxkAK+QKZVNv92A5KYkxfvIshtBJkmg5TSiCnYqZP3i9OO9whE79Pwgm4jGaoHgkM4ao/b9Cyu4zQ=="; + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz"; + sha512 = "WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A=="; }; }; - "libsodium-wrappers-0.7.10" = { + "libsodium-wrappers-0.7.11" = { name = "libsodium-wrappers"; packageName = "libsodium-wrappers"; - version = "0.7.10"; + version = "0.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz"; - sha512 = "pO3F1Q9NPLB/MWIhehim42b/Fwb30JNScCNh8TcQ/kIc+qGLQch8ag8wb0keK3EP5kbGakk1H8Wwo7v+36rNQg=="; + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz"; + sha512 = "SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q=="; }; }; "lie-3.0.4" = { @@ -45200,103 +46280,103 @@ let sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; - "lightning-6.8.0" = { + "lightning-7.0.3" = { name = "lightning"; packageName = "lightning"; - version = "6.8.0"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-6.8.0.tgz"; - sha512 = "HzcRq5n4zkGIXuGefFCoCjKIG/4IbpGESUyKA/+3UvfiGhtrKymRM8zoSFjWRFoaLaosR2P2SuKlrTyMfDmPHg=="; + url = "https://registry.npmjs.org/lightning/-/lightning-7.0.3.tgz"; + sha512 = "oGnfMICKd0cmGxHdXG6VW5Ha/TLVgHJxCCYxHHyOO0PKAAweK8yUV8d0CUfgHaV/rUybTxbQ+oRhMQ6M7yPtyg=="; }; }; - "lightning-7.0.3" = { + "lightning-7.1.0" = { name = "lightning"; packageName = "lightning"; - version = "7.0.3"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-7.0.3.tgz"; - sha512 = "oGnfMICKd0cmGxHdXG6VW5Ha/TLVgHJxCCYxHHyOO0PKAAweK8yUV8d0CUfgHaV/rUybTxbQ+oRhMQ6M7yPtyg=="; + url = "https://registry.npmjs.org/lightning/-/lightning-7.1.0.tgz"; + sha512 = "+46PVhATqGB+t01RipPHj/uOavsnDdKbSBMSNAyAmn2Yo1+lJSp8nYJpr2mfMikMmNDiP3NbBJTSqNjNBknHBQ=="; }; }; - "lightningcss-1.18.0" = { + "lightningcss-1.19.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.18.0.tgz"; - sha512 = "uk10tNxi5fhZqU93vtYiQgx/8a9f0Kvtj5AXIm+VlOXY+t/DWDmCZWJEkZJmmALgvbS6aAW8or+Kq85eJ6TDTw=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.19.0.tgz"; + sha512 = "yV5UR7og+Og7lQC+70DA7a8ta1uiOPnWPJfxa0wnxylev5qfo4P+4iMpzWAdYWOca4jdNQZii+bDL/l+4hUXIA=="; }; }; - "lightningcss-darwin-arm64-1.18.0" = { + "lightningcss-darwin-arm64-1.19.0" = { name = "lightningcss-darwin-arm64"; packageName = "lightningcss-darwin-arm64"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.18.0.tgz"; - sha512 = "OqjydwtiNPgdH1ByIjA1YzqvDG/OMR6L3LPN6wRl1729LB0y4Mik7L06kmZaTb+pvUHr+NmDd2KCwnlrQ4zO3w=="; + url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.19.0.tgz"; + sha512 = "wIJmFtYX0rXHsXHSr4+sC5clwblEMji7HHQ4Ub1/CznVRxtCFha6JIt5JZaNf8vQrfdZnBxLLC6R8pC818jXqg=="; }; }; - "lightningcss-darwin-x64-1.18.0" = { + "lightningcss-darwin-x64-1.19.0" = { name = "lightningcss-darwin-x64"; packageName = "lightningcss-darwin-x64"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.18.0.tgz"; - sha512 = "mNiuPHj89/JHZmJMp+5H8EZSt6EL5DZRWJ31O6k3DrLLnRIQjXuXdDdN8kP7LoIkeWI5xvyD60CsReJm+YWYAw=="; + url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.19.0.tgz"; + sha512 = "Lif1wD6P4poaw9c/4Uh2z+gmrWhw/HtXFoeZ3bEsv6Ia4tt8rOJBdkfVaUJ6VXmpKHALve+iTyP2+50xY1wKPw=="; }; }; - "lightningcss-linux-arm-gnueabihf-1.18.0" = { + "lightningcss-linux-arm-gnueabihf-1.19.0" = { name = "lightningcss-linux-arm-gnueabihf"; packageName = "lightningcss-linux-arm-gnueabihf"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.18.0.tgz"; - sha512 = "S+25JjI6601HiAVoTDXW6SqH+E94a+FHA7WQqseyNHunOgVWKcAkNEc2LJvVxgwTq6z41sDIb9/M3Z9wa9lk4A=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.19.0.tgz"; + sha512 = "P15VXY5682mTXaiDtbnLYQflc8BYb774j2R84FgDLJTN6Qp0ZjWEFyN1SPqyfTj2B2TFjRHRUvQSSZ7qN4Weig=="; }; }; - "lightningcss-linux-arm64-gnu-1.18.0" = { + "lightningcss-linux-arm64-gnu-1.19.0" = { name = "lightningcss-linux-arm64-gnu"; packageName = "lightningcss-linux-arm64-gnu"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.18.0.tgz"; - sha512 = "JSqh4+21dCgBecIQUet35dtE4PhhSEMyqe3y0ZNQrAJQ5kyUPSQHiw81WXnPJcOSTTpG0TyMLiC8K//+BsFGQA=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.19.0.tgz"; + sha512 = "zwXRjWqpev8wqO0sv0M1aM1PpjHz6RVIsBcxKszIG83Befuh4yNysjgHVplF9RTU7eozGe3Ts7r6we1+Qkqsww=="; }; }; - "lightningcss-linux-arm64-musl-1.18.0" = { + "lightningcss-linux-arm64-musl-1.19.0" = { name = "lightningcss-linux-arm64-musl"; packageName = "lightningcss-linux-arm64-musl"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.18.0.tgz"; - sha512 = "2FWHa8iUhShnZnqhn2wfIcK5adJat9hAAaX7etNsoXJymlliDIOFuBQEsba2KBAZSM4QqfQtvRdR7m8i0I7ybQ=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.19.0.tgz"; + sha512 = "vSCKO7SDnZaFN9zEloKSZM5/kC5gbzUjoJQ43BvUpyTFUX7ACs/mDfl2Eq6fdz2+uWhUh7vf92c4EaaP4udEtA=="; }; }; - "lightningcss-linux-x64-gnu-1.18.0" = { + "lightningcss-linux-x64-gnu-1.19.0" = { name = "lightningcss-linux-x64-gnu"; packageName = "lightningcss-linux-x64-gnu"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.18.0.tgz"; - sha512 = "plCPGQJtDZHcLVKVRLnQVF2XRsIC32WvuJhQ7fJ7F6BV98b/VZX0OlX05qUaOESD9dCDHjYSfxsgcvOKgCWh7A=="; + url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.19.0.tgz"; + sha512 = "0AFQKvVzXf9byrXUq9z0anMGLdZJS+XSDqidyijI5njIwj6MdbvX2UZK/c4FfNmeRa2N/8ngTffoIuOUit5eIQ=="; }; }; - "lightningcss-linux-x64-musl-1.18.0" = { + "lightningcss-linux-x64-musl-1.19.0" = { name = "lightningcss-linux-x64-musl"; packageName = "lightningcss-linux-x64-musl"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.18.0.tgz"; - sha512 = "na+BGtVU6fpZvOHKhnlA0XHeibkT3/46nj6vLluG3kzdJYoBKU6dIl7DSOk++8jv4ybZyFJ0aOFMMSc8g2h58A=="; + url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.19.0.tgz"; + sha512 = "SJoM8CLPt6ECCgSuWe+g0qo8dqQYVcPiW2s19dxkmSI5+Uu1GIRzyKA0b7QqmEXolA+oSJhQqCmJpzjY4CuZAg=="; }; }; - "lightningcss-win32-x64-msvc-1.18.0" = { + "lightningcss-win32-x64-msvc-1.19.0" = { name = "lightningcss-win32-x64-msvc"; packageName = "lightningcss-win32-x64-msvc"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.18.0.tgz"; - sha512 = "5qeAH4RMNy2yMNEl7e5TI6upt/7xD2ZpHWH4RkT8iJ7/6POS5mjHbXWUO9Q1hhDhqkdzGa76uAdMzEouIeCyNw=="; + url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.19.0.tgz"; + sha512 = "C+VuUTeSUOAaBZZOPT7Etn/agx/MatzJzGRkeV+zEABmPuntv1zihncsi+AyGmjkkzq3wVedEy7h0/4S84mUtg=="; }; }; "lilconfig-2.0.6" = { @@ -45470,13 +46550,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "listr2-5.0.6" = { + "listr2-5.0.7" = { name = "listr2"; packageName = "listr2"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-5.0.6.tgz"; - sha512 = "u60KxKBy1BR2uLJNTWNptzWQ1ob/gjMzIJPZffAENzpZqbMZ/5PrXXOomDcevIS/+IB7s1mmCEtSlT2qHWMqag=="; + url = "https://registry.npmjs.org/listr2/-/listr2-5.0.7.tgz"; + sha512 = "MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw=="; }; }; "livereload-0.9.3" = { @@ -45515,22 +46595,22 @@ let sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw=="; }; }; - "ln-accounting-6.1.2" = { + "ln-accounting-6.1.3" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.2.tgz"; - sha512 = "fVYvNmwyOzqpxKRhcBV4itOYbGRKtjnml5sbmS6lGsS2ZNDZgmopx4/cxl+ZQG5dO8W7/MlSJD7I5MVmFXOrOw=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.3.tgz"; + sha512 = "8eQvvZb/MiYcRUlg/iIaamWSSTLBpLidLiviqmZ3enpnliW1JIA6pgXsbfyKSWPK3bdzqPuRGnQKQevXsTAybQ=="; }; }; - "ln-service-54.8.0" = { + "ln-service-54.10.0" = { name = "ln-service"; packageName = "ln-service"; - version = "54.8.0"; + version = "54.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.8.0.tgz"; - sha512 = "QNOek7A5BFKGiHlCYHQfIwhehtRyO/oFndeaSn/11x2cvo461pgJXyu/zQETCb4yhGZUa1v3LU1Lmk4bPqsvyw=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-54.10.0.tgz"; + sha512 = "lNEUUDMPkh78mY4Gl1HWK0qMvZOmP7sN2kWBYwOYKlhdvxzN9Mn2BkPUYx19wY9QpechbqIezVn3tS4zwnq9/A=="; }; }; "ln-service-54.9.0" = { @@ -45542,40 +46622,31 @@ let sha512 = "aeuRa5B3EhCJf6RL2m2oTK7luClU90Evhqp9RRWcfxngQZc2BSbw47fav63WaoXwA/o7/3tgy6y/1bCZ5UfzgA=="; }; }; - "ln-sync-4.1.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.1.0.tgz"; - sha512 = "N02s3tCvlyiTSmhJYoawDLqVmZ63Yk/7k27F+244J8kOorwLNrtAjcy8WHn+YnR44yreAph9xHwacU4Nr+VQuQ=="; - }; - }; - "ln-sync-4.1.1" = { + "ln-sync-4.2.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.1.1.tgz"; - sha512 = "Y0XIPFizypuIUNzjwEJMz2eBkgH+7UepCUjwWiVurp61QpLqDNW73dq8/ittFO+mf9bIFqebmTeIiORh0DETFQ=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.2.0.tgz"; + sha512 = "yRQZ7nQOIa97p4vWeUo8iqGXX0nVMoROqA3PVm29RnW+AgKPk3sXtJ+LUDu+vMNkOauocrGz1vXS61Q+WNLutg=="; }; }; - "ln-sync-4.2.0" = { + "ln-sync-4.3.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.2.0.tgz"; - sha512 = "yRQZ7nQOIa97p4vWeUo8iqGXX0nVMoROqA3PVm29RnW+AgKPk3sXtJ+LUDu+vMNkOauocrGz1vXS61Q+WNLutg=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.3.0.tgz"; + sha512 = "DQr68yZBk9QmcSKRJ9Nto6WxB2xjRS2XcUFSQXNDWkM+r9vMFCsqNUFU5IMVt/aLiKnf4PdKQ3mhfrvbH+TMuQ=="; }; }; - "ln-telegram-4.6.0" = { + "ln-telegram-4.6.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.0.tgz"; - sha512 = "rNnNgYUsXEbkLjX20AwgsAa8JBi5U938/NadOLW4ro+gMdb36TprMe/qDX8jOyoiXRVJs+0re9vdQPbHmXBxVw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.1.tgz"; + sha512 = "0zoS1dDGXKwT2ixtSxfWRJsHdcz7ap+PNoNB5KEB3vKeAR1fuGZAz1kr5lbKXGLK8Y8RaR/S/qK3hV8e5khfkg=="; }; }; "load-bmfont-1.4.1" = { @@ -45623,6 +46694,15 @@ let sha512 = "Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw=="; }; }; + "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=="; + }; + }; "load-json-file-6.2.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -45722,22 +46802,22 @@ let 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=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; + sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; }; }; - "loader-utils-2.0.4" = { + "loader-utils-3.2.1" = { name = "loader-utils"; packageName = "loader-utils"; - version = "2.0.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; - sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"; + sha512 = "ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="; }; }; "loady-0.0.5" = { @@ -45812,13 +46892,13 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; - "locate-path-7.1.1" = { + "locate-path-7.2.0" = { name = "locate-path"; packageName = "locate-path"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz"; - sha512 = "vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg=="; + url = "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz"; + sha512 = "gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA=="; }; }; "lock-1.1.0" = { @@ -45929,15 +47009,6 @@ let sha512 = "k8SE/OwvWfYZqx3MA/Ry1SHBDWre8Z8tCs0Ba0bF5OqVNvymxgFZ/4VDtbTxzTvcoG11JpTMFsaeZp/yGYvFnA=="; }; }; - "lodash-es-4.17.21" = { - name = "lodash-es"; - packageName = "lodash-es"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"; - sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; - }; - }; "lodash-id-0.14.1" = { name = "lodash-id"; packageName = "lodash-id"; @@ -47225,22 +48296,22 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.7.1" = { + "log4js-6.8.0" = { name = "log4js"; packageName = "log4js"; - version = "6.7.1"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.7.1.tgz"; - sha512 = "lzbd0Eq1HRdWM2abSD7mk6YIVY0AogGJzb/z+lqzRk+8+XJP+M6L1MS5FUSc3jjGru4dbKjEMJmqlsoYYpuivQ=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.8.0.tgz"; + sha512 = "g+V8gZyurIexrOvWQ+AcZsIvuK/lBnx2argejZxL4gVZ4Hq02kUYH6WZOnqxgBml+zzQZYdaEoTN84B6Hzm8Fg=="; }; }; - "logform-2.4.2" = { + "logform-2.5.1" = { name = "logform"; packageName = "logform"; - version = "2.4.2"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"; + sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; }; }; "logidrom-0.3.1" = { @@ -47612,6 +48683,15 @@ let sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; }; }; + "lru-cache-7.17.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.17.0.tgz"; + sha512 = "zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ=="; + }; + }; "lru-queue-0.1.0" = { name = "lru-queue"; packageName = "lru-queue"; @@ -47766,13 +48846,13 @@ let sha512 = "O2VCg6iyRpuvCtHvOdxhfyX3Xr/toARtIQRsGJpbHVX9Wjm4wU/B79TQJiq74x/flFcrJiBM6flu7TwTwDShYA=="; }; }; - "macos-release-2.5.0" = { + "macos-release-2.5.1" = { name = "macos-release"; packageName = "macos-release"; - version = "2.5.0"; + version = "2.5.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/macos-release/-/macos-release-2.5.1.tgz"; + sha512 = "DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A=="; }; }; "magic-string-0.22.5" = { @@ -47811,6 +48891,15 @@ let sha512 = "8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA=="; }; }; + "magic-string-0.29.0" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz"; + sha512 = "WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q=="; + }; + }; "magicli-0.0.5" = { name = "magicli"; packageName = "magicli"; @@ -47910,13 +48999,13 @@ let sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; }; }; - "make-fetch-happen-11.0.2" = { + "make-fetch-happen-11.0.3" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.2.tgz"; - sha512 = "5n/Pq41w/uZghpdlXAY5kIM85RgJThtTH/NYBRAZ9VUOBWV90USaQjwGrw76fZP3Lj5hl/VZjpVvOaRBMoL/2w=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz"; + sha512 = "oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA=="; }; }; "make-fetch-happen-9.1.0" = { @@ -48072,13 +49161,13 @@ let sha512 = "8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="; }; }; - "markdown-it-10.0.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "10.0.0"; + "markdown-extensions-1.1.1" = { + name = "markdown-extensions"; + packageName = "markdown-extensions"; + version = "1.1.1"; 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-extensions/-/markdown-extensions-1.1.1.tgz"; + sha512 = "WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q=="; }; }; "markdown-it-12.3.2" = { @@ -48126,13 +49215,13 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; - "markdown-it-anchor-8.6.6" = { + "markdown-it-anchor-8.6.7" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; - version = "8.6.6"; + version = "8.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.6.tgz"; - sha512 = "jRW30YGywD2ESXDc+l17AiritL0uVaSnWsb26f+68qaW9zgbIIr1f4v2Nsvc0+s0Z2N3uX6t/yAw7BwCQ1wMsA=="; + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz"; + sha512 = "FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA=="; }; }; "markdown-it-deflist-2.1.0" = { @@ -48153,6 +49242,15 @@ let sha512 = "QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg=="; }; }; + "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-expand-tabs-1.0.13" = { name = "markdown-it-expand-tabs"; packageName = "markdown-it-expand-tabs"; @@ -48504,15 +49602,6 @@ let sha512 = "3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw=="; }; }; - "md5-file-4.0.0" = { - name = "md5-file"; - packageName = "md5-file"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/md5-file/-/md5-file-4.0.0.tgz"; - sha512 = "UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg=="; - }; - }; "md5-file-5.0.0" = { name = "md5-file"; packageName = "md5-file"; @@ -48549,13 +49638,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" = { @@ -48567,6 +49656,15 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; + "mdast-util-definitions-5.1.2" = { + name = "mdast-util-definitions"; + packageName = "mdast-util-definitions"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz"; + sha512 = "8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA=="; + }; + }; "mdast-util-find-and-replace-1.1.1" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; @@ -48576,13 +49674,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" = { @@ -48603,13 +49701,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" = { @@ -48621,13 +49719,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" = { @@ -48639,13 +49737,13 @@ let sha512 = "NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ=="; }; }; - "mdast-util-gfm-2.0.1" = { + "mdast-util-gfm-2.0.2" = { name = "mdast-util-gfm"; packageName = "mdast-util-gfm"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz"; - sha512 = "42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ=="; + url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.2.tgz"; + sha512 = "qvZ608nBppZ4icQlhQQIAdc6S3Ffj9RGmzwUKUWuEICFnd1LVkN3EktF7ZHAgfcEdvZB5owU9tQgt99e2TlLjg=="; }; }; "mdast-util-gfm-autolink-literal-0.1.3" = { @@ -48657,22 +49755,22 @@ let sha512 = "GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A=="; }; }; - "mdast-util-gfm-autolink-literal-1.0.2" = { + "mdast-util-gfm-autolink-literal-1.0.3" = { name = "mdast-util-gfm-autolink-literal"; packageName = "mdast-util-gfm-autolink-literal"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz"; - sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; + url = "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.3.tgz"; + sha512 = "My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA=="; }; }; - "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" = { @@ -48684,13 +49782,13 @@ let sha512 = "5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA=="; }; }; - "mdast-util-gfm-strikethrough-1.0.2" = { + "mdast-util-gfm-strikethrough-1.0.3" = { name = "mdast-util-gfm-strikethrough"; packageName = "mdast-util-gfm-strikethrough"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.2.tgz"; - sha512 = "T/4DVHXcujH6jx1yqpcAYYwd+z5lAYMw4Ls6yhTfbMMtCt0PHY4gEfhW9+lKsLBtyhUGKRIzcUA2FATVqnvPDA=="; + url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.3.tgz"; + sha512 = "DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ=="; }; }; "mdast-util-gfm-table-0.1.6" = { @@ -48702,13 +49800,13 @@ let sha512 = "j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ=="; }; }; - "mdast-util-gfm-table-1.0.6" = { + "mdast-util-gfm-table-1.0.7" = { name = "mdast-util-gfm-table"; packageName = "mdast-util-gfm-table"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz"; - sha512 = "uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag=="; + url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.7.tgz"; + sha512 = "jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg=="; }; }; "mdast-util-gfm-task-list-item-0.1.6" = { @@ -48720,13 +49818,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" = { @@ -48738,49 +49836,76 @@ let sha512 = "8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw=="; }; }; - "mdast-util-mdx-2.0.0" = { + "mdast-util-mdx-1.1.0" = { name = "mdast-util-mdx"; packageName = "mdast-util-mdx"; - version = "2.0.0"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-1.1.0.tgz"; + sha512 = "leKb9uG7laXdyFlTleYV4ZEaCpsxeU1LlkkR/xp35pgKrfV1Y0fNCuOw9vaRc2a9YDpH22wd145Wt7UY5yzeZw=="; + }; + }; + "mdast-util-mdx-2.0.1" = { + name = "mdast-util-mdx"; + packageName = "mdast-util-mdx"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-2.0.0.tgz"; - sha512 = "M09lW0CcBT1VrJUaF/PYxemxxHa7SLDHdSn94Q9FhxjCQfuW7nMAWKWimTmA3OyDMSTH981NN1csW1X+HPSluw=="; + url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-2.0.1.tgz"; + sha512 = "38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw=="; }; }; - "mdast-util-mdx-expression-1.3.1" = { + "mdast-util-mdx-expression-1.3.2" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.1.tgz"; - sha512 = "TTb6cKyTA1RD+1su1iStZ5PAv3rFfOUKcoU5EstUpv/IZo63uDX03R8+jXjMEhcobXnNOiG6/ccekvVl4eV1zQ=="; + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.2.tgz"; + sha512 = "xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA=="; }; }; - "mdast-util-mdx-jsx-2.1.0" = { + "mdast-util-mdx-jsx-1.2.0" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; - version = "2.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.0.tgz"; - sha512 = "KzgzfWMhdteDkrY4mQtyvTU5bc/W4ppxhe9SzelO6QUUiwLAM+Et2Dnjjprik74a336kHdo0zKm7Tp+n6FFeRg=="; + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-1.2.0.tgz"; + sha512 = "5+ot/kfxYd3ChgEMwsMUO71oAfYjyRI3pADEK4I7xTmWLGQ8Y7ghm1CG36zUoUvDPxMlIYwQV/9DYHAUWdG4dA=="; }; }; - "mdast-util-mdxjs-esm-1.3.0" = { + "mdast-util-mdx-jsx-2.1.2" = { + name = "mdast-util-mdx-jsx"; + packageName = "mdast-util-mdx-jsx"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.2.tgz"; + sha512 = "o9vBCYQK5ZLGEj3tCGISJGjvafyHRVJlZmfJzSE7xjiogSzIeph/Z4zMY65q4WGRMezQBeAwPlrdymDYYYx0tA=="; + }; + }; + "mdast-util-mdxjs-esm-1.3.1" = { name = "mdast-util-mdxjs-esm"; packageName = "mdast-util-mdxjs-esm"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.0.tgz"; - sha512 = "7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g=="; + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.1.tgz"; + sha512 = "SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w=="; }; }; - "mdast-util-phrasing-3.0.0" = { + "mdast-util-phrasing-3.0.1" = { name = "mdast-util-phrasing"; packageName = "mdast-util-phrasing"; - version = "3.0.0"; + 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-hast-11.3.0" = { + name = "mdast-util-to-hast"; + packageName = "mdast-util-to-hast"; + version = "11.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.0.tgz"; - sha512 = "S+QYsDRLkGi8U7o5JF1agKa/sdP+CNGXXLqC17pdTVL8FHHgQEiwFGa9yE5aYtUxNiFGYoaDy9V1kC85Sz86Gg=="; + url = "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-11.3.0.tgz"; + sha512 = "4o3Cli3hXPmm1LhB+6rqhfsIUBjnKFlIUZvudaermXB+4/KONdd/W4saWWkC+LBLbPMqhFSSTSRgafHsT5fVJw=="; }; }; "mdast-util-to-markdown-0.6.5" = { @@ -48837,13 +49962,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" = { @@ -48927,6 +50052,15 @@ let sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; }; }; + "media-query-parser-2.0.2" = { + name = "media-query-parser"; + packageName = "media-query-parser"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/media-query-parser/-/media-query-parser-2.0.2.tgz"; + sha512 = "1N4qp+jE0pL5Xv4uEcwVUhIkwdUO3S/9gML90nqKA7v7FcOS5vUtatfzok9S9U1EJU8dHWlcv95WLnKmmxZI9w=="; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -48990,22 +50124,31 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; - "mem-fs-2.2.1" = { + "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.3.0" = { name = "mem-fs"; packageName = "mem-fs"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs/-/mem-fs-2.2.1.tgz"; - sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; + url = "https://registry.npmjs.org/mem-fs/-/mem-fs-2.3.0.tgz"; + sha512 = "GftCCBs6EN8sz3BoWO1bCj8t7YBtT713d8bUgbhg9Iel5kFSqnSvCK06TYIDJAtJ51cSiWkM/YemlT0dfoFycw=="; }; }; - "mem-fs-editor-9.5.0" = { + "mem-fs-editor-9.7.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.5.0"; + version = "9.7.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.7.0.tgz"; + sha512 = "ReB3YD24GNykmu4WeUL/FDIQtkoyGB6zfJv60yfCo3QjKeimNcTqv2FT83bP0ccs6uu+sm5zyoBlspAzigmsdg=="; }; }; "memfs-3.4.13" = { @@ -49251,13 +50394,13 @@ let sha512 = "cylD/HcPXjeSVEPj4menLP0mndi6gvqmTlDq3QF4Vptn1tgc6ilgK7rdcAUA4X3RTkymXRwLuZpNncIfq1q1AA=="; }; }; - "mermaid-9.3.0" = { + "mermaid-9.2.2" = { name = "mermaid"; packageName = "mermaid"; - version = "9.3.0"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-9.3.0.tgz"; - sha512 = "mGl0BM19TD/HbU/LmlaZbjBi//tojelg8P/mxD6pPZTAYaI+VawcyBdqRsoUHSc7j71PrMdJ3HBadoQNdvP5cg=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-9.2.2.tgz"; + sha512 = "6s7eKMqFJGS+0MYjmx8f6ZigqKBJVoSx5ql2gw6a4Aa+WJ49QiEJg7gPwywaBg3DZMs79UP7trESp4+jmaQccw=="; }; }; "meros-1.1.4" = { @@ -49350,13 +50493,13 @@ let sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; - "metro-react-native-babel-preset-0.72.3" = { + "metro-react-native-babel-preset-0.73.7" = { name = "metro-react-native-babel-preset"; packageName = "metro-react-native-babel-preset"; - version = "0.72.3"; + version = "0.73.7"; src = fetchurl { - url = "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.72.3.tgz"; - sha512 = "uJx9y/1NIqoYTp6ZW1osJ7U5ZrXGAJbOQ/Qzl05BdGYvN1S7Qmbzid6xOirgK0EIT0pJKEEh1s8qbassYZe4cw=="; + url = "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.7.tgz"; + sha512 = "RKcmRZREjJCzHKP+JhC9QTCohkeb3xa/DtqHU14U5KWzJHdC0mMrkTZYNXhV0cryxsaVKVEw5873KhbZyZHMVw=="; }; }; "microee-0.0.6" = { @@ -49422,13 +50565,13 @@ let sha512 = "q6nPLFCMTLtfsctAuS0Xh4vaolxSFUWUWR6PZSrXXiRy+SANGllpcqdXFv2z07l0Xz/6Hl40hK0ffNCJPH2n1A=="; }; }; - "micromark-extension-frontmatter-1.0.0" = { + "micromark-extension-frontmatter-1.0.1" = { name = "micromark-extension-frontmatter"; packageName = "micromark-extension-frontmatter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-1.0.0.tgz"; - sha512 = "EXjmRnupoX6yYuUJSQhrQ9ggK0iQtQlpi6xeJzVD5xscyAI+giqco5fdymayZhJMbIFecjnE2yz85S9NzIgQpg=="; + url = "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-1.0.1.tgz"; + sha512 = "9OJhCXkrpj8qIXW5AAgRZGvS8Q4GTMdH5+Ljt98kV4XQVflRGeEhNRYp6O/zCvf8c8lZ+wc4uwmbly27pS/s4Q=="; }; }; "micromark-extension-gfm-0.3.3" = { @@ -49548,13 +50691,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" = { @@ -49611,13 +50754,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" = { @@ -49710,13 +50853,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" = { @@ -50106,22 +51249,22 @@ let sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; }; - "mini-css-extract-plugin-0.5.0" = { + "mini-css-extract-plugin-0.9.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "0.5.0"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; }; }; - "mini-css-extract-plugin-0.9.0" = { + "mini-css-extract-plugin-2.7.2" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "0.9.0"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; - sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; + 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" = { @@ -50142,13 +51285,13 @@ let sha512 = "LfHUYIA047rrqIZEn0gwbqbzarU5bmZ8yZ9SizeoiPwVq5cemE3foJTJZ3pCktUq/IPkKNGghFHJk1O8149mOA=="; }; }; - "miniflare-2.11.0" = { + "miniflare-2.12.1" = { name = "miniflare"; packageName = "miniflare"; - version = "2.11.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-2.11.0.tgz"; - sha512 = "QA18I1VQXdCo4nBtPJUcUDxW8c9xbc5ex5F61jwhkGVOISSnYdEheolESmjr8MYk28xwi0XD1ozS4rLaTONd+w=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-2.12.1.tgz"; + sha512 = "pym6gzg8AQZ1NRChRV1hC4K55N49wndoaDEVRMvZPJrFsmGkNnXkWmlvmZ7SB3BN5UkP5MZwKhLqiJ49Ry8tFA=="; }; }; "minilog-3.1.0" = { @@ -50259,6 +51402,24 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; + "minimatch-6.2.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz"; + sha512 = "sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg=="; + }; + }; + "minimatch-7.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-7.3.0.tgz"; + sha512 = "WaMDuhKa7a6zKiwplR1AOz+zGvJba24k5VU1Cy6NhEguavT2YRlHxuINUgTas4wiS6fwBpYq4TcA1XIECSntyw=="; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -50313,13 +51474,13 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minimist-1.2.7" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; "minimist-options-3.0.2" = { @@ -50376,13 +51537,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.0" = { + "minipass-4.2.4" = { name = "minipass"; packageName = "minipass"; - version = "4.0.0"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz"; + sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; }; }; "minipass-collect-1.0.2" = { @@ -50547,6 +51708,15 @@ let sha512 = "r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw=="; }; }; + "mitt-3.0.0" = { + name = "mitt"; + packageName = "mitt"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz"; + sha512 = "7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="; + }; + }; "mixin-deep-1.3.2" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -50601,6 +51771,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"; @@ -50628,13 +51807,22 @@ let sha512 = "nbj022D7cd7n6hxDuON08SQciKHSTcRSFlLfCGyIuypo4cl6Z6qJxMVlatFyS6ZbgHqOebkYm/fvwtGiKqmSwQ=="; }; }; - "mobx-6.7.0" = { + "mlly-1.1.1" = { + name = "mlly"; + packageName = "mlly"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mlly/-/mlly-1.1.1.tgz"; + sha512 = "Jnlh4W/aI4GySPo6+DyTN17Q75KKbLTyFK8BrGhjNP4rxuUjbRWhE6gHg3bs33URWAF44FRm7gdQA348i3XxRw=="; + }; + }; + "mobx-6.8.0" = { name = "mobx"; packageName = "mobx"; - version = "6.7.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.7.0.tgz"; - sha512 = "1kBLBdSNG2bA522HQdbsTvwAwYf9hq9FWxmlhX7wTsJUAI54907J+ozfGW+LoYUo06vjit748g6QH1AAGLNebw=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.8.0.tgz"; + sha512 = "+o/DrHa4zykFMSKfS8Z+CPSEg5LW9tSNGTuN8o6MF1GKxlfkSHSeJn5UtgxvPkGgaouplnrLXCF+duAsmm6FHQ=="; }; }; "mobx-react-7.6.0" = { @@ -50781,13 +51969,13 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; - "moment-timezone-0.5.40" = { + "moment-timezone-0.5.41" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.40"; + version = "0.5.41"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz"; - sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz"; + sha512 = "e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg=="; }; }; "mongodb-3.7.3" = { @@ -51033,31 +52221,31 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.8.1" = { + "msgpackr-1.8.4" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.1"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.1.tgz"; - sha512 = "05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.4.tgz"; + sha512 = "BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg=="; }; }; - "msgpackr-extract-2.2.0" = { + "msgpackr-extract-3.0.1" = { name = "msgpackr-extract"; packageName = "msgpackr-extract"; - version = "2.2.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"; - sha512 = "0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog=="; + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.1.tgz"; + sha512 = "8jiKrp+ApgrD/TqdnYjqNC2wwId1qPdC/zsop/rT1A5nAGJeQ6Y5HV8AasQ3vuh1ZMblYwMm+nMyFp7Sv0PUeA=="; }; }; - "mssql-9.1.0" = { + "mssql-9.1.1" = { name = "mssql"; packageName = "mssql"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.1.0.tgz"; - sha512 = "rAsD7xfOkzSUqmNMoWX9YT43QfxbabIbrhEuf/PGRCzhWCzwHf25jxNgaoAwqT7vcb5/1irDCi6l6DG05ZGEEQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-9.1.1.tgz"; + sha512 = "m0yTx9xzUtTvJpWJHqknUXUDPRnJXZYOOFNygnNIXn1PBkLsC/rkXQdquObd+M0ZPlBhGC00Jg28zG0wCl7VWg=="; }; }; "multer-1.4.3" = { @@ -51420,13 +52608,13 @@ let sha512 = "Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig=="; }; }; - "mysql2-3.0.1" = { + "mysql2-3.1.2" = { name = "mysql2"; packageName = "mysql2"; - version = "3.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-3.0.1.tgz"; - sha512 = "Wrh5KuE0OOlm6wRwRhE2q+C8LjwwfT3sFKVauyTwMwPbOd2i0SzxMqTZPqs90ZNAEWjot5GFywje84qVn3ITYw=="; + url = "https://registry.npmjs.org/mysql2/-/mysql2-3.1.2.tgz"; + sha512 = "NXz6sUvHSEOKz1jv3koSga7eb2dHrwD/mnPmqbbZzMRvjQcSpb0Eh0ectWyYt1U60CLlEbjoA3XYjjbbReRF5Q=="; }; }; "mz-2.7.0" = { @@ -52123,6 +53311,15 @@ let sha512 = "P6qw6kenNXP+J9XlKJNi/MNHUQ+Lx5K8FEcSfX7/w8KJdZan5+BB5MKzuNgL2RTjHG1Svg8SehfseVEp8zAqwA=="; }; }; + "ngrok-4.3.3" = { + name = "ngrok"; + packageName = "ngrok"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ngrok/-/ngrok-4.3.3.tgz"; + sha512 = "a2KApnkiG5urRxBPdDf76nNBQTnNNWXU0nXw0SsqsPI+Kmt2lGf9TdVYpYrHMnC+T9KhcNSWjCpWqBgC6QcFvw=="; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -52159,13 +53356,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" = { @@ -52177,13 +53374,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" = { @@ -52195,13 +53392,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" = { @@ -52213,13 +53410,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" = { @@ -52258,22 +53455,22 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.31.0" = { + "node-abi-3.33.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.31.0"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz"; + sha512 = "7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog=="; }; }; - "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" = { @@ -52465,13 +53662,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-2.6.8" = { + "node-fetch-2.6.9" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; }; }; "node-fetch-3.2.10" = { @@ -52618,6 +53815,15 @@ let sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA=="; }; }; + "node-gyp-build-optional-packages-5.0.7" = { + name = "node-gyp-build-optional-packages"; + packageName = "node-gyp-build-optional-packages"; + version = "5.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz"; + sha512 = "YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w=="; + }; + }; "node-hid-2.1.2" = { name = "node-hid"; packageName = "node-hid"; @@ -52627,13 +53833,13 @@ let 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" = { @@ -52681,15 +53887,6 @@ let sha512 = "YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ=="; }; }; - "node-notifier-8.0.2" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz"; - sha512 = "oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg=="; - }; - }; "node-object-hash-2.3.10" = { name = "node-object-hash"; packageName = "node-object-hash"; @@ -52708,13 +53905,13 @@ let sha512 = "+IIOdav5D7vHsuLDNk55t17kK2s6c1w4DbfKw8UQxZ635n+AO/SqDE3RpuO3PZKqpWjPtL/chzYZNVxz8/4TUQ=="; }; }; - "node-persist-2.1.0" = { + "node-persist-3.1.0" = { name = "node-persist"; packageName = "node-persist"; - version = "2.1.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz"; - sha512 = "NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w=="; + url = "https://registry.npmjs.org/node-persist/-/node-persist-3.1.0.tgz"; + sha512 = "/j+fd/u71wNgKf3V2bx4tnDm+3GvLnlCuvf2MXbJ3wern+67IAb6zN9Leu1tCWPlPNZ+v1hLSibVukkPK2HqJw=="; }; }; "node-polyglot-1.0.0" = { @@ -52780,22 +53977,13 @@ let sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; - "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-releases-2.0.8" = { + "node-releases-2.0.10" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"; - sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"; + sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="; }; }; "node-rsa-1.1.1" = { @@ -53293,15 +54481,6 @@ let sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; }; }; - "npm-bundled-2.0.1" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-2.0.1.tgz"; - sha512 = "gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw=="; - }; - }; "npm-bundled-3.0.0" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -53500,13 +54679,13 @@ let sha512 = "L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ=="; }; }; - "npm-packlist-5.1.3" = { + "npm-packlist-5.1.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "5.1.3"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.3.tgz"; - sha512 = "263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz"; + sha512 = "UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw=="; }; }; "npm-packlist-7.0.4" = { @@ -53581,13 +54760,13 @@ let sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; }; }; - "npm-registry-fetch-13.3.1" = { + "npm-registry-fetch-13.3.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "13.3.1"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz"; - sha512 = "eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.3.0.tgz"; + sha512 = "10LJQ/1+VhKrZjIuY9I/+gQTvumqqlgnsCufoXETHAPFTS3+M+Z5CFhZRDHGavmJ6rOye3UvNga88vl8n1r6gg=="; }; }; "npm-registry-fetch-14.0.3" = { @@ -53797,13 +54976,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" = { @@ -53869,13 +55048,13 @@ let sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; }; - "nx-15.5.2" = { + "nx-15.7.2" = { name = "nx"; packageName = "nx"; - version = "15.5.2"; + version = "15.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-15.5.2.tgz"; - sha512 = "jo8DG7zt0EorKL6AihkoshaeiFkK25NOeGUEnF05BFCaqsIoS9s3uctrOumh2G9DhaGMEWzakc3kF4/LeLB9pg=="; + url = "https://registry.npmjs.org/nx/-/nx-15.7.2.tgz"; + sha512 = "VRb+CZCji3G4ikdMAGoh6TeU9Q6n5atRwqRSFhUX63er8zhlMvWHLskPMZC4q/81edo/E7RhbmEVUD5MB0JoeA=="; }; }; "nyc-15.1.0" = { @@ -54545,13 +55724,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.73.0" = { + "oo-ascii-tree-1.76.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.73.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.73.0.tgz"; - sha512 = "bGx23QLCltdo+jrUcvnxf+2Ob7Ntsr8n7UzHPVoz0pWABSjzIzxOh2GRQa/2GebYNTqIHLnERY5Ubs/V7RVPWg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.76.0.tgz"; + sha512 = "I/me4GK6Dybc9lsPYZJdnd1OOFbbnZtfEIIizrbTuFx/v1if375Y59w9ol/TJ75MlSAKs4aHj7Xm+A4E0JitSw=="; }; }; "open-0.0.2" = { @@ -54617,6 +55796,24 @@ let sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; + "open-8.4.1" = { + name = "open"; + packageName = "open"; + version = "8.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; + sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; + }; + }; + "open-8.4.2" = { + name = "open"; + packageName = "open"; + version = "8.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; + sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; + }; + }; "openapi-default-setter-8.0.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -54824,13 +56021,13 @@ let sha512 = "/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw=="; }; }; - "openapi3-ts-3.1.2" = { + "openapi3-ts-3.2.0" = { name = "openapi3-ts"; packageName = "openapi3-ts"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.1.2.tgz"; - sha512 = "S8fijNOqe/ut0kEDAwHZnI7sVYqb8Q3XnISmSyXmK76jgrcf4ableI75KTY1qdksd9EI/t39Vi5M4VYKrkNKfQ=="; + url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.2.0.tgz"; + sha512 = "/ykNWRV5Qs0Nwq7Pc0nJ78fgILvOT/60OxEmB3v7yQ8a8Bwcm43D4diaYazG/KBn6czA+52XYy931WFLMCUeSg=="; }; }; "opencollective-postinstall-2.0.3" = { @@ -54860,13 +56057,13 @@ let sha512 = "EFTQ61/OUVhCeq78Y3rBpdKSuvgb0lwkU8nN4QTdcv0afc5MT7e4IVuZwgkMsgE993dmhbIhkxHFP3iTVJXWmw=="; }; }; - "openpgp-5.5.0" = { + "openpgp-5.7.0" = { name = "openpgp"; packageName = "openpgp"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/openpgp/-/openpgp-5.5.0.tgz"; - sha512 = "SpwcJnxrK9Y0HRM6KxSFqkAEOSWEabCH/c8dII/+y2e5f6KvuDG5ZE7JXaPBaVJNE4VUZZeTphxXDoZD0KOHrw=="; + url = "https://registry.npmjs.org/openpgp/-/openpgp-5.7.0.tgz"; + sha512 = "wchYJQfFbSaocUvUIYqNrWD+lRSmFSG1d3Ak2CHeXFocDSEsf7Uc1zUzHjSdlZPTvGeeXPQ+MJrwVtalL4QCBg=="; }; }; "opentracing-0.14.7" = { @@ -55247,22 +56444,13 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.5.5" = { - name = "ot-builder"; - packageName = "ot-builder"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.5.tgz"; - sha512 = "LRzFRcx8+33inNTAcyxHY9vS1mp17VMIU0DUW2aPZmIEYLvOGYrL2oQl0ePESg+QB0/D40GbQB7oO9Hi8fjJpA=="; - }; - }; - "otb-ttc-bundle-1.5.5" = { - name = "otb-ttc-bundle"; - packageName = "otb-ttc-bundle"; - version = "1.5.5"; + "outdent-0.8.0" = { + name = "outdent"; + packageName = "outdent"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.5.tgz"; - sha512 = "BG36gFUPVBYhM4cgsHrTBQYU+7wuV98rwjNHLBTCXaXK3lU9P1lM2mE7l1o/sG2tx9OxWwNUupE8/N+usyTnpw=="; + url = "https://registry.npmjs.org/outdent/-/outdent-0.8.0.tgz"; + sha512 = "KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A=="; }; }; "ow-0.21.0" = { @@ -55904,22 +57092,31 @@ let sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; - "pacote-13.6.2" = { + "pacote-13.6.1" = { + name = "pacote"; + packageName = "pacote"; + version = "13.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-13.6.1.tgz"; + sha512 = "L+2BI1ougAPsFjXRyBhcKmfT016NscRFLv6Pz5EiNf1CCFJFU0pSKKQwsZTyAQB+sTuUL4TyFyp6J1Ork3dOqw=="; + }; + }; + "pacote-15.1.0" = { name = "pacote"; packageName = "pacote"; - version = "13.6.2"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-13.6.2.tgz"; - sha512 = "Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-15.1.0.tgz"; + sha512 = "FFcjtIl+BQNfeliSm7MZz5cpdohvUV1yjGnqgVM4UnVF7JslRY0ImXAygdaCDV0jjUADEWu4y5xsDV8brtrTLg=="; }; }; - "pacote-15.0.8" = { + "pacote-15.1.1" = { name = "pacote"; packageName = "pacote"; - version = "15.0.8"; + version = "15.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-15.0.8.tgz"; - sha512 = "UlcumB/XS6xyyIMwg/WwMAyUmga+RivB5KgkRwA1hZNtrx+0Bt41KxHCvg1kr0pZ/ZeD8qjhW4fph6VaYRCbLw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-15.1.1.tgz"; + sha512 = "eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ=="; }; }; "pad-0.0.5" = { @@ -55949,22 +57146,22 @@ let sha512 = "8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="; }; }; - "paid-services-4.2.1" = { + "paid-services-4.3.0" = { name = "paid-services"; packageName = "paid-services"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.2.1.tgz"; - sha512 = "XguuYsT5jQ9QZPLeS/OrUnodpawCFf79oRB033synxe2RvZYIs8QH52PuPPqwT+dyHR8KvuI9QcdZayLVYOE+A=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.0.tgz"; + sha512 = "OhwWeWAFnklitYkobAgIqM7UlQuJdsYI9WeEsfdiVrfJau02JYwljtNMZEID1XWE7sYW3vMD3H8tsJC+fagrPQ=="; }; }; - "paid-services-4.3.0" = { + "paid-services-4.3.3" = { name = "paid-services"; packageName = "paid-services"; - version = "4.3.0"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.0.tgz"; - sha512 = "OhwWeWAFnklitYkobAgIqM7UlQuJdsYI9WeEsfdiVrfJau02JYwljtNMZEID1XWE7sYW3vMD3H8tsJC+fagrPQ=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.3.tgz"; + sha512 = "OfYQkRAne2HbPsC+tWjwfQVAbjzq7mBXVQF1aGwfbpWEO49X54aH0/RwepQjkxrRvYFMqHc++NGxcHwQRRWTew=="; }; }; "pako-0.2.9" = { @@ -56147,13 +57344,13 @@ let sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ=="; }; }; - "parse-entities-4.0.0" = { + "parse-entities-4.0.1" = { name = "parse-entities"; packageName = "parse-entities"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.0.tgz"; - sha512 = "5nk9Fn03x3rEhGaX1FU6IDwG/k+GxLXlFAkgrbM1asuAFl3BhdQWvASaIsmwWypRNcZKHPYnIuOSfIWEyEQnPQ=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.1.tgz"; + sha512 = "SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w=="; }; }; "parse-filepath-1.0.2" = { @@ -56336,15 +57533,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"; @@ -56867,6 +58055,15 @@ let sha512 = "4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ=="; }; }; + "path-scurry-1.5.0" = { + name = "path-scurry"; + packageName = "path-scurry"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.5.0.tgz"; + sha512 = "hJ8rODLI9B2qwsYAd32rrI76gwVUPeu5kq/do6URDj2bJCVH3ilyT978Mv/NLuFMaqzHrn3XtiDLMZHaTTh4vA=="; + }; + }; "path-to-glob-pattern-1.0.2" = { name = "path-to-glob-pattern"; packageName = "path-to-glob-pattern"; @@ -56975,6 +58172,15 @@ let sha512 = "TX+cz8Jk+ta7IvRy2FAej8rdlbrP0+uBIkP/5DTODez/AuL/vSb30KuAdDxGVREXzn8QfAiu5mJYJ1XjbOhEPA=="; }; }; + "pathe-1.1.0" = { + name = "pathe"; + packageName = "pathe"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz"; + sha512 = "ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w=="; + }; + }; "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; @@ -57110,13 +58316,22 @@ let sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; - "pg-8.8.0" = { + "periscopic-3.1.0" = { + name = "periscopic"; + packageName = "periscopic"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz"; + sha512 = "vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw=="; + }; + }; + "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" = { @@ -57128,13 +58343,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" = { @@ -57164,22 +58379,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" = { @@ -57371,6 +58586,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"; @@ -57461,6 +58685,15 @@ let sha512 = "9hHgE5+Xai/ChrnahNP8Ke0VNF/s41IZIB/d24eMHEaRamdPg+wwlRm2lTb5wMvE8eTIKrYZsrxfuOwt3dpsIQ=="; }; }; + "pkg-conf-3.1.0" = { + name = "pkg-conf"; + packageName = "pkg-conf"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz"; + sha512 = "m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ=="; + }; + }; "pkg-dir-1.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -57515,6 +58748,15 @@ let sha512 = "0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA=="; }; }; + "pkg-types-1.0.2" = { + name = "pkg-types"; + packageName = "pkg-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.2.tgz"; + sha512 = "hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ=="; + }; + }; "pkg-up-3.1.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -57911,15 +59153,6 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.19" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; - sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; - }; - }; "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; @@ -57956,13 +59189,13 @@ let sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; - "postcss-colormin-5.3.0" = { + "postcss-colormin-5.3.1" = { name = "postcss-colormin"; packageName = "postcss-colormin"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; - sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz"; + sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ=="; }; }; "postcss-convert-values-4.0.1" = { @@ -58082,13 +59315,13 @@ let sha512 = "flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw=="; }; }; - "postcss-js-4.0.0" = { + "postcss-js-4.0.1" = { name = "postcss-js"; packageName = "postcss-js"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz"; - sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ=="; + url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz"; + sha512 = "dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw=="; }; }; "postcss-less-3.1.4" = { @@ -58172,13 +59405,13 @@ let sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; - "postcss-merge-rules-5.1.3" = { + "postcss-merge-rules-5.1.4" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz"; - sha512 = "LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA=="; + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz"; + sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="; }; }; "postcss-minify-font-values-4.0.2" = { @@ -58253,6 +59486,15 @@ let sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; }; }; + "postcss-modules-6.0.0" = { + name = "postcss-modules"; + packageName = "postcss-modules"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-6.0.0.tgz"; + sha512 = "7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ=="; + }; + }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -58271,6 +59513,15 @@ let sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; + "postcss-modules-extract-imports-3.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -58298,6 +59549,15 @@ let sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; }; }; + "postcss-modules-local-by-default-4.0.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -58316,6 +59576,15 @@ let sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; + "postcss-modules-scope-3.0.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -58343,6 +59612,15 @@ let sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; + "postcss-modules-values-4.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + }; "postcss-nested-6.0.0" = { name = "postcss-nested"; packageName = "postcss-nested"; @@ -58541,13 +59819,13 @@ let sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; - "postcss-reduce-initial-5.1.1" = { + "postcss-reduce-initial-5.1.2" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz"; - sha512 = "//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w=="; + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz"; + sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg=="; }; }; "postcss-reduce-transforms-4.0.2" = { @@ -59225,6 +60503,15 @@ let sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; }; }; + "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=="; + }; + }; "prettier-2.8.1" = { name = "prettier"; packageName = "prettier"; @@ -59234,13 +60521,13 @@ let sha512 = "lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg=="; }; }; - "prettier-2.8.3" = { + "prettier-2.8.4" = { name = "prettier"; packageName = "prettier"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; - sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"; + sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; }; }; "prettier-bytes-1.0.4" = { @@ -59855,15 +61142,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"; @@ -59918,15 +61196,6 @@ let sha512 = "K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA=="; }; }; - "proper-lockfile-2.0.1" = { - name = "proper-lockfile"; - packageName = "proper-lockfile"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; - sha512 = "rjaeGbsmhNDcDInmwi4MuI6mRwJu6zq8GjYCLuSuE7GF+4UjgzkL69sVKKJ2T2xH61kK7rXvGYpvaTu909oXaQ=="; - }; - }; "proper-lockfile-4.1.2" = { name = "proper-lockfile"; packageName = "proper-lockfile"; @@ -59990,22 +61259,22 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.1.2" = { + "protobufjs-7.2.2" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.1.2"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz"; - sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.2.tgz"; + sha512 = "++PrQIjrom+bFDPpfmqXfAGSQs40116JRrqqyf53dymUMvvb5d/LMRyicRoF1AUKoXVS1/IgJXlEgcpr4gTF3Q=="; }; }; - "protobufjs-cli-1.0.2" = { + "protobufjs-cli-1.1.1" = { name = "protobufjs-cli"; packageName = "protobufjs-cli"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.0.2.tgz"; - sha512 = "cz9Pq9p/Zs7okc6avH20W7QuyjTclwJPgqXG11jNaulfS3nbVisID8rC+prfgq0gbZE0w9LBFd1OKFF03kgFzg=="; + url = "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz"; + sha512 = "VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA=="; }; }; "protocol-buffers-encodings-1.2.0" = { @@ -60116,15 +61385,6 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; - "psbt-2.7.1" = { - name = "psbt"; - packageName = "psbt"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-2.7.1.tgz"; - sha512 = "qFnvwdQcDoQBHHi3jYVVX+W98CRTbyeQs3RlUdAIzdEVbwBHEcv1+xhVaEJHrYiF75n7L+i6roDmZHIXT6tDSQ=="; - }; - }; "psbt-2.7.2" = { name = "psbt"; packageName = "psbt"; @@ -60998,13 +62258,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.2.0" = { + "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz"; - sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; }; "pupa-2.1.1" = { @@ -61043,22 +62303,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.5.2" = { + "puppeteer-19.7.2" = { name = "puppeteer"; packageName = "puppeteer"; - version = "19.5.2"; + version = "19.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.5.2.tgz"; - sha512 = "xlqRyrhXhVH114l79Y0XqYXUVG+Yfw4sKlvN55t8Y9DxtA5fzI1uqF8SVXbWK5DUMbD6Jo4lpixTZCTTZGD05g=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.2.tgz"; + sha512 = "4Lm7Qpe/LU95Svirei/jDLDvR5oMrl9BPGd7HMY5+Q28n+BhvKuW97gKkR+1LlI86bO8J3g8rG/Ll5kv9J1nlQ=="; }; }; - "puppeteer-core-19.5.2" = { + "puppeteer-core-19.7.2" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "19.5.2"; + version = "19.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.5.2.tgz"; - sha512 = "Rqk+3kqM+Z2deooTYqcYt8lRtGffJdifWa9td9nbJSjhANWsFouk8kLBNUKycewCCFHM8TZUKS0x28OllavW2A=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.2.tgz"; + sha512 = "PvI+fXqgP0uGJxkyZcX51bnzjFA73MODZOAv0fSD35yR7tvbqwtMV3/Y+hxQ0AMMwzxkEebP6c7po/muqxJvmQ=="; }; }; "purgecss-2.3.0" = { @@ -61133,22 +62393,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.290" = { + "pyright-1.1.295" = { name = "pyright"; packageName = "pyright"; - version = "1.1.290"; - src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.290.tgz"; - sha512 = "iHT8G2+R/GUfYWxxd4ud5Lj/0H0bE1eWVR0avKKgPtkBeLkUz3sorjKpfuaJdsuJNrunzMtZsmYPD366t39klg=="; - }; - }; - "q-0.9.7" = { - name = "q"; - packageName = "q"; - version = "0.9.7"; + version = "1.1.295"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha512 = "ijt0LhxWClXBtc1RCt8H0WhlZLAdVX26nWbpsJy+Hblmp81d2F/pFsvlrJhJDDruFHM+ECtxP0H0HzGSrARkwg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.295.tgz"; + sha512 = "nBowWG3qI2+ETtbsPBOnN7S5aNFE2PXn3OfQMM2jNfSh6A9P7z6YOmV9tYt8HYQ8WHX8qcU9b4ALe7nFp0GnBg=="; }; }; "q-1.1.2" = { @@ -61547,31 +62798,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-20.0.26" = { + "quicktype-core-23.0.9" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "20.0.26"; + version = "23.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-20.0.26.tgz"; - sha512 = "B+VGYa6adM0kZq6yhnwmAMeGMnHEFMjJbHRZQidPmTCbnzeY2cNuxDIhNV6JbPzyt+o8c+fZ/DkYMefWJynIHQ=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.9.tgz"; + sha512 = "RDbv+V3iC8gDwBiROTbpT0s1cHNkG+NYa9+r2gKjROHTkApd4UjT/eUiw5LDdDjbDyYeYIKIKTALG7qLS8tYuQ=="; }; }; - "quicktype-graphql-input-20.0.26" = { + "quicktype-graphql-input-23.0.9" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "20.0.26"; + version = "23.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-20.0.26.tgz"; - sha512 = "AbvJp7g0Xbjb5jl3nP/go4GZ93vogky0HcEjDhzted/LCCSQK4tHYMPFECKcqtW7nxk0OB7/f9BEj5aZNHLvPg=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.9.tgz"; + sha512 = "L0MTYTp/Llf6iP8Fm0PoDSCo46RCqpvZpFb3CZnpa26WGMzR6537zdIHErP3HYXbKS18wW2GFH0Jc2RaDw+ffg=="; }; }; - "quicktype-typescript-input-20.0.26" = { + "quicktype-typescript-input-23.0.9" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "20.0.26"; + version = "23.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-20.0.26.tgz"; - sha512 = "OieJhc77M8mb3yEqZHQMF9LmzD3/6j8P1Khs4A1dTJT44lQAs6R3tK6EAIIF/5cfyXyOMGD3d3N7Ou6NoT0OfQ=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.9.tgz"; + sha512 = "pQr4tw2EGscfMgIS6Ik5Y9DsaiMGtzENvtAcoAlK3R/iwUGA4/QbyS+8H9RGHSVLl7ZmLIa9ZjQbepl/mbqw+g=="; }; }; "quotation-1.1.3" = { @@ -61898,6 +63149,15 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "raw-body-2.5.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; + }; + }; "raw-loader-3.1.0" = { name = "raw-loader"; packageName = "raw-loader"; @@ -61925,15 +63185,6 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-3.0.0" = { - name = "rc-config-loader"; - packageName = "rc-config-loader"; - version = "3.0.0"; - 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.2" = { name = "rc-config-loader"; packageName = "rc-config-loader"; @@ -62006,22 +63257,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.27.1" = { + "react-devtools-core-4.27.2" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.27.1"; + version = "4.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.27.1.tgz"; - sha512 = "qXhcxxDWiFmFAOq48jts9YQYe1+wVoUXzJTlY4jbaATzyio6dd6CUGu3dXBhREeVgpZ+y4kg6vFJzIOZh6vY2w=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.27.2.tgz"; + sha512 = "8SzmIkpO87alD7Xr6gWIEa1jHkMjawOZ+6egjazlnjB4UUcbnzGDf/vBJ4BzGuWWEM+pzrxuzsPpcMqlQkYK2g=="; }; }; "react-dom-16.14.0" = { @@ -62051,15 +63293,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"; @@ -62240,6 +63473,15 @@ let sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="; }; }; + "read-cmd-shim-3.0.0" = { + name = "read-cmd-shim"; + packageName = "read-cmd-shim"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz"; + sha512 = "KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog=="; + }; + }; "read-cmd-shim-3.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -62294,13 +63536,13 @@ let sha512 = "Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ=="; }; }; - "read-package-json-5.0.2" = { + "read-package-json-5.0.1" = { name = "read-package-json"; packageName = "read-package-json"; - version = "5.0.2"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-5.0.2.tgz"; - sha512 = "BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-5.0.1.tgz"; + sha512 = "MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg=="; }; }; "read-package-json-6.0.0" = { @@ -62546,6 +63788,15 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; + "readable-stream-2.3.8" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; + }; + }; "readable-stream-3.6.0" = { name = "readable-stream"; packageName = "readable-stream"; @@ -62555,6 +63806,15 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; + "readable-stream-3.6.1" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; + }; + }; "readable-stream-4.3.0" = { name = "readable-stream"; packageName = "readable-stream"; @@ -62699,6 +63959,15 @@ let sha512 = "E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ=="; }; }; + "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"; @@ -62744,15 +64013,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"; @@ -62843,13 +64103,13 @@ let sha512 = "bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ=="; }; }; - "redis-4.5.1" = { + "redis-4.6.5" = { name = "redis"; packageName = "redis"; - version = "4.5.1"; + version = "4.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.5.1.tgz"; - sha512 = "oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.5.tgz"; + sha512 = "O0OWA36gDQbswOdUuAhRL6mTZpHFN525HlgZgDaVNgCJIAZR3ya06NTESb0R+TUZ+BFaDpz6NnnVvoMx9meUFg=="; }; }; "redis-commands-1.7.0" = { @@ -62915,22 +64175,13 @@ let sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; }; }; - "redux-3.7.2" = { - name = "redux"; - packageName = "redux"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz"; - sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; - }; - }; - "redux-4.2.0" = { + "redux-4.2.1" = { name = "redux"; packageName = "redux"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz"; - sha512 = "oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA=="; + url = "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz"; + sha512 = "LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w=="; }; }; "ref-1.3.5" = { @@ -63095,13 +64346,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.2.2" = { + "regexpu-core-5.3.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.2.2"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz"; - sha512 = "T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz"; + sha512 = "nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ=="; }; }; "register-protocol-win32-1.1.0" = { @@ -63176,15 +64427,6 @@ let sha512 = "+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q=="; }; }; - "regjsgen-0.7.1" = { - name = "regjsgen"; - packageName = "regjsgen"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"; - sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="; - }; - }; "regjsparser-0.9.1" = { name = "regjsparser"; packageName = "regjsparser"; @@ -63833,6 +65075,15 @@ let sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; }; }; + "remark-mdx-frontmatter-1.1.1" = { + name = "remark-mdx-frontmatter"; + packageName = "remark-mdx-frontmatter"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-mdx-frontmatter/-/remark-mdx-frontmatter-1.1.1.tgz"; + sha512 = "7teX9DW4tI2WZkXS4DBxneYSY7NHiXl4AKdWDO9LXVweULlCT8OPWsOjLEnMIXViN1j+QcY8mfbq3k0EK6x3uA=="; + }; + }; "remark-message-control-6.0.0" = { name = "remark-message-control"; packageName = "remark-message-control"; @@ -63878,6 +65129,15 @@ let sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; }; }; + "remark-rehype-9.1.0" = { + name = "remark-rehype"; + packageName = "remark-rehype"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-rehype/-/remark-rehype-9.1.0.tgz"; + sha512 = "oLa6YmgAYg19zb0ZrBACh40hpBLteYROaPLhBXzLgjqyHQrN+gVP9N/FJvfzuNNuzCutktkroXEZBrxAxKhh7Q=="; + }; + }; "remark-retext-4.0.0" = { name = "remark-retext"; packageName = "remark-retext"; @@ -64139,13 +65399,13 @@ let sha512 = "dl51G1i9HLy2TGuNoBqYvo1qWV6dmMJtO8Z7ua7SrHBTpxoz9IR+bOlYUxGKzM27VaSeNN06xAJSIKG6CjnUNg=="; }; }; - "request-compose-1.2.3" = { + "request-compose-2.1.6" = { name = "request-compose"; packageName = "request-compose"; - version = "1.2.3"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/request-compose/-/request-compose-1.2.3.tgz"; - sha512 = "i2m8y3kEveoaAVTsTqig2LmWI10bUdakqzIVHkTEAK8kcsr4a/+iL93tsujsLaMiCZmnB1Osdk3WEMsB//H66A=="; + url = "https://registry.npmjs.org/request-compose/-/request-compose-2.1.6.tgz"; + sha512 = "S07L+2VbJB32WddD/o/PnYGKym63zLVbymygVWXvt8L79VAngcjAxhHaGuFOICLxEV90EasEPzqPKKHPspXP8w=="; }; }; "request-light-0.2.5" = { @@ -64175,22 +65435,22 @@ let sha512 = "3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg=="; }; }; - "request-light-0.6.0" = { + "request-light-0.7.0" = { name = "request-light"; packageName = "request-light"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/request-light/-/request-light-0.6.0.tgz"; - sha512 = "D3TyWnzX4Kej7ZomWbD+ZqnmzKw/otLHU4tsuhsnF3CoIBo9y0JsxkQXGAqBC4FH/y1hm/ry0/hrsVaKMCkljA=="; + url = "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz"; + sha512 = "lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="; }; }; - "request-oauth-0.0.3" = { + "request-oauth-1.0.1" = { name = "request-oauth"; packageName = "request-oauth"; - version = "0.0.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/request-oauth/-/request-oauth-0.0.3.tgz"; - sha512 = "q7WdJlpIcPaIDac0FZSy/yH37FO3UkUuPDIsiLALiLjuC6vzvuKIU14YIC3Lm0wtQRXS9GqvSo/fCYj8n75xSw=="; + url = "https://registry.npmjs.org/request-oauth/-/request-oauth-1.0.1.tgz"; + sha512 = "85THTg1RgOYtqQw42JON6AqvHLptlj1biw265Tsq4fD4cPdUvhDB2Qh9NTv17yCD322ROuO9aOmpc4GyayGVBA=="; }; }; "request-progress-2.0.1" = { @@ -64283,6 +65543,15 @@ let sha512 = "efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg=="; }; }; + "require-like-0.1.2" = { + name = "require-like"; + packageName = "require-like"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz"; + sha512 = "oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A=="; + }; + }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -64400,15 +65669,6 @@ 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"; @@ -64868,6 +66128,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"; @@ -64895,15 +66164,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"; @@ -64976,6 +66236,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"; @@ -65111,13 +66380,13 @@ let sha512 = "tTMBCMVSP+sfSQyBbFrUuVPfxfKBhy6Hciz/SttYRxKteFqjPljrH2GqXoPSCOeubSgxPDRAbQOCvQzp2hNTOA=="; }; }; - "router-1.3.7" = { + "router-1.3.8" = { name = "router"; packageName = "router"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.7.tgz"; - sha512 = "bYnD9Vv2287+g3AIll2kHITLtHV5+fldq6hVzaul9RbdGme77mvBY/1cO+ahsgstA2RI6DSg/j4W1TYHm4Lz4g=="; + url = "https://registry.npmjs.org/router/-/router-1.3.8.tgz"; + sha512 = "461UFH44NtSfIlS83PUg2N7OZo86BC/kB3dY77gJdsODsBhhw7+2uE0tzTINxrY9CahCUVk1VhpWCA5i1yoIEg=="; }; }; "router-ips-1.0.0" = { @@ -65570,22 +66839,22 @@ let sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; }; }; - "sass-1.57.1" = { + "sass-1.58.3" = { name = "sass"; packageName = "sass"; - version = "1.57.1"; + version = "1.58.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; - sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz"; + sha512 = "Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A=="; }; }; - "sass-formatter-0.7.5" = { + "sass-formatter-0.7.6" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.7.5.tgz"; - sha512 = "NKFP8ddjhUYi6A/iD1cEtzkEs91U61kzqe3lY9SVNuvX7LGc88xnEN0mmsWL7Ol//YTi2GL/ol7b9XZ2+hgXuA=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.7.6.tgz"; + sha512 = "hXdxU6PCkiV3XAiSnX+XLqz2ohHoEnVUlrd8LEVMAI80uB1+OTScIkH9n6qQwImZpTye1r1WG1rbGUteHNhoHg=="; }; }; "sass-graph-2.2.5" = { @@ -65660,6 +66929,15 @@ let sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; }; }; + "saxes-6.0.0" = { + name = "saxes"; + packageName = "saxes"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz"; + sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; + }; + }; "scheduler-0.18.0" = { name = "scheduler"; packageName = "scheduler"; @@ -66209,13 +67487,22 @@ let sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; - "sentence-splitter-3.2.2" = { + "sentence-splitter-3.2.3" = { name = "sentence-splitter"; packageName = "sentence-splitter"; - version = "3.2.2"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.2.3.tgz"; + sha512 = "eDqaz4MasTn6Mp3dagKzIbiNsJpgpueMEQqCJeN9F9XQRFLDGFJ0kX8R3uMp+mU7J58dWjr4q6eks/nUX/vnJQ=="; + }; + }; + "sentence-splitter-4.2.0" = { + name = "sentence-splitter"; + packageName = "sentence-splitter"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.2.2.tgz"; - sha512 = "hMvaodgK9Fay928uiQoTMEWjXpCERdKD2uKo7BbSyP+uWTo+wHiRjN+ZShyI99rW0VuoV4Cuw8FUmaRcnpN7Ug=="; + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-4.2.0.tgz"; + sha512 = "1Ww0iofAbR56tu6lVJ9Yh8Sj5ukeVjikBQ4sR5sNWM0kc+2AJe3p5F2o2qyuf5dJ4KVs1RbJpNkwEiMBCz7pKg=="; }; }; "separator-escape-0.0.1" = { @@ -66515,6 +67802,15 @@ let sha512 = "7sxUydQx4iEh17uJUFjZDAwbffJirldZaNIJvVB/hk9mPEL3J4GpLGSL+mHFH2ydkye46DAsLGqzFJ+/Qj5foQ=="; }; }; + "seventh-0.8.2" = { + name = "seventh"; + packageName = "seventh"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/seventh/-/seventh-0.8.2.tgz"; + sha512 = "GQsGIdg98GLYW4KEtzr+JKfI94NTaSeJAzAL3XrObeFeHvVp7PwuVELYNzk6XO1s8rWD+tTDKce3wh/No8ZPAg=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -66560,13 +67856,13 @@ let sha512 = "y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="; }; }; - "sharp-0.26.3" = { + "sharp-0.31.3" = { name = "sharp"; packageName = "sharp"; - version = "0.26.3"; + version = "0.31.3"; src = fetchurl { - url = "https://registry.npmjs.org/sharp/-/sharp-0.26.3.tgz"; - sha512 = "NdEJ9S6AMr8Px0zgtFo1TJjMK/ROMU92MkDtYn2BBrDjIx3YfH9TUyGdzPC+I/L619GeYQc690Vbaxc5FPCCWg=="; + url = "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz"; + sha512 = "XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg=="; }; }; "shasum-1.0.2" = { @@ -66623,15 +67919,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"; @@ -66641,13 +67928,13 @@ let sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; }; - "shell-quote-1.7.4" = { + "shell-quote-1.8.0" = { name = "shell-quote"; packageName = "shell-quote"; - version = "1.7.4"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz"; - sha512 = "8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw=="; + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz"; + sha512 = "QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ=="; }; }; "shelljs-0.7.8" = { @@ -66830,13 +68117,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" = { @@ -66866,6 +68153,15 @@ let sha512 = "abgDPg1106vuZZOvw7cFwdCABddfJRz5akcCcchzTbhyhYnsG31y4AlZEgp315T7W3nQq5P4xeOm186ZiPVFzw=="; }; }; + "sigstore-1.0.0" = { + name = "sigstore"; + packageName = "sigstore"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sigstore/-/sigstore-1.0.0.tgz"; + sha512 = "e+qfbn/zf1+rCza/BhIA//Awmf0v1pa5HQS8Xk8iXrn9bgytytVLqYD0P7NSqZ6IELTgq+tcDvLPkQjNHyWLNg=="; + }; + }; "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; @@ -66938,13 +68234,13 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; - "simple-git-3.16.0" = { + "simple-git-3.16.1" = { name = "simple-git"; packageName = "simple-git"; - version = "3.16.0"; + version = "3.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.0.tgz"; - sha512 = "zuWYsOLEhbJRWVxpjdiXl6eyAyGo/KzVW+KFhhw9MqEEJttcq+32jTWSGyxTdf9e/YCohxRE+9xpWFj9FdiJNw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.16.1.tgz"; + sha512 = "xzRxMKiy1zEYeHGXgAzvuXffDS0xgsq07Oi4LWEEcVH29vLpcZ2tyQRWyK0NLLlCVaKysZeem5tC1qHEOxsKwA=="; }; }; "simple-markdown-0.4.4" = { @@ -67460,6 +68756,15 @@ let sha512 = "m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ=="; }; }; + "socket.io-4.6.1" = { + name = "socket.io"; + packageName = "socket.io"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz"; + sha512 = "KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA=="; + }; + }; "socket.io-adapter-0.2.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -67496,6 +68801,15 @@ let sha512 = "W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="; }; }; + "socket.io-adapter-2.5.2" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz"; + sha512 = "87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA=="; + }; + }; "socket.io-client-1.0.6" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -67532,13 +68846,13 @@ let sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g=="; }; }; - "socket.io-client-4.5.4" = { + "socket.io-client-4.6.1" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "4.5.4"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.4.tgz"; - sha512 = "ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g=="; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz"; + sha512 = "5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ=="; }; }; "socket.io-parser-2.1.2" = { @@ -67595,22 +68909,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"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz"; - sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g=="; - }; - }; - "sockjs-0.3.20" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.20"; + version = "4.2.2"; 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" = { @@ -67622,15 +68927,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"; @@ -67802,6 +69098,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"; @@ -67847,6 +69152,15 @@ let sha512 = "GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw=="; }; }; + "sort-object-keys-1.1.3" = { + name = "sort-object-keys"; + packageName = "sort-object-keys"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz"; + sha512 = "855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg=="; + }; + }; "sort-on-4.1.1" = { name = "sort-on"; packageName = "sort-on"; @@ -67856,6 +69170,15 @@ let sha512 = "nj8myvTCEErLMMWnye61z1pV5osa7njoosoQNdylD8WyPYHoHCBQx/xn7mGJL6h4oThvGpYSIAxfm8VUr75qTQ=="; }; }; + "sort-package-json-1.57.0" = { + name = "sort-package-json"; + packageName = "sort-package-json"; + version = "1.57.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.57.0.tgz"; + sha512 = "FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q=="; + }; + }; "sorted-array-functions-1.3.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; @@ -67955,6 +69278,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"; @@ -68261,15 +69593,6 @@ let sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA=="; }; }; - "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=="; - }; - }; "split-0.2.10" = { name = "split"; packageName = "split"; @@ -69135,15 +70458,6 @@ let sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; }; }; - "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=="; - }; - }; "stackframe-1.3.4" = { name = "stackframe"; packageName = "stackframe"; @@ -69171,6 +70485,15 @@ let sha512 = "DzVKo18iiu9dHcs1y/51Th/bOB4qbC5G1mfBcK4/cq2QNxZqExWH6MG9YbXSx96nC293B65pEsC0fT7MKmsGnA=="; }; }; + "standard-17.0.0" = { + name = "standard"; + packageName = "standard"; + version = "17.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/standard/-/standard-17.0.0.tgz"; + sha512 = "GlCM9nzbLUkr+TYR5I2WQoIah4wHA2lMauqbyPLV/oI5gJxqhHzhjl9EG2N0lr/nRqI3KCbCvm/W3smxvLaChA=="; + }; + }; "standard-as-callback-2.1.0" = { name = "standard-as-callback"; packageName = "standard-as-callback"; @@ -69180,6 +70503,15 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; + "standard-engine-15.0.0" = { + name = "standard-engine"; + packageName = "standard-engine"; + version = "15.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/standard-engine/-/standard-engine-15.0.0.tgz"; + sha512 = "4xwUhJNo1g/L2cleysUqUv7/btn7GEbYJvmgKrQ2vd/8pkTmN8cpqAZg+BT8Z1hNeEH787iWUdOpL8fmApLtxA=="; + }; + }; "standard-error-1.1.0" = { name = "standard-error"; packageName = "standard-error"; @@ -69567,6 +70899,15 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; + "stream-slice-0.1.2" = { + name = "stream-slice"; + packageName = "stream-slice"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz"; + sha512 = "QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA=="; + }; + }; "stream-splicer-2.0.1" = { name = "stream-splicer"; packageName = "stream-splicer"; @@ -69675,13 +71016,13 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.1.4" = { + "streamroller-3.1.5" = { name = "streamroller"; packageName = "streamroller"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.4.tgz"; - sha512 = "Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz"; + sha512 = "KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw=="; }; }; "streamsearch-0.1.2" = { @@ -69792,6 +71133,15 @@ let sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag=="; }; }; + "string-kit-0.17.8" = { + name = "string-kit"; + packageName = "string-kit"; + version = "0.17.8"; + src = fetchurl { + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.17.8.tgz"; + sha512 = "pkJoGTq6y/xMwvV9A9Ets/sRgYEQ/nxhbHsm0z/8pAB6pqkC2JF+Od9r1o8CPRkai12r0XjRsCwUiZaSnEdjdA=="; + }; + }; "string-length-1.0.1" = { name = "string-length"; packageName = "string-length"; @@ -69855,15 +71205,6 @@ let sha512 = "Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw=="; }; }; - "string-to-stream-1.1.1" = { - name = "string-to-stream"; - packageName = "string-to-stream"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-to-stream/-/string-to-stream-1.1.1.tgz"; - sha512 = "QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw=="; - }; - }; "string-to-stream-3.0.1" = { name = "string-to-stream"; packageName = "string-to-stream"; @@ -70116,15 +71457,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"; @@ -70440,6 +71772,15 @@ let sha512 = "qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA=="; }; }; + "stubborn-fs-1.2.4" = { + name = "stubborn-fs"; + packageName = "stubborn-fs"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.4.tgz"; + sha512 = "KRa4nIRJ8q6uApQbPwYZVhOof8979fw4xbajBWa5kPJFa4nyY3aFaMWVyIVCDnkNCCG/3HLipUZ4QaNlYsmX1w=="; + }; + }; "style-loader-0.23.1" = { name = "style-loader"; packageName = "style-loader"; @@ -70449,15 +71790,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"; @@ -70476,6 +71808,15 @@ let sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg=="; }; }; + "style-to-object-0.4.1" = { + name = "style-to-object"; + packageName = "style-to-object"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz"; + sha512 = "HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw=="; + }; + }; "styled-components-5.3.6" = { name = "styled-components"; packageName = "styled-components"; @@ -70764,13 +72105,13 @@ let sha512 = "DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A=="; }; }; - "superstatic-9.0.2" = { + "superstatic-9.0.3" = { name = "superstatic"; packageName = "superstatic"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/superstatic/-/superstatic-9.0.2.tgz"; - sha512 = "eKX9qubOaJbtdxn4gWhVVMXuno8cn0WPKOYgLAmLwYiHafrASXAIXHzL3Jx7w06yXiaM5e1DA2Ezeb08iV28+A=="; + url = "https://registry.npmjs.org/superstatic/-/superstatic-9.0.3.tgz"; + sha512 = "e/tmW0bsnQ/33ivK6y3CapJT0Ovy4pk/ohNPGhIAGU2oasoNLRQ1cv6enua09NU9w6Y0H/fBu07cjzuiWvLXxw=="; }; }; "supports-color-0.2.0" = { @@ -70917,22 +72258,22 @@ let sha512 = "S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ=="; }; }; - "svelte-preprocess-5.0.0" = { + "svelte-preprocess-5.0.1" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.0.tgz"; - sha512 = "q7lpa7i2FBu8Pa+G0MmuQQWETBwCKgsGmuq1Sf6n8q4uaG9ZLcLP0Y+etC6bF4sE6EbLxfiI38zV6RfPe3RSfg=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.1.tgz"; + sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; - "svelte2tsx-0.6.0" = { + "svelte2tsx-0.6.2" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.0.tgz"; - sha512 = "TrxfQkO7CKi8Pu2eC/FyteDCdk3OOeQV5u6z7OjYAsOhsd0ClzAKqxJdvp6xxNQLrbFzf/XvCi9Fy8MQ1MleFA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.2.tgz"; + sha512 = "0ircYY2/jMOfistf+iq8fVHERnu1i90nku56c78+btC8svyafsc3OjOV37LDEOV7buqYY1Rv/uy03eMxhopH2Q=="; }; }; "sver-compat-1.5.0" = { @@ -70944,15 +72285,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"; @@ -70962,13 +72294,13 @@ let sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; }; }; - "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" = { @@ -71088,13 +72420,13 @@ let sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; }; }; - "swagger-ui-dist-4.15.5" = { + "swagger-ui-dist-4.16.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.15.5"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.5.tgz"; - sha512 = "V3eIa28lwB6gg7/wfNvAbjwJYmDXy1Jo1POjyTzlB6wPcHiGlRxq39TSjYGVjQrUSAzpv+a7nzp7mDxgNy57xA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.16.1.tgz"; + sha512 = "4J4XekQG0ol4/TyUzMfksrWsMTbw/7JYlT+SFaX7H0xamd1OeuVlUSb/Cbq4qdDx1lc+uLZQW7u2mlImcE8c+w=="; }; }; "swagger2openapi-7.0.8" = { @@ -71214,13 +72546,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" = { @@ -71232,13 +72564,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.17.3" = { + "systeminformation-5.17.11" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.17.3"; + version = "5.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.3.tgz"; - sha512 = "IAmnUJdeFUWqY+YneAWJ9rceTdRRIaTiwspvd1B6SG7yhqpxLrSosHgGZKiE8lcaBlBYpLQpY3BRLtus4n8PNQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.11.tgz"; + sha512 = "JaS/ggJDzMC1oOhCcs2b2wTQlmrnLCHUNHsefbqOcZH/uLYAxaweI5Nyx1tViQqYIxLOsgr6Rl0FDny8MtRj/g=="; }; }; "sywac-1.3.0" = { @@ -71368,13 +72700,13 @@ let sha512 = "IQ6G4wK/t8VBauYiGPLx+d3fA5XjSVagjWV5SIYzvEvglbQjwEcukeYI68JOPpdydjxhZ9sIgzRlSmwSpphHyw=="; }; }; - "tailwindcss-3.2.4" = { + "tailwindcss-3.2.7" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.2.4"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz"; - sha512 = "AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.7.tgz"; + sha512 = "B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ=="; }; }; "taketalk-1.0.0" = { @@ -71548,15 +72880,6 @@ let sha512 = "h+BGQ8ExIUZ81h4iHRvatZY5eeBBl2WZk31MmMdFG9LBTc5eCH5u/bzZ7phaPH3bsiB7WhM7YTkOyB2dyFQfXg=="; }; }; - "tcp-port-used-0.1.2" = { - name = "tcp-port-used"; - packageName = "tcp-port-used"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-0.1.2.tgz"; - sha512 = "jZI6bc4i0bRpxHprkCzqsi8r8jvaWXghDvFEdjH1yGNfSe3KH1l8TlM+TyEmB42p1XUCrOCbHh/55C6Hszqj6A=="; - }; - }; "tcp-port-used-1.0.2" = { name = "tcp-port-used"; packageName = "tcp-port-used"; @@ -71575,13 +72898,13 @@ let sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; - "tedious-15.1.2" = { + "tedious-15.1.3" = { name = "tedious"; packageName = "tedious"; - version = "15.1.2"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-15.1.2.tgz"; - sha512 = "94slmnggCX8zG6iLNnM3k6PplTguP0p7R2RWOKTXdPmK1VmTpWk4+e0J4koIMXm1jjG7sGlZ1/JlaGVAdF1OOg=="; + url = "https://registry.npmjs.org/tedious/-/tedious-15.1.3.tgz"; + sha512 = "166EpRm5qknwhEisjZqz/mF7k14fXKJYHRg6XiAXVovd/YkyHJ3SG4Ppy89caPaNFfRr7PVYe+s4dAvKaCMFvw=="; }; }; "telegraf-3.40.0" = { @@ -71737,6 +73060,15 @@ let sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag=="; }; }; + "terminal-kit-3.0.0" = { + name = "terminal-kit"; + packageName = "terminal-kit"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.0.0.tgz"; + sha512 = "GSJGYF0+hoFylKJXmq0ntE42b4S7zUkxFpf7FqHGwKFPCNeGkuv3jV0tmGquZkmfh5mYb/B2xoPJiP40mJsQrg=="; + }; + }; "terminal-link-2.1.1" = { name = "terminal-link"; packageName = "terminal-link"; @@ -71773,13 +73105,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.16.1" = { + "terser-5.16.5" = { name = "terser"; packageName = "terser"; - version = "5.16.1"; + version = "5.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; - sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; + sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -71791,15 +73123,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"; @@ -71881,15 +73204,6 @@ let sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw=="; }; }; - "textlint-12.5.1" = { - name = "textlint"; - packageName = "textlint"; - version = "12.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.5.1.tgz"; - sha512 = "LoFU1yBIm/gxM++jDdvdfS2diW14NBHsimRyChi8Kb5h5pUHcG0rGfW2PflUzfYcHF0XykgW9WBdPd1WWnyS7Q=="; - }; - }; "textlint-rule-helper-1.2.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; @@ -71899,40 +73213,22 @@ let sha512 = "yJmVbmyuUPOndKsxOijpx/G7mwybXXf4M10U2up0BeIZSN+6drUl+aSKAoC+RUHY7bG4ogLwRcmWoNG1lSrRIQ=="; }; }; - "textlint-rule-helper-2.2.4" = { + "textlint-rule-helper-2.3.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.2.4.tgz"; - sha512 = "aQDn83+L6uG8tA6IjAsfFLWxR0/OJg51/C0k6OxNuGJnn/rgQnX+6Lh/bWh9dJ0RmOIQk7VkZ1uHUny5PXkjwQ=="; - }; - }; - "textlint-tester-12.5.0" = { - name = "textlint-tester"; - packageName = "textlint-tester"; - version = "12.5.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.5.0.tgz"; - sha512 = "4BKh/eWCc73T6mvBwXz1q53gbzCm+S0iHet2nmOQWF9aEbGkVnLbFbEKNdPiayAJ5tugIdvpfT/5iUb1RXDjeg=="; + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.3.0.tgz"; + sha512 = "Ug78Saahb/qVImttL0NSFyT5/JJ5wXvOPepR2pYAjNi54BsQAAz/hAyyEgKuYeR0+yjFb0KPhby4f880X5vqHA=="; }; }; - "textlint-util-to-string-3.1.1" = { + "textlint-util-to-string-3.3.2" = { name = "textlint-util-to-string"; packageName = "textlint-util-to-string"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-3.1.1.tgz"; - sha512 = "mHE7/pDw/Hk+Q6YdSMNRrZPl5bCuWnFLbF+bxW+MsWQ64dw+Ia9irkammYbH5I0hVMMcfwb0MQc5nbsjqgWeyQ=="; - }; - }; - "tfunk-4.0.0" = { - name = "tfunk"; - packageName = "tfunk"; - version = "4.0.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz"; - sha512 = "eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ=="; + url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-3.3.2.tgz"; + sha512 = "TCnHX5xGDWIGQpcusLrctodid+n5t5G6ft9+KAVad+GmrOOkk9IiPej8FwH9Vq/uk1j44yTB20YYja0YnQ+z/w=="; }; }; "thelounge-3.3.0" = { @@ -72295,6 +73591,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"; @@ -72376,13 +73681,13 @@ let sha512 = "+CorETse1kl98xg0WAzii8DTT4ABF4R3nquhrkIbVGcw1T8JYs5Gfx9xEfGINPUZGDj9C4BmOtuKeaTtuuRolg=="; }; }; - "tinycolor2-1.5.2" = { + "tinycolor2-1.6.0" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; - sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz"; + sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; }; }; "titleize-2.1.0" = { @@ -72430,22 +73735,22 @@ let sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; - "tldts-5.7.104" = { + "tldts-5.7.109" = { name = "tldts"; packageName = "tldts"; - version = "5.7.104"; + version = "5.7.109"; src = fetchurl { - url = "https://registry.npmjs.org/tldts/-/tldts-5.7.104.tgz"; - sha512 = "PlziEIVPH/ogbqOhS35K6MOeD09rd9U5g2NHO5n9NZeMC1PGpXgsjQpoJ1KiRnjhZsWDkzN8EoX3xQZuz5ZyFQ=="; + url = "https://registry.npmjs.org/tldts/-/tldts-5.7.109.tgz"; + sha512 = "k7uaEspKgUS1yyeQFETYbhh+l7tfGfQCC0pzDsz+fqyvOEptovF5yM+ND2jcxqrlcbrmC7qUY/fZ+2mXg7tdww=="; }; }; - "tldts-core-5.7.104" = { + "tldts-core-5.7.109" = { name = "tldts-core"; packageName = "tldts-core"; - version = "5.7.104"; + version = "5.7.109"; src = fetchurl { - url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.104.tgz"; - sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; + url = "https://registry.npmjs.org/tldts-core/-/tldts-core-5.7.109.tgz"; + sha512 = "PGjUhQ8DrwoxpnZch0zrLPGeRPpjPbRy7dzpSChulmLf09jg6QXqfa2W8DXEZLWhcAZ7CxBk+arr/kJT1Dgg9w=="; }; }; "tmp-0.0.29" = { @@ -72673,13 +73978,13 @@ let sha512 = "BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw=="; }; }; - "to-vfile-7.2.3" = { + "to-vfile-7.2.4" = { name = "to-vfile"; packageName = "to-vfile"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-7.2.3.tgz"; - sha512 = "QO0A9aE6Z/YkmQadJ0syxpmNXtcQiu0qAtCKYKD5cS3EfgfFTAXfgLX6AOaBrSfWSek5nfsMf3gBZ9KGVFcLuw=="; + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-7.2.4.tgz"; + sha512 = "2eQ+rJ2qGbyw3senPI0qjuM7aut8IYXK6AEoOWb+fJx/mQYzviTckm1wDjq91QYHAPBTYzmdJXxMFA6Mk14mdw=="; }; }; "toidentifier-1.0.0" = { @@ -72745,6 +74050,15 @@ let sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ=="; }; }; + "toml-3.0.0" = { + name = "toml"; + packageName = "toml"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz"; + sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; + }; + }; "too-hot-1.0.1" = { name = "too-hot"; packageName = "too-hot"; @@ -72781,15 +74095,6 @@ let sha512 = "FclLrw8b9bMWf4QlCJuHBEVhSRsqDj6u3nIjAzPeJvgl//1hBlffdlk0MALceL14+koWEdU4ofRAXofbODxQzg=="; }; }; - "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=="; - }; - }; "torrent-discovery-5.4.0" = { name = "torrent-discovery"; packageName = "torrent-discovery"; @@ -72988,13 +74293,13 @@ let sha512 = "5Jv2d/ngAzTopwpyJtOmlj7W/EYAamm+a7Or8jCnYM9FKp8djoJIzvZFUWO/X44OovZmrsWSwYML05twxb2Pcw=="; }; }; - "trash-8.1.0" = { + "trash-8.1.1" = { name = "trash"; packageName = "trash"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/trash/-/trash-8.1.0.tgz"; - sha512 = "gp+zp7IDcyeLCPzsSqF/zmEykOVaga9lsdxzCmlS/bgbjdA1/SdFRYmHI2KCXrqg01Wmyl8fO6tgcb4kDijZSA=="; + url = "https://registry.npmjs.org/trash/-/trash-8.1.1.tgz"; + sha512 = "r15NUF+BJpDBKLTyOXaB+PhF8qh53TAOTpu/wCt6bqpu488jamsiOV7VdC//yPwAnyGIv1EJgetEnjLNer5XVw=="; }; }; "traverse-0.3.9" = { @@ -73330,13 +74635,13 @@ let sha512 = "5xZugaeM3wKQPj/vrWnrtYjNh4xnIz6cGSW/smCe9OTmkh1+KvHpm7M7HLq/OnBaljf4+yKctC4AYimBi4T1/Q=="; }; }; - "tsconfck-2.0.2" = { + "tsconfck-2.0.3" = { name = "tsconfck"; packageName = "tsconfck"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.0.2.tgz"; - sha512 = "H3DWlwKpow+GpVLm/2cpmok72pwRr1YFROV3YzAmvzfGFiC1zEM/mc9b7+1XnrxuXtEbhJ7xUSIqjPFbedp7aQ=="; + url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.0.3.tgz"; + sha512 = "o3DsPZO1+C98KqHMdAbWs30zpxD30kj8r9OLA4ML1yghx4khNDzaaShNalfluh8ZPPhzKe3qyVCP1HiZszSAsw=="; }; }; "tsconfig-5.0.3" = { @@ -73348,22 +74653,13 @@ let sha512 = "Cq65A3kVp6BbsUgg9DRHafaGmbMb9EhAc7fjWvudNWKjkbWrt43FnrtZt6awshH1R0ocfF2Z0uxock3lVqEgOg=="; }; }; - "tsconfig-paths-3.14.1" = { + "tsconfig-paths-3.14.2" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - }; - "tsconfig-paths-4.1.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.1.tgz"; - sha512 = "VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"; + sha512 = "o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g=="; }; }; "tsconfig-paths-4.1.2" = { @@ -73456,6 +74752,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"; @@ -73537,6 +74842,15 @@ let sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; + "tuf-js-1.0.0" = { + name = "tuf-js"; + packageName = "tuf-js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tuf-js/-/tuf-js-1.0.0.tgz"; + sha512 = "1dxsQwESDzACJjTdYHQ4wJ1f/of7jALWKfJEHSBWUQB/5UTJUx9SW6GHXp4mZ1KvdBRJCpGjssoPFGi4hvw8/A=="; + }; + }; "tumblr-0.4.1" = { name = "tumblr"; packageName = "tumblr"; @@ -73600,13 +74914,13 @@ let sha512 = "vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg=="; }; }; - "tus-js-client-3.0.1" = { + "tus-js-client-3.1.0" = { name = "tus-js-client"; packageName = "tus-js-client"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-3.0.1.tgz"; - sha512 = "2EZIUvswv1xG3KtzJO9FZ2wvTtVzltUN23Nse/nZwWE06dbn/8RBeRqi2clV/ilpEomOQOOMdHkIPUQmTum/xg=="; + url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-3.1.0.tgz"; + sha512 = "Hfpc8ho4C9Lhs/OflPUA/nHUHZJUrKD5upoPBq7dYJJ9DQhWocsjJU2RZYfN16Y5n19j9dFDszwCvVZ5sfcogw=="; }; }; "tv4-1.3.0" = { @@ -73654,13 +74968,13 @@ let sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="; }; }; - "twig-1.15.4" = { + "twig-1.16.0" = { name = "twig"; packageName = "twig"; - version = "1.15.4"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.4.tgz"; - sha512 = "gRpGrpdf+MswqF6eSjEdYZTa/jt3ZWHK/NU59IbTYJMBQXJ1W+7IxaGEwLkQjd+mNT15j9sQTzQumxUBkuQueQ=="; + url = "https://registry.npmjs.org/twig/-/twig-1.16.0.tgz"; + sha512 = "NYGBERQUEfK5PNQYjeK0XRktksrzgu8b5cU4YEMSrq3rvJ/obnDWLAG4/VyMFgXdS1+IvCfvnvi6aeN6mGZ0dQ=="; }; }; "twitter-1.7.1" = { @@ -73861,31 +75175,31 @@ let sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; }; }; - "type-fest-3.4.0" = { + "type-fest-3.5.1" = { name = "type-fest"; packageName = "type-fest"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.4.0.tgz"; - sha512 = "PEPg6RHlB9cFwoTMNENNrQFL0cXX04voWr2UPwQBJ3pVs7Mt8Y1oLWdUeMdGEwZE8HFFlujq8gS9enmyiQ8pLg=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.1.tgz"; + sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; }; }; - "type-fest-3.5.1" = { + "type-fest-3.6.0" = { name = "type-fest"; packageName = "type-fest"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.1.tgz"; - sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.6.0.tgz"; + sha512 = "RqTRtKTzvPpNdDUp1dVkKQRunlPITk4mXeqFlAZoJsS+fLRn8AdPK0TcQDumGayhU7fjlBfiBjsq3pe3rIfXZQ=="; }; }; - "type-fest-3.5.2" = { + "type-fest-3.6.1" = { name = "type-fest"; packageName = "type-fest"; - version = "3.5.2"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.2.tgz"; - sha512 = "Ph7S4EhXzWy0sbljEuZo0tTNoLl+K2tPauGrQpcwUWrOVneLePTuhVzcuzVJJ6RU5DsNwQZka+8YtkXXU4z9cA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.6.1.tgz"; + sha512 = "htXWckxlT6U4+ilVgweNliPqlsVSSucbxVexRYllyMVJDtf5rTjv6kF/s+qAd4QSL1BZcnJPEJavYBPQiWuZDA=="; }; }; "type-is-1.6.18" = { @@ -74050,22 +75364,22 @@ 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-4.9.4" = { + "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -74140,15 +75454,6 @@ let sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; }; }; - "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=="; - }; - }; "u2f-api-0.2.7" = { name = "u2f-api"; packageName = "u2f-api"; @@ -74185,13 +75490,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" = { @@ -74203,6 +75508,15 @@ let sha512 = "00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg=="; }; }; + "ua-parser-js-1.0.33" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "1.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.33.tgz"; + sha512 = "RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -74212,6 +75526,15 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; + "ufo-1.1.1" = { + name = "ufo"; + packageName = "ufo"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ufo/-/ufo-1.1.1.tgz"; + sha512 = "MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg=="; + }; + }; "uglify-es-3.3.10" = { name = "uglify-es"; packageName = "uglify-es"; @@ -74545,22 +75868,13 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.15.0" = { - name = "undici"; - packageName = "undici"; - version = "5.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.15.0.tgz"; - sha512 = "wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g=="; - }; - }; - "undici-5.9.1" = { + "undici-5.20.0" = { name = "undici"; packageName = "undici"; - version = "5.9.1"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.9.1.tgz"; - sha512 = "6fB3a+SNnWEm4CJbgo0/CWR8RGcOCQP68SF4X0mxtYTq2VNN8T88NYrWVBAeSX+zb7bny2dx2iYhP3XHi00omg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz"; + sha512 = "J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g=="; }; }; "unfetch-3.0.0" = { @@ -74923,13 +76237,13 @@ let sha512 = "VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ=="; }; }; - "unist-util-filter-2.0.3" = { - name = "unist-util-filter"; - packageName = "unist-util-filter"; - version = "2.0.3"; + "unist-builder-3.0.1" = { + name = "unist-builder"; + packageName = "unist-builder"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-filter/-/unist-util-filter-2.0.3.tgz"; - sha512 = "8k6Jl/KLFqIRTHydJlHh6+uFgqYHq66pV75pZgr1JwfyFSjbWb12yfb0yitW/0TbHXjr9U4G9BQpOvMANB+ExA=="; + url = "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.1.tgz"; + sha512 = "gnpOw7DIpCA0vpr6NqdPvTWnlPTApCTRzr+38E6hCWx3rz/cjo83SsKIlS1Z+L5ttScQ2AwutNnb8+tAvpb6qQ=="; }; }; "unist-util-find-1.0.2" = { @@ -74977,6 +76291,15 @@ let sha512 = "cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg=="; }; }; + "unist-util-generated-2.0.1" = { + name = "unist-util-generated"; + packageName = "unist-util-generated"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz"; + sha512 = "qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A=="; + }; + }; "unist-util-inspect-4.1.4" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; @@ -74995,13 +76318,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" = { @@ -75031,13 +76354,13 @@ let sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="; }; }; - "unist-util-is-5.1.1" = { + "unist-util-is-5.2.1" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "5.1.1"; + version = "5.2.1"; 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.1.tgz"; + sha512 = "u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw=="; }; }; "unist-util-map-1.0.5" = { @@ -75067,13 +76390,13 @@ let sha512 = "HGrj7JQo9DwZt8XFsX8UD4gGqOsIlCih9opG6Y+N11XqkBGKzHo8cvDi+MfQQgiZ7zXRUiQREYHhjOBHERTMdg=="; }; }; - "unist-util-modify-children-3.1.0" = { + "unist-util-modify-children-3.1.1" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.0.tgz"; - sha512 = "L0UizdncPZ1NIwpmkwFdLo2NaK2Eb5LU/vaQ7lZGkAaOBZfsHp+8T/gVWPVmmMO1hj6gc+XeMoytut8jr7fdyA=="; + 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" = { @@ -75085,22 +76408,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" = { @@ -75112,13 +76435,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" = { @@ -75139,13 +76462,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" = { @@ -75184,13 +76507,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" = { @@ -75202,13 +76525,13 @@ let sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ=="; }; }; - "unist-util-visit-children-2.0.1" = { + "unist-util-visit-children-2.0.2" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.1.tgz"; - sha512 = "2cEU3dhV1hMfO9ajwb8rJsDedMfsahsm6fCfR8LxDR/w7KcB5lzHQ9dBTQIXsWGNWBFH5MPmaFP3Xh0dWLqClQ=="; + 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" = { @@ -75238,13 +76561,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" = { @@ -75670,13 +76993,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" = { @@ -75742,15 +77065,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"; @@ -75922,13 +77236,13 @@ let sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q=="; }; }; - "utf-8-validate-6.0.0" = { + "utf-8-validate-6.0.3" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "6.0.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.0.tgz"; - sha512 = "OCJuwxQsnG51swYmNloViggxNOFO/leOZpnb/vVeoastJbrzrZZU7lGsYlUcdkCl9nsBu2nkKLjpljb3Ckvb/Q=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz"; + sha512 = "uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA=="; }; }; "utf7-1.0.2" = { @@ -75985,6 +77299,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"; @@ -76363,13 +77686,13 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; - "validator-13.7.0" = { + "validator-13.9.0" = { name = "validator"; packageName = "validator"; - version = "13.7.0"; + version = "13.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz"; - sha512 = "nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="; + url = "https://registry.npmjs.org/validator/-/validator-13.9.0.tgz"; + sha512 = "B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA=="; }; }; "validator-5.7.0" = { @@ -76876,13 +78199,13 @@ let sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; }; }; - "vfile-5.3.6" = { + "vfile-5.3.7" = { name = "vfile"; packageName = "vfile"; - version = "5.3.6"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-5.3.6.tgz"; - sha512 = "ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA=="; + url = "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz"; + sha512 = "r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g=="; }; }; "vfile-find-down-1.0.0" = { @@ -76912,13 +78235,13 @@ let sha512 = "YWx8fhWQNYpHxFkR5fDO4lCdvPcY4jfCG7qUMHVvSp14vRfkEYxFG/vUEV0eJuXoKFfiAmMkAS8dekOYnpAJ+A=="; }; }; - "vfile-find-up-6.0.0" = { + "vfile-find-up-6.1.0" = { name = "vfile-find-up"; packageName = "vfile-find-up"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-6.0.0.tgz"; - sha512 = "TPE1tYyHrYxewHxi42F8yP45rY5fK78jiPg9WP1xH5TfAbdncxja5NquZyYSSzG1aHpK98AvUOVJrEOoTonW6w=="; + url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-6.1.0.tgz"; + sha512 = "plN64Ff/wLPvKC8ucTzyB97cgV7SdIcFL74HLCSmI/79FqOI1WACbNM4noKrJa+dZRgN6Gwp4BQElm/yBDqC3w=="; }; }; "vfile-location-3.2.0" = { @@ -76930,13 +78253,13 @@ let sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; }; }; - "vfile-location-4.0.1" = { + "vfile-location-4.1.0" = { name = "vfile-location"; packageName = "vfile-location"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-4.0.1.tgz"; - sha512 = "JDxPlTbZrZCQXogGheBHjbRWjESSPEak770XwWPfw5mTc1v1nWGLB/apzZxsx8a0SJVfF8HK8ql8RD308vXRUw=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-4.1.0.tgz"; + sha512 = "YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw=="; }; }; "vfile-message-1.1.1" = { @@ -76957,13 +78280,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.1.3" = { + "vfile-message-3.1.4" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.3.tgz"; - sha512 = "0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz"; + sha512 = "fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw=="; }; }; "vfile-reporter-1.5.0" = { @@ -76993,13 +78316,13 @@ let sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; }; }; - "vfile-reporter-7.0.4" = { + "vfile-reporter-7.0.5" = { name = "vfile-reporter"; packageName = "vfile-reporter"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz"; - sha512 = "4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A=="; + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz"; + sha512 = "NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw=="; }; }; "vfile-reporter-pretty-5.0.0" = { @@ -77029,13 +78352,13 @@ let sha512 = "tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA=="; }; }; - "vfile-sort-3.0.0" = { + "vfile-sort-3.0.1" = { name = "vfile-sort"; packageName = "vfile-sort"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz"; - sha512 = "fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg=="; + url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz"; + sha512 = "1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw=="; }; }; "vfile-statistics-1.1.4" = { @@ -77047,13 +78370,13 @@ let sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA=="; }; }; - "vfile-statistics-2.0.0" = { + "vfile-statistics-2.0.1" = { name = "vfile-statistics"; packageName = "vfile-statistics"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz"; - sha512 = "foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA=="; + url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz"; + sha512 = "W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg=="; }; }; "vfile-to-eslint-2.0.2" = { @@ -77164,13 +78487,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.13" = { + "vm2-3.9.14" = { name = "vm2"; packageName = "vm2"; - version = "3.9.13"; + version = "3.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; - sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; + sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; }; }; "voc-1.2.0" = { @@ -77227,13 +78550,13 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-6.2.1" = { + "vscode-css-languageservice-6.2.4" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "6.2.1"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz"; - sha512 = "FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.4.tgz"; + sha512 = "9UG0s3Ss8rbaaPZL1AkGzdjrGY8F+P+Ne9snsrvD9gxltDGhsn8C2dQpqQewHrMW37OvlqJoI8sUU2AWDb+qNw=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -77254,13 +78577,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-5.0.3" = { + "vscode-html-languageservice-5.0.4" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.3.tgz"; - sha512 = "6rfrtcHhXDMXmC5pR2WXrx02HiNCzQDynOBMn+53zLxr2hvZrDzoc0QgC0FaFGfcglf7GeOsfhkWvJBFC/a70g=="; + 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" = { @@ -77290,13 +78613,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.1.3" = { + "vscode-json-languageservice-5.3.1" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.1.3"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.3.tgz"; - sha512 = "p0O1Ql5+zyWFIBU4cSxnDcuq9OnbE0MmvNKDYYvz4EPsZ9EHBT3I6KJb5Gk3snkj+jQTFILEZ06cfY7WZxxqPw=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.1.tgz"; + sha512 = "tPRf/2LOBS6uFflFLABdj8T3ol2/QgZ0kpzZHFCs+cbxpnjBNiCo+rfh3th0dtdytq5dSnWo5iFJj99zF6jZWQ=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -77371,13 +78694,13 @@ let sha512 = "RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ=="; }; }; - "vscode-jsonrpc-8.1.0-next.7" = { + "vscode-jsonrpc-8.1.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.1.0-next.7"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.7.tgz"; - sha512 = "UJlY2e4wnI+GkaNYM2TERqrNvTe0XScny7lUA4f+F+z6XI5pDJnHj6udXiGJofT/tX57d8C6fnlfgrCfF6aptQ=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz"; + sha512 = "6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw=="; }; }; "vscode-languageclient-4.0.1" = { @@ -77479,13 +78802,13 @@ let sha512 = "bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA=="; }; }; - "vscode-languageserver-8.1.0-next.6" = { + "vscode-languageserver-8.1.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.1.0-next.6"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0-next.6.tgz"; - sha512 = "YSj9fKN0FtVW95RKjcy8UheODK4YosqiZUkEbAgJJ0uMxR1Om1dhD/+QwYUKfJX/u8KLS/qFroMNVFHoPoc2hg=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz"; + sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -77542,13 +78865,13 @@ let sha512 = "8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg=="; }; }; - "vscode-languageserver-protocol-3.17.3-next.6" = { + "vscode-languageserver-protocol-3.17.3" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.3-next.6"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.6.tgz"; - sha512 = "UCL2DaAOCzGFZKIAJ4wOS9BXVbeARL8GxXTW7ANnAXJg03IytNmOJcmguL6l+ht4CCdKNQbnRSJB4dh8cgDyJw=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz"; + sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -77668,13 +78991,13 @@ let sha512 = "zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="; }; }; - "vscode-languageserver-types-3.17.3-next.3" = { + "vscode-languageserver-types-3.17.3" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.17.3-next.3"; + version = "3.17.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=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz"; + sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -77686,13 +79009,13 @@ let sha512 = "D4rUfu/oKYdc9Tmec0nEfedj+uXO2tZHR+eoHs9rE9G/QpRyZaHuug8ZUNGTGdO+ALLGgenL6bRpY8y3J9acHg=="; }; }; - "vscode-markdown-languageservice-0.2.0" = { + "vscode-markdown-languageservice-0.3.0-alpha.5" = { name = "vscode-markdown-languageservice"; packageName = "vscode-markdown-languageservice"; - version = "0.2.0"; + version = "0.3.0-alpha.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0.tgz"; - sha512 = "3Jh7/eN6zEPqfkT6cjL+AwGoQ7euL8RtW3FYf24IfPksz4nAZJcRibRtpSdlCaOKpwEoy/f5Axh94cmWPIGBMw=="; + url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.5.tgz"; + sha512 = "5SEn8hr999N/K8IaY25fdZoW7JPJT4pOm53AQvimGNYiCntb0TWJhMJD1Izbc2DvbyrWAksVkLqzbGKV/zW+Sg=="; }; }; "vscode-nls-2.0.2" = { @@ -77857,6 +79180,15 @@ 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-hot-reload-api-2.3.4" = { name = "vue-hot-reload-api"; packageName = "vue-hot-reload-api"; @@ -78019,6 +79351,15 @@ let sha512 = "3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg=="; }; }; + "w3c-xmlserializer-4.0.0" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"; + sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw=="; + }; + }; "walk-2.3.15" = { name = "walk"; packageName = "walk"; @@ -78064,13 +79405,13 @@ let sha512 = "rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w=="; }; }; - "wasm-feature-detect-1.4.0" = { + "wasm-feature-detect-1.5.1" = { name = "wasm-feature-detect"; packageName = "wasm-feature-detect"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.4.0.tgz"; - sha512 = "9z4Yk3SeHQdb7E4g6ywQYcUt1CHr9HFiCIA5h29rv0gmW4lCE5dnDhheiJI5qzVPSDnXHyXQPLGPyucsuIzacw=="; + url = "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.5.1.tgz"; + sha512 = "GHr23qmuehNXHY4902/hJ6EV5sUANIJC3R/yMfQ7hWDg3nfhlcJfnIL96R2ohpIwa62araN6aN4bLzzzq5GXkg=="; }; }; "watchpack-1.7.5" = { @@ -78109,22 +79450,13 @@ let sha512 = "/lRBpLn2TvEwrIW5i35ZCpb+SIq4VWq4c1yxN311we+E4eXRW7EB5nybrv4fJEuBmgqyqVkT2gtQ6Zqu+u66mA=="; }; }; - "wavedrom-2.9.1" = { + "wavedrom-3.2.0" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.1.tgz"; - sha512 = "IPv1bKVwh4Zo8dMMQfnNy4KFqU/v0buoPDwLkTrtHE2nr0dV4pHqryhWpqNCSUm7xTWroER+nE5xRkng96xLUA=="; - }; - }; - "wawoff2-2.0.1" = { - name = "wawoff2"; - packageName = "wawoff2"; - version = "2.0.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz"; - sha512 = "r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-3.2.0.tgz"; + sha512 = "7U0JuNbYKD84Xwf3Ofxc9M0BRUOWJ/aNhGHtkuujiH012re5q3qoEUtJtSvQjMjY2E5w6Nz2fToW7JzM72kg6w=="; }; }; "wbuf-1.7.3" = { @@ -78163,6 +79495,15 @@ let sha512 = "rWkTAGqs4TN6qreS06+irmFUMrQVx5KoFjD8CxMHUsAwmxw/upDcfleaEYOLsonUbornahg+VJ9xrWxp4udyJA=="; }; }; + "web-encoding-1.1.5" = { + name = "web-encoding"; + packageName = "web-encoding"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/web-encoding/-/web-encoding-1.1.5.tgz"; + sha512 = "HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA=="; + }; + }; "web-namespaces-1.1.4" = { name = "web-namespaces"; packageName = "web-namespaces"; @@ -78217,15 +79558,6 @@ let sha512 = "e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="; }; }; - "web-streams-polyfill-4.0.0-beta.3" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "4.0.0-beta.3"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz"; - sha512 = "QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug=="; - }; - }; "web-tree-sitter-0.20.5" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -78244,13 +79576,22 @@ let sha512 = "flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A=="; }; }; - "web3-utils-1.8.1" = { + "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.2" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.8.1.tgz"; - sha512 = "LgnM9p6V7rHHUGfpMZod+NST8cRfGzJ1BTXAyNo7A9cJX9LczBfSRxJp+U/GInYe9mby40t3v22AJdlELibnsQ=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.8.2.tgz"; + sha512 = "v7j6xhfLQfY7xQDrUP0BKbaNrmZ2/+egbqP9q3KYmOiPpnvAfol+32slgL0WX/5n8VPvKCK5EZ1HGrAVICSToA=="; }; }; "webassemblyjs-1.11.1" = { @@ -78262,13 +79603,13 @@ let sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg=="; }; }; - "webcrypto-core-1.7.5" = { + "webcrypto-core-1.7.6" = { name = "webcrypto-core"; packageName = "webcrypto-core"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.5.tgz"; - sha512 = "gaExY2/3EHQlRNNNVSrbG2Cg94Rutl7fAaKILS1w8ZDhGxdFOaw6EbCfHIxPy9vt/xwp5o0VQAx9aySPF6hU1A=="; + url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.6.tgz"; + sha512 = "TBPiewB4Buw+HI3EQW+Bexm19/W4cP/qZG/02QJCXN+iN+T5sl074vZ3rJcle/ZtDBQSgjkbsQO/1eFcxnSBUA=="; }; }; "webidl-conversions-2.0.1" = { @@ -78343,15 +79684,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"; @@ -78379,13 +79711,13 @@ let sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="; }; }; - "webpack-bundle-analyzer-4.7.0" = { + "webpack-bundle-analyzer-4.8.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz"; - sha512 = "j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg=="; + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz"; + sha512 = "ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg=="; }; }; "webpack-chain-6.5.1" = { @@ -78442,22 +79774,22 @@ let sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; }; }; - "webpack-dev-server-3.11.0" = { + "webpack-dev-server-3.11.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.11.0"; + version = "3.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; - sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz"; + sha512 = "3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="; }; }; - "webpack-dev-server-3.11.3" = { + "webpack-dev-server-4.11.1" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.11.3"; + version = "4.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz"; - sha512 = "3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="; + 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" = { @@ -78487,13 +79819,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=="; + url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz"; + sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; }; }; "webpack-merge-4.2.2" = { @@ -78550,6 +79882,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "webpack-sources-2.3.1" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz"; + sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; + }; + }; "webpack-sources-3.2.3" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -78568,13 +79909,13 @@ let sha512 = "UlTm7Yz4meJV0THhZMrgRTE9v/vZ0xfUoJ/eOig98TvzsqNiW+FLSv5WaZeML3uJUPrMQ6K5jo1FJJFXNCc8+g=="; }; }; - "websocket-driver-0.6.5" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.6.5"; + "webpod-0.0.2" = { + name = "webpod"; + packageName = "webpod"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha512 = "oBx6ZM1Gs5q2jwZuSN/Qxyy/fbgomV8+vqsmipaPKB/74hjHlKuM07jNmRhn4qa2AdUwsgxrltq+gaPsHgcl0Q=="; + url = "https://registry.npmjs.org/webpod/-/webpod-0.0.2.tgz"; + sha512 = "cSwwQIeg8v4i3p4ajHhwgR7N6VyxAf+KYSSsY6Pd3aETE+xEU4vbitz7qQkB0I321xnhDdgtxuiSfk5r/FVtjg=="; }; }; "websocket-driver-0.7.4" = { @@ -78730,6 +80071,15 @@ let sha512 = "9lFZp/KHoqH6bPKjbWqa+3Dg/K/r2v0X/3/G2x4DBGchVS2QX2VXL3cZV994WQVnTM1/PD71Az25nAzryEUugw=="; }; }; + "when-exit-2.1.0" = { + name = "when-exit"; + packageName = "when-exit"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/when-exit/-/when-exit-2.1.0.tgz"; + sha512 = "H85ulNwUBU1e6PGxkWUDgxnbohSXD++ah6Xw1VHAN7CtypcbZaC4aYjQ+C2PMVaDkURDuOinNAT+Lnz3utWXxQ=="; + }; + }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -79171,13 +80521,13 @@ let sha512 = "U0IUQHKXXn6PFo9nqsHphVCE5m3IntqZNB9Jjn7EB1lrR7YTDY3YWgFvEvwniTzXSvOH/XMzAZaIfJF/LvHYXg=="; }; }; - "wonka-6.1.2" = { + "wonka-6.2.3" = { name = "wonka"; packageName = "wonka"; - version = "6.1.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/wonka/-/wonka-6.1.2.tgz"; - sha512 = "zNrXPMccg/7OEp9tSfFkMgTvhhowqasiSHdJ3eCZolXxVTV/aT6HUTofoZk9gwRbGoFey/Nss3JaZKUMKMbofg=="; + url = "https://registry.npmjs.org/wonka/-/wonka-6.2.3.tgz"; + sha512 = "EFOYiqDeYLXSzGYt2X3aVe9Hq1XJG+Hz/HjTRRT4dZE9q95khHl5+7pzUSXI19dbMO1/2UMrTf7JT7/7JrSQSQ=="; }; }; "word-wrap-1.2.3" = { @@ -79270,13 +80620,13 @@ let sha512 = "ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="; }; }; - "workerpool-6.3.1" = { + "workerpool-6.4.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.3.1.tgz"; - sha512 = "0x7gJm1rhpn5SPG9NENOxPtbfUZZtK/qOg6gEdSqeDBA3dTeR91RJqSPjccPRCkhNfrnnl/dWxSSj5w9CtdzNA=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.4.0.tgz"; + sha512 = "i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A=="; }; }; "wrap-ansi-2.1.0" = { @@ -79333,13 +80683,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" = { @@ -79414,6 +80764,15 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; + "write-file-atomic-4.0.1" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz"; + sha512 = "nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ=="; + }; + }; "write-file-atomic-4.0.2" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -79423,6 +80782,15 @@ let sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; }; }; + "write-file-atomic-5.0.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.0.tgz"; + sha512 = "R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w=="; + }; + }; "write-file-webpack-plugin-4.3.2" = { name = "write-file-webpack-plugin"; packageName = "write-file-webpack-plugin"; @@ -79450,15 +80818,6 @@ let sha512 = "3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ=="; }; }; - "write-json-file-4.3.0" = { - name = "write-json-file"; - packageName = "write-json-file"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz"; - sha512 = "PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ=="; - }; - }; "write-pkg-4.0.0" = { name = "write-pkg"; packageName = "write-pkg"; @@ -79603,6 +80962,15 @@ let sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; }; }; + "ws-8.12.1" = { + name = "ws"; + packageName = "ws"; + version = "8.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz"; + sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; + }; + }; "ws-8.2.3" = { name = "ws"; packageName = "ws"; @@ -79729,13 +81097,22 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.3.0" = { + "xdl-60.0.4" = { name = "xdl"; packageName = "xdl"; - version = "59.3.0"; + version = "60.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/xdl/-/xdl-60.0.4.tgz"; + sha512 = "xyvJj4ATdu8hdBwA1Q/71LjfHS9jKEpj63qPe9hGvhIAaKX3mYaMFpC44XySZ2PJ9YeCMM7VRRjyEdiUSoUDjQ=="; + }; + }; + "xdm-2.1.0" = { + name = "xdm"; + packageName = "xdm"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.3.0.tgz"; - sha512 = "+7HeQDo13SWNCktnmggutegmWBIgF5TzKLPpaZe3qhlTXRETdNvQUbuYfaETLlcwk372jzvO7navUgxUvFrpNA=="; + url = "https://registry.npmjs.org/xdm/-/xdm-2.1.0.tgz"; + sha512 = "3LxxbxKcRogYY7cQSMy1tUuU1zKNK9YPqMT7/S0r7Cz2QpyF8O9yFySGD7caOZt+LWUOQioOIX+6ZzCoBCpcAA=="; }; }; "xenvar-0.5.1" = { @@ -80126,13 +81503,13 @@ let sha512 = "F6WF5s6xG/bm8Oxi2ETuzwGQW8yleL5I4JPxZl49m7Uw7D4LAXu+4dvUK78Uo4D863sM8auqw6+1Xmj9mFlmDQ=="; }; }; - "xstate-4.35.2" = { + "xstate-4.37.0" = { name = "xstate"; packageName = "xstate"; - version = "4.35.2"; + version = "4.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.35.2.tgz"; - sha512 = "5X7EyJv5OHHtGQwN7DsmCAbSnDs3Mxl1cXQ4PVaLwi+7p/RRapERnd1dFyHjYin+KQoLLfuXpl1dPBThgyIGNg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.37.0.tgz"; + sha512 = "YC+JCerRclKS9ixQTuw8l3vs3iFqWzNzOGR0ID5XsSlieMXIV9nNPE43h9CGr7VdxA1QYhMwhCZA0EdpOd17Bg=="; }; }; "xstream-11.14.0" = { @@ -80441,6 +81818,15 @@ let sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; }; }; + "yargs-17.7.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"; + sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -80702,22 +82088,22 @@ let sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.13.0" = { + "yeoman-environment-3.15.1" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.13.0"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.13.0.tgz"; - sha512 = "eBPpBZCvFzx6yk17x+ZrOHp8ADDv6qHradV+SgdugaQKIy9NjEX5AkbwdTHLOgccSTkQ9rN791xvYOu6OmqjBg=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.15.1.tgz"; + sha512 = "P4DTQxqCxNTBD7gph+P+dIckBdx0xyHmvOYgO3vsc9/Sl67KJ6QInz5Qv6tlXET3CFFJ/YxPIdl9rKb0XwTRLg=="; }; }; - "yeoman-generator-5.7.0" = { + "yeoman-generator-5.8.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.7.0.tgz"; - sha512 = "z9ZwgKoDOd+llPDCwn8Ax2l4In5FMhlslxdeByW4AMxhT+HbTExXKEAahsClHSbwZz1i5OzRwLwRIUdOJBr5Bw=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.8.0.tgz"; + sha512 = "dsrwFn9/c2/MOe80sa2nKfbZd/GaPTgmmehdgkFifs1VN/I7qPsW2xcBfvSkHNGK+PZly7uHyH8kaVYSFNUDhQ=="; }; }; "ylru-1.3.2" = { @@ -80900,22 +82286,22 @@ let sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; }; }; - "zod-3.20.2" = { + "zod-3.20.5" = { name = "zod"; packageName = "zod"; - version = "3.20.2"; + version = "3.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/zod/-/zod-3.20.2.tgz"; - sha512 = "1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ=="; + url = "https://registry.npmjs.org/zod/-/zod-3.20.5.tgz"; + sha512 = "BTAAliwfoB9dWf2hC+TXlyWKk/YTqRGZjHQR0WLC2A2pzierWo7KuQ1ebjS4SNaFaxg/lDItzl9/QTgLjcHbgw=="; }; }; - "zwave-js-10.4.0" = { + "zwave-js-10.10.0" = { name = "zwave-js"; packageName = "zwave-js"; - version = "10.4.0"; + version = "10.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.4.0.tgz"; - sha512 = "9eVe+7xli+KOvoyakXPMI1a5Mhkjlwi2t6Gniuyu+s6U8rOCd8NmhHvvzB2p+2KLRjuYjBRqPNA5c8qAsvC+ug=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.10.0.tgz"; + sha512 = "mirnbCz9egAZebFDgycnkxnqAPeZRlWE0t0sH23DxkXWsQMZI+L1qHWHZJUm3+1SDLmOS7pCZk+9cwNSEWGhrA=="; }; }; "zwitch-1.0.5" = { @@ -80951,25 +82337,25 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "15.1.1"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.1.tgz"; - sha512 = "539I3B5yTasaX/EQrXZyXOc9eZUyVBxMWiGj3/bmlCsft7/Y8J+A92uftjxIO4P8lYWzSdSxFT3Bu1zI1b6yzw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-15.2.0.tgz"; + sha512 = "Zy1kmcvqoQf316eirfxkS5vb8/3B9btZf0YvZH/hDHmAyzAs8cwfirU+ClhwLLb/T9i7HnB0YS+Pdz0XaQa/jQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1501.1" - sources."@angular-devkit/core-15.1.1" - sources."@angular-devkit/schematics-15.1.1" + sources."@angular-devkit/architect-0.1502.0" + sources."@angular-devkit/core-15.2.0" + sources."@angular-devkit/schematics-15.2.0" sources."@gar/promisify-1.1.3" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@npmcli/fs-2.1.2" sources."@npmcli/git-4.0.3" - sources."@npmcli/installed-package-contents-2.0.1" + sources."@npmcli/installed-package-contents-2.0.2" sources."@npmcli/move-file-2.0.1" 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.1" + sources."@schematics/angular-15.2.0" sources."@tootallnate/once-2.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -81037,7 +82423,7 @@ in sources."fast-deep-equal-3.1.3" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."fs-minipass-3.0.0" + sources."fs-minipass-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -81050,16 +82436,16 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-6.1.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" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - (sources."ignore-walk-6.0.0" // { + (sources."ignore-walk-6.0.1" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" + sources."minimatch-6.2.0" ]; }) sources."imurmurhash-0.1.4" @@ -81071,7 +82457,7 @@ in (sources."inquirer-8.2.4" // { dependencies = [ sources."rxjs-7.8.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."ip-2.0.0" @@ -81093,8 +82479,8 @@ in 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.27.0" + sources."lru-cache-7.17.0" + sources."magic-string-0.29.0" (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -81108,7 +82494,7 @@ in }) sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -81164,25 +82550,25 @@ in sources."npm-pick-manifest-8.0.1" (sources."npm-registry-fetch-14.0.3" // { dependencies = [ - sources."make-fetch-happen-11.0.2" + sources."make-fetch-happen-11.0.3" sources."minipass-fetch-3.0.1" ]; }) sources."npmlog-6.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.1" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-15.0.8" + sources."pacote-15.1.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."picomatch-2.3.1" sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."read-package-json-6.0.0" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -81191,7 +82577,7 @@ in ]; }) sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -81210,6 +82596,12 @@ in }) sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" + (sources."sigstore-1.0.0" // { + dependencies = [ + sources."make-fetch-happen-11.0.3" + sources."minipass-fetch-3.0.1" + ]; + }) sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" @@ -81238,6 +82630,14 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-1.14.1" + (sources."tuf-js-1.0.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."make-fetch-happen-11.0.3" + sources."minimatch-6.2.0" + sources."minipass-fetch-3.0.1" + ]; + }) sources."type-fest-0.21.3" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -81268,10 +82668,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.18.8"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.18.8.tgz"; - sha512 = "0m++AudwQq+wWAz/Ax7g+sh/wFW51HHQ6BtPLsuTAsFIzWB/bv/0COwZE7BRS+u0nqMb6Ks6nlk6cY1TpPDwHg=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.20.0.tgz"; + sha512 = "mBgAuq2b0daSA/14LMyjEjaInD7/Zd7KVXZge7bQPKmtQJFqy9/pWBml6DMkMreeHQEomMtIbbeqReNJ/74kjA=="; }; buildInputs = globalBuildInputs; meta = { @@ -81311,14 +82711,14 @@ in sources."end-of-stream-1.4.4" sources."event-target-shim-5.0.1" sources."events-3.3.0" - sources."fast-copy-3.0.0" + sources."fast-copy-3.0.1" sources."fast-redact-3.1.2" sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" sources."glob-8.1.0" (sources."help-me-4.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."ieee754-1.2.1" @@ -81329,7 +82729,7 @@ in sources."json5-2.2.3" sources."lodash.clonedeep-4.5.0" sources."minimatch-5.1.6" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."on-exit-leak-free-2.1.0" sources."once-1.4.0" sources."pino-8.7.0" @@ -81412,7 +82812,7 @@ in sources."clone-stats-1.0.0" (sources."cloneable-readable-1.1.3" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."colorette-2.0.19" @@ -81423,27 +82823,27 @@ in sources."crc-32-1.2.2" sources."dateformat-4.6.3" sources."decompress-response-6.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."diff3-0.0.3" sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" sources."event-target-shim-5.0.1" sources."events-3.3.0" sources."extend-3.0.2" - sources."fast-copy-3.0.0" + sources."fast-copy-3.0.1" sources."fast-redact-3.1.2" sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) 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" // { @@ -81488,7 +82888,7 @@ in sources."json5-2.2.3" (sources."lazystream-1.0.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."lead-1.0.0" @@ -81497,7 +82897,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-3.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimisted-2.0.1" sources."multi-progress-4.0.0" sources."neo-async-2.6.2" @@ -81509,7 +82909,7 @@ in sources."once-1.4.0" (sources."ordered-read-streams-1.0.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."pako-1.0.11" @@ -81538,7 +82938,7 @@ in sources."pumpify-2.0.1" sources."queue-4.5.1" sources."quick-format-unescaped-4.0.4" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."real-require-0.2.0" sources."remove-bom-buffer-3.0.0" sources."remove-bom-stream-1.2.0" @@ -81563,7 +82963,7 @@ in sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."through2-filter-3.0.0" @@ -81585,7 +82985,7 @@ in sources."is-glob-3.1.0" sources."pump-2.0.1" sources."pumpify-1.5.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."vinyl-sourcemap-1.1.0" @@ -81610,13 +83010,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.29.4"; + version = "0.29.6"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.4.tgz"; - sha512 = "ZcvMVz4ItsLe+Ey6Ucrp+HYYT5Bc9BeNlQ7QYWVyHYqoke/HvlHXHPScj04LxVJ2Iq9FXjj4yRNFxBWj8P5J2g=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.6.tgz"; + sha512 = "pdfMMKeVEkx045fzBH6exyqbEa7VMcZaygNAj7Dym4FxYNvMEWZzB5WUBlePpNbt5ChhwUkX5vSqK3zNab5UGw=="; }; dependencies = [ - sources."@astrojs/compiler-0.31.4" + sources."@astrojs/compiler-1.1.2" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" @@ -81629,7 +83029,7 @@ in sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.10" + sources."@vscode/l10n-0.0.11" sources."cross-spawn-7.0.3" sources."define-lazy-prop-2.0.0" sources."emmet-2.3.6" @@ -81642,26 +83042,30 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jsonc-parser-2.3.1" - sources."open-8.4.0" + sources."open-8.4.2" sources."path-key-3.1.1" sources."picocolors-1.0.0" - sources."prettier-2.8.3" - sources."prettier-plugin-astro-0.7.2" + sources."prettier-2.8.4" + (sources."prettier-plugin-astro-0.7.2" // { + dependencies = [ + sources."@astrojs/compiler-0.31.4" + ]; + }) sources."s.color-0.0.15" - sources."sass-formatter-0.7.5" + sources."sass-formatter-0.7.6" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" 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.2.1" - sources."vscode-html-languageservice-5.0.3" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."tslib-2.5.0" + sources."vscode-css-languageservice-6.2.4" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-3.0.7" sources."which-2.0.2" ]; @@ -81677,46 +83081,46 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "2023.1.0"; + version = "2023.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2023.1.0.tgz"; - sha512 = "/90Op7H2EAsqbkEgJYUhgogf08m0QtS+pE5DaPcGvJDB6JNuQldRA//qmQIHPGAJiOsu6jb3/zIvRPNWEiyjsg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2023.2.0.tgz"; + sha512 = "9u6fkmU4mnrqOAsHgnFDn6CdM6aYhhVxk0A2EvVEG3APhbTagXoGRvCNly3ojnjin3aH5vfHNtdrC0oV/357zA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { 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-function-name-7.21.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-module-transforms-7.21.2" 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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" 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/plugin-transform-modules-commonjs-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -81735,11 +83139,12 @@ in sources."yallist-4.0.0" ]; }) + sources."@phc/format-1.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" @@ -81754,25 +83159,26 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."string_decoder-1.3.0" ]; }) + sources."argon2-0.30.3" sources."asynckit-0.4.0" sources."balanced-match-1.0.2" sources."big-integer-1.6.51" 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."browserslist-4.21.5" 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."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."canvas-2.11.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -81798,7 +83204,7 @@ in (sources."concat-stream-1.6.2" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -81808,7 +83214,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" (sources."cookies-0.8.0" // { dependencies = [ @@ -81842,7 +83248,7 @@ in ]; }) sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -81873,7 +83279,7 @@ in sources."function-bind-1.1.1" sources."gauge-3.0.2" 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."globals-11.12.0" sources."graceful-fs-4.2.10" @@ -81916,7 +83322,7 @@ in (sources."jszip-3.10.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -81945,12 +83351,8 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -81968,7 +83370,8 @@ in sources."mute-stream-0.0.8" sources."nan-2.17.0" sources."negotiator-0.6.3" - (sources."node-fetch-2.6.8" // { + sources."node-addon-api-5.1.0" + (sources."node-fetch-2.6.9" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -81977,7 +83380,7 @@ in }) sources."node-forge-1.3.1" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."nwsapi-2.2.2" @@ -81987,7 +83390,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."only-0.0.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."pako-1.0.11" @@ -82002,10 +83405,10 @@ in sources."process-nextick-args-2.0.1" sources."proper-lockfile-4.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystringify-2.2.0" - (sources."raw-body-2.5.1" // { + (sources."raw-body-2.5.2" // { dependencies = [ sources."depd-2.0.0" sources."http-errors-2.0.0" @@ -82020,7 +83423,7 @@ in sources."run-async-2.4.1" (sources."rxjs-7.8.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."safe-buffer-5.1.2" @@ -82040,7 +83443,7 @@ in (sources."streaming-json-stringify-3.1.0" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -82057,8 +83460,8 @@ in ]; }) sources."through-2.3.8" - sources."tldts-5.7.104" - sources."tldts-core-5.7.104" + sources."tldts-5.7.109" + sources."tldts-core-5.7.109" sources."tmp-0.0.33" sources."to-fast-properties-2.0.0" sources."toidentifier-1.0.1" @@ -82107,10 +83510,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.2.tgz"; - sha512 = "0rPGJ2O1owhpxMIXL9YJ2CgPkdrFLKZElIZHXDN8L8+qWK1DGH7Q7IelBT1pchXTYTuDlqkOTdh//aTvT3bSUA=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.4.tgz"; + sha512 = "HwKlD7CPVMVGTAeFZylVNy14Vm5POVY0WxPkZr7EXLC/os0LH/obs6z4HRvJtH/nHCMYBvUBQhGwnufKfTjd5g=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -82125,18 +83528,18 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-17.4.0" - sources."@commitlint/ensure-17.4.0" + sources."@commitlint/config-validator-17.4.4" + sources."@commitlint/ensure-17.4.4" 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/format-17.4.4" + sources."@commitlint/is-ignored-17.4.4" + sources."@commitlint/lint-17.4.4" + sources."@commitlint/load-17.4.4" 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/parse-17.4.4" + sources."@commitlint/read-17.4.4" + sources."@commitlint/resolve-extends-17.4.4" + sources."@commitlint/rules-17.4.4" sources."@commitlint/to-lines-17.4.0" (sources."@commitlint/top-level-17.4.0" // { dependencies = [ @@ -82146,32 +83549,32 @@ in sources."p-locate-5.0.0" ]; }) - sources."@commitlint/types-17.4.0" + sources."@commitlint/types-17.4.4" 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.36" 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-18.11.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -82190,7 +83593,7 @@ in sources."compare-func-2.0.0" sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" - sources."cosmiconfig-8.0.0" + sources."cosmiconfig-8.1.0" sources."cosmiconfig-typescript-loader-4.3.0" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" @@ -82265,7 +83668,7 @@ in sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.0" sources."normalize-package-data-3.0.3" sources."npm-run-path-4.0.1" @@ -82279,7 +83682,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -82295,7 +83698,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -82325,7 +83728,7 @@ in sources."trim-newlines-3.0.1" sources."ts-node-10.9.1" sources."type-fest-0.18.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -82335,7 +83738,7 @@ in sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.6.2" // { + (sources."yargs-17.7.1" // { dependencies = [ sources."yargs-parser-21.1.1" ]; @@ -82357,10 +83760,10 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "17.4.2"; + version = "17.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.2.tgz"; - sha512 = "JVo1moSj5eDMoql159q8zKCU8lkOhQ+b23Vl3LVVrS6PXDLQIELnJ34ChQmFVbBdSSRNAbbXnRDhosFU+wnuHw=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.4.tgz"; + sha512 = "u6ztvxqzi6NuhrcEDR7a+z0yrh11elY66nRrQIpqsqW6sZmpxYkDLtpRH8jRML+mmxYQ8s4qqF06Q/IQx5aJeQ=="; }; dependencies = [ sources."array-ify-1.0.0" @@ -82384,10 +83787,10 @@ in "@emacs-eask/cli" = nodeEnv.buildNodePackage { name = "_at_emacs-eask_slash_cli"; packageName = "@emacs-eask/cli"; - version = "0.7.8"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.8.tgz"; - sha512 = "Vr7nZf9H/T6wQyrC+vj3x2ysGbRlyRsayp6TrWu5jBWUi2ocYCq2/0O48HUKj9lkyEPWKjwr+ANehC95S727Sg=="; + url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.10.tgz"; + sha512 = "Gwr5PsyH+JSsM3jaJLW00EqwMD151wu0v3lBa58mnbBVVXOEG6Fnynv9jE9vLzOkhAVcDH9dtCtYlurDH7/YZg=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -82404,7 +83807,7 @@ in sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -82420,10 +83823,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "6.4.0"; + version = "6.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.0.tgz"; - sha512 = "inTrWbkBbgnFX+L+RJ4XRxo6GgXGGiECZLnE1WrCpgoNI8j+SSvk11UPz5YA3krebKeiSJseMQ/VyswePvzsMg=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.3.tgz"; + sha512 = "WrH6+w+h7IOsOU4NQ/GksECG127HsfuxpttzWOZcfYcdRRtLd1ZgM7l3FVJ0SqKa6uw6MuSEkpBAARZ0jldXUQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -82434,22 +83837,22 @@ in ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-compilation-targets-7.20.7" - sources."@babel/helper-create-class-features-plugin-7.20.12" + sources."@babel/helper-create-class-features-plugin-7.21.0" sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.2" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-replace-supers-7.20.7" @@ -82458,48 +83861,51 @@ in 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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" 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.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" 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.20.7" - sources."@babel/plugin-transform-typescript-7.20.7" - sources."@babel/preset-typescript-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.21.0" + sources."@babel/plugin-transform-typescript-7.21.0" + sources."@babel/preset-typescript-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@colors/colors-1.5.0" sources."@discoveryjs/json-ext-0.5.7" - sources."@forge/api-2.9.1" + sources."@forge/api-2.11.1" (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.2.0" - (sources."@forge/cli-shared-3.5.0" // { + sources."@forge/babel-plugin-transform-ui-1.1.1" + sources."@forge/bundler-4.5.0" + (sources."@forge/cli-shared-3.6.1" // { dependencies = [ sources."glob-7.2.3" ]; }) - (sources."@forge/egress-1.1.1" // { + sources."@forge/csp-2.1.1" + (sources."@forge/egress-1.1.2" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" ]; }) - sources."@forge/lint-3.2.12" - sources."@forge/manifest-4.5.3" - sources."@forge/storage-1.3.1" - sources."@forge/util-1.2.0" + sources."@forge/lint-3.2.15" + sources."@forge/manifest-4.7.0" + sources."@forge/runtime-4.2.0" + sources."@forge/storage-1.3.2" + sources."@forge/tunnel-3.1.1" + sources."@forge/util-1.2.1" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -82511,28 +83917,66 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@jsdevtools/ono-7.1.3" + 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" sources."@polka/url-1.0.0-next.21" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-8.4.10" + (sources."@sentry/core-7.39.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.39.0" // { + dependencies = [ + sources."cookie-0.4.2" + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.39.0" + (sources."@sentry/utils-7.39.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sindresorhus/is-4.6.0" + sources."@szmarczak/http-timer-4.0.6" + 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.21.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" + sources."@types/express-4.17.17" + sources."@types/express-serve-static-core-4.17.33" sources."@types/html-minifier-terser-6.1.0" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-proxy-1.17.10" sources."@types/json-schema-7.0.11" - sources."@types/node-18.11.18" + sources."@types/keyv-3.1.4" + sources."@types/mime-3.0.1" + sources."@types/node-18.14.2" sources."@types/node-fetch-2.6.2" - sources."@typescript-eslint/types-5.48.2" - (sources."@typescript-eslint/typescript-estree-5.48.2" // { + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/responselike-1.0.0" + sources."@types/retry-0.12.0" + sources."@types/serve-index-1.9.1" + sources."@types/serve-static-1.15.1" + sources."@types/sockjs-0.3.33" + sources."@types/ws-8.5.4" + sources."@types/yauzl-2.10.0" + sources."@typescript-eslint/types-5.54.0" + (sources."@typescript-eslint/typescript-estree-5.54.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.48.2" + sources."@typescript-eslint/visitor-keys-5.54.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -82553,30 +83997,42 @@ 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."accepts-1.3.8" + 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" + sources."json-schema-traverse-0.4.1" + ]; + }) + (sources."ajv-formats-2.1.1" // { + dependencies = [ + sources."ajv-8.12.0" + sources."fast-deep-equal-3.1.3" ]; }) sources."ajv-keywords-3.5.2" sources."ansi-escapes-4.3.2" + sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" + sources."anymatch-3.1.3" sources."archiver-5.3.1" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."glob-7.2.3" sources."inherits-2.0.4" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."argparse-1.0.10" + sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array.prototype.flatmap-1.3.1" (sources."asn1.js-5.4.1" // { @@ -82590,15 +84046,18 @@ in ]; }) sources."async-3.2.4" + sources."async-request-handler-0.8.8" 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" + sources."batch-0.6.1" sources."big-integer-1.6.51" sources."big.js-5.2.2" sources."binary-0.3.0" + sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" @@ -82607,6 +84066,18 @@ in }) sources."bluebird-3.4.7" sources."bn.js-5.2.1" + (sources."body-parser-1.20.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."bonjour-service-1.1.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + sources."fast-deep-equal-3.1.3" + ]; + }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -82621,7 +84092,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" @@ -82630,19 +84101,24 @@ in sources."buffers-0.1.1" sources."bufferutil-4.0.7" sources."bunyan-1.8.15" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) + sources."bytes-3.1.2" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."case-1.6.3" sources."chainsaw-0.1.0" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."chardet-0.7.0" (sources."cheerio-0.22.0" // { dependencies = [ @@ -82657,10 +84133,11 @@ in sources."nth-check-1.0.2" ]; }) + sources."chokidar-3.5.3" 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" @@ -82674,18 +84151,33 @@ in sources."mimic-response-1.0.1" ]; }) - 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."colorette-2.0.19" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-7.2.0" sources."commondir-1.0.1" sources."compress-commons-4.1.1" + 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."conf-6.2.4" + sources."connect-history-api-fallback-2.0.0" sources."console-browserify-1.2.0" + sources."content-disposition-0.5.4" + sources."content-security-policy-parser-0.3.0" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" + sources."cookie-0.5.0" + sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."crc32-stream-4.0.2" @@ -82707,12 +84199,17 @@ in sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" + sources."default-gateway-6.0.3" sources."defaults-1.0.4" - sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.4" + sources."defer-to-connect-2.0.1" + sources."define-lazy-prop-2.0.0" + sources."define-properties-1.2.0" sources."delayed-stream-1.0.0" + sources."depd-2.0.0" sources."des.js-1.0.1" + sources."destroy-1.2.0" sources."detect-libc-2.0.1" + sources."detect-node-2.1.0" sources."didyoumean-1.2.2" (sources."diffie-hellman-5.0.3" // { dependencies = [ @@ -82720,6 +84217,8 @@ in ]; }) sources."dir-glob-3.0.1" + sources."dns-equal-1.0.0" + sources."dns-packet-5.4.0" sources."dom-converter-0.2.0" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" @@ -82732,13 +84231,14 @@ in (sources."duplexer2-0.1.4" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.284" + sources."ee-first-1.1.1" + sources."electron-to-chromium-1.4.313" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -82747,6 +84247,7 @@ in }) sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -82767,6 +84268,7 @@ in sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."escalade-3.1.1" + sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" sources."eslint-visitor-keys-3.3.0" @@ -82777,10 +84279,24 @@ in ]; }) sources."estraverse-4.3.0" + sources."etag-1.8.1" sources."event-emitter-0.3.5" + sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" + (sources."execa-5.1.1" // { + dependencies = [ + sources."get-stream-6.0.1" + ]; + }) sources."expand-template-2.0.3" + (sources."express-4.18.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."express-intercept-0.8.10" (sources."ext-1.7.0" // { dependencies = [ sources."type-2.7.2" @@ -82792,28 +84308,41 @@ in ]; }) sources."extract-files-9.0.0" + sources."extract-zip-2.0.1" sources."fast-deep-equal-2.0.1" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" + sources."faye-websocket-0.11.4" + sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" + (sources."finalhandler-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."find-cache-dir-3.3.2" sources."find-up-4.1.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."fp-ts-2.13.1" + sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { dependencies = [ sources."mkdirp-0.5.6" ]; }) - sources."fswin-3.22.106" + sources."fswin-3.23.119" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" @@ -82821,8 +84350,8 @@ 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-stream-4.1.0" + sources."get-intrinsic-1.2.0" + sources."get-stream-5.2.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" sources."glob-6.0.4" @@ -82832,19 +84361,15 @@ in 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" - sources."mimic-response-1.0.1" - ]; - }) + sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."graphql-15.8.0" sources."graphql-request-3.4.0" sources."gzip-size-6.0.0" + 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-flag-4.0.0" sources."has-property-descriptors-1.0.0" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" @@ -82862,6 +84387,19 @@ in sources."he-1.2.0" sources."hidefile-3.0.0" sources."hmac-drbg-1.0.1" + (sources."hpack.js-2.1.6" // { + dependencies = [ + (sources."readable-stream-2.3.8" // { + dependencies = [ + sources."inherits-2.0.4" + ]; + }) + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."hpagent-0.1.2" + sources."html-entities-2.3.3" (sources."html-minifier-terser-6.1.0" // { dependencies = [ sources."commander-8.3.0" @@ -82869,7 +84407,19 @@ in }) sources."html-webpack-plugin-5.5.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" + sources."http-deceiver-1.2.7" + (sources."http-errors-2.0.0" // { + dependencies = [ + sources."inherits-2.0.4" + ]; + }) + sources."http-parser-js-0.5.8" + sources."http-proxy-1.18.1" + sources."http-proxy-middleware-1.3.1" + sources."http2-wrapper-1.0.3" + 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.2.4" @@ -82881,24 +84431,23 @@ in sources."ini-1.3.8" (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.4" + sources."internal-slot-1.0.5" sources."interpret-2.2.0" sources."io-ts-2.2.20" + sources."io-ts-reporters-1.2.2" + sources."ipaddr.js-1.9.1" 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" sources."is-callable-1.2.7" sources."is-core-module-2.11.0" sources."is-date-object-1.0.5" + sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -82907,29 +84456,31 @@ in sources."is-number-7.0.0" sources."is-number-object-1.0.7" sources."is-obj-2.0.0" + sources."is-plain-obj-3.0.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-stream-2.0.1" 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."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" (sources."jest-worker-27.5.1" // { dependencies = [ - sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-ref-parser-9.0.9" (sources."json-schema-to-typescript-9.1.1" // { @@ -82937,7 +84488,7 @@ in sources."glob-7.2.3" ]; }) - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-schema-typed-7.0.3" sources."json-stable-stringify-1.0.2" sources."json-stringify-safe-5.0.1" @@ -82946,7 +84497,7 @@ in sources."jsonify-0.0.1" sources."jsonpointer-5.0.1" sources."keytar-7.9.0" - sources."keyv-3.1.0" + sources."keyv-4.5.2" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."launchdarkly-eventsource-1.4.3" @@ -82959,7 +84510,7 @@ in (sources."lazystream-1.0.1" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -82971,6 +84522,7 @@ in sources."lodash-4.17.21" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" + sources."lodash.clonedeep-4.5.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.filter-4.6.0" @@ -82987,30 +84539,30 @@ in sources."lodash.union-4.6.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."lowercase-keys-2.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."media-typer-0.3.0" sources."memfs-3.4.13" sources."memoizee-0.4.15" + 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."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" ]; }) + sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" @@ -83018,12 +84570,13 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" sources."mrmime-1.0.1" sources."ms-2.1.2" + sources."multicast-dns-7.2.5" sources."mute-stream-0.0.8" (sources."mv-2.1.1" // { dependencies = [ @@ -83034,10 +84587,17 @@ in sources."nan-2.17.0" sources."napi-build-utils-1.0.2" sources."ncp-2.0.0" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."next-tick-1.1.0" + (sources."ngrok-4.3.3" // { + dependencies = [ + sources."@types/node-8.10.66" + sources."uuid-8.3.2" + ]; + }) sources."no-case-3.0.4" - (sources."node-abi-3.31.0" // { + (sources."node-abi-3.33.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" @@ -83045,6 +84605,11 @@ in ]; }) sources."node-addon-api-4.3.0" + (sources."node-cache-5.1.2" // { + dependencies = [ + sources."clone-2.1.2" + ]; + }) (sources."node-fetch-2.6.7" // { dependencies = [ sources."tr46-0.0.3" @@ -83052,6 +84617,7 @@ in sources."whatwg-url-5.0.0" ]; }) + sources."node-forge-1.3.1" sources."node-gyp-build-4.6.0" (sources."node-localstorage-1.3.1" // { dependencies = [ @@ -83059,57 +84625,83 @@ in ]; }) sources."node-machine-id-1.1.12" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.1.0" + sources."npm-run-path-4.0.1" sources."nth-check-2.1.1" sources."object-assign-4.1.1" sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" + sources."obuf-1.1.2" sources."omelette-0.4.17" + sources."on-finished-2.4.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" + sources."open-8.4.2" sources."opener-1.5.2" (sources."ora-4.1.1" // { dependencies = [ - sources."ansi-styles-4.3.0" + sources."ansi-styles-3.2.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."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.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" + sources."supports-color-5.5.0" ]; }) sources."original-1.0.2" sources."os-browserify-0.3.0" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" + sources."p-cancelable-2.1.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."p-retry-4.6.2" sources."p-try-2.2.0" - sources."package-json-6.5.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."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-4.1.0" + sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."mimic-response-1.0.1" + sources."normalize-url-4.5.1" + sources."p-cancelable-1.1.0" + sources."responselike-1.0.2" + ]; + }) sources."pako-1.0.11" sources."param-case-3.0.4" sources."parse-asn1-5.1.6" + sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-browserify-1.0.1" 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-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pbkdf2-3.1.2" + sources."pend-1.2.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pkg-dir-4.2.0" @@ -83130,10 +84722,11 @@ in }) sources."prebuild-install-7.1.1" sources."prepend-http-2.0.0" - sources."prettier-2.8.3" + sources."prettier-2.8.4" sources."pretty-error-4.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.7" (sources."public-encrypt-4.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -83141,14 +84734,18 @@ in }) sources."pump-3.0.0" sources."punycode-1.4.1" + sources."qs-6.11.0" sources."querystring-0.2.0" sources."querystring-browser-1.0.4" sources."querystringify-2.2.0" 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.5.1" sources."rc-1.2.8" - (sources."readable-stream-3.6.0" // { + (sources."readable-stream-3.6.1" // { dependencies = [ sources."inherits-2.0.4" ]; @@ -83159,6 +84756,7 @@ in sources."minimatch-5.1.6" ]; }) + sources."readdirp-3.6.0" sources."rechoir-0.7.1" sources."recursive-readdir-2.2.3" sources."regexp.prototype.flags-1.4.3" @@ -83167,12 +84765,15 @@ in sources."relateurl-0.2.7" sources."renderkid-3.0.0" 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-alpn-1.2.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" - sources."responselike-1.0.2" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" + sources."retry-0.13.1" sources."reusify-1.0.4" sources."rimraf-2.4.5" sources."ripemd160-2.0.2" @@ -83185,9 +84786,34 @@ in sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" sources."schema-utils-2.7.1" + sources."select-hose-2.0.0" + sources."selfsigned-2.1.1" sources."semver-6.3.0" + (sources."send-0.18.0" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.3" + ]; + }) sources."serialize-javascript-6.0.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."setimmediate-1.0.5" + sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" @@ -83199,23 +84825,27 @@ in sources."sirv-1.0.19" sources."slash-3.0.0" sources."slide-1.1.6" + (sources."sockjs-0.3.24" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."source-map-0.6.1" sources."source-map-support-0.5.21" + sources."spdy-4.0.2" + sources."spdy-transport-3.0.0" sources."sprintf-js-1.0.3" + sources."statuses-2.0.1" sources."stdin-0.0.1" sources."string-width-4.2.3" 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-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - 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-color-7.2.0" + sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" sources."tar-fs-2.1.1" @@ -83225,7 +84855,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.5" // { dependencies = [ sources."commander-2.20.3" ]; @@ -83239,6 +84869,7 @@ in sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" + sources."thunky-1.1.0" sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tiny-each-async-2.0.3" @@ -83251,28 +84882,24 @@ in sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" sources."totalist-1.1.0" (sources."tr46-1.0.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."traverse-0.3.9" sources."truncate-utf8-bytes-1.0.2" (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" @@ -83281,9 +84908,10 @@ in sources."tunnel-agent-0.6.0" sources."type-1.2.0" sources."type-fest-0.21.3" + sources."type-is-1.6.18" sources."typed-array-length-1.0.4" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.9.4" + sources."typescript-4.9.5" (sources."typescript-json-schema-0.45.1" // { dependencies = [ sources."glob-7.2.3" @@ -83291,10 +84919,11 @@ in }) sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" + sources."unpipe-1.0.0" (sources."unzipper-0.10.11" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -83302,7 +84931,7 @@ in sources."update-browserslist-db-1.0.10" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."urijs-1.19.11" @@ -83322,8 +84951,11 @@ in }) sources."util-deprecate-1.0.2" sources."utila-0.4.0" + sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."vary-1.1.2" sources."watchpack-2.4.0" + sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" (sources."webpack-5.75.0" // { @@ -83331,32 +84963,44 @@ in sources."schema-utils-3.1.1" ]; }) - (sources."webpack-bundle-analyzer-4.7.0" // { + (sources."webpack-bundle-analyzer-4.8.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."webpack-cli-4.10.0" + (sources."webpack-dev-middleware-5.3.3" // { + dependencies = [ + sources."ajv-8.12.0" + sources."ajv-keywords-5.1.0" + sources."fast-deep-equal-3.1.3" + sources."schema-utils-4.0.0" + ]; + }) + (sources."webpack-dev-server-4.11.1" // { + dependencies = [ + sources."ajv-8.12.0" + sources."ajv-keywords-5.1.0" + sources."fast-deep-equal-3.1.3" + sources."glob-7.2.3" + sources."http-proxy-middleware-2.0.6" + sources."ipaddr.js-2.0.1" + sources."rimraf-3.0.2" + sources."schema-utils-4.0.0" + sources."ws-8.12.1" + ]; + }) sources."webpack-merge-5.8.0" sources."webpack-sources-3.2.3" + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" 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" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-7.5.9" @@ -83365,6 +85009,7 @@ in sources."yaml-1.10.2" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" + sources."yauzl-2.10.0" sources."zip-stream-4.1.0" ]; buildInputs = globalBuildInputs; @@ -83404,7 +85049,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -83480,7 +85125,7 @@ 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" @@ -83494,7 +85139,7 @@ in 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" @@ -83547,7 +85192,7 @@ in sources."jws-4.0.0" sources."keyv-4.5.2" sources."lines-and-columns-1.2.4" - sources."locate-path-7.1.1" + sources."locate-path-7.2.0" sources."lodash-4.17.21" (sources."log-symbols-5.1.0" // { dependencies = [ @@ -83565,7 +85210,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" sources."normalize-newline-4.1.0" (sources."normalize-package-data-3.0.3" // { @@ -83578,7 +85223,7 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" (sources."ora-6.1.2" // { dependencies = [ sources."bl-5.1.0" @@ -83630,7 +85275,7 @@ in sources."yocto-queue-0.1.0" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.3" sources."replace-buffer-1.2.1" @@ -83671,9 +85316,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.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."url-parse-1.5.10" sources."url-template-2.0.8" @@ -83709,38 +85354,38 @@ in "@medable/mdctl-cli" = nodeEnv.buildNodePackage { name = "_at_medable_slash_mdctl-cli"; packageName = "@medable/mdctl-cli"; - version = "1.0.68"; + version = "1.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.68.tgz"; - sha512 = "zCtMCbQxJc5k2iaB/nV+1FrGQBEfbnFh427BD7O3jR6wJjVGBIamXtVKnqYqC5Kjtam7Eb9jvusZNpRcnVcAFQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.69.tgz"; + sha512 = "tJNiTfZ5Q/rrTSp8GQdq2VU76bbRq9DTyk1OhfuGlIep6bvjRbKZ+hwMmWkQ5AtCi5PqZ1zVNPyOnigdJObgOg=="; }; dependencies = [ - sources."@babel/parser-7.20.7" - 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" // { + sources."@babel/parser-7.21.2" + sources."@medable/mdctl-api-1.0.69" + sources."@medable/mdctl-api-driver-1.0.69" + sources."@medable/mdctl-axon-tools-1.0.69" + sources."@medable/mdctl-core-1.0.69" + sources."@medable/mdctl-core-schemas-1.0.69" + sources."@medable/mdctl-core-utils-1.0.69" + sources."@medable/mdctl-credentials-provider-keychain-1.0.69" + sources."@medable/mdctl-credentials-provider-pouchdb-1.0.69" + sources."@medable/mdctl-docs-1.0.69" + sources."@medable/mdctl-export-adapter-console-1.0.69" + (sources."@medable/mdctl-export-adapter-tree-1.0.69" // { dependencies = [ sources."glob-7.2.3" sources."globby-10.0.2" ]; }) - sources."@medable/mdctl-import-adapter-1.0.68" - (sources."@medable/mdctl-manifest-1.0.68" // { + sources."@medable/mdctl-import-adapter-1.0.69" + (sources."@medable/mdctl-manifest-1.0.69" // { dependencies = [ sources."pluralize-8.0.0" ]; }) - sources."@medable/mdctl-node-utils-1.0.68" - sources."@medable/mdctl-sandbox-1.0.68" - sources."@medable/mdctl-secrets-1.0.68" + sources."@medable/mdctl-node-utils-1.0.69" + sources."@medable/mdctl-sandbox-1.0.69" + sources."@medable/mdctl-secrets-1.0.69" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -83750,7 +85395,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.18" + sources."@types/node-18.14.2" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83764,7 +85409,7 @@ in sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.7" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -83799,7 +85444,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bl-1.2.3" // { dependencies = [ - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -84162,7 +85807,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.6" + sources."markdown-it-anchor-8.6.7" sources."marked-4.2.12" sources."md5.js-1.3.5" sources."mdurl-1.0.1" @@ -84179,7 +85824,7 @@ in sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" (sources."mixin-deep-1.3.2" // { @@ -84196,7 +85841,7 @@ in sources."napi-build-utils-1.0.2" (sources."ndjson-1.5.0" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -84211,7 +85856,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.8" + sources."node-fetch-2.6.9" sources."node-pre-gyp-0.11.0" sources."noop-fn-1.0.0" sources."noop-logger-0.1.1" @@ -84383,13 +86028,13 @@ in sources."promise-nodify-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."rc-1.2.8" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" (sources."recast-0.11.23" // { dependencies = [ sources."esprima-3.1.3" @@ -84484,7 +86129,7 @@ in sources."split-string-3.1.0" (sources."split2-2.2.0" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -84528,7 +86173,7 @@ in }) (sources."tar-stream-1.6.2" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -84640,94 +86285,91 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.88.0"; + version = "5.93.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.88.0.tgz"; - sha512 = "SEgQvrlCmBrjWogSXtk0cA9QAV7XqdeTurWYjjXLSNP56MMpqmF3e8b7FqnZcdT1r9i+rkWrBuQF/K3q+5bT7A=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.93.1.tgz"; + sha512 = "OzdPSA1jis1rYb96ry/dYtJdWSCD7Ao6B71hoiCoOwLtEIoHBbXv5MTxLZb3SvvlWOgrJvHtObSIccfb6DLOEg=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-client-1.7.0" // { + (sources."@azure/core-client-1.7.2" // { dependencies = [ - sources."tslib-2.4.1" + 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.4.1" + sources."form-data-4.0.0" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-lro-2.5.0" // { + (sources."@azure/core-lro-2.5.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) - (sources."@azure/core-paging-1.4.0" // { + (sources."@azure/core-paging-1.5.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."form-data-4.0.0" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-util-1.1.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/identity-2.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) - (sources."@azure/msal-browser-2.32.2" // { + (sources."@azure/msal-browser-2.33.0" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-10.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { + (sources."@azure/msal-node-1.15.0" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-10.0.0" ]; }) (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.21.1" sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.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" @@ -84736,26 +86378,27 @@ in sources."@babel/parser-7.16.4" (sources."@babel/template-7.20.7" // { dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" ]; }) - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.21.2" // { dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" ]; }) - sources."@babel/types-7.20.7" + sources."@babel/types-7.21.2" 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.88.0" + sources."@microsoft/rush-lib-5.93.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" @@ -84768,25 +86411,24 @@ in }) sources."@pnpm/types-6.4.0" sources."@pnpm/write-project-manifest-1.1.7" - sources."@rushstack/heft-config-file-0.11.4" - (sources."@rushstack/node-core-library-3.53.3" // { + sources."@rushstack/heft-config-file-0.11.9" + (sources."@rushstack/node-core-library-3.55.2" // { dependencies = [ sources."import-lazy-4.0.0" - sources."resolve-1.17.0" ]; }) - sources."@rushstack/package-deps-hash-3.2.66" - (sources."@rushstack/rig-package-0.3.17" // { + sources."@rushstack/package-deps-hash-4.0.8" + (sources."@rushstack/rig-package-0.3.18" // { dependencies = [ - sources."resolve-1.17.0" + sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.88.0" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.88.0" - sources."@rushstack/rush-sdk-5.88.0" - sources."@rushstack/stream-collator-4.0.219" - sources."@rushstack/terminal-0.3.88" - (sources."@rushstack/ts-command-line-4.13.1" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.93.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.93.1" + sources."@rushstack/rush-sdk-5.93.1" + sources."@rushstack/stream-collator-4.0.227" + sources."@rushstack/terminal-0.5.2" + (sources."@rushstack/ts-command-line-4.13.2" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -84798,19 +86440,19 @@ in 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/node-18.14.2" + sources."@types/node-fetch-2.6.2" 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."@vue/compiler-core-3.2.47" + sources."@vue/compiler-dom-3.2.47" + sources."@vue/compiler-sfc-3.2.47" + sources."@vue/compiler-ssr-3.2.47" + sources."@vue/reactivity-transform-3.2.47" + sources."@vue/shared-3.2.47" sources."@yarnpkg/lockfile-1.0.2" - sources."@zkochan/cmd-shim-5.4.0" + 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" // { @@ -84834,7 +86476,7 @@ in sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."boxen-5.1.2" // { @@ -84919,6 +86561,11 @@ in 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" @@ -84927,6 +86574,7 @@ in 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" @@ -84953,7 +86601,7 @@ in sources."pkg-dir-4.2.0" ]; }) - sources."form-data-4.0.0" + sources."form-data-3.0.1" (sources."fs-extra-7.0.1" // { dependencies = [ sources."universalify-0.1.2" @@ -85003,7 +86651,7 @@ in ]; }) sources."hosted-git-info-4.1.0" - 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" @@ -85012,7 +86660,7 @@ in sources."ignore-5.1.9" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" - sources."immutable-4.2.2" + sources."immutable-4.2.4" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -85074,7 +86722,7 @@ in sources."jws-3.2.2" ]; }) - sources."jszip-3.7.1" + sources."jszip-3.8.0" sources."jwa-1.4.1" (sources."jws-4.0.0" // { dependencies = [ @@ -85115,7 +86763,9 @@ in 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" @@ -85126,11 +86776,11 @@ in 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-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-1.2.8" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" @@ -85176,8 +86826,12 @@ in sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.0" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) + sources."open-8.4.2" (sources."ora-5.4.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -85192,6 +86846,7 @@ in 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" @@ -85238,18 +86893,14 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.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-1.2.8" (sources."rc-config-loader-4.1.2" // { dependencies = [ sources."js-yaml-4.1.0" @@ -85281,7 +86932,7 @@ in sources."js-yaml-4.1.0" ]; }) - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdir-scoped-modules-1.1.0" sources."readdirp-3.6.0" sources."redent-3.0.0" @@ -85296,12 +86947,13 @@ in 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."sass-1.58.3" sources."sax-1.2.4" sources."scss-parser-1.0.6" sources."semver-7.3.8" @@ -85336,13 +86988,13 @@ in 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."strip-json-comments-2.0.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."minipass-4.2.4" ]; }) sources."text-table-0.2.0" @@ -85380,7 +87032,7 @@ in 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."validator-13.9.0" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -85488,7 +87140,7 @@ in sources."is-plain-object-5.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."joi-17.7.0" + sources."joi-17.8.3" sources."js-yaml-3.14.1" sources."jsonfile-6.1.0" sources."lodash-4.17.21" @@ -85497,7 +87149,7 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."netrc-0.1.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-version-1.2.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -85505,7 +87157,7 @@ in sources."preferences-2.0.2" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -85540,20 +87192,20 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "9.1.8"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.8.tgz"; - sha512 = "53laCMoPLAkjyz3405FlMSrHnbr3DGeoaQjY963bEroezLlm/qfQhwj6oGJwtgA28eNFgx68mvQV2f1VZNUJtw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.2.0.tgz"; + sha512 = "6B1IjDcJbrOu55oMF67L1x5lDUOZ3Zs9l7bKCBH9D78965m8wq/2rlEWl/gJto5TABLQWy3hVvV/s8VzUlRMxw=="; }; dependencies = [ - sources."@angular-devkit/core-15.0.4" - sources."@angular-devkit/schematics-15.0.4" - (sources."@angular-devkit/schematics-cli-15.0.4" // { + sources."@angular-devkit/core-15.1.4" + sources."@angular-devkit/schematics-15.1.4" + (sources."@angular-devkit/schematics-cli-15.1.4" // { dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.4" sources."rxjs-7.8.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" @@ -85575,12 +87227,19 @@ in 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.4" - sources."@types/eslint-8.4.10" + (sources."@nestjs/schematics-9.0.4" // { + dependencies = [ + sources."@angular-devkit/core-15.0.4" + sources."@angular-devkit/schematics-15.0.4" + sources."ajv-8.11.0" + sources."magic-string-0.26.7" + ]; + }) + sources."@types/eslint-8.21.1" 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.18" + sources."@types/node-18.14.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -85599,9 +87258,9 @@ 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-3.5.2" // { dependencies = [ @@ -85620,11 +87279,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -85641,9 +87300,9 @@ in sources."cosmiconfig-7.1.0" sources."cross-spawn-7.0.3" sources."de-indent-1.0.2" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."defaults-1.0.4" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.12.0" @@ -85665,7 +87324,7 @@ 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.14" // { + (sources."fork-ts-checker-webpack-plugin-7.3.0" // { dependencies = [ sources."chalk-4.1.2" sources."fs-extra-10.1.0" @@ -85727,20 +87386,20 @@ in ]; }) sources."lru-cache-6.0.0" - sources."macos-release-2.5.0" - sources."magic-string-0.26.7" + sources."macos-release-2.5.1" + sources."magic-string-0.27.0" sources."memfs-3.4.13" sources."merge-stream-2.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" 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.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -85762,16 +87421,16 @@ in sources."picomatch-2.3.1" sources."pluralize-8.0.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdirp-3.6.0" sources."rechoir-0.6.2" sources."require-from-string-2.0.2" sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" - sources."rimraf-3.0.2" + sources."rimraf-4.1.2" sources."run-async-2.4.1" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" @@ -85804,7 +87463,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tapable-2.2.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.5" // { dependencies = [ sources."commander-2.20.3" ]; @@ -85814,7 +87473,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.1" + sources."tsconfig-paths-4.1.2" (sources."tsconfig-paths-webpack-plugin-4.0.0" // { dependencies = [ sources."chalk-4.1.2" @@ -85822,7 +87481,7 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."universalify-2.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" @@ -85885,7 +87544,7 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."ora-5.4.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" sources."signal-exit-3.0.7" @@ -85893,7 +87552,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.4.0" + sources."wasm-feature-detect-1.5.1" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.2.1" ]; @@ -85923,23 +87582,23 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.36" 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.18" + sources."@types/node-18.14.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -85981,7 +87640,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nanoid-3.3.4" sources."normalize-path-3.0.0" sources."object-hash-3.0.0" @@ -85991,7 +87650,7 @@ in sources."pify-2.3.0" sources."postcss-8.4.21" sources."postcss-import-14.1.0" - sources."postcss-js-4.0.0" + sources."postcss-js-4.0.1" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" sources."postcss-selector-parser-6.0.11" @@ -86005,16 +87664,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.4" + sources."tailwindcss-3.2.7" 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.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86047,23 +87706,23 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.36" 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.18" + sources."@types/node-18.14.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -86106,7 +87765,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mini-svg-data-uri-1.4.4" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nanoid-3.3.4" sources."normalize-path-3.0.0" sources."object-hash-3.0.0" @@ -86116,7 +87775,7 @@ in sources."pify-2.3.0" sources."postcss-8.4.21" sources."postcss-import-14.1.0" - sources."postcss-js-4.0.0" + sources."postcss-js-4.0.1" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" sources."postcss-selector-parser-6.0.11" @@ -86130,16 +87789,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.4" + sources."tailwindcss-3.2.7" 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.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86159,10 +87818,10 @@ in "@tailwindcss/language-server" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_language-server"; packageName = "@tailwindcss/language-server"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.10.tgz"; - sha512 = "4rG07stqhws4/UyRLbHDc+plmxDfTOH/w0sLGvK7LoQq4GaaN0Ov8vEqL60ef94am6pp/ZrjIB5qL6kG7DshHA=="; + url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.11.tgz"; + sha512 = "34E/guiYHdgCSlgyIKy68jmmPJQrMdCIj4Uth7Sgay+s9w4NFSqgnWmktty6oP+jQfhUXQ5o0mIYqzuIZVxazQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -86190,23 +87849,23 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.36" 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.18" + sources."@types/node-18.14.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -86248,7 +87907,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nanoid-3.3.4" sources."normalize-path-3.0.0" sources."object-hash-3.0.0" @@ -86258,7 +87917,7 @@ in sources."pify-2.3.0" sources."postcss-8.4.21" sources."postcss-import-14.1.0" - sources."postcss-js-4.0.0" + sources."postcss-js-4.0.1" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" sources."postcss-selector-parser-6.0.11" @@ -86272,16 +87931,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.4" + sources."tailwindcss-3.2.7" 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.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86314,23 +87973,23 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.36" 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.18" + sources."@types/node-18.14.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -86375,7 +88034,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nanoid-3.3.4" sources."normalize-path-3.0.0" sources."object-hash-3.0.0" @@ -86385,7 +88044,7 @@ in sources."pify-2.3.0" sources."postcss-8.4.21" sources."postcss-import-14.1.0" - sources."postcss-js-4.0.0" + sources."postcss-js-4.0.1" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" sources."postcss-selector-parser-6.0.10" @@ -86399,16 +88058,20 @@ 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.4" + (sources."tailwindcss-3.2.7" // { + dependencies = [ + sources."postcss-selector-parser-6.0.11" + ]; + }) 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.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -86428,10 +88091,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.1.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.1.1.tgz"; - sha512 = "uNKVXXJ/LTeUgdaoLg0bQr27ccVRZx6weD9H2UR0/pHkwb+vXptJB81LwPmvRldlaK7G35N2i/w2Mjqbz/Lakg=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.3.0.tgz"; + sha512 = "OPe2bdb4v+LPNZXKqke1RTBo8Nfkj8sOtlCTegxLEnSrgolrSsJbgB9IHEZm86Q99FRbFDgSUKTEv8YmKU07RQ=="; }; dependencies = [ sources."@redis/bloom-1.0.2" @@ -86445,15 +88108,16 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" + sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1296.0" + sources."aws-sdk-2.1324.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -86461,7 +88125,9 @@ in ]; }) sources."bintrees-1.0.2" + sources."bn.js-4.12.0" sources."body-parser-1.20.0" + sources."brorand-1.1.0" sources."buffer-4.9.2" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" @@ -86480,7 +88146,7 @@ in sources."common-tags-1.8.2" sources."connect-redis-6.1.3" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" @@ -86498,12 +88164,13 @@ in ]; }) sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" + sources."elliptic-6.5.4" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."escape-goat-3.0.0" @@ -86535,19 +88202,25 @@ 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.6" sources."graceful-fs-4.2.10" - sources."grant-4.7.0" + (sources."grant-5.4.21" // { + dependencies = [ + sources."cookie-signature-1.2.1" + ]; + }) sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hash.js-1.1.7" sources."helmet-4.6.0" - sources."http-cache-semantics-4.1.0" + sources."hmac-drbg-1.0.1" + 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" @@ -86562,15 +88235,18 @@ in sources."is-typed-array-1.1.10" sources."isarray-1.0.0" sources."jmespath-0.16.0" - sources."js-base64-3.7.4" + sources."js-base64-3.7.5" sources."json-buffer-3.0.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ + sources."jwa-1.4.1" + sources."jws-3.2.2" sources."semver-5.7.1" ]; }) - sources."jwa-1.4.1" - sources."jws-3.2.2" + sources."jwa-2.0.0" + sources."jwk-to-pem-2.0.5" + sources."jws-4.0.0" sources."keyv-4.5.2" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" @@ -86599,8 +88275,10 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" sources."moment-2.29.4" - sources."moment-timezone-0.5.40" + sources."moment-timezone-0.5.41" (sources."morgan-1.10.0" // { dependencies = [ sources."on-finished-2.3.0" @@ -86611,7 +88289,7 @@ in 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."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.3" sources."object-keys-1.1.1" @@ -86639,10 +88317,10 @@ in sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."redis-4.2.0" - sources."request-compose-1.2.3" - (sources."request-oauth-0.0.3" // { + sources."request-compose-2.1.6" + (sources."request-oauth-1.0.1" // { dependencies = [ - sources."uuid-3.4.0" + sources."uuid-8.3.2" ]; }) sources."requires-port-1.0.0" @@ -86665,7 +88343,7 @@ in sources."supports-color-7.2.0" sources."tdigest-0.1.2" sources."toidentifier-1.0.1" - sources."tus-js-client-3.0.1" + sources."tus-js-client-3.1.0" sources."type-is-1.6.18" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" @@ -86676,7 +88354,7 @@ in sources."util-0.12.5" sources."utils-merge-1.0.1" sources."uuid-8.0.0" - sources."validator-13.7.0" + sources."validator-13.9.0" sources."vary-1.1.2" sources."which-typed-array-1.1.9" sources."wrappy-1.0.2" @@ -86724,13 +88402,13 @@ in 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.10" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -86744,8 +88422,8 @@ in 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-create-class-features-plugin-7.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.0" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -86753,11 +88431,11 @@ in }) 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-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.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" @@ -86767,9 +88445,9 @@ in 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-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.21.0" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86780,12 +88458,12 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.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.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.20.7" + sources."@babel/plugin-proposal-class-static-block-7.21.0" 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" @@ -86794,9 +88472,9 @@ in sources."@babel/plugin-proposal-numeric-separator-7.18.6" 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.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.20.5" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" 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" @@ -86818,20 +88496,20 @@ in 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.11" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" 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" - sources."@babel/plugin-transform-flow-strip-types-7.19.0" - sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-flow-strip-types-7.21.0" + sources."@babel/plugin-transform-for-of-7.21.0" 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.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" 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.20.5" @@ -86846,7 +88524,7 @@ in 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.7" + sources."@babel/plugin-transform-typescript-7.21.0" 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" // { @@ -86856,29 +88534,31 @@ in }) sources."@babel/preset-flow-7.18.6" sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.18.6" - (sources."@babel/register-7.18.9" // { + sources."@babel/preset-typescript-7.21.0" + (sources."@babel/register-7.21.0" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.20.7" + sources."@babel/regjsgen-0.8.0" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.15" // { + (sources."@graphql-tools/mock-8.7.18" // { dependencies = [ - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - sources."@graphql-tools/utils-9.1.4" + sources."@graphql-tools/merge-8.3.18" + sources."@graphql-tools/schema-9.0.16" + sources."@graphql-tools/utils-9.2.1" sources."value-or-promise-1.0.12" ]; }) sources."@graphql-tools/schema-8.5.1" sources."@graphql-tools/utils-8.9.0" + sources."@graphql-typed-document-node/core-3.1.2" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@josephg/resolvable-1.0.1" @@ -86909,10 +88589,10 @@ in sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.1" + sources."@types/ejs-3.1.2" sources."@types/express-4.17.14" sources."@types/express-serve-static-core-4.17.31" - sources."@types/inquirer-8.2.5" + sources."@types/inquirer-8.2.6" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" @@ -86921,11 +88601,11 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/through-0.0.30" sources."@vue/cli-shared-utils-5.0.8" (sources."@vue/cli-ui-5.0.8" // { @@ -86935,10 +88615,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.45" - sources."@vue/compiler-dom-3.2.45" + sources."@vue/compiler-core-3.2.47" + sources."@vue/compiler-dom-3.2.47" sources."@vue/compiler-sfc-2.7.14" - sources."@vue/shared-3.2.45" + sources."@vue/shared-3.2.47" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -86998,7 +88678,7 @@ in }) sources."base64-js-1.5.1" sources."bl-4.1.0" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" sources."iconv-lite-0.4.24" @@ -87011,7 +88691,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -87030,7 +88710,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -87074,12 +88754,12 @@ in ]; }) sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.29.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -87123,7 +88803,7 @@ in sources."pify-2.3.0" ]; }) - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."define-property-2.0.2" @@ -87140,7 +88820,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -87179,7 +88859,10 @@ in }) (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."debug-2.6.9" + sources."iconv-lite-0.4.24" + sources."raw-body-2.5.1" ]; }) sources."express-history-api-fallback-2.2.1" @@ -87248,14 +88931,14 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.197.0" + sources."flow-parser-0.200.1" sources."for-in-1.0.2" 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."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -87267,7 +88950,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" @@ -87360,7 +89043,7 @@ in ]; }) sources."javascript-stringify-2.1.0" - sources."joi-17.7.0" + sources."joi-17.8.3" sources."js-message-1.0.7" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -87419,7 +89102,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -87433,9 +89116,9 @@ 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.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."node-notifier-10.0.1" // { dependencies = [ @@ -87443,7 +89126,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -87476,7 +89159,7 @@ in sources."on-finished-2.4.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-0.4.1" @@ -87551,21 +89234,20 @@ in sources."query-string-5.1.1" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { + (sources."raw-body-2.5.2" // { dependencies = [ sources."iconv-lite-0.4.24" ]; }) sources."read-pkg-5.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."recast-0.20.5" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" - sources."regexpu-core-5.2.2" - sources."regjsgen-0.7.1" + sources."regexpu-core-5.3.1" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -87617,7 +89299,7 @@ in sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."shellwords-0.1.1" sources."shortid-2.2.16" sources."side-channel-1.0.4" @@ -87700,7 +89382,7 @@ in (sources."tar-stream-1.6.2" // { dependencies = [ sources."bl-1.2.3" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -87740,7 +89422,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" @@ -87951,13 +89633,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.21.1" 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.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/types-7.20.7" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -88038,8 +89720,12 @@ 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-6.1.1" - sources."@npmcli/map-workspaces-3.0.1" + sources."@npmcli/config-6.1.3" + (sources."@npmcli/map-workspaces-3.0.2" // { + dependencies = [ + sources."minimatch-6.2.0" + ]; + }) sources."@npmcli/name-from-folder-2.0.0" sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" @@ -88057,12 +89743,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.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -88085,7 +89771,7 @@ in sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.8" sources."camelcase-7.0.1" (sources."camelcase-keys-8.0.2" // { dependencies = [ @@ -88098,14 +89784,14 @@ in sources."character-entities-html4-2.1.0" sources."character-entities-legacy-3.0.0" sources."character-reference-invalid-2.0.1" - sources."ci-info-3.7.1" + sources."ci-info-3.8.0" sources."cli-boxes-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."comma-separated-tokens-2.0.3" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."string_decoder-1.3.0" ]; }) @@ -88148,8 +89834,8 @@ 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" @@ -88175,7 +89861,7 @@ in sources."has-flag-3.0.0" sources."has-yarn-3.0.0" sources."hast-util-embedded-2.0.1" - sources."hast-util-from-parse5-7.1.1" + sources."hast-util-from-parse5-7.1.2" sources."hast-util-has-property-2.0.1" sources."hast-util-is-body-ok-link-2.0.0" sources."hast-util-is-element-2.1.3" @@ -88186,7 +89872,7 @@ in 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."http-cache-semantics-4.1.1" (sources."http2-wrapper-2.2.0" // { dependencies = [ sources."quick-lru-5.1.1" @@ -88228,39 +89914,39 @@ in sources."limit-spawn-0.0.3" sources."lines-and-columns-1.2.4" sources."load-plugin-5.1.0" - sources."locate-path-7.1.1" + sources."locate-path-7.2.0" sources."longest-streak-3.1.0" sources."lowercase-keys-3.0.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-table-3.0.3" - sources."mdast-comment-marker-2.1.0" - (sources."mdast-util-find-and-replace-2.2.1" // { + 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-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-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-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-phrasing-3.0.0" + sources."mdast-util-from-markdown-1.3.0" + sources."mdast-util-frontmatter-1.0.1" + sources."mdast-util-gfm-2.0.2" + sources."mdast-util-gfm-autolink-literal-1.0.3" + sources."mdast-util-gfm-footnote-1.0.2" + sources."mdast-util-gfm-strikethrough-1.0.3" + sources."mdast-util-gfm-table-1.0.7" + sources."mdast-util-gfm-task-list-item-1.0.2" + sources."mdast-util-mdx-2.0.1" + sources."mdast-util-mdx-expression-1.3.2" + sources."mdast-util-mdx-jsx-2.1.2" + sources."mdast-util-mdxjs-esm-1.3.1" + sources."mdast-util-phrasing-3.0.1" sources."mdast-util-to-markdown-1.5.0" sources."mdast-util-to-nlcst-5.2.1" - sources."mdast-util-to-string-3.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" - sources."micromark-extension-frontmatter-1.0.0" + sources."micromark-extension-frontmatter-1.0.1" sources."micromark-extension-gfm-2.0.1" sources."micromark-extension-gfm-autolink-literal-1.0.3" sources."micromark-extension-gfm-footnote-1.0.4" @@ -88268,14 +89954,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" @@ -88286,7 +89972,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" @@ -88297,14 +89983,14 @@ in sources."mimic-response-4.0.0" sources."min-indent-1.0.1" sources."minimatch-5.1.6" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.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."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-8.0.0" @@ -88320,12 +90006,12 @@ in sources."nlcst-to-string-2.0.4" ]; }) - sources."parse-entities-4.0.0" + sources."parse-entities-4.0.1" sources."parse-json-5.2.0" (sources."parse-latin-5.0.1" // { dependencies = [ - sources."unist-util-modify-children-3.1.0" - sources."unist-util-visit-children-2.0.1" + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" ]; }) sources."parse5-6.0.1" @@ -88430,10 +90116,10 @@ in sources."xtend-4.0.2" ]; }) - sources."to-vfile-7.2.3" + sources."to-vfile-7.2.4" sources."trim-newlines-4.0.2" sources."trough-2.1.0" - sources."type-fest-3.5.2" + sources."type-fest-3.6.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.1" @@ -88457,20 +90143,20 @@ in ]; }) sources."unique-string-3.0.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-is-5.1.1" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.1" (sources."unist-util-modify-children-2.0.0" // { dependencies = [ sources."array-iterate-1.1.4" ]; }) - sources."unist-util-position-4.0.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-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.2.0" @@ -88479,21 +90165,21 @@ in sources."util-deprecate-1.0.2" sources."uvu-0.5.6" sources."validate-npm-package-license-3.0.4" - sources."vfile-5.3.6" - sources."vfile-find-up-6.0.0" - sources."vfile-location-4.0.1" - sources."vfile-message-3.1.3" - (sources."vfile-reporter-7.0.4" // { + sources."vfile-5.3.7" + sources."vfile-find-up-6.1.0" + sources."vfile-location-4.1.0" + sources."vfile-message-3.1.4" + (sources."vfile-reporter-7.0.5" // { dependencies = [ sources."supports-color-9.3.1" ]; }) - sources."vfile-sort-3.0.0" - sources."vfile-statistics-2.0.0" + sources."vfile-sort-3.0.1" + sources."vfile-statistics-2.0.1" 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" @@ -88531,30 +90217,30 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { 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-function-name-7.21.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-module-transforms-7.21.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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -88567,8 +90253,8 @@ in sources."async-3.2.4" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001445" + sources."browserslist-4.21.5" + sources."caniuse-lite-1.0.30001458" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -88578,7 +90264,7 @@ in sources."convert-source-map-1.9.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -88637,7 +90323,7 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -88711,7 +90397,7 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookies-0.8.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -88814,7 +90500,7 @@ in sources."path-to-regexp-1.8.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."require-directory-2.1.1" @@ -88856,7 +90542,7 @@ in ]; }) sources."y18n-5.0.8" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" sources."ylru-1.3.2" ]; @@ -88881,7 +90567,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -88927,7 +90613,7 @@ in sources."inherits-2.0.4" sources."isstream-0.1.2" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."once-1.4.0" (sources."optimist-0.6.1" // { @@ -88965,13 +90651,13 @@ in sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; }; dependencies = [ - sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001445" - sources."electron-to-chromium-1.4.284" + sources."browserslist-4.21.5" + sources."caniuse-lite-1.0.30001458" + sources."electron-to-chromium-1.4.313" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.4" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" sources."postcss-8.4.21" @@ -89003,9 +90689,9 @@ in sources."handlebars-4.7.7" sources."iconv-lite-0.6.3" sources."lru-cache-6.0.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."neo-async-2.6.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."parse-github-url-1.0.2" sources."safer-buffer-2.1.2" sources."semver-7.3.8" @@ -89030,16 +90716,16 @@ in aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.6.0.tgz"; - sha512 = "mdmR7H1P1Cqw91X5jIgiUjayvtMZAhepS/sJVLlYGsA36If1SihPQl661sJFxP7nkgTkqom4km1I+WG4m2mzsQ=="; + url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.6.1.tgz"; + sha512 = "wIUVyYY5XNksGeRJZjDKW6kQ17lUzCMsfKh2o9O8kYjfxvNF7DA+6iWX8m4eq8eVMjnEFIzxoq5yWLn4qFYcGg=="; }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/yauzl-2.10.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -89047,7 +90733,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1324.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -89128,7 +90814,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" @@ -89198,8 +90884,8 @@ in sources."punycode-1.3.2" sources."puppeteer-13.7.0" sources."querystring-0.2.0" - sources."raw-body-2.5.1" - sources."readable-stream-3.6.0" + sources."raw-body-2.5.2" + sources."readable-stream-3.6.1" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" @@ -89228,7 +90914,7 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" (sources."unbzip2-stream-1.4.3" // { @@ -89243,7 +90929,7 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -89271,10 +90957,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.60.0"; + version = "2.66.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.60.0.tgz"; - sha512 = "/kO8KGuJVCnkhnR+SmDHsAaaqmaTR6Vp/kpryohsBfKh/ZdOH1oKpviMiz167K6tUdin7x95Wjz/GZAfeiKPKg=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.66.1.tgz"; + sha512 = "exm97/VOH6yZPN2is3UC0acc6KF56AANvCg2gAEhyu6dPBueKxNCzrvsjNg/vmXrA8HqJ2jYJMg88YRNaUfylA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -89292,10 +90978,10 @@ in awesome-lint = nodeEnv.buildNodePackage { name = "awesome-lint"; packageName = "awesome-lint"; - version = "0.18.1"; + version = "0.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.1.tgz"; - sha512 = "BH2O+hQsUvsStpHvQeSsXHFZ27CqA0JPxu0w8y8bVW5y1hx5BdcGjxAdz+OyjlIns0Iqih44oGQ6XVrkIkAP4g=="; + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.2.tgz"; + sha512 = "SvGJTHprAqu/zjFzdTR78ASdJYWVlcLhkI3WehydUcQOq/RdqxF367R32KK3PTM2nPmJqtBEuxuuux1konWeCw=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -89412,7 +91098,7 @@ 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.4" sources."indent-string-4.0.0" @@ -89420,7 +91106,7 @@ in 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" @@ -89528,7 +91214,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-3.0.0" sources."remark-13.0.0" sources."remark-lint-8.0.0" @@ -89710,10 +91396,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.21.0"; + version = "13.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.21.0.tgz"; - sha512 = "4y0t3tAZiAMqRpyw0Yc8EbbRlikIpJRSKkcbi/0i3QcNg85FYaMeL7f2+BxfkMWzTjmN6XA4WWaPgqTV7W69eg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.27.0.tgz"; + sha512 = "SQD/KN2kNHKW3CfDDEMnmbt6i07Y3Wb8s6L8Y+PvvHxmimoJ/tzKz3yBOIGimCfatAk7bw+SmgNzJyozzYZaEA=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -89739,10 +91425,12 @@ in }) sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@grammyjs/types-2.11.2" + sources."@grammyjs/types-2.12.1" 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" @@ -89755,20 +91443,22 @@ 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.15" - sources."@types/express-serve-static-core-4.17.32" + 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.18" + sources."@types/node-18.14.2" 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/serve-static-1.15.1" sources."@types/tough-cookie-4.0.2" - sources."@types/ws-8.5.3" + sources."@types/triple-beam-1.3.2" + sources."@types/ws-8.5.4" sources."abort-controller-3.0.0" sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { @@ -89802,7 +91492,7 @@ in sources."bitcoinjs-lib-6.1.0" (sources."bl-5.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-3.7.2" @@ -89811,7 +91501,7 @@ in sources."bolt01-1.2.6" sources."bolt03-1.2.15" sources."bolt07-1.8.3" - sources."bolt09-0.2.4" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."buffer-6.0.3" @@ -89842,21 +91532,20 @@ 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 = [ sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."crypto-js-4.1.1" - sources."csv-parse-5.3.3" + sources."csv-parse-5.3.5" sources."debug-2.6.9" sources."defaults-1.0.4" sources."define-property-1.0.0" @@ -89900,9 +91589,14 @@ 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-12.0.2" - (sources."grammy-1.13.1" // { + sources."get-intrinsic-1.2.0" + (sources."goldengate-12.0.2" // { + dependencies = [ + sources."ln-service-54.9.0" + sources."ln-sync-4.2.0" + ]; + }) + (sources."grammy-1.14.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -89918,7 +91612,7 @@ in sources."has-unicode-2.0.1" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" ]; }) @@ -89947,15 +91641,10 @@ in sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."tmp-0.0.33" - sources."wrap-ansi-8.0.1" - ]; - }) - (sources."invoices-2.2.2" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - sources."bolt07-1.8.2" + sources."wrap-ansi-8.1.0" ]; }) + sources."invoices-2.2.3" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -89974,80 +91663,47 @@ 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.6" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lightning-6.8.0" // { + (sources."lightning-7.0.3" // { dependencies = [ - sources."@grpc/grpc-js-1.8.0" - sources."@types/node-18.11.16" - sources."asyncjs-util-1.2.10" - sources."bolt07-1.8.2" - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - sources."type-fest-3.4.0" + sources."@grpc/grpc-js-1.8.1" + sources."@types/node-18.11.18" ]; }) - (sources."ln-accounting-6.1.2" // { + (sources."ln-accounting-6.1.3" // { dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."bolt07-1.8.2" - sources."goldengate-12.0.1" - (sources."ln-sync-4.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.10" - sources."ln-service-54.8.0" - ]; - }) - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) + sources."ln-service-54.9.0" ]; }) - (sources."ln-service-54.9.0" // { + (sources."ln-service-54.10.0" // { dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."@types/ws-8.5.4" - sources."bolt09-0.2.5" - sources."invoices-2.2.3" - sources."lightning-7.0.3" - sources."type-fest-3.5.1" + sources."@grpc/grpc-js-1.8.9" + sources."@grpc/proto-loader-0.7.5" + sources."@types/express-4.17.17" + sources."@types/node-18.13.0" + sources."lightning-7.1.0" + sources."type-fest-3.6.0" + sources."ws-8.12.1" ]; }) - sources."ln-sync-4.2.0" - (sources."ln-telegram-4.6.0" // { + (sources."ln-sync-4.3.0" // { + dependencies = [ + sources."ln-service-54.9.0" + ]; + }) + (sources."ln-telegram-4.6.1" // { dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."bolt09-0.2.5" sources."debug-4.3.4" - (sources."goldengate-12.0.1" // { + sources."grammy-1.13.1" + sources."ln-service-54.9.0" + sources."ms-2.1.2" + (sources."paid-services-4.3.0" // { dependencies = [ - sources."bolt07-1.8.2" - (sources."ln-sync-4.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.10" - sources."ln-service-54.8.0" - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - ]; - }) + sources."ln-sync-4.2.0" ]; }) - sources."grammy-1.13.0" - sources."invoices-2.2.3" - sources."ln-sync-4.1.1" - sources."ms-2.1.2" - sources."paid-services-4.2.1" ]; }) sources."lodash-4.17.21" @@ -90064,7 +91720,7 @@ in sources."chalk-5.2.0" ]; }) - (sources."logform-2.4.2" // { + (sources."logform-2.5.1" // { dependencies = [ sources."ms-2.1.3" ]; @@ -90092,7 +91748,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."negotiator-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."nofilter-3.1.0" sources."npmlog-2.0.4" @@ -90116,33 +91772,36 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p2tr-1.3.3" - (sources."paid-services-4.3.0" // { + (sources."paid-services-4.3.3" // { dependencies = [ - sources."bolt09-0.2.5" - sources."invoices-2.2.3" + sources."ln-service-54.9.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.1" + (sources."probing-3.0.1" // { + dependencies = [ + sources."ln-service-54.9.0" + ]; + }) sources."process-nextick-args-2.0.1" - (sources."protobufjs-7.1.2" // { + (sources."protobufjs-7.2.2" // { dependencies = [ sources."long-5.2.1" ]; }) sources."proxy-addr-2.0.7" sources."psbt-2.7.2" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-terminal-0.12.0" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."restore-cursor-1.0.1" @@ -90207,10 +91866,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-3.5.2" + sources."type-fest-3.5.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" @@ -90230,12 +91889,12 @@ in sources."window-size-1.1.1" (sources."winston-3.7.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."wrap-ansi-7.0.0" // { @@ -90263,10 +91922,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.5.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.5.0.tgz"; - sha512 = "Vnq+3KScmrj6MYujzUhiZ4DJDMI/Pyc5EC2gxi1bIW8Qg+ASlOeUnm485/3Q6Ro3jNf+T6E9opQFbh6O606xfg=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.7.0.tgz"; + sha512 = "JLe8bk0/FtOiGIdFWg/2JoAGJctYQyrYpmj24dhCSEAjIq9HHqr9I6L9k32fh9WkWjHcrh6v70Epiv6m+SxvDQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -90286,7 +91945,7 @@ in sources."is-number-7.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" @@ -90295,7 +91954,6 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."turndown-7.1.1" - sources."urijs-1.19.11" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -90304,7 +91962,7 @@ in sources."web-tree-sitter-0.20.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."zod-3.20.2" + sources."zod-3.20.5" ]; buildInputs = globalBuildInputs; meta = { @@ -90316,6 +91974,24 @@ in bypassCache = true; reconstructLock = true; }; + bibtex-tidy = nodeEnv.buildNodePackage { + name = "bibtex-tidy"; + packageName = "bibtex-tidy"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bibtex-tidy/-/bibtex-tidy-1.8.5.tgz"; + sha512 = "dOcnSb/fn2q3T8rDHLBepPFPBcvWJQJuZthBQgXqMx95+DQOnRDvkjhbeDu9wKItR0lJ4xb5bcHwfiGYWryXpQ=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Tidy bibtex files"; + homepage = "https://github.com/FlamingTempura/bibtex-tidy"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; @@ -90405,7 +92081,7 @@ in sources."meow-3.7.0" sources."mime-db-1.52.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."natives-1.1.6" @@ -90506,7 +92182,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."browserify-zlib-0.2.0" @@ -90556,7 +92232,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" @@ -90564,7 +92240,7 @@ in sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."hash.js-1.1.7" @@ -90595,7 +92271,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" @@ -90622,7 +92298,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -90634,18 +92310,18 @@ in sources."safer-buffer-2.1.2" sources."sha.js-2.4.11" sources."shasum-object-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."simple-concat-1.0.1" sources."source-map-0.5.7" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-combiner2-1.1.1" (sources."stream-http-3.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-splicer-2.0.1" @@ -90685,19 +92361,19 @@ in browser-sync = nodeEnv.buildNodePackage { name = "browser-sync"; packageName = "browser-sync"; - version = "2.27.11"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.11.tgz"; - sha512 = "U5f9u97OYJH66T0MGWWzG9rOQTW6ZmDMj97vsmtqwNS03JAwdLVES8eel2lD3rvAqQCNAFqaJ74NMacBI57vJg=="; + url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.28.1.tgz"; + sha512 = "XAd+jULGQ6TSdxA8ABnK6E0r4HHClnZn/p11sHOQ9dr5Qn4ay8TsrEkNUOiWlJOgLuf49QxlkwpqS7BvfGdCpQ=="; }; dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."accepts-1.3.8" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."async-2.6.4" sources."async-each-series-0.1.1" @@ -90708,21 +92384,16 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browser-sync-client-2.27.11" - sources."browser-sync-ui-2.27.11" + sources."browser-sync-client-2.28.1" + sources."browser-sync-ui-2.28.1" 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."chalk-4.1.2" sources."chokidar-3.5.3" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-2.20.3" @@ -90740,18 +92411,16 @@ in sources."depd-2.0.0" sources."destroy-1.0.4" sources."dev-ip-1.0.1" - sources."dlv-1.1.3" sources."easy-extender-2.3.4" - sources."eazy-logger-3.1.0" + sources."eazy-logger-4.0.0" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."engine.io-6.2.1" - sources."engine.io-client-6.2.3" + sources."engine.io-6.4.1" + sources."engine.io-client-6.4.0" 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" sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."fill-range-7.0.1" @@ -90767,11 +92436,11 @@ 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-parent-5.1.2" sources."graceful-fs-4.2.10" sources."has-1.0.3" - sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.3" (sources."http-errors-2.0.0" // { dependencies = [ @@ -90819,7 +92488,7 @@ in sources."portscanner-2.2.0" sources."qs-6.11.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."requires-port-1.0.0" @@ -90858,46 +92527,32 @@ in sources."server-destroy-1.0.1" sources."setprototypeof-1.2.0" 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.4" - sources."socket.io-parser-4.2.1" + sources."socket.io-4.6.1" + sources."socket.io-adapter-2.5.2" + sources."socket.io-client-4.6.1" + sources."socket.io-parser-4.2.2" sources."statuses-1.3.1" sources."stream-throttle-0.1.3" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."supports-color-7.2.0" sources."symbol-observable-1.0.1" - sources."tfunk-4.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."typescript-4.9.4" - sources."ua-parser-js-1.0.2" + sources."typescript-4.9.5" + sources."ua-parser-js-1.0.33" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" sources."vary-1.1.2" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."strip-ansi-6.0.1" - ]; - }) - sources."ws-8.2.3" + sources."wrap-ansi-7.0.0" + sources."ws-8.11.0" sources."xmlhttprequest-ssl-2.0.0" sources."y18n-5.0.8" - (sources."yargs-17.6.2" // { + (sources."yargs-17.7.1" // { dependencies = [ - sources."ansi-regex-5.0.1" sources."cliui-8.0.1" - sources."strip-ansi-6.0.1" sources."yargs-parser-21.1.1" ]; }) @@ -90926,8 +92581,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.7" - sources."@babel/types-7.20.7" + sources."@babel/parser-7.21.2" + sources."@babel/types-7.21.2" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@popperjs/core-2.11.6" @@ -90971,7 +92626,7 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -91011,7 +92666,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" @@ -91072,8 +92727,10 @@ in sources."event-loop-stats-1.4.1" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."cookie-0.5.0" sources."debug-2.6.9" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -91103,7 +92760,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" @@ -91182,7 +92839,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.0" sources."mkdirp-0.5.6" sources."moment-2.29.4" @@ -91236,7 +92893,7 @@ in sources."pug-runtime-3.0.1" sources."pug-strip-comments-2.0.0" sources."pug-walk-2.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-1.5.1" sources."qs-6.11.0" @@ -91244,7 +92901,7 @@ in sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" (sources."read-pkg-5.2.0" // { dependencies = [ sources."hosted-git-info-2.8.9" @@ -91258,7 +92915,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-3.0.0" sources."redis-3.1.2" sources."redis-commands-1.7.0" @@ -91393,7 +93050,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.18" + sources."@types/node-18.14.2" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -91460,7 +93117,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."string_decoder-1.3.0" ]; }) @@ -91579,7 +93236,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.3.5" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -91646,7 +93303,7 @@ in sources."once-1.2.0" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qap-3.3.1" sources."qs-6.5.3" sources."query-string-1.0.1" @@ -91698,7 +93355,7 @@ in (sources."simple-peer-6.4.4" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -91707,7 +93364,7 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" (sources."ws-2.3.1" // { @@ -92130,7 +93787,7 @@ in sources."mimic-fn-1.2.0" sources."min-document-2.19.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -92212,11 +93869,11 @@ in }) sources."query-string-6.14.1" sources."quick-lru-1.1.0" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."redent-2.0.0" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" @@ -92332,7 +93989,7 @@ in sources."terminal-image-0.1.2" sources."through-2.3.8" sources."timed-out-4.0.1" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -92489,14 +94146,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.109"; + version = "2.1.145"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.109.tgz"; - sha512 = "ebHJcPSosOi62963Roe3HB05ibu4bj2HXdFnWBbbiQB9JQtmJCfE8Ml2wmi9U1e5LMvw7xwh6NiRM/2U0I8gkg=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.145.tgz"; + sha512 = "l8gSezQ5uUFGPUQykz+A3l5WqlbQ6RPJ/0chP7qDyv/jH6ObnT5r4aWzObrfig1BWW0RFFAuryPJoiZiyeoKNQ=="; }; dependencies = [ - sources."@jsii/check-node-1.73.0" - sources."@jsii/spec-1.73.0" + sources."@jsii/check-node-1.76.0" + sources."@jsii/spec-1.76.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -92510,12 +94167,12 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.6.22" - sources."cdk8s-plus-25-2.3.27" + sources."cdk8s-2.7.14" + sources."cdk8s-plus-25-2.4.37" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.73.0" // { + (sources."codemaker-1.76.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -92524,7 +94181,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.223" + sources."constructs-10.1.263" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -92555,57 +94212,57 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - (sources."jsii-1.73.0" // { + (sources."jsii-1.76.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.73.0" // { + (sources."jsii-pacmak-1.76.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.73.0" // { + (sources."jsii-reflect-1.76.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.73.0" // { + (sources."jsii-rosetta-1.76.0" // { dependencies = [ sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.797" // { + (sources."jsii-srcmak-0.1.838" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.247" + sources."json2jsii-0.3.290" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" - sources."log4js-6.7.1" + sources."log4js-6.8.0" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."oo-ascii-tree-1.73.0" + sources."oo-ascii-tree-1.76.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.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -92625,24 +94282,24 @@ in sources."sort-json-2.0.1" sources."spdx-license-list-6.6.0" sources."sscaff-1.2.274" - sources."streamroller-3.1.4" + sources."streamroller-3.1.5" 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.1" + sources."workerpool-6.4.0" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.0.0-11" + sources."yaml-2.2.1" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -92658,6 +94315,7 @@ in buildInputs = globalBuildInputs; meta = { description = "This is the command line tool for Cloud Development Kit (CDK) for Kubernetes (cdk8s)."; + homepage = "https://github.com/cdk8s-team/cdk8s-cli#readme"; license = "Apache-2.0"; }; production = true; @@ -92667,32 +94325,32 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.15.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.0.tgz"; - sha512 = "wPVkiuoId7u1Jy1C1d+D4ktfQde5GfHkZBMppmkO/daZXsI2kH7yIFZpJ81/0k9hNRHvoK1d0/gDMMywqwWcmg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.5.tgz"; + sha512 = "FofWVVT/2oANEvtk91yWSlgelxJWQfXglvVBRgN1AJHTArQf54slJAROsk4m74cAF5Da8IizG5HiSuSHpjKvuA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.21.1" 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.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/types-7.20.7" - sources."@cdktf/cli-core-0.15.0" - sources."@cdktf/commons-0.15.0" - sources."@cdktf/hcl2cdk-0.15.0" - sources."@cdktf/hcl2json-0.15.0" + sources."@babel/types-7.21.2" + sources."@cdktf/cli-core-0.15.5" + sources."@cdktf/commons-0.15.5" + sources."@cdktf/hcl2cdk-0.15.5" + sources."@cdktf/hcl2json-0.15.5" sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" - sources."@cdktf/provider-generator-0.15.0" + sources."@cdktf/provider-generator-0.15.5" 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.73.0" // { + (sources."@jsii/check-node-1.76.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -92702,7 +94360,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.73.0" + sources."@jsii/spec-1.76.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -92713,10 +94371,9 @@ in sources."@sentry/node-6.19.7" sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" - sources."@types/node-18.11.18" - sources."@types/node-fetch-2.6.2" + sources."@types/node-14.18.33" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.28" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.6" @@ -92731,7 +94388,6 @@ in sources."ansi-styles-3.2.1" sources."arr-rotate-1.0.0" sources."astral-regex-2.0.0" - sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" @@ -92743,7 +94399,7 @@ in sources."bufferutil-4.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.15.0" + sources."cdktf-0.15.5" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -92753,7 +94409,7 @@ in sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.73.0" // { + (sources."codemaker-1.76.0" // { dependencies = [ sources."decamelize-5.0.1" sources."fs-extra-10.1.0" @@ -92763,10 +94419,9 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.223" + sources."constructs-10.1.263" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -92776,8 +94431,7 @@ in 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."deepmerge-4.3.0" sources."detect-indent-5.0.0" sources."detect-libc-2.0.1" sources."detect-newline-2.1.0" @@ -92797,7 +94451,6 @@ in 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" @@ -92845,7 +94498,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.73.0" // { + (sources."jsii-1.76.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -92863,7 +94516,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.73.0" // { + (sources."jsii-pacmak-1.76.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -92879,7 +94532,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.73.0" // { + (sources."jsii-reflect-1.76.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -92897,7 +94550,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.73.0" // { + (sources."jsii-rosetta-1.76.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -92909,7 +94562,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.797" // { + (sources."jsii-srcmak-0.1.838" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -92922,15 +94575,13 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" - sources."log4js-6.7.1" + sources."log4js-6.8.0" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" sources."lru_map-0.3.3" sources."mdurl-1.0.1" 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-3.1.0" (sources."minimatch-5.1.6" // { @@ -92938,22 +94589,22 @@ in sources."brace-expansion-2.0.1" ]; }) - sources."minimist-1.2.7" + sources."minimist-1.2.8" 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-abi-3.31.0" - sources."node-abort-controller-3.0.1" - sources."node-fetch-2.6.8" + sources."node-abi-3.33.0" + sources."node-abort-controller-3.1.1" + sources."node-fetch-2.6.9" 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.73.0" + sources."oo-ascii-tree-1.76.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -92963,15 +94614,15 @@ in sources."path-key-3.1.1" sources."picomatch-2.3.1" sources."prebuild-install-7.1.1" - sources."prettier-2.8.3" + sources."prettier-2.8.4" sources."pump-3.0.0" - sources."punycode-2.2.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.27.1" + sources."react-devtools-core-4.27.2" sources."react-reconciler-0.26.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" @@ -92993,7 +94644,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" @@ -93011,7 +94662,7 @@ in sources."escape-string-regexp-2.0.0" ]; }) - sources."streamroller-3.1.4" + sources."streamroller-3.1.5" sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."string_decoder-1.3.0" @@ -93037,7 +94688,7 @@ in sources."which-2.0.2" sources."which-module-2.0.0" sources."widest-line-3.1.0" - sources."workerpool-6.3.1" + sources."workerpool-6.4.0" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93049,10 +94700,10 @@ in sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" - sources."xstate-4.35.2" + sources."xstate-4.37.0" sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-17.6.2" // { + (sources."yargs-17.7.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-8.0.1" @@ -93084,10 +94735,10 @@ 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.3" @@ -93096,7 +94747,7 @@ in 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" @@ -93272,7 +94923,7 @@ in sources."mute-stream-0.0.8" sources."node-fetch-1.7.3" sources."prompt-1.3.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."query-string-6.14.1" sources."read-1.0.7" sources."revalidator-0.1.8" @@ -93305,10 +94956,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.27.0"; + version = "0.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.27.0.tgz"; - sha512 = "XNV8x2adzhenq9uh5rBRsCYvfUiLQJ3mEtj5kKgwxIDa9+kDEEfl/CVDXnx0lM2aa2f845cWCxfL9XNCejOwDQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.28.0.tgz"; + sha512 = "oTltDkfXQ2PEwameTTo6yzDL23M+YXWrw/Clci5A/1ugBnfVLE05iIjRMMjSlJXsbl/90S7wcIzJeO+PlsgA6w=="; }; buildInputs = globalBuildInputs; meta = { @@ -93358,10 +95009,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.7"; + version = "0.23.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.7.tgz"; - sha512 = "CRFEcusfy8ATbYswZV2205Et/qjfe82KvJunQnLL8VlhKkymwgrfbgMZCTr35WPX0Dv3PItUSZZYq91LcYIm6w=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.9.tgz"; + sha512 = "vfBZoEiPJeA7X8ZYYgquywFIsiMNIc0eYEfgcdLinDPs7fDftgBS9Y58ngUIl4vtm18lTTUIPeFazyy2P9fSTQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93376,31 +95027,31 @@ in coc-docker = nodeEnv.buildNodePackage { name = "coc-docker"; packageName = "coc-docker"; - version = "0.5.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-docker/-/coc-docker-0.5.0.tgz"; - sha512 = "ivLkxcmRgvb1yjYxNqm+kZvjqvKpUEzLOAubwFADY+NDb+rpojnz1jqirJgPztNeqdd12/vcszd5GX4ISUxjlA=="; + url = "https://registry.npmjs.org/coc-docker/-/coc-docker-1.0.2.tgz"; + sha512 = "6As7Y7yhU0aI5UwI/QOuJzmAluoDMUcOcNg0yJZOMsnpjw9ezrPdNMIo+vRImXp1V/STU0j27CztwnH8vofOQQ=="; }; dependencies = [ - sources."dockerfile-ast-0.1.0" - 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."vscode-jsonrpc-8.0.2" - (sources."vscode-languageserver-7.0.0" // { + sources."dockerfile-ast-0.4.2" + sources."dockerfile-language-server-nodejs-0.9.0" + sources."dockerfile-language-service-0.9.0" + sources."dockerfile-utils-0.10.0" + sources."tslib-2.5.0" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + (sources."vscode-languageserver-protocol-3.17.3" // { dependencies = [ - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-types-3.16.0" + sources."vscode-languageserver-types-3.17.3" ]; }) - sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-textdocument-1.0.9" + sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; meta = { description = "docker extension for coc"; + homepage = "https://github.com/josa42/coc-docker#readme"; license = "MIT"; }; production = true; @@ -93419,7 +95070,7 @@ in sources."@emmetio/extract-abbreviation-0.1.6" sources."jsonc-parser-1.0.3" sources."vscode-emmet-helper-1.2.17" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" ]; buildInputs = globalBuildInputs; meta = { @@ -93451,10 +95102,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.26.1"; + version = "0.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.1.tgz"; - sha512 = "L2qnieIfAu4Eqv6+1Cir4vO0E8AI8/8Meqc5GsYdwEiblMRGmB8XnIJoIYY7RhdS4jztw25EmLfBcj11q0JTRQ=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.26.3.tgz"; + sha512 = "6+Bo47fjBra0G3ESYfBwEcxEuvVK92h/tbYMxiImm3idveWl6InmiAZm2cqHc9vbjm5i1iNrca6b7EdHdPDArA=="; }; dependencies = [ sources."@sindresorhus/chunkify-0.2.0" @@ -93512,7 +95163,7 @@ in sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."strip-final-newline-2.0.0" - sources."trash-8.1.0" + sources."trash-8.1.1" sources."user-home-2.0.0" sources."uuid-8.3.2" sources."which-2.0.2" @@ -93550,10 +95201,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.0.tgz"; - sha512 = "1Xo6++/ml/ozfBi2ubDXPVz49I1ewI5v8tZysn/Rz3/PojQuOcroXs48aqYx8rPADt7zSXAVGs+uN9lAkLgrLA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.1.tgz"; + sha512 = "GUkltYI/RTAx3vUIb+lQuEoF96ByfliYokoqM/Gn4hMRtl0IE/XaxqRj71byaj9eO1boSGzqMQtpx8ju1xhWuQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93568,21 +95219,22 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.0"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.0.tgz"; - sha512 = "Oh3ea/gb0lU5qZN1qaQMAQhxscrgcYfB3ZuRWxi+tMLCjoi8gJg/g05C5zD6hfbgmhC1PsL7jPeWSe5F4MifLg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.7.tgz"; + sha512 = "gs5BZQUNxFRmff8qMg9ISat86tU9oOrmrEMDGUhr51c4HSbToGQfa3ihrcOorRydw8HwYchKvpIYrrcq/bUihQ=="; }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-uri-3.0.7" - sources."which-2.0.2" + sources."which-3.0.0" ]; buildInputs = globalBuildInputs; meta = { description = "gopls extension for coc"; + homepage = "https://github.com/josa42/coc-go#readme"; license = "MIT"; }; production = true; @@ -93633,7 +95285,7 @@ in sha512 = "NXmTfHF/TxysUeSstDyLUcfv6LlK08PnltVZCe1J7XpG/QHRRq0sjhkNqkHJVfFT/Vo2NC4lv5Bc9UIWdjGGuw=="; }; dependencies = [ - sources."typescript-4.9.4" + sources."typescript-4.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -93665,11 +95317,28 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.6"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.6.tgz"; - sha512 = "AwIVgKdfmeVnf56cI3bOGSGM+SHZ5cIXtWI0xU5ToFGAFk/wJ3YJlpUsHensuBrBrMTIAYHk+O3Mu+FuG9jKZg=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.14.1.tgz"; + sha512 = "1QpsmzpcToU+kt9xp8XfncPdOH8I7W8vV+dDNDiDG/F6e0rkqFFI8vJseGW4gd5hms5fMK0bJs8zFSoP1GcPUw=="; }; + dependencies = [ + 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."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."normalize-path-3.0.0" + sources."picomatch-2.3.1" + sources."readdirp-3.6.0" + sources."to-regex-range-5.0.1" + ]; buildInputs = globalBuildInputs; meta = { description = "Java language extension for coc.nvim"; @@ -93718,10 +95387,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.0.tgz"; - sha512 = "X3xt19f5CtRZ9/zMzNjjxuBaZLmyJt1KUnbvt1njFrBa80SK5pCkuTcJC+/CnkFhHwFeJbMyKNfw1AG68h4d6Q=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.1.tgz"; + sha512 = "tJYhsDHadL6YYEsHAUc+tFi8MYklHmPx3AcjiUHTYRAtkAyKoZb+BPpAwG8gvfSqdkCxu55eHLeJ9lGhXNztZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -93813,7 +95482,7 @@ in sources."debounce-1.2.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -93843,7 +95512,7 @@ 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" @@ -93864,7 +95533,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -93893,12 +95562,12 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.7.1" + sources."log4js-6.8.0" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -93915,7 +95584,7 @@ in }) sources."ncp-2.0.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" sources."object-inspect-1.12.3" @@ -93930,7 +95599,7 @@ in sources."promisify-child-process-4.1.1" sources."pump-3.0.0" sources."rc-1.2.8" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -93946,10 +95615,10 @@ in sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."streamroller-3.1.4" + sources."streamroller-3.1.5" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { @@ -93962,7 +95631,7 @@ in 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" @@ -93976,7 +95645,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -93998,10 +95667,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.1.tgz"; - sha512 = "iWLgnUnd8MXi5k1RQQ5GiCboRg+lpOkcziPCpn8eWpFmXc947XZuZF3CB6zFdNZD8ifNbs9mZtcf31DnLPQuew=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.2.tgz"; + sha512 = "4qcKB1i4SdQUKv8HT+/owk+fZn4zssX4NUOEZ5IFt+hP5pb6hdWMyuJvqnH5A0+5SYQuwg5zdtQeZnneUIApfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -94022,7 +95691,7 @@ in sha512 = "t/j62Sjq/eBcaN90b4KPNDuZBP3K+TomXj9RLdiJX0zE7RG2byqsxVTnVKAk9c+qE05jv16C5Zv1qv97ZKcA4g=="; }; dependencies = [ - sources."prettier-2.8.3" + sources."prettier-2.8.4" ]; buildInputs = globalBuildInputs; meta = { @@ -94037,13 +95706,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.284"; + version = "1.1.295"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.284.tgz"; - sha512 = "MP4yyTx1C7WCp6/l1JIBlSIZLmnoNLSjHPyt2rCKQyglt8T+4zt6pHDRgoG+nGs9SjxMASQJLU7y4tURHTV+4g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.295.tgz"; + sha512 = "0GIGhNh7VokXpAxJC5YbWJrZ8Cb4jqmdpP4fpQq9ZZp0+m5UaSPLZhI5RO0yjiMQ+ctX6wurBqrV9NFreNI3GQ=="; }; dependencies = [ - sources."pyright-1.1.290" + sources."pyright-1.1.295" ]; buildInputs = globalBuildInputs; meta = { @@ -94082,10 +95751,10 @@ in sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; dependencies = [ - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" ]; buildInputs = globalBuildInputs; meta = { @@ -94117,10 +95786,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.71.1"; + version = "0.72.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.71.1.tgz"; - sha512 = "O8gH7wk6AMoRKBvfwvI9rF9MeZapS5fmN+U8/xlgB12IqcqkQliOWMbQYoH+jmb1/CWEnCg3hY6MjwWIwe9HBA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.72.1.tgz"; + sha512 = "OJW6xEaT6JTHXkYMGrvktetI5gS9FBxOD0tpz/e+slRWcFnaXHO1hIa5onT73zw3ssB6QAGlfRAVsrhUevncUA=="; }; buildInputs = globalBuildInputs; meta = { @@ -94135,88 +95804,54 @@ in coc-sh = nodeEnv.buildNodePackage { name = "coc-sh"; packageName = "coc-sh"; - version = "0.7.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sh/-/coc-sh-0.7.0.tgz"; - sha512 = "HGUBtksIRvjTcempnZz/oUoVr3XNNol5sJO+Pv8JGIihKVBougOVA4MkaJmSU0R+1WP+XL+feALf7edTdqUqlw=="; + url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.0.2.tgz"; + sha512 = "qnRVGp+om7DEd/vUoGyxyY0CW5DULEVbx9D/sEStvhWG5l/ZKqubPk3LP4mgOw6C/bCLvWL3+bhJ+lf2jsI6SQ=="; }; 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.12.0" - sources."balanced-match-1.0.2" - sources."bash-language-server-3.0.3" - 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."bash-language-server-4.7.0" + 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.1.0" - 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.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.2.0" - 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.9" + 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."tslib-2.4.1" - sources."tunnel-agent-0.6.0" + sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" + sources."tslib-2.5.0" 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.9" + 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.5" ]; buildInputs = globalBuildInputs; meta = { description = "sh extension for coc"; + homepage = "https://github.com/josa42/coc-sh#readme"; license = "MIT"; }; production = true; @@ -94421,34 +96056,34 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { 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-function-name-7.21.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-module-transforms-7.21.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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -94483,11 +96118,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -94524,7 +96159,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -94618,14 +96253,14 @@ in sources."micromatch-4.0.5" sources."min-indent-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."minimist-options-4.1.0" // { dependencies = [ sources."is-plain-obj-1.1.0" ]; }) sources."ms-2.1.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."lru-cache-6.0.0" @@ -94665,7 +96300,7 @@ in sources."postcss-selector-parser-6.0.11" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -94681,7 +96316,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-3.0.0" sources."remark-13.0.0" sources."remark-parse-9.0.0" @@ -94746,7 +96381,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -94768,10 +96403,10 @@ in coc-sumneko-lua = nodeEnv.buildNodePackage { name = "coc-sumneko-lua"; packageName = "coc-sumneko-lua"; - version = "0.0.35"; + version = "0.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.35.tgz"; - sha512 = "UcrTwjaeN9vGuedPcy8aOLMWWtjbOleBFBOiv44DZao6M32QaRRsgAmVZZ8tjCMzBJgsoGmbklqhuLQ4ftbTNg=="; + url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.37.tgz"; + sha512 = "QZn7RnwwWkj4aFhAqQxY8/Fv/jkf0VaT1vaeOV6VZnDeLsMd085FQbZ1d7bfMHUSNAZVaoFyvcc9Ouw5SXnDlQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94847,7 +96482,7 @@ in sources."@taplo/lsp-0.2.4" sources."encoding-0.1.13" sources."iconv-lite-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."safer-buffer-2.1.2" sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -94899,7 +96534,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -94961,13 +96596,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.0.tgz"; - sha512 = "gjc0WOlYu42m46+0kN+uBjSUPKq8kf+1aLuhnCTA6bp6cNRoen4Oe2QtTDGE71CHWSVbNYmAw1TYfRZBmHV8sQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.3.tgz"; + sha512 = "rzom53icaFoCF7p6Ps0dHqflS8yv+hOtQw43qOS4NL3b+rnulkfNracHFzuH1n1tyQWCzLgs73cAL1pBGrkUHQ=="; }; dependencies = [ - sources."typescript-4.9.4" + sources."typescript-4.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -95071,7 +96706,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { + (sources."esquery-1.4.2" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -95092,10 +96727,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.19.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -95122,7 +96757,7 @@ in sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."natural-compare-1.4.0" @@ -95134,11 +96769,11 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.8.3" + sources."prettier-2.8.4" sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -95178,7 +96813,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -95388,7 +97023,7 @@ in ]; }) sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."nice-try-1.0.5" (sources."npm-conf-1.1.3" // { @@ -95412,7 +97047,7 @@ in sources."proto-list-1.2.4" sources."pump-3.0.0" sources."ramda-0.27.2" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -95558,16 +97193,16 @@ in sources."lodash-4.17.21" sources."require-directory-2.1.1" sources."rxjs-7.8.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" 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" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -95591,6 +97226,7 @@ in dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" + sources."@types/triple-beam-1.3.2" sources."async-3.2.4" sources."bintrees-1.0.2" sources."color-3.2.1" @@ -95609,11 +97245,11 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.4.2" + sources."logform-2.5.1" sources."ms-2.1.3" sources."one-time-1.0.0" sources."prom-client-14.1.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" @@ -95706,7 +97342,7 @@ in sources."get-caller-file-2.0.5" (sources."get-pkg-repo-4.2.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -95774,7 +97410,7 @@ in ]; }) sources."min-indent-1.0.1" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.0" sources."modify-values-1.0.1" sources."neo-async-2.6.2" @@ -95806,7 +97442,7 @@ in ]; }) sources."read-pkg-up-3.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-3.0.0" sources."require-directory-2.1.1" sources."resolve-1.22.1" @@ -95990,7 +97626,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-6.0.0" @@ -96011,7 +97647,7 @@ in sources."pify-5.0.0" ]; }) - sources."cordova-serve-4.0.0" + sources."cordova-serve-4.0.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" @@ -96097,7 +97733,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-6.0.1" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -96118,7 +97754,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" @@ -96216,7 +97852,7 @@ in sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.5.0" + sources."macos-release-2.5.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -96236,7 +97872,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -96308,7 +97944,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.5.3" @@ -96330,7 +97966,7 @@ in sources."read-chunk-3.2.0" sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."request-2.88.2" @@ -96398,10 +98034,10 @@ 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.17.3" + sources."systeminformation-5.17.11" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" ]; }) sources."through-2.3.8" @@ -96634,7 +98270,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.18" + sources."@types/node-18.14.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -96663,7 +98299,7 @@ in sources."cycle-onionify-4.0.0" sources."d-1.0.1" sources."debug-3.2.7" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" @@ -96687,7 +98323,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" @@ -96719,7 +98355,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."ms-2.1.3" sources."mute-stream-0.0.7" sources."next-tick-1.1.0" @@ -96734,7 +98370,7 @@ in sources."qs-6.11.0" sources."quicktask-1.1.0" sources."raf-3.3.2" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."restore-cursor-2.0.0" sources."run-async-2.4.1" sources."rx-lite-4.0.8" @@ -96824,7 +98460,7 @@ in sources."kleur-3.0.3" sources."lru-cache-6.0.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."once-1.4.0" @@ -96845,7 +98481,7 @@ in (sources."tar-pack-3.4.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -96899,10 +98535,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.19.2"; + version = "6.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.19.2.tgz"; - sha512 = "nyrxnTcv1UzzdElZe96OMU8mxJGaLBnmPCR/HOaFE367EZD+WS5fcpoDBHC9tfD7yJv4+q5sjByYZltcV6jo0A=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.27.0.tgz"; + sha512 = "BhDzXJIRFcpswOy32tgnoOw2OdSM91pQuUpRxfZvRxdM4HBxUrodDYJ5HbBz7D0vNBrXFidFX/157KNX4m1gmg=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -96917,56 +98553,58 @@ in sources."supports-color-5.5.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/cspell-bundled-dicts-6.27.0" + sources."@cspell/cspell-pipe-6.27.0" + sources."@cspell/cspell-service-bus-6.27.0" + sources."@cspell/cspell-types-6.27.0" sources."@cspell/dict-ada-4.0.1" sources."@cspell/dict-aws-3.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-companies-3.0.8" + sources."@cspell/dict-cpp-4.0.3" sources."@cspell/dict-cryptocurrencies-3.0.1" 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-css-4.0.5" + sources."@cspell/dict-dart-2.0.2" + sources."@cspell/dict-django-4.0.2" + sources."@cspell/dict-docker-1.1.6" + sources."@cspell/dict-dotnet-4.0.2" + sources."@cspell/dict-elixir-4.0.2" + sources."@cspell/dict-en-common-misspellings-1.0.2" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.2.0" + sources."@cspell/dict-en_us-4.3.0" sources."@cspell/dict-filetypes-3.0.0" - sources."@cspell/dict-fonts-3.0.0" - sources."@cspell/dict-fullstack-3.1.1" + sources."@cspell/dict-fonts-3.0.1" + sources."@cspell/dict-fullstack-3.1.4" sources."@cspell/dict-gaming-terms-1.0.4" sources."@cspell/dict-git-2.0.0" - sources."@cspell/dict-golang-5.0.1" + sources."@cspell/dict-golang-5.0.2" sources."@cspell/dict-haskell-4.0.1" - sources."@cspell/dict-html-4.0.2" + sources."@cspell/dict-html-4.0.3" sources."@cspell/dict-html-symbol-entities-4.0.0" - sources."@cspell/dict-java-5.0.4" - sources."@cspell/dict-k8s-1.0.0" + sources."@cspell/dict-java-5.0.5" + sources."@cspell/dict-k8s-1.0.1" sources."@cspell/dict-latex-3.1.0" sources."@cspell/dict-lorem-ipsum-3.0.0" - sources."@cspell/dict-lua-4.0.0" + sources."@cspell/dict-lua-4.0.1" sources."@cspell/dict-node-4.0.2" - sources."@cspell/dict-npm-5.0.3" + sources."@cspell/dict-npm-5.0.5" sources."@cspell/dict-php-3.0.4" - sources."@cspell/dict-powershell-4.0.0" + sources."@cspell/dict-powershell-4.0.2" 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.0" - sources."@cspell/dict-sql-2.0.1" + sources."@cspell/dict-ruby-4.0.2" + sources."@cspell/dict-rust-4.0.1" + sources."@cspell/dict-scala-4.0.1" + sources."@cspell/dict-software-terms-3.1.5" + sources."@cspell/dict-sql-2.0.2" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" - sources."@cspell/dict-typescript-3.1.0" + sources."@cspell/dict-typescript-3.1.1" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/strong-weak-map-6.19.2" + sources."@cspell/dynamic-import-6.27.0" + sources."@cspell/strong-weak-map-6.27.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -96989,13 +98627,13 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.0.0" sources."crypto-random-string-2.0.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."cspell-dictionary-6.27.0" + sources."cspell-gitignore-6.27.0" + sources."cspell-glob-6.27.0" + sources."cspell-grammar-6.27.0" + sources."cspell-io-6.27.0" + sources."cspell-lib-6.27.0" + sources."cspell-trie-lib-6.27.0" sources."dot-prop-5.3.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -97010,7 +98648,6 @@ in sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" sources."gensequence-4.0.3" sources."get-stdin-8.0.0" @@ -97027,6 +98664,7 @@ in sources."resolve-from-4.0.0" ]; }) + sources."import-meta-resolve-2.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -97040,7 +98678,6 @@ in 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" sources."locate-path-6.0.0" sources."lru-cache-6.0.0" @@ -97052,7 +98689,7 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -97078,7 +98715,6 @@ in sources."tr46-0.0.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."universalify-2.0.0" sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-uri-3.0.7" sources."webidl-conversions-3.0.1" @@ -97455,7 +99091,7 @@ in sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mirror-folder-3.1.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -97526,7 +99162,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-tick-1.0.1" sources."random-access-file-2.2.1" @@ -97536,7 +99172,7 @@ in sources."range-parser-1.2.1" sources."rc-1.2.8" sources."read-1.0.7" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -97711,7 +99347,7 @@ in sources."util-deprecate-1.0.2" (sources."utp-native-2.5.3" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."uuid-3.4.0" @@ -97774,7 +99410,7 @@ in sha512 = "SfKVTg5qqe5aXSrSAXABM1yJl3OjekhSg6ryJyLjK1015waNj9fmMq8SrHI6qWuICtiprfYbh/f55giBJcC9Ag=="; }; dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; buildInputs = globalBuildInputs; meta = { @@ -97854,11 +99490,11 @@ in sources."tslib-1.14.1" sources."type-fest-0.16.0" sources."unique-string-2.0.0" - sources."vscode-jsonrpc-8.0.2" + sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" ]; @@ -97884,11 +99520,11 @@ in sources."dockerfile-ast-0.4.2" sources."dockerfile-language-service-0.9.0" sources."dockerfile-utils-0.10.0" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - (sources."vscode-languageserver-protocol-3.17.2" // { + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + (sources."vscode-languageserver-protocol-3.17.3" // { dependencies = [ - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" ]; }) sources."vscode-languageserver-textdocument-1.0.9" @@ -97907,10 +99543,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.96.0"; + version = "6.97.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.0.tgz"; - sha512 = "GJsJF+yxOBv5s/KS1h4nCnkhXbJtHm0nEq7xUTDxpI6aqHj9wWaWCURNjdGziN4lv3hNPtnHXt7TsM57nzAXbQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.97.0.tgz"; + sha512 = "q/N1D21klc2u9PnpkQQMYS2TKQZLsSIrzktxABNgJwLqH/a/LQc3LTicL9wH8MpI1LfXIC8viym5hLoGUlWv4g=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -97984,7 +99620,7 @@ in sources."method-missing-1.2.4" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" sources."p-queue-6.6.2" @@ -97995,7 +99631,7 @@ in sources."punycode-1.3.2" sources."qs-6.5.3" sources."querystring-0.2.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -98022,14 +99658,14 @@ in sources."through-2.3.8" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.2.0" + 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.2.0" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -98052,21 +99688,21 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.4.tgz"; - sha512 = "iyQyh0g/cSWVQs30wsAqmTmqgV8E/i9Cy/CsHwHxQlsHHcq8N61k1JlB2dpEV1Hy9Lxafql5TE3/6uI7939IEg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.5.tgz"; + sha512 = "3xD4XKyV634cQCR8HobpVnb4LqVdTHDs+KwsU9zgjaBIJMBapCS3ZzpXYbxzPekTaVwu39ojMUg990JVYBhs2A=="; }; dependencies = [ - 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-forge/core-6.0.5" + sources."@electron-forge/core-utils-6.0.5" + sources."@electron-forge/maker-base-6.0.5" + sources."@electron-forge/plugin-base-6.0.5" + sources."@electron-forge/publisher-base-6.0.5" + sources."@electron-forge/shared-types-6.0.5" + sources."@electron-forge/template-base-6.0.5" + sources."@electron-forge/template-webpack-6.0.5" + sources."@electron-forge/template-webpack-typescript-6.0.5" (sources."@electron/asar-3.2.3" // { dependencies = [ sources."commander-5.1.0" @@ -98108,7 +99744,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" @@ -98184,7 +99820,7 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-libc-2.0.1" @@ -98250,7 +99886,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" @@ -98277,7 +99913,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" @@ -98312,7 +99948,7 @@ in sources."jsonfile-6.1.0" sources."junk-3.1.0" sources."keyv-4.5.2" - sources."listr2-5.0.6" + sources."listr2-5.0.7" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -98325,7 +99961,7 @@ in ]; }) sources."lowercase-keys-2.0.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" sources."lzma-native-8.0.6" sources."make-fetch-happen-10.2.1" sources."map-age-cleaner-0.1.3" @@ -98340,7 +99976,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" @@ -98352,10 +99988,10 @@ in sources."ms-2.1.3" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.31.0" + sources."node-abi-3.33.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-9.3.1" sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" @@ -98418,7 +100054,7 @@ in sources."find-up-2.1.0" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."rechoir-0.8.0" sources."require-directory-2.1.1" sources."resolve-1.22.1" @@ -98471,14 +100107,14 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" ]; }) sources."through-2.3.8" 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" @@ -98496,7 +100132,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" (sources."yarn-or-npm-3.0.1" // { dependencies = [ @@ -98524,10 +100160,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "3.3.2"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.3.2.tgz"; - sha512 = "YHlGUS+qkSXOnwin67gC+6IfV87fkCUNUS/t8Lm9aXVTClLPNVOI3LPPJqnabPn6TzhYU3zSIP+S7IzOL8zqzA=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.7.2.tgz"; + sha512 = "S7LKa0mjC6FoWI8/t/ARJj4oi3e+fnZKaWE9iPEXbmeh+t2fZhYHmKm74wKwkJjUhId9zkH5l/ctbx72BrFWbA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -98537,7 +100173,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@expo/apple-utils-0.0.0-alpha.34" + sources."@expo/apple-utils-1.1.0" (sources."@expo/bunyan-4.0.0" // { dependencies = [ sources."uuid-8.3.2" @@ -98557,8 +100193,8 @@ in ]; }) sources."@expo/config-types-47.0.0" - sources."@expo/eas-build-job-0.2.102" - (sources."@expo/eas-json-3.3.2" // { + sources."@expo/eas-build-job-0.2.106" + (sources."@expo/eas-json-3.7.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; @@ -98699,7 +100335,7 @@ in sources."commander-4.1.1" sources."component-type-1.2.1" sources."concat-map-0.0.1" - sources."content-type-1.0.4" + sources."content-type-1.0.5" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -98727,7 +100363,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.2" // { + (sources."expo-modules-autolinking-1.1.2" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" @@ -98831,8 +100467,8 @@ in sources."brace-expansion-2.0.1" ]; }) - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -98867,7 +100503,7 @@ in sources."object-treeify-1.1.33" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."ora-5.1.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -98909,7 +100545,7 @@ in sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" sources."prompts-2.4.2" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -98978,7 +100614,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."widest-line-3.1.0" - sources."wonka-6.1.2" + sources."wonka-6.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -99033,10 +100669,10 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision11"; + version = "0.19.1-revision12"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision11.tgz"; - sha512 = "ZUCE+YM3zNzADtZNZpm+swcL7NEJm68vEqRb+cENOp+ndQbG9nBWjSpVfpAo5Ha3rEmj/KdxjiWf2kMUCggnmQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision12.tgz"; + sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -99103,13 +100739,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -99123,28 +100759,28 @@ in ]; }) sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.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-module-transforms-7.21.2" 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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" 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.7" sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -99153,7 +100789,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.26" + sources."@types/react-18.0.28" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" @@ -99171,14 +100807,14 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."bufferutil-4.0.7" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -99208,7 +100844,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -99298,7 +100934,7 @@ in sources."ms-2.1.2" sources."nice-try-1.0.5" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -99331,10 +100967,10 @@ in sources."pkg-up-3.1.0" sources."prop-types-15.8.1" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.27.1" + sources."react-devtools-core-4.27.2" sources."react-is-16.13.1" (sources."react-reconciler-0.26.2" // { dependencies = [ @@ -99364,7 +101000,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."signal-exit-3.0.7" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { @@ -99447,10 +101083,10 @@ in dependencies = [ sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.4.0" - sources."@azure/core-client-1.7.0" + sources."@azure/core-client-1.7.2" sources."@azure/core-http-compat-1.3.0" - sources."@azure/core-lro-2.5.0" - sources."@azure/core-paging-1.4.0" + sources."@azure/core-lro-2.5.1" + sources."@azure/core-paging-1.5.0" (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" @@ -99469,15 +101105,15 @@ in }) sources."@azure/keyvault-keys-4.6.0" sources."@azure/logger-1.0.3" - (sources."@azure/msal-browser-2.32.2" // { + (sources."@azure/msal-browser-2.33.0" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-10.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { + (sources."@azure/msal-node-1.15.0" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-10.0.0" sources."uuid-8.3.2" ]; }) @@ -99513,21 +101149,21 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@fluentui/date-time-utilities-8.5.4" - sources."@fluentui/dom-utilities-2.2.4" - sources."@fluentui/font-icons-mdl2-8.5.6" - sources."@fluentui/foundation-legacy-8.2.26" - sources."@fluentui/keyboard-key-0.4.4" - sources."@fluentui/merge-styles-8.5.5" - sources."@fluentui/react-8.104.5" - sources."@fluentui/react-focus-8.8.12" - sources."@fluentui/react-hooks-8.6.15" + sources."@fluentui/date-time-utilities-8.5.5" + sources."@fluentui/dom-utilities-2.2.5" + sources."@fluentui/font-icons-mdl2-8.5.9" + sources."@fluentui/foundation-legacy-8.2.29" + sources."@fluentui/keyboard-key-0.4.5" + sources."@fluentui/merge-styles-8.5.6" + sources."@fluentui/react-8.106.1" + sources."@fluentui/react-focus-8.8.15" + sources."@fluentui/react-hooks-8.6.17" 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.8.5" - sources."@fluentui/theme-2.6.21" - sources."@fluentui/utilities-8.13.5" + sources."@fluentui/react-window-provider-2.2.6" + sources."@fluentui/set-version-8.2.5" + sources."@fluentui/style-utilities-8.9.2" + sources."@fluentui/theme-2.6.23" + sources."@fluentui/utilities-8.13.7" sources."@gar/promisify-1.1.3" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ @@ -99579,37 +101215,33 @@ in 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.4.2" // { - dependencies = [ - sources."cluster-key-slot-1.1.1" - ]; - }) + sources."@redis/bloom-1.2.0" + sources."@redis/client-1.5.6" sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" - sources."@redis/search-1.1.0" + sources."@redis/search-1.1.2" sources."@redis/time-series-1.0.4" - (sources."@sap/hana-client-2.15.19" // { + (sources."@sap/hana-client-2.15.22" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.37" 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" @@ -99621,11 +101253,11 @@ in sources."@types/connect-3.4.35" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" 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.32" + 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" @@ -99639,10 +101271,10 @@ 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.26" - sources."@types/react-dom-18.0.10" + sources."@types/react-18.0.28" + sources."@types/react-dom-18.0.11" sources."@types/scheduler-0.16.2" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/socket.io-3.0.1" sources."@types/source-map-support-0.5.4" sources."@types/sqlite3-3.1.7" @@ -99693,7 +101325,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" @@ -99793,7 +101425,7 @@ 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.6" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" @@ -99811,7 +101443,7 @@ in sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" - sources."better-sqlite3-8.0.1" + sources."better-sqlite3-8.1.0" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" @@ -99823,7 +101455,7 @@ in sources."body-parser-1.19.0" sources."brace-expansion-2.0.1" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."bson-1.1.6" sources."buffer-5.7.1" sources."buffer-equal-1.0.1" @@ -99842,6 +101474,7 @@ in dependencies = [ sources."brace-expansion-1.1.11" sources."glob-7.2.3" + sources."lru-cache-6.0.0" sources."minimatch-3.1.2" sources."minipass-3.3.6" ]; @@ -99856,7 +101489,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -99909,7 +101542,7 @@ in (sources."cloneable-readable-1.1.3" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -99927,13 +101560,13 @@ in (sources."concat-stream-1.6.2" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" @@ -99982,7 +101615,7 @@ in sources."default-resolution-2.0.0" sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."del-6.0.0" sources."delayed-stream-1.0.0" @@ -100009,14 +101642,14 @@ in (sources."duplexify-3.7.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) sources."each-props-1.3.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -100081,7 +101714,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { + (sources."esquery-1.4.2" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -100175,7 +101808,7 @@ in (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -100206,12 +101839,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.1.0" + sources."glob-9.0.1" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -100221,7 +101854,7 @@ in sources."is-glob-3.1.0" sources."isarray-1.0.0" sources."minimatch-3.1.2" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -100233,7 +101866,7 @@ in sources."which-1.3.1" ]; }) - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."globby-11.1.0" sources."glogg-1.0.2" @@ -100288,7 +101921,7 @@ in sources."json-schema-traverse-0.4.1" sources."levn-0.3.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."optionator-0.8.3" @@ -100367,7 +102000,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 = [ @@ -100393,11 +102026,11 @@ in sources."inherits-2.0.3" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."interpret-1.4.0" sources."inversify-5.1.1" sources."invert-kv-1.0.0" - (sources."ioredis-5.2.5" // { + (sources."ioredis-5.3.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -100494,7 +102127,7 @@ in (sources."lazystream-1.0.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -100519,7 +102152,7 @@ in sources."long-5.2.1" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" + sources."lru-cache-7.17.0" sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -100529,6 +102162,7 @@ in sources."make-error-1.3.6" (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."lru-cache-6.0.0" sources."minipass-3.3.6" ]; }) @@ -100561,9 +102195,9 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-5.1.6" + sources."minimatch-7.3.0" sources."minimist-1.2.5" - sources."minipass-4.0.0" + sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -100650,7 +102284,7 @@ in ]; }) sources."openapi-types-7.2.3" - sources."swagger-ui-dist-4.15.5" + sources."swagger-ui-dist-4.16.1" ]; }) (sources."mixin-deep-1.3.2" // { @@ -100665,7 +102299,7 @@ in sources."bl-2.2.1" sources."denque-1.5.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -100675,7 +102309,7 @@ in ]; }) sources."ms-2.0.0" - (sources."mssql-9.1.0" // { + (sources."mssql-9.1.1" // { dependencies = [ sources."commander-9.5.0" sources."debug-4.3.4" @@ -100684,7 +102318,7 @@ in }) (sources."multer-1.4.3" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" ]; }) @@ -100697,19 +102331,14 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."mysql2-3.0.1" // { + (sources."mysql2-3.1.2" // { 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.3" // { - dependencies = [ - sources."lru-cache-7.14.1" - ]; - }) + sources."named-placeholders-1.1.3" sources."nan-2.17.0" sources."nanomatch-1.2.13" sources."napi-build-utils-1.0.2" @@ -100719,10 +102348,10 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."nice-try-1.0.5" - sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."node-abi-3.33.0" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" @@ -100734,7 +102363,7 @@ in ]; }) sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -100772,7 +102401,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" (sources."openapi-default-setter-9.3.1" // { dependencies = [ sources."openapi-types-9.3.1" @@ -100821,7 +102450,7 @@ in (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -100856,12 +102485,13 @@ in sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" + sources."path-scurry-1.5.0" 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 = [ @@ -100872,8 +102502,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" @@ -100910,7 +102540,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" @@ -100925,7 +102555,7 @@ in ]; }) sources."read-pkg-up-1.0.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readable-web-to-node-stream-3.0.2" (sources."readdirp-2.2.1" // { dependencies = [ @@ -100936,13 +102566,13 @@ in sources."isarray-1.0.0" sources."kind-of-3.2.2" sources."micromatch-3.1.10" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" sources."to-regex-range-2.1.1" ]; }) sources."rechoir-0.6.2" - sources."redis-4.5.1" + sources."redis-4.6.5" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" @@ -101000,7 +102630,11 @@ in sources."json-schema-traverse-0.4.1" ]; }) - sources."semver-7.3.8" + (sources."semver-7.3.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { dependencies = [ @@ -101163,7 +102797,7 @@ in }) sources."tar-stream-2.2.0" sources."tarn-3.0.2" - (sources."tedious-15.1.2" // { + (sources."tedious-15.1.3" // { dependencies = [ sources."bl-5.1.0" sources."buffer-6.0.3" @@ -101172,9 +102806,9 @@ in sources."sprintf-js-1.1.2" ]; }) - (sources."terser-5.16.1" // { + (sources."terser-5.16.5" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."commander-2.20.3" ]; }) @@ -101186,7 +102820,7 @@ in (sources."through2-2.0.5" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -101211,10 +102845,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" @@ -101289,7 +102923,7 @@ in (sources."vinyl-fs-3.0.3" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -101302,7 +102936,7 @@ in sources."webidl-conversions-3.0.1" (sources."webpack-5.75.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."webpack-sources-3.2.3" @@ -101317,7 +102951,7 @@ in sources."wrappy-1.0.2" (sources."write-1.0.3" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" ]; }) @@ -101336,7 +102970,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."yargs-17.6.2" // { + (sources."yargs-17.7.1" // { dependencies = [ sources."cliui-8.0.1" sources."yargs-parser-21.1.1" @@ -101367,12 +103001,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.7" + sources."@babel/parser-7.21.2" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-7.3.1" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."ignore-4.0.6" sources."type-fest-0.20.2" ]; @@ -101415,24 +103049,24 @@ 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.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-4.17.17" + 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" + sources."@types/http-proxy-1.17.10" sources."@types/json-schema-7.0.11" sources."@types/json-stable-stringify-1.0.33" sources."@types/lodash-4.14.178" sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/smoothscroll-polyfill-0.3.1" sources."@types/socket.io-client-1.4.36" sources."@types/source-list-map-0.1.2" @@ -101565,18 +103199,18 @@ in sources."yallist-3.1.1" ]; }) - (sources."@vue/compiler-core-3.2.45" // { + (sources."@vue/compiler-core-3.2.47" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.45" - (sources."@vue/compiler-sfc-3.2.45" // { + sources."@vue/compiler-dom-3.2.47" + (sources."@vue/compiler-sfc-3.2.47" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.2.45" + sources."@vue/compiler-ssr-3.2.47" (sources."@vue/component-compiler-utils-3.3.0" // { dependencies = [ sources."hash-sum-1.0.2" @@ -101590,8 +103224,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.45" - sources."@vue/shared-3.2.45" + sources."@vue/reactivity-transform-3.2.47" + sources."@vue/shared-3.2.47" sources."@vue/web-component-wrapper-1.3.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -101665,7 +103299,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.6" sources."async-foreach-0.1.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -101730,11 +103364,11 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -101778,7 +103412,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -101869,7 +103503,7 @@ in sources."consolidate-0.15.1" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" @@ -101984,7 +103618,7 @@ in sources."decode-uri-component-0.2.2" sources."deep-equal-1.1.1" sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" (sources."default-gateway-5.0.5" // { dependencies = [ sources."cross-spawn-7.0.3" @@ -102002,7 +103636,7 @@ in ]; }) sources."defaults-1.0.4" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" (sources."del-4.1.1" // { dependencies = [ @@ -102055,7 +103689,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102114,7 +103748,7 @@ in sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."globals-13.19.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" @@ -102168,7 +103802,7 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { + (sources."esquery-1.4.2" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -102316,7 +103950,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" @@ -102372,7 +104006,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."hash-sum-2.0.0" @@ -102469,7 +104103,7 @@ in sources."default-gateway-4.2.0" ]; }) - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."interpret-1.4.0" sources."inversify-6.0.1" sources."ip-1.1.8" @@ -102616,7 +104250,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."minimist-options-4.1.0" // { dependencies = [ sources."is-plain-obj-1.1.0" @@ -102659,7 +104293,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" (sources."node-sass-6.0.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -103060,7 +104694,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -103083,7 +104717,7 @@ in sources."type-fest-0.8.1" ]; }) - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -103209,7 +104843,7 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."shelljs-0.8.5" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" @@ -103287,7 +104921,7 @@ in sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."split-string-3.1.0" @@ -103357,7 +104991,7 @@ in (sources."tar-6.1.13" // { dependencies = [ sources."chownr-2.0.0" - sources."minipass-4.0.0" + sources."minipass-4.2.4" sources."mkdirp-1.0.4" ]; }) @@ -103706,20 +105340,21 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.32.0"; + version = "8.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz"; - sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; + sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; }; dependencies = [ - sources."@eslint/eslintrc-1.4.1" + sources."@eslint/eslintrc-2.0.0" + sources."@eslint/js-8.35.0" 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" @@ -103737,7 +105372,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.32.0" + sources."eslint-8.35.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -103746,7 +105381,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -103761,7 +105396,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -103773,7 +105408,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + 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" @@ -103792,7 +105427,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -103832,14 +105467,15 @@ in sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA=="; }; dependencies = [ - sources."@eslint/eslintrc-1.4.1" + sources."@eslint/eslintrc-2.0.0" + sources."@eslint/js-8.35.0" 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" @@ -103862,7 +105498,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.32.0" + sources."eslint-8.35.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -103871,7 +105507,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -103886,7 +105522,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -103898,7 +105534,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + 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" @@ -103918,7 +105554,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -103969,26 +105605,27 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "6.1.0"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.1.0.tgz"; - sha512 = "yhbevPdwof7oyjQup/dEYbxYZCiK/vYYQVnZA3CbYxtz0TG6LcEumz1Pn5WhAwU6vGCSmKpsJ02r4O0/bwIB/Q=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.3.2.tgz"; + sha512 = "Jq3SmCPpevcPEaQ4fHw10RVJfDuBrBGVA93gJxFWCPMaYh8jqBYtSuvH527mT8FoDu5VxYdYXULTqQz5kfVeHQ=="; }; dependencies = [ - (sources."@ampproject/remapping-2.2.0" // { + sources."@ampproject/remapping-2.2.0" + sources."@babel/code-frame-7.10.4" + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.1.1" + sources."@babel/code-frame-7.18.6" + sources."json5-2.2.3" + sources."semver-6.3.0" ]; }) - sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.9.0" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ - sources."json5-2.2.3" - sources."semver-5.7.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - 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.9" (sources."@babel/helper-compilation-targets-7.20.7" // { @@ -103998,8 +105635,8 @@ in 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-create-class-features-plugin-7.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.0" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -104007,11 +105644,11 @@ in }) 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-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.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" @@ -104021,35 +105658,21 @@ in 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-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.21.0" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.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.20.7" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) + 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.20.7" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-proposal-decorators-7.20.7" + sources."@babel/plugin-proposal-class-static-block-7.21.0" + sources."@babel/plugin-proposal-decorators-7.21.0" 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" @@ -104059,14 +105682,14 @@ in sources."@babel/plugin-proposal-numeric-separator-7.18.6" 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.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.20.5" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" 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-decorators-7.19.0" + sources."@babel/plugin-syntax-decorators-7.21.0" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-default-from-7.18.6" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" @@ -104086,20 +105709,20 @@ in 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.11" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" 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" - sources."@babel/plugin-transform-flow-strip-types-7.19.0" - sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-flow-strip-types-7.21.0" + sources."@babel/plugin-transform-for-of-7.21.0" 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.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" 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.20.5" @@ -104108,12 +105731,12 @@ in 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.20.7" - sources."@babel/plugin-transform-react-jsx-self-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.21.0" + sources."@babel/plugin-transform-react-jsx-self-7.21.0" sources."@babel/plugin-transform-react-jsx-source-7.19.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" // { + (sources."@babel/plugin-transform-runtime-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104123,7 +105746,7 @@ in 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.7" + sources."@babel/plugin-transform-typescript-7.21.0" 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" // { @@ -104132,38 +105755,37 @@ in ]; }) sources."@babel/preset-modules-0.1.5" + sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.20.7" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.21.2" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - sources."@babel/types-7.20.7" + sources."@babel/types-7.21.2" sources."@colors/colors-1.5.0" - sources."@expo/apple-utils-0.0.0-alpha.31" + sources."@expo/apple-utils-0.0.0-alpha.37" sources."@expo/bunyan-4.0.0" - (sources."@expo/cli-0.4.11" // { + (sources."@expo/cli-0.6.2" // { dependencies = [ - sources."@babel/runtime-7.20.7" - (sources."@expo/config-7.0.3" // { + sources."@babel/runtime-7.21.0" + (sources."@expo/config-8.0.2" // { dependencies = [ - sources."@expo/json-file-8.2.36" sources."semver-7.3.2" ]; }) - (sources."@expo/config-plugins-5.0.4" // { + (sources."@expo/config-plugins-6.0.1" // { 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.124" // { + sources."@expo/config-types-48.0.0" + (sources."@expo/dev-server-0.2.3" // { dependencies = [ sources."fs-extra-9.0.0" sources."semver-7.3.2" @@ -104176,54 +105798,33 @@ in sources."tempy-0.3.0" ]; }) - (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" // { + sources."@expo/metro-config-0.7.1" + sources."@expo/package-manager-1.0.1" + (sources."@expo/prebuild-config-6.0.0" // { 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.5" // { @@ -104244,7 +105845,7 @@ in ]; }) sources."@expo/config-types-45.0.0" - sources."@expo/dev-server-0.1.115" + sources."@expo/dev-server-0.2.0" (sources."@expo/devcert-1.1.0" // { dependencies = [ sources."debug-3.2.7" @@ -104264,9 +105865,12 @@ in sources."json5-2.2.3" ]; }) - (sources."@expo/metro-config-0.3.18" // { + (sources."@expo/metro-config-0.6.0" // { dependencies = [ - sources."@expo/json-file-8.2.36" + sources."@expo/config-8.0.2" + sources."@expo/config-plugins-6.0.1" + sources."@expo/config-types-48.0.0" + sources."semver-7.3.8" ]; }) sources."@expo/osascript-2.0.33" @@ -104285,7 +105889,7 @@ in ]; }) sources."@expo/rudder-sdk-node-1.1.1" - (sources."@expo/schemer-1.4.4" // { + (sources."@expo/schemer-1.4.5" // { dependencies = [ sources."probe-image-size-7.2.3" ]; @@ -104293,22 +105897,40 @@ 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.4" + (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" ]; }) sources."@gar/promisify-1.1.3" - sources."@graphql-typed-document-node/core-3.1.1" + sources."@graphql-typed-document-node/core-3.1.2" 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" @@ -104330,69 +105952,66 @@ in sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" + sources."@trysound/sax-0.2.0" + sources."@types/body-parser-1.19.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.21.1" + sources."@types/eslint-scope-3.7.4" + sources."@types/estree-0.0.51" + sources."@types/express-4.17.17" + 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.10" 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-3.1.4" + sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" - sources."@types/node-18.11.18" - sources."@types/q-1.5.5" + sources."@types/node-18.14.2" + 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/serve-index-1.9.1" + sources."@types/serve-static-1.15.1" + 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.12.0" - sources."ajv-errors-1.0.1" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -104400,61 +106019,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.3" sources."application-config-path-0.1.1" - sources."aproba-1.2.0" 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."available-typed-arrays-1.0.5" 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.2" - 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 = [ @@ -104463,31 +106051,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-preset-expo-9.2.2" + sources."babel-plugin-react-native-web-0.18.12" + sources."babel-preset-expo-9.3.0" 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" // { + (sources."body-parser-1.20.2" // { 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" ]; @@ -104502,46 +106082,28 @@ 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."browserslist-4.21.5" 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."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ sources."mkdirp-1.0.4" 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" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -104555,32 +106117,10 @@ in sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" - sources."ci-info-3.7.1" - 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.8.0" + 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" @@ -104594,34 +106134,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" // { @@ -104640,48 +106163,24 @@ 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."content-type-1.0.5" 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."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."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."core-js-compat-3.27.1" + sources."core-js-compat-3.29.0" sources."core-util-is-1.0.3" - sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" (sources."cross-fetch-3.1.5" // { dependencies = [ sources."node-fetch-2.6.7" @@ -104693,119 +106192,64 @@ in ]; }) 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" // { - dependencies = [ - sources."ajv-6.12.6" - sources."camelcase-5.3.1" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - ]; - }) - (sources."css-select-4.3.0" // { + sources."css-declaration-sorter-6.3.1" + (sources."css-loader-6.7.3" // { dependencies = [ - sources."domhandler-4.3.1" + sources."semver-7.3.8" ]; }) - sources."css-select-base-adapter-0.1.1" - (sources."css-tree-1.0.0-alpha.37" // { + (sources."css-minimizer-webpack-plugin-3.4.1" // { 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.15" + sources."cssnano-preset-default-5.2.14" + 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.2" (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."deepmerge-4.3.0" 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" ]; }) sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."des.js-1.0.1" + sources."depd-2.0.0" 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."domutils-2.8.0" sources."dot-case-3.0.4" - sources."dot-prop-5.3.0" - sources."duplexer-0.1.2" 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."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -104815,24 +106259,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.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."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 = [ @@ -104844,8 +106279,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 = [ @@ -104853,73 +106286,48 @@ in sources."is-stream-1.1.0" ]; }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."expo-47.0.13" // { + (sources."expo-48.0.4" // { dependencies = [ - sources."@babel/runtime-7.20.7" - (sources."@expo/config-7.0.3" // { + sources."@babel/runtime-7.21.0" + (sources."@expo/config-8.0.2" // { dependencies = [ sources."semver-7.3.2" ]; }) - 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."@expo/config-plugins-6.0.1" + sources."@expo/config-types-48.0.0" sources."commander-7.2.0" - sources."expo-modules-autolinking-1.0.2" + sources."expo-modules-autolinking-1.1.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.7.0" - (sources."expo-constants-14.0.2" // { + sources."expo-application-5.1.1" + sources."expo-asset-8.9.0" + (sources."expo-constants-14.2.1" // { 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."@expo/config-8.0.2" + sources."@expo/config-plugins-6.0.1" + sources."@expo/config-types-48.0.0" sources."semver-7.3.8" sources."uuid-3.4.0" ]; }) - sources."expo-error-recovery-4.0.1" - (sources."expo-file-system-15.1.1" // { + (sources."expo-file-system-15.2.2" // { dependencies = [ sources."uuid-3.4.0" ]; }) - sources."expo-font-11.0.1" - sources."expo-keep-awake-11.0.1" + sources."expo-font-11.1.1" + sources."expo-keep-awake-12.0.1" (sources."expo-modules-autolinking-0.8.1" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" ]; }) - sources."expo-modules-core-1.1.1" + sources."expo-modules-core-1.2.3" (sources."expo-pwa-0.0.124" // { dependencies = [ sources."@expo/image-utils-0.3.23" @@ -104934,6 +106342,7 @@ in sources."body-parser-1.18.3" sources."bytes-3.0.0" sources."debug-2.6.9" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."finalhandler-1.1.1" sources."http-errors-1.6.3" @@ -104941,6 +106350,7 @@ in sources."inherits-2.0.3" sources."mime-1.4.1" sources."ms-2.0.0" + sources."on-finished-2.3.0" sources."qs-6.5.2" sources."raw-body-2.3.3" sources."safe-buffer-5.1.2" @@ -104949,41 +106359,22 @@ 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.15.0" - sources."faye-websocket-0.10.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 = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."on-finished-2.3.0" + sources."statuses-1.5.0" ]; }) (sources."find-babel-config-1.2.0" // { @@ -104992,195 +106383,82 @@ 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-each-0.3.3" - 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."globalthis-1.0.3" sources."globby-11.1.0" - sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."graphql-15.8.0" sources."graphql-tag-2.12.6" - sources."gzip-size-5.1.1" 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-proto-1.0.1" 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" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - (sources."html-minifier-terser-5.1.1" // { - dependencies = [ - sources."commander-4.1.1" - ]; - }) - (sources."html-webpack-plugin-4.3.0" // { + sources."html-entities-2.3.3" + (sources."html-minifier-terser-6.1.0" // { dependencies = [ - sources."loader-utils-1.4.2" + sources."commander-8.3.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-errors-2.0.0" + 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."icss-utils-5.1.0" sources."ignore-5.2.4" - 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."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.4" 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-array-buffer-3.0.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" @@ -105190,10 +106468,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 = [ @@ -105201,7 +106476,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 = [ @@ -105226,29 +106501,20 @@ 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-typed-array-1.1.10" 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" - sources."joi-17.7.0" + sources."joi-17.8.3" sources."join-component-1.1.0" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { @@ -105258,7 +106524,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" @@ -105266,19 +106532,16 @@ in ]; }) sources."json-schema-traverse-1.0.0" - sources."json3-3.3.3" sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."keychain-1.3.0" sources."keyv-4.5.2" - sources."killable-1.0.1" - sources."kind-of-6.0.3" 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-runner-4.3.0" (sources."loader-utils-2.0.4" // { dependencies = [ sources."json5-2.2.3" @@ -105295,86 +106558,53 @@ in sources."chalk-2.4.2" ]; }) - sources."loglevel-1.8.1" sources."loose-envify-1.4.0" 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.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) - sources."microevent.ts-0.1.1" + sources."metro-react-native-babel-preset-0.73.7" 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.2" - 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."minimist-1.2.8" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" 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 = [ @@ -105386,16 +106616,11 @@ in sources."nested-error-stacks-2.0.1" sources."nice-try-1.0.5" sources."no-case-3.0.4" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" 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.8" + sources."node-gyp-build-4.6.0" + sources."node-html-parser-5.4.2" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" (sources."npm-package-arg-6.1.0" // { @@ -105408,40 +106633,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.3" - 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."obuf-1.1.2" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - 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."open-8.4.2" (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -105449,7 +106647,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" @@ -105492,23 +106689,16 @@ in sources."semver-6.3.0" ]; }) - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" sources."param-case-3.0.4" - sources."parse-asn1-5.1.6" - sources."parse-json-4.0.0" sources."parse-png-2.1.0" - sources."parse-srcset-1.0.2" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - sources."pascalcase-0.1.1" (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" @@ -105516,20 +106706,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" // { @@ -105547,133 +106735,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-8.4.21" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.1" + 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.4" + 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.2" + sources."postcss-reduce-transforms-5.1.0" sources."postcss-selector-parser-6.0.11" - (sources."postcss-svgo-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-unique-selectors-4.0.1" + 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" @@ -105682,114 +106780,49 @@ 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.2.0" - 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."qs-6.11.0" 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."raw-body-2.5.2" 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.3" - 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" sources."read-last-lines-1.6.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) 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.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.2" + sources."regexpu-core-5.3.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" ]; }) 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" @@ -105799,43 +106832,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 = [ @@ -105844,52 +106868,42 @@ in sources."ms-2.0.0" ]; }) - sources."depd-2.0.0" - sources."http-errors-2.0.0" sources."mime-1.6.0" sources."ms-2.1.3" - sources."on-finished-2.4.1" - sources."setprototypeof-1.2.0" - sources."statuses-2.0.1" - sources."toidentifier-1.0.1" ]; }) 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" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."ms-2.0.0" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) (sources."serve-static-1.13.2" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."mime-1.4.1" sources."ms-2.0.0" + sources."on-finished-2.3.0" sources."send-0.16.2" sources."setprototypeof-1.1.0" 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."setprototypeof-1.2.0" 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" // { @@ -105897,103 +106911,42 @@ 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" // { + sources."sockjs-0.3.24" + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + (sources."source-map-loader-3.0.2" // { dependencies = [ - sources."uuid-3.4.0" + sources."iconv-lite-0.6.3" ]; }) - (sources."sockjs-client-1.4.0" // { + (sources."source-map-support-0.4.18" // { dependencies = [ - sources."debug-3.2.7" - sources."faye-websocket-0.11.4" + sources."source-map-0.5.7" ]; }) - 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."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) 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."statuses-2.0.1" 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.6" - sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -106001,20 +106954,11 @@ 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."style-loader-3.3.1" + sources."stylehacks-5.1.1" (sources."sucrase-3.29.0" // { dependencies = [ sources."commander-4.1.1" @@ -106029,25 +106973,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."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" sources."mkdirp-1.0.4" ]; }) @@ -106060,269 +106994,125 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-4.8.1" // { + (sources."terser-5.16.5" // { 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."toidentifier-1.0.1" 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-2.4.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."typed-array-length-1.0.4" 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.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.3" 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.2" - 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."bytes-3.1.2" - sources."chokidar-2.1.8" + 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."content-disposition-0.5.4" sources."cookie-0.5.0" - sources."del-4.1.1" - 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."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."cross-spawn-7.0.3" + sources."debug-2.6.9" + sources."default-gateway-6.0.3" + sources."execa-5.1.1" + sources."express-4.18.2" + sources."finalhandler-1.2.0" + sources."get-stream-6.0.1" + sources."ipaddr.js-2.0.1" + sources."mimic-fn-2.1.0" sources."ms-2.0.0" - sources."normalize-path-2.1.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."qs-6.11.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-retry-4.6.2" + sources."path-key-3.1.1" 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."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."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."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" ]; }) - 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."which-typed-array-1.1.9" 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" @@ -106332,13 +107122,13 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-6.2.2" + sources."ws-8.12.1" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" ]; }) - (sources."xdl-59.3.0" // { + (sources."xdl-60.0.4" // { dependencies = [ sources."bplist-parser-0.3.2" sources."minimatch-3.0.4" @@ -106351,28 +107141,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; @@ -106396,9 +107166,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -106406,38 +107176,38 @@ in sources."@babel/helper-annotate-as-pure-7.18.6" 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-function-name-7.21.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-module-transforms-7.21.2" 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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" 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.7" sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" 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.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.28" sources."@types/scheduler-0.16.2" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -106456,7 +107226,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" @@ -106465,7 +107235,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -106491,7 +107261,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -106566,7 +107336,7 @@ in sources."ms-2.1.2" sources."node-fetch-2.6.7" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."lru-cache-6.0.0" @@ -106598,7 +107368,7 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.27.1" + sources."react-devtools-core-4.27.2" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -106613,7 +107383,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-3.0.0" sources."resolve-1.22.1" sources."resolve-from-3.0.0" @@ -106623,7 +107393,7 @@ in sources."safer-buffer-2.1.2" sources."scheduler-0.20.2" sources."semver-6.3.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -106711,16 +107481,17 @@ 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.21" - sources."@oclif/config-1.18.6" + sources."@oclif/command-1.8.22" + sources."@oclif/config-1.18.8" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { dependencies = [ + sources."@oclif/config-1.18.6" 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" @@ -106766,7 +107537,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-3.7.2" @@ -106830,7 +107601,7 @@ in sources."semver-5.7.1" ]; }) - sources."csv-parse-5.3.3" + sources."csv-parse-5.3.5" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.4" @@ -106851,7 +107622,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."execa-0.10.0" - sources."exponential-backoff-3.1.0" + sources."exponential-backoff-3.1.1" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ @@ -106865,7 +107636,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" - sources."faunadb-4.7.1" + sources."faunadb-4.8.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -106965,8 +107736,8 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" - sources."node-fetch-2.6.8" + sources."node-abort-controller-3.1.1" + sources."node-fetch-2.6.9" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -106989,15 +107760,15 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.8.3" + sources."prettier-2.8.4" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" sources."rate-limiter-flexible-2.4.1" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -107047,7 +107818,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" @@ -107085,18 +107856,18 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.20.0"; + version = "11.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.20.0.tgz"; - sha512 = "jFDqWcYuydvHbx1uE1iDSx2pmqyIe2YuF7Jrf28HxU4VZyRPXII010v9OfT8cn5EJlA47WTDWuO2Fbx8EYPL7g=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.24.0.tgz"; + sha512 = "fqwI6rBCvMs3E2pLYEzJYPIB+cmLxV9l+bX7VZHpxhUvbZZrM7271C8sjiBdIh97ue+BvgXHqTDlsW88ZZXt1g=="; }; dependencies = [ - (sources."@apidevtools/json-schema-ref-parser-9.1.0" // { + (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { dependencies = [ sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@gar/promisify-1.1.3" @@ -107104,14 +107875,15 @@ in 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.7.0" ]; }) - sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.4" + sources."@grpc/grpc-js-1.8.11" + sources."@grpc/proto-loader-0.7.5" sources."@jsdevtools/ono-7.1.3" + sources."@jsdoc/salty-0.2.3" (sources."@npmcli/fs-2.1.2" // { dependencies = [ sources."semver-7.3.8" @@ -107132,20 +107904,22 @@ 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/glob-8.1.0" sources."@types/json-schema-7.0.11" sources."@types/linkify-it-3.0.2" sources."@types/long-4.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" - sources."@types/node-18.11.18" + sources."@types/minimatch-5.1.2" + sources."@types/node-18.14.2" + sources."@types/rimraf-3.0.2" + sources."@types/triple-beam-1.3.2" 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" @@ -107172,7 +107946,7 @@ in sources."archiver-5.3.1" (sources."archiver-utils-2.1.0" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -107205,7 +107979,7 @@ in sources."binary-extensions-2.2.0" sources."bl-4.1.0" sources."bluebird-3.7.2" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -107228,16 +108002,10 @@ in (sources."cacache-16.1.3" // { dependencies = [ sources."glob-8.1.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" sources."minimatch-5.1.6" ]; }) - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" @@ -107260,7 +108028,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" @@ -107304,7 +108071,7 @@ in }) sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -107325,16 +108092,14 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."csv-parse-5.3.3" + sources."csv-parse-5.3.5" 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" @@ -107343,12 +108108,11 @@ in sources."dot-prop-5.3.0" (sources."duplexer2-0.1.4" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" 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" @@ -107392,8 +108156,10 @@ in sources."exegesis-express-4.0.0" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."debug-2.6.9" sources."ms-2.0.0" + sources."raw-body-2.5.1" ]; }) sources."extend-3.0.2" @@ -107455,8 +108221,7 @@ in sources."gaxios-5.0.2" 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" @@ -107478,13 +108243,12 @@ in sources."gtoken-5.3.2" ]; }) - (sources."google-gax-3.5.2" // { + (sources."google-gax-3.5.7" // { dependencies = [ 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" @@ -107495,7 +108259,7 @@ in 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" @@ -107549,39 +108313,37 @@ in }) sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - sources."jsdoc-3.6.11" + sources."jsdoc-4.0.2" 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" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."leven-3.1.0" sources."levn-0.3.0" - sources."libsodium-0.7.10" - sources."libsodium-wrappers-0.7.10" + sources."libsodium-0.7.11" + sources."libsodium-wrappers-0.7.11" sources."linkify-it-3.0.3" sources."listenercount-1.0.1" sources."lodash-4.17.21" @@ -107590,20 +108352,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."logform-2.5.1" sources."long-4.0.0" - sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -107614,12 +108369,12 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" sources."socks-proxy-agent-7.0.0" ]; }) sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.6" + sources."markdown-it-anchor-8.6.7" sources."marked-4.2.12" (sources."marked-terminal-5.1.1" // { dependencies = [ @@ -107636,13 +108391,12 @@ 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."minimist-1.2.8" sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" @@ -107665,7 +108419,7 @@ in sources."netmask-2.0.2" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" (sources."node-gyp-9.3.1" // { dependencies = [ @@ -107676,7 +108430,6 @@ in 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" @@ -107688,21 +108441,14 @@ in sources."one-time-1.0.0" sources."onetime-5.1.2" sources."open-6.4.0" - sources."openapi3-ts-3.1.2" + sources."openapi3-ts-3.2.0" 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."registry-auth-token-4.2.2" - sources."semver-6.3.0" - ]; - }) sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -107717,7 +108463,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" @@ -107729,12 +108474,12 @@ in }) sources."proto-list-1.2.4" sources."proto3-json-serializer-1.1.0" - (sources."protobufjs-7.1.2" // { + (sources."protobufjs-7.2.2" // { dependencies = [ sources."long-5.2.1" ]; }) - (sources."protobufjs-cli-1.0.2" // { + (sources."protobufjs-cli-1.1.1" // { dependencies = [ sources."glob-8.1.0" sources."minimatch-5.1.6" @@ -107751,11 +108496,11 @@ in sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + 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."raw-body-2.5.2" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -107763,7 +108508,7 @@ in ]; }) sources."re2-1.18.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" (sources."readdir-glob-1.1.2" // { dependencies = [ sources."minimatch-5.1.6" @@ -107783,12 +108528,11 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."requizzle-0.2.4" - sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.13.1" sources."retry-request-5.0.2" sources."rimraf-3.0.2" - (sources."router-1.3.7" // { + (sources."router-1.3.8" // { dependencies = [ sources."array-flatten-3.0.0" sources."debug-2.6.9" @@ -107846,20 +108590,19 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" - (sources."superstatic-9.0.2" // { + (sources."superstatic-9.0.3" // { dependencies = [ - sources."commander-9.5.0" + sources."commander-10.0.0" sources."isarray-0.0.1" - sources."minimatch-5.1.6" + sources."minimatch-6.2.0" sources."path-to-regexp-1.8.0" ]; }) sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" - sources."taffydb-2.6.2" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" ]; }) sources."tar-stream-2.2.0" @@ -107871,7 +108614,6 @@ in 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" @@ -107879,7 +108621,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" @@ -107898,16 +108640,11 @@ in (sources."unzipper-0.10.11" // { dependencies = [ sources."bluebird-3.4.7" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) (sources."update-notifier-cjs-5.1.6" // { dependencies = [ sources."semver-7.3.8" @@ -107915,7 +108652,6 @@ in }) 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" @@ -107927,7 +108663,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-fetch-3.6.2" @@ -108174,7 +108910,7 @@ in sources."type-fest-1.4.0" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" @@ -108204,7 +108940,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" @@ -108245,7 +108981,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.18" + sources."@types/node-18.14.2" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -108367,12 +109103,12 @@ in sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mute-stream-0.0.8" sources."nedb-1.8.0" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."number-to-bn-1.7.0" // { dependencies = [ @@ -108390,11 +109126,11 @@ in sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."reflect-metadata-0.1.13" sources."request-2.88.2" sources."request-promise-4.2.6" @@ -108438,7 +109174,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.8.1" + sources."web3-utils-1.8.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -108486,6 +109222,7 @@ in dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" + sources."@types/triple-beam-1.3.2" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -108497,7 +109234,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.6" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" @@ -108573,7 +109310,7 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.2" sources."deep-equal-2.2.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."director-1.2.7" sources."dot-prop-4.2.1" @@ -108629,7 +109366,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" // { @@ -108655,7 +109392,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.1" @@ -108696,7 +109433,7 @@ in sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."lazy-1.0.11" - (sources."logform-2.4.2" // { + (sources."logform-2.5.1" // { dependencies = [ sources."ms-2.1.3" ]; @@ -108711,7 +109448,7 @@ in sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; }) sources."ms-2.0.0" @@ -108763,7 +109500,7 @@ in (sources."prettyjson-1.2.5" // { dependencies = [ sources."colors-1.4.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; }) sources."process-nextick-args-2.0.1" @@ -108775,7 +109512,7 @@ in }) sources."ps-tree-1.2.0" sources."read-1.0.7" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -108901,12 +109638,12 @@ in (sources."winston-3.8.2" // { dependencies = [ sources."async-3.2.4" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."wordwrap-0.0.3" @@ -108961,15 +109698,15 @@ in ganache = nodeEnv.buildNodePackage { name = "ganache"; packageName = "ganache"; - version = "7.7.3"; + version = "7.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/ganache/-/ganache-7.7.3.tgz"; - sha512 = "dZTUHjzSuvDTMUpKaBTWJnpcWpsBUtqciA8ttdmC/r/XRXJhDa0EpypisYULhoV8tx76G08mOuM/B1vhPbh20A=="; + url = "https://registry.npmjs.org/ganache/-/ganache-7.7.5.tgz"; + sha512 = "H8ybC7l9hhvor61uS4wvQ7UOYpgc4OcqZvFb3XGutPwbxQL4yYDoNjOumfUcq4JalYZF9ojzy95ss7lOvrw76w=="; }; dependencies = [ sources."@types/bn.js-5.1.1" sources."@types/lru-cache-5.1.1" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -109008,21 +109745,21 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "5.4.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.4.0.tgz"; - sha512 = "3b6PGhv89mtIabur6Al7O/0cDoazgQfNjQzeKqsboRyaZCanJZsZnk6mDaHBYBSUfq6M+8TQWZvNlvxnF2kwig=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.7.0.tgz"; + sha512 = "8rfBCWsnzNeWMSOfnylJ6EjGJAVWhGrT1gvnchWlzT/fe9e63Xq3bW2cGTEqozPPxYJasxJ730gg3/LcGYuNgQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -109033,13 +109770,13 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.12" + sources."@babel/helper-create-class-features-plugin-7.21.0" sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.2" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-replace-supers-7.20.7" @@ -109048,21 +109785,21 @@ in 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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-typescript-7.20.7" - sources."@babel/preset-typescript-7.18.6" - sources."@babel/runtime-7.20.7" + sources."@babel/plugin-transform-typescript-7.21.0" + sources."@babel/preset-typescript-7.21.0" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -109076,12 +109813,12 @@ 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.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."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.1" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" @@ -109094,7 +109831,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -109113,7 +109850,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -109121,7 +109858,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109158,7 +109895,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.9.0" - sources."create-gatsby-3.4.0" + sources."create-gatsby-3.7.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -109182,7 +109919,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -109214,22 +109951,10 @@ in 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-4.4.0" - (sources."gatsby-telemetry-4.4.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.7.0" + sources."gatsby-telemetry-4.7.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -109239,6 +109964,7 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."has-flag-3.0.0" + sources."hash-wasm-4.9.0" (sources."hosted-git-info-3.0.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -109246,7 +109972,7 @@ in ]; }) 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" @@ -109269,7 +109995,7 @@ in sources."is-valid-path-0.1.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."joi-17.7.0" + sources."joi-17.8.3" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" @@ -109295,15 +110021,19 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."msgpackr-1.8.1" - sources."msgpackr-extract-2.2.0" + sources."msgpackr-1.8.4" + (sources."msgpackr-extract-3.0.1" // { + dependencies = [ + sources."node-gyp-build-optional-packages-5.0.7" + ]; + }) sources."mute-stream-0.0.8" sources."nice-try-1.0.5" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-optional-packages-5.0.3" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.1.1" @@ -109333,9 +110063,9 @@ in sources."pump-3.0.0" sources."quick-lru-5.1.1" sources."read-1.0.7" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readable-web-to-node-stream-3.0.2" - sources."redux-4.2.0" + sources."redux-4.2.1" sources."regenerator-runtime-0.13.11" (sources."renderkid-2.0.7" // { dependencies = [ @@ -109379,7 +110109,6 @@ in sources."strip-final-newline-2.0.0" 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" @@ -109439,10 +110168,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.2.tgz"; - sha512 = "MWUDKWKtsYNT/eNZcFYoxHPatM4aAUFjSiI19RTOozd1tDiHBkIzWY28bRcE81eanJU3HQ8Djle5hDQG04K0hg=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.4.tgz"; + sha512 = "HKO4Y5QTk75XTcCZeOTipIrifN4yo91Phe5gva6FSEeZcBIUhL0DtAvXBNkar4rRXjkp6OxmJW5q0c94xJcb5A=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -109472,7 +110201,6 @@ in 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.1.0" sources."minimatch-5.1.6" ]; @@ -109514,7 +110242,11 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + (sources."are-we-there-yet-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) sources."argparse-1.0.10" sources."array-differ-3.0.0" sources."array-union-2.1.0" @@ -109530,8 +110262,12 @@ in ]; }) sources."binaryextensions-4.18.0" - sources."bl-4.1.0" - sources."brace-expansion-1.1.11" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."builtins-1.0.3" @@ -109545,16 +110281,10 @@ in sources."cli-spinners-2.7.0" sources."cli-table-0.3.11" sources."cli-width-3.0.0" - sources."clone-1.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" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."cloneable-readable-1.1.3" sources."cmd-shim-5.0.0" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" @@ -109577,7 +110307,11 @@ in sources."debug-4.3.4" sources."debuglog-1.0.1" sources."deep-extend-0.6.0" - sources."defaults-1.0.4" + (sources."defaults-1.0.4" // { + dependencies = [ + sources."clone-1.0.4" + ]; + }) sources."delegates-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" @@ -109606,20 +110340,13 @@ in sources."figures-3.2.0" (sources."filelist-1.0.4" // { dependencies = [ - sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" ]; }) sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."find-yarn-workspace-root2-1.2.16" - (sources."first-chunk-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."first-chunk-stream-2.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -109627,7 +110354,12 @@ in sources."get-stdin-4.0.1" sources."get-stream-6.0.1" sources."github-username-6.0.0" - sources."glob-7.2.3" + (sources."glob-7.2.3" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.10" @@ -109641,7 +110373,7 @@ 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" @@ -109649,7 +110381,12 @@ in sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.2.4" - sources."ignore-walk-4.0.1" + (sources."ignore-walk-4.0.1" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -109673,9 +110410,14 @@ in sources."is-unicode-supported-0.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.10" + sources."isbinaryfile-5.0.0" sources."isexe-2.0.0" - sources."jake-10.8.5" + (sources."jake-10.8.5" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."json-parse-even-better-errors-2.3.1" @@ -109695,14 +110437,14 @@ in sources."log-symbols-4.1.0" 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-2.3.0" + sources."mem-fs-editor-9.7.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."minimatch-7.3.0" + sources."minimist-1.2.8" sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -109714,14 +110456,20 @@ in sources."mkdirp-1.0.4" sources."mkdirp-infer-owner-2.0.0" sources."ms-2.1.2" - sources."multimatch-5.0.0" + (sources."multimatch-5.0.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."mute-stream-0.0.8" sources."negotiator-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" (sources."node-gyp-8.4.1" // { dependencies = [ sources."are-we-there-yet-3.0.1" sources."npmlog-6.0.2" + sources."readable-stream-3.6.1" sources."which-2.0.2" ]; }) @@ -109747,11 +110495,10 @@ in sources."@npmcli/fs-2.1.2" sources."@npmcli/move-file-2.0.1" sources."@tootallnate/once-2.0.0" - sources."brace-expansion-2.0.1" sources."cacache-16.1.3" sources."glob-8.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."minipass-fetch-2.1.2" @@ -109820,12 +110567,12 @@ in ]; }) sources."read-pkg-up-7.0.1" - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.8" sources."readdir-scoped-modules-1.1.0" sources."rechoir-0.6.2" sources."remove-trailing-separator-1.1.0" sources."replace-ext-1.0.1" - sources."request-light-0.6.0" + sources."request-light-0.7.0" sources."resolve-1.22.1" sources."restore-cursor-3.1.0" sources."retry-0.12.0" @@ -109834,7 +110581,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-7.8.0" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" sources."scoped-regex-2.1.0" @@ -109856,7 +110603,7 @@ in sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."strip-bom-buf-1.0.0" @@ -109867,7 +110614,7 @@ in sources."taketalk-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" ]; }) sources."text-table-0.2.0" @@ -109878,7 +110625,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" @@ -109888,11 +110635,7 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - (sources."vinyl-2.2.1" // { - dependencies = [ - sources."clone-2.1.2" - ]; - }) + sources."vinyl-2.2.1" sources."vinyl-file-3.0.0" sources."walk-up-path-1.0.0" sources."wcwidth-1.0.1" @@ -109905,16 +110648,19 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-4.0.2" sources."yallist-4.0.0" - (sources."yeoman-environment-3.13.0" // { + (sources."yeoman-environment-3.15.1" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."escape-string-regexp-4.0.0" sources."find-up-5.0.0" + sources."isbinaryfile-4.0.10" sources."locate-path-6.0.0" + sources."minimatch-3.1.2" sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."yeoman-generator-5.7.0" + sources."yeoman-generator-5.8.0" sources."yocto-queue-0.1.0" (sources."yosay-2.0.2" // { dependencies = [ @@ -109974,8 +110720,8 @@ in sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."iterall-1.3.0" - sources."minimist-1.2.7" - sources."node-fetch-2.6.8" + sources."minimist-1.2.8" + sources."node-fetch-2.6.9" sources."safer-buffer-2.1.2" sources."supports-color-5.5.0" sources."tr46-0.0.3" @@ -110063,14 +110809,14 @@ in sources."jsonpointer-5.0.1" sources."kvgraph-0.1.0" sources."kvset-1.0.0" - sources."libsodium-0.7.10" - sources."libsodium-wrappers-0.7.10" + sources."libsodium-0.7.11" + sources."libsodium-wrappers-0.7.11" sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."moment-2.29.4" sources."moo-0.5.2" @@ -110253,7 +110999,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -110286,13 +111032,13 @@ 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.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" @@ -110326,7 +111072,7 @@ in sources."qs-6.11.0" sources."query-string-7.1.3" sources."quick-lru-5.1.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" sources."restore-cursor-4.0.0" @@ -110357,10 +111103,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "7.0.3"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-7.0.3.tgz"; - sha512 = "SXSREEuKbxiU/FAaCxvqSNCBeMKbOw0JoilOPb7DJ1hJZclbzD/OTPcFEJWkMgnIDFcWgEew1jS9yVDt3KKD5A=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-8.0.0.tgz"; + sha512 = "2KZhSp8k7v+8b5kwqTopO/XURRfFlumzKpqk7GEbxU16Tg8JSu5z6nxvSXwEhkJgID/i9IMZXHYK/+CQeO+cfA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -110380,7 +111126,7 @@ 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.12.0" @@ -110393,32 +111139,28 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."ansi-escapes-6.0.0" + (sources."ansi-escapes-6.0.0" // { + dependencies = [ + sources."type-fest-3.6.1" + ]; + }) sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" sources."arrify-1.0.1" sources."ast-types-0.13.4" - sources."atomically-1.7.0" + sources."atomically-2.0.1" sources."base64-js-1.5.1" sources."bl-5.1.0" - (sources."boxen-7.0.1" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) + sources."boxen-7.0.1" sources."buffer-6.0.3" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.8" sources."camelcase-7.0.1" - (sources."camelcase-keys-8.0.2" // { - dependencies = [ - sources."type-fest-2.19.0" - ]; - }) + sources."camelcase-keys-8.0.2" sources."chalk-5.2.0" sources."chardet-0.7.0" - sources."ci-info-3.7.1" + sources."ci-info-3.8.0" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.7.0" @@ -110426,13 +111168,17 @@ in sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."conf-10.2.0" + sources."conf-11.0.1" (sources."config-chain-1.1.13" // { dependencies = [ sources."ini-1.3.8" ]; }) - sources."configstore-6.0.0" + (sources."configstore-6.0.0" // { + dependencies = [ + sources."dot-prop-6.0.1" + ]; + }) sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."crypto-random-string-4.0.0" // { @@ -110441,7 +111187,7 @@ in ]; }) sources."data-uri-to-buffer-4.0.1" - sources."debounce-fn-4.0.0" + sources."debounce-fn-5.1.2" sources."debug-4.3.4" sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { @@ -110461,10 +111207,10 @@ in sources."defer-to-connect-2.0.1" sources."degenerator-3.0.2" sources."depd-2.0.0" - sources."dot-prop-6.0.1" + sources."dot-prop-7.2.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."env-paths-2.2.1" + sources."env-paths-3.0.0" sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-5.0.0" @@ -110472,19 +111218,14 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - (sources."execa-6.1.0" // { - dependencies = [ - sources."mimic-fn-4.0.0" - sources."onetime-6.0.0" - ]; - }) + sources."execa-7.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" sources."fetch-blob-3.2.0" sources."figures-5.0.0" sources."file-uri-to-path-2.0.0" - sources."find-up-3.0.0" + sources."find-up-6.3.0" sources."form-data-encoder-2.1.4" sources."formdata-polyfill-4.0.10" sources."fs-extra-8.1.0" @@ -110511,10 +111252,10 @@ in sources."has-yarn-3.0.0" (sources."hosted-git-info-5.2.1" // { dependencies = [ - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.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."http2-wrapper-2.2.0" // { @@ -110523,7 +111264,7 @@ in ]; }) sources."https-proxy-agent-5.0.1" - sources."human-signals-3.0.1" + sources."human-signals-4.3.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-4.0.0" @@ -110554,29 +111295,29 @@ in sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-7.0.3" + sources."json-schema-typed-8.0.1" sources."jsonfile-4.0.0" sources."keyv-4.5.2" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."levn-0.3.0" sources."lines-and-columns-1.2.4" - (sources."locate-path-3.0.0" // { - dependencies = [ - sources."path-exists-3.0.0" - ]; - }) + sources."locate-path-7.2.0" sources."lodash-4.17.21" sources."log-symbols-5.1.0" sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - sources."meow-11.0.0" + (sources."meow-11.0.0" // { + dependencies = [ + sources."type-fest-3.6.1" + ]; + }) sources."merge-stream-2.0.0" - sources."mimic-fn-3.1.0" + sources."mimic-fn-4.0.0" sources."mimic-response-4.0.0" sources."min-indent-1.0.1" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -110590,18 +111331,13 @@ in sources."path-key-4.0.0" ]; }) - (sources."onetime-5.1.2" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) + sources."onetime-6.0.0" sources."optionator-0.8.3" sources."ora-6.1.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" sources."pac-proxy-agent-5.0.0" sources."pac-resolver-5.0.1" sources."package-json-8.1.0" @@ -110609,7 +111345,6 @@ in sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."picocolors-1.0.0" - sources."pkg-up-3.1.0" sources."prelude-ls-1.1.2" sources."proto-list-1.2.4" (sources."proxy-agent-5.0.0" // { @@ -110619,10 +111354,10 @@ in ]; }) sources."proxy-from-env-1.1.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."quick-lru-6.1.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -110632,26 +111367,22 @@ in dependencies = [ sources."hosted-git-info-4.1.0" sources."normalize-package-data-3.0.3" - sources."type-fest-2.19.0" ]; }) - (sources."read-pkg-up-9.1.0" // { - dependencies = [ - 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" + sources."read-pkg-up-9.1.0" + sources."readable-stream-3.6.1" sources."redent-4.0.0" sources."registry-auth-token-5.0.1" sources."registry-url-6.0.1" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - sources."restore-cursor-4.0.0" + (sources."restore-cursor-4.0.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + ]; + }) sources."run-async-2.4.1" sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" @@ -110681,14 +111412,15 @@ in sources."strip-final-newline-3.0.0" sources."strip-indent-4.0.0" sources."strip-json-comments-2.0.1" + sources."stubborn-fs-1.2.4" sources."supports-color-5.5.0" sources."through-2.3.8" 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.5.2" + sources."type-fest-2.19.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."universalify-0.1.2" @@ -110697,14 +111429,15 @@ in sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."validator-13.7.0" - sources."vm2-3.9.13" + sources."validator-13.9.0" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.2.1" + sources."when-exit-2.1.0" 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" @@ -110725,24 +111458,23 @@ in glob = nodeEnv.buildNodePackage { name = "glob"; packageName = "glob"; - version = "8.1.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"; - sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; + url = "https://registry.npmjs.org/glob/-/glob-9.0.1.tgz"; + sha512 = "psRdn8MI0gRcH0xow0VOhYxXD/6ZaRGmgtfN0oWN/hCgjxpRQBMCl7wE4JRJSAUTdJsW+FmD0EtE0CgJhKqSVw=="; }; dependencies = [ sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."minimatch-5.1.6" - sources."once-1.4.0" - sources."wrappy-1.0.2" + sources."lru-cache-7.17.0" + sources."minimatch-7.3.0" + sources."minipass-4.2.4" + sources."path-scurry-1.5.0" ]; buildInputs = globalBuildInputs; meta = { - description = "a little globber"; + description = "the most correct and second fastest glob implementation in JavaScript"; homepage = "https://github.com/isaacs/node-glob#readme"; license = "ISC"; }; @@ -110771,7 +111503,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."cli-progress-3.11.2" + sources."cli-progress-3.12.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -110836,10 +111568,10 @@ in ]; }) sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -110856,7 +111588,7 @@ in ]; }) sources."query-string-7.1.3" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -110898,7 +111630,7 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" ]; @@ -110933,7 +111665,7 @@ in sources."iconv-lite-0.6.3" sources."idb-keyval-6.2.0" sources."inversify-6.0.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."reflect-metadata-0.1.13" sources."safari-14-idb-fix-3.0.0" sources."safer-buffer-2.1.2" @@ -111032,10 +111764,10 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.7.15" // { + (sources."@graphql-tools/import-6.7.17" // { dependencies = [ - sources."@graphql-tools/utils-9.1.4" - sources."tslib-2.4.1" + sources."@graphql-tools/utils-9.2.1" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -111047,7 +111779,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) ]; @@ -111063,7 +111795,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" // { @@ -111085,6 +111817,7 @@ in sources."value-or-promise-1.0.6" ]; }) + sources."@graphql-typed-document-node/core-3.1.2" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@microsoft/fetch-event-source-2.0.1" @@ -111093,7 +111826,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.18" + sources."@types/node-18.14.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -111180,7 +111913,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."duplexer3-0.1.5" @@ -111224,7 +111957,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" @@ -111255,7 +111988,7 @@ 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" @@ -111281,7 +112014,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.1" sources."is-arrayish-0.2.1" @@ -111348,7 +112081,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" @@ -111366,7 +112099,7 @@ in sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-3.3.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -111375,7 +112108,7 @@ 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" @@ -111390,7 +112123,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.6.2" + sources."yargs-17.7.1" ]; }) sources."oas-schema-walker-1.1.5" @@ -111434,7 +112167,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" @@ -111447,7 +112180,7 @@ in sources."prepend-http-2.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -111502,7 +112235,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.6.2" + sources."yargs-17.7.1" ]; }) sources."symbol-observable-1.2.0" @@ -111565,10 +112298,10 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.14"; + version = "3.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.14.tgz"; - sha512 = "1jPvSEWMTNiro1Ao0wJV9ApMP4R0axnXKS0jTJqh+IsySgHBmO2suflPxewYdWMMv6StMqF9ITX5IXrW9E7bbw=="; + 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" @@ -111576,26 +112309,26 @@ 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.7" + sources."@babel/parser-7.21.2" sources."@babel/polyfill-7.12.1" - sources."@babel/types-7.20.7" + sources."@babel/types-7.21.2" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.5.15" - sources."@graphql-tools/delegate-9.0.22" - sources."@graphql-tools/executor-0.0.12" - sources."@graphql-tools/executor-graphql-ws-0.0.6" - 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.9" - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - sources."@graphql-tools/url-loader-7.17.2" - sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.1" - sources."@graphql-typed-document-node/core-3.1.1" + sources."@graphql-tools/batch-execute-8.5.18" + sources."@graphql-tools/delegate-9.0.28" + sources."@graphql-tools/executor-0.0.15" + sources."@graphql-tools/executor-graphql-ws-0.0.11" + sources."@graphql-tools/executor-http-0.1.9" + sources."@graphql-tools/executor-legacy-ws-0.0.9" + sources."@graphql-tools/graphql-file-loader-7.5.16" + sources."@graphql-tools/import-6.7.17" + sources."@graphql-tools/json-file-loader-7.4.17" + sources."@graphql-tools/load-7.8.12" + sources."@graphql-tools/merge-8.3.18" + sources."@graphql-tools/schema-9.0.16" + sources."@graphql-tools/url-loader-7.17.13" + sources."@graphql-tools/utils-9.2.1" + sources."@graphql-tools/wrap-9.3.7" + sources."@graphql-typed-document-node/core-3.1.2" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -111604,17 +112337,18 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/parse-json-4.0.0" 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."@vue/compiler-core-3.2.47" + sources."@vue/compiler-dom-3.2.47" + sources."@vue/compiler-sfc-3.2.47" + sources."@vue/compiler-ssr-3.2.47" + sources."@vue/reactivity-transform-3.2.47" + sources."@vue/shared-3.2.47" + sources."@whatwg-node/events-0.0.2" + sources."@whatwg-node/fetch-0.8.1" + sources."@whatwg-node/node-fetch-0.3.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."arg-4.1.3" @@ -111636,7 +112370,7 @@ in sources."cosmiconfig-7.0.1" sources."cosmiconfig-toml-loader-1.0.0" sources."create-require-1.1.1" - sources."dataloader-2.1.0" + sources."dataloader-2.2.2" sources."diff-4.0.2" sources."dir-glob-3.0.1" sources."dotenv-8.2.0" @@ -111647,17 +112381,13 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" - sources."event-target-shim-5.0.1" sources."extract-files-11.0.0" + sources."fast-decode-uri-component-1.0.1" sources."fast-glob-3.2.12" + sources."fast-querystring-1.1.1" + sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" sources."fill-range-7.0.1" - sources."form-data-encoder-1.7.2" - (sources."formdata-node-4.4.1" // { - dependencies = [ - sources."web-streams-polyfill-4.0.0-beta.3" - ]; - }) sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.2.3" @@ -111670,9 +112400,9 @@ in sources."minimatch-4.2.1" ]; }) - sources."graphql-language-service-5.1.0" - sources."graphql-language-service-server-2.9.4" - sources."graphql-ws-5.11.2" + sources."graphql-language-service-5.1.1" + sources."graphql-language-service-server-2.9.5" + sources."graphql-ws-5.11.3" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."ignore-5.2.4" @@ -111701,9 +112431,8 @@ 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-domexception-1.0.0" - sources."node-fetch-2.6.8" + sources."node-abort-controller-3.1.1" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" @@ -111716,6 +112445,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."postcss-8.4.21" + sources."punycode-1.4.1" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."queue-microtask-1.2.3" @@ -111740,20 +112470,19 @@ 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.9.4" - sources."undici-5.15.0" + sources."tslib-2.5.0" + sources."typescript-4.9.5" sources."unixify-1.0.0" sources."urlpattern-polyfill-6.0.2" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" 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-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-3.0.7" sources."web-streams-polyfill-3.2.1" - sources."webcrypto-core-1.7.5" + sources."webcrypto-core-1.7.6" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" (sources."wrap-ansi-7.0.0" // { @@ -111764,7 +112493,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-16.2.0" @@ -111807,37 +112536,37 @@ in }) sources."@cronvel/get-pixels-3.4.1" sources."@cspotcode/source-map-support-0.8.1" - sources."@graphql-tools/batch-execute-8.5.15" - sources."@graphql-tools/delegate-9.0.22" - sources."@graphql-tools/executor-0.0.12" - (sources."@graphql-tools/executor-graphql-ws-0.0.6" // { + sources."@graphql-tools/batch-execute-8.5.18" + sources."@graphql-tools/delegate-9.0.28" + sources."@graphql-tools/executor-0.0.15" + (sources."@graphql-tools/executor-graphql-ws-0.0.11" // { dependencies = [ sources."isomorphic-ws-5.0.0" - sources."ws-8.12.0" + sources."ws-8.12.1" ]; }) - sources."@graphql-tools/executor-http-0.1.1" - (sources."@graphql-tools/executor-legacy-ws-0.0.6" // { + sources."@graphql-tools/executor-http-0.1.9" + (sources."@graphql-tools/executor-legacy-ws-0.0.9" // { dependencies = [ sources."isomorphic-ws-5.0.0" - sources."ws-8.12.0" + sources."ws-8.12.1" ]; }) - 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.9" - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - (sources."@graphql-tools/url-loader-7.17.2" // { + sources."@graphql-tools/graphql-file-loader-7.5.16" + sources."@graphql-tools/import-6.7.17" + sources."@graphql-tools/json-file-loader-7.4.17" + sources."@graphql-tools/load-7.8.12" + sources."@graphql-tools/merge-8.3.18" + sources."@graphql-tools/schema-9.0.16" + (sources."@graphql-tools/url-loader-7.17.13" // { dependencies = [ sources."isomorphic-ws-5.0.0" - sources."ws-8.12.0" + sources."ws-8.12.1" ]; }) - sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.1" - sources."@graphql-typed-document-node/core-3.1.1" + sources."@graphql-tools/utils-9.2.1" + sources."@graphql-tools/wrap-9.3.7" + sources."@graphql-typed-document-node/core-3.1.2" sources."@iarna/toml-2.2.5" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" @@ -111849,7 +112578,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" ]; @@ -111878,29 +112607,30 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.37" 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.18" + sources."@types/node-18.14.2" sources."@types/ws-8.5.4" - sources."@whatwg-node/fetch-0.6.2" - sources."abort-controller-3.0.0" + sources."@whatwg-node/events-0.0.2" + sources."@whatwg-node/fetch-0.8.1" + sources."@whatwg-node/node-fetch-0.3.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" @@ -111953,7 +112683,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."content-disposition-0.5.2" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."cosmiconfig-8.0.0" @@ -111966,7 +112696,7 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."dataloader-2.1.0" + sources."dataloader-2.2.2" sources."debug-4.3.4" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -111986,7 +112716,6 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-target-shim-5.0.1" sources."eventemitter3-3.1.2" (sources."express-4.16.3" // { dependencies = [ @@ -111996,7 +112725,10 @@ in }) sources."extract-files-11.0.0" sources."extract-stack-1.0.0" + sources."fast-decode-uri-component-1.0.1" sources."fast-glob-3.2.12" + sources."fast-querystring-1.1.1" + sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.1" // { @@ -112005,12 +112737,6 @@ in sources."ms-2.0.0" ]; }) - sources."form-data-encoder-1.7.2" - (sources."formdata-node-4.4.1" // { - dependencies = [ - sources."web-streams-polyfill-4.0.0-beta.3" - ]; - }) sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-extra-8.1.0" @@ -112018,7 +112744,7 @@ in sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."graphql-15.4.0" - sources."graphql-config-4.4.0" + sources."graphql-config-4.4.1" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-16.6.0" @@ -112036,7 +112762,7 @@ in ]; }) sources."graphql-language-service-utils-2.5.1" - sources."graphql-ws-5.11.2" + sources."graphql-ws-5.11.3" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -112093,8 +112819,7 @@ in sources."nextgen-events-1.5.3" sources."nice-try-1.0.5" sources."node-bitmap-0.0.1" - sources."node-domexception-1.0.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" @@ -112112,6 +112837,7 @@ in sources."picomatch-2.3.1" sources."pngjs-6.0.0" sources."proxy-addr-2.0.7" + sources."punycode-1.4.1" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."qs-6.5.1" @@ -112174,23 +112900,22 @@ 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.9.4" - sources."undici-5.15.0" + sources."typescript-4.9.5" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."urlpattern-polyfill-6.0.2" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" sources."utils-merge-1.0.1" sources."v8-compile-cache-lib-3.0.1" sources."value-or-promise-1.0.12" sources."vary-1.1.2" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."web-streams-polyfill-3.2.1" - sources."webcrypto-core-1.7.5" + sources."webcrypto-core-1.7.6" sources."webidl-conversions-3.0.1" sources."whatwg-fetch-3.6.2" sources."whatwg-url-5.0.0" @@ -112327,7 +113052,7 @@ in sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."debug-2.6.9" @@ -112343,7 +113068,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" @@ -112356,7 +113081,7 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."ms-2.0.0" sources."negotiator-0.6.3" sources."object-inspect-1.12.3" @@ -112516,7 +113241,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.11" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -112579,7 +113304,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.6" sources."async-settle-1.0.0" sources."atob-2.1.2" sources."bach-1.2.0" @@ -112650,7 +113375,7 @@ in ]; }) sources."default-resolution-2.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."detect-file-1.0.0" sources."duplexify-3.7.1" @@ -112718,7 +113443,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" // { @@ -112856,7 +113581,7 @@ in sources."pumpify-1.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdirp-2.2.1" sources."rechoir-0.6.2" sources."regex-not-1.0.2" @@ -113069,7 +113794,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."default-compare-1.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."detect-file-1.0.0" (sources."each-props-1.3.2" // { @@ -113129,7 +113854,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" @@ -113267,7 +113992,7 @@ in sources."process-nextick-args-2.0.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."rechoir-0.6.2" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" @@ -113457,7 +114182,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."minimatch-3.1.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."safer-buffer-2.1.2" @@ -113500,7 +114225,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" @@ -113510,7 +114235,7 @@ in sources."iconv-lite-0.6.3" sources."lodash-4.17.21" sources."mime-1.6.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.3" sources."object-inspect-1.12.3" @@ -113540,27 +114265,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" @@ -113569,9 +114306,9 @@ 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."bval-0.1.7" sources."bweb-0.1.12" sources."goosig-0.10.0" sources."hs-client-0.0.13" @@ -113579,7 +114316,7 @@ in 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 = { @@ -113725,7 +114462,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1296.0" + sources."aws-sdk-2.1324.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -113775,7 +114512,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" @@ -113842,10 +114579,10 @@ in sources."marked-4.2.12" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."moment-2.29.4" - sources."moment-timezone-0.5.40" + sources."moment-timezone-0.5.41" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."named-regexp-0.1.1" @@ -113864,7 +114601,7 @@ in sources."qs-6.5.3" sources."querystring-0.2.0" sources."read-1.0.7" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."recursive-readdir-sync-1.0.6" (sources."request-2.88.2" // { dependencies = [ @@ -113890,7 +114627,7 @@ in sources."strip-ansi-6.0.1" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" @@ -113899,7 +114636,7 @@ in sources."underscore-1.12.1" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -114016,7 +114753,7 @@ in (sources."duplexify-3.7.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -114094,7 +114831,7 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."nested-error-stacks-1.0.2" @@ -114113,14 +114850,14 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."rc-1.2.8" (sources."read-all-stream-3.1.0" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -114174,7 +114911,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites"; - homepage = "https://github.com/remy/inliner"; + homepage = "http://github.com/remy/inliner"; license = "MIT"; }; production = true; @@ -114210,7 +114947,7 @@ in sources."minimist-0.0.10" (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; }) sources."moment-2.29.4" @@ -114247,27 +114984,27 @@ in immich = nodeEnv.buildNodePackage { name = "immich"; packageName = "immich"; - version = "0.28.0"; + version = "0.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/immich/-/immich-0.28.0.tgz"; - sha512 = "Dz/z1OBeB4r9PJY1Owzk6JQZVHjPja8rx7icUuPIGXaAajohO5mjgE0/j+/846Of5X1P5wQW6aIS3Y3QCA1v8A=="; + url = "https://registry.npmjs.org/immich/-/immich-0.32.0.tgz"; + sha512 = "Ki9iItl6wFDlyjwBuhgUvHnXU+KBH88UG8HD//ZphcHZ/9MkBcDvf6BGzJ0jAn7gTJ35tMSiy7VWlVHS/Ks1GA=="; }; dependencies = [ sources."@ffprobe-installer/darwin-arm64-5.0.1" - sources."@ffprobe-installer/darwin-x64-5.0.0" - sources."@ffprobe-installer/ffprobe-1.4.1" - sources."@ffprobe-installer/linux-arm-5.0.0" - sources."@ffprobe-installer/linux-arm64-5.0.0" - sources."@ffprobe-installer/linux-ia32-5.0.0" - sources."@ffprobe-installer/linux-x64-5.0.0" - sources."@ffprobe-installer/win32-ia32-5.0.0" - sources."@ffprobe-installer/win32-x64-5.0.0" + sources."@ffprobe-installer/darwin-x64-5.1.0" + sources."@ffprobe-installer/ffprobe-1.4.2" + sources."@ffprobe-installer/linux-arm-5.1.0" + sources."@ffprobe-installer/linux-arm64-5.1.0" + sources."@ffprobe-installer/linux-ia32-5.1.0" + sources."@ffprobe-installer/linux-x64-5.1.0" + sources."@ffprobe-installer/win32-ia32-5.1.0" + sources."@ffprobe-installer/win32-x64-5.1.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."asynckit-0.4.0" sources."axios-0.26.1" sources."chalk-2.4.2" - sources."cli-progress-3.11.2" + sources."cli-progress-3.12.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" @@ -114302,7 +115039,7 @@ in sources."p-limit-3.1.0" sources."path-key-3.1.1" sources."picomatch-2.3.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -114314,7 +115051,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.11" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -114344,7 +115081,7 @@ in sources."commander-2.11.0" sources."encoding-0.1.13" sources."iconv-lite-0.6.3" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."source-map-0.7.4" @@ -114392,7 +115129,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.3" - sources."jquery.terminal-2.35.2" + sources."jquery.terminal-2.35.3" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" sources."nice-try-1.0.5" @@ -114426,10 +115163,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.4.tgz"; - sha512 = "iRYwXogGCu9NxWHN5UYqaKeAd9u+MDC8Mhvrwt+stRluSYWjyFqwQGVSuPStW0P8pFgSZ80mOthlA933wKRGKA=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.5.tgz"; + sha512 = "5iU2b84SLE3JOlfGU/g6XCzioEdcflmpHRxPLKEMhEzV43DHgBwbdsTagDtXKtO50hi8osrzA85/HOCglrylKA=="; }; dependencies = [ sources."@azure/abort-controller-1.1.0" @@ -114450,10 +115187,10 @@ in 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."@opentelemetry/core-1.9.1" + sources."@opentelemetry/resources-1.9.1" + sources."@opentelemetry/sdk-trace-base-1.9.1" + sources."@opentelemetry/semantic-conventions-1.9.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -114465,14 +115202,14 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.10.0" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" (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.10" + sources."@vscode/l10n-0.0.11" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -114513,7 +115250,7 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-4.3.4" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.1" @@ -114568,7 +115305,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" - sources."html-to-text-9.0.3" + sources."html-to-text-9.0.4" sources."htmlparser2-8.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" @@ -114605,11 +115342,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -114619,7 +115352,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."nopt-6.0.0" sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" @@ -114632,14 +115365,14 @@ in sources."picomatch-2.3.1" sources."process-0.11.10" sources."proto-list-1.2.4" - sources."protobufjs-7.1.2" + sources."protobufjs-7.2.2" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -114684,24 +115417,37 @@ in sources."to-regex-range-5.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-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.9.4" + sources."typescript-4.9.5" sources."universalify-0.2.0" sources."uri-js-4.4.1" sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + (sources."vscode-css-languageservice-6.2.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.3" + ]; + }) + sources."vscode-html-languageservice-5.0.4" + sources."vscode-jsonrpc-8.1.0" + (sources."vscode-languageserver-8.0.2" // { + dependencies = [ + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" + ]; + }) + (sources."vscode-languageserver-protocol-3.17.3" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.3" + ]; + }) sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" @@ -114751,7 +115497,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" @@ -114789,7 +115535,7 @@ in sources."diff-4.0.2" (sources."duplexer2-0.1.4" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -114829,7 +115575,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" @@ -114893,14 +115639,14 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.5.0" + sources."macos-release-2.5.1" sources."methods-1.1.2" sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -114936,8 +115682,8 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.11.0" - sources."raw-body-2.5.1" - sources."readable-stream-3.6.0" + sources."raw-body-2.5.2" + sources."readable-stream-3.6.1" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" @@ -114973,7 +115719,7 @@ in sources."statuses-2.0.1" (sources."stream-combiner2-1.1.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -115040,84 +115786,6 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz" = nodeEnv.buildNodePackage { - name = "iosevka"; - packageName = "iosevka"; - version = "15.6.3"; - 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"; - }; - dependencies = [ - sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.8.0" - sources."@ot-builder/bin-composite-types-1.5.5" - sources."@ot-builder/bin-util-1.5.5" - sources."@ot-builder/cli-help-shower-1.5.5" - sources."@ot-builder/cli-proc-1.5.5" - sources."@ot-builder/cli-shared-1.5.5" - sources."@ot-builder/common-impl-1.5.5" - sources."@ot-builder/errors-1.5.5" - sources."@ot-builder/io-bin-cff-1.5.5" - sources."@ot-builder/io-bin-encoding-1.5.5" - sources."@ot-builder/io-bin-ext-private-1.5.5" - sources."@ot-builder/io-bin-font-1.5.5" - sources."@ot-builder/io-bin-glyph-store-1.5.5" - sources."@ot-builder/io-bin-layout-1.5.5" - sources."@ot-builder/io-bin-metadata-1.5.5" - sources."@ot-builder/io-bin-metric-1.5.5" - sources."@ot-builder/io-bin-name-1.5.5" - sources."@ot-builder/io-bin-sfnt-1.5.5" - sources."@ot-builder/io-bin-ttf-1.5.5" - sources."@ot-builder/io-bin-vtt-private-1.5.5" - sources."@ot-builder/ot-1.5.5" - sources."@ot-builder/ot-encoding-1.5.5" - sources."@ot-builder/ot-ext-private-1.5.5" - sources."@ot-builder/ot-glyphs-1.5.5" - sources."@ot-builder/ot-layout-1.5.5" - sources."@ot-builder/ot-metadata-1.5.5" - sources."@ot-builder/ot-name-1.5.5" - sources."@ot-builder/ot-sfnt-1.5.5" - sources."@ot-builder/ot-standard-glyph-namer-1.5.5" - sources."@ot-builder/ot-vtt-private-1.5.5" - sources."@ot-builder/prelude-1.5.5" - sources."@ot-builder/primitive-1.5.5" - sources."@ot-builder/rectify-1.5.5" - sources."@ot-builder/stat-glyphs-1.5.5" - sources."@ot-builder/trace-1.5.5" - sources."@ot-builder/var-store-1.5.5" - sources."@ot-builder/variance-1.5.5" - sources."aglfn-1.0.2" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."chalk-4.1.2" - sources."clipper-lib-6.4.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."iconv-lite-0.6.3" - sources."lru-cache-6.0.0" - sources."ot-builder-1.5.5" - sources."otb-ttc-bundle-1.5.5" - sources."safer-buffer-2.1.2" - sources."semver-7.3.8" - sources."spiro-3.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."wawoff2-2.0.1" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; @@ -115200,7 +115868,7 @@ in sources."long-2.4.0" sources."loupe-2.3.6" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mz-2.7.0" sources."node-int64-0.4.0" sources."object-assign-4.1.1" @@ -115229,7 +115897,7 @@ in sources."vscode-languageserver-types-3.14.0" ]; }) - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" sources."xorshift-1.2.0" @@ -115248,10 +115916,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.9.1"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.9.1.tgz"; - sha512 = "5kjhOG5a2BA4KOkWsfGG0qDbVXkOoYEC9h6tb6KY1zFQTJ7bdLCeR35eyPy5ANfKmHh4tzc1A5SWcnHM8j3hNw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.10.3.tgz"; + sha512 = "MejQ3BgzGv/Okty7c8JkvbQmR9DbyhTS7slaF88Ai+HANgrbcflvLuNTHs/lefTChkrMvYLsgLUxFw3UshXt7w=="; }; dependencies = [ (sources."@aws-crypto/crc32-2.0.0" // { @@ -115297,14 +115965,14 @@ in sources."@aws-sdk/abort-controller-3.226.0" sources."@aws-sdk/chunked-blob-reader-3.188.0" sources."@aws-sdk/chunked-blob-reader-native-3.208.0" - (sources."@aws-sdk/client-s3-3.252.0" // { + (sources."@aws-sdk/client-s3-3.241.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/client-sso-3.252.0" - sources."@aws-sdk/client-sso-oidc-3.252.0" - (sources."@aws-sdk/client-sts-3.252.0" // { + sources."@aws-sdk/client-sso-3.241.0" + sources."@aws-sdk/client-sso-oidc-3.241.0" + (sources."@aws-sdk/client-sts-3.241.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; @@ -115312,10 +115980,10 @@ in sources."@aws-sdk/config-resolver-3.234.0" sources."@aws-sdk/credential-provider-env-3.226.0" sources."@aws-sdk/credential-provider-imds-3.226.0" - sources."@aws-sdk/credential-provider-ini-3.252.0" - sources."@aws-sdk/credential-provider-node-3.252.0" + sources."@aws-sdk/credential-provider-ini-3.241.0" + sources."@aws-sdk/credential-provider-node-3.241.0" sources."@aws-sdk/credential-provider-process-3.226.0" - sources."@aws-sdk/credential-provider-sso-3.252.0" + sources."@aws-sdk/credential-provider-sso-3.241.0" sources."@aws-sdk/credential-provider-web-identity-3.226.0" sources."@aws-sdk/eventstream-codec-3.226.0" sources."@aws-sdk/eventstream-serde-browser-3.226.0" @@ -115355,17 +116023,31 @@ in sources."@aws-sdk/property-provider-3.226.0" sources."@aws-sdk/protocol-http-3.226.0" sources."@aws-sdk/querystring-builder-3.226.0" - sources."@aws-sdk/querystring-parser-3.226.0" - sources."@aws-sdk/s3-request-presigner-3.252.0" + (sources."@aws-sdk/querystring-parser-3.272.0" // { + dependencies = [ + sources."@aws-sdk/types-3.272.0" + ]; + }) + sources."@aws-sdk/s3-request-presigner-3.241.0" sources."@aws-sdk/service-error-classification-3.229.0" sources."@aws-sdk/shared-ini-file-loader-3.226.0" sources."@aws-sdk/signature-v4-3.226.0" - sources."@aws-sdk/signature-v4-crt-3.226.0" + (sources."@aws-sdk/signature-v4-crt-3.272.0" // { + dependencies = [ + sources."@aws-sdk/signature-v4-3.272.0" + sources."@aws-sdk/types-3.272.0" + sources."@aws-sdk/util-middleware-3.272.0" + ]; + }) sources."@aws-sdk/signature-v4-multi-region-3.226.0" sources."@aws-sdk/smithy-client-3.234.0" - sources."@aws-sdk/token-providers-3.252.0" + sources."@aws-sdk/token-providers-3.241.0" sources."@aws-sdk/types-3.226.0" - sources."@aws-sdk/url-parser-3.226.0" + (sources."@aws-sdk/url-parser-3.226.0" // { + dependencies = [ + sources."@aws-sdk/querystring-parser-3.226.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" @@ -115375,7 +116057,7 @@ in sources."@aws-sdk/util-create-request-3.234.0" sources."@aws-sdk/util-defaults-mode-browser-3.234.0" sources."@aws-sdk/util-defaults-mode-node-3.234.0" - sources."@aws-sdk/util-endpoints-3.245.0" + sources."@aws-sdk/util-endpoints-3.241.0" sources."@aws-sdk/util-format-url-3.226.0" sources."@aws-sdk/util-hex-encoding-3.201.0" sources."@aws-sdk/util-locate-window-3.208.0" @@ -115386,60 +116068,34 @@ in sources."@aws-sdk/util-uri-escape-3.201.0" sources."@aws-sdk/util-user-agent-browser-3.226.0" sources."@aws-sdk/util-user-agent-node-3.226.0" + sources."@aws-sdk/util-utf8-3.254.0" sources."@aws-sdk/util-utf8-browser-3.188.0" sources."@aws-sdk/util-utf8-node-3.208.0" sources."@aws-sdk/util-waiter-3.226.0" sources."@aws-sdk/xml-builder-3.201.0" + sources."@babel/runtime-7.21.0" 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" - sources."@joplin/fork-htmlparser2-4.1.41" - sources."@joplin/fork-sax-1.2.45" - sources."@joplin/fork-uslug-1.0.6" - (sources."@joplin/htmlpack-2.9.1" // { - dependencies = [ - sources."fs-extra-10.1.0" - ]; - }) - (sources."@joplin/lib-2.9.1" // { - dependencies = [ - sources."debug-0.7.4" - sources."q-0.9.7" - sources."tcp-port-used-0.1.2" - ]; - }) - (sources."@joplin/renderer-2.9.1" // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - (sources."@joplin/turndown-4.0.63" // { - dependencies = [ - sources."css-2.2.4" - ]; - }) - sources."@joplin/turndown-plugin-gfm-1.0.45" + sources."@joplin/fork-htmlparser2-4.1.43" + sources."@joplin/fork-sax-1.2.47" + sources."@joplin/fork-uslug-1.0.8" + sources."@joplin/htmlpack-2.10.2" + sources."@joplin/lib-2.10.2" + sources."@joplin/renderer-2.10.2" + sources."@joplin/turndown-4.0.65" + sources."@joplin/turndown-plugin-gfm-1.0.47" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ - sources."ansi-regex-5.0.1" sources."are-we-there-yet-2.0.0" sources."gauge-3.0.2" sources."is-fullwidth-code-point-3.0.0" - sources."mkdirp-1.0.4" - sources."node-fetch-2.6.8" sources."npmlog-5.0.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" 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.13" - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" ]; }) (sources."@npmcli/fs-1.1.1" // { @@ -115453,19 +116109,15 @@ in sources."rimraf-3.0.2" ]; }) - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/ws-8.5.4" sources."abab-2.0.6" sources."abbrev-1.1.1" - sources."acorn-7.4.1" - (sources."acorn-globals-4.3.4" // { - dependencies = [ - sources."acorn-6.4.2" - ]; - }) - sources."acorn-walk-6.2.0" + sources."acorn-8.8.2" + sources."acorn-globals-7.0.1" + sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" @@ -115488,22 +116140,15 @@ in sources."are-we-there-yet-1.0.6" sources."argparse-2.0.1" sources."array-back-2.0.0" - sources."array-equal-1.0.0" - sources."array-flatten-3.0.0" sources."asap-2.0.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-mutex-0.1.4" + sources."async-mutex-0.4.0" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-crt-1.15.7" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."tar-6.1.13" - ]; - }) - (sources."aws-sdk-2.1296.0" // { + sources."aws-crt-1.15.9" + (sources."aws-sdk-2.1290.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -115517,7 +116162,7 @@ in sources."aws4-1.12.0" sources."axios-0.24.0" sources."balanced-match-1.0.2" - sources."base-64-0.1.0" + sources."base-64-1.0.0" sources."base64-js-1.5.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -115526,14 +116171,13 @@ in sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-3.7.2" sources."bowser-2.11.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browser-process-hrtime-1.0.0" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."buffer-indexof-polyfill-1.0.2" @@ -115543,14 +116187,11 @@ in sources."builtin-modules-3.3.0" (sources."cacache-15.3.0" // { dependencies = [ + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" sources."minipass-3.3.6" sources."mkdirp-1.0.4" sources."rimraf-3.0.2" - (sources."tar-6.1.13" // { - dependencies = [ - sources."minipass-4.0.0" - ]; - }) ]; }) sources."call-bind-1.0.2" @@ -115562,11 +116203,18 @@ in sources."chalk-4.1.2" sources."charenc-0.0.2" sources."chokidar-3.5.3" - sources."chownr-2.0.0" + sources."chownr-1.1.4" sources."chroma-js-2.4.2" sources."clean-css-4.2.4" sources."clean-stack-2.2.0" - sources."cliss-0.0.2" + (sources."cliss-0.0.2" // { + dependencies = [ + sources."ansi-regex-3.0.1" + sources."camelcase-4.1.0" + sources."strip-ansi-4.0.0" + sources."yargs-parser-7.0.0" + ]; + }) (sources."cliui-3.2.0" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -115575,47 +116223,47 @@ in (sources."cmake-js-6.3.2" // { dependencies = [ sources."axios-0.21.4" + sources."fs-extra-5.0.0" + sources."tar-4.4.19" + sources."yallist-3.1.1" ]; }) sources."code-point-at-1.1.0" - sources."color-3.1.2" + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.1" sources."color-support-1.1.3" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" - sources."commander-2.17.1" + sources."commander-2.20.3" sources."commist-1.1.0" sources."compare-version-0.1.2" sources."compare-versions-3.6.0" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" sources."crypt-0.0.2" sources."crypto-js-4.1.1" - (sources."css-3.0.0" // { - dependencies = [ - sources."source-map-resolve-0.6.0" - ]; - }) - sources."cssom-0.4.4" + sources."css-3.0.0" + sources."cssom-0.5.0" (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.8.1" - sources."d3-array-3.2.1" + 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.2" sources."d3-delaunay-6.0.2" @@ -115624,7 +116272,6 @@ in (sources."d3-dsv-3.0.1" // { dependencies = [ sources."commander-7.2.0" - sources."iconv-lite-0.6.3" ]; }) sources."d3-ease-3.0.1" @@ -115646,36 +116293,75 @@ in 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-d3-es-7.0.6" + 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."iconv-lite-0.4.24" + ]; + }) sources."dashdash-1.14.1" - sources."data-urls-1.1.0" + sources."data-urls-3.0.2" sources."datauri-4.1.0" sources."debug-4.3.4" sources."decamelize-1.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" sources."deepmerge-2.2.1" + sources."define-lazy-prop-2.0.0" sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-libc-2.0.1" sources."diff-match-patch-1.0.5" - (sources."dom-serializer-1.4.1" // { + (sources."dom-serializer-2.0.0" // { dependencies = [ - sources."domhandler-4.3.1" + sources."domhandler-5.0.3" + sources."entities-4.4.0" ]; }) sources."domelementtype-2.3.0" - sources."domexception-1.0.1" - sources."domhandler-3.0.0" - sources."dompurify-2.4.1" - (sources."domutils-2.8.0" // { + sources."domexception-4.0.0" + sources."domhandler-3.3.0" + sources."dompurify-2.4.0" + (sources."domutils-3.0.1" // { dependencies = [ - sources."domhandler-4.3.1" + sources."domhandler-5.0.3" ]; }) sources."duplexer2-0.1.4" @@ -115691,25 +116377,22 @@ in sources."supports-color-2.0.0" ]; }) - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" + sources."escodegen-2.0.0" sources."esprima-4.0.1" - sources."estraverse-4.3.0" + sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."events-1.1.1" 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" @@ -115717,6 +116400,7 @@ in sources."fault-1.0.4" sources."file-type-10.11.0" sources."fill-range-7.0.1" + sources."filter-obj-1.1.0" sources."find-up-2.1.0" sources."follow-redirects-1.15.2" sources."font-awesome-filetypes-2.1.0" @@ -115724,26 +116408,22 @@ in sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" sources."forever-agent-0.6.1" - sources."form-data-2.5.1" + sources."form-data-4.0.0" sources."format-0.2.2" sources."fs-constants-1.0.0" - (sources."fs-extra-5.0.0" // { - dependencies = [ - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - (sources."fs-minipass-2.1.0" // { + (sources."fs-extra-11.1.0" // { dependencies = [ - sources."minipass-3.3.6" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" ]; }) + sources."fs-minipass-1.2.7" 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" @@ -115752,6 +116432,7 @@ 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" @@ -115764,21 +116445,21 @@ in sources."he-1.2.0" (sources."help-me-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) - sources."highlight.js-11.1.0" + sources."highlight.js-11.7.0" sources."hpagent-1.2.0" - sources."html-encoding-sniffer-1.0.2" + sources."html-encoding-sniffer-3.0.0" sources."html-entities-1.4.0" - sources."html-minifier-3.5.21" - sources."http-cache-semantics-4.1.0" + sources."html-minifier-4.0.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" (sources."image-data-uri-2.0.1" // { dependencies = [ @@ -115825,8 +116506,7 @@ in sources."invert-kv-1.0.0" sources."iota-array-1.0.0" sources."ip-2.0.0" - sources."ip-regex-2.1.0" - sources."is-absolute-0.2.6" + sources."ip-regex-4.3.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" @@ -115840,19 +116520,12 @@ in sources."is-iojs-1.1.0" sources."is-lambda-1.0.1" sources."is-number-7.0.0" - sources."is-relative-0.2.1" - sources."is-stream-1.1.0" + sources."is-potential-custom-element-name-1.0.1" sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" - sources."is-unc-path-0.1.2" sources."is-url-1.2.4" - sources."is-windows-0.2.0" sources."is-wsl-2.2.0" - (sources."is2-0.0.9" // { - dependencies = [ - sources."deep-is-0.1.2" - ]; - }) + sources."is2-2.0.9" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" @@ -115860,20 +116533,14 @@ 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-tokens-4.0.0" + sources."js-sdsl-4.3.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" - ]; - }) + sources."jsdom-21.0.0" 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."jsonfile-4.0.0" sources."jsprim-1.4.2" (sources."katex-0.13.24" // { dependencies = [ @@ -115888,17 +116555,14 @@ in sources."leven-2.1.0" sources."levenshtein-1.0.5" sources."levn-0.3.0" - sources."linkify-it-2.2.0" + sources."linkify-it-4.0.1" sources."listenercount-1.0.1" sources."locate-path-2.0.0" sources."lodash-4.17.21" - sources."lodash-es-4.17.21" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" sources."lodash.repeat-4.1.0" - sources."lodash.sortby-4.7.0" - sources."loose-envify-1.4.0" sources."lower-case-1.1.4" (sources."lowlight-1.9.2" // { dependencies = [ @@ -115914,20 +116578,20 @@ in }) (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."minipass-3.3.6" ]; }) - (sources."markdown-it-10.0.0" // { + (sources."markdown-it-13.0.1" // { dependencies = [ - sources."argparse-1.0.10" - sources."entities-2.0.3" - sources."sprintf-js-1.0.3" + sources."entities-3.0.1" ]; }) sources."markdown-it-abbr-1.0.4" sources."markdown-it-anchor-5.3.0" sources."markdown-it-deflist-2.1.0" - sources."markdown-it-emoji-1.4.0" + sources."markdown-it-emoji-2.0.2" sources."markdown-it-expand-tabs-1.0.13" sources."markdown-it-footnote-3.0.3" sources."markdown-it-ins-3.0.1" @@ -115937,7 +116601,7 @@ in sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.2.0" sources."md5-2.3.0" - sources."md5-file-4.0.0" + sources."md5-file-5.0.0" sources."mdurl-1.0.1" (sources."memory-stream-0.0.3" // { dependencies = [ @@ -115946,18 +116610,18 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."mermaid-9.3.0" // { - dependencies = [ - sources."uuid-9.0.0" - ]; - }) + sources."mermaid-9.2.2" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimer-2.0.2" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -115966,6 +116630,7 @@ in (sources."minipass-fetch-1.4.1" // { dependencies = [ sources."minipass-3.3.6" + sources."minizlib-2.1.2" ]; }) (sources."minipass-flush-1.0.5" // { @@ -115983,11 +116648,7 @@ in sources."minipass-3.3.6" ]; }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minizlib-1.3.3" sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" @@ -115995,7 +116656,7 @@ in (sources."mqtt-4.3.7" // { dependencies = [ sources."duplexify-4.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."utf-8-validate-5.0.10" sources."ws-7.5.9" ]; @@ -116012,7 +116673,7 @@ in sources."negotiator-0.6.3" sources."nextgen-events-1.5.3" sources."no-case-2.3.2" - (sources."node-abi-3.31.0" // { + (sources."node-abi-3.33.0" // { dependencies = [ sources."semver-7.3.8" ]; @@ -116020,39 +116681,41 @@ in sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" - sources."node-fetch-1.7.3" + (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-8.4.1" // { dependencies = [ - sources."ansi-regex-5.0.1" sources."are-we-there-yet-3.0.1" sources."gauge-4.0.4" sources."is-fullwidth-code-point-3.0.0" - sources."mkdirp-1.0.4" sources."npmlog-6.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" 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.13" sources."which-2.0.2" ]; }) sources."node-gyp-build-4.6.0" - (sources."node-notifier-8.0.2" // { + (sources."node-notifier-10.0.1" // { dependencies = [ sources."semver-7.3.8" sources."uuid-8.3.2" sources."which-2.0.2" ]; }) - sources."node-persist-2.1.0" + sources."node-persist-3.1.0" sources."node-rsa-1.1.1" sources."non-layered-tidy-tree-layout-2.0.2" 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" @@ -116065,7 +116728,7 @@ in }) sources."omggif-1.0.10" sources."once-1.4.0" - sources."open-7.4.2" + sources."open-8.4.1" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."p-limit-1.3.0" @@ -116073,14 +116736,17 @@ in sources."p-map-4.0.0" sources."p-try-1.0.0" sources."param-case-2.1.1" - sources."parse5-5.1.0" + (sources."parse5-7.1.2" // { + dependencies = [ + sources."entities-4.4.0" + ]; + }) sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-3.0.0" sources."pipe-functions-1.3.0" - sources."pn-1.1.0" sources."pngjs-6.0.0" (sources."prebuild-install-7.1.1" // { dependencies = [ @@ -116091,20 +116757,15 @@ in }) sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" + sources."promise-8.3.0" sources."promise-inflight-1.0.1" - (sources."promise-retry-2.0.1" // { - dependencies = [ - sources."retry-0.12.0" - ]; - }) - sources."proper-lockfile-2.0.1" + sources."promise-retry-2.0.1" + sources."proper-lockfile-4.1.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" - sources."q-1.1.2" + sources."punycode-2.3.0" sources."qs-6.5.3" - sources."query-string-4.3.4" + sources."query-string-7.1.3" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-6.0.2" @@ -116112,14 +116773,15 @@ in sources."rc-1.2.8" sources."re-reselect-4.0.1" sources."read-chunk-2.1.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) sources."readdirp-3.6.0" sources."reduce-flatten-1.0.1" - sources."redux-3.7.2" + sources."redux-4.2.1" + sources."regenerator-runtime-0.13.11" sources."reinterval-1.1.0" sources."relateurl-0.2.7" sources."relative-3.0.2" @@ -116127,18 +116789,12 @@ in dependencies = [ sources."form-data-2.3.3" sources."tough-cookie-2.5.0" - ]; - }) - sources."request-promise-core-1.1.4" - (sources."request-promise-native-1.0.9" // { - dependencies = [ - sources."tough-cookie-2.5.0" + sources."uuid-3.4.0" ]; }) sources."requires-port-1.0.0" sources."reselect-4.1.7" - sources."resolve-url-0.2.1" - sources."retry-0.10.1" + sources."retry-0.12.0" sources."rfdc-1.3.0" sources."rimraf-2.7.1" sources."robust-predicates-3.0.1" @@ -116146,37 +116802,23 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."saxes-3.1.11" + sources."saxes-6.0.0" sources."semver-5.7.1" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" - sources."seventh-0.7.40" - (sources."sharp-0.26.3" // { + sources."seventh-0.8.2" + (sources."sharp-0.31.3" // { dependencies = [ - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."color-3.2.1" + sources."color-4.2.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."decompress-response-6.0.0" - sources."detect-libc-1.0.3" - sources."gauge-2.7.4" sources."mimic-response-3.1.0" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."node-addon-api-3.2.1" - sources."npmlog-4.1.2" - (sources."prebuild-install-6.1.4" // { - dependencies = [ - sources."simple-get-3.1.1" - ]; - }) + sources."node-addon-api-5.1.0" sources."semver-7.3.8" sources."simple-get-4.0.1" - sources."strip-ansi-3.0.1" ]; }) sources."shellwords-0.1.1" @@ -116193,22 +116835,17 @@ in sources."socks-2.7.1" sources."socks-proxy-agent-6.2.1" sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" + sources."source-map-resolve-0.6.0" + sources."split-on-first-1.1.0" sources."split-skip-0.0.2" (sources."split2-3.2.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."splitargs-0.0.7" sources."sprintf-js-1.1.2" - (sources."sqlite3-5.1.4" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."tar-6.1.13" - ]; - }) + sources."sqlite3-5.1.4" sources."sshpk-1.17.0" (sources."ssri-8.0.1" // { dependencies = [ @@ -116216,12 +116853,15 @@ in ]; }) sources."statuses-1.5.0" - sources."stealthy-require-1.1.1" sources."stream-shift-1.0.1" - sources."strict-uri-encode-1.1.0" - sources."string-kit-0.11.10" + sources."strict-uri-encode-2.0.0" + sources."string-kit-0.17.8" sources."string-padding-1.0.2" - sources."string-to-stream-1.1.1" + (sources."string-to-stream-3.0.1" // { + dependencies = [ + sources."readable-stream-3.6.1" + ]; + }) (sources."string-width-1.0.2" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -116237,81 +116877,86 @@ in sources."magicli-0.0.5" ]; }) - (sources."strip-ansi-4.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-3.0.1" + sources."ansi-regex-5.0.1" ]; }) sources."strip-json-comments-2.0.1" sources."strnum-1.0.5" sources."stylis-4.1.3" sources."supports-color-7.2.0" - sources."symbol-observable-1.2.0" sources."symbol-tree-3.2.4" sources."table-layout-0.4.5" - (sources."tar-4.4.19" // { - dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."yallist-3.1.1" - ]; - }) - (sources."tar-fs-2.1.1" // { + (sources."tar-6.1.13" // { dependencies = [ - sources."chownr-1.1.4" + sources."chownr-2.0.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."minipass-4.2.4" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."mkdirp-1.0.4" ]; }) + sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."tcp-port-used-1.0.2" // { dependencies = [ sources."debug-4.3.1" - sources."ip-regex-4.3.0" - sources."is2-2.0.9" ]; }) - sources."terminal-kit-1.49.4" + sources."terminal-kit-3.0.0" (sources."tkwidgets-0.5.27" // { dependencies = [ + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" + sources."seventh-0.7.40" + sources."string-kit-0.11.10" sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" + sources."terminal-kit-1.49.4" sources."wrap-ansi-3.0.1" ]; }) sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tough-cookie-3.0.1" - sources."tr46-1.0.1" + (sources."tough-cookie-4.1.2" // { + dependencies = [ + sources."universalify-0.2.0" + ]; + }) + sources."tr46-3.0.0" 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" sources."typedarray-0.0.6" sources."typical-2.6.1" sources."uc.micro-1.0.6" - (sources."uglify-js-3.4.10" // { - dependencies = [ - sources."commander-2.19.0" - ]; - }) + sources."uglify-js-3.17.4" sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" - sources."unc-path-regex-0.1.2" sources."uniq-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."universalify-2.0.0" + sources."universalify-0.1.2" sources."unorm-1.6.0" sources."unpack-string-0.0.2" (sources."unzipper-0.8.14" // { @@ -116324,7 +116969,6 @@ in }) sources."upper-case-1.1.3" sources."uri-js-4.4.1" - sources."urix-0.1.0" (sources."url-0.10.3" // { dependencies = [ sources."punycode-1.3.2" @@ -116332,22 +116976,20 @@ in }) sources."url-join-0.0.1" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" sources."util-0.12.5" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."valid-url-1.0.9" + sources."uuid-9.0.0" (sources."verror-1.10.0" // { dependencies = [ sources."core-util-is-1.0.2" ]; }) - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-1.1.2" - sources."webidl-conversions-4.0.2" - sources."whatwg-encoding-1.0.5" - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-7.1.0" + sources."w3c-xmlserializer-4.0.0" + sources."webidl-conversions-7.0.0" + sources."whatwg-encoding-2.0.0" + sources."whatwg-mimetype-3.0.0" + sources."whatwg-url-11.0.0" sources."which-1.3.1" sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" @@ -116360,8 +117002,8 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.12.0" - sources."xml-name-validator-3.0.0" + sources."ws-8.12.1" + sources."xml-name-validator-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmlchars-2.2.0" @@ -116369,17 +117011,13 @@ in sources."y18n-3.2.2" sources."yallist-4.0.0" sources."yargs-3.32.0" - (sources."yargs-parser-7.0.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) + sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "Joplin CLI Client"; homepage = "https://github.com/laurent22/joplin#readme"; - license = "MIT"; + license = "AGPL-3.0-or-later"; }; production = true; bypassCache = true; @@ -116450,13 +117088,13 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz"; - sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz"; + sha512 = "e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg=="; }; dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@jsdoc/salty-0.2.3" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" @@ -116472,7 +117110,7 @@ in sources."linkify-it-3.0.3" sources."lodash-4.17.21" sources."markdown-it-12.3.2" - sources."markdown-it-anchor-8.6.6" + sources."markdown-it-anchor-8.6.7" sources."marked-4.2.12" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" @@ -116541,7 +117179,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "https://jshint.com/"; + homepage = "http://jshint.com/"; license = "MIT"; }; production = true; @@ -116568,33 +117206,16 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.0.tgz"; - sha512 = "9M6M60W4GUxmha6eoFhRVKF+tDw70jdqrxo3u6aqQ6/cwW6RhkSTPI0gvfCRcBwbWiUWvJo9jR6e9TZxcQdhnA=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.3.tgz"; + sha512 = "W0yk/xzjz7bag9v9eS4qthvPG4O07uxNeXwirhvcOqmX4w8HLtB/Pw76o5Z7Pblwvf4vpCi4+iHOlHDnmav/rA=="; }; dependencies = [ sources."@ewoudenberg/difflib-0.1.0" - sources."cli-color-2.0.3" - sources."d-1.0.1" + sources."colors-1.4.0" sources."dreamopt-0.8.0" - sources."es5-ext-0.10.62" - sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" - sources."event-emitter-0.3.5" - (sources."ext-1.7.0" // { - dependencies = [ - sources."type-2.7.2" - ]; - }) sources."heap-0.2.7" - sources."is-promise-2.2.2" - sources."lru-queue-0.1.0" - sources."memoizee-0.4.15" - sources."next-tick-1.1.0" - sources."timers-ext-0.1.7" - sources."type-1.2.0" sources."wordwrap-1.0.0" ]; buildInputs = globalBuildInputs; @@ -116632,7 +117253,7 @@ in sources."form-data-4.0.0" 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" @@ -116650,9 +117271,9 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."side-channel-1.0.4" @@ -116678,20 +117299,56 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.17.1.tgz"; - sha512 = "2cR/IAL9xX4M1Y5ONMpnvRvJ5o9gJH5GsSQs7fQHdTKTKoN4YRZu1ApQKg/4P0XzwlLyUDqTlwhPq9nsvJ9acw=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.17.2.tgz"; + sha512 = "PKmTFfiUduibc9QyieY9PDiSG4CttFpqpVkwTvWWbGQaah4Id/gKqn5er4dnynUw4GVdjAzGKjSbBuVIlXM6mw=="; }; dependencies = [ + (sources."@eslint/eslintrc-2.0.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."@eslint/js-8.35.0" + (sources."@humanwhocodes/config-array-0.11.8" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + 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."@types/json5-0.0.29" sources."accepts-1.3.8" + sources."acorn-8.8.2" + sources."acorn-jsx-5.3.2" + sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" + sources."argparse-2.0.1" sources."array-flatten-1.1.1" + 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."available-typed-arrays-1.0.5" + sources."balanced-match-1.0.2" sources."basic-auth-2.0.1" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" + sources."brace-expansion-1.1.11" + (sources."builtins-5.0.1" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) sources."bytes-3.1.2" sources."call-bind-1.0.2" + sources."callsites-3.1.0" sources."chalk-4.1.2" sources."cliui-8.0.1" sources."color-convert-2.0.1" @@ -116702,28 +117359,98 @@ in sources."bytes-3.0.0" ]; }) + sources."concat-map-0.0.1" sources."connect-pause-0.1.1" (sources."content-disposition-0.5.4" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" + sources."cross-spawn-7.0.3" sources."debug-2.6.9" + sources."deep-is-0.1.4" + sources."define-properties-1.2.0" sources."depd-2.0.0" sources."destroy-1.2.0" + sources."doctrine-3.0.0" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" + sources."error-ex-1.3.2" sources."errorhandler-1.5.1" + sources."es-abstract-1.21.1" + sources."es-set-tostringtag-2.0.1" + 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-4.0.0" + (sources."eslint-8.35.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."eslint-config-standard-17.0.0" + sources."eslint-config-standard-jsx-11.0.0" + (sources."eslint-import-resolver-node-0.3.7" // { + 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-es-4.1.0" // { + dependencies = [ + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + ]; + }) + (sources."eslint-plugin-import-2.27.5" // { + dependencies = [ + sources."debug-3.2.7" + sources."doctrine-2.1.0" + sources."ms-2.1.3" + ]; + }) + (sources."eslint-plugin-n-15.6.1" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) + sources."eslint-plugin-promise-6.1.1" + (sources."eslint-plugin-react-7.32.2" // { + dependencies = [ + sources."doctrine-2.1.0" + sources."resolve-2.0.0-next.4" + ]; + }) + 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."espree-9.4.1" + sources."esquery-1.4.2" + sources."esrecurse-4.3.0" + sources."estraverse-5.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -116732,28 +117459,95 @@ in sources."path-to-regexp-1.8.0" ]; }) + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.15.0" + sources."file-entry-cache-6.0.1" sources."finalhandler-1.2.0" + sources."find-up-5.0.0" + sources."flat-cache-3.0.4" + sources."flatted-3.2.7" + sources."for-each-0.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" + 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-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" + sources."get-stdin-8.0.0" + sources."get-symbol-description-1.0.0" + sources."glob-7.2.3" + sources."glob-parent-6.0.2" + sources."globals-13.20.0" + sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" + 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."http-errors-2.0.0" sources."iconv-lite-0.4.24" + 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.5" sources."ipaddr.js-1.9.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" + sources."is-callable-1.2.7" + sources."is-core-module-2.11.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-path-inside-3.0.3" 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-weakref-1.0.2" sources."isarray-0.0.1" + sources."isexe-2.0.0" sources."jju-1.4.0" + sources."js-sdsl-4.3.0" + sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" + sources."json-parse-better-errors-1.0.2" sources."json-parse-helpfulerror-1.0.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json5-1.0.2" + sources."jsx-ast-utils-3.3.3" + sources."levn-0.4.1" + (sources."load-json-file-5.3.0" // { + dependencies = [ + sources."pify-4.0.1" + sources."type-fest-0.3.1" + ]; + }) + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash-id-0.14.1" + sources."lodash.merge-4.6.2" + sources."loose-envify-1.4.0" sources."lowdb-1.0.0" + sources."lru-cache-6.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -116765,6 +117559,8 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" (sources."morgan-1.10.0" // { dependencies = [ sources."on-finished-2.3.0" @@ -116772,23 +117568,64 @@ in }) sources."ms-2.0.0" sources."nanoid-3.3.4" + sources."natural-compare-1.4.0" sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."object-inspect-1.12.3" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."object.entries-1.1.6" + sources."object.fromentries-2.0.6" + sources."object.hasown-1.1.2" + sources."object.values-1.1.6" sources."on-finished-2.4.1" sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."optionator-0.9.1" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-4.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-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."pify-3.0.0" + (sources."pkg-conf-3.1.0" // { + 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."please-upgrade-node-3.2.0" sources."pluralize-8.0.0" + sources."prelude-ls-1.2.1" + sources."prop-types-15.8.1" sources."proxy-addr-2.0.7" + sources."punycode-2.3.0" sources."qs-6.11.0" + sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" + sources."react-is-16.13.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."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" + sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" + sources."semver-6.3.0" sources."semver-compare-1.0.0" (sources."send-0.18.0" // { dependencies = [ @@ -116798,21 +117635,46 @@ in sources."serve-static-1.15.0" sources."server-destroy-1.0.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."standard-17.0.0" + sources."standard-engine-15.0.0" sources."statuses-2.0.1" sources."steno-0.4.4" sources."string-width-4.2.3" + 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."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."text-table-0.2.0" sources."toidentifier-1.0.1" + sources."tsconfig-paths-3.14.2" + 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."unbox-primitive-1.0.2" sources."unpipe-1.0.0" + sources."uri-js-4.4.1" sources."utils-merge-1.0.1" sources."vary-1.1.2" + 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."xdg-basedir-4.0.0" sources."y18n-5.0.8" - sources."yargs-17.6.2" + sources."yallist-4.0.0" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -116873,7 +117735,7 @@ 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.6" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -116888,7 +117750,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" sources."boxen-0.6.0" sources."braces-1.8.5" sources."bytes-3.1.2" @@ -116945,7 +117807,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -116979,6 +117841,8 @@ in sources."expand-range-1.8.2" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -117008,7 +117872,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" @@ -117118,7 +117982,7 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -117198,7 +118062,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -117207,12 +118071,12 @@ in ]; }) sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" (sources."readdirp-2.2.1" // { dependencies = [ sources."arr-diff-4.0.0" @@ -117442,16 +118306,17 @@ 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.21" - sources."@oclif/config-1.18.6" + sources."@oclif/command-1.8.22" + sources."@oclif/config-1.18.8" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { dependencies = [ + sources."@oclif/config-1.18.6" 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" @@ -117464,7 +118329,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.33.0" // { + (sources."@putdotio/api-client-8.33.1" // { dependencies = [ sources."axios-0.21.4" ]; @@ -117491,7 +118356,7 @@ in sources."chardet-0.7.0" sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" - sources."cli-progress-3.11.2" + sources."cli-progress-3.12.0" (sources."cli-ux-5.6.7" // { dependencies = [ sources."supports-color-8.1.1" @@ -117548,7 +118413,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" @@ -117612,7 +118477,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -117640,7 +118505,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" @@ -117698,7 +118563,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -117706,7 +118571,7 @@ in sources."balanced-match-1.0.2" sources."base64id-2.0.0" sources."binary-extensions-2.2.0" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bufferutil-4.0.7" @@ -117718,7 +118583,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."connect-3.7.0" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" @@ -117731,7 +118596,7 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.2.1" // { + (sources."engine.io-6.4.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117757,7 +118622,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" @@ -117776,7 +118641,7 @@ in sources."isbinaryfile-4.0.10" sources."jsonfile-4.0.0" sources."lodash-4.17.21" - (sources."log4js-6.7.1" // { + (sources."log4js-6.8.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117787,7 +118652,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."negotiator-0.6.3" @@ -117803,7 +118668,7 @@ in sources."qjobs-1.2.0" sources."qs-6.11.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."requires-port-1.0.0" @@ -117812,14 +118677,14 @@ in sources."safer-buffer-2.1.2" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" - (sources."socket.io-4.5.4" // { + (sources."socket.io-4.6.1" // { 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-adapter-2.5.2" + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117827,7 +118692,7 @@ in }) sources."source-map-0.6.1" sources."statuses-2.0.1" - (sources."streamroller-3.1.4" // { + (sources."streamroller-3.1.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117839,7 +118704,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" @@ -117848,7 +118713,7 @@ in sources."void-elements-2.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.2.3" + sources."ws-8.11.0" sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" @@ -117873,15 +118738,15 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.20.7" + sources."@babel/cli-7.21.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -117893,26 +118758,26 @@ in ]; }) sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-function-name-7.21.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-module-transforms-7.21.2" 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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" sources."@babel/node-7.20.7" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/plugin-syntax-jsx-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" - sources."@babel/register-7.18.9" + sources."@babel/plugin-transform-react-jsx-7.21.0" + sources."@babel/register-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -117969,7 +118834,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" @@ -118010,13 +118875,13 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."canvas-2.11.0" sources."chalk-2.4.2" sources."chardet-1.5.1" @@ -118034,11 +118899,11 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -118062,7 +118927,7 @@ in sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" @@ -118077,7 +118942,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -118103,7 +118968,7 @@ in sources."ms-2.0.0" ]; }) - sources."express-validator-6.14.2" + sources."express-validator-6.15.0" sources."fast-glob-3.2.12" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -118124,7 +118989,7 @@ in sources."fresh-0.5.2" (sources."from2-2.3.0" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -118149,7 +119014,7 @@ 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" @@ -118184,7 +119049,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."into-stream-6.0.0" sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" @@ -118253,12 +119118,8 @@ in sources."mimic-response-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -118274,7 +119135,7 @@ in sources."negotiator-0.6.3" sources."node-abi-2.30.1" sources."node-environment-flags-1.0.6" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."node-notifier-10.0.1" // { dependencies = [ @@ -118283,7 +119144,7 @@ in sources."yallist-4.0.0" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."number-is-nan-1.0.1" @@ -118295,7 +119156,7 @@ in sources."object.getownpropertydescriptors-2.1.5" sources."on-finished-2.4.1" sources."once-1.4.0" - sources."openpgp-5.5.0" + sources."openpgp-5.7.0" sources."optionator-0.8.3" sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" @@ -118349,7 +119210,7 @@ in sources."gauge-2.7.4" sources."is-fullwidth-code-point-1.0.0" sources."npmlog-4.1.2" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -118362,7 +119223,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."qs-6.11.0" @@ -118377,7 +119238,7 @@ in ]; }) sources."rc-1.2.8" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."require-directory-2.1.1" @@ -118423,7 +119284,7 @@ in sources."statuses-2.0.1" (sources."stream-meter-1.0.4" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -118458,7 +119319,7 @@ 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" @@ -118468,17 +119329,17 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."v8flags-3.2.0" sources."valid-url-1.0.9" - sources."validator-13.7.0" + sources."validator-13.9.0" sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" - sources."webcrypto-core-1.7.5" + sources."webcrypto-core-1.7.6" sources."webidl-conversions-3.0.1" (sources."whatwg-encoding-1.0.5" // { dependencies = [ @@ -118500,7 +119361,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -118555,7 +119416,7 @@ in sources."picomatch-2.3.1" sources."process-nextick-args-2.0.1" sources."queue-microtask-1.2.3" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."require-directory-2.1.1" sources."reusify-1.0.4" sources."run-parallel-1.2.0" @@ -118745,7 +119606,7 @@ in sources."prompt-1.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -118951,7 +119812,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-1.0.4" sources."moment-2.29.4" sources."mute-stream-0.0.8" @@ -118984,7 +119845,7 @@ in sources."prelude-ls-1.1.2" sources."prompt-1.0.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -119081,10 +119942,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "6.4.1"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-6.4.1.tgz"; - sha512 = "0t8TSG4CDAn5+vORjvTFn/ZEGyc4LOEsyBUpzcdIxODHPKM4TVOGvbW9dBs1g40PhOrQfwhHS+3fSx/42j42dQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-6.5.1.tgz"; + sha512 = "Va1bysubwWdoWZ1ncKcoTGBXNAu/10/TwELb550TTivXmEWjCCdek4eX0BNLTEYKxu3tpV2UEeqVisUiWGn4WA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -119102,199 +119963,107 @@ 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.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.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" - sources."make-dir-3.1.0" - sources."semver-6.3.0" - sources."sort-keys-4.2.0" - sources."write-file-atomic-3.0.3" - sources."write-json-file-4.3.0" - ]; - }) - 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" - sources."make-dir-3.1.0" - sources."semver-6.3.0" - sources."sort-keys-4.2.0" - sources."write-file-atomic-3.0.3" - sources."write-json-file-4.3.0" - ]; - }) - 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.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" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."sort-keys-4.2.0" - sources."write-file-atomic-3.0.3" - sources."write-json-file-4.3.0" - ]; - }) - (sources."@lerna/write-log-file-6.4.1" // { - dependencies = [ - sources."write-file-atomic-4.0.2" - ]; - }) + sources."@lerna/child-process-6.5.1" + sources."@lerna/create-6.5.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" (sources."@npmcli/arborist-5.3.0" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" - sources."nopt-5.0.0" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" + ]; + }) + (sources."@npmcli/fs-2.1.2" // { + dependencies = [ + sources."semver-7.3.8" ]; }) - sources."@npmcli/fs-2.1.2" (sources."@npmcli/git-3.0.2" // { dependencies = [ - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" + (sources."semver-7.3.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) ]; }) 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.1.0" sources."minimatch-5.1.6" ]; }) - sources."@npmcli/metavuln-calculator-3.1.1" + (sources."@npmcli/metavuln-calculator-3.1.1" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) sources."@npmcli/move-file-2.0.1" sources."@npmcli/name-from-folder-1.0.1" sources."@npmcli/node-gyp-2.0.0" 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.5.2" - (sources."@nrwl/devkit-15.5.2" // { + sources."@npmcli/run-script-4.1.7" + sources."@nrwl/cli-15.7.2" + sources."@nrwl/devkit-15.7.2" + sources."@nrwl/nx-darwin-arm64-15.7.2" + sources."@nrwl/nx-darwin-x64-15.7.2" + sources."@nrwl/nx-linux-arm-gnueabihf-15.7.2" + sources."@nrwl/nx-linux-arm64-gnu-15.7.2" + sources."@nrwl/nx-linux-arm64-musl-15.7.2" + sources."@nrwl/nx-linux-x64-gnu-15.7.2" + sources."@nrwl/nx-linux-x64-musl-15.7.2" + sources."@nrwl/nx-win32-arm64-msvc-15.7.2" + sources."@nrwl/nx-win32-x64-msvc-15.7.2" + sources."@nrwl/tao-15.7.2" + sources."@octokit/auth-token-3.0.3" + sources."@octokit/core-4.2.0" + sources."@octokit/endpoint-7.0.5" + 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-3.1.0" // { dependencies = [ - sources."semver-7.3.4" + sources."@octokit/openapi-types-12.11.0" + sources."@octokit/types-6.41.0" ]; }) - sources."@nrwl/tao-15.5.2" - sources."@octokit/auth-token-3.0.2" - sources."@octokit/core-4.1.0" - (sources."@octokit/endpoint-7.0.3" // { - dependencies = [ - sources."is-plain-object-5.0.0" - ]; - }) - sources."@octokit/graphql-5.0.4" - sources."@octokit/openapi-types-14.0.0" - sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-5.0.1" 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-6.8.1" // { dependencies = [ - sources."is-plain-object-5.0.0" + sources."@octokit/openapi-types-14.0.0" + sources."@octokit/types-8.2.1" ]; }) - sources."@octokit/request-error-3.0.2" - sources."@octokit/rest-19.0.5" - sources."@octokit/types-8.1.1" + sources."@octokit/request-6.2.3" + sources."@octokit/request-error-3.0.3" + sources."@octokit/rest-19.0.3" + sources."@octokit/types-9.0.0" sources."@parcel/watcher-2.0.4" sources."@phenomnomnominal/tsquery-4.1.1" - 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" + sources."@swc-node/core-1.10.1" + sources."@swc-node/register-1.6.2" + sources."@swc-node/sourcemap-support-0.3.0" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" sources."@tootallnate/once-2.0.0" 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.35" // { + (sources."@yarnpkg/parsers-3.0.0-rc.39" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -119321,40 +120090,36 @@ in sources."array-differ-3.0.0" sources."array-ify-1.0.0" sources."array-union-2.1.0" - sources."arrify-2.0.1" + sources."arrify-1.0.1" sources."asap-2.0.6" sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."axios-1.2.3" + sources."axios-1.3.4" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" (sources."bin-links-3.0.3" // { dependencies = [ sources."npm-normalize-package-bin-2.0.0" - sources."write-file-atomic-4.0.2" ]; }) sources."bl-4.1.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."builtins-1.0.3" - sources."byte-size-7.0.1" + sources."byte-size-7.0.0" (sources."cacache-16.1.3" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."lru-cache-7.14.1" - sources."minimatch-5.1.6" + sources."lru-cache-7.17.0" ]; }) sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.2" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."ci-info-2.0.0" @@ -119364,7 +120129,11 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-deep-4.0.1" + (sources."clone-deep-4.0.1" // { + dependencies = [ + sources."is-plain-object-2.0.4" + ]; + }) sources."cmd-shim-5.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -119380,15 +120149,10 @@ in }) sources."concat-map-0.0.1" sources."concat-stream-2.0.0" - sources."config-chain-1.1.13" + sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.13" - (sources."conventional-changelog-core-4.2.4" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."normalize-package-data-3.0.3" - ]; - }) + sources."conventional-changelog-angular-5.0.12" + sources."conventional-changelog-core-4.2.4" sources."conventional-changelog-preset-loader-2.3.4" (sources."conventional-changelog-writer-5.0.1" // { dependencies = [ @@ -119399,7 +120163,11 @@ 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.1.0" + (sources."cosmiconfig-7.0.0" // { + dependencies = [ + sources."path-type-4.0.0" + ]; + }) sources."cross-spawn-7.0.3" sources."dargs-7.0.0" sources."dateformat-3.0.3" @@ -119420,7 +120188,11 @@ in sources."deprecation-2.3.1" sources."detect-indent-5.0.0" sources."dezalgo-1.0.4" - sources."dir-glob-3.0.1" + (sources."dir-glob-3.0.1" // { + dependencies = [ + sources."path-type-4.0.0" + ]; + }) sources."dot-prop-6.0.1" sources."dotenv-10.0.0" sources."duplexer-0.1.2" @@ -119436,10 +120208,10 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."estraverse-5.3.0" sources."eventemitter3-4.0.7" - sources."execa-5.1.1" + sources."execa-5.0.0" (sources."external-editor-3.1.0" // { dependencies = [ sources."iconv-lite-0.4.24" @@ -119450,7 +120222,6 @@ in sources."figures-3.2.0" (sources."filelist-1.0.4" // { dependencies = [ - sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" ]; }) @@ -119469,14 +120240,14 @@ in (sources."get-pkg-repo-4.2.1" // { dependencies = [ sources."hosted-git-info-4.1.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."through2-2.0.5" ]; }) sources."get-port-5.1.1" - sources."get-stream-6.0.1" + sources."get-stream-6.0.0" sources."git-raw-commits-2.0.11" (sources."git-remote-origin-url-2.0.0" // { dependencies = [ @@ -119491,7 +120262,11 @@ in sources."git-up-7.0.0" sources."git-url-parse-13.1.0" sources."gitconfiglocal-1.0.0" - sources."glob-7.2.3" + (sources."glob-8.1.0" // { + dependencies = [ + sources."minimatch-5.1.6" + ]; + }) sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.10" @@ -119500,8 +120275,12 @@ in sources."has-1.0.3" 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."hosted-git-info-5.2.1" // { + dependencies = [ + sources."lru-cache-7.17.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" @@ -119511,7 +120290,6 @@ in sources."ignore-5.2.4" (sources."ignore-walk-5.0.1" // { dependencies = [ - sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" ]; }) @@ -119529,14 +120307,15 @@ in sources."ini-1.3.8" (sources."init-package-json-3.0.2" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" + ]; + }) + (sources."inquirer-8.2.5" // { + dependencies = [ + sources."chalk-4.1.2" ]; }) - sources."inquirer-8.2.5" sources."ip-2.0.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" @@ -119550,11 +120329,10 @@ in sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" + sources."is-plain-object-5.0.0" sources."is-ssh-1.4.0" - sources."is-stream-2.0.1" + sources."is-stream-2.0.0" sources."is-text-path-1.0.1" - sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -119574,27 +120352,23 @@ in sources."just-diff-5.2.0" sources."just-diff-apply-5.5.0" sources."kind-of-6.0.3" - (sources."libnpmaccess-6.0.4" // { + (sources."libnpmaccess-6.0.3" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" ]; }) - (sources."libnpmpublish-6.0.5" // { + (sources."libnpmpublish-6.0.4" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" + sources."normalize-package-data-4.0.1" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" ]; }) sources."lines-and-columns-1.2.4" (sources."load-json-file-6.2.0" // { dependencies = [ + sources."strip-bom-4.0.0" sources."type-fest-0.6.0" ]; }) @@ -119603,25 +120377,22 @@ in sources."lodash.ismatch-4.4.0" sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" - (sources."make-dir-2.1.0" // { + (sources."make-dir-3.1.0" // { dependencies = [ - sources."pify-4.0.1" - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) (sources."make-fetch-happen-10.2.1" // { dependencies = [ - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" ]; }) sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ - sources."hosted-git-info-4.1.0" - sources."normalize-package-data-3.0.3" + sources."hosted-git-info-2.8.9" (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" ]; @@ -119632,7 +120403,6 @@ in ]; }) sources."semver-5.7.1" - sources."type-fest-0.18.1" ]; }) sources."merge-stream-2.0.0" @@ -119642,13 +120412,13 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.7" - (sources."minimist-options-4.1.0" // { + (sources."minimatch-3.0.5" // { dependencies = [ - sources."arrify-1.0.1" + sources."brace-expansion-1.1.11" ]; }) + sources."minimist-1.2.8" + sources."minimist-options-4.1.0" sources."minipass-3.3.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.2" @@ -119661,66 +120431,66 @@ in sources."mkdirp-infer-owner-2.0.0" sources."modify-values-1.0.1" sources."ms-2.1.2" - sources."multimatch-5.0.0" + (sources."multimatch-5.0.0" // { + dependencies = [ + sources."arrify-2.0.1" + ]; + }) sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.8" - sources."node-gyp-9.3.1" + sources."node-fetch-2.6.7" + (sources."node-gyp-9.3.1" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.3" + sources."minimatch-3.1.2" + sources."nopt-6.0.0" + sources."semver-7.3.8" + ]; + }) sources."node-gyp-build-4.6.0" - sources."nopt-6.0.0" - (sources."normalize-package-data-4.0.1" // { + sources."nopt-5.0.0" + (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" + sources."hosted-git-info-4.1.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-8.1.1" - (sources."npm-packlist-5.1.3" // { + (sources."npm-package-arg-8.1.1" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - sources."npm-bundled-2.0.1" - sources."npm-normalize-package-bin-2.0.0" + sources."hosted-git-info-3.0.8" + sources."validate-npm-package-name-3.0.0" ]; }) + sources."npm-packlist-5.1.1" (sources."npm-pick-manifest-7.0.2" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" sources."npm-normalize-package-bin-2.0.0" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" ]; }) - (sources."npm-registry-fetch-13.3.1" // { + (sources."npm-registry-fetch-13.3.0" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" ]; }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-15.5.2" // { + (sources."nx-15.7.2" // { dependencies = [ sources."cli-spinners-2.6.1" sources."fast-glob-3.2.7" 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" - (sources."yargs-17.6.2" // { + (sources."yargs-17.7.1" // { dependencies = [ sources."cliui-8.0.1" ]; @@ -119730,7 +120500,7 @@ in }) sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" @@ -119744,13 +120514,10 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - (sources."pacote-13.6.2" // { + (sources."pacote-13.6.1" // { dependencies = [ - sources."builtins-5.0.1" - sources."hosted-git-info-5.2.1" - sources."lru-cache-7.14.1" sources."npm-package-arg-9.1.2" - sources."validate-npm-package-name-4.0.0" + sources."semver-7.3.8" ]; }) sources."parent-module-1.0.1" @@ -119762,7 +120529,11 @@ in 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."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."picomatch-2.3.1" sources."pify-5.0.0" sources."pirates-4.0.5" @@ -119781,13 +120552,11 @@ in sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."read-1.0.7" - sources."read-cmd-shim-3.0.1" - (sources."read-package-json-5.0.2" // { + sources."read-cmd-shim-3.0.0" + (sources."read-package-json-5.0.1" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - sources."npm-normalize-package-bin-2.0.0" + sources."normalize-package-data-4.0.1" + sources."semver-7.3.8" ]; }) sources."read-package-json-fast-2.0.3" @@ -119797,10 +120566,8 @@ in sources."load-json-file-4.0.0" sources."normalize-package-data-2.5.0" sources."parse-json-4.0.0" - sources."path-type-3.0.0" sources."pify-3.0.0" sources."semver-5.7.1" - sources."strip-bom-3.0.0" ]; }) (sources."read-pkg-up-3.0.0" // { @@ -119813,7 +120580,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdir-scoped-modules-1.1.0" sources."redent-3.0.0" sources."require-directory-2.1.1" @@ -119823,13 +120590,19 @@ in sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rimraf-3.0.2" + (sources."rimraf-3.0.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.3" + sources."minimatch-3.1.2" + ]; + }) sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-7.8.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.8" + sources."semver-7.3.4" sources."set-blocking-2.0.0" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" @@ -119853,17 +120626,13 @@ in sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."strip-bom-4.0.0" + sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" 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.13" // { - dependencies = [ - sources."minipass-4.0.0" - ]; - }) + sources."tar-6.1.11" sources."tar-stream-2.2.0" sources."temp-dir-1.0.0" sources."text-extensions-1.9.0" @@ -119874,16 +120643,11 @@ in sources."tr46-0.0.3" sources."treeverse-2.0.0" sources."trim-newlines-3.0.1" - (sources."tsconfig-paths-4.1.2" // { - dependencies = [ - sources."strip-bom-3.0.0" - ]; - }) - sources."tslib-2.4.1" - sources."type-fest-0.4.1" + sources."tsconfig-paths-4.1.2" + sources."tslib-2.5.0" + sources."type-fest-0.18.1" sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uglify-js-3.17.4" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -119894,7 +120658,11 @@ in sources."uuid-8.3.2" sources."v8-compile-cache-2.3.0" sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" + (sources."validate-npm-package-name-4.0.0" // { + dependencies = [ + sources."builtins-5.0.1" + ]; + }) sources."walk-up-path-1.0.0" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" @@ -119904,23 +120672,30 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" + sources."write-file-atomic-4.0.1" (sources."write-json-file-3.2.0" // { dependencies = [ + sources."make-dir-2.1.0" sources."pify-4.0.1" + sources."semver-5.7.1" + sources."write-file-atomic-2.4.3" + ]; + }) + (sources."write-pkg-4.0.0" // { + dependencies = [ + sources."type-fest-0.4.1" ]; }) - sources."write-pkg-4.0.0" 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."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { - description = "A tool for managing JavaScript projects with multiple packages."; + description = "Lerna is a fast, modern build system for managing and publishing multiple JavaScript/TypeScript packages from the same repository"; homepage = "https://lerna.js.org"; license = "MIT"; }; @@ -119955,7 +120730,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 = { @@ -120013,7 +120788,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.6" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -120191,7 +120966,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-middleware-0.15.0" sources."range-parser-1.2.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" @@ -120346,7 +121121,7 @@ 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.6" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -120364,7 +121139,7 @@ in sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."blob-0.0.5" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" sources."braces-1.8.5" sources."bufferutil-4.0.7" sources."bytes-3.1.2" @@ -120404,7 +121179,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -120443,6 +121218,8 @@ in sources."expand-range-1.8.2" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -120469,7 +121246,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" @@ -120567,7 +121344,7 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -120625,7 +121402,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -120634,8 +121411,8 @@ in ]; }) sources."range-parser-1.2.1" - sources."raw-body-2.5.1" - sources."readable-stream-2.3.7" + sources."raw-body-2.5.2" + sources."readable-stream-2.3.8" (sources."readdirp-2.2.1" // { dependencies = [ sources."arr-diff-4.0.0" @@ -120912,7 +121689,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.18" + sources."@types/node-18.14.2" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -121054,7 +121831,7 @@ in sources."lstream-0.0.4" sources."mime-2.4.7" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."moment-2.29.4" (sources."mooremachine-2.3.0" // { @@ -121121,7 +121898,7 @@ in (sources."sshpk-agent-1.8.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" @@ -121201,7 +121978,7 @@ in sources."markdownlint-0.27.0" sources."mdurl-1.0.1" sources."minimatch-5.1.6" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."once-1.4.0" sources."run-con-1.2.11" sources."strip-json-comments-3.1.1" @@ -121315,7 +122092,7 @@ in sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."progress-2.0.3" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."supports-color-7.2.0" @@ -121337,13 +122114,13 @@ in src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.21.0" (sources."@babel/core-7.0.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.21.1" 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" // { @@ -121351,18 +122128,18 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-regexp-features-plugin-7.20.5" + sources."@babel/helper-create-regexp-features-plugin-7.21.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-function-name-7.21.0" // { dependencies = [ sources."@babel/template-7.20.7" ]; }) sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - (sources."@babel/helper-module-transforms-7.20.11" // { + (sources."@babel/helper-module-transforms-7.21.2" // { dependencies = [ sources."@babel/template-7.20.7" ]; @@ -121380,19 +122157,19 @@ in 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-validator-option-7.21.0" (sources."@babel/helper-wrap-function-7.20.5" // { dependencies = [ sources."@babel/template-7.20.7" ]; }) - (sources."@babel/helpers-7.20.7" // { + (sources."@babel/helpers-7.21.0" // { dependencies = [ sources."@babel/template-7.20.7" ]; }) sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" 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" @@ -121409,8 +122186,8 @@ in 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.11" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" (sources."@babel/plugin-transform-computed-properties-7.20.7" // { dependencies = [ sources."@babel/template-7.20.7" @@ -121420,19 +122197,19 @@ in 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-for-of-7.21.0" sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-modules-amd-7.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" 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.7" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" - sources."@babel/plugin-transform-react-jsx-self-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.21.0" + sources."@babel/plugin-transform-react-jsx-self-7.21.0" sources."@babel/plugin-transform-react-jsx-source-7.19.6" sources."@babel/plugin-transform-regenerator-7.20.5" (sources."@babel/plugin-transform-runtime-7.0.0" // { @@ -121448,6 +122225,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.18.6" sources."@babel/preset-env-7.0.0" sources."@babel/preset-react-7.0.0" + sources."@babel/regjsgen-0.8.0" (sources."@babel/runtime-7.0.0" // { dependencies = [ sources."regenerator-runtime-0.12.1" @@ -121459,8 +122237,8 @@ in ]; }) sources."@babel/template-7.0.0" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@chemzqm/msgpack-lite-0.1.29" sources."@chemzqm/neovim-5.9.5" sources."@jridgewell/gen-mapping-0.3.2" @@ -121527,7 +122305,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.6" sources."atob-2.1.2" (sources."autodll-webpack-plugin-0.4.2" // { dependencies = [ @@ -121585,12 +122363,12 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" @@ -121603,7 +122381,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -121676,7 +122454,7 @@ in sources."date-format-4.0.14" sources."debug-4.3.4" sources."decode-uri-component-0.2.2" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."del-3.0.0" sources."depd-1.1.1" @@ -121690,7 +122468,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -121738,7 +122516,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."event-lite-0.1.2" + sources."event-lite-0.1.3" sources."event-source-polyfill-0.0.12" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" @@ -121814,7 +122592,7 @@ 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" @@ -121850,7 +122628,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" ]; }) @@ -121875,7 +122653,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."invariant-2.2.4" sources."is-accessor-descriptor-1.0.0" sources."is-array-buffer-3.0.1" @@ -121941,7 +122719,7 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."log-update-2.3.0" - sources."log4js-6.7.1" + sources."log4js-6.8.0" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" @@ -121981,7 +122759,7 @@ in }) (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; }) sources."mkdirp-then-1.2.0" @@ -122002,7 +122780,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."resolve-1.22.1" @@ -122089,7 +122867,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" @@ -122099,7 +122877,7 @@ in sources."react-dom-16.14.0" sources."react-error-overlay-4.0.0" sources."read-pkg-2.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdirp-3.6.0" (sources."recursive-copy-2.0.6" // { dependencies = [ @@ -122114,13 +122892,12 @@ in sources."regenerator-runtime-0.13.11" (sources."regenerator-transform-0.15.1" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.21.0" ]; }) sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.2" - sources."regjsgen-0.7.1" + sources."regexpu-core-5.3.1" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -122166,7 +122943,7 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."slash-1.0.0" @@ -122262,7 +123039,7 @@ in sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.1" - sources."streamroller-3.1.4" + sources."streamroller-3.1.5" sources."string-hash-1.1.3" (sources."string-width-2.1.1" // { dependencies = [ @@ -122524,7 +123301,7 @@ in sources."eslint-3.19.0" sources."espree-3.5.4" sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { + (sources."esquery-1.4.2" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -122629,7 +123406,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."multipipe-0.1.2" @@ -122656,9 +123433,9 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readline-1.3.0" sources."readline2-1.0.1" sources."rechoir-0.6.2" @@ -122796,10 +123573,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.3.0.tgz"; - sha512 = "mjMGQTJys6HfUICwESbQhdNqbJA5JiW8Fp/QvOVnlz9bwRJPVJCW85bumEYu+eyE2sDuXszCu+T6yn+Lwjbw/w=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.4.0.tgz"; + sha512 = "/Nqs8Xtasw5wvop1PPiqmSx5SUxq/yARH+0EhEHAx8MVdbZXtUnzuK+Yv6NgpD2/Fb84/N3jF08zmIiJSyT5Lg=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -122809,7 +123586,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-3.2.1" @@ -122824,14 +123601,15 @@ in sources."callsites-3.1.0" sources."chalk-5.2.0" sources."chownr-1.1.4" + sources."chromium-bidi-0.4.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-9.5.0" + sources."commander-10.0.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.1068969" + sources."devtools-protocol-0.0.1094867" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -122855,6 +123633,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."lines-and-columns-1.2.4" sources."minimatch-3.1.2" + sources."mitt-3.0.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.7" @@ -122868,9 +123647,9 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-19.5.2" - sources."puppeteer-core-19.5.2" - sources."readable-stream-3.6.0" + sources."puppeteer-19.7.2" + sources."puppeteer-core-19.7.2" + sources."readable-stream-3.6.1" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" @@ -122881,6 +123660,7 @@ in sources."tar-stream-2.2.0" sources."through-2.3.8" sources."tr46-0.0.3" + sources."typescript-4.9.5" sources."unbzip2-stream-1.4.3" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" @@ -123034,7 +123814,7 @@ in sources."form-data-4.0.0" 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" @@ -123057,9 +123837,9 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."side-channel-1.0.4" @@ -123129,11 +123909,11 @@ in sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" sources."rxjs-6.6.7" @@ -123189,11 +123969,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.7" + sources."@ledgerhq/devices-8.0.0" 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-6.28.1" + sources."@ledgerhq/hw-transport-node-hid-6.27.12" + sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.12" (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { dependencies = [ sources."@ledgerhq/devices-5.51.1" @@ -123227,7 +124007,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" @@ -123325,7 +124105,7 @@ in 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" @@ -123359,7 +124139,7 @@ in sources."jest-mock-27.5.1" (sources."jest-util-27.5.1" // { dependencies = [ - sources."ci-info-3.7.1" + sources."ci-info-3.8.0" ]; }) sources."join-component-1.1.0" @@ -123384,7 +124164,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."ms-2.1.3" sources."mustache-4.2.0" @@ -123398,15 +124178,15 @@ 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-3.31.0" + sources."node-abi-3.33.0" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."node-hid-2.1.2" sources."normalize-url-4.5.1" sources."o3-1.0.3" sources."once-1.4.0" - sources."open-8.4.0" + sources."open-8.4.2" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -123434,7 +124214,7 @@ in ]; }) sources."react-is-17.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."remove-trailing-slash-0.1.1" @@ -123535,6 +124315,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@msgpack/msgpack-2.8.0" + sources."@types/triple-beam-1.3.2" sources."async-3.2.4" sources."color-3.2.1" sources."color-convert-1.9.3" @@ -123548,11 +124329,11 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.4.2" + sources."logform-2.5.1" sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-1.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" sources."semver-7.3.8" @@ -123645,7 +124426,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" @@ -123659,7 +124440,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" sources."make-fetch-happen-10.2.1" sources."minimatch-3.1.2" sources."minipass-3.3.6" @@ -123679,7 +124460,7 @@ in sources."path-is-absolute-1.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."retry-0.12.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" @@ -123700,7 +124481,7 @@ in sources."strip-ansi-6.0.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" ]; }) sources."unique-filename-2.0.1" @@ -123786,7 +124567,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -123826,7 +124607,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 = [ @@ -123885,7 +124666,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."nan-2.17.0" @@ -123932,7 +124713,7 @@ in sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -124046,7 +124827,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = "https://github.com/node-inspector/node-inspector"; + homepage = "http://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -124089,7 +124870,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -124109,7 +124890,7 @@ in sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" sources."rc-1.2.8" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -124150,12 +124931,13 @@ in sha512 = "B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.21.0" sources."@mapbox/node-pre-gyp-1.0.10" sources."@node-red/editor-api-3.0.2" sources."@node-red/editor-client-3.0.2" (sources."@node-red/nodes-3.0.2" // { dependencies = [ + sources."content-type-1.0.4" sources."cookie-0.5.0" sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" @@ -124169,7 +124951,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -124188,7 +124970,7 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."argparse-2.0.1" @@ -124207,7 +124989,7 @@ in sources."bcryptjs-2.4.3" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."body-parser-1.20.0" @@ -124235,7 +125017,7 @@ in sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" (sources."cookie-parser-1.4.6" // { dependencies = [ @@ -124267,7 +125049,7 @@ in sources."domutils-2.8.0" (sources."duplexify-4.1.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."ee-first-1.1.1" @@ -124304,7 +125086,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" @@ -124315,12 +125097,12 @@ in sources."hash-sum-2.0.0" (sources."help-me-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) 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" // { @@ -124338,7 +125120,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" @@ -124373,7 +125155,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."minipass-3.3.6" // { dependencies = [ sources."yallist-4.0.0" @@ -124393,7 +125175,7 @@ in sources."debug-4.3.4" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."yallist-4.0.0" ]; }) @@ -124409,7 +125191,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."node-red-admin-3.0.0" sources."node-watch-0.7.3" @@ -124417,7 +125199,7 @@ in 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" @@ -124445,14 +125227,14 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.10.3" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."read-1.0.7" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -124486,7 +125268,7 @@ in sources."signal-exit-3.0.7" (sources."split2-3.2.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."statuses-2.0.1" @@ -124508,7 +125290,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" @@ -124625,8 +125407,8 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -124673,9 +125455,9 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -124837,7 +125619,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -124958,7 +125740,7 @@ 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.4" @@ -125114,7 +125896,7 @@ in sources."mimic-response-2.1.0" sources."min-indent-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" (sources."new-github-release-url-1.0.0" // { @@ -125331,10 +126113,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "9.3.1"; + version = "9.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.3.1.tgz"; - sha512 = "ydRVmnWEVXmc3DCM+F9BjiNj3IHkZ3Mwz5VbJYS2BpY/6d4PcKxNW+Xb0vzGeE6PkVhLcPxwhoIi+RFV2fSfEA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.5.1.tgz"; + sha512 = "MzULm9eEWPuPyHmRBxjcKm47KKYYT1gteVOXPlNJbfdaXNtp+sO4y2X3v5g375KudEAGJVDVCoFuk7bFnuuvNg=="; }; buildInputs = globalBuildInputs; meta = { @@ -125349,10 +126131,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.6.2"; + version = "16.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.2.tgz"; - sha512 = "J/L90a+NDDWscBQGKIsPKer+qbQEQRJDpK+BPsVZf9YWDN5DCAMicPqRb+Emnxfi8QboiNmvDJWRUFFWRQzDMg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.7.10.tgz"; + sha512 = "sLDgYD8ebkH9Jd6mPIq7UDGLr3DAxkHl6ZuJrEF4rauLv6DqHBxtnF16MHUPN+/eBt5QbH4GL/+nxfSAFm3TfQ=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -125361,8 +126143,12 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-2.1.2" sources."@npmcli/git-4.0.3" - sources."@npmcli/installed-package-contents-2.0.1" - sources."@npmcli/move-file-2.0.1" + sources."@npmcli/installed-package-contents-2.0.2" + (sources."@npmcli/move-file-2.0.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.0" @@ -125400,22 +126186,23 @@ in dependencies = [ sources."@npmcli/fs-3.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."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.5" + sources."cacheable-request-10.2.8" sources."camelcase-7.0.1" sources."chalk-5.2.0" sources."chownr-2.0.0" - sources."ci-info-3.7.1" + sources."ci-info-3.8.0" 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.5.0" + sources."commander-10.0.0" sources."concat-map-0.0.1" (sources."config-chain-1.1.13" // { dependencies = [ @@ -125459,7 +126246,7 @@ in sources."find-up-5.0.0" sources."form-data-encoder-2.1.4" sources."fp-and-or-0.1.3" - sources."fs-minipass-3.0.0" + sources."fs-minipass-3.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-4.0.4" @@ -125484,14 +126271,18 @@ in 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.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.4" - sources."ignore-walk-6.0.0" + (sources."ignore-walk-6.0.1" // { + dependencies = [ + sources."minimatch-6.2.0" + ]; + }) sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -125528,22 +126319,30 @@ in sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lowercase-keys-3.0.0" - sources."lru-cache-7.14.1" + sources."lru-cache-7.17.0" (sources."make-fetch-happen-10.2.1" // { dependencies = [ + sources."brace-expansion-1.1.11" 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."rimraf-3.0.2" // { + dependencies = [ + sources."glob-7.2.3" + sources."minimatch-3.1.2" + ]; + }) 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.6" - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimatch-7.3.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -125584,6 +126383,7 @@ in sources."negotiator-0.6.3" (sources."node-gyp-9.3.1" // { dependencies = [ + sources."rimraf-3.0.2" sources."which-2.0.2" ]; }) @@ -125606,7 +126406,7 @@ in sources."npm-pick-manifest-8.0.1" (sources."npm-registry-fetch-14.0.3" // { dependencies = [ - sources."make-fetch-happen-11.0.2" + sources."make-fetch-happen-11.0.3" sources."minipass-fetch-3.0.1" ]; }) @@ -125617,7 +126417,7 @@ in sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."package-json-8.1.0" - sources."pacote-15.0.8" + sources."pacote-15.1.1" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -125636,16 +126436,18 @@ in (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" + sources."strip-json-comments-2.0.1" ]; }) sources."rc-config-loader-4.1.2" (sources."read-package-json-6.0.0" // { dependencies = [ sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."registry-auth-token-5.0.1" sources."registry-url-6.0.1" sources."remote-git-tags-3.0.0" @@ -125654,7 +126456,7 @@ in sources."responselike-3.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rimraf-3.0.2" + sources."rimraf-4.1.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -125669,6 +126471,12 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" + (sources."sigstore-1.0.0" // { + dependencies = [ + sources."make-fetch-happen-11.0.3" + sources."minipass-fetch-3.0.1" + ]; + }) sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.2.0" @@ -125685,7 +126493,7 @@ in 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."strip-json-comments-5.0.0" (sources."tar-6.1.13" // { dependencies = [ (sources."fs-minipass-2.1.0" // { @@ -125696,6 +126504,13 @@ in ]; }) sources."to-regex-range-5.0.1" + (sources."tuf-js-1.0.0" // { + dependencies = [ + sources."make-fetch-happen-11.0.3" + sources."minimatch-6.2.0" + sources."minipass-fetch-3.0.1" + ]; + }) sources."type-fest-2.19.0" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-2.0.1" @@ -125716,7 +126531,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" @@ -125810,10 +126625,10 @@ in sources."npm-7.24.2" sources."oauth-sign-0.9.0" sources."only-0.0.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."safe-buffer-5.2.1" @@ -125864,7 +126679,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -125881,17 +126696,17 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.11.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.11.0.tgz"; - sha512 = "oABYZWFKW4PtEv0Kb3Zqg0mIi75J3gMvq9Km8fjo+Ku0gzpdXhUKkeQUisvJXBPsRBTGkWBDRtCuRhqakCNH4w=="; + url = "https://registry.npmjs.org/orval/-/orval-6.12.0.tgz"; + sha512 = "H5iErtFRhXdl09LuWJwCNJz4iaqA4azplZXuJUC1SiSjO3jiIXypxTuuMvZ0126VzhlObUv+gVPiKk1zYwVKAw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" sources."@apidevtools/openapi-schemas-2.1.0" sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" - sources."@asyncapi/specs-3.2.1" + sources."@asyncapi/specs-4.1.1" sources."@esbuild/android-arm-0.15.18" sources."@esbuild/linux-loong64-0.15.18" sources."@exodus/schemasafe-1.0.0-rc.9" @@ -125902,12 +126717,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.0" - sources."@orval/axios-6.11.0" - sources."@orval/core-6.11.0" - sources."@orval/msw-6.11.0" - sources."@orval/query-6.11.0" - sources."@orval/swr-6.11.0" + sources."@orval/angular-6.12.0" + sources."@orval/axios-6.12.0" + sources."@orval/core-6.12.0" + sources."@orval/msw-6.12.0" + sources."@orval/query-6.12.0" + sources."@orval/swr-6.12.0" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -125915,7 +126730,7 @@ in ]; }) sources."@stoplight/better-ajv-errors-1.0.3" - sources."@stoplight/json-3.20.1" + sources."@stoplight/json-3.20.2" (sources."@stoplight/json-ref-readers-1.2.2" // { dependencies = [ sources."tslib-1.14.1" @@ -125929,34 +126744,34 @@ in sources."fast-glob-3.2.7" ]; }) - (sources."@stoplight/spectral-core-1.16.0" // { + (sources."@stoplight/spectral-core-1.16.1" // { dependencies = [ sources."@stoplight/types-13.6.0" ]; }) - sources."@stoplight/spectral-formats-1.4.0" + sources."@stoplight/spectral-formats-1.5.0" 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.5.0" - sources."@stoplight/spectral-ruleset-migrator-1.9.1" - sources."@stoplight/spectral-rulesets-1.14.1" + sources."@stoplight/spectral-ruleset-bundler-1.5.1" + sources."@stoplight/spectral-ruleset-migrator-1.9.2" + sources."@stoplight/spectral-rulesets-1.15.0" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" ]; }) - sources."@stoplight/types-13.8.0" + sources."@stoplight/types-13.9.1" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" sources."@tootallnate/once-1.1.2" 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.18" + sources."@types/node-18.14.2" 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.12.0" @@ -126001,7 +126816,7 @@ in sources."deep-is-0.1.4" sources."deepmerge-2.2.1" sources."defaults-1.0.4" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" (sources."degenerator-3.0.2" // { dependencies = [ sources."ast-types-0.13.4" @@ -126080,7 +126895,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" @@ -126118,10 +126933,10 @@ in }) sources."iconv-lite-0.6.3" sources."ignore-5.2.4" - sources."immer-9.0.18" + sources."immer-9.0.19" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."ip-1.1.8" sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" @@ -126187,7 +127002,7 @@ in sources."jsonpath-plus-6.0.1" ]; }) - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" sources."normalize-path-3.0.0" @@ -126204,7 +127019,7 @@ in sources."onetime-5.1.2" sources."ono-4.0.11" sources."openapi-types-12.1.0" - (sources."openapi3-ts-3.1.2" // { + (sources."openapi3-ts-3.2.0" // { dependencies = [ sources."yaml-2.2.1" ]; @@ -126227,10 +127042,9 @@ in sources."printable-characters-1.0.42" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."punycode-1.3.2" - sources."querystring-0.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - (sources."raw-body-2.5.1" // { + (sources."raw-body-2.5.2" // { dependencies = [ sources."iconv-lite-0.4.24" ]; @@ -126290,25 +127104,20 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tsconfck-2.0.2" - sources."tslib-2.4.1" + sources."tsconfck-2.0.3" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."typed-array-length-1.0.4" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.2.0" - ]; - }) + sources."uri-js-4.4.1" sources."urijs-1.19.11" - sources."url-0.11.0" sources."utility-types-3.10.0" sources."validate-npm-package-name-3.0.0" - sources."validator-13.7.0" - sources."vm2-3.9.13" + sources."validator-13.9.0" + sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -126348,14 +127157,14 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."json5-2.2.3" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -126367,8 +127176,8 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.12" - sources."@babel/helper-create-regexp-features-plugin-7.20.5" + sources."@babel/helper-create-class-features-plugin-7.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.0" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -126376,11 +127185,11 @@ in }) 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-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.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" @@ -126390,16 +127199,16 @@ in 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-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.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.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.20.7" + sources."@babel/plugin-proposal-class-static-block-7.21.0" 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" @@ -126408,9 +127217,9 @@ in sources."@babel/plugin-proposal-numeric-separator-7.18.6" 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.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.20.5" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" 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" @@ -126432,20 +127241,20 @@ in 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.11" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" 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" - sources."@babel/plugin-transform-flow-strip-types-7.19.0" - sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-flow-strip-types-7.21.0" + sources."@babel/plugin-transform-for-of-7.21.0" 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.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" 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.20.5" @@ -126453,7 +127262,7 @@ in sources."@babel/plugin-transform-object-super-7.18.6" sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.21.0" 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" @@ -126469,10 +127278,11 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.20.7" + sources."@babel/regjsgen-0.8.0" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -126531,7 +127341,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.6" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -126579,7 +127389,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" ]; }) @@ -126588,7 +127398,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -126605,7 +127415,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -126631,7 +127441,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.27.1" + sources."core-js-compat-3.29.0" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -126692,7 +127502,7 @@ in sources."clone-1.0.4" ]; }) - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" (sources."define-property-0.2.5" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { @@ -126738,7 +127548,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -126801,7 +127611,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" @@ -126840,7 +127650,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" ]; }) @@ -126853,10 +127663,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.16.1" + sources."terser-5.16.5" ]; }) (sources."htmlparser2-6.1.0" // { @@ -126876,7 +127686,7 @@ in sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-absolute-url-2.1.0" (sources."is-accessor-descriptor-1.0.0" // { dependencies = [ @@ -126991,7 +127801,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -127016,7 +127826,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -127127,7 +127937,7 @@ in sources."domhandler-2.4.2" sources."entities-1.1.2" sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."posthtml-render-1.4.0" @@ -127140,7 +127950,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" @@ -127156,7 +127966,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -127173,8 +127983,7 @@ in ]; }) sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.2" - sources."regjsgen-0.7.1" + sources."regexpu-core-5.3.1" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -127395,10 +128204,10 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.8.2.tgz"; - sha512 = "XMVf3Ip9Iokv0FC3ulN/B0cb5O21qaw0RhUPz7zULQlY794ZpFP9mNtN7HvCVEgjl5/q2sYMcTA8l+5QJ2zZ/Q=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.8.3.tgz"; + sha512 = "5rMBpbNE72g6jZvkdR5gS2nyhwIXaJy8i65osOqs/+5b7zgf3eMKgjSsDrv6bhz3gzifsba6MBJiZdBckl+vnA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -127423,85 +128232,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.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.2" - sources."@parcel/cache-2.8.2" - sources."@parcel/codeframe-2.8.2" - sources."@parcel/compressor-raw-2.8.2" - sources."@parcel/config-default-2.8.2" - sources."@parcel/core-2.8.2" - sources."@parcel/diagnostic-2.8.2" - sources."@parcel/events-2.8.2" - sources."@parcel/fs-2.8.2" - sources."@parcel/fs-search-2.8.2" - sources."@parcel/graph-2.8.2" - sources."@parcel/hash-2.8.2" - sources."@parcel/logger-2.8.2" - sources."@parcel/markdown-ansi-2.8.2" - sources."@parcel/namer-default-2.8.2" - sources."@parcel/node-resolver-core-2.8.2" - sources."@parcel/optimizer-css-2.8.2" - sources."@parcel/optimizer-htmlnano-2.8.2" - sources."@parcel/optimizer-image-2.8.2" - sources."@parcel/optimizer-svgo-2.8.2" - sources."@parcel/optimizer-terser-2.8.2" - sources."@parcel/package-manager-2.8.2" - sources."@parcel/packager-css-2.8.2" - sources."@parcel/packager-html-2.8.2" - sources."@parcel/packager-js-2.8.2" - sources."@parcel/packager-raw-2.8.2" - sources."@parcel/packager-svg-2.8.2" - sources."@parcel/plugin-2.8.2" - sources."@parcel/reporter-cli-2.8.2" - sources."@parcel/reporter-dev-server-2.8.2" - sources."@parcel/resolver-default-2.8.2" - sources."@parcel/runtime-browser-hmr-2.8.2" - sources."@parcel/runtime-js-2.8.2" - sources."@parcel/runtime-react-refresh-2.8.2" - sources."@parcel/runtime-service-worker-2.8.2" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.1" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.1" + 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.8.2" - sources."@parcel/transformer-css-2.8.2" - (sources."@parcel/transformer-html-2.8.2" // { + 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.8.2" - sources."@parcel/transformer-js-2.8.2" - sources."@parcel/transformer-json-2.8.2" - sources."@parcel/transformer-postcss-2.8.2" - (sources."@parcel/transformer-posthtml-2.8.2" // { + 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.8.2" - sources."@parcel/transformer-react-refresh-wrap-2.8.2" - (sources."@parcel/transformer-svg-2.8.2" // { + 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.8.2" - sources."@parcel/utils-2.8.2" + 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.8.2" + 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" @@ -127524,11 +128333,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -127554,8 +128363,8 @@ in sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-5.1.14" - sources."cssnano-preset-default-5.2.13" + sources."cssnano-5.1.15" + sources."cssnano-preset-default-5.2.14" sources."cssnano-utils-3.1.0" sources."csso-4.2.0" sources."cssom-0.3.8" @@ -127577,7 +128386,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -127598,7 +128407,7 @@ in sources."get-port-4.2.0" sources."getpass-0.1.7" sources."glob-8.1.0" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -127635,15 +128444,15 @@ in sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - 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."lightningcss-1.19.0" + sources."lightningcss-darwin-arm64-1.19.0" + sources."lightningcss-darwin-x64-1.19.0" + sources."lightningcss-linux-arm-gnueabihf-1.19.0" + sources."lightningcss-linux-arm64-gnu-1.19.0" + sources."lightningcss-linux-arm64-musl-1.19.0" + sources."lightningcss-linux-x64-gnu-1.19.0" + sources."lightningcss-linux-x64-musl-1.19.0" + sources."lightningcss-win32-x64-msvc-1.19.0" sources."lilconfig-2.0.6" sources."lines-and-columns-1.2.4" sources."lmdb-2.5.2" @@ -127656,13 +128465,17 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."msgpackr-1.8.1" - sources."msgpackr-extract-2.2.0" + sources."msgpackr-1.8.4" + (sources."msgpackr-extract-3.0.1" // { + dependencies = [ + sources."node-gyp-build-optional-packages-5.0.7" + ]; + }) sources."nanoid-3.3.4" sources."node-addon-api-4.3.0" sources."node-gyp-build-4.6.0" sources."node-gyp-build-optional-packages-5.0.3" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-url-6.1.0" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" @@ -127682,14 +128495,14 @@ in sources."pn-1.1.0" sources."postcss-8.4.21" sources."postcss-calc-8.2.4" - sources."postcss-colormin-5.3.0" + sources."postcss-colormin-5.3.1" 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-merge-rules-5.1.4" sources."postcss-minify-font-values-5.1.0" sources."postcss-minify-gradients-5.1.1" sources."postcss-minify-params-5.1.4" @@ -127704,7 +128517,7 @@ in 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-initial-5.1.2" sources."postcss-reduce-transforms-5.1.0" sources."postcss-selector-parser-6.0.11" sources."postcss-svgo-5.1.0" @@ -127715,7 +128528,7 @@ in sources."posthtml-render-3.0.0" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."purgecss-5.0.0" // { dependencies = [ sources."commander-9.5.0" @@ -127746,7 +128559,7 @@ in sources."svgo-2.8.0" sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.5" // { dependencies = [ sources."commander-2.20.3" ]; @@ -127755,7 +128568,7 @@ in 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" @@ -127840,7 +128653,7 @@ in (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" - sources."content-type-1.0.4" + sources."content-type-1.0.5" ]; }) sources."brace-expansion-1.1.11" @@ -127874,7 +128687,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -127893,7 +128706,7 @@ in sources."etag-1.8.1" (sources."express-4.18.2" // { dependencies = [ - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."safe-buffer-5.2.1" ]; }) @@ -127915,7 +128728,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" @@ -127963,7 +128776,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."moment-2.29.4" sources."ms-2.0.0" @@ -127996,7 +128809,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -128004,7 +128817,7 @@ in sources."bytes-3.1.2" ]; }) - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.3" @@ -128136,7 +128949,7 @@ in sources."klaw-sync-6.0.0" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nice-try-1.0.5" sources."once-1.4.0" sources."open-7.4.2" @@ -128245,7 +129058,7 @@ in sources."decompress-response-3.3.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."dns-equal-1.0.0" sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" @@ -128267,7 +129080,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" @@ -128330,7 +129143,7 @@ in sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.3.5" sources."mkdirp-classic-0.5.3" sources."ms-2.0.0" @@ -128396,7 +129209,7 @@ in sources."re-emitter-1.1.4" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."redent-1.0.0" sources."regexp.prototype.flags-1.4.3" sources."repeating-2.0.1" @@ -128501,7 +129314,7 @@ in sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."array-flatten-1.1.1" @@ -128533,7 +129346,7 @@ in sources."blob-0.0.5" sources."bn.js-4.12.0" sources."bncode-0.5.3" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -128557,7 +129370,7 @@ in sources."component-inherit-0.0.3" (sources."compress-commons-2.1.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."concat-map-0.0.1" @@ -128577,7 +129390,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -128612,6 +129425,8 @@ in sources."events-3.3.0" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -128632,7 +129447,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" @@ -128680,7 +129495,7 @@ in }) (sources."lazystream-1.0.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."lodash-4.17.21" @@ -128699,7 +129514,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" (sources."morgan-1.10.0" // { @@ -128750,7 +129565,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" @@ -128760,10 +129575,10 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.3" @@ -128787,13 +129602,13 @@ in sources."simple-get-2.8.2" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.0.1" sources."ws-2.3.1" ]; @@ -128912,7 +129727,7 @@ in sources."base64-js-1.5.1" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."braces-3.0.2" @@ -128982,12 +129797,12 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-response-2.1.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" (sources."multistream-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."napi-build-utils-1.0.2" @@ -128996,7 +129811,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-notifier-10.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -129013,7 +129828,7 @@ in sources."pump-3.0.0" sources."queue-microtask-1.2.3" sources."rc-1.2.8" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."require-directory-2.1.1" sources."resolve-1.22.1" sources."reusify-1.0.4" @@ -129037,7 +129852,7 @@ in sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."to-fast-properties-2.0.0" @@ -129110,7 +129925,7 @@ 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" @@ -129247,7 +130062,7 @@ in sources."promptly-2.2.0" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."readdirp-3.6.0" @@ -129280,10 +130095,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.17.3" + sources."systeminformation-5.17.11" 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" @@ -129296,7 +130111,7 @@ in sources."async-2.6.4" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -129307,7 +130122,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "https://pm2.keymetrics.io/"; + homepage = "http://pm2.keymetrics.io/"; license = "AGPL-3.0"; }; production = true; @@ -129317,10 +130132,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.25.0"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.25.0.tgz"; - sha512 = "FGFQUON8kJ6ma39elJ8lyD8wPIfgp3opGJD9sX0TgIJk4zSr556qCgC8AN+3BFHe4yuRkEauf4JVLW2RKyyEcA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.28.0.tgz"; + sha512 = "nbuY07S2519jEjaV9KLjSFmOwh0b6KIViIdc/RCJkgco8SZa2+ikQQe4N3CfNn5By5BH0dKVbZ8Ox1Mw8wItSA=="; }; buildInputs = globalBuildInputs; meta = { @@ -129399,24 +130214,24 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.37" 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.18" - sources."acorn-8.8.1" + sources."@types/node-18.14.2" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -129482,13 +130297,13 @@ in sources."thenby-1.3.4" sources."to-regex-range-5.0.1" sources."ts-node-10.9.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" 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.2.1" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" sources."yn-3.1.1" ]; @@ -129527,14 +130342,14 @@ in sources."ini-1.3.8" sources."lru-cache-6.0.0" sources."mimic-response-3.1.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-3.31.0" + sources."node-abi-3.33.0" sources."once-1.4.0" sources."pump-3.0.0" sources."rc-1.2.8" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."simple-concat-1.0.1" @@ -129561,10 +130376,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; - sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"; + sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; }; buildInputs = globalBuildInputs; meta = { @@ -129591,10 +130406,10 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."is-core-module-2.11.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nanolru-1.0.0" sources."path-parse-1.0.7" - sources."prettier-2.8.3" + sources."prettier-2.8.4" sources."resolve-1.22.1" sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" @@ -129636,13 +130451,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "4.9.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-4.9.0.tgz"; - sha512 = "bS96oZ5oDFXYgoF2l7PJ3Mp1wWWfLOo8B/jAfbA2Pn0Wm5Z/owBHzaMQKS3i1CzVBDWWPVnOohmbJmjvkcHS5w=="; + url = "https://registry.npmjs.org/prisma/-/prisma-4.10.1.tgz"; + sha512 = "0jDxgg+DruB1kHVNlcspXQB9au62IFfVg9drkhzXudszHNUAQn0lVuu+T8np0uC2z1nKD5S3qPeCyR8u5YFLnA=="; }; dependencies = [ - sources."@prisma/engines-4.9.0" + sources."@prisma/engines-4.10.1" ]; buildInputs = globalBuildInputs; meta = { @@ -129657,38 +130472,38 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "4.9.0"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.9.0.tgz"; - sha512 = "Q1KS0GoQG0284hI5CqAdfyq+oLKC7SnB9N6g6ldA7Jqs96rlFVe2Te0UW8bvA9AyG3uljmB0MjlEQDLWPFo8+A=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.10.1.tgz"; + sha512 = "8cMYi37R/wjRfgBB+R24NbHpsdHgF1JhYTDHgxl041fFllW6d0JQCyCdc0nHXgh0QqZs30qYpKQWHzY1dc9e4Q=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { 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-function-name-7.21.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-module-transforms-7.21.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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.1.1" @@ -129696,7 +130511,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.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5" + sources."@prisma/prisma-fmt-wasm-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19" sources."@types/js-levenshtein-1.1.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" @@ -129706,10 +130521,10 @@ in sources."argparse-1.0.10" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -129722,7 +130537,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -129776,7 +130591,7 @@ in sources."minimatch-3.1.2" sources."ms-2.1.2" sources."node-preload-0.2.1" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."nyc-15.1.0" sources."once-1.4.0" sources."p-limit-2.3.0" @@ -129939,7 +130754,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."browserify-zlib-0.2.0" @@ -129955,7 +130770,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."console-browserify-1.2.0" @@ -130009,7 +130824,7 @@ in sources."has-1.0.3" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."hash.js-1.1.7" @@ -130045,7 +130860,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.8" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" (sources."module-deps-6.2.3" // { @@ -130091,7 +130906,7 @@ in sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -130106,7 +130921,7 @@ in sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."simple-concat-1.0.1" sources."sorcery-0.10.0" sources."source-map-0.5.7" @@ -130115,7 +130930,7 @@ in sources."stream-combiner2-1.1.1" (sources."stream-http-3.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-splicer-2.0.1" @@ -130173,13 +130988,13 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -130283,19 +131098,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.4" + sources."js-base64-3.7.5" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" sources."keyv-3.1.0" @@ -130304,14 +131119,14 @@ in sources."lodash.flatmap-4.5.0" sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" - sources."minimist-1.2.7" + sources."minimist-1.2.8" 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.3" sources."once-1.4.0" - sources."open-8.4.0" + sources."open-8.4.2" sources."p-cancelable-1.1.0" sources."package-json-6.5.0" (sources."pixiv-api-client-0.25.0" // { @@ -130355,10 +131170,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.290"; + version = "1.1.295"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.290.tgz"; - sha512 = "iHT8G2+R/GUfYWxxd4ud5Lj/0H0bE1eWVR0avKKgPtkBeLkUz3sorjKpfuaJdsuJNrunzMtZsmYPD366t39klg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.295.tgz"; + sha512 = "nBowWG3qI2+ETtbsPBOnN7S5aNFE2PXn3OfQMM2jNfSh6A9P7z6YOmV9tYt8HYQ8WHX8qcU9b4ALe7nFp0GnBg=="; }; buildInputs = globalBuildInputs; meta = { @@ -130373,10 +131188,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "20.0.26"; + version = "23.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-20.0.26.tgz"; - sha512 = "q0pOSWfVgGEATW96fvbAOEe9od48EqMCGpv86XNt9aznVngdB4eJRyPK1Z0Jvl10/cWDze2bvzPT2b+LChSfAQ=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.9.tgz"; + sha512 = "seufowo6TLgUcbguGyqUs9K6ey6PR1OMVAlZH8VHndoKMNE9zK2T9n/suY9dN16zXTNxNpxlonkR30cX8aeCTg=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -130384,28 +131199,32 @@ in 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + (sources."@mark.probst/typescript-json-schema-0.55.0" // { + dependencies = [ + sources."typescript-4.9.4" + ]; + }) + sources."@swc/core-1.3.36" + sources."@swc/core-darwin-arm64-1.3.36" + sources."@swc/core-darwin-x64-1.3.36" + sources."@swc/core-linux-arm-gnueabihf-1.3.36" + sources."@swc/core-linux-arm64-gnu-1.3.36" + sources."@swc/core-linux-arm64-musl-1.3.36" + sources."@swc/core-linux-x64-gnu-1.3.36" + sources."@swc/core-linux-x64-musl-1.3.36" + sources."@swc/core-win32-arm64-msvc-1.3.36" + sources."@swc/core-win32-ia32-msvc-1.3.36" + sources."@swc/core-win32-x64-msvc-1.3.36" + sources."@swc/wasm-1.3.37" 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/node-16.18.13" 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."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -130458,7 +131277,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-url-1.2.4" sources."iterall-1.1.3" - sources."js-base64-2.6.4" + sources."js-base64-3.7.5" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."make-error-1.3.6" @@ -130471,9 +131290,9 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - sources."quicktype-core-20.0.26" - sources."quicktype-graphql-input-20.0.26" - sources."quicktype-typescript-input-20.0.26" + sources."quicktype-core-23.0.9" + sources."quicktype-graphql-input-23.0.9" + sources."quicktype-typescript-input-23.0.9" sources."readable-stream-4.3.0" sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" @@ -130484,7 +131303,7 @@ in sources."stream-json-1.7.5" (sources."string-to-stream-3.0.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."string-width-4.2.3" @@ -130500,7 +131319,7 @@ in sources."tiny-inflate-1.0.3" sources."tr46-0.0.3" sources."ts-node-10.9.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."typical-4.0.0" sources."unicode-properties-1.4.1" (sources."unicode-trie-2.0.0" // { @@ -130523,7 +131342,7 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yaml-2.2.1" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" sources."yn-3.1.1" ]; @@ -130558,7 +131377,7 @@ in sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."deep-equal-2.2.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."es-get-iterator-1.1.3" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" @@ -130566,7 +131385,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."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -130578,7 +131397,7 @@ in sources."i-0.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" @@ -130598,7 +131417,7 @@ in sources."isarray-2.0.5" sources."isstream-0.1.2" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mute-stream-0.0.8" sources."ncp-0.4.2" @@ -130651,15 +131470,15 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.20.7" + sources."@babel/cli-7.21.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.20.12" // { + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -130671,8 +131490,8 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.20.12" - sources."@babel/helper-create-regexp-features-plugin-7.20.5" + sources."@babel/helper-create-class-features-plugin-7.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.0" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -130680,11 +131499,11 @@ in }) 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-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.11" + sources."@babel/helper-module-transforms-7.21.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" @@ -130694,16 +131513,16 @@ in 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-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.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.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.20.7" + sources."@babel/plugin-proposal-class-static-block-7.21.0" 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" @@ -130713,9 +131532,9 @@ in sources."@babel/plugin-proposal-numeric-separator-7.18.6" 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.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.20.5" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" 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" @@ -130737,19 +131556,19 @@ in 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.11" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" 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" - sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-for-of-7.21.0" 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.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" 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.20.5" @@ -130758,12 +131577,12 @@ in 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.20.7" + sources."@babel/plugin-transform-react-jsx-7.21.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.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.19.6" // { + (sources."@babel/plugin-transform-runtime-7.21.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -130783,11 +131602,12 @@ in sources."@babel/preset-modules-0.1.5" 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.7" + sources."@babel/register-7.21.0" + sources."@babel/regjsgen-0.8.0" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -130798,11 +131618,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.18" + sources."@types/node-18.14.2" 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" @@ -130871,7 +131691,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.6" sources."async-limiter-1.0.1" sources."atob-2.1.2" (sources."autoprefixer-9.8.8" // { @@ -130955,11 +131775,11 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -130989,7 +131809,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -131059,14 +131879,14 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.29.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" @@ -131167,7 +131987,7 @@ in sources."pump-3.0.0" ]; }) - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."del-4.1.1" sources."depd-2.0.0" @@ -131210,7 +132030,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -131366,7 +132186,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" @@ -131422,7 +132242,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."hash.js-1.1.7" @@ -131500,7 +132320,7 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."intersection-observer-0.7.0" sources."into-stream-3.1.0" sources."invariant-2.2.4" @@ -131625,7 +132445,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."mississippi-3.0.0" // { dependencies = [ sources."pump-3.0.0" @@ -131660,7 +132480,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -131907,7 +132727,7 @@ in }) sources."pump-2.0.1" sources."pumpify-1.5.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.11.0" sources."query-string-5.1.1" @@ -131943,7 +132763,7 @@ in sources."react-lifecycles-compat-3.0.4" sources."react-side-effect-2.1.2" sources."react-universal-component-4.5.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -131955,10 +132775,9 @@ in sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.2.2" + sources."regexpu-core-5.3.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -132147,7 +132966,7 @@ in sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."split-string-3.1.0" @@ -132219,7 +133038,7 @@ in dependencies = [ sources."bl-4.1.0" sources."pump-3.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."tar-stream-2.2.0" ]; }) @@ -132482,7 +133301,7 @@ in ]; }) sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -132506,10 +133325,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" @@ -132517,7 +133336,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" @@ -132562,7 +133381,7 @@ in sources."delegates-1.0.0" sources."detect-libc-2.0.1" sources."domexception-4.0.0" - sources."dompurify-2.4.3" + sources."dompurify-2.4.4" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."escalade-3.1.1" @@ -132602,7 +133421,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -132611,7 +133430,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - (sources."node-fetch-2.6.8" // { + (sources."node-fetch-2.6.9" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -132629,9 +133448,9 @@ in sources."path-is-absolute-1.0.1" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."querystringify-2.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."require-directory-2.1.1" sources."requires-port-1.0.0" sources."rimraf-3.0.2" @@ -132654,7 +133473,7 @@ in sources."type-check-0.3.2" sources."universalify-0.2.0" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-3.0.0" @@ -132666,12 +133485,12 @@ in sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -132694,21 +133513,21 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.21.1" 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" + sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-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.20.7" - sources."@babel/runtime-7.20.7" + sources."@babel/parser-7.21.2" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" @@ -132721,10 +133540,10 @@ 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.120" + sources."@redocly/openapi-core-1.0.0-beta.123" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" @@ -132746,7 +133565,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 = [ @@ -132794,11 +133613,11 @@ in (sources."browserify-sign-4.2.1" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -132816,7 +133635,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" (sources."chalk-2.4.2" // { dependencies = [ sources."has-flag-3.0.0" @@ -132839,7 +133658,7 @@ in sources."configstore-5.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -132851,7 +133670,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.1.0" + sources."css-to-react-native-3.2.0" sources."debug-4.3.4" sources."decko-1.2.0" sources."decompress-response-3.3.0" @@ -132864,10 +133683,10 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.4.3" + sources."dompurify-2.4.4" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -132913,7 +133732,7 @@ in (sources."hash-base-3.1.0" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."hash.js-1.1.7" // { @@ -132923,7 +133742,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" @@ -132983,18 +133802,18 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-5.1.6" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-1.0.4" - sources."mobx-6.7.0" + sources."mobx-6.8.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.8" + sources."node-fetch-2.6.9" 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.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."oas-kit-common-1.0.8" @@ -133048,7 +133867,7 @@ in sources."react-dom-17.0.2" sources."react-is-16.13.1" sources."react-tabs-3.2.3" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -133111,7 +133930,7 @@ in sources."supports-color-8.1.1" sources."swagger2openapi-7.0.8" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.5" sources."terser-webpack-plugin-5.3.6" sources."timers-browserify-2.0.12" sources."to-arraybuffer-1.0.1" @@ -133136,7 +133955,7 @@ in }) (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) (sources."url-0.11.0" // { @@ -133175,7 +133994,7 @@ in sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -133198,7 +134017,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.28" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -133406,7 +134225,7 @@ in sources."concat-stream-1.6.2" sources."configstore-5.0.1" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -133456,7 +134275,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-4.1.0" sources."glob-8.0.3" sources."glob-parent-5.1.2" @@ -133468,7 +134287,7 @@ in sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."highlight.js-11.7.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ @@ -133520,7 +134339,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-5.1.6" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mustache-4.2.0" @@ -133565,7 +134384,7 @@ in sources."ini-1.3.8" ]; }) - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -133662,10 +134481,10 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.1.tgz"; - sha512 = "Z4Y81w8atcvaJuJuBB88VpADRH66okZAuEm+Jtaufa+s7rZmIz+Hik2G53kGaNytE7lsfXyWktTmfVz0H9xuDg=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -133680,10 +134499,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.10.0"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz"; - sha512 = "JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.17.3.tgz"; + sha512 = "p5LaCXiiOL/wrOkj8djsIDFmyU9ysUxcyW+EKRLHb6TKldJzXpImjcRSR+vgo09DBdofGcOoLOsRyxxG2n5/qQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -133704,7 +134523,8 @@ in version = "0.3.1059"; src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ - sources."@eslint/eslintrc-1.4.1" + sources."@eslint/eslintrc-2.0.0" + sources."@eslint/js-8.35.0" sources."@hpcc-js/wasm-1.16.6" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" @@ -133717,16 +134537,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.48.2" - sources."@typescript-eslint/parser-5.48.2" - sources."@typescript-eslint/scope-manager-5.48.2" - sources."@typescript-eslint/type-utils-5.48.2" - sources."@typescript-eslint/types-5.48.2" - sources."@typescript-eslint/typescript-estree-5.48.2" - sources."@typescript-eslint/utils-5.48.2" - sources."@typescript-eslint/visitor-keys-5.48.2" - sources."@vscode/test-electron-2.2.2" - sources."acorn-8.8.1" + sources."@typescript-eslint/eslint-plugin-5.54.0" + sources."@typescript-eslint/parser-5.54.0" + sources."@typescript-eslint/scope-manager-5.54.0" + sources."@typescript-eslint/type-utils-5.54.0" + sources."@typescript-eslint/types-5.54.0" + sources."@typescript-eslint/typescript-estree-5.54.0" + sources."@typescript-eslint/utils-5.54.0" + sources."@typescript-eslint/visitor-keys-5.54.0" + sources."@vscode/test-electron-2.2.3" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -133741,7 +134561,7 @@ in sources."binary-0.3.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-3.4.7" @@ -133770,8 +134590,8 @@ in sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" - sources."d3-7.8.1" - sources."d3-array-3.2.1" + 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" @@ -133842,7 +134662,7 @@ in sources."entities-4.4.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.32.0" // { + (sources."eslint-8.35.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -133857,7 +134677,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - (sources."esquery-1.4.0" // { + (sources."esquery-1.4.2" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -133890,11 +134710,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.19.0" + sources."globals-13.20.0" sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" @@ -133921,7 +134741,7 @@ in sources."is-path-inside-3.0.3" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + 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" @@ -133944,7 +134764,7 @@ in sources."mime-1.6.0" sources."mimic-response-3.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -133952,7 +134772,7 @@ 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.31.0" + sources."node-abi-3.33.0" sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" sources."object-inspect-1.12.3" @@ -133979,7 +134799,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { @@ -133988,7 +134808,7 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."regexpp-3.2.0" sources."require-directory-2.1.1" sources."resolve-from-4.0.0" @@ -134017,14 +134837,14 @@ in sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."text-table-0.2.0" 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" @@ -134035,7 +134855,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.9" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.6" @@ -134156,7 +134976,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" @@ -134206,10 +135026,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.57.1"; + version = "1.58.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; - sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz"; + sha512 = "Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -134219,7 +135039,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."glob-parent-5.1.2" - sources."immutable-4.2.2" + sources."immutable-4.2.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -134265,13 +135085,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "14.1.2"; + version = "14.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-14.1.2.tgz"; - sha512 = "luwVfJwbeE7dhCKeRU0vIBpt4bXdbAfzwsWJIQ5eqrIW2e+4nLWXbSlZ0WzelSFHQq+FlueOW6dr90jEewS9zw=="; + 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" // { @@ -134331,7 +135151,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."ms-2.0.0" sources."negotiator-0.6.3" sources."npm-run-path-4.0.1" @@ -134340,7 +135160,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" @@ -134373,7 +135193,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" @@ -134393,10 +135213,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.26.0"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.26.0.tgz"; - sha512 = "drVr4akkQwm2Pj7ZN9boh5PoI2nKvlXmy+Cb8Hh1Zv8ybsf47ZUQE6t7dakGA4irYf4SQCbVc72nKqISfarMCQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.27.0.tgz"; + sha512 = "+8EDo7x8IJxTj4KqQG71qpX7oq+EZy0NGm/04q3M5jK7L8rLowEtnzq82s93yeNSgmJSMopd3pTzuH9CCWkNMw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -134405,7 +135225,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" @@ -134431,7 +135251,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.191" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -134448,7 +135268,7 @@ in }) (sources."archiver-5.3.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."archiver-utils-2.1.0" @@ -134459,7 +135279,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.1296.0" // { + (sources."aws-sdk-2.1324.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -134473,7 +135293,7 @@ in sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."bluebird-3.7.2" @@ -134505,7 +135325,7 @@ in sources."child-process-ext-2.1.1" sources."chokidar-3.5.3" sources."chownr-2.0.0" - sources."ci-info-3.7.1" + sources."ci-info-3.8.0" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.2" @@ -134525,7 +135345,7 @@ in sources."component-emitter-1.3.0" (sources."compress-commons-4.1.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."concat-map-0.0.1" @@ -134539,7 +135359,7 @@ in sources."crc-32-1.2.2" (sources."crc32-stream-4.0.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."cross-spawn-6.0.5" // { @@ -134652,7 +135472,7 @@ in 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" @@ -134667,7 +135487,7 @@ 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" @@ -134746,7 +135566,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -134760,7 +135580,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -134770,7 +135590,7 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" @@ -134793,15 +135613,15 @@ in sources."process-utils-4.0.0" sources."promise-queue-2.2.5" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."readdir-glob-1.1.2" // { @@ -134830,13 +135650,13 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.16.0" + sources."simple-git-3.16.1" sources."slash-3.0.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" (sources."split2-3.2.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."sprintf-js-1.0.3" @@ -134850,7 +135670,7 @@ in sources."strtok3-6.3.0" (sources."superagent-7.1.6" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."supports-color-8.1.1" // { @@ -134861,7 +135681,7 @@ in sources."tar-6.1.13" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."throat-5.0.0" @@ -134874,7 +135694,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" @@ -134911,7 +135731,7 @@ in sources."yauzl-2.10.0" (sources."zip-stream-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) ]; @@ -134964,7 +135784,7 @@ in sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -135013,7 +135833,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" @@ -135053,7 +135873,7 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."moment-2.7.0" sources."ms-2.0.0" @@ -135074,7 +135894,7 @@ in sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -135308,7 +136128,7 @@ in sources."pascalcase-0.1.1" sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."repeat-element-1.1.4" @@ -135460,7 +136280,7 @@ in sources."lru-cache-2.2.0" sources."mime-1.6.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mv-2.1.1" sources."nan-2.17.0" @@ -135473,7 +136293,7 @@ in sources."precond-0.2.3" sources."process-nextick-args-2.0.1" sources."qs-3.1.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -135560,10 +136380,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1087.0"; + version = "1.1109.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1087.0.tgz"; - sha512 = "4Ap2O59+qHCKmzeJu0Kq6S74M409UwRer3ss3wLCNO7vwj8hpfi4wvA+bZc8ywwKv028X9nLhw8hzcJ7bmsavQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1109.0.tgz"; + sha512 = "sBcibkAfcq6nXr6t0GieDjdc8kQfEf429+M1VKavGfLaJPQNIqSjtOhQJ5FcZqaB/mCWa1szektkHeyAiB4m9A=="; }; buildInputs = globalBuildInputs; meta = { @@ -135577,23 +136397,23 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.5.4"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz"; - sha512 = "m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz"; + sha512 = "KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA=="; }; dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" 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.1" + sources."engine.io-6.4.1" sources."engine.io-parser-5.0.6" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -135601,11 +136421,11 @@ in sources."negotiator-0.6.3" 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-adapter-2.5.2" + sources."socket.io-parser-4.2.2" sources."utf-8-validate-5.0.10" sources."vary-1.1.2" - sources."ws-8.2.3" + sources."ws-8.11.0" ]; buildInputs = globalBuildInputs; meta = { @@ -135721,7 +136541,7 @@ in sources."quick-lru-5.1.1" sources."read-pkg-6.0.0" sources."read-pkg-up-8.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."redent-4.0.0" sources."restore-cursor-4.0.0" sources."round-to-6.0.0" @@ -135758,7 +136578,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" ]; @@ -135782,10 +136602,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "12.0.5"; + version = "12.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.0.5.tgz"; - sha512 = "nKils1bIf99WyDqr7252W6NhHjgJoL2mw7bvWb79uDzVd1xZceZ8zyy05behD92+xJIUzEibNMXwTuDFMwrHyg=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.1.2.tgz"; + sha512 = "SoFn+9ZflUt8+HYZ/PaifXt1RptcDUn8HXqsWmfXdPV3WeHPgT0qOSJXxHU24d7NOVt9X40MLqf263fNk79XqA=="; }; dependencies = [ sources."argparse-2.0.1" @@ -135842,7 +136662,7 @@ in sources."push-stream-11.2.0" ]; }) - sources."async-each-1.0.3" + sources."async-each-1.0.6" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" @@ -135952,7 +136772,7 @@ in sources."abstract-leveldown-6.2.3" ]; }) - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -136047,7 +136867,7 @@ 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" @@ -136093,7 +136913,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int53-1.0.0" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."ip-1.1.8" sources."irregular-plurals-1.4.0" (sources."is-accessor-descriptor-1.0.0" // { @@ -136175,7 +136995,7 @@ in sources."level-errors-2.0.1" (sources."level-iterator-stream-4.0.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."level-js-4.0.2" // { @@ -136194,8 +137014,8 @@ in }) sources."levelup-4.4.0" sources."libnested-1.5.2" - sources."libsodium-0.7.10" - sources."libsodium-wrappers-0.7.10" + sources."libsodium-0.7.11" + sources."libsodium-wrappers-0.7.11" sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" @@ -136213,7 +137033,7 @@ in sources."mdmanifest-1.0.8" sources."micromatch-2.3.11" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -136416,7 +137236,7 @@ in }) sources."range-parser-1.2.1" sources."rc-1.2.8" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" (sources."readdirp-2.2.1" // { dependencies = [ sources."arr-diff-4.0.0" @@ -136856,7 +137676,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1324.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -136884,7 +137704,7 @@ in sources."bindings-1.2.1" sources."blob-0.0.5" sources."bluebird-2.11.0" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."qs-6.11.0" ]; @@ -136927,7 +137747,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."string_decoder-1.1.1" ]; }) @@ -136938,7 +137758,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-to-ecmascript-compatible-varname-0.1.5" sources."cookie-0.4.0" (sources."cookie-session-2.0.0" // { @@ -137031,9 +137851,11 @@ in }) (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."cookie-0.5.0" sources."proxy-addr-2.0.7" sources."qs-6.11.0" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -137065,7 +137887,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 = [ @@ -137153,7 +137975,7 @@ in dependencies = [ sources."esprima-4.0.1" sources."js-yaml-3.14.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."uri-js-3.0.2" ]; }) @@ -137234,7 +138056,7 @@ in sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.6" sources."moment-2.29.4" @@ -137338,7 +138160,7 @@ in sources."randexp-0.4.9" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -137362,7 +138184,7 @@ in sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -137472,7 +138294,7 @@ in sources."mime-2.6.0" sources."ms-2.1.2" sources."qs-6.11.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."string_decoder-1.3.0" @@ -137540,7 +138362,7 @@ in sources."unpipe-1.0.0" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) (sources."url-0.10.3" // { @@ -137655,25 +138477,28 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.16.1"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz"; - sha512 = "ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-15.2.0.tgz"; + sha512 = "wjg5OLn8zQwjlj5cYUgyQpMWKzct42AG5dYlqkHRJQJqsystFFn3onqEc263KH4xfEI0W3lZCnlIhFfS64uwSA=="; }; 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/css-parser-algorithms-2.0.1" + sources."@csstools/css-tokenizer-2.1.0" + sources."@csstools/media-query-list-parser-2.0.1" + 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.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" + sources."argparse-2.0.1" sources."array-union-2.1.0" sources."arrify-1.0.1" sources."astral-regex-2.0.0" @@ -137692,8 +138517,9 @@ in sources."color-name-1.1.3" sources."colord-2.9.3" sources."concat-map-0.0.1" - sources."cosmiconfig-7.1.0" + sources."cosmiconfig-8.1.0" sources."css-functions-list-3.1.0" + sources."css-tree-2.3.1" sources."cssesc-3.0.0" sources."debug-4.3.4" sources."decamelize-1.2.0" @@ -137750,6 +138576,7 @@ in sources."is-plain-object-5.0.0" 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."kind-of-6.0.3" @@ -137760,6 +138587,7 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.3.0" sources."mathml-tag-names-2.1.3" + sources."mdn-data-2.0.30" sources."meow-9.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -137788,7 +138616,7 @@ in sources."postcss-safe-parser-6.0.0" sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -137849,14 +138677,13 @@ in sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."write-file-atomic-4.0.2" + sources."write-file-atomic-5.0.0" sources."yallist-4.0.0" - sources."yaml-1.10.2" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; meta = { - description = "A mighty, modern CSS linter."; + description = "A mighty CSS linter that helps you avoid errors and enforce conventions."; homepage = "https://stylelint.io"; license = "MIT"; }; @@ -137945,7 +138772,7 @@ in sources."minimist-1.2.3" (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; }) sources."moniker-0.1.2" @@ -137960,7 +138787,7 @@ in sources."performance-now-2.1.0" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.5" sources."request-2.88.2" @@ -138004,38 +138831,38 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.2.tgz"; - sha512 = "DkhKhV0Jt0gh7q9DBB26+J2Vfb9y4/4JWxnbkXBZha7542LOhwvj3edJFjyJ+xjdaXyInZ+YRRYc3V6wytP2ew=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.4.tgz"; + sha512 = "feIyBAA5cSIxq4vq6mwGvGQTHy/wBVQbs5b+/VvE21WN8X7nonAuSqwvZv0UDBowzRka3Rh4gmLPH8rPePz3/w=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { 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-function-name-7.21.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-module-transforms-7.21.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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -138049,26 +138876,26 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.37" + sources."@swc/core-darwin-arm64-1.3.37" + sources."@swc/core-darwin-x64-1.3.37" + sources."@swc/core-linux-arm-gnueabihf-1.3.37" + sources."@swc/core-linux-arm64-gnu-1.3.37" + sources."@swc/core-linux-arm64-musl-1.3.37" + sources."@swc/core-linux-x64-gnu-1.3.37" + sources."@swc/core-linux-x64-musl-1.3.37" + sources."@swc/core-win32-arm64-msvc-1.3.37" + sources."@swc/core-win32-ia32-msvc-1.3.37" + sources."@swc/core-win32-x64-msvc-1.3.37" + sources."@swc/wasm-1.3.37" 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.18" + sources."@types/node-18.14.2" 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.3" @@ -138081,11 +138908,11 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138103,7 +138930,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -138115,7 +138942,7 @@ in 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" @@ -138126,7 +138953,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.2.2" + sources."immutable-4.2.4" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -138163,7 +138990,7 @@ in sources."mime-1.6.0" sources."min-indent-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."mri-1.2.0" sources."ms-2.1.2" @@ -138173,7 +139000,7 @@ in sources."debug-3.2.7" ]; }) - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -138210,14 +139037,13 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.57.1" + sources."sass-1.58.3" 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 = [ @@ -138231,13 +139057,13 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" - sources."svelte-preprocess-5.0.0" + 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.9.4" + sources."tslib-2.5.0" + sources."typescript-4.9.5" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" @@ -138260,38 +139086,38 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.2"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.2.tgz"; - sha512 = "U8V3ZBx6IQbTfCkyf1Hss+xNmDTJJ2KyLLo7hv+JxBJpqZzBdfWkyJpCTrvN9FP10X4LFKbb3vIl558fKl9Meg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.5.tgz"; + sha512 = "UGhMIv+oMQeDEE5fu2buhvDjcuSnW5GzHd9QtOpR11a3wqW7SjINvJQy3MzOSH35+8tQM6fvmj0HQsrTtnR4SA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + sources."@babel/compat-data-7.21.0" + sources."@babel/core-7.21.0" + (sources."@babel/generator-7.21.1" // { 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-function-name-7.21.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-module-transforms-7.21.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.7" + sources."@babel/helper-validator-option-7.21.0" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.2" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -138308,23 +139134,23 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.37" + sources."@swc/core-darwin-arm64-1.3.37" + sources."@swc/core-darwin-x64-1.3.37" + sources."@swc/core-linux-arm-gnueabihf-1.3.37" + sources."@swc/core-linux-arm64-gnu-1.3.37" + sources."@swc/core-linux-arm64-musl-1.3.37" + sources."@swc/core-linux-x64-gnu-1.3.37" + sources."@swc/core-linux-x64-musl-1.3.37" + sources."@swc/core-win32-arm64-msvc-1.3.37" + sources."@swc/core-win32-ia32-msvc-1.3.37" + sources."@swc/core-win32-x64-msvc-1.3.37" + sources."@swc/wasm-1.3.37" 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.18" + sources."@types/node-18.14.2" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" (sources."@vscode/emmet-helper-2.8.6" // { @@ -138332,8 +139158,8 @@ in sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.10" - sources."acorn-8.8.1" + 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.3" @@ -138346,10 +139172,10 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138368,7 +139194,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."emmet-2.3.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -138382,7 +139208,7 @@ in 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" @@ -138393,7 +139219,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.2.2" + sources."immutable-4.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -138432,7 +139258,7 @@ in sources."mime-1.6.0" sources."min-indent-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."nanoid-3.3.4" @@ -138442,7 +139268,7 @@ in ]; }) sources."no-case-3.0.4" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -138479,14 +139305,13 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.57.1" + sources."sass-1.58.3" 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 = [ @@ -138500,19 +139325,23 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" - sources."svelte-preprocess-5.0.0" - sources."svelte2tsx-0.6.0" + sources."svelte-preprocess-5.0.1" + sources."svelte2tsx-0.6.2" 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.9.4" + sources."tslib-2.5.0" + sources."typescript-4.9.5" 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-6.2.1" - sources."vscode-html-languageservice-5.0.3" + (sources."vscode-css-languageservice-6.2.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.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" @@ -138605,7 +139434,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.6" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" @@ -138689,7 +139518,7 @@ in sources."concat-stream-1.6.2" sources."configstore-3.1.5" sources."connect-3.7.0" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookiejar-2.1.4" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" @@ -138780,7 +139609,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" @@ -138800,7 +139629,7 @@ in sources."growl-1.9.2" (sources."handlebars-4.7.7" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."source-map-0.6.1" ]; }) @@ -138942,7 +139771,7 @@ in sources."ms-2.0.0" (sources."multer-1.4.4" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" ]; }) @@ -138997,7 +139826,7 @@ in sources."mime-2.6.0" sources."ms-2.1.2" sources."qs-6.11.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."semver-7.3.8" sources."superagent-7.1.6" sources."yallist-4.0.0" @@ -139014,7 +139843,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.8" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-4.0.0" sources."range-parser-1.2.1" (sources."raw-body-2.0.2" // { @@ -139024,10 +139853,10 @@ in }) (sources."rc-1.2.8" // { dependencies = [ - sources."minimist-1.2.7" + sources."minimist-1.2.8" ]; }) - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdirp-2.2.1" sources."readline2-1.0.1" sources."reduce-component-1.0.1" @@ -139238,10 +140067,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.2.4"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz"; - sha512 = "AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.7.tgz"; + sha512 = "B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -139251,23 +140080,23 @@ 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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.37" + sources."@swc/core-darwin-arm64-1.3.37" + sources."@swc/core-darwin-x64-1.3.37" + sources."@swc/core-linux-arm-gnueabihf-1.3.37" + sources."@swc/core-linux-arm64-gnu-1.3.37" + sources."@swc/core-linux-arm64-musl-1.3.37" + sources."@swc/core-linux-x64-gnu-1.3.37" + sources."@swc/core-linux-x64-musl-1.3.37" + sources."@swc/core-win32-arm64-msvc-1.3.37" + sources."@swc/core-win32-ia32-msvc-1.3.37" + sources."@swc/core-win32-x64-msvc-1.3.37" + sources."@swc/wasm-1.3.37" 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.18" + sources."@types/node-18.14.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -139309,7 +140138,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."nanoid-3.3.4" sources."normalize-path-3.0.0" sources."object-hash-3.0.0" @@ -139319,7 +140148,7 @@ in sources."pify-2.3.0" sources."postcss-8.4.21" sources."postcss-import-14.1.0" - sources."postcss-js-4.0.0" + sources."postcss-js-4.0.1" sources."postcss-load-config-3.1.4" sources."postcss-nested-6.0.0" sources."postcss-selector-parser-6.0.11" @@ -139336,12 +140165,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.9.4" + sources."typescript-4.9.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."xtend-4.0.2" @@ -139461,15 +140290,15 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.2" - sources."libsodium-0.7.10" - sources."libsodium-wrappers-0.7.10" + sources."libsodium-0.7.11" + sources."libsodium-wrappers-0.7.11" sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -139479,7 +140308,7 @@ in sources."nan-2.17.0" sources."needle-2.9.1" sources."node-addon-api-2.0.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" (sources."node-opus-0.2.9" // { dependencies = [ @@ -139510,11 +140339,11 @@ in sources."prism-media-0.0.4" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."ramda-0.25.0" sources."rc-1.2.8" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" (sources."ref-1.3.5" // { dependencies = [ sources."debug-2.6.9" @@ -139665,7 +140494,7 @@ in sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" sources."prr-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."resolve-from-2.0.0" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -139686,10 +140515,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.16.1"; + version = "5.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; - sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; + sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -139698,7 +140527,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" @@ -139717,51 +140546,41 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.5.1"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.5.1.tgz"; - sha512 = "LoFU1yBIm/gxM++jDdvdfS2diW14NBHsimRyChi8Kb5h5pUHcG0rGfW2PflUzfYcHF0XykgW9WBdPd1WWnyS7Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.3.1.tgz"; + sha512 = "lsLOYXPcWITUDmPimjuRqHnp9TcA3xgoaqmpI5CbA/znirDy9St/Y23Aq9wr6eHXnkH3Iw+QKEVw06E1L4oahA=="; }; dependencies = [ - sources."@azu/format-text-1.0.1" - sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.3.0" - sources."@textlint/ast-tester-12.5.0" - sources."@textlint/ast-traverse-12.5.0" - (sources."@textlint/config-loader-12.5.0" // { - dependencies = [ - sources."rc-config-loader-4.1.2" - ]; - }) - sources."@textlint/feature-flag-12.5.0" - sources."@textlint/fixer-formatter-12.5.1" - sources."@textlint/kernel-12.5.0" - (sources."@textlint/linter-formatter-12.5.0" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - ]; - }) - sources."@textlint/markdown-to-ast-12.5.0" - sources."@textlint/module-interop-12.5.0" - sources."@textlint/source-code-fixer-12.5.0" - sources."@textlint/text-to-ast-12.5.0" - sources."@textlint/textlint-plugin-markdown-12.5.0" - sources."@textlint/textlint-plugin-text-12.5.0" - sources."@textlint/types-12.5.0" - sources."@textlint/utils-12.5.0" + sources."@azu/format-text-1.0.2" + sources."@azu/style-format-1.0.1" + sources."@textlint/ast-node-types-13.3.1" + sources."@textlint/ast-tester-13.3.1" + sources."@textlint/ast-traverse-13.3.1" + sources."@textlint/config-loader-13.3.1" + sources."@textlint/feature-flag-13.3.1" + sources."@textlint/fixer-formatter-13.3.1" + sources."@textlint/kernel-13.3.1" + sources."@textlint/linter-formatter-13.3.1" + sources."@textlint/markdown-to-ast-13.3.1" + sources."@textlint/module-interop-13.3.1" + sources."@textlint/source-code-fixer-13.3.1" + sources."@textlint/text-to-ast-13.3.1" + sources."@textlint/textlint-plugin-markdown-13.3.1" + sources."@textlint/textlint-plugin-text-13.3.1" + sources."@textlint/types-13.3.1" + sources."@textlint/utils-13.3.1" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" + 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" @@ -139773,9 +140592,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" @@ -139783,6 +140600,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" @@ -139792,34 +140610,26 @@ 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-4.1.0" + 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.3" @@ -139856,12 +140666,10 @@ in sources."micromark-extension-gfm-tagfilter-0.3.0" sources."micromark-extension-gfm-task-list-item-0.3.3" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" 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" @@ -139879,11 +140687,11 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" - (sources."rc-config-loader-3.0.0" // { + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" ]; }) sources."read-pkg-1.1.0" @@ -139897,7 +140705,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" @@ -139916,7 +140723,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" @@ -139981,10 +140788,10 @@ in }; dependencies = [ sources."call-bind-1.0.2" - sources."define-properties-1.1.4" + sources."define-properties-1.2.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."has-1.0.3" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" @@ -140016,7 +140823,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.3.0" + sources."@textlint/ast-node-types-13.3.1" sources."@types/hast-2.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -140071,7 +140878,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."string_decoder-1.3.0" ]; }) @@ -140139,7 +140946,7 @@ 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."http-cache-semantics-4.1.1" sources."ignore-5.2.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -140207,7 +141014,7 @@ in sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nlcst-is-literal-1.2.2" @@ -140318,7 +141125,7 @@ in 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.4" + sources."textlint-rule-helper-2.3.0" sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ @@ -140450,289 +141257,43 @@ in textlint-rule-en-max-word-count = nodeEnv.buildNodePackage { name = "textlint-rule-en-max-word-count"; packageName = "textlint-rule-en-max-word-count"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-en-max-word-count/-/textlint-rule-en-max-word-count-2.0.0.tgz"; - sha512 = "9V9kDxFR7cFZF5ZnjRFqt9gsQSXWuXlazSOygfXWw0ftr/RkR4y9bO5T1EaO6HLb8nT+/OEAa5pCWRIVSCwgAA=="; + url = "https://registry.npmjs.org/textlint-rule-en-max-word-count/-/textlint-rule-en-max-word-count-2.0.1.tgz"; + sha512 = "gZMxUU+/O8QIchBQoo50QryknmMKahb2vBj89wVvk+Dhvp70nAJKSkpt2vjZVYBWCxpIKysQlwheBjrFZWpkfg=="; }; dependencies = [ - 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.5.0" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - (sources."@textlint/ast-traverse-12.5.0" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - (sources."@textlint/config-loader-12.5.0" // { - dependencies = [ - sources."rc-config-loader-4.1.2" - ]; - }) - sources."@textlint/feature-flag-12.5.0" - sources."@textlint/fixer-formatter-12.5.1" - (sources."@textlint/kernel-12.5.0" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - (sources."@textlint/linter-formatter-12.5.0" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - ]; - }) - (sources."@textlint/markdown-to-ast-12.5.0" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - sources."@textlint/module-interop-12.5.0" - sources."@textlint/source-code-fixer-12.5.0" - (sources."@textlint/text-to-ast-12.5.0" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - sources."@textlint/textlint-plugin-markdown-12.5.0" - sources."@textlint/textlint-plugin-text-12.5.0" - (sources."@textlint/types-12.5.0" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - sources."@textlint/utils-12.5.0" - sources."@types/mdast-3.0.10" - sources."@types/structured-source-3.0.0" + sources."@textlint/ast-node-types-13.3.1" sources."@types/unist-2.0.6" - sources."ajv-8.12.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."astral-regex-2.0.0" sources."bail-1.0.5" - sources."balanced-match-1.0.2" - sources."boundary-1.0.1" - sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.2" - sources."call-bind-1.0.2" + sources."boundary-2.0.0" sources."ccount-1.1.0" - sources."chalk-4.1.2" - sources."character-entities-1.2.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."charenc-0.0.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."comma-separated-tokens-1.0.8" - sources."concat-map-0.0.1" - sources."concat-stream-2.0.0" - 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" - sources."escape-string-regexp-4.0.0" - sources."esprima-4.0.1" sources."extend-3.0.2" - sources."fast-deep-equal-3.1.3" - sources."fast-levenshtein-2.0.6" - sources."fault-1.0.4" - sources."file-entry-cache-5.0.1" - sources."find-up-2.1.0" - sources."flat-cache-2.0.1" - sources."flatted-2.0.2" - 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."hast-util-from-parse5-5.0.3" sources."hast-util-parse-selector-2.2.5" sources."hastscript-5.1.2" - 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-4.1.0" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-traverse-1.0.0" - 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" - (sources."md5-2.3.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - sources."mdast-util-find-and-replace-1.1.1" - sources."mdast-util-footnote-0.1.7" - sources."mdast-util-from-markdown-0.8.5" - sources."mdast-util-frontmatter-0.2.0" - sources."mdast-util-gfm-0.1.2" - sources."mdast-util-gfm-autolink-literal-0.1.3" - sources."mdast-util-gfm-strikethrough-0.2.3" - sources."mdast-util-gfm-table-0.1.6" - sources."mdast-util-gfm-task-list-item-0.1.6" - sources."mdast-util-to-markdown-0.6.5" - sources."mdast-util-to-string-2.0.0" - sources."micromark-2.11.4" - sources."micromark-extension-footnote-0.3.2" - sources."micromark-extension-frontmatter-0.2.2" - sources."micromark-extension-gfm-0.3.3" - sources."micromark-extension-gfm-autolink-literal-0.5.7" - sources."micromark-extension-gfm-strikethrough-0.6.5" - sources."micromark-extension-gfm-table-0.4.3" - sources."micromark-extension-gfm-tagfilter-0.3.0" - sources."micromark-extension-gfm-task-list-item-0.3.3" - sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."normalize-package-data-2.5.0" - sources."object-assign-4.1.1" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object_values-0.1.2" - sources."once-1.4.0" - sources."optionator-0.9.1" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parse-entities-2.0.0" - sources."parse-json-2.2.0" sources."parse5-5.1.1" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-to-glob-pattern-1.0.2" - sources."path-type-1.1.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pluralize-2.0.0" - sources."prelude-ls-1.2.1" sources."property-information-5.6.0" - sources."punycode-2.2.0" - (sources."rc-config-loader-3.0.0" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - ]; - }) - sources."read-pkg-1.1.0" - (sources."read-pkg-up-3.0.0" // { - dependencies = [ - sources."load-json-file-4.0.0" - sources."parse-json-4.0.0" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."read-pkg-3.0.0" - sources."strip-bom-3.0.0" - ]; - }) - sources."readable-stream-3.6.0" - sources."regexp.prototype.flags-1.4.3" sources."rehype-parse-6.0.2" - sources."remark-footnotes-3.0.0" - sources."remark-frontmatter-3.0.0" - sources."remark-gfm-1.0.0" - sources."remark-parse-9.0.0" - sources."repeat-string-1.6.1" - sources."require-from-string-2.0.2" - sources."resolve-1.22.1" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.1" - sources."semver-5.7.1" - sources."sentence-splitter-3.2.2" - sources."slice-ansi-4.0.0" + sources."sentence-splitter-4.2.0" sources."space-separated-tokens-1.1.5" - 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."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-bom-2.0.0" - sources."structured-source-3.0.2" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."table-6.8.1" - sources."text-table-0.2.0" - (sources."textlint-12.5.1" // { - dependencies = [ - sources."@textlint/ast-node-types-12.3.0" - ]; - }) - sources."textlint-tester-12.5.0" - (sources."textlint-util-to-string-3.1.1" // { - dependencies = [ - sources."unified-8.4.2" - ]; - }) - sources."traverse-0.6.7" + sources."structured-source-4.0.0" + sources."textlint-util-to-string-3.3.2" sources."trough-1.0.5" - sources."try-resolve-1.0.1" - sources."type-check-0.4.0" - sources."typedarray-0.0.6" - 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" + sources."unified-8.4.2" sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-parents-3.1.1" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.1" sources."vfile-message-2.0.4" sources."web-namespaces-1.1.4" - sources."word-wrap-1.2.3" - sources."wrappy-1.0.2" - sources."write-1.0.3" sources."xtend-4.0.2" - sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; + homepage = "https://github.com/textlint-rule/textlint-rule-en-max-word-count"; license = "MIT"; }; production = true; @@ -140742,46 +141303,34 @@ in textlint-rule-max-comma = nodeEnv.buildNodePackage { name = "textlint-rule-max-comma"; packageName = "textlint-rule-max-comma"; - version = "2.0.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-max-comma/-/textlint-rule-max-comma-2.0.2.tgz"; - sha512 = "t4twAgEZWWMhIYH3xURZr/A1EcAUKiC10/N0EU6RG+ZBa9+FB5HDhMdQMS5wHqEI1FopWHTYYv/sC2PGEtvyLg=="; + url = "https://registry.npmjs.org/textlint-rule-max-comma/-/textlint-rule-max-comma-3.0.1.tgz"; + sha512 = "VMht14U0+gxRhEnT3/Rfv7yUDF3YGhsSSODwXGnnicwe54Czs2CYALAZIlWA79R4LLqcYFc9pP1i8DeGWvaHeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.3" - sources."@types/structured-source-3.0.0" + sources."@textlint/ast-node-types-13.3.1" sources."@types/unist-2.0.6" sources."bail-1.0.5" - sources."boundary-1.0.1" - sources."buffer-from-1.1.2" + sources."boundary-2.0.0" sources."ccount-1.1.0" sources."comma-separated-tokens-1.0.8" - sources."concat-stream-2.0.0" sources."extend-3.0.2" sources."hast-util-from-parse5-5.0.3" sources."hast-util-parse-selector-2.2.5" sources."hastscript-5.1.2" - sources."inherits-2.0.4" sources."is-buffer-2.0.5" sources."is-plain-obj-2.1.0" - sources."object_values-0.1.2" sources."parse5-5.1.1" sources."property-information-5.6.0" - sources."readable-stream-3.6.0" sources."rehype-parse-6.0.2" - sources."safe-buffer-5.2.1" - sources."sentence-splitter-3.2.2" + sources."sentence-splitter-4.2.0" sources."space-separated-tokens-1.1.5" - sources."string_decoder-1.3.0" - sources."structured-source-3.0.2" - sources."textlint-util-to-string-3.1.1" + sources."structured-source-4.0.0" + sources."textlint-util-to-string-3.3.2" sources."trough-1.0.5" - sources."typedarray-0.0.6" sources."unified-8.4.2" - sources."unist-util-filter-2.0.3" - sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" - sources."util-deprecate-1.0.2" sources."vfile-4.2.1" sources."vfile-message-2.0.4" sources."web-namespaces-1.1.4" @@ -140814,14 +141363,14 @@ in sources."inherits-2.0.4" sources."object-assign-4.1.1" sources."object_values-0.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" - sources."sentence-splitter-3.2.2" + sources."sentence-splitter-3.2.3" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" - (sources."textlint-rule-helper-2.2.4" // { + (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.3.1" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -140873,13 +141422,13 @@ in sha512 = "gO4N3OnPLvE6+fvJ1Y5m8MzDVrqMEWzW8pTGMXjL8VAXmQkD6YQ9eDMbsVN0/DzEe8tcsBqNgA/iIrQ64oECuQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.3.1" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" sources."structured-source-4.0.0" - sources."textlint-rule-helper-2.2.4" + 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" @@ -140903,13 +141452,13 @@ in sha512 = "obQ3y0hqX6OWCrM8K5K6WSJGE4BOyNfGF6hUGPet56taTm/xzkRu8XA6vpn2GFr4zom/oMa0sBJ3OtDWCgrS/g=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.3.1" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" sources."structured-source-4.0.0" - sources."textlint-rule-helper-2.2.4" + 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" @@ -140936,7 +141485,7 @@ in 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."define-properties-1.2.0" sources."es-abstract-1.21.1" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -140944,7 +141493,7 @@ 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."globalthis-1.0.3" sources."gopd-1.0.1" @@ -140954,7 +141503,7 @@ in sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -141001,13 +141550,14 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" - (sources."@eslint/eslintrc-1.4.1" // { + sources."@babel/runtime-7.21.0" + (sources."@eslint/eslintrc-2.0.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) + sources."@eslint/js-8.35.0" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" @@ -141019,10 +141569,10 @@ 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.3.0" + sources."@textlint/ast-node-types-13.3.1" 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" @@ -141036,7 +141586,7 @@ in sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" - sources."axe-core-4.6.2" + sources."axe-core-4.6.3" sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."boundary-2.0.0" @@ -141053,7 +141603,7 @@ in sources."debug-3.2.7" sources."deep-equal-2.2.0" sources."deep-is-0.1.4" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" @@ -141063,7 +141613,7 @@ in sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.32.0" // { + (sources."eslint-8.35.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -141074,7 +141624,7 @@ in 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" // { + (sources."eslint-plugin-react-7.32.2" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -141088,7 +141638,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -141105,11 +141655,11 @@ 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."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" @@ -141125,7 +141675,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" @@ -141150,7 +141700,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + 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" @@ -141164,7 +141714,7 @@ in sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."ms-2.1.3" sources."natural-compare-1.4.0" sources."no-cliches-0.3.4" @@ -141189,7 +141739,7 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" @@ -141216,9 +141766,9 @@ in 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.4" + sources."textlint-rule-helper-2.3.0" sources."too-wordy-0.3.4" - sources."tsconfig-paths-3.14.1" + sources."tsconfig-paths-3.14.2" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-array-length-1.0.4" @@ -141267,7 +141817,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -141324,10 +141874,10 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141397,7 +141947,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."getpass-0.1.7" sources."glob-7.2.3" @@ -141413,7 +141963,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" @@ -141482,8 +142032,8 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -141494,7 +142044,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -141504,7 +142054,7 @@ in sources."gauge-2.7.4" sources."is-fullwidth-code-point-1.0.0" sources."npmlog-4.1.2" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -141538,7 +142088,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -141546,7 +142096,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readable-web-to-node-stream-3.0.2" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -141606,7 +142156,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" @@ -141669,7 +142219,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -141726,10 +142276,10 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141799,7 +142349,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."getpass-0.1.7" sources."glob-7.2.3" @@ -141815,7 +142365,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" @@ -141884,8 +142434,8 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -141896,7 +142446,7 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -141906,7 +142456,7 @@ in sources."gauge-2.7.4" sources."is-fullwidth-code-point-1.0.0" sources."npmlog-4.1.2" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -141940,7 +142490,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -141948,7 +142498,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readable-web-to-node-stream-3.0.2" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -142009,7 +142559,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" @@ -142079,7 +142629,7 @@ in (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -142144,10 +142694,10 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142225,7 +142775,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" @@ -142241,7 +142791,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" @@ -142310,7 +142860,7 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -142364,14 +142914,14 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" @@ -142603,10 +143153,10 @@ in thelounge-theme-chord = nodeEnv.buildNodePackage { name = "thelounge-theme-chord"; packageName = "thelounge-theme-chord"; - version = "1.1.9"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-chord/-/thelounge-theme-chord-1.1.9.tgz"; - sha512 = "DPjUxjF4N+uk0tdc6e3nkQf4CV3PzJ1rW9xl4xm7gyYb5YtMAVhHrpJSm3NpZcmLJ8jhZlzJk+KXYhc1Q1jf6A=="; + url = "https://registry.npmjs.org/thelounge-theme-chord/-/thelounge-theme-chord-1.2.1.tgz"; + sha512 = "FP/OyTgvXKNidiSb1hgPKe3wvLti3vdD+tGr3qJj1MruCzniVFMqwXlJylLBSV2sXWA+2731ysI8wncHH1vGKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -142741,7 +143291,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -142764,7 +143314,7 @@ in (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -142819,10 +143369,10 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142908,7 +143458,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" @@ -142976,7 +143526,7 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -143061,7 +143611,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -143069,7 +143619,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readable-web-to-node-stream-2.0.0" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -143209,7 +143759,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143232,7 +143782,7 @@ in (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; @@ -143287,10 +143837,10 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143376,7 +143926,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" @@ -143444,7 +143994,7 @@ in sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -143529,7 +144079,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -143537,7 +144087,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readable-web-to-node-stream-2.0.0" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -144061,10 +144611,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.148.0"; + version = "0.150.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.148.0.tgz"; - sha512 = "8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw=="; + url = "https://registry.npmjs.org/three/-/three-0.150.1.tgz"; + sha512 = "5C1MqKUWaHYo13BX0Q64qcdwImgnnjSOFgBscOzAo8MYCzEtqfQqorEKMcajnA3FHy1yVlIe9AmaMQ0OQracNA=="; }; buildInputs = globalBuildInputs; meta = { @@ -144108,7 +144658,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.6" sources."ajv-6.12.6" @@ -144164,7 +144714,7 @@ in 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" @@ -144187,7 +144737,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."node-appc-1.1.6" sources."normalize-url-6.1.0" @@ -144199,7 +144749,7 @@ in sources."performance-now-2.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."quick-lru-5.1.1" (sources."request-2.88.2" // { @@ -144338,7 +144888,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."read-1.0.7" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -144486,7 +145036,7 @@ in sources."supports-color-2.0.0" sources."temp-0.8.4" sources."tslib-1.14.1" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" ]; @@ -144513,30 +145063,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.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.37" + sources."@swc/core-darwin-arm64-1.3.37" + sources."@swc/core-darwin-x64-1.3.37" + sources."@swc/core-linux-arm-gnueabihf-1.3.37" + sources."@swc/core-linux-arm64-gnu-1.3.37" + sources."@swc/core-linux-arm64-musl-1.3.37" + sources."@swc/core-linux-x64-gnu-1.3.37" + sources."@swc/core-linux-x64-musl-1.3.37" + sources."@swc/core-win32-arm64-msvc-1.3.37" + sources."@swc/core-win32-ia32-msvc-1.3.37" + sources."@swc/core-win32-x64-msvc-1.3.37" + sources."@swc/wasm-1.3.37" 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.18" - sources."acorn-8.8.1" + sources."@types/node-18.14.2" + 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.9.4" + sources."typescript-4.9.5" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" ]; @@ -144574,10 +145124,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; buildInputs = globalBuildInputs; meta = { @@ -144592,10 +145142,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "3.0.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.2.tgz"; - sha512 = "KJ5kdKzdlNO0mfHbnb9nDKiL244fEd/fqW+b8trVchaLcCFo1aAd0sGX/vP563tdstBew/P1TzKLTnYa17/b8A=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.3.0.tgz"; + sha512 = "dwHmsXWMqCFJ44XTzrmpq6yIjmprGlh3NUSc6zs1YU63ZFPEyn+K3+66misKrISJ4UfmBpugJmFUtQrik7PuvQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -144645,24 +145195,25 @@ 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.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.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.11" + sources."@types/node-16.18.13" + sources."@types/triple-beam-1.3.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -144696,7 +145247,7 @@ in sources."base64id-2.0.0" sources."blueimp-md5-2.19.0" sources."bn.js-5.2.1" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -144709,7 +145260,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."browserify-zlib-0.2.0" @@ -144720,7 +145271,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.5" + sources."cacheable-request-10.2.8" sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."cipher-base-1.0.4" @@ -144742,7 +145293,7 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" @@ -144775,7 +145326,7 @@ in sources."destroy-1.2.0" sources."detective-5.2.1" sources."diff-5.1.0" - sources."diff2html-3.4.29" + sources."diff2html-3.4.31" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -144809,7 +145360,9 @@ in sources."evp_bytestokey-1.0.3" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" sources."cookie-0.5.0" + sources."raw-body-2.5.1" ]; }) (sources."express-session-1.17.3" // { @@ -144829,7 +145382,7 @@ in 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" @@ -144841,7 +145394,7 @@ in sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."hash.js-1.1.7" @@ -144853,7 +145406,7 @@ 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.2.0" sources."https-browserify-1.0.0" @@ -144891,7 +145444,7 @@ in sources."latest-version-7.0.0" sources."lodash-4.17.21" sources."lodash.memoize-3.0.4" - (sources."logform-2.4.2" // { + (sources."logform-2.5.1" // { dependencies = [ sources."ms-2.1.3" ]; @@ -144920,8 +145473,8 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" - sources."mkdirp-1.0.4" + sources."minimist-1.2.8" + sources."mkdirp-2.1.3" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."moment-2.29.4" @@ -144939,7 +145492,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-8.4.0" + sources."open-8.4.2" sources."os-browserify-0.3.0" sources."p-cancelable-3.0.0" sources."p-limit-4.0.0" @@ -144979,10 +145532,10 @@ in sources."randomfill-1.0.4" sources."range-parser-1.2.1" sources."raven-js-3.27.2" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -144993,7 +145546,7 @@ 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.2" @@ -145013,7 +145566,7 @@ in sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shasum-object-1.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signals-1.0.0" sources."simple-concat-1.0.1" @@ -145030,7 +145583,7 @@ in ]; }) 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" @@ -145041,13 +145594,13 @@ in sources."statuses-2.0.1" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-combiner2-1.1.1" (sources."stream-http-3.2.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."stream-splicer-2.0.1" @@ -145084,7 +145637,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.5" sources."uid-safe-2.1.5" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -145103,12 +145656,12 @@ in sources."which-typed-array-1.1.9" (sources."winston-3.8.2" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."wrap-ansi-7.0.0" @@ -145143,14 +145696,14 @@ 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-6.1.1" - sources."@npmcli/map-workspaces-3.0.1" + sources."@npmcli/config-6.1.3" + sources."@npmcli/map-workspaces-3.0.2" 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.18" + sources."@types/node-18.14.2" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" @@ -145172,7 +145725,11 @@ in sources."find-up-6.3.0" sources."format-0.2.2" sources."fs.realpath-1.0.0" - sources."glob-8.1.0" + (sources."glob-8.1.0" // { + dependencies = [ + sources."minimatch-5.1.6" + ]; + }) sources."has-flag-3.0.0" sources."ignore-5.2.4" sources."import-meta-resolve-2.2.1" @@ -145187,9 +145744,9 @@ in sources."json-parse-even-better-errors-3.0.0" sources."lines-and-columns-2.0.3" sources."load-plugin-5.1.0" - sources."locate-path-7.1.1" + sources."locate-path-7.2.0" sources."lru-cache-6.0.0" - sources."minimatch-5.1.6" + sources."minimatch-6.2.0" sources."ms-2.1.2" sources."nopt-7.0.0" sources."npm-normalize-package-bin-3.0.0" @@ -145204,34 +145761,34 @@ in sources."path-exists-5.0.0" sources."proc-log-3.0.0" sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."supports-color-5.5.0" - sources."to-vfile-7.2.3" + sources."to-vfile-7.2.4" sources."trough-2.1.0" sources."typedarray-0.0.6" sources."unified-engine-10.1.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-stringify-position-3.0.2" + 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.6" - sources."vfile-message-3.1.3" - (sources."vfile-reporter-7.0.4" // { + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + (sources."vfile-reporter-7.0.5" // { dependencies = [ sources."supports-color-9.3.1" ]; }) - sources."vfile-sort-3.0.0" - sources."vfile-statistics-2.0.0" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."vfile-sort-3.0.1" + sources."vfile-statistics-2.0.1" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."walk-up-path-1.0.0" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -145276,7 +145833,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-3.2.1" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -145326,7 +145883,7 @@ in }) sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minipass-4.2.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -145335,13 +145892,13 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.17.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."nopt-5.0.0" sources."npmlog-5.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."require-directory-2.1.1" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -145405,7 +145962,7 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -145421,10 +145978,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.6.0.tgz"; - sha512 = "aTjQk//SzL9ctHY4ItA8yZSGflHMWPJmCXEs8LeRlixuOaAbamZmeL8xNMbQpS/vAZQeFAqjcJ32Fuztz/oGww=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.6.1.tgz"; + sha512 = "Dij2OkJcmK+/2pIcLambjV/vWmhP11ypL3YqDVryBfJxP1m+ZgZU+8/SOEP3B2R1MhmmT7JDYQUtiNcGi1/2ig=="; }; dependencies = [ sources."@types/clone-2.1.1" @@ -145436,7 +145993,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."d3-array-3.2.1" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -145465,7 +146022,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.8" + sources."node-fetch-2.6.9" sources."require-directory-2.1.1" sources."robust-predicates-3.0.1" sources."rw-1.3.3" @@ -145478,7 +146035,7 @@ in ]; }) sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vega-5.22.1" sources."vega-canvas-1.2.6" sources."vega-crossfilter-4.1.0" @@ -145533,17 +146090,183 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.12.6"; + version = "28.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.12.6.tgz"; - sha512 = "hDR6CfEu2kp5QNbQwS7tS87t7BTYkkF62lIlDx5KXSD/1OniYmVr8P1fyWNmkQ1biRjMNMa6/MMHT/md5b7Qlg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.16.7.tgz"; + sha512 = "IEplmvPAhsMtAapp3MUMWYS5UNaS55ZO1ZkWPYCIIFyhMufmtyomlUbfzNYtNhTinf0L3hbELNvIp/ReEM5IYw=="; }; dependencies = [ + sources."@ampproject/remapping-2.2.0" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@babel/generator-7.21.1" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/trace-mapping-0.3.17" + sources."jsesc-2.5.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.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.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.21.0" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-member-expression-to-functions-7.21.0" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.21.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.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.21.0" + sources."@babel/helper-wrap-function-7.20.5" + sources."@babel/helpers-7.21.0" + (sources."@babel/highlight-7.18.6" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@babel/parser-7.21.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.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.21.0" + 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.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.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" + 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-syntax-typescript-7.20.0" + 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.21.0" + sources."@babel/plugin-transform-classes-7.21.0" + 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" + sources."@babel/plugin-transform-for-of-7.21.0" + 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.20.11" + sources."@babel/plugin-transform-modules-commonjs-7.21.2" + 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.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.7" + sources."@babel/plugin-transform-property-literals-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.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.21.0" + 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/preset-typescript-7.21.0" + sources."@babel/regjsgen-0.8.0" + sources."@babel/runtime-7.21.0" + sources."@babel/template-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" 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."@emotion/hash-0.9.0" + (sources."@esbuild-plugins/node-modules-polyfill-0.1.4" // { + dependencies = [ + sources."escape-string-regexp-4.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."@gar/promisify-1.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.9" (sources."@mapbox/node-pre-gyp-1.0.10" // { @@ -145554,73 +146277,307 @@ in 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" + sources."@npmcli/package-json-2.0.0" + (sources."@remix-run/dev-1.13.0" // { + dependencies = [ + sources."@esbuild/android-arm-0.16.3" + sources."@esbuild/android-arm64-0.16.3" + sources."@esbuild/android-x64-0.16.3" + sources."@esbuild/darwin-arm64-0.16.3" + sources."@esbuild/darwin-x64-0.16.3" + sources."@esbuild/freebsd-arm64-0.16.3" + sources."@esbuild/freebsd-x64-0.16.3" + sources."@esbuild/linux-arm-0.16.3" + sources."@esbuild/linux-arm64-0.16.3" + sources."@esbuild/linux-ia32-0.16.3" + sources."@esbuild/linux-loong64-0.16.3" + sources."@esbuild/linux-mips64el-0.16.3" + sources."@esbuild/linux-ppc64-0.16.3" + sources."@esbuild/linux-riscv64-0.16.3" + sources."@esbuild/linux-s390x-0.16.3" + sources."@esbuild/linux-x64-0.16.3" + sources."@esbuild/netbsd-x64-0.16.3" + sources."@esbuild/openbsd-x64-0.16.3" + sources."@esbuild/sunos-x64-0.16.3" + sources."@esbuild/win32-arm64-0.16.3" + sources."@esbuild/win32-ia32-0.16.3" + sources."@esbuild/win32-x64-0.16.3" + sources."arg-5.0.2" + sources."esbuild-0.16.3" + sources."fast-glob-3.2.11" + sources."lru-cache-7.17.0" + (sources."semver-7.3.8" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) + ]; + }) + sources."@remix-run/express-1.13.0" + (sources."@remix-run/node-1.13.0" // { + dependencies = [ + sources."cookie-signature-1.2.1" + ]; + }) + sources."@remix-run/router-1.3.2" + sources."@remix-run/serve-1.13.0" + sources."@remix-run/server-runtime-1.13.0" + sources."@remix-run/web-blob-3.0.4" + sources."@remix-run/web-fetch-4.3.2" + sources."@remix-run/web-file-3.0.2" + sources."@remix-run/web-form-data-3.0.4" + sources."@remix-run/web-stream-1.0.3" sources."@rollup/pluginutils-4.2.1" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@sindresorhus/is-4.6.0" + sources."@swc/core-1.3.37" + sources."@swc/core-darwin-arm64-1.3.37" + sources."@swc/core-darwin-x64-1.3.37" + sources."@swc/core-linux-arm-gnueabihf-1.3.37" + sources."@swc/core-linux-arm64-gnu-1.3.37" + sources."@swc/core-linux-arm64-musl-1.3.37" + sources."@swc/core-linux-x64-gnu-1.3.37" + sources."@swc/core-linux-x64-musl-1.3.37" + sources."@swc/core-win32-arm64-msvc-1.3.37" + sources."@swc/core-win32-ia32-msvc-1.3.37" + sources."@swc/core-win32-x64-msvc-1.3.37" + sources."@swc/wasm-1.3.37" + sources."@szmarczak/http-timer-4.0.6" + sources."@tootallnate/once-1.1.2" 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/acorn-4.0.6" + sources."@types/cacheable-request-6.0.3" + sources."@types/cookie-0.4.1" + sources."@types/debug-4.1.7" + sources."@types/estree-1.0.0" + sources."@types/estree-jsx-0.0.1" + sources."@types/glob-7.2.0" + sources."@types/hast-2.3.4" + sources."@types/http-cache-semantics-4.0.1" sources."@types/json-schema-7.0.11" + sources."@types/keyv-3.1.4" + sources."@types/mdast-3.0.10" + sources."@types/mdurl-1.0.2" + sources."@types/minimatch-5.1.2" + sources."@types/ms-0.7.31" sources."@types/node-14.18.33" - sources."@vercel/build-utils-5.9.0" - sources."@vercel/go-2.2.30" - sources."@vercel/hydrogen-0.0.44" - sources."@vercel/next-3.3.15" + sources."@types/prop-types-15.7.5" + sources."@types/react-18.0.28" + sources."@types/responselike-1.0.0" + sources."@types/scheduler-0.16.2" + sources."@types/unist-2.0.6" + sources."@vanilla-extract/babel-plugin-debug-ids-1.0.1" + sources."@vanilla-extract/css-1.9.5" + (sources."@vanilla-extract/integration-6.1.0" // { + dependencies = [ + sources."esbuild-0.16.17" + ]; + }) + sources."@vanilla-extract/private-1.0.3" + sources."@vercel/build-utils-6.3.1" + (sources."@vercel/gatsby-plugin-vercel-analytics-1.0.7" // { + dependencies = [ + sources."@babel/runtime-7.12.1" + ]; + }) + (sources."@vercel/gatsby-plugin-vercel-builder-1.1.9" // { + dependencies = [ + sources."ajv-8.12.0" + sources."fs-extra-11.1.0" + ]; + }) + sources."@vercel/go-2.3.8" + sources."@vercel/hydrogen-0.0.54" + sources."@vercel/next-3.6.1" sources."@vercel/nft-0.22.5" - sources."@vercel/node-2.8.13" - sources."@vercel/node-bridge-3.1.9" - sources."@vercel/python-3.1.40" - sources."@vercel/redwood-1.0.51" - sources."@vercel/remix-1.2.5" - (sources."@vercel/routing-utils-2.1.8" // { + sources."@vercel/node-2.9.8" + sources."@vercel/node-bridge-3.1.12" + sources."@vercel/python-3.1.50" + sources."@vercel/redwood-1.1.6" + (sources."@vercel/remix-1.4.1" // { + dependencies = [ + sources."path-to-regexp-6.2.1" + ]; + }) + (sources."@vercel/routing-utils-2.1.9" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/ruby-1.3.56" - sources."@vercel/static-build-1.1.7" - sources."@vercel/static-config-2.0.11" + sources."@vercel/ruby-1.3.67" + sources."@vercel/static-build-1.3.12" + sources."@vercel/static-config-2.0.13" + sources."@web3-storage/multipart-parser-1.0.0" + sources."@zxing/text-encoding-0.9.0" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."abort-controller-3.0.0" + sources."accepts-1.3.8" + sources."acorn-8.8.2" + sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" + sources."aggregate-error-3.1.0" + sources."ahocorasick-1.0.2" sources."ajv-8.6.3" + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.3" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" sources."arg-4.1.3" + sources."argparse-2.0.1" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."ast-types-0.13.4" + sources."astring-1.8.4" sources."async-sema-3.1.1" + sources."available-typed-arrays-1.0.5" + 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."bail-2.0.2" sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."big.js-5.2.2" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" + sources."bl-4.1.0" + (sources."body-parser-1.20.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."iconv-lite-0.4.24" + sources."ms-2.0.0" + ]; + }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."browserify-zlib-0.1.4" + sources."browserslist-4.21.5" + sources."buffer-5.7.1" + sources."buffer-from-1.1.2" + sources."bufferutil-4.0.7" + sources."bytes-3.1.2" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."cacheable-lookup-5.0.4" + (sources."cacheable-request-7.0.2" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."pump-3.0.0" + ]; + }) + sources."call-bind-1.0.2" + sources."caniuse-lite-1.0.30001458" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."character-entities-2.0.2" + sources."character-entities-html4-2.1.0" + sources."character-entities-legacy-3.0.0" + sources."character-reference-invalid-2.0.1" + sources."chardet-0.7.0" + sources."chokidar-3.5.3" sources."chownr-2.0.0" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.7.0" + sources."cli-width-3.0.0" + sources."clone-1.0.4" + sources."clone-response-1.0.3" sources."code-block-writer-10.1.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-support-1.1.3" + sources."comma-separated-tokens-2.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."console-control-strings-1.1.0" + sources."content-disposition-0.5.4" + sources."content-type-1.0.5" sources."convert-hrtime-3.0.0" + sources."convert-source-map-1.9.0" + sources."cookie-0.4.2" + sources."cookie-signature-1.0.6" + sources."core-js-compat-3.29.0" + sources."core-util-is-1.0.3" sources."create-require-1.1.1" + sources."cross-spawn-7.0.3" + sources."css-what-5.1.0" + sources."cssesc-3.0.0" + sources."csstype-3.1.1" + sources."data-uri-to-buffer-3.0.1" + sources."deasync-0.1.28" sources."debug-4.3.4" + sources."decode-named-character-reference-1.0.2" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) + sources."deep-is-0.1.4" + sources."deep-object-diff-1.1.9" + sources."deepmerge-4.3.0" + sources."defaults-1.0.4" + sources."defer-to-connect-2.0.1" + sources."degenerator-3.0.2" sources."delegates-1.0.0" + sources."depd-2.0.0" + sources."dequal-2.0.3" + sources."destroy-1.2.0" + sources."detect-indent-6.1.0" sources."detect-libc-2.0.1" + sources."detect-newline-3.1.0" sources."diff-4.0.2" + sources."dir-glob-3.0.1" + sources."dotenv-16.0.3" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."readable-stream-2.3.8" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."edge-runtime-2.0.0" + sources."ee-first-1.1.1" + sources."electron-to-chromium-1.4.313" sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" 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" @@ -145642,98 +146599,598 @@ in sources."esbuild-windows-32-0.14.47" sources."esbuild-windows-64-0.14.47" sources."esbuild-windows-arm64-0.14.47" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."estree-util-attach-comments-2.1.1" + (sources."estree-util-build-jsx-2.2.2" // { + dependencies = [ + sources."@types/estree-jsx-1.0.0" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-walker-3.0.3" + ]; + }) + sources."estree-util-is-identifier-name-1.1.0" + (sources."estree-util-value-to-estree-1.3.0" // { + dependencies = [ + sources."is-plain-obj-3.0.0" + ]; + }) + (sources."estree-util-visit-1.2.1" // { + dependencies = [ + sources."@types/estree-jsx-1.0.0" + ]; + }) sources."estree-walker-2.0.2" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."eval-0.1.6" + sources."event-target-shim-5.0.1" + sources."execa-5.1.1" sources."exit-hook-2.2.1" + (sources."express-4.18.2" // { + dependencies = [ + sources."cookie-0.5.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."path-to-regexp-0.1.7" + ]; + }) + sources."extend-3.0.2" + (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-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" + sources."fault-2.0.1" + sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" + (sources."finalhandler-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-up-5.0.0" + sources."for-each-0.3.3" + sources."format-0.2.2" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + sources."fs-extra-10.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."ftp-0.3.10" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."function-bind-1.1.1" sources."gauge-3.0.2" + sources."generic-names-4.0.0" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.2.0" + sources."get-port-5.1.1" + sources."get-stream-6.0.1" + (sources."get-uri-3.0.2" // { + dependencies = [ + sources."file-uri-to-path-2.0.0" + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) + sources."git-hooks-list-1.0.3" sources."glob-7.2.3" sources."glob-parent-5.1.2" + sources."globals-11.12.0" + sources."globby-10.0.0" + sources."gopd-1.0.1" + sources."got-11.8.6" sources."graceful-fs-4.2.10" + sources."gunzip-maybe-1.4.2" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" + (sources."hast-util-to-estree-2.3.2" // { + dependencies = [ + sources."@types/estree-jsx-1.0.0" + sources."estree-util-is-identifier-name-2.1.0" + ]; + }) + sources."hast-util-whitespace-2.0.1" + sources."http-cache-semantics-4.1.1" + sources."http-errors-2.0.0" + sources."http-proxy-agent-4.0.1" sources."http-status-1.5.3" + sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" + sources."icss-utils-5.1.0" + sources."ieee754-1.2.1" + sources."ignore-5.2.4" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."inline-style-parser-0.1.1" + sources."inquirer-8.2.5" + sources."ip-1.1.8" + sources."ipaddr.js-1.9.1" + sources."is-alphabetical-2.0.1" + sources."is-alphanumerical-2.0.1" + sources."is-arguments-1.1.1" + sources."is-binary-path-2.1.0" + sources."is-buffer-2.0.5" + sources."is-callable-1.2.7" + sources."is-core-module-2.11.0" + sources."is-decimal-2.0.1" + sources."is-deflate-1.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-gzip-1.0.0" + sources."is-hexadecimal-2.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" + sources."is-plain-obj-4.1.0" + sources."is-reference-3.0.1" + sources."is-stream-2.0.1" + sources."is-typed-array-1.1.10" + sources."is-unicode-supported-0.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."javascript-stringify-2.1.0" + sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" + sources."jsesc-3.0.2" + sources."json-buffer-3.0.1" + sources."json-parse-even-better-errors-2.3.1" sources."json-schema-to-ts-1.6.4" sources."json-schema-traverse-1.0.0" + sources."json5-2.2.3" + sources."jsonc-parser-3.2.0" + sources."jsonfile-6.1.0" + sources."keyv-4.5.2" + sources."kleur-4.1.5" + sources."levn-0.3.0" + sources."lilconfig-2.0.6" + sources."loader-utils-3.2.1" + sources."locate-path-6.0.0" + sources."lodash-4.17.21" + sources."lodash.camelcase-4.3.0" + sources."lodash.debounce-4.0.8" + sources."log-symbols-4.1.0" + sources."longest-streak-3.1.0" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" + sources."magic-string-0.25.9" sources."make-dir-3.1.0" sources."make-error-1.3.6" + sources."markdown-extensions-1.1.1" + sources."mdast-util-definitions-5.1.2" + sources."mdast-util-from-markdown-1.3.0" + sources."mdast-util-frontmatter-1.0.1" + sources."mdast-util-mdx-1.1.0" + (sources."mdast-util-mdx-expression-1.3.2" // { + dependencies = [ + sources."@types/estree-jsx-1.0.0" + ]; + }) + sources."mdast-util-mdx-jsx-1.2.0" + (sources."mdast-util-mdxjs-esm-1.3.1" // { + dependencies = [ + sources."@types/estree-jsx-1.0.0" + ]; + }) + sources."mdast-util-phrasing-3.0.1" + sources."mdast-util-to-hast-11.3.0" + sources."mdast-util-to-markdown-1.5.0" + sources."mdast-util-to-string-3.1.1" + sources."mdurl-1.0.1" + sources."media-query-parser-2.0.2" + 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."micromark-3.1.0" + sources."micromark-core-commonmark-1.0.6" + sources."micromark-extension-frontmatter-1.0.1" + sources."micromark-extension-mdx-expression-1.0.4" + (sources."micromark-extension-mdx-jsx-1.0.3" // { + dependencies = [ + sources."estree-util-is-identifier-name-2.1.0" + ]; + }) + 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.7" + sources."micromark-factory-space-1.0.0" + sources."micromark-factory-title-1.0.2" + sources."micromark-factory-whitespace-1.0.0" + sources."micromark-util-character-1.1.0" + sources."micromark-util-chunked-1.0.0" + sources."micromark-util-classify-character-1.0.0" + sources."micromark-util-combine-extensions-1.0.0" + 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.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" + sources."micromark-util-sanitize-uri-1.1.0" + sources."micromark-util-subtokenize-1.0.2" + sources."micromark-util-symbol-1.0.1" + sources."micromark-util-types-1.0.2" sources."micromatch-4.0.5" + sources."mime-1.6.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minipass-4.0.0" + sources."minimist-1.2.8" + sources."minipass-4.2.4" + (sources."minipass-collect-1.0.2" // { + 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."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) sources."mkdirp-1.0.4" + sources."mkdirp-classic-0.5.3" + sources."mlly-1.1.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."on-finished-2.3.0" + ]; + }) sources."mri-1.2.0" + sources."mrmime-1.0.1" sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."nanoid-3.3.4" + sources."negotiator-0.6.3" + sources."netmask-2.0.2" + sources."node-addon-api-1.7.2" sources."node-fetch-2.6.7" sources."node-gyp-build-4.6.0" + sources."node-releases-2.0.10" sources."nopt-5.0.0" + sources."normalize-path-3.0.0" + sources."normalize-url-6.1.0" + sources."npm-run-path-4.0.1" sources."npmlog-5.0.1" sources."object-assign-4.1.1" + sources."object-inspect-1.12.3" + sources."on-finished-2.4.1" + sources."on-headers-1.0.2" sources."once-1.4.0" + sources."onetime-5.1.2" + sources."optionator-0.8.3" + sources."ora-5.4.1" + sources."os-tmpdir-1.0.2" + sources."outdent-0.8.0" + sources."p-cancelable-2.1.1" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-map-4.0.0" + sources."pac-proxy-agent-5.0.0" + sources."pac-resolver-5.0.1" + sources."pako-0.2.9" + sources."parse-entities-4.0.1" sources."parse-ms-2.1.0" + sources."parseurl-1.3.3" sources."path-browserify-1.0.1" + 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-to-regexp-6.1.0" + sources."path-type-4.0.0" + sources."pathe-1.1.0" + sources."peek-stream-1.1.3" + (sources."periscopic-3.1.0" // { + dependencies = [ + sources."estree-walker-3.0.3" + ]; + }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" + sources."pkg-types-1.0.2" + sources."postcss-8.4.21" + sources."postcss-discard-duplicates-5.1.0" + sources."postcss-load-config-4.0.1" + sources."postcss-modules-6.0.0" + 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-selector-parser-6.0.11" + sources."postcss-value-parser-4.2.0" + sources."prelude-ls-1.1.2" + sources."prettier-2.7.1" sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" - sources."punycode-2.2.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."property-information-6.2.0" + sources."proxy-addr-2.0.7" + (sources."proxy-agent-5.0.0" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."proxy-from-env-1.1.0" + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."punycode-2.3.0" + sources."qs-6.11.0" sources."queue-microtask-1.2.3" - sources."readable-stream-3.6.0" + sources."quick-lru-5.1.1" + sources."range-parser-1.2.1" + (sources."raw-body-2.5.1" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + sources."readable-stream-3.6.1" + sources."readdirp-3.6.0" + (sources."recast-0.21.5" // { + dependencies = [ + sources."ast-types-0.15.2" + sources."source-map-0.6.1" + ]; + }) + sources."regenerate-1.4.2" + sources."regenerate-unicode-properties-10.1.0" + sources."regenerator-runtime-0.13.11" + sources."regenerator-transform-0.15.1" + sources."regexpu-core-5.3.1" + (sources."regjsparser-0.9.1" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remark-frontmatter-4.0.1" + sources."remark-mdx-frontmatter-1.1.1" + sources."remark-parse-10.0.1" + sources."remark-rehype-9.1.0" sources."require-from-string-2.0.2" + sources."require-like-0.1.2" + sources."resolve-1.22.1" + sources."resolve-alpn-1.2.1" sources."resolve-from-5.0.0" + sources."responselike-2.0.1" + sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" + (sources."rollup-plugin-inject-3.0.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) + sources."rollup-plugin-node-polyfills-0.2.1" + (sources."rollup-pluginutils-2.8.2" // { + dependencies = [ + sources."estree-walker-0.6.1" + ]; + }) + sources."run-async-2.4.1" sources."run-parallel-1.2.0" + sources."rxjs-7.8.0" + sources."sade-1.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.1.1" + (sources."send-0.18.0" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.3" + ]; + }) + sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-cookie-parser-2.5.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.7" + sources."slash-3.0.0" + sources."smart-buffer-4.2.0" + (sources."socks-2.7.1" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) + sources."socks-proxy-agent-5.0.1" + sources."sort-object-keys-1.1.3" + (sources."sort-package-json-1.57.0" // { + dependencies = [ + sources."is-plain-obj-2.1.0" + ]; + }) + sources."source-map-0.7.4" + sources."source-map-js-1.0.2" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."sourcemap-codec-1.4.8" + sources."space-separated-tokens-2.0.2" + (sources."ssri-8.0.1" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."statuses-2.0.1" + sources."stream-shift-1.0.1" + sources."stream-slice-0.1.2" + sources."string-hash-1.1.3" sources."string-width-4.2.3" sources."string_decoder-1.3.0" + sources."stringify-entities-4.0.3" sources."strip-ansi-6.0.1" + sources."strip-bom-3.0.0" + sources."strip-final-newline-2.0.0" + sources."style-to-object-0.4.1" + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."tar-6.1.13" + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + sources."pump-3.0.0" + ]; + }) + sources."tar-stream-2.2.0" + sources."through-2.3.8" + (sources."through2-2.0.5" // { + dependencies = [ + sources."readable-stream-2.3.8" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."time-span-4.0.0" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + sources."toml-3.0.0" sources."tr46-0.0.3" + sources."trough-2.1.0" sources."ts-morph-12.0.0" sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" + sources."tsconfig-paths-4.1.2" + sources."tslib-2.5.0" + sources."type-check-0.3.2" + sources."type-fest-0.21.3" + sources."type-is-1.6.18" sources."typescript-4.3.4" + sources."ufo-1.1.1" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.1.0" + sources."unicode-property-aliases-ecmascript-2.1.0" + sources."unified-10.1.2" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."unist-builder-3.0.1" + sources."unist-util-generated-2.0.1" + sources."unist-util-is-5.2.1" + 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-parents-5.1.3" + sources."universalify-2.0.0" + 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."util-0.12.5" sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + (sources."uvu-0.5.6" // { + dependencies = [ + sources."diff-5.1.0" + ]; + }) sources."v8-compile-cache-lib-3.0.1" + sources."vary-1.1.2" + sources."vfile-5.3.7" + sources."vfile-location-4.1.0" + sources."vfile-message-3.1.4" + sources."vm2-3.9.14" + sources."wcwidth-1.0.1" + sources."web-encoding-1.1.5" + sources."web-streams-polyfill-3.2.1" + sources."web-vitals-0.2.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" + sources."which-2.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" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."wrappy-1.0.2" + sources."ws-7.5.9" + (sources."xdm-2.1.0" // { + dependencies = [ + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-walker-3.0.3" + sources."loader-utils-2.0.4" + ]; + }) + sources."xregexp-2.0.0" + sources."xtend-4.0.2" sources."yallist-4.0.0" + sources."yaml-2.2.1" sources."yn-3.1.1" + sources."yocto-queue-0.1.0" + sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -145766,198 +147223,184 @@ in vls = nodeEnv.buildNodePackage { name = "vls"; packageName = "vls"; - version = "0.8.2"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.8.2.tgz"; - sha512 = "esrJmf7yRY5rlG7d5Jmucp7P2ZeWHOi7p1aADwxbPiN69SgNUq1Tp24YJ0vUXiEU8mgOW0tf0dL4f6LlSu6K/g=="; + url = "https://registry.npmjs.org/vls/-/vls-0.8.5.tgz"; + sha512 = "61kbdO2COZWBMC4wq59QfDdev9ruXd0226f57DFJTFpFXv85S+qnHakQlAmbSYFFLGKcx95HB2UjnuQh4YRwFA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + 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."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."@eslint/eslintrc-0.4.3" - sources."@humanwhocodes/config-array-0.5.0" + sources."@eslint/eslintrc-2.0.0" + sources."@eslint/js-8.35.0" + sources."@humanwhocodes/config-array-0.11.8" + sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" - sources."acorn-7.4.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.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."astral-regex-2.0.0" + sources."ansi-styles-4.3.0" + sources."argparse-2.0.1" sources."balanced-match-1.0.2" + sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."chalk-4.1.2" sources."character-parser-2.2.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."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" + sources."cssesc-3.0.0" sources."debug-4.3.4" sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" - sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.20.0" // { - dependencies = [ - sources."semver-6.3.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.1.0" - (sources."espree-7.3.1" // { + sources."eslint-8.35.0" + sources."eslint-plugin-vue-9.9.0" + sources."eslint-scope-7.1.1" + (sources."eslint-utils-3.0.0" // { dependencies = [ - sources."eslint-visitor-keys-1.3.0" + sources."eslint-visitor-keys-2.1.0" ]; }) + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.4.1" sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" + sources."esquery-1.4.2" + sources."esrecurse-4.3.0" + 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."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."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.19.0" + sources."glob-parent-6.0.2" + sources."globals-13.20.0" + sources."grapheme-splitter-1.0.4" sources."has-1.0.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."ignore-4.0.6" + sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-core-module-2.11.0" - sources."is-expression-4.0.0" + (sources."is-expression-4.0.0" // { + dependencies = [ + sources."acorn-7.4.1" + ]; + }) sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" + sources."is-path-inside-3.0.3" sources."is-regex-1.1.4" sources."isexe-2.0.0" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."natural-compare-1.4.0" + sources."nth-check-2.1.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."optionator-0.9.1" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."parent-module-1.0.1" + 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."postcss-selector-parser-6.0.11" sources."prelude-ls-1.2.1" - sources."prettier-2.8.3" - sources."progress-2.0.3" + sources."prettier-2.8.4" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" + sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" - sources."require-from-string-2.0.2" sources."resolve-1.22.1" sources."resolve-from-4.0.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."semver-7.3.8" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."table-6.8.1" // { - dependencies = [ - sources."ajv-8.12.0" - sources."json-schema-traverse-1.0.0" - ]; - }) sources."text-table-0.2.0" sources."tslib-1.14.1" (sources."tslint-6.1.3" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."js-yaml-3.14.1" sources."semver-5.7.1" + sources."supports-color-5.5.0" ]; }) sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uri-js-4.4.1" - sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.11.0" // { - dependencies = [ - sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" - sources."semver-6.3.0" - ]; - }) + sources."util-deprecate-1.0.2" + sources."vue-eslint-parser-9.1.0" sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" + sources."xml-name-validator-4.0.0" sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -145979,11 +147422,11 @@ in }; dependencies = [ sources."vscode-css-languageservice-3.0.13" - sources."vscode-jsonrpc-8.0.2" + sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" ]; @@ -146017,11 +147460,11 @@ in sources."vscode-nls-4.1.2" ]; }) - sources."vscode-jsonrpc-8.0.2" + sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-3.2.5" sources."vscode-uri-1.0.8" ]; @@ -146066,7 +147509,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.7" ]; @@ -146133,32 +147576,32 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.5.0.tgz"; - sha512 = "r8+ZWDHRAnUPQMyZQa2eZzZyYE8wGia3SCL9ZtVjl6S2MLA5l6NVg3z8Atz4nDQ9JPih858bj0vnthGsjhNLjg=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.6.0.tgz"; + sha512 = "PoDv5KANylqypzkUZTHTuBT8OZfFxhMwNCQ2vXIG1d3ZB6BrE+z6AZ6aJULxz6ZxhIYeCz4GQKFOHqfBlh7XGw=="; }; dependencies = [ - sources."@vscode/l10n-0.0.10" - sources."core-js-3.27.1" + sources."@vscode/l10n-0.0.11" + sources."core-js-3.29.0" sources."jsonc-parser-3.2.0" sources."picomatch-2.3.1" sources."regenerator-runtime-0.13.11" - sources."request-light-0.5.8" - sources."typescript-4.9.4" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" - sources."vscode-json-languageservice-5.1.3" - 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" // { + sources."request-light-0.7.0" + sources."typescript-4.9.5" + sources."vscode-css-languageservice-6.2.4" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-json-languageservice-5.3.1" + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-8.1.0" + sources."vscode-languageserver-protocol-3.17.3" + sources."vscode-languageserver-textdocument-1.0.9" + sources."vscode-languageserver-types-3.17.3" + (sources."vscode-markdown-languageservice-0.3.0-alpha.5" // { dependencies = [ - sources."vscode-languageserver-types-3.17.3-next.3" + sources."@vscode/l10n-0.0.10" ]; }) - 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.7" ]; @@ -146330,7 +147773,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."multimatch-2.1.0" @@ -146360,10 +147803,10 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-metadata-1.0.0" - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -146460,7 +147903,7 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@adobe/css-tools-4.0.2" + sources."@adobe/css-tools-4.2.0" sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" @@ -146479,7 +147922,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.18" + sources."@types/node-18.14.2" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -146699,7 +148142,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { + (sources."esquery-1.4.2" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -146814,7 +148257,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" // { @@ -146936,7 +148379,7 @@ in sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -147065,7 +148508,7 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."quick-lru-1.1.0" sources."rc-1.2.8" sources."read-pkg-3.0.0" @@ -147078,7 +148521,7 @@ in sources."p-try-2.2.0" ]; }) - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."readdirp-3.6.0" sources."redent-2.0.0" sources."regenerator-runtime-0.11.1" @@ -147319,7 +148762,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 = [ @@ -147351,7 +148794,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.1.3" + sources."vfile-message-3.1.4" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -147371,11 +148814,11 @@ in ]; }) sources."vscode-emmet-helper-1.2.17" - sources."vscode-jsonrpc-8.0.2" + sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-5.2.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" @@ -147429,208 +148872,141 @@ 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.7" - 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.21.0" + sources."@jimp/bmp-0.16.13" + sources."@jimp/core-0.16.13" + sources."@jimp/custom-0.16.13" + sources."@jimp/gif-0.16.13" + sources."@jimp/jpeg-0.16.13" + sources."@jimp/plugin-blit-0.16.13" + sources."@jimp/plugin-blur-0.16.13" + sources."@jimp/plugin-circle-0.16.13" + sources."@jimp/plugin-color-0.16.13" + sources."@jimp/plugin-contain-0.16.13" + sources."@jimp/plugin-cover-0.16.13" + sources."@jimp/plugin-crop-0.16.13" + sources."@jimp/plugin-displace-0.16.13" + sources."@jimp/plugin-dither-0.16.13" + sources."@jimp/plugin-fisheye-0.16.13" + sources."@jimp/plugin-flip-0.16.13" + sources."@jimp/plugin-gaussian-0.16.13" + sources."@jimp/plugin-invert-0.16.13" + sources."@jimp/plugin-mask-0.16.13" + sources."@jimp/plugin-normalize-0.16.13" + sources."@jimp/plugin-print-0.16.13" + sources."@jimp/plugin-resize-0.16.13" + sources."@jimp/plugin-rotate-0.16.13" + sources."@jimp/plugin-scale-0.16.13" + sources."@jimp/plugin-shadow-0.16.13" + sources."@jimp/plugin-threshold-0.16.13" + sources."@jimp/plugins-0.16.13" + sources."@jimp/png-0.16.13" + sources."@jimp/tiff-0.16.13" + sources."@jimp/types-0.16.13" + sources."@jimp/utils-0.16.13" + sources."@resvg/resvg-js-2.4.1" + sources."@resvg/resvg-js-android-arm-eabi-2.4.1" + sources."@resvg/resvg-js-android-arm64-2.4.1" + sources."@resvg/resvg-js-darwin-arm64-2.4.1" + sources."@resvg/resvg-js-darwin-x64-2.4.1" + sources."@resvg/resvg-js-linux-arm-gnueabihf-2.4.1" + sources."@resvg/resvg-js-linux-arm64-gnu-2.4.1" + sources."@resvg/resvg-js-linux-arm64-musl-2.4.1" + sources."@resvg/resvg-js-linux-x64-gnu-2.4.1" + sources."@resvg/resvg-js-linux-x64-musl-2.4.1" + sources."@resvg/resvg-js-win32-arm64-msvc-2.4.1" + sources."@resvg/resvg-js-win32-ia32-msvc-2.4.1" + sources."@resvg/resvg-js-win32-x64-msvc-2.4.1" + sources."@tokenizer/token-0.3.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.7.0" - sources."brace-expansion-1.1.11" - sources."browser-process-hrtime-1.0.0" + sources."base64-js-1.5.1" + (sources."bit-field-1.8.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.11.0" - 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.27.1" - 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.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-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" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."exif-parser-0.1.12" + sources."file-type-16.5.4" + 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."ieee754-1.2.1" + sources."image-q-4.0.0" sources."inherits-2.0.4" 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."is-function-1.0.2" + sources."jimp-0.16.13" + 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-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.8" - sources."node-gyp-build-4.6.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.8" + 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.2.0" - sources."querystringify-2.2.0" - sources."raf-3.4.1" - sources."readable-stream-3.6.0" + 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."peek-readable-4.1.0" + sources."phin-2.9.3" + sources."pixelmatch-4.0.2" + sources."pngjs-3.4.0" + sources."process-0.11.10" + sources."readable-stream-3.6.1" + sources."readable-web-to-node-stream-3.0.2" 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.13" - (sources."tough-cookie-4.1.2" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."tr46-0.0.3" + sources."strtok3-6.3.0" + sources."svg2img-1.0.0-beta.2" + sources."timm-1.7.1" + sources."tinycolor2-1.6.0" + sources."token-types-4.2.1" 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."utif-2.0.1" 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."wavedrom-3.2.0" 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-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -147646,10 +149022,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-7.4.0.tgz"; - sha512 = "dT2HJaGNXxRNuOtzaVBtEULccL0kM2SN1ark1NnN/ZSlbucobBxCDj6119iki72YyuXpaXZCJGqfZtVf1Znocg=="; + 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" @@ -147665,7 +149041,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.20.1" + 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" @@ -147679,7 +149055,7 @@ in 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.17" + 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" @@ -147689,22 +149065,21 @@ in 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.18" + sources."@types/node-18.14.2" 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.23.0" + sources."addons-linter-5.27.0" sources."addons-moz-compare-1.3.0" - (sources."addons-scanner-utils-8.1.0" // { + (sources."addons-scanner-utils-8.3.0" // { dependencies = [ sources."node-fetch-2.6.7" ]; }) sources."adm-zip-0.5.10" - sources."ajv-8.11.2" - sources."ajv-merge-patch-5.0.1" + sources."ajv-8.12.0" (sources."ansi-align-3.0.1" // { dependencies = [ sources."string-width-4.2.3" @@ -147754,20 +149129,20 @@ in sources."bunyan-1.8.15" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.5" // { + (sources."cacheable-request-10.2.8" // { 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.7.1" + sources."ci-info-3.8.0" sources."cli-boxes-3.0.0" (sources."cliui-8.0.1" // { dependencies = [ @@ -147785,7 +149160,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" ]; }) @@ -147796,10 +149171,10 @@ in }) sources."configstore-6.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" 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" // { @@ -147856,14 +149231,14 @@ in sources."escape-goat-4.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.28.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 = [ @@ -147873,7 +149248,7 @@ in sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" sources."esprima-4.0.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -147890,11 +149265,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - (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" @@ -147917,14 +149288,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.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" ]; @@ -147939,10 +149310,10 @@ 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.6" @@ -147951,7 +149322,7 @@ in sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.1" - sources."globals-13.19.0" + sources."globals-13.20.0" (sources."got-12.5.3" // { dependencies = [ sources."get-stream-6.0.1" @@ -147973,7 +149344,7 @@ 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.2.0" @@ -148013,8 +149384,8 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jed-1.1.1" - sources."jose-4.11.1" - sources."js-sdsl-4.2.0" + 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" @@ -148030,15 +149401,11 @@ 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 = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" ]; }) @@ -148057,14 +149424,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" @@ -148081,7 +149442,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-4.0.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-1.0.4" sources."moment-2.29.4" sources."ms-2.1.2" @@ -148137,10 +149498,10 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."pino-8.7.0" + sources."pino-8.8.0" sources."pino-abstract-transport-1.0.0" sources."pino-std-serializers-6.1.0" - sources."postcss-8.4.19" + sources."postcss-8.4.21" sources."prelude-ls-1.2.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -148150,7 +149511,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."qs-6.11.0" sources."queue-6.0.2" @@ -148228,7 +149589,7 @@ 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."sonic-boom-3.2.1" sources."source-map-0.6.1" @@ -148288,7 +149649,7 @@ in ]; }) sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -148308,7 +149669,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" @@ -148317,7 +149678,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xdg-basedir-5.1.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -148358,11 +149719,11 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" 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.18" + sources."@types/node-18.14.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -148380,16 +149741,16 @@ 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."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -148414,9 +149775,9 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."picocolors-1.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" @@ -148425,7 +149786,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.5" sources."terser-webpack-plugin-5.3.6" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" @@ -148459,11 +149820,11 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" 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.18" + sources."@types/node-18.14.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -148484,19 +149845,19 @@ in 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."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" sources."commander-9.5.0" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."enhanced-resolve-5.12.0" sources."envinfo-7.8.1" sources."es-module-lexer-0.9.3" @@ -148534,7 +149895,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.8" + sources."node-releases-2.0.10" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -148543,7 +149904,7 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."rechoir-0.8.0" sources."resolve-1.22.1" @@ -148560,7 +149921,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.5" // { dependencies = [ sources."commander-2.20.3" ]; @@ -148606,20 +149967,20 @@ in sources."@types/bonjour-3.5.10" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" - sources."@types/http-proxy-1.17.9" + sources."@types/express-4.17.17" + sources."@types/express-serve-static-core-4.17.33" + sources."@types/http-proxy-1.17.10" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" 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/serve-static-1.15.1" sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.4" sources."@webassemblyjs/ast-1.11.1" @@ -148640,7 +150001,7 @@ 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.12.0" sources."ajv-formats-2.1.1" @@ -148659,12 +150020,12 @@ in sources."bonjour-service-1.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -148678,7 +150039,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" @@ -148692,7 +150053,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.313" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" @@ -148727,7 +150088,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" @@ -148739,7 +150100,7 @@ in sources."has-symbols-1.0.3" (sources."hpack.js-2.1.6" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" ]; }) sources."html-entities-2.3.3" @@ -148785,7 +150146,7 @@ in sources."neo-async-2.6.2" sources."node-forge-1.3.1" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-inspect-1.12.3" @@ -148794,7 +150155,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."p-retry-4.6.2" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" @@ -148808,7 +150169,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -148817,7 +150178,7 @@ in sources."bytes-3.1.2" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdirp-3.6.0" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" @@ -148869,7 +150230,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.5" (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" @@ -148885,7 +150246,7 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -148906,7 +150267,7 @@ in sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" ]; buildInputs = globalBuildInputs; meta = { @@ -148936,11 +150297,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" 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.18" + sources."@types/node-18.14.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -148958,19 +150319,19 @@ 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.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."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001458" 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."electron-to-chromium-1.4.313" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -149010,12 +150371,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.8" + sources."node-releases-2.0.10" 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.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."require-from-string-2.0.2" @@ -149029,7 +150390,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.16.1" + sources."terser-5.16.5" (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" @@ -149083,7 +150444,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.18" + sources."@types/node-18.14.2" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -149113,7 +150474,7 @@ in dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) (sources."bittorrent-tracker-9.19.0" // { @@ -149128,14 +150489,14 @@ in }) (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."blob-to-buffer-1.2.9" sources."block-iterator-1.1.1" (sources."block-stream2-2.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."bn.js-5.2.1" @@ -149168,7 +150529,7 @@ in }) (sources."chunk-store-stream-4.3.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."cli-cursor-3.1.0" @@ -149271,20 +150632,20 @@ in sources."mdns-js-packet-0.2.0" (sources."mediasource-2.4.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."memory-chunk-store-1.3.5" sources."mime-3.0.0" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" sources."mp4-box-encoding-1.4.1" (sources."mp4-stream-3.1.3" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."ms-2.0.0" @@ -149304,7 +150665,7 @@ in sources."on-finished-2.4.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."package-json-versionify-1.0.4" @@ -149335,11 +150696,11 @@ in sources."range-parser-1.2.1" (sources."range-slice-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."rc4-0.1.5" - sources."readable-stream-2.3.7" + sources."readable-stream-2.3.8" sources."record-cache-1.2.0" (sources."render-media-4.1.0" // { dependencies = [ @@ -149367,7 +150728,7 @@ in sources."buffer-6.0.3" sources."debug-4.3.4" sources."ms-2.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."simple-sha1-3.1.0" @@ -149375,7 +150736,7 @@ in dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."smart-buffer-4.2.0" @@ -149410,7 +150771,7 @@ in ]; }) 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" @@ -149430,7 +150791,7 @@ in sources."util-deprecate-1.0.2" (sources."utp-native-2.5.3" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."videostream-3.2.2" @@ -149453,7 +150814,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -149469,10 +150830,10 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "0.20.12"; + version = "0.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.12.tgz"; - sha512 = "Dki/T3/T3Anl9swh2AbQz2M9ne3jK6kTuInhd5ZIUY9CdXJd1olK1w7o6TWcN6Ez2qT0SQbt9lsjZQEH2vMxxQ=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.14.tgz"; + sha512 = "mnk1lhY+MsGMRdSceol/tbKTlrwJ7JTJjEpiged3vDoTb3Z+rmkBO0T8bgG2mkuEQQWc+ajnYhB9zWONeqaugQ=="; }; dependencies = [ sources."@withgraphite/graphite-cli-routes-0.23.0" @@ -149508,9 +150869,9 @@ in sources."kleur-3.0.3" sources."lru-cache-6.0.0" sources."minimatch-3.1.2" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."once-1.4.0" - sources."open-8.4.0" + sources."open-8.4.2" sources."path-is-absolute-1.0.1" sources."path-to-regexp-6.2.1" sources."prompts-2.4.2" @@ -149532,7 +150893,7 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; @@ -149548,37 +150909,59 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.8.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.0.tgz"; - sha512 = "CAhjoeTnVFB65HPmOSquXbQ37lc2X77iOirX4tRMuRNKQng2NztHOfo++6BZdlV29E4IPD9boTRXck3R+O8mrg=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.12.0.tgz"; + sha512 = "yAqv3JbJqkB1oaciI2CGEiEscQ98BXaFN+Z7VbWuepMqVL2UV2wUjA2mJLjWuoZOwSmC74MsDzZ+5hzDs/2Nkg=="; }; 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."@esbuild/android-arm-0.16.3" + sources."@esbuild/android-arm64-0.16.3" + sources."@esbuild/android-x64-0.16.3" + sources."@esbuild/darwin-arm64-0.16.3" + sources."@esbuild/darwin-x64-0.16.3" + sources."@esbuild/freebsd-arm64-0.16.3" + sources."@esbuild/freebsd-x64-0.16.3" + sources."@esbuild/linux-arm-0.16.3" + sources."@esbuild/linux-arm64-0.16.3" + sources."@esbuild/linux-ia32-0.16.3" + sources."@esbuild/linux-loong64-0.16.3" + sources."@esbuild/linux-mips64el-0.16.3" + sources."@esbuild/linux-ppc64-0.16.3" + sources."@esbuild/linux-riscv64-0.16.3" + sources."@esbuild/linux-s390x-0.16.3" + sources."@esbuild/linux-x64-0.16.3" + sources."@esbuild/netbsd-x64-0.16.3" + sources."@esbuild/openbsd-x64-0.16.3" + sources."@esbuild/sunos-x64-0.16.3" + sources."@esbuild/win32-arm64-0.16.3" + sources."@esbuild/win32-ia32-0.16.3" + sources."@esbuild/win32-x64-0.16.3" sources."@iarna/toml-2.2.5" - 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."@miniflare/cache-2.12.1" + sources."@miniflare/cli-parser-2.12.1" + sources."@miniflare/core-2.12.1" + sources."@miniflare/d1-2.12.1" + sources."@miniflare/durable-objects-2.12.1" + sources."@miniflare/html-rewriter-2.12.1" + sources."@miniflare/http-server-2.12.1" + sources."@miniflare/kv-2.12.1" + sources."@miniflare/queues-2.12.1" + sources."@miniflare/r2-2.12.1" + sources."@miniflare/runner-vm-2.12.1" + sources."@miniflare/scheduler-2.12.1" + sources."@miniflare/shared-2.12.1" + sources."@miniflare/sites-2.12.1" + sources."@miniflare/storage-file-2.12.1" + sources."@miniflare/storage-memory-2.12.1" + sources."@miniflare/storage-redis-2.12.1" + sources."@miniflare/watcher-2.12.1" + sources."@miniflare/web-sockets-2.12.1" sources."@types/better-sqlite3-7.6.3" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/stack-trace-0.0.29" sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" @@ -149596,27 +150979,7 @@ in sources."debug-4.3.4" sources."denque-1.5.1" sources."dotenv-10.0.0" - sources."esbuild-0.14.51" - sources."esbuild-android-64-0.14.51" - sources."esbuild-android-arm64-0.14.51" - sources."esbuild-darwin-64-0.14.51" - sources."esbuild-darwin-arm64-0.14.51" - sources."esbuild-freebsd-64-0.14.51" - sources."esbuild-freebsd-arm64-0.14.51" - sources."esbuild-linux-32-0.14.51" - sources."esbuild-linux-64-0.14.51" - sources."esbuild-linux-arm-0.14.51" - sources."esbuild-linux-arm64-0.14.51" - sources."esbuild-linux-mips64le-0.14.51" - sources."esbuild-linux-ppc64le-0.14.51" - sources."esbuild-linux-riscv64-0.14.51" - sources."esbuild-linux-s390x-0.14.51" - sources."esbuild-netbsd-64-0.14.51" - sources."esbuild-openbsd-64-0.14.51" - sources."esbuild-sunos-64-0.14.51" - sources."esbuild-windows-32-0.14.51" - sources."esbuild-windows-64-0.14.51" - sources."esbuild-windows-arm64-0.14.51" + sources."esbuild-0.16.3" sources."escape-string-regexp-4.0.0" sources."estree-walker-0.6.1" sources."execa-6.1.0" @@ -149625,7 +150988,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" @@ -149643,7 +151006,7 @@ in sources."merge-stream-2.0.0" sources."mime-3.0.0" sources."mimic-fn-4.0.0" - sources."miniflare-2.11.0" + sources."miniflare-2.12.1" sources."ms-2.1.2" sources."mustache-4.2.0" sources."nanoid-3.3.4" @@ -149688,12 +151051,12 @@ in sources."streamsearch-1.1.0" sources."strip-final-newline-3.0.0" sources."to-regex-range-5.0.1" - sources."undici-5.9.1" + sources."undici-5.20.0" sources."urlpattern-polyfill-4.0.3" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.3" sources."validate-npm-package-name-4.0.0" sources."which-2.0.2" - sources."ws-8.12.0" + sources."ws-8.12.1" sources."xxhash-wasm-1.0.2" sources."yallist-4.0.0" sources."youch-2.2.2" @@ -149701,7 +151064,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command-line interface for all things Cloudflare Workers"; - homepage = "https://github.com/cloudflare/wrangler2#readme"; + homepage = "https://github.com/cloudflare/workers-sdk#readme"; license = "MIT OR Apache-2.0"; }; production = true; @@ -149735,13 +151098,14 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" - (sources."@eslint/eslintrc-1.4.1" // { + sources."@babel/runtime-7.21.0" + (sources."@eslint/eslintrc-2.0.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) + sources."@eslint/js-8.35.0" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" @@ -149754,7 +151118,7 @@ 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" @@ -149768,7 +151132,7 @@ in sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" - sources."axe-core-4.6.2" + sources."axe-core-4.6.3" sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -149784,7 +151148,7 @@ in sources."debug-3.2.7" sources."deep-equal-2.2.0" sources."deep-is-0.1.4" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" @@ -149794,7 +151158,7 @@ in sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.32.0" // { + (sources."eslint-8.35.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -149805,7 +151169,7 @@ in 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" // { + (sources."eslint-plugin-react-7.32.2" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -149819,7 +151183,7 @@ in }) sources."eslint-visitor-keys-3.3.0" sources."espree-9.4.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -149836,11 +151200,11 @@ 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."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" @@ -149856,7 +151220,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" @@ -149881,7 +151245,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + 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" @@ -149895,7 +151259,7 @@ in sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."ms-2.1.3" sources."natural-compare-1.4.0" sources."no-cliches-0.3.4" @@ -149920,7 +151284,7 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" @@ -149947,7 +151311,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."text-table-0.2.0" sources."too-wordy-0.3.4" - sources."tsconfig-paths-3.14.1" + sources."tsconfig-paths-3.14.2" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-array-length-1.0.4" @@ -149975,10 +151339,10 @@ in "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { name = "_at_yaegassy_slash_coc-nginx"; packageName = "@yaegassy/coc-nginx"; - version = "0.3.6"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.3.6.tgz"; - sha512 = "ml53NkTvLqmhdE4rFY6WK5ZM1l6SFM+sGui1xrurEN1zTN+v0w0ifaNLwoEz/XsQdX3yTpl0oD+MA3JYgx9Tzg=="; + url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.4.0.tgz"; + sha512 = "RY4ygMb9lvhHfc7NJYpYuozYq0Tww1EfRcSP3eVQ15ai57bD5dC7FP/I4Yq3ENYn4tU3rKVM31REY6fLm9micQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -150003,7 +151367,7 @@ in sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."request-light-0.5.8" sources."require-from-string-2.0.2" sources."uri-js-4.4.1" @@ -150016,7 +151380,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.9" - sources."vscode-languageserver-types-3.17.2" + sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" sources."yaml-2.0.0-11" @@ -150129,7 +151493,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.21.0" sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -150238,7 +151602,7 @@ in sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" ]; }) sources."boolean-3.2.0" @@ -150255,7 +151619,9 @@ in sources."builtins-1.0.3" (sources."cacache-15.3.0" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."glob-7.2.3" + sources."minimatch-3.1.2" sources."mkdirp-1.0.4" ]; }) @@ -150301,7 +151667,7 @@ in sources."config-chain-1.1.13" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.27.1" + sources."core-js-3.29.0" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -150324,7 +151690,7 @@ in 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."define-properties-1.2.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."detect-node-2.1.0" @@ -150387,7 +151753,7 @@ in 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."glob-8.1.0" // { @@ -150455,7 +151821,12 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.4" - sources."ignore-walk-4.0.1" + (sources."ignore-walk-4.0.1" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -150499,10 +151870,15 @@ in sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.10" + sources."isbinaryfile-5.0.0" sources."isexe-2.0.0" sources."isurl-1.0.0" - sources."jake-10.8.5" + (sources."jake-10.8.5" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."json-buffer-3.0.0" @@ -150520,7 +151896,7 @@ in sources."cacheable-request-6.1.0" sources."get-stream-5.2.0" sources."got-9.6.0" - sources."http-cache-semantics-4.1.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" @@ -150552,7 +151928,7 @@ in 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" @@ -150563,8 +151939,8 @@ in ]; }) sources."mem-5.1.1" - sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" + sources."mem-fs-2.3.0" + sources."mem-fs-editor-9.7.0" (sources."meow-5.0.0" // { dependencies = [ sources."read-pkg-up-3.0.0" @@ -150575,12 +151951,8 @@ in sources."micromatch-4.0.5" 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."minimatch-7.3.0" + sources."minimist-1.2.8" (sources."minimist-options-3.0.2" // { dependencies = [ sources."arrify-1.0.1" @@ -150601,17 +151973,24 @@ in ]; }) sources."ms-2.0.0" - sources."multimatch-5.0.0" + (sources."multimatch-5.0.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) 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."are-we-there-yet-3.0.1" + sources."brace-expansion-1.1.11" sources."gauge-4.0.4" sources."glob-7.2.3" + sources."minimatch-3.1.2" sources."npmlog-6.0.2" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."semver-7.3.8" ]; }) @@ -150636,7 +152015,7 @@ in sources."cacheable-request-6.1.0" sources."get-stream-5.2.0" sources."got-9.6.0" - sources."http-cache-semantics-4.1.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" @@ -150651,7 +152030,9 @@ in }) (sources."npm-packlist-3.0.0" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."glob-7.2.3" + sources."minimatch-3.1.2" ]; }) (sources."npm-pick-manifest-6.1.1" // { @@ -150666,9 +152047,9 @@ 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."lru-cache-7.17.0" (sources."make-fetch-happen-10.2.1" // { dependencies = [ sources."minipass-fetch-2.1.2" @@ -150698,7 +152079,7 @@ in sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."ora-5.4.1" sources."os-homedir-1.0.2" sources."os-shim-0.1.3" @@ -150734,7 +152115,7 @@ in sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" sources."got-11.8.6" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."json-buffer-3.0.1" sources."keyv-4.5.2" sources."lowercase-keys-2.0.0" @@ -150821,7 +152202,7 @@ in sources."type-fest-0.8.1" ]; }) - (sources."readable-stream-2.3.7" // { + (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -150845,7 +152226,9 @@ in 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."roarr-2.15.4" @@ -150945,7 +152328,7 @@ in sources."taketalk-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.0.0" + sources."minipass-4.2.4" sources."mkdirp-1.0.4" ]; }) @@ -150959,9 +152342,9 @@ in sources."to-regex-range-5.0.1" sources."treeverse-1.0.4" sources."trim-newlines-2.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-0.0.6" - (sources."twig-1.15.4" // { + (sources."twig-1.16.0" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.0.8" @@ -151045,9 +152428,10 @@ in sources."url-parse-lax-1.0.0" ]; }) - (sources."yeoman-environment-3.13.0" // { + (sources."yeoman-environment-3.15.1" // { dependencies = [ sources."are-we-there-yet-2.0.0" + sources."brace-expansion-1.1.11" sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" @@ -151055,14 +152439,16 @@ in sources."gauge-3.0.2" sources."get-stream-6.0.1" sources."is-stream-2.0.1" + sources."isbinaryfile-4.0.10" sources."locate-path-6.0.0" + sources."minimatch-3.1.2" sources."ms-2.1.2" sources."npm-run-path-4.0.1" sources."npmlog-5.0.1" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."semver-7.3.8" ]; }) @@ -151110,10 +152496,10 @@ in "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; - version = "1.24.1"; + version = "1.26.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.26.0.tgz"; + sha512 = "eftGxKZGpDYAAfPNm0t/2PqYP1lkvmGVxB7qSwEd0HdB6f7r1yKxNMhtCRqOgB0OcdsUXnHa0ONRHO/vzdEN/A=="; }; dependencies = [ sources."@alcalzone/jsonl-db-2.5.3" @@ -151122,7 +152508,7 @@ 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.5" + sources."@esm2cjs/cacheable-request-10.2.8" sources."@esm2cjs/form-data-encoder-2.1.4" sources."@esm2cjs/got-12.5.3" sources."@esm2cjs/http-timer-5.0.1" @@ -151135,23 +152521,23 @@ in sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.31.1" // { + (sources."@sentry/core-7.39.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.31.1" // { + (sources."@sentry/integrations-7.39.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.31.1" // { + (sources."@sentry/node-7.39.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.31.1" - (sources."@sentry/utils-7.31.1" // { + sources."@sentry/types-7.39.0" + (sources."@sentry/utils-7.39.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -151171,14 +152557,15 @@ in 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.4.0" - sources."@zwave-js/config-10.4.0" - sources."@zwave-js/core-10.4.0" - sources."@zwave-js/host-10.4.0" - sources."@zwave-js/nvmedit-10.4.0" - sources."@zwave-js/serial-10.4.0" - sources."@zwave-js/shared-10.4.0" - sources."@zwave-js/testing-10.4.0" + sources."@types/triple-beam-1.3.2" + sources."@zwave-js/cc-10.10.0" + sources."@zwave-js/config-10.10.0" + sources."@zwave-js/core-10.10.0" + sources."@zwave-js/host-10.10.0" + sources."@zwave-js/nvmedit-10.10.0" + sources."@zwave-js/serial-10.10.0" + sources."@zwave-js/shared-10.10.0" + sources."@zwave-js/testing-10.10.0" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -151219,7 +152606,7 @@ 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."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" @@ -151237,14 +152624,14 @@ in sources."kuler-2.0.0" sources."lie-3.1.1" sources."localforage-1.10.0" - sources."logform-2.4.2" + sources."logform-2.5.1" sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."lru_map-0.3.3" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."mimic-response-3.1.0" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."moment-2.29.4" sources."ms-2.1.2" sources."node-addon-api-5.1.0" @@ -151257,7 +152644,7 @@ in sources."path-key-3.1.1" sources."proper-lockfile-4.1.2" sources."quick-lru-5.1.1" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."reflect-metadata-0.1.13" sources."require-directory-2.1.1" sources."resolve-alpn-1.2.1" @@ -151280,22 +152667,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-6.0.0" + sources."utf-8-validate-6.0.3" 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.12.0" + sources."ws-8.12.1" sources."xstate-4.29.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.1" sources."yargs-parser-21.1.1" - sources."zwave-js-10.4.0" + sources."zwave-js-10.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -151310,20 +152697,21 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-7.1.1.tgz"; - sha512 = "5YlTO2AJ+Ku2YuZKSSSqnUKuagcM/f/j4LmHs15O84Ch80Z9gzR09ZK3gR7GV+rc8IFpz2H/XNFtFVmj31yrZA=="; + url = "https://registry.npmjs.org/zx/-/zx-7.2.0.tgz"; + sha512 = "SMuOZ21zFnBxicw+WMtTv3z3eERh6KBtZExAJaL8EAV+Ev/3M1NIAOkrZ8kRfCzD9acv9heUH/WZctTR4vQxBQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/fs-extra-9.0.13" + sources."@types/fs-extra-11.0.1" + sources."@types/jsonfile-6.1.1" sources."@types/minimist-1.2.2" - sources."@types/node-18.11.18" + sources."@types/node-18.14.2" sources."@types/ps-tree-1.1.2" - sources."@types/which-2.0.1" + sources."@types/which-2.0.2" sources."braces-3.0.2" sources."chalk-5.2.0" sources."data-uri-to-buffer-4.0.1" @@ -151336,7 +152724,7 @@ in sources."fill-range-7.0.1" sources."formdata-polyfill-4.0.10" sources."from-0.1.7" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."glob-parent-5.1.2" sources."globby-13.1.3" sources."graceful-fs-4.2.10" @@ -151349,7 +152737,7 @@ in sources."map-stream-0.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."node-domexception-1.0.0" sources."node-fetch-3.2.10" sources."path-type-4.0.0" @@ -151366,7 +152754,8 @@ in sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."web-streams-polyfill-3.2.1" - sources."which-2.0.2" + sources."webpod-0.0.2" + sources."which-3.0.0" sources."yaml-2.2.1" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 1ecf716329b98..3c22331fe5a2f 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -188,10 +188,12 @@ final: prev: { graphite-cli = prev."@withgraphite/graphite-cli".override { name = "graphite-cli"; nativeBuildInputs = [ pkgs.installShellFiles ]; + # 'gt completion' auto-detects zshell from environment variables: + # https://github.com/yargs/yargs/blob/2b6ba3139396b2e623aed404293f467f16590039/lib/completion.ts#L45 postInstall = '' installShellCompletion --cmd gt \ --bash <($out/bin/gt completion) \ - --zsh <($out/bin/gt completion) + --zsh <(ZSH_NAME=zsh $out/bin/gt completion) ''; }; @@ -268,11 +270,7 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postFixup = '' wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]} - ${ - if stdenv.isLinux - then "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" - else "" - } + ${lib.optionalString stdenv.isLinux "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""} ''; }; @@ -406,7 +404,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-bS96oZ5oDFXYgoF2l7PJ3Mp1wWWfLOo8B/jAfbA2Pn0Wm5Z/owBHzaMQKS3i1CzVBDWWPVnOohmbJmjvkcHS5w=="; + sha512 = "sha512-0jDxgg+DruB1kHVNlcspXQB9au62IFfVg9drkhzXudszHNUAQn0lVuu+T8np0uC2z1nKD5S3qPeCyR8u5YFLnA=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix index ba266ade830e2..04d31c881561c 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/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index dae42e2b97beb..c52079f5ccb67 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -10,7 +10,7 @@ buildDunePackage { propagatedBuildInputs = [ alcotest logs lwt fmt ]; doCheck = true; - nativeCheckInputs = [ re cmdliner ]; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 52b65817c6f87..502bd2ad44d7e 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; }; - nativeCheckInputs = [ alcotest ppx_let ]; + checkInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index c74545caf24fe..fddf128d0d9be 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { 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 cdf657ea72e1f..4c98f5b377bc2 100644 --- a/pkgs/development/ocaml-modules/arp/default.nix +++ b/pkgs/development/ocaml-modules/arp/default.nix @@ -36,7 +36,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-clock-unix mirage-profile diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 720294e65e6ec..8447c25cd7075 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-asn1-combinators"; diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index a8d2ef0ace18d..07ee079cae30f 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; - nativeCheckInputs = [ 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 4296261ba2a44..fd0bf82df3438 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,8 +25,10 @@ buildDunePackage rec { ppx_sexp_conv eqaf ]; + buildInputs = [ ppx_cstruct ]; + doCheck = true; - nativeCheckInputs = [ cstruct-unix cmdliner fmt ]; + checkInputs = [ cstruct-unix cmdliner fmt ]; meta = with lib; { description = "SSH implementation in OCaml"; diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix index ff8477273fc8b..241df784ad59c 100644 --- a/pkgs/development/ocaml-modules/awa/lwt.nix +++ b/pkgs/development/ocaml-modules/awa/lwt.nix @@ -7,12 +7,15 @@ buildDunePackage { inherit (awa) version src; + duneVersion = "3"; + propagatedBuildInputs = [ awa cstruct mtime lwt mirage-crypto-rng ]; doCheck = true; - nativeCheckInputs = [ cstruct-unix ]; + 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 8513e57410480..ebf3ad23fc5b2 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 4585f731e3c67..0d2b4247bd423 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 9420d3c419b5d..be8dabf7f60ec 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -2,20 +2,21 @@ buildDunePackage rec { pname = "base64"; - version = "3.5.0"; + version = "3.5.1"; minimalOCamlVersion = "4.03"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; - sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q="; + url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-${version}.tbz"; + hash = "sha256-2P7apZvRL+rnrMCLWSjdR4qsUj9MqNJARw0lAGUcZe0="; }; - propagatedBuildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; # otherwise fmt breaks evaluation doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest bos rresult ]; + checkInputs = [ alcotest bos rresult ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 0f5722a44acfb..6c579e127184c 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/bheap/default.nix b/pkgs/development/ocaml-modules/bheap/default.nix index 7b23e23fdcea5..49e5c336d90bc 100644 --- a/pkgs/development/ocaml-modules/bheap/default.nix +++ b/pkgs/development/ocaml-modules/bheap/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { useDune2 = true; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index 7d6bb8806d42b..2674369f37e08 100644 --- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,12 +14,10 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; - strictDeps = !doCheck; - propagatedBuildInputs = [ bigarray-compat ]; nativeBuildInputs = [ findlib pkg-config ]; - nativeCheckInputs = [ alcotest astring fpath bos ]; + checkInputs = [ alcotest astring fpath bos ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index bd5d470e03f41..08f50ea53e19c 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -13,11 +13,8 @@ buildDunePackage rec { sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE="; }; - # This currently fails with dune - strictDeps = false; - nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/bindlib/default.nix b/pkgs/development/ocaml-modules/bindlib/default.nix index 9f4cc91e22502..c0d8dd54a37bd 100644 --- a/pkgs/development/ocaml-modules/bindlib/default.nix +++ b/pkgs/development/ocaml-modules/bindlib/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4="; }; - nativeCheckInputs = [ earley timed ]; + checkInputs = [ earley timed ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 22d2b643b279b..2c58a4081401b 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { propagatedBuildInputs = [ camlp-streams easy-format ]; - strictDeps = true; - meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; homepage = "https://github.com/ocaml-community/biniou"; diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index 35b36bc944052..5fa482acc6d40 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -1,17 +1,19 @@ { 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"; version = "0.11.2"; minimalOCamlVersion = "4.11"; + duneVersion = "3"; src = fetchFromGitHub { owner = "biocaml"; - repo = pname; - rev = "v${version}"; + repo = pname; + rev = "v${version}"; sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s"; }; @@ -21,7 +23,7 @@ buildDunePackage rec { }; buildInputs = [ ppx_jane ppx_sexp_conv ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 43cbd33f738ca..192bb470a66d4 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { pname = "bistro"; version = "unstable-2022-05-07"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pveber"; diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix index 2b9cbca2085d6..9eb4c74f574c5 100644 --- a/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ bitstring ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = bitstring.meta // { description = "Bitstrings and bitstring matching for OCaml - PPX extension"; diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index a986a46f29354..25906f1432f06 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/bls12-381-signature/default.nix b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix index 378af4109cb6a..db0a383f925ee 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 ]; - nativeCheckInputs = [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 b30c1333dff09..6c1ff541c5f99 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"; @@ -23,7 +24,7 @@ buildDunePackage rec { hex ]; - nativeCheckInputs = [ alcotest ff-pbt ]; + checkInputs = [ alcotest ff-pbt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/pkgs/development/ocaml-modules/bls12-381/legacy.nix index 1ae2add216587..c72157c677e72 100644 --- a/pkgs/development/ocaml-modules/bls12-381/legacy.nix +++ b/pkgs/development/ocaml-modules/bls12-381/legacy.nix @@ -26,7 +26,7 @@ buildDunePackage rec { zarith ]; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix index 0c5509e08de96..aa762502a5981 100644 --- a/pkgs/development/ocaml-modules/bwd/default.nix +++ b/pkgs/development/ocaml-modules/bwd/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ qcheck-core ]; + checkInputs = [ qcheck-core ]; meta = { description = "Backward Lists"; diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 3e5119b1739e3..1dab8e4911e03 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 @@ -40,7 +39,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = with lib; { description = "X.509 trust anchors extracted from Mozilla's NSS"; diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 963989cb2236e..185944f412e67 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ cacert # for /etc/ssl/certs/ca-bundle.crt alcotest fmt diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index cf349eeb8bb16..8fd3f5befef93 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { propagatedBuildInputs = [ re ]; - strictDeps = true; - meta = { inherit (src.meta) homepage; description = "A library for handling dates and times"; diff --git a/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix index 145bcedacbcbd..2004f8868caff 100644 --- a/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/pkgs/development/ocaml-modules/callipyge/default.nix @@ -25,7 +25,7 @@ buildDunePackage rec { # alcotest isn't available for OCaml < 4.08 due to fmt doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/oklm-wsh/Callipyge"; diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix index b44fd7db6b31f..53115c4ecb8ea 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 a83c7c474ac5d..b6768cfe8c1a8 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/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index e5fe670213129..ea2a653936821 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 0f37575d86d2e..18b55b9857efd 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"; @@ -15,7 +16,7 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ logs ptime uri bigstringaf ]; - nativeCheckInputs = [ re cmdliner alcotest ]; + checkInputs = [ re cmdliner alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 822c002a8de31..d6c230d9dbded 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; inherit (caqti) version src; + duneVersion = "3"; + propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; meta = caqti.meta // { diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index b075ea53021a3..727d407ac5423 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -11,10 +11,11 @@ buildDunePackage rec { 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-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; patches = [ @@ -55,7 +56,7 @@ buildDunePackage rec { nativeBuildInputs = [ findlib ]; - nativeCheckInputs = [ + checkInputs = [ base64 alcotest alcotest-lwt diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index 7e08e69543d7a..b361ee1447b20 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "carton-git"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 2c0cf34ae5a4b..03333deff67a3 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -11,6 +11,7 @@ buildDunePackage { pname = "carton-lwt"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton @@ -23,6 +24,8 @@ buildDunePackage { doCheck = true; nativeCheckInputs = [ git-binary + ]; + checkInputs = [ alcotest alcotest-lwt cstruct diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index aeedb414a3bb8..0de51fbb57878 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -1,28 +1,27 @@ -{ lib, buildDunePackage, fetchFromGitHub, m4, core_kernel, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, m4, camlp-streams, core_kernel, ounit }: buildDunePackage rec { pname = "cfstream"; - version = "1.3.1"; + version = "1.3.2"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.04.1"; + minimalOCamlVersion = "4.04.1"; src = fetchFromGitHub { owner = "biocaml"; repo = pname; rev = version; - sha256 = "0qnxfp6y294gjsccx7ksvwn9x5q20hi8sg24rjypzsdkmlphgdnd"; + hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; patches = [ ./git_commit.patch ]; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ m4 ]; - nativeCheckInputs = [ ounit ]; - propagatedBuildInputs = [ core_kernel ]; + checkInputs = [ ounit ]; + propagatedBuildInputs = [ camlp-streams core_kernel ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix index bad57cb9e9b40..ebd73b519f957 100644 --- a/pkgs/development/ocaml-modules/chacha/default.nix +++ b/pkgs/development/ocaml-modules/chacha/default.nix @@ -32,7 +32,7 @@ buildDunePackage rec { # alcotest isn't available for OCaml < 4.05 due to fmt doCheck = lib.versionAtLeast ocaml.version "4.05"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/abeaumont/ocaml-chacha"; diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index faeb905e6a7f6..498dcdfe04cbc 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -10,10 +10,11 @@ buildDunePackage rec { pname = "checkseum"; minimalOCamlVersion = "4.07"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz"; - sha256 = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; + hash = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; }; buildInputs = [ dune-configurator ]; @@ -24,7 +25,7 @@ buildDunePackage rec { ocaml-freestanding ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bos astring diff --git a/pkgs/development/ocaml-modules/chrome-trace/default.nix b/pkgs/development/ocaml-modules/chrome-trace/default.nix index fb6c14b3362ea..9c427d343758e 100644 --- a/pkgs/development/ocaml-modules/chrome-trace/default.nix +++ b/pkgs/development/ocaml-modules/chrome-trace/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "chrome-trace"; inherit (dune_3) src version; + minimalOCamlVersion = "4.08"; duneVersion = "3"; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix index 1290abaa23833..f59ad1448a9f6 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 @@ { stdenv, lib, fetchFromGitLab, buildDunePackage , gmp, pkg-config, dune-configurator , zarith, integers -, alcotest, bisect_ppx }: +, alcotest, bisect_ppx +}: buildDunePackage rec { pname = "class_group_vdf"; @@ -23,12 +24,16 @@ buildDunePackage rec { dune-configurator ]; + buildInputs = [ + dune-configurator + ]; + propagatedBuildInputs = [ zarith integers ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bisect_ppx ]; diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index bcc1c11459b2f..3e6ac4ae2d967 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -51,7 +51,7 @@ buildDunePackage { # Examples don't compile with core 0.15. See https://github.com/mirage/ocaml-cohttp/pull/864. doCheck = false; - nativeCheckInputs = [ + checkInputs = [ ounit mirage-crypto core diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 0cb9813687a37..fcbed191ad6f2 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { propagatedBuildInputs = [ base64 re stringext uri-sexp ]; doCheck = true; - nativeCheckInputs = [ fmt alcotest crowbar ]; + checkInputs = [ fmt alcotest crowbar ]; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 0ff6fb6920aa1..b360cf0e587ea 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -14,13 +14,18 @@ buildDunePackage { 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 # https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742 doCheck = false; - nativeCheckInputs = [ ounit cacert ]; + checkInputs = [ ounit cacert ]; meta = cohttp-lwt.meta // { description = "CoHTTP implementation for Unix and Windows using Lwt"; diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index 5996cd7adb612..c9b6ad3128f38 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/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 3f91d9b75365c..cb86ea5f4f06c 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -23,7 +23,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ lwt_log ssl ]; diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix index 48478c963ef08..980984c6ec056 100644 --- a/pkgs/development/ocaml-modules/containers/data.nix +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -9,7 +9,7 @@ buildDunePackage { inherit (containers) src version doCheck; buildInputs = [ dune-configurator ]; - nativeCheckInputs = [ gen iter qcheck-core ]; + checkInputs = [ gen iter qcheck-core ]; propagatedBuildInputs = [ containers ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 2503ffbf08f09..4cd6413293e54 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ either seq ]; - nativeCheckInputs = [ gen iter qcheck-core uutf yojson ]; + checkInputs = [ gen iter qcheck-core uutf yojson ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index a3894f0cbf4f4..180a09e4d4a1c 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 1c898f8e75f85..4688ec4ef328c 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; @@ -14,7 +15,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index 33702ca182964..a61a597b20939 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/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix index da55cb1d78a8e..d321abfe9daa9 100644 --- a/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { postPatch = "rm -rf examples/xmldiff"; propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; - nativeCheckInputs = [ calendar fpath pprint uutf uunf uucp ]; + checkInputs = [ calendar fpath pprint uutf uunf uucp ]; # uunf is broken on aarch64 doCheck = !stdenv.isAarch64; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 5ef3540a9a1e6..9efe75af70c9a 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ fmt ]; doCheck = true; - nativeCheckInputs = [ alcotest crowbar ]; + checkInputs = [ alcotest crowbar ]; meta = { description = "Access C-like structures directly from OCaml"; diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index c4518de9f9ee9..b640c9745f3b0 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; - nativeCheckInputs = [ 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/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index 091a6ab4defae..a20911cbb299c 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -11,7 +11,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ cstruct sexplib ]; } diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index 6eb814ef7db9d..edb31f1836bf6 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -20,10 +20,12 @@ buildDunePackage rec { propagatedBuildInputs = [ integers_stubs_js ]; nativeCheckInputs = [ - ctypes + nodejs js_of_ocaml-compiler + ]; + checkInputs = [ + ctypes ppx_expect - nodejs ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 48a776669dc39..b4cd7e458a70e 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 = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation { "all" "test" ]; - nativeCheckInputs = [ + checkInputs = [ ounit ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index f82a6c237dcda..5f0e93f8f26d6 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -16,7 +16,8 @@ buildDunePackage rec { }; propagatedBuildInputs = [ result ]; - nativeCheckInputs = [ 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 e72f4ce0e8b30..23c098aedcb5d 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0yy3wf8i7jgvzdc40bni7mvpkvclq97cgb5fw265mrjj0iqpkqpd"; }; + strictDeps = true; + propagatedBuildInputs = [ ncurses ]; nativeBuildInputs = [ ocaml findlib ]; # Fix build for recent ncurses versions - NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; + env.NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index b5878a51ef7d8..7bd01ff831572 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -36,7 +36,7 @@ buildDunePackage { json-data-encoding-bson ]; - nativeCheckInputs = [ + checkInputs = [ alcotest crowbar ppx_expect diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index a8b460f426ba6..3e15bd5bbcd18 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 ]; - nativeCheckInputs = [ 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/diet/default.nix b/pkgs/development/ocaml-modules/diet/default.nix index dc4f5214208da..cd14d2a06af5e 100644 --- a/pkgs/development/ocaml-modules/diet/default.nix +++ b/pkgs/development/ocaml-modules/diet/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ stdlib-shims ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = with lib; { homepage = "https://github.com/mirage/ocaml-diet"; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index cca890e997f0c..75ecb7fc58fbe 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -15,12 +15,11 @@ buildDunePackage rec { sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY="; }; - nativeBuildInputs = [ findlib which ]; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ findlib which ocaml pkg-config ]; propagatedBuildInputs = [ eqaf ]; - nativeCheckInputs = [ alcotest astring bos fpath ]; + checkInputs = [ alcotest astring bos fpath ]; doCheck = true; postCheck = '' diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix index e6f6ffc864929..587f5a792dc7b 100644 --- a/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/pkgs/development/ocaml-modules/dispatch/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index dd2a8445867e8..6e23eeecba975 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -39,7 +39,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index 087c0a1efa1ae..e8bd210dcd8cb 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -12,11 +12,28 @@ buildDunePackage { 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 ]; - nativeCheckInputs = [ alcotest ]; + 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; meta = dns.meta // { diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index e9ae3184b5a9e..81bc741d974b6 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -1,5 +1,17 @@ -{ 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 }: @@ -18,7 +30,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "An Domain Name System (DNS) library"; diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix index 3b2b0e2374ba4..de2a76052384f 100644 --- a/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -1,6 +1,13 @@ -{ 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 { @@ -20,7 +27,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest base64 ]; diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix index fb598746bbbaa..dd46a1534ed38 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 }: @@ -28,7 +40,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix index e10ec3830076c..049cf507e3acd 100644 --- a/pkgs/development/ocaml-modules/dns/server.nix +++ b/pkgs/development/ocaml-modules/dns/server.nix @@ -1,6 +1,16 @@ -{ 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 { @@ -21,7 +31,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-crypto-rng dns-tsig diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix index d544e51f36f0a..3ecc90d398531 100644 --- a/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/pkgs/development/ocaml-modules/dns/tsig.nix @@ -13,7 +13,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 7a7a14192f9e7..b27efe5019448 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/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix index f14172fcb5919..afbfbb66391b2 100644 --- a/pkgs/development/ocaml-modules/domain-name/default.nix +++ b/pkgs/development/ocaml-modules/domain-name/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix index 8da2ed538fd72..8a36285fe697a 100644 --- a/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchurl, buildDunePackage +{ lib +, fetchurl +, buildDunePackage , lockfree , mirage-clock-unix }: @@ -18,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ lockfree ]; doCheck = true; - nativeCheckInputs = [ mirage-clock-unix ]; + checkInputs = [ mirage-clock-unix ]; meta = { homepage = "https://github.com/ocaml-multicore/domainslib"; diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index a59395971544f..1146da5d3067f 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -34,11 +34,13 @@ buildDunePackage rec { ]; nativeCheckInputs = [ - dpkg # Replaces: conf-dpkg - git - ounit 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/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 44bc5d7498bf0..ffcfb38c6bf1b 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 2564d2ed07560..583949cf1da42 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 { @@ -15,7 +21,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ + checkInputs = [ alcotest crowbar hxd diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix index 5d9f105782b49..9eb7afa2c408c 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/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix index eeb974b135fbe..1a1f9b07769fe 100644 --- a/pkgs/development/ocaml-modules/duration/default.nix +++ b/pkgs/development/ocaml-modules/duration/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/hannesm/duration"; diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 08c0a284fad2c..209bf30d2a61a 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -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/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 47b002fd7302f..16a69db3b2fce 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 428e42682329b..e921ffd064562 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 ] + ++ [ (if lib.versionAtLeast version "1.15" || version == "dev" then menhir else camlp5) ] + ++ 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 c76d79d5f81ba..44764033d6a21 100644 --- a/pkgs/development/ocaml-modules/emile/default.nix +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -1,17 +1,26 @@ -{ lib, buildDunePackage, fetchurl, ocaml -, angstrom, ipaddr, base64, pecu, uutf -, alcotest, cmdliner +{ lib +, buildDunePackage +, fetchurl +, ocaml +, angstrom +, ipaddr +, base64 +, pecu +, uutf +, alcotest +, cmdliner }: buildDunePackage rec { pname = "emile"; version = "1.1"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz"; - sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p"; + hash = "sha256:0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p"; }; buildInputs = [ cmdliner ]; @@ -24,11 +33,8 @@ buildDunePackage rec { uutf ]; - # technically emile is available for ocaml >= 4.03, but alcotest - # and angstrom (fmt) are only available for >= 4.08. Disabling - # tests for < 4.08 at least improves the error message - doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + doCheck = true; + checkInputs = [ alcotest ]; meta = with lib; { description = "Parser of email address according RFC822"; diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix index 317446fc5ba41..7c15edabd589d 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"; @@ -15,7 +22,7 @@ buildDunePackage rec { useDune2 = true; propagatedBuildInputs = [ angstrom fmt bigstringaf ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/ethernet/default.nix b/pkgs/development/ocaml-modules/ethernet/default.nix index 59c581e128aed..6d76590c6ca96 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/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix index ff5ed12a998ae..0dcfd5ec02ded 100644 --- a/pkgs/development/ocaml-modules/faraday/default.nix +++ b/pkgs/development/ocaml-modules/faraday/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI="; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix index 4d9c69ace6198..5681b33cb7683 100644 --- a/pkgs/development/ocaml-modules/ff/default.nix +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { zarith ]; - nativeCheckInputs = [ + checkInputs = [ alcotest ff-pbt ]; diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix index 6c929e11b17ed..ffd78381127be 100644 --- a/pkgs/development/ocaml-modules/ff/pbt.nix +++ b/pkgs/development/ocaml-modules/ff/pbt.nix @@ -6,7 +6,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index e7b6d76967247..594053491300e 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.6"; + version = "1.1.7"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-NlWmt98QwuGFNP8FHnAR3C0DIiSfJ1ZJXeVFFZiOSXs="; + sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index 7f0a5da34ddb0..f3364cb548a60 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -14,7 +14,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; propagatedBuildInputs = [ ffmpeg-avutil diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 8c4d4e8c23c4b..73b8ed0f6aecd 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 442c80ab6a129..1ff5a89ee307f 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index 72180afb96146..64ebc1affee1d 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -16,7 +16,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 3b3b94988b175..32342860d13ea 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -13,7 +13,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 7635fb6d1218a..a271b984d14cb 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -9,7 +9,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index 801e00b6155f3..fb6fbda58d20c 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index f39ffbc96fa02..a085795831b96 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src useDune2; + inherit (ffmpeg-base) version src duneVersion; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index e2f5fdab4f44e..0431c733cb909 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { stdlib-shims ]; - nativeCheckInputs = [ + checkInputs = [ ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index cf364347fa445..346083ddadb3c 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -4,13 +4,14 @@ buildDunePackage rec { pname = "functoria"; - version = "4.2.0"; + version = "4.3.4"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - sha256 = "sha256-rZ9y8+wbDjqjY1sx+TmSoR42hUKRMGpehCCR2cEgbv8="; + hash = "sha256-ZN8La2+N19wVo/vBUfIj17JU6FSp0jX7h2nDoIpR1XY="; }; propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ]; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 2fae764f5dd51..837a481cf1bdc 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; meta = { description = "OCaml client for google services"; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 9242133ec236e..ee932bffd5e6e 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; - nativeCheckInputs = [ qcheck ounit2 ]; + checkInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index ec8bbb31617dd..c3bf3a2ec938a 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 b078ad973f229..1ffc95d3c2250 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.10.1"; + version = "3.12.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "sha256-plu69FIpyJcuZ8nJ3QnufLnDEjtcsoAd8czKHfzTkd8="; + hash = "sha256-qgd5fny23J6pcOdgwB3Yt1UxJii2XE25OjcSVFdLMKA="; }; # remove changelog for the carton package @@ -32,7 +32,10 @@ buildDunePackage rec { domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; nativeCheckInputs = [ - alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner + git-binary + ]; + checkInputs = [ + 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 b1e38c2ebfc91..28ce7c4a3f301 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 @@ -82,7 +83,7 @@ buildDunePackage { result ]; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt bigstringaf diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 65a4619ac5d8c..f5e8337382e41 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -18,8 +18,11 @@ buildDunePackage { duneVersion = "3"; buildInputs = [ - awa awa-mirage cmdliner - mirage-clock tcpip + awa + awa-mirage + cmdliner + mirage-clock + tcpip ]; propagatedBuildInputs = [ rresult result bigstringaf @@ -30,12 +33,13 @@ buildDunePackage { tls tls-mirage git happy-eyeballs-lwt git-mirage mirage-clock-unix ]; - nativeCheckInputs = [ + 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/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix index 7cdddfe101de8..ce13b0e1cee3d 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"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest fmt ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index b4f836215de4f..b202d46abd533 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 { @@ -13,7 +21,7 @@ buildDunePackage rec { nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; - nativeCheckInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ]; + checkInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index b0426500b310a..679d89f44b10d 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ graphql_parser rresult yojson ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 396de94bc2893..cbdcba64abb48 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ graphql ocaml_lwt ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index 25432d9ad8a58..4042e65772bc8 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ fmt re ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 1c3351f791df6..9314c1033d4c6 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 @@ -26,7 +28,7 @@ buildDunePackage rec { yojson ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index 6f60330e40ccd..1a8d0c5d6395a 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -30,6 +30,7 @@ buildDunePackage rec { src ; + duneVersion = "3"; minimalOCamlVersion = "4.06"; propagatedBuildInputs = [ @@ -46,7 +47,7 @@ buildDunePackage rec { preCheck = '' ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case ''; - nativeCheckInputs = [ + checkInputs = [ alcotest yojson hex diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index d5b0691fdffaf..a3a2a3cff1f94 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { 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 9160b9233fa5c..50f1f94557395 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -19,8 +19,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; duneVersion = "3"; - strictDeps = true; - buildInputs = [ cmdliner duration diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index 22f17111e44bd..eb15706efac9f 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -21,8 +21,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; duneVersion = "3"; - strictDeps = true; - buildInputs = [ duration ipaddr diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index b4492f438ccca..68fc506222de6 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 374d7fa20d517..3df9ad5307c03 100644 --- a/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -4,17 +4,16 @@ 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 ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 691e09a410e7d..508b2e4b7f76d 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z"; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ angstrom faraday ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 27ad2b5f0029b..10509f1e75007 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,5 +1,10 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, decompress, stdlib-shims, alcotest +{ lib +, fetchurl +, buildDunePackage +, ocaml +, decompress +, stdlib-shims +, alcotest }: buildDunePackage rec { @@ -17,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ decompress stdlib-shims ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "Image formats such as PNG and PPM in OCaml"; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index f38d1f495f441..ebc0507875558 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -10,10 +10,11 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4="; + hash = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; buildInputs = [ stdlib-shims @@ -31,7 +32,7 @@ buildDunePackage rec { lru ]; - nativeCheckInputs = [ + checkInputs = [ alcotest crowbar re diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 026985efcb6ea..2dce9320afd4c 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -15,10 +15,8 @@ buildDunePackage rec { }; buildInputs = [ lwt ]; - nativeCheckInputs = [ ounit2 fileutils ]; - # Otherwise nativeCheckInputs can't be found - strictDeps = false; + checkInputs = [ ounit2 fileutils ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 915bea6ff0467..b576282224053 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,8 +11,9 @@ buildDunePackage rec { sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ cstruct bigarray-compat ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 5055aa7bbbd4e..c4eefb637fb58 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -10,7 +10,7 @@ buildDunePackage rec { propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; - nativeCheckInputs = [ ppx_sexp_conv ounit ]; + checkInputs = [ ppx_sexp_conv ounit ]; doCheck = true; meta = macaddr.meta // { diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 6f94382cf3a3a..373b5a87e495d 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ipaddr ]; - nativeCheckInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; + checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; doCheck = true; meta = ipaddr.meta // { diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 39ef6b00068fc..61a0d6021ab64 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -4,11 +4,12 @@ buildDunePackage rec { pname = "irmin-chunk"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt logs lwt ]; doCheck = true; - nativeCheckInputs = [ alcotest irmin-test ]; + checkInputs = [ alcotest irmin-test ]; meta = irmin.meta // { description = "Irmin backend which allow to store values into chunks"; diff --git a/pkgs/development/ocaml-modules/irmin/containers.nix b/pkgs/development/ocaml-modules/irmin/containers.nix index fe7eb3ffc569d..aa003f39b3f47 100644 --- a/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/pkgs/development/ocaml-modules/irmin/containers.nix @@ -7,18 +7,25 @@ buildDunePackage { pname = "irmin-containers"; inherit (ppx_irmin) src version strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin ]; propagatedBuildInputs = [ - irmin irmin-fs ppx_irmin lwt mtime + irmin + irmin-fs + ppx_irmin + lwt + mtime ]; doCheck = true; - nativeCheckInputs = [ - alcotest alcotest-lwt cacert + checkInputs = [ + alcotest + alcotest-lwt + cacert ]; meta = ppx_irmin.meta // { diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index 13ae4109de069..485547ddcad68 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -9,7 +9,8 @@ buildDunePackage { inherit (ppx_irmin) src version strictDeps; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ astring @@ -28,7 +29,7 @@ buildDunePackage { uutf ]; - nativeCheckInputs = [ + checkInputs = [ vector hex alcotest diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 196f75ff26f03..4b8d7c4b97aaa 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -1,15 +1,17 @@ { lib, buildDunePackage, irmin, astring, logs, lwt -, alcotest, irmin-test, irmin-watcher }: +, alcotest, irmin-test, irmin-watcher +}: buildDunePackage rec { pname = "irmin-fs"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin astring logs lwt ]; - nativeCheckInputs = [ alcotest irmin-test irmin-watcher ]; + checkInputs = [ alcotest irmin-test irmin-watcher ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix index b3259372860b3..c489281591304 100644 --- a/pkgs/development/ocaml-modules/irmin/git.nix +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -30,7 +30,7 @@ buildDunePackage { cohttp-lwt-unix ]; - nativeCheckInputs = [ mtime alcotest irmin-test cacert ]; + checkInputs = [ mtime alcotest irmin-test cacert ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 21fe590c056b6..005bf25eb2d95 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -13,7 +13,7 @@ buildDunePackage rec { doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt logs diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/pkgs/development/ocaml-modules/irmin/http.nix index 5cf57fe047ccc..9a466928c64a2 100644 --- a/pkgs/development/ocaml-modules/irmin/http.nix +++ b/pkgs/development/ocaml-modules/irmin/http.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ]; - nativeCheckInputs = [ + checkInputs = [ digestif git-unix irmin-git irmin-test irmin-fs cacert ]; diff --git a/pkgs/development/ocaml-modules/irmin/mirage.nix b/pkgs/development/ocaml-modules/irmin/mirage.nix index 9e4bd9330799c..2d7d0a8912498 100644 --- a/pkgs/development/ocaml-modules/irmin/mirage.nix +++ b/pkgs/development/ocaml-modules/irmin/mirage.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "irmin-mirage"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ irmin fmt ptime mirage-clock diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 7056a2f63e6cd..8c0c7b2a3b000 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,10 +1,11 @@ { lib, buildDunePackage -, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner +, index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner, checkseum, rusage , alcotest, alcotest-lwt, astring, irmin-test }: buildDunePackage rec { - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; + duneVersion = "3"; pname = "irmin-pack"; @@ -12,9 +13,9 @@ buildDunePackage rec { nativeBuildInputs = [ ppx_irmin ]; - propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner ]; + propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner checkseum rusage ]; - nativeCheckInputs = [ astring alcotest alcotest-lwt irmin-test ]; + checkInputs = [ astring alcotest alcotest-lwt irmin-test ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 2e21331c22e6d..4ff7f4a8bdd81 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,16 +2,15 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "sha256-kig2EWww7GgGijhpSgm7pSHPR+3Q5K5E4Ha5tJY9oYA="; + hash = "sha256-zXiKjT9KPdGNwWChU9SuyR6vaw+0GtQUZNJsecMEqY4="; }; minimalOCamlVersion = "4.10"; - - strictDeps = false; # We must provide nativeCheckInputs as buildInputs because dune builds tests at build time + duneVersion = "3"; propagatedBuildInputs = [ ppx_repr diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix index ee13bf426768f..4e2ccce716636 100644 --- a/pkgs/development/ocaml-modules/irmin/test.nix +++ b/pkgs/development/ocaml-modules/irmin/test.nix @@ -8,6 +8,7 @@ buildDunePackage { pname = "irmin-test"; inherit (irmin) version src strictDeps; + duneVersion = "3"; nativeBuildInputs = [ ppx_irmin ]; @@ -27,7 +28,7 @@ buildDunePackage { metrics ]; - nativeCheckInputs = [ hex vector ]; + checkInputs = [ hex vector ]; meta = irmin.meta // { description = "Irmin test suite"; diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix index 2549a783bde64..ddfc0d073205c 100644 --- a/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -7,22 +7,23 @@ buildDunePackage rec { pname = "irmin-tezos"; inherit (irmin) version src strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ - irmin - irmin-pack - ppx_irmin - digestif - fmt - tezos-base58 + irmin + irmin-pack + ppx_irmin + digestif + fmt + tezos-base58 ]; buildInputs = [ - cmdliner - yojson + cmdliner + yojson ]; - nativeCheckInputs = [ alcotest hex irmin-test fpath ]; + checkInputs = [ alcotest hex irmin-test fpath ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 62ea8f78b45c4..26adaf06d1ee2 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"; - nativeCheckInputs = [ 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 d32c2027df4f6..075f7c1f57d69 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -155,7 +155,7 @@ with self; meta.description = "Full standard library replacement for OCaml"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ sexplib0 ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; }; base_bigstring = janePackage { @@ -205,9 +205,7 @@ with self; minimumOCamlVersion = "4.07"; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; - nativeCheckInputs = [ ppx_jane ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ppx_jane ]; }; core = janePackage { @@ -782,9 +780,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - nativeCheckInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ounit ]; }; shexp = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index af040a739478e..7433c116b68fb 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -177,7 +177,7 @@ with self; meta.description = "Full standard library replacement for OCaml"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ sexplib0 ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; }; base_bigstring = janePackage { @@ -958,9 +958,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - nativeCheckInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ounit ]; }; shexp = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index da26875760154..9552268abc2e0 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 5b9186835701b..d61f1b6d41c2d 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 d124baea8972d..e3c3efc9999e8 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 678599089946d..7306ce46bf993 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/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index a12ade51c2ea9..5675e10dbad1f 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 3029f4084cfeb..5ee48d3ed2d64 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,9 +17,9 @@ buildDunePackage rec { sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA="; }; - buildInputs = [ menhir ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ]; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index a92c4839ab5d0..46810ab1566be 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -10,7 +10,7 @@ buildDunePackage { ocplib-endian ]; - nativeCheckInputs = [ + checkInputs = [ crowbar alcotest ]; diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix index ff3667bd79fc7..13b81d9c52718 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { uri ]; - nativeCheckInputs = [ + checkInputs = [ crowbar alcotest ]; diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix index f8ba36d9690b0..745f86dff52b0 100644 --- a/pkgs/development/ocaml-modules/jwto/default.nix +++ b/pkgs/development/ocaml-modules/jwto/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ digestif fmt yojson base64 re ppx_deriving ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix index 519b0c1725c89..243824947983f 100644 --- a/pkgs/development/ocaml-modules/ke/default.nix +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; - nativeCheckInputs = [ alcotest bigstringaf ]; + checkInputs = [ alcotest bigstringaf ]; doCheck = true; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index b010272b54b48..55dd88d7246b8 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 bcf82e1c3842b..3d5135d7439a3 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 75b3940a1d506..66728db655668 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 96dbd071fdefe..17e64cafb0776 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -12,7 +12,7 @@ let param = rev = version; sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po="; }; - NIX_CFLAGS_COMPILE = null; + env = { }; buildInputs = [ camlp-streams ]; } else if check "3.12" then { version = "2.18.5"; @@ -24,13 +24,13 @@ let param = # gcc-10. Otherwise build fails as: # ld: ml_gtktree.o:(.bss+0x0): multiple definition of # `ml_table_extension_events'; ml_gdkpixbuf.o:(.bss+0x0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in stdenv.mkDerivation { pname = "ocaml${ocaml.version}-lablgtk"; - inherit (param) version src NIX_CFLAGS_COMPILE; + inherit (param) version src env; # gnumake42: https://github.com/garrigue/lablgtk/issues/162 nativeBuildInputs = [ pkg-config ocaml findlib gnumake42 ]; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 4d5c4ae303e89..465c82da12107 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { inherit (param) version src; pname = "ocaml${ocaml.version}-labltk"; + strictDeps = true; + nativeBuildInputs = [ ocaml findlib makeWrapper ]; buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index c073ddf39cd29..a2294822a0cac 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; diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index f0509c243e124..1478687fe5e3a 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -33,8 +33,8 @@ buildDunePackage rec { bindlib camlp-streams cmdliner pratter sedlex stdlib-shims timed why3 yojson ]; - nativeCheckInputs = [ alcotest dedukti ]; - doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory") + checkInputs = [ alcotest dedukti ]; + 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/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index ee3876d5da42d..d7d0028b2c159 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ markup ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix new file mode 100644 index 0000000000000..39952366dbac7 --- /dev/null +++ b/pkgs/development/ocaml-modules/lem/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, lib +, ncurses +, makeWrapper +, ocamlbuild +, findlib +, ocaml +, num +, zarith +}: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "lem is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-lem"; + version = "2022-12-10"; + + src = fetchFromGitHub { + owner = "rems-project"; + repo = "lem"; + rev = version; + hash = "sha256-ZQgcuIVRkJS0KtpzjbO4OPHGg6B0TadWA6XpRir30y8="; + }; + + nativeBuildInputs = [ makeWrapper ocamlbuild findlib ocaml ]; + propagatedBuildInputs = [ zarith num ]; + + installFlags = [ "INSTALL_DIR=$(out)" ]; + + createFindlibDestdir = true; + + postInstall = '' + wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library + ''; + + meta = with lib; { + homepage = "https://github.com/rems-project/lem"; + description = "A tool for lightweight executable mathematics"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = with licenses; [ bsd3 gpl2 ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index efebb5309e464..c9cd5572bc7f6 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { buildInputs = [ ppx_deriving ppxlib ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = with lib; { homepage = "https://github.com/pdonadeo/ocaml-lens"; diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 6f14af03e5c6c..13875147a4e54 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -52,7 +52,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "ACME implementation in OCaml"; diff --git a/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix new file mode 100644 index 0000000000000..751f4e14a2d30 --- /dev/null +++ b/pkgs/development/ocaml-modules/linksem/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, stdenv +, findlib +, ocaml +, lem +}: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "linksem is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-linksem"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "rems-project"; + repo = "linksem"; + rev = version; + hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA="; + }; + + nativeBuildInputs = [ findlib ocaml ]; + + propagatedBuildInputs = [ lem ]; + + createFindlibDestdir = true; + + meta = with lib; { + homepage = "https://github.com/rems-project/linksem"; + description = "A formalisation of substantial parts of ELF linking and DWARF debug information"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/lockfree/default.nix b/pkgs/development/ocaml-modules/lockfree/default.nix index 6a8e871bda41e..c3400d4583e04 100644 --- a/pkgs/development/ocaml-modules/lockfree/default.nix +++ b/pkgs/development/ocaml-modules/lockfree/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ dscheck ]; doCheck = true; - nativeCheckInputs = [ qcheck qcheck-alcotest ]; + checkInputs = [ qcheck qcheck-alcotest ]; meta = { description = "Lock-free data structures for multicore OCaml"; diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix index dfa765d564931..678023bb8f3d2 100644 --- a/pkgs/development/ocaml-modules/lru/default.nix +++ b/pkgs/development/ocaml-modules/lru/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { propagatedBuildInputs = [ psq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ qcheck-alcotest ]; + checkInputs = [ qcheck-alcotest ]; meta = { homepage = "https://github.com/pqwy/lru"; diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix index 4eb1e55a5a8af..97084b913edbd 100644 --- a/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lustre-v6"; - version = "6.107.1"; + version = "6.107.3"; minimalOCamlVersion = "4.12"; src = fetchurl { - url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; - hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc="; + url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; + hash = "sha256-z3cljDyxtotCGUIdYEzYu7fQd04RC3hhWpROcMh6Zng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index e2df6f321fdcc..da7f9ba1808fa 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { nativeBuildInputs = [ file ]; propagatedBuildInputs = [ ctypes result ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/pkgs/development/ocaml-modules/lwt-dllist/default.nix index 12675eda9a1e3..b28981b1b7799 100644 --- a/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "e86ce75e40f00d51514cf8b2e71e5184c4cb5dae96136be24613406cfc0dba6e"; }; - nativeCheckInputs = [ + checkInputs = [ lwt ]; doCheck = lib.versionAtLeast ocaml.version "4.03"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9be06c2e61120..8004cfcd4bb42 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/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 18bc15673bd94..7eb74ff064d02 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn"; }; - nativeCheckInputs = [ ppx_sexp_conv ounit ]; + checkInputs = [ ppx_sexp_conv ounit ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 15d5602e7e035..1f03c1326a537 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -9,7 +9,7 @@ buildDunePackage { propagatedBuildInputs = [ ppx_sexp_conv ]; - nativeCheckInputs = [ macaddr-cstruct ounit ]; + checkInputs = [ macaddr-cstruct ounit ]; doCheck = true; meta = macaddr.meta // { diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 178232633552e..535557c0e8df3 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ uchar uutf ]; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 19cd08af85f74..02ef06044457a 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 ]; - nativeCheckInputs = [ 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 312169acb6cf5..ddb610f5570b5 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"; @@ -27,7 +28,7 @@ buildDunePackage rec { zarith ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bisect_ppx ]; diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index b295c0eda0f7d..a8ccd2cf4a015 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/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix index 837bf6c2dc965..5fcf7cf511085 100644 --- a/pkgs/development/ocaml-modules/metrics/default.nix +++ b/pkgs/development/ocaml-modules/metrics/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix index ef32ed3159fd7..5df5e14982ccf 100644 --- a/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/pkgs/development/ocaml-modules/metrics/unix.nix @@ -13,7 +13,8 @@ buildDunePackage rec { propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ]; - nativeCheckInputs = [ metrics-lwt ]; + 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 1522b2def3846..097ecb3135346 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest alcotest-lwt bigstringaf diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 940e9a779104a..0d0851536b38e 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"; @@ -16,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; doCheck = true; - nativeCheckInputs = [ diet ounit2 ]; + checkInputs = [ diet ounit2 ]; meta = with lib; { description = "MirageOS disk block driver for Unix"; diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix index c280853488de4..1bf622714788d 100644 --- a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "mirage-bootvar-xen"; version = "0.8.0"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${version}/mirage-bootvar-xen-v${version}.tbz"; - sha256 = "0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; + hash = "sha256:0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix index 7461ef91daee5..bdafeb4305498 100644 --- a/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; doCheck = true; - nativeCheckInputs = [ alcotest mirage-flow-combinators ]; + checkInputs = [ alcotest mirage-flow-combinators ]; meta = { description = "Buffered channels for MirageOS FLOW types"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 5bbf5d0fcb317..d5f110948dc93 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; @@ -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 5a9de788a5d35..3afe582413f5a 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,10 +36,10 @@ buildDunePackage rec { ocaml-freestanding ]; - strictDeps = !doCheck; + strictDeps = true; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ hex alcotest asn1-combinators diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index d10e51ea0e727..b79f49c64bd45 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -10,10 +10,8 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; - strictDeps = !doCheck; - doCheck = true; - nativeCheckInputs = [ ounit2 randomconv ]; + checkInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index f9a244de36eb6..c3703a5a60abb 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -9,13 +9,11 @@ buildDunePackage rec { inherit (mirage-crypto-rng) version src; doCheck = true; - nativeCheckInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; + checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; 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 eb7e0cf0e488d..044b8ed27b82e 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -7,12 +7,12 @@ buildDunePackage rec { inherit (mirage-crypto) version src; doCheck = true; - nativeCheckInputs = [ ounit2 randomconv ]; + checkInputs = [ ounit2 randomconv ]; 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 6a317ca34c934..023896447db19 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"; @@ -14,7 +15,7 @@ buildDunePackage { propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; doCheck = true; - nativeCheckInputs = [ alcotest mirage-flow-combinators ]; + checkInputs = [ alcotest mirage-flow-combinators ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS on Unix"; diff --git a/pkgs/development/ocaml-modules/mirage-kv/default.nix b/pkgs/development/ocaml-modules/mirage-kv/default.nix index 771efcef2b7c3..20d83e1664184 100644 --- a/pkgs/development/ocaml-modules/mirage-kv/default.nix +++ b/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt mirage-device ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "MirageOS signatures for key/value devices"; diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index 133d49ddf9d96..7aabd51b819a7 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix index 0fdc6d4fa95ad..fea1e712abd21 100644 --- a/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-clock-unix ]; diff --git a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix index 49a00747cfa6c..e03e17905faaf 100644 --- a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix @@ -20,6 +20,8 @@ buildDunePackage { meta ; + duneVersion = "3"; + nativeBuildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/mirage-xen/default.nix b/pkgs/development/ocaml-modules/mirage-xen/default.nix index a2b84e8fb5e42..8f174f01ccb94 100644 --- a/pkgs/development/ocaml-modules/mirage-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix @@ -17,14 +17,15 @@ buildDunePackage rec { pname = "mirage-xen"; - version = "7.2.0"; + version = "8.0.1"; src = fetchurl { url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz"; - sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA="; + hash = "sha256-x8i2Kbz0EcifZK/lbDIFa9Kwtl1/xzbYV9h9E+EtGP4="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 76f11cfd9055b..98d96cf146f0b 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -8,6 +8,7 @@ buildDunePackage rec { inherit (mirage-runtime) version src; minimalOCamlVersion = "4.08"; + duneVersion = "3"; outputs = [ "out" "dev" ]; @@ -23,7 +24,7 @@ buildDunePackage rec { # Tests need opam-monorepo doCheck = false; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 25062bcb0df15..8182b7b5ef53d 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -10,7 +10,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix index 6895a29fb1ac2..0425bcafa639b 100644 --- a/pkgs/development/ocaml-modules/mm/default.nix +++ b/pkgs/development/ocaml-modules/mm/default.nix @@ -4,7 +4,9 @@ buildDunePackage rec { pname = "mm"; - version = "0.8.1"; + version = "0.8.2"; + + duneVersion = "3"; minimalOCamlVersion = "4.12"; @@ -12,7 +14,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-mm"; rev = "v${version}"; - sha256 = "sha256-7ozt+OgKNxMnjl2R+/ce27ZyL+T6BShvnnFE5BasJC4="; + sha256 = "sha256-EifM96MWIDyr1EVUZYuISWGwbMshVQppzWLJchqzV2E="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index 54f137aecd8f3..a2d118765616d 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -62,7 +62,7 @@ buildDunePackage rec { mirage-crypto-rng ]; - nativeCheckInputs = [ + checkInputs = [ alcotest jsonm ]; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 12853232a9974..3ca6e4ac973b7 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,8 +1,6 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -with lib; - -throwIfNot (versionAtLeast ocaml.version "4.08") +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "mtime is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase 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 index 8c9149c4af5a9..4d44f3b977635 100644 --- a/pkgs/development/ocaml-modules/multipart-form-data/default.nix +++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix @@ -13,13 +13,13 @@ buildDunePackage rec { hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII="; }; - nativeBuildInputs = [ lwt_ppx ]; + buildInputs = [ lwt_ppx ]; propagatedBuildInputs = [ lwt stringext ]; duneVersion = "3"; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "Parser for multipart/form-data (RFC2388)"; diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix index 6fcf7757f2f91..5d4b39b21aa80 100644 --- a/pkgs/development/ocaml-modules/mustache/default.nix +++ b/pkgs/development/ocaml-modules/mustache/default.nix @@ -11,11 +11,12 @@ buildDunePackage rec { sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py"; }; - buildInputs = [ ezjsonm menhir ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ ezjsonm ]; propagatedBuildInputs = [ menhirLib ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "Mustache logic-less templates in OCaml"; diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix index 61e5c70edd445..8b0dbec39276a 100644 --- a/pkgs/development/ocaml-modules/netchannel/default.nix +++ b/pkgs/development/ocaml-modules/netchannel/default.nix @@ -19,16 +19,17 @@ buildDunePackage rec { pname = "netchannel"; - version = "2.1.1"; + version = "2.1.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz"; - sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs="; + hash = "sha256-lTmwcNKiaq5EdJdM4UaaAVdZ+hTCX5U9MPKY/r3i7fw="; }; - nativeBuildInputs = [ + buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix index 9375029f5f681..f604780f4769c 100644 --- a/pkgs/development/ocaml-modules/npy/default.nix +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "npy"; version = "0.0.9"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "${pname}-ocaml"; rev = version; - sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; + hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; }; propagatedBuildInputs = [ camlzip ]; diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index 023b327cc08eb..12f9aa4ca02b7 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation (rec { inherit (src.meta) homepage; }; } // (if lib.versions.majorMinor ocaml.version == "4.06" then { - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; } else {}) ) diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f0e70699ad883..2c2ffecf3dbae 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 942d69e591946..3588495884f8b 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 f99a84cf6102d..e6a778194654e 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -7,9 +7,9 @@ buildDunePackage { propagatedBuildInputs = [ camomile ocaml_gettext ]; doCheck = true; - nativeCheckInputs = [ ounit fileutils ]; + 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 bd887b4b9f56b..c65f506469746 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -11,14 +11,14 @@ buildDunePackage rec { sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ gettext fileutils ]; # Tests for version 0.4.2 are not compatible with OUnit 2.2.6 doCheck = false; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index d8999dcbae583..75e739959c3c0 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -12,7 +12,7 @@ buildDunePackage rec { doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]; } diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 3111d4277c41d..1c7d72cbc36db 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -26,7 +26,7 @@ buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2"; - minimumOCamlVersion = + minimalOCamlVersion = if lib.versionAtLeast version "1.7.0" then "4.12" else @@ -74,7 +74,6 @@ buildDunePackage rec { [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ - cppo ppx_yojson_conv_lib ocaml-syntax-shims octavius @@ -83,6 +82,8 @@ buildDunePackage rec { cmdliner ]; + nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo; + propagatedBuildInputs = [ csexp jsonrpc diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index fd628e7651c72..8de5abf7e4814 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -1,44 +1,37 @@ -{ 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 ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + 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 6ae36252aa08a..72c1cb148c20b 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 aeb9c9dc699ca..28f12046eaa3c 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 13ac62f645145..1efcbf382dbfd 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 0be4e7806630c..850c29c4dc024 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/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 3482aa37e750b..2a33d8b17cccf 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/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 3ee300a5a964f..f4225c917dbda 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 @@ -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/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index 24d2c04c6ca69..a16fbc578d33d 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 34f3e84304b71..924f643cc88db 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 ]; - nativeCheckInputs = [ 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 26632f37d2062..b98d892696ec4 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -49,7 +49,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest-lwt ]; diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix index c3bffc013f95e..8613ccf9ae088 100644 --- a/pkgs/development/ocaml-modules/ordering/default.nix +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "ordering"; inherit (dune_3) version src; duneVersion = "3"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix index f680c3794cafb..cbe02de2ef11f 100644 --- a/pkgs/development/ocaml-modules/oseq/default.nix +++ b/pkgs/development/ocaml-modules/oseq/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { duneVersion = "3"; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ containers qcheck ]; diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index 3f06a098d0e16..4a2e605f4cef9 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/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index d2ed78d51b8a2..108f4b79d782b 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "otr"; version = "0.3.10"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; - sha256 = "0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; + hash = "sha256:0dssc7p6s7z53n0mddyipjghzr8ld8bb7alaxqrx9gdpspwab1gq"; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk astring base64 ]; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 7872edca59225..3b75428d0efb7 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,22 +1,22 @@ { lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: buildDunePackage rec { - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; pname = "ounit2"; version = "2.2.6"; - useDune2 = lib.versionAtLeast ocaml.version "4.08"; + duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "2" else "1"; src = fetchurl { url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz"; - sha256 = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM="; + hash = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM="; }; propagatedBuildInputs = [ seq stdlib-shims ]; doCheck = true; - nativeCheckInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; + checkInputs = 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-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 189359cd1c863..32eef11936502 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "owl-base"; version = "1.0.2"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; - sha256 = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM="; + hash = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM="; }; - minimumOCamlVersion = "4.10"; + minimalOCamlVersion = "4.10"; meta = with lib; { description = "Numerical computing library for Ocaml"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index b5f707446a583..ac294648d217e 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -14,13 +14,18 @@ buildDunePackage rec { pname = "owl"; - inherit (owl-base) version src meta useDune2; + inherit (owl-base) version src meta; - nativeCheckInputs = [ alcotest ]; + duneVersion = "3"; + + 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 97396769fd05e..2f2891493061c 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -22,7 +22,7 @@ buildDunePackage { inherit (paf) version src - ; + ; duneVersion = "3"; @@ -35,7 +35,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest-lwt fmt logs diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index d172e73e13b29..974c981f57c67 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -25,11 +25,11 @@ buildDunePackage rec { pname = "paf"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - sha256 = "sha256-+RkrmWJJREHg8BBdNe92vYhd2/Frvs7l5qOr9jBwymU="; + hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE="; }; minimalOCamlVersion = "4.08"; @@ -50,7 +50,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ lwt logs fmt diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix index 28345a6cdc564..429cd0a4d8d78 100644 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ b/pkgs/development/ocaml-modules/paf/le.nix @@ -1,6 +1,7 @@ { lib , buildDunePackage , paf +, dns-client , duration , emile , httpaf @@ -23,6 +24,7 @@ buildDunePackage { propagatedBuildInputs = [ paf + dns-client duration emile httpaf diff --git a/pkgs/development/ocaml-modules/parse-argv/default.nix b/pkgs/development/ocaml-modules/parse-argv/default.nix index 79a6a541a5563..4bc409245eed6 100644 --- a/pkgs/development/ocaml-modules/parse-argv/default.nix +++ b/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "Process strings into sets of command-line arguments"; diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index 41dc6394e84cd..d6b9bdb7e7581 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -10,14 +10,16 @@ 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 ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index aa65deff7412f..ffd183787793c 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 ]; @@ -28,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit mmap ]; diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix index cc2827ad533d8..22c1913635f8c 100644 --- a/pkgs/development/ocaml-modules/pecu/default.nix +++ b/pkgs/development/ocaml-modules/pecu/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { # crowbar availability doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ fmt alcotest crowbar astring ]; + checkInputs = [ fmt alcotest crowbar astring ]; meta = with lib; { description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index c8fbeb103aa40..d41e7c16ce1b2 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -26,9 +26,11 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; - nativeCheckInputs = [ alcotest bppsuite ]; - buildInputs = [ menhir ]; + nativeCheckInputs = [ bppsuite ]; + checkInputs = [ alcotest ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ angstrom-unix biocaml diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 653f86c03ac10..39ae5a86c5982 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 ]; - nativeCheckInputs = [ num ]; + checkInputs = [ num ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index a63876ec5bb1d..d87f6b39efb8e 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/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix index c53b5946556c7..7602d7024524d 100644 --- a/pkgs/development/ocaml-modules/pp/default.nix +++ b/pkgs/development/ocaml-modules/pp/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { useDune2 = true; minimalOCamlVersion = "4.08"; - nativeCheckInputs = [ ppx_expect ]; + checkInputs = [ ppx_expect ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 9bf509801bbcf..6248e4e6a9456 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index c58004b9adca9..88f187cc706a3 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 dba8ffc743dd2..e1c31c3ec28eb 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -39,8 +39,7 @@ buildDunePackage rec { inherit (params) sha256; }; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ cppo ]; buildInputs = [ ppxlib ]; @@ -53,7 +52,7 @@ buildDunePackage rec { ]; doCheck = lib.versionOlder ocaml.version "5.0"; - nativeCheckInputs = [ + checkInputs = [ (if lib.versionAtLeast version "5.2" then ounit2 else ounit) ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index 1b48c90e1d280..5bf70a0565073 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index ff7fc30e986c8..acc36f2b01aca 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -3,13 +3,14 @@ buildDunePackage rec { pname = "ppx_deriving_rpc"; - inherit (rpclib) version useDune2 src; + inherit (rpclib) version src; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; - nativeCheckInputs = [ alcotest yojson ]; + checkInputs = [ alcotest yojson ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 98872feb14f8a..c6a0f6d0af655 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; doCheck = true; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; meta = { description = "A YAML codec generator for OCaml"; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 87784177ed44c..4fef3c0619f3f 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib ppx_deriving yojson ]; doCheck = true; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { description = "A Yojson codec generator for OCaml >= 4.04"; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index dca50972e3dbe..120ce1893b279 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 { @@ -38,7 +36,7 @@ buildDunePackage rec { ppxlib ]; - nativeCheckInputs = [ + checkInputs = [ ounit ppx_deriving ppx_sexp_conv diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index d3af0ea154ea8..2d5f73be42b85 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -58,8 +58,6 @@ then inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; duneVersion = "3"; - - strictDeps = true; } else stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix index 339eac87beaeb..a44e815092ca0 100644 --- a/pkgs/development/ocaml-modules/pratter/default.nix +++ b/pkgs/development/ocaml-modules/pratter/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ camlp-streams ]; - nativeCheckInputs = [ alcotest qcheck qcheck-alcotest ]; + checkInputs = [ alcotest qcheck qcheck-alcotest ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/prettym/default.nix b/pkgs/development/ocaml-modules/prettym/default.nix index 7cdbc7b05bbed..0ec93f488eef1 100644 --- a/pkgs/development/ocaml-modules/prettym/default.nix +++ b/pkgs/development/ocaml-modules/prettym/default.nix @@ -1,10 +1,9 @@ { alcotest , base64 -, bigarray-compat , bigarray-overlap , bigstringaf , buildDunePackage -, fetchzip +, fetchurl , fmt , jsonm , ke @@ -14,24 +13,24 @@ buildDunePackage rec { pname = "prettym"; - version = "0.0.2"; + version = "0.0.3"; - src = fetchzip { + src = fetchurl { url = "https://github.com/dinosaure/prettym/releases/download/${version}/prettym-${version}.tbz"; - sha256 = "03x7jh62mvzc6x2d8xsy456qa6iphw72zm7jmqrakpmsy6zcf2lb"; + hash = "sha256-kXDxoRref02YpYSlvlK7a5FBX5ccbnWJQzG0axi5jwk="; }; - useDune2 = true; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ - bigarray-compat bigarray-overlap bigstringaf fmt ke ]; - nativeCheckInputs = [ + checkInputs = [ ptime alcotest jsonm diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix index 35c7ee9eb43c5..b714cdf337123 100644 --- a/pkgs/development/ocaml-modules/progress/default.nix +++ b/pkgs/development/ocaml-modules/progress/default.nix @@ -7,14 +7,14 @@ buildDunePackage rec { pname = "progress"; minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; inherit (terminal) version src; propagatedBuildInputs = [ fmt logs mtime optint terminal vector ]; doCheck = true; - nativeCheckInputs = [ alcotest astring ]; + checkInputs = [ alcotest astring ]; meta = with lib; { description = "Progress bar library for OCaml"; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 41e13f21a4121..ef88bdcdab7b8 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/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix index 75b2344728497..ea9a0615b4149 100644 --- a/pkgs/development/ocaml-modules/psq/default.nix +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ qcheck-alcotest ]; + checkInputs = [ qcheck-alcotest ]; meta = { description = "Functional Priority Search Queues for OCaml"; diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index a3c0eb55f9685..edc9e1c6dcbd2 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 1cc85833d584d..8358be50032a1 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -28,6 +28,10 @@ buildDunePackage rec { "CHANGES.md" ]; }) + (fetchpatch { + url = "https://github.com/thierry-martinez/pyml/commit/97407473800b3f6215190643c1e6b9bd25d5caeb.patch"; + hash = "sha256-7CrVuV4JT7fyi/ktWz4nNOG/BbqsQVCoJwCAhE2y4YU="; + }) ]; buildInputs = [ @@ -40,7 +44,7 @@ buildDunePackage rec { ]; nativeCheckInputs = [ - python3.pkgs.numpy + python3.pkgs.numpy python3.pkgs.ipython ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 3aafd9807a018..49b1357f54918 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { propagatedBuildInputs = [ react ]; - strictDeps = true; - meta = with lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = "https://github.com/ocsigen/reactiveData"; diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index b4d6708467f0d..3e517591b9e65 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/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix index f5a11919c5dbc..47c19154689e5 100644 --- a/pkgs/development/ocaml-modules/repr/default.nix +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -8,10 +8,11 @@ buildDunePackage rec { owner = "mirage"; repo = "repr"; rev = version; - sha256 = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw="; + hash = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; strictDeps = true; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index eb96298f16ae1..b1091114ce279 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -4,6 +4,7 @@ buildDunePackage { pname = "ppx_repr"; inherit (repr) src version strictDeps; + duneVersion = "3"; propagatedBuildInputs = [ ppx_deriving @@ -12,7 +13,7 @@ buildDunePackage { ]; doCheck = false; # tests fail with ppxlib >= 0.23.0 - nativeCheckInputs = [ + checkInputs = [ alcotest hex ]; diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix index 432636bcbb5f5..40356ec9aa5fc 100644 --- a/pkgs/development/ocaml-modules/rfc7748/default.nix +++ b/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { # the tests fail for 4.05 doCheck = lib.versionAtLeast ocaml.version "4.06"; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; meta = { homepage = "https://github.com/burgerdev/ocaml-rfc7748"; diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix index 3675b8994264e..492e01ce5d59d 100644 --- a/pkgs/development/ocaml-modules/rosetta/default.nix +++ b/pkgs/development/ocaml-modules/rosetta/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij"; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ coin diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index 34f62852a81ab..9dd895ea4b0e0 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -1,24 +1,25 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage , alcotest , base64, cmdliner, rresult, xmlm, yojson }: buildDunePackage rec { pname = "rpclib"; - version = "8.1.0"; + version = "9.0.0"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; - sha256 = "0fbajg8wq8hjhkvvfnq68br0m0pa8zf2qzadhfgi2nnr9713rada"; + url = "https://github.com/mirage/ocaml-rpc/releases/download/${version}/rpclib-${version}.tbz"; + hash = "sha256-ziPrdWwCjZN0vRmCMpa923wjfT8FVFLTDRz30VIW6WM="; }; buildInputs = [ cmdliner yojson ]; propagatedBuildInputs = [ base64 rresult xmlm ]; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix index 69b2bf7499082..eacdcf303c2dd 100644 --- a/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -1,15 +1,20 @@ -{ lib, buildDunePackage, rpclib +{ lib +, buildDunePackage +, rpclib , lwt -, alcotest-lwt, ppx_deriving_rpc, yojson +, alcotest-lwt +, ppx_deriving_rpc +, yojson }: buildDunePackage { pname = "rpclib-lwt"; - inherit (rpclib) version useDune2 src; + inherit (rpclib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt rpclib ]; - nativeCheckInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; + checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; doCheck = true; meta = rpclib.meta // { diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 3184e460a9ac9..0c1081159ede6 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,5 +1,8 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "rresult is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-rresult"; version = "0.7.0"; diff --git a/pkgs/development/ocaml-modules/rusage/default.nix b/pkgs/development/ocaml-modules/rusage/default.nix new file mode 100644 index 0000000000000..891784ba6def0 --- /dev/null +++ b/pkgs/development/ocaml-modules/rusage/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "rusage"; + version = "1.0.0"; + + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${version}/rusage-${version}.tbz"; + hash = "sha256-OgYA2Fe1goqoaOS45Z6FBJNNYN/uq+KQoUwG8KSo6Fk="; + }; + + meta = { + description = "Bindings to the GETRUSAGE(2) syscall"; + homepage = "https://github.com/CraigFe/ocaml-rusage"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix new file mode 100644 index 0000000000000..f66abd2bdcf17 --- /dev/null +++ b/pkgs/development/ocaml-modules/sail/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, base64 +, omd +, menhir +, ott +, linenoise +, dune-site +, pprint +, makeWrapper +, lem +, z3 +, linksem +, num +}: + +buildDunePackage rec { + pname = "sail"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "rems-project"; + repo = "sail"; + rev = version; + hash = "sha256-eNdFOSzkniNvSCZeORRJ/IYAu+9P4HSouwmhd4BQLPk="; + }; + + duneVersion = "3"; + minimalOCamlVersion = "4.08"; + + nativeBuildInputs = [ + makeWrapper + ott + menhir + lem + ]; + + propagatedBuildInputs = [ + base64 + omd + dune-site + linenoise + pprint + linksem + ]; + + preBuild = '' + rm -r aarch* # Remove code derived from non-bsd2 arm spec + rm -r snapshots # Some of this might be derived from stuff in the aarch dir, it builds fine without it + ''; + # `buildDunePackage` only builds the [pname] package + # This doesnt work in this case, as sail includes multiple packages in the same source tree + buildPhase = '' + runHook preBuild + dune build --release ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; + checkPhase = '' + runHook preCheck + dune runtest ''${enableParallelBuild:+-j $NIX_BUILD_CORES} + runHook postCheck + ''; + installPhase = '' + runHook preInstall + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR + runHook postInstall + ''; + postInstall = '' + wrapProgram $out/bin/sail --set SAIL_DIR $out/share/sail + ''; + + meta = with lib; { + homepage = "https://github.com/rems-project/sail"; + description = "A language for describing the instruction-set architecture (ISA) semantics of processors"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 78d28270035ab..a5d042fc1907e 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-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix index f08f77c5282fa..4a9a761ab30c6 100644 --- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { dune-configurator ]; - nativeCheckInputs = [ + checkInputs = [ alcotest hex ]; diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix index d809678838ab7..bdf3b16c4a910 100644 --- a/pkgs/development/ocaml-modules/sha/default.nix +++ b/pkgs/development/ocaml-modules/sha/default.nix @@ -2,12 +2,12 @@ buildDunePackage rec { pname = "sha"; - version = "1.15.2"; + version = "1.15.4"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/djs55/ocaml-${pname}/releases/download/${version}/${pname}-${version}.tbz"; - hash = "sha256-P71Xs5p8QAaOtBrh7MuhQJOL6144BqTLvXlZOyGD/7c="; + url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-beWxITmxmZzp30zHiloxiGwqVHydRIvyhT+LU7zx8bE="; }; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit2 ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 2e4b656e638ff..0b4974f910c9d 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 ]; @@ -28,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index 75d62dd15a79a..e3ae1ef2e3dc4 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -27,7 +27,7 @@ buildDunePackage { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ ounit ]; diff --git a/pkgs/development/ocaml-modules/shine/default.nix b/pkgs/development/ocaml-modules/shine/default.nix index 3aa8cce7980c4..f6acd6b937b6d 100644 --- a/pkgs/development/ocaml-modules/shine/default.nix +++ b/pkgs/development/ocaml-modules/shine/default.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "shine"; - version = "0.2.2"; + version = "0.2.3"; - useDune2 = true; + duneVersion = "2"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-shine"; - rev = "2e1de686ea031f1056df389161ea2b721bfdb39e"; - sha256 = "0v6i4ym5zijki6ffkp2qkp00lk4fysjhmg690xscj23gwz4zx8ir"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-x/ubqPXT89GWYV9KIyzny0rJDB3TBurLX71i0DlvHLU="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/simple-diff/default.nix b/pkgs/development/ocaml-modules/simple-diff/default.nix new file mode 100644 index 0000000000000..a87026fb4a0b7 --- /dev/null +++ b/pkgs/development/ocaml-modules/simple-diff/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, topkg, ocamlbuild, re }: + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-simple-diff"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "gjaldon"; + repo = "simple_diff"; + rev = "v${version}"; + sha256 = "sha256-OaKECUBCCt9KfdRJf3HcXTUJVxKKdYtnzOHpMPOllrk="; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + propagatedBuildInputs = [ re ]; + + strictDeps = true; + + inherit (topkg) buildPhase installPhase; + + meta = with lib; { + homepage = "https://github.com/gjaldon/simple_diff"; + description = "Simple_diff is a pure OCaml diffing algorithm"; + license = licenses.isc; + maintainers = with maintainers; [ ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index f20a6cff0a892..cfd03493d3afd 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -3,12 +3,12 @@ buildDunePackage rec { pname = "sqlite3"; version = "5.1.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; + hash = "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 7730a5a62bae9..7eca606f93fce 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -24,7 +24,7 @@ buildDunePackage rec { propagatedBuildInputs = [ openssl ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; preCheck = '' mkdir -p _build/default/tests/ cp tests/digicert_certificate.pem _build/default/tests/ diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index b8dcc81bfe7ee..33e93967e192e 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -12,8 +12,6 @@ buildDunePackage rec { sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; }; - strictDeps = true; - # Otherwise ./configure script will run and create files conflicting with dune. dontConfigure = true; diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 5abcdc3dcfa2a..cec0ec8183002 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { ''; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ qcheck ]; + checkInputs = [ qcheck ]; meta = { description = "Various signed and unsigned integers for OCaml"; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 95b01e5d8fed7..3d440cf48959e 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -14,7 +14,7 @@ buildDunePackage { sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv"; }; - nativeCheckInputs = [ ounit qtest ]; + checkInputs = [ ounit qtest ]; inherit doCheck; meta = { diff --git a/pkgs/development/ocaml-modules/syslog-message/default.nix b/pkgs/development/ocaml-modules/syslog-message/default.nix index 4e5ab303f5c57..2c12415cdbb2e 100644 --- a/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ + checkInputs = [ qcheck ]; diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index a388bea4e8676..0cd57ba9c8ff7 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -23,12 +23,12 @@ buildDunePackage rec { }; nativeBuildInputs = [ - bisect_ppx - ppx_cstruct pkg-config ]; propagatedBuildInputs = [ + bisect_ppx + ppx_cstruct rresult cstruct cstruct-lwt @@ -58,7 +58,7 @@ buildDunePackage rec { ]; doCheck = false; - nativeCheckInputs = [ + checkInputs = [ alcotest mirage-flow mirage-vnetif diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix index fa18ce2271552..e97fb223e4151 100644 --- a/pkgs/development/ocaml-modules/terminal/default.nix +++ b/pkgs/development/ocaml-modules/terminal/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ stdlib-shims uutf uucp ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - nativeCheckInputs = [ alcotest fmt ]; + checkInputs = [ alcotest fmt ]; meta = with lib; { description = "Basic utilities for interacting with terminals"; diff --git a/pkgs/development/ocaml-modules/terminal_size/default.nix b/pkgs/development/ocaml-modules/terminal_size/default.nix index 564b69505d7cd..fa6bd003eaec6 100644 --- a/pkgs/development/ocaml-modules/terminal_size/default.nix +++ b/pkgs/development/ocaml-modules/terminal_size/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7"; }; - nativeCheckInputs = [ alcotest ]; + checkInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { 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 03c2ecca40523..47f9253e44734 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 ]; - nativeCheckInputs = [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/plompiler.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix index 3eed3652e5f57..0f618f0d1e6b4 100644 --- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix +++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix @@ -30,7 +30,7 @@ buildDunePackage rec { mec ]; - nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ]; + checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; doCheck = false; # circular deps 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 c602e8a3b0e2e..f9b78e11d3329 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 { @@ -25,7 +25,7 @@ buildDunePackage rec { tezos-plompiler ]; - nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ]; + checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; doCheck = false; # broken diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index a0c22b5026b49..b68edba2728e8 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ alcotest cstruct-unix ounit2 diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 10104228c8391..a62cd9152ae6b 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/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index dddbf8a790d57..e46374ee1c277 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -17,15 +17,16 @@ buildDunePackage rec { pname = "torch"; - version = "0.15"; + version = "0.17"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "sha256-EXJqlAGa0LwQKY8IlmcoJs0l2eRTiUhuzMHfakrslXU="; + hash = "sha256-z/9NUBjeFWE63Z/e8OyzDiy8hrn6qzjaiBH8G9MPeos="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index db107003df04d..354a8ca2098a9 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}" @@ -18,9 +19,12 @@ stdenv.mkDerivation { 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 11ee8eb6b5eb6..efb86d8624765 100644 --- a/pkgs/development/ocaml-modules/uecc/default.nix +++ b/pkgs/development/ocaml-modules/uecc/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { bigstring ]; - nativeCheckInputs = [ + checkInputs = [ alcotest cstruct hex diff --git a/pkgs/development/ocaml-modules/unstrctrd/default.nix b/pkgs/development/ocaml-modules/unstrctrd/default.nix index b3cb4933b9174..104cabfd0fae2 100644 --- a/pkgs/development/ocaml-modules/unstrctrd/default.nix +++ b/pkgs/development/ocaml-modules/unstrctrd/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { uutf ]; - nativeCheckInputs = [ + checkInputs = [ alcotest bigstringaf crowbar diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index fa659699cb705..f669a98c4defc 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ angstrom stringext ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix index 9cb66139fb8eb..ba970b1d6c51e 100644 --- a/pkgs/development/ocaml-modules/uri/sexp.nix +++ b/pkgs/development/ocaml-modules/uri/sexp.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "uri-sexp"; inherit (uri) version useDune2 src meta; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; } diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index cfadc9e5fb379..476a4529f3fe9 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ${topkg.run} test runHook postCheck ''; - nativeCheckInputs = [ uucd ]; + checkInputs = [ uucd ]; meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 0ead92d9c54b6..bece082f6418f 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 8f4b4eadaed18..ed38329ae22b6 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -25,11 +25,11 @@ buildDunePackage rec { buildInputs = [ angstrom ]; - strictDeps = !doCheck; - - nativeCheckInputs = [ re ]; + checkInputs = [ re ]; doCheck = true; + duneVersion = "3"; + meta = { description = "A library to normalize an ISO-8859 input to Unicode code-point"; homepage = "https://github.com/mirage/uuuu"; diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index 703743250864a..872d11606ff67 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 @@ -31,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - nativeCheckInputs = [ + checkInputs = [ cmdliner ounit ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 94ebc1b8d8170..410e356be797d 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/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 95c0c4a9dc42b..f7ade2ec80703 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -33,7 +33,7 @@ buildDunePackage rec { xmlm ]; - nativeCheckInputs = [ + checkInputs = [ alcotest-lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index c6335ba8a939d..9f8749cac9fd3 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp dispatch ptime ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 91a478df8844f..bd7a7a0fa47c6 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -10,12 +10,14 @@ 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="; }; - nativeCheckInputs = [ alcotest cstruct-unix ]; + checkInputs = [ alcotest cstruct-unix ]; propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix index 8d3810fa7e9e6..52543175e07cc 100644 --- a/pkgs/development/ocaml-modules/xdg/default.nix +++ b/pkgs/development/ocaml-modules/xdg/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { inherit (dune_3) src version; duneVersion = "3"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index a60341f569cef..a3f4e0abcdef5 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -13,11 +13,11 @@ buildDunePackage rec { hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; }; - nativeBuildInputs = [ ppx_cstruct ]; + buildInputs = [ ppx_cstruct ]; propagatedBuildInputs = [ cstruct lwt ]; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; meta = with lib; { description = "Xenstore protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index f91eb0b5b5cd0..5ebaadf214fb6 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -1,35 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, gitUpdater }: +{ lib +, buildDunePackage +, fetchurl +}: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "xml-light is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "xml-light"; + version = "2.5"; -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-xml-light"; - version = "2.4"; + duneVersion = "3"; + minimalOCamlVersion = "4.03"; - src = fetchFromGitHub { - owner = "ncannasse"; - repo = "xml-light"; - rev = version; - sha256 = "sha256-2txmkl/ZN5RGaLQJmr+orqwB4CbFk2RpLJd4gr7kPiE="; + src = fetchurl { + url = "https://github.com/ncannasse/xml-light/releases/download/${version}/xml-light-${version}.tbz"; + hash = "sha256-9YwrPbcK0boICw0wauMvgsy7ldq7ksWZzcRn0eROAD0="; }; - nativeBuildInputs = [ ocaml findlib ]; - - strictDeps = true; - - createFindlibDestdir = true; - - installPhase = '' - runHook preInstall - make install_ocamlfind - mkdir -p $out/share - cp -vai doc $out/share/ - runHook postInstall - ''; - - passthru.updateScript = gitUpdater { }; - meta = { description = "Minimal Xml parser and printer for OCaml"; longDescription = '' @@ -42,6 +27,5 @@ stdenv.mkDerivation rec { homepage = "http://tech.motion-twin.com/xmllight.html"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.romildo ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index 401b7ce1dcf4d..61a5a326395d6 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; - nativeCheckInputs = [ 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 44f64361540e6..c0582fa2a2246 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; - nativeCheckInputs = [ gcc + ]; + checkInputs = [ alcotest fmt uutf diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix index e156e8cbb3314..5a78809d9099f 100644 --- a/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ qcheck-alcotest ]; + checkInputs = [ qcheck-alcotest ]; meta = { description = "Name pattern combinators"; diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 2fc4b3c3b4305..8005322cff731 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -1,14 +1,22 @@ -{ lib, buildPerlPackage, fetchFromGitHub, makeWrapper, openssh, GitRepository, URI, XMLMini }: +{ lib +, buildPerlPackage +, fetchFromGitHub +, makeWrapper +, openssh +, GitRepository +, URI +, XMLMini +}: buildPerlPackage { pname = "ham-unstable"; - version = "2020-09-09"; + version = "2022-10-26"; src = fetchFromGitHub { owner = "kernkonzept"; repo = "ham"; - rev = "ae2a326f2efcdae0fa7c5bf0ba205b580fc91ecc"; - sha256 = "0m65pav2830y0ivwsy60dc4w457qlc0nqg43lji1kj2g96hmy2bw"; + rev = "f2f10516177d00a79fe81701351632df2544ba4e"; + hash = "sha256-cxlZh1x8ycpZIwSeOwqB6BtwYaMoWtSPaeiyW41epdk="; }; outputs = [ "out" ]; @@ -32,12 +40,12 @@ buildPerlPackage { doCheck = false; - meta = { + meta = with lib; { description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories"; homepage = "https://github.com/kernkonzept/ham"; - license = "unknown"; # should be gpl2, but not quite sure - maintainers = with lib.maintainers; [ aw ]; + license = licenses.bsd2; + maintainers = with maintainers; [ aw ]; mainProgram = "ham"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index d33362d4a1708..806ad65b737b9 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -11,7 +11,7 @@ buildPerlPackage rec { pname = "strip-nondeterminism"; - version = "1.13.0"; + version = "1.13.1"; outputs = [ "out" "dev" ]; # no "devdoc" @@ -20,7 +20,7 @@ buildPerlPackage rec { repo = "strip-nondeterminism"; domain = "salsa.debian.org"; rev = version; - sha256 = "sha256-KZQeoJYBPJzUvz4wlUZbiGODbpCp7/52dsg5OemKDkI="; + sha256 = "czx9UhdgTsQSfDNo1mMOXCM/3/nuNe+cPZeyy2xdnKs="; }; strictDeps = true; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index 6e00aa5f789ef..12de7e84dbcd3 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: CMakeFiles/pharo.dir/build/pharo-vm-2016.02.18/src/vm/gcc3x-cointerp.c.o:(.bss+0x88): multiple definition of # `sendTrace'; CMakeFiles/pharo.dir/build/pharo-vm-2016.02.18/src/vm/cogit.c.o:(.bss+0x84): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' mkdir -p "$prefix/lib/$name" diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 1331df3b7d60a..fe61061ca6e4c 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: vm/vm.a(cogit.o):/build/source/spur64src/vm/cointerp.h:358: multiple definition of `checkAllocFiller'; # vm/vm.a(gcc3x-cointerp.o):/build/source/spur64src/vm/cointerp.h:358: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; CFLAGS = "-DPharoVM -DIMMUTABILITY=1 -msse2 -D_GNU_SOURCE -DCOGMTVM=0 -g -O2 -DNDEBUG -DDEBUGVM=0"; LDFLAGS = "-Wl,-z,now"; diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index b2d319d7f4042..c7c2d9fc323e5 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,11 +1,11 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: -mkDerivation rec { +mkDerivation (finalAttrs: { pname = "grumphp"; version = "1.15.0"; src = fetchurl { - url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; + url = "https://github.com/phpro/grumphp/releases/download/v${finalAttrs.version}/grumphp.phar"; sha256 = "sha256-EqzJb7DYZb7PnebErLVI/EZLxj0m26cniZlsu1feif0="; }; @@ -16,17 +16,17 @@ mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/bin - install -D $src $out/libexec/${pname}/grumphp.phar + install -D $src $out/libexec/grumphp/grumphp.phar makeWrapper ${php}/bin/php $out/bin/grumphp \ - --add-flags "$out/libexec/${pname}/grumphp.phar" + --add-flags "$out/libexec/grumphp/grumphp.phar" runHook postInstall ''; meta = with lib; { - changelog = "https://github.com/phpro/grumphp/releases/tag/v${version}"; + changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; license = licenses.mit; maintainers = teams.php.members; }; -} +}) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 00aef53cc1b29..5366fb078678c 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.32"; + version = "0.29.33"; src = fetchPypi { pname = "Cython"; inherit version; - hash = "sha256-hzPPR1i3kwTypOOev6xekjQbzke8zrJsElQ5iy+MGvc="; + hash = "sha256-UEB2TEpNLOlko5XaJPDRrlgUSZXauSxrlvRMP01yKGo="; }; nativeBuildInputs = [ @@ -46,11 +46,7 @@ in buildPythonPackage rec { # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. # it does not affect Python code unless the code explicitly uses the feature. # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) - (fetchpatch { - name = "trashcan.patch"; - url = "https://github.com/cython/cython/commit/f781880b6780117660b2026caadf4a6d7905722f.patch"; - sha256 = "sha256-SnjaJdBZxm3O5gJ5Dxut6+eeVtZv+ygUUNwAwgoiFxg="; - }) + ./trashcan.patch # The above commit introduces custom trashcan macros, as well as # compiler changes to use them in Cython-emitted code. The latter # change is still useful, but the former has been upstreamed as of @@ -79,6 +75,7 @@ in buildPythonPackage rec { # doCheck = !stdenv.isDarwin; meta = { + changelog = "https://github.com/cython/cython/blob/${version}/CHANGES.rst"; description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; homepage = "https://cython.org"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/Cython/trashcan.patch b/pkgs/development/python-modules/Cython/trashcan.patch new file mode 100644 index 0000000000000..398422e76f395 --- /dev/null +++ b/pkgs/development/python-modules/Cython/trashcan.patch @@ -0,0 +1,354 @@ +From 1b77e35d848340f2c5f4c9b82965c25a0572d48f Mon Sep 17 00:00:00 2001 +From: Jeroen Demeyer <J.Demeyer@UGent.be> +Date: Thu, 14 Feb 2019 10:02:41 +0100 +Subject: [PATCH] @cython.trashcan directive to enable the Python trashcan for + deallocations + +--- + Cython/Compiler/ModuleNode.py | 10 +++ + Cython/Compiler/Options.py | 2 + + Cython/Compiler/PyrexTypes.py | 8 +- + Cython/Compiler/Symtab.py | 18 +++- + Cython/Utility/ExtensionTypes.c | 43 ++++++++++ + tests/run/trashcan.pyx | 148 ++++++++++++++++++++++++++++++++ + 6 files changed, 227 insertions(+), 2 deletions(-) + create mode 100644 tests/run/trashcan.pyx + +diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py +index 56845330d..3a3e8a956 100644 +--- a/Cython/Compiler/ModuleNode.py ++++ b/Cython/Compiler/ModuleNode.py +@@ -1443,6 +1443,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): + + is_final_type = scope.parent_type.is_final_type + needs_gc = scope.needs_gc() ++ needs_trashcan = scope.needs_trashcan() + + weakref_slot = scope.lookup_here("__weakref__") if not scope.is_closure_class_scope else None + if weakref_slot not in scope.var_entries: +@@ -1481,6 +1482,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): + # running this destructor. + code.putln("PyObject_GC_UnTrack(o);") + ++ if needs_trashcan: ++ code.globalstate.use_utility_code( ++ UtilityCode.load_cached("PyTrashcan", "ExtensionTypes.c")) ++ code.putln("__Pyx_TRASHCAN_BEGIN(o, %s)" % slot_func_cname) ++ + # call the user's __dealloc__ + self.generate_usr_dealloc_call(scope, code) + +@@ -1554,6 +1560,10 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): + code.putln("(*Py_TYPE(o)->tp_free)(o);") + if freelist_size: + code.putln("}") ++ ++ if needs_trashcan: ++ code.putln("__Pyx_TRASHCAN_END") ++ + code.putln( + "}") + +diff --git a/Cython/Compiler/Options.py b/Cython/Compiler/Options.py +index d03119fca..05a728135 100644 +--- a/Cython/Compiler/Options.py ++++ b/Cython/Compiler/Options.py +@@ -319,6 +319,7 @@ directive_types = { + 'freelist': int, + 'c_string_type': one_of('bytes', 'bytearray', 'str', 'unicode'), + 'c_string_encoding': normalise_encoding_name, ++ 'trashcan': bool, + 'cpow': bool + } + +@@ -362,6 +363,7 @@ directive_scopes = { # defaults to available everywhere + 'np_pythran': ('module',), + 'fast_gil': ('module',), + 'iterable_coroutine': ('module', 'function'), ++ 'trashcan' : ('cclass',), + } + + +diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py +index c309bd04b..9231130b5 100644 +--- a/Cython/Compiler/PyrexTypes.py ++++ b/Cython/Compiler/PyrexTypes.py +@@ -1129,6 +1129,7 @@ class PyObjectType(PyrexType): + is_extern = False + is_subclassed = False + is_gc_simple = False ++ builtin_trashcan = False # builtin type using trashcan + + def __str__(self): + return "Python object" +@@ -1183,10 +1184,14 @@ class PyObjectType(PyrexType): + + + builtin_types_that_cannot_create_refcycles = set([ +- 'bool', 'int', 'long', 'float', 'complex', ++ 'object', 'bool', 'int', 'long', 'float', 'complex', + 'bytearray', 'bytes', 'unicode', 'str', 'basestring' + ]) + ++builtin_types_with_trashcan = set([ ++ 'dict', 'list', 'set', 'frozenset', 'tuple', 'type', ++]) ++ + + class BuiltinObjectType(PyObjectType): + # objstruct_cname string Name of PyObject struct +@@ -1211,6 +1216,7 @@ class BuiltinObjectType(PyObjectType): + self.typeptr_cname = "(&%s)" % cname + self.objstruct_cname = objstruct_cname + self.is_gc_simple = name in builtin_types_that_cannot_create_refcycles ++ self.builtin_trashcan = name in builtin_types_with_trashcan + if name == 'type': + # Special case the type type, as many C API calls (and other + # libraries) actually expect a PyTypeObject* for type arguments. +diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py +index 7361a55ae..f0c311ba6 100644 +--- a/Cython/Compiler/Symtab.py ++++ b/Cython/Compiler/Symtab.py +@@ -2043,7 +2043,7 @@ class PyClassScope(ClassScope): + class CClassScope(ClassScope): + # Namespace of an extension type. + # +- # parent_type CClassType ++ # parent_type PyExtensionType + # #typeobj_cname string or None + # #objstruct_cname string + # method_table_cname string +@@ -2087,6 +2087,22 @@ class CClassScope(ClassScope): + return not self.parent_type.is_gc_simple + return False + ++ def needs_trashcan(self): ++ # If the trashcan directive is explicitly set to False, ++ # unconditionally disable the trashcan. ++ directive = self.directives.get('trashcan') ++ if directive is False: ++ return False ++ # If the directive is set to True and the class has Python-valued ++ # C attributes, then it should use the trashcan in tp_dealloc. ++ if directive and self.has_cyclic_pyobject_attrs: ++ return True ++ # Use the trashcan if the base class uses it ++ base_type = self.parent_type.base_type ++ if base_type and base_type.scope is not None: ++ return base_type.scope.needs_trashcan() ++ return self.parent_type.builtin_trashcan ++ + def needs_tp_clear(self): + """ + Do we need to generate an implementation for the tp_clear slot? Can +diff --git a/Cython/Utility/ExtensionTypes.c b/Cython/Utility/ExtensionTypes.c +index dc187ab49..f359165df 100644 +--- a/Cython/Utility/ExtensionTypes.c ++++ b/Cython/Utility/ExtensionTypes.c +@@ -119,6 +119,49 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) { + return r; + } + ++/////////////// PyTrashcan.proto /////////////// ++ ++// These macros are taken from https://github.com/python/cpython/pull/11841 ++// Unlike the Py_TRASHCAN_SAFE_BEGIN/Py_TRASHCAN_SAFE_END macros, they ++// allow dealing correctly with subclasses. ++ ++// This requires CPython version >= 2.7.4 ++// (or >= 3.2.4 but we don't support such old Python 3 versions anyway) ++#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x02070400 ++#define __Pyx_TRASHCAN_BEGIN_CONDITION(op, cond) \ ++ do { \ ++ PyThreadState *_tstate = NULL; \ ++ // If "cond" is false, then _tstate remains NULL and the deallocator ++ // is run normally without involving the trashcan ++ if (cond) { \ ++ _tstate = PyThreadState_GET(); \ ++ if (_tstate->trash_delete_nesting >= PyTrash_UNWIND_LEVEL) { \ ++ // Store the object (to be deallocated later) and jump past ++ // Py_TRASHCAN_END, skipping the body of the deallocator ++ _PyTrash_thread_deposit_object((PyObject*)(op)); \ ++ break; \ ++ } \ ++ ++_tstate->trash_delete_nesting; \ ++ } ++ // The body of the deallocator is here. ++#define __Pyx_TRASHCAN_END \ ++ if (_tstate) { \ ++ --_tstate->trash_delete_nesting; \ ++ if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \ ++ _PyTrash_thread_destroy_chain(); \ ++ } \ ++ } while (0); ++ ++#define __Pyx_TRASHCAN_BEGIN(op, dealloc) __Pyx_TRASHCAN_BEGIN_CONDITION(op, \ ++ Py_TYPE(op)->tp_dealloc == (destructor)(dealloc)) ++ ++#else ++// The trashcan is a no-op on other Python implementations ++// or old CPython versions ++#define __Pyx_TRASHCAN_BEGIN(op, dealloc) ++#define __Pyx_TRASHCAN_END ++#endif ++ + /////////////// CallNextTpDealloc.proto /////////////// + + static void __Pyx_call_next_tp_dealloc(PyObject* obj, destructor current_tp_dealloc); +diff --git a/tests/run/trashcan.pyx b/tests/run/trashcan.pyx +new file mode 100644 +index 000000000..93a501ff8 +--- /dev/null ++++ b/tests/run/trashcan.pyx +@@ -0,0 +1,148 @@ ++# mode: run ++ ++cimport cython ++ ++ ++# Count number of times an object was deallocated twice. This should remain 0. ++cdef int double_deallocations = 0 ++def assert_no_double_deallocations(): ++ global double_deallocations ++ err = double_deallocations ++ double_deallocations = 0 ++ assert not err ++ ++ ++# Compute x = f(f(f(...(None)...))) nested n times and throw away the result. ++# The real test happens when exiting this function: then a big recursive ++# deallocation of x happens. We are testing two things in the tests below: ++# that Python does not crash and that no double deallocation happens. ++# See also https://github.com/python/cpython/pull/11841 ++def recursion_test(f, int n=2**20): ++ x = None ++ cdef int i ++ for i in range(n): ++ x = f(x) ++ ++ ++@cython.trashcan(True) ++cdef class Recurse: ++ """ ++ >>> recursion_test(Recurse) ++ >>> assert_no_double_deallocations() ++ """ ++ cdef public attr ++ cdef int deallocated ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ # Check that we're not being deallocated twice ++ global double_deallocations ++ double_deallocations += self.deallocated ++ self.deallocated = 1 ++ ++ ++cdef class RecurseSub(Recurse): ++ """ ++ >>> recursion_test(RecurseSub) ++ >>> assert_no_double_deallocations() ++ """ ++ cdef int subdeallocated ++ ++ def __dealloc__(self): ++ # Check that we're not being deallocated twice ++ global double_deallocations ++ double_deallocations += self.subdeallocated ++ self.subdeallocated = 1 ++ ++ ++@cython.freelist(4) ++@cython.trashcan(True) ++cdef class RecurseFreelist: ++ """ ++ >>> recursion_test(RecurseFreelist) ++ >>> recursion_test(RecurseFreelist, 1000) ++ >>> assert_no_double_deallocations() ++ """ ++ cdef public attr ++ cdef int deallocated ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ # Check that we're not being deallocated twice ++ global double_deallocations ++ double_deallocations += self.deallocated ++ self.deallocated = 1 ++ ++ ++# Subclass of list => uses trashcan by default ++# As long as https://github.com/python/cpython/pull/11841 is not fixed, ++# this does lead to double deallocations, so we skip that check. ++cdef class RecurseList(list): ++ """ ++ >>> RecurseList(42) ++ [42] ++ >>> recursion_test(RecurseList) ++ """ ++ def __init__(self, x): ++ super().__init__((x,)) ++ ++ ++# Some tests where the trashcan is NOT used. When the trashcan is not used ++# in a big recursive deallocation, the __dealloc__s of the base classs are ++# only run after the __dealloc__s of the subclasses. ++# We use this to detect trashcan usage. ++cdef int base_deallocated = 0 ++cdef int trashcan_used = 0 ++def assert_no_trashcan_used(): ++ global base_deallocated, trashcan_used ++ err = trashcan_used ++ trashcan_used = base_deallocated = 0 ++ assert not err ++ ++ ++cdef class Base: ++ def __dealloc__(self): ++ global base_deallocated ++ base_deallocated = 1 ++ ++ ++# Trashcan disabled by default ++cdef class Sub1(Base): ++ """ ++ >>> recursion_test(Sub1, 100) ++ >>> assert_no_trashcan_used() ++ """ ++ cdef public attr ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ global base_deallocated, trashcan_used ++ trashcan_used += base_deallocated ++ ++ ++@cython.trashcan(True) ++cdef class Middle(Base): ++ cdef public foo ++ ++ ++# Trashcan disabled explicitly ++@cython.trashcan(False) ++cdef class Sub2(Middle): ++ """ ++ >>> recursion_test(Sub2, 1000) ++ >>> assert_no_trashcan_used() ++ """ ++ cdef public attr ++ ++ def __init__(self, x): ++ self.attr = x ++ ++ def __dealloc__(self): ++ global base_deallocated, trashcan_used ++ trashcan_used += base_deallocated +-- +2.39.0 + diff --git a/pkgs/development/python-modules/abodepy/default.nix b/pkgs/development/python-modules/abodepy/default.nix deleted file mode 100644 index 42a6d8be2d2f6..0000000000000 --- 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 ]; - nativeCheckInputs = [ 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/accessible-pygments/default.nix b/pkgs/development/python-modules/accessible-pygments/default.nix new file mode 100644 index 0000000000000..0b5c39117cc7c --- /dev/null +++ b/pkgs/development/python-modules/accessible-pygments/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pygments +}: + +buildPythonPackage rec { + pname = "accessible-pygments"; + version = "0.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CRe1B2RqazOT60kJGmJQb2sqOTX12V5NEkncUF+KTq4="; + }; + + propagatedBuildInputs = [ + pygments + ]; + + # Tests only execute pygments with these styles + doCheck = false; + + pythonImportsCheck = [ + "a11y_pygments" + "a11y_pygments.utils" + ]; + + meta = with lib; { + description = "A collection of accessible pygments styles"; + homepage = "https://github.com/Quansight-Labs/accessible-pygments"; + changelog = "https://github.com/Quansight-Labs/accessible-pygments/raw/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index b1b13bf581d11..c3b32bbc5deef 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.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; - rev = version; - hash = "sha256-S7EZZxNcoLcZyyRNGlZj6nGoCAlqCxNdh3azIVKvOTM="; + rev = "refs/tags/${version}"; + hash = "sha256-VkO+XLIC/UQzvfLsgbKcx9i8OxTC6J32nkxPHWWn7m8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to quickly gather forensic artifacts from disk images or a live system"; homepage = "https://github.com/fox-it/acquire"; + changelog = "https://github.com/fox-it/acquire/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 01eeba71fa0a0..147e5805b8061 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.39.0"; - format = "setuptools"; + version = "3.40.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-l5upg3Jux+HHtiYM95+5qL05kzmVHrzPYrqIejbaVZY="; + hash = "sha256-phG9DEl4JlrIN3zil0SQRZ+DnktpunK094nxVQ9Cksw="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix index d3712ba46c245..6d32b95305230 100644 --- a/pkgs/development/python-modules/adafruit-pureio/default.nix +++ b/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -1,28 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools-scm }: buildPythonPackage rec { - pname = "Adafruit-PureIO"; - version = "1.1.9"; + pname = "adafruit-pureio"; + version = "1.1.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit_PureIO"; inherit version; - sha256 = "0yd8hw676s7plq75gac4z0ilfcfydjkk3wv76bc73xy70zxj5brc"; + hash = "sha256-EgaIN1PAlmMJ5tAtqXBnbpvHtQO7Sib3NuAXOfVqZLk="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; # Physical SMBus is not present doCheck = false; - pythonImportsCheck = [ "Adafruit_PureIO" ]; + + pythonImportsCheck = [ + "Adafruit_PureIO" + ]; meta = with lib; { description = "Python interface to Linux IO including I2C and SPI"; homepage = "https://github.com/adafruit/Adafruit_Python_PureIO"; + changelog = "https://github.com/adafruit/Adafruit_Python_PureIO/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 02ca5197c6d0c..7dfe54fddbc49 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildPythonPackage , rustPlatform , pkg-config @@ -29,6 +30,15 @@ buildPythonPackage rec { hash = "sha256-5g5xdUzH/RTVwu4Vfb5Cb1t0ruG0EXgiXjrogD/+JCU="; }; + patches = [ + # https://github.com/ArniDagur/python-adblock/pull/91 + (fetchpatch { + name = "pep-621-compat.patch"; + url = "https://github.com/ArniDagur/python-adblock/commit/2a8716e0723b60390f0aefd0e05f40ba598ac73f.patch"; + hash = "sha256-n9+LDs0no66OdNZxw3aU57ngWrAbmm6hx4qIuxXoatM="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index fd4fb79a59990..3aa50cc101f03 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.7.3.1"; + version = "0.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; repo = pname; - rev = version; - sha256 = "1a6hizx1cnplj0irn8idgda2lacsb61dw464cwx798pjr1gd401n"; + rev = "refs/tags/${version}"; + sha256 = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index bdf8332760676..53c09cfa019f7 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.11.2"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S6dJK5ZhDCSwM/14sTrXNJ/+dDe9OeDRemsnuoe4IW0="; + hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 9c344f720aec4..8789bd0fa1939 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 04610db42ece4..bc3bdc2fd5830 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="; }; 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/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index cb9db9a886fa2..63a9987994c90 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aesedb"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TetXhDrWG6MECm/nhsZDUwcOJwP5drFO+YLarGC2pak="; + hash = "sha256-pnbzPVXr3qgBH7t5wNR+jbTdQGMdnLpV+xfgQjdc+7A="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parser for JET databases"; homepage = "https://github.com/skelsec/aesedb"; + changelog = "https://github.com/skelsec/aesedb/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index ca43befd033b9..5c6cf00cd232b 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ 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 ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 47fe8d1bad778..17e9afe40409a 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.34"; + version = "9.2.40"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-qFnr+HzDqzhub9MKHjmpbEI3CGMuUkpwX763ykoP9No="; + hash = "sha256-Ykm9LuhICsnJemcAMlS0ohZM7x1ndCjF6etX9ip2IsA="; }; nativeBuildInputs = [ 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 534e8441e77a6..56e5f8475cbc4 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , aio-geojson-client , fetchFromGitHub @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.1"; + version = "0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; rev = "refs/tags/v${version}"; - hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; + hash = "sha256-toDvliFMxicaEhlxb7wCadDJErpsIPcZbJz7TpO83GE="; }; propagatedBuildInputs = [ @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; 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 04ffcf6b384df..1cb1125839354 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/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-usgs-earthquakes"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; rev = "refs/tags/v${version}"; - hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; + hash = "sha256-ET8wcOep4tSZJXyL+XvfW2j9eKp6LrBk/g18ZlgLIzc="; }; propagatedBuildInputs = [ @@ -32,10 +31,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ aresponses - asynctest pytest-asyncio - pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 5ceaa8cb4391d..6fb1ec42631bc 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 = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { 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 2abe7899499bf..3816b591544da 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 = [ @@ -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 0000000000000..ff0a25d265948 --- /dev/null +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -0,0 +1,73 @@ +{ lib +, aiomisc +, aiormq +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, setuptools +, shortuuid +, typing-extensions +, yarl +}: + +buildPythonPackage rec { + pname = "aio-pika"; + version = "9.0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-dY4uSkiAZz8kjeqt0QwehogljBrxqhVI9LmRE/I8HKA="; + }; + + nativeBuildInputs = [ + setuptools + poetry-core + ]; + + propagatedBuildInputs = [ + aiormq + yarl + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + aiomisc + shortuuid + ]; + + disabledTestPaths = [ + # Tests attempt to connect to a RabbitMQ server + "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"; + changelog = "https://github.com/mosquito/aio-pika/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 56b1678c033b0..42f8f3fb7bf30 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.53"; + version = "0.1.56"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-aU15T3H98un+ImE0KYbJpYop7mvBtBPSFAEqiTZzigQ="; + hash = "sha256-YLAIT33ItaNgokwensOan/OO2lK01GO/u5AZwzvuoPo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 4d5c652db9be9..b7fbf9af5dd21 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , poetry-core @@ -19,19 +18,19 @@ buildPythonPackage rec { version = "2022.10.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; + rev = "refs/tags/${version}"; + hash = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; }; postPatch = '' # https://github.com/bachya/aioambient/pull/97 substituteInPlace pyproject.toml \ - --replace 'websockets = ">=8.1,<10.0"' 'websockets = ">=8.1,<11.0"' + --replace 'websockets = ">=9.1,<11.0"' 'websockets = "*"' ''; nativeBuildInputs = [ @@ -47,7 +46,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook @@ -65,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the Ambient Weather API"; homepage = "https://github.com/bachya/aioambient"; + changelog = "https://github.com/bachya/aioambient/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54979dbd7ba4f..105ebc9188eaa 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -3,31 +3,43 @@ , buildPythonPackage , fetchFromGitHub , msgpack +, pythonOlder }: buildPythonPackage rec { pname = "aiocache"; - version = "0.11.1"; + version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + rev = "refs/tags/v${version}"; + hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; - propagatedBuildInputs = [ - aioredis - msgpack - ]; + passthru.optional-dependencies = { + redis = [ + aioredis + ]; + msgpack = [ + msgpack + ]; + }; # aiomcache would be required but last release was in 2017 doCheck = false; - pythonImportsCheck = [ "aiocache" ]; + + pythonImportsCheck = [ + "aiocache" + ]; meta = with lib; { description = "Python API Rate Limit Decorator"; - homepage = "https://github.com/tomasbasham/ratelimit"; + homepage = "https://github.com/aio-libs/aiocache"; + changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 23fab5398d636..b5d93fae31b2e 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.5.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PSXYXIWb2zTVC6kwMgkDovF+BVtEnqQh8NFPb96tFRY="; + sha256 = "sha256-tINfOGJz0v7zPh9ii7PlgzBBCXvEXif1jWLIi27FLYQ="; }; nativeCheckInputs = [ @@ -38,6 +38,8 @@ buildPythonPackage rec { --replace "--cov aioconsole --count 2" "" ''; + __darwinAllowLocalNetworking = true; + disabledTests = [ "test_interact_syntax_error" # Output and the sandbox don't work well together diff --git a/pkgs/development/python-modules/aiocurrencylayer/default.nix b/pkgs/development/python-modules/aiocurrencylayer/default.nix index 80144877e141f..39fb1deeb9b35 100644 --- a/pkgs/development/python-modules/aiocurrencylayer/default.nix +++ b/pkgs/development/python-modules/aiocurrencylayer/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "aiocurrencylayer"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = pname; - rev = version; - sha256 = "sha256-neWUld/XnF5xTHSrw5EfGfNhpYzZi5TZsWN4+eqsVXs="; + rev = "refs/tags/${version}"; + hash = "sha256-468OBQV7ISnPRUfi/CM3dCh1ez0jwSVnM6DduPvAgPI="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with currencylayer"; homepage = "https://github.com/home-assistant-ecosystem/aiocurrencylayer"; + changelog = "https://github.com/home-assistant-ecosystem/aiocurrencylayer/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix new file mode 100644 index 0000000000000..b6cc55d7fd84a --- /dev/null +++ b/pkgs/development/python-modules/aiodocker/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "aiodocker"; + # unstable includes support for python 3.10+ + version = "unstable-2022-01-20"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "f1dbdc3d42147f4c2ab5e6802acf6f7d0f885be4"; + sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # tests require docker daemon + doCheck = false; + pythonImportsCheck = [ "aiodocker" ]; + + meta = with lib; { + description = "Docker API client for asyncio"; + homepage = "https://github.com/aio-libs/aiodocker"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 9a024def5ee55..7d8bdd5d3a3b8 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 = "13.0.4"; + version = "13.4.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,14 +21,9 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pqCg4LAFIr5BEDqRWMaNc3M36bUmou5cZdarQ/0W77Y="; + hash = "sha256-J0nhHJQkmcAPpkNRfyFyhJun54J3g18js47dSS3pvas="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "protobuf>=3.12.2,<4.0" "protobuf>=3.12.2" - ''; - propagatedBuildInputs = [ noiseprotocol protobuf diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index a2c4eaf5ff8e1..5d79aaa1bc32c 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -1,9 +1,9 @@ { lib , aiomisc -, asynctest , caio , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder }: @@ -22,13 +22,20 @@ buildPythonPackage rec { hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; }; + patches = [ + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch"; + hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo="; + }) + ]; + propagatedBuildInputs = [ caio ]; nativeCheckInputs = [ aiomisc - asynctest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 099ea8664dc19..ba943865a444d 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.12.2"; + version = "23.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j7ikJS6lcqr7K4fU/EL43lFlWtGvPT4V9JC2Iqhi0ec="; + hash = "sha256-J6kcEVqADmVJZDbU9eqLCL0rohMSA/Ig7FSp/Ye5Sfk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index fcbe12a11db7d..83f6231629620 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -2,7 +2,6 @@ , aiohttp , async-timeout , asyncio-dgram -, asynctest , buildPythonPackage , docutils , fetchFromGitHub @@ -10,22 +9,24 @@ , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder , voluptuous }: buildPythonPackage rec { pname = "aioguardian"; version = "2022.10.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; + hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; }; - format = "pyproject"; - nativeBuildInputs = [ poetry-core ]; @@ -40,17 +41,11 @@ buildPythonPackage rec { nativeCheckInputs = [ asyncio-dgram - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = "<0.18"' 'docutils = "*"' - ''; - disabledTestPaths = [ "examples/" ]; @@ -62,10 +57,11 @@ buildPythonPackage rec { meta = with lib; { description = " Python library to interact with Elexa Guardian devices"; longDescription = '' - aioguardian is a Pytho3, asyncio-focused library for interacting with the + aioguardian is an asyncio-focused library for interacting with the Guardian line of water valves and sensors from Elexa. ''; homepage = "https://github.com/bachya/aioguardian"; + changelog = "https://github.com/bachya/aioguardian/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index e29f22ba3c991..c2c625b4f408e 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.4.4"; + version = "2.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a7i8xBlTM3DZDZBzLe/sbMR4CNx7XMxNQ6tiMI6MoTg="; + hash = "sha256-FqZYJoNaRISuZ5m5ZeeregPdBT4fh8NdcgzEho0ZWd0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 8e062db87e6de..6008b94179fb0 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.5"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fDul6sBgtpH05QU0ry15/KKnVxLr0rJeb8sSlYWfkQs="; + hash = "sha256-jRSbKlfZH3lLM6OU6lvGa1Z/OMdKWmqUd6/CRQ8QXAE="; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 2b912f9622e41..86cc7e308e9c0 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder # install_requires , attrs @@ -39,6 +40,14 @@ buildPythonPackage rec { sha256 = "3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269"; }; + patches = [ + (fetchpatch { + # https://github.com/aio-libs/aiohttp/pull/7178 + url = "https://github.com/aio-libs/aiohttp/commit/5718879cdb6a98bf48810a994b78bc02abaf3e07.patch"; + hash = "sha256-4UynkTZOzWzusQ2+MPZszhFA8I/PJNLeT/hHF/fASy8="; + }) + ]; + postPatch = '' sed -i '/--cov/d' setup.cfg diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 580a48212a324..f4248a27ddde2 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 = [ @@ -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/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 6cae53c1bce8f..4c5ea71919401 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.7"; + version = "0.8.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pqneX4O3BnDH7vT7RgFiEIMpLcoXOpBvKOYuMla3Iq4="; + hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix index dff6c28e530a4..1f0c21a208f9b 100644 --- a/pkgs/development/python-modules/aiolivisi/default.nix +++ b/pkgs/development/python-modules/aiolivisi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiolivisi"; - version = "0.0.14"; + version = "0.0.16"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-n7EQCOItr6MZRnTCfkJrq39bDbw09XyIRzSuZR2TsNg="; + hash = "sha256-L7KeTdC3IPbXBLDkP86CyQ59s2bL4byxgKhl8YCmZHQ="; }; postPatch = '' @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to communicate with LIVISI Smart Home Controller"; homepage = "https://github.com/StefanIacobLivisi/aiolivisi"; + changelog = "https://github.com/StefanIacobLivisi/aiolivisi/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index b3a65926d6e8c..ce000ddb0361a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "16.2.10"; + version = "16.3.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iQlbd1DoPgxq+Am0BTDYXIBZoC21/54+bywDtcCXlls="; + hash = "sha256-lHDjsK8ds1ftovY2IAbJwk3jnn4FoDo6f/Nu/MSAhqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index c44fb3ef78e9a..51c43d5cf96a3 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.6"; + version = "0.14.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = "refs/tags/${version}"; - hash = "sha256-eQBVenB/WIqksohWtCU/3o3TGWMavPjJahlg0yus4aE="; + hash = "sha256-6fHTZ5zFiXuyFtZj9cNH5ejLbzx/1cEBUy+fs+Q6O4Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioopenssl/default.nix b/pkgs/development/python-modules/aioopenssl/default.nix new file mode 100644 index 0000000000000..0ecbbc4e6a533 --- /dev/null +++ b/pkgs/development/python-modules/aioopenssl/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyopenssl +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioopenssl"; + version = "0.6.0"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "horazont"; + repo = "aioopenssl"; + rev = "refs/tags/v${version}"; + hash = "sha256-7Q+4/DlP+kUnC3YNk7woJaxLEEiuVmolUOajepM003Q="; + }; + + propagatedBuildInputs = [ + pyopenssl + ]; + + pythonImportsCheck = [ "aioopenssl" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "TLS-capable transport using OpenSSL for asyncio"; + homepage = "https://github.com/horazont/aioopenssl"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 84b9f9c7bcf08..0f44a49a3979b 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,18 +22,21 @@ 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 @@ -44,18 +46,9 @@ buildPythonPackage rec { 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/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index e0a2b51a75d96..d2ba97374014b 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.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8WfQTaa9BiMHDLxCZNqcFmi0ifEC2xgyN2cDBBtBDdI="; + hash = "sha256-Z7Q9b+ameddvGu9KJUNsaqOHiu0qXnpzuiZwg+/0+64="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix new file mode 100644 index 0000000000000..b8ec9619b1390 --- /dev/null +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pamqp +, yarl +, setuptools +, poetry-core +, aiomisc +}: + +buildPythonPackage rec { + pname = "aiormq"; + version = "6.7.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ujRw+trXOZaCRsZdkE3WoomOSdYoQkHmtlyFg1mp3Sg="; + }; + + 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"; + changelog = "https://github.com/mosquito/aiormq/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/development/python-modules/aioruuvigateway/default.nix b/pkgs/development/python-modules/aioruuvigateway/default.nix new file mode 100644 index 0000000000000..2ba4718af565c --- /dev/null +++ b/pkgs/development/python-modules/aioruuvigateway/default.nix @@ -0,0 +1,49 @@ +{ 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 + ]; + + pythonImportsCheck = [ + "aioruuvigateway" + ]; + + 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/aiosasl/default.nix b/pkgs/development/python-modules/aiosasl/default.nix new file mode 100644 index 0000000000000..d904802ff61a2 --- /dev/null +++ b/pkgs/development/python-modules/aiosasl/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pyopenssl +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiosasl"; + version = "0.5.0"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "horazont"; + repo = "aiosasl"; + rev = "refs/tags/v${version}"; + hash = "sha256-JIuNPb/l4QURMQc905H2iNGCfMz+zM/QJhDQOR8LPdc="; + }; + + patches = [ + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/horazont/aiosasl/commit/44c48d36b416bd635d970dba2607a31b2167ea1b.patch"; + hash = "sha256-u6PJKV54dU2MA9hXa/9hJ3eLVds1DuLHGbt8y/OakWs="; + }) + ]; + + nativeCheckInputs = [ + pyopenssl + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiosasl" ]; + + meta = { + description = "Asyncio SASL library"; + homepage = "https://github.com/horazont/aiosasl"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 00ae13cd91fae..01be603f2101d 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.3.0"; + version = "5.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tsjHs1v5Yth5XToznCdAWoe70Lhxqh6Mq/MHKSYYg14="; + hash = "sha256-a8zU3xHnYRmoiNiXlCUgrqgVINbhUWkPKGGsHkgHo4w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix new file mode 100644 index 0000000000000..6026db49d5873 --- /dev/null +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, prettytable +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiosomecomfort"; + version = "0.0.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkmer"; + repo = "AIOSomecomfort"; + rev = "refs/tags/${version}"; + hash = "sha256-w9rD/8fb9CoN9esHY0UEjIs98i9OGp+suiz6I5Uj3ok="; + }; + + 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"; + changelog = "https://github.com/mkmer/AIOSomecomfort/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 0bd275f294abf..9fb42cd93e108 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.1"; + version = "3.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw="; + hash = "sha256-17LTNQjI2UfgtlNNkSRSWMNnhgokBXn/7KGuKo5Ai4E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 67f1804d0614a..82fbb5a40aabb 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "43"; + version = "44"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qpFQdNlw6voqccoJwPsnmbU5DtAC6zwtouUeysZ8/0M="; + hash = "sha256-SRI7c0cmrNSTOEyRbs6JGEg5O9tws+Dwn0G8HUqWEqc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 59a2483d02eea..54c0f9132ef6f 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -1,20 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, prompt-toolkit , pythonOlder , winacl -, prompt-toolkit }: buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.7"; + version = "0.0.9"; + format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1p88q2b6slm1sw3234r40s9jd03fqlkcx8y3iwg6ihf0z4ww14d1"; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-FyrYqNqp0PTEHHit3Rn00jtvPOvgVy+lz3jDRJnsobI="; }; propagatedBuildInputs = [ @@ -25,11 +28,14 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; - pythonImportsCheck = [ "aiowinreg" ]; + pythonImportsCheck = [ + "aiowinreg" + ]; meta = with lib; { description = "Python module to parse the registry hive"; homepage = "https://github.com/skelsec/aiowinreg"; + changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix new file mode 100644 index 0000000000000..133d9ffc72687 --- /dev/null +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiosasl +, aioopenssl +, babel +, dnspython +, lxml +, multidict +, pyasn1 +, pyasn1-modules +, pyopenssl +, sortedcollections +, tzlocal +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioxmpp"; + version = "0.13.3"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "horazont"; + repo = "aioxmpp"; + rev = "refs/tags/v${version}"; + hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo="; + }; + + propagatedBuildInputs = [ + aiosasl + aioopenssl + babel + dnspython + lxml + multidict + pyasn1 + pyasn1-modules + pyopenssl + sortedcollections + tzlocal + ]; + + pythonImportsCheck = [ + "aioxmpp" + "aioxmpp.node" + "aioxmpp.security_layer" + "aioxmpp.stanza" + "aioxmpp.stream" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "benchmarks" + ]; + + meta = { + changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; + description = "Pure-python XMPP library for asyncio"; + homepage = "https://github.com/horazont/aioxmpp"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 6351fea9bd802..eda8e77e43b75 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Airthings BLE devices"; homepage = "https://github.com/vincegio/airthings-ble"; + changelog = "https://github.com/vincegio/airthings-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/airtouch4pyapi/default.nix b/pkgs/development/python-modules/airtouch4pyapi/default.nix index 1c567181f9b48..de19c59653644 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/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix index ca6c6cca96326..3ca8016cd7657 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/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 9ea861aa68185..aa4edc45fc27d 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.8.0"; + version = "3.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UOakkvWyWT50lVazEivF5TtAR/E3JpKdT6KNb7YJDBs="; + hash = "sha256-LsB3u35PLI/3PcuNbdgcxRoEFZ5CpyINEJa4Nw64NPA="; }; propagatedBuildInputs = [ 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 bd693ead16c7e..0635b941c939b 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.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WQyYgjEe2oxNXBcHMhFXJ++XlIWf/rtJylvb6exwg7k="; + hash = "sha256-R3ov7EssN9kcf8SA8juPu9+TEptzo9Vkb8YwzwFlMQ4="; }; propagatedBuildInputs = [ 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 6a5802c388f99..06c56116de4e6 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.49.0"; + version = "8.50.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-POrDx4xXCIOBU4hvXu03XcZI2F6xHsjHNJRBaGFC8U8="; + hash = "sha256-tFI6iPvKWp69PKvkBrMQrkMZD03VHhLIIDy0VI5XLEA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 55925b8e0a923..63ee77d22163e 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 = [ diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 0cb078f0f7ecd..3e7aae7f3daac 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}"; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 64da0be72e25a..e3ace1940ed6d 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.34"; + version = "9.2.40"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ar74eYEUinHmAosec7r5C9Rg6iqYl2uLZo87UdOquJY="; + hash = "sha256-PA/88T7o+oEr/U33opGu1Tcvc0zT/WhChpJJV/AvCmw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 6eeb158a6ba18..da022c1e7f190 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.7"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CN7dzQodxrqr5nSwfG/4ghGEksEj0oH1bwGQUnGn/8Q="; + sha256 = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index d05d730a467ad..96f381f56d038 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.8"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "refs/tags/v${version}"; - hash = "sha256-A4SqDEArnRG9SJTqU/C9TOQO2vjot+hfj2/PKB/JMfw="; + hash = "sha256-xUg7+7oWxIVdKLOGIE1uxh7SSjkz/w0//OyMF1HhEJk="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 37a97121b0344..f51a1bd3ec6b0 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI="; + hash = "sha256-5TV9cTMTx8R6jf9HypieinCyNgHC4LSHTRQd9RXApG4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 12c353d1059fe..1b61ab6afc4a6 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.11.0"; + version = "6.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NIrDVsOBem25j7aZPsF7WyNsFjEiOHWfCj8U81Q6nlA="; + hash = "sha256-Q1wStP2I2oFa9oIfO/iwTrtlGBHaiaEcnRkLr/Ibrao="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index b4d09d38f8873..8f8e98ca64966 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 74f24b2028eb2..558ce409d4b68 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 = "7.1.0"; + version = "7.2.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0="; + sha256 = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 08d69424e579f..2fb7d3efcdc20 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -4,6 +4,7 @@ , cython , dill , fastavro +, fasteners , fetchFromGitHub , fetchpatch , freezegun @@ -11,11 +12,12 @@ , grpcio-tools , hdfs , httplib2 +, hypothesis , lib , mock , mypy-protobuf , numpy -, oauth2client +, objsize , orjson , pandas , parameterized @@ -26,32 +28,33 @@ , pydot , pyhamcrest , pymongo +, pytest-xdist , pytestCheckHook , python , python-dateutil -, pythonAtLeast , pythonRelaxDepsHook , pytz , pyyaml +, regex , requests , requests-mock , scikit-learn -, setuptools , sqlalchemy , tenacity , testcontainers , typing-extensions +, zstandard }: buildPythonPackage rec { pname = "apache-beam"; - version = "2.43.0"; + version = "2.45.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo="; + hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0="; }; patches = [ @@ -62,24 +65,26 @@ 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 = [ # See https://github.com/NixOS/nixpkgs/issues/156957 "dill" "numpy" - "pyarrow" "pymongo" # See https://github.com/NixOS/nixpkgs/issues/193613 "protobuf" + + # As of apache-beam v2.45.0, the requirement is httplib2>=0.8,<0.21.0, but + # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be + # removed once beam is upgraded since the current requirement on master is + # for httplib2>=0.8,<0.22.0. + "httplib2" + + # As of apache-beam v2.45.0, the requirement is pyarrow<10.0.0,>=0.15.1, but + # the current (2023-02-22) nixpkgs's pyarrow version is 11.0.0. + "pyarrow" ]; sourceRoot = "source/sdks/python"; @@ -94,14 +99,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ cloudpickle crcmod - cython dill fastavro + fasteners grpcio hdfs httplib2 numpy - oauth2client + objsize orjson proto-plus protobuf @@ -110,9 +115,10 @@ buildPythonPackage rec { pymongo python-dateutil pytz + regex requests - setuptools typing-extensions + zstandard ]; enableParallelBuilding = true; @@ -121,14 +127,16 @@ buildPythonPackage rec { "apache_beam" ]; - nativeCheckInputs = [ + checkInputs = [ freezegun + hypothesis mock pandas parameterized psycopg2 pyhamcrest pytestCheckHook + pytest-xdist pyyaml requests-mock scikit-learn @@ -160,6 +168,13 @@ buildPythonPackage rec { # Fails starting from dill 0.3.6 because it tries to pickle pytest globals: # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499. "apache_beam/transforms/window_test.py" + + # See https://github.com/apache/beam/issues/25390. + "apache_beam/coders/slow_coders_test.py" + "apache_beam/dataframe/pandas_doctests_test.py" + "apache_beam/typehints/typed_pipeline_test.py" + "apache_beam/coders/fast_coders_test.py" + "apache_beam/dataframe/schemas_test.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 1a85922e5dd59..d7fc0929ec439 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -4,6 +4,7 @@ , marshmallow , mock , openapi-spec-validator +, packaging , prance , pytestCheckHook , pythonOlder @@ -23,16 +24,26 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pyyaml - prance + packaging ]; + passthru.optional-dependencies = { + marshmallow = [ + marshmallow + ]; + yaml = [ + pyyaml + ]; + validation = [ + openapi-spec-validator + prance + ]; + }; + nativeCheckInputs = [ - openapi-spec-validator - marshmallow mock pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "apispec" diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix new file mode 100644 index 0000000000000..2ada38bfb14e3 --- /dev/null +++ b/pkgs/development/python-modules/app-model/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, in-n-out +, psygnal +, pydantic +, pytestCheckHook +, pythonOlder +, typing-extensions +, setuptools-scm +, setuptools +}: + +buildPythonPackage rec { + pname = "app-model"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pyapp-kit"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-nZnIb2QHfpkPirjQPiBdLd7pc1NNn97fdjGxKs0lWQU="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + psygnal + pydantic + in-n-out + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "app_model" + ]; + + meta = with lib; { + description = "Module to implement generic application schema"; + homepage = "https://github.com/pyapp-kit/app-model"; + changelog = "https://github.com/pyapp-kit/app-model/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} 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 0000000000000..3b21c3ffab83c --- /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 e9df0a22482f2..e4e1f5873b212 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,26 +19,29 @@ }: buildPythonPackage rec { - version = "5.4.2"; + version = "8.2.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-7OeFOPBOs+SXKOQGKxiigVvoY50+bqRo+oDbVYTMQxU="; }; propagatedBuildInputs = [ allpairspy + approval-utilities beautifulsoup4 empty-files + mrjob pyperclip pytest + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 4347fd925dc16..7710d856fb8a0 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.6.1"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-/XQ/Q4/LzCBDaTindbBENOh5OSIH2JPLyiYFWT9DcP4="; + hash = "sha256-h3YDpPreJuJpq43dHFC3ZP9coJ34lrWBdbCrGWGACsY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index 2310ef1e6df90..7cba156bd6840 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.0.1"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = "refs/tags/${version}"; - hash = "sha256-Lmz701qdqFlXro279AdNx+P1o3Q/Om63jKvy854ogto="; + hash = "sha256-nRInKju3Q4En+SiSl6DOeeTRK56TzKPweoVXsvzs45I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 432ea73e7c3b4..e88d0bb2e9b77 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.34"; + version = "9.2.40"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-RsIknVuhDzPbVJudjilNnMjBTH6cxPROQEXxRiAbDEs="; + hash = "sha256-jJFOtvcsU1bmJQT7atE6DJLcAeoN+78yWP4OiM6euWI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index bdc2a078a8a54..55da36c71c6f2 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -9,22 +9,13 @@ buildPythonPackage rec { pname = "argh"; - version = "0.26.2"; + version = "0.27.2"; src = fetchPypi { inherit pname version; - sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65"; + hash = "sha256-AMkCf29GG88kr+WZooG72ly9Xe5LZwW+++opOkyn0iE="; }; - patches = [ - # https://github.com/neithere/argh/issues/148 - (fetchpatch { - name = "argh-0.26.2-fix-py3.9-msgs.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch?id=6f194f12a2e30aad7da347848f7b0187e188f983"; - sha256 = "nBmhF2PXVeS7cBNujzip6Bb601LRHrjmhlGKFr/++Oo="; - }) - ]; - nativeCheckInputs = [ iocapture mock @@ -34,6 +25,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "argh" ]; meta = with lib; { + changelog = "https://github.com/neithere/argh/blob/v${version}/CHANGES"; homepage = "https://github.com/neithere/argh"; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix new file mode 100644 index 0000000000000..229e15d24ff34 --- /dev/null +++ b/pkgs/development/python-modules/arpy/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "arpy"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "viraptor"; + repo = pname; + rev = version; + hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s="; + }; + + checkInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "arpy" ]; + + meta = with lib; { + description = "A library for accessing the archive files and reading the contents"; + homepage = "https://github.com/viraptor/arpy"; + license = licenses.bsd2; + maintainers = with maintainers; [ thornycrackers ]; + }; +} diff --git a/pkgs/development/python-modules/arsenic/default.nix b/pkgs/development/python-modules/arsenic/default.nix new file mode 100644 index 0000000000000..e2c929b251474 --- /dev/null +++ b/pkgs/development/python-modules/arsenic/default.nix @@ -0,0 +1,70 @@ +{ lib +, aiohttp +, attrs +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonRelaxDepsHook +, pythonOlder +, structlog +}: + +buildPythonPackage rec { + pname = "arsenic"; + version = "21.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "HENNGE"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE="; + }; + + patches = [ + # Switch to poetry-core, https://github.com/HENNGE/arsenic/pull/160 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/HENNGE/arsenic/commit/ca82894a5f1e832ab9283a245258b334bdd48855.patch"; + hash = "sha256-ECCUaJF4MRmFOKH1C6HowJ+zmbEPPiS7h9DlKw5otZc="; + }) + ]; + + pythonRelaxDeps = [ + "structlog" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + structlog + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Depends on asyncio_extras which is not longer maintained + doCheck = false; + + pythonImportsCheck = [ + "arsenic" + ]; + + meta = with lib; { + description = "WebDriver implementation for asyncio and asyncio-compatible frameworks"; + homepage = "https://github.com/HENNGE/arsenic/"; + changelog = "https://github.com/HENNGE/arsenic/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 5f27e8c131b55..6be8a76dece2b 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asana"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-+lktPFCL2c79dNGgbsaFJRELmV6sJ2kiBSb8kd9XPIQ="; + hash = "sha256-aYWojS+SeAnFvSqyb9ceyRKhG1Hpn6/eK9xrXxQbVeA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ascii-magic/default.nix b/pkgs/development/python-modules/ascii-magic/default.nix index 6a1b617c03ed1..0c876d756ebef 100644 --- a/pkgs/development/python-modules/ascii-magic/default.nix +++ b/pkgs/development/python-modules/ascii-magic/default.nix @@ -3,16 +3,21 @@ , colorama , fetchPypi , pillow +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ascii-magic"; - version = "1.6"; + version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "ascii_magic"; inherit version; - sha256 = "sha256-faVRj3No5z8R4hUaDAYIBKoUniZ7Npt+52U/vXsEalE="; + hash = "sha256-PtQaHLFn3u1cz8YotmnzWjoD9nvdctzBi+X/2KJkPYU="; }; propagatedBuildInputs = [ @@ -20,16 +25,31 @@ buildPythonPackage rec { pillow ]; - # Project is not tagging releases and tests are not shipped with PyPI source - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "ascii_magic" ]; + preCheck = '' + cd tests + ''; + + disabledTests = [ + # Test requires network access + "test_from_url" + "test_quick_test" + "test_wrong_url" + # No clipboard in the sandbox + "test_from_clipboard" + ]; + meta = with lib; { description = "Python module to converts pictures into ASCII art"; homepage = "https://github.com/LeandroBarone/python-ascii_magic"; + changelog = "https://github.com/LeandroBarone/python-ascii_magic#changelog"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index b0d2b1f723866..686a9e92cebfe 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, dateparser , fetchFromGitHub +, pythonOlder +, requests +, shapely +, python-dateutil +, pytz , importlib-metadata , numpy +, dateparser +, jinja2 +, remotezip , pytestCheckHook -, python-dateutil -, pythonOlder -, pytz -, requests , requests-mock -, shapely -, wktutils +, defusedxml }: buildPythonPackage rec { @@ -29,25 +31,25 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateparser - importlib-metadata - numpy - python-dateutil - pytz requests shapely - wktutils + python-dateutil + pytz + importlib-metadata + numpy + dateparser + jinja2 + remotezip ]; nativeCheckInputs = [ pytestCheckHook - requests-mock ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "WKTUtils==" "WKTUtils>=" - ''; + checkInputs = [ + requests-mock + defusedxml + ]; pythonImportsCheck = [ "asf_search" diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 72d9a9707323d..923ee6bd8198e 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { "test_multiprocessing" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "asgiref" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aspectlib/default.nix b/pkgs/development/python-modules/aspectlib/default.nix new file mode 100644 index 0000000000000..70fd8e8db2e22 --- /dev/null +++ b/pkgs/development/python-modules/aspectlib/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, fetchpatch +, setuptools +, fields +, process-tests +, pytestCheckHook +, tornado +}: + +buildPythonPackage rec { + pname = "aspectlib"; + version = "2.0.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pLRhudoLUxrry5PvzePegIpyxgIm3Y2QLEZ9E/r3zpI="; + }; + + patches = [ + # https://github.com/ionelmc/python-aspectlib/pull/25 + (fetchpatch { + name = "darwin-compat.patch"; + url = "https://github.com/ionelmc/python-aspectlib/commit/ef2c12304f08723dc8e79d1c59bc32c946d758dc.patch"; + hash = "sha256-gtPFtwDsGIMkHTyuoiLk+SAGgB2Wyx/Si9HIdoIsvI8="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + fields + ]; + + pythonImportsCheck = [ + "aspectlib" + "aspectlib.contrib" + "aspectlib.debug" + "aspectlib.test" + ]; + + checkInputs = [ + process-tests + pytestCheckHook + tornado + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + changelog = "https://github.com/ionelmc/python-aspectlib/blob/v${version}/CHANGELOG.rst"; + description = "Aspect-oriented programming, monkey-patch and decorators library"; + homepage = "https://github.com/ionelmc/python-aspectlib"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index ed434bcb6bc7a..4bfd53c085616 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.28"; + version = "0.9.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "newville"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-J35AqVSFpIsw0XThbLCJjS9NFRFeyYV/YrwdfcOrFhk="; + hash = "sha256-cJIrb0lo/FmeyZd8L6nlCEt6MP7Fdv3rr5C6xvplN6c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 2eb0e4986f001..02f1a951d17ca 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , numpy @@ -36,6 +37,8 @@ buildPythonPackage rec { hypothesis ]; + disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) "test_interpolate_bilinear_skycoord"; + # tests must be run in the build directory preCheck = '' cd build/lib* diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 3e157887f65d6..ab74cf9666c1e 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.11"; + version = "0.0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KCG+SdAtpenwDf+5nA2+p8eKrWiJQSdiRyCU+lGf/1o="; + hash = "sha256-tVvqzKsCvvSgKB3xRBMnIQLEDzCaPO/h8cM8WMpzi6M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 73ccaa62c3d3f..0aab8c3ae41db 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, typing-extensions , pytestCheckHook , pytest-asyncio }: buildPythonPackage rec { pname = "async-lru"; - version = "1.0.3"; + version = "2.0.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + format = "setuptools"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; rev = "v${version}"; - hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM="; + hash = "sha256-kcvtF/p1L5OVXJSRxRQ0NMFtV29tAysZs8cnTHqOBOo="; }; + propagatedBuildInputs = [ + typing-extensions + ]; + postPatch = '' sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; @@ -28,10 +35,6 @@ buildPythonPackage rec { pytest-asyncio ]; - pytestFlagsArray = [ - "--asyncio-mode=strict" - ]; - pythonImportsCheck = [ "async_lru" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index a96dd8271e41f..112bd15d2ae92 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.33.0"; + version = "0.33.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-I7C2ho+pmowerJFK82wYcqEOhRV3KZ5j5IBVCKjhllM="; + hash = "sha256-gXDuStgCBH6YW3SsAjEvQq7l+Vf8+Z8sle1TnLRtNwo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index baf4702126f95..f999cd3b3b344 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -17,20 +17,25 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jsbronder"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; + rev = "refs/tagsv${version}"; + hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; nativeCheckInputs = [ - pytest-asyncio pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + ]; + # OSError: AF_UNIX path too long doCheck = !stdenv.isDarwin; disabledTests = [ "test_protocol_pause_resume" + # TypeError: socket type must be 2 + "test_from_socket_bad_socket" ]; pythonImportsCheck = [ @@ -40,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python support for higher level Datagram"; homepage = "https://github.com/jsbronder/asyncio-dgram"; + changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${version}/ChangeLog"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index b81c4d2c6968b..c5888f000ee03 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.7"; 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-mkYh1fmhtBZ2DyL7a2RduTm+ig4Xnk5Ps1Tm0DS/OEc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 4165db53b1281..c5666af7c187c 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.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-vn4ctHIl3JiZ5WRy/cTarANYSmhDZ1MpwM5nF5yyDik="; + hash = "sha256-67uDwFwLRc8jDeHvLwYFnjYPmvpcPd9g/JL697lP+Ic="; }; propagatedBuildInputs = [ @@ -78,7 +78,6 @@ buildPythonPackage rec { ]; meta = with lib; { - 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"; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 253640b50bb24..8faa98cfda065 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "v${version}"; - hash = "sha256-wBtI3ZlsvOkNvl/q0X9cm2hNRUBW1oB/kZOo8lqo4dQ="; + hash = "sha256-6A4z+tiQ2oUlB9t44wlW64j5sjWFMAgqT3Xt0FdJCBs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 3ec2635af7733..187d5f005ba96 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,7 +1,7 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub +, pytest-mock , pytestCheckHook , python-socks , pythonOlder @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.1"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pogzyb"; repo = pname; - rev = "v${version}"; - hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE="; + rev = "refs/tags/v${version}"; + hash = "sha256-h2RAUedcVTlX/DmaXewSQfw9gb0rE8NG9hdNe+exqqk="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest + pytest-mock pytestCheckHook ]; @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for retrieving WHOIS information"; homepage = "https://github.com/pogzyb/asyncwhois"; + changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}"; license = with licenses; [ asl20 ]; 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 947f5db4b3179..187aaeeb99ac8 100644 --- a/pkgs/development/python-modules/atc-ble/default.nix +++ b/pkgs/development/python-modules/atc-ble/default.nix @@ -19,10 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-rwOFKxUlbbNIDJRdCmZpHstXwxcTnvlExgcVDdGbIVY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -37,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "atc_ble" ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for ATC devices with custom firmware"; homepage = "https://github.com/Bluetooth-Devices/atc-ble"; + changelog = "https://github.com/Bluetooth-Devices/atc-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 2c9c653dd1712..81994ce985a3d 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.32.2"; + version = "3.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-fI+c2JiChDZhZPdoy3PaRtUwgWMRJnZieHcF4OR6nZE="; + sha256 = "sha256-en+4EKkmTQWMgnGZaGs+O9Yh2TI03xW111wbp9O8dYE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/auroranoaa/default.nix b/pkgs/development/python-modules/auroranoaa/default.nix index 5d3fe1ff15dda..d9162d704b3ad 100644 --- a/pkgs/development/python-modules/auroranoaa/default.nix +++ b/pkgs/development/python-modules/auroranoaa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "auroranoaa"; - version = "0.0.2"; + version = "0.0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "djtimca"; repo = "aurora-api"; rev = version; - sha256 = "0bh8amixkg3xigwh3ryra22x6kzhbdassmf1iqv20lhbvzmsqjv0"; + sha256 = "sha256-ho0O5aEHCKaTuWh2eW2kY5a7dVGIGBLm4nKxAMq0bZ4="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 725cc2800d47e..b4daad5c24ef0 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.24.0"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-Qr1E6MNBAKyNr0XbCIP0yJUFRvBpLhTZzTG06tdg31I="; + hash = "sha256-XdWrEJL/u+B15jAzxS7UZBhFBCVfSlnBtUcKcA0iUOw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 7d6c0457c0bac..2c85cbfcf79cb 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.16.3"; + version = "0.16.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w39Qt046dWDzbt41t9LVMCJNM2uGOv9VTZf3yfWUlNM="; + hash = "sha256-MQFJm0ebgvBAP2Fb9SDB+LlQaBjSdePiit4lzGvNuSs="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix new file mode 100644 index 0000000000000..cfd7b7084822d --- /dev/null +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -0,0 +1,89 @@ +{ backoff +, sparqlwrapper +, boto3 +, buildPythonPackage +, fetchFromGitHub +, gremlinpython +, jsonpath-ng +, lib +, moto +, openpyxl +, opensearch-py +, pandas +, pg8000 +, poetry-core +, progressbar2 +, pyarrow +, pymysql +, pyodbc +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, redshift-connector +, requests-aws4auth +}: + +buildPythonPackage rec { + pname = "awswrangler"; + version = "2.19.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7.1"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-sdk-pandas"; + rev = "refs/tags/${version}"; + hash = "sha256-xUEytEgr/djfnoOowLxAZmbPkMS+vU0fuPY7JxZXEe0="; + }; + + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook ]; + + propagatedBuildInputs = [ + backoff + boto3 + gremlinpython + jsonpath-ng + openpyxl + opensearch-py + pandas + pg8000 + progressbar2 + pyarrow + pymysql + redshift-connector + requests-aws4auth + ]; + + pythonRelaxDeps = [ + "gremlinpython" + "numpy" + "pandas" + "pg8000" + "pyarrow" + ]; + + nativeCheckInputs = [ moto pytestCheckHook ]; + + pytestFlagsArray = [ + # Subset of tests that run in upstream CI (many others require credentials) + # https://github.com/aws/aws-sdk-pandas/blob/2b7c62ac0762b1303149bb3c03979791479ba4f9/.github/workflows/minimal-tests.yml + "tests/test_metadata.py" + "tests/test_session.py" + "tests/test_utils.py" + "tests/test_moto.py" + ]; + + passthru.optional-dependencies = { + sqlserver = [ pyodbc ]; + sparql = [ sparqlwrapper ]; + }; + + meta = { + description = "Pandas on AWS"; + homepage = "https://github.com/aws/aws-sdk-pandas"; + changelog = "https://github.com/aws/aws-sdk-pandas/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index b926a1abc25be..2ac4a7be1d3f9 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -1,37 +1,49 @@ { lib +, async-timeout , attrs , buildPythonPackage , fetchFromGitHub , httpx +, orjson , packaging +, pythonOlder , xmltodict }: buildPythonPackage rec { pname = "axis"; - version = "44"; + version = "47"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-GC8GiDP/QHU+8swe60VFPRx8kSMMHuXjIPEKCja8HPE="; + rev = "refs/tags/v${version}"; + hash = "sha256-a8YvFX3IcbX4Sm75GzGv7vIyMmSHxwGejyq6nE7foOE="; }; propagatedBuildInputs = [ + async-timeout attrs httpx + orjson packaging xmltodict ]; # Tests requires a server on localhost doCheck = false; - pythonImportsCheck = [ "axis" ]; + + pythonImportsCheck = [ + "axis" + ]; 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-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index ee7f9fd44ff40..e44dd89291b0a 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9372467c74930d20827135d468b7fcaa1ad42e4673a4591ceadbb6ad8e1b7e07"; + sha256 = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 68a0409d9ead6..4fca1b356a31e 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -17,7 +17,7 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.26.1"; + version = "1.26.3"; pname = "azure-core"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0="; + sha256 = "sha256-rL0NqpZ1zohiPaNcgNgZza+pFzHe5rJpXGTXyp2oLbQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 1d8ce8d5675aa..351a870750d39 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.1"; + version = "12.4.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-FvEo6PZubKBcB/t4/MxxNJMjHfHYXjPE4lp5yURVhko="; + sha256 = "sha256-Oz1dFbKpY+CbSTSx/iuiF/Kd2axRghwXVJ/K+HRwJDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index a2d260339acac..b72ffdd4ea509 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.3.0"; + version = "13.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; + hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index dc86f5acd7381..f75b262df3a09 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -1,27 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , azure-common , azure-mgmt-core , msrest -, msrestazure +, typing-extensions }: buildPythonPackage rec { - version = "10.0.0"; pname = "azure-mgmt-containerregistry"; - disabled = isPy27; + version = "10.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HjejK28Em5AeoQ20o4fucnXTlAwADF/SEpVfHn9anZk="; + hash = "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; extension = "zip"; }; - propagatedBuildInputs = [ azure-common azure-mgmt-core msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.containerregistry" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.containerregistry" + ]; meta = with lib; { description = "Microsoft Azure Container Registry Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 726984df9803d..89cf42a6a2474 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 = "21.1.0"; + version = "21.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-5EOythXO7spLzzlqDWrwcdkkJAMH9W8OBv96rYaWxAY="; + hash = "sha256-pJLnSuSbXbarOiXwfnjSDNmyU7ZOl2IUUVaEA8mQriQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index db6df3583b68b..4637e74cc3178 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "8.0.0"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo="; + hash = "sha256-7bP8klNIp2skhNKU8s51zaxQOG6pYMCK9wk6ce5pySA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 3027d54531ac9..8104cfd340293 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.10.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s="; + hash = "sha256-aVfH65fJnsTSr0MR0Fr5yamxIOv2+aST953uCr7QXOk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 615ab0f33e6ff..6ff2d91c98959 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "3.1.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-sSE/jN2YWuf81dUsZFLgYUnTv9e1PnO9qszjuHlUcDI="; + sha256 = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 45a57d1c68a08..1f4568f3b7f36 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "6.1.0"; + version = "7.0.0"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; + sha256 = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 2d994b93707ac..a9158d8b581f4 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss="; + hash = "sha256-4L6Tqgvqh+nJyeXMolSpQ/2knAED75RQqD/lUDOt5ek="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index d5fe92f320b09..6334df6637475 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-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index fc4d923f4ca6a..e100b35ee643d 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-CtTOw6cC9fkL+2XgfG/r/LXpzhQoYXLjrwlI6Q5XpP4="; + hash = "sha256-P6GLB5+2p9sS9XSwSykQXHXw5YrJNNSgs5d7sy5jHTk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index e4cb5b2347424..4683d1e294125 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -2,33 +2,39 @@ , buildPythonPackage , fetchPypi , msrest -, msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "8.0.0"; + version = "9.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; + hash = "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - azure-mgmt-nspkg msrest - msrestazure + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.search" ]; + + pythonImportsCheck = [ + "azure.mgmt.search" + ]; meta = with lib; { description = "This is the Microsoft Azure Search Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 51843b9ab4a76..182fa1599752b 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "8.1.0"; + version = "8.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg="; + hash = "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 9c7a57adc08d4..95f1a127db724 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.1"; + version = "7.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks="; + hash = "sha256-FC4AUHWV8UxvB1Lz3/+z/l/OhdTj1YSn4iLmXt+zwZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index f8f7f2f403b28..1a02c11bafba3 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.14.1"; + version = "12.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-hg1NgphaS/x9MnHnEnWvMw9U8zCnVDVUNae6dJzN6Zc="; + hash = "sha256-+LjVgkknQKsWdERVQINC+45MiJe2Soo/wxdDhEciwvI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix deleted file mode 100644 index af6652733bd5a..0000000000000 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs -, buildPythonPackage -, fetchPypi -, azure-common -, cryptography -, futures ? null -, python-dateutil -, requests -, isPy3k -}: - -buildPythonPackage rec { - version = "0.36.0"; - pname = "azure-storage"; - - src = fetchPypi { - inherit pname version; - sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; - }; - - propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ] - ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - - postPatch = '' - rm azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-nspkg" "" - ''; - - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; -} diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index c5188188c467e..4dac7ecf5b83b 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.18.0"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-knLyjRjUmLZtM9dJoPBeSdm7GpE0+UJhwLi/obVvPuw="; + hash = "sha256-aJpSt+dXjw4S33dBiMkaR6wxzwLru+jseuPKFj2R36Y="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { disabledTestPaths = [ # requires aws s3 auth "test/integration/test_download.py" + "test/integration/test_upload.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix new file mode 100644 index 0000000000000..2999eadd678f3 --- /dev/null +++ b/pkgs/development/python-modules/bambi/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, arviz +, blackjax +, formulae +, graphviz +, numpy +, numpyro +, pandas +, pymc +, scipy +}: + +buildPythonPackage rec { + pname = "bambi"; + version = "0.9.3"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bambinos"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-f/4CrFmma+Lc6wZm+YyDupDWfPAtuRsZdRf28sYUWTk="; + }; + + propagatedBuildInputs = [ + arviz + formulae + numpy + pandas + pymc + scipy + ]; + + preCheck = ''export HOME=$(mktemp -d)''; + + nativeCheckInputs = [ + blackjax + graphviz + numpyro + pytestCheckHook + ]; + disabledTests = [ + # attempt to fetch data: + "test_data_is_copied" + "test_predict_offset" + ]; + + pythonImportsCheck = [ "bambi" ]; + + meta = with lib; { + homepage = "https://bambinos.github.io/bambi"; + description = "High-level Bayesian model-building interface"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index ba4672a177464..cee1ee04e3538 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; postInstall = '' - ${python.interpreter} -m bash_kernel.install --prefix $out + ${python.pythonForBuild.interpreter} -m bash_kernel.install --prefix $out ''; meta = { diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index cb02db36ada10..e1d635c18b698 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' - ${python.interpreter} -c 'import bashlex' + ${python.pythonForBuild.interpreter} -c 'import bashlex' ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix deleted file mode 100644 index 454a972f177b9..0000000000000 --- a/pkgs/development/python-modules/bedup/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, btrfs-progs -, contextlib2 -, pyxdg -, pycparser -, alembic -, cffi -, pythonOlder -, isPyPy -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "bedup"; - disabled = pythonOlder "3.3"; - - src = fetchFromGitHub { - owner = "g2p"; - repo = "bedup"; - rev = "v${version}"; - sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6"; - }; - - buildInputs = [ btrfs-progs ]; - propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] - ++ lib.optionals (!isPyPy) [ cffi ]; - - meta = with lib; { - description = "Deduplication for Btrfs"; - longDescription = '' - Deduplication for Btrfs. bedup looks for new and changed files, - making sure that multiple copies of identical files share space - on disk. It integrates deeply with btrfs so that scans are - incremental and low-impact. - ''; - homepage = "https://github.com/g2p/bedup"; - license = licenses.gpl2; - maintainers = with maintainers; [ bluescreen303 ]; - }; -} diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index c2fca94408853..437bf9cf6bdb5 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.6"; + version = "0.34.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-J6PUVdIs9adRdFbw9yzu1Y9jU9Ge0hGxueXbE1b03og="; + hash = "sha256-2QTY6mZkhaXHeZcLKxW7BkzOj2jYJx1v4TKG5YBcSC0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bencode-py/default.nix b/pkgs/development/python-modules/bencode-py/default.nix new file mode 100644 index 0000000000000..e4d5041e8b4ba --- /dev/null +++ b/pkgs/development/python-modules/bencode-py/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + python, + pbr, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "beconde-py"; + version = "4.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "bencode.py"; + sha256 = "sha256-KiTM2hclpRplCJPQtjJgE4NZ6qKZu256CZYTUKKm4Fw="; + }; + + pythonImportsCheck = [ + "bencodepy" + ]; + + nativeBuildInputs = [ + pbr + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple bencode parser (for Python 2, Python 3 and PyPy)"; + homepage = "https://github.com/fuzeman/bencode.py"; + license = licenses.bitTorrent11; + maintainers = with maintainers; [vamega]; + }; +} diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index c22c0c9657f1b..84bd82d94ab2f 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.9"; + version = "1.10.0"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KdYZ5sOpSdUdi7AvnrEfDBnfml4P6thTLM0dUPC/toA="; + sha256 = "sha256-WJb9EENkYFVgKuByHFJhed/Slt6ayG31LeQk1+14/Ys="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 91d663c6a23c5..d756865be2668 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.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-Efa3Z4pWn+TkpA61COQTFCl+gOc5IGqYv6ZHTqiTC2c="; + hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index c3a0b8feedfde..4cadf33f1a6d9 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; rev = "v${version}"; - sha256 = "0phqyqv34vhh80dgipiggs4n3iq2vfjk9ywx2c5d8g61vzgbd2g8"; + sha256 = "sha256-hlPbzqGRSXcIqlI+SNKq37CnnHd1IoMBNSjhyeAM1TE="; }; patches = [ diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index e0b419da29263..96385466ad9e6 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.80"; + version = "1.81"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UoBemviHZ+RQ4t+BE7W8Welk4uinu4A6g1cL27UcDkM="; + sha256 = "sha256-LPOBErbYQVrTnWphGYjNEftfM+sJNGZmqHJjvrqWFOA="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index ec351457a2229..16786b2e0189e 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/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index a9bbef0e4325b..eaf0770dcb93d 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.1"; + version = "2.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; + hash = "sha256-9xJWoyYJsDatrZMuEii2amtOLK5r45fliN3Aur2aeLk="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index f91ade7d10b32..e1cd7bd66a1b0 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/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix index 9d5ba8eaa8a9f..82994b9d0d1dc 100644 --- a/pkgs/development/python-modules/bite-parser/default.nix +++ b/pkgs/development/python-modules/bite-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bite-parser"; - version = "0.2.1"; + version = "0.2.2"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "bite_parser"; inherit version; - hash = "sha256-PmZCCQzxCfCq6Mr1qn03tj/7/0we9Bfk5fj4K+wMhsk="; + hash = "sha256-mBghKgrNv4ZaRNowo7csWekmqrI0xAVKJKowSeumr4g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 4602e650b7f32..d83eb87baff1a 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.15.1"; + version = "8.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b6atv7jzuMtowhsTqmXSPrLDrDJBmrkm8/0f/3F6kSU="; + hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix new file mode 100644 index 0000000000000..62fdc0e94a982 --- /dev/null +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, fastprogress +, jax +, jaxlib +, jaxopt +, optax +, typing-extensions +}: + +buildPythonPackage rec { + pname = "blackjax"; + version = "0.9.6"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "blackjax-devs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-EieDu9SJxi2cp1bHlxX4vvFZeDGMGIm24GoR8nSyjvE="; + }; + + patches = [ + # remove in next release + (fetchpatch { + name = "fix-lbfgs-args"; + url = "https://github.com/blackjax-devs/blackjax/commit/1aaa6f64bbcb0557b658604b2daba826e260cbc6.patch"; + hash = "sha256-XyjorXPH5Ap35Tv1/lTeTWamjplJF29SsvOq59ypftE="; + }) + ]; + + propagatedBuildInputs = [ + fastprogress + jax + jaxlib + jaxopt + optax + typing-extensions + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ "tests/test_benchmarks.py" ]; + disabledTests = [ + # too slow + "test_adaptive_tempered_smc" + ]; + + pythonImportsCheck = [ + "blackjax" + ]; + + meta = with lib; { + homepage = "https://blackjax-devs.github.io/blackjax"; + description = "Sampling library designed for ease of use, speed and modularity"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 20525c0f267e3..8b28cfacf1ac1 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -1,32 +1,34 @@ { 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 ]; nativeCheckInputs = [ @@ -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 9e5b4d0fbc46b..2a0e2183cba5f 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 = '' @@ -48,6 +50,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index 11edb88848b30..d6eb12166a8ab 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.1"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QGad5o9JZ6ansVh3bRBO+9mE4PKw05acY+9+Ur2OBsY="; + hash = "sha256-mJ5JNGN4F9U3WMJQDwiZwuxE0zOirwo1sWF3/bVwXhY="; }; nativeBuildInputs = [ 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 21bdad355c061..65a5fc6444ec9 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Btfya9l1UX7GbiUxuaFHT0l+pG+Dg5X0L2JS+1/VYOo="; + hash = "sha256-3qZlk6zV/AeFG4OSRONQ7EMw9Kk/yHjVHV2o64bxCGM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 1a4648d413821..5d570844862f7 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -28,19 +28,16 @@ , icalendar , pandas , pythonImportsCheckHook -, contourpy -, xyzservices }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.0.3"; - format = "setuptools"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo="; + sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; }; patches = [ @@ -73,10 +70,10 @@ buildPythonPackage rec { requests nbconvert icalendar + pandas ]; propagatedBuildInputs = [ - contourpy pillow jinja2 python-dateutil @@ -84,10 +81,8 @@ 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 fffdea592b731..f8f33c0021f27 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/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 ' + +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 + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None @@ -11,5 +11,5 @@ index 9af8691..4b93543 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path() -> str: + def _nodejs_path(): global _nodejs diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 19d69546abb82..770c523e31f9f 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -1,15 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook -, pythonAtLeast , pythonOlder }: buildPythonPackage rec { pname = "boltons"; - version = "21.0.0"; + version = "23.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,23 +15,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; - rev = version; - hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk="; + rev = "refs/tags/${version}"; + hash = "sha256-NqlCu0W/BQkLiaLYs9DB1RrEya6KGPfNtpAzKXxoRD0="; }; nativeCheckInputs = [ pytestCheckHook ]; - patches = lib.optionals (pythonAtLeast "3.10") [ - # pprint has no attribute _safe_repr, https://github.com/mahmoud/boltons/issues/294 - (fetchpatch { - name = "fix-pprint-attribute.patch"; - url = "https://github.com/mahmoud/boltons/commit/270e974975984f662f998c8f6eb0ebebd964de82.patch"; - sha256 = "sha256-pZLfr6SRCw2aLwZeYaX7bzfJeZC4cFUILEmnVsKR6zc="; - }) - ]; - # Tests bind to localhost __darwinAllowLocalNetworking = true; @@ -42,7 +31,6 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/mahmoud/boltons"; description = "Constructs, recipes, and snippets extending the Python standard library"; longDescription = '' Boltons is a set of over 200 BSD-licensed, pure-Python utilities @@ -59,6 +47,8 @@ buildPythonPackage rec { - A full-featured TracebackInfo type, for representing stack traces, in tbutils ''; + homepage = "https://github.com/mahmoud/boltons"; + changelog = "https://github.com/mahmoud/boltons/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ twey ]; }; diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 4f17d17c0d523..360144a36976f 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.48"; + version = "0.2.56"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-EPS9kqlognIoMnpgmFl32FVT1ahyliizLzGfgE3N24Y="; + sha256 = "sha256-OcXAlMc1/HdGJGjB0miTh7k9rH7cC0CZtwKSqePgPUY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index c0e19fc48682e..65b80267c1d4d 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.6.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-VZSYVSFFBMdYO3G5oDqE3OLpaoQCdhO7U7QtBIRM4k4="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-visualization"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-bcqr+vGKBga4rR4XFRWbjtw5xL+pWkIt+ihtKlKF6Y8="; }; - nativeCheckInputs = [ pytest selenium ]; - propagatedBuildInputs = [ jinja2 six setuptools ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + # We don't want flake8 + rm setup.cfg + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + selenium + ]; + + pythonImportsCheck = [ + "branca" + ]; + + disabledTestPaths = [ + # Some tests require a browser + "tests/test_utilities.py" + ]; - # Seems to require a browser - doCheck = false; + disabledTests = [ + "test_rendering_utf8_iframe" + "test_rendering_figure_notebook" + ]; - meta = { + 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 3e3af5d4cfaa6..7f34a3c48bc76 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 - - # 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 - ]; + pytz + msgpack + ] ++ jsonschema.optional-dependencies.format; nativeCheckInputs = [ - mypy-extensions pytestCheckHook + ]; + + checkInputs = [ 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/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix new file mode 100644 index 0000000000000..52149b8830604 --- /dev/null +++ b/pkgs/development/python-modules/brian2/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, jinja2 +, numpy +, pyparsing +, setuptools +, sympy +, pytest +, pytest-xdist +, python +}: + +buildPythonPackage rec { + pname = "brian2"; + version = "2.5.1"; + + src = fetchPypi { + pname = "Brian2"; + inherit version; + sha256 = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; + }; + + propagatedBuildInputs = [ + cython + jinja2 + numpy + pyparsing + setuptools + sympy + ]; + + checkInputs = [ + pytest + pytest-xdist + ]; + + checkPhase = '' + runHook preCheck + # Cython cache lies in home directory + export HOME=$(mktemp -d) + cd $HOME && ${python.interpreter} -c "import brian2;assert brian2.test()" + runHook postCheck + ''; + + meta = with lib; { + description = "A clock-driven simulator for spiking neural networks"; + homepage = "https://briansimulator.org/"; + license = licenses.cecill21; + maintainers = with maintainers; [ jiegec ]; + }; +} diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index cd596cecbb9fe..52ef0cd8ec203 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.5"; + version = "0.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i2Ib7OGnoimiZ2R/vGe6phPhA8lEP0BJ/gP1q9RVeiU="; + hash = "sha256-fyyZ7pkNlD6MH1+SRUYjU0mXMUsZJ3qhOqJrcmJ/hgc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index 5ee2ff0522af0..3c8df0a178559 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GICsP1KmxGrmvMbbEX5Ps1+bDM1a91/U/uaQfQDWmDw="; + hash = "sha256-G5XOk7nzBoRvbJHJ0OPrZZCkyFrCu+crX2DZ24KtKhw="; }; pythonImportsCheck = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Binary diff and patch using the BSDIFF4-format"; homepage = "https://github.com/ilanschnell/bsdiff4"; + changelog = "https://github.com/ilanschnell/bsdiff4/blob/${version}/CHANGELOG.txt"; license = licenses.bsdProtection; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 9baacd74d9b41..c3f6a9766dab1 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.5.1"; + version = "2.7.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-xxdCuTSpGe89TjF0YPmD4i1Fx1WfaQTTataFRnbcaos="; + hash = "sha256-wt/TA8bymjYgYSb63Viqf6ToUE1ffa2a3SEVFuTHh94="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 69c663f9ce0bf..308bba80b31fc 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.3"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-kIUAsCD/mJsAlG+Kb2Vz84qbGAjQd+UuPc8Ej7FwwTo="; + hash = "sha256-/d+KTcwCU+OQJ7qzgKLiDUeuNwoySFQW8qZq2a4aQ/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 23a31e389acb1..a04b19e9df21c 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-9q6Cp/reUJJ3XGMT9BV+4z5AxJdP8izfzgjOpS84/Tc="; + hash = "sha256-1vtoDmyulfH3YDdMoT9qBFaRd48nnTBCt0iWuQtk3iw="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic error monitoring for Python applications"; homepage = "https://github.com/bugsnag/bugsnag-python"; + changelog = "https://github.com/bugsnag/bugsnag-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 44d6e6f978335..bcdd7614ecd56 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; + __darwinAllowLocalNetworking = true; + disabledTests = [ # Tests often fail with StopIteration "test_isolat" diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index ee36e10531f1f..e6f78dfc0bd77 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock }: +{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock, cairosvg, klein, jinja2 }: { www = buildPythonPackage rec { @@ -115,4 +115,28 @@ license = licenses.gpl2; }; }; + + badges = buildPythonPackage rec { + pname = "buildbot-badges"; + inherit (buildbot-pkg) version; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug="; + }; + + buildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = [ cairosvg klein jinja2 ]; + + # No tests + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot Badges Plugin"; + maintainers = with maintainers; [ julienmalka ]; + license = licenses.gpl2; + }; + }; + } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 8c5be6384f359..4adfde8030540 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.16.0"; + version = "4.17.0"; disabled = pythonOlder "3.7"; @@ -26,12 +26,12 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = version; - sha256 = "sha256-y7h43D/SeXmMm0Fxi3hOOfXgDlmeoca11HOhGeJffRA="; + sha256 = "sha256-hdTJcuhVMbLqtPclgj4u6XwH0A5DvnGpnkhIG6Gm8+4="; }; nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros + setuptools cryptography jinja2 Mako passlib pyyaml requests tomlkit librouteros ] ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; pythonImportsCheck = [ "bundlewrap" ]; 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 0000000000000..195fdf89f4960 --- /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 = "76"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "boxine"; + repo = "bx_py_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-daqbF+DCt4yvKHbEzwJyOzEgsYLqhR31a0pYqp9OSvo="; + }; + + 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/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 114c7275f380b..08e0b559b0f2c 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,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkem"; repo = pname; - rev = "v${version}"; - hash = "sha256-DheHTD62f1ZxoiS0y0/CzDMHvKGmEiEUAX6oaqTpB78="; + rev = "refs/tags/v${version}"; + hash = "sha256-1B/vAfGroGABijMWuiKmIkMyjNSp2B3VkH7s1NMlbw0="; }; nativeCheckInputs = [ @@ -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/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index d6b8112c7df6d..b451f4da0c297 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -4,30 +4,32 @@ , icalendar , lxml , pytestCheckHook +, pythonOlder , pytz , recurring-ical-events , requests -, six , tzlocal , vobject }: buildPythonPackage rec { pname = "caldav"; - version = "1.0.1"; + version = "1.2.0"; + + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1BGy4h0TpeiUNtUnj/BiGSfH4T9YXP8YGJ1+4UsRGug="; + hash = "sha256-ibizwN4pxqzmVozVjrAPNSrmM1+8+/Qu6UnfRerrwUk="; }; propagatedBuildInputs = [ vobject lxml requests - six icalendar recurring-ical-events ]; @@ -50,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "CalDAV (RFC4791) client library"; homepage = "https://github.com/python-caldav/caldav"; + changelog = "https://github.com/python-caldav/caldav/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ marenz dotlambda ]; }; diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 46ceee80c0f5a..0787d4d097182 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.4"; + version = "1.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bAmyEZUR8w6xEmz82XOhCCTiDxz9JQOc3j0SGN2cjY8="; + hash = "sha256-aN/BV7AR4H2Uv3S11MzAGVhYTtlC2d/V/dcGYJ6BzUs="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encodes objects and arrays as RFC 7159 JSON"; homepage = "https://github.com/matrix-org/python-canonicaljson"; + changelog = "https://github.com/matrix-org/python-canonicaljson/blob/v${version}/CHANGES.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cart/default.nix b/pkgs/development/python-modules/cart/default.nix index c4ef21648773e..a0541fc1467f4 100644 --- a/pkgs/development/python-modules/cart/default.nix +++ b/pkgs/development/python-modules/cart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cart"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CybercentreCanada"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-PsdDlNhX0FbuwS5ZXk9P98DjnzDGdigfnRwrdwYa4qY="; + rev = "refs/tags/v${version}"; + hash = "sha256-0dHdXb4v92681xL21FsrIkNgNQ9R5ULV1lnSCITZzP8="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the CaRT Neutering format"; homepage = "https://github.com/CybercentreCanada/cart"; + changelog = "https://github.com/CybercentreCanada/cart/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 6cd182e181c9a..29feab25abef3 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.5"; + version = "1.17.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-PLtIxA3XD9Mi33zRfciocJUml1HqGsWGITlLUKAJUss="; + hash = "sha256-917JTjNKvO/Gp9qvvd0Dd5Zjl+AQzUw8PfbH2MQ14Dg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 0dfc302a49a5f..2c4d3bb23516b 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.1.1"; + version = "1.0.5"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; + rev = "v${version}"; + sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; }; nativeBuildInputs = [ clang_12 ]; diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index 4fbe2ecd37923..767071a75ef2f 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "certomancer"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "certomancer"; rev = version; - sha256 = "sha256-H43NlFNTwZtedHsB7c62MocwQVOi5JjVJxRcZY+Wn7Y="; + sha256 = "4v2e46ZrzhKXpMULj0vmDRoLOypi030eaADAYjLMg5M="; }; propagatedBuildInputs = [ @@ -43,9 +43,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace ", 'pytest-runner'" "" \ - --replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5" + substituteInPlace setup.py --replace ", 'pytest-runner'" "" ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 87c8f898899d1..5f12deb014115 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -75,7 +75,7 @@ if isPyPy then null else buildPythonPackage rec { propagatedBuildInputs = [ pycparser ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing"; doCheck = !stdenv.hostPlatform.isMusl; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 69353dcaec289..e750bbece81de 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -23,7 +23,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hypothesis + # "hypothesis" indirectly depends on chardet to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook ]; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 966daaf1ea1ec..c988ab49a75bb 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.11.0"; + version = "5.13.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Reti8tvBpBxpfNjnZs8wWuS76oEWIKPCxzSdTEO+ykA="; + sha256 = "sha256-j4n5goW2Iu5Z1+Gta1Ar34WXaF8ryUKs5P+6Onhmyh0="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 930303005780c..550da20b626ff 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.3"; + version = "0.2.4"; format = "setuptools"; src = fetchPypi { inherit version pname; - sha256 = "e19f961480b14b55d03d4d4aaa766d46131bdf2ea8a79b47d20037dfd980201a"; + sha256 = "beeaedbe7d28e22f8a2c635fc6432f9e9af84e3c2a6ecff101f4453de1abb385"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 8a3e328313f96..832cac1f7872b 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -3,48 +3,41 @@ , build , buildPythonPackage , fetchPypi -, fetchpatch , git -, mock , pep517 , pytestCheckHook -, toml +, tomli , pythonOlder }: buildPythonPackage rec { pname = "check-manifest"; - version = "0.48"; + version = "0.49"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc="; + hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY="; }; - patches = [ - # Fix git submodule tests using file: protocol - (fetchpatch { - url = "https://github.com/mgedmin/check-manifest/pull/159.patch"; - hash = "sha256-CDtuIoHgP4THLt+xF32C/OrjakwPOEVTKUh5JuQB5wM="; - }) - ]; - propagatedBuildInputs = [ build pep517 - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ - breezy git - mock pytestCheckHook ]; + checkInputs = [ + breezy + ]; + disabledTests = [ # Test wants to setup a venv "test_build_sdist_pep517_isolated" @@ -57,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Check MANIFEST.in in a Python source package for completeness"; homepage = "https://github.com/mgedmin/check-manifest"; + changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; }; diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 76e2a2bfa3230..9fa7a378b56e0 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -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 ad3755638df37..5e120ecc88d84 100644 --- a/pkgs/development/python-modules/chia-rs/Cargo.lock +++ b/pkgs/development/python-modules/chia-rs/Cargo.lock @@ -29,7 +29,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -132,7 +132,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chia" -version = "0.1.15" +version = "0.2.0" dependencies = [ "chia-protocol", "clvm-utils", @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "chia-bls" -version = "0.1.15" +version = "0.2.0" dependencies = [ "anyhow", "bls12_381_plus", @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "chia-protocol" -version = "0.1.15" +version = "0.2.0" dependencies = [ "chia_py_streamable_macro", "chia_streamable_macro", @@ -180,7 +180,7 @@ dependencies = [ [[package]] name = "chia_rs" -version = "0.1.16" +version = "0.2.0" dependencies = [ "chia", "chia-protocol", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "chia_wasm" -version = "0.1.15" +version = "0.2.0" dependencies = [ "chia", "wasm-bindgen", @@ -258,16 +258,16 @@ dependencies = [ [[package]] name = "clvm-utils" -version = "0.1.15" +version = "0.2.0" dependencies = [ "clvmr", ] [[package]] name = "clvmr" -version = "0.1.24" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5e907612d322d0d7def6b0ecb3ad681f6af2db106bcfabe4153746c60ef9e4" +checksum = "8c6bb157d96f8309f2081663887e055b6f500f00d50235290690988d11197e84" dependencies = [ "bls12_381", "hex", @@ -478,9 +478,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", @@ -543,6 +543,15 @@ dependencies = [ ] [[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" @@ -652,9 +661,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" @@ -673,9 +682,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -737,19 +746,19 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "oorandom" @@ -867,15 +876,15 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[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.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -931,9 +940,9 @@ 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", ] @@ -1007,9 +1016,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "regex-syntax", ] @@ -1037,9 +1046,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "same-file" @@ -1064,24 +1073,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -1090,9 +1099,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -1152,9 +1161,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -1187,18 +1196,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1257,9 +1266,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -1278,9 +1287,9 @@ 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" diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index 649edb7b41b33..b8ce9ce755bce 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.1.16"; + version = "0.2.0"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = "refs/tags/${version}"; - sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8="; + rev = version; + hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU="; }; patches = [ diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 40018a49c8cc1..52cd1a8cf28a7 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , dnspython +, deprecat , fetchFromGitHub , loguru , passlib @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.50"; + version = "1.7.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mpenning"; repo = pname; - rev = version; - hash = "sha256-OKPw7P2hhk8yzqjOcf2NYEueJR1ecC/D93ULfkM88Xg="; + rev = "refs/tags/${version}"; + hash = "sha256-oGvwtaIgVvvW8Oq/dZN+Zj/PESpqWALFYPia9yeilco="; }; postPatch = '' @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib + deprecat dnspython loguru toml @@ -51,6 +53,8 @@ buildPythonPackage rec { # Tests require network access "test_dns_lookup" "test_reverse_dns_lookup" + # Path issues with configuration files + "testParse_valid_filepath" ]; pythonImportsCheck = [ @@ -58,8 +62,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + description = "Module to parse, audit, query, build, and modify Cisco IOS-style configurations"; homepage = "https://github.com/mpenning/ciscoconfparse"; + changelog = "https://github.com/mpenning/ciscoconfparse/blob/${version}/CHANGES.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro ]; }; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 38c7ee4a2d7f4..db488dcae7031 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.34"; + version = "9.2.40"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2oUUIPHBT/pAAWUy+8fuEqZv0pG1OHDn6eaphOsrevE="; + hash = "sha256-J56UP/6LoC9Tqf4zZb0Tup8la2a++9LCBwav3CclOuM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index c2087409b0488..8ae90785669e5 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { 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"; + env.NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 80f82d1ac9460..44c5937042d0a 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.34"; + version = "9.2.40"; # 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-mbYitM0ibUSxBRhbF1ecB1MOryhWRPZZ1ujRFD8iiWs="; + hash = "sha256-xNVZzw5m8OZNoK2AcbaSOEbr7uTVcMI7HCgRqylayDo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index ac382aaf7ef6b..375fee87486cd 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 = [ diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 7e826194de45b..6099c3c635911 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -5,7 +5,6 @@ , mock , blessings , nose -, nose_progressive , pillow , args , pkgs @@ -28,7 +27,7 @@ buildPythonPackage rec { # no longer compatible as behavior demand 2to3, which was removed # in setuptools>=58 doCheck = false; - nativeCheckInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; + nativeCheckInputs = [ mock nose pkgs.glibcLocales ]; checkPhase = '' ${python.interpreter} test_clint.py ''; diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index cbd1e4615c11d..1de1b81d89b63 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 = [ - python-dateutil - tabulate - colorlog attrs + colorlog csvw + lxml + markdown + markupsafe + pylatexenc + python-dateutil + tabulate ]; 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/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 37678b93d195e..2acfe17327b6c 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; + hash = "sha256-2JaEuN6eNKKkOzRg+8oH0J1uJc6FjfTVpEJAQDthePU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index e83e3464ad5d9..285e90c22526a 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 = "2.0.0"; - + version = "2.0.1"; format = "wheel"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Mcdpmrjg5hX4BTlBgt2+jQaoCqWjNIqkBykl1iT7McA="; + hash = "sha256-wFSHlUdZTARsAV3igVXThrXoGsPUaZyzXBJCSJFZYYQ="; }; propagatedBuildInputs = [ certifi - six python-dateutil + six urllib3 ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index b38d61f6fa014..e1bd8e4f8b7bb 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.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A0arNKF9jPRj3GnnOBHG8xDD2YEPpMrPRbZEaKg8FHQ="; + sha256 = "sha256-bwqzyhQbUI2gPOGb1S8eXo0pdz/DBi1782RQqCIH7Bs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix index 0e82989caadbf..1e3a55486156b 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.25"; + version = "0.1.30"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools_rs"; rev = version; - sha256 = "sha256-s4AeXoLOtEIxCSnW5CWVZoZrAJ+wKQPklEehPAvnHMw="; + sha256 = "sha256-7eGOJgcZcSGmvLJc5BVfWarcu9kQb/uEcnG70JWXDSw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-4SjSpEMu6NAPn50u7iyAznTw4AL4+KmBvppMV4+w6Jk="; + sha256 = "sha256-46WEmp1FT6biM9A2M7z5onb45XhWjePKb6NSwLjuemc="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 5f1121c8e914b..ee3a552b94f30 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/cmaes/default.nix b/pkgs/development/python-modules/cmaes/default.nix new file mode 100644 index 0000000000000..fdb2a1d0fcc0c --- /dev/null +++ b/pkgs/development/python-modules/cmaes/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hypothesis +, numpy +, setuptools +}: + +buildPythonPackage rec { + pname = "cmaes"; + version = "0.9.1"; + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CyberAgentAILab"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-dd5vLT4Q0cI5ts0WgBpjPtOA81exGNjWSNHEiPggYbg="; + }; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ pytestCheckHook hypothesis ]; + + pythonImportsCheck = [ "cmaes" ]; + + meta = with lib; { + description = "Python library for CMA evolution strategy"; + homepage = "https://github.com/CyberAgentAILab/cmaes"; + license = licenses.mit; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index e3ca8380c6590..646fef8f47fa9 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -1,73 +1,53 @@ { lib , fetchPypi , rustPlatform +, cffi +, libiconv , stdenv -, Security -, writeShellScriptBin +, darwin , buildPythonPackage -, setuptools-scm , appdirs -, milksnake , pyyaml , hypothesis , jinja2 -, mock , pytestCheckHook +, unzip }: -let - pname = "cmsis-pack-manager"; - version = "0.5.1"; + +buildPythonPackage rec { + pname = "cmsis_pack_manager"; + version = "0.5.2"; src = fetchPypi { - pname = "cmsis_pack_manager"; - inherit version; - sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk="; + inherit pname version; + hash = "sha256-sVfyz9D7/0anIp0bEPp1EJkERDbNJ3dCcydLbty1KsQ="; }; - native = rustPlatform.buildRustPackage { - name = "${pname}-${version}-native"; - + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - - buildInputs = lib.optionals stdenv.isDarwin [ - Security - ]; - - sourceRoot = "${pname}-${version}/rust"; - cargoLock.lockFile = ./Cargo.lock; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - cargoBuildFlags = [ "--lib" ]; + sha256 = "dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI="; }; -in -buildPythonPackage rec { - inherit pname version src; - - # The cargo build is already run in a separate derivation - postPatch = '' - substituteInPlace setup.py \ - --replace "'cargo', 'build'," "'true'," - ''; - - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ appdirs milksnake pyyaml ]; - nativeCheckInputs = [ hypothesis jinja2 mock pytestCheckHook ]; + nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook ]; + propagatedNativeBuildInputs = [ cffi ]; + buildInputs = [ libiconv ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + propagatedBuildInputs = [ appdirs pyyaml ]; + nativeCheckInputs = [ hypothesis jinja2 pytestCheckHook unzip ]; - preBuild = '' - mkdir -p rust/target/release/deps - ln -s ${native}/lib/libcmsis_cffi${stdenv.hostPlatform.extensions.sharedLibrary} rust/target/release/deps/ - ''; + format = "pyproject"; preCheck = '' - # Otherwise the test uses a dummy library (missing all symbols) - ln -sf ../build/lib/cmsis_pack_manager/_native__lib${stdenv.hostPlatform.extensions.sharedLibrary} cmsis_pack_manager/_native__lib${stdenv.hostPlatform.extensions.sharedLibrary} + unzip $dist/*.whl cmsis_pack_manager/cmsis_pack_manager/native.so ''; - pythonImportsCheck = [ "cmsis_pack_manager" ]; + disabledTests = [ + # All require DNS. + "test_pull_pdscs" + "test_install_pack" + "test_pull_pdscs_cli" + "test_dump_parts_cli" + ]; meta = with lib; { description = "A Rust and Python module for handling CMSIS Pack files"; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 4efa160d27eab..35195b1db529e 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -16,18 +16,22 @@ , pomegranate , pyfaidx , python +, pythonOlder , R }: buildPythonPackage rec { - pname = "CNVkit"; - version = "0.9.9"; + pname = "cnvkit"; + version = "0.9.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "etal"; repo = "cnvkit"; - rev = "v${version}"; - sha256 = "1q4l7jhr1k135an3n9aa9wsid5lk6fwxb0hcldrr6v6y76zi4gj1"; + rev = "refs/tags/v${version}"; + hash = "sha256-mCQXo3abwC06x/g51UBshqUk3dpqEVNUvx+cJ/EdYGQ="; }; postPatch = '' @@ -74,6 +78,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://cnvkit.readthedocs.io"; description = "A Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; + changelog = "https://github.com/etal/cnvkit/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.jbedo ]; }; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index c51dd9ecc95ef..0dc799d7ea236 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zDMcQPAYlxid3fcMT8kRzE+LN1dxUVWjkg8pdVtmwZg="; + sha256 = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix index c4d20c23d3f28..d1545d36b3764 100644 --- a/pkgs/development/python-modules/collections-extended/default.nix +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -5,6 +5,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { @@ -12,7 +13,8 @@ buildPythonPackage rec { version = "2.0.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + # https://github.com/mlenzen/collections-extended/issues/198 + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "mlenzen"; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index df12b6a98af1c..932e434d923d1 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "configobj"; - version = "5.0.6"; + version = "5.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DiffSK"; repo = pname; - rev = "v${version}"; - hash = "sha256-HMLYzVMnxvMpb3ORsbKy18oU/NkuRT0isK6NaUk6J3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-t3Q0FEBibkAM5PAG4fjXwNH/71RqSSDj/Mn27ri0iDU="; }; propagatedBuildInputs = [ @@ -26,17 +26,21 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytestCheckHook ]; + checkInputs = [ + mock + ]; + pythonImportsCheck = [ "configobj" ]; meta = with lib; { description = "Config file reading, writing and validation"; - homepage = "https://pypi.python.org/pypi/configobj"; + homepage = "https://github.com/DiffSK/configobj"; + changelog = "https://github.com/DiffSK/configobj/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 4ea01b221d549..d4eb668d73edb 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 = [ @@ -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/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 9b7914e5b9c15..ed40735a20639 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -66,6 +66,10 @@ buildPythonPackage rec { "TestVMDKConversion" # CLI test fails with AssertionError "test_help" + # Failing TestCOTDeployESXi tests + "test_serial_fixup_stubbed" + "test_serial_fixup_stubbed_create" + "test_serial_fixup_stubbed_vm_not_found" ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; diff --git a/pkgs/development/python-modules/criticality-score/default.nix b/pkgs/development/python-modules/criticality-score/default.nix index 6b3348472a425..d7e4ac4619b1f 100644 --- a/pkgs/development/python-modules/criticality-score/default.nix +++ b/pkgs/development/python-modules/criticality-score/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "criticality_score"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "0i811a27i87z3j1rw0dwrnw8v0ckbd918ms6shjawhs4cnb1c6x8"; + sha256 = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ="; }; propagatedBuildInputs = [ PyGithub python-gitlab ]; @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for computing the Open Source Project Criticality Score."; homepage = "https://github.com/ossf/criticality_score"; + changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ wamserma ]; }; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ead0a1b1a5c0f..ba2407923f33a 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -28,20 +28,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "38.0.4"; # Also update the hash in vectors.nix + version = "39.0.1"; # Also update the hash in vectors.nix format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-F1wagYuHyayAu3N39VILfzGz7yoABOJCAxm+re22cpA="; + hash = "sha256-0fYZjubZFIQF5JiHgDkH/olioj5sb4PqfZjxwN43VpU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; + hash = "sha256-0x+KIqJznDEyIUqVuYfIESKmHBWfzirPeX2R/cWlngc="; }; cargoRoot = "src/rust"; @@ -62,7 +62,8 @@ buildPythonPackage rec { nativeCheckInputs = [ cryptography-vectors - hypothesis + # "hypothesis" indirectly depends on cryptography to build its documentation + (hypothesis.override { enableDocumentation = false; }) iso8601 pretend py diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 31ace7c48ffdf..b054f89aa3a6d 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-bsYmlb7F34ECiN3OrpmK5pHNuKFigI1svJYNPeuafbE="; + hash = "sha256-DLrrUL2388nXqTsmoEYu9ul8doynjZAoVP4EXDC2gMY="; }; # No tests included diff --git a/pkgs/development/python-modules/cstruct/default.nix b/pkgs/development/python-modules/cstruct/default.nix new file mode 100644 index 0000000000000..688fe787af2be --- /dev/null +++ b/pkgs/development/python-modules/cstruct/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cstruct"; + version = "5.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "andreax79"; + repo = "python-cstruct"; + rev = "v${version}"; + hash = "sha256-Dwogf0mmxFyBV7tPsuKV6gMZLPSCm7YhzqgJNHpaPFA="; + }; + + pythonImportsCheck = [ + "cstruct" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "C-style structs for Python"; + homepage = "https://github.com/andreax79/python-cstruct"; + changelog = "https://github.com/andreax79/python-cstruct/blob/v${version}/changelog.txt"; + license = licenses.mit; + maintainers = with maintainers; [ tnias ]; + }; +} diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 6d9efc36e406c..b44c51e4014c1 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "tags/${version}"; - hash = "sha256-8qlXwEbgLRZ1qYtBJ1c0nv6qfIOW5zAK9eOS+n+afWQ="; + hash = "sha256-hJPcxnc4iQzsYNNVJ9fw6yQl+5K7pdtjHT6oMmBx/Zs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index e9d42e4535f5c..9f4979c53265c 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-6S646cvm+UwdpRGOtCuNijWcUxhZD6IG407hNBz+NA4="; + sha256 = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 0bb4e8dbcbe61..d47debe407e93 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,27 +30,37 @@ 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 '' export CVXOPT_BUILD_GSL=1 - export CVXOPT_GSL_LIB_DIR=${gsl}/lib - export CVXOPT_GSL_INC_DIR=${gsl}/include + export CVXOPT_GSL_LIB_DIR=${lib.getLib gsl}/lib + export CVXOPT_GSL_INC_DIR=${lib.getDev gsl}/include '' + lib.optionalString withGlpk '' export CVXOPT_BUILD_GLPK=1 - export CVXOPT_GLPK_LIB_DIR=${glpk}/lib - export CVXOPT_GLPK_INC_DIR=${glpk}/include + export CVXOPT_GLPK_LIB_DIR=${lib.getLib glpk}/lib + export CVXOPT_GLPK_INC_DIR=${lib.getDev glpk}/include '' + lib.optionalString withFftw '' export CVXOPT_BUILD_FFTW=1 - export CVXOPT_FFTW_LIB_DIR=${fftw}/lib - export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include + export CVXOPT_FFTW_LIB_DIR=${lib.getLib fftw}/lib + export CVXOPT_FFTW_INC_DIR=${lib.getDev fftw}/include ''; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 3fd18bd030070..3ca704d1066cf 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.2.3"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-IaeUtv0vdgqddm1o++SUZTT2Xom3Pom4icVQOYVVi4Y="; + hash = "sha256-Zszme9xjW5spBmUQR0OSwM/A2V24rdpAENyM3Y4EYlA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index 038bf395e9629..0c0618f9c3d0e 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.21"; + version = "0.23"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y1zuYaxoE0XUk8UpCLsg4ty0sn+5Uu4ztRnUoJezO/o="; + hash = "sha256-tr4QQ/p0jx/e5kHx4WSYfo06/qMNFyxIGsaAA8nBBoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix index f2e0a4b2d96c2..a33a26d5224d5 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.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,9 +16,14 @@ buildPythonPackage rec { owner = "konradhalas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+yWvlJcOmqDkHl3JZfPnIV3C4ieSo4FiBvoUZ0+J4N0="; + hash = "sha256-aQwQHFWaXwTaA6GQgDcWT6ivE9YtWtHCTOtxDi503+M="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--benchmark-autosave --benchmark-json=benchmark.json" "" + ''; + nativeCheckInputs = [ pytestCheckHook ]; @@ -28,6 +32,10 @@ buildPythonPackage rec { "dacite" ]; + disabledTestPaths = [ + "tests/performance" + ]; + meta = with lib; { description = "Python helper to create data classes from dictionaries"; homepage = "https://github.com/konradhalas/dacite"; diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index c34d402de5e5a..a7e0b754273f3 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.7"; + version = "unstable-11-10-2022"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY="; + src = fetchFromGitHub { + owner = "rhinstaller"; + repo = pname; + rev = "64b6b4d9e37cd7e0cbf4a7bf75faa7cdbd01086d"; + hash = "sha256-TmhhDrfpP+nUErAd7dUb+RtGBRtWwn3bYOoIqa0VRoc="; }; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ pygobject3 ]; - nativeCheckInputs = [ dbus ]; + nativeCheckInputs = [ dbus pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/rhinstaller/dasbus"; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index f859a43bd1e20..a43f1a5afb570 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, arrow-cpp , bokeh , buildPythonPackage , click @@ -70,13 +71,14 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - fastparquet - pyarrow pytestCheckHook pytest-rerunfailures pytest-xdist scipy zarr + ] ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 + fastparquet + pyarrow ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index e698d53f433d7..5c01cb734d751 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -1,49 +1,67 @@ { lib , buildPythonPackage , fetchFromGitHub -, thrift +, lz4 +, numpy +, oauthlib , pandas -, pyarrow , poetry-core +, pyarrow , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, thrift }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.2.1"; + version = "2.3.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA="; + hash = "sha256-XyDkL/bGnivx7MRG86vGS69mKdrWw7kKiuvQfBYFKVQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'thrift = "^0.13.0"' 'thrift = ">=0.13.0,<1.0.0"' - ''; + pythonRelaxDeps = [ + "numpy" + "thrift" + ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ - thrift + lz4 + numpy + oauthlib pandas pyarrow + thrift ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/unit" ]; + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "databricks" + ]; meta = with lib; { description = "Databricks SQL Connector for Python"; homepage = "https://docs.databricks.com/dev-tools/python-sql-connector.html"; + changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ harvidsen ]; }; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 6a258cf73036c..d3592d76a8f09 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,18 +1,16 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, hatchling -, decorator -, requests -, typing ? null -, configparser , click +, fetchPypi , freezegun +, hatchling , mock -, pytestCheckHook , pytest-vcr +, pytestCheckHook , python-dateutil +, pythonAtLeast +, pythonOlder +, requests , vcrpy }: @@ -21,22 +19,20 @@ buildPythonPackage rec { version = "0.44.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; + hash = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; - postPatch = '' - find . -name '*.pyc' -exec rm {} \; - ''; - nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ decorator requests ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (pythonOlder "3.0") configparser; + propagatedBuildInputs = [ + requests + ]; nativeCheckInputs = [ click @@ -54,13 +50,20 @@ buildPythonPackage rec { disabledTests = [ "test_default_settings_set" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/DataDog/datadogpy/issues/746 + "TestDogshell" ]; - pythonImportsCheck = [ "datadog" ]; + pythonImportsCheck = [ + "datadog" + ]; meta = with lib; { description = "The Datadog Python library"; - license = licenses.bsd3; homepage = "https://github.com/DataDog/datadogpy"; + changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/datafusion/Cargo.lock.patch b/pkgs/development/python-modules/datafusion/Cargo.lock.patch deleted file mode 100644 index e4e5eca8af4c8..0000000000000 --- a/pkgs/development/python-modules/datafusion/Cargo.lock.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index fa84a54c..3d790e1c 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,9 +57,9 @@ checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" - - [[package]] - name = "arrow" --version = "6.0.0" -+version = "6.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "337e668497751234149fd607f5cb41a6ae7b286b6329589126fe67f0ac55d637" -+checksum = "216c6846a292bdd93c2b93c1baab58c32ff50e2ab5e8d50db333ab518535dd8b" - dependencies = [ - "bitflags", - "chrono", -@@ -212,9 +212,9 @@ dependencies = [ - - [[package]] - name = "comfy-table" --version = "4.1.1" -+version = "5.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3" -+checksum = "c42350b81f044f576ff88ac750419f914abb46a03831bb1747134344ee7a4e64" - dependencies = [ - "strum", - "strum_macros", -@@ -279,7 +279,7 @@ dependencies = [ - - [[package]] - name = "datafusion" --version = "5.1.0" -+version = "6.0.0" - dependencies = [ - "ahash", - "arrow", -@@ -310,7 +310,7 @@ dependencies = [ - - [[package]] - name = "datafusion-python" --version = "0.3.0" -+version = "0.4.0" - dependencies = [ - "datafusion", - "pyo3", -@@ -877,9 +877,9 @@ dependencies = [ - - [[package]] - name = "parquet" --version = "6.0.0" -+version = "6.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d263b9b59ba260518de9e57bd65931c3f765fea0fabacfe84f40d6fde38e841a" -+checksum = "788d9953f4cfbe9db1beff7bebd54299d105e34680d78b82b1ddc85d432cac9d" - dependencies = [ - "arrow", - "base64", -@@ -1228,15 +1228,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - - [[package]] - name = "strum" --version = "0.21.0" -+version = "0.22.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" -+checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" - - [[package]] - name = "strum_macros" --version = "0.21.1" -+version = "0.22.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -+checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" - dependencies = [ - "heck", - "proc-macro2", diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index fb991dabf3d20..84afbfc3a1c10 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -5,54 +5,42 @@ , fetchPypi , fetchFromGitHub , rustPlatform -, maturin , pytestCheckHook , libiconv , numpy , pandas , pyarrow -, pytest }: + let - # le sigh, the perils of unrelated versions of software living in the same - # repo: there's no obvious way to map the top level source repo - # (arrow-datafusion) version to the version of contained repo - # (arrow-datafusion/python) - # - # A commit hash will do in a pinch, and ultimately the sha256 has the final - # say of what the content is when building - cargoLock = fetchurl { - url = "https://raw.githubusercontent.com/apache/arrow-datafusion/6.0.0/python/Cargo.lock"; - sha256 = "sha256-xiv3drEU5jOGsEIh0U01ZQ1NBKobxO2ctp4mxy9iigw="; + arrow-testing = fetchFromGitHub { + owner = "apache"; + repo = "arrow-testing"; + rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; + hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; }; - postUnpack = '' - cp "${cargoLock}" $sourceRoot/Cargo.lock - chmod u+w $sourceRoot/Cargo.lock - ''; + parquet-testing = fetchFromGitHub { + owner = "apache"; + repo = "parquet-testing"; + rev = "5b82793ef7196f7b3583e85669ced211cd8b5ff2"; + hash = "sha256-gcOvk7qFHZgJWE9CpucC8zwayYw47VbC3lmSRu4JQFg="; + }; in + buildPythonPackage rec { pname = "datafusion"; - version = "0.4.0"; + version = "0.7.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+YqogteKfNhtI2QbVXv/5CIWm3PcOH653dwONm5ZcL8="; + sha256 = "sha256-XYXZMorPs2Ue7E38DASd4rmxvX0wlx8A6sCpAbYUh4I="; }; - inherit postUnpack; - - # TODO: remove the patch hacking and postUnpack hooks after - # https://github.com/apache/arrow-datafusion/pull/1508 is merged - # - # the lock file isn't up to date as of 6.0.0 so we need to patch the source - # lockfile and the vendored cargo deps lockfile - patches = [ ./Cargo.lock.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src pname version postUnpack; - sha256 = "sha256-JGyDxpfBXzduJaMF1sbmRm7KJajHYdVSj+WbiSETiY0="; - patches = [ ./Cargo.lock.patch ]; + inherit src pname version; + sha256 = "sha256-6mPdKwsEN09Gf4eNsd/v3EBHVezHmff/KYB2lsXgzcA="; }; nativeBuildInputs = with rustPlatform; [ @@ -68,13 +56,18 @@ buildPythonPackage rec { pyarrow ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "datafusion" ]; + pytestFlagsArray = [ "--pyargs" pname ]; + + preCheck = '' + pushd $TMPDIR + ln -s ${arrow-testing} ./testing + ln -s ${parquet-testing} ./parquet + ''; - checkPhase = '' - runHook preCheck - pytest --pyargs "${pname}" - runHook postCheck + postCheck = '' + popd ''; meta = with lib; { diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix new file mode 100644 index 0000000000000..af221199c9107 --- /dev/null +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, mbstrdecoder +, typepy +, pytestCheckHook +, termcolor +}: + +buildPythonPackage rec { + pname = "dataproperty"; + version = "0.55.0"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44="; + }; + + propagatedBuildInputs = [ mbstrdecoder typepy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ termcolor ]; + + # Tests fail, even on non-nixos + pytestFlagsArray = [ + "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence" + "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal" + "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal" + ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/dataproperty"; + description = "A library for extracting properties from data"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 514876761ebfe..d437c5794feb5 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/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 5115484424dd9..2fb9d7ce41276 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.6.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,17 +30,9 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5j8HT/DzHH8xssv97g/9kpSgtpaY6daWOGwjasD1psg="; + hash = "sha256-GEH7uk8M5pxYDKzfTRNMlnI5yrLr5K2PuD7CJV/wbu4="; }; - patches = [ - (fetchpatch { - # Backport support for dill<3.7 - url = "https://github.com/huggingface/datasets/pull/5166.patch"; - hash = "sha256-QigpXKHi2B60M/iIWSqvBU9hW5vBu6IHGML22aCMevo="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "responses<0.19" "responses" diff --git a/pkgs/development/python-modules/datasette-publish-fly/default.nix b/pkgs/development/python-modules/datasette-publish-fly/default.nix index 0ca0bec083929..521b408b524c1 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,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = pname; - rev = version; - hash = "sha256-0frP/RkpZX6LCR8cOlzcBG3pbcOh0KPuELlYUXS3dRE="; + rev = "refs/tags/${version}"; + hash = "sha256-L94QYcrTWjuoz0aEFTxPi8Xg0xERP1zCs7+vzhoJagc="; }; propagatedBuildInputs = [ @@ -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/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index f526438afafc7..d9c5b1b4464de 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.3"; + version = "0.14.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28="; + hash = "sha256-AkHmEflRvjJFlycI5adpuxg6+/zu7Dzy7vbYCvd1b70="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 222399fdfd21d..599d2e6cec72b 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ docutils pytestCheckHook ]; LLVM = llvm; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; # test suite is very cpu intensive, only run small subset to ensure package is working as expected pytestFlagsArray = [ "tests/test-sets.py" ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 2b5223c044c19..4af53c9f756db 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.6"; + version = "1.1.7"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rn8RD1nnUi4MhK6QKLaP5eG6UAFrhlecimvn8sAsu6k="; + hash = "sha256-KQCjXuBDBZduNYJITwk1qx7mBp8CJ95ZbFlhrFMkE8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index b8f2fffe0e1af..09eff1461d5aa 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.84.0"; + version = "1.84.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AdfrzN7ufvy77tKjnHPNo+jHoHRw9fXtdUdYvdnMAjs="; + hash = "sha256-L2+8mS7mTRWDQwXcYfJW3078N69AFY2vs4a4vi62XYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 98981a65adbc3..861f9c6847ce1 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.23.4"; + version = "4.24.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YwozwoTb1JsvrwcTntlpWpQJ9DszH2lmtuKkK8qZiG0="; + hash = "sha256-5gd46SMucH0rek9talMJ74TMRRvUm5Up6pCusUIHDjE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index e68cda8c0e254..eec2c9fd895c2 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -1,12 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, requests, click }: +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, requests +, click +, pythonOlder +}: buildPythonPackage rec { pname = "deep-translator"; - version = "1.9.2"; + version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iHK1A44SZqJ5N+D2ets76xuU0mryGT7TehM4wryB/AY="; + hash = "sha256-7VsEN6t9c0FMw0zHWnxnIyilQmQ127rXEfLrAYatKEc="; }; propagatedBuildInputs = [ @@ -25,9 +35,10 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Flexible, free and unlimited Python tool to translate between different languages in a simple way using multiple translators"; + description = "Python tool to translate between different languages by using multiple translators"; homepage = "https://deep-translator.readthedocs.io"; - license = licenses.mit; + changelog = "https://github.com/nidhaloff/deep-translator/releases/tag/v1.10.0"; + license = licenses.asl20; maintainers = with maintainers; [ wolfangaukang ]; }; } diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index b4921b2d1f443..f5ea937a4f15f 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , click , ordered-set +, orjson , clevercsv , jsonpickle , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "6.2.1"; + version = "6.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-AKah3A9srKm/cFWM7IiZ7JxQ8s0KTuh8VLKOymsDgnA="; + hash = "sha256-rlMksUi+R48fIEjVv2E3yOETDezTghZ8+Zsypu8fAnQ="; }; postPatch = '' @@ -33,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ordered-set + orjson ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 4bb079e9be7a6..8d5d9da29a023 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,14 +1,11 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi -, fontpens +, setuptools-scm , fonttools -, fs -, lxml +, fontpens , pytestCheckHook -, pythonOlder -, setuptools-scm -, unicodedata2 }: buildPythonPackage rec { @@ -30,23 +27,27 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools - ]; + ] + ++ fonttools.optional-dependencies.ufo + ++ fonttools.optional-dependencies.unicode; nativeCheckInputs = [ - fontpens - fs - lxml pytestCheckHook - unicodedata2 ]; pythonImportsCheck = [ "defcon" ]; + passthru.optional-dependencies = { + pens = [ fontpens ]; + lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml; + }; + meta = with lib; { description = "A set of UFO based objects for use in font editing applications"; homepage = "https://github.com/robotools/defcon"; + changelog = "https://github.com/robotools/defcon/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann ]; }; diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index d0bdc0cd7179c..92777f73e7ad5 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , pkg-config , pkgconfig , setuptools-scm +, wheel , libdeltachat , cffi , imap-tools @@ -18,12 +19,16 @@ buildPythonPackage rec { inherit (libdeltachat) version src; sourceRoot = "${src.name}/python"; - disabled = isPy27; + disabled = pythonOlder "3.7"; + format = "pyproject"; nativeBuildInputs = [ + cffi pkg-config pkgconfig + setuptools setuptools-scm + wheel ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -37,7 +42,6 @@ buildPythonPackage rec { imap-tools pluggy requests - setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 14fe85c6af51c..23a86a184c36b 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , asyncstdlib , attrs , buildPythonPackage @@ -15,16 +16,16 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "scarface-4711"; + owner = "ol-iver"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0zclIoEGKjA8Ro8k+HYX/d77U+ntQZv0vq6gC4Sa7zE="; + hash = "sha256-iYekqqhrcN1rbclFVSbJSF5ky19WsBLKlTxAa2HULqY="; }; propagatedBuildInputs = [ @@ -33,6 +34,8 @@ buildPythonPackage rec { defusedxml httpx netifaces + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ @@ -48,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Denon AVR receivers"; - homepage = "https://github.com/scarface-4711/denonavr"; + homepage = "https://github.com/ol-iver/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/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix new file mode 100644 index 0000000000000..da81c63cca869 --- /dev/null +++ b/pkgs/development/python-modules/deprecat/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +, wrapt +}: + +buildPythonPackage rec { + pname = "deprecat"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mjhajharia"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-3Xl/IC+ImFUxxLry15MIIVRf6aR+gA9K5S2IQomkv+o="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + wrapt + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deprecat" + ]; + + meta = with lib; { + description = "Decorator to deprecate old python classes, functions or methods"; + homepage = "https://github.com/mjhajharia/deprecat"; + changelog = "https://github.com/mjhajharia/deprecat/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 840fbda9231b4..29e5f915ccca0 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.2"; + version = "3.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OujBpq3SBDKw9Jgb9MD200Rp0fD0OJRw90flxS22I2s="; + hash = "sha256-V5CggWp9G0/XoQhArrY3LCvfkF2SymORDWdJGjsr7yI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index c437a1b565850..e349151f316ca 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.7.1"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-crKTxlueE8NGjAqu625iFvp35UK2U7+9kl8rpbzf0gs="; + hash = "sha256-Wuq49deZKhIHHhxgxgzxxY/3aQcJVCJ0ofGwDrUcHkY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index de4c90d4b03bf..e8bccf2928aa7 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.9.0"; - 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-FBcDEEWgfV+OgHriSOZKWZPt0O89nDe2CsY3oqX/6zo="; + rev = "refs/tags/v${version}"; + hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,15 +46,14 @@ buildPythonPackage rec { 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 d9128cdc9dc1c..6d41bc86ba086 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ="; + sha256 = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index d41743ecbe547..f7dda6214ac8f 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.23.1"; + 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-gVUlP3offTgHUBTTIzTBf7b2NpBjGlAHYQQxe6ks0v8="; + hash = "sha256-4b+jmR56y2VV0XxD6FCmNpDB0UKH9+FqcTQuU2jRCXo="; }; postPatch = '' @@ -40,20 +42,33 @@ buildPythonPackage rec { ./remove-black-requirement.patch ]; - nativeCheckInputs = [ 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 dcf9b4d2ad119..d6c9b42270916 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 <mail@fabian-affolter.ch> +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/dicom-numpy/default.nix b/pkgs/development/python-modules/dicom-numpy/default.nix new file mode 100644 index 0000000000000..c1248ad214860 --- /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/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index a51ec5303cd2e..7b18007dc169d 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -1,21 +1,31 @@ { lib -, fetchPypi , buildPythonPackage +, fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.1"; - format = "setuptools"; + version = "1.7.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY="; + src = fetchFromGitHub { + owner = "delfick"; + repo = "python-dict2xml"; + rev = "refs/tags/release-${version}"; + hash = "sha256-Ara+eWaUQv4VuzuVrpb5mjMXHHCxydS22glLsYz+UE0="; }; + nativeBuildInputs = [ + setuptools + ]; + + # Tests are inplemented in a custom DSL (RSpec) + doCheck = false; + pythonImportsCheck = [ "dict2xml" ]; @@ -23,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to convert a Python dictionary into an XML string"; homepage = "https://github.com/delfick/python-dict2xml"; + changelog = "https://github.com/delfick/python-dict2xml/releases/tag/release-${version}"; license = licenses.mit; maintainers = with maintainers; [ johnazoidberg ]; }; diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix deleted file mode 100644 index 8fbe1661ecdae..0000000000000 --- 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.4.3"; - - src = fetchFromGitHub { - owner = "p1c2u"; - repo = "dictpath"; - rev = "refs/tags/${version}"; - sha256 = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew="; - }; - - postPatch = '' - sed -i "/^addopts/d" setup.cfg - ''; - - nativeCheckInputs = [ - 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/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index a6f2d3dc09725..aea49cde6f180 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 = "1.0.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nedbat"; repo = pname; - rev = version; - hash = "sha256-hrRs4hBRckUMsDGix+6GMr5VwyhXl/ib3jon7VNca1Y="; + rev = "refs/tags/${version}"; + hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A GitHub activity digest tool"; homepage = "https://github.com/nedbat/dinghy"; + changelog = "https://github.com/nedbat/dinghy/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ trundle veehaitch ]; }; diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index cec15c0fd0fa3..8a69a5f7de504 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 ]; diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index e13da65aee190..ccd426f94bad4 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.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; - rev = version; - hash = "sha256-d02P6RXIiriOujGns9mOkyiJLNQFNTTW61kInzS17Y4="; + rev = "refs/tags/${version}"; + hash = "sha256-RlkTsAvX+9c69JBy+DZbcCfAvcCnWDisgdQQMBkphtg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database"; homepage = "https://github.com/fox-it/dissect.cim"; + changelog = "https://github.com/fox-it/dissect.cim/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 3e807d3bd2601..d73d2145985f4 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.2"; + version = "1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.clfs"; - rev = version; - hash = "sha256-1nh81ppJpYre3y7hJ9xS+TNU1NfTH+9NMHdV55kPEXI="; + rev = "refs/tags/${version}"; + hash = "sha256-QzEcJvujkNVUXtqu7yY7sJ/U55jzGBbUHxOVDxg4vac="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the CLFS (Common Log File System) file system"; homepage = "https://github.com/fox-it/dissect.clfs"; + changelog = "https://github.com/fox-it/dissect.clfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 722e1a75f7758..6b0f74f16bd76 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.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; - rev = version; - hash = "sha256-8OxAsrECgsQf8+EaZtJ3XNhwdhBI08o3r+xhD/D1NhQ="; + rev = "refs/tags/${version}"; + hash = "sha256-tEWqw3ySF1ebOMztZwAlkTiY0mFCzTM58wD0XDfljFA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for C-like structures"; homepage = "https://github.com/fox-it/dissect.cstruct"; + changelog = "https://github.com/fox-it/dissect.cstruct/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 74c8bdf9ec702..e2188b70ff750 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.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.esedb"; - rev = version; - hash = "sha256-ErPihjAcukMerCAxLdDQVUApeNdFnFn0Zejo3LhgZFc="; + rev = "refs/tags/${version}"; + hash = "sha256-wTzr9b95jhPbZVWM/C9T1OSBLK39sCIjbsNK/6Z83JE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Microsofts Extensible Storage Engine Database (ESEDB)"; homepage = "https://github.com/fox-it/dissect.esedb"; + changelog = "https://github.com/fox-it/dissect.esedb/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index ffde954907630..6c0bc54c42fbc 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.etl"; - rev = version; - hash = "sha256-s3Ls8tuqp/COBF+WV9RRyfo7FAqPcXmBZ08gHZMPzOU="; + rev = "refs/tags/${version}"; + hash = "sha256-rEYWTMBzMyaADqT1Pp5z1J2Uf/t/GeX/FAnZVnaycYs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Event Trace Log (ETL) files"; homepage = "https://github.com/fox-it/dissect.etl"; + changelog = "https://github.com/fox-it/dissect.etl/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 7fa3e68cabc68..00021187679e5 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.eventlog"; - rev = version; - hash = "sha256-emNGZs/5LWD29xE5BmXQKQfkZApLZlGs6KNIqobaKvM="; + rev = "refs/tags/${version}"; + hash = "sha256-PbU9Rd0D+xdleTIMAV+esw1WynWU4++8KeXlHS9yiJs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for the Windows EVT, EVTX and WEVT log file formats"; homepage = "https://github.com/fox-it/dissect.eventlog"; + changelog = "https://github.com/fox-it/dissect.eventlog/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index f6608aac9f716..ed3cbb56eb077 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.evidence"; - rev = version; - hash = "sha256-rm9IjsXHz4GS8M/oPaDoaxjwqMMtD0qjRtQ3vFJQyQY="; + rev = "refs/tags/${version}"; + hash = "sha256-R4ua7JeT09GkoBwM2YGf2T0PJXhldUpqAS3xsB9L79c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parsers for various forensic evidence file containers"; homepage = "https://github.com/fox-it/dissect.evidence"; + changelog = "https://github.com/fox-it/dissect.evidence/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix new file mode 100644 index 0000000000000..0b932de9a2a21 --- /dev/null +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, setuptools +, setuptools-scm +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dissect-executable"; + version = "1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.executable"; + rev = "refs/tags/${version}"; + hash = "sha256-c58g2L3B/3/pC+iyXphYsjhpBs0I0Q64B8+rv5k1dtg="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + pythonImportsCheck = [ + "dissect.executable" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for various executable formats such as PE, ELF and Macho-O"; + homepage = "https://github.com/fox-it/dissect.executable"; + changelog = "https://github.com/fox-it/dissect.executable/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 45aea2685d595..f337d3ae8efd5 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; - rev = version; - hash = "sha256-KGqmguKwCSQw2USKuWFMQCz+D8XMv5W12eJfUxgz324="; + rev = "refs/tags/${version}"; + hash = "sha256-VCPNY/4SUkFpLuSs2Cxu8u5qt2sQ9VGlfdPssybxhk8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the ExtFS file system"; homepage = "https://github.com/fox-it/dissect.extfs"; + changelog = "https://github.com/fox-it/dissect.extfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 47b2cafdb8131..b384fb5cba9fc 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.fat"; - rev = version; - hash = "sha256-kqdVgUkvW9I5CI4T9b7VeX6hPm3Ufwrdnhmo1jR5Fdg="; + rev = "refs/tags/${version}"; + hash = "sha256-v4GjI6DdDfxO3kGZ7Z5C6mkdRj9axsT9mvlSOQyiMBw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the FAT file system"; homepage = "https://github.com/fox-it/dissect.fat"; + changelog = "https://github.com/fox-it/dissect.fat/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index fd4d4372e2aca..37f95807fcc6e 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ffs"; - rev = version; - hash = "sha256-kcYSoY3a8ljY9LWzOUekLBzokE+wJrG1KEr0p5CCj0U="; + rev = "refs/tags/${version}"; + hash = "sha256-nGxojXslFVcqU+9StBOacmCyoZJJB4B4OIvql/cbcZE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the FFS file system"; homepage = "https://github.com/fox-it/dissect.ffs"; + changelog = "https://github.com/fox-it/dissect.ffs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 92c885907f151..b5ee17918a6f5 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.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.hypervisor"; - rev = version; - hash = "sha256-Q7lbFr+gc6inQEJT54DXjpyyis5GxrKQHI5qqa1INKo="; + rev = "refs/tags/${version}"; + hash = "sha256-dWaU3v2QcoqVIygeufy0ZYVliBE1tijV3qEsvCOIarM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files"; homepage = "https://github.com/fox-it/dissect.hypervisor"; + changelog = "https://github.com/fox-it/dissect.hypervisor/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 1b27129e9d58b..611f9b56226ea 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; - rev = version; - hash = "sha256-4QEsWTdqlHIP1a9g45+zv1SdHY0Ofsr7Rf1z+ctssSw="; + rev = "refs/tags/${version}"; + hash = "sha256-xhtAN0QaLLbQk/aAd9PlEkyW39w33iPaQtGzbouI6hc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the NTFS file system"; homepage = "https://github.com/fox-it/dissect.ntfs"; + changelog = "https://github.com/fox-it/dissect.ntfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index fb5ead471abba..5540c62a8baf3 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ole"; - rev = version; - hash = "sha256-0bIlnRFKBvSXnBIU4+1V7WzyXCvulUpNSXG1Rj2k4jY="; + rev = "refs/tags/${version}"; + hash = "sha256-m2+AcKp8rH+VQIdT85oKoA8QoyNQOmrZ2DvBELZnEqM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Object Linking & Embedding (OLE) format"; homepage = "https://github.com/fox-it/dissect.ole"; + changelog = "https://github.com/fox-it/dissect.ole/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index d731aeb68a086..c453cbf9a439c 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.regf"; - rev = version; - hash = "sha256-hSMdgGkSmFDAiO6C1xTJDmKClHwrGc887wqO3/5NZn4="; + rev = "refs/tags/${version}"; + hash = "sha256-3QJ1N9LukvEa74rndN/Sj6Vq10YJVBsOGdlMzR9TrKA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Windows registry file format"; homepage = "https://github.com/fox-it/dissect.regf"; + changelog = "https://github.com/fox-it/dissect.regf/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 4a4b3802128e8..c0f4228593a67 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.shellitem"; - rev = version; - hash = "sha256-z0/KSOgo5Gnl4MLOY5eUPHlI/8dCyYaEEiKMmkP7cgg="; + rev = "refs/tags/${version}"; + hash = "sha256-flTv2Y+UwMTQnvqRS/pZRPkTsIjvCAp7B4rKAQPOJL4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; homepage = "https://github.com/fox-it/dissect.shellitem"; + changelog = "https://github.com/fox-it/dissect.shellitem/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 55e52c9c91203..69bfbb4a659ef 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; - rev = version; - hash = "sha256-yw0EUxlgm7/3FpecGGvxkukudyFMv0fmPbOLJqc2tC0="; + rev = "refs/tags/${version}"; + hash = "sha256-sIXFEckHFr9H4oGFw8uuC+c54PR8ZbQxJKb5x5EixxQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parsers for the SQLite database file format"; homepage = "https://github.com/fox-it/dissect.sql"; + changelog = "https://github.com/fox-it/dissect.sql/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix new file mode 100644 index 0000000000000..1413b352f03c7 --- /dev/null +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, lz4 +, python-lzo +, pythonOlder +, setuptools +, setuptools-scm +, zstandard +}: + +buildPythonPackage rec { + pname = "dissect-squashfs"; + version = "1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.squashfs"; + rev = "refs/tags/${version}"; + hash = "sha256-bDR6GAgl1dOhZ3fWA7E27KS6pj9AXInNxwmwNXXV3lc="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + passthru.optional-dependencies = { + full = [ + lz4 + python-lzo + zstandard + ]; + }; + + pythonImportsCheck = [ + "dissect.squashfs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the SquashFS file system"; + homepage = "https://github.com/fox-it/dissect.squashfs"; + changelog = "https://github.com/fox-it/dissect.squashfs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 0c69d93ef3ee2..65786ef0a9e2f 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -24,6 +24,7 @@ , flow-record , fusepy , ipython +, pycryptodome , pytestCheckHook , pythonOlder , pyyaml @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.4"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -44,8 +45,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; - rev = version; - hash = "sha256-QwEznweETwDTuTctOnq0n27JYXC9BO5l6BYpXsMRVq4="; + rev = "refs/tags/${version}"; + hash = "sha256-jFQ8BxCC4PW135igfXA5EmlWYIZ0zF12suiUMiLbArA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,6 +57,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + defusedxml dissect-cstruct dissect-eventlog dissect-evidence @@ -71,7 +73,6 @@ buildPythonPackage rec { passthru.optional-dependencies = { full = [ asn1crypto - defusedxml dissect-cim dissect-clfs dissect-esedb @@ -84,6 +85,7 @@ buildPythonPackage rec { dissect-xfs fusepy ipython + pycryptodome pyyaml yara-python zstandard @@ -101,11 +103,14 @@ buildPythonPackage rec { disabledTests = [ # Test requires rdump "test_exec_target_command" + # Issue with tar file + "test_tar_sensitive_drive_letter" ]; meta = with lib; { description = "Dissect module that provides a programming API and command line tools"; homepage = "https://github.com/fox-it/dissect.target"; + changelog = "https://github.com/fox-it/dissect.target/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index ca48d44d344de..8a47b9eeaab00 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.1"; + version = "1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.thumbcache"; - rev = version; - hash = "sha256-4yUVJwIQniE9AAtAgzHczOZfyWZly86JKc0Qh3byYf4="; + rev = "refs/tags/${version}"; + hash = "sha256-lTtTZQgEvgaVoNPnVeRGO/BQU/8RfQ2ktljSBflhlOw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Windows thumbcache"; homepage = "https://github.com/fox-it/dissect.thumbcache"; + changelog = "https://github.com/fox-it/dissect.thumbcache/releases/tag/${version}"; 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 cac7233b9efb7..b816656a53b14 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.3"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; - rev = version; - hash = "sha256-HGlWyRjvXu1d0n1PPkMyl8NNRRhsjMzXZJMS1MjdTWQ="; + rev = "refs/tags/${version}"; + hash = "sha256-hijwu2QT9xJZ1F0wz5NO0mAVe/VA3JcPmoEYQiQRLtM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.util"; + changelog = "https://github.com/fox-it/dissect.util/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index a520ce8c05a5c..0834e967b2d63 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; - rev = version; - hash = "sha256-6ZNybNRL97Zz6O32r4X0K3/+vZF3Qid98rj2pgGWgvI="; + rev = "refs/tags/${version}"; + hash = "sha256-9+1geOJ+vzy6+eGibX+BUHbtzyLhq3MPBsad98ykn3I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the VMFS file system"; homepage = "https://github.com/fox-it/dissect.vmfs"; + changelog = "https://github.com/fox-it/dissect.vmfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index cff900efbefa5..9053d83f0e496 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; - rev = version; - hash = "sha256-NwY4J1FSCvNIoH9uUHJVlM3jJt6A9CZ7uCWhlIdYztM="; + rev = "refs/tags/${version}"; + hash = "sha256-5O2ywPJi9M7gvcreS7DrW2qJ32MoR3Qero7jJ5gv0ow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.volume"; + changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 60a7ee1abb2fc..772e223c59797 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.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; - rev = version; - hash = "sha256-S05Y+Oe1q4DcTR9al2K82Q41EP0FnDGUp1gfzYiS/Yk="; + rev = "refs/tags/${version}"; + hash = "sha256-OasoZ+HGvW8PPWDBvKdrfiE3FqnXPx0xjBVFWLBYHwQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the XFS file system"; homepage = "https://github.com/fox-it/dissect.xfs"; + changelog = "https://github.com/fox-it/dissect.xfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index e6da0a1a6a8e8..59db158b6636f 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -10,12 +10,14 @@ , dissect-extfs , dissect-fat , dissect-ffs +, dissect-executable , dissect-hypervisor , dissect-ntfs , dissect-ole , dissect-regf , dissect-shellitem , dissect-sql +, dissect-squashfs , dissect-target , dissect-util , dissect-vmfs @@ -29,7 +31,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; - rev = version; - hash = "sha256-1m5reKmPFSqMW/wYdiMw95l8A9E5FS8RHLb8/i1rQKY="; + rev = "refs/tags/${version}"; + hash = "sha256-+t6v553lP9NEimNlp48NQ+6dpIOrgfZ1FU3LNJF44YY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,6 +58,7 @@ buildPythonPackage rec { dissect-etl dissect-eventlog dissect-evidence + dissect-executable dissect-extfs dissect-fat dissect-ffs @@ -65,6 +68,7 @@ buildPythonPackage rec { dissect-regf dissect-shellitem dissect-sql + dissect-squashfs dissect-target dissect-util dissect-vmfs @@ -82,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect meta module"; homepage = "https://github.com/fox-it/dissect"; + changelog = "https://github.com/fox-it/dissect/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 0280f693e76f0..8122af7e28b9d 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -1,21 +1,25 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib , django , funcy , redis -, six , pytest-django , pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "django-cacheops"; - version = "6.1"; + version = "6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-toTvOf1DQYnTy7fYVBfNlyr2NSiaAyRHmCRztKifcn0="; + hash = "sha256-zHP9ChwUeZJT/yCopFeRo8jSgCIXswHnDPoIroGeQ48="; }; propagatedBuildInputs = [ @@ -51,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "A slick ORM cache with automatic granular event-driven invalidation for Django"; homepage = "https://github.com/Suor/django-cacheops"; + changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 4351f371af907..00dccb9caff42 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -1,19 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi, django +{ lib +, buildPythonPackage +, fetchPypi +, django +, pythonOlder }: buildPythonPackage rec { pname = "django-cleanup"; - version = "6.0.0"; + version = "7.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "922e06ef8839c92bd3ab37a84db6058b8764f3fe44dbb4487bbca941d288280a"; + hash = "sha256-KKlp+InGYeug2UOJeGk5gPCUgsl5g70I7lKVXa6NceQ="; }; - nativeCheckInputs = [ django ]; + nativeCheckInputs = [ + django + ]; meta = with lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; homepage = "https://github.com/un1t/django-cleanup"; + changelog = "https://github.com/un1t/django-cleanup/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-compression-middleware/default.nix b/pkgs/development/python-modules/django-compression-middleware/default.nix new file mode 100644 index 0000000000000..7857ae74834b2 --- /dev/null +++ b/pkgs/development/python-modules/django-compression-middleware/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchPypi +, buildPythonPackage +, django +, zstandard +, brotli +}: + +buildPythonPackage rec { + pname = "django-compression-middleware"; + version = "0.4.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-cdS80JVGz4h4MVCsZGfrQWhZlTR3Swm4Br4wFxOcKVs="; + }; + + propagatedBuildInputs = [ + django + zstandard + brotli + ]; + + meta = with lib; { + description = "Django middleware to compress responses using several algorithms"; + homepage = "https://github.com/friedelwolff/django-compression-middleware"; + changelog = "https://github.com/friedelwolff/django-compression-middleware/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ e1mo ]; + }; +} diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index d0894177c3f9e..a0bfca2a8b2ba 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Na/GeQc74LCoi7Dp3HcSnmUaLi1EjyYYgZTcFyzqOQM="; + hash = "sha256-MUIwgG8GKL+V5GgiC7gZXn5tlSVrmTj/IFiP+hVB7Ks="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple app that provides django integration for RQ (Redis Queue)"; homepage = "https://github.com/rq/django-rq"; + changelog = "https://github.com/rq/django-rq/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix index a6c184e2d67e2..8056aca7100e7 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-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 7b5b6c67cff43..d550ea9862d44 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.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA="; + hash = "sha256-BzvtoY4pKfpc2DuvvKr5deWUXoShe/qBkny2yfWhe5Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index f881ed5221aeb..de1424bb0ec40 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.16"; + version = "3.2.18"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-OtwoUSQkRySjlPqbmDnMjNEW+vfRWVVMQ+zaqM3wuU0="; + hash = "sha256-CCCN/okutk//BzynQ7O5UjERBPk55/ba6VT+ctzFM7o="; }; patches = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 48ad8d9ea87c5..db702d0ed7a67 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.5"; + version = "4.1.7"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/1br1+rQ/V2+Bv4VewAkp6rqLgWTuzeF+1lM+U2tWO8="; + hash = "sha256-RPcUuBxfGQ2dLdrQGlMv5QL6AcTLj68dCB9CZO0V3Ng="; }; patches = [ diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 8a53a9d1d58f6..0b420e9362c98 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,7 +1,6 @@ { lib , autopep8 , buildPythonPackage -, contextlib2 , django , factory_boy , fetchFromGitHub @@ -72,7 +71,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - contextlib2 networkx pydot factory_boy diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 2728d77d3f807..dd6e054b55c32 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; + hash = "sha256-hKs1BAJ31STrd5OeI1VoychWy1I8yWVXk7Zv6aPvRos="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index c4d1d300cca7a..3fd274a2c9a06 100644 --- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "djangorestframework-camel-case"; - version = "1.3.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-31kTYv+kSMjwo1TFauilP7eruxXiIpUdDG9feBYzkH4="; + sha256 = "sha256-za51hGZIq7ZYXHRwY5odL7Bk3EX46LYqqlC+fxp6YfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index dbe8912153fef..9d294977ca70b 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121"; + sha256 = "sha256-NQDukEVLfCz3ElgeA5jrRwONJ+aRSDKd9jTs2Y3YYhw="; }; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index fa77bc0d0cde0..01e3dd2cb55e3 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,38 +1,79 @@ { lib , stdenv +, aioquic , buildPythonPackage +, cacert +, cryptography +, curio , fetchPypi +, h2 +, httpx +, idna +, pytestCheckHook , pythonOlder +, requests +, requests-toolbelt , setuptools-scm -, pytestCheckHook -, cacert +, sniffio +, trio }: buildPythonPackage rec { pname = "dnspython"; - version = "2.2.1"; - disabled = pythonOlder "3.6"; + version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "tar.gz"; - sha256 = "0gk00m8zxjghxnzafhars51k5ahd6wfhf123nrc1j5gzlsj6jx8g"; + hash = "sha256-Ik4ysD60a+cOEu9tZOC+Ejpk5iGrTAgi/21FDVKlQLk="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + passthru.optional-dependencies = { + DOH = [ + httpx + h2 + requests + requests-toolbelt + ]; + IDNA = [ + idna + ]; + DNSSEC = [ + cryptography + ]; + trio = [ + trio + ]; + curio = [ + curio + sniffio + ]; + DOQ = [ + aioquic + ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.optionals stdenv.isDarwin [ - cacert ]; + checkInputs = [ + cacert + ] ++ passthru.optional-dependencies.DNSSEC; + disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" # fails if IPv6 isn't available "test_resolver_override" - - # Tests that run inconsistently on darwin systems ] ++ lib.optionals stdenv.isDarwin [ + # Tests that run inconsistently on darwin systems # 9 tests fail with: BlockingIOError: [Errno 35] Resource temporarily unavailable "testQueryUDP" # 6 tests fail with: dns.resolver.LifetimeTimeout: The resolution lifetime expired after ... @@ -40,15 +81,14 @@ buildPythonPackage rec { "testResolveTCP" ]; - nativeBuildInputs = [ - setuptools-scm + pythonImportsCheck = [ + "dns" ]; - pythonImportsCheck = [ "dns" ]; - meta = with lib; { description = "A DNS toolkit for Python"; homepage = "https://www.dnspython.org"; + changelog = "https://github.com/rthalley/dnspython/blob/v${version}/doc/whatsnew.rst"; license = with licenses; [ isc ]; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index f7be25f61509e..0eb7506a2ce1c 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, poetry-core +, charset-normalizer +, tomli , untokenize , mock , pytestCheckHook @@ -9,20 +12,37 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.6"; - format = "setuptools"; + format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GSfsM6sPSLOIH0YJYFVTB3SigI62/ps51mA2iZ7GOEg="; + hash = "sha256-r+8FOl9Rrfi3V8f8wD41bRsaqDb+UrOBWuR3goK43xY="; }; + patches = [ + ./test-path.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'charset_normalizer = "^2.0.0"' 'charset_normalizer = ">=2.0.0"' + substituteInPlace tests/conftest.py \ + --subst-var-by docformatter $out/bin/docformatter + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + charset-normalizer + tomli untokenize ]; @@ -34,6 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "docformatter" ]; meta = { + changelog = "https://github.com/PyCQA/docformatter/blob/${src.rev}/CHANGELOG.md"; description = "Formats docstrings to follow PEP 257"; homepage = "https://github.com/myint/docformatter"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/docformatter/test-path.patch b/pkgs/development/python-modules/docformatter/test-path.patch new file mode 100644 index 0000000000000..bd61c0ca829b6 --- /dev/null +++ b/pkgs/development/python-modules/docformatter/test-path.patch @@ -0,0 +1,29 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index 5f5a9aa..3289222 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -92,21 +92,9 @@ def run_docformatter(arguments, temporary_file): + + Return subprocess object. + """ +- if "DOCFORMATTER_COVERAGE" in os.environ and int( +- os.environ["DOCFORMATTER_COVERAGE"] +- ): +- DOCFORMATTER_COMMAND = [ +- "coverage", +- "run", +- "--branch", +- "--parallel", +- "--omit=*/site-packages/*", +- os.environ["VIRTUAL_ENV"] + "/bin/docformatter", +- ] +- else: +- DOCFORMATTER_COMMAND = [ +- os.environ["VIRTUAL_ENV"] + "/bin/docformatter", +- ] # pragma: no cover ++ DOCFORMATTER_COMMAND = [ ++ "@docformatter@" ++ ] + + if "-" not in arguments: + arguments.append(temporary_file) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 197a16db269d3..97d7396078aa6 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.1.3"; + version = "2.1.4"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-0aeg5kJ9CkFWx5LILK8fAQlgP2is55LjbKRZb9LLjZ0="; + sha256 = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; }; # use pytest as nosetests hangs diff --git a/pkgs/development/python-modules/drawille/default.nix b/pkgs/development/python-modules/drawille/default.nix new file mode 100644 index 0000000000000..a00b0b16892b2 --- /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 0000000000000..1ed452c1d1090 --- /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-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index eca45373fab72..4853e7eb08254 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.4"; + version = "1.21.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iHyfeeZPRqpIl0I05hApsb6msS6mKKj8ijaXWJrdHT4="; + sha256 = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 7b5a8aa1f6112..89b6c23caf319 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 = "1.0.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q="; + hash = "sha256-giWchaiNuEN2m2XOpDigZKd0p0gOxp6RrIxPLHEvYOg="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse Dutch Smart Meter Requirements (DSMR)"; homepage = "https://github.com/ndokter/dsmr_parser"; + changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 6dbd9f05f5ccd..0ad328bfd8347 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,7 +11,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Z3eWuLuuA264z1ccdVp1YwAjDrLIXFxvTt/gC/zBE6o="; + sha256 = "sha256-yh7L87s3STL2usGBXgIhCS7GKQuau/PV6US3T06bb0M="; }; buildInputs = [ pybind11 ]; diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index b9c9e65a4fe6d..301d99aabe0cd 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -2,30 +2,27 @@ , buildPythonPackage , fetchPypi , isPy27 -, contextlib2 , pytest , pytestCheckHook , vcrpy , citeproc-py , requests -, setuptools , six }: buildPythonPackage rec { pname = "duecredit"; - version = "0.9.1"; + version = "0.9.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8"; + sha256 = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; }; - # bin/duecredit requires setuptools at runtime - propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + propagatedBuildInputs = [ citeproc-py requests six ]; - nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ec4a1a93ca43a..ae800654b7dce 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.21.0"; + version = "0.21.3"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-wizAXwIKlq012U1lIPgHAnC+4KN7V1aG0JwCeYsl7YY="; + hash = "sha256-fKO0U9dn64Oz7Fjwz83JNIdaNBzf2w3FXBQxyWYIz4M="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 60e42f5b2fa08..87ff45fb468e4 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.15.0"; + version = "1.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dqMI51UHbkyfkxAPojRlS6qew2Ob4LbUkYua6zmcQgc="; + hash = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs="; }; nativeBuildInputs = [ @@ -49,11 +49,14 @@ buildPythonPackage rec { setuptools ]; - pythonImportsCheck = [ "dunamai" ]; + pythonImportsCheck = [ + "dunamai" + ]; meta = with lib; { description = "Dynamic version generation"; homepage = "https://github.com/mtkennerly/dunamai"; + changelog = "https://github.com/mtkennerly/dunamai/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jmgilman ]; }; diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index fc25a2b5928f6..60af0c1eb4620 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "duo-client"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "duosecurity"; repo = "duo_client_python"; - rev = version; - sha256 = "sha256-9ADFtCrSJ4Y2QQY5YC/BMvoVZs2vaYHkhIM/rBlZm4I="; + rev = "refs/tags/${version}"; + hash = "sha256-1xasV9iLbSODy8q1wEVDvELdmSQwj3qVCXOE94lyjFU="; }; postPatch = '' @@ -38,11 +38,14 @@ buildPythonPackage rec { pytz ]; - pythonImportsCheck = [ "duo_client" ]; + pythonImportsCheck = [ + "duo_client" + ]; meta = with lib; { description = "Python library for interacting with the Duo Auth, Admin, and Accounts APIs"; homepage = "https://github.com/duosecurity/duo_client_python"; + changelog = "https://github.com/duosecurity/duo_client_python/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index a5f557c2cc6f1..3c03a9e0fdcf8 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.35.1"; + version = "0.40.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MyYRkClbJDcMgwAHcESY0Bo7LgAFpDtkOVmVRUJ7jME="; + hash = "sha256-kJABNVUFoaN8Q7IVJKW/LF2kJwB4HcsvMEDmE6eTAxg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index c20540b8eeb39..a0ab592eaa907 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.19.0"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; + hash = "sha256-oKK+BhOgdRPZZAACgxgmr9rlzEH9yWmvbmx09d42u/Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 2ccc61cf97ca3..58b409741f15c 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , funcy @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.17"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg="; + hash = "sha256-1nXNi++vNNRxoA/ptTDN9PtePP67oWdkAtqAbZpTfDg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,6 +51,10 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/test_vega.py" + ]; + pythonImportsCheck = [ "dvc_render" ]; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 52d7e4706e4b5..21e079492fea2 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.9"; + version = "0.1.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+v1M8bKcHWUTz4DJ85tB1qdFYKI0k8TS/Dvf166o920="; + hash = "sha256-0KfH0/rghq+03sFLaR8lsIi4TJuwwca/YhQgILCdHq8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Celery task queue used in DVC"; homepage = "https://github.com/iterative/dvc-task"; + changelog = "https://github.com/iterative/dvc-task/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix new file mode 100644 index 0000000000000..30c3f8fb3b42e --- /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 739ace442b956..b9c49e30a560e 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -1,40 +1,52 @@ -{ buildPythonPackage +{ lib +, attrs +, buildPythonPackage , fetchPypi -, lib -, isPy3k +, pytestCheckHook +, pythonOlder , six -, attrs -, pytest , testtools }: buildPythonPackage rec { - version = "1.1.0"; pname = "effect"; - disabled = (!isPy3k); + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; + hash = "sha256-ev+2A3B8ZIsHsReB67eTpLmu6KzxrFdkw+0hEq3wyeo="; }; - nativeCheckInputs = [ - pytest - testtools - ]; + postPatch = '' + substituteInPlace effect/test_do.py \ + --replace "py.test" "pytest" + ''; propagatedBuildInputs = [ - six attrs + six ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + testtools + ]; + + pythonImportsCheck = [ + "effect" + ]; meta = with lib; { description = "Pure effects for Python"; - homepage = "https://github.com/python-effect/effect"; + homepage = "https://effect.readthedocs.io/"; + changelog = "https://github.com/python-effect/effect/releases/tag/${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 4f070068a12da..19f265a7c39e3 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "eigenpy"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-gYGJutTnvq5ERv6tDff6b+t7Kitnx9QAD/6hauHxOt4="; + hash = "sha256-h088il9gih1rJJKOI09qq2180DxbxCAVZcgBXWh8aVk="; }; strictDeps = true; diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index a0ebc7150756d..4e2dc1d6d90f0 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -7,12 +7,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pytz , yarl }: buildPythonPackage rec { pname = "eiswarnung"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-eiswarnung"; rev = "refs/tags/v${version}"; - hash = "sha256-sMR16if2Q+lK+ilnVNYVootBN2LFwBQLlZFkoX+oS/g="; + hash = "sha256-PVFAy34+UfNQNdzVdfvNiySrCTaKGuepnTINZYkOsuo="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pytz yarl ]; @@ -52,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for getting Eiswarning API forecasts"; homepage = "https://github.com/klaasnicolaas/python-eiswarnung"; + changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index f94e05a475239..b7286ad39c26f 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , aiohttp , blinker , buildPythonPackage @@ -15,6 +14,7 @@ , pytest-bdd , pytest-localserver , pytest-mock +, pytest-random-order , pytestCheckHook , pythonOlder , sanic @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.13.2"; + version = "6.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-HbIra8Cxgn/2xOVEvtcc7rMtSLBmWMxxHlIM44Oy+8U="; + hash = "sha256-Uoybe6Mx7ZLs2GaOnl278Xj6KlTEgrOuNxMRmPpSq8k="; }; propagatedBuildInputs = [ @@ -53,19 +53,19 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest ecs-logging + httpx jinja2 jsonschema Logbook mock - httpx pytest-asyncio pytest-bdd - pytest-mock pytest-localserver - sanic-testing + pytest-mock + pytest-random-order pytestCheckHook + sanic-testing structlog webob ]; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 0aa5c65837848..14876fa30d391 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 = "3.0.2"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; + hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 4797c1cb038b2..1ddae0409fbba 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -6,7 +6,7 @@ , boltons , hypothesis , pyrsistent -, pytest +, pytestCheckHook , setuptools , six , testtools @@ -16,19 +16,15 @@ buildPythonPackage rec { pname = "eliot"; version = "1.14.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149"; + hash = "sha256-wvCZo+jV7PwidFdm58xmSkjbZLa4nZht/ycEkdhoMUk="; }; - nativeCheckInputs = [ - hypothesis - testtools - pytest - ]; - propagatedBuildInputs = [ aiocontextvars boltons @@ -38,19 +34,31 @@ buildPythonPackage rec { zope_interface ]; - pythonImportsCheck = [ "eliot" ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + testtools + ]; + + pythonImportsCheck = [ + "eliot" + ]; # Tests run eliot-prettyprint in out/bin. - # test_parse_stream is broken, skip it. - checkPhase = '' + preCheck = '' export PATH=$out/bin:$PATH - pytest -k 'not test_parse_stream' ''; + disabledTests = [ + "test_parse_stream" + # AttributeError: module 'inspect' has no attribute 'getargspec' + "test_default" + ]; + meta = with lib; { homepage = "https://eliot.readthedocs.io"; description = "Logging library that tells you why it happened"; license = licenses.asl20; - maintainers = [ maintainers.dpausp ]; + maintainers = with maintainers; [ dpausp ]; }; } diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index af643560e8508..3dbf9c9b65460 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; @@ -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 65cae10f0e21d..fc822e1ece15d 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc="; + hash = "sha256-Zo5mH+AAi75vbjsV0UmEOrXKw1IUwspjWStJa+PI/as="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 2d2e4c7a479ac..f6568e691fa1a 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 = [ @@ -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/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 215e69138d05a..4bce72125e31f 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -18,11 +18,11 @@ in buildPythonPackage rec { pname = "entrance"; - version = "1.1.17"; + version = "1.1.20"; src = fetchPypi { inherit pname version; - sha256 = "dee5b4f3330f633fcd4e665f1781bf6e53b375ffdc7a24434257dfba6b1c2d7f"; + sha256 = "sha256-PvsP6HXCllW102h3o7abz9uC2AZTwvg5qIqP+rdkk6Y="; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index b5497f5ecedfa..aaa0a6cc0d23e 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.29"; 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-iGL2LrjVDj4rmzRe6JEBlZxqk6Zt1JlCsQdo+wYXb+0="; }; propagatedBuildInputs = [ @@ -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/ephemeral-port-reserve/default.nix b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index dc3148f362302..76d14e191cac2 100644 --- a/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -29,6 +29,8 @@ buildPythonPackage { "test_fqdn" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "ephemeral_port_reserve" ]; 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 0000000000000..24abd9d47a957 --- /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/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index bc99c09b402b3..f12fd2b5ca70f 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/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 008aa6038826f..7f5b436a14f50 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 }: @@ -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/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 354b10749938b..659a2314d6dd0 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 e653bda8caac2..2f358ba983254 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.33.1"; + version = "0.33.3"; format = "setuptools"; src = fetchFromGitHub { owner = "eventlet"; repo = pname; rev = "v${version}"; - hash = "sha256-8tIvvTTCcIG56VaPZMhdzAKnFRsYV3YC9xcf47nh838="; + hash = "sha256-iSSEZgPkK7RrZfU11z7hUk+JbFsCPH/SD16e+/f6TFU="; }; propagatedBuildInputs = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { "test_patcher_existing_locks_locked" # broken with pyopenssl 22.0.0 "test_sendall_timeout" - ] ++ lib.optionals stdenv.isAarch64 [ + # broken on aarch64 and when using march in gcc "test_fork_after_monkey_patch" ]; diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index 7f15ee79a805c..af6f36ec6f9eb 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -9,22 +9,22 @@ buildPythonPackage rec { pname = "evtx"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "omerbenamram"; repo = "pyevtx-rs"; - rev = version; - sha256 = "sha256-MSQYp/qkntFcnGqGhJ+0i4eMGzcDJcSZ44qFARMYM2I="; + rev = "refs/tags/${version}"; + hash = "sha256-t//oNvD+7wnv5KkriKBX4xgGS8pQpZgCsKxAEXsj0X8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-kzv2ppRjkmXgMxJviBwRVXMiGWBlhBqLXEmmRvwlw98="; + hash = "sha256-DPEL36cYNV5v4iW3+Fg1eEeuBuK9S7Qe78xOzZs8aJw="; }; nativeBuildInputs = with rustPlatform; [ @@ -41,10 +41,11 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Bindings for evtx"; homepage = "https://github.com/omerbenamram/pyevtx-rs"; + changelog = "https://github.com/omerbenamram/pyevtx-rs/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 9120017a7da52..5e7930bbc9cd7 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-csyDWVvcsAMzgomb0xq0NbVP7qYQpDv9obBGANlwiVI="; + hash = "sha256-XQcYYz4MOxWj9QlgM6KuwBaCHjYzGRkQw3cN5WBSnAo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 1869ea45fcf05..a3fc50c350b17 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY="; + hash = "sha256-Rz+oEpgfvSRdly+H1bYxYjNCfo1STkLcogPgZs+b8DY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index e2c64333df023..d600e50d395b2 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.5.0"; + version = "2.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-yb6Tuko7swrrFRQmtXAhm1kl16O813epOOCzOMEg58E="; + hash = "sha256-YwUNjEM0Lmj14fTqQXy78LRzlfffy7KZOTulufkeRZA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index f80c8f4e2ed9c..4bc9d1b239a32 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.9.1"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-qtHa2JQ9dl9NzhNZ9l6vRe9wR9rCx7+WwDBhRG+Btj4="; + hash = "sha256-bVuysEr8VVFgA4OZ7N7UlL2FigbyLVyPr1HHwkshSMU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 92c52fe5e956e..e9c03b10ae619 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.4"; + version = "1.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6Iwgl15adc6wK7i8sFLeSf2HSvMo/Sx/BI44qboNnRM="; + hash = "sha256-SogtdLTiTCJ8qUYsnwhPgBLFbj66EJC7L4wS64Nmuoo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 9826ae25170f1..928593c3809c5 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.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-vzaaX3wj1UkFGCohxYlPw6NA0b+oV/2JtpYXC4zncjk="; + sha256 = "sha256-IKs3uYGxiSy++tjF2XhWFrIfOo+SSl2JATUHBhCE3ZQ="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 2b63ee846b840..82522db24ae24 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wal451pQSLuoM9kNbnSKVZUMqLWfEukXwqLI58p+tvU="; + hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 1fd3af291fec3..d0ed5bb1493cd 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/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 92bc5100256f6..16e3bd7ed2293 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2022.12.0"; + version = "2023.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-/DSe2vZwrHHTuAXWJh9M1wCes5c4/QAVUnJVEI4Evyw="; + hash = "sha256-p8JydnrDEl9W4clrOkd+np0NYGP3hVnq+lyyF/zaVk8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix new file mode 100644 index 0000000000000..9e46a4b8ceeb9 --- /dev/null +++ b/pkgs/development/python-modules/fasttext-predict/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pybind11 +}: + +buildPythonPackage rec { + pname = "fasttext-predict"; + version = "0.9.2.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw="; + }; + + nativeBuildInputs = [ + pybind11 + ]; + + # tests are removed from fork + doCheck = false; + + pythonImportsCheck = [ "fasttext" ]; + + meta = with lib; { + description = "fasttext with wheels and no external dependency, but only the predict method (<1MB)"; + homepage = "https://github.com/searxng/fasttext-predict/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + # ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind) + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 3b2cde0121c7c..6e1cab529fbc1 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -4,18 +4,21 @@ , colorama , tqdm , pytestCheckHook +, pythonOlder , ffmpeg , procps }: buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.6.1"; + version = "0.7.1"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; - hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14="; + hash = "sha256-wK33h+Qg737hSv+2HF4hvfBDDsJpI+7mGbRgUQvrZb0="; }; propagatedBuildInputs = [ colorama tqdm ]; @@ -34,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Run an ffmpeg command with progress"; homepage = "https://github.com/slhck/ffmpeg-progress-yield"; + changelog = "https://github.com/slhck/ffmpeg-progress-yield/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 0b5ee19408925..fe1ef2b672a1b 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.3"; + version = "0.2.4"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-wmWo/p/QVzYDHu1uWK1VUWNO8IGaocHkX6NTDltqRlY="; + hash = "sha256-YfF2jN2EPcL4pFlxJyxYwlZBpQsZ2pEwLiSS4ypmc2I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 852e0a18e91db..3e9430ef318b2 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,37 +1,46 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder -, attrs, click, cligj, click-plugins, six, munch, enum34 -, pytestCheckHook, boto3, mock, giflib, pytz -, gdal, certifi -, fetchpatch +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cython +, gdal +, setuptools +, attrs +, certifi +, click +, click-plugins +, cligj +, munch +, shapely +, boto3 +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "fiona"; - version = "1.8.22"; + version = "1.9.1"; - src = fetchPypi { - pname = "Fiona"; - inherit version; - sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM="; - }; + disabled = pythonOlder "3.7"; - patches = [ - # https://github.com/Toblerity/Fiona/pull/1122 - (fetchpatch { - url = "https://github.com/Toblerity/Fiona/commit/fa632130dcd9dfbb982ecaa4911b3fab3459168f.patch"; - hash = "sha256-IuNHr3yBqS1jY9Swvcq8XPv6BpVlInDx0FVuzEMaYTY="; - }) - ]; + format = "pyproject"; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + src = fetchFromGitHub { + owner = "Toblerity"; + repo = "Fiona"; + rev = "refs/tags/${version}"; + hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8="; + }; nativeBuildInputs = [ + cython gdal # for gdal-config + setuptools ]; buildInputs = [ gdal - ] ++ lib.optionals stdenv.cc.isClang [ giflib ]; + ]; propagatedBuildInputs = [ attrs @@ -39,30 +48,33 @@ buildPythonPackage rec { click cligj click-plugins - six munch - pytz - ] ++ lib.optional (!isPy3k) enum34; + setuptools + ]; + + passthru.optional-dependencies = { + calc = [ shapely ]; + s3 = [ boto3 ]; + }; nativeCheckInputs = [ pytestCheckHook - boto3 - ] ++ lib.optional (pythonOlder "3.4") mock; + pytz + ] ++ passthru.optional-dependencies.s3; preCheck = '' rm -r fiona # prevent importing local fiona - # disable gdal deprecation warnings - export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; 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; { + changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index 491fcd3980530..0e75f61a9f706 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -1,19 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "first"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1gykyrm6zlrbf9iz318p57qwk594mx1jf0d79v79g32zql45na7z"; + hash = "sha256-/yhbCMVfjJfOTqcBJ0OvJJXJ8SkXhfFjcivTb2r2078="; }; doCheck = false; # no tests + pythonImportsCheck = [ + "first" + ]; + meta = with lib; { description = "The function you always missed in Python"; homepage = "https://github.com/hynek/first/"; + changelog = "https://github.com/hynek/first/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 71b457b52738a..296f6eb30d96f 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.1.20"; + version = "23.2.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JO6S9LjCEZKeUKxUpkqEw+RJ47HLbwQOOOKhHwnmWVI="; + hash = "sha256-4iOt6KQU8QkNdmGBIyevfwqvbKpylV+BN49GjeX68xE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flake8-docstrings/default.nix b/pkgs/development/python-modules/flake8-docstrings/default.nix index a02d900a7f07e..c3a08f9315573 100644 --- a/pkgs/development/python-modules/flake8-docstrings/default.nix +++ b/pkgs/development/python-modules/flake8-docstrings/default.nix @@ -1,26 +1,41 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , flake8 , pydocstyle +, pythonOlder }: buildPythonPackage rec { pname = "flake8-docstrings"; - version = "1.6.0"; + version = "1.7.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fe7c6a306064af8e62a055c2f61e9eb1da55f84bb39caef2b84ce53708ac34b"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-EafLWySeHB81HRcXiDs56lbUZzGvnT87WVqln0PoLCk="; }; - propagatedBuildInputs = [ flake8 pydocstyle ]; + propagatedBuildInputs = [ + flake8 + pydocstyle + ]; + + # Module has no tests + doCheck = false; - pythonImportsCheck = [ "flake8_docstrings" ]; + pythonImportsCheck = [ + "flake8_docstrings" + ]; meta = with lib; { description = "Extension for flake8 which uses pydocstyle to check docstrings"; - homepage = "https://gitlab.com/pycqa/flake8-docstrings"; + homepage = "https://github.com/pycqa/flake8-docstrings"; + changelog = "https://github.com/PyCQA/flake8-docstrings/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ smaret ]; }; diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index d81a9765bb0c5..348246a939ce1 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -1,14 +1,17 @@ { lib , buildPythonPackage -, pythonOlder +, fetchPypi , flake8 +, flit-core , pytestCheckHook -, fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "flake8-length"; version = "0.3.1"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -16,22 +19,31 @@ buildPythonPackage rec { sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ flake8 ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "flake8_length" ]; - nativeCheckInputs = [ pytestCheckHook ]; - - pytestFlagsArray = [ "tests/" ]; + pytestFlagsArray = [ + "tests/" + ]; - meta = { + meta = with lib; { description = "Flake8 plugin for a smart line length validation"; homepage = "https://github.com/orsinium-labs/flake8-length"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sauyon ]; + changelog = "https://github.com/orsinium-labs/flake8-length/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sauyon ]; }; } diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 075cc2f7ec2a1..d4b2f4d71dac3 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -95,6 +95,8 @@ buildPythonPackage rec { "flask_admin/tests/sqla/test_inlineform.py" "flask_admin/tests/sqla/test_postgres.py" "flask_admin/tests/sqla/test_translation.py" + # RuntimeError: Working outside of application context. + "flask_admin/tests/sqla/test_multi_pk.py" ]; pythonImportsCheck = [ @@ -104,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { description = "Admin interface framework for Flask"; homepage = "https://github.com/flask-admin/flask-admin/"; + changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index b122d6020bc31..c9c4bbff72625 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , apispec , colorama , click @@ -27,7 +26,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.1.3"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,23 +34,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; + hash = "sha256-rZbu0Bif5pOa/zu6MCrbGJpkqUdYzWyVgp6tqRzGyIc="; }; - patches = [ - (fetchpatch { - # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 - name = "flask-appbuilder-wtf3.patch"; - url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; - hash = "sha256-24mlS3HIs77wKOlwdHah5oks31OOmCBHmcafZT2ITOc="; - excludes = [ - "requirements.txt" - "setup.py" - "examples/employees/app/views.py" - ]; - }) - ]; - propagatedBuildInputs = [ apispec colorama @@ -73,13 +58,13 @@ buildPythonPackage rec { pyjwt pyyaml sqlalchemy-utils - ]; + ] ++ apispec.optional-dependencies.yaml; postPatch = '' substituteInPlace setup.py \ - --replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \ - --replace "Flask-WTF>=0.14.2, <1.0.0" "Flask-WTF" \ - --replace "WTForms<3.0.0" "WTForms" \ + --replace "apispec[yaml]>=3.3, <6" "apispec[yaml]" \ + --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ + --replace "Flask-Babel>=1, <3" "Flask-Babel" \ --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ --replace "prison>=0.2.1, <1.0.0" "prison" ''; @@ -94,7 +79,10 @@ buildPythonPackage rec { meta = with lib; { description = "Application development framework, built on top of Flask"; homepage = "https://github.com/dpgaspar/flask-appbuilder/"; + changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; + # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940 + broken = true; }; } diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index fff8859e86e08..c8e14eaf35e32 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi , flask , flask-silk , future -, pathlib +, pythonOlder +, unittestCheckHook }: buildPythonPackage rec { - pname = "Flask-AutoIndex"; + pname = "flask-autoindex"; version = "0.6.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "Flask-AutoIndex"; + inherit version; sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7"; }; @@ -21,8 +25,14 @@ buildPythonPackage rec { flask flask-silk future - ] ++ lib.optionals (pythonOlder "3.4") [ - pathlib + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "flask_autoindex" ]; meta = with lib; { @@ -31,8 +41,11 @@ buildPythonPackage rec { Flask-AutoIndex generates an index page for your Flask application automatically. The result is just like mod_autoindex, but the look is more awesome! ''; + homepage = "https://flask-autoindex.readthedocs.io/"; + changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = teams.sage.members; - homepage = "https://pythonhosted.org/Flask-AutoIndex/"; + # https://github.com/general03/flask-autoindex/issues/67 + broken = true; }; } diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 9a2aef0570eca..0222ea21c983d 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.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + src = fetchFromGitHub { + owner = "python-babel"; + repo = "flask-babel"; + rev = "refs/tags/v${version}"; + hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk="; }; + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + furo + poetry-core + sphinxHook + ]; + propagatedBuildInputs = [ - flask babel + flask jinja2 pytz - speaklater ]; - unittestFlagsArray = [ "-s" "tests" ]; + 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-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index a68c00aec5448..470639835a3b9 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 = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - unittestCheckHook + 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-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index e411d1f55a78b..9adecc5968d4c 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -1,49 +1,71 @@ { lib , buildPythonPackage +, email-validator , fetchFromGitHub , flask , flask-wtf +, markupsafe , mongoengine -, six -, nose -, rednose -, coverage -, email-validator +, pythonOlder +, setuptools +, setuptools-scm +, typing-extensions +, wtforms }: buildPythonPackage rec { pname = "flask-mongoengine"; version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; - rev = "v${version}"; - sha256 = "10g9b13ls2msnhv8j44gslrfxa2ppqz2y1xjn2a4gg4m9mdjv8b2"; + rev = "refs/tags/v${version}"; + hash = "sha256-YqEtW02VvEeUsLIHLz6+V6juMtWPEIk2tLoKTUdY6YE="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ email-validator flask flask-wtf mongoengine - six + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; - # they set test requirements to setup_requirements... - buildInputs = [ - nose - rednose - coverage - ]; + passthru.optional-dependencies = { + wtf = [ + flask-wtf + wtforms + ] ++ wtforms.optional-dependencies.email; + # toolbar = [ + # flask-debugtoolbar + # ]; + legacy = [ + markupsafe + ]; + }; - # tests require working mongodb connection + # Tests require working mongodb connection doCheck = false; + pythonImportsCheck = [ + "flask_mongoengine" + ]; + meta = with lib; { - description = "Flask-MongoEngine is a Flask extension that provides integration with MongoEngine and WTF model forms"; + description = "Flask extension that provides integration with MongoEngine and WTF model forms"; homepage = "https://github.com/mongoengine/flask-mongoengine"; + changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix deleted file mode 100644 index 4673daa746448..0000000000000 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, blinker -, tzlocal -, mock -, rednose -, flask -, six -, jsonschema -, pytz -, aniso8601 -, flask-restful -, isPy27 -, enum34 -}: - -buildPythonPackage rec { - pname = "flask-restplus"; - version = "0.13.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6"; - }; - - nativeCheckInputs = [ nose blinker tzlocal mock rednose ]; - propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ] - ++ lib.optional isPy27 enum34; - - # RuntimeError: Working outside of application context. - doCheck = false; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = "https://github.com/noirbizarre/flask-restplus"; - description = "Fast, easy and documented API development with Flask"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 961e1a644baa9..20dd72b662cec 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo="; + sha256 = "sha256-Rp+TQjAZqgIS6jmj0PAqshD+5a3JPOr2Qw5l4INxK/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index d5bd81ab90c14..550d9adf416f3 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,21 +1,25 @@ { lib , buildPythonPackage , fetchPypi -, pdm-pep517 , flask , mock -, sqlalchemy +, pdm-pep517 , pytestCheckHook +, pythonOlder +, sqlalchemy }: buildPythonPackage rec { - pname = "Flask-SQLAlchemy"; - version = "3.0.2"; + pname = "flask-sqlalchemy"; + version = "3.0.3"; format = "pyproject"; + disabled = pythonOlder "3.9"; + src = fetchPypi { - inherit pname version; - hash = "sha256-FhmfWz3ftp4N8vUq5Mdq7b/sgjRiNJ2rshobLgorZek="; + pname = "Flask-SQLAlchemy"; + inherit version; + hash = "sha256-J2QzXzydfr3J7WBEr6+Yqun6UNegdM71Xd4wfslZA+w="; }; nativeBuildInputs = [ @@ -39,9 +43,14 @@ buildPythonPackage rec { "test_persist_selectable" ]; + pythonImportsCheck = [ + "flask_sqlalchemy" + ]; + meta = with lib; { description = "SQLAlchemy extension for Flask"; homepage = "http://flask-sqlalchemy.pocoo.org/"; + changelog = "https://github.com/pallets-eco/flask-sqlalchemy/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix deleted file mode 100644 index a0e42e60c2e08..0000000000000 --- 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/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index f190307828275..12b340639f79b 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.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g="; + sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; }; buildInputs = [ jaxlib ]; diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index 2a209f2b7cd85..6b7c57100017c 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "WillDaSilva"; repo = "flit_scm"; rev = "refs/tags/${version}"; - hash = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; + hash = "sha256-2nx9kWq/2TzauOW+c67g9a3JZ2dhBM4QzKyK/sqWOPo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index b46b1df5410a2..825c7f19436b5 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.7"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; - rev = version; - hash = "sha256-bXI7q+unlrXvagKisAO4INfzeXlC4g918xmPmwMDCK8="; + rev = "refs/tags/${version}"; + hash = "sha256-hvd5I1n3lOuP9sUtVO69yGCVOVEWYKKfFf7OjAJCXIg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for defining and creating structured data"; homepage = "https://github.com/fox-it/flow.record"; + changelog = "https://github.com/fox-it/flow.record/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 30a2bcf773129..09c2137872d29 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.14.0"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; + 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 @@ -50,24 +44,34 @@ buildPythonPackage rec { ]; 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/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix new file mode 100644 index 0000000000000..9755fed902382 --- /dev/null +++ b/pkgs/development/python-modules/formulae/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, numpy +, pandas +, scipy +}: + +buildPythonPackage rec { + pname = "formulae"; + version = "0.3.4"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bambinos"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-6IGTn3griooslN6+qRYLJiWaJhvsxa1xj1+1kQ57yN0="; + }; + + propagatedBuildInputs = [ + numpy + pandas + scipy + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + # use assertions of form `assert pytest.approx(...)`, which is now disallowed: + disabledTests = [ "test_basic" "test_degree" ]; + pythonImportsCheck = [ + "formulae" + "formulae.matrices" + ]; + + meta = with lib; { + homepage = "https://bambinos.github.io/formulae"; + description = "Formulas for mixed-effects models in Python"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/fortiosapi/default.nix b/pkgs/development/python-modules/fortiosapi/default.nix index 8b0425c388176..5b6bce687ea3f 100644 --- a/pkgs/development/python-modules/fortiosapi/default.nix +++ b/pkgs/development/python-modules/fortiosapi/default.nix @@ -5,18 +5,23 @@ , packaging , paramiko , pexpect +, pythonOlder , requests +, six }: buildPythonPackage rec { pname = "fortiosapi"; version = "1.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fortinet-solutions-cse"; repo = pname; - rev = "v${version}"; - sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k"; + rev = "refs/tags/v${version}"; + hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg="; }; propagatedBuildInputs = [ @@ -25,11 +30,15 @@ buildPythonPackage rec { paramiko packaging oyaml + six ]; # Tests require a local VM doCheck = false; - pythonImportsCheck = [ "fortiosapi" ]; + + pythonImportsCheck = [ + "fortiosapi" + ]; meta = with lib; { description = "Python module to work with Fortigate/Fortios devices"; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index fb2d0b1668896..e1c22cd57885f 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "sha256-iUPreJ8BSB8LDisbJis0xn8ld6+Nf9Z4AP8SWJlCfZg="; + sha256 = "sha256-T6l6hKzRDevlLyLu5H+bnEdl0OhsPer1coCDiftbPAk="; }; - patches = [ - (fetchpatch { - name = "remove-strategies-doctest.patch"; - url = "https://github.com/fplll/fpylll/commit/3edffcd189e9d827a322d83b0f84d32e5f067442.patch"; - sha256 = "sha256-U7qOIbVzUNwYmjOPryjnE3J+MX/vMwm3T0UyOZ5ylLc="; - }) - ]; - buildInputs = [ gmp pari diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index a896a6c72ed95..950b2d4caee4c 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "freebox-api"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY="; + hash = "sha256-3i9I2RRRxLgyfzegnqjO4g+ad1v4phx6xa8HpWP1cck="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with the Freebox OS API"; homepage = "https://github.com/hacf-fr/freebox-api"; + changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index f4e54cd197623..79301cf600317 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,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kbr"; repo = pname; - rev = version; - sha256 = "sha256-eRvo40VXgo+SQGeh88vRfHPnbrsVDyz03ToIgwRc43Q="; + rev = "refs/tags/${version}"; + hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 8c6c79c3ec6ec..6e3aac99828e8 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.3.4"; + version = "2.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-rDorFoVHiwbkRsIIA2MLKPHJ9HWJw2FKZ5iFHEiqzhg="; + hash = "sha256-IlKhqQvNaYz4+U8UJ/fGUNNTC3RjyGKCJUzJ6J431Vw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index 2a41d9955f347..5abacb6a79d94 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/future/default.nix b/pkgs/development/python-modules/future/default.nix index a24ea8ab97239..7c4a5507b5404 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/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 9a4303b1dd5e4..adadfc030bf15 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.51"; + 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-SEolk0bbq3vNNMFz5B/qELaiCFCZFXJD4zTH8hBUX+Y="; + hash = "sha256-bUOdurCuAxpVag+mv3brxYIyNu9KhoDauL+lcrcob/k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index c6306da0ee631..f2a772d1ad669 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "gbulb"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "beeware"; repo = "gbulb"; - rev = "v${version}"; - sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-AdZSvxix0cpoFQSrslGl+hB/s6Nh0EsWMQmXZAJVJOg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index c7ddc590d97d9..6af750b0bd00c 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.6.0"; + version = "4.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k="; + hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdtoolkit/default.nix b/pkgs/development/python-modules/gdtoolkit/default.nix deleted file mode 100644 index 5323e12e4c557..0000000000000 --- a/pkgs/development/python-modules/gdtoolkit/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, lark, docopt, pyyaml, setuptools }: - -let lark080 = lark.overrideAttrs (old: rec { - # gdtoolkit needs exactly this lark version - version = "0.8.0"; - src = fetchFromGitHub { - owner = "lark-parser"; - repo = "lark"; - rev = version; - sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4="; - }; -}); - -in -buildPythonPackage rec { - pname = "gdtoolkit"; - version = "3.3.1"; - - propagatedBuildInputs = [ - lark080 - docopt - pyyaml - setuptools - ]; - - # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) - src = fetchFromGitHub { - owner = "Scony"; - repo = "godot-gdscript-toolkit"; - rev = version; - sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; - }; - - disabled = pythonOlder "3.7"; - - # Tests cannot be run because they need network to install additional dependencies using pip and tox - doCheck = false; - pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; - - meta = with lib; { - description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; - homepage = "https://github.com/Scony/godot-gdscript-toolkit"; - license = licenses.mit; - maintainers = with maintainers; [ shiryel ]; - }; -} diff --git a/pkgs/development/python-modules/gemfileparser2/default.nix b/pkgs/development/python-modules/gemfileparser2/default.nix new file mode 100644 index 0000000000000..f6a2c0877bfd6 --- /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/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 406beae748b6a..183454dac89de 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -56,5 +56,8 @@ buildPythonPackage rec { homepage = "https://radimrehurek.com/gensim/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ jyp ]; + # python310 errors as: No matching distribution found for FuzzyTM>=0.4.0 + # python311 errors as: longintrepr.h: No such file or directory + broken = true; # At 2023-02-05 }; } diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 0563b8ae997ac..c821c5a0cda3a 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -1,28 +1,35 @@ -{ buildPythonPackage, lib, fetchPypi, pythonOlder +{ lib , aiohttp +, buildPythonPackage +, fetchPypi , maxminddb , mocket +, pytestCheckHook +, pythonAtLeast +, pythonOlder , requests , requests-mock , urllib3 -, pytestCheckHook }: buildPythonPackage rec { - version = "4.6.0"; pname = "geoip2"; + version = "4.6.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M="; + hash = "sha256-8OgLzoCwa7OL0Iv0h31ahONU6TIJXmzPtNJ7tZj6T4M="; }; - patchPhase = '' - substituteInPlace requirements.txt --replace "requests>=2.24.0,<3.0.0" "requests" - ''; - - propagatedBuildInputs = [ aiohttp maxminddb requests urllib3 ]; + propagatedBuildInputs = [ + aiohttp + maxminddb + requests + urllib3 + ]; nativeCheckInputs = [ mocket @@ -30,11 +37,21 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "geoip2" ]; + pythonImportsCheck = [ + "geoip2" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/maxmind/GeoIP2-python/pull/136 + "TestAsyncClient" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_request" + ]; meta = with lib; { description = "GeoIP2 webservice client and database reader"; homepage = "https://github.com/maxmind/GeoIP2-python"; + changelog = "https://github.com/maxmind/GeoIP2-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 96f540088dc6e..49d58eab82c6b 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -5,18 +5,21 @@ , pytest-benchmark , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "getmac"; - version = "0.8.3"; + version = "0.9.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; - rev = version; - sha256 = "sha256-X4uuYisyobCxhoywaSXBZjVxrPAbBiZrWUJAi2/P5mw="; + rev = "refs/tags/${version}"; + hash = "sha256-n4WpEbkaYUS0aGdZKO5T/cuDr5OxauiuOAAdK56/+AM="; }; nativeCheckInputs = [ @@ -43,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/ghrepo-stats/default.nix b/pkgs/development/python-modules/ghrepo-stats/default.nix index 71e640cce795e..00f49fbdaea53 100644 --- a/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.5.0"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mrbean-bremen"; repo = pname; - rev = "v${version}"; - hash = "sha256-rTW6wADpkP9GglNmQNVecHfA2yJZuzYhJfsLfucbcgY="; + rev = "refs/tags/v${version}"; + hash = "sha256-YKGVDE1cM3Lcr9lHE2iserleob0BE3DxchdSX65CJBE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index ee5eea4220de9..7506c5295b5f4 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.4.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-9+U9kRMkcQY0tjao6Pmi0STqh0xw0pFU0/xZXlawkKM="; + hash = "sha256-xIlg3W/A3FBvVOEin/ku0QdmzGXlmOm5yLeYvoGkzNU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index ef7f5a70358a4..7834688e15f23 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 = [ @@ -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 b28846860035d..f90a24f090fbe 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/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 57f869842c83e..c04bb6e7f8733 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.15.1"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-qxqGfbrnMvmjbBD7l8OtGKx7WJr65Jbd9y5IyZDXwW4="; + hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 38f17c9ed8cc5..876feaf6c2c6d 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -1,12 +1,13 @@ { lib -, buildPythonPackage -, fetchPypi -, boltons , attrs +, boltons +, buildPythonPackage , face +, fetchPypi , pytestCheckHook -, pyyaml +, pythonAtLeast , pythonOlder +, pyyaml }: buildPythonPackage rec { @@ -40,6 +41,9 @@ buildPythonPackage rec { disabledTests = [ # Test is outdated (was made for PyYAML 3.x) "test_main_yaml_target" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + "test_regular_error_stack" + "test_long_target_repr" ]; pythonImportsCheck = [ @@ -47,12 +51,13 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/mahmoud/glom"; description = "Restructuring data, the Python way"; longDescription = '' glom helps pull together objects from other objects in a declarative, dynamic, and downright simple way. ''; + homepage = "https://github.com/mahmoud/glom"; + changelog = "https://github.com/mahmoud/glom/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ twey ]; }; diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 69d9278c43084..b459d44bb5794 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.27"; 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-J7hmtFEvJ2ivVi5UsahcpWen/gw65bf3rhBEpiOKsWk="; }; postPatch = '' @@ -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-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index ba4388c25699b..5e83c98599162 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.70.0"; + version = "2.75.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ji3glNWjDTN/WeZlgQGf7UW2mMB4OXrEjdMjwJaCNuc="; + sha256 = "sha256-DxCaK3HxTJp7SCMf7PzdOrlYYeqav1TwYKxFwgT63D0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-apitools/default.nix b/pkgs/development/python-modules/google-apitools/default.nix deleted file mode 100644 index 550051c1d1467..0000000000000 --- a/pkgs/development/python-modules/google-apitools/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ 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-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index e32bcf9702640..4e6c6aaae870d 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.17.1"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc="; + hash = "sha256-BW+zYDmK9CPmzePAgQWXRQ8JrQNgEulPGtQgUdnrY4I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 2370af8adc3bb..dddde1a3093ae 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BiXbDc1nX2y1ru8+t1rrhIzFg9wLAYMj3WJhIUb6VJ8="; + hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4="; }; propagatedBuildInputs = [ 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 a7e22c11b4f7f..7aaa53d39cf11 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.18.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RncpEPcNeCZdpeevSEeTmu1L6m4qZO/huZPAxoazrxY="; + hash = "sha256-XNPeWe8nYGmJr/MVxt0uBZMf0N2QEp5hYge0RJRWUqA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 41a9238d7a980..cd574b5323fa5 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.4.2"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA="; + hash = "sha256-WIbBTykJcVjVmvp0pnMtvdWD5u8w3Jk0pWrVMpBt41Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 2c6a9d4ea8f96..f92580db80b97 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.14.1"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A40lbmMijD0d1B81n2bcJ43gGaRYkVfmquOO8usRXew="; + hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 6c022b84ab75c..64cdac603e0b8 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.17.1"; + version = "2.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA="; + hash = "sha256-sYF6yV/VENn11V74vWU2p/pSkPAfYPtW2l1TdHTSR2g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index a79ce4c8eabb5..289fef97b1b6c 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-44HADoHz0ITGolvZtB1wlFDEMWBwyOZ2HazJMl/SXn0="; + hash = "sha256-iuhXfFp6cfDNDtk3JS+U8YbQAOII0khY2bmvP75QAP4="; }; propagatedBuildInputs = [ 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 5a062f4a85c22..b9dfd63441ba7 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xl+Jc05daQZPh4xggf/JYYlJ5Lx6LafqWhMcVdk/r6o="; + hash = "sha256-bwl1gWLux5LJMZIS/tJFMhHs1LcaDVCTgNrke6ASiBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 360c4c9a4d17e..a827b841a5ef3 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.9.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WxUiufi+rXBPuSBcC/Ktp0tEkcaA457o0WexweS9MMI="; + hash = "sha256-iCwYBZhWfheyYTOm2IQIXr3OXyoi4FWNykzzbWV+5wY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index dc6334adfbdc1..668556d4fc811 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.8.0"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LEExcED6vlv2Lhto+KyLiz8uyDTa+rHLySUNDZpHGe4="; + hash = "sha256-7rKNcG11cgvvwNEYiN9l8h8UR8u6DFfcI+S1QDi+t/c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index b94fd0635353a..d167a07fa6111 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zeD1n625F0aHRiUrr0sR6gD21obvAhORg+r5IfOu5rQ="; + hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo="; }; propagatedBuildInputs = [ 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 43b5b09810e1a..35066385a7d3b 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ivlerguhDb7zhRfizIPGQWwwLOUhyoj2xWAy9inSklQ="; + hash = "sha256-ylUUxWLe5u1WVyz1rD64u9MJ7qKsLl3cLD4ELcZCI6Y="; }; propagatedBuildInputs = [ 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 bc1896a77bc58..021d9533b445b 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.14.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CLZC9Iub3LWvDPhetxlHorccRUritd+YzTI/MF1hHrY="; + hash = "sha256-78o/MQFUREOW21BsSezK1QqciPVAEwOd15TRfAhxTWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 26446cc412e5e..ac0c0bf039faf 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.14.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4nFPB7dQRYvq9bB7Zw6ntgWO4VXAIcmH0LjmpAvzRG8="; + hash = "sha256-PKVX/A1AT3EqHahBLnGlXNY7aiZZdbCmvsQ/+KNV7UA="; }; propagatedBuildInputs = [ 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 a4709e4db26e0..b2aa7804b601a 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O1g8NcpvQn+3eyD1yqZ43aM6+eubVQGzLAt9DuI2Aqc="; + hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 1c05367490194..18c57e8898b1a 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.27.0"; + version = "3.27.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6zrAz+VqO8ojC+E0wcYMktZpnWF7skSj6R4GRrJ3nOs="; + hash = "sha256-1/pGE8Ql50B8hY4I/o5AhPIDOuE3EQcro2zMN23zLsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 7c57cc560eb72..2de8604ccfb46 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.17.1"; + version = "2.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o="; + hash = "sha256-RgGL9SXlmI4mcuL8phcPOCiGo2xhzRZbnpRw72U1KzI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 0ecdaf118548e..a753acdcc1e89 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zqd9uiSpp6z5LyGG42axl6pGcYKmSrbku+UcLGtoUbI="; + hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index b75bc26253a6c..91b7920f58430 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1XuY1Xf4QwJqEWCv0m2seSpoteDJxWep38lyP2Okk1Q="; + hash = "sha256-nVzFxoEIk01fPnybPQ7elFSff9ofSI9Ik6B+P4o41N8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 9168d3f046f1a..d8fe3ca62f974 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.2.2"; + 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-QeT4S8UlJQ0rCYG8+hc4cP1mM3KZlu/afFqz+LPIuVA="; + hash = "sha256-HQzU6no/DV2QOC+LV7kUSrygTwgAvfMSmYIKaBd/PCE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 162cda76f4e34..d2e67e4676e79 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.9.0"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ji9GDVQdDmneOcjrmfaG84HJNCz4igHJQmnwk9xiUlM="; + hash = "sha256-8oGZEMKUGaDHKq4qIZy10cbLNMmVclJnQE/dx877pNQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 3e1bb1c8a7d18..2678c0120bee6 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.21.1"; + version = "0.23.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-F5BUt+A5IF010PT/OvkINrMyK8tZ+uqml3CqNWpaM0c="; + hash = "sha256-/uv4P7wB/5QQW2IA+PT6VMPWd91Aoyxsez+8ptrIa5M="; }; nativeBuildInputs = [ @@ -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/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix new file mode 100644 index 0000000000000..bdfa8c0e49c0b --- /dev/null +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, matplotlib +, numpy +, opencv4 +, pillow +, scikit-learn +, torch +, torchvision +, ttach +, tqdm +}: + +buildPythonPackage rec { + pname = "grad-cam"; + version = "1.4.6"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "opencv-python" "opencv" + ''; + + propagatedBuildInputs = [ + matplotlib + numpy + opencv4 + pillow + scikit-learn + torchvision + ttach + tqdm + ]; + + # Let the user bring their own instance (as with torchmetrics) + buildInputs = [ + torch + ]; + + doCheck = false; # every nontrivial test tries to download a pretrained model + + pythonImportsCheck = [ + "pytorch_grad_cam" + "pytorch_grad_cam.metrics" + "pytorch_grad_cam.metrics.cam_mult_image" + "pytorch_grad_cam.metrics.road" + "pytorch_grad_cam.utils" + "pytorch_grad_cam.utils.image" + "pytorch_grad_cam.utils.model_targets" + ]; + + meta = with lib; { + description = "Advanced AI explainability for computer vision."; + homepage = "https://jacobgil.github.io/pytorch-gradcam-book"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index e4d7127236e01..d7c5c258ab5e6 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,39 +1,51 @@ { lib -, fetchPypi , buildPythonPackage +, certifi , chardet -, configparser , datadog +, decorator +, fetchPypi +, idna , requests -, python +, urllib3 +, pythonOlder }: buildPythonPackage rec { - pname = "gradient_statsd"; + pname = "gradient-statsd"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; + pname = "gradient_statsd"; + inherit version; + hash = "sha256-iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; }; propagatedBuildInputs = [ + certifi chardet datadog + decorator + idna requests - ] - ++ lib.optional python.isPy2 configparser; + urllib3 + ]; - pythonImportsCheck = [ "gradient_statsd" ]; + pythonImportsCheck = [ + "gradient_statsd" + ]; # Pypi does not contain tests doCheck = false; meta = with lib; { description = "Wrapper around the DogStatsd client"; - homepage = "https://paperspace.com"; - license = licenses.mit; - platforms = platforms.unix; + homepage = "https://paperspace.com"; + license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 91def6f2886be..221b1cfbfae15 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/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 0cdf472be0996..30a724c07c44f 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.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-UBkfe4d+K+730TbvModZF1ET7uxMpQGxOkq0PF/WiWc="; + hash = "sha256-M4oxFi/PpqhJgZX/wM+9rSrraIZcqzubbxnihfK0W2E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix index 2d4fbf506408f..65bbc142e3257 100644 --- a/pkgs/development/python-modules/gridnet/default.nix +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gridnet"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-gridnet"; rev = "refs/tags/v${version}"; - hash = "sha256-/UBZVbDRZMYHDrgifpYSTygAQTBiqgZ0tRGncE3GeT4="; + hash = "sha256-Enld68P9Cyq9Au4bsZQqPV26TL72pcmIm/Vg1DnheLk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 692b2fe6d8e62..8dfabb0972963 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.25.4"; + version = "0.25.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AZZhwHtVhdHkztzr/Hdi63VC5CjK2Vz8h8zizmSUdNY="; + hash = "sha256-0+n5v93ERcQDKNtXxSZYfCUMTRzcbtQEXl023KSxfrE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 9245b895124cf..c170bc3da3c5e 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 = [ diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index c956d139942ba..4d611cbaf2ab3 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -19,7 +19,7 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.7.0"; + version = "3.8.0"; pname = "h5py"; format = "pyproject"; @@ -27,7 +27,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P883iEODxdpkhGq1EBkHIAJ9ygdo3vNN2Ny2Wdvly/M="; + hash = "sha256-b+rYLwxAAM841T+cAweA2Bv6AiAhiu4TuQt3Ack32V8="; }; # avoid strict pinning of numpy @@ -46,7 +46,7 @@ in buildPythonPackage rec { ${lib.optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + preBuild = lib.optionalString mpiSupport "export CC=${mpi}/bin/mpicc"; nativeBuildInputs = [ cython @@ -68,6 +68,7 @@ in buildPythonPackage rec { pythonImportsCheck = [ "h5py" ]; meta = with lib; { + changelog = "https://github.com/h5py/h5py/blob/${version}/docs/whatsnew/${lib.versions.majorMinor version}.rst"; description = "Pythonic interface to the HDF5 binary data format"; homepage = "http://www.h5py.org/"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 9fd1295733c46..0da05c75f2dbe 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,18 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, async-timeout }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, async-timeout +}: buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.0.2"; + version = "3.1.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1"; + hash = "sha256-sheNYtmp1panthglpEqJTdaCgGBTUJRswikl5hu9k7s="; }; - propagatedBuildInputs = [ async-timeout ]; + propagatedBuildInputs = [ + async-timeout + ]; # only manual tests doCheck = false; @@ -24,8 +31,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/pvizeli/ha-ffmpeg"; - description = "Library for home-assistant to handle ffmpeg"; + description = "Library for Home Assistant to handle ffmpeg"; + homepage = "https://github.com/home-assistant-libs/ha-ffmpeg/"; + changelog = "https://github.com/home-assistant-libs/ha-ffmpeg/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 3d8ff39af14b8..4b8b02e912096 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 = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iJxu+TdgDHMnLuNTFj0UC8V76x3nAgGqswMLDSgmDmQ="; + hash = "sha256-5SneI1aZiUyLGYmtRXJYPBUtQR08fV+MWkjIQXt208s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a5b2a8fffc281..5a0ce432b6526 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 = "2023.1.7"; + version = "2023.2.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-n/j884ttxFCkNnpRuHquzDeWsJchHS0A13CR2CtO4lo="; + sha256 = "sha256-LyX/wHd4FnI9RrmwV6IDhz8gWJlBwG3Up64JYaIVdmM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix deleted file mode 100644 index aa61baa1b4897..0000000000000 --- a/pkgs/development/python-modules/hangups/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, configargparse -, aiohttp -, async-timeout -, appdirs -, readlike -, requests -, reparser -, protobuf -, urwid -, mechanicalsoup -, httpretty -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "hangups"; - version = "0.4.18"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "tdryer"; - repo = "hangups"; - rev = "v${version}"; - hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<4" "protobuf" \ - --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" - ''; - - propagatedBuildInputs = [ - configargparse - aiohttp - async-timeout - appdirs - readlike - requests - reparser - protobuf - urwid - mechanicalsoup - ]; - - nativeCheckInputs = [ - httpretty - pytestCheckHook - ]; - - pythonImportsCheck = [ - "hangups" - "hangups.client" - "hangups.event" - "hangups.parsers" - "hangups.user" - ]; - - meta = with lib; { - description = "The first third-party instant messaging client for Google Hangouts"; - homepage = "https://github.com/tdryer/hangups"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index b3fe9e7cb59ec..687a04b8846db 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,7 +1,6 @@ { lib , acme , aiohttp -, asynctest , atomicwrites-homeassistant , attrs , buildPythonPackage @@ -44,7 +43,6 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; nativeCheckInputs = [ - asynctest pytest-aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 52425fe3a614a..c8949968536c6 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "0.2.5"; + version = "0.2.6"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-/KEYTY3Y/KKP/r2OBf3R/jE7Sp/hNygC/Gdzk9XIf/0="; + hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 0d7e6a037ed7a..8cb980f84067a 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.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aGCAQAZb8mChe/N43h6O21mhiPPm3XPM56cGqScWlxE="; + hash = "sha256-fE5klk4ToayRyUmE2xtcMMsH4VKOKZHqvBCa9GG84rU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix index b68506ecd3529..af74b15b02148 100644 --- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, hatch , hatchling , packaging , pytestCheckHook @@ -20,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - hatch + hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 38bd8f54beab6..328af63b6e9e3 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mapado"; repo = pname; rev = "v${version}"; - hash = "sha256-iAGG1mjrt6oJ0IkmlJwrvb2Bpk4dNxV7ee9LYov03UY="; + hash = "sha256-cwvTs/91eJhjmeuCQAUBgfnKuCiLEg1jSnrXfx9VWkI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index 5f5c9843945ee..51902da85d577 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.3.0"; + version = "2.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-M7mumot7OvNVFBp0kBy1qlV9zi5MmZKgow7wRDobIgY="; + hash = "sha256-sRdLuk1XW5k5wB80HiTZvb4ODNTMTOLn13aS2hkUXPs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index accbda978f95c..073637b25367e 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.5.3"; + version = "11.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0frkG8HqzC1ZftGDMv4vk47vc9tQWGBQbL4bzFdaCL4="; + sha256 = "sha256-7LCsw6LSFB0r2jJt7/3X18jxRhLGsRjWmjllVLxspbU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 977d94e8a20c9..bbbcdfb5267da 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.12.0.post2"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "8ebb2117be8b27af5c780936030148e1971b6b7fda06e0581ff0bfb15e94ed76"; + sha256 = "99b18b28ec414ef9b604ddaed08182e486a400486f31ca56f61d537eed1d17cf"; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix new file mode 100644 index 0000000000000..df7f447a0444f --- /dev/null +++ b/pkgs/development/python-modules/hist/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchPypi +, buildPythonPackage +, boost-histogram +, histoprint +, hatchling +, hatch-vcs +, numpy +, pytestCheckHook +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "hist"; + version = "2.6.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "dede097733d50b273af9f67386e6dcccaab77e900ae702e1a9408a856e217ce9"; + }; + + buildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + boost-histogram + histoprint + numpy + ]; + + checkInputs = [ + pytestCheckHook + pytest-mpl + ]; + + meta = with lib; { + description = "Histogramming for analysis powered by boost-histogram"; + homepage = "https://hist.readthedocs.io/en/latest/"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/histoprint/default.nix b/pkgs/development/python-modules/histoprint/default.nix new file mode 100644 index 0000000000000..3c65fbf0eb801 --- /dev/null +++ b/pkgs/development/python-modules/histoprint/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchPypi +, buildPythonPackage +, click +, numpy +, setuptools +, setuptools-scm +, uhi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "histoprint"; + version = "2.4.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "328f789d186e3bd76882d57b5aad3fa08c7870a856cc83bcdbad9f4aefbda94d"; + }; + + buildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + numpy + uhi + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Pretty print histograms to the console"; + homepage = "https://github.com/scikit-hep/histoprint"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} 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 0000000000000..92966821d4bb4 --- /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.13.2"; + + format = "pyproject"; + + src = fetchFromGitLab { + owner = "nobodyinperson"; + repo = "hledger-utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw="; + }; + + 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/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 6d98f876bc70f..bab50ea617b3c 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage , convertdate -, python-dateutil -, fetchPypi +, fetchFromGitHub , hijri-converter , korean-lunar-calendar , pytestCheckHook +, python-dateutil , pythonOlder }: buildPythonPackage rec { pname = "holidays"; - version = "0.18"; + version = "0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6U2dNTb/Gipw1tL1bLBV65qV0LmjpfuBuej5024zN4k="; + src = fetchFromGitHub { + owner = "dr-prodigy"; + repo = "python-holidays"; + rev = "refs/tags/v.${version}"; + hash = "sha256-hz0v4g94RMA1dKOLu4BSYnK5EPNl1hIWEShFJWO0F3A="; }; propagatedBuildInputs = [ @@ -36,10 +38,6 @@ 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"; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 8f109053b5e9b..b60343dfc68a0 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.3"; + version = "1.15.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pFiRzSuPzUCHQs//81HJKPv0zx730fBEQsfYeG7o6ZQ="; + hash = "sha256-StwTN1DmDnNiZ+3iF2NW5qMDFDiwkTZ8tPKzhN6ZrgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 30e147172735e..06f7946b1ef21 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.9.2"; + version = "1.9.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8RGwWx/I6Log7qyGiP+LAWC1GCG2A7UEXnO5fGoTsb4="; + hash = "sha256-7wZocfTYTwTBwm61hKmIS4xlHq2nSvC6p8SlklnHq4M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 0cf52ad3d08f5..8807d0877bb8d 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2022.12.0"; + version = "2023.1.0"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-zo54lRNyKXCCUUoYIiZmHZMqISim9QKEOnFbM/iBRqE="; + hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 1394eef5cbdb2..a3a8cf93b810d 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2022.12.0"; + version = "2023.1.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -33,11 +33,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-oNqrvbzXeXpMG3v9RK6kppONH4n7xLVaJCEFXxVj2jE="; + hash = "sha256-hNaGE2s/oFFAVCWu50IeeaFTlOSByJJAKvBgX1iDrVE="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-S5n1MUig8ZDSLgWeVmu+5qLZ4kfHQUC9qZcVfM8rPvw="; + hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -87,7 +87,7 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/chip-wheels"; license = licenses.asl20; maintainers = teams.home-assistant.members; - platforms = platforms.linux; + platforms = [ "aarch64-linux" "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index a014872ad696c..c23f928d20d71 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, cryptography , fetchPypi , httpx , pyspnego @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "httpx-ntlm"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,21 +16,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "httpx_ntlm"; inherit version; - hash = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; + hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I="; }; propagatedBuildInputs = [ - cryptography httpx pyspnego ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyspnego==0.3.*" "pyspnego>=0.3.*" \ - --replace "cryptography==36.0.*" "cryptography>=36.0.*" - ''; - # https://github.com/ulodciv/httpx-ntlm/issues/5 doCheck = false; diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 38c25fa1b0c8d..a622017bebcf6 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -1,22 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, redis }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, redis +}: buildPythonPackage rec { pname = "huey"; - version = "2.4.2"; + version = "2.4.5"; + + format = "pyproject"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; - rev = version; - sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; + rev = "refs/tags/${version}"; + hash = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ redis ]; # connects to redis doCheck = false; meta = with lib; { + changelog = "https://github.com/coleifer/huey/blob/${src.rev}/CHANGELOG.md"; description = "A little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 4d8f020200183..790a14ba014e6 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.1"; + version = "0.12.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-sUo8B4IbFiIvqWx2UxT3TpHzi2Q2YNW1zrx1Squ2psQ="; + hash = "sha256-uw64JnXx790S4snLjANU0aLI3r7AMPec+IQentTZOdU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index aa39edd5c24d1..13ed586c3787b 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -6,13 +6,13 @@ , importlib-metadata , pytestCheckHook , pythonOlder -, setuptools -, setuptools-scm +, hatch-vcs +, hatchling }: buildPythonPackage rec { - version = "4.4.0"; pname = "humanize"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,20 +20,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-humanize"; repo = pname; - rev = version; - hash = "sha256-XxlmOs3sfHOLTkrKGsHRiBWpuCIPJua2VkKxDmjOeWE="; + rev = "refs/tags/${version}"; + hash = "sha256-sI773uzh+yMiyu1ebsk6zutfyt+tfx/zT/X2AdH5Fyg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling gettext ]; - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -57,6 +56,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/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 0df01749e953c..68cba094ab31a 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/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 7a1bd2356d0fd..aed8e99e0f84b 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -1,20 +1,18 @@ { lib , astor , buildPythonPackage -, colorama , fetchFromGitHub , funcparserlib , hy , pytestCheckHook , python , pythonOlder -, rply , testers }: buildPythonPackage rec { pname = "hy"; - version = "0.25.0"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,14 +21,13 @@ buildPythonPackage rec { owner = "hylang"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-V+ZtPm17ESxCGpRieGvEeO2bkwHfZQ6k9lsnDWr6pqo="; + hash = "sha256-Ow3FAiH97lSaI3oSx702+jgScfNgf+JstuDpgPSB8LM="; }; # https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10 HY_VERSION = version; propagatedBuildInputs = [ - colorama funcparserlib ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 994262a9871a2..61b4f87a6793d 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.61.0"; + outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +32,28 @@ buildPythonPackage rec { 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 diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index a02a110bb281f..8b16d29274746 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hyrule"; - version = "0.2.1"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "hylang"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-UvLk5d1lhoXBP2y3YfxVBCoKb3PMHUeNnnbAX6iypiU="; + hash = "sha256-nQAUVX409RWlFPeknnNwFNgo7e2xHkEXkAuXazZNntk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 7b9910559b4d8..1f0f799d587f2 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for iBeacon BLE devices"; homepage = "https://github.com/Bluetooth-Devices/ibeacon-ble"; + changelog = "https://github.com/Bluetooth-Devices/ibeacon-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index a49f7c684aab7..6f5052910e0bb 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -16,6 +16,7 @@ , geoalchemy2 , geopandas , graphviz-nox +, hypothesis , lz4 , multipledispatch , numpy @@ -30,8 +31,9 @@ , pymysql , pyspark , pytest-benchmark -, pytest-randomly , pytest-mock +, pytest-randomly +, pytest-snapshot , pytest-xdist , python , pytz @@ -62,7 +64,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "3.2.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -71,10 +73,12 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = version; - hash = "sha256-YRP1nGJs4btqXQirm0GfEDKNPCVXexVrwQ6sE8JtD2o="; + hash = "sha256-G3kMd6Jyib7ZXHFP6t2CEPlDD5n5zHE2jq/0he3U4Nk="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ atpublic @@ -95,29 +99,35 @@ buildPythonPackage rec { pytestCheckHook click filelock + hypothesis pytest-benchmark pytest-mock pytest-randomly + pytest-snapshot pytest-xdist rsync ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; - preBuild = '' - # setup.py exists only for developer convenience and is automatically generated - # it gets in the way in nixpkgs so we remove it - rm setup.py - ''; - pytestFlagsArray = [ "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" - # this test fails on nixpkgs datafusion version (0.4.0), but works on - # datafusion 0.6.0 - "-k" - "'not datafusion-no_op'" + # these will be fixed in ibis-framework 5.0.0 + "--deselect=ibis/backends/tests/test_string.py::test_string" + "--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" + "--deselect=ibis/backends/tests/test_client.py::test_list_databases" ]; + # remove when sqlalchemy backend no longer uses deprecated methods + SQLALCHEMY_SILENCE_UBER_WARNING = 1; + + # patch out tests that check formatting with black + postPatch = '' + find ibis/tests -type f -name '*.py' -exec sed -i \ + -e '/^ *assert_decompile_roundtrip/d' \ + -e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} + + ''; + preCheck = '' set -eo pipefail 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 6eb64f79ed321..deff4de058e1b 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.1"; + version = "3.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TsM56eE2qCJsr+ZHTaY7Wd/ZjhFqWJXA7Z3O+2MCgPc="; + hash = "sha256-fPYl9cz9GIDAKZYEH+8g+omRtGMU+abBx16If7H5i3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 00b6e6ba9aba5..061b20a835dad 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.15"; + version = "2.5.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5M51eWdER9/K15H2yUQjvXMjzYNwx9BLIKSW/ToDU5g="; + sha256 = "sha256-Pf9/mjbyC859WT8ZreFq5u6YER/tRgsQuqIgt6mdPqE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 541ddad92e85e..da48ed3147317 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio="; + sha256 = "sha256-iuaBuKoKlt7F7Z7fbVOZAUAoFnU3AOxYC/ANgqoQksU="; }; nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 3cbdd97e719b2..b8f02166f3307 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.3"; + version = "0.10.4"; disabled = pythonOlder "3.7"; + format = "setuptools"; + src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; - rev = version; - hash = "sha256-j7c1CtZ796EYMsS11kd8YED7pPolskgT+611uvePTsA="; + rev = "refs/tags/${version}"; + hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 93cc6453f9780..0450dee30b464 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -61,6 +61,7 @@ buildPythonPackage rec { disabledTests = [ "test_tiff_rgb" + "test_png_gray1" # https://gitlab.mister-muffin.de/josch/img2pdf/issues/154 ]; pythonImportsCheck = [ "img2pdf" ]; diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index eebeb17bb7e76..97dec9cf66f39 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.18.0"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-fuLGoLzaxYGzj66NDzQ/3uVfkfH2psyWQ/z7zGwtw+Y="; + hash = "sha256-pz/m4C814xgPwBvFwXlO32Yv8XJcO8Kk9DNWd5nadQQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/in-n-out/default.nix b/pkgs/development/python-modules/in-n-out/default.nix new file mode 100644 index 0000000000000..d345869bed526 --- /dev/null +++ b/pkgs/development/python-modules/in-n-out/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, cython_3 +, fetchPypi +, future +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools +, setuptools-scm +, toolz +}: + +buildPythonPackage rec { + pname = "in-n-out"; + version = "0.1.6"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PuzjidORMFVlmFZbmnu9O92FoiuXrC8NNRyjwdodriY="; + }; + + nativeBuildInputs = [ + cython_3 + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + future + ]; + + nativeCheckInputs = [ + pytestCheckHook + toolz + ]; + + pythonImportsCheck = [ + "in_n_out" + ]; + + disabledTestPaths = lib.optionals (pythonAtLeast "3.11") [ + # Fatal Python error + "tests/test_injection.py" + "tests/test_processors.py" + "tests/test_providers.py" + "tests/test_store.py" + ]; + + meta = with lib; { + description = "Module for dependency injection and result processing"; + homepage = "https://app-model.readthedocs.io/"; + changelog = "https://github.com/pyapp-kit/in-n-out/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index d281ece246353..496c984889103 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -1,29 +1,43 @@ { lib , aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "incomfort-client"; - version = "0.4.5"; + version = "0.5.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zxdavb"; repo = pname; - rev = version; - sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp"; + rev = "refs/tags/${version}"; + hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E="; }; propagatedBuildInputs = [ aiohttp ]; - # Project has no tests - doCheck = false; - pythonImportsCheck = [ "incomfortclient" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + ]; + + pythonImportsCheck = [ + "incomfortclient" + ]; meta = with lib; { description = "Python module to poll Intergas boilers via a Lan2RF gateway"; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index b707887bc392b..0ada1ee5d865b 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.35.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-kewhNnbCmciywTkk/NTBqO02jN8IAW/MriH/DkhQkFU="; + 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/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 2172a88411403..fc5eb2d12ba4d 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "inkbird-ble"; - version = "0.5.5"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-KUBOjeFM4h2Qt9eT0mQKPFYJJ8OWdbYy9+AiHsJWNyU="; + rev = "refs/tags/v${version}"; + hash = "sha256-re5HjPtssFkpcltCr0HEJmJyHbXJdkr2wDgaAHfy2Tk="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Inkbird BLE devices"; homepage = "https://github.com/Bluetooth-Devices/inkbird-ble"; + changelog = "https://github.com/Bluetooth-Devices/inkbird-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 3f8bc99eeb6b7..4cc96646bc0bf 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -1,47 +1,83 @@ -{ buildPythonPackage -, inkscape +{ lib +, buildPythonPackage +, fetchFromGitLab +, poetry-core , cssselect , lxml , numpy +, packaging +, pillow , pygobject3 -, python +, pyserial +, scour +, gobject-introspection +, pytestCheckHook +, gtk3 }: -buildPythonPackage { +buildPythonPackage rec { pname = "inkex"; - inherit (inkscape) version; + version = "1.2.2"; - format = "other"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "inkscape"; + repo = "extensions"; + rev = "EXTENSIONS_AT_INKSCAPE_${version}"; + hash = "sha256-jw7daZQTBxLHWOpjZkMYtP1vIQvd/eLgiktWqVSjEgU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"1.2.0"' '"${version}"' \ + --replace 'scour = "^0.37"' 'scour = ">=0.37"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ cssselect lxml numpy + packaging + pillow pygobject3 + pyserial + scour ]; - # We just copy the files. - dontUnpack = true; - dontBuild = true; + pythonImportsCheck = [ "inkex" ]; - # No tests installed. - doCheck = false; - - installPhase = '' - runHook preInstall + nativeCheckInputs = [ + gobject-introspection + pytestCheckHook + ]; - mkdir -p "$out/${python.sitePackages}" - cp -r "${inkscape}/share/inkscape/extensions/inkex" "$out/${python.sitePackages}" + checkInputs = [ + gtk3 + ]; - runHook postInstall - ''; + disabledTests = [ + "test_extract_multiple" + "test_lookup_and" + ]; - meta = inkscape.meta // { - description = "Inkscape Extensions Library"; - longDescription = '' - This module provides support for inkscape extensions, it includes support for opening svg files and processing them. + disabledTestPaths = [ + # Fatal Python error: Segmentation fault + "tests/test_inkex_gui.py" + "tests/test_inkex_gui_listview.py" + "tests/test_inkex_gui_window.py" + # Failed to find pixmap 'image-missing' in /build/source/tests/data/ + "tests/test_inkex_gui_pixmaps.py" + ]; - Standalone, it is especially useful for running tests for Inkscape extensions. - ''; + meta = { + description = "Library for manipulating SVG documents which is the basis for Inkscape extensions"; + homepage = "https://gitlab.com/inkscape/extensions"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index a0a37ce92f807..3ea584fbc03da 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder # native , poetry-core @@ -18,14 +19,16 @@ buildPythonPackage rec { pname = "inquirer"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gDJqD0IHshyGw9MmMtYjkkpvYklRLgPd6EtLVqi2I/o="; + hash = "sha256-7kq0sZzPeCX7TA5Cl2rg6Uw+9jLz335a+tOrO0+Cyas="; }; nativeBuildInputs = [ @@ -44,10 +47,16 @@ buildPythonPackage rec { pytestCheckHook ]; + + pythonImportsCheck = [ + "inquirer" + ]; + meta = with lib; { - homepage = "https://github.com/magmax/python-inquirer"; description = "A collection of common interactive command line user interfaces, based on Inquirer.js"; + homepage = "https://github.com/magmax/python-inquirer"; + changelog = "https://github.com/magmax/python-inquirer/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } 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 584aa0050ed54..6303ec76fe05f 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.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AP8yf2eEBT8LWs03hKihCgbBkS9sEUg5NkYdagFiqwA="; + hash = "sha256-7jRf6fp+5u6qqR5xP1R+kp6LURsBVqfct6yuCkbxBMw="; }; + 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 1ba9a973774ff..687fe8e58e6b4 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 = [ @@ -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 9396b6dc3d56d..aa2fc70eb0de3 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -7,14 +7,14 @@ 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="; }; nativeCheckInputs = [ @@ -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/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 2bede522584c6..e0021cbc39e04 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.2.0"; + version = "3.3.0"; format = "setuptools"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cB7nRDmO2NNaHjNkHCuXH0+15WZfxseS8DBdIqefSzk="; + sha256 = "sha256-PLf+PMIXlaoL974e7coQCQKH6cVBYODPhkDxa2vhTB0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index edfbc49d776b5..88c426870c34d 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.3.2"; + version = "4.3.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-LyuZf2Vp0+4fT3412wyx2gjAd7IaiPHAHFn1uYajGqY="; + sha256 = "sha256-T7LOaT+yaM2ukAN0z6GpFkHiLZUU0eweYtp0cFCST3Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index b15bb53e2c293..c70fe92b5dfce 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.9.2"; + version = "0.9.3"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-ZVYE8L9tJkz1mXZpUKWybiktEHzCPhl1A2R+dUF5gcw="; + sha256 = "sha256-0RPNVYkbr+myfvmbbdERqHvra7KuVQxAQpInIQO+gBM="; }; diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 77ed45ce4ccde..d18c5e9621967 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.8.0"; + version = "1.9.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-0qjvArC8xEr9MSecuAKMBr49fA60FYRyicAADy93N7c="; + sha256 = "sha256-hBqNvg6dKx6P5Yo17nUA9ztmvQjz+ChNFWnD2OOPp3U="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index cfef001013c73..3e612c6cda8de 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.12"; + version = "3.10.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FOZNsZK8PTPJhK0BvGQiPqCr8au3rwHsjE3dCKWGtDM="; + hash = "sha256-Rnk0H1ag35HGNeg4oiLOfxB1XLW8yVSOP3qK/1Z009Q="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ismartgate/default.nix b/pkgs/development/python-modules/ismartgate/default.nix index 361003480fbad..7998b03a3782a 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 = [ @@ -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/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index c3e022cdb38bd..af90e739163c8 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -25,7 +25,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hypothesis + # "hypothesis" indirectly depends on iso8601 to build its documentation + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook pytz ]; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index d51e41448548a..1b0ec627d3c75 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.11.4"; + version = "5.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = "refs/tags/${version}"; - sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I="; + sha256 = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/itanium-demangler/default.nix b/pkgs/development/python-modules/itanium-demangler/default.nix index d1251449af5c4..67b71c9bf217d 100644 --- a/pkgs/development/python-modules/itanium-demangler/default.nix +++ b/pkgs/development/python-modules/itanium-demangler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "whitequark"; repo = "python-itanium_demangler"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-I6NUfckt2cocQt5dZSFadpshTCuA/6bVNauNXypWh+A="; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ - " itanium_demangler " + "itanium_demangler" ]; meta = with lib; { 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 0000000000000..fd17b76103ba6 --- /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/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index d65aca6931658..a7800b783a884 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "jaconv"; - version = "0.3.1"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikegami-yukino"; repo = pname; - rev = "v${version}"; - hash = "sha256-uzGHvklFHVoNloZauczgITeHQIgYQAfI9cjLWgG/vyI="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; nativeCheckInputs = [ 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 0000000000000..8ddb8f4b493c3 --- /dev/null +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -0,0 +1,94 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchPypi +, 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.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.abode"; + rev = "refs/tags/v${version}"; + hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio="; + }; + + postPatch = '' + # https://github.com/jaraco/jaraco.abode/issues/19 + echo "graft jaraco" > MANIFEST.in + ''; + + 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 6a8c0fd1ea4a7..7a882c80195c1 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.2.0"; + 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-J7vL+pvwXcKEkqZn44/U01HmP1CI5kIGsJ1aJevp0I4="; + 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 0000000000000..b99eff746f47a --- /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 0000000000000..d4ff9e9294607 --- /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/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index baa9a0dc1abfc..2c13defe43838 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -164,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="${cudaFlags.cudaRealCapabilitiesCommaString}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" '' + '' CFG ''; diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix new file mode 100644 index 0000000000000..09a1ff66f263e --- /dev/null +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, absl-py +, cvxpy +, jax +, jaxlib +, matplotlib +, numpy +, optax +, scipy +, scikitlearn +}: + +buildPythonPackage rec { + pname = "jaxopt"; + version = "0.5.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "refs/tags/${pname}-v${version}"; + hash = "sha256-WOsr/Dvguu9/qX6+LMlAKM3EANtYPtDu8Uo2157+bs0="; + }; + + propagatedBuildInputs = [ + absl-py + jax + jaxlib + matplotlib + numpy + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + cvxpy + optax + scikitlearn + ]; + + pythonImportsCheck = [ + "jaxopt" + "jaxopt.implicit_diff" + "jaxopt.linear_solve" + "jaxopt.loss" + "jaxopt.tree_util" + ]; + + meta = with lib; { + homepage = "https://jaxopt.github.io"; + description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} 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 0000000000000..33975ee204ea5 --- /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/johnnycanencrypt/Cargo.lock.patch b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch deleted file mode 100644 index 57e53bb6f5737..0000000000000 --- a/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch +++ /dev/null @@ -1,1456 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..ae65889 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,1450 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "adler" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -+ -+[[package]] -+name = "aho-corasick" -+version = "0.7.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "android_system_properties" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" -+ -+[[package]] -+name = "ascii-canvas" -+version = "3.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -+dependencies = [ -+ "term", -+] -+ -+[[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 = "base64" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -+ -+[[package]] -+name = "base64" -+version = "0.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -+ -+[[package]] -+name = "bindgen" -+version = "0.57.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" -+dependencies = [ -+ "bitflags", -+ "cexpr", -+ "clang-sys", -+ "lazy_static", -+ "lazycell", -+ "peeking_take_while", -+ "proc-macro2", -+ "quote", -+ "regex", -+ "rustc-hash", -+ "shlex", -+] -+ -+[[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 = "block-buffer" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -+dependencies = [ -+ "block-padding", -+ "byte-tools", -+ "byteorder", -+ "generic-array 0.12.4", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -+dependencies = [ -+ "byte-tools", -+] -+ -+[[package]] -+name = "buffered-reader" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e9f82920285502602088677aeb65df0909b39c347b38565e553ba0363c242f65" -+dependencies = [ -+ "bzip2", -+ "flate2", -+ "libc", -+] -+ -+[[package]] -+name = "bumpalo" -+version = "3.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" -+ -+[[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" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -+ -+[[package]] -+name = "bzip2" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -+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 = "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 = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "chrono" -+version = "0.4.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -+dependencies = [ -+ "iana-time-zone", -+ "js-sys", -+ "num-integer", -+ "num-traits", -+ "time", -+ "wasm-bindgen", -+ "winapi", -+] -+ -+[[package]] -+name = "clang-sys" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -+dependencies = [ -+ "glob", -+ "libc", -+ "libloading", -+] -+ -+[[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 = "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 = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "crunchy" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -+ -+[[package]] -+name = "cxx" -+version = "1.0.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" -+dependencies = [ -+ "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 = "diff" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -+ -+[[package]] -+name = "digest" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -+dependencies = [ -+ "generic-array 0.12.4", -+] -+ -+[[package]] -+name = "digest" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+dependencies = [ -+ "generic-array 0.14.6", -+] -+ -+[[package]] -+name = "dirs-next" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -+dependencies = [ -+ "cfg-if", -+ "dirs-sys-next", -+] -+ -+[[package]] -+name = "dirs-sys-next" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi", -+] -+ -+[[package]] -+name = "dyn-clone" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" -+ -+[[package]] -+name = "either" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -+ -+[[package]] -+name = "ena" -+version = "0.14.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" -+dependencies = [ -+ "log", -+] -+ -+[[package]] -+name = "fake-simd" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[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.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -+dependencies = [ -+ "crc32fast", -+ "miniz_oxide", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.12.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -+dependencies = [ -+ "typenum", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.14.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "libc", -+ "wasi 0.9.0+wasi-snapshot-preview1", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "libc", -+ "wasi 0.11.0+wasi-snapshot-preview1", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+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 = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "iana-time-zone" -+version = "0.1.53" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -+dependencies = [ -+ "android_system_properties", -+ "core-foundation-sys", -+ "iana-time-zone-haiku", -+ "js-sys", -+ "wasm-bindgen", -+ "winapi", -+] -+ -+[[package]] -+name = "iana-time-zone-haiku" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -+dependencies = [ -+ "cxx", -+ "cxx-build", -+] -+ -+[[package]] -+name = "idna" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -+dependencies = [ -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[package]] -+name = "indoc" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" -+ -+[[package]] -+name = "instant" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.10.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "johnnycanencrypt" -+version = "0.11.0" -+dependencies = [ -+ "anyhow", -+ "chrono", -+ "pyo3", -+ "sequoia-openpgp", -+ "sshkeys", -+ "talktosc", -+ "tempfile", -+] -+ -+[[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 = "lalrpop" -+version = "0.19.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" -+dependencies = [ -+ "ascii-canvas", -+ "atty", -+ "bit-set", -+ "diff", -+ "ena", -+ "itertools", -+ "lalrpop-util", -+ "petgraph", -+ "regex", -+ "regex-syntax", -+ "string_cache", -+ "term", -+ "tiny-keccak", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "lalrpop-util" -+version = "0.19.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" -+ -+[[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.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -+dependencies = [ -+ "cfg-if", -+ "winapi", -+] -+ -+[[package]] -+name = "link-cplusplus" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -+dependencies = [ -+ "cc", -+] -+ -+[[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 = "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 = "memsec" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ac78937f19a0c7807e45a931eac41f766f210173ec664ec046d58e6d388a5cb" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -+dependencies = [ -+ "adler", -+] -+ -+[[package]] -+name = "nettle" -+version = "7.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f5d193a809310369c5d16e45bc0a88cb27935edd5d3375bcfc2371b167694035" -+dependencies = [ -+ "getrandom 0.2.8", -+ "libc", -+ "nettle-sys", -+ "thiserror", -+] -+ -+[[package]] -+name = "nettle-sys" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b13b685c7883e3a32196ccf3ce594947ec37ace43d74e157de7ca03d3fe62d17" -+dependencies = [ -+ "bindgen", -+ "cc", -+ "libc", -+ "pkg-config", -+ "tempfile", -+ "vcpkg", -+] -+ -+[[package]] -+name = "new_debug_unreachable" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -+ -+[[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 = "num-integer" -+version = "0.1.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -+dependencies = [ -+ "autocfg", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -+ -+[[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.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "windows-sys", -+] -+ -+[[package]] -+name = "pcsc" -+version = "2.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e29e4de78a433aeecd06fb5bd55a0f9fde11dc85a14c22d482972c7edc4fdc4" -+dependencies = [ -+ "bitflags", -+ "pcsc-sys", -+] -+ -+[[package]] -+name = "pcsc-sys" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1b7bfecba2c0f1b5efb0e7caf7533ab1c295024165bcbb066231f60d33e23ea" -+dependencies = [ -+ "pkg-config", -+] -+ -+[[package]] -+name = "peeking_take_while" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -+ -+[[package]] -+name = "petgraph" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" -+dependencies = [ -+ "fixedbitset", -+ "indexmap", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -+dependencies = [ -+ "siphasher", -+] -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -+ -+[[package]] -+name = "precomputed-hash" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.47" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "pyo3" -+version = "0.17.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" -+dependencies = [ -+ "cfg-if", -+ "indoc", -+ "libc", -+ "memoffset", -+ "parking_lot", -+ "pyo3-build-config", -+ "pyo3-ffi", -+ "pyo3-macros", -+ "unindent", -+] -+ -+[[package]] -+name = "pyo3-build-config" -+version = "0.17.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" -+dependencies = [ -+ "once_cell", -+ "target-lexicon", -+] -+ -+[[package]] -+name = "pyo3-ffi" -+version = "0.17.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" -+dependencies = [ -+ "libc", -+ "pyo3-build-config", -+] -+ -+[[package]] -+name = "pyo3-macros" -+version = "0.17.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" -+dependencies = [ -+ "proc-macro2", -+ "pyo3-macros-backend", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pyo3-macros-backend" -+version = "0.17.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom 0.1.16", -+ "libc", -+ "rand_chacha", -+ "rand_core", -+ "rand_hc", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom 0.1.16", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "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 = "regex" -+version = "1.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -+dependencies = [ -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.28" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -+ -+[[package]] -+name = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "rustc-hash" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -+ -+[[package]] -+name = "rustversion" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" -+ -+[[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.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" -+ -+[[package]] -+name = "sequoia-openpgp" -+version = "1.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50d9033c24b1d41fdfab2bbde66005d324625b4abee2af2aea6135bdd9543ff7" -+dependencies = [ -+ "anyhow", -+ "base64 0.13.1", -+ "buffered-reader", -+ "bzip2", -+ "chrono", -+ "dyn-clone", -+ "flate2", -+ "getrandom 0.2.8", -+ "idna", -+ "lalrpop", -+ "lalrpop-util", -+ "lazy_static", -+ "libc", -+ "memsec", -+ "nettle", -+ "rand", -+ "regex", -+ "regex-syntax", -+ "sha1collisiondetection", -+ "thiserror", -+ "xxhash-rust", -+] -+ -+[[package]] -+name = "sha1collisiondetection" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c66558a774ef5044cb4a834db5f5c7f95e139d2341d7f502fe6034afa7082461" -+dependencies = [ -+ "digest 0.9.0", -+ "generic-array 0.14.6", -+] -+ -+[[package]] -+name = "sha2" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -+dependencies = [ -+ "block-buffer", -+ "digest 0.8.1", -+ "fake-simd", -+ "opaque-debug", -+] -+ -+[[package]] -+name = "shlex" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -+ -+[[package]] -+name = "siphasher" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -+ -+[[package]] -+name = "smallvec" -+version = "1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -+ -+[[package]] -+name = "sshkeys" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c926cb006a77964474a13a86aa0135ea82c9fd43e6793a1151cc54143db6637c" -+dependencies = [ -+ "base64 0.12.3", -+ "byteorder", -+ "sha2", -+] -+ -+[[package]] -+name = "string_cache" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -+dependencies = [ -+ "new_debug_unreachable", -+ "once_cell", -+ "parking_lot", -+ "phf_shared", -+ "precomputed-hash", -+] -+ -+[[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 = "talktosc" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d165e1d4852d6a986a400f085b39c2786f9647aa7af53aabe168caa11629c28f" -+dependencies = [ -+ "pcsc", -+ "thiserror", -+] -+ -+[[package]] -+name = "target-lexicon" -+version = "0.12.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" -+ -+[[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 = "term" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -+dependencies = [ -+ "dirs-next", -+ "rustversion", -+ "winapi", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[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 = "time" -+version = "0.1.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -+dependencies = [ -+ "libc", -+ "wasi 0.10.0+wasi-snapshot-preview1", -+ "winapi", -+] -+ -+[[package]] -+name = "tiny-keccak" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -+dependencies = [ -+ "crunchy", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "1.6.0" -+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.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -+ -+[[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.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+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-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 = "unindent" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[package]] -+name = "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", -+ "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-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 = "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.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" -+ -+[[package]] -+name = "xxhash-rust" -+version = "0.8.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix index c47e6aee0bbdf..9bbfe091c8920 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/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 88039e138e00e..02248b8104966 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.44"; + version = "0.44.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LsZPf5PVXPSyHNgfBdjH4hG4OFIdSprO5uj3saPDqzo="; + hash = "sha256-qja4mYl8G/t3FqFoVToLo76XthJ4RXF4y6odkPZDoq4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsons/default.nix b/pkgs/development/python-modules/jsons/default.nix index 457bcf4f65251..9a5116c94d6a4 100644 --- a/pkgs/development/python-modules/jsons/default.nix +++ b/pkgs/development/python-modules/jsons/default.nix @@ -1,8 +1,10 @@ { lib +, attrs , buildPythonPackage , fetchFromGitHub -, attrs , pytestCheckHook +, pythonAtLeast +, pythonOlder , typish , tzdata }: @@ -10,12 +12,15 @@ buildPythonPackage rec { pname = "jsons"; version = "1.6.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "jsons"; - rev = "v${version}"; - sha256 = "0sdwc57f3lwzhbcapjdbay9f8rn65rlspxa67a2i5apcgg403qpc"; + rev = "refs/tags/v${version}"; + hash = "sha256-7OIByHvsqhKFOkb1q2kuxmbkkleryavYgp/T4U5hvGk="; }; propagatedBuildInputs = [ @@ -34,6 +39,11 @@ buildPythonPackage rec { "tests/test_performance.py" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/ramonhagenaars/jsons/issues/187 + "test_dump_load_parameterized_collections" + ]; + pythonImportsCheck = [ "jsons" ]; @@ -41,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn Python objects into dicts or json strings and back"; homepage = "https://github.com/ramonhagenaars/jsons"; + changelog = "https://github.com/ramonhagenaars/jsons/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fmoda3 ]; }; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index c7c9997cf8ffc..d50dd571764b4 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,41 +1,45 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub - -# propagates +, fetchpatch , jinja2 , lxml +, mock , ncclient , netaddr +, nose , ntc-templates , paramiko , pyparsing , pyserial +, pythonOlder , pyyaml , scp , six , transitions , yamlordereddictloader - -# tests -, mock -, nose -, pytestCheckHook }: buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.6"; + version = "2.6.7"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; rev = "refs/tags/${version}"; - hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8="; + hash = "sha256-+hGybznip5RpJm89MLg9JO4B/y50OIdgtmV2FIpZShU="; }; + postPatch = '' + # https://github.com/Juniper/py-junos-eznc/issues/1236 + substituteInPlace lib/jnpr/junos/utils/scp.py \ + --replace "inspect.getargspec" "inspect.getfullargspec" + ''; + propagatedBuildInputs = [ jinja2 lxml @@ -61,11 +65,14 @@ buildPythonPackage rec { nosetests -v -a unit --exclude=test_sw_put_ftp ''; - pythonImportsCheck = [ "jnpr.junos" ]; + pythonImportsCheck = [ + "jnpr.junos" + ]; meta = with lib; { - homepage = "https://github.com/Juniper/py-junos-eznc"; + changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}"; description = "Junos 'EZ' automation for non-programmers"; + homepage = "https://github.com/Juniper/py-junos-eznc"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 44f88d56d9537..ac2a6c8125df6 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , flit-core +, pythonRelaxDepsHook , click , docutils , jinja2 @@ -25,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.13.1"; + version = "0.13.2"; format = "flit"; @@ -33,24 +34,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RgpC/H4J3kbdZsKuwYu7EOKCqcgM2v4uUsm6PVFknQE="; + sha256 = "sha256-wJWY0tBrlCkOFDfGZS4xWvv87sOlyrNl3fiGqgayqTs="; }; - postPatch = '' - 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" \ - --replace "linkify-it-py~=1.0.1" "linkify-it-py" - ''; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ click @@ -73,11 +63,19 @@ buildPythonPackage rec { sphinx-multitoc-numbering ]; - pythonImportsCheck = [ "jupyter_book" ]; + pythonRelaxDeps = [ + "docutils" + "myst-nb" + "sphinx" + ]; + + pythonImportsCheck = [ + "jupyter_book" + ]; meta = with lib; { description = "Build a book with Jupyter Notebooks and Sphinx"; - homepage = "https://executablebooks.org/"; + homepage = "https://jupyterbook.org/"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index f5d4f12e30732..f6065afa2bc66 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.4.4"; + version = "6.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fy9TNeMdYA32FhOpe38DUvLIJQu9EJLvLWWPdySfifs="; + sha256 = "sha256-a5G3tuinFQU7U22yCaL0sCQp17KNsnNzpWomsL69Ygs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix index 3d6b9fa933508..a31f0de42e6f3 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/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix index 465b865d662c4..fee502989ba06 100644 --- a/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -3,30 +3,39 @@ , fetchFromGitHub , karton-core , unittestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "karton-asciimagic"; version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; + rev = "refs/tags/v${version}"; + hash = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; }; propagatedBuildInputs = [ karton-core ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; - pythonImportsCheck = [ "karton.asciimagic" ]; + pythonImportsCheck = [ + "karton.asciimagic" + ]; meta = with lib; { description = "Decoders for ascii-encoded executables for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-asciimagic"; + changelog = "https://github.com/CERT-Polska/karton-asciimagic/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index a5d4f2c86a29d..7bdac115385ff 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; + rev = "refs/tags/v${version}"; + hash = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; }; propagatedBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "AutoIt script ripper for Karton framework"; homepage = "https://github.com/CERT-Polska/karton-autoit-ripper"; + changelog = "https://github.com/CERT-Polska/karton-autoit-ripper/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index 6578dc70a6be1..bb59fde718652 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "File type classifier for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-classifier"; + changelog = "https://github.com/CERT-Polska/karton-classifier/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 673d7569463a7..bce1025301e30 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; + rev = "refs/tags/v${version}"; + hash = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static configuration extractor for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-config-extractor"; + changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 65c56cbae18cc..0c2a44aa3e6b4 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -3,18 +3,22 @@ , buildPythonPackage , fetchFromGitHub , unittestCheckHook +, pythonOlder , redis }: buildPythonPackage rec { pname = "karton-core"; - version = "5.0.0"; + version = "5.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-0B2u2xnrGc3iQ8B9iAQ3fcovQQCPqdFsn5evgdDwg5M="; + hash = "sha256-TKO0l0AKsC9MMB58ao/EXcJ9k/J3y3S9tc127H7vA6w="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { redis ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; pythonImportsCheck = [ "karton.core" @@ -31,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed malware processing framework"; homepage = "https://karton-core.readthedocs.io/"; + changelog = "https://github.com/CERT-Polska/karton/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ chivay fab ]; }; diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 621c5da5b6e1a..a055c423374bc 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -8,6 +8,7 @@ , networkx , prometheus-client , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { }; patches = [ + # Allow later mistune, https://github.com/CERT-Polska/karton-dashboard/pull/68 (fetchpatch { name = "update-mistune.patch"; url = "https://github.com/CERT-Polska/karton-dashboard/commit/d0a2a1ffd21e9066acca77434acaff7b20e460d0.patch"; @@ -32,6 +34,17 @@ buildPythonPackage rec { }) ]; + pythonRelaxDeps = [ + "Flask" + "mistune" + "networkx" + "prometheus-client" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ flask karton-core @@ -40,19 +53,13 @@ buildPythonPackage rec { prometheus-client ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "Flask==2.0.3" "Flask" \ - --replace "networkx==2.6.3" "networkx" \ - --replace "prometheus_client==0.11.0" "prometheus_client" - ''; - # Project has no tests. pythonImportsCheck requires MinIO configuration doCheck = false; meta = with lib; { description = "Web application that allows for Karton task and queue introspection"; homepage = "https://github.com/CERT-Polska/karton-dashboard"; + changelog = "https://github.com/CERT-Polska/karton-dashboard/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 75523b67617fc..abc6ab5030ccd 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-QVxczXT74Xt0AtCSDm4nhIK4qtHQ6bqmVNb/CALZSE4="; }; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter"; + changelog = "https://github.com/CERT-Polska/karton-mwdb-reporter/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index ac9c93ee1c4d9..f85c756b811e0 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -3,18 +3,22 @@ , fetchFromGitHub , karton-core , unittestCheckHook +, pythonOlder , yara-python }: buildPythonPackage rec { pname = "karton-yaramatcher"; version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; + rev = "refs/tags/v${version}"; + hash = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; }; propagatedBuildInputs = [ @@ -22,13 +26,18 @@ buildPythonPackage rec { yara-python ]; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + unittestCheckHook + ]; - pythonImportsCheck = [ "karton.yaramatcher" ]; + pythonImportsCheck = [ + "karton.yaramatcher" + ]; meta = with lib; { description = "File and analysis artifacts yara matcher for the Karton framework"; homepage = "https://github.com/CERT-Polska/karton-yaramatcher"; + changelog = "https://github.com/CERT-Polska/karton-yaramatcher/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 057f5f76a9f9e..199ab908efd78 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder # build , setuptools-scm @@ -14,51 +15,53 @@ , responses , unittestCheckHook }: - buildPythonPackage rec { - pname = "sapi-python-client"; - version = "0.4.1"; - format = "setuptools"; + pname = "sapi-python-client"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "keboola"; - repo = pname; - rev = version; - sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; - }; + src = fetchFromGitHub { + owner = "keboola"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; + }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools-scm - ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ - azure-storage-blob - boto3 - requests - ]; + propagatedBuildInputs = [ + azure-storage-blob + boto3 + requests + ]; - # requires API token and an active keboola bucket - # ValueError: Root URL is required. - doCheck = false; + # Requires API token and an active Keboola bucket + # ValueError: Root URL is required. + doCheck = false; - nativeCheckInputs = [ - unittestCheckHook - responses - ]; + nativeCheckInputs = [ + unittestCheckHook + responses + ]; - pythonImportsCheck = [ - "kbcstorage" - "kbcstorage.buckets" - "kbcstorage.client" - "kbcstorage.tables" - ]; + pythonImportsCheck = [ + "kbcstorage" + "kbcstorage.buckets" + "kbcstorage.client" + "kbcstorage.tables" + ]; - meta = with lib; { - description = "Keboola Connection Storage API client"; - homepage = "https://github.com/keboola/sapi-python-client"; - maintainers = with maintainers; [ mrmebelman ]; - license = licenses.mit; - }; + meta = with lib; { + description = "Keboola Connection Storage API client"; + homepage = "https://github.com/keboola/sapi-python-client"; + changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mrmebelman ]; + }; } diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix index 315054b10de9e..e5ddcf01be1c8 100644 --- a/pkgs/development/python-modules/kegtron-ble/default.nix +++ b/pkgs/development/python-modules/kegtron-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-O5I5shW8nL2RAQptS2Bp/GI/4L6o0xXXmwYvRq0MM8o="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Kegtron BLE devices"; homepage = "https://github.com/Bluetooth-Devices/kegtron-ble"; + changelog = "https://github.com/Bluetooth-Devices/kegtron-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index 0b91d0bb97281..77054ebe40ac0 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { # prefer pkg-config over hardcoded framework paths USE_OSX_FRAMEWORKS = 0; # work around python distutils compiling C++ with $CC (see issue #26709) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace kivy/lib/mtdev.py \ diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e51324989e663..1481bc8699c05 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-I${lib.getDev libcxx}/include/c++/v1" ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 03c858dd92f2b..a74f22ffa7be5 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "25.3.0"; + version = "26.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-LKj9zt9ou3zfPnpOP2MMycby0qqW3dtI4CmW/E6jv0Y="; + sha256 = "sha256-2QkQGZ4Dho2PykH90ijosWWBzhQoCHoWhRL3ruOiDBg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix index 6ba2330eb56ab..aada84c73654b 100644 --- a/pkgs/development/python-modules/leb128/default.nix +++ b/pkgs/development/python-modules/leb128/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "leb128"; - version = "1.0.4"; + version = "1.0.5"; # fetchPypi doesn't include files required for tests src = fetchFromGitHub { owner = "mohanson"; repo = "leb128"; - rev = "v${version}"; - sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zK14LPziBkvXAMzuPbcg/47caO/5GEYA9txAzCGfpS8="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 53ae154857aa1..a75bc1f59ab9c 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for LED BLE devices"; homepage = "https://github.com/Bluetooth-Devices/led-ble"; + changelog = "https://github.com/Bluetooth-Devices/led-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 7480045f7008e..be5b871469010 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 0000000000000..f1b55e0ae817e --- /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 d3c717a7e0c98..1a3ad1b7f268d 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -10,6 +10,7 @@ , importlib-metadata , inifile , jinja2 +, markupsafe , marshmallow , marshmallow-dataclass , mistune @@ -19,8 +20,10 @@ , pytest-mock , pytest-pylint , pytestCheckHook +, python , pythonOlder , python-slugify +, pytz , requests , setuptools , typing-inspect @@ -30,7 +33,7 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.4.0b2"; + version = "3.4.0b4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -39,7 +42,7 @@ buildPythonPackage rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5w3tT0celHgjmLlsM3sdBdYlXx57z3kMePVGSQkOP7M="; + hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk="; }; propagatedBuildInputs = [ @@ -51,12 +54,14 @@ buildPythonPackage rec { flask inifile jinja2 + markupsafe marshmallow marshmallow-dataclass mistune pip pyopenssl python-slugify + pytz requests setuptools typing-inspect @@ -72,9 +77,8 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "typing.inspect < 0.8.0" "typing.inspect" + postInstall = '' + cp -r lektor/translations "$out/${python.sitePackages}/lektor/" ''; pythonImportsCheck = [ @@ -89,6 +93,7 @@ buildPythonPackage rec { meta = with lib; { description = "A static content management system"; homepage = "https://www.getlektor.com/"; + changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md"; license = licenses.bsd0; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 6faaae0794a79..d680f2cb1e05c 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -37,9 +37,9 @@ buildPythonPackage rec { rapidfuzz-cpp ]; - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 - ]; + ]); propagatedBuildInputs = [ rapidfuzz diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index cf9e72c110d70..aa026a98eb32f 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -7,18 +7,19 @@ , pytestCheckHook , procps , tmux +, ncurses }: buildPythonPackage rec { pname = "libtmux"; - version = "0.18.1"; + version = "0.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OhNyJcnxjbyP/Kpt70qLv3ZtZvXXVTWEMcjv/pa50/4="; + hash = "sha256-nZPVS3jNz2e2LTlWiSz1fN7MzqJs/CqtAt6UVZaPPTY="; }; postPatch = '' @@ -32,14 +33,20 @@ buildPythonPackage rec { nativeCheckInputs = [ procps tmux + ncurses pytest-rerunfailures pytestCheckHook ]; - pytestFlagsArray = [ - "tests" - ] ++ 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/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 01be9fb865111..1be852daa1570 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lightgbm"; version = "3.3.5"; - format = "other"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix deleted file mode 100644 index f6d21f95dbfc1..0000000000000 --- a/pkgs/development/python-modules/lightning/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, jinja2 -, matplotlib -, numpy -, requests -, six -}: - -buildPythonPackage rec { - version = "1.2.1"; - pname = "lightning-python"; - - src = fetchPypi { - inherit pname version; - sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792"; - }; - - buildInputs = [ pytest ]; - propagatedBuildInputs = [ jinja2 matplotlib numpy requests six ]; - - meta = with lib; { - description = "A Python client library for the Lightning data visualization server"; - homepage = "http://lightning-viz.org"; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 428b199294ccd..6f07c8854862e 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 = "2023.1.12"; + version = "2023.1.28"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-V3DkIsnVv/HekWuOnIKnMHhccDGWun7mF7AcBSEsy6o="; + hash = "sha256-yIKJAW5hb7EOUiS7G+Q4QAESfG4dbfqHScaQBKLMkeM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index c1039db8829ce..9fa13391b6adf 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, contextlib2 , cython , fuse , pkg-config @@ -29,8 +28,6 @@ buildPythonPackage rec { buildInputs = [ fuse ]; - propagatedBuildInputs = [ contextlib2 ]; - preConfigure = '' substituteInPlace setup.py \ --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'" diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index bb9c100890af0..b0da4fba29343 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 @@ -31,7 +32,8 @@ buildPythonPackage rec { 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/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 01c07c6fecc55..a06101d837574 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -14,11 +14,13 @@ buildPythonPackage rec { pname = "locationsharinglib"; version = "4.1.8"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; + hash = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY="; }; propagatedBuildInputs = [ @@ -49,11 +51,14 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "locationsharinglib" ]; + pythonImportsCheck = [ + "locationsharinglib" + ]; meta = with lib; { description = "Python package to retrieve coordinates from a Google account"; homepage = "https://locationsharinglib.readthedocs.io/"; + changelog = "https://github.com/costastf/locationsharinglib/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 70476a4b8900f..f89741e527af2 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -4,31 +4,29 @@ , 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 ]; @@ -36,19 +34,15 @@ buildPythonPackage rec { 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/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 8effe91bc6e57..7c84d19a9ddcb 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.17.1"; + version = "1.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-H0dGPcGSiV8fZwZRGWIx39ObriPmsr1pZaFkSsXrTQA="; + hash = "sha256-R17pMVK0T2LLQPNX7mwIlkmuRyNs8rx0sJZa8F60mvs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 9f2e31fbc7df2..b3c82f707f0dd 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.2.5"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; + hash = "sha256-g2EEyPhsQZ+VKP/kSjZdQ9ns0NlptH8l2h0vTTLpF54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 229d3dfdaa9ed..f28b261f50993 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.8"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-JSr9qLyRg0pMZHuvfo/ZO9/Hwl7ZHTrMGkrcejVRweY="; + hash = "sha256-uz3IUUL5rdYwUsBNdHB+K/ZaCCnUE5EThFConVl8YgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 863ed3ccc2216..73b03cf83cb27 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -1,21 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, python - -# native inputs , pkgconfig -, setuptools-scm - -# tests , psutil , pytestCheckHook +, python +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "python-lz4"; - version = "4.3.1"; + version = "4.3.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XWkCZhBapjtzH3g3t+xXiB2f54p3Xw0+UBKVNH+gGHQ="; + sha256 = "sha256-aVnXCrTh+0Ip+FgYWN7hLw8N3iQCmXSywhReD5RTUfI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,8 +31,8 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools-scm pkgconfig + setuptools-scm ]; pythonImportsCheck = [ @@ -47,8 +43,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook psutil + pytestCheckHook ]; # for lz4.steam @@ -63,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "LZ4 Bindings for Python"; homepage = "https://github.com/python-lz4/python-lz4"; + changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 8e214540b12d4..8f75d74f95252 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://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://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-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/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 5798f7c95d991..076e6a50b9b51 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.6.5"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-YCPMPkvMaZ0uzTiiCbXFDpgDS0yGlfF0wKK2HhYmH+Y="; + hash = "sha256-WYLYDDXxO5ot30oSBkxgJszn8nyAQh5XtCyywBz56J4="; }; propagatedBuildInputs = [ 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 3e4f31dff60a3..0a9e26771c4ae 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 @@ -33,6 +47,7 @@ buildPythonPackage rec { 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/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 20b1b951ec8cb..f10f42c567538 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WxEOcz2U96SdisJ7Hi1A8rsFAemMHYJeDZMtJpIN1d8="; + sha256 = "sha256-QLDxGLbe0NjXjHjx62ebi2skYuPBs+BfsbLajNRrSKU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 9b03caa6b1031..443415470b056 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.interpreter} setup.py build_ext --inplace + ${python.pythonForBuild.interpreter} setup.py build_ext --inplace ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 100298e0fc0ba..c648ec9fed6b1 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , marshmallow +, packaging , sqlalchemy , pytest-lazy-fixture , pytestCheckHook @@ -10,16 +11,19 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.28.1"; - disabled = pythonOlder "3.6"; + version = "0.28.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qjdnRylngKVjVeMGe5yL9DoqHET/mF3oKzpdnhYcorg="; + hash = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE="; }; propagatedBuildInputs = [ marshmallow + packaging sqlalchemy ]; @@ -33,9 +37,10 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; description = "SQLAlchemy integration with marshmallow"; + homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; + changelog = "https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/${version}/CHANGELOG.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index fb44a1281c540..3737bea082432 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -23,16 +23,18 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.1"; + version = "0.13.3"; disabled = pythonOlder "3.5"; + format = "setuptools"; + src = fetchFromGitLab { domain = "0xacab.org"; owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-/HcWVXguZf9cCGY0xlC7uMnLkSAqZ0DIAC6JUw2KKDs="; + hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8="; }; patches = [ @@ -56,6 +58,7 @@ buildPythonPackage rec { ]; postPatch = '' + rm pyproject.toml substituteInPlace dolphin/mat2.desktop \ --replace "@mat2@" "$out/bin/mat2" \ --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg" diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 53f72ce94637f..c2c156885c19a 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 cdfce3d..1e83520 100644 +index 2b91ac2..5fcf6e5 100644 --- a/libmat2/exiftool.py +++ b/libmat2/exiftool.py @@ -1,8 +1,6 @@ @@ -23,13 +23,13 @@ index cdfce3d..1e83520 100644 import os -import shutil import subprocess - from typing import Union + from typing import Union, Set, Dict @@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser): return False return True --@functools.lru_cache +-@functools.lru_cache(maxsize=None) def _get_exiftool_path() -> str: # pragma: no cover - which_path = shutil.which('exiftool') - if which_path: @@ -42,7 +42,7 @@ index cdfce3d..1e83520 100644 - raise RuntimeError("Unable to find exiftool") + return '@exiftool@' diff --git a/libmat2/video.py b/libmat2/video.py -index 4d33aa4..6388664 100644 +index 39059c5..82fe1e7 100644 --- a/libmat2/video.py +++ b/libmat2/video.py @@ -1,6 +1,4 @@ @@ -51,12 +51,12 @@ index 4d33aa4..6388664 100644 -import shutil import logging - from typing import Union + from typing import Union, Dict @@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser): } --@functools.lru_cache() +-@functools.lru_cache(maxsize=None) def _get_ffmpeg_path() -> str: # pragma: no cover - which_path = shutil.which('ffmpeg') - if which_path: diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index ff92d814a099f..a764c3b4ed5d0 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.9"; + version = "0.19.4"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Ihaz/izB9L6osu3CPwBWOwLZ2JOLKhsDuqOUf/B02qI="; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-zPcqM+Ge7K4pJD4K0MkkGdSiYvXxe0K1qbfHzVYmGx0="; }; propagatedBuildInputs = [ aiohttp + attrs + yarl + ]; - # defined in optional-requirements.txt - sqlalchemy - aiosqlite - ruamel-yaml - CommonMark - lxml + passthru.optional-dependencies = { + detect_mimetype = [ + python-magic + ]; + encryption = [ + python-olm + unpaddedbase64 + pycryptodome + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook ]; - # no tests available - doCheck = false; + 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/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index b0ddfeeefcf35..405dccff2df18 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { vtk ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; # Needs X server doCheck = false; diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix new file mode 100644 index 0000000000000..59914caf80086 --- /dev/null +++ b/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, chardet +, pytestCheckHook +, faker +}: + +buildPythonPackage rec { + pname = "mbstrdecoder"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-U8F+mWKDulIRvvhswmdGnxKjM2qONQybViQ5TLZbLDY="; + }; + + propagatedBuildInputs = [ chardet ]; + + nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ faker ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/mbstrdecoder"; + description = "A library for decoding multi-byte character strings"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 8cd113972a247..bbd364267549c 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 = "10.0.1"; + version = "10.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8="; + hash = "sha256-8RdJarRoBOkHZfFAKnDgqu8dANQLwKAoY2g8SwbuDeE="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for checking the status of Minecraft servers"; homepage = "https://github.com/py-mine/mcstatus"; + changelog = "https://github.com/py-mine/mcstatus/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index a8d1c18c471e9..193fca714ad53 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.8"; + version = "8.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ="; + hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 75dfc5dabc9a8..40f57408703f9 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -2,32 +2,52 @@ , buildPythonPackage , fetchPypi , future +, joblib , numpy , pytest +, pythonOlder +, scikit-learn }: buildPythonPackage rec { - pname = "MDP"; + pname = "mdp"; version = "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e"; + pname = "MDP"; + inherit version; + hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4="; }; - propagatedBuildInputs = [ future numpy ]; - - nativeCheckInputs = [ pytest ]; - - doCheck = true; - - pythonImportsCheck = [ "mdp" "bimdp" ]; - postPatch = '' # https://github.com/mdp-toolkit/mdp-toolkit/issues/92 - substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict + substituteInPlace mdp/utils/routines.py \ + --replace numx.typeDict numx.sctypeDict + substituteInPlace mdp/test/test_NormalizingRecursiveExpansionNode.py \ + --replace py.test"" "pytest" + substituteInPlace mdp/test/test_RecursiveExpansionNode.py \ + --replace py.test"" "pytest" ''; + propagatedBuildInputs = [ + future + numpy + ]; + + nativeCheckInputs = [ + joblib + pytest + scikit-learn + ]; + + pythonImportsCheck = [ + "mdp" + "bimdp" + ]; + checkPhase = '' runHook preCheck @@ -39,7 +59,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = "http://mdp-toolkit.sourceforge.net"; + homepage = "https://mdp-toolkit.github.io/"; + changelog = "https://github.com/mdp-toolkit/mdp-toolkit/blob/MDP-${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ nico202 ]; }; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 44190b11e5995..333f55ce42281 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; + format = "flit"; + pythonImportsCheck = [ "mediapy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix new file mode 100644 index 0000000000000..021121a44ac29 --- /dev/null +++ b/pkgs/development/python-modules/meep/default.nix @@ -0,0 +1,151 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gfortran +, mpi +, blas +, lapack +, fftw +, hdf5-mpi +, swig +, gsl +, harminv +, libctl +, libGDSII +, openssh +, guile +, python +, numpy +, scipy +, matplotlib +, h5py-mpi +, cython +, autograd +, mpi4py +}: + +assert !blas.isILP64; +assert !lapack.isILP64; + +buildPythonPackage rec { + pname = "meep"; + version = "1.25.0"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4rIz2RXLSWzZbRuv8d4nidOa0ULYc4QHIdaYrGu1WkI="; + }; + + format = "other"; + + # MPI is needed in nativeBuildInputs too, otherwise MPI libs will be missing + # at runtime + nativeBuildInputs = [ + autoreconfHook + gfortran + pkg-config + swig + mpi + ]; + + buildInputs = [ + gsl + blas + lapack + fftw + hdf5-mpi + harminv + libctl + libGDSII + guile + gsl + ]; + + propagatedBuildInputs = [ + mpi + numpy + scipy + matplotlib + h5py-mpi + cython + autograd + mpi4py + ]; + + propagatedUserEnvPkgs = [ mpi ]; + + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + + enableParallelBuilding = true; + + preConfigure = '' + export HDF5_MPI=ON + export PYTHON=${python}/bin/${python.executable}; + ''; + + configureFlags = [ + "--without-libctl" + "--enable-shared" + "--with-mpi" + "--with-openmp" + "--enable-maintainer-mode" + ]; + + passthru = { inherit mpi; }; + + /* + This test is taken from the MEEP tutorial "Fields in a Waveguide" at + <https://meep.readthedocs.io/en/latest/Python_Tutorials/Basics/>. + It is important, that the test actually performs a calculation + (calls `sim.run()`), as only then MPI will be initialised and MPI linking + errors can be caught. + */ + doCheck = true; + checkPhase = '' + export PATH=$PATH:${openssh}/bin + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + export OMP_NUM_THREADS=1 + + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + export OMPI_MCA_rmaps_base_oversubscribe=1 + + # Generate a python test script + cat > test.py << EOF + import meep as mp + cell = mp.Vector3(16,8,0) + geometry = [mp.Block(mp.Vector3(mp.inf,1,mp.inf), + center=mp.Vector3(), + material=mp.Medium(epsilon=12))] + sources = [mp.Source(mp.ContinuousSource(frequency=0.15), + component=mp.Ez, + center=mp.Vector3(-7,0))] + pml_layers = [mp.PML(1.0)] + resolution = 10 + sim = mp.Simulation(cell_size=cell, + boundary_layers=pml_layers, + geometry=geometry, + sources=sources, + resolution=resolution) + sim.run(until=200) + EOF + + ${mpi}/bin/mpiexec -np 2 python3 test.py + ''; + + meta = with lib; { + description = "Free finite-difference time-domain (FDTD) software for electromagnetic simulations"; + homepage = "https://meep.readthedocs.io/en/latest/"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index f418cfbe9f01f..c9abb37701516 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.23.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-7TiXyuB2veNJtK6UmQg01O82r549aRmEa/DFzJtnQug="; + hash = "sha256-tN6rjUozN+VqUAm4vHN3RDQoNmkPE49pSUl+zuei9lc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 6fbb4aa877fb2..ec1f34fcf3d25 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -8,17 +8,18 @@ , pypubsub , pyqrcode , pyserial +, pytap2 , pytestCheckHook , pythonOlder , pyyaml +, setuptools , tabulate -, pytap2 , timeago }: buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.9"; + version = "2.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; + hash = "sha256-Y3X5LW85e+OQ548H13fQ0s+R870Hzp0kVd+v+lbdqtg="; }; propagatedBuildInputs = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { pyqrcode pyserial pyyaml + setuptools tabulate timeago ]; diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 9183bc8170f59..b6fb1d51446db 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "meteofrance-api"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - hash = "sha256-1ZN/9ur6uhK7M5TurmmWgUjzkc79MPqKnT637hbAAWA="; + rev = "refs/tags/v${version}"; + hash = "sha256-W26R+L2ZJpycEQ9KwkHqVARKsd/5YkJCxMeciKnKAX8="; }; nativeBuildInputs = [ @@ -56,12 +56,14 @@ buildPythonPackage rec { "test_places" "test_rain" "test_session" + "test_observation" "test_workflow" ]; meta = with lib; { description = "Module to access information from the Meteo-France API"; homepage = "https://github.com/hacf-fr/meteofrance-api"; + changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 16becae6f4f11..8bd0aea36ca47 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,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thp"; repo = "minidb"; - rev = version; - hash = "sha256-H7W+GBapT9uJgbPlARp4ZLKTN7hZlF/FbNo7rObqDM4="; + rev = "refs/tags/${version}"; + hash = "sha256-0f2usKoHs4NO/Ir8MhyiAVZFYnUkVH5avdh3QdHzY6s="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 104b9a9149ae1..c29a75377d8b3 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -5,26 +5,28 @@ , fetchPypi , oscrypto , pythonOlder +, six , tqdm , unicrypto }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.3.5"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FjeMtf09I2EksVUwZ2UCndmmqqnyTvtgh58HSrqVShw="; + hash = "sha256-uB3J9DRZ23Hf31EkAUyxNTV7Ftgt0yjhEOiiv+Aft+w="; }; propagatedBuildInputs = [ asn1crypto asysocks oscrypto + six tqdm unicrypto ]; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 600c77e8e0a6b..8025fbd48628a 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "mistune"; - version = "2.0.4"; + version = "2.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; + hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mistune" ]; meta = with lib; { + changelog = "https://github.com/lepture/mistune/blob/v${version}/docs/changes.rst"; description = "A sane Markdown parser with useful plugins and renderers"; homepage = "https://github.com/lepture/mistune"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix index 3cb3e82b0e079..1fa353260dad3 100644 --- a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, stdenv +, darwin , pytestCheckHook , pythonOlder , rustPlatform @@ -21,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-Oq3jF4XeT58rad0MWmqucZZHVAshhA8PViQ+2Q9Shgc="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.libiconv + darwin.apple_sdk.frameworks.Security + ]; + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ 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 0000000000000..57f900c6ab124 --- /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/ml-collections/default.nix b/pkgs/development/python-modules/ml-collections/default.nix index ffa3a6ade32ee..d317aa22cccfe 100644 --- a/pkgs/development/python-modules/ml-collections/default.nix +++ b/pkgs/development/python-modules/ml-collections/default.nix @@ -19,13 +19,13 @@ let in buildPythonPackage rec { pname = "ml-collections"; - version = "0.1.0"; + version = "0.1.1"; # ml-collections does not have any git release tags. See https://github.com/google/ml_collections/issues/8. src = fetchPypi { inherit version; pname = "ml_collections"; - sha256 = "0g6gxfz8g6fh1sghys869ylxgpda9hq7ylc8jw05608l3k6pz8ar"; + sha256 = "sha256-P+/McuxDOqHl0yMHo+R0u7Z/QFvoFOpSohZr/J2+aMw="; }; # The pypi source archive does not include requirements.txt or diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index f79fb2f3689ce..46bc25672e183 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.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3N9S8QhQ3vtC9SZBQqvwVpE8V062VVWTV3nBhPI1lmA="; + hash = "sha256-jvrk6m1Cd5ig2LXq6sAIbHDhmtG1gH/7WNAc7oet+tg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moat-ble/default.nix b/pkgs/development/python-modules/moat-ble/default.nix index 5131fd048603f..2e55edd7aedb0 100644 --- a/pkgs/development/python-modules/moat-ble/default.nix +++ b/pkgs/development/python-modules/moat-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-dy1Fm0Z1PUsPY8QTiXUcWSi+csFnTUsobSkA92m06QI="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Moat BLE devices"; homepage = "https://github.com/Bluetooth-Devices/moat-ble"; + changelog = "https://github.com/Bluetooth-Devices/moat-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index 9e82c24d1931c..c91cf2697fbde 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "mobly"; - version = "1.12"; + version = "1.12.1"; format = "setuptools"; src = fetchFromGitHub { owner = "google"; repo = "mobly"; rev = "refs/tags/${version}"; - hash = "sha256-HAXm0/h5jbgVuIwP7IZ1ffUs92gcpOPiM2VgT38r8Go="; + hash = "sha256-8ZcjxxAv+x8vTsgVKLFb55M02gElkZcZo/nrLwG7k6k="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/google/mobly/blob/"; + 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; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index c36747d3ddc75..ff8d2856cc991 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,62 +1,69 @@ { lib +, aiohttp +, asgiref , buildPythonPackage -, fetchPypi -, pythonOlder -, isPy3k , decorator -, http-parser -, python-magic -, urllib3 -, pytestCheckHook -, pytest-mock -, aiohttp , fastapi +, fetchPypi , gevent +, httptools , httpx +, isPy3k +, pook +, pytest-mock +, pytestCheckHook +, python-magic +, pythonOlder , redis , requests , sure -, pook +, urllib3 }: buildPythonPackage rec { pname = "mocket"; - version = "3.10.9"; - disabled = !isPy3k; + version = "3.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; + hash = "sha256-OIdLP3hHnPZ9MqrHt6G5t2SSO342+jTACgzxM6RjVYM="; }; propagatedBuildInputs = [ decorator - http-parser + httptools python-magic urllib3 ]; + passthru.optional-dependencies = { + pook = [ + pook + ]; + }; + nativeCheckInputs = [ - pytestCheckHook - pytest-mock aiohttp + asgiref fastapi gevent httpx + pytest-mock + pytestCheckHook redis requests sure - pook - ]; + ] ++ passthru.optional-dependencies.pook; - # skip http tests + # Skip http tests SKIP_TRUE_HTTP = true; - pytestFlagsArray = [ + + disabledTestPaths = [ # Requires a live Redis instance - "--ignore=tests/main/test_redis.py" - ] ++ lib.optionals (pythonOlder "3.8") [ - # Uses IsolatedAsyncioTestCase which is only available >= 3.8 - "--ignore=tests/tests38/test_http_aiohttp.py" + "tests/main/test_redis.py" ]; disabledTests = [ @@ -74,11 +81,14 @@ buildPythonPackage rec { "test_gethostbyname" ]; - pythonImportsCheck = [ "mocket" ]; + pythonImportsCheck = [ + "mocket" + ]; meta = with lib; { - description = "A socket mock framework - for all kinds of socket animals, web-clients included"; + description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index 7a5bf4224f397..ae57d8fbf84cb 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"; @@ -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 deleted file mode 100644 index e93f1a054facd..0000000000000 --- a/pkgs/development/python-modules/moku/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zeroconf -, requests -, setuptools -}: - -buildPythonPackage rec { - pname = "moku"; - version = "2.5.1"; - - /* - - Pypi's webpage <https://pypi.org/project/moku/> lists - https://github.com/liquidinstruments/moku/archive/${version}.tar.gz as the - download link, but that repository doesn't exist from some reason :/. When - packaging this, I didn't find any mention of a git repo of the sources. Note - that the pymoku <https://github.com/liquidinstruments/pymoku> repo holds the - sources of the legacy API package. - - */ - src = fetchPypi { - inherit pname version; - hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I="; - }; - /* - - Note: If you run `moku download` and encounter the error: - - [Errno 13] Permission denied: '/nix/store/.../lib/python 3.9/site-packages/moku/data' - - Then use the $MOKU_DATA_PATH environment variable to control where the - downloaded files will go to. It is undocumented upstream and there's no - repository to contribute such documentation unfortunately. Also there is no - suitable default value for this on Nix systems, so there's no patch we can - apply locally to make the situation better. - - */ - - propagatedBuildInputs = [ - zeroconf - requests - setuptools - ]; - - pythonImportsCheck = [ - "moku" - ]; - - meta = with lib; { - description = "Python scripting interface to the Liquid Instruments Moku"; - homepage = "https://apis.liquidinstruments.com/starting-python.html"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 8156764dee413..d6d67cd763350 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , msgpack -, pytestCheckHook , numpy , pandas , pydantic , pymongo +, pytestCheckHook +, pythonOlder , ruamel-yaml , tqdm }: @@ -15,13 +15,15 @@ buildPythonPackage rec { pname = "monty"; version = "2022.9.9"; - disabled = pythonOlder "3.5"; # uses type annotations + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; + hash = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; }; postPatch = '' @@ -30,17 +32,29 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + msgpack ruamel-yaml tqdm - msgpack ]; nativeCheckInputs = [ - pytestCheckHook 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/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix new file mode 100644 index 0000000000000..318bd9a00bbda --- /dev/null +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -0,0 +1,58 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "mopeka-iot-ble"; + version = "0.4.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "bluetooth-devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "mopeka_iot_ble" + ]; + + meta = with lib; { + description = "Library for Mopeka IoT BLE devices"; + homepage = "https://github.com/bluetooth-devices/mopeka-iot-ble"; + changelog = "https://github.com/Bluetooth-Devices/mopeka-iot-ble/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 2a9fcd2010356..fc88d76113ff2 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.15"; + version = "0.6.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-OTnlfJeE64tURR5YrTXjzTHbvGnbeEWu9UHGynzmSiQ="; + hash = "sha256-rCPwOhhv1hDwJqs8g3JfXcSgvrLf6UhNm0JPtRGW5S0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mox/default.nix b/pkgs/development/python-modules/mox/default.nix deleted file mode 100644 index 3513ac2b2cc85..0000000000000 --- a/pkgs/development/python-modules/mox/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, six -}: - -buildPythonPackage rec { - pname = "mox"; - version = "0.7.8"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "ivancrneto"; - repo = "pymox"; - rev = "v${version}"; - hash = "sha256-gODE9IGDk3WtO8iPOlp98fGp6Ih2laA3YlOHmq62m8Y="; - }; - - propagatedBuildInputs = [ - six - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "mox" - ]; - - meta = with lib; { - description = "Mock object framework"; - homepage = "https://github.com/ivancrneto/pymox"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 3aa8b02dc1014..2cdfd2c0c7462 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonAtLeast , subunit , testrepository , testtools @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "mox3"; version = "1.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index b00a7703cf05e..3364398241400 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.20.0"; + version = "1.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; + hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + changelog = "https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index fdeddeae06017..78aa7eb6e61e7 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.12.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9k1lpx5pb9idMwgYAZjVEM915w5wsmLWQ/tnHNSKHAs="; + hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 2d1ab99020a2a..47a65bf0cfe8d 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nolze"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-A5A578JZrxRXX6ewkFzittGTOebeNb99fuKsEm5QGoI="; + rev = "refs/tags/v${version}"; + hash = "sha256-OrGgY+CEhAHGOOIPYK8OijRdoh0PRelnsKB++ksUIXY="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool and library for decrypting MS Office files with passwords or other keys"; homepage = "https://github.com/nolze/msoffcrypto-tool"; + changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index 3523563693c3f..90e596a51166e 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , setuptools , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "multimethod"; - version = "1.6"; + version = "1.9.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "coady"; repo = pname; - rev = "v${version}"; - sha256 = "09vrxzv8q0lqsbh6d83wjdd29ja66rj31y7wmyha14jk603fd9k0"; + rev = "refs/tags/v${version}"; + hash = "sha256-KfO+6bZOZOv9SWTV4eqJTWb3/PeCpnXknSF47ddZR5o="; }; nativeBuildInputs = [ @@ -31,7 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "Multiple argument dispatching"; - homepage = "https://github.com/coady/multimethod"; + homepage = "https://coady.github.io/multimethod/"; + changelog = "https://github.com/coady/multimethod/tree/v${version}#changes"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d6ada06ef91ef..3c582230ee2e9 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.12.3"; + version = "7.12.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-cAbDw/u0kLUEdmd/NBNDy/bt5Wno9QpmqpqicqZ/Q6g="; + hash = "sha256-X8ATnycG7MvzDNaMClvhyy4Qy4hvoNhn0sQ+s/JnX64="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 6825978f19f33..bacf0cbf52b20 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.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bXB5+Mc53Jk8vtrQc2KZxBOyl4FLc3laOFWnkWnsyTg="; + hash = "sha256-qBf/8o/ualbYlkEK4KbYSP/kNUgK43rBxIGUDZYOz+U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index bb585a7afcd70..6bee65c7fec41 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Optional static typing for Python"; - homepage = "http://www.mypy-lang.org"; + homepage = "https://www.mypy-lang.org"; license = licenses.mit; maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index 7f167c3f71df3..a671cb2af819c 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; - homepage = "http://www.mypy-lang.org"; + homepage = "https://www.mypy-lang.org"; license = licenses.mit; maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/n3fit/default.nix b/pkgs/development/python-modules/n3fit/default.nix new file mode 100644 index 0000000000000..5c8b06b74a658 --- /dev/null +++ b/pkgs/development/python-modules/n3fit/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, hyperopt +, keras +, nnpdf +, psutil +, tensorflow +, validphys2 +}: + +buildPythonPackage rec { + pname = "n3fit"; + version = "4.0"; + format = "setuptools"; + + inherit (nnpdf) src; + + prePatch = '' + cd n3fit + ''; + + postPatch = '' + substituteInPlace src/n3fit/version.py \ + --replace '= __give_git()' '= "'$version'"' + ''; + + propagatedBuildInputs = [ + hyperopt + keras + psutil + tensorflow + validphys2 + ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")" + done + ''; + + doCheck = false; # no tests + pythonImportsCheck = [ "n3fit" ]; + + meta = with lib; { + description = "NNPDF fitting framework"; + homepage = "https://docs.nnpdf.science"; + inherit (nnpdf.meta) license; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index f809587f75f2f..acefdcc14bca0 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -1,29 +1,50 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools-scm -, pytestCheckHook -, pytest -, ipython +, imageio , ipykernel -, qtconsole +, ipython , napari-plugin-engine -, imageio -}: buildPythonPackage rec { +, pythonOlder +, qtconsole +, setuptools-scm +}: + +buildPythonPackage rec { pname = "napari-console"; - version = "0.0.4"; + version = "0.0.7"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "napari"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-aVdYOzkZ+dqB680oDjNCg6quXU+QgUZI09E/MSTagyA="; + rev = "refs/tags/v${version}"; + hash = "sha256-vHLCVMgrcs54pGb48wQpc0h7QBIfE6r7hCSoDNI3QvA="; }; - nativeBuildInputs = [ setuptools-scm ]; - # setup.py somehow requires pytest - propagatedBuildInputs = [ pytest ipython ipykernel napari-plugin-engine imageio qtconsole ]; - chechInputs = [ pytestCheckHook ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + imageio + ipykernel + ipython + napari-plugin-engine + qtconsole + ]; + + # Circular dependency: napari + doCheck = false; + + pythonImportsCheck = [ + "napari_console" + ]; + meta = with lib; { description = "A plugin that adds a console to napari"; homepage = "https://github.com/napari/napari-console"; diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index 969351a41a887..8b9a015e00657 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -3,22 +3,38 @@ , fetchFromGitHub , setuptools-scm , pytestCheckHook -}: buildPythonPackage rec { +, pythonOlder +}: + +buildPythonPackage rec { pname = "napari-plugin-engine"; version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "napari"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; + rev = "refs/tags/v${version}"; + hash = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; - nativeBuildInputs = [ setuptools-scm ]; - nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ + setuptools-scm + ]; + + # Circular dependency: napari + doCheck = false; + + pythonImportsCheck = [ + "napari_plugin_engine" + ]; + meta = with lib; { - description = "A fork of pluggy for napari - plugin management package"; + description = "First generation napari plugin engine"; homepage = "https://github.com/napari/napari-plugin-engine"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix index 1a5eb1ee4be5f..b07ca1e2cf188 100644 --- a/pkgs/development/python-modules/napari-svg/default.nix +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub +, imageio +, napari-plugin-engine +, pythonOlder , setuptools-scm -, pytestCheckHook , vispy -, napari-plugin-engine -, imageio -}: buildPythonPackage rec { +}: + +buildPythonPackage rec { pname = "napari-svg"; - version = "0.1.5"; + version = "0.1.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "napari"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-20NLi6JTugP+hxqF2AnhSkuvhkGGbeG+tT3M2SZbtRc="; + rev = "refs/tags/v${version}"; + hash = "sha256-lvI6RWT9oUE95vL6WO75CASc/Z+1G5UMm2p8vhqIjA0="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ vispy napari-plugin-engine imageio ]; - nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; # Circular dependency: napari + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + vispy + napari-plugin-engine + imageio + ]; + + # Circular dependency: napari + doCheck = false; + meta = with lib; { description = "A plugin for writing svg files from napari"; homepage = "https://github.com/napari/napari-svg"; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 592407007221e..0e41999470397 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,8 +1,10 @@ { lib , mkDerivationWith , appdirs +, app-model , buildPythonPackage , cachey +, certifi , dask , docstring-parser , fetchFromGitHub @@ -23,6 +25,7 @@ , scikitimage , scipy , setuptools-scm +, sphinx , superqt , tifffile , toolz @@ -49,15 +52,24 @@ mkDerivationWith buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "scikit-image>=0.19.1" "scikit-image" \ + --replace "sphinx<5" "sphinx" \ + --replace "vispy>=0.11.0,<0.12" "vispy" + ''; + nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; propagatedBuildInputs = [ + app-model appdirs cachey - dask.optional-dependencies.array + certifi + dask docstring-parser imageio jsonschema @@ -74,6 +86,7 @@ mkDerivationWith buildPythonPackage rec { pyyaml scikitimage scipy + sphinx superqt tifffile toolz @@ -81,13 +94,7 @@ mkDerivationWith buildPythonPackage rec { typing-extensions vispy wrapt - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "scikit-image>=0.19.1" "scikit-image" \ - --replace "vispy>=0.10.0,<0.11" "vispy" - ''; + ] ++ dask.optional-dependencies.array; dontUseSetuptoolsCheck = true; @@ -98,6 +105,7 @@ mkDerivationWith buildPythonPackage rec { meta = with lib; { description = "A fast, interactive, multi-dimensional image viewer"; homepage = "https://github.com/napari/napari"; + changelog = "https://github.com/napari/napari/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 385899ba84180..4b656fd72fd04 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -1,37 +1,45 @@ { lib , buildPythonPackage , fetchFromGitHub -, paramiko -, selectors2 , lxml +, paramiko , pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "ncclient"; version = "0.6.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; + rev = "refs/tags/v${version}"; + hash = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; }; propagatedBuildInputs = [ paramiko lxml + six ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "ncclient" ]; + pythonImportsCheck = [ + "ncclient" + ]; meta = with lib; { - homepage = "https://github.com/ncclient/ncclient"; description = "Python library for NETCONF clients"; + homepage = "https://github.com/ncclient/ncclient"; + changelog = "https://github.com/ncclient/ncclient/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index 92c5f392f4b7e..feeb36737a8a3 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -6,13 +6,15 @@ 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="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 0bb1f33c98ba6..3db12e6478389 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "neo"; - version = "0.11.1"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9KIGBEszKtALEAcrDcenCzWfo2XseG+Sq3V+9K5YhHQ="; + hash = "sha256-O2yk/AXf206VPiU+cJlL+7yP4ukJWPvaf6WGDK8/pjo="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Package for representing electrophysiology data"; homepage = "https://neuralensemble.org/neo/"; + changelog = "https://neo.readthedocs.io/en/${version}/releases/${version}.html"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index ea3558ab0bd69..67e0947b5c14d 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.4.0"; + version = "5.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-emUz6DHnrDBOu9Wlhum7ntK3JIt94/05tuBAT2x4Bjs="; + hash = "sha256-OjGLV7xHyF8kB++juXTM40aUl4OK+xwhnFaLSyxHMo4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 9bf6f3c7817b6..3ca143638ca40 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.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RT6KAliRlH285sEx2fbIXJNwe1gcyH6CrQ8pXKgY/hQ="; + hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix deleted file mode 100644 index 2d388dfa4c27a..0000000000000 --- a/pkgs/development/python-modules/neuronpy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, matplotlib -, scipy -, isPy27 -}: - -buildPythonPackage rec { - pname = "neuronpy"; - version = "0.1.6"; - disabled = !isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "1clhc2b5fy2l8nfrji4dagmj9419nj6kam090yqxhq5c28sngk25"; - }; - - propagatedBuildInputs = [ numpy matplotlib scipy ]; - - #No tests included - doCheck = false; - - meta = with lib; { - description = "Interfaces and utilities for the NEURON simulator and analysis of neural data"; - maintainers = [ maintainers.nico202 ]; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index e9ec686b796c6..f2a6137faed91 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.3.2"; + version = "2.4.0"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-ZflCOTqNhalBhxDkee3UwusiVA+ShtfabP0slE28/UQ="; + hash = "sha256-TePUsyQ4DCuvfRQD4KAUs94o3MJRmZmu6jMPv4lJtHE="; }; patches = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/nextcord/nextcord/blob/${src.rev}/docs/whats_new.rst"; description = "Python wrapper for the Discord API forked from discord.py"; homepage = "https://github.com/nextcord/nextcord"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nextcord/paths.patch b/pkgs/development/python-modules/nextcord/paths.patch index b5c9ce4f77a71..0b0e4c50fb9dd 100644 --- a/pkgs/development/python-modules/nextcord/paths.patch +++ b/pkgs/development/python-modules/nextcord/paths.patch @@ -1,8 +1,8 @@ diff --git a/nextcord/opus.py b/nextcord/opus.py -index 52e4ddbd..d8b8090b 100644 +index b1119a8e..b7c9c713 100644 --- a/nextcord/opus.py +++ b/nextcord/opus.py -@@ -255,7 +255,7 @@ def _load_default() -> bool: +@@ -233,7 +233,7 @@ def _load_default() -> bool: _filename = os.path.join(_basedir, "bin", f"libopus-0.{_target}.dll") _lib = libopus_loader(_filename) else: @@ -12,10 +12,10 @@ index 52e4ddbd..d8b8090b 100644 if opus is None: _lib = None diff --git a/nextcord/player.py b/nextcord/player.py -index 5d0674cc..fd1c20ef 100644 +index 5c7daf52..48a11eb7 100644 --- a/nextcord/player.py +++ b/nextcord/player.py -@@ -148,7 +148,7 @@ class FFmpegAudio(AudioSource): +@@ -127,7 +127,7 @@ class FFmpegAudio(AudioSource): self, source: Union[str, io.BufferedIOBase], *, @@ -23,8 +23,8 @@ index 5d0674cc..fd1c20ef 100644 + executable: str = "@ffmpeg@", args: Any, **subprocess_kwargs: Any, - ): -@@ -275,7 +275,7 @@ class FFmpegPCMAudio(FFmpegAudio): + ) -> None: +@@ -254,7 +254,7 @@ class FFmpegPCMAudio(FFmpegAudio): self, source: Union[str, io.BufferedIOBase], *, @@ -33,16 +33,16 @@ index 5d0674cc..fd1c20ef 100644 pipe: bool = False, stderr: Optional[IO[str]] = None, before_options: Optional[str] = None, -@@ -378,7 +378,7 @@ class FFmpegOpusAudio(FFmpegAudio): +@@ -357,7 +357,7 @@ class FFmpegOpusAudio(FFmpegAudio): *, bitrate: int = 128, codec: Optional[str] = None, - executable: str = "ffmpeg", + executable: str = "@ffmpeg@", - pipe=False, + pipe: bool = False, stderr=None, before_options=None, -@@ -532,7 +532,7 @@ class FFmpegOpusAudio(FFmpegAudio): +@@ -510,7 +510,7 @@ class FFmpegOpusAudio(FFmpegAudio): """ method = method or "native" @@ -51,16 +51,19 @@ index 5d0674cc..fd1c20ef 100644 probefunc = fallback = None if isinstance(method, str): -@@ -577,7 +577,7 @@ class FFmpegOpusAudio(FFmpegAudio): +@@ -555,9 +555,9 @@ class FFmpegOpusAudio(FFmpegAudio): @staticmethod def _probe_codec_native( - source, executable: str = "ffmpeg" + source, executable: str = "@ffmpeg@" ) -> Tuple[Optional[str], Optional[int]]: - exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable +- exe = executable[:2] + "probe" if executable in ("ffmpeg", "avconv") else executable ++ exe = executable[:-4] + "probe" if executable.endswith(("ffmpeg", "avconv")) else executable args = [ -@@ -606,7 +606,7 @@ class FFmpegOpusAudio(FFmpegAudio): + exe, + "-v", +@@ -584,7 +584,7 @@ class FFmpegOpusAudio(FFmpegAudio): @staticmethod def _probe_codec_fallback( diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index 18eae73ca0003..4c633aa4ce2e1 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.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F6vTOwE8WdcELH+W7VuRbGDLD+7+a09iai/TDMBfv4s="; + hash = "sha256-+ApchGB/+mV5i751jTfZoP8XJ3VAYPCwx6VoRkq5950="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index eed07e4a38dba..b9193d1382480 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "niaarm"; - version = "0.2.4"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = version; - hash = "sha256-JPsBpVMeVZxUhCHoIBP47LhR8nrc8ZtJHREZLwL5Zxw="; + hash = "sha256-5XOE3c7amvhw1KrX1hcmTxneYNvAuiHz+OZLb/yhB+I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index d5e399701dc86..9f600bdf86ac1 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, cython , nose , matplotlib , nibabel @@ -21,9 +22,14 @@ buildPythonPackage rec { sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848"; }; + nativeBuildInputs = [ cython ]; buildInputs = lib.optionals doCheck [ nose ]; propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ]; + preBuild = '' + make recythonize + ''; + checkPhase = '' # wants to be run in a different directory mkdir nosetests cd nosetests diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9b290730be9d7..77ed843d47cdf 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.8"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw="; + hash = "sha256-GDTaPQaCy6Tyzt4vmq1rD6+2RhukUdsO+2+cOXmNZNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 2c6fe00e9d2f6..42067f594e8bc 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -7,11 +7,11 @@ 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 = [ diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index 3a11c78f34533..a1c8909e5fa47 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -1,18 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "nocaselist"; - version = "1.0.6"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SPBn+MuEEkXzTQMSC8G6mQDxOxnLUbzGx77gF/fIdNo="; + sha256 = "sha256-qZOEq8cAxAnp3vcUN2PhjfrTMv3/fjD64fbRows3J3I="; }; + propagatedBuildInputs = [ + six + ]; + nativeCheckInputs = [ - pytest + pytestCheckHook ]; pythonImportsCheck = [ @@ -22,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "A case-insensitive list for Python"; homepage = "https://github.com/pywbem/nocaselist"; + changelog = "https://github.com/pywbem/nocaselist/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ freezeboy ]; }; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 6549697f1e3e6..2fb460bc006d8 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,20 +1,37 @@ -{ lib, fetchPypi, buildPythonPackage, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "0.8.1"; pname = "node-semver"; + version = "0.9.0"; + format = "setuptools"; - nativeCheckInputs = [ pytest ]; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "281600d009606f4f63ddcbe148992e235b39a69937b9c20359e2f4a2adbb1e00"; + src = fetchFromGitHub { + owner = "podhmo"; + repo = "python-node-semver"; + rev = "refs/tags/${version}"; + hash = "sha256-Ncl+RUvy9G9lF3EzLz2HfiDB02tEgAlZ34Wbn4mlF6Y="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nodesemver" + ]; + meta = with lib; { - homepage = "https://github.com/podhmo/python-semver"; + changelog = "https://github.com/podhmo/python-node-semver/blob/${version}/CHANGES.txt"; description = "A port of node-semver"; + homepage = "https://github.com/podhmo/python-semver"; license = licenses.mit; - platforms = platforms.all; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 120aa896aaab6..28410b313298d 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.1"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-bpMv7dFX6hQoR8uG8IRy8JaDGLlU50hOPAI6jWmlMWI="; + hash = "sha256-SPQ/3ntdD+EBW2YZJKfg2lornlg1ktnvTd1PNAqNSIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix deleted file mode 100644 index fb9a8e61bdae4..0000000000000 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchPypi -, nose -, pillow -, blessings -, isPy3k -}: - -buildPythonPackage rec { - pname = "nose-progressive"; - version = "1.5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1mzmgq0wnfizmg9m2wn0c9g9282rdgv1jnphp8ww5h8kwqrjhvis"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ pillow blessings ]; - - # fails with obscure error - doCheck = !isPy3k; - - meta = with lib; { - homepage = "https://github.com/erikrose/nose-progressive"; - description = "A testrunner with a progress bar and smarter tracebacks"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; - broken = true; # relies on 2to3 conversion, which was removed from setuptools>=58.0 - }; - -} diff --git a/pkgs/development/python-modules/notifications-python-client/default.nix b/pkgs/development/python-modules/notifications-python-client/default.nix index e98620dd91872..b41cc4344c492 100644 --- a/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/pkgs/development/python-modules/notifications-python-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notifications-python-client"; - version = "6.4.1"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alphagov"; repo = pname; - rev = version; - sha256 = "sha256-HEHerdwplsPAld23Al8sUARu4T5IJLmY5kucAz2791c="; + rev = "refs/tags/${version}"; + hash = "sha256-feATZS7PG9IKY6ooPztA49WykQ/Bt67frSe3PpbiCLc="; }; propagatedBuildInputs = [ @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the GOV.UK Notify API"; homepage = "https://github.com/alphagov/notifications-python-client"; + changelog = "https://github.com/alphagov/notifications-python-client/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index d2d21ab09b6e3..61c1c9026e0be 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "notify-py"; - version = "0.3.39"; + version = "0.3.42"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ms7m"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QIK5MCCOsD8SStoh7TRw+l9k28SjChwV2J/T7gMKnAs="; + hash = "sha256-XtjJImH9UwPPZS/Yqs8S5xGXOLBRmJRawzxWXoPWvrM="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 35145189207a3..9c60eac4116aa 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -40,7 +40,7 @@ in buildPythonPackage rec { --replace "setuptools<60" "setuptools" ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; nativeBuildInputs = lib.optionals cudaSupport [ addOpenGLRunpath diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ff7bc68dd23c2..5640c01d64306 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -77,7 +77,8 @@ in buildPythonPackage rec { 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/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 5870d47ab5cc7..b3c68b4e6e5f0 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for probabilistic programming with NumPy"; homepage = "https://num.pyro.ai/"; + changelog = "https://github.com/pyro-ppl/numpyro/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 4a1fc5ff3e0d7..7ec78dab79e05 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.9.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KhgijXJ908uxM7VZdXo1WU/RGU0cfqctBCbpF2wOcy8="; + sha256 = "sha256-EOkxTliGcGwe0GWfNt9t4gosxrMq7748hcB0Snemtzw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 4b66d242ee298..ec75d9c452ae3 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -1,25 +1,26 @@ { lib , buildPythonPackage , fetchPypi +, graphviz +, graphvizPkgs , isPyPy +, pytestCheckHook +, pythonOlder , substituteAll -, graphvizPkgs -, graphviz -, mock }: 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 + ]; - nativeCheckInputs = [ 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 0000000000000..18efa2b3494a9 --- /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 90910e93d1461..7b1232decd614 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -7,23 +7,33 @@ , pyopenssl , python-dateutil , pythonOlder +, pythonRelaxDepsHook , pytz }: buildPythonPackage rec { pname = "oci"; - version = "2.90.2"; + version = "2.93.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-8HqvJx4H4cLkAXuaEUmlOjiuYD7WmVT0Xvsktc/IfCE="; + hash = "sha256-yH9SCrTASP+O9VLVs6tliteCOWi+Pc7nDOgiboHQE4s="; }; + pythonRelaxDeps = [ + "cryptography" + "pyOpenSSL" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ certifi circuitbreaker @@ -33,13 +43,6 @@ buildPythonPackage rec { pytz ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "configparser==4.0.2 ; python_version < '3'" "" \ - --replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \ - --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" - ''; - # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 doCheck = false; @@ -49,7 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Python SDK"; - homepage = "https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/"; + homepage = "https://github.com/oracle/oci-python-sdk"; + changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 /* or */ upl ]; maintainers = with maintainers; [ ilian ]; }; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 51c756db19e35..cd1aad3d6a377 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.2"; + version = "14.0.3"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g="; + hash = "sha256-LAYy1UpGHd3kTH1TIrp9gfrFwXzsXcME6AISf07rUYA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 3021333091abb..1ad03a48a957b 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "5.0.1"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-gRfOZwUguQgoROnqQuQWKOgubR3wjcf7Yfje2+4+CB0="; + hash = "sha256-ECRm9I/wHb82F8UBqPQWd60wLybIloCJiTxXDb3GnGs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix new file mode 100644 index 0000000000000..b5be85bf1151a --- /dev/null +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, aiohttp +, dask +, fsspec +, numpy +, requests +, scikitimage +, s3fs +, toolz +, zarr +}: + +buildPythonPackage rec { + pname = "ome-zarr"; + version = "0.6.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ome"; + repo = "ome-zarr-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-dpweOuqruh7mAqmSaNbehLCr8OCLe1IZNWV4bpHpTl0="; + }; + + patches = [ + # remove after next release: + (fetchpatch { + name = "fix-writer-bug"; + url = "https://github.com/ome/ome-zarr-py/commit/c1302e05998dfe2faf94b0f958c92888681f5ffa.patch"; + hash = "sha256-1WANObABUXkjqeGdnmg0qJ48RcZcuAwgitZyMwiRYUw="; + }) + ]; + + propagatedBuildInputs = [ + numpy + dask + zarr + fsspec + aiohttp + requests + s3fs + scikitimage + toolz + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # attempts to access network + "test_s3_info" + ]; + + pythonImportsCheck = [ + "ome_zarr" + "ome_zarr.cli" + "ome_zarr.csv" + "ome_zarr.data" + "ome_zarr.format" + "ome_zarr.io" + "ome_zarr.reader" + "ome_zarr.writer" + "ome_zarr.scale" + "ome_zarr.utils" + ]; + + meta = with lib; { + description = "Implementation of next-generation file format (NGFF) specifications for storing bioimaging data in the cloud."; + homepage = "https://pypi.org/project/ome-zarr"; + changelog = "https://github.com/ome/ome-zarr-py/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = [ maintainers.bcdarwin ]; + mainProgram = "ome_zarr"; + }; +} diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a6f290633edc9..29a2f385ccc21 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,35 +1,42 @@ { lib , buildPythonPackage +, python3 , bash , cmake -, fetchPypi +, fetchFromGitHub +, gtest , isPy27 , nbval , numpy , protobuf +, pybind11 , pytestCheckHook , six , tabulate , typing-extensions , pythonRelaxDepsHook -, pytest-runner }: -buildPythonPackage rec { +let + gtestStatic = gtest.override { static = true; }; +in buildPythonPackage rec { pname = "onnx"; - version = "1.12.0"; + version = "1.13.1"; format = "setuptools"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-E7PnfSdSO52/TzDfyclZRVhZ1eNOkhxE9xLWm4Np7/k="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-10MH23XpAv/uDW/2tRFGS2lKU8hnaNBwbIBIgVc7Jpk="; }; nativeBuildInputs = [ cmake pythonRelaxDepsHook + pybind11 ]; pythonRelaxDeps = [ "protobuf" ]; @@ -44,26 +51,36 @@ buildPythonPackage rec { nativeCheckInputs = [ nbval pytestCheckHook - pytest-runner tabulate ]; postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in - patchShebangs tools/protoc-gen-mypy.py - substituteInPlace tools/protoc-gen-mypy.sh.in \ - --replace "/bin/bash" "${bash}/bin/bash" + patchShebangs tools/protoc-gen-mypy.sh.in + + substituteInPlace setup.py \ + --replace 'setup_requires.append("pytest-runner")' "" + + # prevent from fetching & building own gtest + substituteInPlace CMakeLists.txt \ + --replace 'include(googletest)' "" + substituteInPlace cmake/unittest.cmake \ + --replace 'googletest)' ')' + ''; + + preConfigure = '' + # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set + # to lib64 and cmake incorrectly looks for the protobuf library in lib64 + export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" + '' + lib.optionalString doCheck '' + export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" + export ONNX_BUILD_TESTS=1 ''; preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ''; - disabledTestPaths = [ - # Unexpected output fields from running code: {'stderr'} - "onnx/examples/np_array_tensorproto.ipynb" - ]; - # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin @@ -72,6 +89,35 @@ buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; + doCheck = true; + preCheck = '' + export HOME=$(mktemp -d) + + # detecting source dir as a python package confuses pytest + mv onnx/__init__.py onnx/__init__.py.hidden + ''; + pytestFlagsArray = [ "onnx/test" "onnx/examples" ]; + disabledTests = [ + # attempts to fetch data from web + "test_bvlc_alexnet_cpu" + "test_densenet121_cpu" + "test_inception_v1_cpu" + "test_inception_v2_cpu" + "test_resnet50_cpu" + "test_shufflenet_cpu" + "test_squeezenet_cpu" + "test_vgg19_cpu" + "test_zfnet512_cpu" + ]; + disabledTestPaths = [ + # Unexpected output fields from running code: {'stderr'} + "onnx/examples/np_array_tensorproto.ipynb" + ]; + postCheck = '' + # run "cpp" tests + .setuptools-cmake-build/onnx_gtests + ''; + pythonImportsCheck = [ "onnx" ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index a5529af2ab156..ede1a7a3d84fa 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.26.2"; + version = "0.26.5"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-rUXwrr8hgKwqJ/ittK2DOKaqxTAs8wKyVTSdEhfiWfI="; + hash = "sha256-eKU+WRFf7f1yH63vcoQ9dVeqhJXBqMJGpk/9AoEgR0M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 845fa042fc8c1..496dceeaab487 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.4"; + version = "0.16.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-16DM9HrptQmj95OOM5XSGIEKzxrCkN3sU/7o8Yh0l6s="; + hash = "sha256-xXSZ9qxjmeIyYIWQubJbJxkXUdOu/WSSBddIWsVaH8k="; }; postPatch = '' 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 0000000000000..7f9fd5c85b16c --- /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/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 986fa493bf9b7..baa1518244e2e 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.103.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-T58RiYZgOWdDXzl2s+BZlQpxvY5BqDFsyK+y2WaKB0E="; + hash = "sha256-Nl5dzKZOFudKT5+dKh8iB5cOlG2aXEglSc+l7ALKLJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index cc197360d9357..fbd3b2852eed6 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.3"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - hash = "sha256-ZTZ7D3NGhO18IxKqTMFBe6pDvqtGR+9w0cgs6VAHtwg="; + hash = "sha256-clG/5NAPmmmoj4b3LdVwl58DHg1EFMIMu+erx+GT+NE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openvino/default.nix b/pkgs/development/python-modules/openvino/default.nix new file mode 100644 index 0000000000000..20f47eb666ef8 --- /dev/null +++ b/pkgs/development/python-modules/openvino/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, openvino-native +, numpy +, python +}: + +buildPythonPackage { + pname = "openvino"; + inherit (openvino-native) version; + format = "other"; + + src = openvino-native.python; + + propagatedBuildInputs = [ + numpy + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python.sitePackages} + cp -Rv * $out/${python.sitePackages}/ + + runHook postInstall + ''; + + pythonImportsCheck = [ + "ngraph" + "openvino" + "openvino.runtime" + ]; + + meta = with lib; { + description = "OpenVINO(TM) Runtime"; + homepage = "https://github.com/openvinotoolkit/openvino"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index c921feadd0e82..dc07fcffac262 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -70,10 +70,10 @@ buildPythonPackage rec { typing ]; - configurePhase = if !(pythonOlder "3.5") then '' + configurePhase = lib.optionalString (! pythonOlder "3.5") '' substituteInPlace setup.py \ --replace "'typing'," "" - '' else ""; + ''; checkPhase = '' pytest --ignore tests/test_cli.py \ diff --git a/pkgs/development/python-modules/opytimark/default.nix b/pkgs/development/python-modules/opytimark/default.nix index 542c9042c771e..69eb61f795bf5 100644 --- a/pkgs/development/python-modules/opytimark/default.nix +++ b/pkgs/development/python-modules/opytimark/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "opytimizer"; + pname = "opytimark"; version = "1.0.8"; format = "setuptools"; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix new file mode 100644 index 0000000000000..adf39ad10a0aa --- /dev/null +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cryptography +, cython +}: + +buildPythonPackage rec { + pname = "oracledb"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3Z9jCE5EZCtISkay/PtPySHzn6z0lKG6sAYo+mQJ9Pw="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + doCheck = false; # Checks need an Oracle database + + pythonImportsCheck = [ + "oracledb" + ]; + + meta = with lib; { + description = "Python driver for Oracle Database"; + homepage = "https://oracle.github.io/python-oracledb"; + changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst"; + license = with licenses; [ asl20 /* and or */ upl ]; + maintainers = with maintainers; [ harvidsen ]; + }; +} diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index e373034c2a545..689cd79033688 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.1"; + version = "0.17.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0VZRtsh17W8h1qcGfAxE4KUehtCk1PKy3MO3fVJb4qY="; + hash = "sha256-Lwrr5XzU2pbx3cYkvYtHgXFhGnz3cMBnNFWCpuY3ltg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 50ea51adecb1a..4890614ed5a92 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.2"; + version = "3.8.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-jiyYCjZ6c62zmm4Ge9KbEI8/PtPunu79HVODyoHFdSg="; + hash = "sha256-XQBiE8hmLC/AIRt0eJri/ilPHUEYiOxd0onRBQsx+pM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-z1B0oSp37OGJ21Q57UUfmSRfUWLftiiBayN9y6yKNyg="; + hash = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; }; format = "pyproject"; @@ -57,6 +57,7 @@ buildPythonPackage rec { 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 9f7afc2457b6e..90b56b3cd4d75 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -11,6 +11,7 @@ , httpx , importlib-metadata , mysqlclient +, nest-asyncio , orjson , poetry-core , psycopg2 @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B6dC9+t/pe7vsPb7rkGAbJWLfCAF7lIElFvt1pUu5yA="; + hash = "sha256-7d0vmYDN1EjzNWmylb/As4ywo8YYzQ88UwigIsVnwMM="; }; pythonRelaxDeps = [ @@ -50,32 +51,63 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aiomysql - aiosqlite - asyncpg - cryptography databases - orjson psycopg2 pydantic sqlalchemy + psycopg2 ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata ]; + 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 = [ - aiomysql - aiopg - aiosqlite - asyncpg + pytestCheckHook + ]; + + checkInputs = [ fastapi httpx - mysqlclient - psycopg2 - pymysql + nest-asyncio pytest-asyncio - pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + disabledTestPaths = [ + "benchmarks/test_benchmark_*.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index a714cd3a2281d..b48a5f23487f6 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-DfvzYJX0Y3/7tl5cJB9MJYUavTtyjd2tnwc5YwKnJUQ="; + sha256 = "sha256-iyF2xXzFSWkrXCAbTJWqV4rnzN+lwPgUxXgY1pptTVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index fe4e7363cfc18..6904cbf87c9d7 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "5.0.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iMDG0HZoHGDVYPfWZWXkKsEWxaqKKKBNt8CsACUTMiQ="; + sha256 = "sha256-Ly55FxBE79GAfFVxPtLH9AaLGNc9AngZFlxIGbKHz68="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index d981114b7301f..7d8443a14b3b5 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.0.2"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-5F5zEqpxUooWc2zkUVK+PxrxI/XvYqqB2gRoBVhPzKM="; + hash = "sha256-9qw3r5WRjgXXod19CwVSuosisuQwhi6zNt5ZLSXITyk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index a94c79e9baf63..3cede81560b6e 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.0.0"; + version = "5.1.1"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "sha256-KEUyjQ9H3Ioj/tKoIlPpCs/wqnMdvSTzec+OUObMZro="; + sha256 = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 9f26c06eaf3ad..330385625d2ef 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/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index e6d8bf28a6523..f78ed6dd5adf3 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/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix new file mode 100644 index 0000000000000..6d916ffa639d1 --- /dev/null +++ b/pkgs/development/python-modules/overrides/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "overrides"; + version = "7.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkorpela"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-mxMh1ifOnii2SqxYjupDKvslHVGwClGtRgyoJSCGfZo="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "overrides" + ]; + + meta = with lib; { + description = "Decorator to automatically detect mismatch when overriding a method"; + homepage = "https://github.com/mkorpela/overrides"; + changelog = "https://github.com/mkorpela/overrides/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 005557a2a6e6c..1aaf94710311e 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ovoenergy"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZbLs8w0qeaV2qWP08FKnlZ3fefj15Bw2A2bGpL6/d0I="; + hash = "sha256-oeNwBmzlkE8JewSwuFG8OYigyispP4xdwO3s2CAcfW4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index c2783642b514e..5369d7b08b8d3 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,28 +1,70 @@ -{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyproj +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +, pyyaml +, requests +, python +}: + buildPythonPackage rec { - pname = "OWSLib"; - version = "0.27.2"; + pname = "owslib"; + version = "0.28.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s="; + src = fetchFromGitHub { + owner = "geopython"; + repo = "OWSLib"; + rev = "refs/tags/${version}"; + hash = "sha256-o/sNhnEZ9e0BsftN9AhJKuUjKHAHNRPe0grxdAWRVao="; }; - # as now upstream https://github.com/geopython/OWSLib/pull/824 postPatch = '' - substituteInPlace requirements.txt \ - --replace 'pyproj ' 'pyproj #' + substituteInPlace tox.ini \ + --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" "" ''; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ + pyproj + python-dateutil + pytz + pyyaml + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "owslib" + ]; - # 'tests' dir not included in pypy distribution archive. - doCheck = false; + preCheck = '' + # _pytest.pathlib.ImportPathMismatchError: ('owslib.swe.sensor.sml', '/build/source/build/... + export PY_IGNORE_IMPORTMISMATCH=1 + ''; + + disabledTests = [ + # Tests require network access + "test_ows_interfaces_wcs" + "test_wfs_110_remotemd" + "test_wfs_200_remotemd" + "test_wms_130_remotemd" + "test_wmts_example_informatievlaanderen" + ]; meta = with lib; { - description = "client for Open Geospatial Consortium web service interface standards"; - license = licenses.bsd3; + description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; + changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index bc3b1aa62f96e..219bb1f2910a9 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.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-p1monitor"; - rev = "refs/tags/${version}"; - hash = "sha256-HaTwqTKqTuXZVt2fhKXyXEEYZCSau/YY6DRg6YHIhOI="; + rev = "refs/tags/v${version}"; + hash = "sha256-jmSSejflez3AmIp7PY6m0+vW8YZuNgUj8lwyu0roLYc="; }; nativeBuildInputs = [ @@ -52,7 +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/${version}"; + 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/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix deleted file mode 100644 index c657a2fa1b12f..0000000000000 --- 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/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index b45689afb1dfe..9e80c0a0501ae 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -4,25 +4,27 @@ , fetchFromGitHub , jinja2 , matplotlib +, odfpy , openpyxl , pandas , poetry-core -, scipy -, sqlalchemy -, tabulate , pyarrow , pyreadstat -, tables , pytestCheckHook , pythonOlder +, scipy +, sqlalchemy +, tables +, tabulate , types-pytz , typing-extensions , xarray +, XlsxWriter }: buildPythonPackage rec { pname = "pandas-stubs"; - version = "1.5.0.221003"; + version = "1.5.3.230214"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pandas-dev"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-RV0pOTPtlwBmYs3nu8+lNwVpl/VC/VzcXKOQMg9C3qk="; + rev = "refs/tags/v${version}"; + hash = "sha256-hLQXGnWtjYNzzyHO+p7CCFEHc2lrSwh35Om94K5Ozhk="; }; nativeBuildInputs = [ @@ -46,62 +48,65 @@ buildPythonPackage rec { nativeCheckInputs = [ jinja2 matplotlib + odfpy openpyxl - scipy - sqlalchemy - tabulate pyarrow - tables pyreadstat pytestCheckHook + scipy + sqlalchemy + tables + tabulate typing-extensions xarray + XlsxWriter ]; disabledTests = [ # AttributeErrors, missing dependencies, error and warning checks - "test_data_error" - "test_specification_error" - "test_setting_with_copy_error" - "test_setting_with_copy_warning" - "test_numexpr_clobbering_error" - "test_undefined_variable_error" - "test_indexing_error" - "test_pyperclip_exception" - "test_css_warning" - "test_possible_data_loss_error" - "test_closed_file_error" - "test_incompatibility_warning" + "test_aggregate_frame_combinations" + "test_aggregate_series_combinations" + "test_arrow_dtype" "test_attribute_conflict_warning" - "test_database_error" - "test_possible_precision_loss" - "test_value_label_type_mismatch" - "test_invalid_column_name" "test_categorical_conversion_warning" - "test_join" - "test_isetframe" - "test_reset_index_150_changes" + "test_clipboard_iterator" + "test_clipboard" + "test_closed_file_error" "test_compare_150_changes" - "test_quantile_150_changes" - "test_resample_150_changes" + "test_crosstab_args" + "test_css_warning" + "test_data_error" + "test_database_error" + "test_dummies" + "test_from_dummies_args" + "test_incompatibility_warning" "test_index_astype" - "test_orc" - "test_orc_path" + "test_indexing_error" + "test_invalid_column_name" + "test_isetframe" + "test_join" + "test_numexpr_clobbering_error" "test_orc_buffer" - "test_orc_columns" "test_orc_bytes" - "test_clipboard" - "test_clipboard_iterator" - "test_arrow_dtype" - "test_aggregate_series_combinations" - "test_aggregate_frame_combinations" - "test_types_rank" + "test_orc_columns" + "test_orc_path" + "test_orc" + "test_possible_data_loss_error" + "test_possible_precision_loss" + "test_pyperclip_exception" + "test_quantile_150_changes" + "test_resample_150_changes" + "test_reset_index_150_changes" "test_reset_index" - "test_types_assert_series_equal" - "test_show_version" - "test_dummies" - "test_from_dummies_args" "test_rolling_step_method" + "test_setting_with_copy_error" + "test_setting_with_copy_warning" + "test_show_version" + "test_specification_error" + "test_types_assert_series_equal" + "test_types_rank" + "test_undefined_variable_error" + "test_value_label_type_mismatch" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; @@ -112,7 +117,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations for Pandas"; - homepage = "https://github.com/VirtusLab/pandas-stubs"; + homepage = "https://github.com/pandas-dev/pandas-stubs"; license = licenses.mit; maintainers = with maintainers; [ malo ]; }; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 9b35cb6ac1778..881280a1fca8e 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -1,20 +1,22 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , bleach , bokeh , param , pyviz-comms , markdown , pyct -, testpath +, requests +, setuptools , tqdm -, nodejs +, typing-extensions }: buildPythonPackage rec { pname = "panel"; - version = "0.14.2"; + version = "0.14.3"; format = "wheel"; @@ -23,31 +25,42 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU="; + hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "bokeh" + ]; + propagatedBuildInputs = [ bleach bokeh - param - pyviz-comms markdown + param pyct - testpath + pyviz-comms + requests + setuptools tqdm + typing-extensions + ]; + + pythonImportsCheck = [ + "panel" ]; # infinite recursion in test dependencies (hvplot) doCheck = false; - passthru = { - inherit nodejs; # For convenience - }; - meta = with lib; { description = "A high level dashboarding library for python visualization libraries"; - homepage = "https://pyviz.org"; + homepage = "https://github.com/holoviz/panel"; + changelog = "https://github.com/holoviz/panel/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 1989e844ddd46..8e84896079c17 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"); - - nativeCheckInputs = ([ + 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/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index e2d94ac02561e..c020992bee221 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytestCheckHook , coveralls , numpy -, contextlib2 , decopatch , more-itertools , nestedtext @@ -24,6 +24,14 @@ buildPythonPackage rec { sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; }; + patches = [ + (fetchpatch { + name = "replace contextlib2-with-contextlib.patch"; + url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; + hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; + }) + ]; + # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml @@ -38,7 +46,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - contextlib2 decopatch more-itertools nestedtext diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index aaa62ada8ba33..1a9f4fef309b4 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.21.1"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Mw9IVQoXZU8ByU6OI2Wtmo3PJuVz6KzzH7I+pPYkssQ="; + hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns="; }; postPatch = '' diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index e388adfb1f1e4..ba082c9285b93 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,40 +2,57 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "paste"; - version = "3.5.0"; + version = "3.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cdent"; repo = "paste"; - rev = version; - sha256 = "sha256-yaOxbfQ8rdViepxhdF0UzlelC/ozdsP1lOdU5w4OPEQ="; + rev = "refs/tags/${version}"; + hash = "sha256-lpQMzrRpcG5TqWm/FJn4oo9TV8Skf0ypZVeQC4y8p1U="; }; postPatch = '' patchShebangs tests/cgiapp_data/ ''; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + setuptools + six + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # broken test "test_file_cache" # requires network connection "test_proxy_to_website" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/cdent/paste/issues/72 + "test_form" ]; - pythonNamespaces = [ "paste" ]; + pythonNamespaces = [ + "paste" + ]; meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; - homepage = "http://pythonpaste.org/"; + homepage = "https://pythonpaste.readthedocs.io/"; + changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 03b7657190699..749d3574d701c 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -2,24 +2,40 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pastedeploy"; - version = "2.1.1"; + version = "3.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Pylons"; repo = pname; - rev = version; - sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU="; + rev = "refs/tags/${version}"; + hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q="; }; - nativeCheckInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov" "" + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "paste.deploy" + ]; meta = with lib; { description = "Load, configure, and compose WSGI applications and servers"; homepage = "https://github.com/Pylons/pastedeploy"; + changelog = "https://github.com/Pylons/pastedeploy/blob/${version}/docs/news.rst"; license = licenses.mit; maintainers = teams.openstack.members; }; diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix index b7ab5b9d32ddb..789162b1fe527 100644 --- a/pkgs/development/python-modules/pathable/default.nix +++ b/pkgs/development/python-modules/pathable/default.nix @@ -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/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix index c5492c149f276..feb347b797c7c 100644 --- a/pkgs/development/python-modules/pathy/default.nix +++ b/pkgs/development/python-modules/pathy/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.6.1"; + version = "0.10.1"; format = "setuptools"; 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 ]; nativeCheckInputs = [ @@ -33,15 +33,6 @@ buildPythonPackage rec { 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 4c5c0744b0e24..4837ffba7c27f 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.12"; + version = "0.2.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BdTsx4UIRRK9fbMXOrgut651YMTowxHDFfitlP7ue2I="; + hash = "sha256-Hst/2hRqH8AIKD2EXtJo8m3diOxPBWAmNhtS3TUYT3I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index b9f8486aa5d64..61072507e2943 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; - rev = "v${version}"; - sha256 = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg="; + rev = "refs/tags/v${version}"; + hash = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg="; }; nativeBuildInputs = [ @@ -57,8 +57,9 @@ buildPythonPackage rec { meta = with lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization"; homepage = "https://github.com/NordicSemiconductor/pc-ble-driver-py"; + changelog = "https://github.com/NordicSemiconductor/pc-ble-driver-py/releases/tag/v${version}"; license = licenses.unfreeRedistributable; - platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index c8813208d5e83..a096973a93674 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -2,8 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi , fetchFromGitHub +, setuptools , jinja2 , pygments , markupsafe @@ -14,17 +14,23 @@ buildPythonPackage rec { pname = "pdoc"; - version = "12.0.2"; + version = "12.3.1"; disabled = pythonOlder "3.7"; + format = "pyproject"; + # the Pypi version does not include tests src = fetchFromGitHub { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0="; + sha256 = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jinja2 pygments @@ -48,6 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; meta = with lib; { + changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; description = "API Documentation for Python Projects"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 5dd2bf7f7439c..3333331e85f6c 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 = "10.2.8"; + version = "12.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wMC5SnC0KJ6pauvAKq+jTJiFoD0dlYBtxU8cag/JmnM="; + hash = "sha256-WOuKGVrNZzvY7F0Mvj3MjSdTu47c5Y11ySe1qorzlWE="; }; postPatch = '' 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 0000000000000..d86e447711c48 --- /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/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index b1707670e7689..55bd8c0cc07d3 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pefile"; - version = "2022.5.30"; + version = "2023.2.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "erocarrera"; repo = pname; - rev = "v${version}"; - hash = "sha256-Cv20hJsErHFSuS5Q1kqLNp4DAsPXv/eFhaU9oYECSeI="; + rev = "refs/tags/v${version}"; + hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0="; }; nativeBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files"; homepage = "https://github.com/erocarrera/pefile"; + changelog = "https://github.com/erocarrera/pefile/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ pamplemousse ]; }; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 5c517231ec919..adbfda8a47974 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU="; + hash = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU="; }; propagatedBuildInputs = [ @@ -61,13 +61,15 @@ buildPythonPackage rec { "test_mixed_pairs" "test_multiple_diagrams" "test_n_pixels" + # https://github.com/scikit-tda/persim/issues/67 + "test_persistenceimager" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Distances and representations of persistence diagrams"; homepage = "https://persim.scikit-tda.org"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 8c146474d94e3..7c0f38b525d6b 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 = "4.1"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JXgU2uoMhfqKlQOksbdYZtnJbs7UZKlTxZNo7OIGEig="; + hash = "sha256-bR/e5pZCrnMCUt9zEszI0aVlqezTzwR3DIdpXv/6qGM="; }; propagatedBuildInputs = [ @@ -43,5 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/lelit/pglast/raw/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marsam ]; + mainProgram = "pgpp"; }; } diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index d743dd24bd52e..2e8dcb85570b7 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 - ''; - - nativeCheckInputs = [ - 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 a0e0817bb72a0..0000000000000 --- 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 3d216dfd97961..23e0e08d8be32 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.3"; + version = "8.13.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro="; + hash = "sha256-+L2Sl1unRjt4KK4vleEDe34KuPAj6ej/t8Vg/X9dZtc="; }; nativeCheckInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for handling international phone numbers"; homepage = "https://github.com/daviddrysdale/python-phonenumbers"; + changelog = "https://github.com/daviddrysdale/python-phonenumbers/blob/v${version}/python/HISTORY.md"; license = licenses.asl20; maintainers = with maintainers; [ fadenb ]; }; 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 0000000000000..272f3f6810bf3 --- /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 f9a68d98dc31b..8ce8e1fe95f17 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "piccata"; - version = "2.0.0"; + version = "2.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = pname; - rev = version; - sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Vuhwt+esTkvyEIRVYaRGvNMTAXVWBBv/6lpaxN5RrBA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c4c6edffc2800..9a98f0515832f 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -18,16 +18,18 @@ , python-dateutil , python-xmp-toolkit , qpdf +, setuptools , setuptools-scm , substituteAll +, wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.8"; - format = "setuptools"; + version = "7.1.1"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pikepdf"; @@ -39,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-0E+kkvxT1jLfoBg3C9BfbSqfIX3K/Z5kK1kCdOks2Hk="; + hash = "sha256-u6xfsWHod8U7nM5S40ZU1z4qxNMlWdq+7yhnAtBh8oE="; }; patches = [ @@ -58,12 +60,14 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ - pybind11 qpdf ]; nativeBuildInputs = [ + pybind11 + setuptools setuptools-scm + wheel ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 05fe40802c5d5..6dc894c0a4ca5 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -12,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.3.0"; + version = "9.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-yTWiKlV6VgEI14D5oPxCbddFmUDcVPqknYMknI0+dg8="; + hash = "sha256-ocLXeARI65P7zDeJvzkWqlcg2ULjeUX0BWaAMX8c0j4="; }; passthru.tests = { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 406378adddd97..8657f4d28e79a 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.12.1"; + version = "6.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iO+3spqSP/6sBxPm8j74UpzGF1Un1CuT9zdWzJQ4cpM="; + hash = "sha256-i5A2lt9FmLENRpAm75mVxfmodLQW6I56IUiE6+SnAkU="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 186e468e04910..57d3538d68f57 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.3.3"; + version = "2.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-ivqu9b+4FhGa5y+WnKRk4nF6MR4Vj62pSs2d7ycIZMc="; + hash = "sha256-hAODK7kFCntfKC77VF/KyTk0O/z+bXHixVxQIz8JuDk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 6530780d9064c..33831490708f4 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -10,16 +10,17 @@ }: buildPythonPackage rec { - version = "0.3.0"; pname = "pipenv-poetry-migrate"; + version = "0.3.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-j6YAHMjgaQgHpKBH67PFEUHhLi+kg3L966GbEyMPphM="; + hash = "sha256-aPG0MgChnJbivJRjYx9aQE5OPhL4WlPyt5uKCHZUpeE="; }; nativeBuildInputs = [ @@ -33,7 +34,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' + substituteInPlace pyproject.toml \ + --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' ''; nativeCheckInputs = [ @@ -43,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is simple migration script, migrate pipenv to poetry"; homepage = "https://github.com/yhino/pipenv-poetry-migrate"; + changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 4f4b9901c13db..9d0b7f65f6362 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { libXi libXext libSM libICE libX11 ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${qtbase.dev}/include/QtCore" "-I${qtbase.dev}/include/QtGui" "-I${qtbase.dev}/include/QtOpenGL" diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 51f96c24ab58c..58bd99ae1f254 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.4.0"; + version = "11.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5IHFChiIm/6x3xr+F+RIAZ3kDYQsXs+baFqUasjI8qs="; + hash = "sha256-du6UqzZthjzkRkkqXzl/019bNMQH/K3tqmFOtA/hm6M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index e57655c2227c1..741b655df8683 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -223,5 +223,6 @@ buildPythonPackage rec { homepage = "https://github.com/microsoft/playwright-python"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick yrd SuperSandro2000 ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 6f41011e47f6e..717f530ef16d3 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace " --cov=plotnine --cov-report=xml" "" ''; - buildInputs = [ + propagatedBuildInputs = [ matplotlib mizani pandas diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 6b0b6db157b53..89ced453a9d3b 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.27.3"; + version = "0.27.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-JO9Gc7ZhWeQIheAwanzCBQFum1BUoh7K/exAEkWp/1U="; + hash = "sha256-MT6P1st3NbHPdulL23zckgliFRTgCn8h9CK3QumXVtQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index b8e386d7c2094..3ca66e9b9fb31 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.21.3"; + version = "0.21.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LdcjzfOiKar0BCdU7W+N5adErdk/NOUf+FzeaMlfn3w="; + hash = "sha256-1RgxDXzijWr47mZeqfHfFnANdZKyY3QXCZoXijs5nTw="; }; nativeBuildInputs = [ @@ -37,8 +38,12 @@ buildPythonPackage rec { 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" diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index f265e24fe4ef8..5424152a1e82b 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; - propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else []; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index ea98a6679275e..bfb804911084e 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.5"; - disabled = pythonOlder "3.6"; + version = "0.12.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - sha256 = "sha256-DwWX8ztqnm/KYkiarG9KXkHcVxYE6Cc285oOMz9gkqc="; + hash = "sha256-odtMbPHty3NUqz+4UAw+8dsK6AMZer41/BAX8cK5Rek="; }; propagatedBuildInputs = [ @@ -34,11 +36,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "policy_sentry" ]; + pythonImportsCheck = [ + "policy_sentry" + ]; meta = with lib; { description = "Python module for generating IAM least privilege policies"; homepage = "https://github.com/salesforce/policy_sentry"; + changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index b53d9108ba11b..d6fed8f9ac5b9 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.1.3"; + version = "23.2.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qmgfEsB3Mg6xjQxQLR2JMXATzurtuOem2kdIkD0WQXI="; + hash = "sha256-3SxgAFpES53AP9W/Q4cajOmgU8sZgK/LduG4psw2KP4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 704e8f7d26710..46cef25975228 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"; diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 67fa9ec605dea..79d3eebf93e5c 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.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "h2non"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5hVRyZCA5VzufiYh1l9ezob1iuT8/VXhuFjC0OjGsbQ="; + hash = "sha256-nLeJAAsJUKFAetZSAQmOtXP+3ZRHvCTFAzycSkK+kiI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 4133cb02394c8..6742b989c2927 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "portalocker"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lk9oMPtCp0tdMrzpntN9gwjB19RN3xjz3Yn0aA3pezk="; + hash = "sha256-Ay6B1TSojsFzbQP3gLoHPwR6BsR4sG4pN0hvM06VXFE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 767dc5c55ca0e..a554ceec910df 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "praw"; - version = "7.6.1"; + version = "7.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "praw-dev"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZGPtgpVTiGkInWDjsIcK7geu+TxAwDxbh2oyf2D65bo="; + rev = "refs/tags/v${version}"; + hash = "sha256-reJW1M1yDSQ1SvZJeOc0jwHj6ydl1AmMl5VZqRHxXZA="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Reddit API wrapper"; homepage = "https://praw.readthedocs.org/"; + changelog = "https://github.com/praw-dev/praw/blob/v${version}/CHANGES.rst"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix index d686ac3bd0b06..7e96bf4196b4e 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/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 373a5d090d0ed..9b0efcad461ea 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s5+/rHJhj6HutbP9ntE0HxDdkN91SZy0w4psPvR83ZQ="; + hash = "sha256-C1TRXmAuuK9Kwxsdsho36pXOWJDgdBuw3Z3tSTzvu+k="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 14c96e5734abd..d3d44259fefbf 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "primer3"; - version = "0.6.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "libnano"; repo = "primer3-py"; - rev = version; - sha256 = "1glybwp9w2m1ydvaphr41gj31d8fvlh40s35galfbjqa563si72g"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-o9B8TN3mOchOO7dz34mI3NDtIhHSlA9+lMNsYcxhTE0="; }; nativeBuildInputs = [ cython ] diff --git a/pkgs/development/python-modules/pscript/default.nix b/pkgs/development/python-modules/pscript/default.nix index 54fcdeb81668a..76af30e2c125d 100644 --- a/pkgs/development/python-modules/pscript/default.nix +++ b/pkgs/development/python-modules/pscript/default.nix @@ -3,18 +3,21 @@ , 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="; }; nativeCheckInputs = [ @@ -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/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 131d49f4ac931..8608c19c8dcdb 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.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KMSyqXKhNH+i9Y0Mx3DHCwJZOkl4Va2n0zu0TEitslU="; + hash = "sha256-6d5HQJEH/x+V0rpmQkprMlH1n151KyUF6d4tM9W5TFs="; }; propagatedBuildInputs = [ @@ -30,7 +30,6 @@ buildPythonPackage rec { xmldiff ]; - pythonImportsCheck = [ "psrpcore" ]; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 7138c8aa1c5d9..1b84cc6140c81 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 ]; @@ -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/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 586e5d8dfb283..83e08324a737b 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -1,43 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub -, importlib-metadata +, hatch-vcs +, hatchling +, mypy-extensions , numpy , pydantic , pytest-mypy-plugins , pytestCheckHook , pythonOlder -, setuptools-scm , typing-extensions -, wheel , wrapt }: buildPythonPackage rec { pname = "psygnal"; - version = "0.6.0"; - format = "setuptools"; + version = "0.8.1"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "tlambert03"; + owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KCdX+pMUAQxeQRZhkrdGCKGjBaB1Ode/r1W8LJQPxyM="; + hash = "sha256-+VO2OlDzBECkasLBvZWDsqDeooU6CnRFjeI/ISLWAnA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ - setuptools-scm - wheel + hatch-vcs + hatchling ]; propagatedBuildInputs = [ + mypy-extensions typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; nativeCheckInputs = [ @@ -48,18 +47,14 @@ buildPythonPackage rec { wrapt ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=psygnal --cov-report=term-missing" "" - ''; - pythonImportsCheck = [ "psygnal" ]; meta = with lib; { description = "Implementation of Qt Signals"; - homepage = "https://github.com/tlambert03/psygnal"; + homepage = "https://github.com/pyapp-kit/psygnal"; + changelog = "https://github.com/pyapp-kit/psygnal/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index c78aacc8d5a21..355171856fbd0 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.22"; + version = "3.0.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wJezJEBgFKAFxrCfSTu73eVx5BI2CvK6FVGHOhDDbPg="; + hash = "sha256-n8m+wsxRvEAAwSJNjFYkHOikBrPUnsjcJm94zTzQS6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 816dfc0288839..ae388396fd3f5 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.27.0"; + version = "5.30.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-JNiklXAAyHFLdspglGLokmHOiffDS1I5igsmupla1Qo="; + hash = "sha256-XRn5kMbbbbk5+X8vah44cAHv2MMySK0ToO8ga5FWSuA="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index aac505dd8f39a..ad4037a6c5802 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "puremagic"; - version = "1.14"; + version = "1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-PV3ybMfsmuu/hCoJEVovqF3FnqZBT6VoVyxEd115bLw="; + src = fetchFromGitHub { + owner = "cdgriffith"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WnqDrVPTlNxz3SDt1wLdZmxtj0Vh6gLHDJlYGEHHxsg="; }; - # test data not included on pypi - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "puremagic" @@ -26,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of magic file detection"; homepage = "https://github.com/cdgriffith/puremagic"; + changelog = "https://github.com/cdgriffith/puremagic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/py-bip39-bindings/Cargo.lock b/pkgs/development/python-modules/py-bip39-bindings/Cargo.lock index 770d4bdc65d18..4cf61e525a2f2 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/Cargo.lock +++ b/pkgs/development/python-modules/py-bip39-bindings/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "autocfg" @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-tools" @@ -104,16 +104,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" -dependencies = [ - "quote", - "syn", -] - -[[package]] name = "digest" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -170,17 +160,6 @@ dependencies = [ ] [[package]] -name = "ghost" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "hmac" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -202,72 +181,24 @@ dependencies = [ [[package]] name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "inventory" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb5160c60ba1e809707918ee329adb99d222888155835c6feedba19f6c3fd4" -dependencies = [ - "ctor", - "ghost", - "inventory-impl", -] - -[[package]] -name = "inventory-impl" -version = "0.1.11" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.135" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -289,10 +220,19 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] name = "once_cell" -version = "1.15.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -308,46 +248,25 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", + "windows-sys", ] [[package]] @@ -371,28 +290,22 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] [[package]] name = "py-bip39-bindings" -version = "0.1.10" +version = "0.1.11" dependencies = [ "hmac 0.7.1", "pbkdf2 0.3.0", @@ -403,47 +316,69 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.11.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca8710ffa8211c9a62a8a3863c4267c710dc42a82a7fd29c97de465d7ea6b7d" +checksum = "06a3d8e8a46ab2738109347433cb7b96dffda2e4a218b03ef27090238886b147" dependencies = [ - "ctor", + "cfg-if", "indoc", - "inventory", "libc", + "memoffset", "parking_lot", - "paste", - "pyo3cls", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", "unindent", ] [[package]] -name = "pyo3-derive-backend" -version = "0.11.1" +name = "pyo3-build-config" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad070bf6967b0d29ea74931ffcf9c6bbe8402a726e9afbeafadc0a287cc2b3" +checksum = "75439f995d07ddfad42b192dfcf3bc66a7ecfd8b4a1f5f6f046aa5c2c5d7677d" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839526a5c07a17ff44823679b68add4a58004de00512a95b6c1c98a6dcac0ee5" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd44cf207476c6a9760c4653559be4f206efafb924d3e4cbf2721475fc0d6cc5" dependencies = [ "proc-macro2", + "pyo3-macros-backend", "quote", "syn", ] [[package]] -name = "pyo3cls" -version = "0.11.1" +name = "pyo3-macros-backend" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fa17e1ea569d0bf3b7c00f2a9eea831ca05e55dd76f1794c541abba1c64baa" +checksum = "dc1f43d8e30460f36350d18631ccf85ded64c059829208fe680904c65bcd0a4c" dependencies = [ - "pyo3-derive-backend", + "proc-macro2", "quote", "syn", ] [[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", ] @@ -555,9 +490,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -577,19 +512,25 @@ dependencies = [ ] [[package]] +name = "target-lexicon" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" + +[[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -626,21 +567,21 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "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.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -659,9 +600,9 @@ 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" @@ -677,9 +618,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -687,9 +628,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -702,9 +643,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -712,9 +653,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -725,31 +666,75 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +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 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +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 = "zeroize" @@ -762,9 +747,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-bip39-bindings/default.nix b/pkgs/development/python-modules/py-bip39-bindings/default.nix index 12d70e8bee4a8..7de906d4256f2 100644 --- a/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -10,18 +10,26 @@ buildPythonPackage rec { pname = "py-bip39-bindings"; - version = "0.1.10"; + version = "0.1.11"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "polkascan"; repo = "py-bip39-bindings"; - rev = "ddb74433c2dca7b1f1e1984c33b9da7b51a30227"; - sha256 = "sha256-MBDic955EohTW6BWprv7X+ZPHoqzkyBJYKV4jpNPKz8="; + rev = "refs/tags/v${version}"; + hash = "sha256-3/KBPUFVFkJifunGWJeAHLnY08KVTb8BHCFzDqKWH18="; }; + patches = [ + (fetchpatch { + name = "update-to-latest-maturin-and-pyo3.patch"; + url = "https://github.com/polkascan/py-bip39-bindings/commit/f05cced028b43b59cfa67e17fbf0f337bdd3aa8d.patch"; + hash = "sha256-/pFNSFtYyKiOoIDVqEWdZCbQxFZ7FIcvAHY2m5STlEc="; + }) + ]; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock b/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock index ded748b627708..0a31c382b1d40 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,32 +28,14 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -66,57 +48,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +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", @@ -292,29 +268,23 @@ dependencies = [ ] [[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,55 +331,23 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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 = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.8.2" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +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-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index dd940f0ee43eb..0ae3cf8bd0d1e 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,31 +1,36 @@ { 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.4"; 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-37JzdhMny6YDTBO9NRzfrZJAVAOPnpcr95fOKxisbTg="; }; nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ - requests - urllib3 + aiohttp + async-timeout ]; nativeCheckInputs = [ @@ -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/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index a7003945526e3..de8cc23c8fb8f 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -26,9 +26,7 @@ buildPythonPackage rec { ]; # Work around Python distutils compiling C++ with $CC (see issue #26709) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ - "-I${lib.getDev libcxx}/include/c++/v1" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; pythonImportsCheck = [ "pyexiv2" diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 3b454eb2402f1..7d7033ef8a022 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,40 +1,48 @@ { lib , buildPythonPackage +, acpi +, alsa-utils +, coreutils +, dbus-python , fetchPypi -, requests -, pytz -, tzlocal +, file +, i3 , i3ipc +, libnotify +, lm_sensors +, procps , pydbus , pygobject3 , pyserial +, pytz +, requests , setuptools -, dbus-python - -, file -, acpi -, coreutils -, alsa-utils -, i3 -, procps -, lm_sensors -, libnotify +, tzlocal , xorg }: buildPythonPackage rec { pname = "py3status"; - version = "3.47"; + version = "3.49"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e2UTTD8J1GDg43FdzU8Xiaj2bL/gHLIT2lzwbwarIyI="; + hash = "sha256-aTQ3hYDMyXSTcEiCVtdU3XQ4xO7mN5dZ0S94ZWbSGo4="; }; - doCheck = false; propagatedBuildInputs = [ - pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python file + pytz + requests + tzlocal + i3ipc + pydbus + pygobject3 + pyserial + setuptools + dbus-python + file ]; + prePatch = '' sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py @@ -48,10 +56,13 @@ buildPythonPackage rec { sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py ''; + doCheck = false; + meta = with lib; { description = "Extensible i3status wrapper"; - license = licenses.bsd3; homepage = "https://github.com/ultrabug/py3status"; + changelog = "https://github.com/ultrabug/py3status/blob/${version}/CHANGELOG"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index fceece73a52b5..7c1c76c4adb5b 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,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q="; + rev = "refs/tags/${version}"; + hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE="; }; propagatedBuildInputs = [ @@ -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/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 228844f530218..9be744b74aa9f 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , numpy @@ -23,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-xzTho4HsIU2YLURz9DfFfaRL3tsrtVi8n5IA2bRkyzw="; }; @@ -39,10 +38,10 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook + pytestCheckHook ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/pyalmond/default.nix b/pkgs/development/python-modules/pyalmond/default.nix deleted file mode 100644 index 59a9339c2649c..0000000000000 --- 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/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index a862fa69a9a2f..a330a93928768 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , python +, pythonAtLeast , pythonOlder , arrow-cpp , cffi @@ -17,18 +18,15 @@ , pkg-config , scipy , setuptools-scm -, six }: let zero_or_one = cond: if cond then 1 else 0; - - _arrow-cpp = arrow-cpp.override { python3 = python; }; in buildPythonPackage rec { pname = "pyarrow"; - inherit (_arrow-cpp) version src; + inherit (arrow-cpp) version src; disabled = pythonOlder "3.7"; @@ -41,13 +39,14 @@ buildPythonPackage rec { setuptools-scm ]; + buildInputs = [ arrow-cpp ]; + propagatedBuildInputs = [ cffi cloudpickle fsspec numpy scipy - six ]; nativeCheckInputs = [ @@ -60,20 +59,24 @@ buildPythonPackage rec { PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_DATASET = zero_or_one true; - PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; + PYARROW_WITH_FLIGHT = zero_or_one arrow-cpp.enableFlight; PYARROW_WITH_HDFS = zero_or_one true; PYARROW_WITH_PARQUET = zero_or_one true; - PYARROW_WITH_PLASMA = zero_or_one (!stdenv.isDarwin); - PYARROW_WITH_S3 = zero_or_one _arrow-cpp.enableS3; + PYARROW_WITH_PARQUET_ENCRYPTION = zero_or_one true; + # Plasma is deprecated since arrow 10.0.0 + PYARROW_WITH_PLASMA = zero_or_one false; + PYARROW_WITH_S3 = zero_or_one arrow-cpp.enableS3; + PYARROW_WITH_GCS = zero_or_one arrow-cpp.enableGcs; + PYARROW_BUNDLE_ARROW_CPP_HEADERS = zero_or_one false; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" ]; - ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _arrow-cpp; + ARROW_HOME = arrow-cpp; + PARQUET_HOME = arrow-cpp; - ARROW_TEST_DATA = lib.optionalString doCheck _arrow-cpp.ARROW_TEST_DATA; + ARROW_TEST_DATA = lib.optionalString doCheck arrow-cpp.ARROW_TEST_DATA; doCheck = true; @@ -85,6 +88,13 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; + postInstall = '' + # copy the pyarrow C++ header files to the appropriate location + pyarrow_include="$out/${python.sitePackages}/pyarrow/include" + mkdir -p "$pyarrow_include/arrow/python" + find "$PWD/pyarrow/src/arrow" -type f -name '*.h' -exec cp {} "$pyarrow_include/arrow/python" \; + ''; + pytestFlagsArray = [ # Deselect a single test because pyarrow prints a 2-line error message where # only a single line is expected. The additional line of output comes from @@ -102,6 +112,8 @@ buildPythonPackage rec { "--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" + # expects arrow-cpp headers to be bundled + "--deselect=pyarrow/tests/test_cpp_internals.py::test_pyarrow_include" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" @@ -109,8 +121,18 @@ buildPythonPackage rec { "--deselect=pyarrow/tests/test_flight.py::test_large_descriptor" "--deselect=pyarrow/tests/test_flight.py::test_large_metadata_client" "--deselect=pyarrow/tests/test_flight.py::test_none_action_side_effect" + # fails to compile + "--deselect=pyarrow/tests/test_cython.py::test_cython_api" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Repr output is printing number instead of enum name so these tests fail + "--deselect=pyarrow/tests/test_fs.py::test_get_file_info" + ] ++ lib.optionals stdenv.isLinux [ + # this test requires local networking + "--deselect=pyarrow/tests/test_fs.py::test_filesystem_from_uri_gcs" ]; + disabledTests = [ "GcsFileSystem" ]; + dontUseSetuptoolsCheck = true; preCheck = '' @@ -125,7 +147,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyarrow" - ] ++ map (module: "pyarrow.${module}") ([ + ] ++ map (module: "pyarrow.${module}") [ "compute" "csv" "dataset" @@ -135,9 +157,7 @@ buildPythonPackage rec { "hdfs" "json" "parquet" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "plasma" - ]); + ]; meta = with lib; { description = "A cross-language development platform for in-memory data"; diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index d49488ffc3d13..3981f64645d2f 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,19 +11,20 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.19.0"; + version = "2.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss="; + hash = "sha256-6T2qr0fcHzgDPZvc3StZwIH2ZRvTOJFXDLPc3iFmwCQ="; }; propagatedBuildInputs = [ boto3 botocore + fsspec pandas tenacity ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 1286805a918cf..a5154a3e4abd9 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.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-YxAkozyWNTKMCIEk3AhHZbRHtzhRrCSB3wh/Qy9CIyU="; + hash = "sha256-Rlr6Ec6BEujTxQkQ9UP+6u0cYeFsJlj7U346MtRM6QM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix index 6ec4cab91c514..92fe348368515 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.5"; + 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-QWn5VdZlbxm2/ZvsQWlKuVPPBcqFkyt75Odh9Mf9Bqk="; + hash = "sha256-aY+G4e2uq2yWUkJ9CXnOhc5S57kkMB36N/x+iQDCivo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycontrol4/default.nix b/pkgs/development/python-modules/pycontrol4/default.nix index b960b4b7da6db..5719e7640631f 100644 --- a/pkgs/development/python-modules/pycontrol4/default.nix +++ b/pkgs/development/python-modules/pycontrol4/default.nix @@ -4,24 +4,35 @@ , fetchFromGitHub , aiohttp , xmltodict +, python-socketio +, websocket-client }: buildPythonPackage rec { pname = "pycontrol4"; - version = "0.3.1"; + version = "1.1.0"; disabled = pythonOlder "3.6"; + format = "setuptools"; + src = fetchFromGitHub { owner = "lawtancool"; repo = "pyControl4"; rev = "v${version}"; - sha256 = "068iiyi17ndv6cv124r5dzvififblbi2zw7jgnzb5xi0q093czkj"; + hash = "sha256-dMv2b6dbMauPvPf4LHKmLF4jnXYRYe6A+2lDtiZDUhY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "python-socketio>=4,<5" "python-socketio>=4" + ''; + propagatedBuildInputs = [ aiohttp xmltodict + python-socketio + websocket-client ]; # tests access network diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index f2b546cac802d..f07c8062c1086 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , callPackage , fetchFromGitHub -, fetchpatch , gmp }: @@ -11,23 +10,16 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.16.0"; + version = "3.17.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; rev = "v${version}"; - hash = "sha256-8EAgeAU3HQiPrMKOtoVQQLbgq47cbveU2eQYp15XS/U="; + hash = "sha256-xsfd+dbaNOPuD0ulvpLPBPtcFgmJqX1VuunwNMcqh+Q="; }; - 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"' diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index b1e5ec095f13c..3a00c78198813 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -1,20 +1,23 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , param , pytestCheckHook +, pythonOlder , pyyaml , requests }: buildPythonPackage rec { pname = "pyct"; - version = "0.4.8"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7"; + hash = "sha256-3Z9KxcvY43w1LAQDYGLTxfZ+/sdtQEdh7xawy/JqpqA="; }; propagatedBuildInputs = [ @@ -27,8 +30,6 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !isPy27; - pythonImportsCheck = [ "pyct" ]; @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "ClI for Python common tasks for users"; homepage = "https://github.com/pyviz/pyct"; + changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index e2a41cca4a3a2..49fc12e17274b 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { }; preConfigure = with lib.versions; '' - ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ + ${python.pythonForBuild.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ --boost-python-libname=boost_python${major python.version}${minor python.version} \ diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 20514c064627f..2d0b967cb3470 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 = [ diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix index d492923f07ab6..11332ecb6f0f3 100644 --- a/pkgs/development/python-modules/pydanfossair/default.nix +++ b/pkgs/development/python-modules/pydanfossair/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pydanfossair"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "JonasPed"; repo = "pydanfoss-air"; rev = "v${version}"; - sha256 = "0950skga7x930whdn9f765x7fi8g6rr3zh99zpzaj8avjdwf096b"; + sha256 = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index b828120a309c1..93869a3930768 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , sphinx +, accessible-pygments , beautifulsoup4 , docutils , packaging @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.12.0"; + version = "0.13.0"; format = "wheel"; @@ -21,17 +22,20 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "sha256-wX26tno3dPBvNPY3jolvzQZozItdocG6AX5lzx3wr1g="; + sha256 = "sha256-+ITUC7adMdlk/xnWBk97zqqmNBk1/bwJLVwknR/wC1I="; }; propagatedBuildInputs = [ sphinx + accessible-pygments beautifulsoup4 docutils packaging ]; - pythonImportsCheck = [ "pydata_sphinx_theme" ]; + pythonImportsCheck = [ + "pydata_sphinx_theme" + ]; meta = with lib; { description = "Bootstrap-based Sphinx theme from the PyData community"; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 54b4b2ef1d8af..3ccb8960f5ef8 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 = "106"; + version = "108"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-13of5ohz/hezlmGvSNqCu9QoOPKdPPtrhQHbxmG2/Do="; + hash = "sha256-CPFkfVwvk0AO/DoE1Nj1jLdLvuOpRzndmRK/M6SSGtk="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library wrapping the Deconz REST API"; homepage = "https://github.com/Kane610/deconz"; + changelog = "https://github.com/Kane610/deconz/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index ef5339086f636..aefb4cc43f546 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.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0="; + hash = "sha256-nFdt68QhpX1URLEQtdikR11KFK9E9Y+cTvJQn4/YZlI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 75643d0874e48..62754bdd18eec 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.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VneuAnt9HkIRBeK2T71MIHbZbz6zY1vVy5vOYZ+82gM="; + hash = "sha256-scgWD40jjt8qPGygV11Rfd4Z1voBlErScabLLcmQqGg="; }; # Module has no tests diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 380e01dbd15b1..34a802a256920 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 diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index ab7457a13086e..d77caf7e4ad0e 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.post2301"; + version = "0.4.0.post2302"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "PyDMD"; rev = "refs/tags/v${version}"; - hash = "sha256-0ss7yyT6u0if+YjBYNbKtx5beJU43JC1LD9rqHPKBS8="; + hash = "sha256-EYVmaxwOxje3KVrNbvsjwRqQBD7Rje/JK+qB1F7EqA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index 159679b0515f1..75d25a885bfe9 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-OuBrZr+WP0NSSYnIf01ngDlEH+BZmTxnA/szzDxtiuw="; + hash = "sha256-Hx8xuMned3vUDrDRhqYirLPmsbjjxWPlCNRoxZp50/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix new file mode 100644 index 0000000000000..759fe47221b7f --- /dev/null +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +}: + +buildPythonPackage rec { + pname = "pyfibaro"; + version = "0.6.8"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "rappenze"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-2BDVCukm2y4rZyIWozRWJ+pY2bI2A7Vpitjd8jSJoWQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "pyfibaro" + ]; + + meta = with lib; { + description = "Library to access FIBARO Home center"; + homepage = "https://github.com/rappenze/pyfibaro"; + changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix index 43909e2c130f0..a850030274c49 100644 --- a/pkgs/development/python-modules/pyfido/default.nix +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfido"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0b28bhyhscaw7dbc92dxswann05x8mz92cagyawdfm8jnc67gq4b"; + sha256 = "sha256-hh2g46GVCkiMHElEP6McY8FdzGNzZV7pgA5DQhodP20="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 751bb9c8ae942..7155ec3778e3d 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, substituteAll, fetchFromGitHub, buildPythonPackage, python, pkg-config, libX11 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig , AppKit +, pythonAtLeast }: buildPythonPackage rec { @@ -52,7 +53,7 @@ buildPythonPackage rec { ]; preConfigure = '' - ${python.interpreter} buildconfig/config.py + ${python.pythonForBuild.interpreter} buildconfig/config.py ''; checkPhase = '' @@ -75,5 +76,7 @@ buildPythonPackage rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; + # fatal error: longintrepr.h: No such file or directory. + broken = pythonAtLeast "3.11"; # At 2022-02-27 }; } diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index f622dccab2929..0401fa3d4cbe2 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -29,9 +29,15 @@ buildPythonPackage rec { pexpect ]; + nativeBuildInputs = [ + # For cross compilation the doCheck is false and therefor the + # nativeCheckInputs not included. We have to include nose here, since + # setup.py requires nose unconditionally. + nose + ]; + nativeCheckInputs = [ mock - nose pytestCheckHook ] ++ passthru.optional-dependencies.GATTTOOL; diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 67fa2e02aa59a..f5e0bf87b1d25 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -30,8 +30,8 @@ buildPythonPackage rec { # for the package to function. Therefore override of buildPhase was # necessary. buildPhase = '' - ${python.interpreter} setup.py build_ext --inplace - ${python.interpreter} setup.py bdist_wheel + ${python.pythonForBuild.interpreter} setup.py build_ext --inplace + ${python.pythonForBuild.interpreter} setup.py bdist_wheel ''; nativeCheckInputs = [ @@ -50,4 +50,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ nialov ]; }; } - 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 0000000000000..918456774f57a --- /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/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 20c45462d9ed9..893fd1e64564a 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -42,8 +42,7 @@ buildPythonPackage rec { ]; buildInputs = [ - # # .so files link to these - gobject-introspection + # # .so files link to this glib ] ++ lib.optionals stdenv.isDarwin [ ncurses diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 17966ad58b21a..38b71b80e782c 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 = [ diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix new file mode 100644 index 0000000000000..828847cf82fbc --- /dev/null +++ b/pkgs/development/python-modules/pyheif/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, libheif +}: + +buildPythonPackage rec { + pname = "pyheif"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hqXFF0N51xRrXtGmiJL69yaKE1+39QOaARv7em6QMgA="; + }; + + propagatedBuildInputs = [ cffi libheif ]; + + meta = with lib; { + homepage = "https://github.com/carsales/pyheif"; + description = "Python interface to libheif library"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index b2035077fa0dc..ec6d51191966f 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 d382687e5c27d..51c8dae89f0a7 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.59"; + version = "0.3.60"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "chimpler"; repo = pname; - rev = version; - sha256 = "sha256-0BuDYheURFhtnWIh7Qw4LzZbk5tSqiNejo+08eglIvs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-H460j/DjY1lltapva3l87oyOJVjzUE9Q/oKti3SsUyU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index de27ffe82d7b6..899e1d1910467 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.6.1"; + 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-TpO91YVWswcdpV4z9jkxBELwsIIGvlpL3URQTjAAkUs="; + hash = "sha256-8eYbsPBMcRhFk5eouSAHEr3q/Llj0RqR76iwn/TrSSg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index 9befc34acbb62..8d2d153ebb9ce 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyipma"; - version = "3.0.5"; + version = "3.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KyXHNkP/XJlTdVFdP91x3udMquQju8G2VUHLPvZymtk="; + hash = "sha256-BwW8gUFeinZ9Z/v1orJKRTqt2WxVMD+hQj+A3gU1LDI="; }; propagatedBuildInputs = [ @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to retrieve information from Instituto Português do Mar e Atmosfera"; homepage = "https://github.com/dgomes/pyipma"; + changelog = "https://github.com/dgomes/pyipma/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index d0f4437cddb3c..0841559769212 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -1,15 +1,17 @@ { lib +, aiohttp , buildPythonPackage +, colorlog , fetchFromGitHub -, requests , python-dateutil -, aiohttp , pythonOlder +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "pyisy"; - version = "3.0.12"; + version = "3.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,17 +20,23 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro="; + hash = "sha256-OvWdKr8RlXRnAUMHSPhJDacvKeRa8QGPmGPQWLG2ouk="; }; + 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 ]; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 859564e1d13d9..385239b5ad521 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , importlib-metadata , jaconv +, py-cpuinfo , pytest-benchmark , pytestCheckHook , pythonOlder @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miurahr"; repo = pname; - rev = "v${version}"; - sha256 = "ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + py-cpuinfo pytest-benchmark pytestCheckHook ]; @@ -56,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; homepage = "https://github.com/miurahr/pykakasi"; + changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 04e397e597043..8b1b41cf3c44c 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 = "2023.1.1"; + 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-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew="; + hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix deleted file mode 100644 index 3e12fbdf97949..0000000000000 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, black -, toml -, pytestCheckHook -, python-language-server -, isPy3k -}: - -buildPythonPackage rec { - pname = "pyls-black"; - version = "0.4.7"; - - src = fetchFromGitHub { - owner = "rupert"; - repo = "pyls-black"; - rev = "v${version}"; - sha256 = "0bkhfnlik89j3yamr20br4wm8975f20v33wabi2nyxvj10whr5dj"; - }; - - disabled = !isPy3k; - - nativeCheckInputs = [ pytestCheckHook ]; - - propagatedBuildInputs = [ black toml python-language-server ]; - - meta = with lib; { - homepage = "https://github.com/rupert/pyls-black"; - description = "Black plugin for the Python Language Server"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix deleted file mode 100644 index 8c7db89d3b190..0000000000000 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, future, python-language-server, mypy, configparser -, pytestCheckHook, mock, pytest-cov, coverage -, fetchpatch -}: - -buildPythonPackage rec { - pname = "pyls-mypy"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "tomv564"; - repo = "pyls-mypy"; - rev = version; - sha256 = "14giyvcrq4w3asm1nyablw70zkakkcsr76chk5a41alxlk4l2alb"; - }; - - # presumably tests don't find typehints ? - doCheck = false; - - disabledTests = [ - "test_parse_line_without_line" - ]; - - preCheck = '' - export HOME=$TEMPDIR - ''; - - patches = [ - # makes future optional - (fetchpatch { - url = "https://github.com/tomv564/pyls-mypy/commit/2949582ff5f39b1de51eacc92de6cfacf1b5ab75.patch"; - sha256 = "0bqkvdy5mxyi46nhq5ryynf465f68b6ffy84hmhxrigkapz085g5"; - }) - ]; - - nativeCheckInputs = [ mock pytest-cov coverage pytestCheckHook ]; - - propagatedBuildInputs = [ - mypy python-language-server configparser - ] ++ lib.optionals (isPy27) [ - future - ]; - - meta = with lib; { - homepage = "https://github.com/tomv564/pyls-mypy"; - description = "Mypy plugin for the Python Language Server"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index ab6e1e2c6657a..eb6fbe371b640 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.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7bQgMDmvEAvnEoHZxZ9JzYsx1JR9W5eYuvcVUmYM/dw="; + hash = "sha256-O4PNlL3lPSIyFw9MtPP678ggLBQRPedbZn1gWys7DPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 4bf56d5e6edc5..e394986163715 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/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 8603eeabdee17..1f528d9ab7154 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 = "5.0.1"; + 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-uWvzWbZyRRE8L9X9+azmN+1JYahwwNSYCk2fQ/C8Yi0="; + 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; diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix new file mode 100644 index 0000000000000..d7f90f9f84533 --- /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/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index cf69c2b0fa334..68925fe7f4a9d 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { disabledTests = [ # python-memcached is not available (last release in 2017) "TestClientSocketConnect" + ] ++ lib.optionals stdenv.is32bit [ + # test_compressed_complex is broken on 32-bit platforms + # this can be removed on the next version bump + # see also https://github.com/pinterest/pymemcache/pull/480 + "test_compressed_complex" ]; pythonImportsCheck = [ @@ -53,6 +58,5 @@ buildPythonPackage rec { homepage = "https://pymemcache.readthedocs.io/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.is32bit; }; } diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 0923d8214c619..7d2a583891fb8 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.8"; + version = "0.0.9"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70="; + hash = "sha256-dhhRHXdck7hJGkXQpkiMulLsnMluZ5ADZ9L8cNm6dFs="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with MicroBot"; homepage = "https://github.com/spycle/pyMicroBot/"; + changelog = "https://github.com/spycle/pyMicroBot/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 1aba805c59dcd..e9cf439d36c17 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -10,6 +10,8 @@ , pyserial , pyserial-asyncio , pytest-asyncio +, pytest-rerunfailures +, pytest-xdist , pytestCheckHook , redis , sqlalchemy @@ -19,13 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.0.2"; + version = "3.1.3"; + format = "setuptools"; src = fetchFromGitHub { - owner = "riptideio"; + owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7zuFKJuKc+J4g7qoK22xed8dmXJatQbQXz4aKAOcvN8="; + hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8="; }; # Twisted asynchronous version is not supported due to a missing dependency @@ -43,12 +46,18 @@ buildPythonPackage rec { asynctest mock pytest-asyncio + pytest-rerunfailures + pytest-xdist pytestCheckHook redis sqlalchemy twisted ]; + pytestFlagsArray = [ + "--reruns" "3" # Racy socket tests + ]; + pythonImportsCheck = [ "pymodbus" ]; meta = with lib; { @@ -59,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/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index e75b4fa3a90f4..ab6903b931876 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; preBuild = '' - ${python.interpreter} setup.py build_ext --inplace + ${python.pythonForBuild.interpreter} setup.py build_ext --inplace ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 766ef2703984f..885486cbbc5e9 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.3.4"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-qg/aFK7rt2a/ZcLm+VSlq8UYBh6zS0/VVLqRAN7kLus="; + hash = "sha256-N+WpQil/OJ2p81Dc2b6c5K03NjAUdpbS+gjPzdqLY4w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 97b3f2c5be59d..1be7a78c44f34 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pynobo"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "echoromeo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YbQfdOLO1gs7+oiwe4rDmmD1o7MG+vma5xPlrtNZ00M="; + hash = "sha256-T86d3HGu6hsc54+ocCbINsInH/qHL9+HhOXDQ0I8QGA="; }; # Project has no tests @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; homepage = "https://github.com/echoromeo/pynobo"; + changelog = "https://github.com/echoromeo/pynobo/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch b/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch new file mode 100644 index 0000000000000..48727de2516aa --- /dev/null +++ b/pkgs/development/python-modules/pynvml/0001-locate-libnvidia-ml.so.1-on-NixOS.patch @@ -0,0 +1,17 @@ +diff --git a/pynvml/nvml.py b/pynvml/nvml.py +index 56d908f..1de0b97 100644 +--- a/pynvml/nvml.py ++++ b/pynvml/nvml.py +@@ -1475,7 +1475,11 @@ def _LoadNvmlLibrary(): + nvmlLib = CDLL(os.path.join(os.getenv("ProgramFiles", "C:/Program Files"), "NVIDIA Corporation/NVSMI/nvml.dll")) + else: + # assume linux +- nvmlLib = CDLL("libnvidia-ml.so.1") ++ try: ++ nvmlLib = CDLL("libnvidia-ml.so.1") ++ except OSError: ++ # assume NixOS ++ nvmlLib = CDLL("@driverLink@/lib/libnvidia-ml.so.1") + except OSError as ose: + _nvmlCheckReturn(NVML_ERROR_LIBRARY_NOT_FOUND) + if (nvmlLib == None): diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 63d445e0923fc..bad74b2aed9ce 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, substituteAll , pythonOlder , cudatoolkit +, addOpenGLRunpath }: buildPythonPackage rec { pname = "pynvml"; - version = "11.4.1"; + version = "11.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b2e4a33b80569d093b513f5804db0c7f40cfc86f15a013ae7a8e99c5e175d5dd"; + sha256 = "sha256-0CeyG5WxCIufwngRf59ht8Z/jjOnh+n4P3NfD3GsMtA="; }; + patches = [ + (substituteAll { + src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; + inherit (addOpenGLRunpath) driverLink; + }) + ]; + propagatedBuildInputs = [ cudatoolkit ]; doCheck = false; # no tests in PyPi dist diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index aebab128cb1ed..d6bd079a04a1e 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.34.1"; + version = "0.34.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fpa2IEsLOQ8ylGI/5D6h+22j1pvrvE9IMIyhCtyM6qU="; + sha256 = "2zDr6fnA2MCTT/hNVvk7u3gugMo+nUF2E2VsOPhJXH4="; }; patches = [ @@ -60,7 +60,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "libusb-package>=1.0,<2.0" "" + --replace "libusb-package>=1.0,<2.0" "" \ + --replace "pylink-square>=0.11.1,<1.0" "pylink-square>=0.11.1,<2.0" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 5b8656bbe19fc..d3e7faf03cd39 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; }; + nativeBuildInputs = [ + unixODBC # for odbc_config + ]; + buildInputs = [ unixODBC ]; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index eef2875a0d974..b7b35a7657314 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.4"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-FVpwJRCRlc537tJomB4Alxx8zJj8FpZp+LxB0f12rGE="; + hash = "sha256-ZsoWz+35hQS15dbpe1IOzft6JwZygKjv5AQWjVe+8kQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 27e329c928558..21812dd47f7e0 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x"; - homepage = "http://pyopengl.sourceforge.net/"; + homepage = "https://pyopengl.sourceforge.net/"; maintainers = with lib.maintainers; [ laikq ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 048c47184d161..ec6acefeb49de 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,32 +2,36 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , openssl , cryptography , pytestCheckHook , pretend +, sphinxHook +, sphinx-rtd-theme , flaky }: buildPythonPackage rec { pname = "pyopenssl"; - version = "22.1.0"; - - outputs = [ "out" "dev" ]; + version = "23.0.0"; + format = "setuptools"; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - sha256 = "sha256-eoO3snLdWVIi1nL1zimqAw8fuDdjDvIp9i5y45XOiWg="; + hash = "sha256-wcxfhrys78hNrafTEXXK4bFRjV9g09C7WVpngiqGim8="; }; - patches = [ - (fetchpatch { - name = "fix-flaky-darwin-handshake-tests.patch"; - url = "https://github.com/pyca/pyopenssl/commit/8a75898356806784caf742e8277ef03de830ce11.patch"; - hash = "sha256-UVsZ8Nq1jUTZhOUAilRgdtqMYp4AN7qvWHqc6RleqRI="; - }) + outputs = [ + "out" + "dev" + "doc" + ]; + + nativeBuildInputs = [ + openssl + sphinxHook + sphinx-rtd-theme ]; postPatch = '' @@ -35,10 +39,17 @@ buildPythonPackage rec { sed "/cryptography/ s/,<[0-9]*//g" setup.py ''; - nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography ]; + propagatedBuildInputs = [ + cryptography + ]; + + nativeCheckInputs = [ + flaky + pretend + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook pretend flaky ]; + __darwinAllowLocalNetworking = true; preCheck = '' export LANG="en_US.UTF-8" @@ -82,6 +93,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper around the OpenSSL library"; homepage = "https://github.com/pyca/pyopenssl"; + changelog = "https://github.com/pyca/pyopenssl/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 49f4b06a5ce6e..05b8793c73fb3 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -1,10 +1,10 @@ { lib , aiohttp , aresponses -, asynctest , backoff , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.01.0"; + version = "2023.02.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,9 +23,18 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qPLfah35E0vX2tQhGw4wTSMyE4nIyWMDIaKlJePVSd4="; + hash = "sha256-EiTTck6hmOGSQ7LyZsbhnH1zgkH8GccejLdJaH2m0F8="; }; + patches = [ + # Remove asynctest, https://github.com/bachya/pyopenuv/pull/108 + (fetchpatch { + name = "remove-asynctest.patch"; + url = "https://github.com/bachya/pyopenuv/commit/af15736b0d82ef811c3f380f5da32007752644fe.patch"; + hash = "sha256-5uQS3DoM91mhfyxLTNii3JBxwXIDK4/GwtadkVagjuw="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -37,7 +46,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytest-aiohttp pytestCheckHook @@ -55,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API to retrieve data from openuv.io"; homepage = "https://github.com/bachya/pyopenuv"; + changelog = "https://github.com/bachya/pyopenuv/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix new file mode 100644 index 0000000000000..bbf388c56cade --- /dev/null +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, poetry-core +, httpx +, pydicom +}: + +buildPythonPackage rec { + pname = "pyorthanc"; + version = "1.11.4"; + disabled = pythonOlder "3.8"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "gacou54"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-HbNeI6KpdIoLwRx09qQGJ/iJGKnRj0Z4/mkgoXhofGA="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ httpx pydicom ]; + + doCheck = false; # requires orthanc server (not in Nixpkgs) + + pythonImportsCheck = [ + "pyorthanc" + ]; + + meta = with lib; { + description = "Python library that wraps the Orthanc REST API"; + homepage = "https://github.com/gacou54/pyorthanc"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index dbfe8dd4ecd0d..289f4d1c048e9 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,24 +1,55 @@ -{ 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 .."; diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index ea59fa0dc10f3..ff2a4a4323c1d 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, aiocache , buildPythonPackage , fetchFromGitHub , poetry-core @@ -9,37 +8,29 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder -, msgpack , ujson }: buildPythonPackage rec { - pname = "pyflunearyou"; - version = "2021.10.0"; + pname = "pyoutbreaksnearme"; + version = "2022.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - aiocache - msgpack ujson ]; @@ -56,12 +47,13 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ - "pyflunearyou" + "pyoutbreaksnearme" ]; meta = with lib; { - description = "Python library for retrieving UV-related information from Flu Near You"; - homepage = "https://github.com/bachya/pyflunearyou"; + description = "Library for retrieving data from for Outbreaks Near Me"; + homepage = "https://github.com/bachya/pyoutbreaksnearme"; + changelog = "https://github.com/bachya/pyoutbreaksnearme/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 49e6abffd54ad..963290da2776a 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.7.3"; + version = "1.7.6"; 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-hmi6cOBHbcxzA10vQt6fxB8qHrr4My5JFmucV5QCUVg="; + hash = "sha256-nmXOmoPH8w4Soj8lhI7wl3uYVmKw3xSuIkmCF0XI7RI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 327e3a92adac4..9b337bf274c26 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.47.1"; + version = "0.48.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-c9pEO9k5tCFWLPismrXrrYEQYmxYKkciXFgpbrDEGzE="; + sha256 = "sha256-gt0jrDPr6FeLB5P9HCSosCHb/W1sAKSusTrCpkqO26E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypitoken/default.nix b/pkgs/development/python-modules/pypitoken/default.nix new file mode 100644 index 0000000000000..90c42306a134d --- /dev/null +++ b/pkgs/development/python-modules/pypitoken/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, poetry-core +, pymacaroons +, pytest-mock +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pypitoken"; + version = "6.0.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ewjoachim"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-1kPIVcxpFjqlAnPh71iS07n9M0qcFrwMRV8k38YxHBc="; + }; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pymacaroons + jsonschema + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pypitoken" + ]; + + meta = with lib; { + description = "Library for generating and manipulating PyPI tokens"; + homepage = "https://pypitoken.readthedocs.io/"; + changelog = "https://github.com/ewjoachim/pypitoken/releases/tag/6.0.3${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index e474a84567387..1dd8c57a260d3 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU="; }; @@ -70,9 +70,17 @@ buildPythonPackage rec { "pypsrp" ]; + disabledTests = [ + # TypeError: Backend.load_rsa_private_numbers() missing 1 required... + "test_psrp_pshost_ui_mocked_methods" + "test_psrp_key_exchange_timeout" + "test_psrp_multiple_commands" + ]; + meta = with lib; { description = "PowerShell Remoting Protocol Client library"; homepage = "https://github.com/jborean93/pypsrp"; + changelog = "https://github.com/jborean93/pypsrp/blob/v${version}/CHANGELOG.md"; license = 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 3751edd01be48..fdaeb031f9c6d 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 }: @@ -45,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/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 2652b5eb00b3c..a0bf3f03f600f 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''} chmod +x configure.py - sed -i '1i#!${python.interpreter}' configure.py + sed -i '1i#!${python.pythonForBuild.interpreter}' configure.py ''; configureScript = "./configure.py"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b78f16233ea59..70fb1ef8a85d3 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "PyQt5"; - version = "5.15.7"; + version = "5.15.9"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ="; + hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA="; }; patches = [ diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index fce9308093ecd..d98c4c695b6fe 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.4.0"; + version = "6.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kTkkab4fSRkF+p54+k5AWaiathbd8uz9UlvB1lwmu5M="; + hash = "sha256-dAJE9gj+Fe4diWlcQ/MaFMrspBxPAqw2yG37pKXVgT0="; }; patches = [ diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index c86fe165d4fc2..c11dcad4d7d3d 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/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 00351c5dc516d..72ba19f8a2e85 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 = [ @@ -55,21 +62,18 @@ buildPythonPackage rec { ]; 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/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix new file mode 100644 index 0000000000000..20a5d59833db9 --- /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/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 899e1cfd7b606..8d9c546213f84 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,11 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub +, freezegun +, ical , parameterized , pycryptodome , pydantic , pytest-aiohttp +, pytest-asyncio +, pytest-golden +, pytest-mock , pytestCheckHook +, python-dateutil , pythonOlder , pyyaml , requests @@ -15,7 +21,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "1.1.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -24,7 +30,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e+neyzH+sGTzGwdy/N7n6GUvctHlHQgwDkRQsnzL7Jw="; + hash = "sha256-fQHWamtGA1Cz/9Hbxbns5lDd08Q01nIvaMXp9PWrelM="; }; postPatch = '' @@ -36,15 +42,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + ical pycryptodome pydantic + python-dateutil pyyaml requests ]; nativeCheckInputs = [ + freezegun parameterized pytest-aiohttp + pytest-asyncio + pytest-golden + pytest-mock pytestCheckHook requests-mock responses diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 44a7779d3a593..426459a67fb40 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="; }; - nativeCheckInputs = [ 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_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix deleted file mode 100644 index 4a21f6771ef74..0000000000000 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub -, pyramid -, hawkauthlib -, tokenlib -, webtest -}: - -buildPythonPackage rec { - pname = "pyramid_hawkauth"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "mozilla-services"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; - }; - - propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ]; - buildInputs = [ webtest ]; - - pythonImportsCheck = [ "pyramid_hawkauth" ]; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - homepage = "https://github.com/mozilla-services/pyramid_hawkauth"; - description = "A Pyramid authentication plugin for HAWK"; - license = licenses.mpl20; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 02c69a4615205..9e8fd5f789229 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -47,6 +48,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; + disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) [ + # Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. + # Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 + "test_calculate_rotation_angle" + "test_region" + ]; + # Disable automatic update of the astropy-helper module postPatch = '' substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 389dff30ad10d..a3bbd94663c26 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = "refs/tags/${version}"; - hash = "sha256-ntnZITj8upzUzlrSTjQxY9xNTU+gJ2rE9PN35cpWwvM="; + hash = "sha256-sxxGu1ON5fhUCaONYJdsUFHraTh5NAdXzj7Cai9k5yc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 0dbc1880be884..8897ae953578a 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.100"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM="; + hash = "sha256-WlKzBhToSrBl6T8XFlqi3p0ABDufBGdhmK/0Fn7V61A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index b232a0bd8f418..908fb0c8a0ae0 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.4"; + version = "0.7.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d1rO/vTSrOdZHmIAAL3zg8cMi3lpgEhw9sLYIE+iF+A="; + hash = "sha256-Husvo+JUM1ffCpN6cAxbZ2GyqlKEQArtRiBkcP5cC+U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 9efc461cec2b5..106fa03a082bc 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" ''; - NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) + env.NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) "-I ${lib.getDev pcsclite}/include/PCSC"; propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index ad68da4478db7..54ada321371a8 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -1,22 +1,20 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.24"; + version = "1.0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-lLorBf4HjynkTyLfKGcxEpSzyCawjKDej/HFtHl/Ar8="; + src = fetchPypi { + inherit pname version; + hash = "sha256-AZpqV/CQ8TLKjaee9b0Zbu6WfnGNenKIvot+TTTSikg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 9d6a3c6407986..4fa3e757767d5 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,4 +1,6 @@ { python +, pythonAtLeast +, disabledIf , fetchurl , lib , stdenv @@ -9,6 +11,10 @@ , shiboken2 }: +# Only build when Python<=3.10 +# See https://bugreports.qt.io/browse/PYSIDE-1864 +# "There are no plans to support Python versions > 3.10 in the 5.15 branch." +disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; version = "5.15.5"; @@ -31,7 +37,7 @@ stdenv.mkDerivation rec { "-DPYTHON_EXECUTABLE=${python.interpreter}" ]; - NIX_CFLAGS_COMPILE = "-I${qt5.qtdeclarative.dev}/include/QtQuick/${qt5.qtdeclarative.version}/QtQuick"; + env.NIX_CFLAGS_COMPILE = "-I${qt5.qtdeclarative.dev}/include/QtQuick/${qt5.qtdeclarative.version}/QtQuick"; nativeBuildInputs = [ cmake ninja qt5.qmake python ]; @@ -49,6 +55,7 @@ stdenv.mkDerivation rec { qtcharts qtsensors qtsvg + qt3d ]) ++ (with python.pkgs; [ setuptools ]) ++ (lib.optionals (python.pythonOlder "3.9") [ @@ -63,7 +70,7 @@ stdenv.mkDerivation rec { postInstall = '' cd ../../.. - ${python.interpreter} setup.py egg_info --build-type=pyside2 + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside2 cp -r PySide2.egg-info $out/${python.sitePackages}/ ''; @@ -73,4 +80,4 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; }; -} +}) diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 4edf006c19d08..ca99e542c66dc 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.2"; + 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-HzvL6b2zeUrAAJ4mmKPOacZzHVVxfs3gjzP+fZIhApI="; + hash = "sha256-EDs1ZBjwZCNrZMiH0Lcp2NyxQhGHygUMNBEU/5zuUYI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index cfa75f83c06ef..f3a7f7d15497b 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.4"; + 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-ZcX8LK/qckNEhMWljv73QHtWv4IY7Xtr4ISrlnrUaAY="; + hash = "sha256-j8BiO/7wp1TRSK+C5cPSgF72CuBpb2jLhJXRJLHgh5I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix index 670e2bc213166..f0ec07437bca1 100644 --- a/pkgs/development/python-modules/pysmart/default.nix +++ b/pkgs/development/python-modules/pysmart/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmart"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "truenas"; repo = "py-SMART"; rev = "refs/tags/v${version}"; - hash = "sha256-qZJwUxU9LSKXpftBuKFnxI4gygHIuJEwGJqFaBlCudc="; + hash = "sha256-5VoZEgHWmHUDkm2KhBP0gfmhOJUYJUqDLWBp/kU1404="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 5da547e5ebfa4..d962615e7adbf 100644 --- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysnmp-pyasn1"; - version = "1.1.2"; + version = "1.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysnmp"; repo = "pyasn1"; - rev = "v${version}"; - hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA="; + rev = "refs/tags/v${version}"; + hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI="; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python ASN.1 encoder and decoder"; homepage = "https://github.com/pysnmp/pyasn1"; + changelog = "https://github.com/pysnmp/pyasn1/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix index 71fdfa28057b8..3b1c8fe2b2999 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.20"; + version = "5.0.21"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysnmp"; rev = "refs/tags/v${version}"; - hash = "sha256-SrtOn9zETtobT6nMVHLi6hP7VZGBvXvFzoThTi3ITag="; + hash = "sha256-ejRIlRxDbdZgy7wHilSzunRTGn1uO6YLLmLxNrrHKss="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 51a61d0483308..6309cfc03429b 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.13"; + version = "1.0.14"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U="; + hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index b436eecbcb12a..ca25ce6d70645 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6Z+n3pK+QGiEv9gxwyuTBqOpneRM/Dmi7vtu0HRF1fo="; + hash = "sha256-Df1dtDAMH2zJwW2NvfuC2IG0sXKYTacTRO3hqdSJPag="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix deleted file mode 100644 index 02c1c36d08374..0000000000000 --- a/pkgs/development/python-modules/pysparse/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, numpy -, blas -, lapack -, isPy27 -, python -}: - -buildPythonPackage { - pname = "pysparse"; - version = "1.3-dev"; - disabled = !isPy27; - - src = fetchFromGitHub { - owner = "PythonOptimizers"; - repo = "pysparse"; - rev = "f8430bd99ac2a6209c462657c5792d10033888cc"; - sha256 = "19xcq8214yndra1xjhna3qjm32wprsqck97dlnw3xcww7rfy6hqh"; - }; - - hardeningDisable = [ "all" ]; - - propagatedBuildInputs = [ - numpy - blas - lapack - ]; - - # Include patches from working version of PySparse 1.3-dev in - # Conda-Forge, - # https://github.com/conda-forge/pysparse-feedstock/tree/b69266911a2/recipe - # Thanks to https://github.com/guyer - patches = [ ./dropPackageLoader.patch ]; - - checkPhase = '' - cd test - ${python.interpreter} -c "import pysparse" - ${python.interpreter} test_sparray.py - ''; - - meta = with lib; { - homepage = "https://github.com/PythonOptimizers/pysparse"; - description = "A Sparse Matrix Library for Python"; - license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/pysparse/dropPackageLoader.patch b/pkgs/development/python-modules/pysparse/dropPackageLoader.patch deleted file mode 100644 index b2526645f8908..0000000000000 --- a/pkgs/development/python-modules/pysparse/dropPackageLoader.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/pysparse/__init__.py b/pysparse/__init__.py -index 6d09b00..ff39084 100644 ---- a/pysparse/__init__.py -+++ b/pysparse/__init__.py -@@ -1,9 +1,42 @@ --"PySparse: A Fast Sparse Matrix Library for Python" -+""" -+PySparse: A Fast Sparse Matrix Library for Python -+================================================= -+ -+Documentation is available in the docstrings and -+online at http://pysparse.sourceforge.net/. -+ -+Contents -+-------- -+Pysparse imports -+:: -+ spmatrix --- sparse matrix types -+ -+and, in addition, provides: -+ -+Subpackages -+----------- -+Using any of these subpackages requires an explicit import. For example, -+``import pysparse.itsolvers``. -+ -+:: -+ -+ itsolvers --- Iterative linear algebra solvers -+ precon --- Preconditioners -+ direct --- Direct solvers -+ direct.superlu --- Wrappers to SuperLU library -+ direct.umfpack --- Wrappers to UMFPACK library -+ eigen.jdsym --- Jacobi davidson eigenvalue solver for symmetric matrices -+ -+Utility tools -+------------- -+:: -+ -+ __version__ --- pysparse version string -+""" -+ - - __docformat__ = 'restructuredtext' - --# Imports --from numpy._import_tools import PackageLoader - try: - from version import version as __version__ - except ImportError: -@@ -11,31 +44,6 @@ except ImportError: - __version__ = 'undefined' - - from sparse import spmatrix --#from sparse import * --from misc import get_include -- --pkgload = PackageLoader() --pkgload(verbose=False,postpone=True) -- --if __doc__: -- __doc__ += """ -- --Available subpackages ----------------------- --""" --if __doc__: -- __doc__ += pkgload.get_pkgdocs() -- --__all__ = filter(lambda s: not s.startswith('_'), dir()) --__all__ += '__version__' -- --__doc__ += """ -- --Miscellaneous --------------- -- -- __version__ : pysparse version string --""" - - from pysparse.misc import Deprecated - -@@ -47,3 +55,5 @@ class _superlu: - return self.factorizeFnc(*args, **kwargs) - - superlu = _superlu() -+ -+__all__ = ['spmatrix', 'superlu', '__version__'] diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index dd258c380c6f0..738b67a0997f3 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev libstemmer}/include" ]; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index fc8bdc2ab0d1b..33daf6af75df2 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 = [ @@ -37,8 +37,8 @@ buildPythonPackage rec { preConfigure = '' cd Source - ${python.interpreter} setup.py backport - ${python.interpreter} setup.py configure \ + ${python.pythonForBuild.interpreter} setup.py backport + ${python.pythonForBuild.interpreter} setup.py configure \ --apr-inc-dir=${apr.dev}/include \ --apu-inc-dir=${aprutil.dev}/include \ --pycxx-dir=${pycxx.dev}/include \ @@ -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 4ee6f81ac31f0..978fc21ac92f7 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -1,4 +1,5 @@ { lib +, awesomeversion , buildPythonPackage , aiohttp , fetchFromGitHub @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.7.18"; + version = "1.7.21"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ="; + hash = "sha256-3Ujs9GgdJm69vb8F00ZWaRgWXxkaPguX5DJ71bqOFec="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + awesomeversion packaging ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index f87b55c9b36d4..39bacfa44028b 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.36.4"; + version = "0.37.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-3n3TtyzosWsdnzT2m2s55hnY45Yjj7kJS3rv/5LTSSg="; + hash = "sha256-0Kzzyzlxs5PaEHKzJLsconUg4zmgPzWI8LD5UIcKwEY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index ae670c709a32b..d5623fff63134 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/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix new file mode 100644 index 0000000000000..07461e06a298a --- /dev/null +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -0,0 +1,57 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, dataproperty +, mbstrdecoder +, pathvalidate +, setuptools +, tabledata +, tcolorpy +, typepy +, pytestCheckHook +, pyyaml +, toml +, elasticsearch +, dominate +}: + +buildPythonPackage rec { + pname = "pytablewriter"; + version = "0.64.2"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+IOHnmdd9g3SoHyITJJtbJ0/SAAmwWmwX5XeqsO34EM="; + }; + + propagatedBuildInputs = [ + dataproperty + mbstrdecoder + pathvalidate + tabledata + tcolorpy + typepy + ]; + + checkInputs = [ pyyaml toml elasticsearch dominate ]; + nativeCheckInputs = [ pytestCheckHook ]; + # Circular dependency + disabledTests = [ + "test_normal_from_file" + "test_normal_from_text" + "test_normal_clear_theme" + ]; + disabledTestPaths = [ + "test/writer/binary/test_excel_writer.py" + "test/writer/binary/test_sqlite_writer.py" + ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/pytablewriter"; + description = "A library to write a table in various formats"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix new file mode 100644 index 0000000000000..1a8ee768fb658 --- /dev/null +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# propagates +, pycryptodome +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "pytapo"; + version = "2.9.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LW14uDQBqIVsigOzO0bNTpjY7Fk0IWAeDMPEuWM/nOo="; + }; + + propagatedBuildInputs = [ + pycryptodome + requests + urllib3 + ]; + + pythonImportsCheck = [ + "pytapo" + ]; + + # Tests require actual hardware + doCheck = false; + + meta = with lib; { + description = "Python library for communication with Tapo Cameras "; + homepage = "https://github.com/JurajNyiri/pytapo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index 849d1e29a1724..5d2c51675c43b 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 = '' @@ -34,9 +34,12 @@ buildPythonPackage rec { ]; 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/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 0f3cd981ba94a..17d63fcc6675e 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.11"; + version = "1.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-GSEMjgG8Q+gzHQWRbXr/qiGP6U6ydPxu0JsD56mRNWU="; + hash = "sha256-vuwD9NVomxwG1IQioy6TzEHnibCdpg+VyCXjnjnmw54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix new file mode 100644 index 0000000000000..aed37ab142297 --- /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/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index b9def8d834afa..6fd0cefb51c3f 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-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 6697db4746e5c..b72063a2336f6 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.13"; + version = "3.6.14"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e1hEMyMSgLFqdPNNm6H1CrzGuXPTujrakFPCxBoR+3c="; + sha256 = "sha256-dFXmylelRMG/3YtWrOCMHBzkxlcqiquPG9NR3CWhC2s="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Separate test code from test cases in pytest"; homepage = "https://github.com/smarie/python-pytest-cases"; + changelog = "https://github.com/smarie/python-pytest-cases/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 9e85ceb51ce0c..dbbf42c9b6a0a 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.3.0"; + version = "2.1.4"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k="; + hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 5fdd5c757d414..f972070f53f2e 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,30 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, isPy27 }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, flask +, pytest +, pytestCheckHook +, pythonOlder +, setuptools-scm +, werkzeug +}: buildPythonPackage rec { pname = "pytest-flask"; version = "1.2.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "46fde652f77777bf02dc91205aec4ce20cdf2acbbbd66a918ab91f5c14693d3d"; + hash = "sha256-Rv3mUvd3d78C3JEgWuxM4gzfKsu71mqRirkfXBRpPT0="; }; - doCheck = false; + nativeBuildInputs = [ + setuptools-scm + ]; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ flask werkzeug ]; - nativeBuildInputs = [ setuptools-scm ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_flask" + ]; + + pytestFlagsArray = lib.optionals stdenv.isDarwin [ + "--ignore=tests/test_live_server.py" + ]; meta = with lib; { - homepage = "https://github.com/pytest-dev/pytest-flask/"; + description = "A set of pytest fixtures to test Flask applications"; + homepage = "https://pytest-flask.readthedocs.io/"; + changelog = "https://github.com/pytest-dev/pytest-flask/blob/${version}/docs/changelog.rst"; license = licenses.mit; - description = "A set of py.test fixtures to test Flask applications"; maintainers = with maintainers; [ vanschelven ]; }; } diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 80b294445f7a8..e4727abadb7c4 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi -, fetchpatch +, fetchFromGitHub +, setuptools , setuptools-scm +, wheel , py , pytest , pytestCheckHook @@ -11,28 +12,26 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "1.4.0"; + version = "1.6.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4="; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-forked"; + rev = "refs/tags/v${version}"; + hash = "sha256-owkGwF5WQ17/CXwTsIYJ2AgktekRB4qhtsDxR0LCI/k="; }; - 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 + setuptools-scm + wheel ]; - nativeBuildInputs = [ setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ pytest @@ -50,6 +49,7 @@ buildPythonPackage rec { setupHook = ./setup-hook.sh; meta = { + changelog = "https://github.com/pytest-dev/pytest-forked/blob/${src.rev}/CHANGELOG.rst"; description = "Run tests in isolated forked subprocesses"; homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 1c69f426b1695..feae849013045 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -37,6 +37,12 @@ buildPythonPackage rec { toml ]; + __darwinAllowLocalNetworking = true; + + disabledTests = [ + "test_wait_raise_assertion_false" # racy + ]; + pythonImportsCheck = [ "pytest_httpserver" ]; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index a0e9bb1fb2a6b..c6e8b7e915d6c 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,23 +1,31 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, packaging +, pytest +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "10.3"; + version = "11.0"; + format = "pyproject"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2CRNeZ+Jpu215XMB3a6ztvENZpFjjVHoCzcTEVkuKMY="; + hash = "sha256-zuWeTm8Nc65j+6CZhlMUupuRW3GTSVQREPoBL/tu+xM="; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ setuptools ]; - nativeCheckInputs = [ mock pytest ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ packaging ]; - checkPhase = '' - py.test test_pytest_rerunfailures.py - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pytest plugin to re-run tests to eliminate flaky failures"; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 13621e68e21ca..d3ea76b8a1bbe 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,7 +21,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = "refs/tags/${version}"; - hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k="; + hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 4cc1ad2589ee1..446fbfcd9c9eb 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.28.0"; + version = "0.28.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-o5WeqAVg1oGumkQbWeBNJgWgHxz5UOvYpnHt8NviTKA="; + hash = "sha256-6gzmVOuJfNpNJlea4Am20HI98mgcKkwtU/28l7qg20Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 7fabc513e9b1d..cc66888ad4e7d 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -2,10 +2,12 @@ , buildPythonPackage , fetchFromGitHub , msgpack +, poetry-core , pytestCheckHook , pythonOlder , pyyaml , ruamel-yaml +, setuptools , toml , tomli , tomli-w @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.1.0"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,9 +24,13 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; + hash = "sha256-Ddt8/S6HzmOt1kvzRzed3+TbOacw6RG9nd2UNn+ELB4="; }; + nativeBuildInputs = [ + setuptools + ]; + passthru.optional-dependencies = { all = [ msgpack @@ -64,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python dictionaries with advanced dot notation access"; homepage = "https://github.com/cdgriffith/Box"; + changelog = "https://github.com/cdgriffith/Box/blob/${version}/CHANGES.rst"; 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 3e920ff6b9ac0..164f2046c6951 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.2.0"; + version = "9.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qnYodaJwr0kFfKyofVsDTmMLMYDexqGTz8uSefPWPfQ="; + sha256 = "sha256-mmqjD+/0jAwP0Yjm1RUNvdkeP9WxDS2514uYEqsUr4g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index f48bc9c13ea7f..2e811525c3795 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.8"; + version = "0.9.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DgPPbro2KHF8zwbfoPSiuoYohgrbF0y/0lCnpGkoZaE="; + sha256 = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20="; }; preCheck = '' diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 847c167fa20bb..046b32c2177ab 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.interpreter} setup.py build_ext + ${python.pythonForBuild.interpreter} setup.py build_ext ''; installPhase = '' - ${python.interpreter} setup.py install --prefix=$out --single-version-externally-managed + ${python.pythonForBuild.interpreter} setup.py install --prefix=$out --single-version-externally-managed ''; doCheck = false; diff --git a/pkgs/development/python-modules/python-flirt/Cargo.lock b/pkgs/development/python-modules/python-flirt/Cargo.lock index d6ad3d6aef61d..2e05f648491ec 100644 --- a/pkgs/development/python-modules/python-flirt/Cargo.lock +++ b/pkgs/development/python-modules/python-flirt/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -25,36 +25,48 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.5.3" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ - "memchr 0.1.11", + "memchr", ] [[package]] -name = "aho-corasick" -version = "0.7.18" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "memchr 2.5.0", + "libc", ] [[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[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", + "winapi", ] [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "ar" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "d67af77d68a931ecd5cbd8a3b5987d63a1d1d1278f7f6a60ae33db485cdebb69" [[package]] name = "atty" @@ -62,9 +74,9 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -75,13 +87,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -90,9 +102,9 @@ dependencies = [ [[package]] name = "better-panic" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d12a680cc74d8c4a44ee08be4a00dedf671b089c2440b2e3fdaa776cd468476" +checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" dependencies = [ "backtrace", "console", @@ -100,21 +112,15 @@ dependencies = [ [[package]] name = "bitflags" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" - -[[package]] -name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" 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", @@ -123,31 +129,10 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr 2.5.0", - "regex-automata", - "serde", -] - -[[package]] -name = "build-helper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdce191bf3fa4995ce948c8c83b4640a1745457a149e73c6db75b4ffe36aad5f" -dependencies = [ - "semver", -] - -[[package]] name = "bumpalo" -version = "3.10.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -163,9 +148,15 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cfg-if" @@ -175,89 +166,190 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", "time", - "winapi 0.3.9", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "ciborium" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "2.34.0" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "ansi_term", "atty", - "bitflags 1.3.2", + "bitflags", + "clap_lex 0.2.4", + "indexmap", "strsim", - "term_size", + "termcolor", "textwrap", - "unicode-width", - "vec_map", ] [[package]] -name = "clicolors-control" -version = "1.0.1" +name = "clap" +version = "4.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" dependencies = [ - "atty", - "lazy_static", - "libc", - "winapi 0.3.9", + "bitflags", + "clap_lex 0.3.1", + "is-terminal", + "once_cell", + "strsim", + "termcolor", + "terminal_size", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", ] [[package]] name = "cmake" -version = "0.1.48" +version = "0.1.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" dependencies = [ "cc", ] [[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 = "console" -version = "0.9.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ - "clicolors-control", "encode_unicode", "lazy_static", "libc", - "regex 1.6.0", - "termios", - "winapi 0.3.9", + "windows-sys 0.42.0", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen", +] + +[[package]] +name = "const_format" +version = "0.2.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[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 = [ + "cfg-if 1.0.0", ] [[package]] name = "criterion" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" dependencies = [ + "anes", "atty", "cast", - "clap", + "ciborium", + "clap 3.2.23", "criterion-plot", - "csv", "itertools", "lazy_static", "num-traits", "oorandom", "plotters", "rayon", - "regex 1.6.0", + "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -266,9 +358,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", "itertools", @@ -280,7 +372,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", ] @@ -290,55 +382,75 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", - "once_cell", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ - "cfg-if", - "once_cell", + "cfg-if 1.0.0", ] [[package]] -name = "csv" -version = "1.1.6" +name = "cxx" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ - "bstr", - "csv-core", - "itoa 0.4.8", - "ryu", - "serde", + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", ] [[package]] -name = "csv-core" -version = "0.1.10" +name = "cxx-build" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ - "memchr 2.5.0", + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -347,7 +459,7 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "add9a102807b524ec050363f09e06f1504214b0e1c7797f64261c891022dce8b" dependencies = [ - "bitflags 1.3.2", + "bitflags", "byteorder", "lazy_static", "proc-macro-error", @@ -369,9 +481,9 @@ dependencies = [ [[package]] name = "either" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -380,6 +492,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "fern" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -389,28 +522,32 @@ dependencies = [ ] [[package]] -name = "funty" -version = "1.2.0" +name = "flate2" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] [[package]] -name = "gcc" -version = "0.3.55" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "goblin" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" +checksum = "572564d6cba7d09775202c8e7eebc4d534d5ae36578ab402fb21e182a0ac9505" dependencies = [ "log", "plain", @@ -424,6 +561,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] name = "hermit-abi" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -433,6 +576,21 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -440,42 +598,61 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexyl" -version = "0.9.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f823e021c22ebf3e1437685a9f3ceb2b93adb723e23dca2e4e38b47d3d49e447" +checksum = "392fe25d8f080f8fed5faed180f560e2379f411c3fc0a62bba146d93d893d95d" dependencies = [ - "ansi_term", "anyhow", - "atty", - "clap", + "clap 4.1.6", + "const_format", "libc", + "owo-colors", + "supports-color", + "terminal_size", "thiserror", ] [[package]] -name = "indoc" -version = "0.3.6" +name = "iana-time-zone" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ - "indoc-impl", - "proc-macro-hack", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", ] [[package]] -name = "indoc-impl" -version = "0.3.6" +name = "iana-time-zone-haiku" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", + "cxx", + "cxx-build", +] + +[[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 = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] name = "inflate" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -485,60 +662,77 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" +name = "io-lifetimes" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ - "cfg-if", + "libc", + "windows-sys 0.45.0", ] [[package]] -name = "itertools" -version = "0.10.3" +name = "is-terminal" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" dependencies = [ - "either", + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", ] [[package]] -name = "itoa" -version = "0.4.8" +name = "is_ci" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + +[[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.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" -version = "0.3.58" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +name = "jslancelot" +version = "0.8.6" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "anyhow", + "console_error_panic_hook", + "js-sys", + "lancelot", + "wasm-bindgen", + "web-sys", + "wee_alloc", ] [[package]] name = "lancelot" -version = "0.7.0" +version = "0.8.6" dependencies = [ + "ansi_term", "anyhow", - "bitflags 1.3.2", + "bitflags", "bitvec", "byteorder", "chrono", @@ -550,24 +744,26 @@ dependencies = [ "lancelot-flirt", "lazy_static", "log", - "regex 1.6.0", + "object", + "regex", "smallvec", "smol_str", "thiserror", - "unicorn", + "unicorn-engine", "widestring", "zydis", ] [[package]] name = "lancelot-bin" -version = "0.7.0" +version = "0.8.6" dependencies = [ "ansi_term", "anyhow", + "ar", "better-panic", "chrono", - "clap", + "clap 3.2.23", "fern", "goblin", "hex", @@ -575,26 +771,26 @@ dependencies = [ "lancelot", "lancelot-flirt", "log", + "serde_json", "thiserror", - "zydis", ] [[package]] name = "lancelot-flirt" -version = "0.7.0" +version = "0.8.6" dependencies = [ "anyhow", "better-panic", - "bitflags 1.3.2", + "bitflags", "bitvec", "chrono", - "clap", + "clap 3.2.23", "criterion", "fern", "inflate", "log", "nom", - "regex 1.6.0", + "regex", "smallvec", "thiserror", ] @@ -607,29 +803,30 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[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 = "libunicorn-sys" -version = "0.8.0" +name = "link-cplusplus" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf3199986a2161e4b771d09c7ab75d3776769132c78e4bd8c68488125ce2c4b" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ - "bitflags 0.8.2", - "build-helper", - "gcc", - "libc", - "os_type", - "pkg-config", + "cc", ] [[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -641,16 +838,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -dependencies = [ - "libc", + "cfg-if 1.0.0", ] [[package]] @@ -661,9 +849,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7" +checksum = "2af2c65375e552a67fe3829ca63e8a7c27a378a62824594f43b2851d682b5ec2" dependencies = [ "libc", ] @@ -678,6 +866,21 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memory_units" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" + +[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -685,20 +888,20 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[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 = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "memchr 2.5.0", + "memchr", "minimal-lexical", ] @@ -723,28 +926,29 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ - "memchr 2.5.0", + "flate2", + "memchr", ] [[package]] name = "once_cell" -version = "1.13.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -753,63 +957,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "os_type" -version = "0.6.0" +name = "os_str_bytes" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e8f383a1428eabebb01f650a03e7d1e5eb645e50f9ae4c26197647dd5e77a" -dependencies = [ - "regex 0.1.80", -] +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "cfg-if", - "instant", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", + "windows-sys 0.45.0", ] [[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 = "plain" @@ -819,9 +1005,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "plotters" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" dependencies = [ "num-traits", "plotters-backend", @@ -838,9 +1024,9 @@ checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" [[package]] name = "plotters-svg" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" dependencies = [ "plotters-backend", ] @@ -870,61 +1056,67 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] name = "proc-macro2" -version = "1.0.41" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc2916cde080c1876ff40292a396541241fe0072ef928cd76582e9ea5d60d2" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] [[package]] name = "pylancelot" -version = "0.7.0" +version = "0.8.6" dependencies = [ "anyhow", "lancelot", "pyo3", - "zydis", ] [[package]] name = "pyo3" -version = "0.15.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "indoc", "libc", + "memoffset 0.6.5", "parking_lot", - "paste", "pyo3-build-config", + "pyo3-ffi", "pyo3-macros", "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.15.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" dependencies = [ "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +dependencies = [ + "libc", + "pyo3-build-config", ] [[package]] name = "pyo3-macros" -version = "0.15.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", "syn", @@ -932,19 +1124,18 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.15.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" dependencies = [ "proc-macro2", - "pyo3-build-config", "quote", "syn", ] [[package]] name = "python-flirt" -version = "0.7.0" +version = "0.8.6" dependencies = [ "anyhow", "lancelot-flirt", @@ -953,36 +1144,34 @@ dependencies = [ [[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 = "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 = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -992,54 +1181,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "0.1.80" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "aho-corasick 0.5.3", - "memchr 0.1.11", - "regex-syntax 0.3.9", - "thread_local", - "utf8-ranges", + "bitflags", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ - "aho-corasick 0.7.18", - "memchr 2.5.0", - "regex-syntax 0.6.27", + "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.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" - -[[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rustc-demangle" @@ -1048,10 +1212,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[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 = "same-file" @@ -1069,19 +1247,25 @@ 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 = "scroll" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ "proc-macro2", "quote", @@ -1089,41 +1273,19 @@ dependencies = [ ] [[package]] -name = "semver" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" -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.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" - -[[package]] -name = "serde_cbor" -version = "0.11.2" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ - "half", - "serde", + "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", @@ -1132,41 +1294,51 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ - "itoa 1.0.2", + "itoa", "ryu", "serde", ] [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smol_str" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7475118a28b7e3a2e157ce0131ba8c5526ea96e90ee601d9f6bb2e286a35ab44" +checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" dependencies = [ "serde", ] [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "supports-color" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +dependencies = [ + "atty", + "is_ci", +] [[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", @@ -1180,48 +1352,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "term_size" -version = "0.3.2" +name = "target-lexicon" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" + +[[package]] +name = "termcolor" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ - "libc", - "winapi 0.3.9", + "winapi-util", ] [[package]] -name = "termios" -version = "0.3.3" +name = "terminal_size" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" dependencies = [ - "libc", + "rustix", + "windows-sys 0.45.0", ] [[package]] name = "textwrap" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "term_size", - "unicode-width", -] +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1229,33 +1403,14 @@ dependencies = [ ] [[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -dependencies = [ - "kernel32-sys", - "libc", -] - -[[package]] -name = "thread_local" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -dependencies = [ - "thread-id", -] - -[[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1270,45 +1425,40 @@ 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 = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] -name = "unicorn" -version = "0.8.0" +name = "unicorn-engine" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b44a5d2a8bf4e20647959d44caa769fc6e025d2aeccabf7fa79667b36233e58" +checksum = "f3b881bfd9837ff4f62e81a1e64b40a584604375ae0a73d0d5f09b7a72350b96" dependencies = [ - "bitflags 0.8.2", - "gcc", + "bitflags", + "cc", + "cmake", "libc", - "libunicorn-sys", + "pkg-config", ] [[package]] name = "unindent" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44" - -[[package]] -name = "utf8-ranges" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" - -[[package]] -name = "vec_map" -version = "0.8.2" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "version_check" @@ -1323,7 +1473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -1335,23 +1485,23 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.81" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.81" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", "syn", @@ -1360,9 +1510,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.81" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1370,9 +1520,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.81" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -1383,31 +1533,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.81" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.58" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "widestring" -version = "0.5.1" +name = "wee_alloc" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "memory_units", + "winapi", +] [[package]] -name = "winapi" -version = "0.2.8" +name = "widestring" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -1420,12 +1576,6 @@ dependencies = [ ] [[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" @@ -1437,7 +1587,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1447,19 +1597,102 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] name = "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 = "zydis" -version = "3.1.1" -source = "git+https://github.com/williballenthin/zydis-rs?branch=fix-26#cc52d4fac3f5534c4834635a452b96995f283e0e" +version = "3.1.3" +source = "git+https://github.com/williballenthin/zydis-rs?branch=nightly/wasm#cfebd092d2c98217c0527649beb5f67de349ccde" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cmake", + "serde", + "serde_derive", ] diff --git a/pkgs/development/python-modules/python-flirt/default.nix b/pkgs/development/python-modules/python-flirt/default.nix index cbd3de93b6e7a..54d942fd08408 100644 --- a/pkgs/development/python-modules/python-flirt/default.nix +++ b/pkgs/development/python-modules/python-flirt/default.nix @@ -1,18 +1,20 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , rustPlatform +, libiconv }: buildPythonPackage rec { pname = "python-flirt"; - version = "0.7.0"; + version = "0.8.6"; src = fetchFromGitHub { owner = "williballenthin"; repo = "lancelot"; rev = "v${version}"; - sha256 = "sha256-FsdnWWfyQte7FDz5ldo+S+3IEtbOIODOeh1fHDP2/4s="; + hash = "sha256-J48tRgJw6JjUrcAQdRELFE50pyDptbmbgYbr+rAK/PA="; }; postPatch = '' @@ -26,12 +28,16 @@ buildPythonPackage rec { maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + buildAndTestSubdir = "pyflirt"; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "zydis-3.1.1" = "sha256-/L28cBTCg/S7onDQXnqUoB5udoEO/depmxDUcnfIQEw="; + "zydis-3.1.3" = "sha256-X+aURjNfXGXO4eh6RJ3bi8Eb2kvF09I34ZHffvYjt9I="; }; }; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 4aabb208a90c7..45c94cdb83b3e 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython ]; preBuild = '' - ${python.interpreter} setup.py build_ext -i + ${python.pythonForBuild.interpreter} setup.py build_ext -i ''; checkPhase = '' diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 37877610178f5..fedf919c7ea86 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.9.3"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fXfLXr8Zf3rQOkmfGx5SrbsFtw9AthohoV1NiRCOBM8="; + hash = "sha256-bHnCa7laDYi424czCGCPZuomqEOAeihjDTTW35ZTiac="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix new file mode 100644 index 0000000000000..729c5ed9a180b --- /dev/null +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -0,0 +1,100 @@ +{ lib +, antlr4-python3-runtime +, asciimatics +, buildPythonPackage +, click +, dacite +, decorator +, fetchFromGitHub +, future +, first +, jsonpath-ng +, loguru +, overrides +, pillow +, ply +, pyfiglet +, pyperclip +, pytestCheckHook +, pythonOlder +, antlr4 +, pythonRelaxDepsHook +, pyyaml +, setuptools +, six +, urwid +, parameterized +, wcwidth +, yamale +}: + +buildPythonPackage rec { + pname = "python-fx"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cielong"; + repo = "pyfx"; + rev = "refs/tags/v${version}"; + hash = "sha256-nRMeYL0JGvCtUQBUMXUsZ4+F2KX+x/CbZ61sAidT9so="; + }; + + postPatch = '' + rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens} + antlr -Dlanguage=Python3 -visitor -o src/pyfx/model/common/jsonpath/ *.g4 + ''; + + pythonRelaxDeps = true; + + nativeBuildInputs = [ + antlr4 + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + antlr4-python3-runtime + asciimatics + click + dacite + decorator + first + future + jsonpath-ng + loguru + overrides + pillow + ply + pyfiglet + pyperclip + pyyaml + six + urwid + wcwidth + yamale + ]; + + nativeCheckInputs = [ + pytestCheckHook + parameterized + ]; + + # antlr4 issue prevents us from running the tests + # https://github.com/antlr/antlr4/issues/4041 + doCheck = false; + + # pythonImportsCheck = [ + # "pyfx" + # ]; + + meta = with lib; { + description = "Module to view JSON in a TUI"; + homepage = "https://github.com/cielong/pyfx"; + changelog = "https://github.com/cielong/pyfx/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6682b57ed7ae7..55e11d49d1d15 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.12.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VnOQwrk2kNrmLtlzi/nyIfpFwBN4/fiWCJ2/fIoTT70="; + 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 2c55dce69e112..15e96e798c3bc 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.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+CmOh9Dr6Gx8MLkR1u/YNpScOxIO7OUIbJAio+omOpg="; + hash = "sha256-5nwCPOc9GBxk9BItiaScfy1eljl+e0okFCEOVsHoXDQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 5210bc79e72da..4310b767aade7 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "22.9.1"; + version = "23.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-V9xfPYwDDoCGJPstzYsC/ikUp45uiaZE0Bg4i9tRNhU="; + sha256 = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 21d4f07a7c36d..b7eaa9f3e6cef 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.3.1"; + 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-rj3WTDj2ey8unOxXkD4zbqwd0FDcyHPzsDrjtX7myj4="; + hash = "sha256-ab+Fa7Dc2mHGy5C5PfoBfXIb/eugCyGrWjTYlJmTQE0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 9ee03dc8911cd..68bcd7434d05b 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "sha256-Y8HJ7MXYHJRUWPTcw8p+GGSFswuRI7u+/bIaJpKy7lY="; + sha256 = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 0214a6b0d2e4a..193717d6d83e3 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7RawbJ5O5KCruD499fOkuFcouBzp3f7aEUnE37wJqmM="; + sha256 = "sha256-yYmzZuwZSasN6g6Bosivexe5oOy3dP+l/cD5TkXC87g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-jwt/default.nix b/pkgs/development/python-modules/python-jwt/default.nix new file mode 100644 index 0000000000000..43ff058149652 --- /dev/null +++ b/pkgs/development/python-modules/python-jwt/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, cryptography +, freezegun +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "jwt"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + inherit version; + owner = "GehirnInc"; + repo = "python-jwt"; + rev = "v${version}"; + sha256 = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg="; + }; + + postPatch = '' + # pytest-flake8 is incompatible flake8 6.0.0 and currently unmaintained + substituteInPlace setup.cfg --replace "--flake8" "" + ''; + + propagatedBuildInputs = [ + cryptography + ]; + + nativeCheckInputs = [ + pytestCheckHook + freezegun + pytest-cov + ]; + + pythonImportsCheck = [ "jwt" ]; + + meta = with lib; { + description = "JSON Web Token library for Python 3"; + homepage = "https://github.com/GehirnInc/python-jwt"; + license = licenses.asl20; + maintainers = with maintainers; [ thornycrackers ]; + }; +} diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 36cf7d737a5dd..e348b2b80b0ea 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9zCUYB+TYgDMoTHpR0u42Usq2EKp8vtzlTgU82eXxl8="; + sha256 = "sha256-vp2r842f9A2lEFLhUcHyGZavAWT4Ke9mH+FAlGucdqo="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; homepage = "https://python-kasa.readthedocs.io/"; + changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 725849fee078f..358a647d52d94 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , substituteAll , file , pytestCheckHook @@ -23,6 +24,11 @@ buildPythonPackage rec { src = ./libmagic-path.patch; libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + (fetchpatch { + name = "update-test-for-upstream-added-gzip-extensions.patch"; + url = "https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457.patch"; + hash = "sha256-67GpjlGiR4/os/iZ69V+ZziVLpjmid+7t+gQ2aQy9I0="; + }) ]; preCheck = '' diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 4e10af5b40d3e..77baaa332caec 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Hf/U3LFcIsT00lIzvvZaowfMth/zj5WY6UAxYWjC1JA="; + hash = "sha256-Ek/RW7ZAZJhkgR6IJRvKGjtUKeHic8l5v1BuNECPiEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index a5b9617a59d60..e59781180b38c 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "1.0.8"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-7w2Gg70Sl84zs55z6Hg8JPtkY9dNzyb1iBC6O4ulr1M="; + hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 8c43d7a4ca275..ade6acd85d46d 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.11"; + version = "1.1.14"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "034vc2j54dciiq80k7jn6kx4g7i58sjk0ykma039k5rihj2rblpk"; + sha256 = "sha256-kOC6FsLYTVx/cCL8AZuGkKarHqAESjJA+2BUagbiy3A="; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 6731aa873b531..8cdc62e8c0f5f 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.2.0"; + version = "18.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GFu/LK+189dh8nLj4YSnAMx7pc99UWGQZb5/XEtbfPQ="; + hash = "sha256-UPdYfHorJSj3NQWBf5Q3rFwdBNV26b4mTS3u/9t0WnY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index f430517be7590..39cd201c96550 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -1,5 +1,10 @@ { lib, buildPythonPackage, isPy3k, olm -, cffi, future, typing }: +, cffi +, future +, aspectlib +, pytest-benchmark +, pytestCheckHook +}: buildPythonPackage { pname = "python-olm"; @@ -17,17 +22,20 @@ buildPythonPackage { propagatedBuildInputs = [ cffi future - typing ]; propagatedNativeBuildInputs = [ cffi ]; - # Some required libraries for testing are not packaged yet. - doCheck = false; pythonImportsCheck = [ "olm" ]; + nativeCheckInputs = [ + aspectlib + pytest-benchmark + pytestCheckHook + ]; + meta = { inherit (olm.meta) license maintainers; description = "Python bindings for Olm"; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 6a9e24a9f8d84..8e0317dbc6d54 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kcOsEtpLQjwWs5F2FvhKI+KWHnUPzlkNQJ7MUO4EMc4="; + sha256 = "sha256-7ZF5GFG/eQmvQYnVmaV8iWYPhWldJPPumlZloeJkNLg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 337abedc5f560..f2cd6d285b753 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"; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 318b6c5f6f847..468e4a71336a9 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-swiftclient"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+CKY5KSPfL3WgPJjjIXRynrhp27b4wA20htM16KcCes="; + hash = "sha256-o/Ynzp+1S1fTD9tB3DBb1eYFM+62mueeSWrU7F6EjIU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 5a5ac9f772a6b..ac69e15ec77d2 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , loguru @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.4.5"; + version = "3.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O/+jvdzzxUFaQdAfUM9p40fPPDNN+stTauCD993HH6Y="; + hash = "sha256-FFBWkq7ct4JWSTH4Ldg+pbG/BAiW33puB7lqFPBjptw="; }; postPatch = '' @@ -47,6 +48,11 @@ buildPythonPackage rec { "_python_utils_tests" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Flaky tests on darwin + "test_timeout_generator" + ]; + meta = with lib; { description = "Module with some convenient utilities"; homepage = "https://github.com/WoLpH/python-utils"; diff --git a/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch b/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch new file mode 100644 index 0000000000000..11b5541517905 --- /dev/null +++ b/pkgs/development/python-modules/python-zbar/0001-python-enum-fix-build-for-Python-3.11.patch @@ -0,0 +1,61 @@ +From 64de7911d2938fc3601fec39c08008465b9d4f6f Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 7 Feb 2023 17:12:50 +0800 +Subject: [PATCH] python: enum: fix build for Python 3.11 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Python 3.9 introduced Py_SET_SIZE function to set size instead of +relying on Py_SIZE() as a macro [3.9]. + +Python 3.10 started to encourage to use Py_SET_SIZE instead of +assigning into return value of Py_SIZE [3.10]. + +Python 3.11 flips the switch, turn Py_SIZE into a function [3.11], +thus Py_SIZE(obj) will be a rvalue. We need to use Py_SET_SIZE +to set size now. + +[3.9]: https://docs.python.org/3.9/c-api/structures.html#c.Py_SET_SIZE +[3.10]: https://docs.python.org/3.10/c-api/structures.html#c.Py_SIZE +[3.11]: https://docs.python.org/3.11/c-api/structures.html#c.Py_SIZE + +Adapted from https://github.com/mchehab/zbar/pull/231 + +Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> +Signed-off-by: Nick Cao <nickcao@nichi.co> +--- + python/enum.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/python/enum.c b/python/enum.c +index dfe1b1e..4833a20 100644 +--- a/python/enum.c ++++ b/python/enum.c +@@ -52,7 +52,11 @@ enumitem_new (PyTypeObject *type, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x030900A4 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + #else +@@ -143,7 +147,11 @@ zbarEnumItem_New (PyObject *byname, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x030900A4 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + +-- +2.39.1 + diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index 7ad125b26ef5d..178b1899ef51f 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -1,4 +1,10 @@ -{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, zbar +, pytestCheckHook +}: buildPythonPackage rec { pname = "python-zbar"; @@ -12,6 +18,13 @@ buildPythonPackage rec { sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; }; + patches = [ + # python: enum: fix build for Python 3.11 + # https://github.com/mchehab/zbar/pull/231 + # the patch is reworked as it does not cleanly apply + ./0001-python-enum-fix-build-for-Python-3.11.patch + ]; + propagatedBuildInputs = [ pillow ]; buildInputs = [ zbar ]; diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index e993567569eaf..8c25f17bb8b30 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.11"; + version = "0.27.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-FVbp7FYTzoNuwROdvKGzSnVN5nAp1hboyzNMhAu6YDY="; + hash = "sha256-KmUzXlINRbtyzZCoG4d2Xc57g07d+x7bdoq/DtMmtqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index b0bd470b32b9b..cc6b56d4cf97c 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.7.2"; + version = "2.0.1"; disabled = isPy27; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-f+k7WuZRgSDGbWp/TvmDkDzT02WeycwDCd/1WhR3VD8="; + sha256 = "sha256-zB0g6GJcqWRhjJZgUWmTdG4fhBBfFR6yEM2FEOVLWIs="; }; propagatedBuildInputs = [ @@ -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 0dca174784288..4f61c14a59af9 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-B8B5zULIuqiojP7bmj3sABC9dqYLqOX5CfEN6slOFZ8="; + sha256 = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 46e9b3843af53..83ab0a9879f34 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 = "13.0.0"; 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-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0="; }; propagatedBuildInputs = [ @@ -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/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index e162a4a6cb615..b8594e51f8391 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytz"; - version = "2022.7"; + version = "2022.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fM+ue0ssBnRkpnM8YmFnP9uP0b6QVGA5a5egc+n6aDo="; + hash = "sha256-AaBoHEuWhKKDBGFeulXRqzGuAL9o7BV+w3CKgYLbvNA="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index e75e99ceb340b..fac54d545a13e 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.6.2"; + version = "4.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sEIjR6ScJNliJJJET06e22x5GMDrmB6fZAzyHr847sk="; + hash = "sha256-VvziL9IfPP19whwaLpNp42mZEduGqnPjPJtlSjTNmMo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix index 8dc976fa8c401..8b6af6dc5d921 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,10 +18,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-QZm8FlUm17Vv80hB3iai54QcVlhSrq2AvbdBaRWDyok="; + rev = "refs/tags/${version}"; + hash = "sha256-hy/hmXxxEb44X8JUszoA1YF/41y7GkQqC4uS+Pax6WA="; }; + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp ]; @@ -32,12 +38,6 @@ buildPythonPackage rec { pytest-asyncio ]; - postPatch = '' - # Upstream doesn't set version in the repo - substituteInPlace setup.py \ - --replace 'version="main",' 'version="${version}",' - ''; - 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/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 3a6c3871a4411..e6391349927c2 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyutil"; - version = "3.3.0"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848"; + sha256 = "sha256-6hbSxVtvg0Eh3rYyp0VLCg+uJdXRMLFfa+l667B2yfw="; }; propagatedBuildInputs = [ simplejson ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 2c69497dfbcd3..628e01dde9090 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.34"; + version = "9.2.40"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3IWhMhiaGm0LXxgVy1HgCxNIBYuGzCJKf3Nual13xe8="; + hash = "sha256-M4eo/ADLoisxl2VFbLN2/VUV8vpDOxP+T6r5STDtyaA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 97d2b5a83ba63..b238d82ec98d5 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.24.0"; + version = "2.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-D0N7kRTzfKCxLNtRJML+xykvsv3Mv0WHdlA05eLHl3M="; + sha256 = "sha256-OZvYl8wl8kOIOfsWVn74XFKMX/jAmtoMTIEQpAZmTeo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 6c56916d19eff..46c99543a342a 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.6.0"; + version = "0.6.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-1EAkE2uYjo8sUbSrF6E1AGZkKPTxkSre3ov2RU8YhfM="; + hash = "sha256-bRO2xO3Q9ruu5KY9SHwdhDU3DoZfW98uYiEFv5P0Fqc="; }; nativeBuildInputs = [ @@ -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/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index ce69f6c6c0756..8b13dae335348 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , imageio , numpy , pillow , pooch , scooby , vtk -, unittestCheckHook }: buildPythonPackage rec { pname = "pyvista"; - version = "0.37.0"; + version = "0.38.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-02osbV9T9HOrapJBZpaTrO56UXk5Tcl1ldoUzB3iMUE="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-DkJZfzBS/amQqZDcsmQo+WlSxOYtIwizXJOjF/N2lSE="; }; propagatedBuildInputs = [ @@ -28,8 +30,11 @@ buildPythonPackage rec { vtk ]; - nativeCheckInputs = [ - unittestCheckHook + # Fatal Python error: Aborted + doCheck = false; + + pythonImportsCheck = [ + "pyvista" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 54ee52c347bfa..a2ce4e0686887 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.0.1.1"; + version = "8.0.0.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0="; + hash = "sha256-t54FUgEXEUpb3SqayY7gCmj1egavIaoXMfuShDL9dBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 634db03a3a227..64798acad2eec 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , astropy , pillow , pythonOlder @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; }; + patches = [ + # Backport Python 3.11 support. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/astropy/pyvo/pull/385.patch"; + sha256 = "IHf3W9fIT8XFvyM41PUiJkt1j+B3RkX3TS4FOnRUMDk="; + }) + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix new file mode 100644 index 0000000000000..43f276a2df825 --- /dev/null +++ b/pkgs/development/python-modules/pywaterkotte/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "pywaterkotte"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "chboland"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-zK0x6LyXPPNPA20Zq+S1B1q7ZWGxQmWf4JxEfjNkPQw="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "pywaterkotte" + ]; + + meta = with lib; { + description = "Library to communicate with Waterkotte heatpumps"; + homepage = "https://github.com/chboland/pywaterkotte"; + changelog = "https://github.com/chboland/pywaterkotte/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index f5832449b0d7b..2a681c4f49602 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.interpreter} pywayland/ffi_build.py + ${python.pythonForBuild.interpreter} pywayland/ffi_build.py ''; # Tests need this to create sockets diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index b1384496325b0..c03a4d01b170b 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.8"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "briis"; repo = pname; - rev = "v${version}"; - sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; + rev = "refs/tags/v${version}"; + hash = "sha256-LFA1GJCYFIWl7/YblRrYgAB4lbELpzhCJyjB8aCkJ/E="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get data from WeatherFlow Weather Stations"; homepage = "https://github.com/briis/pyweatherflowrest"; + changelog = "https://github.com/briis/pyweatherflowrest/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index 9dbb19738beee..43543279efc2a 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 e49ede923f20b..0596ce02fe2ee 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 @@ -72,5 +68,6 @@ buildPythonPackage rec { 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/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 2fdf0407c64ff..fb03693574a1a 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.interpreter} wlroots/ffi_build.py + ${python.pythonForBuild.interpreter} wlroots/ffi_build.py ''; pythonImportsCheck = [ "wlroots" ]; 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 0000000000000..e6effdd72740a --- /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/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 74b688c232f44..48b0e0ac7e04c 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 = [ @@ -54,32 +71,8 @@ buildPythonPackage rec { 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 16a5622cc78a6..7f531b75a15a4 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.5.post2"; + version = "0.1.5.post3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fa960b//HacdoG6C1RR72xrIZlgWF9jwbMTu2kjioUk="; + sha256 = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index e47d0b9fbf29e..0b008f86f884e 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -9,21 +9,24 @@ , pefile , pyelftools , pythonOlder +, python-fx , python-registry , pyyaml +, questionary +, termcolor , unicorn }: buildPythonPackage rec { pname = "qiling"; - version = "1.4.4"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gtPYwmQ96+jz6XrqU0ufaN7Ht6gqrtxGrDoaTWce7/U="; + hash = "sha256-MEafxry/ewqlzOMu9TJMQodXLChGMYjS2jX3yv7FZJk="; }; propagatedBuildInputs = [ @@ -33,8 +36,11 @@ buildPythonPackage rec { multiprocess pefile pyelftools + python-fx python-registry pyyaml + termcolor + questionary unicorn ]; @@ -49,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Qiling Advanced Binary Emulation Framework"; homepage = "https://qiling.io/"; + changelog = "https://github.com/qilingframework/qiling/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 431b5c9bfa101..9c54df213dc34 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 21053b8c75bcb..8140226b4dd95 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-vfezalq3x9KAMtwixUkIVQIwBO2zd+BDl+JwdRqBn7w="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Qingping BLE devices"; homepage = "https://github.com/bluetooth-devices/qingping-ble"; + changelog = "https://github.com/Bluetooth-Devices/qingping-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix new file mode 100644 index 0000000000000..db5ea8ad1f7df --- /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/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index 38ff4bc434ff9..b05a0428f976f 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "quantiphy"; - version = "2.18"; + version = "2.19"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "quantiphy"; rev = "v${version}"; - hash = "sha256-KXZQTal5EQDrMNV9QKeuLeYYDaMfAJlEDEagq2XG9/Q="; + hash = "sha256-oSWq/D1EX6mxUDElfujyOSEtql0csAm72u2B5RuQddE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 419dea854096b..937d031253530 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -3,17 +3,28 @@ , fetchPypi , numpy , pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "quantities"; - version = "0.13.0"; + version = "0.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81"; + hash = "sha256-7+r//AwDZPiRqTJyOc0SSWvMtVzQN6bRv0TecG9yKHc="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ numpy ]; @@ -27,11 +38,14 @@ buildPythonPackage rec { "test_mul" ]; - pythonImportsCheck = [ "quantities" ]; + pythonImportsCheck = [ + "quantities" + ]; meta = with lib; { description = "Quantities is designed to handle arithmetic and conversions of physical quantities"; homepage = "https://python-quantities.readthedocs.io/"; + changelog = "https://github.com/python-quantities/python-quantities/blob/v${version}/CHANGES.txt"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 8e84f1e2fd8ba..4aa36b38735d9 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.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI="; + hash = "sha256-SEW10ka0aQAXtW2UNCVJHMVhhZ9JTTj4IbskL87/Dn4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 55b964fb6ad27..e720c180014ba 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "railroad-diagrams"; - version = "2.0.4"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dBP/oZRYO9UQ78PkZo9h1aOL7soYa7fDbuptDW8D+0U="; + hash = "sha256-qRMyuskAyzw2czH6m2mfCJe8+GtyZPZUWGdd9DDQTOM="; }; # This is a dependency of pyparsing, which is a dependency of pytest diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index da4a3846a95fb..6a223bb4fb762 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -1,12 +1,18 @@ { lib +, aiohttp +, aioresponses , beautifulsoup4 , buildPythonPackage , fetchFromGitHub , html5lib +, pytest-asyncio +, pytest-aiohttp , pytestCheckHook , pythonOlder , requests , requests-mock +, setuptools +, setuptools-scm , urllib3 }: @@ -24,7 +30,25 @@ buildPythonPackage rec { hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + # https://github.com/vanstinator/raincloudy/pull/60 + substituteInPlace setup.py \ + --replace "bs4" "beautifulsoup4" \ + + # fix raincloudy.aio package discovery, by relying on + # autodiscovery instead. + sed -i '/packages=/d' setup.py + ''; + propagatedBuildInputs = [ + aiohttp requests beautifulsoup4 urllib3 @@ -32,19 +56,16 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-aiohttp pytestCheckHook requests-mock ]; - postPatch = '' - # https://github.com/vanstinator/raincloudy/pull/60 - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" \ - --replace "html5lib==1.0.1" "html5lib" - ''; - pythonImportsCheck = [ "raincloudy" + "raincloudy.aio" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 0b55d0a77b0de..40a27eed934f5 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -52,9 +52,9 @@ buildPythonPackage rec { export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 - ]; + ]); propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/rapt-ble/default.nix b/pkgs/development/python-modules/rapt-ble/default.nix new file mode 100644 index 0000000000000..7c4f104c8cde1 --- /dev/null +++ b/pkgs/development/python-modules/rapt-ble/default.nix @@ -0,0 +1,58 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "rapt-ble"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "sairon"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-upTtVqxVHrqLSGTSGCiCVlDa2NEuuqe+0W2DM+UhTnc="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=rapt_ble --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rapt_ble" + ]; + + meta = with lib; { + description = "Library for RAPT Pill hydrometer BLE devices"; + homepage = "https://github.com/sairon/rapt-ble"; + changelog = "https://github.com/sairon/rapt-ble/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 48fda6557a4f9..16661032fff13 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 +, certifi +, cython +, fetchFromGitHub +, gdal +, hypothesis , matplotlib +, ipython , numpy -, snuggs -, setuptools - -# tests -, hypothesis , packaging , pytest-randomly , pytestCheckHook +, pythonOlder +, setuptools , shapely +, snuggs }: buildPythonPackage rec { pname = "rasterio"; - version = "4"; # 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/release-test-${version}"; - hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; + rev = "refs/tags/${version}"; + 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 + ]; + }; 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/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index cb8af2c9495d3..d3f0483eec9f5 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -2,9 +2,6 @@ , buildPythonPackage , fetchFromGitHub -# native -, flake8 - # tests , pytestCheckHook , pexpect @@ -26,11 +23,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=readchar" "" + # run Linux tests on Darwin as well + # see https://github.com/magmax/python-readchar/pull/99 for why this is not upstreamed + substituteInPlace tests/linux/conftest.py \ + --replace 'sys.platform.startswith("linux")' 'sys.platform.startswith(("darwin", "linux"))' ''; - nativeBuildInputs = [ - flake8 - ]; + pythonImportsCheck = [ "readchar" ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 570654dc7e15f..cab55c3a29fea 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,22 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, regex +}: buildPythonPackage rec { pname = "rebulk"; - version = "3.1.0"; + version = "3.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a"; + hash = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw="; }; - # Some kind of trickery with imports that doesn't work. - doCheck = false; - buildInputs = [ pytest pytest-runner ]; - propagatedBuildInputs = [ six regex ]; + propagatedBuildInputs = [ + regex + ]; + + buildInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rebulk" + ]; meta = with lib; { + description = "Advanced string matching from simple patterns"; homepage = "https://github.com/Toilal/rebulk/"; + changelog = "https://github.com/Toilal/rebulk/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - description = "Advanced string matching from simple patterns"; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 040148e369648..ff57846c20c0e 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-B6oLy4Ai30SGGTgGcO0V+f1mf1P1W8sMpzk7oIUtcJY="; + hash = "sha256-aM7c/HE8xLqT5wCLaCrfFn6c7FIkCJA6TTICZprAgNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 649a1192afd02..d16cff4f92800 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - hidredis = [ + hiredis = [ hiredis ]; ocsp = [ 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 0000000000000..467d5e1340b4c --- /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/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 92e5c680b7308..a2c004fba7b85 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , poetry-core @@ -18,7 +17,7 @@ buildPythonPackage rec { version = "2022.11.2"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; @@ -38,7 +37,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index 62d6ab1ea6dc1..0fc894e9f011e 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 ]; nativeCheckInputs = [ - pytest + 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/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix new file mode 100644 index 0000000000000..174b0bff311d8 --- /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/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix new file mode 100644 index 0000000000000..5a79b68e6b851 --- /dev/null +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tabulate +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage { + pname = "remotezip"; + version = "0.12.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gtsystem"; + repo = "python-remotezip"; + # upstream does not tag releases, determined with git blame + # pypi archive lacks files for tests + rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; + hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; + }; + + propagatedBuildInputs = [ + requests + tabulate + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + requests-mock + ]; + + pythonImportsCheck = [ + "remotezip" + ]; + + meta = with lib; { + description = "Python module to access single members of a zip archive without downloading the full content"; + homepage = "https://github.com/gtsystem/python-remotezip"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 321b3daec1988..1a9c2b509fbb6 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.11"; + version = "0.1.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; + rev = "refs/tags/v${version}"; + hash = "sha256-uSyqAs0JqrsFuMpfuILoIGxLL+HVOGI/euCZziCgEdQ="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with the Renault API"; homepage = "https://github.com/hacf-fr/renault-api"; + changelog = "https://github.com/hacf-fr/renault-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index c88ec54643fa7..7d4ec741431be 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.2.2"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,26 +20,27 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - sha256 = "sha256-rHiKwr720aTpkem8urnK9TP5CkHCEOHdeBp00rhlitI="; + hash = "sha256-GLBekTsJqwzwtSYiYaJSeTt7qNs0gx2nOhlsfECFvKg="; }; + 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 ]; - postPatch = '' - # Packages in nixpkgs is different than the module name - substituteInPlace setup.py \ - --replace "ffmpeg" "ffmpeg-python" - ''; - pytestFlagsArray = [ "tests/test.py" ]; @@ -51,7 +52,9 @@ buildPythonPackage rec { "test3_images" "test4_properties" "test_succes" + "test_wrong_host" "test_wrong_password" + "test_wrong_user" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/reportengine/default.nix b/pkgs/development/python-modules/reportengine/default.nix index a7f0df89c34c8..17720e8bec2b8 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 ]; diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 47bb842cc875c..fb946fc1eb19e 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 2bc59b553507a..3baf811140f91 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.1"; - format = "setuptools"; + version = "0.10.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc="; + hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; }; nativeBuildInputs = [ @@ -47,6 +47,8 @@ buildPythonPackage rec { "build/lib*" # Avoid failure due to user warning: Distutils was imported before Setuptools "-p no:warnings" + # Uses network + "--ignore build/lib*/reproject/interpolation/" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 9819c3df60e8b..b240aa81509cf 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.2.0"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tedder"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-a3OY0Z5GGr3gYa5m4V6ukqQmjZuqtgZjmLGJxmFOPqU="; + hash = "sha256-RbaRFMyvK3y7xN+xwNi/lHJjx+xIlpfizJj9BIn6cT4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index fcc4db1fbf0fa..96b64a5be2369 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.14"; + version = "1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-LZgKjSas0KdJAf4leSVz8sEnRrlJ20Sm9Ka+S5zDOTM="; + hash = "sha256-xk8+oERonZWzxKEmZutfvovzVOz9ZP5O83cMDTz9i3Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8f68f1459e557..dfa4b16c8e98a 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -18,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 = [ - ./relax-charset-normalizer.patch - ]; - propagatedBuildInputs = [ brotlicffi certifi @@ -90,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/requests/relax-charset-normalizer.patch b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch deleted file mode 100644 index ef14c09fffb83..0000000000000 --- a/pkgs/development/python-modules/requests/relax-charset-normalizer.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 54ae822ce968f49a4d5a10e30c5d75e76c887fe4 Mon Sep 17 00:00:00 2001 -From: deedy5 <65482418+deedy5@users.noreply.github.com> -Date: Thu, 20 Oct 2022 18:26:18 +0000 -Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261) - ---- - requests/__init__.py | 4 ++-- - setup.cfg | 2 +- - setup.py | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/requests/__init__.py b/requests/__init__.py -index 7ac8e29..22db3c1 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) -- # charset_normalizer >= 2.0.0 < 3.0.0 -- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) -+ # charset_normalizer >= 2.0.0 < 4.0.0 -+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) - else: - raise Exception("You need either charset_normalizer or chardet installed") - -diff --git a/setup.cfg b/setup.cfg -index 93d1f99..ea45aaf 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -5,7 +5,7 @@ provides-extra = - use_chardet_on_py3 - requires-dist = - certifi>=2017.4.17 -- charset_normalizer>=2,<3 -+ charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 - -diff --git a/setup.py b/setup.py -index 23977ed..092b40d 100755 ---- a/setup.py -+++ b/setup.py -@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": - sys.exit() - - requires = [ -- "charset_normalizer>=2,<3", -+ "charset_normalizer>=2,<4", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", - "certifi>=2017.4.17", --- -2.38.1 - diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 817577cc447f7..c5f8f5b02852d 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "ReStructuredText viewer"; homepage = "https://mg.pov.lt/restview/"; + changelog = "https://github.com/mgedmin/restview/blob/${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix new file mode 100644 index 0000000000000..5a5ce355feed0 --- /dev/null +++ b/pkgs/development/python-modules/returns/default.nix @@ -0,0 +1,65 @@ +{ lib +, anyio +, curio +, buildPythonPackage +, fetchFromGitHub +, httpx +, hypothesis +, mypy +, poetry-core +, pytestCheckHook +, pytest-aio +, pytest-cov +, pytest-mypy +, pytest-mypy-plugins +, pytest-subtests +, setuptools +, trio +, typing-extensions +}: + +buildPythonPackage rec { + pname = "returns"; + version = "0.19.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dry-python"; + repo = "returns"; + rev = "refs/tags/${version}"; + hash = "sha256-yKlW5M7LlK9xF4GiCKtUVrZwwSmFVjCnDhnzaNFcAsU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + nativeCheckInputs = [ + anyio + curio + httpx + hypothesis + mypy + pytestCheckHook + pytest-aio + pytest-cov + pytest-mypy + pytest-mypy-plugins + pytest-subtests + setuptools + trio + ]; + + pytestFlagsArray = [ "--ignore=typesafety" ]; + + meta = with lib; { + description = "Make your functions return something meaningful, typed, and safe!"; + homepage = "returns.rtfd.io"; + license = licenses.bsd2; + maintainers = [ maintainers.jessemoore ]; + }; +} diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index a751ef1d4c0e3..8c02dd5393ed5 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -23,6 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-BNKcXtsBB90KQe4HXmfJ7H3yepk1dEkozSEy5v8KSAA="; }; + patches = [ + # https://github.com/aequitas/python-rflink/pull/70 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/aequitas/python-rflink/commit/ba807ddd2fde823b8d50bc50bb500a691d9e331f.patch"; + hash = "sha256-4Wh7b7j8qsvzYKdFwaY+B5Jd8EkyjAe1awlY0BDu2YA="; + }) + ]; + propagatedBuildInputs = [ async-timeout docopt diff --git a/pkgs/development/python-modules/rich-argparse-plus/default.nix b/pkgs/development/python-modules/rich-argparse-plus/default.nix new file mode 100644 index 0000000000000..e152ce267f4c4 --- /dev/null +++ b/pkgs/development/python-modules/rich-argparse-plus/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, rich +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rich-argparse-plus"; + version = "0.3.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "michelcrypt4d4mus"; + repo = "rich-argparse-plus"; + rev = "v${version}"; + hash = "sha256-oF2wuvyLYwObVJ4fhJl9b/sdfmQ2ahgKkfd9ZwObfPw="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + rich + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rich_argparse_plus" + ]; + + disabledTests = [ + # Tests are comparing CLI output + "test_spans" + "test_actions_spans_in_usage" + "test_boolean_optional_action_spans" + "test_usage_spans_errors" + "test_text_highlighter" + "test_default_highlights" + ]; + + meta = with lib; { + description = "Library to help formatting argparse"; + homepage = "https://github.com/michelcrypt4d4mus/rich-argparse-plus"; + changelog = "https://github.com/michelcrypt4d4mus/rich-argparse-plus/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 61e340057a99d..a82d4107ceb3f 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -1,35 +1,32 @@ { lib , buildPythonPackage -, fetchpatch -, fetchPypi -, pythonOlder , cython +, fetchPypi , numpy -, scipy -, scikit-learn , persim , pytestCheckHook +, pythonOlder +, scikit-learn +, scipy }: buildPythonPackage rec { pname = "ripser"; - version = "0.6.1"; + version = "0.6.4"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd"; + hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ="; }; - patches = [ - (fetchpatch { - url = "https://github.com/scikit-tda/ripser.py/commit/4baa248994cee9a65d710fac91809bad8ed4e5f1.patch"; - sha256 = "sha256-J/nxMOGOUiBueojJrUlAaXwktHDploYG/XL8/siF2kY="; - }) + nativeBuildInputs = [ + cython ]; propagatedBuildInputs = [ - cython numpy scipy scikit-learn @@ -47,10 +44,15 @@ buildPythonPackage rec { echo "backend: ps" > $HOME/.matplotlib/matplotlibrc ''; + pythonImportsCheck = [ + "ripser" + ]; + meta = with lib; { description = "A Lean Persistent Homology Library for Python"; homepage = "https://ripser.scikit-tda.org"; + changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix new file mode 100644 index 0000000000000..52dce6a150909 --- /dev/null +++ b/pkgs/development/python-modules/riscof/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, git +, riscv-isac +, riscv-config +, jinja2 +}: + +buildPythonPackage rec { + pname = "riscof"; + version = "1.25.2"; + + src = fetchFromGitHub { + owner = "riscv-software-src"; + repo = pname; + rev = "1.25.2"; + hash = "sha256-6jiKBGj4NN038/qq3ze+L0MYpQEEaN5xt4CTWu0i4qs="; + }; + + postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython"; + + propagatedBuildInputs = [ riscv-isac riscv-config jinja2 ]; + + patches = [ + # riscof copies a template directory from the store, but breaks because it doesn't change permissions and expects it to be writeable + ./make_writeable.patch + ]; + + meta = with lib; { + homepage = "https://github.com/riscv-software-src/riscof"; + description = "RISC-V Architectural Test Framework"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/riscof/make_writeable.patch b/pkgs/development/python-modules/riscof/make_writeable.patch new file mode 100644 index 0000000000000..938f9913a7ade --- /dev/null +++ b/pkgs/development/python-modules/riscof/make_writeable.patch @@ -0,0 +1,25 @@ +diff --git a/riscof/cli.py b/riscof/cli.py +index 26af62e..9d0ddbf 100644 +--- a/riscof/cli.py ++++ b/riscof/cli.py +@@ -502,6 +502,7 @@ def setup(dutname,refname,work_dir): + src = os.path.join(constants.root, "Templates/setup/model/") + dest = os.path.join(cwd, dutname) + distutils.dir_util.copy_tree(src, dest) ++ os.system(f"chmod +w -R '{dest}'") + + os.rename(cwd+'/'+dutname+'/model_isa.yaml', + cwd+'/'+dutname+'/'+dutname+'_isa.yaml') +@@ -525,10 +526,12 @@ def setup(dutname,refname,work_dir): + src = os.path.join(constants.root, "Templates/setup/sail_cSim/") + dest = os.path.join(cwd, refname) + distutils.dir_util.copy_tree(src, dest) ++ os.system(f"chmod +w -R '{dest}'") + else: + src = os.path.join(constants.root, "Templates/setup/reference/") + dest = os.path.join(cwd, refname) + distutils.dir_util.copy_tree(src, dest) ++ os.system(f"chmod +w -R '{dest}'") + os.rename(cwd+'/'+refname+'/riscof_model.py', + cwd+'/'+refname+'/riscof_'+refname+'.py') + with open(cwd+'/'+refname+'/riscof_'+refname+'.py', 'r') as file : diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix new file mode 100644 index 0000000000000..fdfd6741f6e2a --- /dev/null +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, cerberus +, pyyaml +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "riscv-config"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "riscv-software-src"; + repo = pname; + rev = version; + hash = "sha256-HKmHrvOF4OOzoILrBJG46UOKow5gRxMcXXiI6f34dPc="; + }; + + propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; + + meta = with lib; { + homepage = "https://github.com/riscv/riscv-config"; + description = "RISC-V configuration validator"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix new file mode 100644 index 0000000000000..98fff40285b2c --- /dev/null +++ b/pkgs/development/python-modules/riscv-isac/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, click +, colorlog +, gitpython +, pyelftools +, pytablewriter +, pytest +, pyyaml +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "riscv-isac"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "riscv-software-src"; + repo = pname; + rev = version; + hash = "sha256-Krjr9bvpoOeNfMbYj/QbJ+Y+AVLjwrzj8KKMUXCfnMA="; + }; + + postPatch = "substituteInPlace riscv_isac/requirements.txt --replace 'pyelftools==0.26' pyelftools"; + + propagatedBuildInputs = [ + click + colorlog + gitpython + pyelftools + pytablewriter + pytest + pyyaml + ruamel-yaml + ]; + + meta = with lib; { + homepage = "https://github.com/riscv/riscv-isac"; + description = "An ISA coverage extraction tool"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index 058e457d9ebe0..ab52aec1a2362 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 ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + 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" + ]; - disabledTests = [ "test_affine" ]; # deprecated division operator '/' + 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/rmsd/default.nix b/pkgs/development/python-modules/rmsd/default.nix new file mode 100644 index 0000000000000..2a0f2ecb50b2c --- /dev/null +++ b/pkgs/development/python-modules/rmsd/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, lib +, fetchPypi +, scipy +}: + +buildPythonPackage rec { + pname = "rmsd"; + version = "1.5.1"; + + propagatedBuildInputs = [ scipy ]; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wDQoIUMqrBDpgImHeHWizYu/YkFjlxB22TaGpA8Q0Sc="; + }; + + pythonImportsCheck = [ "rmsd" ]; + + meta = with lib; { + description = "Calculate root-mean-square deviation (RMSD) between two sets of cartesian coordinates"; + homepage = "https://github.com/charnley/rmsd"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 7383946dcb16f..453a6e8e953f7 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.7"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-1cTGzZ/5YgaYpSdk8nGLqgpKBNyY16fCFmrUJ+QwSDM="; + hash = "sha256-6hv85lWr2/qRzLrER6IYdmcvgiPKi1tt4fQaiqGwFQY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 47c8734eb2b4f..fd5655bcd1563 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.2"; disabled = pythonOlder "3.7"; @@ -20,17 +19,9 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "v${version}"; - hash = "sha256-86o5Lh9zWo4vUF2186dN7e8tTUu5PIxM/ZukPwNl0S8="; + hash = "sha256-uS0NwyFqidhrMG7thHM0qau22B/kI16c8aXEUuNdioQ="; }; - patches = [ - (fetchpatch { - name = "fix-finding-version.patch"; - url = "https://github.com/robotframework/PythonLibCore/commit/84c73979e309f59de057ae6a77725ab0f468b71f.patch"; - hash = "sha256-zrjsNvXpJDLpXql200NV+QGWFLtnRVZTeAjT52dRn2s="; - }) - ]; - nativeCheckInputs = [ pytest-mockito pytestCheckHook diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 74810c7761f53..df1201fb8ea6b 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "robotstatuschecker"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = "refs/tags/v${version}"; - sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; + sha256 = "sha256-7xHPqlR7IFZp3Z120mg25ZSg9eI878kE8RF1y3F5O70="; }; propagatedBuildInputs = [ robotframework ]; diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 44ea38934b9f7..d272d07ff19f7 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; - rev = version; - hash = "sha256-M4eZzFphhc96Pf1bspD+Hvl9SUN1N72xnxdtVFiPc78="; + rev = "refs/tags/${version}"; + hash = "sha256-3GHG4FBGMiF5kNk2gl05xiX9+5tcrUyi4SUCXTa6Qco="; }; nativeBuildInputs = [ @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous Python client for Roku (ECP)"; homepage = "https://github.com/ctalkington/python-rokuecp"; + changelog = "https://github.com/ctalkington/python-rokuecp/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index ae3116de9ae53..8743f97093bb2 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.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - hash = "sha256-QOFBNTz8g3f6C8Vjkblrd3QFCRrA1WqOCv6xS4GbFC4="; + hash = "sha256-TXIKa5DB5+511fQuHAQwPWqw7vQPP+s1X3U7BgEfzzE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix index 3adf7a35ea74c..43f6e0bbb95ec 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"; + version = "0.4.0"; # 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 = "refs/tags/v${version}"; + hash = "sha256-CNnej67yTh3C8n4cCA7NW97rlfIDrrlepRNDkv+BUeY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index f21b2fa0c7bd2..206c38cda7621 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.6"; + version = "3.5.8"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-NATxAx0tj/ihACZWq445S4rBbdNMpDr2je7RAvOW53E="; + sha256 = "sha256-ImEfIbxSeYCH+5gwlwXxolz76L/Sf7/u6gHz01L92yk="; }; patches = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index d0caa8741dc13..27893f4a1d26b 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.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-hV9Rntgt1Y4TBWGlunoXDKy8A2/9tum8aII8kFIZznU="; + hash = "sha256-YbpH5Pt93nKYRZMb+MRFFGRxKcRITlvFTvbo574ruFs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index d295c73b2fe29..b212af78a26c5 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.11.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM="; + hash = "sha256-iy4oNyQj6T8mMSIIqScuIqli3dCnnWP5poaTtq9f8Yc="; }; postPatch = '' 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 0000000000000..cf654cfd714b9 --- /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/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 571606a9a34f4..52b04f4cccefb 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -3,13 +3,13 @@ , aiofiles , beautifulsoup4 , buildPythonPackage -, doCheck ? true +, doCheck ? !stdenv.isDarwin # on Darwin, tests fail but pkg still works , fetchFromGitHub , gunicorn , httptools , multidict , pytest-asyncio - ,pytestCheckHook +, pytestCheckHook , pythonOlder , pythonAtLeast , sanic-routing @@ -69,7 +69,7 @@ buildPythonPackage rec { # needed for relative paths for some packages cd tests - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; @@ -126,7 +126,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "sanic" ]; meta = with lib; { - 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}"; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 61ebb429a4f5b..9ae1fd02b62ae 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.20230109181936"; + version = "8.4.20230127112827"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4PuPvnk92kITPzdGQr6fGvFlG7+zyjfjQdiGbWld5Fo="; + hash = "sha256-nptZTNveutV9bGSkDPWLfiBusZblVqd/5m7DN4HwGJY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index c095ea9ca9211..008813330dc81 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage -, contextlib2 , fetchPypi , mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -19,8 +19,12 @@ buildPythonPackage rec { hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; }; - propagatedBuildInputs = [ - contextlib2 + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "contextlib2" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 93dc48affc82c..38fffa4ba88ff 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2022.9.0"; + version = "2023.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zxK0pUfg5G5w9E+QBt1H12Ld5gWc+WakQdNVRMSFiA="; + sha256 = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index dbe2d10b780a1..7499eb6e9de90 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.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA="; + sha256 = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix index 821cba9869808..9b140ae6fed5e 100644 --- a/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -1,38 +1,58 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, unittestCheckHook -, pytest-runner, django -, sly }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, django +, sly +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "scim2-filter-parser"; - version = "0.4.0"; - format = "setuptools"; + version = "0.5.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "15five"; repo = pname; - # gets rarely updated, we can then just replace the hash rev = "refs/tags/${version}"; - hash = "sha256-ZemR5tn+T9WWgNB1FYrPJO6zh8g9zjobFZemi+MHkEE="; + 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 = [ - django - pytest-runner - unittestCheckHook - ]; + 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"; - license = licenses.mit; + 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 7f9091d87f144..13bc07faed3a8 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { runHook postCheck ''; + requiredSystemFeatures = [ "big-parallel" ]; # the tests need lots of CPU time + passthru = { blas = numpy.blas; }; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 0f2ffa7138e69..c61bc4a8ce140 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -11,11 +11,12 @@ , pygtrie , pythonOlder , setuptools +, shortuuid }: buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.7"; + version = "0.1.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F+t/3Nfcw+LG9Kh0Je2JwPWUWBNsZXTEaQOKaTT5ig0="; + hash = "sha256-/KUPePiy3ROZY+orJYZQLiAaQ5kY5eAe4v1hOS5Zmck="; }; postPatch = '' @@ -46,6 +47,7 @@ buildPythonPackage rec { pathspec pygit2 pygtrie + shortuuid ]; # Requires a running Docker instance diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index bdcc62963a73c..0bd037a74fc7a 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -1,27 +1,65 @@ { lib +, beautifulsoup4 , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, numpy +, pytest-console-scripts +, pytestCheckHook +, pythonOlder +, pyvips +, scipy , setuptools-scm }: buildPythonPackage rec { pname = "scooby"; - version = "0.7.0"; + version = "0.7.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-scD/uuAtepatt8Yn7b6PJMfSj9AT7iOy0HuVHyVvEhk="; + 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 ]; - pythonImportsCheck = [ "scooby" ]; + 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; { - homepage = "https://github.com/banesullivan/scooby"; + 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/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index 9be77facf08e7..290637cb8abb1 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-splash"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a7c17735415151ae01f07b03c7624e7276a343779b3c5f4546f655f6133df42f"; + sha256 = "sha256-7PEwJk3AjgxGHIYH7K13dGimStAd7bJinA+BvV/NcpU="; }; propagatedBuildInputs = [ scrapy six ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 646db47538bbb..62756a4eab2cb 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.7.1"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4="; + hash = "sha256-gHGsbGXxhewsdv6FCflNmf6ggFGf3CBvkIqSDV4F/kM="; }; nativeBuildInputs = [ @@ -118,12 +118,18 @@ buildPythonPackage rec { "test_xmliter_encoding" "test_download" "test_reactor_default_twisted_reactor_select" + "URIParamsSettingTest" + "URIParamsFeedOptionTest" + # flaky on darwin-aarch64 + "test_fixed_delay" + "test_start_requests_laziness" ]; postInstall = '' installManPage extras/scrapy.1 - install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy - install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy + installShellCompletion --cmd scrapy \ + --zsh extras/scrapy_zsh_completion \ + --bash extras/scrapy_bash_completion ''; pythonImportsCheck = [ @@ -143,6 +149,5 @@ buildPythonPackage rec { changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix new file mode 100644 index 0000000000000..71e399cb987aa --- /dev/null +++ b/pkgs/development/python-modules/screed/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "screed"; + version = "1.1.2"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-c0/6eopkUoZJbYlbc2+R1rKYiVbi/UI1gSPZPshRm2o="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonImportsCheck = [ "screed" ]; + checkInputs = [ pytestCheckHook ]; + + # These tests use the screed CLI and make assumptions on how screed is + # installed that break with nix. Can be enabled when upstream is fixed. + disabledTests = [ + "Test_convert_shell" + "Test_fa_shell_command" + "Test_fq_shell_command" + ]; + + meta = with lib; { + description = "A simple read-only sequence database, designed for short reads"; + homepage = "https://pypi.org/project/screed/"; + maintainers = with maintainers; [ luizirber ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 329d74af51573..3bc5e45bd3baa 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.6.3"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AWQiOTgYYqhsaJqYMwhCBoSWJ1ol6dJc6TArqptNu6Y="; + hash = "sha256-0yQ0upLkx5oroEH9BvIOfM5bgmVJw8o83IeAao5ncVs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 04b2f86121803..6b11975cd912a 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -46,11 +46,18 @@ buildPythonPackage rec { "TestKDEPlotUnivariate" "test_with_rug" "test_bivariate_kde_norm" + + # requires internet connection + "test_load_dataset_string_error" ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [ # overly strict float tolerances "TestDendrogram" ]; + # All platforms should use Agg. Let's set it explicitly to avoid probing GUI + # backends (leads to crashes on macOS). + MPLBACKEND="Agg"; + pythonImportsCheck = [ "seaborn" ]; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 76c3956ec86be..598bbc41deeef 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.7.0"; + version = "4.8.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-7inmi8dHi6So+8AbLq85Go/GEaiV1XK/7+wt9UkTdo8="; + hash = "sha256-YTi6SNtTWuEPlQ3PTeis9osvtnWmZ7SRQbne9fefdco="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix index 3e9793d0974ee..4c8412e7f9363 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.1"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,10 +19,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-D0xHNPsGlNBoHR3LqR6TbVhqXWapzwYsG+uN3kSF1oE="; + rev = "refs/tags/v${version}"; + hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -37,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "sensorpro_ble" ]; diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index 3567b178bb952..d51f6d7d64470 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.5.2"; + version = "1.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-64DywtZwfDFjW8WUzw3ZTT462sBGFgAHGc0bGnKCJpY="; + rev = "refs/tags/v${version}"; + hash = "sha256-17Yzpbcy/r+GlkLktgghehfAEboZHMbB/Dze1no4I80="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for SensorPush BLE devices"; homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble"; + changelog = "https://github.com/Bluetooth-Devices/sensorpush-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix new file mode 100644 index 0000000000000..4554b36d12071 --- /dev/null +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, huggingface-hub +, nltk +, numpy +, scikit-learn +, scipy +, sentencepiece +, tokenizers +, torch +, torchvision +, tqdm +, transformers +}: + +buildPythonPackage rec { + pname = "sentence-transformers"; + version = "2.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "UKPLab"; + repo = "sentence-transformers"; + rev = "v${version}"; + hash = "sha256-hEYpDAL0lliaS1j+c5vaZ0q1hw802jfTUurx/FvgY9w="; + }; + + propagatedBuildInputs = [ + huggingface-hub + nltk + numpy + scikit-learn + scipy + sentencepiece + tokenizers + torch + torchvision + tqdm + transformers + ]; + + pythonImportsCheck = [ "sentence_transformers" ]; + + doCheck = false; # tests fail at build_ext + + meta = with lib; { + description = "Multilingual Sentence & Image Embeddings with BERT"; + homepage = "https://github.com/UKPLab/sentence-transformers"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index e01c1828fe609..d81b055036c9b 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.14.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-2STQKIAoaGLreGGkqOSrNrByu7j+7oxZihwp9COhuGM="; + hash = "sha256-xUDMi2xoRMsDDe7LcQxIxxozo8vV5ZPzZp5zmNld3ew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix index 56f82e449a706..2ee338c66631c 100644 --- a/pkgs/development/python-modules/serialio/default.nix +++ b/pkgs/development/python-modules/serialio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Library for concurrency agnostic serial connunication"; + description = "Library for concurrency agnostic serial communication"; homepage = "https://github.com/tiagocoutinho/serialio"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index 986cd3397592e..a4a62a5145afe 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -9,13 +9,13 @@ 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 ]; diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 208e8b13a4271..fce03188f85dd 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.5"; + version = "0.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw="; + hash = "sha256-1Jn785e4aLd83EHjkgB90sWi9No8wqCjUEn4ecyVl4o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index a16e645a814ce..a7c9b139ac5c8 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -146,8 +146,12 @@ buildPythonPackage rec { meta = with lib; { description = "A unified approach to explain the output of any machine learning model"; homepage = "https://github.com/slundberg/shap"; + changelog = "https://github.com/slundberg/shap/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; + # No support for scikit-learn > 1.2 + # https://github.com/slundberg/shap/issues/2866 + broken = true; }; } diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 53ea30ca68235..b736c17337a9c 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { postInstall = '' cd ../../.. - ${python.interpreter} setup.py egg_info --build-type=shiboken2 + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken2 cp -r shiboken2.egg-info $out/${python.sitePackages}/ rm $out/bin/shiboken_tool.py ''; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 34ad5aa939088..fda1e1896a504 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to generate concise, unambiguous and URL-safe UUIDs"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; + changelog = "https://github.com/skorokithakis/shortuuid/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ zagy ]; }; diff --git a/pkgs/development/python-modules/show-in-file-manager/default.nix b/pkgs/development/python-modules/show-in-file-manager/default.nix new file mode 100644 index 0000000000000..d5f95aa466b59 --- /dev/null +++ b/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, packaging +, pyxdg +}: + +buildPythonPackage rec { + pname = "show-in-file-manager"; + version = "1.1.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FdFuSodbniF7A40C8CnDgAxKatZF4/c8nhB+omurOts="; + }; + + propagatedBuildInputs = [ + packaging + ] + ++ lib.optional (stdenv.isLinux) pyxdg + ++ lib.optional (pythonOlder "3.8") importlib-metadata; + + meta = with lib; { + homepage = "https://github.com/damonlynch/showinfilemanager"; + description = "Open the system file manager and select files in it"; + longDescription = '' + Show in File Manager is a Python package to open the system file + manager and optionally select files in it. The point is not to + open the files, but to select them in the file manager, thereby + highlighting the files and allowing the user to quickly do + something with them. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index 750af927e7688..c5e3a8ef22108 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.5"; + version = "0.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "deepjyoti30"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-d9YhqYmRyoYb03GqYKM7HkK8cnTQKPbSP6z2aanB6pQ="; + hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 28e5c25786027..57693fb3791c6 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "simpleeval"; - version = "0.9.12"; + version = "0.9.13"; format = "pyproject"; src = fetchFromGitHub { owner = "danthedeckie"; repo = pname; - rev = version; - sha256 = "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4"; + rev = "refs/tags/${version}"; + hash = "sha256-I1GILYPE6OyotgRe0Ek/iHHv6q9/b/MlcTxMAtfZD80="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple, safe single expression evaluator library"; homepage = "https://github.com/danthedeckie/simpleeval"; + changelog = "https://github.com/danthedeckie/simpleeval/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ johbo ]; }; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index a58cf5818b72b..381c7688be186 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -1,19 +1,23 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, stdenv , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "simplejson"; - version = "3.18.0"; + version = "3.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-X1lD/kCbKDPPgpr2deoVbC5LADqBlNZHvDg7206E9ZE="; + hash = "sha256-m5V1wmqkPxZBH25vWajztwa3HF4KtH+HXXs4TCecTm8="; }; nativeCheckInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { 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 ac6ca9c21264a..74c7a3c0addf0 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , backoff , beautifulsoup4 , buildPythonPackage @@ -23,7 +22,7 @@ buildPythonPackage rec { version = "2022.12.1"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; @@ -48,18 +47,12 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-aiohttp pytest-asyncio pytestCheckHook types-pytz ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = "<0.18"' 'docutils = "*"' - ''; - disabledTests = [ # simplipy/api.py:253: InvalidCredentialsError "test_request_error_failed_retry" diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 5f6a3a5f82f25..111cd66ed22f7 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -1,11 +1,11 @@ -{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }: +{ lib, fetchurl, buildPythonPackage, python, isPyPy, pythonAtLeast, sip-module ? "sip" }: buildPythonPackage rec { pname = sip-module; version = "4.19.25"; format = "other"; - disabled = isPyPy; + disabled = isPyPy || pythonAtLeast "3.11"; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5facfac582c01..5d6fde555d6fc 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,34 +1,35 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, packaging +, ply +, toml +}: buildPythonPackage rec { pname = "sip"; - version = "6.7.5"; + version = "6.7.7"; + + format = "pyproject"; src = fetchPypi { - pname = "sip"; - inherit version; - sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ="; + inherit pname version; + hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ packaging ply toml ]; # There aren't tests doCheck = false; - # FIXME: Why isn't this detected automatically? - # Needs to be specified in pyproject.toml, e.g.: - # [tool.sip.bindings.MODULE] - # tags = [PLATFORM_TAG] - platform_tag = - if stdenv.targetPlatform.isLinux then - "WS_X11" - else if stdenv.targetPlatform.isDarwin then - "WS_MACX" - else if stdenv.targetPlatform.isWindows then - "WS_WIN" - else - throw "unsupported platform"; - pythonImportsCheck = [ "sipbuild" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/siuba/default.nix b/pkgs/development/python-modules/siuba/default.nix new file mode 100644 index 0000000000000..97d90cac25ae7 --- /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/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 22901130ccd84..7114b7b167169 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.5"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; + hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 08671a0e0f448..fefc841941d90 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , flask , flask-sockets -, isPy3k +, pythonOlder , mock , moto , psutil @@ -16,7 +16,6 @@ , pytest-runner , requests , responses -, six , sqlalchemy , websockets , websocket-client @@ -24,23 +23,22 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.19.5"; + version = "3.20.0"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; + hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws="; }; propagatedBuildInputs = [ aiohttp websocket-client requests - six ]; nativeCheckInputs = [ @@ -83,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; homepage = "https://github.com/slackapi/python-slackclient"; + changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ flokli psyanticy ]; }; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f0299b231b060..4a89534c63cd5 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.9.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg="; + hash = "sha256-F0EbgRSS/kYKUDPhf6euM0eLqIqVjQsHC6C9ZZSRCIE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 94a4a2a14a528..1764f561169a4 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.5"; + version = "1.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-clUDElZ17xxbrJ+O0oplzVAxL1afWDwdk/g5ZofEhOs="; + hash = "sha256-xkx8QlabOCodqj4tRYxpln0z+HHVwYdqlXkaitzmKx8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 48a69786855b7..01128c77a5d2e 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.29.0"; + version = "0.29.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-6xyJY+qgwMsOgnh+PTVCf4F442hnBwlFnW+bt/cWxGc="; + hash = "sha256-Kp9rG7fJzvmnLpjVulf9kODoABdjaaHvgyed9I+FHVA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index af8724d1999d5..b20c60c4ab82b 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "solc-select"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw="; + sha256 = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 507e75356bed4..e34a6babb0421 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 89c5dedf50650..0000000000000 --- 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/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index c77287ec412ad..cfeb015a222a6 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.4.5"; + version = "0.4.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-L+DUEpnk8wN9rSrO3k7/BmazSh+j2lM15HEgNzlkvvU="; + sha256 = "sha256-Mja3jxXwQVvfAGpiDO8HPQwFIoUdZvSpYe1tjrFIL+k="; }; propagatedBuildInputs = [ cffi numpy portaudio ]; diff --git a/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch b/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch new file mode 100644 index 0000000000000..fa656fd2845ed --- /dev/null +++ b/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch @@ -0,0 +1,25 @@ +From b3eabd314f050a7491e82bc1560e8d8633569a06 Mon Sep 17 00:00:00 2001 +From: Zhong Jianxin <azuwis@gmail.com> +Date: Fri, 24 Feb 2023 11:03:41 +0800 +Subject: [PATCH] Fix build on linux arm64 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ef99bcc..81c2dcb 100644 +--- a/setup.py ++++ b/setup.py +@@ -80,7 +80,7 @@ else: + elif platform == 'linux': + # the oldest mainline github runner available is ubuntu 20.04, + # which runs glibc 2.31: +- oses = 'manylinux_2_31_x86_64' ++ oses = 'manylinux_2_31_{}'.format(architecture0) + else: + pythons = 'py2.py3' + oses = 'any' +-- +2.39.1 + diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 4bbf606ff5231..a6875d5edca32 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pytestCheckHook , numpy , libsndfile @@ -12,22 +11,17 @@ buildPythonPackage rec { pname = "soundfile"; - version = "0.10.3.post1"; + version = "0.12.1"; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.isi686; src = fetchPypi { - pname = "SoundFile"; - inherit version; - sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329"; + inherit pname version; + hash = "sha256-6OEBeyzx3adnrvGdL9nuXr4H4FDUMPd6Cnxmugi4za4="; }; patches = [ - # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332 - (fetchpatch { - url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch"; - sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU="; - }) + ./0001-Fix-build-on-linux-arm64.patch ]; postPatch = '' @@ -38,10 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy libsndfile cffi ]; propagatedNativeBuildInputs = [ cffi ]; - # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see - # https://github.com/bastibe/python-soundfile/issues/331 - doCheck = stdenv.system != "aarch64-darwin"; - meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 6dae66a661baf..43e9ab052d551 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -27,18 +27,23 @@ , typer , typing-extensions , wasabi +, writeScript +, stdenv +, nix +, git +, nix-update }: buildPythonPackage rec { pname = "spacy"; - version = "3.4.4"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5QDPLLXxhJRhp5KPomlwN1YGm9+3FVkGUkCvbQIIsIw="; + hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU="; }; propagatedBuildInputs = [ @@ -85,7 +90,19 @@ buildPythonPackage rec { "spacy" ]; - passthru.tests.annotation = callPackage ./annotation-test { }; + passthru = { + updateScript = writeScript "update-spacy" '' + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ nix git nix-update ]} + + nix-update python3Packages.spacy + + # update spacy models as well + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + ''; + tests.annotation = callPackage ./annotation-test { }; + }; meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP)"; diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index 6e88e9f02dea4..a68ea0456fe52 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.9"; + version = "3.0.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; + sha256 = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; }; # nativeCheckInputs = [ pytestCheckHook spacy ]; diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index d29b7ac7fa87a..e44e2300763d8 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,374 +1,374 @@ [ { "pname": "ca_core_news_lg", - "version": "3.3.0", - "sha256": "06dyd5h3c1q7vndg8j0vja24y49lvdqkb6cy6i25ldz306b6aa0l", + "version": "3.5.0", + "sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.3.0", - "sha256": "0ac8n8lg4x5mknplsfbzhsl1qxhkbi5plx4xd252zmr0kilxkykn", + "version": "3.5.0", + "sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.3.0", - "sha256": "1gj4ni9mwksrwqxjipvn13lhbfk7wqh8k7hh9gfpsm2saa951yf6", + "version": "3.5.0", + "sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.3.0", - "sha256": "0fhf71rj568akcwxvzjr2j5x5f5qz7g7i49bz5m9lbqs01bj0rjw", + "version": "3.5.0", + "sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.3.0", - "sha256": "0wyw9lyxbs0jgy8qgxhpqpfhm8y4a9hanar0ggrvhsaxcfjs6qhr", + "version": "3.5.0", + "sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.3.0", - "sha256": "0rj8l0v6m1ia5r4j0180gl0kh2srfw90bkvq21wr1gq142536f2d", + "version": "3.5.0", + "sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.3.0", - "sha256": "0a8786jqlpjrvg27h9nww0v4p3p9f0rr7kilbpmb7w9466hjbkjy", + "version": "3.5.0", + "sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.3.0", - "sha256": "1k80mq5gfiw7m7z60by1qis2zhszwb9z9hg55r0qam71pnbsqb0f", + "version": "3.5.0", + "sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.3.0", - "sha256": "0y13qwkfh7nzp2m8w3qna0qj3gaxrpsncmc1ramnn515565j62in", + "version": "3.5.0", + "sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.3.0", - "sha256": "0ln5p4dg5y4hzpx1738qlh6591j2ydrf8gyvhfvx5dr1pkwps83d", + "version": "3.5.0", + "sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.3.0", - "sha256": "18clx5dck1wmk39miqlsqgwvzhhqd7xh8vmi6ilpjnwgx48yfjh7", + "version": "3.5.0", + "sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.3.0", - "sha256": "165vji0d4imylpgpywnmdjvylsi2l8kz8fpxbhwjdx5cv40ywcda", + "version": "3.5.0", + "sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.3.0", - "sha256": "0jz32glmwj1a662ciz1ay6g2shil0ia8smmbj42ghnjl4dlf2n3b", + "version": "3.5.0", + "sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.3.0", - "sha256": "179fqj781wfrh9nkizv7s5ia8abb73sgnnl3yim35nbkpwnps47v", + "version": "3.5.0", + "sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.3.0", - "sha256": "0j1d9i2xqqbaiyzr1aghzm42nfjlxx3qv2mlfhav3yi69hmy8aj3", + "version": "3.5.0", + "sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.3.0", - "sha256": "1anq8vlk3rwf7by1j7b9gvc5pjdvc9cz4mazqvrs4448xs3r0ndl", + "version": "3.5.0", + "sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.3.0", - "sha256": "1bknji6j21pm9y0v48zhc0r4di5wm4lxxab35wmzakn0myhag2il", + "version": "3.5.0", + "sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.3.0", - "sha256": "1qfkif2dzs9gvkydca2mq1w9xb818zmz14rwramxpvq17bfraqdw", + "version": "3.5.0", + "sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.3.0", - "sha256": "0jd9wq7nxw4iywr9v2m19kf84hhgnh1sy9j2zrz6w5vv16363cr9", + "version": "3.5.0", + "sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.3.0", - "sha256": "0gk2rca1qmgy5bnv4r8h9kxpix19h3dgbgjwky60fagnbvch5pzc", + "version": "3.5.0", + "sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.3.0", - "sha256": "0r3hvx5za3iydqfqz65p586c8g86b7pw8mjnipj43y0qnz2d0x14", + "version": "3.5.0", + "sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.3.0", - "sha256": "1rmccrgddgbfagj2vasfr6bqc5kpziy4gln5bcmnxwhh6mh66rwd", + "version": "3.5.0", + "sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12", "license": "gpl3" }, { "pname": "fr_core_news_lg", - "version": "3.3.0", - "sha256": "15vxksw3g7g721cwrp9436w5wx43gicq6i2v6v1h63qifxjhkp3j", + "version": "3.5.0", + "sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.3.0", - "sha256": "1x3d6nlfmclq961b292aqvgz8ldijpsi330vja75ncrbyz9wygav", + "version": "3.5.0", + "sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.3.0", - "sha256": "1gqzspi8y8b54ja7ikhlr5ip137kgv7x4flavgj456sdhfzkaqkz", + "version": "3.5.0", + "sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.3.0", - "sha256": "09n067v07233gr8sw6yma1s2bi2m6wf8ripn74npjjs28akmr5p3", + "version": "3.5.0", + "sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2", "license": "lgpllr" }, { "pname": "it_core_news_lg", - "version": "3.3.0", - "sha256": "1c5zqfpkmjwr21nmcnky6sgf7fr4lpiaai9hz2z14yrnnvby80y1", + "version": "3.5.0", + "sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.3.0", - "sha256": "1jpcivp0djfm975czn41k23y7ly6b54myrlj5fyjql1scwf0xzh1", + "version": "3.5.0", + "sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.3.0", - "sha256": "0lkgs8sw02p7l5mrbrwkaiqs524hd9bkhfiiz7wzcc0p0zn4hn8h", + "version": "3.5.0", + "sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip", "license": "cc-by-nc-sa-30" }, { "pname": "lt_core_news_lg", - "version": "3.3.0", - "sha256": "08azxjqpsa66b5vm7gwllbjli36wv1n11m07andlkg3p2nmn6m85", + "version": "3.5.0", + "sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.3.0", - "sha256": "05qj4bhjq4v31r05rza7kc52kmp954f4h4zs344pdddzdzzc8h4q", + "version": "3.5.0", + "sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.3.0", - "sha256": "0wmaxixrm08ikicgnbz5zw3iimmm9dl7j7yy78bqixzym0iv2hxy", + "version": "3.5.0", + "sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.3.0", - "sha256": "17q62v8nvyz73d5jsbd5nw1mzxkj1cn7g6f0cl0lrl6pqn2b2rgl", + "version": "3.5.0", + "sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.3.0", - "sha256": "103z7hkr5jbk6zmqihzsm9jlmr4mg32r6ph90j6xx71jdmnjz4ky", + "version": "3.5.0", + "sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.3.0", - "sha256": "09k56dds3mjc2qxa6mbcha1i2h4hqjvbavkhnijmdfhsk6azk3v5", + "version": "3.5.0", + "sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.3.0", - "sha256": "11iq62w96zc5z51i9kkxp5bqbfmhzm3jpivrs8arw9fs7xrscjn0", + "version": "3.5.0", + "sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.3.0", - "sha256": "0891z1c867jyhg9jr0ais2vv6h3v5b98sc7c8hxy4apf7nwnkjss", + "version": "3.5.0", + "sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.3.0", - "sha256": "1v19jvzvhix6rfac4szggdcqi3qkljwqmrynl75qz28piff0sln5", + "version": "3.5.0", + "sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.3.0", - "sha256": "0ai6pydmd2rabpl8fy98ild7n2wwk2z11qha20x4gn33d8k60ih0", + "version": "3.5.0", + "sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.3.0", - "sha256": "1c95xcivn09dmfgrq21hh9i82v6wbnk0cwglcdgnx9kfidzgpgjc", + "version": "3.5.0", + "sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.3.0", - "sha256": "1jp978ish3hvn48i1dard82czzx3vvh4lnlhhb50j0kk4b7xv5z1", + "version": "3.5.0", + "sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.3.0", - "sha256": "0w5rpz43ix16sq8h6h5g3h1a64ww8r5z4fydz2vr7bphajkwrhlq", + "version": "3.5.0", + "sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.3.0", - "sha256": "1sllknhw689nbf9rmnc5604r0vig1yzkpg3s6yvgjyli7m04k6d1", + "version": "3.5.0", + "sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.3.0", - "sha256": "0gpa140y04kazr8imifgdjsdzj7m10s15vy8q0vbi8chc8m14i1s", + "version": "3.5.0", + "sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.3.0", - "sha256": "1pk0m03hyck3g6riq1x5n5k0jp70z2fqaw6pl7zrm0rcf2165rh0", + "version": "3.5.0", + "sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.3.0", - "sha256": "190d74ihga38kp68r8xs9rxnavxdzw2j917f7b75wmr04brbf824", + "version": "3.5.0", + "sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.3.0", - "sha256": "1477yddal5cjn7a6adw1bvmal4pc4p8bcc4x7q016a22fgk9lcpl", + "version": "3.5.0", + "sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.3.0", - "sha256": "1w8cwll2dp9a1k40b5njbypdrxwf7vacf9sdwc18kkiadkrihy4g", + "version": "3.5.0", + "sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.3.0", - "sha256": "1mr3s0fm571idbgi0g3qg4x7hyy1kw9br98vn8g21f8h05qmlc72", + "version": "3.5.0", + "sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.3.0", - "sha256": "1n6dwfx2l0wzb02r14z47r19v5dy7ld35s11w1kq40k5bbkbakhm", + "version": "3.5.0", + "sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.3.0", - "sha256": "1yv2r6b6n9ccvizi23q2xdrzbws1asa5mbiw4771irrmqzan9wiq", + "version": "3.5.0", + "sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.3.0", - "sha256": "0s2yjlibg2r2pdf8cfn36nx6rp9ppk8jjjph91az0sp5lj0c38pp", + "version": "3.5.0", + "sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.3.0", - "sha256": "0cnn8daf90hnl5mmgk3y6fc0f6x62j7rm9gkq16zbb0qmayb7ri0", + "version": "3.5.0", + "sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn", "license": "mit" }, { "pname": "sv_core_news_lg", - "version": "3.3.0", - "sha256": "0503xnr8cdzb2ckj12b51hkayv2gzf2c2rv746w4y50pjk4cmfsx", + "version": "3.5.0", + "sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.3.0", - "sha256": "1hzfl92j13hxf8im4b4mjbgxawp8xqpi3ych6bi2x5pr7qjx6gab", + "version": "3.5.0", + "sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.3.0", - "sha256": "0sjg1ab8r7m1g735amgakslchn1jba0ygyri59h6qsp8cmhvajw7", + "version": "3.5.0", + "sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "3.3.0", - "sha256": "1925y6n90qwy703v410si8sq7vzvlwi6zaj9n19ggysr78kyrsqz", + "version": "3.5.0", + "sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.3.0", - "sha256": "0dgd2lwh269f8m7qsv8x3743b3mc5r2lw6kcvdh1cs8qk8hxlfnx", + "version": "3.5.0", + "sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.3.0", - "sha256": "15yps28i86shnf313xbsmv1sgnr71aymxnx5s155hbn2fk8pdzwc", + "version": "3.5.0", + "sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.3.0", - "sha256": "0mvqgmm4y1ng6asxb2ic215ikk8lx0dm7c5cfwhx02vamllxv20q", + "version": "3.5.0", + "sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.3.0", - "sha256": "05qc50wxddfacf6x7i8q0r9dnrr6gsfnaldzmavry96nfngmqp6v", + "version": "3.5.0", + "sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.3.0", - "sha256": "0pmb456q8b02qw5zmw735w9yv3clfaqcqm91ng8lphxbcxqkp9jc", + "version": "3.5.0", + "sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb", "license": "mit" } ] diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 0e0f1f19640f4..4110e157d62b6 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -6,42 +6,72 @@ , sentencepiece , spacy , spacy-pkuseg -, spacy-transformers }: +, spacy-transformers +, writeScript +, stdenv +, jq +, nix +, moreutils +}: let buildModelPackage = { pname, version, sha256, license }: - let - lang = builtins.substring 0 2 pname; - in buildPythonPackage { - inherit pname version; - - src = fetchurl { - url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - inherit sha256; - }; + let + lang = builtins.substring 0 2 pname; + in + buildPythonPackage { + inherit pname version; + + src = fetchurl { + url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + propagatedBuildInputs = [ spacy ] + ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] + ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] + ++ lib.optionals (lang == "ru") [ pymorphy2 ] + ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + + postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' + substituteInPlace meta.json \ + --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" + ''; + + pythonImportsCheck = [ pname ]; - propagatedBuildInputs = [ spacy ] - ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] - ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] - ++ lib.optionals (lang == "ru") [ pymorphy2 ] - ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + passthru.updateScript = writeScript "update-spacy-models" '' + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ jq nix moreutils ]} - postPatch = lib.optionalString (pname == "fr_dep_news_trf") '' - substituteInPlace meta.json \ - --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" - ''; + IFS=. read -r major minor patch <<<"${spacy.version}" + spacyVersion="$(echo "$major.$minor.0")" - pythonImportsCheck = [ pname ]; + pushd pkgs/development/python-modules/spacy/ || exit - meta = with lib; { - description = "Models for the spaCy NLP library"; - homepage = "https://github.com/explosion/spacy-models"; - license = licenses.${license}; - maintainers = with maintainers; [ rvl ]; + jq -r '.[] | .pname' models.json | while IFS= read -r pname; do + if [ "$(jq --arg pname "$pname" -r '.[] | select(.pname == $pname) | .version' models.json)" == "$spacyVersion" ]; then + continue + fi + + newHash="$(nix-prefetch-url "https://github.com/explosion/spacy-models/releases/download/$pname-$spacyVersion/$pname-$spacyVersion.tar.gz")" + jq --arg newHash "$newHash" --arg pname "$pname" --arg spacyVersion "$spacyVersion" \ + '[(.[] | select(.pname != $pname)), (.[] | select(.pname == $pname) | .sha256 = $newHash | .version = $spacyVersion)] | sort_by(.pname)' \ + models.json | sponge models.json + done + + popd || exit + ''; + + meta = with lib; { + description = "Models for the spaCy NLP library"; + homepage = "https://github.com/explosion/spacy-models"; + license = licenses.${license}; + maintainers = with maintainers; [ rvl ]; + }; }; - }; makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models); -in makeModelSet (lib.importJSON ./models.json) - -# cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url +in +makeModelSet (lib.importJSON ./models.json) diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 6c5597755a361..12a5878024b82 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -5,11 +5,12 @@ , sphinx , pydata-sphinx-theme , pyyaml +, jupyter-book }: buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "0.4.0rc1"; + version = "1.0.0rc2"; format = "wheel"; @@ -20,7 +21,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "bfad8ef469885da5633f7cf7f8cd9a0ae11ea2351a91e507b44cf15973934512"; + sha256 = "43977402f55b79706e117c6de6f50e67dac6dad698eb9b75be07dc2e6a689bde"; }; propagatedBuildInputs = [ @@ -29,7 +30,13 @@ buildPythonPackage rec { pyyaml ]; - pythonImportsCheck = [ "sphinx_book_theme" ]; + pythonImportsCheck = [ + "sphinx_book_theme" + ]; + + passthru.tests = { + inherit jupyter-book; + }; meta = with lib; { description = "A clean book theme for scientific explanations and documentation with Sphinx"; 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 0000000000000..c9dcec606fa1f --- /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-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix new file mode 100644 index 0000000000000..c606297e1afc3 --- /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 0000000000000..6bbf8687f5a13 --- /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-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix new file mode 100644 index 0000000000000..dd2efe81fd151 --- /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 0000000000000..cc5d5f0b2eca6 --- /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-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 998ee4b8ed774..8d2ff5a8a05a4 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -4,25 +4,22 @@ , docutils , sphinx , readthedocs-sphinx-ext +, sphinx-jquery , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.1.1"; + version = "1.2.0"; + format = "setuptools"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - sha256 = "sha256-YUbIRfHhlHs8PdRDLCiZihaTzMdCtPmtfGMSnwdXwQM="; + sha256 = "sha256-oNi9Gi7VLgszjL4ZxLLu88XnoEh2l1PaxqnwWce2Qbg="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "docutils <0.18" "docutils" \ - --replace "sphinx >=1.6,<6" "sphinx" - ''; - preBuild = '' # Don't use NPM to fetch assets. Assets are included in sdist. export CI=1 @@ -31,18 +28,28 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils sphinx + sphinx-jquery ]; nativeCheckInputs = [ - readthedocs-sphinx-ext pytestCheckHook + pythonRelaxDepsHook + readthedocs-sphinx-ext + ]; + + pythonRelaxDeps = [ + "docutils" + "sphinxcontrib-jquery" + ]; + + pythonImportsCheck = [ + "sphinx_rtd_theme" ]; meta = with lib; { - description = "ReadTheDocs.org theme for Sphinx"; + description = "Sphinx theme for readthedocs.org"; homepage = "https://github.com/readthedocs/sphinx_rtd_theme"; + changelog = "https://github.com/readthedocs/sphinx_rtd_theme/blob/${version}/docs/changelog.rst"; license = licenses.mit; - platforms = platforms.unix; }; - } 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 0000000000000..a2714c2d12603 --- /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-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index d031faa90c2ab..1bf8685282ee3 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CHZ6WacLlFhpGyujW7b2KkRSlGmUR3rlg5ulPMsKUoc="; + 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 0000000000000..bf57d4f2fd834 --- /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/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index ce5546566fd65..1f4eb94fea54d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -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-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 0e7216d1ddfc6..1486372b02aba 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-rO1qloTOgU5qVHURMyA6Ug7rC3UOjICqPUiFJ9RsLzA="; + hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix new file mode 100644 index 0000000000000..795556797b931 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +, requests +, flit-core +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-youtube"; + version = "1.2.0"; + format = "pyproject"; + + nativeBuildInputs = [ flit-core ]; + + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "youtube"; + rev = "v${version}"; + hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A="; + }; + + propagatedBuildInputs = [ sphinx requests ]; + + # tests require internet access + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.youtube" ]; + + meta = with lib; { + description = "Youtube extension for Sphinx"; + homepage = "https://github.com/sphinx-contrib/youtube"; + maintainers = with maintainers; [ gador ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 01af1111a2412..1247312ad0fcc 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.22.0"; + version = "2.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uLnumxbOJZ49utvHi0DzdgzcTMM9t9kwJS7HkJEhdtA="; + hash = "sha256-VGgNvyQ6Kwz/DlkeHSaWkulCZSc7UquQmUpmFVXASsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 8a038bbb31933..44531ba12f276 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -54,15 +54,16 @@ buildPythonPackage rec { 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; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # indicate tests that we don't have a database server at hand + # Indicate tests that we don't have a database server at hand DB = "sqlite"; + disabledTestPaths = [ + # Test doesn't support latest SQLAlchemy + "tests/plugins/test_flask.py" + ]; + pythonImportsCheck = [ "sqlalchemy_continuum" ]; diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index 05dfba9497293..3d12618b8e45c 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -5,10 +5,11 @@ , pytestCheckHook , python-dateutil , duckdb +, pyspark }: buildPythonPackage rec { pname = "sqlglot"; - version = "6.0.7"; + version = "10.5.2"; disabled = pythonOlder "3.8"; @@ -16,12 +17,15 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "v${version}"; - hash = "sha256-7PBhf9NN/mCi92xSkB9ygfmfxTyOYaEyrNvL309sG5Y="; + hash = "sha256-ZFc2aOhCTRFlrzgnYDSdIZxRqKZ8FvkYSZRU0OMHI34="; }; propagatedBuildInputs = [ python-dateutil ]; - nativeCheckInputs = [ pytestCheckHook duckdb ]; + nativeCheckInputs = [ pytestCheckHook duckdb pyspark ]; + + # these integration tests assume a running Spark instance + disabledTestPaths = [ "tests/dataframe/integration" ]; pythonImportsCheck = [ "sqlglot" ]; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 338112f8d7f7c..80e82d353e981 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.7"; + version = "1.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EQ7kdX14WkmH4b40W2sXplZdJw9SICYBpy6lPbMx8WY="; + 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/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 99ccab32acde6..da465eb0ccb37 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.0.26"; + version = "0.0.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QxQyxGOt6K3Q/ShdTMgI72lJML4J1+zZj1OoKyPAYVs="; + hash = "sha256-i1IFkibQ7VHrkD8KzeInBE4ZbjxAw8nQIeE6O4iYmbw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 9f1d946688516..fa4cf74069bc7 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.5"; + version = "2.4.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c="; + hash = "sha256-R7QfMjq6TJwzEav2DkQ8A6nv6cafZdxALRc8Mvd0Sm8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index c7e506e3ca208..c65563d6e6a38 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -2,20 +2,24 @@ , buildPythonPackage , fetchPypi , nose +, setuptools , arrow , requests , units +, pint +, pydantic , pytz , six }: buildPythonPackage rec { pname = "stravalib"; - version = "1.1.0"; + version = "1.2.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; + sha256 = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; }; nativeCheckInputs = [ @@ -26,7 +30,10 @@ buildPythonPackage rec { arrow requests units + pint + pydantic pytz + setuptools six ]; @@ -36,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; - homepage = "https://github.com/hozn/stravalib"; + homepage = "https://github.com/stravalib/stravalib"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 96a7310cb04ce..7085f0fe703b9 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 = "5.0.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0="; + hash = "sha256-pDcrna+DEtgjaaqmSZcpem8Ea8B8oJ91159ayAkztBQ="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stripe Python bindings"; homepage = "https://github.com/stripe/stripe-python"; + changelog = "https://github.com/stripe/stripe-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix deleted file mode 100644 index f2776265b067f..0000000000000 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPyPy -}: - -buildPythonPackage rec { - pname = "suds-jurko"; - version = "0.6"; - disabled = isPyPy; # lots of failures - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; - }; - - doCheck = false; - - postPatch = '' - # fails - substituteInPlace tests/test_transport_http.py \ - --replace "test_sending_unicode_data" "noop" - ''; - - meta = with lib; { - description = "Lightweight SOAP client (Jurko's fork)"; - homepage = "https://bitbucket.org/jurko/suds"; - license = licenses.lgpl3; - broken = true; # Uses use2to3, which has been removed in setuptools>=58 - }; - -} diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix new file mode 100644 index 0000000000000..0d2e00e59e542 --- /dev/null +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "sunweg"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rokam"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-fGaPn4pp1nDL4MX7K8zP2Vq2R/uRtd8rHSaWEG5Ye7s="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "sunweg" + ]; + + meta = with lib; { + description = "Module to access the WEG solar energy platform"; + homepage = "https://github.com/rokam/sunweg"; + changelog = "https://github.com/rokam/sunweg/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix deleted file mode 100644 index 83925dd64d935..0000000000000 --- a/pkgs/development/python-modules/suseapi/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, django -, suds-jurko -, python-ldap -, mechanize -, beautifulsoup4 -, pyxdg -, python-dateutil -, requests -, httpretty -}: - -buildPythonPackage rec { - pname = "suseapi"; - version = "0.24-31-g0fcbe96"; - - src = fetchFromGitHub { - owner = "openSUSE"; - repo = "python-${pname}"; - rev = version; - sha256 = "0hyzq0h1w8gp0zfvhqh7qsgcg1wp05a14371m6bn5a7gss93rbv4"; - }; - - propagatedBuildInputs = [ - django suds-jurko python-ldap mechanize beautifulsoup4 pyxdg python-dateutil requests - ]; - - buildInputs = [ httpretty ]; - - doCheck = false; - - meta = { - homepage = "https://github.com/openSUSE/python-suseapi/"; - description = "Python module to work with various SUSE services"; - license = lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 686c4298e0bab..18ca0bd263e35 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub +, poetry-core +, inkex , lxml , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "svg2tikz"; - version = "unstable-2021-01-12"; + version = "1.2.0"; - format = "setuptools"; + disabled = pythonOlder "3.10"; + + format = "pyproject"; src = fetchFromGitHub { owner = "xyz2tex"; repo = "svg2tikz"; - rev = "7a9959c295e1ed73e543474c6f3679d04cebc9e9"; - hash = "sha256-OLMFtEEdcY8ARI+hUSOhMwwcrtOAsbKRJRdDJcuaIBg="; + rev = "refs/tags/v${version}"; + hash = "sha256-oFcKRcXef1Uz0qFi6Gga/D4u8zW0RjXAnHDlhRr33Ts="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "+dairiki.1" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + inkex lxml ]; @@ -26,12 +41,10 @@ buildPythonPackage { pytestCheckHook ]; - # upstream hasn't updated the tests in a while - doCheck = false; - pythonImportsCheck = [ "svg2tikz" ]; meta = with lib; { + changelog = "https://github.com/xyz2tex/svg2tikz/blob/${src.rev}/README.md#changes-bug-fixes-and-known-problems-from-the-original"; homepage = "https://github.com/xyz2tex/svg2tikz"; description = "Set of tools for converting SVG graphics to TikZ/PGF code"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index 84dd9d77a8aa7..1eed43519e7e9 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 = '' diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index d1bb2994f7793..ab6d341b2647f 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sybil"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "simplistix"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9fXvQfVS3IVdOV4hbA0bEYFJU7uK0WpqJKMNBltqFTI="; + hash = "sha256-NvgmAFRuiBbyPnJykQlYNyQYALx1bFubMrakw671fDY="; }; # Circular dependency with testfixtures diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix new file mode 100644 index 0000000000000..661fd29a288c9 --- /dev/null +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -0,0 +1,55 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, rapidfuzz +, requests +}: + +buildPythonPackage rec { + pname = "syncedlyrics"; + version = "0.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rtcq"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-dH9irIah9CdZ9Kv7bIymP1o5ifWEYCiSqegUpu8Y+Tg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + requests + rapidfuzz + beautifulsoup4 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "syncedlyrics" + ]; + + pytestFlagsArray = [ + "test.py::test_all_providers" + ]; + + meta = with lib; { + description = "Module to get LRC format (synchronized) lyrics"; + homepage = "https://github.com/rtcq/syncedlyrics"; + changelog = "https://github.com/rtcq/syncedlyrics/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index b27af96edbd75..864bb2532ca12 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -1,31 +1,24 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub +, libredirect , systemd , pkg-config +, pytest +, python }: buildPythonPackage rec { pname = "systemd"; - version = "234"; + version = "235"; src = fetchFromGitHub { owner = "systemd"; repo = "python-systemd"; rev = "v${version}"; - sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz"; + sha256 = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o="; }; - patches = [ - # Fix runtime issues on Python 3.10 - # https://github.com/systemd/python-systemd/issues/107 - (fetchpatch { - url = "https://github.com/systemd/python-systemd/commit/c71bbac357f0ac722e1bcb2edfa925b68cca23c9.patch"; - sha256 = "22s72Wa/BCwNNvwbxEUh58jhHlbA00SNwNVchVDovcc="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; @@ -34,8 +27,17 @@ buildPythonPackage rec { systemd ]; - # No module named 'systemd._journal - doCheck = false; + nativeCheckInputs = [ + pytest + ]; + + checkPhase = '' + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + + pytest $out/${python.sitePackages}/systemd + ''; pythonImportsCheck = [ "systemd.journal" @@ -46,7 +48,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for native access to the systemd facilities"; - homepage = "http://www.freedesktop.org/software/systemd/python-systemd/"; + homepage = "https://www.freedesktop.org/software/systemd/python-systemd/"; + changelog = "https://github.com/systemd/python-systemd/blob/v${version}/NEWS"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix new file mode 100644 index 0000000000000..7b9a8977a928d --- /dev/null +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, dataproperty +, typepy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tabledata"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6Nkdc32cp9wbmw7cnBn5VAJKfqxNunyxExuZ9b+qWNY="; + }; + + propagatedBuildInputs = [ dataproperty typepy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/tabledata"; + description = "A library to represent tabular data"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 25ae9a1b51178..585cf7205e1f1 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.6.0"; - format = "setuptools"; + version = "2.7.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "chezou"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L/N4TqVHIlwqVeBKlUq5Oz1VW/105Ov6Yicvnn/lxlI="; + hash = "sha256-SV4QLvk7dXtU0/husS5A5mBYvbTejLyO9PpiO2oBtjs="; }; patches = [ diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix new file mode 100644 index 0000000000000..d31fb3683ef4e --- /dev/null +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tcolorpy"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-duMbeKygEuGVcg4+gQRfClww3rs5AsmJR1VQBo7KWFY="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/tcolorpy"; + description = "A library to apply true color for terminal text"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 3c3bbf5756e0e..f40809dabf9e5 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 = '' diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 7198620b8ff03..ca79b7b771c25 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , fetchPypi , pbr , cliff @@ -14,6 +15,7 @@ , oslo-serialization , oslo-utils , fixtures +, pythonOlder , pyyaml , subunit , stevedore @@ -29,6 +31,9 @@ buildPythonPackage rec { pname = "tempest"; version = "33.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -38,6 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr cliff + defusedxml jsonschema testtools paramiko diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix index 24fb681f3b6f0..c7d8e4d630be9 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-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 6f820298ec13c..bd447bd4325a5 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , fetchFromGitHub -, bazel_3 +, bazel_6 , buildBazelPackage , buildPythonPackage +, cctools , python , setuptools , wheel @@ -25,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 @@ -35,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 @@ -46,12 +48,13 @@ let tensorflow ]; - bazel = bazel_3; + bazel = bazel_6; bazelTarget = ":pip_pkg"; + LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm"; + sha256 = "sha256-pST4R45mWC5j0ngkkRe+hmostaMploW0+BN3WKPt0t0="; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 7a2d29b75c7c4..dcfa8e0e964c7 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 ? {} @@ -76,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 3f8eb562f9665..a59a31b57442e 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.3"; +version = "2.11.0"; linux_py_37_cpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0m360pj7ix57d30s9inq9g5cbv7jrgnk2ryygj8irfw569rrzk7x"; }; linux_py_38_cpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1kx4rj15fnbmznpyjjbkw5mf0b03gw97h7ijlqf1kcdjzmbm24la"; }; linux_py_39_cpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1isvyiwrhis8i2xjx5mmsrxv2i7fl0hg1jaa1pgw70c6sz5vqm0r"; }; linux_py_310_cpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1ni7yrk33xdh6zpy840y3hbidmfgj9dxp690yxrjwarr3694465k"; }; linux_py_37_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "14r2sa25gmpda6kysv7dbbrzmaxb47jq2fpy9dfcfbiwsrzszwhi"; }; linux_py_38_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1z8g3j1a8bzpfl3cwf74wal9npfyzr89l14wrrjmd311w9c06z25"; }; linux_py_39_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1nfhw5fwkvwyvcap41756avrg4c8xm0xrdgj8spqfjvamc3chcqp"; }; linux_py_310_gpu = { - 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"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1vckr15ys8cks8pj9yld4zyhm8w7bjnc8yq6q1g3145fl99ygac1"; }; mac_py_37_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp37-cp37m-macosx_10_14_x86_64.whl"; - sha256 = "05y3y18ggnrfzrcrzkxkb3djbhsm8001s1l1nmvvv9zq8v02b6hp"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp37-cp37m-macosx_10_14_x86_64.whl"; + sha256 = "12lk1wx5dqklc210xya3sbm3gl4163454k13d2nnk94z2iwi376j"; }; mac_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp38-cp38-macosx_10_14_x86_64.whl"; - sha256 = "0qgzqdfv4q5bl6hd932jd6zfp47abva59nyrgxw19kiz0gzq3lw9"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp38-cp38-macosx_10_14_x86_64.whl"; + sha256 = "1j4y6vhlpz27xllwr9n0gswmwld221ws8sl5wdn56hi347r2jv85"; }; mac_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp39-cp39-macosx_10_14_x86_64.whl"; - sha256 = "1zjvjyvz0lshvqf5sc80bxkdwnk8b43abwmzsm9m6dyl8waj5d5r"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp39-cp39-macosx_10_14_x86_64.whl"; + sha256 = "11ylm1a2mxf9lz958p39q2pag4mqss6zsfxagk3ybwj1lsy2bkyr"; }; mac_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.9.3-cp310-cp310-macosx_10_14_x86_64.whl"; - sha256 = "0pncslab7m9d89syaad7n3fgxygkr07d5prir225a42kym8slni8"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.11.0-cp310-cp310-macosx_10_14_x86_64.whl"; + sha256 = "1l6jnmi14sbxbrpwqw3bq6mv1mn5rhbkx9j3dxfnhh10dkn9y13c"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index f0729fc28dcce..f7d920c372217 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -6,7 +6,7 @@ , 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, coreutils @@ -18,7 +18,7 @@ # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, cudaPackages ? {} -, mklSupport ? false, mkl ? null +, mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken , xlaSupport ? cudaSupport @@ -39,8 +39,6 @@ assert cudaSupport -> cudatoolkit != null # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); -assert mklSupport -> mkl != null; - let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; @@ -74,8 +72,8 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.10.1"; - variant = if cudaSupport then "-gpu" else ""; + version = "2.11.0"; + variant = lib.optionalString cudaSupport "-gpu"; pname = "tensorflow${variant}"; pythonEnv = python.withPackages (_: @@ -98,7 +96,7 @@ let six tblib tensorboard - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wheel @@ -187,8 +185,8 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; - rev = "v${version}"; - hash = "sha256-AYHUtJEXYZdVDigKZo7mQnV+PDeQg8mi45YH18qXHZA="; + rev = "refs/tags/v${version}"; + hash = "sha256-OYh61/83yv+ycivylfdS8yFUIUAk8euAPvmfjPzldGs="; }; # On update, it can be useful to steal the changes from gentoo @@ -303,7 +301,7 @@ 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 = builtins.concatStringsSep "," cudaFlags.cudaRealArchs; + TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArches; postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 @@ -319,7 +317,7 @@ let ''; # https://github.com/tensorflow/tensorflow/pull/39470 - NIX_CFLAGS_COMPILE = [ "-Wno-stringop-truncation" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-stringop-truncation" ]; preConfigure = let opt_flags = [] @@ -372,11 +370,11 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-Q6a/Q4fr5cmqqkIoL8ZBJOKfF4NXnrhqFi2VgUpHC3E=" - else "sha256-RBrmxWBn5Yj5fIHlPYXuWOFMTqDGbgk+IvUXk7kIXHM="; - aarch64-linux = "sha256-MEkn2DplUW1R95q+A6uuIKNtMEBv08jU8kvTbMgIKJU="; - x86_64-darwin = "sha256-bqZTu0AABeg6M2IVwlkUPuF8EMsbQXurcmjWZY0EN9E="; - aarch64-darwin = "sha256-q1PfVqyZ3KG65aKw6l9vhxCfPoxH6Nb5y1Eh9P8Ovqk="; + 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}"); }; @@ -419,6 +417,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; @@ -438,11 +437,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" \ @@ -476,7 +477,7 @@ in buildPythonPackage { packaging protobuf-python six - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wrapt diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 0d6e8f014396e..a4a7c5dfa57c1 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.3" +version="2.11.0" 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 52b3be102a207..0de6a2ff9eedd 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 ]; 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/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 73b5a5727a38f..9e3e1560c2083 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { sha256 = "1bmj76gi8401lcqdaaznfmz9yf11myy1bzivqwwq08z3dwzxswck"; }; + # https://github.com/sirfz/tesserocr/issues/314 + postPatch = '' + sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesseract.pxd + ''; + nativeBuildInputs = [ cython pkg-config diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 20c52fd686a0b..2b94a34989fce 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "v${version}"; - sha256 = "sha256-t6W5A877bSPcbKVzCLEhjPzOPwF8ZTGjlvnwt1CwWCE="; + sha256 = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index e075700c11810..5decea07774d8 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-T71Jmgj/hgLOcSHu5QyqdZ7dYpLjhTQqDBdQgiaGXA8="; + sha256 = "sha256-DPE8brf8y6DJDPfDNUBk09ngthSWN59UYw6yPfI4+Qw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index ee2a4fb2e7579..1a07edc441d48 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.3"; + version = "0.4.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o="; + hash = "sha256-z3RrPOV7NGl3aNor+baeVivn+DKwYHcrdlM5sNMGVD0="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Thermopro BLE devices"; homepage = "https://github.com/bluetooth-devices/thermopro-ble"; + changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index f3c94bbb773a6..e415bc17a7b3c 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.6"; + version = "8.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kkHDd2HwBP5oTmN9K02Lea3eurxk40OqHLoUT60sm0c="; + hash = "sha256-Dwj20fxQ4ovxiBTKKxyAfNTVmpMNcTRZpnXghsR3mvk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index c4164ce07003e..1be167f9a88af 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tilt-ble"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-PR+BA0wUljUeUYCTRMKxkG+kj6PfklksbO/k9L7sWdE="; + rev = "refs/tags/v${version}"; + hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Tilt BLE devices"; homepage = "https://github.com/Bluetooth-Devices/tilt-ble"; + changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix new file mode 100644 index 0000000000000..5f2d0135cc8fc --- /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/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index a19858c46e7b6..2a44225eca63e 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -4,34 +4,49 @@ , faker , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tld"; - version = "0.12.6"; + version = "0.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0"; + hash = "sha256-k93l4cBL3xhEl26uRAcGN50h9KsjW3PAXXSD4HT7Vik="; }; + postPatch = '' + sed -i "/--cov/d" pytest.ini + ''; + 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/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix index 8387fb386b71c..63d05203d67e6 100644 --- a/pkgs/development/python-modules/toml-adapt/default.nix +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "toml-adapt"; - version = "0.2.10"; + version = "0.2.11"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = pname; rev = version; - sha256 = "sha256-eVRiMwdYDS2YdQsINy8lBzV8lhcKgq+Vwlc02C5ar0Q="; + sha256 = "sha256-7gQZCjsCtzvmV5NPZNAW4d34TkKemH9FgeN0Iwydwgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index a9722b053bfb1..bc0185482fce8 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.10"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; + sha256 = "sha256-v7tHnFPQppbqdAJgH05pPJewNng3yImLxkca38o3pr0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index e9018c123d462..6847fd7d58898 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -29,7 +29,7 @@ in buildPythonPackage { format = "wheel"; - disabled = !(isPy37 || isPy38 || isPy39 || isPy310); + disabled = !(isPy38 || isPy39 || isPy310); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; @@ -76,7 +76,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 2802ef080eac8..94d7080020beb 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,30 +7,20 @@ version : builtins.getAttr version { "1.13.1" = { - x86_64-linux-37 = { - 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.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="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-u/lUbw0Ni1EmPKR5Y3tCaogzX8oANPQs7GPU0y3uBa8="; }; x86_64-linux-39 = { 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="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-s6wTng1KCzA8wW9R63cUbsfRTAsecCrWOGE2KPUIavc="; }; x86_64-linux-310 = { 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.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="; + url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU="; }; x86_64-darwin-38 = { name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl"; @@ -62,6 +52,20 @@ version : builtins.getAttr version { 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="; }; - + aarch64-linux-38 = { + name = "torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + hash = "sha256-34Q0sGlenOuMxwZQr8ExDYupSebbKgUl3dnDsrGB5f4="; + }; + aarch64-linux-39 = { + name = "torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + hash = "sha256-LDWBo/2B6x8PIpl83f/qVp/qU7r6NyssBHHbNzsmqvw="; + }; + aarch64-linux-310 = { + name = "torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + hash = "sha256-2f54XTdfLial1eul3pH4nmo75dEe+0l+dnBf35P6PC4="; + }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index c64f36c8df321..b00146b573fea 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -41,6 +41,7 @@ }: let + inherit (lib) lists strings trivial; inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; in @@ -50,10 +51,49 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; # confirm that cudatoolkits are sync'd across dependencies assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit; -assert !cudaSupport || magma.cudatoolkit == cudatoolkit; +assert !cudaSupport || magma.cudaPackages.cudatoolkit == cudatoolkit; let setBool = v: if v then "1" else "0"; + + # https://github.com/pytorch/pytorch/blob/v1.13.1/torch/utils/cpp_extension.py#L1751 + supportedTorchCudaCapabilities = + let + real = ["3.5" "3.7" "5.0" "5.2" "5.3" "6.0" "6.1" "6.2" "7.0" "7.2" "7.5" "8.0" "8.6"]; + ptx = lists.map (x: "${x}+PTX") real; + in + real ++ ptx; + + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements + # of the first list *from* the second list. That means: + # lists.subtractLists a b = b - a + + # For CUDA + supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities; + unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities; + + # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. + gpuArchWarner = supported: unsupported: + trivial.throwIf (supported == [ ]) + ( + "No supported GPU targets specified. Requested GPU targets: " + + strings.concatStringsSep ", " unsupported + ) + supported; + + # Create the gpuTargetString. + gpuTargetString = strings.concatStringsSep ";" ( + if gpuTargets != [ ] then + # If gpuTargets is specified, it always takes priority. + gpuTargets + else if cudaSupport then + gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities + else if rocmSupport then + hip.gpuTargets + else + throw "No GPU targets specified" + ); + cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs @@ -111,6 +151,15 @@ in buildPythonPackage rec { # base is 10.12. Until we upgrade, we can fall back on the older # pthread support. ./pthreadpool-disable-gcd.diff + ] ++ [ + # PyTorch fails to build on gcc 12 due to gloo + # https://github.com/pytorch/pytorch/issues/77614 + (fetchpatch { + url = "https://github.com/facebookincubator/gloo/commit/4a5e339b764261d20fc409071dc7a8b8989aa195.patch"; + stripLen = 1; + extraPrefix = "third_party/gloo/"; + hash = "sha256-UxR1r7F6g76BWj3GBIrSy5t+YZDCWy6mMddwx+hon5w="; + }) ]; postPatch = lib.optionalString rocmSupport '' @@ -137,14 +186,14 @@ in buildPythonPackage rec { ''; preConfigure = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" + export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" 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 PYTORCH_ROCM_ARCH="${gpuTargetString}" export CMAKE_CXX_FLAGS="-I${rocmtoolkit_joined}/include -I${rocmtoolkit_joined}/include/rocblas" python tools/amd_build/build_amd.py ''; @@ -170,7 +219,7 @@ in buildPythonPackage rec { preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES - ${python.interpreter} setup.py build --cmake-only + ${python.pythonForBuild.interpreter} setup.py build --cmake-only ${cmake}/bin/cmake build ''; @@ -204,7 +253,11 @@ in buildPythonPackage rec { # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 - NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; + env.NIX_CFLAGS_COMPILE = toString ((lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ] + # Suppress gcc regression: avx512 math function raises uninitialized variable warning + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105593 + # See also: Fails to compile with GCC 12.1.0 https://github.com/pytorch/pytorch/issues/77939 + ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=maybe-uninitialized" "-Wno-error=uninitialized" ])); nativeBuildInputs = [ cmake @@ -307,7 +360,8 @@ in buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; passthru = { - inherit cudaSupport cudaPackages; + inherit cudaSupport cudaPackages gpuTargetString; + cudaCapabilities = supportedCudaCapabilities; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; }; diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index 78151ae787a52..4963bd8012c0c 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -5,22 +5,24 @@ set -eou pipefail version=$1 -linux_cuda_version="cu116" -linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cuda_version="cu117" +linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cpu_bucket="https://download.pytorch.org/whl" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl" + "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index f3656aa0a46f3..f74ac8082388c 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; - disabled = !(isPy37 || isPy38 || isPy39 || isPy310); + disabled = !(isPy38 || isPy39 || isPy310); propagatedBuildInputs = [ torch-bin @@ -51,7 +51,7 @@ buildPythonPackage rec { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index a5ac20de3efa2..c6a903457c013 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,30 +7,20 @@ version : builtins.getAttr version { "0.13.1" = { - x86_64-linux-37 = { - 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.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="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-QCY7LUVyj7/x2zOBJyvkKXD/blj5KZSqWHKlvUx+cmQ="; }; x86_64-linux-39 = { 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="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-Zbs2FdQz1bkwrNwQNu+xJAR9VxfbpN63D0GSkNlC+DY="; }; x86_64-linux-310 = { 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.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="; + url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY="; }; x86_64-darwin-38 = { name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; @@ -62,5 +52,20 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl"; hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0="; }; + aarch64-linux-38 = { + name = "torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + hash = "sha256-PEi8/wDq6BgPh/WNHJ5+n9jEy36z6ogXk1+2BI0VK8c="; + }; + aarch64-linux-39 = { + name = "torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + hash = "sha256-MCOutcGRBHvvFoGjdBv/1KIWS1imTK0k3TfaXhrC0fE="; + }; + aarch64-linux-310 = { + name = "torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + hash = "sha256-LkdWLNzdR8uO2Go88FO3BnzJ6INA9FUK5z15DdvBLyE="; + }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 807129f227ea7..dad401d0d1361 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,22 +5,24 @@ set -eou pipefail version=$1 -linux_cuda_version="cu116" -linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cuda_version="cu117" +linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cpu_bucket="https://download.pytorch.org/whl" darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" + "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "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_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" + "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/torchlibrosa/default.nix b/pkgs/development/python-modules/torchlibrosa/default.nix new file mode 100644 index 0000000000000..bab73b0dae93a --- /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 c1ce980176c74..efb51c9b9e93d 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.11.0"; + version = "0.11.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-vHWW9TAIocU4g7++UQ0SWtOV/Cdtdq+tOV1x0MLwY7E="; + hash = "sha256-oeARQA7TtcplsvXvWVN4pcjj0BaMmHOJPZxGA55luI4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index afa862ab4778f..3c7aa4bb6248c 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -61,7 +61,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 7a46e5650bf5e..282154f89d336 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -9,23 +9,23 @@ version : builtins.getAttr version { "0.14.1" = { x86_64-linux-37 = { 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="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-vOOhWqGuclcvjNKOSdHsGtjwhm+7ZhxzaNnBKF9psi4="; }; x86_64-linux-38 = { 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="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-dAk4UTnOiGTOssgv/OM46+FaVRk/S4DEKm0PnP14Fik="; }; x86_64-linux-39 = { 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="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-iomg7gB9fNulO9VkJth5UGCgZLiRm2GsOeAOOZ3ta+I="; }; x86_64-linux-310 = { 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="; + url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-g9JxpTA5KBS4x/aTgihcrHx9p5uPXcxrz1bGKFR7zlM="; }; x86_64-darwin-37 = { name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl"; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index de8852035c909..d36beb6575e09 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -15,13 +15,13 @@ }: let - inherit (torch.cudaPackages) cudatoolkit cudaFlags cudnn; + inherit (torch) gpuTargetString; + inherit (torch.cudaPackages) cudatoolkit cudnn; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; paths = [ cudatoolkit.out cudatoolkit.lib ]; }; - cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; version = "0.14.1"; @@ -45,7 +45,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy pillow torch scipy ]; preBuild = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" + export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export FORCE_CUDA=1 ''; diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 44a9ba8ece5a2..fcc8edd0fcebe 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,7 +5,7 @@ set -eou pipefail version=$1 -linux_cuda_version="cu116" +linux_cuda_version="cu117" linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" darwin_bucket="https://download.pytorch.org/whl" diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 0d65d0ade19f0..5e87993f991af 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.1"; + version = "2023.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-BZEL/cIAeiwxQor3TbzY8cJ08PYSkXxMl/4XkIEXncg="; + hash = "sha256-sZA+3UjYSHZnN87KUNukRCQ/kG7aobcPVWnhqNOLwJw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix deleted file mode 100644 index 1179f9240200c..0000000000000 --- a/pkgs/development/python-modules/transip/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, requests -, cryptography -, suds-jurko -, pytestCheckHook -, pythonOlder -}: - -buildPythonPackage rec { - pname = "transip"; - version = "2.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.5"; - - src = fetchFromGitHub { - owner = "benkonrath"; - repo = "transip-api"; - rev = "v${version}"; - hash = "sha256-J/zcDapry8pm1zozzCDzrQED7vvCR6yoE4NcduBFfZQ="; - }; - - propagatedBuildInputs = [ - requests - cryptography - suds-jurko - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # Constructor tests require network access - "test_constructor" - "testConstructor" - ]; - - pythonImportsCheck = [ - "transip" - ]; - - meta = with lib; { - description = "TransIP API Connector"; - homepage = "https://github.com/benkonrath/transip-api"; - license = licenses.mit; - maintainers = with maintainers; [ flyfloh ]; - }; -} diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 672a0916b22f3..a0d41a3e839bb 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.18.1"; + version = "3.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8Jw5YmHsATchcchiPqxqxA+PYgl7elqZLqG8vTu/b0k="; + sha256 = "sha256-JZl3I1X0bdQ2alz2zozPo6AyIvCLHDlklNRb9clYGNE="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 647bfbbafc765..a662d1a1a504f 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.1.12"; + version = "2023.2.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-66Rg2DJg/PNkjXyKy/IgQ0T9eF+JD7rstoZKf7nwaS4="; + hash = "sha256-hgsMDYyeDTJinKXvE36h5jdYC2NLdLpA4VOf00RkwPU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix new file mode 100644 index 0000000000000..11b43fd992506 --- /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/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 91b360f936e30..7889a8ab03ee2 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests-cache , pytest }: buildPythonPackage rec { pname = "tvdb_api"; - version = "3.1.0"; + version = "3.2.0-beta"; - src = fetchPypi { - inherit pname version; - sha256 = "f63f6db99441bb202368d44aaabc956acc4202b18fc343a66bf724383ee1f563"; + src = fetchFromGitHub { + owner = "dbr"; + repo = "tvdb_api"; + rev = "ce0382181a9e08a5113bfee0fed2c78f8b1e613f"; + sha256 = "sha256-poUuwySr6+8U9PIHhqFaR7nXzh8kSaW7mZkuKTUJKj8="; }; propagatedBuildInputs = [ requests-cache ]; @@ -26,7 +28,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbr/tvdb_api"; license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; - # https://github.com/dbr/tvdb_api/issues/94 - broken = true; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 4acdcd104d243..e3a8b36ec44c4 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.16.1"; + version = "7.16.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-n4n6lG3lzfGh5HPjt1oNWGjSTobHP7IJach2xLdBNdY="; + hash = "sha256-OB7jW+I5oAE2TGPWmuIcXcABY1v1FMjo8UT83Xn4DB8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 49a8ca0c9971d..0f0f455a42354 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -143,7 +143,8 @@ buildPythonPackage rec { nativeCheckInputs = [ git glibcLocales - hypothesis + # "hypothesis" indirectly depends on twisted to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pyhamcrest ] ++ passthru.optional-dependencies.conch diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 4681e4829f487..ce4c3cbee13e3 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.4.1"; + version = "3.9.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-q35ijx4zDR07k9al11T1H7SPYG9M8g8+rD/TNrkL2Ek="; + hash = "sha256-M3Jl3DGvjWdeqYOWmOSe/W9h9yZq4HVGrDR+5tEXBow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 85385347b96fc..e412b9a870276 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -1,30 +1,33 @@ { lib , stdenv -, python +, automat , buildPythonPackage -, pythonOlder -, fetchPypi , cryptography -, incremental -, twisted -, automat -, zope_interface +, fetchPypi +, GeoIP , idna +, incremental +, lsof +, mock , pyopenssl -, service-identity , pytestCheckHook -, mock -, lsof -, GeoIP +, python +, pythonOlder +, service-identity +, twisted +, zope_interface }: buildPythonPackage rec { pname = "txtorcon"; - version = "22.0.0"; + version = "23.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM="; + hash = "sha256-AiX/rWdokTeEmtmtNK21abDYj5rwRQMABnpfkB6ZQyU="; }; propagatedBuildInputs = [ @@ -35,14 +38,20 @@ buildPythonPackage rec { zope_interface ] ++ twisted.optional-dependencies.tls; - nativeCheckInputs = [ pytestCheckHook mock lsof GeoIP ]; + nativeCheckInputs = [ + pytestCheckHook + mock + lsof + GeoIP + ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - meta = { + meta = with lib; { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; homepage = "https://github.com/meejah/txtorcon"; - maintainers = with lib.maintainers; [ jluttine exarkun ]; - license = lib.licenses.mit; + changelog = "https://github.com/meejah/txtorcon/releases/tag/v${version}"; + maintainers = with maintainers; [ jluttine exarkun ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7c69463d9b7b2..7ae99a98d2285 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -5,12 +5,16 @@ , setuptools-scm , pytestCheckHook , typing-extensions +, sphinxHook +, sphinx-autodoc-typehints +, sphinx-rtd-theme , glibcLocales }: buildPythonPackage rec { pname = "typeguard"; version = "2.13.3"; + outputs = [ "out" "doc" ]; src = fetchPypi { inherit pname version; @@ -18,7 +22,12 @@ buildPythonPackage rec { }; buildInputs = [ setuptools-scm ]; - nativeBuildInputs = [ glibcLocales ]; + nativeBuildInputs = [ + glibcLocales + sphinxHook + sphinx-autodoc-typehints + sphinx-rtd-theme + ]; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix new file mode 100644 index 0000000000000..b0a505e3205bd --- /dev/null +++ b/pkgs/development/python-modules/typepy/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, mbstrdecoder +, python-dateutil +, pytz +, packaging +, pytestCheckHook +, tcolorpy +}: + +buildPythonPackage rec { + pname = "typepy"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-J6SgVd2m0wOVr2ZV/pryRcJrn+BYTGstAUQO349c2lE="; + }; + + propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ]; + + nativeCheckInputs = [ pytestCheckHook ]; + checkInputs = [ tcolorpy ]; + + meta = with lib; { + homepage = "https://github.com/thombashi/typepy"; + description = "A library for variable type checker/validator/converter at a run time"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 932a88ef75a6e..19190404a6b6e 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.4"; + version = "0.4.15.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YPfWJXkTE1IYVkzxudLpZ4wM5ywFHZ/6oadMdpBOWAg="; + hash = "sha256-xrskWqhox914w7Fr1ISEzTZhJ9YeTvoVZ26sI6zYK3Y="; }; # 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 275fdbaab886f..92dfde3b5e6f7 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.5"; + version = "2.8.19.9"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; + hash = "sha256-Y3cW+zr73H62g/ZBFx+HSTevExSc1Faoxj6PgRJ6Oe0="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 0af21f38a4a37..fb046be652ecf 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.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SkMviPSZ0uxii2V9ZPCdUdGPtRZ4OYEgAxCCZw8akQ="; + sha256 = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI="; }; # 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 af33403ee7fc3..d42e2c0a2c84b 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.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vgpRuhx90hXZ0t9m1oReY8EAm0u/TFvrh6DZdFzbqWI="; + hash = "sha256-ozSnA6hoiRDQhpRk8fb4vTMNdYQ72rT4k1R7+ylBegE="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix new file mode 100644 index 0000000000000..6418c370d6fcb --- /dev/null +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-pillow"; + version = "9.4.0.13"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "types-Pillow"; + sha256 = "sha256-RRCqmKKJR79j8rKe3rvRG3z/hkfZC4Z87Js2dMCowyE="; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "PIL-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for Pillow"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ arjan-s ]; + }; +} diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 862b8ff805c29..4455ab8ffcffd 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 = "4.21.0.2"; + version = "4.21.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ffSD00rT/LH6f/8Qc1YNWWyawfQZz6hRsiDJqTOGyZg="; + sha256 = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 3d1d6eecb19bd..a988099f6800b 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.5"; + version = "5.9.5.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tyb9sssGSydMvGNZ+6Sr87OimT19SrwzatCUdWghLGI="; + sha256 = "sha256-s443a6DVO5oI0Ot3w8z2Ifng4PkPm9+y7MRz1ixoKKM="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index 39430b92140d6..27778bfaa7121 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.5"; + version = "2.8.19.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; + hash = "sha256-MWxrEH0FW70GMktxNi5hBBAiIOaYiqSjiFUKo6itXQY="; }; # 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 e1ff2f67a315d..a3a67259beb7f 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.7.0.0"; + version = "2022.7.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TyDClTs6OgWH6USJ7EyeAsPTrtubpc1+eW4S9M+nAn4="; + sha256 = "sha256-SH0+jp9Ace7ICBdG1T+pgrvAWBLnGdy/Lr89VaGkzSg="; }; # 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 f0b4056e2b58a..47ef2a0c495d1 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.3"; + version = "6.0.12.8"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w="; + sha256 = "sha256-GTBIaaidSa8AvmgeeyZ0FN8hP064ljTESV+mLo+UK58="; }; # 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 274e69ca77685..e341ea2fd4c90 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.8"; + version = "2.28.11.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5nQkUl+ErfvqtyaKFZ08Yzhi2vrhXFsZVHzhtVlU8KM="; + sha256 = "sha256-/I6qCcwBRpnGtjxgwuOt0MiwmkEMgYtaxuZfkqJt3gk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix index 53323d950cbfc..e0953ad7790d5 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.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sQh7J0aAtULHllSehIiJjQsizYmYjvEBbvVtQ2f/T0E="; + hash = "sha256-VEgdUj/nvMXWujndTyBT5XUjoVoW4xK3yP6b5H/EVdU="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 767e597cec58d..f4e129b15fa7e 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.9.0.0"; + version = "0.9.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-SnlHRxTOoVa80hhbub3dj7nT1SJ8jQp/Ib8hyvX2Dmc="; + hash = "sha256-5IYpLCefGSR4Zb2r6AJBl0Cg50tTRE5/eoAJ4IEp2l0="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index fff70bd611f76..c3c5a13e9005d 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8.1"; + version = "0.10.8.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FxvbMWPXmlIFYPJLqRap/Jv/gWWcVEip/qiSQJI3Ir4="; + sha256 = "sha256-UdQoZmsw6cwEd5H0QNDxGoIgXnicQN67uG863XRyzz4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 55ab0f9ee1e52..409d6584d7f7b 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.4"; + version = "1.26.25.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7sVVZCjuyGKxrFePtpqrOHeZWpn/7J5aEs9/vQzJ2u4="; + hash = "sha256-7PQ8QtjuQ51zKhEQtJAekBenmjjayibwjkLIRgBpOSw="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/typish/default.nix b/pkgs/development/python-modules/typish/default.nix index c0942c701683e..c05518c257f0e 100644 --- a/pkgs/development/python-modules/typish/default.nix +++ b/pkgs/development/python-modules/typish/default.nix @@ -3,17 +3,22 @@ , fetchFromGitHub , numpy , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "typish"; version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "typish"; - rev = "7875850f55e2df8a9e2426e2d484ab618e347c7f"; - sha256 = "0mc5hw92f15mwd92rb2q9isc4wi7xq76449w7ph5bskcspas0wrf"; + rev = "refs/tags/v${version}"; + hash = "sha256-LnOg1dVs6lXgPTwRYg7uJ3LCdExYrCxS47UEJxKHhVU="; }; nativeCheckInputs = [ @@ -27,6 +32,11 @@ buildPythonPackage rec { "tests/functions/test_instance_of.py" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/ramonhagenaars/typish/issues/32 + "test_get_origin" + ]; + pythonImportsCheck = [ "typish" ]; @@ -34,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for checking types of objects"; homepage = "https://github.com/ramonhagenaars/typish"; + changelog = "https://github.com/ramonhagenaars/typish/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fmoda3 ]; }; diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 457020af6457e..2188cf25a5e70 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "udatetime"; - version = "0.0.16"; + version = "0.0.17"; src = fetchPypi { inherit pname version; - sha256 = "09vlcskvaxnfk73l9w5xgl2ks9l62g1b24yrm0xxb7gn93qxglw2"; + sha256 = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; patches = [ diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix new file mode 100644 index 0000000000000..948f2108d2610 --- /dev/null +++ b/pkgs/development/python-modules/uhi/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchPypi +, buildPythonPackage +, hatchling +, hatch-vcs +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uhi"; + version = "0.3.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "800caf3a5f1273b08bcc3bb4b49228fe003942e23423812b0110546aad9a24be"; + }; + + buildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Universal Histogram Interface"; + homepage = "https://uhi.readthedocs.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 7f9ca14ebdbef..6755a274d1dde 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.6.0"; + version = "5.7.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+IHi2KAi6Shaouq2uoZ0NY28srV/poYY2I1ik3rD/wQ="; + sha256 = "sha256-54jl1dyuj2EYrJtF0LiRoNVfesSA7dy38HJj8rzzeyM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 79d7e40bbc947..001a5f1b4208b 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 diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix index 0bb9fc4e7b481..5167bc8494691 100644 --- a/pkgs/development/python-modules/unicrypto/default.nix +++ b/pkgs/development/python-modules/unicrypto/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pycryptodome , pycryptodomex , pythonOlder @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "unicrypto"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nV3YWK1a1gj6UkmHsX6IVdZNbSRQygyhFjj02S/GyAs="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-mZEnYVM5r4utiGwM7bp2SwaDjYsH8AR/Qm5UdPNke0w="; }; propagatedBuildInputs = [ @@ -33,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unified interface for cryptographic libraries"; homepage = "https://github.com/skelsec/unicrypto"; + changelog = "https://github.com/skelsec/unicrypto/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 310480a49ab44..50b4d7a4d0a51 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "upb_lib"; inherit version; - hash = "sha256-/TNKsno0JJtxBY9HCPQfp7OhlfkOP6sJI51rgp2ujDg="; + hash = "sha256-I1lnIr8ptDCyK8r0bvFWFPUGRwoMsQcNnSCSwzdt1Bc="; }; propagatedBuildInputs = [ 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 0000000000000..e9af904e9cd8a --- /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/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index be42bfc0792a3..b50cd5eb83109 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "validobj"; - version = "0.6"; + version = "0.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo="; + sha256 = "cbij55HZKVLO3MLoDTtFT2YYNVZwbNaYEk+35gIcGdo="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/validphys2/default.nix b/pkgs/development/python-modules/validphys2/default.nix index c417cb47e2d31..38debb91be11b 100644 --- a/pkgs/development/python-modules/validphys2/default.nix +++ b/pkgs/development/python-modules/validphys2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/validphys/version.py \ - --replace '= __give_git()' '= "${version}"' + --replace '= __give_git()' '= "'$version'"' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 0b667d9218416..5697ff8129949 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -5,22 +5,22 @@ , setuptools , construct , websockets -, asynctest +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo="; + hash = "sha256-JbTuBzRSgMTPSgWEEAJGc8R44VLHiMr4qocbBjpJBmk="; }; nativeBuildInputs = [ @@ -33,10 +33,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest + pytest-asyncio pytestCheckHook ]; + pythonImportsCheck = [ "vallox_websocket_api" ]; + meta = { description = "Async API for Vallox ventilation units"; homepage = "https://github.com/yozik04/vallox_websocket_api"; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 19131e9d0bf45..043d08a022bb8 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="; }; + propagatedBuildInputs = [ + pyyaml + six + yarl + wrapt + ]; + nativeCheckInputs = [ - pytest pytest-httpbin + pytestCheckHook ]; - propagatedBuildInputs = [ - pyyaml - wrapt - six - ] - ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] - ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; + disabledTestPaths = [ + "tests/integration" + ]; - checkPhase = '' - py.test --ignore=tests/integration -k "not TestVCRConnection" - ''; + 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/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 480b72e2e5df3..74a29ae175e9c 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY="; + hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 1bd12d4a3dc25..11bf821e0e6cf 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.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM="; + hash = "sha256-UC8RkZCRodsK4DV0Pnn2jUohM7pNiqGWrbjWlDqn72I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index df0c72a34494e..931a052d24f4a 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchPypi , wrapQtAppsHook @@ -21,11 +21,14 @@ buildPythonPackage rec { pname = "vivisect"; - version = "1.0.8"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y8y6sAQJa9baPPdhtuR9Jv1tJkNWJsS1hJ1lknkHWU4="; + hash = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI="; }; postPatch = '' @@ -64,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure python disassembler, debugger, emulator, and static analysis framework"; homepage = "https://github.com/vivisect/vivisect"; + changelog = "https://github.com/vivisect/vivisect/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 57088b9c3993a..a9cc19f79c2e2 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # `_PyThreadState_Current'; src/_vmprof.o:src/vmprof_common.h:92: first defined here # TODO: can be removed once next release contains: # https://github.com/vmprof/vmprof-python/pull/203 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; diff --git a/pkgs/development/python-modules/voluptuous-stubs/default.nix b/pkgs/development/python-modules/voluptuous-stubs/default.nix new file mode 100644 index 0000000000000..840a7cc510048 --- /dev/null +++ b/pkgs/development/python-modules/voluptuous-stubs/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mypy +}: + +buildPythonPackage rec { + pname = "voluptuous-stubs"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-cPscCIJC8g4RAjJStWSM13+DH2ks2RDI+XE8wTXPjMg="; + }; + + nativeBuildInputs = [ + mypy + ]; + + pythonImportsCheck = [ + "voluptuous-stubs" + ]; + + doCheck = false; + + meta = with lib; { + description = "Typing stubs for voluptuous"; + homepage = "https://github.com/ryanwang520/voluptuous-stubs"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 604901c8da7e2..133c9401a2934 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -1,34 +1,43 @@ { lib +, aiohttp +, amqtt , buildPythonPackage -, pythonOlder +, certifi +, docopt , fetchFromGitHub -, setuptools +, fetchpatch , geopy -, docopt -, certifi -, amqtt -, websockets -, aiohttp -, pytestCheckHook -, asynctest +, mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, websockets }: buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.1"; + version = "0.10.2"; + format = "setuptools"; disabled = pythonOlder "3.8"; - format = "setuptools"; - src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; - rev = "v${version}"; - hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; + rev = "refs/tags/v${version}"; + hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU="; }; + 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 ]; @@ -45,13 +54,15 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ - asynctest + checkInputs = [ + 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"; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 40303c29f9c99..e50a91c060394 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.6.0"; + version = "9.7.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-LHs98lccPjub5GDPB3dxtkOYCDxri04CVpSSsypa4xI="; + sha256 = "sha256-O3WnG3JQ7CEHMPYTmE9pgnS8YZs717P6wBKBnXIvvFI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 525d56ce56266..ea44c4b5a165a 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.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nveMsebW828ATEW6vw+var+GxbJj2N0mNaQlkx+GH3w="; + hash = "sha256-O95W/J5y7qcR6PSzNQwOl0W19CyXifbq8okquESFSqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index d6747b3d7271b..f150984918181 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wand"; - version = "0.6.10"; + version = "0.6.11"; src = fetchPypi { pname = "Wand"; inherit version; - sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc="; + sha256 = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU="; }; postPatch = '' @@ -38,9 +38,10 @@ buildPythonPackage rec { passthru.imagemagick = imagemagickBig; meta = with lib; { + changelog = "https://docs.wand-py.org/en/${version}/changes.html"; description = "Ctypes-based simple MagickWand API binding for Python"; homepage = "http://wand-py.org/"; license = [ licenses.mit ]; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ infinisil dotlambda ]; }; } diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 2662a449c80aa..b38236170f05f 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 @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.13.7"; + 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-o9mIGSILztnHY3Eyb0MlznUEdMbCfA1BT6ux0UlesBc="; + hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI="; }; patches = [ @@ -65,6 +66,7 @@ buildPythonPackage rec { # setuptools is necessary since pkg_resources is required at runtime. propagatedBuildInputs = [ + appdirs click docker_pycreds gitpython @@ -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=${bokeh.version} ''; pythonRelaxDeps = [ "protobuf" ]; @@ -117,11 +121,12 @@ buildPythonPackage rec { "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_summary.py" "tests/unit_tests_old/test_tb_watcher.py" "tests/unit_tests_old/test_time_resolution.py" + "tests/unit_tests_old/test_wandb.py" "tests/unit_tests_old/test_wandb_agent.py" "tests/unit_tests_old/test_wandb_artifacts.py" "tests/unit_tests_old/test_wandb_integration.py" diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index da3b4b2fc9b75..103f71a70ade6 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "wasabi"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU="; + sha256 = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 3444f541282e3..0fbd9d2f8d7de 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -41,6 +41,12 @@ let nativeBuildInputs = (with rustPlatform; [ cargoSetupHook maturinBuildHook ]) ++ extraNativeBuildInputs; + postPatch = '' + # Workaround for metadata, that maturin 0.14 does not accept in Cargo.toml anymore + substituteInPlace ${buildAndTestSubdir}/Cargo.toml \ + --replace "package.metadata.maturin" "broken" + ''; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ extraBuildInputs; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index a242c7ec9c6cb..043b1e8aff666 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g8+Lxg2cYTtmpMAYBRhz1ic9nkXQQO7QbWqWJBvY7AE="; + hash = "sha256-zcwjyVKGAaiik+tDacvRT2tPNPB66HaUISUunCJxi28="; }; patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index c31aa264bd845..82060561a8d44 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -11,6 +11,8 @@ , pytest-timeout , pytestCheckHook , python +, CoreServices +, libiconv }: buildPythonPackage rec { @@ -33,6 +35,11 @@ buildPythonPackage rec { hash = "sha256-IWONA3o+2emJ7cKEw5xYSMdWzGuUSwn1B70zUDzj7Cw="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + libiconv + ]; + nativeBuildInputs = [ ] ++ (with rustPlatform; [ cargoSetupHook @@ -69,6 +76,5 @@ buildPythonPackage rec { homepage = "https://watchfiles.helpmanual.io/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix index 21dbe7b8ae829..34531b5f7ecb8 100644 --- a/pkgs/development/python-modules/wavinsentio/default.nix +++ b/pkgs/development/python-modules/wavinsentio/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wavinsentio"; - version = "0.3.0"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3mzK+YBRhLDqcEJDyMK43Le6eCH3B89unXpuu8nIe1g="; + sha256 = "sha256-c3MpFoJrT2FBQrNce+zP/bfIZFqu8gSAA9oIa1jKYCo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 071fe201119ab..a6f3c68445464 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.2"; + version = "58.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-uOnvLcvPvILpkhWs/Wj5R7K18ZmbWxVtt1+r44C6fpo="; + hash = "sha256-cPSCytjlPCw+rpz4avQS65NAWxash4G1GeozJtR1vW8="; }; patches = [ diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index f26c85f58f394..c302eb9194d3a 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.6.0"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; + hash = "sha256-B8GdtaufMMl0gHywZ00wNyYZ+rojrExKuQsA/vmbYRI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 4f6a8b00d2134..07acd1debd5b6 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,24 +10,18 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.41.1"; + version = "0.42.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-RYxfz5uBWV1HLbcIK1N/glJv2w0nfPLBPyM2b7HuDIY="; + hash = "sha256-dPG714a/GPNPs7h/ubLA+KI2hB5gFf5UDNwhhMyqJlc="; }; - propagatedBuildInputs = [ - paho-mqtt - python-dateutil - weconnect - ] ++ weconnect.optional-dependencies.Images; - postPatch = '' substituteInPlace weconnect_mqtt/__version.py \ --replace "develop" "${version}" @@ -36,6 +30,12 @@ buildPythonPackage rec { --replace "pytest-cov" "" ''; + propagatedBuildInputs = [ + paho-mqtt + python-dateutil + weconnect + ] ++ weconnect.optional-dependencies.Images; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index db66c2e9b1c81..33636fb9a9920 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.50.1"; + version = "0.54.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KYGNtUJXpY1UrRbUxr71EHxLCR6WixTAk+ybkfqB3Ps="; + hash = "sha256-WNvEcx+Ut4CtL2L81u5fCfmZoi+5hi/CbB9mfrG8Hm4="; }; propagatedBuildInputs = [ @@ -48,7 +48,8 @@ buildPythonPackage rec { --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=9.3.0" "pillow" + --replace "pillow~=" "pillow>=" \ + --replace "ascii_magic~=" "ascii_magic>=" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 508426ea1a3d1..f8e8cb72d5a48 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "west"; - version = "0.14.0"; + version = "1.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mlKnhWX9TWnGS3XFSfYbExiSsbbSbBzBYs3q0aPPS48="; + hash = "sha256-ZvhwIhkoES71jyv8Xv0dd44Z7tFAZzmE2XsiH7wFJfQ="; }; propagatedBuildInputs = [ @@ -56,6 +56,7 @@ buildPythonPackage rec { (https://docs.zephyrproject.org/latest/guides/west/repo-tool.html). ''; homepage = "https://github.com/zephyrproject-rtos/west"; + changelog = "https://github.com/zephyrproject-rtos/west/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli ]; }; diff --git a/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch index 93db54b0c6e6c..8e70f0069d654 100644 --- a/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch +++ b/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch @@ -20,18 +20,15 @@ name that has the same encoding in each normal form. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py -index 651c034..9b94ac8 100644 +index 5a6db16..42cf121 100644 --- a/tests/test_bdist_wheel.py +++ b/tests/test_bdist_wheel.py -@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths): +@@ -69,7 +69,7 @@ def test_unicode_record(wheel_paths): with ZipFile(path) as zf: - record = zf.read('unicode.dist-0.1.dist-info/RECORD') + record = zf.read("unicode.dist-0.1.dist-info/RECORD") -- assert u'åäö_日本語.py'.encode('utf-8') in record -+ assert u'æɐø_日本價.py'.encode('utf-8') in record +- assert "åäö_日本語.py".encode() in record ++ assert "æɐø_日本價.py".encode() in record - def test_licenses_default(dummy_dist, monkeypatch, tmpdir): --- -2.17.2 (Apple Git-113) - + UTF8_PKG_INFO = """\ diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 8735a37b21ff7..3be508a0ec590 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.37.1"; + version = "0.38.4"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; + hash = "sha256-yZLU0t/nz6kfnnoLL15bybOxN4+SJUaTJsCpGffl1QU="; name = "${pname}-${version}-source"; postFetch = '' cd $out diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index e05c331210baa..aae90576e0558 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 = [ diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index 8dd65d11911e2..c4b207962987e 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -1,7 +1,7 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , httpx @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Aji8OqdcVOHB4TOv4W6x1qIGaJvoDmLGpr/PFz5mZ4w="; + hash = "sha256-hAU9143R/LDqDBgX3Y+gBG+dt4dpIIPDdO6HgH0ZTfg="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 7ec9251eb0eeb..184e5fe4c53dc 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.24"; + version = "0.9.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-DxjfRBJh/qLafxXN2VcXHTWuajDg6lvmJ5U86Na3L5g="; + hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix index 80738318433de..208265ba9a3bf 100644 --- a/pkgs/development/python-modules/wiffi/default.nix +++ b/pkgs/development/python-modules/wiffi/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "wiffi"; - version = "1.1.0"; + version = "1.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mampfes"; repo = "python-wiffi"; - rev = version; - sha256 = "sha256-uB4M3etW1DCE//V2pcmsLZbORmrL00pbPADMQD5y3CY="; + rev = "refs/tags/${version}"; + hash = "sha256-pnbzJxq8K947Yg54LysPPho6IRKf0cc+szTETgyzFao="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interface with STALL WIFFI devices"; homepage = "https://github.com/mampfes/python-wiffi"; + changelog = "https://github.com/mampfes/python-wiffi/blob/${version}/HISTORY.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index f58ce1fecbf73..dc378d34d0130 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.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GAw3Vgej9v8gSIpMaN2pbOptWsqTvC0Kph70yfj2LDQ="; + hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 08ae8cfc34770..9886f2db1cb44 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "wordcloud"; - version = "1.8.1"; + version = "unstable-2023-01-04"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "amueller"; - repo = pname; - rev = version; - hash = "sha256-4EFQfv+Jn9EngUAyDoJP0yv9zr9Tnbrdwq1YzDacB9Q="; + repo = "word_cloud"; + rev = "dbf7ab7753a36e1c12c0e1b36aeeece5023f39f9"; + hash = "sha256-ogSkVcPUth7bh7mxwdDmF/Fc2ySDxbLA8ArmBNnPvw8="; }; nativeBuildInputs = [ @@ -40,14 +40,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - (fetchpatch { - # https://github.com/amueller/word_cloud/pull/616 - url = "https://github.com/amueller/word_cloud/commit/858a8ac4b5b08494c1d25d9e0b35dd995151a1e5.patch"; - sha256 = "sha256-+aDTMPtOibVwjPrRLxel0y4JFD5ERB2bmJi4zRf/asg="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace " --cov --cov-report xml --tb=short" "" diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index b54a351b47def..f1b81599c396e 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wsgidav"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mar10"; repo = pname; - rev = "v${version}"; - hash = "sha256-iNyXY0txKX4X1+O27T7my8dfs8wqXoG7Kuo9yN9SRnY="; + rev = "refs/tags/v${version}"; + hash = "sha256-1S3Zi92YRcu/PKNWJIn2ayr5Wbc+/+E7irFBQpMrKW8="; }; nativeBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic and extendable WebDAV server based on WSGI"; homepage = "https://wsgidav.readthedocs.io/"; + changelog = "https://github.com/mar10/wsgidav/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 037bbb394e2e1..deffda6ef5fee 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -5,34 +5,47 @@ , babel , pytestCheckHook , email-validator +, pythonOlder }: buildPythonPackage rec { - version = "3.0.1"; pname = "wtforms"; + version = "3.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "WTForms"; inherit version; - sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb"; + hash = "sha256-azUbuxLdWK9X/+8FvHhCXQjRkU4P1o7hQUO3reAjxbw="; }; - propagatedBuildInputs = [ markupsafe babel ]; + propagatedBuildInputs = [ + markupsafe + babel + ]; + passthru.optional-dependencies = { + email = [ + email-validator + ]; + }; nativeCheckInputs = [ pytestCheckHook - email-validator - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ "wtforms" ]; + pythonImportsCheck = [ + "wtforms" + ]; meta = with lib; { description = "A flexible forms validation and rendering library for Python"; homepage = "https://github.com/wtforms/wtforms"; changelog = "https://github.com/wtforms/wtforms/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = [ maintainers.bhipple ]; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 380fefbc4cd02..64123cafd4a10 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -69,11 +69,11 @@ buildPythonPackage rec { ''; buildPhase = '' - ${python.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py + ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py ''; installPhase = '' - ${python.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out ''; passthru = { wxWidgets = wxGTK; }; diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 3198dbc004c3d..4b3e62a2eece9 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -129,11 +129,11 @@ buildPythonPackage rec { ''; buildPhase = '' - ${python.interpreter} build.py -v build_wx dox etg --nodoc sip build_py + ${python.pythonForBuild.interpreter} build.py -v build_wx dox etg --nodoc sip build_py ''; installPhase = '' - ${python.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out wrapPythonPrograms ''; diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxPython/4.2.nix index cd112f8511c31..3d4ddb1e70615 100644 --- a/pkgs/development/python-modules/wxPython/4.2.nix +++ b/pkgs/development/python-modules/wxPython/4.2.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { export PATH="${wxGTK}/bin:$PATH" export SDL_CONFIG="${SDL.dev}/bin/sdl-config" - ${python.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py + ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py runHook postBuild ''; @@ -111,7 +111,7 @@ buildPythonPackage rec { installPhase = '' runHook preInstall - ${python.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out wrapPythonPrograms runHook postInstall diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index 9ca01d574d7f4..c795568149ea3 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.4.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6Wf5pc8e36lMv1V115N6sQbmE4l3QT6kbO7izUws0zc="; + hash = "sha256-oDrNR7iVDg7Piti6JNaXGekfrUfK5GWJYbH/g6m4570="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index fa9620d9dab30..189042082f042 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; postBuild = '' - ${python.interpreter} -m compileall -f xattr + ${python.pythonForBuild.interpreter} -m compileall -f xattr ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index c868801e2d4ef..aa59481b8ed4a 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.15.0"; + version = "0.16.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo="; + hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index f9320a4bca003..8bf77c24e3f4c 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.interpreter} xkbcommon/ffi_build.py + ${python.pythonForBuild.interpreter} xkbcommon/ffi_build.py ''; pythonImportsCheck = [ "xkbcommon" ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b0420bee7ee20..af7f10e3fd8d5 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 = "2.2.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vz24saI0wuhax4/zCBDM3HB+ZjZI8bGOWr2va4V3zV8="; + hash = "sha256-MSk/c2qLztq5GQ6+CzK0Jw+rOJTClguaoL284YaBPjw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index cfec72b968352..d306f83220e8c 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , elementpath +, jinja2 , lxml , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "2.1.1"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ="; + hash = "sha256-yF2L5VxUkqJjen5JeCQis4Q1o1KCJtRJ+S52wnS5VQg="; }; propagatedBuildInputs = [ @@ -26,28 +27,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + jinja2 lxml pytestCheckHook ]; - # Ignore broken fixtures, and tests for files which don't exist. - # For darwin, we need to explicity say we can't reach network - disabledTests = [ - "export_remote" - "element_tree_import_script" - ]; - - disabledTestPaths = [ - "tests/test_schemas.py" - "tests/test_memory.py" - "tests/test_validation.py" - ]; - pythonImportsCheck = [ "xmlschema" ]; meta = with lib; { + changelog = "https://github.com/sissaschool/xmlschema/blob/${src.rev}/CHANGELOG.rst"; description = "XML Schema validator and data conversion library for Python"; homepage = "https://github.com/sissaschool/xmlschema"; license = licenses.mit; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 6ad48ac123644..d3d06d4074932 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , click , click-default-group , docformatter @@ -25,6 +26,16 @@ buildPythonPackage rec { hash = "sha256-o9Xxt7b/+MkW94Jcg26ihaTn0/OpTcu+0OY7oV3JRGY="; }; + patches = [ + # https://github.com/tefra/xsdata/pull/741 + (fetchpatch { + name = "use-docformatter-1.5.1.patch"; + url = "https://github.com/tefra/xsdata/commit/040692db47e6e51028fd959c793e757858c392d7.patch"; + excludes = [ "setup.cfg" ]; + hash = "sha256-ncecMJLJUiUb4lB8ys+nyiGU/UmayK++o89h3sAwREQ="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--benchmark-skip" "" diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 3e2de3d2afcd7..fc0087aac8e96 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.12.8"; + version = "2.0.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-04Xl2TBs9RL+KWmJgUY+PDoYN4AAvrcWP7TJBEu5lNU="; + hash = "sha256-8jZxAG1NVFkWbQF1HwyQbqd0NVRgpluspdtgRaF4zhg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 22919fa0a01fb..add1fbd40434b 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -3,7 +3,6 @@ , aiohttp , aioresponses , aiounittest -, asynctest , buildPythonPackage , fetchFromGitHub , pubnub @@ -17,16 +16,16 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.2.6"; + version = "1.2.8"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-E+Forcx6dRtDeagcjGGE8DFkAKUgsHyCEONW7WU0lpo="; + rev = "refs/tags/v${version}"; + hash = "sha256-SdWfhA6mroZnqHQYPieuZvox+OGEHWOTlfuHqu5r0cg="; }; propagatedBuildInputs = [ @@ -41,7 +40,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses aiounittest - asynctest pytestCheckHook requests-mock ]; @@ -59,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell"; homepage = "https://github.com/bdraco/yalexs"; + changelog = "https://github.com/bdraco/yalexs/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index f7c830996f74d..35eb9ea1ae426 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.5.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TdW2vVj5wZw8xANSRY8ke1ECw8UTDwRjJDD1g+p9DV4="; + hash = "sha256-av3QNfyPo/4GzFzQ60OrtPK6CV5AkN4FbbqgeBz4rY0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix new file mode 100644 index 0000000000000..11a1caf15b74f --- /dev/null +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, cmake +, fetchFromGitHub +, pytestCheckHook +, libxcrypt +, pythonOlder +, gtest +, pybind11 +, nlohmann_json +}: + +let + pog = fetchFromGitHub { + owner = "metthal"; + repo = "pog"; + rev = "b09bbf9cea573ee62aab7eccda896e37961d16cd"; + hash = "sha256-El4WA92t2O/L4wUqH6Xj8w+ANtb6liRwafDhqn8jxjQ="; + }; +in + buildPythonPackage rec { + pname = "yaramod"; + version = "3.12.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "avast"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-1q+lzNtm8qko9ZAxJjkmPOQjHD5GxB6YyEz0tr+QWGk="; + }; + + postPatch = '' + rm -r deps/googletest deps/pog/ deps/pybind11/ deps/json/json.hpp + cp -r --no-preserve=all ${pog} deps/pog/ + cp -r --no-preserve=all ${nlohmann_json.src}/single_include/nlohmann/json.hpp deps/json/ + cp -r --no-preserve=all ${pybind11.src} deps/pybind11/ + cp -r --no-preserve=all ${gtest.src} deps/googletest/ + ''; + + dontUseCmakeConfigure = true; + + buildInputs = [ + libxcrypt + ]; + + nativeBuildInputs = [ + cmake + pog + gtest + ]; + + setupPyBuildFlags = [ + "--with-unit-tests" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/" + ]; + + pythonImportsCheck = [ + "yaramod" + ]; + + meta = with lib; { + description = "Parsing of YARA rules into AST and building new rulesets in C++"; + homepage = "https://github.com/avast/yaramod"; + changelog = "https://github.com/avast/yaramod/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ msm ]; + }; + } diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index c9be7901c14ae..c2ac28e64d9bc 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -1,26 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi, - click, colorama, flask, requests, yt-dlp }: +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonRelaxDepsHook +, click +, colorama +, flask +, requests +, yt-dlp +, progress +}: buildPythonPackage rec { pname = "yark"; - version = "1.2.3"; + version = "1.2.4"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KMnQpEH2Z19Y0jBjqx2rZjmlle2M9bcuDCjDIljQEYY="; + sha256 = "fdd50d0e832b4522cbe24433f42ed571a1f199f571c1d0c98472b94a501db9cf"; }; + pythonRelaxDeps = [ + "requests" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ - click colorama flask requests yt-dlp + 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/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 9199374450648..c0d278b498811 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.4"; + version = "0.2.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WWqRj6It2sYZk1gV3+D94wFbOfzBhIngygalTSwVwaI="; + hash = "sha256-k0al/N9xWen/IlE8JfFV98DSRnelQk+MURXz3IjGgNI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 5aad3df78a63f..7678b223297c1 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -9,24 +9,25 @@ buildPythonPackage rec { pname = "z3c-checkversions"; - version = "1.2"; + version = "2.0"; src = fetchPypi { inherit version; pname = "z3c.checkversions"; - sha256 = "94c7ab0810ee6fdb66a4689b48e537b57e2dbee277cb1de2ece7a7f4d8c83001"; + hash = "sha256-rn4kl8Pn6YNqbE+VD6L8rVBQHkQqXSD47ZIy77+ashE="; }; propagatedBuildInputs = [ zc-buildout ]; + nativeCheckInputs = [ zope_testrunner ]; - doCheck = !python.pkgs.isPy27; + checkPhase = '' ${python.interpreter} -m zope.testrunner --test-path=src [] ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://github.com/zopefoundation/z3c.checkversions"; + changelog = "https://github.com/zopefoundation/z3c.checkversions/blob/${version}/CHANGES.rst"; description = "Find newer package versions on PyPI"; license = licenses.zpl21; }; diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 791dfd87798a9..9f363bd150c58 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.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-pBXt7t7Cs7F0bxvB8N67XaY/uvYhZPw10+bei/3QSfw="; + hash = "sha256-4q6/+/neWw0BFPjhCPXuLiCwyGqQn96D2pSyK/Yl6U8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 376ad472a01ea..d3353df4de381 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.90"; + version = "0.0.93"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-SfzwS7M821uGfbOLR37iiw+gEebKDgu1H7f0fs3J9kw="; + hash = "sha256-ilPwzQV4vucLV3QAR/otsVIDIxRw8iWPGXM8CvgtFxg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 0ebe0241b400d..040a181e4a674 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.53.0"; + version = "0.53.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-9KTBzPklQpqzLOQYRz6Kd0wUSHr2sfypvTu0X7om31Y="; + hash = "sha256-/IUJzMzbNKXQZkhwmoKoafMVw+6rD3Sw/coBLOi4FIk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix deleted file mode 100644 index 46dd1e173fb22..0000000000000 --- 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/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index 8702d8edc2f14..f478bf1788a5b 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/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index de0a0a282cf71..c3960dd5309d6 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { buildPhase = "buildPhase"; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-ObjC" - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-lpython2.7"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC" + + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -lpython2.7"; installPhase = "installPhase"; diff --git a/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch new file mode 100644 index 0000000000000..93db54b0c6e6c --- /dev/null +++ b/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch @@ -0,0 +1,37 @@ +From 5879a4bbc34d1eb25e160b15b2f5a4f10eac6bd2 Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Mon, 13 Sep 2021 18:07:26 +0200 +Subject: [PATCH] =?UTF-8?q?tests:=20Rename=20a=CC=8Aa=CC=88o=CC=88=5F?= + =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E.py=20=3D>=20=C3=A6=C9=90=C3=B8=5F?= + =?UTF-8?q?=E6=97=A5=E6=9C=AC=E5=83=B9.py?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +`åäö_日本語.py` normalizes differently in NFC and NFD normal forms. This +means a hash generated for the source directory can differ depending on +whether or not the filesystem is normalizing and which normal form it +uses. + +By renaming the file to `æɐø_日本價.py` we avoid this issue by using a +name that has the same encoding in each normal form. +--- + tests/test_bdist_wheel.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py +index 651c034..9b94ac8 100644 +--- a/tests/test_bdist_wheel.py ++++ b/tests/test_bdist_wheel.py +@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths): + with ZipFile(path) as zf: + record = zf.read('unicode.dist-0.1.dist-info/RECORD') + +- assert u'åäö_日本語.py'.encode('utf-8') in record ++ assert u'æɐø_日本價.py'.encode('utf-8') in record + + + def test_licenses_default(dummy_dist, monkeypatch, tmpdir): +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/python2-modules/wheel/default.nix new file mode 100644 index 0000000000000..8735a37b21ff7 --- /dev/null +++ b/pkgs/development/python2-modules/wheel/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bootstrapped-pip +, setuptools +}: + +buildPythonPackage rec { + pname = "wheel"; + version = "0.37.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; + name = "${pname}-${version}-source"; + postFetch = '' + cd $out + mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ + tests/testdata/unicode.dist/unicodedist/æɐø_日本價.py + patch -p1 < ${./0001-tests-Rename-a-a-o-_-.py-_-.py.patch} + ''; + }; + + nativeBuildInputs = [ + bootstrapped-pip + setuptools + ]; + + # No tests in archive + doCheck = false; + pythonImportsCheck = [ "wheel" ]; + + # We add this flag to ignore the copy installed by bootstrapped-pip + pipInstallFlags = [ "--ignore-installed" ]; + + meta = with lib; { + homepage = "https://github.com/pypa/wheel"; + description = "A built-package format for Python"; + longDescription = '' + This library is the reference implementation of the Python wheel packaging standard, + as defined in PEP 427. + + It has two different roles: + + - A setuptools extension for building wheels that provides the bdist_wheel setuptools command + - A command line tool for working with wheel files + + It should be noted that wheel is not intended to be used as a library, + and as such there is no stable, public API. + ''; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index d5b56f585eca1..25cb3b4d7eb83 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.5"; + version = "4.6"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-31f4BIIYCh2acbueUtGZShKnlhctd1FfKkFqsNiUqrI="; + hash = "sha256-C/3zyHnxAxCu8rrR4Znka47pVPp0vvaVGyd4TVQG3qg="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a01c053f2ee68..7cfb8e54f2754 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -84,13 +84,13 @@ let # results in # # { - # foo = old.foo.overrideDerivation (attrs: { + # foo = old.foo.overrideAttrs (attrs: { # nativeBuildInputs = attrs.nativeBuildInputs ++ [ pkgs.bar ]; # }); # } overrideNativeBuildInputs = overrides: old: lib.mapAttrs (name: value: - (builtins.getAttr name old).overrideDerivation (attrs: { + (builtins.getAttr name old).overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ value; }) ) overrides; @@ -105,13 +105,13 @@ let # results in # # { - # foo = old.foo.overrideDerivation (attrs: { + # foo = old.foo.overrideAttrs (attrs: { # buildInputs = attrs.buildInputs ++ [ pkgs.bar ]; # }); # } overrideBuildInputs = overrides: old: lib.mapAttrs (name: value: - (builtins.getAttr name old).overrideDerivation (attrs: { + (builtins.getAttr name old).overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ value; }) ) overrides; @@ -146,16 +146,16 @@ let # results in # # { - # foo = old.foo.overrideDerivation (attrs: { + # foo = old.foo.overrideAttrs (attrs: { # nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.bar ]; # propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ [ self.bar ]; # }); # } overrideRDepends = overrides: old: lib.mapAttrs (name: value: - (builtins.getAttr name old).overrideDerivation (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ value; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ value; + (builtins.getAttr name old).overrideAttrs (attrs: { + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ value; + propagatedNativeBuildInputs = (attrs.propagatedNativeBuildInputs or []) ++ value; }) ) overrides; @@ -325,7 +325,6 @@ let 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 ]; @@ -344,7 +343,7 @@ let graphscan = [ pkgs.gsl ]; gsl = [ pkgs.gsl ]; gert = [ pkgs.libgit2 ]; - haven = with pkgs; [ libiconv zlib.dev ]; + haven = with pkgs; [ zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; imager = [ pkgs.xorg.libX11.dev ]; @@ -362,8 +361,9 @@ let mvabund = [ pkgs.gsl ]; mwaved = [ pkgs.fftw.dev ]; mzR = with pkgs; [ zlib netcdf ]; + nanonext = with pkgs; [ mbedtls nng ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = with pkgs; [ nlopt pkg-config libiconv ]; + nloptr = with pkgs; [ nlopt pkg-config ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; pander = with pkgs; [ pandoc which ]; @@ -379,7 +379,6 @@ let RAppArmor = [ pkgs.libapparmor ]; rapportools = [ pkgs.which ]; rapport = [ pkgs.which ]; - readxl = [ pkgs.libiconv ]; rcdd = [ pkgs.gmp.dev ]; RcppCNPy = [ pkgs.zlib.dev ]; RcppGSL = [ pkgs.gsl ]; @@ -499,15 +498,6 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 - deldir = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - gam = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - interp = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - RcppArmadillo = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - quantreg = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; - hexbin = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; @@ -516,7 +506,6 @@ let 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 xorg.libX11.dev freetype.dev libpng.dev ]; @@ -555,25 +544,6 @@ let tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ]; gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which xorg.xdpyinfo ]; - cluster = [ pkgs.libiconv ]; - KernSmooth = [ pkgs.libiconv ]; - nlme = [ pkgs.libiconv ]; - Matrix = [ pkgs.libiconv ]; - mgcv = [ pkgs.libiconv ]; - minqa = [ pkgs.libiconv ]; - igraph = [ pkgs.libiconv ]; - ape = [ pkgs.libiconv ]; - expm = [ pkgs.libiconv ]; - mnormt = [ pkgs.libiconv ]; - pan = [ pkgs.libiconv ]; - phangorn = [ pkgs.libiconv ]; - quadprog = [ pkgs.libiconv ]; - randomForest = [ pkgs.libiconv ]; - sundialr = [ pkgs.libiconv ]; - ucminf = [ pkgs.libiconv ]; - glmnet = [ pkgs.libiconv ]; - mvtnorm = [ pkgs.libiconv ]; - statmod = [ pkgs.libiconv ]; rsvg = [ pkgs.librsvg.dev ]; ssh = with pkgs; [ libssh ]; s2 = [ pkgs.openssl.dev ]; @@ -943,7 +913,7 @@ let ]; otherOverrides = old: new: { - gifski = old.gifski.overrideDerivation (attrs: { + gifski = old.gifski.overrideAttrs (attrs: { cargoDeps = pkgs.rustPlatform.fetchCargoTarball { src = attrs.src; sourceRoot = "gifski/src/myrustlib"; @@ -959,7 +929,7 @@ let ]; }); - stringi = old.stringi.overrideDerivation (attrs: { + stringi = old.stringi.overrideAttrs (attrs: { postInstall = let icuName = "icudt52l"; icuSrc = pkgs.fetchzip { @@ -973,72 +943,75 @@ let ''; }); - xml2 = old.xml2.overrideDerivation (attrs: { + xml2 = old.xml2.overrideAttrs (attrs: { preConfigure = '' export LIBXML_INCDIR=${pkgs.libxml2.dev}/include/libxml2 patchShebangs configure ''; }); - rzmq = old.rzmq.overrideDerivation (attrs: { + rzmq = old.rzmq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); - clustermq = old.clustermq.overrideDerivation (attrs: { + clustermq = old.clustermq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); - Cairo = old.Cairo.overrideDerivation (attrs: { + Cairo = old.Cairo.overrideAttrs (attrs: { NIX_LDFLAGS = "-lfontconfig"; }); - curl = old.curl.overrideDerivation (attrs: { + curl = old.curl.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); - RcppParallel = old.RcppParallel.overrideDerivation (attrs: { + RcppParallel = old.RcppParallel.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); - RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: { + RcppArmadillo = old.RcppArmadillo.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); - data_table = old.data_table.overrideDerivation (attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp"; + data_table = old.data_table.overrideAttrs (attrs: { + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -fopenmp"; + }; patchPhase = "patchShebangs configure"; }); - ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE - + lib.optionalString stdenv.isDarwin " -fopenmp"; + ModelMetrics = old.ModelMetrics.overrideAttrs (attrs: { + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + lib.optionalString stdenv.isDarwin " -fopenmp"; + }; }); - rpf = old.rpf.overrideDerivation (attrs: { + rpf = old.rpf.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); - rJava = old.rJava.overrideDerivation (attrs: { + rJava = old.rJava.overrideAttrs (attrs: { preConfigure = '' export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ export JAVA_HOME=${pkgs.jdk} ''; }); - JavaGD = old.JavaGD.overrideDerivation (attrs: { + JavaGD = old.JavaGD.overrideAttrs (attrs: { preConfigure = '' export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ export JAVA_HOME=${pkgs.jdk} ''; }); - jqr = old.jqr.overrideDerivation (attrs: { + jqr = old.jqr.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { + pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: { postPatch = lib.optionalString stdenv.isDarwin '' for file in R/*.{r,r.in}; do sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file @@ -1046,35 +1019,42 @@ let ''; }); - s2 = old.s2.overrideDerivation (attrs: { + quarto = old.quarto.overrideAttrs (attrs: { + postPatch = '' + substituteInPlace "R/quarto.R" \ + --replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')" + ''; + }); + + s2 = old.s2.overrideAttrs (attrs: { PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; }); - Rmpi = old.Rmpi.overrideDerivation (attrs: { + Rmpi = old.Rmpi.overrideAttrs (attrs: { configureFlags = [ "--with-Rmpi-type=OPENMPI" ]; }); - Rmpfr = old.Rmpfr.overrideDerivation (attrs: { + Rmpfr = old.Rmpfr.overrideAttrs (attrs: { configureFlags = [ "--with-mpfr-include=${pkgs.mpfr.dev}/include" ]; }); - RVowpalWabbit = old.RVowpalWabbit.overrideDerivation (attrs: { + RVowpalWabbit = old.RVowpalWabbit.overrideAttrs (attrs: { configureFlags = [ "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.out}/lib" ]; }); - RAppArmor = old.RAppArmor.overrideDerivation (attrs: { + RAppArmor = old.RAppArmor.overrideAttrs (attrs: { patches = [ ./patches/RAppArmor.patch ]; LIBAPPARMOR_HOME = pkgs.libapparmor; }); - RMySQL = old.RMySQL.overrideDerivation (attrs: { + RMySQL = old.RMySQL.overrideAttrs (attrs: { MYSQL_DIR = "${pkgs.libmysqlclient}"; PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql"; NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient"; @@ -1083,24 +1063,24 @@ let ''; }); - devEMF = old.devEMF.overrideDerivation (attrs: { + devEMF = old.devEMF.overrideAttrs (attrs: { NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft"; NIX_LDFLAGS = "-lX11"; }); - slfm = old.slfm.overrideDerivation (attrs: { + slfm = old.slfm.overrideAttrs (attrs: { PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); - SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { + SamplerCompare = old.SamplerCompare.overrideAttrs (attrs: { PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); - spMC = old.spMC.overrideDerivation (attrs: { + spMC = old.spMC.overrideAttrs (attrs: { patches = [ ./patches/spMC.patch ]; }); - openssl = old.openssl.overrideDerivation (attrs: { + openssl = old.openssl.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; @@ -1108,19 +1088,19 @@ let PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; }); - websocket = old.websocket.overrideDerivation (attrs: { + websocket = old.websocket.overrideAttrs (attrs: { PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; }); - Rserve = old.Rserve.overrideDerivation (attrs: { + Rserve = old.Rserve.overrideAttrs (attrs: { patches = [ ./patches/Rserve.patch ]; configureFlags = [ "--with-server" "--with-client" ]; }); - V8 = old.V8.overrideDerivation (attrs: { + V8 = old.V8.overrideAttrs (attrs: { postPatch = '' substituteInPlace configure \ --replace " -lv8_libplatform" "" @@ -1138,45 +1118,45 @@ let ''); }); - acs = old.acs.overrideDerivation (attrs: { + acs = old.acs.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - gdtools = old.gdtools.overrideDerivation (attrs: { + gdtools = old.gdtools.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; NIX_LDFLAGS = "-lfontconfig -lfreetype"; }); - magick = old.magick.overrideDerivation (attrs: { + magick = old.magick.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - libgeos = old.libgeos.overrideDerivation (attrs: { + libgeos = old.libgeos.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - protolite = old.protolite.overrideDerivation (attrs: { + protolite = old.protolite.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - rpanel = old.rpanel.overrideDerivation (attrs: { + rpanel = old.rpanel.overrideAttrs (attrs: { preConfigure = '' export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}" ''; TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; }); - RPostgres = old.RPostgres.overrideDerivation (attrs: { + RPostgres = old.RPostgres.overrideAttrs (attrs: { preConfigure = '' export INCLUDE_DIR=${pkgs.postgresql}/include export LIB_DIR=${pkgs.postgresql.lib}/lib @@ -1184,33 +1164,35 @@ let ''; }); - OpenMx = old.OpenMx.overrideDerivation (attrs: { + OpenMx = old.OpenMx.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - odbc = old.odbc.overrideDerivation (attrs: { + odbc = old.odbc.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - x13binary = old.x13binary.overrideDerivation (attrs: { + x13binary = old.x13binary.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - geojsonio = old.geojsonio.overrideDerivation (attrs: { + geojsonio = old.geojsonio.overrideAttrs (attrs: { buildInputs = [ cacert ] ++ attrs.buildInputs; }); - rstan = old.rstan.overrideDerivation (attrs: { - NIX_CFLAGS_COMPILE = "${attrs.NIX_CFLAGS_COMPILE} -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; + rstan = old.rstan.overrideAttrs (attrs: { + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION"; + }; }); - mongolite = old.mongolite.overrideDerivation (attrs: { + mongolite = old.mongolite.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; @@ -1218,15 +1200,15 @@ let PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz"; }); - ps = old.ps.overrideDerivation (attrs: { + ps = old.ps.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); - rlang = old.rlang.overrideDerivation (attrs: { + rlang = old.rlang.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); - systemfonts = old.systemfonts.overrideDerivation (attrs: { + systemfonts = old.systemfonts.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); @@ -1242,13 +1224,13 @@ let ''; }); - lpsymphony = old.lpsymphony.overrideDerivation (attrs: { + lpsymphony = old.lpsymphony.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - sodium = old.sodium.overrideDerivation (attrs: with pkgs; { + sodium = old.sodium.overrideAttrs (attrs: with pkgs; { preConfigure = '' patchShebangs configure ''; @@ -1256,19 +1238,19 @@ let buildInputs = [ libsodium.dev ] ++ attrs.buildInputs; }); - keyring = old.keyring.overrideDerivation (attrs: { + keyring = old.keyring.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - Rhtslib = old.Rhtslib.overrideDerivation (attrs: { + Rhtslib = old.Rhtslib.overrideAttrs (attrs: { preConfigure = '' substituteInPlace R/zzz.R --replace "-lcurl" "-L${pkgs.curl.out}/lib -lcurl" ''; }); - h2o = old.h2o.overrideDerivation (attrs: { + h2o = old.h2o.overrideAttrs (attrs: { preConfigure = '' # prevent download of jar file during install and postpone to first use sed -i '/downloadJar()/d' R/zzz.R @@ -1281,26 +1263,26 @@ let ''; }); - SICtools = old.SICtools.overrideDerivation (attrs: { + SICtools = old.SICtools.overrideAttrs (attrs: { preConfigure = '' substituteInPlace src/Makefile --replace "-lcurses" "-lncurses" ''; }); - arrow = old.arrow.overrideDerivation (attrs: { + arrow = old.arrow.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; }); - proj4 = old.proj4.overrideDerivation (attrs: { + proj4 = old.proj4.overrideAttrs (attrs: { preConfigure = '' substituteInPlace configure \ --replace "-lsqlite3" "-L${lib.makeLibraryPath [ pkgs.sqlite ]} -lsqlite3" ''; }); - rrd = old.rrd.overrideDerivation (attrs: { + rrd = old.rrd.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure ''; @@ -1308,7 +1290,7 @@ let ChIPXpress = old.ChIPXpress.override { hydraPlatforms = []; }; - rgl = old.rgl.overrideDerivation (attrs: { + rgl = old.rgl.overrideAttrs (attrs: { RGL_USE_NULL = "true"; }); @@ -1318,11 +1300,11 @@ let flowClust = old.flowClust.override { platforms = lib.platforms.x86_64 ++ lib.platforms.x86; }; - geomorph = old.geomorph.overrideDerivation (attrs: { + geomorph = old.geomorph.overrideAttrs (attrs: { RGL_USE_NULL = "true"; }); - Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: { + Rhdf5lib = old.Rhdf5lib.overrideAttrs (attrs: { propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.hdf5.dev ]; }); }; diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 880fff44ed644..5939a425aefa9 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran, libiconv }: { name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ lib.optionals requireX [util-linux xvfb-run] ++ - lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; + lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran libiconv]; - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; configurePhase = '' diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 4672bad4ca4d2..aa903a5637c08 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -66,9 +66,8 @@ let name; copyIfBundledByPath = { bundledByPath ? false, ...}: - (if bundledByPath then - assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ - else "" + (lib.optionalString bundledByPath ( + assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/") #*/ ); maybeCopyAll = pkgname: if pkgname == null then "" else diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 9be3f909ca59f..0483feccb6efe 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.5"; - source.sha256 = "sha256-Wvj6rwlmbVnM3xqORh8Xu8XE5Jutstyu4XRln4yH1Eo="; + version = "2.4.6"; + source.sha256 = "sha256-MI/g13w5NMoHQ78AJ11BlKhulroUI6xNPqQ19iH51P8="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 1a95520b92731..9a0c93038b45f 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -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 @@ -203,7 +203,12 @@ in }; eventmachine = attrs: { + dontBuild = false; buildInputs = [ openssl ]; + postPatch = '' + substituteInPlace ext/em.cpp \ + --replace 'if (bind (' 'if (::bind (' + ''; }; exif = attrs: { @@ -224,6 +229,7 @@ in gpgme = attrs: { buildInputs = [ gpgme ]; + nativeBuildInputs = [ pkg-config ]; buildFlags = [ "--use-system-libraries" ]; }; @@ -318,7 +324,7 @@ in nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" "-Wno-error=sizeof-pointer-memaccess" @@ -544,6 +550,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 dbb9e4f451cc4..b8d4df1128a03 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -136,9 +136,9 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { # As of ruby 3.0, ruby headers require -fdeclspec when building with clang # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57 - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ "-fdeclspec" - ]; + ]); buildPhase = attrs.buildPhase or '' runHook preBuild diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index 4799814198016..953f2059da026 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -84,6 +84,7 @@ gem 'jwt' gem 'kramdown-rfc2629' gem 'libv8' gem 'libxml-ruby' +gem 'mail' gem 'magic' gem 'markaby' gem 'method_source' @@ -109,7 +110,7 @@ gem 'pry-byebug' gem 'pry-doc' gem 'public_suffix' gem 'puma' -# gem 'rails' # causes the Bundler resolver to explode, probably due conflict with CocoaPods activesupport requirement +gem 'rails' gem 'rainbow' # gem 'rbczmq' deprecated gem 'rbnacl' diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 819cb38fef08e..89c7d977e7200 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.41.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k="; + hash = "sha256-3lnCqetpQ0Gnms5AR7/+eKV8jxhfv0R2LJ4l+74edt4="; }; - vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0="; + vendorHash = "sha256-uVN99Sgjwtg0IaDuMfuDKWRZRYKVp9UDJwinr56eXOg="; 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 0000000000000..55624ef369e7e --- /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.3.0"; + + src = fetchFromGitHub { + owner = "algolia"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-j0d2HK4McWA2yP7pt+TUOEYVUOQP4NYOdMlK7IqaAcU="; + }; + + vendorHash = "sha256-RG/aLlCve0XLj3ljBBSsloFUgNAG6faqjyMYXOo+CgI="; + + 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/allure/default.nix b/pkgs/development/tools/allure/default.nix index 07ca36be34e45..dfc82c78d3eaa 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.20.1"; + version = "2.21.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-nq7PY4CVSqfuTzN7ZDChTfYalYKb4uBG8ZnIBd7ernI="; + sha256 = "sha256-fX/GNDUUxO8LvPoeoT+tf0n3EcgJlm6kc1lx0lfbiq4="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index f9d1c4549a79b..312afa557ddd9 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 = "5.0.10"; + version = "5.0.14"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-NrFkLZiqX21BSIuE8qF7lurNWKgmf7PAa/1IpPbcUf0="; + sha256 = "sha256-gd7aSBNhTO1ira76lL+1apLlXYXRfGWAbGAsJEUtEqw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 27068cbc4c49f..9a03addaf03f7 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.3.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; - rev = "v${version}"; - hash = "sha256-SZ2sBQeZgtPOYioH9eK5MveFtWVGPvgKMrqsCfjoRGM="; + rev = "refs/tags/v${version}"; + hash = "sha256-coZU3cufQgSCid10zEvmHG7ddLbZhnrvl9ffw4Y6h74="; }; format = "make"; @@ -16,6 +16,7 @@ crystal.buildCrystalPackage rec { meta = with lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; + changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ kimburgess ]; }; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 7d9dbe6f393db..39f69f402b94c 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/amqpcat/default.nix b/pkgs/development/tools/amqpcat/default.nix new file mode 100644 index 0000000000000..a7c30cc9e4b6d --- /dev/null +++ b/pkgs/development/tools/amqpcat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, crystal, openssl, testers, amqpcat }: + +crystal.buildCrystalPackage rec { + pname = "amqpcat"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "cloudamqp"; + repo = "amqpcat"; + rev = "v${version}"; + hash = "sha256-Ec8LlOYYp3fXYgvps/ikeB4MqBEXTw1BAF5nJyL7dI0="; + }; + + format = "shards"; + shardsFile = ./shards.nix; + + buildInputs = [ openssl ]; + + # Tests require network access + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = amqpcat; + }; + + meta = with lib; { + description = "A CLI tool for publishing to and consuming from AMQP servers"; + homepage = "https://github.com/cloudamqp/amqpcat"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjheng ]; + broken = stdenv.isDarwin; # Linking errors. Hope someone can help fix it. + }; +} diff --git a/pkgs/development/tools/amqpcat/shards.nix b/pkgs/development/tools/amqpcat/shards.nix new file mode 100644 index 0000000000000..3321c4c9e170b --- /dev/null +++ b/pkgs/development/tools/amqpcat/shards.nix @@ -0,0 +1,12 @@ +{ + amq-protocol = { + url = "https://github.com/cloudamqp/amq-protocol.cr.git"; + rev = "v0.3.24"; + sha256 = "011xia60wkmbjsk8j4qnswx0lg1i7vrchjwnxlksjv3npp2z98a3"; + }; + amqp-client = { + url = "https://github.com/cloudamqp/amqp-client.cr.git"; + rev = "v0.6.2"; + sha256 = "0h9c2v7ks776msm3dn2d68y85i6mm4gm5s3jlrs8dlp36kndkplc"; + }; +} diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index 2d8348bfc9bc3..e826fd9d2cd58 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/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 17e8458e7dcf6..499a424292308 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/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8c8b0eb29ad93..fb6372e491b47 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.6.0"; + version = "10.8.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-ghGrRu7a9OUVti6P4QRrGFSmQqX8XCfn7aBHR4Q7RCI="; + sha256 = "sha256-gWcenFKcqTDg1Ld3D40+dbw+cD4QO2JG/3Bcol2Aj6c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index ec333520ca549..0f560d0b3a15e 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.12.0"; + version = "2.12.2"; 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-V+UXodw84NGZPi3Ws4hKyftqnGibn9uFgrkGXxpRAZc="; + sha256 = "sha256-n36x50rGA0fzvbwrUDpzWmF7XqwTTxnAfFtBL23gEOE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 1a8183ebab8d2..6c526cd1dc2ff 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,45 +1,54 @@ { lib , stdenv , fetchFromGitHub +, installShellFiles , pcre , python3 , libxslt , docbook_xsl , docbook_xml_dtd_45 -, withZ3 ? true -, z3 , which }: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.9.3"; + version = "2.10.1"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-AaZzr5r+tpG5M40HSx45KCUBPhN/nSpXxS5H3FuSx2c="; + hash = "sha256-tN7MYMRBakdL++ZeY2u9s2B2wyAU7iaOB/hsv2GXI6s="; }; - buildInputs = [ pcre - (python3.withPackages (ps: [ps.pygments])) - ] ++ lib.optionals withZ3 [ z3 ]; - nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 which ]; + buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ]; + nativeBuildInputs = [ installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which ]; - makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ] - ++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; + makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; outputs = [ "out" "man" ]; enableParallelBuilding = true; - doCheck = true; + postBuild = '' + make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man + ''; + + # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. + doCheck = !(stdenv.isLinux && stdenv.isAarch64); postInstall = '' - make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man - mkdir -p $man/share/man/man1 - cp cppcheck.1 $man/share/man/man1/cppcheck.1 + installManPage cppcheck.1 + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + echo 'int main() {}' > ./installcheck.cpp + $out/bin/cppcheck ./installcheck.cpp > /dev/null + + runHook postInstallCheck ''; meta = with lib; { diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index d340cb7562bfa..eb23a0aae51fb 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -11,7 +11,7 @@ buildGoModule { hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; preBuild = '' # Add go modules support diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a7cc801c70cd4..7a4ed91b95302 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 9dba3692ad3af..1039a549d93ed 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, writeText -, autoconf, ncurses, graphviz, doxygen +, graphviz, doxygen , ocamlPackages, ltl2ba, coq, why3 , gdk-pixbuf, wrapGAppsHook }: @@ -17,6 +17,7 @@ let num ocamlgraph ppx_deriving + ppx_deriving_yojson ppx_import stdlib-shims why3 @@ -35,31 +36,38 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "25.0"; - slang = "Manganese"; + version = "26.1"; + slang = "Iron"; src = fetchurl { - url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "sha256-Ii3O/NJyBTVAv1ts/zae/Ee4HCjzYOthZmnD8wqLwp8="; + url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; + hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg="; }; - preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; + postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; - postConfigure = "patchShebangs src/plugins/value/gen-api.sh"; + strictDeps = true; - nativeBuildInputs = [ autoconf wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib dune_3 ]); buildInputs = with ocamlPackages; [ - ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip + dune-site dune-configurator + ltl2ba ocamlgraph yojson menhirLib camlzip lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen - ppx_deriving ppx_import + ppx_deriving ppx_import ppx_deriving_yojson gdk-pixbuf ]; - enableParallelBuilding = true; + buildPhase = '' + runHook preBuild + dune build -j$NIX_BUILD_CORES --release @install + runHook postBuild + ''; + + installFlags = [ "PREFIX=$(out)" ]; preFixup = '' - gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}) + gappsWrapperArgs+=(--prefix OCAMLPATH ':' ${ocamlpath}:$out/lib/) ''; # Allow loading of external Frama-C plugins diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 449d5b6b5ed3b..5c0a96e5d8e03 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "hotspot"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; - rev = "v${version}"; - hash = "sha256-7GuIe8F3QqosW/XaN3KC1WeWcI7woUiEc9Nw0b+fSk0="; + rev = "refs/tags/v${version}"; + hash = "sha256-DW4R7+rnonmEMbCkNS7TGodw+3mEyHl6OlFK3kbG5HM="; fetchSubmodules = true; }; @@ -62,7 +62,7 @@ mkDerivation rec { mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git ''; - meta = { + meta = with lib; { description = "A GUI for Linux perf"; longDescription = '' hotspot is a GUI replacement for `perf report`. @@ -70,8 +70,9 @@ mkDerivation rec { then displays the result in a graphical way. ''; homepage = "https://github.com/KDAB/hotspot"; - license = with lib.licenses; [ gpl2Only gpl3Only ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ nh2 ]; + changelog = "https://github.com/KDAB/hotspot/releases/tag/v${version}"; + license = with licenses; [ gpl2Only gpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; }; } 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 3eae91e939d36..68e9927522b5c 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.18"; + version = "0.19"; src = fetchurl { - sha256 = "sha256-kQL8hBkpR1ffhqic5uwwX42QqBjR8lmKE50V6xiUuPM="; url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; + hash = "sha256-KxAVe2DqCK3AjjiWtJIcc/yt1exOtlKymjQSnVAeXuA="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 3eb953bd48030..5fcfb20147b07 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU="; + hash = "sha256-TgYX7FKTi5FBlCRDskGC/OUyh5yvS0nsLUtfCCC4S1w="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index dad7193dd25d7..2e1a77eda9186 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-Zp2Va5l4IKNuQjzzXUgqqZhJJUuWWM72hERZkS39v7g="; + hash = "sha256-96EzipCd5GX1bkpZIXZp1ZUVO+Oe4t5bhthGZHUVmFk="; }; mesonFlags = [ diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index e9437d718cf7a..da180f0d4b7aa 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' sed '7i#include <math.h>' -i src/Scheduler.cc + sed '1i#include <ctime>' -i src/test-monitor/test-monitor.cc patchShebangs . ''; @@ -43,13 +44,11 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime cmakeFlags = [ - "-DCMAKE_C_FLAGS_RELEASE:STRING=" - "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" "-Ddisable32bit=ON" ]; # we turn on additional warnings due to hardening - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 62026d527810e..6cf84434cdeca 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/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index a3c28a0a9bc0e..61efa78eaef45 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 bb3d37f4f8769..df6a7976de3e4 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.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O758CU70NqRFlbtiy5cmfIHiHdQLxH88BHNZLQVvZ+M="; + sha256 = "sha256-tsnW6KoLHEWd/uDZrK2cnVZ2IWftoxZ5zGdYhRdUp9Q="; }; - vendorSha256 = "sha256-4ODf6Er7V5KsVUdWjqjv+dfH84PPR+5T29V1AJluoJA="; + vendorSha256 = "sha256-crGs7j9hAnGCCFjhigIJVpTM0rr9WgvBq3/ZGt6hwqQ="; doCheck = false; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 3bec558803b4e..9949ec7ec7c70 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix build on ELFv2 powerpc64 + # https://bugs.kde.org/show_bug.cgi?id=398883 + (fetchurl { + url = "https://github.com/void-linux/void-packages/raw/3e16b4606235885463fc9ab45b4c120f1a51aa28/srcpkgs/valgrind/patches/elfv2-ppc64-be.patch"; + sha256 = "NV/F+5aqFZz7+OF5oN5MUTpThv4H5PEY9sBgnnWohQY="; + }) # Fix checks on Musl. # https://bugs.kde.org/show_bug.cgi?id=453929 (fetchpatch { diff --git a/pkgs/development/tools/ansi/default.nix b/pkgs/development/tools/ansi/default.nix new file mode 100644 index 0000000000000..77ddf81a269ab --- /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; + hash = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; + }; + + cargoHash = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0="; + + meta = { + 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 lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + mainProgram = "ansi"; + }; +} diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/development/tools/apksigcopier/default.nix index f9df5fca17af5..13cb0300d7f8d 100644 --- a/pkgs/development/tools/apksigcopier/default.nix +++ b/pkgs/development/tools/apksigcopier/default.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "apksigcopier"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "obfusk"; repo = "apksigcopier"; rev = "refs/tags/v${version}"; - sha256 = "sha256-58NoYe26GsNE0jpSRt4sIkTJ2iR4VVnvthOfi7QFfN0="; + sha256 = "sha256-VuwSaoTv5qq1jKwgBTKd1y9RKUzz89n86Z4UBv7Q51o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 82571293abc6e..f9bed90f8ba43 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.5.3"; + version = "3.6.0"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-D/i1KGKPuhayKU8jaXhWnVgpU5Z/SG12AW8R7bgSQh8="; + hash = "sha256-U8vHwdL1O54X0jPhcjTN/J1U7dKQgFEMfc6lbXe2Ff0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index f8e1a36a993e4..2103d74e072a3 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # 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" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 55c6a34758792..1a7e13e0ec3df 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.2"; + version = "10.17.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-Pab4IYktNWWTudAY7Zx9dI+fRp0yihD78L0MmBHxeNY="; + sha256 = "sha256-a25MA/fDjCvsKzEh34IM34TyXECJ0j07H9jr6JX1uc0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-OlsNFhduilo8fJs/mynrAiwuXcfCZERdaJk3VcAUCJw="; + vendorHash = "sha256-Cb4RVY+E8QcvxSworBujsvqSSGxFGfW0W7nFjmpfLQ8="; doCheck = false; diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 0cb5de0902691..82df086db3bd1 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.021731", - "publishDate": "2022-12-14T02:22:20.0230853Z", + "buildId": "1.0.022431", + "publishDate": "2023-02-21T18:46:09.9616432Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", - "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/linux/StaticSitesClient", + "sha": "a0424f02b72b0e292e23fa1774a579f3a83cc2280af46a19682c11423e55a134" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", - "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/windows/StaticSitesClient.exe", + "sha": "78476f93e8357ebd5b6676c66747c6f0432084615a5cecaa43e4afbda2533176" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", - "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/macOS/StaticSitesClient", + "sha": "0f2dc106903167d5900d9875321fd99a11349d21177b4794495b45e3df175755" } } }, { "version": "stable", - "buildId": "1.0.021731", - "publishDate": "2022-12-14T02:22:20.0230853Z", + "buildId": "1.0.022291", + "publishDate": "2023-02-07T21:07:28.1304112Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", - "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/linux/StaticSitesClient", + "sha": "65ca5599a37cd41ab6d88557b0e33179ffc0f86cb81fe1c72db30b021d8e63c0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", - "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/windows/StaticSitesClient.exe", + "sha": "b94f11e62441339882bfd9f0e8fc496d7c77f9b6d9c2fe305b64d53e87e9814c" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", - "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022291/macOS/StaticSitesClient", + "sha": "3f5808e91fe24a3afee25297fce42cff4b1ab4fbbfaaf0c510662b14277485c6" } } }, { "version": "backup", - "buildId": "1.0.021671", - "publishDate": "2022-12-08T00:34:47.6310685Z", + "buildId": "1.0.022152", + "publishDate": "2023-01-24T18:38:40.5584174Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/linux/StaticSitesClient", - "sha": "306c2d24cbc6461cdf1fe29e9206ccb9d452ba3514ee9d67a1d7e0f8edbc036f" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/linux/StaticSitesClient", + "sha": "40e1639efc239151b3021a262ee85a747403fbf1c9ffce3de1aa0cbf273a3069" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/windows/StaticSitesClient.exe", - "sha": "ee868ca5e73a6ad8758698c168bb01d07b66288d353813fefe41d441f82b9f1f" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/windows/StaticSitesClient.exe", + "sha": "e3287b8b63b00faa501573cd205ce8f7bb9743f7107f3e4f01639d0b297f21fc" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/macOS/StaticSitesClient", - "sha": "5ef513530a45d4b8e135e272f7e7112e900fbb8c8137c19e645a694e71b98c74" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/macOS/StaticSitesClient", + "sha": "396f5fefe087399c78521b2f5456c79e58c771ca64785e4be055a149738a2e6a" } } } diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 130d7f1d23afb..8ef941653e41a 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 a38acbd53c942..a062d18096dc3 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -2,16 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.6.0"; + version = "3.7.0"; src = python3Packages.fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-qHnnUTSLY1yncqIjG+IMLoNauvgwU04qsvH7dZZ8AlI="; + sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84="; }; postPatch = '' substituteInPlace requirements.txt \ + --replace 'phx-class-registry==4.0.5' 'phx-class-registry' + substituteInPlace requirements.txt \ --replace 'tabulate==0.8.10' 'tabulate' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index bb020ec09f62f..dd4a133c1b412 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.4.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k87EgsH7EdnqYBoXHpPu7hB/goEXuZsz8mNsrvM+Hgw="; + hash = "sha256-NszXIVgK65gTsiEmOaw3cMaR0A+ojNYa08ETJ6dP+4c="; }; - cargoHash = "sha256-ujc3tH9I2WqwxmqBaUdE8lJQtj7XS56IVaxfZWhmvF8="; + cargoHash = "sha256-ssrZ6v5euf8AgAdvsjYt6L+dxrIBYoaiHxvBQN2KE+8="; buildInputs = lib.optional stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index fd8a78a1ac6b8..aeec00e99a9bc 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU="; + sha256 = "sha256-ijw0JVU9jUhpIJQjcjgzAVPJDxD7WSZYiLV0OvOyS5g="; }; - vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg="; + vendorHash = "sha256-Hg8rMknanHQOgVLJ58QM9JOgrUYMqL7WvaHuiv9xVYw="; doCheck = false; diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix index 606633fd3a1a0..d0956845092f8 100644 --- a/pkgs/development/tools/bbin/default.nix +++ b/pkgs/development/tools/bbin/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/share cp -r docs $out/share/docs wrapProgram $out/bin/bbin \ - --prefix PATH : "${lib.makeBinPath [ babashka graalvm17-ce ]}" + --prefix PATH : "${lib.makeBinPath [ babashka babashka.graalvmDrv ]}" runHook postInstall ''; diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 13e2effec5af3..57235c3085aeb 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -1,17 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "benthos"; - version = "4.11.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; - rev = "v${version}"; - sha256 = "sha256-1pzyrXJgVN8kO3BHr/7LMpDvtnLcdioaxoRgKv/46v4="; + rev = "refs/tags/v${version}"; + hash = "sha256-6qBeMQSBleZTsq6sExIqkkyxJUx1yt2YhUogKYEWii0="; }; - vendorSha256 = "sha256-SfgdSPJ8Blra+KVWtKSjWfXmAm02tULwuYHNPbyJVpI="; + vendorHash = "sha256-sNqWTgVgcjYEzFlneQaV3g80NTrVKeKz+mtahEOdyIw="; doCheck = false; @@ -19,11 +22,16 @@ buildGoModule rec { "cmd/benthos" ]; - ldflags = [ "-s" "-w" "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/benthosdev/benthos/v4/internal/cli.Version=${version}" + ]; meta = with lib; { description = "Fancy stream processing made operationally mundane"; homepage = "https://www.benthos.dev"; + changelog = "https://github.com/benthosdev/benthos/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sagikazarmark ]; }; diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix index f95810fb7718f..d9302b5df41c4 100644 --- a/pkgs/development/tools/bingo/default.nix +++ b/pkgs/development/tools/bingo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bingo"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "bwplotka"; repo = "bingo"; rev = "v${version}"; - hash = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; + hash = "sha256-YvBRI1i7ICnacYQv7rNDuUnqhuLXJ4eAZhT0ce3vFuU="; }; vendorHash = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix index 839f7b1b6ccc6..819cccf95c616 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.1.0"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-ZIZ6XpRuqhacpvi1kf7zvMszzbF8IvWrMlxAZnJJSxE="; + hash = "sha256-IrIRBozW2nNqt3/643jQ9sHT/YIpYhWeG749bTR4+60="; }; - cargoSha256 = "sha256-/LrrHK9j6xg3J56ubM9RdkJeMn4nvpddUGMtHu2s6OE="; + cargoHash = "sha256-EkvZk5l2Jw/6Ejrz4gYFWz9IZLjz0Op/1z3BGBV07dA="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; diff --git a/pkgs/development/tools/bomber-go/default.nix b/pkgs/development/tools/bomber-go/default.nix index 0c09e1e7c1a58..28a76fe8a5171 100644 --- a/pkgs/development/tools/bomber-go/default.nix +++ b/pkgs/development/tools/bomber-go/default.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to scans Software Bill of Materials (SBOMs) for vulnerabilities"; homepage = "https://github.com/devops-kung-fu/bomber"; + changelog = "https://github.com/devops-kung-fu/bomber/releases/tag/v${version}"; license = licenses.mpl20; mainProgram = "bomber"; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/development/tools/bpf-linker/default.nix index d1839eb86fabb..49780a7772e43 100644 --- a/pkgs/development/tools/bpf-linker/default.nix +++ b/pkgs/development/tools/bpf-linker/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, llvmPackages_14 +, llvmPackages_15 , zlib , ncurses , libxml2 @@ -10,21 +10,21 @@ rustPlatform.buildRustPackage rec { pname = "bpf-linker"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "aya-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-jYuBk78aGQLUeNF6d6kjGPuMxEF22XJquHcs23WVGm0="; + hash = "sha256-LEZ2to1bzJ/H/XYytuh/7NT7+04aI8chpKIFxxVzM+4="; }; - cargoHash = "sha256-X8EVpOxDHwE/wj/gly/wdZ6tsrMrz3kkDe9gEPbk6iw="; + cargoHash = "sha256-s8cW7lXtvgemuQueTtAywewnDVJ/WDcz8SBqsC/tO80="; buildNoDefaultFeatures = true; buildFeatures = [ "system-llvm" ]; - nativeBuildInputs = [ llvmPackages_14.llvm ]; + nativeBuildInputs = [ llvmPackages_15.llvm ]; buildInputs = [ zlib ncurses libxml2 ]; # fails with: couldn't find crate `core` with expected target triple bpfel-unknown-none diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 071bb88423730..7508e77da9652 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.12.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-tEeAr1QSec1Sayfg2/erk5u6wBZDodZIMYq9MaU7ATA="; + hash = "sha256-fosvr8l/xql4j2/mGjbvbJQMUqBqBUturQJq+OQT/wM="; }; - vendorHash = "sha256-FCAxqyacDdt3mR628/sguvrBx+nG10648XqF5hA8z+s="; + vendorHash = "sha256-ZYmYLZXEzWrTt6JJOWyTmbVq8p7D8lhz07bmQ2Z7gKc="; patches = [ # Skip a test that requires networking to be available to work. 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 be12b16518837..0000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ /dev/null @@ -1,628 +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 -, 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; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; - - 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 <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> - - 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 <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" 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. - 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' \ - 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. - 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 <<EOF - # Limit the resources Bazel is allowed to use during the build to 1/2 the - # available RAM and 3/4 the available CPU cores. This should help avoid - # overwhelming the build machine. - build --local_ram_resources=HOST_RAM*.5 - build --local_cpu_resources=HOST_CPUS*.75 - - build --distdir=${distDir} - fetch --distdir=${distDir} - build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" - build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" - build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" - build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" - build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" - build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" - build --host_javabase='@local_jdk//:jdk' - build --host_java_toolchain='${javaToolchain}' - EOF - - # add the same environment vars to compile.sh - sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ - -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ - -e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \ - -e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \ - -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ - -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ - -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ - -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ - -i scripts/bootstrap/compile.sh - - # This is necessary to avoid: - # "error: no visible @interface for 'NSDictionary' declares the selector - # 'initWithContentsOfURL:error:'" - # This can be removed when the apple_sdk is upgraded beyond 10.13+ - sed -i '/initWithContentsOfURL:versionPlistUrl/ { - N - s/error:nil\];/\];/ - }' tools/osx/xcode_locator.m - - # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash - echo "PATH=\$PATH:${defaultShellPath}" >> 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 <<EOF > $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 - 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 450bcd114776a..0000000000000 --- 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 <sys/mman.h> - - #include <algorithm> -+#include <limits> - - #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 <limits.h> -+#include <limits> - - #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 012e613c2f19e..0000000000000 --- 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 <CoreServices/CoreServices.h> - #import <Foundation/Foundation.h> - ---- 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 96553d9d8859b..0000000000000 --- 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 24580faa20ff3..ce370dd414d8f 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -2,8 +2,6 @@ , 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 @@ -364,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) \ 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 e00e2d4b271bb..29874a82ad253 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -2,8 +2,6 @@ , 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 @@ -326,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) \ 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 6f86be80f9a98..63d500e8247e4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -2,8 +2,6 @@ , 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 @@ -336,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) \ diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index cd313a5bc50bf..693ecce9d1e12 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,21 +2,23 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "5.1.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "sha256-PNIqsP5p+OdYH0JgOmjqvge9zVOrAcNg0FMflXFJHwQ="; + hash = "sha256-WXzrGJaulcwg4MnyfY5jWBEVxCXryqMK+/R7J/gFI38="; }; - vendorSha256 = "sha256-9WUjQhXWkpSEJj9Xq+9rOe3I1VZ7nqMTnX7DPl+rxsU="; + vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; preBuild = '' rm -r warn/docs ''; + proxyVendor = true; + doCheck = false; excludedPackages = [ "generatetables" ]; diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index b371a1f11159c..3132678eade10 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.21"; + version = "3.1.1"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-wT3s8CjgFPKrJiMWHWsvmUQwpuuS4figJZUXJn3RclU="; + sha256 = "sha256-EiAGM2tfzHp2rTAsf+mrfQ7VfX0NTFakcLVpT/plqh8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index cac4b3c650b8f..fbe933f6b6d4d 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -8,13 +8,13 @@ , pkgsMusl # for passthru.tests }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "bmake"; - version = "20220928"; + version = "20230126"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-yAS3feP+uOMd7ipMn7Hp7CTFo0dk56KBXIi07QFlDpA="; + url = "http://www.crufty.net/ftp/pub/sjg/${self.pname}-${self.version}.tar.gz"; + hash = "sha256-hk9yGFgs95Dsc7ILcQVCXLn/ozUiJUF3LwMTMGtqC8Q="; }; # Make tests work with musl diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index 9775665869fd6..cad1e0d47f08d 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "bob"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "benchkram"; repo = pname; rev = version; - hash = "sha256-OuIE3saJxk8IBLPbAxdQ2uJ9oXJ3xBOaeZraw9csy1U="; + hash = "sha256-yPdAf/j/vpQ2j+Zp8D7us7yaiDs47sKFPHZgggDjT3w="; }; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; - vendorHash = "sha256-dmMoFyl9IX0QS6sNC6qzC4DQQQfvxmxuUeUfx0DBd/I="; + vendorHash = "sha256-6wAbwZKm8RTMt2Wm90N3AYZREipdo7Dq+XTWsLANd88="; excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index d94dccf7fbc8a..d283e1e321db7 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -40,5 +40,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.jgertm maintainers.marsam ]; license = licenses.asl20; platforms = platforms.all; + # https://github.com/facebook/buck/issues/2666 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/pkgs/development/tools/build-managers/cmake/002-application-services.diff index 7c77336b41be6..56f7cd266b7af 100644 --- a/pkgs/development/tools/build-managers/cmake/002-application-services.diff +++ b/pkgs/development/tools/build-managers/cmake/002-application-services.diff @@ -1,20 +1,18 @@ -diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 9a18184fd3..278d146dd1 100644 ---- a/Source/CMakeLists.txt -+++ b/Source/CMakeLists.txt -@@ -933,7 +933,6 @@ endif() +diff -Naur cmake-3.25.1-old/Source/CMakeLists.txt cmake-3.25.1-new/Source/CMakeLists.txt +--- cmake-3.25.1-old/Source/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 ++++ cmake-3.25.1-new/Source/CMakeLists.txt 2022-12-19 01:00:08.412064304 -0300 +@@ -916,7 +916,6 @@ # On Apple we need CoreFoundation and CoreServices if(APPLE) - target_link_libraries(CMakeLib "-framework CoreFoundation") -- target_link_libraries(CMakeLib "-framework CoreServices") + target_link_libraries(CMakeLib PUBLIC "-framework CoreFoundation") +- target_link_libraries(CMakeLib PUBLIC "-framework CoreServices") endif() if(WIN32 AND NOT UNIX) -diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx -index 77403b076a..d5aac95e1e 100644 ---- a/Source/cmGlobalXCodeGenerator.cxx -+++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -49,10 +49,6 @@ struct cmLinkImplementation; +diff -Naur cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx +--- cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx 2022-11-30 10:57:03.000000000 -0300 ++++ cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx 2022-12-19 01:00:56.065135169 -0300 +@@ -56,10 +56,6 @@ #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) # include <CoreFoundation/CoreFoundation.h> @@ -25,19 +23,17 @@ index 77403b076a..d5aac95e1e 100644 #endif #if !defined(CMAKE_BOOTSTRAP) -diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index 79452ffff6..a848731b7e 100644 ---- a/Utilities/cmlibarchive/CMakeLists.txt -+++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -2013,11 +2013,6 @@ IF(ENABLE_TEST) +diff -Naur cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt +--- cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 ++++ cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt 2022-12-19 01:01:43.392205981 -0300 +@@ -2041,10 +2041,6 @@ + ADD_CUSTOM_TARGET(run_all_tests) ENDIF(ENABLE_TEST) - ENDIF() -# We need CoreServices on Mac OS. -IF(APPLE) - LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") -ENDIF(APPLE) -- + add_subdirectory(libarchive) IF(0) # CMake does not build libarchive's command-line tools. - add_subdirectory(cat) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0a1e191ba360c..2aff749ebcb0c 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.24.3"; + version = "3.25.1"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-tTqhD6gr/4TM21kGWSe3LTvuSfTYYmEkn8CYSzs2cpE="; + sha256 = "sha256-HFEdCVFq9JNpTtm68TxVlHo2OJZ01lei1eDM7caykdg="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 2b7ccc4a6c059..cb66df77e3169 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,57 +1,31 @@ -{ lib, stdenv, python3, fetchFromGitHub, git, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, git +, pkg-config +, python3 +, zlib +}: -# Note: -# Conan has specific dependency demands; check -# https://github.com/conan-io/conan/blob/master/conans/requirements.txt -# https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt -# on the release branch/commit we're packaging. -# -# Two approaches are used here to deal with that: -# Pinning the specific versions it wants in `newPython`, -# and using `substituteInPlace conans/requirements.txt ...` -# in `postPatch` to allow newer versions when we know -# (e.g. from changelogs) that they are compatible. - -let newPython = python3.override { - packageOverrides = self: super: { - node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec { - version = "0.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; - }; - }); - distro = super.distro.overridePythonAttrs (oldAttrs: rec { - version = "1.5.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-Dlh1auOPvY/DAg1UutuOrhfFudy+04ixe7Vbilko35I="; - }; - }); - }; -}; - -in newPython.pkgs.buildPythonApplication rec { - version = "1.53.0"; +python3.pkgs.buildPythonApplication rec { pname = "conan"; + version = "2.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; - rev = version; - hash = "sha256-2DNDNdZO1D30egOiYa3qw8F2xsUTBOm/CHv07v5OrC8="; + rev = "refs/tags/${version}"; + hash = "sha256-yx/MO5QAVKnGraQXJitXxaZooLtBqa+L04s73DwiE14="; }; - propagatedBuildInputs = with newPython.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ bottle colorama python-dateutil - deprecation distro fasteners - future jinja2 - node-semver patch-ng pluginbase pygments @@ -59,33 +33,58 @@ in newPython.pkgs.buildPythonApplication rec { pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152 pyyaml requests - six tqdm urllib3 - ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ]; + ] ++ lib.optionals stdenv.isDarwin [ + idna + cryptography + pyopenssl + ]; nativeCheckInputs = [ - pkg-config git - ] ++ (with newPython.pkgs; [ - codecov + pkg-config + zlib + ] ++ (with python3.pkgs; [ mock - nose parameterized + pytest-xdist + pytestCheckHook webtest ]); - # TODO: reenable tests now that we fetch tests w/ the source from GitHub. - # Not enabled right now due to time constraints/failing tests that I didn't have time to track down - doCheck = false; + pythonImportsCheck = [ + "conan" + ]; - postPatch = '' - substituteInPlace conans/requirements.txt --replace 'PyYAML>=3.11, <6.0' 'PyYAML>=3.11' - ''; + pytestFlagsArray = [ + "-n" + "$NIX_BUILD_CORES" + ]; + + disabledTests = [ + # Tests require network access + "TestFTP" + ]; + + disabledTestPaths = [ + # Requires cmake, meson, autotools, apt-get, etc. + "conans/test/functional/command/new_test.py" + "conans/test/functional/command/test_install_deploy.py" + "conans/test/functional/layout/test_editable_cmake.py" + "conans/test/functional/layout/test_in_subfolder.py" + "conans/test/functional/layout/test_source_folder.py" + "conans/test/functional/toolchains/" + "conans/test/functional/tools_versions_test.py" + "conans/test/functional/tools/system/package_manager_test.py" + "conans/test/functional/util/test_cmd_args_to_string.py" + "conans/test/unittests/tools/env/test_env_files.py" + ]; meta = with lib; { - homepage = "https://conan.io"; description = "Decentralized and portable C/C++ package manager"; + homepage = "https://conan.io"; + changelog = "https://github.com/conan-io/conan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ HaoZeke ]; }; diff --git a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch b/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch deleted file mode 100644 index da5e923e0fa52..0000000000000 --- a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/CorrosionConfig.cmake.in b/cmake/CorrosionConfig.cmake.in -index c042a00..491f53c 100644 ---- a/cmake/CorrosionConfig.cmake.in -+++ b/cmake/CorrosionConfig.cmake.in -@@ -4,11 +4,11 @@ if (Corrosion_FOUND) - return() - endif() - --list(APPEND CMAKE_MODULE_PATH "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_DATADIR@/cmake") -+list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_FULL_DATADIR@/cmake") - - add_executable(Corrosion::Generator IMPORTED GLOBAL) - set_property( - TARGET Corrosion::Generator -- PROPERTY IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_LIBEXECDIR@/corrosion-generator") -+ PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_LIBEXECDIR@/corrosion-generator") - - include(Corrosion) diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 886db356cfa14..bee465fbfd885 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo="; + hash = "sha256-dXUjQmKk+UdgYqdMuNh9ALaots1t0xwg6hEWwAbGPJc="; }; cargoRoot = "generator"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q="; + hash = "sha256-f+n/bjjdKar5aURkPNYKkHUll6lqNa/dlzq3dIFh+tc="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index d8a797dc9189f..5f92214d404da 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -134,9 +134,9 @@ rec { }; gradle_6 = gen { - version = "6.9.3"; + version = "6.9.4"; nativeVersion = "0.22-milestone-20"; - sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw"; + sha256 = "16iqh4bn7ndch51h2lgkdqyyhnd91fdfjx55fa3z3scdacl0491y"; defaultJava = jdk11; }; } diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 5591b1634236c..23e11a324337c 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,19 +1,26 @@ { lib +, stdenv , fetchpatch , installShellFiles , ninja , pkg-config , python3 +, zlib +, coreutils , substituteAll +, Foundation +, OpenGL +, AppKit +, Cocoa }: python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.64.1"; + version = "1.0.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-Oo4DDCM094IIX4FicGLMbUpnce3zHgVf/jdPnmsImrk="; + hash = "sha256-qlCkukVXwl59SERqv96FeVfc31g4X/++Zwug6O+szgU="; }; patches = [ @@ -52,6 +59,9 @@ python3.pkgs.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 ./boost-Do-not-add-system-paths-on-nix.patch + # Nixpkgs cctools does not have bitcode support. + ./disable-bitcode.patch + # Fix passing multiple --define-variable arguments to pkg-config. # https://github.com/mesonbuild/meson/pull/10670 (fetchpatch { @@ -61,17 +71,38 @@ python3.pkgs.buildPythonApplication rec { "docs/yaml/objects/dep.yaml" ]; }) + + # tests: avoid unexpected failure when cmake is not installed + # https://github.com/mesonbuild/meson/pull/11321 + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/a38ad3039d0680f3ac34a6dc487776c79c48acf3.patch"; + hash = "sha256-9YaXwc+F3Pw4BjuOXqva4MD6DAxX1k5WLbn0xzwuEmw="; + }) ]; setupHook = ./setup-hook.sh; - # Meson included tests since 0.45, however they fail in Nixpkgs because they - # require a typical building environment (including C compiler and stuff). - # Just for the sake of documentation, the next lines are maintained here. - doCheck = false; nativeCheckInputs = [ ninja pkg-config ]; + checkInputs = [ zlib ] + ++ lib.optionals stdenv.isDarwin [ Foundation OpenGL AppKit Cocoa ]; checkPhase = '' - python ./run_project_tests.py + runHook preCheck + + patchShebangs 'test cases' + substituteInPlace 'test cases/native/8 external program shebang parsing/script.int.in' \ + --replace /usr/bin/env ${coreutils}/bin/env + # requires git, creating cyclic dependency + rm -r 'test cases/common/66 vcstag' + # requires glib, creating cyclic dependency + rm -r 'test cases/linuxlike/6 subdir include order' + rm -r 'test cases/linuxlike/9 compiler checks with dependencies' + # requires static zlib, see #66461 + rm -r 'test cases/linuxlike/14 static dynamic linkage' + # Nixpkgs cctools does not have bitcode support. + rm -r 'test cases/osx/7 bitcode' + HOME="$TMPDIR" python ./run_project_tests.py + + runHook postCheck ''; postFixup = '' @@ -84,6 +115,9 @@ python3.pkgs.buildPythonApplication rec { # Do not propagate Python rm $out/nix-support/propagated-build-inputs + + substituteInPlace "$out/share/bash-completion/completions/meson" \ + --replace "python3 -c " "${python3.interpreter} -c " ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/pkgs/development/tools/build-managers/meson/disable-bitcode.patch new file mode 100644 index 0000000000000..a72997c104399 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/disable-bitcode.patch @@ -0,0 +1,24 @@ +--- a/mesonbuild/compilers/mixins/clang.py ++++ b/mesonbuild/compilers/mixins/clang.py +@@ -56,10 +56,6 @@ class ClangCompiler(GnuLikeCompiler): + {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'), + OptionKey('b_thinlto_cache_dir')}) + +- # TODO: this really should be part of the linker base_options, but +- # linkers don't have base_options. +- if isinstance(self.linker, AppleDynamicLinker): +- self.base_options.add(OptionKey('b_bitcode')) + # All Clang backends can also do LLVM IR + self.can_compile_suffixes.add('ll') + +--- a/mesonbuild/linkers/linkers.py ++++ b/mesonbuild/linkers/linkers.py +@@ -785,7 +785,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): + return self._apply_prefix('-headerpad_max_install_names') + + def bitcode_args(self) -> T.List[str]: +- return self._apply_prefix('-bitcode_bundle') ++ raise MesonException('Nixpkgs cctools does not support bitcode bundles') + + def fatal_warnings(self) -> T.List[str]: + return self._apply_prefix('-fatal_warnings') diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 966937deffa82..6ede440cc6119 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.10"; + version = "0.10.11"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-Qen3z2qbgyHHYUscBh7Udc1/c82WDLnDIsZJF+tcR5M="; + hash = "sha256-B47C7sqOqiHa/2kC5lk/J1pXK61l1M5umVKaCfVO7cc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index f80f0289dbe8d..84897e43f7862 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -9,6 +9,7 @@ , libxslt , python3 , re2c +, buildPackages , buildDocs ? true }: @@ -23,6 +24,8 @@ stdenv.mkDerivation rec { hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ python3 re2c @@ -35,10 +38,25 @@ stdenv.mkDerivation rec { libxslt.bin ]; + postPatch = '' + # write rebuild args to file after bootstrap + substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])" + ''; + buildPhase = '' runHook preBuild + # for list of env vars + # see https://github.com/ninja-build/ninja/blob/v1.11.1/configure.py#L264 + CXX="$CXX_FOR_BUILD" \ + AR="$AR_FOR_BUILD" \ + CFLAGS="$CFLAGS_FOR_BUILD" \ + CXXFLAGS="$CXXFLAGS_FOR_BUILD" \ + LDFLAGS="$LDFLAGS_FOR_BUILD" \ python configure.py --bootstrap + python configure.py + + source rebuild_args '' + lib.optionalString buildDocs '' # "./ninja -vn manual" output copied here to support cross compilation. asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index aa49b956edc8d..1d7f2cc389972 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index aa7f997d1935f..81f6c8dcff676 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 = "5eeee846642c8226931263ed758ef80f077cadaf"; - version = "2022-11-11"; + rev = "32c96866364964b3e2f7272e0f9ef3e1a76ea7d7"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "2eUGQa0SdfnENbnjy9ZDxd0lKhUrzmTyDLB4fupqVIs="; + sha256 = "AgwqWmNkUkyQDu6R8LO86/JYJJHI6ZjEhPglt/jWBRY="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 85a3563f020c3..f49972839a090 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "0.1.20", + "version": "0.2.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0gb6xmv5qm77nfn49p7r180hz91a3kpilw27s9all8zcmca2xhml" + "sha256": "0fv4ph1pf924wf3vmzri68s79i4kxgmp2fl9qy9v14ff71bbnyv5" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1ax9yqzp4l7aa74x3lgr75h58pl3w92921fjsg8yw3imi2j57h09" + "sha256": "1h5kvd1wf6x3xis15bdrsvrivs8zmbvggcaspr9brsjw38q13c7q" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1i5g8afgcg701g7n22sgbs2639mlwgjmr5jhmw7bz6wvj8h5nz1z" + "sha256": "1p4gkghbfs5cac4k7760nnsdf7m5i5d4f568m8xsyfx8nkhpyw1w" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0a53kxhl9n6p9mblk4r0zy8aklhpsvkg0g42il8hqvf72y0kl4ks" + "sha256": "0xk4n71lgg91kkjk0633sz04s2ypyjkig9vsxg60b16gzm7z4j22" } } } diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 9202543ea9041..5fc102546a226 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -37,8 +37,8 @@ let in rec { shards_0_17 = generic { - version = "0.17.1"; - hash = "sha256-YAsFsMoZVUINnIQzYNjE7/hpvipmyU5DrLJJrk9TkHs="; + version = "0.17.2"; + hash = "sha256-2HpoMgyi8jnWYiBHscECYiaRu2g0mAH+dCY1t5m/l1s="; }; shards = shards_0_17; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 8fcb5f2dbac15..4e42927d0293a 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "waf"; - version = "2.0.24"; + version = "2.0.25"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "${pname}-${version}"; - sha256 = "sha256-nunPDYAy0yfDJpsc+E8SyyFLny19wwrVzxeUOhh7nc4="; + sha256 = "sha256-wqZEAfGRHhcd7Xm2pQ0FTjZGfuPafRrZAUdpc7ACoEA="; }; nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 2131caede3c8c..f0f3a683aab01 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 747abef1e9821..4f5d440858eff 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -15,18 +15,18 @@ buildGoModule rec { pname = "buildah"; - version = "1.28.2"; + version = "1.29.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-1WB+lm2k7q4xViCUBhvCSuMCIlCMlAJ9etRajwGyOQs="; + hash = "sha256-g8Y4ZmQvDbzM7rG1otTxm+SRl/sK3sLM2SOWrBseOPQ="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 0b8478164f223..11c0d85ee4746 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-zRkfH/CHLoulB/IDq2VPc8a6N2wMzX0Ws9oE9339VOQ="; + hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY="; }; vendorHash = null; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 6863ef9e0fd29..aa67ba4393a94 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.2"; + version = "1.14.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-sbX7IYFcU9gwKzHKC8xtmZKVE2XImeNT4RYOx+cSI2Y="; + sha256 = "sha256-50Dn04VixejYfMgXVIstuU5CgC6aB3T99nTnWP95aU0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index d3d0b4293acf0..22ce9a40f913e 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -1,7 +1,5 @@ { lib, fetchFromGitHub, buildGoModule }: -with lib; - buildGoModule rec { pname = "butane"; version = "0.17.0"; @@ -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/changie/default.nix b/pkgs/development/tools/changie/default.nix index 0bf4f9be5920f..79d105128ba96 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -1,28 +1,40 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "changie"; - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-1UUF82sYzZDzlhPD8R8QIfR/Vm/9uUAxHzai+A1FCaQ="; + sha256 = "sha256-IZiGNmVEOJf7sqJHXCXxptfy79mSnyyyiqf+oS41MgI="; }; - vendorSha256 = "sha256-oz327wlTrFCj8Hf1wPiND40Ew4kBB/k5doj1us8lhm4="; + vendorSha256 = "sha256-0/3Ou8z6yLWhc81hdN2gkaFLLlKQWUGcIdvRHVLTrjQ="; - patches = [ ./skip-flaky-test.patch ]; + nativeBuildInputs = [ + installShellFiles + ]; ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; + postInstall = '' + installShellCompletion --cmd changie \ + --bash <($out/bin/changie completion bash) \ + --fish <($out/bin/changie completion fish) \ + --zsh <($out/bin/changie completion zsh) + ''; + meta = with lib; { + description = "Automated changelog tool for preparing releases with lots of customization options"; homepage = "https://changie.dev"; 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 48c038ecf624d..0000000000000 --- 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 7c25ddd34cdda..7c55194bc8574 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,19 +4,21 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.18.3"; + version = "0.21.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - sha256 = "sha256-9Ejcxr/22rJu8JoC7WspLfzF08elz4TaGagDeV0zIXk="; + hash = "sha256-7cXnV27LCG1MXDH28UBmUC4sLooH2gKvGYF3YijLB38="; }; propagatedBuildInputs = [ ruamel-yaml jsonschema - identify requests click ]; @@ -37,9 +39,15 @@ buildPythonApplication rec { export no_proxy='*'; ''; + pythonImportsCheck = [ + "check_jsonschema" + "check_jsonschema.cli" + ]; + meta = with lib; { description = "A jsonschema CLI and pre-commit hook"; homepage = "https://github.com/python-jsonschema/check-jsonschema"; + changelog = "https://github.com/python-jsonschema/check-jsonschema/blob/${version}/CHANGELOG.rst"; license = licenses.apsl20; maintainers = with maintainers; [ sudosubin ]; }; diff --git a/pkgs/development/tools/click/dbus-test-runner.patch b/pkgs/development/tools/click/dbus-test-runner.patch new file mode 100644 index 0000000000000..c705cf99aa7cc --- /dev/null +++ b/pkgs/development/tools/click/dbus-test-runner.patch @@ -0,0 +1,23 @@ +diff --git a/click_package/Makefile.am b/click_package/Makefile.am +index 4981d74..9df9e79 100644 +--- a/click_package/Makefile.am ++++ b/click_package/Makefile.am +@@ -1,5 +1,3 @@ +-SUBDIRS = tests +- + noinst_SCRIPTS = paths.py + CLEANFILES = $(noinst_SCRIPTS) + +diff --git a/configure.ac b/configure.ac +index 8f4dc9e..adbd366 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,8 +52,6 @@ PKG_CHECK_MODULES([SERVICE], [ + AC_SUBST([SERVICE_CFLAGS]) + AC_SUBST([SERVICE_LIBS]) + +-AC_CHECK_PROG(DBUS_TEST_RUNNER_CHECK,dbus-test-runner,yes) +-AS_IF([test "${DBUS_TEST_RUNNER_CHECK}" != "yes"], [AC_MSG_ERROR([dbus-test-runner not found])]) + AC_CHECK_PROG(GDBUS_CHECK,gdbus,yes) + AS_IF([test "${GDBUS_CHECK}" != "yes"], [AC_MSG_ERROR([gdbus (glib) not found])]) + diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix new file mode 100644 index 0000000000000..4adaf11088b82 --- /dev/null +++ b/pkgs/development/tools/click/default.nix @@ -0,0 +1,86 @@ +{ lib +, fetchFromGitLab +, buildPythonApplication +, autoreconfHook +, debian +, perl +, vala +, pkg-config +, libgee +, json-glib +, properties-cpp +, gobject-introspection +, getopt +, setuptools +, pygobject3 +, wrapGAppsHook +}: + +buildPythonApplication { + pname = "click"; + version = "unstable-2023-02-22"; + format = "other"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/click"; + rev = "aaf2735e8e6cbeaf2e429c70136733513a81718a"; + sha256 = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw="; + }; + + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + preFixup = '' + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib" + ) + ''; + + preConfigure = '' + export click_cv_perl_vendorlib=$out/${perl.libPrefix} + export PYTHON_INSTALL_FLAGS="--prefix=$out" + ''; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + gobject-introspection + vala + getopt + wrapGAppsHook + ]; + + # Tests were omitted for time constraint reasons + doCheck = false; + + enableParallelBuilding = true; + + patches = [ + # dbus-test-runner not packaged yet, otherwise build-time dependency even when not running tests + ./dbus-test-runner.patch + ]; + + buildInputs = [ + libgee + json-glib + properties-cpp + ]; + + propagatedBuildInputs = [ + debian + pygobject3 + setuptools + ]; + + meta = { + description = "A tool to build click packages. Mainly used for Ubuntu Touch."; + homepage = "https://gitlab.com/ubports/development/core/click"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ilyakooo0 OPNA2608 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix index 093e015d36e27..dfbac9aac0bab 100644 --- a/pkgs/development/tools/clickable/default.nix +++ b/pkgs/development/tools/clickable/default.nix @@ -7,17 +7,19 @@ , jsonschema , argcomplete , pytestCheckHook +, watchdog +, stdenv }: buildPythonPackage rec { pname = "clickable"; - version = "7.4.0"; + version = "7.11.0"; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - sha256 = "sha256-QS7vi0gUQbqqRYkZwD2B+zkt6DQ6AamQO7sihD8qWS0="; + sha256 = "sha256-OVS+FK2ABoKbBFLDc3drcjeaa3yO9/8Ah8FzlN2fd8g="; }; propagatedBuildInputs = [ @@ -26,18 +28,51 @@ buildPythonPackage rec { pyyaml jsonschema argcomplete + watchdog ]; nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # Test require network connection + # Tests require docker "test_cpp_plugin" "test_html" "test_python" "test_qml_only" "test_rust" - ]; + "test_review" + "test_click_build" + "test_no_device" + "test_no_file_temp" + "test_update" + "test_lib_build" + "test_clean" + "test_temp_exception" + "test_create_interactive" + "test_create_non_interactive" + "test_kill" + "test_writable_image" + "test_no_desktop_mode" + "test_no_lock" + "test_run_default_command" + "test_run" + "test_no_container_mode_log" + "test_custom_mode_log" + "test_skip_desktop_mode" + "test_log" + "test_custom_lock_file" + "test_launch_custom" + "test_launch" + "test_devices" + "test_install" + "test_skip_container_mode" + ] ++ + # There are no docker images available for the aarch64 architecutre + # which are required for tests. + lib.optionals stdenv.isAarch64 [ + "test_arch" + "test_restricted_arch" + ]; meta = { description = "A build system for Ubuntu Touch apps"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 81b876bf455f9..6b0ddc25d110e 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 = "2023.01.16"; + version = "2023.02.17"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-pTqzgNtllx7yaStn9H3WDz03h2na3Uh2k2O7t6lVH98="; + sha256 = "sha256-HVwZZ280ZABgG/LAAaRfq6wYmUF1c2ojR7XLMCwVSk0="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 46e2a7801f693..f08d020f41913 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/cobra-cli/default.nix b/pkgs/development/tools/cobra-cli/default.nix index 989c2f161f6d7..a3f277259f2bb 100644 --- a/pkgs/development/tools/cobra-cli/default.nix +++ b/pkgs/development/tools/cobra-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, go }: buildGoModule rec { pname = "cobra-cli"; @@ -13,6 +13,22 @@ buildGoModule rec { vendorSha256 = "sha256-vrtGPQzY+NImOGaSxV+Dvch+GNPfL9XfY4lfCHTGXwY="; + nativeBuildInputs = [ makeWrapper ]; + + allowGoReference = true; + + postPatch = '' + substituteInPlace "cmd/add_test.go" \ + --replace "TestGoldenAddCmd" "SkipGoldenAddCmd" + substituteInPlace "cmd/init_test.go" \ + --replace "TestGoldenInitCmd" "SkipGoldenInitCmd" + ''; + + postFixup = '' + wrapProgram "$out/bin/cobra-cli" \ + --prefix PATH : ${go}/bin + ''; + meta = with lib; { description = "Cobra CLI tool to generate applications and commands"; homepage = "https://github.com/spf13/cobra-cli/"; diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index af3a32bb9d69b..e4217f06e22a9 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.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-BqyV4hJw7H9yN5Kj/XwhYS6hElXdKUJEUi5M/PNlPO0="; + sha256 = "sha256-Z0snC5NomUWzxI2qcRMxdZbC1aOQ8P2Ll9EdVfhP7ZU="; }; - cargoHash = "sha256-MA3XW2tPn0qVx7ve+UqCoG4nQ7UyuvXEebrPuLKqS4g="; + 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/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix index 2b17f00863b02..186b8b4fdb737 100644 --- a/pkgs/development/tools/codeowners/default.nix +++ b/pkgs/development/tools/codeowners/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "codeowners"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hmarr"; repo = pname; rev = "v${version}"; - hash = "sha256-lklKZCDX/e3MZ0ix3A4AIEICPoufBq7SAIULqDXOYDI="; + hash = "sha256-bjSlt439Y5hmbxR6s4J37ao+P2tuKNuwqRg872P+MUg="; }; - vendorSha256 = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; + vendorHash = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; meta = with lib; { description = "A CLI and Go library for Github's CODEOWNERS file"; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 6998c9b8fb1c1..e5f017de1e1ef 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.14.3"; + version = "0.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-S+s6cOO2iISW3x+JM6mkpAC6KJv/x84RgXuaiFHZs+I="; + hash = "sha256-FHBaefwSGZXwn1jdU7zK8WhwjarknvyeUJTlhmk/hPM="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-nqmwwdIOm6jTPTAuvIqPf0xgVgIbKsUIs0Mbfka0jyU="; + vendorHash = "sha256-+AvmJkZCFovE2+5Lg98tUvA7f2kBHUMzhl5IyrEGuy8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index 60221444da0d8..ac2d36c92391f 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -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,6 +37,10 @@ let ocamlPackages.mparser ocamlPackages.mparser-pcre ocamlPackages.angstrom + ocamlPackages.ppx_deriving + ocamlPackages.ppx_deriving_yojson + ocamlPackages.ppx_sexp_conv + ocamlPackages.ppx_sexp_message ] ++ extraBuildInputs; nativeCheckInputs = [ cacert ]; @@ -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 9da2276010244..d122d5ea88e6f 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-kbWRjOXfDTVI07KuMQHcyxjenc7fW4oWRgyThzO0Pac="; + hash = "sha256-CSvsHp89FugOQ0PLb26PH1nnw5bOVk7bU5q3lJh0HiU="; }; - vendorHash = "sha256-8ZGZzb7Ikfk9DZQ6zyB+4JJuqyo4nlBDhGWUb8MtSys="; + vendorHash = "sha256-HMHG7vGfic9ZseTyM9Fs2fFsJzMTKjHpz67I+WkMJXk="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 91ad0b3ee9074..4524224cd69c3 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.9"; + version = "0.3.12"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-tq3b/4ysGG7fozIou1cvWs+BJSe9rPDYKaV2GT3hLGE="; + hash = "sha256-70qN5cZb0EjBPE5xpeKUv46JD+B8rYaDejAfaqC0Y4M="; }; - vendorHash = "sha256-8FjzL++AFNhHvk9ipeVK3tmPMEgTKg8Fz/vJZMEAPJE="; + vendorHash = "sha256-9a5W8+tQ5rhtq4uul84AtxcKOc25lfe7bMpgbhRT9/Y="; proxyVendor = true; subPackages = [ 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 0000000000000..6dfb50271a49b --- /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 <jake@hillion.co.uk> +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 e9bd040f67817..0000000000000 --- 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 6d0c414fe3bcf..ccbadee62028c 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,26 +1,31 @@ -{ 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="; + src = fetchFromGitHub { + owner = "harness"; + repo = "drone-cli"; + rev = revision; + hash = "sha256-PZ0M79duSctPepD5O+NdJZKhkyR21g/4P6loJtoWZiU="; + }; - doCheck = false; + vendorSha256 = "sha256-JC7OR4ySDsVWmrBBTjpwZrkJlM8RJehbsvXW/VtA4VA="; - patches = [ ./0001-use-different-upstream-for-gomod.patch ]; + # 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}" ]; - src = fetchFromGitHub { - owner = "harness"; - repo = "drone-cli"; - rev = revision; - sha256 = "sha256-TVOj1C5X3fTRZF29hId13LjkkwaAFntlozpmYVUfVJI="; - }; + doCheck = false; meta = with lib; { mainProgram = "drone"; 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 0000000000000..1d15cdc604790 --- /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 9e4dda5475448..136e7c9baf842 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -22,8 +22,9 @@ buildGoModule rec { 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 20ba407e3d03c..fbdcbcde7c454 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.9.0"; + version = "7.9.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-YatN0VG3oEUK+vzJzthRnX+EkvUgKq2uIunAoPMoRag="; + sha256 = "sha256-ySyarky92+VSo/KzQFrWeh35KDMTQDV34F5iFrARHJs="; }; - vendorSha256 = "sha256-nX0r/7V+rgJb3/9O91QskYzBpWXIca7m3Do1QtGuHgg="; + vendorHash = "sha256-Oy1wP82ZhdpGHs/gpfdveOK/jI9yuo0D3JtxjLg+W/w="; 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 143362d98a4cf..b1ff6a76f5413 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.301.1"; + version = "2.302.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-GIWuN3/CnA0uZfpo1Gty+5tL2eDXmFyzYFHrRozHwk0="; + hash = "sha256-l7kGKhHpE5kEo8QMmwZKnG4cctj2INhnko7KfAXfrQ8="; }; nativeBuildInputs = [ @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse ]; + maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; platforms = attrNames runtimeIds; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 14984ba9519ed..29d9412137a92 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.8.0"; + version = "15.8.2"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g="; + sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3e909be05915b..98aff1787616c 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.375.2"; + version = "2.375.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-5XJSX3+kOwguIolvclcCl9iNrsTzarTyX9rcqIX5VJI="; + hash = "sha256-1WBl8eXEMj/sNqlqv3cQskUeNLxPudoXnn3xKaTMwaw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index c3b0af4e8226f..34cc516e0bf31 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.15"; + version = "0.4.0"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a/C93Uuf++FIBqZSA0LaUQX4ZQoUMD2lHnV5MRlCw4g="; + sha256 = "sha256-Fv1yaBnfn/wik1Ix24shwfritwxno3NoeJgHPsHgZOI="; }; - cargoHash = "sha256-JQvLezX8L2yEDyiVxH93Uk1V5qFjwXNVQWEI9ur9YOQ="; + cargoHash = "sha256-q0VrN+5Ypq4ga/gI5MlyRaMdD8NxzuaZ804KaRQzpRs="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/development/tools/cosmoc/default.nix deleted file mode 100644 index e64cf02e9f7e9..0000000000000 --- a/pkgs/development/tools/cosmoc/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, cosmopolitan }: - -stdenv.mkDerivation { - pname = "cosmoc"; - inherit (cosmopolitan) version; - - doInstallCheck = true; - dontUnpack = true; - dontBuild = true; - - # compiler arguments based on upstream README.md - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cat <<EOF >$out/bin/cosmoc - #!${stdenv.shell} - exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \ - -Os -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ - -fno-omit-frame-pointer -pg -mnop-mcount -mno-tls-direct-seg-refs \ - "\$@" \ - -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds -Wl,--gc-sections \ - -include ${cosmopolitan}/include/cosmopolitan.h \ - ${cosmopolitan}/lib/{crt.o,ape-no-modify-self.o,cosmopolitan.a} - EOF - chmod +x $out/bin/cosmoc - runHook postInstall - ''; - - installCheckPhase = '' - printf 'main() { printf("hello world\\n"); }\n' >hello.c - $out/bin/cosmoc hello.c - ./a.out - ''; - - meta = with lib; { - homepage = "https://justine.lol/cosmopolitan/"; - description = "compiler for Cosmopolitan C programs"; - license = licenses.mit; - maintainers = teams.cosmopolitan.members; - }; -} diff --git a/pkgs/development/tools/cosmocc/default.nix b/pkgs/development/tools/cosmocc/default.nix new file mode 100644 index 0000000000000..71028d1a1968f --- /dev/null +++ b/pkgs/development/tools/cosmocc/default.nix @@ -0,0 +1,35 @@ +{ runCommand, lib, cosmopolitan }: + +let + cosmocc = + runCommand "cosmocc" + { + pname = "cosmocc"; + inherit (cosmopolitan) version; + + meta = with lib; { + homepage = "https://justine.lol/cosmopolitan/"; + description = "compilers for Cosmopolitan C/C++ programs"; + license = licenses.mit; + maintainers = teams.cosmopolitan.members; + }; + passthru.tests = { + cc = runCommand "c-test" { } '' + cat > hello.c << END + #include <stdio.h> + int main() { + printf("Hello world!\n"); + return 0; + } + END + ${cosmocc}/bin/cosmocc hello.c + ./a.out > $out + ''; + }; + } '' + mkdir -p $out/bin + install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin + sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/* + ''; +in +cosmocc diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index 9689df362aa87..a8b53faf0a54d 100644 --- a/pkgs/development/tools/cpm-cmake/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.36.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA="; + hash = "sha256-oNM455CEZZmnmkHNtponWqT1BZltl53FFFVKL3L+SsE="; }; dontConfigure = true; diff --git a/pkgs/development/tools/csvq/default.nix b/pkgs/development/tools/csvq/default.nix new file mode 100644 index 0000000000000..badc9aba08b37 --- /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 f4b155da72651..182ad8e484f71 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.15"; + version = "0.8.17"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; + hash = "sha256-vX2U6bkl8ms31zIjXOy/3vw/q9ul74x9TEpsLu5o6XI="; }; - vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; + vendorHash = "sha256-zlMCfa94gYLWDYC9YOzhLYs5khzmDk8a/2MljpSoFng="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 09c3fce04def5..baa7ebf562038 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.16.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE="; + sha256 = "sha256-5hjAP2+0hbYcA9G7YJyRqqp1ZC8LzFDomjeFjl4z4FY="; }; - vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM="; + vendorHash = "sha256-7fC1jJMY/XK+GX5t2/o/k+EjFxAlRAmiemMcWaZhL9o="; doCheck = false; diff --git a/pkgs/development/tools/database/pgagroal/default.nix b/pkgs/development/tools/database/pgagroal/default.nix new file mode 100644 index 0000000000000..e86e19f8f2e1c --- /dev/null +++ b/pkgs/development/tools/database/pgagroal/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, docutils, libev, openssl, systemd }: + +stdenv.mkDerivation rec { + pname = "pgagroal"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "agroal"; + repo = "pgagroal"; + rev = version; + hash = "sha256-d6icEYlk0qnzmoP/mvSmTw16YfIYWc2WbY7sKguX7Ug="; + }; + + patches = [ ./do-not-search-libatomic.patch ]; + + nativeBuildInputs = [ cmake docutils ]; + + buildInputs = [ libev openssl systemd ]; + + meta = with lib; { + description = "High-performance connection pool for PostgreSQL"; + homepage = "https://agroal.github.io/pgagroal/"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch b/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch new file mode 100644 index 0000000000000..7f65205332b87 --- /dev/null +++ b/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch @@ -0,0 +1,15 @@ +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -78,12 +78,6 @@ + endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- find_package(Libatomic) +- if (LIBATOMIC_FOUND) +- message(STATUS "libatomic found") +- else () +- message(FATAL_ERROR "libatomic needed") +- endif() + + find_package(Systemd) + if (SYSTEMD_FOUND) diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index 4381dd83b62c3..9c6927136097f 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -2,13 +2,13 @@ GEM remote: https://rubygems.org/ specs: parallel (1.22.1) - pg (1.4.4) - pgsync (0.7.2) + pg (1.4.5) + pgsync (0.7.3) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.9.3) + slop (4.10.0) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index f556be4eb99da..3224efedfc12f 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; pgsync = { dependencies = ["parallel" "pg" "slop" "tty-spinner"]; @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "009xrrxqwcrcackw2w86xamkb1clb70ghcr8g8n8w9h13qaa0j78"; + sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.3"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf"; + sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb"; type = "gem"; }; - version = "4.9.3"; + version = "4.10.0"; }; tty-cursor = { groups = ["default"]; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index e42c42e14960c..591059676e1c0 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,19 +14,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.9.0"; + version = "4.10.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-Nxpv3ibhHTFiO0hqSrT1hqTK9Vb0P8Svu5riufCChwI="; + sha256 = "sha256-TFLwpKh+FsstcpvBfTw7CNcQOGGSNI9qf8WJ6v75uL8="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-PiDW7+LrCDfRpQirJlgaYDnGenowbsCmwQz1mbgA08E="; + cargoSha256 = "sha256-EPym9MLwTMGBbJkVMKD/NEc6Vfm7nI4FaDkqy/0B14Q="; nativeBuildInputs = [ pkg-config git ]; diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index ad9dd660315eb..a71576f7e81d0 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.16.0"; + version = "1.17.2"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-YxGMfGhcPT3Pcyxu1hAkadkJnEBMX26fE/rGfGSTsyc="; + sha256 = "sha256-30dIFo07C+noWdnq2sL1pEQZzTR4FfaV0FvyW4BxCU8="; }; proxyVendor = true; - vendorSha256 = "sha256-cMYTQ8rATCXOquSxc4iZ2MvxIaMO3RG8PZkpOwwntyc="; + vendorHash = "sha256-y5OYq1X4Y0DxFYW2CiedcIjhOyeHgMhJ3dMa+2PUCUY="; subPackages = [ "cmd/sqlc" ]; diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index 733282cd40677..ccf3bd4a23d3f 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, makeWrapper, requireFile, unzip, jdk }: let - version = "22.3.1"; - fileVersion = "1032109-01"; + version = "22.4.0.342.1212"; + fileVersion = "1032835-01"; in stdenv.mkDerivation { @@ -37,7 +37,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "0yqj8m2zwl8m7zxrzjnbl2rqnl2imn5h1bfpnmklp03nkakbzjbn"; + sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 572a9c46be61f..bc0eb9332c0a1 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.14"; + version = "1.8.27"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-VBFVoBPKT+yUELhKvMUvCAcjamhwvOAKYfO5iFnngjM="; + hash = "sha256-52xAm0D8yzUPvox1byHcyUTg8mILakOnVh8q0a2yR1M="; }; vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA="; diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 43207e5a9c9d6..3bacd85ced63d 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-peqLeZ8RxkvaqUER2FBQeTdy1AQ/+Bcz9gGOGz1CACc="; + sha256 = "sha256-p138Jg5jqflabroaBy3Dj9K9cif0tcM7r9dluf4tsH4="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 8817a5726cb20..da630f0d1cf32 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.2.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-n2zFfa+UlrAOvBtqF+FkF+oSF1t/7Hg79um7Rl8yTCc="; + hash = "sha256-Wm8IpXmxBm6Ifh7fV9viKAfIC8BdjN1prpUyeI9eNXE="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-pZ9s2i62uMebGLpWerOkSJLxShD06vY4MybqM9ZcdGc="; + vendorHash = "sha256-5uh1G+puVVG0A1d+R4pZfbv63zyB86ihBjzoT63Xf1s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 27af4acb352ba..906711a81386d 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,32 +1,19 @@ { lib -, argon2-cffi-bindings -, buildPythonApplication -, check-manifest -, devpi-common , devpi-server -, fetchPypi , git , glibcLocales -, mercurial -, mock -, pkginfo -, pluggy -, py -, pytestCheckHook -, setuptools -, sphinx -, tox -, webtest -, wheel +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "5.2.3"; + version = "6.0.3"; - src = fetchPypi { + format = "setuptools"; + + src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw="; + hash = "sha256-csdQUxnopH+kYtoqdvyXKNW3fGkQNSREJYxjes9Dgi8="; }; postPatch = '' @@ -38,12 +25,16 @@ buildPythonApplication rec { glibcLocales ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ argon2-cffi-bindings + build check-manifest devpi-common + iniconfig + pep517 pkginfo pluggy + platformdirs py setuptools ]; @@ -51,14 +42,16 @@ buildPythonApplication rec { nativeCheckInputs = [ devpi-server git + ] ++ (with python3.pkgs; [ mercurial mock + pypitoken pytestCheckHook sphinx - tox + virtualenv webtest wheel - ]; + ]); preCheck = '' export HOME=$(mktemp -d); @@ -74,8 +67,9 @@ buildPythonApplication rec { __darwinAllowLocalNetworking = true; meta = with lib; { - homepage = "http://doc.devpi.net"; description = "Client for devpi, a pypi index server and packaging meta tool"; + homepage = "http://doc.devpi.net"; + changelog = "https://github.com/devpi/devpi/blob/client-${version}/client/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; }; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 8cdb533da8e03..1b128a51d0b1c 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-968LGj2b8qLs/YQ1DxC1s/xf5qUwnrd8xu5iKrqNN+Y="; + sha256 = "sha256-SqboPBqK7gDVTTjGgCUB9oIGBZR55EA7x65a0wumiKw="; }; nativeBuildInputs = [ @@ -18,16 +18,15 @@ stdenv.mkDerivation rec { bison ]; - buildInputs = - lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) - ++ lib.optional stdenv.isSunOS libiconv - ++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; + buildInputs = [ libiconv ] + ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; meta = { diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 512f7aeb7bd58..05da1f3aa0c10 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2022.2"; + version = "2023.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - sha256 = "JlQ5ENdqedYvZnEihWkqO2KnXzHQfLvupG7sfjTmOlQ="; + sha256 = "qaaHwbfEpBOaIUvUUeAcqGExoxYfaKo+BzJbBgArv7Y="; }; depsBuildBuild = [ @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { markdown markupsafe pygments - toml + toml # remove once python311 is the default typogrify ]; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index e9bf373451332..85f19d899ed65 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/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index cfbf2752c03a4..090454ab87d04 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.34.4"; + version = "0.34.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-JCCmGlvL2OLkeq25lCzVRXvmVCAvkwO4yD81gbKmSsw="; + sha256 = "sha256-kdpiOeXizCHLxEWlq991T6h7sbt0chu7Dou8V8yad94="; }; - cargoHash = "sha256-5biUsZTLoYcEqOPJnzR8YpdN7U1ztXjprRhHTUxKCl4="; + cargoHash = "sha256-qzb2H9acWWIpG9tjFzU5ApHaBKfCYJcSSYjOWQnEebM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 2f26262143d1e..7dea51ef567e2 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.1"; + version = "2.2.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-XK//loEbKqE7DMxC9uzr+916i9E9wGHKl2MRtt1rNEg="; + hash = "sha256-rbpZXLtBPD77jZ+P6ljtrSfKYfhMUdsP/Eoi0cYxsqo="; }; - cargoSha256 = "sha256-2We/JKU1U5q5jzl9rVoDmuGYIPbo5ylMl2O4s3PClVE="; + cargoSha256 = "sha256-UUyoiyA9ykUnFavsAqo7gNMSYpQ9Lu29t4fn1oLj6gs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index f433c54ad5245..4a8f8bf2ac93d 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 index 5bfdb06600d0b..fe4108840c504 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -1,5 +1,5 @@ { buildFHSUserEnv -, electron_20 +, electron_22 , fetchFromGitHub , fetchYarnDeps , fixup_yarn_lock @@ -14,21 +14,21 @@ let pname = "electron-fiddle"; - version = "0.31.0"; - electron = electron_20; + version = "0.32.1"; + electron = electron_22; nodejs = nodejs-16_x; src = fetchFromGitHub { owner = "electron"; repo = "fiddle"; rev = "v${version}"; - hash = "sha256-GueLG+RYFHi3PVVxBTtpTHhfjygcQ6ZCbrp5n5I1gBM="; + hash = "sha256-k+cbg03mwvobyazIUqm+TO9OMYVFQICy4CtkUZmvkr8="; }; inherit (nodejs.pkgs) yarn; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-WVH1A0wtQl5nR1hvaL6mzm/7XBvo311FPKmsxB82e4U="; + hash = "sha256-3vM+YPIA3zeWBaEFXU5lFl+VaGmAY0Qdg4pSA6mIKl0="; }; electronDummyMirror = "https://electron.invalid/"; @@ -89,12 +89,14 @@ 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 [ diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/binary/default.nix index 5c0838fce73f4..95f155914f8b7 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -24,9 +24,9 @@ let in rec { - electron = electron_22; + electron-bin = electron_23-bin; - electron_9 = mkElectron "9.4.4" { + electron_9-bin = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c"; i686-linux = "40e37f8f908a81c9fac1073fe22309cd6df2d68e685f83274c6d2f0959004187"; @@ -35,7 +35,7 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.7" { + electron_10-bin = mkElectron "10.4.7" { x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995"; x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb"; i686-linux = "dd7fde9b3993538333ec701101554050b27d0b680196d0883ab563e8e696fc79"; @@ -44,7 +44,7 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.5.0" { + electron_11-bin = mkElectron "11.5.0" { x86_64-linux = "613ef8ac00c5abda425dfa48778a68f58a2e9c7c1f82539bb1a41afabbd6193f"; x86_64-darwin = "32937dca29fc397f0b15dbab720ed3edb88eee24f00f911984b307bf12dc8fd5"; i686-linux = "cd154c56d02d7b1f16e2bcd5650bddf0de9141fdbb8248adc64f6d607e5fb725"; @@ -54,7 +54,7 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.3" { + electron_12-bin = mkElectron "12.2.3" { armv7l-linux = "4de83c34987ac7b3b2d0c8c84f27f9a34d9ea2764ae1e54fb609a95064e7e71a"; aarch64-linux = "d29d234c09ba810d89ed1fba9e405b6975916ea208d001348379f89b50d1835c"; x86_64-linux = "deae6d0941762147716b8298476080d961df2a32d0f6f57b244cbe3a2553cd24"; @@ -64,7 +64,7 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.9" { + electron_13-bin = mkElectron "13.6.9" { armv7l-linux = "e70cf80ac17850f3291c19a89235c59a7a6e0c791e7965805872ce584479c419"; aarch64-linux = "cb570f77e46403a75b99740c41b297154f057dc3b9aa75fd235dccc5619972cf"; x86_64-linux = "5e29701394041ba2acd8a9bb042d77967c399b8fe007d7ffbd1d3e6bfdb9eb8a"; @@ -74,7 +74,7 @@ rec { headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc"; }; - electron_14 = mkElectron "14.2.9" { + electron_14-bin = mkElectron "14.2.9" { armv7l-linux = "02ae6cd9ec9c2dcb2f550923576a0c851fff3e796a5048dd3806947c541fd564"; aarch64-linux = "631ba0f716d0272931418de42468114360bd21ec72875605fc32d67620743d2c"; x86_64-linux = "0a62a41e8ac4592aba347c82f9c40f3fb4c84c7d00b6bb9501d02375cd49cb7d"; @@ -84,7 +84,7 @@ rec { headers = "181b2agnf4b5s81p2rdnd6wkw9c2ri4cv1x0wwf7rj60axvzvydm"; }; - electron_15 = mkElectron "15.5.2" { + electron_15-bin = mkElectron "15.5.2" { armv7l-linux = "da434095fd7cc17d85ebca5eab3510ec7ff73ace4edc933fe2f27a716ca711c0"; aarch64-linux = "bcec3f962c7acefc8690680a19df9d83721db7e5db55c7b7a8946365139457a6"; x86_64-linux = "a4a95888c313dbe279f5f9d9dfd99f56a2a1b6b905fb6cba3b284322fe19a530"; @@ -94,7 +94,7 @@ rec { headers = "0jbxazkjkm8g8b8d0ini2l4q9z7885mz5vyj74lf85lqdfqzgzc0"; }; - electron_16 = mkElectron "16.2.3" { + electron_16-bin = mkElectron "16.2.3" { armv7l-linux = "9b442b17349dcec08e6efadecf9d338a7f4b2955635fed2a78374af850ceee5d"; aarch64-linux = "eec581d162b494a7bcba4b0221f3beac9f359b48fb8612c83ce6ad7ac63094cd"; x86_64-linux = "2c032baff08b40f106dfcd86e7b63c6275f13e64d26b8c301af704563edf8600"; @@ -104,7 +104,7 @@ rec { headers = "1a9kb89iigwmahjwq14i74rr6gj21gmpc106pg0il73c50khaxpz"; }; - electron_17 = mkElectron "17.4.1" { + electron_17-bin = mkElectron "17.4.1" { armv7l-linux = "d1329468cb21039fb5b503fc813381f9be4d43422383b44f859b450be0e4200c"; aarch64-linux = "70d29bca5f884753341a11b0445ccf159c0f43dfae16eb60c53946582c3128b0"; x86_64-linux = "f9437a86947c418d92eabea14b268dcc4a5dde74cc6927530c1e9195e4aeddf8"; @@ -114,7 +114,7 @@ rec { headers = "064qnwv6gqn502r1cv7vi6ahvgyxcqq7mv0rmk2bxfpkr5x6hgmh"; }; - electron_18 = mkElectron "18.1.0" { + electron_18-bin = mkElectron "18.1.0" { armv7l-linux = "c2296f3f68938aab4cef07b747d2dd28973625b6717163b9c51fbcf1509fd8ff"; aarch64-linux = "13bd4998d0d86ccf4cb87d11f9581d5a6063b4585fc4828e130054527dfb9179"; x86_64-linux = "7f95069d58e6843e6ae2b8f02619d4dcef7db4c35bd6e90b903268d83b939fba"; @@ -124,7 +124,7 @@ rec { headers = "0gl30q2igr9c8sjlhyj5w57dm5navpkas5hnz9yl7sasbx66v10v"; }; - electron_19 = mkElectron "19.0.7" { + electron_19-bin = mkElectron "19.0.7" { armv7l-linux = "d6a6d2d7c0d658695783137d032a50f20843cdfe6582ef985451d741eef4dd32"; aarch64-linux = "58685d21bb92c2667d20063ab12aabc2e5c2518f3eda84e98a0fa2306456ce57"; x86_64-linux = "a4c20a068c54c238ae8c440ab8f46d39eda4168d6aa8cffcaae406800b539983"; @@ -133,30 +133,39 @@ 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-bin = 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-bin = 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.0.0" { - armv7l-linux = "f2b9c870c12d4cfd6a4ac23bf937d4a89cd34381aedc2c9a64f00f22ff984985"; - aarch64-linux = "7c031d1d907953399126e9ed072db66ab7c82e3aff29c8268c8c3a83f825f5de"; - x86_64-linux = "ea0f4ad9a91bef4d5918d73c27b2731a5a93fe8917ad13d9eca83f39c5acbf05"; - x86_64-darwin = "b072e64ae563997abed9b76e30b617dfc23a33d6bba6b85fdf30c0877a6215c2"; - aarch64-darwin = "79b700953a20f4055bf94f11d7a6be9d39a7545774b45ca487cf33482828ebfd"; - headers = "06fi1m6g0g81a1lkx11ryxbic0srp4iq2z2lf2449sjnaw1sh2hr"; + electron_22-bin = mkElectron "22.1.0" { + armv7l-linux = "9bad02cd8e8604400eb90d9bd8fa58b6e400321cea8db7e774908611f4fca2a2"; + aarch64-linux = "1d3e0011761f5ba05faf994a7f78cf518e49e0fef7e4528853e1bff9378d02cf"; + x86_64-linux = "543e5fa7f2b602c3cd7e62a358441faf6f490e738de9b0bd796ad65d6bbd35ee"; + x86_64-darwin = "969cad3fad6a03cbbc1658722cbf87547a8465c90dd4287fd5c03bd15bbf8a5b"; + aarch64-darwin = "4ebf838308e93ad9956f3ce3a14b8d41607ffec5cd2054818d0c91b79df101a2"; + headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; + }; + + electron_23-bin = mkElectron "23.1.1" { + armv7l-linux = "0f2db28e672021b3c03309155e36d94ec59c7541497847140d500fdec45baf09"; + aarch64-linux = "5b5b6bf0a40d063e2a21e2868f3f97ce08a400690389355f2b68d606d4ae614f"; + x86_64-linux = "4e820dc1ca957fbe9dbd168925ddf496b9b14c2001bbe5362159411a6bed0cea"; + x86_64-darwin = "fb93e045e57410ecf046aee46a0baf413c55256ab7cf170f648a53b5d2e2a055"; + aarch64-darwin = "49b0357aa21f317832dd8f620ff18cbf6bcd9aef264113ac67b9d306186c8eef"; + headers = "1jq77kqkcy234nsqlizkcmzqs3wsy53438r4cnhhyfr6zx50f5sb"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 76f2bc427590f..caa0150d4b445 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -32,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 "21.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/binary/print-hashes.sh index e43f1f922a948..e43f1f922a948 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/binary/print-hashes.sh diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 0aebdeeb47c36..3845f18c351da 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.17.3"; + version = "0.17.10"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-hqp5K+FOS+UzwIkUTLrw+q4PIQ9OV+8OKKx6wgXBnI0="; + hash = "sha256-qe7YCOIwp+MSa5VkwImdOea1aMcpWdor/13PIgGEkkw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index 9c1cf92868442..a9ea7bc2f8a43 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.9"; + version = "0.10.11"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dim/8RXBMZTITGlT7F7TdAK9S2ct7w01861QqeT2FZk="; + sha256 = "sha256-V5M7vXlBSQFX2YZ+Vjt63hLziWy0yuAbCMmSZFEO0OA="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-HcD7MnUBPevGDckiWitIcp0z97FJmW3D0f9SySdouq8="; + vendorHash = "sha256-oyFPycyQoYnN261kmGhkN9NMPMA6XChf4jXlYezKiCo="; meta = with lib; { description = "More expressive universal gRPC client"; diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/development/tools/explain/default.nix index 9b6e5fd763dee..47a9622be9441 100644 --- a/pkgs/development/tools/explain/default.nix +++ b/pkgs/development/tools/explain/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library and utility to explain system call errors"; - homepage = "http://libexplain.sourceforge.net"; + homepage = "https://libexplain.sourceforge.net"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ McSinyx ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 55fa760475d97..12eccd200ab64 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.15.4"; + version = "0.15.9"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-Dj4Wli1z4X8FgnthjPszC/h4EIeFiMO/YB5Rlkis5f8="; + sha256 = "sha256-DudZOIwpsa7VaOQMJ2P/mfWHWYwESNhDfIUbtMV5Es0="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 07448b21bb80d..fd15f24e53900 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -21,7 +21,7 @@ python.pkgs.buildPythonApplication rec { ''; preConfigure = '' - ${python.interpreter} setup.py compile_catalog + ${python.pythonForBuild.interpreter} setup.py compile_catalog ''; postInstall = '' diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2921a7b394456..3e3a137a57693 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.12.0"; + version = "9.15.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; + sha256 = "sha256-Ls7PGvpFfXEz93P+VSkI/w+mGjZPJr+Wrf+QdaDFtqE="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index 2145a3ab74c1d..3a66004bc3ada 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.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-OAdKt5RgLVoTmccN50TUwUAU7VLiTU9hEnDAKxKBRzI="; + sha256 = "sha256-tMlHhfPocm+n2aHG/XXbhElwPau8IHxEm6IrYaszcNQ="; }; - vendorSha256 = "sha256-Y9wfeAX0jt3KrpRa5kJi8V8WN/hp4jTcPCbvy0RDGRk="; + 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 0000000000000..803fb63c5e6c6 --- /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 42f76eb092be8..5a68519f660eb 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.12"; + version = "3.16.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kdy3bh76c2sgwAwSxzCs83jTVLJmnH0YcYtKH9UvJew="; + sha256 = "sha256-6U4mYS5ukcOaxGeIiI2UFYlz0PpjKdtQH9cOshYRUg0="; }; subPackages = [ "." ]; - vendorHash = "sha256-S45/wxwyoSBmHsttY+pQSE1Ipg7oH3RrCoBeuC1pxeo="; + vendorHash = "sha256-CbneZtwGab5dlGASZqa69Y70fXgt4PJzAODPJlcpJoA="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 170b9c41dc9fd..0dfd153e2199e 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "gci"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s="; + sha256 = "sha256-VbN4lRK+6stOApMEdtX32JhKGkCSrafMJbizpWmHRXA="; }; - vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; + vendorHash = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; meta = with lib; { description = "Controls golang package import order and makes it always deterministic"; diff --git a/pkgs/development/tools/gdtoolkit/default.nix b/pkgs/development/tools/gdtoolkit/default.nix new file mode 100644 index 0000000000000..67d98e0aa36b5 --- /dev/null +++ b/pkgs/development/tools/gdtoolkit/default.nix @@ -0,0 +1,84 @@ +{ lib +, python3Packages +, fetchFromGitHub +, godot-server +}: + +let lark080 = python3Packages.lark.overrideAttrs (old: rec { + # gdtoolkit needs exactly this lark version + version = "0.8.0"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "lark"; + rev = version; + hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs="; + fetchSubmodules = true; + }; +}); + +in +python3Packages.buildPythonApplication rec { + pname = "gdtoolkit"; + version = "3.3.1"; + + # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) + src = fetchFromGitHub { + owner = "Scony"; + repo = "godot-gdscript-toolkit"; + rev = version; + sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; + }; + + disabled = python3Packages.pythonOlder "3.7"; + + propagatedBuildInputs = [ lark080 + ] ++ (with python3Packages; [ + docopt + pyyaml + setuptools + ]); + + doCheck = true; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + hypothesis + godot-server + ]; + + preCheck = + let + godotServerMajorVersion = lib.versions.major godot-server.version; + gdtoolkitMajorVersion = lib.versions.major version; + msg = '' + gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}! + gdtoolkit needs a matching godot-server for its tests. + If you see this error, you can either: + - disable doCheck for gdtoolkit, or + - provide a compatible godot-server version to gdtoolkit" + ''; + in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg '' + # The tests want to run the installed executables + export PATH=$out/bin:$PATH + + # gdtoolkit tries to write cache variables to $HOME/.cache + export HOME=$TMP + + # Work around https://github.com/godotengine/godot/issues/20503 + # Without this, Godot will complain about a missing project file + touch project.godot + + # Remove broken test case + # (hard to skip via disabledTests since the test name contains an absolute path) + rm tests/potential-godot-bugs/multiline-subscription-expression.gd + ''; + + pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; + + meta = with lib; { + description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; + homepage = "https://github.com/Scony/godot-gdscript-toolkit"; + license = licenses.mit; + maintainers = with maintainers; [ shiryel tmarkus ]; + }; +} diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 1171700ff99ed..27d51b195fe70 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.32.0"; + version = "0.32.2"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gYDfCPA2zsscZ4r4FcNgCvIMMm13/HACTvNoiK/c+LA="; + sha256 = "sha256-w2zGiRvhuPMo79UsnckSISyCwBcIg5sfXIJLmnT3Tnk="; }; - cargoSha256 = "sha256-FlttmNHh0UVQ6xbo1eID+Ys34xp6zvKab4eoKIGujCU="; + cargoHash = "sha256-8P62yQpGXgswfSnAji0cIJwarx8IW0S5DO5gUMMp5PI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index e33d773a40e32..956f5dca4ffd4 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.7.0"; + version = "2.8.3"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-UXuRhozEC6zjOzjRi88mS7vyMqvBSnFCj6HXC4zZEp0="; + sha256 = "sha256-V10AFqCCe+SQeMQ+bBYqrKE/wSxyhpMQg+rNOH5P1e4="; }; - vendorHash = "sha256-SV7G/FZ7kj2ghr15oTMK25Y4SjaIfRc3UfxMPFr4src="; + vendorHash = "sha256-CNpmcQ623ZINYKwV0ZJi7KuEwzyGOM7t9OOCTx7JKDs="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fcebe93aaa2df..06016bec25b56 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; }; + postPatch = '' + sed '1i#include <cstring>' -i src/tools/text.cpp # gcc12 + ''; + nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; buildInputs = [ glfw libGLU glfw libXrandr libXdamage diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/development/tools/go-jet/default.nix new file mode 100644 index 0000000000000..4ce214ee415f2 --- /dev/null +++ b/pkgs/development/tools/go-jet/default.nix @@ -0,0 +1,53 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-jet"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "jet"; + rev = "v${version}"; + sha256 = "sha256-1kJaBLZIunexjxjOy55Nw0WMEhrSu+ptMbWVOJ1e5iA="; + }; + + vendorSha256 = "sha256-mhH9P3waINZhP+jNg3zKlssIL1ZO5xOBHp19Bzq/pSQ="; + + subPackages = [ "cmd/jet" ]; + + tags = [ + "mysql" + "golang" + "postgres" + "sql" + "database" + "code-generator" + "sqlite" + "postgresql" + "mariadb" + "sql-query" + "codegenerator" + "typesafe" + "sql-builder" + "datamapper" + "code-completion" + "sql-queries" + "cockroachdb" + "sql-query-builder" + "sqlbuilder" + "typesafety" + ]; + + postPatch = '' + # removing the tests which depend on external data + rm -rf tests/{sqlite,postgres,mysql} + ''; + + meta = with lib; { + homepage = "https://github.com/go-jet/jet"; + description = "Type safe SQL builder with code generation and automatic query result data mapping"; + maintainers = with maintainers; [ mrityunjaygr8 ]; + license = licenses.asl20; + mainProgram = "jet"; + }; +} diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 230840807a0a8..00752a1470548 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.0.10"; + version = "3.1.1"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - sha256 = "sha256-zxEBX7+WYQE2BDZmF4N8imFOBPorrYzg55tLlWUO8Lo="; + sha256 = "sha256-t7k4zpZrbaCwTZTngPlJGEmJOVl8onfIPVb2XGXuH5s="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorSha256 = "sha256-mIKknTrsJfFBKZrcxhnlDbvQq9q9FCOrk6ueJOoxOzk="; + vendorHash = "sha256-9KKnJQ5eM0UpO1tHebbEVnqwVJZnrls4KXi6BzlgZgM="; doCheck = true; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 9a8f205295373..a80249026960c 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.16.0"; + version = "2.20.2"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-fd+ZR74tApbZEXfMqpUAMk22h9rMRmtByGSd8JcTtK0="; + sha256 = "sha256-MIEVAEjXM3QNz3PnjB/g5Ury+N9NJhxtcXF+SLAvqR4="; }; preCheck = '' @@ -22,7 +22,7 @@ buildGoModule rec { CGO_ENABLED = false; - vendorSha256 = "sha256-SRTxe3y+wQgxsj7ruquMG16dUEAa92rnTXceysWm+F8="; + vendorHash = "sha256-3lx3wHnPQ/slRXnlVAnI1ZqSykDXNivjwg1WUITGj64="; meta = with lib; { homepage = "https://github.com/vektra/mockery"; diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 0417f8d567def..026433cabcb24 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.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI="; + sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q="; }; - vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; + vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; subPackages = [ "cmd/swag" ]; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 466f0ff2a0b9b..e52c36cf3976d 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.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-pKvotNUpZl51r+9+YFEQGXVsUBfxsmTZLnRIdrl7UGQ="; + sha256 = "sha256-w46fCcUKMtmiFVSMSzgsegWBZUcTaMgOkhu9HnfYHf4="; }; - vendorHash = "sha256-AZtkWJ/U1dH9J+wowlcg25qBVyRRo6LCzc6IBYKBkVA="; + vendorHash = "sha256-YC2C0/ayl0Rp8brzLLcdLB98BmhH7sP7EzLVdOIGAvQ="; doCheck = false; diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 3890133256ed9..0f9f5e03f9439 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-tools"; - version = "2022.1.2"; + version = "2023.1.2"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-pfZv/GZxb7weD+JFGCOknhRCsx8g5puQfpY9lZ4v6Rs="; + sha256 = "sha256-Xnylkv0n3FExQ4e4pmD6DAUqGtud80wHHoVY56UXfOU="; }; - vendorSha256 = "sha256-19uLCtKuuZoVwC4SUKvYGWi2ryqAQbcKXY1iNjIqyn8="; + vendorHash = "sha256-o9UtS6AMgRYuAkOWdktG2Kr3QDBDQTOGSlya69K2br8="; excludedPackages = [ "website" ]; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index da4d07bb78891..eac91732be117 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.2"; + version = "3.11.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-cVCzuOZf2zFY01+t20sRArEFinWqvZ461jJIQIyf0yI="; + sha256 = "sha256-KgCF44kpr8dAHzLgoRKXfd9warQUiFggGZ/Dy/49j1Q="; }; - vendorSha256 = "sha256-xLn7qGmBtNSnIZ7Gn4h/Aa037V0lO1jT/8P9PB7bH5o="; + vendorHash = "sha256-d76aeiSkW0sZeFylWIkCoquWzX78s2iaDeX3VE8cYfI="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/godot/3/dont_clobber_environment.patch b/pkgs/development/tools/godot/3/dont_clobber_environment.patch index 74e1241513ba8..cfd3113a6aaea 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 abf87bd0ba19a..d0c85be473363 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -1,11 +1,12 @@ { stdenv , lib , fetchFromGitHub -, installShellFiles -, autoPatchelfHook , pkg-config +, autoPatchelfHook +, installShellFiles , scons , vulkan-loader +, libGL , libX11 , libXcursor , libXinerama @@ -14,7 +15,7 @@ , libXrender , libXi , libXfixes -, freetype +, libxkbcommon , alsa-lib , libpulseaudio , dbus @@ -24,9 +25,9 @@ , withPlatform ? "linuxbsd" , withTarget ? "editor" , withPrecision ? "single" -, withPulseaudio ? false +, withPulseaudio ? true , withDbus ? true -, withSpeechd ? false +, withSpeechd ? true , withFontconfig ? true , withUdev ? true , withTouch ? true @@ -42,7 +43,7 @@ let precision = withPrecision; # Floating-point precision level # Options from 'godot/platform/linuxbsd/detect.py' - pulseaudio = withPulseaudio; + 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 @@ -52,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta14"; + version = "4.0-rc1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "28a24639c3c6a95b5b9828f5f02bf0dc2f5ce54b"; - sha256 = "sha256-qAotCc2YUg8FMK+JFHi5B4OL/cAtvWO/pYRRz8RcNUY="; + rev = "c4fb119f03477ad9a494ba6cdad211b35a8efcce"; + hash = "sha256-YJrm3or4QSzs+MDc06gY6TvUtWRgLST8RkdsomY8lZk="; }; nativeBuildInputs = [ @@ -69,10 +70,11 @@ stdenv.mkDerivation rec { buildInputs = [ scons - ] - ++ runtimeDependencies; + ]; runtimeDependencies = [ + vulkan-loader + libGL libX11 libXcursor libXinerama @@ -81,8 +83,8 @@ stdenv.mkDerivation rec { libXrender libXi libXfixes + libxkbcommon alsa-lib - vulkan-loader ] ++ lib.optional withPulseaudio libpulseaudio ++ lib.optional withDbus dbus @@ -92,12 +94,6 @@ stdenv.mkDerivation rec { ++ 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; # Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py' diff --git a/pkgs/development/tools/godot/4/xfixes.patch b/pkgs/development/tools/godot/4/xfixes.patch deleted file mode 100644 index df5c914d7fd6d..0000000000000 --- 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 844b15e9fb..0c8bee1757 100644 ---- a/platform/linuxbsd/detect.py -+++ b/platform/linuxbsd/detect.py -@@ -192,6 +192,7 @@ def configure(env: "Environment"): - env.ParseConfig("pkg-config xrandr --cflags") - env.ParseConfig("pkg-config xrender --cflags") - env.ParseConfig("pkg-config xi --cflags") -+ env.ParseConfig("pkg-config xfixes --cflags") - - if env["touch"]: - env.Append(CPPDEFINES=["TOUCH_ENABLED"]) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 913cde8ca493e..b3d1220436788 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.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-7HoneQtKxjQVvaTdkjPeu+vJWVOZG3AOiRD87/Ntgn8="; + hash = "sha256-F2rkVZ5ia9/wyTw1WIeizFnuaHoS2A8VzVOGDcshy64="; }; - vendorSha256 = "sha256-6ttRd2E8Zsf/2StNYt6JSC64A57QIv6EbwAwJfhTDaY="; + vendorHash = "sha256-JO/mRJB3gRTtBj6pW1267/xXUtalTJo0p3q5e34vqTs="; doCheck = false; diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index f2cf1f8a48ff9..245f86788a598 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "goresym"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v7rZBVpQMuEoIK9JIXCJnSjMDe3wrtJvL766MN6VmFo="; + sha256 = "sha256-Tf/oD0f8XLG2CuiQvduVberzWSetojVRBrSd83snK5Q="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY="; + vendorHash = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY="; doCheck = true; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 84f221f7afb95..2bb15698e0654 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OPMXU24INpdeQrNlRIPJBag6TtHFFIdxlBTfMgRZc2U="; + sha256 = "sha256-GB+BAGIVPtyY2Bsm/yDTYjJixLGvGwsIoOLCyy/0AJk="; }; - vendorSha256 = "sha256-F/wtDYPF4qUujU+fJx2v9uwlkxQ1LMPECKxHR4EB1zk="; + vendorHash = "sha256-5LIIXf+8ZN7WcFSPzsJ5Tt+d40AgF5YI3O1oXms1WgI="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix new file mode 100644 index 0000000000000..1485b81656494 --- /dev/null +++ b/pkgs/development/tools/gptcommit/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, nix-update-script +, Security +, openssl +}: + +let + pname = "gptcommit"; + version = "0.1.15"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "zurawiki"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ykcKvJJg+K2mDiz7hDYzoL1CYI1zOidlqz4xLUY1NW0="; + }; + + cargoSha256 = "sha256-/BASGNwfdAHLKdceRQe4GNfLy6uanHwH0yohGO7V60Q="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isLinux [ openssl ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "A git prepare-commit-msg hook for authoring commit messages with GPT-3. "; + homepage = "https://github.com/zurawiki/gptcommit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + platforms = with platforms; all; + }; +} + diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 54e6ccd471dcf..c198756827d2e 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.15.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-NOcV3XrSFeb/LYzeZQ0M1l1l4TkC+fVqAXCDUTaMN3c="; + sha256 = "sha256-fI9C0E5sMeZ8NDH7YMpbJ1So+PQ+isswbZWd0r7unis="; }; - vendorSha256 = "sha256-zYKRWJ09SnE0Y9iahTyODas/04an8x9w+rsY0x4/NRM="; + vendorHash = "sha256-JY788tDOo373ucUGzG4zNQbrGo8fdvWda/nMF0NpEE8="; meta = with lib; { description = diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index dc31aa23ac24b..002d9b9548dbf 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.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-bGxgL/Vajy2AtYtSE5/RoURvHHyajpXpR8m7DUeqsks="; + hash = "sha256-EsqOpVCsn0bD0BAOoFifH1hfEF8Wu8bUpM0/BSXAewY="; }; - 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/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 6695716aa67f9..584b8856e89fc 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 b5ad92cc08219..1c0a4f5460fd5 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/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 834a32d65b5bd..07da758728574 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.15"; - # 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-fyTsB+1ftol3prNLydT/coLchip1vijmfLLt3/DnBbc="; + fetchSubmodules = true; }; - cargoSha256 = "sha256-upO+G9569NXFuc2vpxR6E4nxJqCjg+RMlxV7oKb7v1E="; + cargoHash = "sha256-XBah55xfbWjQrkupebZE2uiveFhh/R0BF1KEKkY5Hx8="; - # 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/initool/default.nix b/pkgs/development/tools/initool/default.nix new file mode 100644 index 0000000000000..ce8f769ae442b --- /dev/null +++ b/pkgs/development/tools/initool/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, mlton +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "initool"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "dbohdan"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pszlP9gy1zjQjNNr0L1NY0XViejUUuvUZH6JHtUxdJI="; + }; + + nativeBuildInputs = [ mlton ]; + + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp initool $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + inherit (mlton.meta) platforms; + + description = "Manipulate INI files from the command line"; + homepage = "https://github.com/dbohdan/initool"; + license = licenses.mit; + maintainers = with maintainers; [ e1mo ]; + changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}"; + }; +} + diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix index b4c682bbd220c..0686d4fb2ed46 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 2a1197cae0c8e..53d769837797f 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.102.0"; + version = "0.103.2"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-5T0MQ1b1kA7MVm2drNbUdK6CitTjT76ORPN/BJmsmsM="; + sha256 = "sha256-lG2ABjhVGa+Cj7wkWq8u/uCNki+QgF4pX8+0ZdamB00="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 0808b81df03f0..bf34d472be80c 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "jet"; - version = "0.3.21"; + version = "0.4.23"; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-p7jTPnXpDg1bbPMEmznFWNZ4lq/zt2fZUOE6IOc9akY="; + sha256 = "sha256-ijqMyzmF1C3+5oT3ho1MSkoGuFJGvjhh7WWF/JDV/j8="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index 31d6d281ba5f5..a64fab3353fee 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -20,6 +20,8 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH passthru = { diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix deleted file mode 100644 index d8a639ec5b96d..0000000000000 --- a/pkgs/development/tools/jira_cli/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, libffi, openssl, python3Packages }: -let - inherit (python3Packages) fetchPypi buildPythonApplication; -in - buildPythonApplication rec { - pname = "jira-cli"; - version = "3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "86f7d4ad7292c9a27bbc265d09e7bcd00ef8159f20172998d85f25aad53b0df6"; - }; - - postPatch = '' - substituteInPlace requirements/main.txt --replace "argparse" "" - ''; - - # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this. - doCheck = false; - nativeCheckInputs = with python3Packages; [ vcrpy mock hiro ]; - buildInputs = [ libffi openssl ]; - propagatedBuildInputs = with python3Packages; [ - requests six suds-jurko termcolor keyring - jira keyrings-alt - ]; - - meta = with lib; { - description = "A command line interface to Jira"; - homepage = "https://github.com/alisaifee/jira-cli"; - maintainers = with maintainers; [ nyarly ]; - license = licenses.mit; - }; - } diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix deleted file mode 100644 index 18bb6964adab9..0000000000000 --- a/pkgs/development/tools/jl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, fetchFromGitHub, fetchpatch -, aeson, aeson-pretty, attoparsec, base, bytestring, conduit, conduit-extra -, containers, exceptions, mtl, optparse-simple, parsec, scientific, lib -, text, unordered-containers, vector -}: -mkDerivation rec { - pname = "jl"; - version = "0.1.0"; - sha256 = "15vvn3swjpc5qmdng1fcd8m9nif4qnjmpmxc9hdw5cswzl055lkj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers exceptions mtl parsec - scientific text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring conduit conduit-extra containers - mtl optparse-simple text vector - ]; - license = lib.licenses.bsd3; - description = "Functional sed for JSON"; - maintainers = with lib.maintainers; [ fgaz ]; - homepage = "https://github.com/chrisdone/jl"; -} diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 071f944a82f3b..1a1c3e7a99614 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.4"; + version = "5.1.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D6Y3I5UPChdLlTZ49iToQpE8CrHh3VjWV6PI7fRhU/A="; + sha256 = "sha256-ybcX2dm+gnvhWAcraCq22uGqe8NdqNd8QMNKVkqgNqY="; }; - cargoSha256 = "sha256-GqfQD8NK/HYODEGUmfo+MMVsWg2CabZFLfBTp4UXV2Q="; + cargoHash = "sha256-GzRxXBDMALaXLhpklVoSn+8uCgws5AjkC+fynym0iYo="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index c3af6e9c1a4b5..750e93f66557a 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.3"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lwyM2l4eBCtkyAtG51cEy29Jw/vakjrfYVBSZ9pIBFs="; + sha256 = "sha256-rz3cAA5iqhrCZhLc+RKZhudiMlfu3m6wWYNHAnUP/kg="; }; - vendorSha256 = "sha256-ba7amhYuCB3k1esu1qYBCgUZMjlq5iac498TMqeGuz0="; + vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA="; doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 15cf9c30322d0..8c40281cbde99 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/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index cbb8b38d80d79..a613e421a688e 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mNritx2YY6x5lwnOWrraHzddRZqEySDOWGOqdmqUyIs="; + sha256 = "sha256-KOl1K6XSublOxaCE89QXIRESyBrfgrJnVkaaC76ld1E="; }; - vendorSha256 = "sha256-pqGayeo4JkleZaoZfZW6agbMrK+57tYriKCWXGveoUs="; + vendorHash = "sha256-t306WYXPVXHqp6Ixd02QTVSLJ8VI57FA1KwMDW/JSeg="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 57723da45eb39..0ddbf8f5d5a95 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mtAP8qRfSdt2koKs6LSI9iiXsyK92q1yWOC9zV8utFg="; + sha256 = "sha256-F+cGJbxXIHrgn9OcIMh2am9g4PBLkdC037tV/9znPSg="; }; patches = [ ./version.patch ]; - vendorSha256 = "sha256-9IGdsAqvi01Jf0FpxfL+O+LrDchh4dGgJX4JJIvL3vE="; + vendorHash = "sha256-nZyDoME5fVqRoAeLADjrQ7i6mVf3ujGN2+BUfrSHck8="; ldflags = [ "-s" diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index b2e69d7fc3518..f58b3de977400 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.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-tZ4qa48I/J62bqc9eoSSpTrJjU+LpweF/kI1TMiFrEY="; + sha256 = "sha256-c4+ebl/tWPxAlgt/N5/xalZQZGSizKp/pDcgojbjy7A="; }; - cargoSha256 = "sha256-WpX1wkMPtUwT6KOi0Bij1tzGlDhti828wBSfzpXuZaY="; + cargoHash = "sha256-D3RjlYMD/UHfYxUMvZVSiRHOPmcLVGgsRVghoaMn9AM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 6efeaad638486..6136c5b6cb22a 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.1.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sufP/+YixgrOCJJ4P1SjmZpRlSaufRmnVDiv6H+RCyQ="; + sha256 = "sha256-piCsae2B+FC+wi/vCCtPY76O4eMXJeNufFo31QkHCAU="; }; - vendorHash = "sha256-WZb8VsFKpvvMys1iK3irEsWCnvKaKDzuyFertVswpdE="; + vendorHash = "sha256-vTP2wM7MqiSfP+3Gd0Ab5t0al5xL8rw3kl7bOT19zU4="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/language-servers/jdt-language-server/default.nix b/pkgs/development/tools/language-servers/jdt-language-server/default.nix index 1af69700152d2..1b194814a270d 100644 --- a/pkgs/development/tools/language-servers/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/language-servers/sumneko-lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 24b360a781800..04b5fd6e1e024 100644 --- a/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -1,16 +1,14 @@ { lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }: -let - target = if stdenv.isDarwin then "macOS" else "Linux"; -in + stdenv.mkDerivation rec { - pname = "sumneko-lua-language-server"; - version = "3.6.7"; + pname = "lua-language-server"; + version = "3.6.11"; src = fetchFromGitHub { - owner = "sumneko"; + owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-x7/yO1rJ+VBG4EFpISYblRECLW2lsLz5wcqLR14UV/g="; + sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M="; fetchSubmodules = true; }; @@ -24,12 +22,13 @@ stdenv.mkDerivation rec { Foundation ]; - preBuild = '' - cd 3rd/luamake - '' - + lib.optionalString stdenv.isDarwin '' - # Needed for the test - export HOME=/var/empty + postPatch = '' + # filewatch tests are failing on darwin + # this feature is not used in lua-language-server + sed -i /filewatch/d 3rd/bee.lua/test/test.lua + + pushd 3rd/luamake + '' + lib.optionalString stdenv.isDarwin '' # This package uses the program clang for C and C++ files. The language # is selected via the command line argument -std, but this do not work # in combination with the nixpkgs clang wrapper. Therefor we have to @@ -44,11 +43,11 @@ stdenv.mkDerivation rec { ''; ninjaFlags = [ - "-fcompile/ninja/${lib.toLower target}.ninja" + "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; postBuild = '' - cd ../.. + popd ./3rd/luamake/luamake rebuild ''; @@ -66,18 +65,21 @@ stdenv.mkDerivation rec { makeWrapper "$out"/share/lua-language-server/bin/lua-language-server \ $out/bin/lua-language-server \ --add-flags "-E $out/share/lua-language-server/main.lua \ - --logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/sumneko_lua/log \ - --metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/sumneko_lua/meta" + --logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/log \ + --metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/meta" runHook postInstall ''; + # some tests require local networking + __darwinAllowLocalNetworking = true; + meta = with lib; { - description = "Lua Language Server coded by Lua"; - homepage = "https://github.com/sumneko/lua-language-server"; + description = "A language server that offers Lua language support"; + homepage = "https://github.com/luals/lua-language-server"; + changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ sei40kr ]; + maintainers = with maintainers; [ figsoda sei40kr ]; platforms = platforms.linux ++ platforms.darwin; - mainProgram = "lua-language-server"; }; } diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 34e8311800e4c..66488a607fd13 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.4"; + version = "0.7.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-YTONlTE9cTl0O7EHRVhrPtuGgIUdX8mvdWu352uHbCE="; + hash = "sha256-1GoZbeXNG00oxBdPa2yk0aOCVguwIkK6fKrlHU6mZYc="; }; - cargoHash = "sha256-U2bbZZCeY7/Jp7AuAKYcZzDIpIxGbNJrmr2Sr2CMr2A="; + cargoHash = "sha256-arIFWJX8WQQWcJP1YpMwFy2XHU/0w+oPj1qE/IlYRF4="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index 22f1e98f1826e..ee26e81e88919 100644 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -2,24 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-01-01"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-xpNlmGG7Qy0SPzXZ9sQ0i9Yo2hMaK+YsTEOTk10rs+k="; + hash = "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ="; }; - cargoHash = "sha256-mwfM3hIEaHKa2oPVWzXpua+W2Oa5brvNRbRCcV0KapY="; + cargoHash = "sha256-k4hw+kH447uqsCASuaZxRx2xmMkmn9LM5sHYL2AJN9k="; - CFG_DATE = version; - CFG_REV = "release"; + CFG_RELEASE = version; nativeBuildInputs = [ (lib.getBin nix) ]; + # 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; { diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index d39b91180f98a..91ac7b7bce050 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix @@ -13,18 +13,21 @@ let in buildBazelPackage rec { pname = "verible"; - version = "0.0-2472-ga80124e1"; # These environment variables are read in bazel/build-version.py to create - # a build string. Otherwise it would attempt to extract it from .git/. - GIT_DATE = "2022-10-21"; - GIT_VERSION = version; + # a build string shown in the tools --version output. + # If env variables not set, it would attempt to extract it from .git/. + GIT_DATE = "2023-02-02"; + GIT_VERSION = "v0.0-2821-gb2180bfa"; + + # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" + version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); src = fetchFromGitHub { owner = "chipsalliance"; repo = "verible"; - rev = "v${version}"; - sha256 = "sha256:0jpdxqhnawrl80pbc8544pyggdp5s3cbc7byc423d5v0sri2f96v"; + rev = "${GIT_VERSION}"; + sha256 = "sha256-etcimvInhebH2zRPyZnWUq6m3VnCq44w32GJrIacULo="; }; patches = [ @@ -46,8 +49,8 @@ buildBazelPackage rec { # of the output derivation ? Is there a more robust way to do this ? # (Hashes extracted from the ofborg build logs) sha256 = { - aarch64-linux = "sha256-6Udp7sZKGU8gcy6+5WPhkSWunf1sVkha8l5S1UQsC04="; - x86_64-linux = "sha256-WfhgbJFaM/ipdd1dRjPeVZ1mK2hotb0wLmKjO7e+BO4="; + aarch64-linux = "sha256-dYJoae3+u+gpULHS8nteFzzL974cVJ+cJzeG/Dz2HaQ="; + x86_64-linux = "sha256-Jd99+nhqgZ2Gwd78eyXfnSSfbl8C3hoWkiUnzJG1jqM="; }.${system} or (throw "No hash for system: ${system}"); }; @@ -62,12 +65,9 @@ buildBazelPackage rec { bazel/build-version.py \ bazel/sh_test_with_runfiles_lib.sh \ common/lsp/dummy-ls_test.sh \ - common/parser/move_yacc_stack_symbols.sh \ - common/parser/record_syntax_error.sh \ common/tools/patch_tool_test.sh \ common/tools/verible-transform-interactive.sh \ common/tools/verible-transform-interactive-test.sh \ - common/util/create_version_header.sh \ kythe-browse.sh \ verilog/tools ''; diff --git a/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch index 19d20309c106b..57b152d9db319 100644 --- a/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch +++ b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch @@ -1,5 +1,5 @@ diff --git a/WORKSPACE b/WORKSPACE -index 696cc7ef..55a5bb8a 100644 +index ad16b3a1..52b66703 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -81,17 +81,6 @@ load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup") @@ -12,11 +12,11 @@ index 696cc7ef..55a5bb8a 100644 - -win_flex_configure( - name = "win_flex_bison", -- sha256 = "095cf65cb3f12ee5888022f93109acbe6264e5f18f6ffce0bda77feb31b65bd8", -- # bison 3.3.2, flex 2.6.4 -- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.18/win_flex_bison-2.5.18.zip", +- sha256 = "8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135", +- # bison 3.8.2, flex 2.6.4 +- url = "https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip", -) - http_archive( name = "rules_m4", - sha256 = "c67fa9891bb19e9e6c1050003ba648d35383b8cb3c9572f397ad24040fb7f0eb", + sha256 = "b0309baacfd1b736ed82dc2bb27b0ec38455a31a3d5d20f8d05e831ebeef1a8e", diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 8cb041b90b2e8..ef96258354b29 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -2,24 +2,28 @@ stdenv.mkDerivation rec { pname = "zls"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "zigtools"; repo = pname; rev = version; - sha256 = "sha256-MVo21qNCZop/HXBqrPcosGbRY+W69KNCc1DfnH47GsI="; + sha256 = "sha256-M0GG4KIMcHN+bEprUv6ISZkWNvWN12S9vqSKP+DRU9M="; fetchSubmodules = true; }; nativeBuildInputs = [ zig ]; + dontConfigure = true; + preBuild = '' export HOME=$TMPDIR ''; installPhase = '' + runHook preInstall zig build -Drelease-safe -Dcpu=baseline --prefix $out install + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 57c405a7f7b53..4e60fffbeb59f 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0emAo/K27lmQ+409maTR/hnonQVkbijF0RAwvIErBFo="; + sha256 = "sha256-A6aFHC4MNNFl7IieR/7aQ3cMzhBXfQwq6sPv+v5Gu4o="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index c2bb6828bc2ac..132faaa4aeeee 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "sha256-JULVX5gyMJhnBwGQxmMObtUaenu37rIE5yDbA5fHsCY="; + sha256 = "sha256-ncZ1tof8InP+8KLTQ2YOwaD/liwU1LNZkllBm53VYNo="; }; - cargoHash = "sha256-PQbN0qsCf4eia5sD71ltP7Y955smZPwkof+uEQATvNQ="; + cargoHash = "sha256-xxR80iizEej1vAzItaoqQnJDZ62dxPOeEdaUpgqhG7I="; buildFeatures = [ "cli" diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index d689504aca99d..1dce8caeeb471 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: global.o:/build/nuweb-1.62/global.h:91: multiple definition of # `current_sector'; main.o:/build/nuweb-1.62/global.h:91: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildPhase = '' make nuweb @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple literate programming tool"; - homepage = "http://nuweb.sourceforge.net"; + homepage = "https://nuweb.sourceforge.net"; license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix new file mode 100644 index 0000000000000..e42f7f50122ac --- /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 b2d719267a624..207ef4d9fe125 100644 --- a/pkgs/development/tools/luaformatter/default.nix +++ b/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: let antlr4 = antlr4_9; @@ -19,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 fce2347d8e0e8..610a313ca27c8 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/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index aa3b292751320..d31268f9cedda 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2022-12-28"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-IOmAOO45sD0TkphbHWLCXXyouxKNJoiNYHXV/bw0xH4="; + sha256 = "sha256-UPPO4ueu7gMR7a573M2/xT3N0QgRSNBshJAqoyXEZpc="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index e5510aa5f80b7..4f8b509702fbd 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.6.0"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iIbx8vK4xAFfTVO4oJ5ELNKn19Tw6LPgwEi6eFOA5yo="; + hash = "sha256-FM6DVBnYgvciTeF9bf2NDvHGsnccxKqcR5ATj6daQ4w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 9c254bb2c79ab..f6d5103745b73 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-oPMojw6CGncBJ8PZOTrzvQu2gRs1cw1Jwi38eOZggI8="; + hash = "sha256-v+8zfNV93nrRSwfn1u7SNYv7WYY74R8nPJFmreDb7i4="; }; vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 8d3d492649e5e..3894dcd2c6ef9 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.8.2"; + version = "3.8.5"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-a07vFya7c8ai0YjNvXCAWSoQLH81U4cIr0QsgX3WcJY="; + sha256 = "sha256-u7Hwj/RYE8pZkIVulJrwdC1kxhTGl3P5DEug6v5lMvg="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 88b802b9aab82..2dfe33b98e6fd 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.6.4"; + version = "2.7.0"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-rl+d21JcaUl4k4xuAw2zv8KHtaE96U+GENzDt2cgvH8="; + sha256 = "sha256-ukgzQ7ooiO13hQjWrsul/pvHPBbs1hkJJKLTQwv+cLg="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 47e2fbc14aef0..a8fd24ebd6a38 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.40"; + version = "0.2.42"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZnGy/N2+/dfmtquyTqpAcuQgqKMuQnDYYR/GOHFOpc0="; + hash = "sha256-+1ciEHBMl78aFDu/NzIAdsGtAZJOfHZRDDZCR1+YuEM="; }; - vendorHash = "sha256-5uF0ZdyJtUoEHQLPEe9ZKIBukdfvZ7kF5LetJB/yel8="; + vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4="; doCheck = false; 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 4f9a92d362bcb..161dca6f1805d 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 470827c2b45e9..f0df759ee2cf6 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 65d6185f50c07..0d9572c6f3140 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/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 9fb0a35dbf467..1194cbeb2453f 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation { # As binutils takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = if hostPlatform.isDarwin then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch deleted file mode 100644 index 0b4162d848803..0000000000000 --- a/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff --git a/bfd/configure.ac b/bfd/configure.ac -index fec067b2135..377e1f5443f 100644 ---- a/bfd/configure.ac -+++ b/bfd/configure.ac -@@ -292,30 +292,16 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --# When building a shared libbfd, link against the pic version of libiberty --# so that apps that use libbfd won't need libiberty just to satisfy any --# libbfd references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libbfd. - SHARED_LIBADD= --SHARED_LDFLAGS= -+SHARED_LDFLAGS=-liberty - if test "$enable_shared" = "yes"; then --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi --fi -- - SHARED_LIBADD="$SHARED_LIBADD $LIBINTL" - --if test "$enable_shared" = "yes"; then - case "${host}" in - # More hacks to build DLLs on Windows. - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32" -+ SHARED_LIBADD="-liberty $SHARED_LIBADD -lcygwin -lkernel32" - ;; - esac - -diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 0e04b4c05c4..848a02662e7 100644 ---- a/opcodes/Makefile.am -+++ b/opcodes/Makefile.am -@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) - endif - - # This is where bfd.h lives. --BFD_H = ../bfd/bfd.h -+BFD_H = $(BFDDIR)/bfd.h - - BUILD_LIBS = @BUILD_LIBS@ - BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ - # development.sh is used to determine -Werror default. - CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh - --AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@ - - disassemble.lo: disassemble.c - if am__fastdepCC -@@ -327,9 +327,18 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c --libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ -+libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion - libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@ --libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@ -+libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ - # Allow dependency tracking to work on all the source files. - EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES) - -+libtool-soversion: -+ @echo "creating $@" -+ bfd_soversion="$(VERSION)" ;\ -+ . $(BFDDIR)/development.sh ;\ -+ if test "$$development" = true ; then \ -+ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ -+ fi ;\ -+ echo "$${bfd_soversion}" > $@ -+ - # libtool will build .libs/libopcodes.a. We create libopcodes.a in - # the build directory so that we don't have to convert all the - # programs that use libopcodes.a simultaneously. This is a hack which -diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index e564f067334..5da62a3d58b 100644 ---- a/opcodes/configure.ac -+++ b/opcodes/configure.ac -@@ -98,6 +98,8 @@ BFD_64_BIT - AC_SUBST(HDEFINES) - AC_PROG_INSTALL - -+GCC_HEADER_STDINT(bfd_stdint.h) -+ - AC_CHECK_DECLS([basename, stpcpy]) - - # Check if sigsetjmp is available. Using AC_CHECK_FUNCS won't do -@@ -148,44 +150,21 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, - - LT_LIB_M - --#Libs for generator progs --if test "x$cross_compiling" = "xno"; then -- BUILD_LIBS=../libiberty/libiberty.a -- BUILD_LIB_DEPS=$BUILD_LIBS --else -- # if cross-compiling, assume that the system provides -liberty -- # and that the version is compatible with new headers. -- BUILD_LIBS=-liberty -- BUILD_LIB_DEPS= --fi --BUILD_LIBS="$BUILD_LIBS $LIBINTL" --BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP" -+BUILD_LIBS="-liberty $LIBINTL" -+BUILD_LIB_DEPS="$LIBINTL_DEP" - - AC_SUBST(BUILD_LIBS) - AC_SUBST(BUILD_LIB_DEPS) - - # Horrible hacks to build DLLs on Windows and a shared library elsewhere. - SHARED_LDFLAGS= --SHARED_LIBADD= -+SHARED_LIBADD=-liberty - SHARED_DEPENDENCIES= --if test "$enable_shared" = "yes"; then --# When building a shared libopcodes, link against the pic version of libiberty --# so that apps that use libopcodes won't need libiberty just to satisfy any --# libopcodes references. --# We can't do that if a pic libiberty is unavailable since including non-pic --# code would insert text relocations into libopcodes. - # Note that linking against libbfd as we do here, which is itself linked - # against libiberty, may not satisfy all the libopcodes libiberty references - # since libbfd may not pull in the entirety of libiberty. - # Also, jam libintl into the right place in all of this: after libiberty, - # which uses it, but before -lcygwin, which it uses. --changequote(,)dnl -- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` --changequote([,])dnl -- if test -n "$x"; then -- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" -- fi --fi - - SHARED_LIBADD="$SHARED_LIBADD $LIBINTL" - -@@ -193,11 +172,10 @@ if test "$enable_shared" = "yes"; then - case "${host}" in - *-*-cygwin*) - SHARED_LDFLAGS="-no-undefined" -- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD" -+ SHARED_LIBADD="-lbfd -liberty $SHARED_LIBADD" - ;; - *) -- SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}" -- SHARED_DEPENDENCIES="../bfd/libbfd.la" -+ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}" - ;; - esac - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3d53c5122f00d..967f62d7c9cd2 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -15,7 +15,6 @@ in , noSysDirs , perl , substitute -, texinfo , zlib , enableGold ? withGold stdenv.targetPlatform @@ -32,12 +31,12 @@ assert enableGold -> withGold stdenv.targetPlatform; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.39"; + version = "2.40"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "sha256-2iSoT+8iAQLdJAQt8G/eqFHCYUpTd/hu/6KPM7exYUg="; + hash = "sha256-+CmOsVOks30RLpRapcsoUAQLzyaj6mW1pxXIOv4F5Io="; }; vc4-none = fetchFromGitHub { owner = "itszor"; @@ -52,7 +51,7 @@ let targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; @@ -85,12 +84,10 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch - # Upstream backport of https://sourceware.org/PR29451: - # Don't emit 0-sized debug entries for objects without size. - # Without the change elfutils on i686-linux fail dwarf validity test: - # https://sourceware.org/PR29450 - # Remove once 2.40 releases. - ./gas-dwarf-zero-PR29451.patch + # Avoid `lib -> out -> lib` reference. Normally `bfd-plugins` does + # not need to know binutils' BINDIR at all. It's an absolute path + # where libraries are stored. + ./plugins-no-BINDIR.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution @@ -106,14 +103,24 @@ stdenv.mkDerivation { else ./mips64-default-n64.patch) ; - outputs = [ "out" "info" "man" ]; + outputs = [ "out" "info" "man" "dev" ] + # Ideally we would like to always install 'lib' into a separate + # target. Unfortunately cross-compiled binutils installs libraries + # across both `$lib/lib/` and `$out/$target/lib` with a reference + # from $out to $lib. Probably a binutils bug: all libraries should go + # to $lib as binutils does not build target libraries. Let's make our + # life slightly simpler by installing everything into $out for + # cross-binutils. + ++ lib.optionals (targetPlatform == hostPlatform) [ "lib" ]; 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,11 +151,25 @@ 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 # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = + env.NIX_CFLAGS_COMPILE = if hostPlatform.isDarwin then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; @@ -181,8 +202,12 @@ stdenv.mkDerivation { # Unconditionally disable: # - musl target needs porting: https://sourceware.org/PR29477 - # - all targets rely on javac: https://sourceware.org/PR29479 "--disable-gprofng" + + # By default binutils searches $libdir for libraries. This brings in + # libbfd and libopcodes into a default visibility. Drop default lib + # path to force users to declare their use of these libraries. + "--with-lib-path=:" ] ++ lib.optionals withAllTargets [ "--enable-targets=all" ] ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ] @@ -203,10 +228,26 @@ stdenv.mkDerivation { enableParallelBuilding = true; + # For the same reason we don't split "lib" output we undo the $target/ + # prefix for installed headers and libraries we link: + # $out/$host/$target/lib/* to $out/lib/ + # $out/$host/$target/include/* to $dev/include/* + # TODO(trofi): fix installation paths upstream so we could remove this + # code and have "lib" output unconditionally. + postInstall = lib.optionalString (hostPlatform.config != targetPlatform.config) '' + ln -s $out/${hostPlatform.config}/${targetPlatform.config}/lib/* $out/lib/ + ln -s $out/${hostPlatform.config}/${targetPlatform.config}/include/* $dev/include/ + ''; + passthru = { inherit targetPrefix; hasGold = enableGold; isGNU = true; + # Having --enable-plugins is not enough, system has to support + # dlopen() or equivalent. See config/plugins.m4 and configure.ac + # (around PLUGINS) for cases that support or not support plugins. + # No platform specific filters yet here. + hasPluginAPI = enableGold; }; meta = with lib; { @@ -226,4 +267,4 @@ stdenv.mkDerivation { # collision due to the ld/as wrappers/symlinks in the latter. priority = 10; }; -} +}) diff --git a/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch b/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch deleted file mode 100644 index 5f1293f8f7320..0000000000000 --- a/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d7abcbcea5ddd40a3bf28758b62f35933c59f996 - -Don't emit 0-sized debug entries for objects without size. -Without the change elfutils on i686-linux fail dwarf validity test: - https://sourceware.org/PR29450 ---- a/gas/dwarf2dbg.c -+++ b/gas/dwarf2dbg.c -@@ -2882,6 +2882,7 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, - { - const char *name; - size_t len; -+ expressionS size = { .X_op = O_constant }; - - /* Skip warning constructs (see above). */ - if (symbol_get_bfdsym (symp)->flags & BSF_WARNING) -@@ -2895,6 +2896,18 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, - if (!S_IS_DEFINED (symp) || !S_IS_FUNCTION (symp)) - continue; - -+#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ -+ size.X_add_number = S_GET_SIZE (symp); -+ if (size.X_add_number == 0 && IS_ELF -+ && symbol_get_obj (symp)->size != NULL) -+ { -+ size.X_op = O_add; -+ size.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); -+ } -+#endif -+ if (size.X_op == O_constant && size.X_add_number == 0) -+ continue; -+ - subseg_set (str_seg, 0); - name_sym = symbol_temp_new_now_octets (); - name = S_GET_NAME (symp); -@@ -2920,29 +2933,17 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, - emit_expr (&exp, sizeof_address); - - /* DW_AT_high_pc */ -- exp.X_op = O_constant; --#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ -- exp.X_add_number = S_GET_SIZE (symp); -- if (exp.X_add_number == 0 && IS_ELF -- && symbol_get_obj (symp)->size != NULL) -- { -- exp.X_op = O_add; -- exp.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); -- } --#else -- exp.X_add_number = 0; --#endif - if (DWARF2_VERSION < 4) - { -- if (exp.X_op == O_constant) -- exp.X_op = O_symbol; -- exp.X_add_symbol = symp; -- emit_expr (&exp, sizeof_address); -+ if (size.X_op == O_constant) -+ size.X_op = O_symbol; -+ size.X_add_symbol = symp; -+ emit_expr (&size, sizeof_address); - } -- else if (exp.X_op == O_constant) -- out_uleb128 (exp.X_add_number); -+ else if (size.X_op == O_constant) -+ out_uleb128 (size.X_add_number); - else -- emit_leb128_expr (symbol_get_value_expression (exp.X_op_symbol), 0); -+ emit_leb128_expr (symbol_get_value_expression (size.X_op_symbol), 0); - } - - /* End of children. */ diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix index 16737a7b5ee84..dca62b82eead0 100644 --- a/pkgs/development/tools/misc/binutils/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/libbfd.nix @@ -1,45 +1,22 @@ { lib, stdenv -, buildPackages -, gnu-config, autoreconfHook, bison, binutils-unwrapped, texinfo -, libiberty, libintl, zlib +, binutils-unwrapped-all-targets }: stdenv.mkDerivation { pname = "libbfd"; - inherit (binutils-unwrapped) version src; - - outputs = [ "out" "dev" ]; - - patches = binutils-unwrapped.patches ++ [ - ./build-components-separately.patch + inherit (binutils-unwrapped-all-targets) version; + + dontUnpack = true; + dontBuild = true; + dontInstall = true; + propagatedBuildInputs = [ + binutils-unwrapped-all-targets.dev + binutils-unwrapped-all-targets.lib ]; - # We just want to build libbfd - postPatch = '' - cd bfd - ''; - - postAutoreconf = '' - echo "Updating config.guess and config.sub from ${gnu-config}" - cp -f ${gnu-config}/config.{guess,sub} ../ - ''; - - # We update these ourselves - dontUpdateAutotoolsGnuConfigScripts = true; - - strictDeps = true; - nativeBuildInputs = [ autoreconfHook bison texinfo ]; - buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - configurePlatforms = [ "build" "host" ]; - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--enable-install-libbfd" - "--with-system-zlib" - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared"; - - enableParallelBuilding = true; + passthru = { + inherit (binutils-unwrapped-all-targets) dev hasPluginAPI; + }; meta = with lib; { description = "A library for manipulating containers of machine code"; diff --git a/pkgs/development/tools/misc/binutils/libopcodes.nix b/pkgs/development/tools/misc/binutils/libopcodes.nix index e4b6cec41b4f0..e067282a0e5e1 100644 --- a/pkgs/development/tools/misc/binutils/libopcodes.nix +++ b/pkgs/development/tools/misc/binutils/libopcodes.nix @@ -1,38 +1,22 @@ -{ lib, stdenv, buildPackages -, autoreconfHook, bison, binutils-unwrapped -, libiberty, libbfd +{ lib, stdenv +, binutils-unwrapped-all-targets }: stdenv.mkDerivation { pname = "libopcodes"; - inherit (binutils-unwrapped) version src; - - outputs = [ "out" "dev" ]; - - patches = binutils-unwrapped.patches ++ [ - ./build-components-separately.patch + inherit (binutils-unwrapped-all-targets) version; + + dontUnpack = true; + dontBuild = true; + dontInstall = true; + propagatedBuildInputs = [ + binutils-unwrapped-all-targets.dev + binutils-unwrapped-all-targets.lib ]; - # We just want to build libopcodes - postPatch = '' - cd opcodes - find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"/<bfd.h>/' \; - ''; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook bison ]; - buildInputs = [ libiberty ]; - # dis-asm.h includes bfd.h - propagatedBuildInputs = [ libbfd ]; - - configurePlatforms = [ "build" "host" ]; - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--enable-install-libbfd" - "--enable-shared" - ]; - - enableParallelBuilding = true; + passthru = { + inherit (binutils-unwrapped-all-targets) dev hasPluginAPI; + }; meta = with lib; { description = "A library from binutils for manipulating machine code"; diff --git a/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch b/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch new file mode 100644 index 0000000000000..562aad33eccd4 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/plugins-no-BINDIR.patch @@ -0,0 +1,25 @@ +Avoid `lib -> out -> lib` reference. Normally `bfd-plugins` does not +need to know binutils' BINDIR at all. It's an absolute path where +libraries are stored. +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -493,7 +493,7 @@ build_plugin_list (bfd *abfd) + when configuring binutils using --libdir. Search in the proper + path first, then the old one for backwards compatibility. */ + static const char *path[] +- = { LIBDIR "/bfd-plugins", BINDIR "/../lib/bfd-plugins" }; ++ = { LIBDIR "/bfd-plugins", }; + struct stat last_st; + unsigned int i; + +@@ -508,9 +508,7 @@ build_plugin_list (bfd *abfd) + last_st.st_ino = 0; + for (i = 0; i < sizeof (path) / sizeof (path[0]); i++) + { +- char *plugin_dir = make_relative_prefix (plugin_program_name, +- BINDIR, +- path[i]); ++ char *plugin_dir = xstrdup (path[i]); + if (plugin_dir) + { + struct stat st; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index dd1aeab81d163..fd3369f582e33 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -13,47 +13,47 @@ let phpMajor = lib.versions.majorMinor php.version; - version = "1.86.3"; + version = "1.86.4"; hashes = { "x86_64-linux" = { system = "amd64"; sha256 = { - "8.0" = "Vl16ssG+47CvGNTQBR6aNkEzoSor7B8F71TSN3x2bm0="; - "8.1" = "27yLfDJYTQ3Izr8M6XFEsEWb7WDmuKjKCdSCPfL9HUw="; - "8.2" = "tnxlB+Tq8qeRoHjBNl/CMI0UZb02ayssiRJSMZaTwWI="; + "8.0" = "lgFetQ7Z9GeNOjhNvNnCJstdytC5OamoCNl9MFyoVww="; + "8.1" = "+xbnz3MSBvEV0sST/SGc+wHZe3S7+6HwWL1Gk1wVnJk="; + "8.2" = "isMrxPfmj6b4RBzurZX6Qpd/K2V+vP3k6myV57UjtvY="; }; }; "i686-linux" = { system = "i386"; sha256 = { - "8.0" = "NF5R470FC/nrAvk57Y3wStT4EQrWCvntniD9rD1Fv/Y="; - "8.1" = "aAl+oX0QfL6wStUrrhB44JHqAvA4ZLbc3dQyRHJbcNU="; - "8.2" = "SWAC9XlJs1vNWnDWeuXHPOMQoA5kCqiSrWxNpRcXHns="; + "8.0" = "yLxiJqL698ntQl3IVmTb3nEgwmkFMrqFafT8UQfHOLs="; + "8.1" = "eGSs9IAVhpG4al7qbeqOMSxN4OAkI84D7EidTvDgs/s="; + "8.2" = "cqYefnX4Q249W5fToX8nCL+BMSRwDBlEXjtxp0mveh4="; }; }; "aarch64-linux" = { system = "arm64"; sha256 = { - "8.0" = "jrTCMkJWzPzzJU7eET+VCwKaiRPqcQKPPIJZrLAuJ6s="; - "8.1" = "WjomQa3+27mW8tR5u++LyVDtyNa7Bj8uS3FHsmdsafo="; - "8.2" = "3SGtZkKosxKsJ/qTlP7BFpnroOTRaWFsvDHq1fK1UBE="; + "8.0" = "etASHFAlcGfR3kgtHfs337XL91QwG5e1GzC7D36JhUM="; + "8.1" = "dYqP7MjwuJcQNpBSteEV9na0C7pvA4sSHrlQ0NTUDJs="; + "8.2" = "+501L16rl5vlD7qFGa0o335GWLaIvrvN2nq11gf+W98="; }; }; "aarch64-darwin" = { system = "arm64"; sha256 = { - "8.0" = "MDPgDfIOfjr/VMGrxj7159xJl6P3jPYgoNOkISZBmX4="; - "8.1" = "zV5gjpA9tNGo/p/Is8n8WfGyIdb/IQDbfH1KuD8S4s8="; - "8.2" = "+zwX3r9X/avQvcmNtt5RT3smY+4yfXFo8XPCiV9xWT4="; + "8.0" = "j2DlfsuQw7y3gxc3JpMxR4d6x7pDYWWCQsA4ilkI8Z4="; + "8.1" = "Cg3m2VH1NH54TXe9+2FTpzTHQS2ex+43aJ7XGQqka4o="; + "8.2" = "JxMBqYMHkXMeqKuuum4cmTS+2BFq4OIEFmCCMTdlFoU="; }; }; "x86_64-darwin" = { system = "amd64"; sha256 = { - "8.0" = "wEsbQrowYgOlbWUkv+yPtPliC9b/iIUXBsvrCXCL6aM="; - "8.1" = "zl7OX3LlBLxn0oLYlNbVavxL4rho4LS3EZmAB2x6zZs="; - "8.2" = "fYGIDxNeBx+HyPx9lhfNZgKUeMJwZ4KvUcJ4jtwH5nQ="; + "8.0" = "j1K27FsITfpZzVVDIZJeooNv7iIBL8MTCMJHJCnS9XU="; + "8.1" = "JzR7fHg4P0H2I4ldZZYhojsDRVpGlPhg7UMrL4WbLyQ="; + "8.2" = "r48LRQlzMPjH11KH3T05x/nCSDmw6KSiiUt78NcKyOk="; }; }; }; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index a6ba7777bf134..33ad5756ee18d 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.23117"; + version = "0.1.23667"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w7vBDJnkfpdOaNJWlo0fCRvdqEzImCn9y22Xflg/aH0="; + sha256 = "sha256-VrRdcp03B/Q3tUD/WKKKr7svNiOXFMM2s6EuIda6z6g="; }; - vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; + vendorHash = "sha256-6l2cblbpIORSqhu2rjzmDl/7y/Vki7fX/b5002jDKd0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index c77cf7833dd7b..ddc8f596c72b5 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.12.09-15.51.10"; + version = "2023.01.26-11.08.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hWDTxYtL0c9zkJDle9/XNPMwDDCltfAnz/Os83xL3iM="; + sha256 = "sha256-1dbeS9yF+qjmwDyfELQhlEyAI5B8092Lg0SwqvqXPgc="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "df8e000a69fc2aaa85312952f27a9b79625928d825acfe1da69cb67d220ada33"; + sha256 = "7fe2f384233d5101483803f72d995b75cf3587eae10dc954989018c2accf711b"; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 0229aba0f38bd..f204b28ee1df8 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 64ee3da1ad924..f8b6bd0ea68e0 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 3acf22e2cd7d1..fc758e4ab021a 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 <<EOF >>"$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/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 78b743ef9f1bf..bb95f21f68d67 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf rpcsvc-proto ]; buildInputs = [ popt zlib libtirpc ]; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; patches = [ diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 49186c75c9a12..e3d55472faac9 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./gcc44.patch ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; postInstall = '' install -D icons/ddd.xpm $out/share/pixmaps/ddd.xpm diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/development/tools/misc/deheader/default.nix index ad1cb909b0dee..7847c29f67c5f 100644 --- a/pkgs/development/tools/misc/deheader/default.nix +++ b/pkgs/development/tools/misc/deheader/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "deheader"; - version = "1.8"; + version = "1.10"; outputs = [ "out" "man" ]; src = fetchFromGitLab { owner = "esr"; repo = "deheader"; rev = version; - sha256 = "sha256-sjxgUtdsi/sfxOViDj7l8591TSYwtCzDQcHsk9ClXuM="; + sha256 = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs="; }; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 6c2799cfadf78..5c7720a2024b4 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -36,8 +36,11 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram "$out/bin/runtest" \ - --prefix PATH ":" "${expect}/bin" + # 'runtest' and 'dejagnu' look up 'expect' in their 'bin' path + # first. We avoid use of 'wrapProgram' here because wrapping + # of shell scripts does not preserve argv[0] for schell scripts: + # https://sourceware.org/PR30052#c5 + ln -s ${expect}/bin/expect $out/bin/expect ''; meta = with lib; { diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 8dddea94f05ec..fb8767edc89c5 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.2.4"; + version = "6.3.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-Y2MFxceOS3H4Ya0EupgQqtOnkhEk6DXbg6rix3J9OtM="; + sha256 = "sha256-ISyimfjTWU4niGeL8cSRRsUMNq3OQOvKJw7MCbY0K7o="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index 0ce3bb52cd4f5..26610c2c78d71 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { phones. With dfu-util you are able to download firmware to your device or upload firmware from it. ''; - homepage = "http://dfu-util.sourceforge.net"; + homepage = "https://dfu-util.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 27ff1b5e69dd6..b7270f79c4315 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -27,10 +27,10 @@ let CXXFLAGS="-O2 -fno-strict-aliasing" --mandir=$out/share/man ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} - ${if static then "LDFLAGS=-static" else ""} - --with${if static == true || popt == null then "" else "out"}-included-popt - --with${if avahi != null then "" else "out"}-avahi - --with${if gtk3 != null then "" else "out"}-gtk + ${lib.optionalString static "LDFLAGS=-static"} + ${lib.withFeature (static == true || popt == null) "included-popt"} + ${lib.withFeature (avahi != null) "avahi"} + ${lib.withFeature (gtk3 != null) "gtk"} --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index 7a3202df40f38..1b7834318772d 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -26,6 +26,6 @@ buildGoPackage rec { description = "docopt CLI tool for shell scripting"; license = licenses.mit; maintainers = [ maintainers.confus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix index ec65ca62fa30b..2203863264f34 100644 --- a/pkgs/development/tools/misc/edb/default.nix +++ b/pkgs/development/tools/misc/edb/default.nix @@ -30,6 +30,8 @@ mkDerivation rec { # Change default optional terminal program path to one that is more likely to work on NixOS. substituteInPlace ./src/Configuration.cpp --replace "/usr/bin/xterm" "xterm"; + + sed '1i#include <memory>' -i include/{RegisterViewModelBase,State,IState}.h # gcc12 ''; meta = with lib; { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 87271cf50ffa1..2b71fa7116705 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 667acd91f3496..bd7adcd1a7b12 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # darwin build fails with format hardening since v7.12 hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ]; - NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; + env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; configurePlatforms = [ "build" "host" "target" ]; diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index 71b0bbd0b0d69..d836e5a973aef 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq"; }; + enableParallelBuilding = true; + meta = { description = "Perfect hash function generator"; diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/development/tools/misc/grpc-client-cli/default.nix index b569b9ff9f6c5..308b2cb7cecc8 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.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-tvpLsiZvGneabAoTewIEnCh+0lzbr7DNepjXGg7azLc="; + sha256 = "sha256-iIF/CzNWY8XQiXQ4WFDU2mHDuNeWmAOXP16irik83FU="; }; - vendorSha256 = "sha256-NFVDDOejclWA2WQr7CHX1CUNu+Lh5jukroSrkxby8Ag="; + vendorHash = "sha256-6oJuyW3Yc/m7GnE2WipTUQk9eymK6xd+dT7mOVn2/vM="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 1d25dc8c6e0d5..5c54941b90775 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "help2man"; - version = "1.49.2"; + version = "1.49.3"; src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ni4OITp+CjYkTu1iBNkCtlBGAqV4tuzRUmixRU3q3TY="; + url = "mirror://gnu/help2man/help2man-${version}.tar.xz"; + sha256 = "sha256-TX5P3vLspq/geiaCFRzqeHgeCk6PliIULZ9wwIOi/U8="; }; strictDeps = true; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { "--enable-nls" ]; - doCheck = false; # target `check' is missing + doCheck = false; # target `check' is missing - patches = if stdenv.hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; + patches = lib.optional stdenv.hostPlatform.isCygwin ./1.40.4-cygwin-nls.patch; # We don't use makeWrapper here because it uses substitutions our # bootstrap shell can't handle. @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { cat > $out/bin/help2man <<EOF #! $SHELL -e export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix} - ${lib.optionalString stdenv.hostPlatform.isCygwin - ''export PATH=\''${PATH:+:}${gettext}/bin''} + ${lib.optionalString stdenv.hostPlatform.isCygwin ''export PATH=\''${PATH:+:}${gettext}/bin''} exec -a \$0 $out/bin/.help2man-wrapped "\$@" EOF chmod +x $out/bin/help2man @@ -45,14 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generate man pages from `--help' output"; - - longDescription = - '' help2man produces simple manual pages from the ‘--help’ and - ‘--version’ output of other commands. - ''; - + longDescription = '' + help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands. + ''; homepage = "https://www.gnu.org/software/help2man/"; - license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 4c141f5a87bcd..358de5b4a9c33 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - NIX_CFLAGS_COMPILE = "-pthread"; + env.NIX_CFLAGS_COMPILE = "-pthread"; OPENLDAP_ROOT = openldap; diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index ce8ce9d8a48b5..1e5aebb76f838 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo ]; pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 40cf1e14e94d5..a5548ff2051d1 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { liboping ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; preConfigure = '' patchShebangs tests man diff --git a/pkgs/development/tools/misc/itm-tools/Cargo.lock b/pkgs/development/tools/misc/itm-tools/Cargo.lock new file mode 100644 index 0000000000000..d9d39e519d228 --- /dev/null +++ b/pkgs/development/tools/misc/itm-tools/Cargo.lock @@ -0,0 +1,315 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "addr2line" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler32" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +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 = "backtrace" +version = "0.3.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "byteorder" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "clap" +version = "2.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] +name = "exitfailure" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" +dependencies = [ + "failure", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "gimli" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" + +[[package]] +name = "hermit-abi" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ + "libc", +] + +[[package]] +name = "itm" +version = "0.4.0" +source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" +dependencies = [ + "byteorder", + "either", + "thiserror", +] + +[[package]] +name = "itm-tools" +version = "0.1.0" +dependencies = [ + "clap", + "exitfailure", + "failure", + "itm", + "rustc-demangle", + "xmas-elf", +] + +[[package]] +name = "libc" +version = "0.2.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" + +[[package]] +name = "miniz_oxide" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" +dependencies = [ + "adler32", +] + +[[package]] +name = "object" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" + +[[package]] +name = "proc-macro2" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[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.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "synstructure" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xmas-elf" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" +dependencies = [ + "zero", +] + +[[package]] +name = "zero" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/pkgs/development/tools/misc/itm-tools/cargo-lock.patch b/pkgs/development/tools/misc/itm-tools/cargo-lock.patch deleted file mode 100644 index 1559510cd9f14..0000000000000 --- a/pkgs/development/tools/misc/itm-tools/cargo-lock.patch +++ /dev/null @@ -1,321 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..d9d39e5 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,315 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "addr2line" -+version = "0.12.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler32" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+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 = "backtrace" -+version = "0.3.49" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" -+dependencies = [ -+ "addr2line", -+ "cfg-if", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "byteorder" -+version = "1.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "clap" -+version = "2.33.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "either" -+version = "1.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+ -+[[package]] -+name = "exitfailure" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" -+dependencies = [ -+ "failure", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "gimli" -+version = "0.21.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "itm" -+version = "0.4.0" -+source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" -+dependencies = [ -+ "byteorder", -+ "either", -+ "thiserror", -+] -+ -+[[package]] -+name = "itm-tools" -+version = "0.1.0" -+dependencies = [ -+ "clap", -+ "exitfailure", -+ "failure", -+ "itm", -+ "rustc-demangle", -+ "xmas-elf", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.71" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -+dependencies = [ -+ "adler32", -+] -+ -+[[package]] -+name = "object" -+version = "0.20.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+ -+[[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.33" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+ -+[[package]] -+name = "winapi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "xmas-elf" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" -+dependencies = [ -+ "zero", -+] -+ -+[[package]] -+name = "zero" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix index 0abdd01790132..7f027a2173279 100644 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -11,12 +11,19 @@ rustPlatform.buildRustPackage rec { sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy"; }; - cargoPatches = [ ./cargo-lock.patch ]; - - cargoSha256 = "1hqv530x8k4rf9zzyl5p5z58bymk1p4qwrcxs21gr0zm2hqjlxy4"; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "itm-0.4.0" = "sha256-T61f1WvxEMhI5bzp8FuMYWiG1YOPJvWuBJfK/gjuNKI="; + }; + }; nativeBuildInputs = [ pkg-config ]; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index 03044fe5c444a..8b38246d67d58 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--enable-frontends=conf,mconf,nconf" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; meta = with lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 3798da7af7b2e..fa58d1fbbf423 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 8625a421af64f..a2c58010eff7c 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/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ac80fc471e063..2faefedd66563 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.98.0"; src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "sha256-S+8KizjayqeiWsMySWjRoZQf7ODCjdMq5ULoetOdYiA="; + sha256 = "sha256-DQLY0a0sOCZFEJA4Y4b18OcWZw47RyqKZ0mVG0CDVTI="; }; patches = [ diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch index c433fd6e08f89..3c518896b0452 100644 --- a/pkgs/development/tools/misc/lsof/no-build-info.patch +++ b/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -1,6 +1,6 @@ ---- a/usage.c 2018-02-14 15:20:32.000000000 +0100 -+++ b/usage.c 2018-10-08 21:57:45.718560869 +0200 -@@ -930,24 +930,6 @@ +--- a/usage.c ++++ b/usage.c +@@ -931,24 +931,6 @@ usage(err, fh, version) (void) fprintf(stderr, " configuration info: %s\n", cp); #endif /* defined(LSOF_CINFO) */ @@ -19,22 +19,22 @@ - cp1 ? cp1 : "", - (cp && cp1) ? "@" : "", - cp ? cp : "" -- ); +- ); - } - #if defined(LSOF_BLDCMT) if ((cp = isnullstr(LSOF_BLDCMT))) (void) fprintf(stderr, " builder's comment: %s\n", cp); -@@ -959,12 +939,8 @@ +@@ -958,12 +940,6 @@ usage(err, fh, version) (void) fprintf(stderr, " compiler: %s\n", cp); if ((cp = isnullstr(LSOF_CCV))) (void) fprintf(stderr, " compiler version: %s\n", cp); - if ((cp = isnullstr(LSOF_CCFLAGS))) - (void) fprintf(stderr, " compiler flags: %s\n", cp); - if ((cp = isnullstr(LSOF_LDFLAGS))) - (void) fprintf(stderr, " loader flags: %s\n", cp); +- if ((cp = isnullstr(LSOF_LDFLAGS))) +- (void) fprintf(stderr, " loader flags: %s\n", cp); - if ((cp = isnullstr(LSOF_SYSINFO))) - (void) fprintf(stderr, " system info: %s\n", cp); - (void) report_SECURITY(" ", ".\n"); - (void) report_WARNDEVACCESS(" ", "are", ".\n"); - (void) report_HASKERNIDCK(" K", "is"); + // display configurations that might affect output + char *features[] = { + #if defined(HASEFFNLINK) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 916226ea05052..941a582cead00 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,13 +2,13 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2022-10-12"; + version = "unstable-2023-02-26"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "7b3cc90ebf07813ed511f530cc50d602e9502001"; - sha256 = "sha256-zN+8BzUkKUQU/6BWg1kcsL3XV9qehnwm1L4vRKOejPs="; + rev = "4cfea3d5d826db4cfbc809ef8bb5f0a9f3a18919"; + sha256 = "sha256-7L8B+/C7Kzt25Ec+OsM2rliYB2/wyZQ3OT63V7AaOxo="; }; patches = [ ]; diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index 0e5b7b0167220..40fb2f51a60d4 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -1,24 +1,26 @@ GEM remote: https://rubygems.org/ specs: - chef-utils (16.7.61) - kramdown (2.3.0) + chef-utils (18.1.0) + concurrent-ruby + concurrent-ruby (1.2.0) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - mdl (0.11.0) + mdl (0.12.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) mixlib-cli (~> 2.1, >= 2.1.1) mixlib-config (>= 2.2.1, < 4) mixlib-shellout mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.2) + mixlib-shellout (3.2.7) chef-utils - rexml (3.2.4) - tomlrb (2.0.0) + rexml (3.2.5) + tomlrb (2.0.3) PLATFORMS ruby @@ -27,4 +29,4 @@ DEPENDENCIES mdl BUNDLED WITH - 2.1.4 + 2.4.6 diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix index eaaa7bed5a5ef..1fd09e878088f 100644 --- a/pkgs/development/tools/misc/mdl/gemset.nix +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,13 +1,24 @@ { chef-utils = { + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; + sha256 = "0ckbnra3cs71syrvfhgcrg1icqxh6pj21by2f9sy6r6kbr19g4w3"; type = "gem"; }; - version = "16.7.61"; + version = "18.1.0"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + type = "gem"; + }; + version = "1.2.0"; }; kramdown = { dependencies = ["rexml"]; @@ -15,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -37,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; + sha256 = "1gk42gayn8d2084ak6wvdwch00wb0acvncglfdhi5n0ap93q6wb6"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; mixlib-cli = { groups = ["default"]; @@ -58,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; type = "gem"; }; - version = "3.0.9"; + version = "3.0.27"; }; mixlib-shellout = { dependencies = ["chef-utils"]; @@ -69,29 +80,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.7"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; + sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.3"; }; } 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 0000000000000..062cb39d62d4c --- /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 0000000000000..d9c138281ed41 --- /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/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index ec9fb436f7648..39b6baabc836a 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.24"; + # Need a revision that supports DW_TAG_unspecified_type(0x3b). + # Was added after 1.24 release in a series of changes. + # Can switch back to release tags once 1.25 is cut. + version = "1.24-unstable-2022-11-24"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; - rev = "v${version}"; - sha256 = "sha256-OPseVKt5kIKgK096+ufKrWMS1E/7Z0uxNqCMN6wKfKg="; + rev = "02d67c51765dfbd5893087da63744c864c7cc9e0"; + hash = "sha256-hKc8UKxPtEM2zlYmolSt1pXJKNRt4wC/Uf+dP/Sb7+s="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index 576b9ca2103ec..8f010a3f4d0b1 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/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix new file mode 100644 index 0000000000000..0b95f2f170216 --- /dev/null +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, lib, php }: + +let + pname = "phpunit"; + version = "10.0.11"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://phar.phpunit.de/phpunit-${version}.phar"; + hash = "sha256-zAAFDiZ2wjncGMI4c74+tzWR++rKMjv1h5gk2GobhbI="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phpunit/phpunit.phar + makeWrapper ${php}/bin/php $out/bin/phpunit \ + --add-flags "$out/libexec/phpunit/phpunit.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "PHP Unit Testing framework"; + license = licenses.bsd3; + homepage = "https://phpunit.de"; + changelog = "https://github.com/sebastianbergmann/phpunit/blob/${version}/ChangeLog-${lib.versions.majorMinor version}.md"; + maintainers = with maintainers; [ onny ] ++ teams.php.members; + }; +} diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index f2721ab952c64..d4feca6dfe6e5 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/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 3c7dc14327eac..8fefb65e79be3 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, libuuid, cacert, Foundation, readline }: -with lib; - stdenv.mkDerivation rec { pname = "premake5"; version = "5.0.0-beta2"; @@ -13,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = [ libuuid ] ++ optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; patchPhase = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 ''; @@ -42,7 +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/rocgdb/default.nix b/pkgs/development/tools/misc/rocgdb/default.nix index 6ad3e301822df..8775ca6d2d685 100644 --- a/pkgs/development/tools/misc/rocgdb/default.nix +++ b/pkgs/development/tools/misc/rocgdb/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # `-Wno-format-nonliteral` doesn't work - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 1c049eac7aa32..6eeb47df10ab4 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.3"; + version = "2.4.6"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - hash = "sha256-xF87Q1K25/9pUYt660RY2RCIC6u2m2ArBQb2nWhiKvw="; + hash = "sha256-FYLjg4lzr8M22r4yoKfMIAx2HKGi2fcD28AaV1ChkLk="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 19f8929ff58d4..0ecebde8c244d 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.3"; + version = "0.3.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-0JOA+T6GJnMUSK+oldZ+8XtgrDDLkccUKYYzjMExM7M="; + sha256 = "sha256-7ctzbuBP2AeBCd+/n18EdxIeCK89fCPb1ZbSRjdg8u0="; }; - cargoSha256 = "sha256-282IAKbou3+0CYMcAhPNr35N3ugrN/fY82KTzyoTy2o="; + cargoHash = "sha256-b5zb5YMqCfj8jAXQPQnBp6qTs0OGTrTgsd9bDGzPdus="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index f941ab05e2888..ae880ceb8ba48 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -5,13 +5,15 @@ , shortenPerlShebang , mysqlSupport ? false , postgresqlSupport ? false +, templateToolkitSupport ? false }: let sqitch = perlPackages.AppSqitch; modules = with perlPackages; [ ] ++ lib.optional mysqlSupport DBDmysql - ++ lib.optional postgresqlSupport DBDPg; + ++ lib.optional postgresqlSupport DBDPg + ++ lib.optional templateToolkitSupport TemplateToolkit; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 538437b2a6cff..100014a139b18 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.1"; + version = "6.2"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JXnpzsN9u3hvbqC+vRX0DdVh7yveKiouzc5ZY7AYWf0="; + sha256 = "sha256-DH04pElBYmjTAEApoiChWnfCIGoDzIgSDzf0bpSRd+g="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 25121bf1ad7d0..cf3cdf586cc45 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libpcap ]; - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 44450f36f492d..229438377d131 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 = "5.1.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rTRUiRL8zGZ6F1hzCPpsakXkxSrumLRRNd+CykXw0vo="; + sha256 = "sha256-DOzXsxqOLlETCAVpKpUXAxO+T0pE+2LwnOS99vU2o48="; }; - cargoSha256 = "sha256-c7/5koNdIaQx4x54qvaKI/mdioPICAjrvRhi1Jzxpu0="; + cargoSha256 = "sha256-t/4nfsED29F8v3DkLYCh2A8AJvQvZvU8z6C0PLhTFuM="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.1.0/.github/workflows/publish.yml#L127-L131 + # https://github.com/latex-lsp/texlab/blob/v5.3.0/.github/workflows/publish.yml#L127-L131 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index c187ad42c0e98..abc4265a1ce7e 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { dontUseQmakeConfigure = true; # c++11 and above is needed for building with Qt 5.9+ - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; sourceRoot = "source/src"; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 3abcfabad779a..2d01944dce419 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" - ${python.interpreter} build.py --system-libclang --clang-completer --ninja + ${python.pythonForBuild.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix index 2b14bf09ddbd5..024028fd5b69d 100644 --- a/pkgs/development/tools/mmixware/default.nix +++ b/pkgs/development/tools/mmixware/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: mmix-config.o:(.bss+0x600): multiple definition of `buffer'; /build/ccDuGrwH.o:(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; nativeBuildInputs = [ tetex ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index b6c018693e5e8..3514e9c24d13d 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i4+MOEZWt+Qb05HgXcGR0uDuMoOAyMhVeLPQwnGiEw8="; + hash = "sha256-5zE5a+BYzQjgVb0Ti7bSQrGzTyysOTTR0NMOO5IKG68="; }; nativeBuildInputs = [ @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-faligned-allocation" - ]; + ]); passthru.tests.version = testers.testVersion { package = mold; }; diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/development/tools/nodenv/default.nix index d1e38d7bda744..657492966cf27 100644 --- a/pkgs/development/tools/nodenv/default.nix +++ b/pkgs/development/tools/nodenv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nodenv"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "nodenv"; repo = "nodenv"; rev = "v${version}"; - sha256 = "0fgc23jd95rjll3dy5hnli8ksfc7rwscw53sdgss4yaharwlg8l2"; + sha256 = "sha256-S7Uld7wiVJjwuvfupBodIAIOO2c/ywEmFfhEHVOCcCc="; }; buildPhase = '' @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ alexnortung ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 471932ff83f7a..dd25dd864cee5 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 65debca11c231..9d81c46e20c9f 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 753ef0a836b98..87db3baf0b0e3 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 7e48203c091e3..7bc1f80c699f6 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -20,10 +20,11 @@ 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 = [ alcotest ] ++ runtimeInputs; + nativeCheckInputs = [ odoc ]; + checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; postPatch = '' diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 51df81cea5ef0..f48ce5abf3f45 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/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index cec91a02f2093..de8906dba44b6 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage -, cmdliner, yojson, ppxlib +, cmdliner, yojson, ppxlib, findlib , menhir, menhirLib }: @@ -7,6 +7,7 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; version = "4.1.0"; duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; @@ -17,7 +18,7 @@ buildDunePackage rec { 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/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 8a4dce3422315..4a0a87577cbff 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-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index f5853057d8e06..18ea26ca22a8d 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -2,27 +2,23 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; - version = "1.2.0-rc"; + version = "1.2.0"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-top"; rev = version; - sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ="; + hash = "sha256-xmPGGB/zUpfeAxUIhR1PhfoESAJq7sTpqHuf++EH3Lw="; }; - buildInputs = [ ncurses ocp-build lablgtk3-sourceview3 ocp-index ]; + nativeBuildInputs = [ ocp-build ]; + buildInputs = [ ncurses lablgtk3-sourceview3 ocp-index ]; configurePhase = '' export TERM=xterm ocp-build -init ''; - postPatch = '' - substituteInPlace src/completion.ml \ - --replace 'LibIndex.load ' 'LibIndex.load ~qualify:false ' - ''; - meta = { homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index b40c8b42546b7..0ac69f86c90dd 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 551a36adaed1b..5b4f7e8e44078 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"; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 48b7d840a4f2b..8277f4adb06dc 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 feb787d24d5d2..de26536eb1c5c 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/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 54e1ee55a7bff..fcb43938112d1 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/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index f6c7955c68633..b7d670ce4a7e7 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { 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/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 60804684ccbc8..23a73002e6fe1 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 de831fde99f14..1db7ea151fabe 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -79,8 +79,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.1.4"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 8929afdef0aba..8b573039d7d87 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -68,8 +68,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 5d500339ff679..0afaff2649470 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 c9728f9cbbf63..faa7b3eae900f 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 31056cff37140..d83d5ef6f11e1 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "13.6.0"; + version = "14.9.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N24kt564/gdJ4mUIyul3zfUFTtF9y49IERfE2jVIL8Q="; + hash = "sha256-oWif17MawHKiFRts9wfLA7XcSLMuogaPLziYzgKihas="; }; - vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; + vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0="; sourceRoot = "source/src"; @@ -35,6 +35,11 @@ buildGoModule rec { "static_build" ]; + postPatch = '' + # this test requires internet access + rm engine/migrate_glyphs_test.go + ''; + postInstall = '' mv $out/bin/{src,oh-my-posh} mkdir -p $out/share/oh-my-posh diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 469c68e2044b1..b9f549693dfe7 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.11.1"; + version = "2.12.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-Eprsy/wd5lMBXk3yVGhofYD9ZBfdmjGMwXZ61RMgd4k="; + hash = "sha256-5HAXcFD53VJ+OpmpStKIazoqztAyeqsdRfJy0ctocEk="; }; vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index f3e8c942bf24a..919c8c0a48b83 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.1.47"; + version = "0.1.50"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-HjoVD3GLNg1jdCPMwEUJR/0BLJexbVxacVfmIm/P4SI="; + sha256 = "sha256-u7epE09WcbXAX1W+zkCOTDECnBTIOFC3gjNowtpuYtI="; }; - vendorHash = "sha256-/wTLnJ3l22owDL5dFR9H/QN3UItxP7QQgU/NcmzBL6U="; + vendorHash = "sha256-QoD6J+is+InumLiFdbL/y1tuWwBCdBebx6RrIZ4Irik="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 3b38cc97e6b84..fd8658ad0734f 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hIJTdTZ24+VwF1M/RvKcnQRzZga0nsjlTTUFYxZn0lo="; + hash = "sha256-rvLWM6G2kOOuFU0JuwdIjSCFNyjBNL+fOoEj+tIR190="; }; - vendorHash = "sha256-1Vz+SIrNULajDqzZt53+o9wv1zLPBvKrO28BTqS4VbM="; + vendorHash = "sha256-L+Z1k+z/XNO9OeTQVzNJd1caRip6Ti8mPfNmXJx5D5c="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 3204058326a3a..20603311b8ad5 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.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-jdJD7AW4IrzVl4BPdsFFrRSdCWX9l4nFM+DWIuxLiJ8="; + sha256 = "sha256-Nc4H7qx+TmbG80Ogw4zRofux5VwqeQZIg9gLqZprgVE="; }; - vendorSha256 = "sha256-ufvWgusTMbM88F3BkJ61KM2wRSdqPOlMKqDSYf7tZQA="; + vendorHash = "sha256-poTBx62m9Q4az5BECFKmFAE37B8C/DVIyHeC80P+VYQ="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/development/tools/paging-calculator/default.nix new file mode 100644 index 0000000000000..f57d7b137b1a2 --- /dev/null +++ b/pkgs/development/tools/paging-calculator/default.nix @@ -0,0 +1,31 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "paging-calculator"; + version = "0.1.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-9DbpfJbarWXYGNzTqfHHSaKFqSJ59E/VhOhuMUWk8ho="; + }; + + cargoHash = "sha256-IfOhJwR5eRHeeAbEZ8zeUVojQXtrYHdzAeht/lvdlUQ="; + + meta = { + description = "CLI utility that helps calculating page table indices from a virtual address"; + longDescription = '' + paging-calculator is a CLI utility written in Rust that helps you find the indices that a virtual + address will have on different architectures or paging implementations. + + It takes a (virtual) address in hexadecimal format and shows you which index will be used for + what page-table level. It can be installed with $ cargo install paging-calculator. + ''; + homepage = "https://github.com/phip1611/paging-calculator"; + changelog = "https://github.com/phip1611/paging-calculator/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 0e8777e9f3f92..24b47119dc610 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -21,7 +21,7 @@ let configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix new file mode 100644 index 0000000000000..f379a1ed05175 --- /dev/null +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, python3 +, bison +, flex +, zlib +}: + +stdenv.mkDerivation rec { + pname = "spicy"; + version = "1.5.3"; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "spicy"; + rev = "v${version}"; + hash = "sha256-eCF914QEBBqg3LfM3N22c7W0TMOhuHqLxncpAG+8FjU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + python3 + ]; + + buildInputs = [ + bison + flex + zlib + ]; + + postPatch = '' + patchShebangs scripts tests/scripts + ''; + + cmakeFlags = [ + "-DHILTI_DEV_PRECOMPILE_HEADERS=OFF" + ]; + + preFixup = '' + for b in $out/bin/* + do wrapProgram "$b" --prefix PATH : "${lib.makeBinPath [ bison flex ]}" + done + ''; + + meta = with lib; { + homepage = "https://github.com/zeek/spicy"; + description = "A C++ parser generator for dissecting protocols & files"; + longDescription = '' + Spicy is a parser generator that makes it easy to create robust C++ + parsers for network protocols, file formats, and more. Spicy is a bit + like a "yacc for protocols", but it's much more than that: It's an + all-in-one system enabling developers to write attributed grammars that + describe both syntax and semantics of an input format using a single, + unified language. Think of Spicy as a domain-specific scripting language + for all your parsing needs. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 13ba669bb4f21..8fcb696ac7f27 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -60,7 +60,7 @@ let buildGrammar { language = grammar.language or name; inherit version; - src = grammar.src or fetchGrammar grammar; + src = grammar.src or (fetchGrammar grammar); location = grammar.location or null; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 9e792a49733b1..9704788141c7a 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.4"; + version = "5.5"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "sha256-z90V4aKp5gIZMWQha3gHpTMtpYVsGhFtPWHiJuFt3qA="; + hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w="; }; outputs = [ "out" ]; @@ -40,5 +40,6 @@ perlPackages.buildPerlPackage rec { changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; maintainers = [ maintainers.marsam ]; license = [ licenses.postgresql licenses.artistic2 ]; + mainProgram = "pg_format"; }; } diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index f12cf2a07c962..ab2e047264eb3 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://pgloader.io/"; description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index f76e0287b564a..ecd80d6260496 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { pname = "picotool"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE="; + sha256 = "sha256-KP5Cq6pYKQI5dV6S4lLapu9EcwAgLgYpK0qreNDZink="; }; buildInputs = [ libusb1 pico-sdk ]; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; - installPhase = '' - runHook preInstall - install -Dm755 ./picotool -t $out/bin - runHook postInstall - ''; - meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 2d19f0fca3c37..e347f4c48e053 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.25"; + version = "2023.2.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ElnWxwU7EIbZqqvIGp/rc5vS0X6BuyAgSJoy7BQYYu4="; + sha256 = "sha256-GKPrpRnjbVnw1af5xCvSaFIeS5t7PRvWrc8TFWkyMnU="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix index 335b5cd17bef3..ffe1eaf6a4838 100644 --- a/pkgs/development/tools/poac/default.nix +++ b/pkgs/development/tools/poac/default.nix @@ -4,6 +4,7 @@ , cmake , cpm-cmake , git +, git2-cpp , cacert , boost179 , fmt_8 @@ -11,19 +12,14 @@ , libarchive , libgit2 , lz4 +, mitama-cpp-result , ninja , openssl_3 +, package-project-cmake , spdlog }: let - git2Cpp = fetchFromGitHub { - owner = "ken-matsui"; - repo = "git2-cpp"; - rev = "v0.1.0-alpha.1"; - sha256 = "sha256-Ub0wrBK5oMfWGv+kpq/W1PN3yzpcfg+XWRFF/lV9VCY="; - }; - glob = fetchFromGitHub { owner = "p-ranav"; repo = "glob"; @@ -31,20 +27,6 @@ let sha256 = "sha256-2y+a7YFBiYX8wbwCCWw1Cm+SFoXGB3ZxLPi/QdZhcdw="; }; - packageProjectCMake = fetchFromGitHub { - owner = "TheLartians"; - repo = "PackageProject.cmake"; - rev = "v1.3"; - sha256 = "sha256-ZktftDrPo+JhBt0XKJekv0cyxIagvcgMcXZOBd4RtKs="; - }; - - mitamaCppResult = fetchFromGitHub { - owner = "LoliGothick"; - repo = "mitama-cpp-result"; - rev = "v9.3.0"; - sha256 = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM="; - }; - structopt = fetchFromGitHub { owner = "p-ranav"; repo = "structopt"; @@ -61,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "poac"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "poacpm"; repo = pname; rev = version; - sha256 = "sha256-jXYPeI/rVuTr7OYV5sMgNr+U1OfN0XZtun6mihtlErY="; + sha256 = "sha256-JgGa7lomDvZG5HLxGJMALcezjnZprexJDTxyTUjLetg="; }; preConfigure = '' @@ -76,13 +58,13 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCPM_USE_LOCAL_PACKAGES=ON" + "-DPOAC_BUILD_TESTING=OFF" "-DCPM_SOURCE_CACHE=${placeholder "out"}/share" "-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_8}" - "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2Cpp}" + "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2-cpp.src}" "-DFETCHCONTENT_SOURCE_DIR_GLOB=${glob}" - "-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${packageProjectCMake}" - "-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitamaCppResult}" + "-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}" @@ -95,10 +77,10 @@ stdenv.mkDerivation rec { enableStatic = !stdenv.isDarwin; }) fmt_8 - git2Cpp + git2-cpp glob - packageProjectCMake - mitamaCppResult + package-project-cmake + mitama-cpp-result ninja structopt toml11 diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index a503ea594fb41..513d17fbbc2f7 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -18,7 +18,7 @@ let makeSetupHook { name = "remove-path-dependencies.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; substitutions = { # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion # because building of tomlkit and its dependencies also use these hooks. @@ -50,7 +50,7 @@ in makeSetupHook { name = "pip-build-hook.sh"; - deps = [ pip wheel ]; + propagatedBuildInputs = [ pip wheel ]; substitutions = { inherit pythonInterpreter pythonSitePackages; }; @@ -64,7 +64,7 @@ in makeSetupHook { name = "fixup-hook.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; substitutions = { inherit pythonSitePackages; filenames = builtins.concatStringsSep " " [ @@ -84,7 +84,7 @@ in makeSetupHook { name = "wheel-unpack-hook.sh"; - deps = [ ]; + propagatedBuildInputs = [ ]; } ./wheel-unpack-hook.sh ) { }; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index dd1e2640a528e..424e93c9344a1 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -151,7 +151,7 @@ let (builtins.filter ({ prefix, path }: "NETRC" == prefix) builtins.nixPath); - netrc_file = if (pathParts != [ ]) then (builtins.head pathParts).path else ""; + netrc_file = lib.optionalString (pathParts != [ ]) (builtins.head pathParts).path; in pkgs.runCommand file { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 36a66d091aebe..a5bb46309f4c3 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -345,7 +345,7 @@ lib.composeManyExtensions [ LIB_DIR = "${lib.getLib pkgs.secp256k1}/lib"; # for actual C toolchain build - NIX_CFLAGS_COMPILE = "-I ${lib.getDev pkgs.secp256k1}/include"; + env.NIX_CFLAGS_COMPILE = "-I ${lib.getDev pkgs.secp256k1}/include"; NIX_LDFLAGS = "-L ${lib.getLib pkgs.secp256k1}/lib"; } ); @@ -457,9 +457,9 @@ lib.composeManyExtensions [ preConfigure = lib.concatStringsSep "\n" [ (old.preConfigure or "") - (if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' + (lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) '' MACOSX_DEPLOYMENT_TARGET=10.16 - '' else "") + '') ]; preBuild = old.preBuild or "" + '' @@ -720,7 +720,7 @@ lib.composeManyExtensions [ (old.propagatedBuildInputs or [ ]) ++ lib.optionals mpiSupport [ self.mpi4py self.openssh ] ; - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + preBuild = lib.optionalString mpiSupport "export CC=${mpi}/bin/mpicc"; HDF5_DIR = "${pkgs.hdf5}"; HDF5_MPI = if mpiSupport then "ON" else "OFF"; # avoid strict pinning of numpy @@ -1383,7 +1383,7 @@ lib.composeManyExtensions [ openexr = super.openexr.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; } ); @@ -1838,7 +1838,7 @@ lib.composeManyExtensions [ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ ( if withApplePCSC then [ PCSC ] else [ pcsclite ] ); - NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) + env.NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) "-I ${lib.getDev pcsclite}/include/PCSC"; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig @@ -2410,9 +2410,7 @@ lib.composeManyExtensions [ # Stop infinite recursion by using bootstrapped pkg from nixpkgs bootstrapped-pip = super.bootstrapped-pip.override { - wheel = (pkgs.python3.pkgs.override { - python = self.python; - }).wheel; + wheel = self.python.pkgs.wheel; }; watchfiles = diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index cadf9b9eeb169..e7c3ee8c5787a 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -19,6 +19,7 @@ let nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; # Needed with GCC 12 }; ## a kernel build dir as expected by systemtap @@ -42,7 +43,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 e53760f54afaf..598b2570600e7 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -9,14 +9,14 @@ in python3.pkgs.buildPythonApplication rec { pname = "prospector"; - version = "1.8.4"; + version = "1.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g7tyn6pj5I/+b28wIitqDapR5ffk1xDEAtcYs2TpIUk="; + hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index a968c26ff5830..09f4a86eeab06 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.4.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-9dLILgDolHgQx33dAtYT3RJ0scWUVh52z+2Fh6FS+K4="; + hash = "sha256-tZNMxheADUhHBOKtFBezOYiLWTR0Ztviq05ogh+uwXw="; }; vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw="; diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix index ee1793f01cab0..3adab620534ba 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/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index aabd70f1a86e3..42eec2fa4c93e 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.127.0"; + version = "0.129.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-GWfEazFrGlH26X0ILMMQTGlzIKm/S9TPCT4ViF+AA+k="; + sha256 = "sha256-GdJyOZ0FqLBRGeQZ5+qLYXLL8JxqigYCVuDUUs1KbN4="; }; - vendorHash = "sha256-5dWZLVPRKJWNtNJ5swIMgSFP2idD34sR/hzQ/+HuykU="; + vendorHash = "sha256-iXT+xvmVDfFVV/bYq+hnmkz2ODUQ4fHR8z2lcaK93TE="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index 948115c332ed3..e65ae273b2622 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.41"; + version = "0.0.42"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-6QBE6+wJ9MQXey9nXaJn69uVUhIVlWMdH9ROiMi7bZk="; + sha256 = "sha256-fs+etB/tzqzV3QbQKa4xqsAjtUkr1BdKtTNvRylnKaY="; }; vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 676e3a8aff746..1fb54f8c17edd 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,17 +1,26 @@ -{ 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="; }; - NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; + 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 + '') + ]; + + env.NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; # error: linker `arm-linux-gnueabihf-gcc` not found preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -20,7 +29,7 @@ rustPlatform.buildRustPackage rec { 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/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix index 015100a682f73..d992ac23da029 100644 --- a/pkgs/development/tools/pypi-mirror/default.nix +++ b/pkgs/development/tools/pypi-mirror/default.nix @@ -4,13 +4,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "pypi-mirror"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "montag451"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-x0to3VrnuON1Ghj6LlMOjJfqSVh9eF3Yg6Cdcxtpbc8="; + sha256 = "sha256-AqE3lAcqWq5CGsgwm8jLa1wX93deFC4mKn+oaVhO508="; }; pythonImportsCheck = [ "pypi_mirror" ]; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index cc1baad2bb0ef..5072bb88f4b6d 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 80adc6f30a75e..aa3dd1ee86883 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/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 4e7135233baaa..0e66f21a5ccb4 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -2,47 +2,54 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , ruby , which +, runCommand +, darwin }: + rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.12.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "FnUUX7qQWVZMHtWvneTLzBL1YYwF8v4e1913Op4Lvbw="; + hash = "sha256-yM3bE79flvFSZvpkHXhhEh1MJrSSJzqZcX9aVRmz1ew="; }; - cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo="; + cargoHash = "sha256-qvx5zPEIwvh2AIFCGNbVMNIRFtVjSLR9+exbSeQ9oXI="; doCheck = true; - patches = [ - # Backport rust 1.62 support. Should be removed in the next rbspy release. - (fetchpatch { - name = "rust-1.62.patch"; - url = "https://github.com/rbspy/rbspy/commit/f5a8eecfbf2ad0b3ff9105115988478fb760d54d.patch"; - sha256 = "sha256-+04rvEXU7/lx5IQkk3Bhe+KLN8PwxZ0j4nH5ySnS154="; - }) - ]; - - # Tests in initialize.rs rely on specific PIDs being queried and attaching - # tracing to forked processes, which don't work well with the isolated build. + # The current implementation of rbspy fails to detect the version of ruby + # from nixpkgs during tests. preCheck = '' substituteInPlace src/core/process.rs \ --replace /usr/bin/which '${which}/bin/which' substituteInPlace src/sampler/mod.rs \ --replace /usr/bin/which '${which}/bin/which' - substituteInPlace src/core/initialize.rs \ - --replace 'fn test_initialize_with_disallowed_process(' '#[ignore] fn test_initialize_with_disallowed_process(' \ - --replace 'fn test_get_exec_trace(' '#[ignore] fn test_get_exec_trace(' \ ''; + checkFlags = [ + "--skip=test_get_trace" + "--skip=test_get_trace_when_process_has_exited" + "--skip=test_sample_single_process" + "--skip=test_sample_single_process_with_time_limit" + "--skip=test_sample_subprocesses" + ]; + nativeBuildInputs = [ ruby which ]; + 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 + '') + ]; + + LIBCLANG_PATH = lib.optionalString stdenv.isDarwin "${stdenv.cc.cc.lib}/lib"; + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://rbspy.github.io/"; diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix index d0b0000e59a42..f98f656d4dd16 100644 --- a/pkgs/development/tools/refurb/default.nix +++ b/pkgs/development/tools/refurb/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "refurb"; - version = "1.10.0"; + version = "1.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dosisod"; repo = "refurb"; rev = "refs/tags/v${version}"; - hash = "sha256-wb9E1BX9gjejZ5nTudzEPP+suX2eG4MPT07651+OY88="; + hash = "sha256-e/gKBgbtjO2XYnAIdHDoVJWyP6cyvsuIFLrV/eqjces="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index f03b522e70a2b..4ede9ef7deee7 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.4.5"; + version = "0.4.7"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-WyjVJp0JVwLitz46YjPGpR/+AjLhjgqTRqabCB9VhHw="; + sha256 = "sha256-BPMdBTtH2uZ6x6sQe7SDe+WcLQrr8gqOka2OnLSA1kU="; }; - vendorSha256 = "sha256-QTeVgvjRw2wBd8QGoVpRVTTh+Wwu2NEZYR1Z9R52/p0="; + vendorHash = "sha256-lDazAGhNzguDzMLHYz2dbk8Jp7VKhV2ULqdXMa+WFPg="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index 3858394ce3bbf..d568743ec6781 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-owFNk+UMKBkrad45zcSHTUidmRVIIGRZ06Ll84ZfEfA="; + sha256 = "sha256-0+9fxNj0TZUQwOh9kww00/k/J8ciuWfYQS4e1aCcd7Y="; }; buildInputs = [ diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 8179f117fd43b..9b75282fbf085 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/riot-redis/default.nix b/pkgs/development/tools/riot-redis/default.nix index 945da3b0e3108..55ac4e8399f84 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 21e77ce5f487d..30d4c5a81e268 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.4.2"; + version = "5.4.3"; pname = "rocminfo"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 697d39d99f29a..c15cb643c6ee2 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 = '' @@ -38,7 +47,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ wackbyte ]; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 551ec1cb1464d..541ce48bdc9a7 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -1,22 +1,27 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.235"; + version = "0.0.244"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pa1q2OY9jwWktcQVmk8EQjb3WUtPb7SFecQ16A+3C6c="; + sha256 = "sha256-oQBNVs7hoiXNqz5lYq5YNKHfpQ/c8LZAvNvtFqpTM2E="; }; - cargoSha256 = "sha256-gYyVa615ujV5xuiC3bhscje9sP43iQV8WolClcF372Q="; + cargoSha256 = "sha256-61kypAXWfUZLfTbSp+b0gCKwuWtxAYVtKIwfVOcJ2o8="; + + nativeBuildInputs = [ + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -25,6 +30,13 @@ rustPlatform.buildRustPackage rec { # 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 89ccdaf7ec799..c6ee65d79cd17 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 444db11732258..cc2cb444a5d73 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 <stdlib.h>' > 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 <cmath>' > 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 <zlib.h>' > 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 95754d16502a5..7a99c448ba7d1 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.64.0"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-sKcKIAkUC2GfAZ4tJBNweXhoFzqO95iCpHgekpOyHzc="; + sha256 = "JfR4NDrU86npU+zJ80YKhCn2+hNirzL+0mzLyDHJQjU="; }; - cargoSha256 = "sha256-P246tw5Kznpxav0LashIkLlmQGVB+aKbFUQQdmcASPw="; + cargoSha256 = "e1Dqv3lA8WeVF/bxBedntk2nCWk9pUs6LkgP3svNI0w="; buildInputs = [ clang.cc.lib ]; diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 88b99889f1ba8..b3b49da4a48a8 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.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo="; + 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-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U="; + 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 2d467fb811c23..0000000000000 --- 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 ea8b67085fd20..0000000000000 --- a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -207,6 +207,7 @@ dependencies = [ - "toml_edit", - "twox-hash", - "url", -+ "zstd", - ] - - [[package]] -@@ -1093,6 +1094,12 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "pkg-config" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.16" -@@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" - dependencies = [ - "cc", - "libc", -+ "pkg-config", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -80,6 +80,8 @@ toml_edit = "0.15" - twox-hash = "1.6" - # Url parsing - url = "2.2" -+# Use pkg-config feature of zstd -+zstd = { version = "*", features = ["pkg-config"] } - - [dev-dependencies] - # Filesystems - Filesystem fixtures and assertions for testing diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix new file mode 100644 index 0000000000000..5705b9039b7d9 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -0,0 +1,58 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, xz +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-binstall"; + version = "0.20.1"; + + src = fetchFromGitHub { + owner = "cargo-bins"; + repo = "cargo-binstall"; + rev = "v${version}"; + hash = "sha256-wM8DawrniyJxj8Omgj+hiePa521p4hIAngfzEHFNO58="; + }; + + cargoHash = "sha256-ZanPmdFMDGZhRHVVGt03OJWz8HnSYFdm42W6rpytu5Y="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + xz + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ + "fancy-no-backtrace" + "pkg-config" + "rustls" + "trust-dns" + "zstd-thin" + ]; + + # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu + postPatch = '' + rm .cargo/config + ''; + + meta = with lib; { + description = "A tool for installing rust binaries as an alternative to building from source"; + homepage = "https://github.com/cargo-bins/cargo-binstall"; + changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix index 5e1b4c2a148b3..d94c15890bb18 100644 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -1,29 +1,24 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , nix-update-script }: rustPlatform.buildRustPackage rec { pname = "cargo-cross"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { - owner = "rust-embedded"; + owner = "cross-rs"; repo = "cross"; - rev = "v${version}"; - sha256 = "sha256-gaY34ziC+ugw/HUTSh0Uk5WBfWMRZLybfpAMkUzsj8g="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; }; - cargoSha256 = "sha256-bdcdlnNr4CdkIJNoo8tb4ohVDmAcKIOP0nRr6BM+EPw="; + cargoSha256 = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; - # Fixes https://github.com/cross-rs/cross/issues/943 - cargoPatches = [ - (fetchpatch { - url = "https://github.com/cross-rs/cross/commit/d639578881d21d28d91d155722201cc53b00c5e7.patch"; - sha256 = "sha256-FWaYIEMonb1Z8g5yXfd/Rl/LnxSYVwLfFIvPY1mJNxU="; - }) + checkFlags = [ + "--skip=docker::shared::tests::directories::test_host" ]; passthru = { @@ -32,7 +27,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Zero setup cross compilation and cross testing"; - homepage = "https://github.com/rust-embedded/cross"; + homepage = "https://github.com/cross-rs/cross"; + changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ otavio ]; mainProgram = "cross"; diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 0472dd8dfa691..053e1a5ef031f 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.42.0"; + version = "1.42.1"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY="; + hash = "sha256-8o3WQ/kaYhp1gjHLQeDU9JITv9crxAVCP8UReIVd4Fc="; }; - cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao="; + cargoHash = "sha256-EbcH2aBs9haXKBdEWJRPqJ1PSLj3pHdHJi38LH08uTk="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix new file mode 100644 index 0000000000000..580a31945b75e --- /dev/null +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-dist"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "axodotdev"; + repo = "cargo-dist"; + rev = "v${version}"; + hash = "sha256-I++dffdEXDg55WR66+Zl5P2KBvt19sp3aZkXA1GBb4A="; + }; + + cargoHash = "sha256-fLHkW28V5MBQeQDd0VrtEjou5FYwArkNDtS/jXKo8G8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + ]; + + meta = with lib; { + description = "A tool for building final distributable artifacts and uploading them to an archive"; + homepage = "https://github.com/axodotdev/cargo-dist"; + changelog = "https://github.com/axodotdev/cargo-dist/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index f5ccafc4815de..f4581ff094fbc 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.7"; + version = "0.11.9"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-u0t/Zh427ZWN1wJ1LISEWa/2r0gAnpWUf8C8eLGA7wc="; + hash = "sha256-2anmuenywCdmPncsof2nD0xrerMFMP3yhTMXs+Qux0s="; }; - cargoSha256 = "sha256-hQvxcS3DXY4SZiEKQSST5GQ40BMNDKSkwi3AqQstJvc="; + cargoSha256 = "sha256-S3Krmkr2sJO5m0ZlEvwrCqAqFWFuP1nKu4UAoJQP7Bg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 03eecf8a31ba7..94ee2371ce9f9 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 5e699f9a7b06a..3798c766d200b 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.38"; + version = "1.0.39"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-n7GDvniwkyCYiu7/qw0TQsVsTZfjcSpkF2Qo/uO60e4="; + sha256 = "sha256-wJyCRg6qvkjjaFuFK6hTqt3u7ugFKAc9K4M/BojND6o="; }; - cargoHash = "sha256-oA+8bceow7Cdao9FhkXkfFyrCpgvR4NJHddevbhUFkA="; + cargoHash = "sha256-n4fraxlMtkVNNmteVBoS6BlS0qE6bpFL/fKRp2pjxIs="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 537392a65bbed..3fd76ed2bc86f 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-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index da90015752a0f..9212078638797 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,19 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.6"; + version = "0.18.1"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM="; + sha256 = "sha256-0o7kemIxKCf+oNCl2ryKT02w49LQUuKaFIQUDt5mIw4="; }; - # patch Cargo.toml to not vendor libgit2 and openssl - cargoPatches = [ ./no-vendor.patch ]; - - cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU="; + cargoSha256 = "sha256-DnPf75MEIbX4UQ6XeGLRE4giu+DxgWWmKJY34jrPwpc="; nativeBuildInputs = [ pkg-config ]; @@ -33,6 +30,9 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git ]; + # disable vendored libgit2 and openssl + buildNoDefaultFeatures = true; + preCheck = '' export HOME=$(mktemp -d) USER=nixbld git config --global user.name Nixbld diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch deleted file mode 100644 index c8233cd5dd3dd..0000000000000 --- a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"] - - [dependencies] - clap = { version = "4.0", features = ["derive", "std", "help"], 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-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 61bc71374870b..43dc8e2d361b7 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.27"; + version = "0.5.28"; src = fetchCrate { inherit pname version; - sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA="; + sha256 = "sha256-434imb66AINKeW50ITc4RRYO9v7sH3fs1DEwSBc3mys="; }; - cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc="; + cargoSha256 = "sha256-oDrpQskQV5hG9Ksp0TJcXjm/J9q/K831mOzxH+CXjfg="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index cf540117f512f..b69c7968dcec7 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.20.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-tzC5AOlms5UDQ8+L7M2Tb5K/RtjZuDs23JSnLGH6pkI="; + sha256 = "sha256-h0jRuY3GSqK85NCeFqdqjyVdNTMbdtD70zU5G3w1STc="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-9r/RPzjPzDSRamntfu8Xz4XWieAU/bnw2m9wtzwkcwk="; + cargoHash = "sha256-GC2ggTJJV3Aww3qPfsnuND0eII1l3OBoZfi5RtvhO8I="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; 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 28be262ca70da..10b0a689b6256 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.9"; + version = "0.5.10"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-GEnEcVYejDMnnJtGTbbMHOC85hYjGFEOIF9/Jdm3288="; + sha256 = "sha256-aCrwmo1a88mpK+hrQxjEQeHBrF4uSO+H5mbV9w3FvWo="; }; - cargoSha256 = "sha256-Yk43FM6YswlM/XYJD+XiunFsOY4+n/xVmnIIEo1ogKY="; + cargoSha256 = "sha256-jhfHTBoIdNcBVrDzJcfBscqrS8SMG6cx4j9Y1FIwBbU="; # 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 6b34c2c337e21..2e86ef220778d 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.23"; + version = "0.4.25"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-u3MvDiagCGD7WjagbVF+TtZ0ATe8WBT3xeyduxrXPi4="; + sha256 = "sha256-KTSp4pbxKkSX1Kh7CILtTVq2mjOpn4SKxO16l+I+i7k="; }; - cargoSha256 = "sha256-9oBnETZqJV35FEw6NImy6cqfVOVE5EHPNVGajE2UT10="; + cargoSha256 = "sha256-A+vUn/TLpp2dVOA5CAjFlviG+SPTd4BstOb0/NHCpdE="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 945d89e096365..bcb23392cdd84 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.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-9P5LoS8wdzJA8vGj9dRxKJYBXaSSzxplpvRc2aqRWlY="; + sha256 = "sha256-PQ59WTBRUwLM6/35ocnryp+hR8YKmgh3EkOSZ7OCYWs="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-NgjBGoJTJNF4HwhDtBDWxcLHfpM6Jk4D9cbKLvojnaI="; + cargoHash = "sha256-6M4KUvTKifEUEJLMyVU8F1Ler6IK5TEUNHfUNMkJ09s="; # 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 52a89b92047d4..576c9eacd74d9 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-5j7zTAFUkevhSpiOn8KNG5+N7M9M1+c6hAKpDwPXdBQ="; + sha256 = "sha256-G9ResHOBEqnKsMXVbr8q1rvywFI8LJcb8gR7hMTI0p4="; }; - cargoSha256 = "sha256-jCbs/y0L9YP9VDEtofeqWXbUlsBpVRMbjIYtPRlmQVY="; + cargoSha256 = "sha256-p6mq+P9ntlhjMPHpcwXV9XBlAX6R63Iqastl9ZHI8Vs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices 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 0000000000000..03117e9c1f411 --- /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-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 8103229bb66ac..6ed10aee16ec2 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-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 5d1b99f02d8ac..ba5dc4e1fc0ec 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.27.1"; + version = "0.27.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mG+OjoOlpmmCpsAIs3m3FIRO36CrmWWgki9LgoXxiKo="; + sha256 = "sha256-6LXFrLSApEQXa34zTVgqUVYMiFnGi6i7gyXnMglHtFE="; }; - cargoSha256 = "sha256-zfqqreNQhxetldE801e6/5KYFKsywXJVt7oIkm8ldS8="; + cargoHash = "sha256-3lMUKtHpCXN+fKDbU4QwVUol6aL6dxP5Bbf59xEkcjY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 71a3405643437..f318dd6fac381 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -4,42 +4,62 @@ , pkg-config , libgit2 , openssl +, zlib , stdenv , darwin +, git }: rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.16.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2t3LWb2oeCYDAePXX1YuIN0o4LLEL58Hxt/1sNeuD3M="; + sha256 = "sha256-PR8+4SK0Bb7+0fDwdvJBYERvhjWLXRGswNoEdRo5JiM="; }; - cargoSha256 = "sha256-K+eLQ7zGEGkh4vMABWucY/Ho2id/afwl4FSo5+Ca1Ec="; + cargoSha256 = "sha256-wZR5ylhtdAUvpJ0raTM5IrbdmaHLPAYrAKU31oE8Bbg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + nativeCheckInputs = [ + git + ]; + checkFlags = [ # requires nightly version of cargo-rustdoc - "--skip=dump::tests" - "--skip=query::tests" + "--skip=both_passing_manifest_path_and_directory_works" + "--skip=rustdoc_cmd::tests" "--skip=verify_binary_contains_lints" + + # requires internet access + "--skip=detects_target_dependencies" ]; + preCheck = '' + patchShebangs scripts/regenerate_test_rustdocs.sh + git init + scripts/regenerate_test_rustdocs.sh + ''; + # 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-checks"; + changelog = "https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v${version}"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index e2fde75ba8297..a582ce805a913 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.21"; + version = "1.0.23"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YEsgXIZ4R2w0HOkTV8LOGi2g32nHRs63nhk9yVR4vak="; + sha256 = "sha256-H8odIEGtAMP1SQMdlgvFbduoLEaze89MFarN8AxBkK4="; }; - cargoSha256 = "sha256-jLbYC862fZONvMHh0CLsiuUmn/hmAF6sRLuav3P+bck="; + cargoSha256 = "sha256-pVHBFub5OTkL6e8ftI0nNisH+vJBOlcq4W0gwzz7vtA="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; homepage = "https://github.com/dtolnay/cargo-tally"; + changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 3f9549401441c..64bf3fccbc4f2 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -16,20 +16,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s="; + 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-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g="; + cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0="; buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index a51185096d7e1..c94c1eb56a097 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.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "yozhgoor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N5PRwUSUAFwvbyq5Uo6nEr05QqmeA1yI9ru0VRnrXa8="; + sha256 = "sha256-Z6qmtZfnpEZ1/XkmAijDo4nRfZOPW9hEIFTycdOYILk="; }; - cargoSha256 = "sha256-vzru7+EA41kQGciA4q03bvcIYOMGYLAiws35ZMh413g="; + 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-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index af7abb9a1abf6..7b0647c14c452 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = "v${version}"; - sha256 = "sha256-FCz15kMSKckifYWSTMGqJbRpZ8X/AM5dSw46dg8ERcY="; + sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc="; }; - cargoSha256 = "sha256-csSUe2qUIN2xKOMHWyM56FZyCwKPdfAI0NrFiDOtRiE="; + cargoSha256 = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 51303745780ea..3e2d10e769c1e 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.3.0"; + version = "8.4.0"; src = fetchFromGitHub { - owner = "passcod"; + owner = "watchexec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4="; + hash = "sha256-YwiTzIO60ct076vMoK9BHKa65Qet2PAvPRwnZcjDgcM="; }; - cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ="; + cargoHash = "sha256-BzcKWQSB94H3XOsbwNvJoAHlZwkJvLABIrfFh9Ugfig="; - 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-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 7d58d112da312..00d4e4e6942ad 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.5"; + version = "0.16.2"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+H+T/PEpJyRySTJlVGbAevLzAEZs5J8BNqwZjiXhuuU="; + sha256 = "sha256-3PzzaZ62My+11yXGrQSWpJvKvbcKXMfy7CLDBnSVDuI="; }; - cargoSha256 = "sha256-IOR/G+SPGl3MgOMjmsVPpvoode8U7K52vqs7yu0BdQk="; + cargoSha256 = "sha256-ZnsrqbB89C4E5yBDN/wgNgpSEh/aS078h2X+ewtMX8E="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/devserver/default.nix b/pkgs/development/tools/rust/devserver/default.nix deleted file mode 100644 index 305a01b69991d..0000000000000 --- 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 43f49a28d2e2d..b005ae9192e85 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 384030c903d96..3c3dd234e2023 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.14.5"; + version = "0.14.13"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-3TEEmraQ9KGx29ok7IUdVzTW0ilaAci1dOZUlKvQYJE="; + hash = "sha256-a/i4pe+vjQRB4j0K6wBA5XVAih+a1ijLlDvROBjjxOw="; }; - cargoHash = "sha256-/biWBTNIysg6HDozyF8UdKoxlgkHl9tnyean8+333hI="; + cargoHash = "sha256-8IsXD6bKAkzxVOM04tA5+z1qQxZiV+enlTZrwiik4Ik="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock new file mode 100644 index 0000000000000..5e698d4ff735e --- /dev/null +++ b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock @@ -0,0 +1,682 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "assert_approx_eq" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "byteorder" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "const_fn" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" + +[[package]] +name = "crossbeam-channel" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +dependencies = [ + "cfg-if", + "const_fn", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +dependencies = [ + "autocfg", + "cfg-if", + "lazy_static", +] + +[[package]] +name = "ctor" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" +dependencies = [ + "ctor", + "ghost", + "inventory-impl", +] + +[[package]] +name = "inventory-impl" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[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.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" + +[[package]] +name = "lock_api" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "memoffset" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "proptest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" +dependencies = [ + "bitflags", + "byteorder", + "lazy_static", + "num-traits", + "quick-error", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", +] + +[[package]] +name = "pyo3" +version = "0.13.2" +dependencies = [ + "assert_approx_eq", + "cfg-if", + "ctor", + "hashbrown", + "indoc", + "inventory", + "libc", + "num-bigint", + "num-complex", + "parking_lot", + "paste", + "proptest", + "pyo3", + "pyo3-macros", + "rustversion", + "serde", + "serde_json", + "trybuild", + "unindent", +] + +[[package]] +name = "pyo3-macros" +version = "0.13.2" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.13.2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_xorshift" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex-syntax" +version = "0.6.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" + +[[package]] +name = "rustapi-module" +version = "0.1.0" +dependencies = [ + "pyo3", +] + +[[package]] +name = "rustversion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[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.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "syn" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" +dependencies = [ + "glob", + "lazy_static", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[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 = "word-count" +version = "0.1.0" +dependencies = [ + "pyo3", + "rayon", +] diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch deleted file mode 100644 index 3aca2e4803a93..0000000000000 --- a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch +++ /dev/null @@ -1,688 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 000000000..5e698d4ff ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,682 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "ahash" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" -+ -+[[package]] -+name = "assert_approx_eq" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" -+ -+[[package]] -+name = "autocfg" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "const_fn" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" -+ -+[[package]] -+name = "crossbeam-channel" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -+dependencies = [ -+ "cfg-if", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-deque" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -+dependencies = [ -+ "cfg-if", -+ "crossbeam-epoch", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "crossbeam-epoch" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" -+dependencies = [ -+ "cfg-if", -+ "const_fn", -+ "crossbeam-utils", -+ "lazy_static", -+ "memoffset", -+ "scopeguard", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" -+dependencies = [ -+ "autocfg", -+ "cfg-if", -+ "lazy_static", -+] -+ -+[[package]] -+name = "ctor" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" -+dependencies = [ -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "either" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+ -+[[package]] -+name = "getrandom" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "ghost" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "hashbrown" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -+dependencies = [ -+ "ahash", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "indoc" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -+dependencies = [ -+ "indoc-impl", -+ "proc-macro-hack", -+] -+ -+[[package]] -+name = "indoc-impl" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "unindent", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -+dependencies = [ -+ "cfg-if", -+] -+ -+[[package]] -+name = "inventory" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" -+dependencies = [ -+ "ctor", -+ "ghost", -+ "inventory-impl", -+] -+ -+[[package]] -+name = "inventory-impl" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -+ -+[[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.86" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" -+ -+[[package]] -+name = "lock_api" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -+dependencies = [ -+ "scopeguard", -+] -+ -+[[package]] -+name = "memoffset" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "num-bigint" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" -+dependencies = [ -+ "autocfg", -+ "num-integer", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-complex" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -+dependencies = [ -+ "num-traits", -+] -+ -+[[package]] -+name = "num-integer" -+version = "0.1.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -+dependencies = [ -+ "autocfg", -+ "num-traits", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "parking_lot" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -+dependencies = [ -+ "instant", -+ "lock_api", -+ "parking_lot_core", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -+dependencies = [ -+ "cfg-if", -+ "instant", -+ "libc", -+ "redox_syscall", -+ "smallvec", -+ "winapi", -+] -+ -+[[package]] -+name = "paste" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -+dependencies = [ -+ "paste-impl", -+ "proc-macro-hack", -+] -+ -+[[package]] -+name = "paste-impl" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -+dependencies = [ -+ "proc-macro-hack", -+] -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "proptest" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" -+dependencies = [ -+ "bitflags", -+ "byteorder", -+ "lazy_static", -+ "num-traits", -+ "quick-error", -+ "rand", -+ "rand_chacha", -+ "rand_xorshift", -+ "regex-syntax", -+] -+ -+[[package]] -+name = "pyo3" -+version = "0.13.2" -+dependencies = [ -+ "assert_approx_eq", -+ "cfg-if", -+ "ctor", -+ "hashbrown", -+ "indoc", -+ "inventory", -+ "libc", -+ "num-bigint", -+ "num-complex", -+ "parking_lot", -+ "paste", -+ "proptest", -+ "pyo3", -+ "pyo3-macros", -+ "rustversion", -+ "serde", -+ "serde_json", -+ "trybuild", -+ "unindent", -+] -+ -+[[package]] -+name = "pyo3-macros" -+version = "0.13.2" -+dependencies = [ -+ "pyo3-macros-backend", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pyo3-macros-backend" -+version = "0.13.2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[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.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+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" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rand_hc" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_xorshift" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "rayon" -+version = "1.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -+dependencies = [ -+ "autocfg", -+ "crossbeam-deque", -+ "either", -+ "rayon-core", -+] -+ -+[[package]] -+name = "rayon-core" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -+dependencies = [ -+ "crossbeam-channel", -+ "crossbeam-deque", -+ "crossbeam-utils", -+ "lazy_static", -+ "num_cpus", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.22" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" -+ -+[[package]] -+name = "rustapi-module" -+version = "0.1.0" -+dependencies = [ -+ "pyo3", -+] -+ -+[[package]] -+name = "rustversion" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[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.123" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.123" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.62" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -+ -+[[package]] -+name = "syn" -+version = "1.0.60" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "trybuild" -+version = "1.0.41" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" -+dependencies = [ -+ "glob", -+ "lazy_static", -+ "serde", -+ "serde_json", -+ "termcolor", -+ "toml", -+] -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+ -+[[package]] -+name = "unindent" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[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 = "word-count" -+version = "0.1.0" -+dependencies = [ -+ "pyo3", -+ "rayon", -+] diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix index 547f11125b700..7bc7e8d43bcb4 100644 --- a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix +++ b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix @@ -24,13 +24,13 @@ python.pkgs.buildPythonPackage rec { hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; - name = "${pname}-${version}"; - hash = "sha256-u3L9nXHKILznyZTgxdvZyOCQZFZhuADrtI7zXYQzrbE="; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; }; - patches = [ ./Cargo.lock.patch ]; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; inherit buildAndTestSubdir format nativeBuildInputs preConfigure; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 6dd1d5e32bd85..a86867eded080 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.6"; + version = "1.0.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; + sha256 = "sha256-nHAsKvNEhGDVrLx8K7xnm7TuCxaZcYwlQ6xjVRvDdSk="; }; - cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; + cargoSha256 = "sha256-ydZ0KM/g9k0ux7Zr4crlxnKCC9N/qPzn1wmzbTIyz7o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix index 3f26e4bd3ab14..d4140bc0b5237 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.14.0"; + version = "0.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-y9EHksRDVbw58XiV7/dKzy4p6OWWAkQ3X9LP/WDWD2c="; + sha256 = "sha256-YNOD0hDDQ6M496m9lps28UX41pMO1r/CE30rcS53h48="; }; - cargoSha256 = "sha256-vv8XSAsGs1M97Y6cIGYevCdaxmPy3aDmHFF00exumq8="; + cargoSha256 = "sha256-/1bnDtfNxnOI4Inmnd+r2epT236ghQsiNuoAuROEfPM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a90ac2780e8a8..f5f970a6ad5b4 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-01-23"; - cargoSha256 = "sha256-NSdHvWN5BIEXZMFiweKYbJayxDqlFmqJp+sIzeORhSU="; + version = "2023-02-20"; + cargoSha256 = "sha256-/5TxlRh3xQrhWiq9Gcljfpn2G5MmCH99Oc022ZrKcVs="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; + sha256 = "sha256-8h0sV0fmMSB7KydJJD5Iz1kJxR3YzYa3iJ71VD2zePk="; }; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/development/tools/rust/rustfilt/default.nix new file mode 100644 index 0000000000000..353cdcdbfdc66 --- /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/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d7c4aaa39eef3..6f9466b60d205 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -23,16 +23,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI="; + sha256 = "sha256-zFdw6P4yrLDshtF9A5MbkxFcUE8KvlZGx5qkW4LSPzw="; }; - cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY="; + cargoSha256 = "sha256-QJKxKAW7MutpJsJwB/EImQLPaax7L/A25yRAAwEDXUQ="; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index ab75664f5a4b4..69a532ccb5c0b 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/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index ac684f081f4a8..dcea17d807d92 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 d18ca0012d808..66a9b97d0db90 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 56ff4f3ad3e53..b1cc26bec519c 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 0bab699b3cf2c..9f1d0f592f4ec 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.11.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-08H/aNYUsTORCwTm9pwWiLQjAcWSiZrjg5q6OkkllWg="; + sha256 = "sha256-U6L2JQk/fYuxmZdt3CvPSaaEDRgZby0CiPT0nJGuVwA="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-GEZZXRPfpIhr73SpyP9iLSjRe67wllSpp5oh6N0S9ok="; + cargoHash = "sha256-gF3a8oCHmnNgatvbM1DeOQknXMMcHgerx2OcDdyqC8U="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/development/tools/shadered/default.nix index 66a9512c18c43..07397f48ad153 100644 --- a/pkgs/development/tools/shadered/default.nix +++ b/pkgs/development/tools/shadered/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ./install_path_fix.patch ]; - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; meta = with lib; { description = "Lightweight, cross-platform & full-featured shader IDE"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index f512e48e91093..4e1a51f5154a0 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "skaffold"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-TFI715knhQ3QyWF1EwIxZfZQW16uDWAqa6LVNfqC8Ws="; + sha256 = "sha256-D0KcnxfjPBGHLGs5YLdecuKL07jIhF6w/SIr/I/W1rI="; }; vendorSha256 = "sha256-yy1BVorjLEcZR6PqupBiZx2plwPJ6xlxripbyB6RLek="; subPackages = ["cmd/skaffold"]; - ldflags = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in [ + ldflags = let t = "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold"; in [ "-s" "-w" "-X ${t}/version.version=v${version}" "-X ${t}/version.gitCommit=${src.rev}" diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index aaae3082d320a..f39f7510c1bf9 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -12,22 +12,24 @@ , fuse-overlayfs , dockerTools , runCommand +, testers +, skopeo }: buildGoModule rec { pname = "skopeo"; - version = "1.10.0"; + version = "1.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-Q6gdkaIYTDUqDbjmE9TcRtQcHjpOJ3bXLJtN8NPp9KA="; + hash = "sha256-wTOcluPSguF6ZnKHlLelM5R2dIF9nd66qu7u/48uNyU="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; @@ -45,8 +47,7 @@ buildGoModule rec { installPhase = '' runHook preInstall - PREFIX=$out make install-binary install-completions - PREFIX=$man make install-docs + PREFIX=${placeholder "out"} make install-binary install-completions install-docs install ${passthru.policy}/default-policy.json -Dt $out/etc/containers '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ @@ -60,11 +61,15 @@ buildGoModule rec { install ${src}/default-policy.json -Dt $out ''; tests = { + version = testers.testVersion { + package = skopeo; + }; inherit (dockerTools.examples) testNixFromDockerHub; }; }; meta = with lib; { + changelog = "https://github.com/containers/skopeo/releases/tag/${src.rev}"; description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; maintainers = with maintainers; [ lewo ] ++ teams.podman.members; diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index 60c2bd188dedd..3dc60021b757f 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { Many full-fledged games have been writen for the engine. Games can be created easily using the editor. ''; - homepage = "http://www.solarus-games.org"; + homepage = "https://www.solarus-games.org"; license = licenses.gpl3; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 6f95ded63e15e..cc8b30ab18ca6 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.236.0"; + version = "1.3.239.0"; src = (assert version == spirv-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "sdk-${version}"; - hash = "sha256-BV7V/jS782zdvtuw/wNY5fyAdx8Z2niWSocNaW0Atho="; + hash = "sha256-xLYykbCHb6OH5wUSgheAfReXhxZtI3RqBJ+PxDZx58s="; } ); diff --git a/pkgs/development/tools/squawk/correct-Cargo.lock.patch b/pkgs/development/tools/squawk/correct-Cargo.lock.patch new file mode 100644 index 0000000000000..410c92a1c3b24 --- /dev/null +++ b/pkgs/development/tools/squawk/correct-Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index d5803a8..384224d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1585,7 +1585,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + + [[package]] + name = "squawk" +-version = "0.20.0" ++version = "0.21.0" + dependencies = [ + "atty", + "base64 0.12.3", diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix new file mode 100644 index 0000000000000..9d3526ee9d53a --- /dev/null +++ b/pkgs/development/tools/squawk/default.nix @@ -0,0 +1,69 @@ +{ darwin +, fetchFromGitHub +, lib +, libiconv +, libpg_query +, openssl +, pkg-config +, rustPlatform +, stdenv +}: +let + # The query parser produces a slightly different AST between major versions + # and Squawk is not capable of handling >=14 correctly yet. + libpg_query13 = libpg_query.overrideAttrs (_: rec { + version = "13-2.2.0"; + src = fetchFromGitHub { + owner = "pganalyze"; + repo = "libpg_query"; + rev = version; + hash = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs="; + }; + }); +in +rustPlatform.buildRustPackage rec { + pname = "squawk"; + version = "0.21.0"; + + src = fetchFromGitHub { + owner = "sbdchd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ObaYGGTAGGLOAji86Q5R9fqbCGg6GP0A3iheNLgzezY="; + }; + + cargoHash = "sha256-VOGgwBKcJK7x+PwvzvuVu9Zd1G8t9UoC/Me3G6bdtrk="; + + cargoPatches = [ + ./correct-Cargo.lock.patch + ]; + + patches = [ + ./fix-postgresql-version-in-snapshot-test.patch + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ + libiconv + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Security + ]); + + OPENSSL_NO_VENDOR = 1; + + LIBPG_QUERY_PATH = libpg_query13; + + meta = with lib; { + description = "Linter for PostgreSQL, focused on migrations"; + homepage = "https://squawkhq.com/"; + changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ andrewsmith ]; + }; +} diff --git a/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch b/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch new file mode 100644 index 0000000000000..205fd3dba9731 --- /dev/null +++ b/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch @@ -0,0 +1,13 @@ +diff --git a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap +index 7273b74..ae94927 100644 +--- a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap ++++ b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap +@@ -133,7 +133,7 @@ Ok( + }), + ]), + "version": Number( +- 130003, ++ 130008, + ), + }), + ) diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 6befb42c24d3c..977b08602735c 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; }; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; # Avoid building example subPackages = [ "." "fs" ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 19187643d1876..60110d6c99f31 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.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DDK/ANBR0wH87/9wnZYwyYMbCl/N/m4KUvQJ/dB8las="; + sha256 = "sha256-PpkJwCVZr21P1WmU2Kid+X9JwKdJs1krY6keQoMqDvc="; }; - cargoSha256 = "sha256-xgOPjdy+uoUOdtYXq/lXR872QdzA1/r8Shi0q1E+e9Q="; + cargoSha256 = "sha256-oCoE+Fk2zcVlV8H+f/soAWlhXNsLTysmqLXx9yjdnFY="; # 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 2ed17061c2198..ab618253e7b15 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/swc/default.nix b/pkgs/development/tools/swc/default.nix new file mode 100644 index 0000000000000..c68542978d12f --- /dev/null +++ b/pkgs/development/tools/swc/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "swc"; + version = "0.91.19"; + + src = fetchCrate { + pname = "swc_cli"; + inherit version; + sha256 = "sha256-BzReetAOKSGzHhITXpm+J2Rz8d9Hq2HUagQmfst74Ag="; + }; + + cargoSha256 = "sha256-1U9YLrPYENv9iJobCxtgnQakJLDctWQwnDUtpLG3PGc="; + + buildFeatures = [ "swc_core/plugin_transform_host_native" ]; + + meta = with lib; { + description = "Rust-based platform for the Web"; + homepage = "https://github.com/swc-project/swc"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/tools/swiftpm2nix/default.nix new file mode 100644 index 0000000000000..25d6b06ef98bb --- /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 0000000000000..94076517ebfcf --- /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 0000000000000..72051b4e448df --- /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 8de028a4add90..dde6628bc69ed 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.21"; - vendorHash = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA="; + version = "5.5.0"; + vendorHash = "sha256-l8h2jHOwxvFEk9v/U8DU8g6La9TyPtpDvQTTSX4BW84="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-lNEd5mj5K8MhlLkrRiFnEqVLnS+4mx7FNAtYuF5jdC0="; + sha256 = "sha256-d/Ld/F1dvwO7/uKLtgQmYhfOoxvIyEbnE3ks6R2412I="; }; ldflags = [ diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/development/tools/tabnine/sources.json index 14ee825c72c07..11ca370deb625 100644 --- a/pkgs/development/tools/tabnine/sources.json +++ b/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.186", + "version": "4.4.245", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-J/VzIxCxttKB4ggLLxyK596k0U1mh6jqaBrzTRxL32Q=" + "hash": "sha256-heumULn4DNYJVB8ZdQz8RcQYcLcdF85+Wjsz4K3SUDg=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-quIINq0ocD5k/KyB/N3yBTqyW3GSljAuoaPp4JNYvMw=" + "hash": "sha256-eLzf2srpOh9YSdl2lK1KALQ/KERIcJJoeErLxeM3J+M=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-lYmKgRi43MDyy7jZn8J/PFHgBE9UdjF1bqx2wrMJ4uU=" + "hash": "sha256-ZCATPu9cU2ZUUFE7vDx/xKyx8jChubrG1xby7I+0z/4=" } } } diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix index 1fd8392c95765..85ffeed3748ed 100644 --- a/pkgs/development/tools/toast/default.nix +++ b/pkgs/development/tools/toast/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "toast"; - version = "0.45.5"; + version = "0.46.0"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7EF9DCT8Vg7aGOUlRG9c4Lv2EhCX/P9k4zQC6Ruqv0c="; + sha256 = "sha256-rDT7ZpixE77imy/HVwLET+O0uCZ+wFhXGqcWq46Ud2w="; }; - cargoSha256 = "sha256-tyZrNUT2i9i0yOqz1KqIuFSb4PO+fx1SNa+ZVNfIGfM="; + cargoHash = "sha256-B5H8YkYlcF/Z6SlsW5lWwHZ9tYfOb54Pu1KNVY3eXP8="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 213c926521fea..50ff38a88935e 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -42,7 +42,7 @@ mkDerivation { # these libraries are only searched for at runtime so we need to force-link them NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl"; - NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; + env.NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; qtWrapperArgs = [ ''--prefix PATH : ${lib.getBin graphviz}/bin'' diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 210700fb8c301..00e121adc7185 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -21,13 +21,13 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] ++ lib.optionals stdenv.isLinux [ gtk3 tbb dbus ]; - NIX_CFLAGS_COMPILE = [ ] + env.NIX_CFLAGS_COMPILE = toString ([ ] # Apple's compiler finds a format string security error on # ../../../server/TracyView.cpp:649:34, preventing building. ++ lib.optional stdenv.isDarwin "-Wno-format-security" ++ lib.optional stdenv.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation" - ++ lib.optional disableLTO "-fno-lto"; + ++ lib.optional disableLTO "-fno-lto"); NIX_CFLAGS_LINK = lib.optional disableLTO "-fno-lto"; diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix new file mode 100644 index 0000000000000..abfc5440734cf --- /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; + hash = "sha256-o7kzQ8jtAqDwTUPtjeNqgotxREeWl7jQG+EDrYWJL/Q="; + }; + + cargoHash = "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 = { + 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 lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} + diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index c9dabfffe0ff1..3187fb28eef05 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenvNoCC, nodejs, fetchzip, makeBinaryWrapper, testers }: +{ lib, stdenvNoCC, nodejs, fetchzip, testers }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.3.2"; + version = "5.4.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-Ld7drg2N+4XUtpsA7Jpg7BrrSWTWBVa1QhuJ+FNOIGw="; + sha256 = "sha256-UEfnwYMiYE+DAENwf3cfSE20ctAxVjbko428rDNIMzI="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ nodejs ]; installPhase = '' diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 1a231575476c3..1c69515c44e7d 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.13.8"; + version = "1.13.12"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-ROMO6IkfpzFvB5Y4RRqrX5NnYzdHT1tsJBdCc1lDu7k="; + hash = "sha256-SP2Di3kAcrAriZ4E7aPSBAZm46REIW82LrbWSmKhA5k="; }; - cargoHash = "sha256-VAVlzciWVKcgl/QKiF3Hfzx11jUi/0J9b6EmaZzG9qE="; + cargoHash = "sha256-3ExXZ7lUnT/54TUembKk47OUVpAzHrWPAro2CcXiYmU="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix index 37408035ff933..14a594a827da7 100644 --- a/pkgs/development/tools/udis86/default.nix +++ b/pkgs/development/tools/udis86/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ]; meta = with lib; { - homepage = "http://udis86.sourceforge.net"; + homepage = "https://udis86.sourceforge.net"; license = licenses.bsd2; maintainers = with maintainers; [ timor ]; mainProgram = "udcli"; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 6488ff63d665b..4326556f13cbc 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.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-czVKliF9qvA9TG4KJKs2X0VDfJi4vHwbVeuLZViwpdg="; + sha256 = "sha256-hpEExyvazCH+lNTK0Ej0zbnWyX0gVLPjM9XfOuAueis="; }; postUnpack = '' diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 17e8983019561..c2477ed02d52d 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmake , pkg-config +, jq , glslang , libffi , libX11 @@ -22,7 +23,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.236.0"; + version = "1.3.239.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -34,18 +35,13 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - hash = "sha256-+VbiXtxzYaF5o+wIrJ+09LmgBdaLv/0VJGFDnBkrXms="; + hash = "sha256-k/A0TaERQAHSM0Fal2IOaRvTz3FV2Go/17P12FSBG1s="; }); - # Include absolute paths to layer libraries in their associated - # layer definition json files. - postPatch = '' - sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt - ''; - nativeBuildInputs = [ cmake pkg-config + jq ]; buildInputs = [ @@ -74,6 +70,15 @@ stdenv.mkDerivation rec { # available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER. doCheck = false; + # Include absolute paths to layer libraries in their associated + # layer definition json files. + preFixup = '' + for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do + jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path" + mv tmp.json "$f" + done + ''; + meta = with lib; { description = "The official Khronos Vulkan validation layers"; homepage = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"; diff --git a/pkgs/development/tools/wambo/default.nix b/pkgs/development/tools/wambo/default.nix new file mode 100644 index 0000000000000..f5e277d415ef5 --- /dev/null +++ b/pkgs/development/tools/wambo/default.nix @@ -0,0 +1,30 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "wambo"; + version = "0.3.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-WZQgQmoFmsWLgPYRWonJmyKq9IIJ+a6J+O19XPppJG4="; + }; + + cargoHash = "sha256-ghUdhWW5gURWxj/OhbcKPNeLzeJvndqAxEZmwKBATUk="; + + meta = { + description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers"; + longDescription = '' + wambo is a binary that can easily shows you a numeric value in all important numeral systems + (bin, hex, dec) + interprets the input as both signed and unsigned values (from i8 to i64, + including f32 and f64). It also easily calculates you mibibytes to bytes, kilobytes to gibibytes, + and so on. + ''; + homepage = "https://github.com/phip1611/wambo"; + changelog = "https://github.com/phip1611/wambo/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 7f9d8fae4c24a..ec336d422ab16 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.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 ]; diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 6f5d9162c5b7c..077042b1c0ac4 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -5,9 +5,15 @@ , cmake , gtest , spdlog +, libxml2 +, libffi +, Foundation }: -llvmPackages.stdenv.mkDerivation rec { +let + stdenv = llvmPackages.stdenv; +in +stdenv.mkDerivation rec { pname = "wasmedge"; version = "0.11.2"; @@ -18,19 +24,26 @@ llvmPackages.stdenv.mkDerivation rec { sha256 = "sha256-P2Y2WK6G8aEK1Q4hjrS9X+2WbOfy4brclB/+SWP5LTM="; }; + nativeBuildInputs = [ + cmake + llvmPackages.lld + ]; + buildInputs = [ boost spdlog llvmPackages.llvm + libxml2 + libffi + ] ++ lib.optionals stdenv.isDarwin [ + Foundation ]; - nativeBuildInputs = [ cmake llvmPackages.lld ]; - - nativeCheckInputs = [ gtest ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git + ] ++ lib.optionals stdenv.isDarwin [ + "-DWASMEDGE_FORCE_DISABLE_LTO=ON" ]; meta = with lib; { @@ -38,5 +51,7 @@ llvmPackages.stdenv.mkDerivation rec { license = with licenses; [ asl20 ]; description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications"; maintainers = with maintainers; [ dit7ya ]; + # error: no member named 'utimensat' in the global namespace + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/tools/watchman/Cargo.lock b/pkgs/development/tools/watchman/Cargo.lock new file mode 100644 index 0000000000000..9554b7be1f5bb --- /dev/null +++ b/pkgs/development/tools/watchman/Cargo.lock @@ -0,0 +1,994 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +dependencies = [ + "const-random", +] + +[[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.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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" +dependencies = [ + "serde", +] + +[[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 = "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 = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.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 0.7.1", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "duct" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +dependencies = [ + "libc", + "once_cell", + "os_pipe", + "shared_child", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[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-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-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 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[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 = "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 = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "jwalk" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dbcda57db8b6dc067e589628b7348639014e793d9e8137d8cf215e8b133a0bd" +dependencies = [ + "crossbeam", + "rayon", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "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 = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[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 = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[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 = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "ntapi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +dependencies = [ + "winapi", +] + +[[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 = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_pipe" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +dependencies = [ + "libc", + "windows-sys", +] + +[[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 = "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 = "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-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.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 = "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" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[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_bser" +version = "0.3.1" +dependencies = [ + "anyhow", + "byteorder", + "bytes", + "serde", + "thiserror", +] + +[[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 = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[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.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysinfo" +version = "0.26.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "tabular" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9a2882c514780a1973df90de9d68adcd8871bacc9a6331c3f28e6d2ff91a3d1" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.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 = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[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", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite", + "slab", + "tokio", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[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.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "watchman_client" +version = "0.8.0" +dependencies = [ + "anyhow", + "bytes", + "futures 0.3.25", + "maplit", + "serde", + "serde_bser", + "thiserror", + "tokio", + "tokio-util", + "winapi", +] + +[[package]] +name = "watchmanctl" +version = "0.1.0" +dependencies = [ + "ahash", + "anyhow", + "atty", + "duct", + "jwalk", + "nix", + "serde", + "serde_json", + "structopt", + "sysinfo", + "tabular", + "tokio", + "watchman_client", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.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/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 2acbf13e2789d..7a042ac8bc731 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,47 +1,107 @@ -{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, libtool, pkg-config, openssl -, confFile ? config.watchman.confFile or null -, withApple ? stdenv.isDarwin, CoreServices +{ boost +, cmake +, config +, CoreServices +, cpptoml +, double-conversion +, edencommon +, ensureNewerSourcesForZipFilesHook +, fb303 +, fbthrift +, fetchFromGitHub +, fizz +, fmt_8 +, folly +, glog +, gtest +, lib +, libevent +, libiconv +, libsodium +, libunwind +, lz4 +, openssl +, pcre +, pkg-config +, python3 +, rustPlatform +, stateDir ? "/tmp" +, stdenv +, wangle +, zlib +, zstd }: stdenv.mkDerivation rec { pname = "watchman"; - version = "4.9.0"; + version = "2023.01.30.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; + sha256 = "sha256-ZtCUlxx3YgfwKa9J8o9GkdkHquJbh+EytLiGNRlABls="; }; - nativeBuildInputs = [ autoconf automake pkg-config libtool ]; - buildInputs = [ pcre openssl ] - ++ lib.optionals withApple [ CoreServices ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs + "-DWATCHMAN_STATE_DIR=${stateDir}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; - configureFlags = [ - "--enable-lenient" - "--enable-conffile=${if confFile == null then "no" else confFile}" - "--with-pcre=yes" + nativeBuildInputs = [ + cmake + pkg-config + ensureNewerSourcesForZipFilesHook + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); - # For security considerations re: --disable-statedir, see: - # https://github.com/facebook/watchman/issues/178 - "--disable-statedir" - ]; + buildInputs = [ + pcre + openssl + python3 + gtest + glog + boost + libevent + fmt_8 + libsodium + zlib + folly + fizz + wangle + fbthrift + fb303 + cpptoml + edencommon + libunwind + double-conversion + lz4 + zstd + libiconv + ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - prePatch = '' - patchShebangs . - ''; + cargoRoot = "watchman/cli"; - preConfigure = '' - ./autogen.sh + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + patchShebangs . + cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock ''; meta = with lib; { description = "Watches files and takes action when they change"; - homepage = "https://facebook.github.io/watchman"; - maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; linux ++ darwin; - license = licenses.asl20; + homepage = "https://facebook.github.io/watchman"; + maintainers = with maintainers; [ cstrahan kylesferrazza ]; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix new file mode 100644 index 0000000000000..3440c0f947e80 --- /dev/null +++ b/pkgs/development/tools/wgo/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wgo"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "bokwoon95"; + repo = "wgo"; + rev = "v${version}"; + hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q="; + }; + + vendorSha256 = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A="; + + ldflags = [ "-s" "-w" ]; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Live reload for Go apps"; + homepage = "https://github.com/bokwoon95/wgo"; + license = licenses.mit; + maintainers = with maintainers; [ bokwoon95 ]; + }; +} + diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/development/tools/wizer/default.nix index f79c96f545184..5f84e1e01ff01 100644 --- a/pkgs/development/tools/wizer/default.nix +++ b/pkgs/development/tools/wizer/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, rustPlatform, fetchCrate }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, testers +, wizer +}: rustPlatform.buildRustPackage rec { pname = "wizer"; - version = "1.4.0"; - - src = fetchCrate { - inherit pname version; - - sha256 = "sha256-3Hc3KKqtbZtvD+3lb/W7+AyrwPukJyxpUe94KGQlzBI="; + version = "1.6.0"; + + # the crate does not contain files which are necessary for the tests + # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04 + src = fetchFromGitHub { + owner = "bytecodealliance"; + repo = "wizer"; + # see https://github.com/bytecodealliance/wizer/pull/62 + rev = "e74c6e59562c4b7edcda506674db8aead878a893"; + sha256 = "sha256-bVxjcb231Ygz+z+8D1U2YQqEdIKsostxISgYt2KecXc="; }; - cargoSha256 = "sha256-zv36/W7dNpIupYn8TS+NaF7uX+BVjrI6AW6Hrlqr8Xg="; + cargoSha256 = "sha256-S9h47aGG5UhwNoOnUHFrtEyByg8iCMC88Cspb/6tb8c="; cargoBuildFlags = [ "--bin" pname ]; @@ -22,11 +32,14 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; + passthru.tests = { + version = testers.testVersion { package = wizer; }; + }; + meta = with lib; { description = "The WebAssembly pre-initializer"; homepage = "https://github.com/bytecodealliance/wizer"; license = licenses.asl20; - maintainers = with maintainers; [ lucperkins ]; - broken = stdenv.isx86_64 && stdenv.isDarwin; + maintainers = with maintainers; [ lucperkins amesgen ]; }; } diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix index f2075f683b1eb..47c48aaa84176 100644 --- a/pkgs/development/tools/wlcs/default.nix +++ b/pkgs/development/tools/wlcs/default.nix @@ -12,27 +12,22 @@ stdenv.mkDerivation rec { pname = "wlcs"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "wlcs"; rev = "v${version}"; - hash = "sha256-ep5BHa9PgfB50gxJySaw0YAc1upBbncOiX9PCqHLbpE="; + hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw="; }; patches = [ - # Fixes pkg-config paths - # Remove when https://github.com/MirServer/wlcs/pull/258 merged & in a release + # 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-FULL-install-vars.patch"; - url = "https://github.com/MirServer/wlcs/pull/258/commits/9002cb7323d94aba7fc1ce5927f445e9beb30d70.patch"; - hash = "sha256-+uhFRKhG59w99oES4RA+L5hHyJ5pf4ij97pTokERPys="; - }) - (fetchpatch { - name = "0002-wlcs-CMAKE_INSTALL_INCLUDEDIR-for-headers.patch"; - url = "https://github.com/MirServer/wlcs/pull/258/commits/71263172c9ba57be9c05f1e07dd40d1f378ca6d0.patch"; - hash = "sha256-nV/72W9DW3AvNGhUZ+tzmQZow3BkxEH3D6QFBZIGjj8="; + 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="; }) ]; @@ -47,6 +42,11 @@ stdenv.mkDerivation rec { wayland ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/MirServer/wlcs/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ OPNA2608 ]; - inherit (wayland.meta) platforms; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index b96a9fb605ec5..e4fa4b2143824 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-s5fcs1A31ePr2EvFdNvX55jMRkHZkR+LRkcy59brwXg="; + sha256 = "sha256-eJLYe6H8g2ZM3gWt0GMzj0X7+7e7pFtCRCqDJfVzvms="; }; - cargoSha256 = "sha256-2jLv3/mLLnSsSKEGaAd4jaM5FOdTvdJg2W1Nc4mVkqs="; + cargoHash = "sha256-DjWVJH0XeSPesqQr0Rb9Bd+8Q39I1rUoS4dg7KT4mo4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 986be513ca767..44bd00cf69aa5 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "sha256-miXgzBaqCcFHRlot2uUKyH+GP2JTMOhFrReXZUl0ms0="; + sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ="; }; - cargoSha256 = "sha256-DJefvaUc1quh43q1eZ5B76V3TEv9vNsxuUKaABWiTCo="; + cargoHash = "sha256-tPLqDm6kOVBKrLvhgZ9xD6vVBNjBBk9uLF7WOPgz8qE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix new file mode 100644 index 0000000000000..8eb01e4dca099 --- /dev/null +++ b/pkgs/development/tools/xc/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "xc"; + version = "0.0.159"; + + src = fetchFromGitHub { + owner = "joerdav"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5Vw/UStMtP5CHbSCOzeD4LMJccPG34Rxw9VHc9Ut3oM="; + }; + + vendorHash = "sha256-XDJdCh6P8ScSvxY55ExKgkgFQqmBaM9fMAjAioEQ0+s="; + + meta = with lib; { + homepage = "https://xcfile.dev/"; + description = "Markdown defined task runner"; + license = licenses.mit; + maintainers = with maintainers; [ joerdav ]; + }; +} diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 3c90603477e46..3d11e551478a9 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { cp liblinenoise.* $out/lib/ ''; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; cmakeFlags = [ "-GNinja" ]; diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix index 5ff3ca6808dc8..e1b8254d7fd89 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 2dbea4e3833ae..35eddd40f859a 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/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix new file mode 100644 index 0000000000000..0d05ef2577d62 --- /dev/null +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "yamlfmt"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-oTdBFWISOfaz4ZDbJmyxtaKrjo9DVNJ5N7Qxnu7SwZA="; + }; + + vendorSha256 = "sha256-QRY6mYtrMvjUqXJOOvHL0b0OQ28320UwV8HL4fXpcNQ="; + + doCheck = false; + + meta = with lib; { + description = "An extensible command line tool or library to format yaml files."; + homepage = "https://github.com/google/yamlfmt"; + license = licenses.asl20; + maintainers = with maintainers; [ sno2wman ]; + }; +} diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index b3bc6bc62b95b..f642b22ef279f 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/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 3af3e43fe21d5..6098c50df1376 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -5,7 +5,7 @@ }@inputs: let - inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; + inherit (pkgs) stdenv lib callPackage git rsync runCommandLocal; compose = f: g: x: f (g x); id = x: x; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 017434134ca1a..150278c0ac4d8 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yj"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "sclevine"; repo = "yj"; - rev = "c4c13b7641389c76ea028b48091f851f3efb6376"; - sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr"; + rev = "v${version}"; + hash = "sha256-lsn5lxtix5W7po6nzvGcHmifbyhrtHgvaKYT7RPPCOg="; }; - vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; + vendorHash = "sha256-NeSOoL9wtFzq6ba8ghseB6D+Qq8Z5holQExcAUbtYrs="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 36658b506a41f..94c1cdaa01a9c 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -1,28 +1,46 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, zed }: buildGoModule rec { pname = "zed"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; + sha256 = "sha256-er3BPQ10ERCIBn0xx0jjyMBybnUBMyX76tqYEYe2WYQ="; }; - vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; + vendorHash = "sha256-3PyyR9d5m33ohbcstREvTOtWwMIrbFNvFyBY1F+6R+4="; subPackages = [ "cmd/zed" "cmd/zq" ]; + ldflags = [ + "-s" + "-w" + "-X=github.com/brimdata/zed/cli.Version=${version}" + ]; + + passthru.tests = { + zed-version = testers.testVersion { + package = zed; + }; + zq-version = testers.testVersion { + package = zed; + command = "zq --version"; + }; + }; + meta = with lib; { description = "A novel data lake based on super-structured data"; - homepage = "https://github.com/brimdata/zed"; - license = licenses.bsd3; - maintainers = with maintainers; [ dit7ya ]; + homepage = "https://zed.brimdata.io"; changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ dit7ya knl ]; }; } diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/development/tools/zprint/default.nix index c401ecf0bb52b..f93098aebfe24 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 deleted file mode 100644 index c62de54360fc2..0000000000000 --- a/pkgs/development/tools/zq/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildGoModule -, testers -, zq -}: - -buildGoModule rec { - pname = "zq"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "brimdata"; - repo = "zed"; - rev = "v${version}"; - hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; - }; - - vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; - - subPackages = [ "cmd/zq" ]; - - ldflags = [ "-s" "-X" "github.com/brimdata/zed/cli.Version=${version}" ]; - - passthru.tests = testers.testVersion { package = zq; }; - - meta = with lib; { - description = "A command-line tool for processing data in diverse input formats, providing search, analytics, and extensive transformations using the Zed language"; - homepage = "https://zed.brimdata.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ knl ]; - }; -} diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 817e32e4921cb..61f6a8abf036f 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.4.0"; + version = "0.5.7"; 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 = "T+vxwYM0zc1HsPiBncZolIquglKThsx2RDOS3/jPn4s="; + sha256 = "m0lFokGfJY3qXLYO4vnFFqKb3/IPRXWN3L6PV5DqtX0="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "AEo4xXnePlQYTXepwSDUaG8NczPdTCbPGPzxgH+/HHo="; + sha256 = "XSUbfRkjo7yiPrPa/Mp30WolFex+Evziphut1sKflDE="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "w66xgmVepmC543apTTGLfeV3FMsLiiUpfqzzRhpaNy8="; + sha256 = "RuZ0T5Y7Vi9mtyFL8ul715MRO4XozDf0WS+qjayx1kg="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "LMutdGNiGp4aLmeqMLk8Pc0xIjqgWPO6GSli1EfTgkY="; + sha256 = "uOVHQIjvZW0Gqv/GLlvbXl5bDcnwR80AP1lUJ2v2ZoM="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index e3e7481dff1fe..a8a4ff5bc4785 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.29.4"; + version = "1.31.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oCBtqOm/d5dpIv70/Ht0M6izxdvm59LCiDHgcMcwLek="; + sha256 = "sha256-0S5BSXWnv4DMcc8cijRQx6NyDReg5aJJT65TeNFlkkw="; }; - cargoSha256 = "sha256-Y/1yfCeWleNrk5MgkIoAtkH8e6YSZWa+GF5RgLaZXQA="; + cargoSha256 = "sha256-DZICb85B9pWT8bV06FYjS604RdomB5nqtR55R00CT8c="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 52b3e12f02866..a98587a7b9d83 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.60.1"; + version = "0.63.0"; shas = { - x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g="; - aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y="; - x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM="; - aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU="; + x86_64-linux = "sha256-D1NLAFMD1B4NOaBFsKBin5Gs+hmNC9LgNy3Z+w/1VGs="; + aarch64-linux = "sha256-3V2WWMCjJNiuCRmx66ISBk+pzvCKCqvOE9F3YWESABo="; + x86_64-darwin = "sha256-rUWSHxlFDT4cDoTLhSgRr04+2/oroeIiWURHbNDcMF8="; + aarch64-darwin = "sha256-LaoIjHrBqWn0BIpAOaiHAg5qCGoPlSHtFhiAi4og9q0="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c97bfd090987e..f280c1c8b8c49 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.450"; + version = "0.0.470"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-UfqjrWzpi1axud4MkrJxIwq1vzqHZ0qAvI1kNh/tywY="; + hash = "sha256-6D106qRd3dsSpZqlOVVV/I38YsjFTEtApvWtCc+LVNw="; }; - vendorHash = "sha256-ljyaF6Yz3bz5vjwZfDgYBb3o2l90YnV5DgolaDH3B9o="; + vendorHash = "sha256-ExHzf4L0Ibb+tYfBV45hEaUJgSQhgpHk40QhHa5dpQ8="; subPackages = [ "." ]; diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix new file mode 100644 index 0000000000000..71e01aca947e3 --- /dev/null +++ b/pkgs/development/web/function-runner/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "function-runner"; + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4uW7gjvQjv10evBeYdRiQFsnA67VAzL74YBNUbVciHg="; + }; + + cargoSha256 = "sha256-EZubfW4PNdBurLk3YJ/BLtDq3zxkQ3YxfWMMBa2TpWU="; + + meta = with lib; { + description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; + homepage = "https://github.com/Shopify/function-runner"; + license = licenses.asl20; + maintainers = with maintainers; [ nintron ]; + }; +} diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 1a8b232c28081..9f09e1b74aac1 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.5"; + version = "5.3.2"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-RI1O10kObIaEjOuUFuAchjIgjrNDKmwRY0+Vep6UT54="; + sha256 = "sha256-UdRtrQiHbBc8VoVUulDCZmAfZ1YTVdgNfeF91HomSqc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix index 792eba3978cc6..10dd7950f96b4 100644 --- a/pkgs/development/web/ihp-new/default.nix +++ b/pkgs/development/web/ihp-new/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ihp-new"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "digitallyinduced"; repo = "ihp"; rev = "v${version}"; - sha256 = "sha256-8RBZn74pMAOHZL1VzO9DeEeDYm5CE1HOobP9e7Ze0Us="; + sha256 = "sha256-LUIC7Olu2qTxZwgkgVpmTgCEQYDlwvLQFQt3Ox/Vm48="; }; dontConfigure = true; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index ca7753aa56e1f..8c6c2c73c2ca9 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/kore/default.nix b/pkgs/development/web/kore/default.nix index 1e1aa3e800f4d..878737ce706fd 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; # added to fix build w/gcc7 and clang5 - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; enableParallelBuilding = true; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 066d473eeead4..18edea1ab65b0 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,7 +120,7 @@ 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 ''; @@ -133,7 +131,7 @@ let 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/v14.nix b/pkgs/development/web/nodejs/v14.nix index 4563dd7a045a6..e7dec1c12f665 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.2"; - sha256 = "00zzl43iis8mr8x48hww5ncj8mj5dmpn05rq7ihpffkp2q7rmw6q"; + version = "14.21.3"; + sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; 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 c8241ababc0d2..725bbc690df1b 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -10,8 +10,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.19.0"; - sha256 = "01k72p0hp4lhlpz1syd9cbkm2gpfww0hn10xdpmzd4i3x8dfq7sg"; + version = "16.19.1"; + sha256 = "sha256-F/txZAYZgSWzDJTdPRdWIHspdwViav4W2NxHmmWh2LU="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 5d1dfa555431f..766fabc3c9e15 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -6,14 +6,13 @@ let python = python3; }; - npmPatches = callPackage ./npm-patches.nix { }; in buildNodejs { inherit enableNpm; - version = "18.13.0"; - sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx"; + version = "18.14.2"; + sha256 = "sha256-+8Nk3SX+4srMDyAz2y2GEV/AdXUxDqDmRAi4Fw0JxoU="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch - ] ++ npmPatches; + ]; } diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index b9cd476a19410..5921c2a4e69a9 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.5.0"; - sha256 = "sha256-KBMXvce6iVITi/jw9fB2SV95+G6FGmWb4fmD3sM8pXc="; + version = "19.7.0"; + sha256 = "sha256-URhH9yTqQF+F4lgDy8+LExsUzQay1wRmmL0nYMQEv8M="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 57892920c8d79..13295edd310a0 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -31,7 +31,7 @@ perlPackages.buildPerlPackage { # Workaround build failure on -fno-common toolchains: # ld: iselect_browse.o:(.bss+0x2020): multiple definition of `Line'; iselect_main.o:(.bss+0x100000): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 1ebf215aefb5f..1738c26659d22 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nvidia-texture-tools libsodium fmt freetype ] ++ lib.optional withEditor wxGTK; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${xorgproto}/include" "-I${libX11.dev}/include" "-I${libXcursor.dev}/include" diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix index 8f6a5b1230587..2c09e5c1eb6f6 100644 --- a/pkgs/games/0verkill/default.nix +++ b/pkgs/games/0verkill/default.nix @@ -29,7 +29,7 @@ gccStdenv.mkDerivation rec { # The code needs an update for gcc-10: # https://github.com/hackndev/0verkill/issues/7 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; hardeningDisable = [ "all" ]; # Someday the upstream will update the code... meta = with lib; { diff --git a/pkgs/games/2048-cli/default.nix b/pkgs/games/2048-cli/default.nix new file mode 100644 index 0000000000000..bc93d51b10fdd --- /dev/null +++ b/pkgs/games/2048-cli/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, gettext +, installShellFiles +, ncurses +, ui ? "terminal" +}: + +assert lib.elem ui [ "terminal" "curses" ]; +stdenv.mkDerivation (self: { + pname = "2048-cli"; + version = "unstable-2019-12-10"; + + src = fetchFromGitHub { + owner = "tiehuis"; + repo = "2048-cli"; + rev = "67439255df7d4f70209ca628d65128cd41d33e8d"; + hash = "sha256-U7g2wCZgR7Lp/69ktQIZZ1cScll2baCequemTl3Mc3I="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "-lcurses" "-lncurses" + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + gettext + ] + ++ (lib.optional (ui == "curses") ncurses); + + dontConfigure = true; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gettext}/share/gettext/"; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ui + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin 2048 + installManPage man/2048.6 + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/tiehuis/2048-cli"; + description = "The game 2048 for your Linux terminal"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix index 1542b120c9af6..e36521e19149f 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -26,9 +26,9 @@ (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.AspNetCore.App.Ref"; version = "6.0.13"; sha256 = "1k49nrz5rw1yglkjypmmnclahib2qiwm838008yahk00ysy039f4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "1a80w34yb700cvjzfcsq3c5sb32bk95ccgjfcvyqxkpzlgcc50xn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "1y2gnkrc788y9k79sygx7dmgkj674qwdajyrxizx0a70rwmjszmw"; }) (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"; }) @@ -36,11 +36,11 @@ (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.App.Host.linux-arm64"; version = "6.0.13"; sha256 = "1xy7x37mkdiv907xbxxc0aijjhgi2hli1s79adqn4adw8fbn2aki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.13"; sha256 = "0ph1r2vhnqg7agk1zz4873983qy2i5nwa10q40ba3g96rdy2pg1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.13"; sha256 = "0ddygsnms3vfg6s7w2mcm7gqdmb4h7glrdj73hm1l42sndmn9p7v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.13"; sha256 = "0l1bq22d85sm36hrsmyf74hir1fj0msqv0c6d4ba0b64b3rwhvg0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.13"; sha256 = "0in8sk9bl2r2dgjf3ncvmqzbdnyvy2329bzmykmvsrq511c76gh3"; }) (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"; }) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 9523a228f8789..c2a988d168767 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.56"; + version = "2.1.60"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-bois8+W/Jvte0HqC6Vi8WcXzrc8y8fKoW3ttbPb/v14="; + sha256 = "sha256-IXgIVMcaZBTasRteZz3tRaDQ2rsWel2cNondK2VnzTU="; }; # 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-xd96wG+dElf6kSJ3jtdwfDhxJIv2r/o/JF2RcIwaZkg="; + sha256 = "sha256-DQZsKkJ8SMAFpZ2/aVRAigmbsdnW79jW7otPOd8Y/v8="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-dYYgKEN6ytZ1CIH2+hK7H7xs3ISMbZGDv3w+Ie+ISlw="; + sha256 = "sha256-y67nxlsyKT1PuBq8KMh8NatpLViClaN6BIMMoralKdQ="; }; }; @@ -45,32 +45,43 @@ let meta = with lib; { inherit (anki.meta) license homepage description longDescription; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ atemu ]; + maintainers = with maintainers; [ mahmoudk1000 atemu ]; }; passthru = { inherit sources; }; -in -if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { - name = "anki"; + fhsUserEnvAnki = buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { + name = "anki"; - # Dependencies of anki - targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]); + # Dependencies of anki + targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]); - runScript = writeShellScript "anki-wrapper.sh" '' - exec ${unpacked}/bin/anki - ''; + runScript = writeShellScript "anki-wrapper.sh" '' + exec ${unpacked}/bin/anki + ''; - extraInstallCommands = '' - mkdir -p $out/share - cp -R ${unpacked}/share/applications \ - ${unpacked}/share/man \ - ${unpacked}/share/pixmaps \ - $out/share/ - ''; + extraInstallCommands = '' + mkdir -p $out/share + cp -R ${unpacked}/share/applications \ + ${unpacked}/share/man \ + ${unpacked}/share/pixmaps \ + $out/share/ + ''; + + inherit meta passthru; + }); + + fhsUserEnvAnkiWithVersion = fhsUserEnvAnki.overrideAttrs (oldAttrs: { + # buildFHSUserEnv doesn't have an easy way to set the version of the + # resulting derivation, so we manually override it here. This makes + # it clear to end users the version of anki-bin. Without this, users + # might assume anki-bin is an old version of Anki. + name = "${pname}-${version}"; + }); +in - inherit meta passthru; -}) else stdenv.mkDerivation { +if stdenv.isLinux then fhsUserEnvAnkiWithVersion +else stdenv.mkDerivation { inherit pname version passthru; src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 301fa231122d3..ed03c2afd71c9 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ SDL ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" ]; preConfigure = '' substituteInPlace data/azimuth.desktop \ diff --git a/pkgs/games/beret/use-home-dir.patch b/pkgs/games/beret/use-home-dir.patch deleted file mode 100644 index c8597a0303b8a..0000000000000 --- a/pkgs/games/beret/use-home-dir.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur beret-beret-orig/game.c beret-beret/game.c ---- beret-beret-orig/game.c 2011-12-17 18:51:32.000000000 -0500 -+++ beret-beret/game.c 2011-12-21 13:16:37.047511020 -0500 -@@ -10,12 +10,10 @@ - #include <stdlib.h> - #include <stdio.h> - #include <string.h> --#ifdef __APPLE__ - #include <sys/stat.h> - #include <unistd.h> - #include <errno.h> - #include <pwd.h> --#endif - - #define CAMSCROLL 15 - #define SCR_WIDTH 780 -@@ -88,12 +86,8 @@ - #define DIRSEP "/" - #endif - --#ifdef __APPLE__ --#define SUPPORT_PATH "Library/Application Support/Beret/" --#define RESOURCE_PATH "Beret.app/Contents/Resources/" --#else -+#define SUPPORT_PATH ".beret" - #define RESOURCE_PATH "" --#endif - - #define QUITMOD_WIN KMOD_ALT - #define QUITKEY_WIN SDLK_F4 -@@ -812,7 +806,6 @@ - - int init() { - -- #ifdef __APPLE__ - char filestr[512]; - // Get the home directory of the user. - struct passwd *pwd = getpwuid(getuid()); -@@ -827,9 +820,6 @@ - sprintf(filestr, "%s/saves", support_path); - mkdir(filestr, S_IRWXU); - } -- #else -- sprintf(support_path, ""); -- #endif - - if (SDL_Init(SDL_INIT_EVERYTHING) == -1) { - printf("Error: couldn't initialize SDL\n"); diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index cd37385585da7..87eac661c890f 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "blightmud"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AGKlkNpNdyD2cJGs350/076Qd/8M/nmRAaHJyefFRgw="; + sha256 = "sha256-0cvMROnblt9c4d6Kbr5iY/Qobf3hOKIhWHvOVQONhO4="; }; - cargoSha256 = "sha256-RI0J60DCspJ501VR3TpqD6pjzO6//Qq1NgQb45d32ks="; + cargoSha256 = "sha256-7jSuadpAZXtlYVw4/NBATTIAFO8M6I11FuxfGFQx51Y="; buildFeatures = lib.optional withTTS "tts"; diff --git a/pkgs/games/blobwars/default.nix b/pkgs/games/blobwars/default.nix index b99c9f2b8e360..b0951064c24cf 100644 --- a/pkgs/games/blobwars/default.nix +++ b/pkgs/games/blobwars/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; makeFlags = [ "PREFIX=$(out)" "RELEASE=1" ]; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index cec88ab51bdc2..f1f2e84a614dd 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; + env.NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; patches = [ (fetchpatch { diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 75bcad2f0db17..9bceef012907f 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/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 3bf2f884ab36a..9d5c865ab48a0 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -44,6 +44,11 @@ let "VERSION=${version}" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = common.meta // { maintainers = with lib.maintainers; common.meta.maintainers ++ [ skeidel ]; diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 23eb6e96dcb8e..c3bd9fa1e8693 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation rec { - pname = "cdogs"; - version = "1.4.0"; + pname = "cdogs-sdl"; + version = "1.4.1"; src = fetchFromGitHub { - repo = "cdogs-sdl"; + repo = pname; owner = "cxong"; rev = version; - sha256 = "sha256-jEK84iFodd0skRnHG3R0+MvBUXLd3o+YOLnBjZdsDms="; + sha256 = "sha256-CH0P8OrRUXtuqAHxDKv4ziKYdwGTccLPwpzh4xo7lQc="; }; postPatch = '' @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { "-DCMAKE_C_FLAGS=-Wno-error=array-bounds" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index fd8189386e73d..8a316438a6328 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "chessx"; - version = "1.5.7"; + version = "1.5.8"; src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; - sha256 = "sha256-wadIO3iNvj8LgIzExHTmeXxXnWOI+ViLrdhAlzZ79Jw="; + sha256 = "sha256-ev+tK1CHLFt/RvmzyPVZ2c0nxfRwwb9ke7uTmm7REaM="; }; nativeBuildInputs = [ diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 7454242c72b5e..e3385eaca5373 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/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 4a1cbf08c5347..1aaa752fbd6ea 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.5"; + version = "16.7.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-fHe72ew+qoSyOqXU9Hs9EyecrYDjEqTm+Ii9Zja9up4="; + 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,8 +82,13 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - cmakeFlags = [ - "-DAUTOUPDATE=OFF" + 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 = '' @@ -71,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 = '' @@ -82,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/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 27b54667f0b9a..9b7de93ecd7d5 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -82,6 +82,11 @@ stdenv.mkDerivation { sha256 = release.sha256; }; + postPatch = '' + # https://github.com/svenstaro/dwarf_fortress_unfuck/pull/27 + substituteInPlace CMakeLists.txt --replace \''${GLEW_LIBRARIES} GLEW::glew + ''; + cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index f949cf69835d6..7ec7ab99b5664 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { sconsFlags = [ "sdl2=1" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-format-nonliteral" "-Wno-format-truncation" ]; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 293811e9b0403..49721fd2ce1eb 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - NIX_CFLAGS_COMPILE = "-fpermissive"; - NIX_LDFLAGS = "-ldl"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { homepage = "http://www.bergo.eng.br/eboard/"; diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 505c76f38f94e..542b414d8a45a 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -1,71 +1,51 @@ { stdenv , lib , fetchFromBitbucket -, makeDesktopItem -, copyDesktopItems , cmake +, copyDesktopItems , pkg-config +, makeWrapper , zlib , bzip2 , libjpeg , SDL2 , SDL2_net , SDL2_mixer -, gtk2 +, gtk3 }: stdenv.mkDerivation rec { pname = "ecwolf"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromBitbucket { owner = pname; repo = pname; rev = version; - sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk="; + sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g="; }; - nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; - buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk2 ]; - - desktopItems = [ - (makeDesktopItem { - name = "ecwolf"; - exec = "ecwolf"; - comment = "Enhanced Wolfenstein 3D port"; - desktopName = "Wolfenstein 3D"; - categories = [ "Game" ]; - }) - ]; + nativeBuildInputs = [ cmake copyDesktopItems pkg-config ] + ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; - # Change the location where the ecwolf executable looks for the ecwolf.pk3 - # file. - # - # By default, it expects the PK3 file to reside in the same directory as the - # executable, which is not desirable. - # We will adjust the code so that it can be retrieved from the share/ - # directory. - - preConfigure = '' - sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h - '' - # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store - + lib.optionalString stdenv.isDarwin '' - sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt - ''; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; - # Install the required PK3 file in the required data directory - postInstall = '' - mkdir -p $out/share/ecwolf - cp ecwolf.pk3 $out/share/ecwolf + # ECWolf installs its binary to the games/ directory, but Nix only adds bin/ + # directories to the PATH. + postInstall = lib.optionalString stdenv.isLinux '' + mv "$out/games" "$out/bin" + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -R ecwolf.app $out/Applications + makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ jayman2000 sander ]; platforms = platforms.all; }; } diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 995d69d0a911e..ba89e4ca7afde 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: mad.o:(.bss+0x233800): multiple definition of `tile_dict'; camera.o:(.bss+0x140): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; diff --git a/pkgs/development/python-modules/cmsis-pack-manager/Cargo.lock b/pkgs/games/eidolon/Cargo.lock index 2d6cb8fd99347..3a800a1263cbf 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/Cargo.lock +++ b/pkgs/games/eidolon/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -18,6 +18,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aho-corasick" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] name = "ansi_term" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -27,16 +45,16 @@ dependencies = [ ] [[package]] -name = "app_dirs" -version = "1.2.1" +name = "arrayref" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -dependencies = [ - "ole32-sys", - "shell32-sys", - "winapi 0.2.8", - "xdg", -] +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "atty" @@ -44,7 +62,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] @@ -66,9 +84,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -80,12 +98,6 @@ dependencies = [ ] [[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] name = "base64" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -95,16 +107,42 @@ dependencies = [ ] [[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 = "bumpalo" -version = "3.10.0" +name = "blake2b_simd" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +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", + "rand 0.5.6", + "regex 1.7.1", + "reqwest", + "serde", + "serde_derive", + "serde_json", +] [[package]] name = "byteorder" @@ -125,9 +163,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -142,19 +180,6 @@ 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 0.1.44", - "winapi 0.3.9", -] - -[[package]] name = "clap" version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -179,52 +204,27 @@ dependencies = [ ] [[package]] -name = "cmsis-cffi" -version = "0.3.0" -dependencies = [ - "cmsis-pack", - "ctor", - "failure", - "log", - "simplelog", -] - -[[package]] -name = "cmsis-cli" -version = "0.3.0" +name = "concolor" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "318d6c16e73b3a900eb212ad6a82fc7d298c5ab8184c7a9998646455bc474a16" dependencies = [ - "app_dirs", - "clap", - "cmsis-pack", - "failure", - "log", - "pbr", - "simplelog", + "bitflags", + "concolor-query", + "is-terminal", ] [[package]] -name = "cmsis-pack" -version = "0.3.0" -dependencies = [ - "failure", - "futures", - "log", - "minidom", - "quick-xml", - "reqwest", - "rustc-demangle", - "serde", - "serde_derive", - "serde_json", - "time 0.2.27", - "tokio-core", -] +name = "concolor-query" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317" [[package]] -name = "const_fn" -version = "0.4.9" +name = "constant_time_eq" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "cookie" @@ -232,7 +232,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" dependencies = [ - "time 0.1.44", + "time", "url 1.7.2", ] @@ -249,28 +249,34 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time 0.1.44", + "time", "try_from", "url 1.7.2", ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "core-foundation" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "cfg-if 1.0.0", + "core-foundation-sys", + "libc", ] [[package]] -name = "crossbeam-channel" -version = "0.5.6" +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 = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.11", ] [[package]] @@ -323,78 +329,78 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if 1.0.0", - "once_cell", ] [[package]] -name = "ct-logs" -version = "0.6.0" +name = "dirs" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" dependencies = [ - "sct", + "libc", + "redox_users", + "winapi 0.3.9", ] [[package]] -name = "ctor" -version = "0.1.22" +name = "dtoa" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "eidolon" +version = "1.4.6" dependencies = [ - "quote", - "syn", + "butlerd", + "dirs", + "human-panic", + "regex 0.2.11", + "serde", + "serde_derive", + "serde_json", + "structopt", ] [[package]] -name = "dirs" -version = "4.0.0" +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encoding_rs" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "dirs-sys", + "cfg-if 1.0.0", ] [[package]] -name = "dirs-sys" -version = "0.3.7" +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ + "errno-dragonfly", "libc", - "redox_users", "winapi 0.3.9", ] [[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "either" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" - -[[package]] -name = "encoding_rs" -version = "0.8.31" +name = "errno-dragonfly" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" dependencies = [ - "cfg-if 1.0.0", + "cc", + "libc", ] [[package]] @@ -413,17 +419,26 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2", - "quote", - "syn", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.109", "synstructure", ] [[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[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", @@ -436,13 +451,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", - "percent-encoding 2.1.0", + "percent-encoding 2.2.0", ] [[package]] @@ -485,9 +514,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +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 = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "libc", @@ -496,9 +536,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "h2" @@ -525,6 +565,15 @@ 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" @@ -534,6 +583,21 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] name = "http" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -558,9 +622,25 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "human-panic" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87eb03e654582b31967d414b86711a7bbd7c6b28a6b7d32857b7d1d45c0926f9" +dependencies = [ + "backtrace", + "concolor", + "os_info", + "serde", + "serde_derive", + "termcolor", + "toml", + "uuid 0.8.2", +] [[package]] name = "hyper" @@ -580,7 +660,7 @@ dependencies = [ "log", "net2", "rustc_version", - "time 0.1.44", + "time", "tokio", "tokio-buf", "tokio-executor", @@ -593,20 +673,16 @@ dependencies = [ ] [[package]] -name = "hyper-rustls" -version = "0.17.1" +name = "hyper-tls" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952" +checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" dependencies = [ "bytes", - "ct-logs", "futures", "hyper", - "rustls", + "native-tls", "tokio-io", - "tokio-rustls", - "webpki", - "webpki-roots", ] [[package]] @@ -632,16 +708,45 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +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 = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -651,25 +756,28 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "0.4.8" +name = "is-terminal" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] [[package]] name = "itoa" -version = "1.0.2" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] -name = "js-sys" -version = "0.3.59" +name = "itoa" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "kernel32-sys" @@ -689,9 +797,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -713,9 +827,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maybe-uninit" @@ -755,19 +869,10 @@ dependencies = [ ] [[package]] -name = "minidom" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe549115a674f5ec64c754d85e37d6f42664bd0ef4ffb62b619489ad99c6cb1a" -dependencies = [ - "quick-xml", -] - -[[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", ] @@ -792,17 +897,6 @@ dependencies = [ ] [[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio", -] - -[[package]] name = "miow" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -815,10 +909,28 @@ dependencies = [ ] [[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.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", @@ -826,58 +938,85 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num_cpus" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "autocfg 1.1.0", - "num-traits", + "hermit-abi 0.2.6", + "libc", ] [[package]] -name = "num-traits" -version = "0.2.15" +name = "object" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ - "autocfg 1.1.0", + "memchr", ] [[package]] -name = "num_cpus" -version = "1.13.1" +name = "once_cell" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "openssl" +version = "0.10.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ - "hermit-abi", + "bitflags", + "cfg-if 1.0.0", + "foreign-types", "libc", + "once_cell", + "openssl-macros", + "openssl-sys", ] [[package]] -name = "object" -version = "0.29.0" +name = "openssl-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "memchr", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.109", ] [[package]] -name = "ole32-sys" -version = "0.2.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "autocfg 1.1.0", + "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] -name = "once_cell" -version = "1.13.0" +name = "os_info" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "d2cc1b4330bb29087e791ae2a5cf56be64fb8946a4ff5aec2ba11c6ca51f5d60" +dependencies = [ + "log", + "serde", + "winapi 0.3.9", +] [[package]] name = "parking_lot" @@ -892,9 +1031,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" dependencies = [ "cfg-if 0.1.10", "cloudabi", @@ -906,18 +1045,6 @@ dependencies = [ ] [[package]] -name = "pbr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2" -dependencies = [ - "crossbeam-channel", - "libc", - "time 0.1.44", - "winapi 0.3.9", -] - -[[package]] name = "percent-encoding" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -925,21 +1052,30 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[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 = "proc-macro-hack" -version = "0.5.19" +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "proc-macro2" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -951,25 +1087,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" dependencies = [ "idna 0.2.3", - "url 2.2.2", + "url 2.3.1", ] [[package]] -name = "quick-xml" -version = "0.17.2" +name = "quote" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" dependencies = [ - "memchr", + "proc-macro2 0.4.30", ] [[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", + "proc-macro2 1.0.51", +] + +[[package]] +name = "rand" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "winapi 0.3.9", ] [[package]] @@ -1095,31 +1244,70 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall 0.1.57", + "rust-argon2", +] + +[[package]] +name = "regex" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" dependencies = [ - "getrandom", - "redox_syscall 0.2.15", - "thiserror", + "aho-corasick 0.6.10", + "memchr", + "regex-syntax 0.5.6", + "thread_local", + "utf8-ranges", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick 0.7.20", + "memchr", + "regex-syntax 0.6.28", ] [[package]] +name = "regex-syntax" +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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] name = "reqwest" version = "0.9.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" dependencies = [ - "base64", + "base64 0.10.1", "bytes", "cookie", "cookie_store", @@ -1128,40 +1316,35 @@ dependencies = [ "futures", "http", "hyper", - "hyper-rustls", + "hyper-tls", "log", "mime", "mime_guess", - "rustls", + "native-tls", "serde", "serde_json", "serde_urlencoded", - "time 0.1.44", + "time", "tokio", "tokio-executor", "tokio-io", - "tokio-rustls", "tokio-threadpool", "tokio-timer", "url 1.7.2", - "uuid", - "webpki-roots", + "uuid 0.7.4", "winreg", ] [[package]] -name = "ring" -version = "0.16.20" +name = "rust-argon2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", + "base64 0.13.1", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1180,29 +1363,33 @@ dependencies = [ ] [[package]] -name = "rustls" -version = "0.16.0" +name = "rustix" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ - "base64", - "log", - "ring", - "sct", - "webpki", + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", ] [[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 = "scoped-tls" -version = "0.1.2" +name = "schannel" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] [[package]] name = "scopeguard" @@ -1211,13 +1398,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sct" -version = "0.6.1" +name = "security-framework" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "ring", - "untrusted", + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -1237,31 +1437,31 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[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", - "syn", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.5", "ryu", "serde", ] @@ -1279,46 +1479,10 @@ dependencies = [ ] [[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 = "shell32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "simplelog" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2736f58087298a448859961d3f4a0850b832e72619d75adc69da7993c2cd3c" -dependencies = [ - "chrono", - "log", - "termcolor", -] - -[[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg 1.1.0", ] @@ -1333,92 +1497,61 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "standback" -version = "0.2.17" +name = "string" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" dependencies = [ - "version_check", + "bytes", ] [[package]] -name = "stdweb" -version = "0.4.20" +name = "strsim" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] -name = "stdweb-derive" -version = "0.5.3" +name = "structopt" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", + "clap", + "structopt-derive", ] [[package]] -name = "stdweb-internal-macros" -version = "0.2.9" +name = "structopt-derive" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", + "heck", + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", ] [[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "string" -version = "0.2.1" +name = "syn" +version = "0.15.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" dependencies = [ - "bytes", + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", ] [[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.98" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.51", + "quote 1.0.23", "unicode-ident", ] @@ -1428,17 +1561,30 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.109", + "unicode-xid 0.2.4", +] + +[[package]] +name = "tempfile" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "redox_syscall 0.2.16", + "rustix", + "windows-sys 0.42.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -1453,30 +1599,19 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.31" +name = "thread_local" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "lazy_static", ] [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -1484,44 +1619,6 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi 0.3.9", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - -[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1532,9 +1629,9 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -1546,18 +1643,13 @@ dependencies = [ "futures", "mio", "num_cpus", - "tokio-codec", "tokio-current-thread", "tokio-executor", - "tokio-fs", "tokio-io", "tokio-reactor", - "tokio-sync", "tokio-tcp", "tokio-threadpool", "tokio-timer", - "tokio-udp", - "tokio-uds", ] [[package]] @@ -1572,36 +1664,6 @@ dependencies = [ ] [[package]] -name = "tokio-codec" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" -dependencies = [ - "bytes", - "futures", - "tokio-io", -] - -[[package]] -name = "tokio-core" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b1395334443abca552f63d4f61d0486f12377c2ba8b368e523f89e828cffd4" -dependencies = [ - "bytes", - "futures", - "iovec", - "log", - "mio", - "scoped-tls", - "tokio", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-timer", -] - -[[package]] name = "tokio-current-thread" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1622,17 +1684,6 @@ dependencies = [ ] [[package]] -name = "tokio-fs" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" -dependencies = [ - "futures", - "tokio-io", - "tokio-threadpool", -] - -[[package]] name = "tokio-io" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1663,20 +1714,6 @@ dependencies = [ ] [[package]] -name = "tokio-rustls" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676" -dependencies = [ - "bytes", - "futures", - "iovec", - "rustls", - "tokio-io", - "webpki", -] - -[[package]] name = "tokio-sync" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1730,43 +1767,19 @@ dependencies = [ ] [[package]] -name = "tokio-udp" -version = "0.1.6" +name = "toml" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "bytes", - "futures", - "log", - "mio", - "tokio-codec", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-uds" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" -dependencies = [ - "bytes", - "futures", - "iovec", - "libc", - "log", - "mio", - "mio-uds", - "tokio-codec", - "tokio-io", - "tokio-reactor", + "serde", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try_from" @@ -1778,6 +1791,12 @@ dependencies = [ ] [[package]] +name = "ucd-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" + +[[package]] name = "unicase" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1788,42 +1807,48 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[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-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.3" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] -name = "untrusted" -version = "0.7.1" +name = "unicode-xid" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" @@ -1838,26 +1863,46 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna 0.2.3", - "matches", - "percent-encoding 2.1.0", + "idna 0.3.0", + "percent-encoding 2.2.0", ] [[package]] +name = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + +[[package]] name = "uuid" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" dependencies = [ - "rand", + "rand 0.6.5", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.8", ] [[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" @@ -1882,6 +1927,12 @@ dependencies = [ [[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" @@ -1893,130 +1944,128 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.82" +name = "winapi" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" +name = "winapi-build" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", + "winapi 0.3.9", ] [[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "web-sys" -version = "0.3.59" +name = "windows-sys" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "js-sys", - "wasm-bindgen", + "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 = "webpki" -version = "0.21.4" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "ring", - "untrusted", + "windows-targets", ] [[package]] -name = "webpki-roots" -version = "0.17.0" +name = "windows-targets" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "webpki", + "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 = "winapi" -version = "0.2.8" +name = "windows_aarch64_gnullvm" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows_aarch64_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] -name = "winapi-build" -version = "0.1.1" +name = "windows_i686_gnu" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows_i686_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] -name = "winapi-util" -version = "0.1.5" +name = "windows_x86_64_gnu" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_x86_64_gnullvm" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +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" @@ -2036,12 +2085,3 @@ dependencies = [ "winapi 0.2.8", "winapi-build", ] - -[[package]] -name = "xdg" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs", -] diff --git a/pkgs/games/eidolon/cargo-lock.patch b/pkgs/games/eidolon/cargo-lock.patch deleted file mode 100644 index 0aec3de6385d7..0000000000000 --- a/pkgs/games/eidolon/cargo-lock.patch +++ /dev/null @@ -1,2726 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 8abf781..6d6189f 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -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" -+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)", -- "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 197683de8b573..8807852f24863 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -16,22 +16,22 @@ rustPlatform.buildRustPackage rec { rev = version; sha256 = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "sha256-1d+Wgx6tBS1Rb8WpVrD/ja0zXdoE2Q9ZlUS/3p8OYWM="; + cargoLock = { + lockFile = ./Cargo.lock; + }; 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}"; + postPatch = '' + ln -sf ${./Cargo.lock} Cargo.lock + ''; 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"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index a65ce6bac0dbf..41dd9625adb8c 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -202,7 +202,7 @@ let --run "$out/share/factorio/update-config.sh" \ --argv0 "" \ --add-flags "-c \$HOME/.factorio/config.cfg" \ - ${if mods!=[] then "--add-flags --mod-directory=${modDir}" else ""} + ${lib.optionalString (mods!=[]) "--add-flags --mod-directory=${modDir}"} # TODO Currently, every time a mod is changed/added/removed using the # modlist, a new derivation will take up the entire footprint of the diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index e1b15b6248f45..30ba8eaabe5af 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-86+4rFSvJ3xIVx+qDXZ65TSqIrPkbyoLNo1A+mFPdy8="; + sha256 = "sha256-l7MFvcUOv1jA7moA8VYcaQO15eyK/06x6Jznz5jsNNg="; }; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index bf94dfa067f65..eb39b3e19a71d 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.3.13"; + version = "2020.3.17"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; - sha256 = "sha256-C3iUVA7IJQ77OdXcaBnSpDphMFjmFZmn0nozQvdxSJM="; + sha256 = "sha256-Kl66K5rmejaRKFgzps4/a73z8gIp9YcdfJQOFR1U2Og="; }; dontUnpack = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Zhq/r0davIz9G6tXVZRp76ZivG0D9Y6Nl3OFAD/lqow="; + sha256 = "sha256-ZnDe3qyiaDrKd/nwa/nR2AYq4yoqVFnd3IqgmJxfGFQ="; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 5b4407038015e..9f9075d75a4da 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -5,8 +5,7 @@ , doxygen , graphviz , makeWrapper -, cppcheck -, boost16x +, boost17x , SDL2 , python3 , freetype @@ -24,8 +23,8 @@ }: stdenv.mkDerivation rec { - version = "0.4.10.2"; pname = "freeorion"; + version = "0.4.10.2"; src = fetchFromGitHub { owner = "freeorion"; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - (boost16x.override { enablePython = true; python = python3; }) + (boost17x.override { enablePython = true; python = python3; }) (python3.withPackages (p: with p; [ pycodestyle ])) SDL2 freetype @@ -53,7 +52,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - cppcheck doxygen graphviz makeWrapper @@ -81,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; - homepage = "http://www.freeorion.org"; + homepage = "https://www.freeorion.org/"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ tex ]; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index 00e43582f6e1f..a61bddf94bfb5 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation { pname = "frogatto-data"; - version = "unstable-2022-04-13"; + version = "unstable-2023-02-27"; src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - rev = "655493961c4ad57ba9cccdc24d23a2ded294b5f2"; - sha256 = "0irn7p61cs8nm7dxsx84b2c3wryf2h12k2kclywdhy6xmh53w8k1"; + rev = "5ca339f4b97e5004dc07394407bf1da43fbd6204"; + sha256 = "sha256-6wqCFc7DlDt0u0JnPg4amVemc9HOjsB/U4s9n7N84QA="; }; installPhase = '' mkdir -p $out/share/frogatto/modules - cp -ar . $out/share/frogatto/modules/frogatto + cp -ar . $out/share/frogatto/modules/frogatto4 ''; meta = with lib; { diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index e141b68e88d30..036b2abec19ca 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -14,7 +14,7 @@ let genericName = "frogatto"; categories = [ "Game" "ArcadeGame" ]; }; - version = "unstable-2020-12-04"; + inherit (data) version; in buildEnv { name = "frogatto-${version}"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index b848c414b7a3c..95e2135660fdb 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,25 +1,19 @@ { lib, stdenv, fetchFromGitHub, fetchurl, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf -, glew, zlib, icu, pkg-config, cairo, libvpx }: +, glew, zlib, icu, pkg-config, cairo, libvpx, glm +}: stdenv.mkDerivation { pname = "anura-engine"; - version = "unstable-2022-04-09"; + version = "unstable-2023-02-27"; src = fetchFromGitHub { owner = "anura-engine"; repo = "anura"; - rev = "5ac7f6fe63114274f0da7dad4c1ed673651e6424"; - sha256 = "1yrcbvzgxdvn893qk1qcpb53pjns366fdls5qjal7lhq71kkfc67"; + rev = "65d85b6646099db1d5cd25d31321bb434a3f94f1"; + sha256 = "sha256-hb4Sn7uI+eXLaGb4zkEy4w+ByQJ6FqkoMUYFsyiFCeE="; fetchSubmodules = true; }; - patches = [ - # https://github.com/anura-engine/anura/issues/321 - (fetchurl { - url = "https://github.com/anura-engine/anura/commit/627d08fb5254b5c66d315f1706089905c2704059.patch"; - sha256 = "052m58qb3lg0hnxacpnjz2sz89dk0x6b5qi2q9bkzkvg38f237rr"; - }) - ]; nativeBuildInputs = [ which pkg-config @@ -36,6 +30,7 @@ stdenv.mkDerivation { icu cairo libvpx + glm ]; enableParallelBuilding = true; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 9d89a6d0b7b33..3223cc4580520 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: main.o:src/main.c:58: multiple definition of # `eclass'; eclass.o:src/eclass.c:21: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index f5d23091b482e..9be95457b41c8 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of # `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here # TODO: drop once updated to 2022.1 or later. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 785d38a759a02..9c2b260f1dbfc 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -38,6 +38,14 @@ in stdenv.mkDerivation rec { ''; makeFlags = [ "build-core" ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=address" + "-Wno-error=deprecated-declarations" + "-Wno-error=use-after-free" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 1d67947d7accb..a8f306977104c 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-BNVoSJbGi+u2DHuAicOjEUpDlmu25vMWoBudbV1FLgM="; + sha256 = "sha256-bx0jqG03GSHj1lO9NRh8DJRUyJBbyVUKCy/2pZ3OWas="; }; nativeBuildInputs = [ diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index c8c0e730f10e8..f534f96154730 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { pname = "heroic-unwrapped"; - version = "2.5.2"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - sha256 = "sha256-vyZH/uOE7Oph8TuBFM2cUFwM4ed8Ri3fKRUrl9A6zHc="; + sha256 = "sha256-QXciJkY5l5Oqzgnj9vV5IwOSUtVeLMH29r2EIQVt2LI="; }; packageJSON = ./package.json; diff --git a/pkgs/games/heroic/package.json b/pkgs/games/heroic/package.json index 77b1702d8793a..b5f5e0478fd92 100644 --- a/pkgs/games/heroic/package.json +++ b/pkgs/games/heroic/package.json @@ -1,6 +1,6 @@ { "name": "heroic", - "version": "2.5.2", + "version": "2.6.2", "private": true, "main": "build/electron/main.js", "homepage": "./", @@ -39,7 +39,7 @@ } ], "win": { - "artifactName": "${productName}-${version}-Setup.${ext}", + "artifactName": "${productName}-${version}-Setup-${arch}.${ext}", "icon": "build/win_icon.ico", "asarUnpack": [ "build/bin/win32/legendary.exe", @@ -50,9 +50,10 @@ ] }, "portable": { - "artifactName": "${productName}-${version}-Portable.${ext}" + "artifactName": "${productName}-${version}-Portable-${arch}.${ext}" }, "mac": { + "artifactName": "${productName}-${version}-macOS-${arch}.${ext}", "target": "dmg", "category": "public.app-category.games", "icon": "build/icon.icns", @@ -145,7 +146,6 @@ "fs-extra": "^10.1.0", "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", @@ -164,28 +164,32 @@ "source-map-support": "^0.5.21", "steam-shortcut-editor": "^3.1.1", "systeminformation": "^5.15.0", + "ts-prune": "^0.10.3", "tslib": "^2.4.0" }, "scripts": { "start": "vite", "codecheck": "tsc --noEmit", + "find-deadcode": "ts-prune --error", "test": "jest", "test-watch": "jest --watch --maxWorkers=25%", "test:ci": "jest --runInBand --silent", "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", + "release:mac": "vite build && electron-builder -p always --mac --x64 --arm64", + "release:win": "vite build && electron-builder -p never --win nsis portable --x64 --arm64", "dist:linux": "vite build && electron-builder --linux", "dist:mac": "vite build && electron-builder --mac", "dist:win": "vite build && electron-builder --win", + "dist:flatpak": "yarn dist:linux appimage && yarn flatpak:prepare && yarn flatpak:build", "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", + "flatpak:build": "cd flatpak-build && flatpak-builder build com.heroicgameslauncher.hgl.yml --install --force-clean --user", + "flatpak:prepare": "node ./flatpak/prepareFlatpak.js", + "flatpak:prepare-release": "node ./flatpak/prepareFlatpak.js release", "i18n": "i18next", "prepare": "husky install", - "prettier": "prettier --check .", - "prettier-fix": "prettier --write ." + "prettier": "prettier --check . '!flatpak-build'", + "prettier-fix": "prettier --write . '!flatpak-build'" }, "eslintConfig": { "extends": [ @@ -211,8 +215,8 @@ "@typescript-eslint/eslint-plugin": "^5.20.0", "@typescript-eslint/parser": "^5.20.0", "@vitejs/plugin-react": "^2.2.0", - "electron": "^21.2.1", - "electron-builder": "^23.1.0", + "electron": "^22.2.0", + "electron-builder": "^23.6.0", "electron-devtools-installer": "^3.2.0", "eslint": "^8.13.0", "eslint-config-prettier": "^8.5.0", @@ -226,6 +230,7 @@ "sass": "^1.55.0", "tmp": "^0.2.1", "ts-jest": "^28.0.7", + "type-fest": "^3.2.0", "typescript": "^4.8.4", "vite": "^3.2.2", "vite-plugin-electron": "^0.10.2", diff --git a/pkgs/games/heroic/yarn.lock b/pkgs/games/heroic/yarn.lock index 6c4d3f59b7668..8e865bd6c9c7d 100644 --- a/pkgs/games/heroic/yarn.lock +++ b/pkgs/games/heroic/yarn.lock @@ -452,21 +452,20 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.14.1": - 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== +"@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.2.1": version "1.2.1" @@ -1141,10 +1140,10 @@ 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" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@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" @@ -1242,12 +1241,12 @@ "@svgr/hast-util-to-babel-ast" "^6.4.0" svg-parser "^2.0.4" -"@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" + defer-to-connect "^2.0.0" "@testing-library/dom@^7.31.0": version "7.31.2" @@ -1311,6 +1310,16 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@ts-morph/common@~0.12.3": + version "0.12.3" + resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.12.3.tgz#a96e250217cd30e480ab22ec6a0ebbe65fd784ff" + integrity sha512-4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w== + dependencies: + fast-glob "^3.2.7" + minimatch "^3.0.4" + mkdirp "^1.0.4" + path-browserify "^1.0.1" + "@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" @@ -1349,6 +1358,16 @@ dependencies: "@babel/types" "^7.3.0" +"@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/classnames@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd" @@ -1414,7 +1433,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graceful-fs@^4.1.3", "@types/graceful-fs@^4.1.5": +"@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== @@ -1433,6 +1452,11 @@ resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64" integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== +"@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/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" @@ -1490,6 +1514,13 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@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/mdast@^3.0.0": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" @@ -1613,6 +1644,13 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@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/scheduler@*": version "0.16.2" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" @@ -2037,13 +2075,6 @@ axios@^0.22: dependencies: follow-redirects "^1.14.4" -axios@^0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" - integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== - dependencies: - follow-redirects "^1.14.4" - axios@^0.26.1: version "0.26.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" @@ -2324,18 +2355,23 @@ builder-util@23.6.0: 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== +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" call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -2528,6 +2564,11 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== +code-block-writer@^11.0.0: + version "11.0.3" + resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz#9eec2993edfb79bfae845fbc093758c0a0b73b76" + integrity sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw== + 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" @@ -2591,6 +2632,11 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +commander@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== + commander@~9.4.1: version "9.4.1" resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" @@ -2632,14 +2678,6 @@ conf@^10.2.0: pkg-up "^3.1.0" semver "^7.3.5" -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" - 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.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" @@ -2836,12 +2874,12 @@ decode-named-character-reference@^1.0.0: dependencies: character-entities "^2.0.0" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== +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" @@ -2858,10 +2896,10 @@ 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== +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, define-properties@^1.1.4: version "1.1.4" @@ -3072,11 +3110,6 @@ 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.5" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" - integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== - duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -3094,7 +3127,7 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-builder@^23.1.0: +electron-builder@^23.6.0: 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== @@ -3175,12 +3208,12 @@ electron-updater@^5.0.1: semver "^7.3.5" typed-emitter "^2.1.0" -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== +electron@^22.2.0: + version "22.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5" + integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g== dependencies: - "@electron/get" "^1.14.1" + "@electron/get" "^2.0.0" "@types/node" "^16.11.26" extract-zip "^2.0.1" @@ -3194,11 +3227,6 @@ emoji-regex@^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 sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -3714,7 +3742,7 @@ fast-fifo@^1.0.0: resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz#17d1a3646880b9891dfa0c54e69c5fef33cad779" integrity sha512-Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g== -fast-glob@^3.2.9: +fast-glob@^3.2.7, 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== @@ -3979,13 +4007,6 @@ get-package-type@^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.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" @@ -4068,16 +4089,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.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" - 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" @@ -4109,24 +4120,24 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - -graceful-fs@^4.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: +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" "^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.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.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -4214,15 +4225,6 @@ heimdalljs@^0.2.6: dependencies: rsvp "~3.2.1" -heroic-wine-downloader@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/heroic-wine-downloader/-/heroic-wine-downloader-1.2.3.tgz#e415709b0d6e1e6feb109261cded50c04073439c" - integrity sha512-njiJ+/hg1PhwGVwTtlm++6qQHVI6rWQtGSi/BA4gLkctt/rb7uYHnX8tkTq6EisXaWVeF5rXNInojH9047PPxw== - dependencies: - "@types/graceful-fs" "^4.1.5" - axios "^0.24.0" - graceful-fs "^4.2.8" - 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" @@ -4270,9 +4272,9 @@ htmlparser2@^8.0.1: entities "^4.3.0" http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== http-proxy-agent@^5.0.0: version "5.0.0" @@ -4283,6 +4285,14 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" +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: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -4423,11 +4433,6 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -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.1" resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d" @@ -5193,10 +5198,10 @@ jsesc@^2.5.1: 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 sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== +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: version "2.3.1" @@ -5229,12 +5234,17 @@ json-stringify-safe@^5.0.1: integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" +json5@^2.1.3: + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== + json5@^2.2.0, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" @@ -5274,12 +5284,12 @@ jszip@^3.1.0: readable-stream "~2.3.6" setimmediate "^1.0.5" -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" kleur@^3.0.3: version "3.0.3" @@ -5382,7 +5392,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@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: +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== @@ -5394,11 +5404,6 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -5744,11 +5749,16 @@ mimic-fn@^3.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== -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== +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== + min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -5802,7 +5812,7 @@ mkdirp@^0.5.1: dependencies: minimist "^1.2.6" -mkdirp@^1.0.3: +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== @@ -5887,10 +5897,10 @@ 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-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" @@ -5899,14 +5909,6 @@ now-and-later@^2.0.0: dependencies: once "^1.3.2" -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" - npm-run-path@^4.0.0, npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -6021,10 +6023,10 @@ ordered-read-streams@^1.0.0: dependencies: readable-stream "^2.0.1" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +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.0.0, p-limit@^2.2.0: version "2.3.0" @@ -6103,6 +6105,11 @@ parse5@^7.0.0: dependencies: entities "^4.4.0" +path-browserify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" @@ -6158,11 +6165,6 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^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 sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - pirates@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" @@ -6209,11 +6211,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== -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== - prettier@^2.6.2: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" @@ -6306,11 +6303,6 @@ property-information@^6.0.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== - pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -6351,6 +6343,11 @@ queue-tick@^1.0.0: resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142" integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag== +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== + quick-temp@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408" @@ -6649,6 +6646,11 @@ 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== +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" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -6696,12 +6698,12 @@ resolve@^2.0.0-next.3: 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 sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== +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" reusify@^1.0.4: version "1.0.4" @@ -7293,11 +7295,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== -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== - 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" @@ -7327,6 +7324,11 @@ trough@^2.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876" integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g== +"true-myth@^4.1.0": + version "4.1.1" + resolved "https://registry.yarnpkg.com/true-myth/-/true-myth-4.1.1.tgz#ff4ac9d5130276e34aa338757e2416ec19248ba2" + integrity sha512-rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg== + 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" @@ -7348,6 +7350,26 @@ ts-jest@^28.0.7: semver "7.x" yargs-parser "^21.0.1" +ts-morph@^13.0.1: + version "13.0.3" + resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-13.0.3.tgz#c0c51d1273ae2edb46d76f65161eb9d763444c1d" + integrity sha512-pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw== + dependencies: + "@ts-morph/common" "~0.12.3" + code-block-writer "^11.0.0" + +ts-prune@^0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/ts-prune/-/ts-prune-0.10.3.tgz#b6c71a525543b38dcf947a7d3adfb7f9e8b91f38" + integrity sha512-iS47YTbdIcvN8Nh/1BFyziyUqmjXz7GVzWu02RaZXqb+e/3Qe1B7IQ4860krOeCGUeJmterAlaM2FRH0Ue0hjw== + dependencies: + commander "^6.2.1" + cosmiconfig "^7.0.1" + json5 "^2.1.3" + lodash "^4.17.21" + "true-myth" "^4.1.0" + ts-morph "^13.0.1" + tsconfig-paths@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" @@ -7375,11 +7397,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.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" @@ -7412,6 +7429,11 @@ type-fest@^2.17.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== +type-fest@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.2.0.tgz#2c8b49e775d9e314a73ea6fcee0b2e8549d5f886" + integrity sha512-Il3wdLRzWvbAEtocgxGQA9YOoRVeVUGOMBtel5LdEpNeEAol6GJTLw8GbX6Z8EIMfvfhoOXs2bwOijtAZdK5og== + typed-emitter@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/typed-emitter/-/typed-emitter-2.1.0.tgz#ca78e3d8ef1476f228f548d62e04e3d4d3fd77fb" @@ -7574,13 +7596,6 @@ 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 sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== - 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" diff --git a/pkgs/games/heroic/yarn.nix b/pkgs/games/heroic/yarn.nix index d8851bfbfdf04..dd85f32653c8f 100644 --- a/pkgs/games/heroic/yarn.nix +++ b/pkgs/games/heroic/yarn.nix @@ -442,11 +442,11 @@ }; } { - name = "_electron_get___get_1.14.1.tgz"; + name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { - name = "_electron_get___get_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; - sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + name = "_electron_get___get_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; + sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; }; } { @@ -1050,11 +1050,11 @@ }; } { - name = "_sindresorhus_is___is_0.14.0.tgz"; + name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { - name = "_sindresorhus_is___is_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + name = "_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=="; }; } { @@ -1170,11 +1170,11 @@ }; } { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_szmarczak_http_timer___http_timer_4.0.6.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 = "_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=="; }; } { @@ -1226,6 +1226,14 @@ }; } { + name = "_ts_morph_common___common_0.12.3.tgz"; + path = fetchurl { + name = "_ts_morph_common___common_0.12.3.tgz"; + url = "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.12.3.tgz"; + sha512 = "4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w=="; + }; + } + { name = "_types_aria_query___aria_query_4.2.2.tgz"; path = fetchurl { name = "_types_aria_query___aria_query_4.2.2.tgz"; @@ -1266,6 +1274,14 @@ }; } { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + path = fetchurl { + 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_classnames___classnames_2.3.1.tgz"; path = fetchurl { name = "_types_classnames___classnames_2.3.1.tgz"; @@ -1370,6 +1386,14 @@ }; } { + 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=="; + }; + } + { name = "_types_i18next_fs_backend___i18next_fs_backend_1.1.2.tgz"; path = fetchurl { name = "_types_i18next_fs_backend___i18next_fs_backend_1.1.2.tgz"; @@ -1442,6 +1466,14 @@ }; } { + 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_mdast___mdast_3.0.10.tgz"; path = fetchurl { name = "_types_mdast___mdast_3.0.10.tgz"; @@ -1594,6 +1626,14 @@ }; } { + 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=="; + }; + } + { name = "_types_scheduler___scheduler_0.16.2.tgz"; path = fetchurl { name = "_types_scheduler___scheduler_0.16.2.tgz"; @@ -2050,14 +2090,6 @@ }; } { - name = "axios___axios_0.24.0.tgz"; - path = fetchurl { - name = "axios___axios_0.24.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - } - { name = "axios___axios_0.26.1.tgz"; path = fetchurl { name = "axios___axios_0.26.1.tgz"; @@ -2346,11 +2378,19 @@ }; } { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; + name = "cacheable_lookup___cacheable_lookup_5.0.4.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 = "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=="; }; } { @@ -2578,6 +2618,14 @@ }; } { + name = "code_block_writer___code_block_writer_11.0.3.tgz"; + path = fetchurl { + name = "code_block_writer___code_block_writer_11.0.3.tgz"; + url = "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz"; + sha512 = "NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw=="; + }; + } + { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; path = fetchurl { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; @@ -2666,6 +2714,14 @@ }; } { + name = "commander___commander_6.2.1.tgz"; + path = fetchurl { + name = "commander___commander_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz"; + sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; + }; + } + { name = "commander___commander_9.4.1.tgz"; path = fetchurl { name = "commander___commander_9.4.1.tgz"; @@ -2706,14 +2762,6 @@ }; } { - name = "config_chain___config_chain_1.1.13.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - } - { name = "convert_source_map___convert_source_map_1.9.0.tgz"; path = fetchurl { name = "convert_source_map___convert_source_map_1.9.0.tgz"; @@ -2954,11 +3002,11 @@ }; } { - name = "decompress_response___decompress_response_3.3.0.tgz"; + name = "decompress_response___decompress_response_6.0.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"; - sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; + 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=="; }; } { @@ -2986,11 +3034,11 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "defer_to_connect___defer_to_connect_2.0.1.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 = "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=="; }; } { @@ -3100,18 +3148,16 @@ { name = "9e7de2a6d917591f10a66389e62e1dc053c04fec"; path = - let - repo = fetchgit { - url = "https://github.com/discordjs/rpc.git"; - rev = "9e7de2a6d917591f10a66389e62e1dc053c04fec"; - sha256 = "1idb6k8h15a2pmbgs5xw5c2d763kgxg2ykx60vq0gdbhq73wz32j"; - }; - in - runCommand "9e7de2a6d917591f10a66389e62e1dc053c04fec" { 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 = fetchgit { + url = "https://github.com/discordjs/rpc.git"; + rev = "9e7de2a6d917591f10a66389e62e1dc053c04fec"; + sha256 = "1idb6k8h15a2pmbgs5xw5c2d763kgxg2ykx60vq0gdbhq73wz32j"; + }; + in runCommand "9e7de2a6d917591f10a66389e62e1dc053c04fec" { 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} . + ''; } { name = "dmg_builder___dmg_builder_23.6.0.tgz"; @@ -3242,14 +3288,6 @@ }; } { - name = "duplexer3___duplexer3_0.1.5.tgz"; - path = fetchurl { - name = "duplexer3___duplexer3_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz"; - sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; - }; - } - { name = "duplexify___duplexify_3.7.1.tgz"; path = fetchurl { name = "duplexify___duplexify_3.7.1.tgz"; @@ -3322,11 +3360,11 @@ }; } { - name = "electron___electron_21.2.1.tgz"; + name = "electron___electron_22.2.0.tgz"; path = fetchurl { - 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=="; + name = "electron___electron_22.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz"; + sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g=="; }; } { @@ -3346,14 +3384,6 @@ }; } { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - } - { name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; @@ -4186,14 +4216,6 @@ }; } { - name = "get_stream___get_stream_4.1.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - } - { name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; @@ -4266,14 +4288,6 @@ }; } { - 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 { name = "globals___globals_11.12.0.tgz"; @@ -4306,11 +4320,11 @@ }; } { - 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=="; }; } { @@ -4434,14 +4448,6 @@ }; } { - name = "heroic_wine_downloader___heroic_wine_downloader_1.2.3.tgz"; - path = fetchurl { - name = "heroic_wine_downloader___heroic_wine_downloader_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/heroic-wine-downloader/-/heroic-wine-downloader-1.2.3.tgz"; - sha512 = "njiJ+/hg1PhwGVwTtlm++6qQHVI6rWQtGSi/BA4gLkctt/rb7uYHnX8tkTq6EisXaWVeF5rXNInojH9047PPxw=="; - }; - } - { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; path = fetchurl { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; @@ -4490,11 +4496,11 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; } { @@ -4506,6 +4512,14 @@ }; } { + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + path = fetchurl { + 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"; @@ -4666,14 +4680,6 @@ }; } { - name = "ini___ini_1.3.8.tgz"; - path = fetchurl { - name = "ini___ini_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - } - { name = "ini___ini_3.0.1.tgz"; path = fetchurl { name = "ini___ini_3.0.1.tgz"; @@ -5362,11 +5368,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"; - sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; + 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=="; }; } { @@ -5418,11 +5424,19 @@ }; } { - name = "json5___json5_1.0.1.tgz"; + name = "json5___json5_1.0.2.tgz"; path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + name = "json5___json5_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz"; + sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; + }; + } + { + name = "json5___json5_2.2.2.tgz"; + path = fetchurl { + name = "json5___json5_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; } { @@ -5466,11 +5480,11 @@ }; } { - 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=="; }; } { @@ -5626,14 +5640,6 @@ }; } { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; - }; - } - { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; @@ -5978,6 +5984,14 @@ }; } { + name = "mimic_response___mimic_response_3.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; + }; + } + { name = "min_indent___min_indent_1.0.1.tgz"; path = fetchurl { name = "min_indent___min_indent_1.0.1.tgz"; @@ -6162,11 +6176,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 = "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=="; }; } { @@ -6178,14 +6192,6 @@ }; } { - 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 = "npm_run_path___npm_run_path_4.0.1.tgz"; path = fetchurl { name = "npm_run_path___npm_run_path_4.0.1.tgz"; @@ -6306,11 +6312,11 @@ }; } { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; + name = "p_cancelable___p_cancelable_2.1.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 = "p_cancelable___p_cancelable_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; } { @@ -6402,6 +6408,14 @@ }; } { + name = "path_browserify___path_browserify_1.0.1.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz"; + sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; + }; + } + { name = "path_dirname___path_dirname_1.0.2.tgz"; path = fetchurl { name = "path_dirname___path_dirname_1.0.2.tgz"; @@ -6490,14 +6504,6 @@ }; } { - 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"; - sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; - }; - } - { name = "pirates___pirates_4.0.5.tgz"; path = fetchurl { name = "pirates___pirates_4.0.5.tgz"; @@ -6554,14 +6560,6 @@ }; } { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; - }; - } - { name = "prettier___prettier_2.7.1.tgz"; path = fetchurl { name = "prettier___prettier_2.7.1.tgz"; @@ -6658,14 +6656,6 @@ }; } { - name = "proto_list___proto_list_1.2.4.tgz"; - path = fetchurl { - name = "proto_list___proto_list_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; - }; - } - { name = "pump___pump_2.0.1.tgz"; path = fetchurl { name = "pump___pump_2.0.1.tgz"; @@ -6714,6 +6704,14 @@ }; } { + name = "quick_lru___quick_lru_5.1.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 = "quick_temp___quick_temp_0.1.8.tgz"; path = fetchurl { name = "quick_temp___quick_temp_0.1.8.tgz"; @@ -6932,18 +6930,16 @@ { name = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; path = - let - repo = fetchgit { - url = "https://github.com/devsnek/node-register-scheme.git"; - rev = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; - sha256 = "0j4ycczsjpmha35arvijrxrsx8f110az9qhdw20plyh23fd4kvy6"; - }; - in - runCommand "e7cc9a63a1f512565da44cb57316d9fb10750e17" { 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 = fetchgit { + url = "https://github.com/devsnek/node-register-scheme.git"; + rev = "e7cc9a63a1f512565da44cb57316d9fb10750e17"; + sha256 = "0j4ycczsjpmha35arvijrxrsx8f110az9qhdw20plyh23fd4kvy6"; + }; + in runCommand "e7cc9a63a1f512565da44cb57316d9fb10750e17" { 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} . + ''; } { name = "remark_parse___remark_parse_10.0.1.tgz"; @@ -7018,6 +7014,14 @@ }; } { + 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=="; + }; + } + { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; path = fetchurl { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; @@ -7074,11 +7078,11 @@ }; } { - 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"; - sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; + name = "responselike___responselike_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; } { @@ -7794,14 +7798,6 @@ }; } { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - path = fetchurl { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - } - { name = "to_regex_range___to_regex_range_5.0.1.tgz"; path = fetchurl { name = "to_regex_range___to_regex_range_5.0.1.tgz"; @@ -7842,6 +7838,14 @@ }; } { + name = "true_myth___true_myth_4.1.1.tgz"; + path = fetchurl { + name = "true_myth___true_myth_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/true-myth/-/true-myth-4.1.1.tgz"; + sha512 = "rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg=="; + }; + } + { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; @@ -7858,6 +7862,22 @@ }; } { + name = "ts_morph___ts_morph_13.0.3.tgz"; + path = fetchurl { + name = "ts_morph___ts_morph_13.0.3.tgz"; + url = "https://registry.yarnpkg.com/ts-morph/-/ts-morph-13.0.3.tgz"; + sha512 = "pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw=="; + }; + } + { + name = "ts_prune___ts_prune_0.10.3.tgz"; + path = fetchurl { + name = "ts_prune___ts_prune_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/ts-prune/-/ts-prune-0.10.3.tgz"; + sha512 = "iS47YTbdIcvN8Nh/1BFyziyUqmjXz7GVzWu02RaZXqb+e/3Qe1B7IQ4860krOeCGUeJmterAlaM2FRH0Ue0hjw=="; + }; + } + { name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; path = fetchurl { name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; @@ -7890,14 +7910,6 @@ }; } { - name = "tunnel___tunnel_0.0.6.tgz"; - path = fetchurl { - name = "tunnel___tunnel_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; - }; - } - { name = "type_check___type_check_0.4.0.tgz"; path = fetchurl { name = "type_check___type_check_0.4.0.tgz"; @@ -7946,6 +7958,14 @@ }; } { + name = "type_fest___type_fest_3.2.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-3.2.0.tgz"; + sha512 = "Il3wdLRzWvbAEtocgxGQA9YOoRVeVUGOMBtel5LdEpNeEAol6GJTLw8GbX6Z8EIMfvfhoOXs2bwOijtAZdK5og=="; + }; + } + { name = "typed_emitter___typed_emitter_2.1.0.tgz"; path = fetchurl { name = "typed_emitter___typed_emitter_2.1.0.tgz"; @@ -8130,14 +8150,6 @@ }; } { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - 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"; diff --git a/pkgs/games/hexgui/default.nix b/pkgs/games/hexgui/default.nix index 1282f03a0eb45..49dae42175512 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/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index f8f0d55fb9c33..1eabfe77a7ae5 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1h"; + version = "12.1i"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-9ChPO0YCsrAyQ81TAbKCMJSgSXoUtkvvNPMTPimPBUo="; + sha256 = "sha256-TMPumyTEzDbV/31UgwXJwr7zt7ufENX3ESxlcBEnaSc="; }; CXXFLAGS = [ diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix index ba8a4dd10bd32..7f78f89b036e2 100644 --- a/pkgs/games/iortcw/sp.nix +++ b/pkgs/games/iortcw/sp.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${SDL2.dev}/include/SDL2" "-I${opusfile.dev}/include/opus" ]; diff --git a/pkgs/games/itchiodl/default.nix b/pkgs/games/itchiodl/default.nix new file mode 100644 index 0000000000000..c68be798f4dc7 --- /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/ivan/default.nix b/pkgs/games/ivan/default.nix index 80dc182127d15..21f071af379bb 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"]; # Help CMake find SDL_mixer.h - NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; # Create "ivan.desktop" file ivanDesktop = makeDesktopItem { diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index 94eeb46376a65..ba2783fb2b25c 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { openal curl libogg libvorbis libtheora SDL2 SDL2_image zlib clang ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${SDL2.dev}/include/SDL2" ]; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index c2ce8f3d82b24..50b48f0a15821 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: modules/.libs/libmodules.a(rocket_pad.o):/build/lincity-1.13.1/modules/../screen.h:23: # multiple definition of `monthgraph_style'; ldsvguts.o:/build/lincity-1.13.1/screen.h:23: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "City simulation game"; diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index eab7941cbd1cd..fc9802d46e5e2 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: random.o:(.bss+0x0): multiple definition of `LW_RANDOM_ON'; game.o:(.bss+0x4): first defined here diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index e012886c884d3..83ac293f8b63d 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -30,11 +30,15 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = - "-Wno-error=deprecated-declarations" + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=address" + "-Wno-error=use-after-free" + ] ++ [ + "-Wno-error=deprecated-declarations" # Avoid GL_GLEXT_VERSION double definition " -DNO_SDL_GLEXT" - ; + ]); # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ]; diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 8bb2e0d0a6fa1..3bc493f5d025a 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -2,7 +2,7 @@ let name = "lunar-client"; - version = "2.10.1"; + version = "2.15.1"; desktopItem = makeDesktopItem { name = "lunar-client"; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - hash = "sha256-3h2FFpIIRta6hEsa/H0xo8+DUvhdQyBv9dqdd/vlwZ4="; + hash = "sha256-8F6inLctNLCrTvO/f4IWHclpm/6vqW44NKbct0Epp4s="; }; in appimageTools.wrapType1 rec { diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix index 4faa7419b7ab9..30d34ffa2ce15 100644 --- a/pkgs/games/lzwolf/default.nix +++ b/pkgs/games/lzwolf/default.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { pname = "lzwolf"; + # Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade. version = "unstable-2022-01-04"; src = fetchFromBitbucket { @@ -13,6 +14,7 @@ stdenv.mkDerivation rec { rev = "6e470316382b87378966f441e233760ce0ff478c"; sha256 = "sha256-IbZleY2FPyW3ORIGO2YFXQyAf1l9nDthpJjEKTTsilM="; }; + nativeBuildInputs = [ p7zip cmake ]; buildInputs = [ SDL2 bzip2 zlib libjpeg SDL2_mixer SDL2_net libsndfile mpg123 diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 5541b3b9d0fa1..277752dc91c3f 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: dnd.o:src/main.h:136: multiple definition of # `MENU_EXT'; main.o:src/main.h:136: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lX11"; diff --git a/pkgs/games/manaplus/default.nix b/pkgs/games/manaplus/default.nix index 09edb32ad1405..1ea5231a65ea3 100644 --- a/pkgs/games/manaplus/default.nix +++ b/pkgs/games/manaplus/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "A free OpenSource 2D MMORPG client"; homepage = "https://manaplus.org/"; license = lib.licenses.gpl2; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 98fbc9051d1d1..a23868a50202e 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -88,7 +88,7 @@ let "-DENABLE_TOUCH=TRUE" ]; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 + env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ninja ]; diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index a873424aa24c7..a020a6b34f1b4 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v $src $out/share/${pname}.love + cp -v $src $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index f359b8c9d98ba..d23517cfad3c2 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config makeWrapper ]; - NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h"; + env.NIX_CFLAGS_COMPILE = "-include ${zlib.dev}/include/zlib.h"; postInstall = '' mkdir -p $out/share/naev diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index f6de3d57c1304..08599cccb212a 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less , buildPackages , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 @@ -19,23 +19,14 @@ let binPath = lib.makeBinPath [ coreutils less ]; in stdenv.mkDerivation rec { - version = "3.6.6"; + version = "3.6.7"; pname = if x11Mode then "nethack-x11" else if qtMode then "nethack-qt" else "nethack"; - patches = [ - # Don't unset `__warn_unused_result__`, breaks on glibc-2.34 - (fetchpatch { - url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch"; - sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY="; - revert = true; - }) - ]; - src = fetchurl { url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; - sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; + sha256 = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI="; }; buildInputs = [ ncurses ] diff --git a/pkgs/games/npush/default.nix b/pkgs/games/npush/default.nix index 34293ce4fc073..7f4afb7b89f38 100644 --- a/pkgs/games/npush/default.nix +++ b/pkgs/games/npush/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; installPhase = '' runHook preInstall diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index b78baee725d46..947b7141b5723 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation { fetchurl { inherit url sha256; }; shell = stdenv.shell; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else if stdenv.hostPlatform.system == "i686-linux" then "x86" - else ""; + else lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "x86"; unpackPhase = '' mkdir oilrush cd oilrush diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 12d00f28ffc16..2543d71f0a88f 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1k35xppfqi3qfysv81xq3hj4qdy9j2ciinbkfdcmwclcsf3nh94z"; }; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -std=c++98 -Wno-error"; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -std=c++98 -Wno-error"; # The breakpad fails to build on x86_64, and it's only to report bugs upstream cmakeFlags = [ "-DBREAKPAD=0" ]; diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix new file mode 100644 index 0000000000000..c884c39dafa22 --- /dev/null +++ b/pkgs/games/openloco/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, cmake +, libpng +, libzip +, openal +, pkg-config +, span-lite +, yaml-cpp +}: + +stdenv.mkDerivation rec { + pname = "openloco"; + version = "23.02"; + + src = fetchFromGitHub { + owner = "OpenLoco"; + repo = "OpenLoco"; + rev = "v${version}"; + hash = "sha256-35g7tnKez4tnTdZzavfU+X8f3btFG6EbLkU+cqL6Qek="; + }; + + # the upstream build process determines the version tag from git; since we + # are not using a git checkout, we patch it manually + postPatch = '' + sed -i '/#define NAME "OpenLoco"/a#define OPENLOCO_VERSION_TAG "${version}"' src/OpenLoco/src/Version.cpp + ''; + + NIX_CFLAGS_COMPILE = "-Wno-error=null-dereference"; + + cmakeFlags = [ + "-DOPENLOCO_BUILD_TESTS=NO" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + SDL2 + libpng + libzip + openal + yaml-cpp + span-lite + ]; + + meta = { + description = "An open source re-implementation of Chris Sawyer's Locomotion"; + homepage = "https://github.com/OpenLoco/OpenLoco"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ icewind1991 ]; + }; +} diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 389f59f91a6ad..8df88c92ff1c4 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -63,6 +63,10 @@ mkDerivation rec { }) ]; + postPatch = '' + sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 0f91a3c0028be..09eec3ef1e125 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -89,7 +89,7 @@ let # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = oldAttrs.patches ++ [ ./tes3mp.patch ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; preConfigure = '' substituteInPlace files/version.in \ diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 59c897ba37135..d9cc93e823484 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/openrct2/default.nix b/pkgs/games/openrct2/default.nix index d474b0eae92ac..7d94f42363576 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -94,6 +94,11 @@ stdenv.mkDerivation { "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + postUnpack = '' cp -r ${objects-src} $sourceRoot/data/object cp -r ${title-sequences-src} $sourceRoot/data/sequence diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/games/opensupaplex/default.nix index dc5d9aae690ce..83c7f8b5c9b02 100644 --- a/pkgs/games/opensupaplex/default.nix +++ b/pkgs/games/opensupaplex/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-DFILE_DATA_PATH=${placeholder "out"}/lib/opensupaplex" "-DFILE_FHS_XDG_DIRS" ]; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 7aac53ae94038..61c7c0bb866c4 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "12.2"; + version = "13.0"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - hash = "sha256-gVCPDek6DCZLIW71agX4OB//e/+m0BASGiFJC02s6Vw="; + hash = "sha256-M5344OCCcIfIOv54+O/GpzsKPYqVCgtTE3zm6KrXq2c="; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { - observe as spectators ''; homepage = "https://www.openttd.org/"; + changelog = "https://cdn.openttd.org/openttd-releases/${version}/changelog.txt"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jcumming fpletz ]; diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index a0c70e463b202..12f4660ba3d44 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.47.1"; + version = "0.50.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-AMd2KXy/ODByeV9CkEd51KbE/+fZ8Us3WzsWCnn7nh0="; + hash = "sha256-VJ8Qd4wiFbX/aY8pEWlh9wEjML0c7P8yrOC1fiQD7ts="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 661cf394e5230..ce9d098082d59 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 index d22d7fce171f1..7a62db1003fa0 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "osu-lazer-bin"; - version = "2022.1228.0"; + version = "2023.207.0"; src = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-KDJ6HrnGyM6Brtf66C0r+hbSt/stppe+srChtNSoQ9g="; + sha256 = "sha256-xJQcqNV/Pr3gEGStczc3gv8AYrEKFsAo2g4WtA59fwk="; }; extraPkgs = pkgs: with pkgs; [ icu ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index a633bfb9547b4..3a56c35fe88da 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.1228.0"; + version = "2023.207.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-mFgNNt1+fWDfFZcxtwvoIurAhkCGPCDSXMq/lc8qITo="; + sha256 = "sha256-s0gzSfj4+xk3joS7S68ZGjgatiJY2Y1FBCmrhptaWIk="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 863c830e80817..908140259b1e5 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -130,10 +130,10 @@ (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"; version = "2023.131.0"; sha256 = "1mbgcg0c8w6114c36jxypz7z1yps5zgw3f2lxw75fra0rylwqm23"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) (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.osu.Game.Resources"; version = "2023.202.0"; sha256 = "13apknxly9fqqchmdvkdgfq2jbimln0ixg2d7yn6jcfd235279mj"; }) (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"; }) diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 17b63b263029b..a3d75bc34aa0b 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "OttoMatic"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256-eHy5yED5qrgHqKuqq1dXhmuR2PQBE5aMhSLPoydlpPk="; + sha256 = "sha256-0mqOAdAmJGxKa6yXktrbmdXkoQIliimq37iy9bCBZYg="; fetchSubmodules = true; }; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 7b8733d6213d8..66754073db5cf 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/pinball/default.nix b/pkgs/games/pinball/default.nix index b7abf1dac8cb2..f1ce5fb9d78c8 100644 --- a/pkgs/games/pinball/default.nix +++ b/pkgs/games/pinball/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-sdl-prefix=${lib.getDev SDL}" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev SDL_image}/include/SDL" "-I${lib.getDev SDL_mixer}/include/SDL" ]; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index f07b2a614d48d..fba528933ff40 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -59,7 +59,7 @@ mkDerivation rec { "pokerth.pro" ]; - NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL"; meta = with lib; { homepage = "https://www.pokerth.net"; diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 7f6ba52dccc4a..4abd40e24ab04 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "prismlauncher"; - version = "6.1"; + version = "6.3"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = version; - sha256 = "sha256-aIBaenSnssv0/r2+UT5R4nBwo2QBGZ1Zp0CWOeiaeDE="; + sha256 = "sha256-7tptHKWkbdxTn6VIPxXE1K3opKRiUW2zv9r6J05dcS8="; }; nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ]; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 2e9c09bc62e35..522a8e39fd88c 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.10"; + version = "8.20"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-/BbMR/ZPjHbKzQ+I1+Vgh3/zenLjW3TnmrKhKPR6Gdk="; + sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; }; postPatch = '' diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 2bbbb43c963c2..f0d8ea56693bb 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "ioquake3"; - version = "unstable-2021-07-20"; + version = "unstable-2022-11-24"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "bc8737d707595aebd7cc11d6d5a5d65ede750f59"; - sha256 = "1icrkaw6c5c5ndy886bn65lycwnxzxwvz0ndz4p9i6r716k11add"; + rev = "70d07d91d62dcdd2f2268d1ac401bfb697b4c991"; + sha256 = "sha256-WDjR0ik+xAs6OA1DNbUGIF1MXSuEoy8nNkPiHaegfF0="; }; nativeBuildInputs = [ which pkg-config ]; @@ -50,10 +50,10 @@ stdenv.mkDerivation { installTargets = [ "copyfiles" ]; - installFlags = [ "COPYDIR=$(out)" ]; + installFlags = [ "COPYDIR=$(out)" "COPYBINDIR=$(out)/bin" ]; preInstall = '' - mkdir -p $out/baseq3 + mkdir -p $out/baseq3 $out/bin ''; meta = with lib; { diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 0c57c97bbe902..a98772d241d0a 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext SDL2 glibc ]; - NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 3cb64641153af..3c777c5b27fbd 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 9c6252a6dda30..7c47166eab56f 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_mixer ]; meta = { - homepage = "http://ri-li.sourceforge.net"; + homepage = "https://ri-li.sourceforge.net"; license = lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix index 131745ac03eb0..591275631fa95 100644 --- a/pkgs/games/rott/default.nix +++ b/pkgs/games/rott/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # when using SDL_compat instead of SDL_classic, SDL_mixer isn't correctly # detected, but there is no harm just specifying it - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev SDL_mixer}/include/SDL" ]; diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 9fd89c062e46e..6fbe73a6bedfb 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_1_1 +{ 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_1_1 ]; runtimeDependencies = [ - libpulseaudio libGL + libpulseaudio SDL2 - xorg_sys_opengl openssl_1_1 + xdg-utils # The launcher uses `xdg-open` to open HTTP URLs in the user's browser + xorg_sys_opengl 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_1_1 + 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/sdlpop/default.nix b/pkgs/games/sdlpop/default.nix index f9f2f6d0dc919..52e1604acc43b 100644 --- a/pkgs/games/sdlpop/default.nix +++ b/pkgs/games/sdlpop/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sdlpop"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "NagyD"; repo = "SDLPoP"; rev = "v${version}"; - sha256 = "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"; + sha256 = "sha256-UI7NfOC/+druRYL5g2AhIjTPEq4ta1qEThcxgyrFjHY="; }; nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source port of Prince of Persia"; homepage = "https://github.com/NagyD/SDLPoP"; + changelog = "https://github.com/NagyD/SDLPoP/blob/v${version}/doc/ChangeLog.txt"; license = licenses.gpl3Plus; maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 752181581f388..28151972fe264 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - NIX_CFLAGS_COMPILE = if isMobile then "-DSTYLUS_BASED" else ""; + env.NIX_CFLAGS_COMPILE = lib.optionalString isMobile "-DSTYLUS_BASED"; buildInputs = [ gtk3 libX11 ]; diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index 8455d35f7b7c3..a6bc833159529 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of # `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' runHook preInstall diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 1f051242ad900..cc8b864c1f3ee 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -163,7 +163,7 @@ let homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ phile314 ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; # TODO: ++ darwin; }; }; diff --git a/pkgs/games/sm64ex/coop.nix b/pkgs/games/sm64ex/coop.nix new file mode 100644 index 0000000000000..9e34e184adb7c --- /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 a6bf7202adcf4..17fcfdd131ac9 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 ab75ac70b9c53..95ba3be4a5691 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 0000000000000..66c84dd0b13c7 --- /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/solarus/default.nix b/pkgs/games/solarus/default.nix index 9dc0e1863cfa7..0e95a77a7cd46 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { Solarus is a game engine for Zelda-like ARPG games written in lua. Many full-fledged games have been writen for the engine. ''; - homepage = "http://www.solarus-games.org"; + homepage = "https://www.solarus-games.org"; license = licenses.gpl3; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 9dfb239620e40..9e7b815661c9e 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -5,7 +5,7 @@ let steamPackagesFun = self: let inherit (self) callPackage; - in { + in rec { steamArch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else if stdenv.hostPlatform.system == "i686-linux" then "i386" else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; @@ -21,6 +21,7 @@ let else null; inherit buildFHSUserEnv; }; + steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; }; steamcmd = callPackage ./steamcmd.nix { }; }; keep = self: { }; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 614d9823f9ff6..c50176dce790e 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -1,46 +1,37 @@ -{ config, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 +{ lib, stdenv, writeScript, buildFHSUserEnv, steam, glxinfo-i686, runtimeShell , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile , extraArgs ? "" # arguments to always pass to steam -, runtimeOnly ? false -, runtimeShell -, stdenv - -# DEPRECATED -, withJava ? config.steam.java or false -, withPrimus ? config.steam.primus or false +, withGameSpecificLibraries ? true # exclude game specific libraries }: let - commonTargetPkgs = pkgs: with pkgs; - [ - # Needed for operating system detection until - # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved - lsb-release - # Errors in output without those - pciutils - # Games' dependencies - xorg.xrandr - which - # Needed by gdialog, including in the steam-runtime - perl - # Open URLs - xdg-utils - iana-etc - # Steam Play / Proton - python3 - # Steam VR - procps - usbutils - - # electron based launchers need newer versions of these libraries than what runtime provides - mesa - sqlite - ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 - ++ lib.optional withPrimus primus - ++ extraPkgs pkgs; + commonTargetPkgs = pkgs: with pkgs; [ + # Needed for operating system detection until + # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved + lsb-release + # Errors in output without those + pciutils + # Games' dependencies + xorg.xrandr + which + # Needed by gdialog, including in the steam-runtime + perl + # Open URLs + xdg-utils + iana-etc + # Steam Play / Proton + python3 + # Steam VR + procps + usbutils + + # electron based launchers need newer versions of these libraries than what runtime provides + mesa + sqlite + ] ++ extraPkgs pkgs; ldPath = lib.optionals stdenv.is64bit [ "/lib64" ] ++ [ "/lib32" ] @@ -87,52 +78,8 @@ in buildFHSUserEnv rec { libthai pango - # Not formally in runtime but needed by some games - at-spi2-atk - at-spi2-core # CrossCode - gst_all_1.gstreamer - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-base - json-glib # paradox launcher (Stellaris) - libdrm - libxkbcommon # paradox launcher - libvorbis # Dead Cells - libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 - mono - xorg.xkeyboardconfig - xorg.libpciaccess - xorg.libXScrnSaver # Dead Cells - udev # shadow of the tomb raider - icu # dotnet runtime, e.g. stardew valley - - # screeps dependencies - gtk3 - dbus - zlib - atk - cairo - freetype - gdk-pixbuf - fontconfig - - # friends options won't display "Launch Game" without it - lsof - - # called by steam's setup.sh - file - - # Prison Architect - libGLU - libuuid - libbsd - alsa-lib - - # Loop Hero - libidn2 - libpsl - nghttp2.lib - openssl_1_1 - rtmpdump + lsof # friends options won't display "Launch Game" without it + file # called by steam's setup.sh # dependencies for mesa drivers, needed inside pressure-vessel mesa.llvmPackages.llvm.lib @@ -144,11 +91,7 @@ in buildFHSUserEnv rec { xorg.libxshmfence xorg.libXxf86vm libelf - - # Required - glib - gtk2 - bzip2 + (lib.getLib elfutils) # Without these it silently fails xorg.libXinerama @@ -168,10 +111,11 @@ in buildFHSUserEnv rec { libusb1 dbus-glib ffmpeg - # Only libraries are needed from those two libudev0-shim # Verified games requirements + fontconfig + freetype xorg.libXt xorg.libXmu libogg @@ -179,10 +123,15 @@ in buildFHSUserEnv rec { SDL SDL2_image glew110 + libdrm libidn tbb + zlib # Other things from runtime + glib + gtk2 + bzip2 flac freeglut libjpeg @@ -209,8 +158,48 @@ in buildFHSUserEnv rec { librsvg xorg.libXft libvdpau - ] - ++ steamPackages.steam-runtime-wrapped.overridePkgs + ] ++ lib.optionals withGameSpecificLibraries [ + # Not formally in runtime but needed by some games + at-spi2-atk + at-spi2-core # CrossCode + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-base + json-glib # paradox launcher (Stellaris) + libdrm + libxkbcommon # paradox launcher + libvorbis # Dead Cells + libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 + mono + xorg.xkeyboardconfig + xorg.libpciaccess + xorg.libXScrnSaver # Dead Cells + udev # Shadow of the Tomb Raider + icu # dotnet runtime, e.g. Stardew Valley + + # screeps dependencies + gtk3 + dbus + zlib + atk + cairo + freetype + gdk-pixbuf + fontconfig + + # Prison Architect + libGLU + libuuid + libbsd + alsa-lib + + # Loop Hero + libidn2 + libpsl + nghttp2.lib + openssl_1_1 + rtmpdump + ] ++ steamPackages.steam-runtime-wrapped.overridePkgs ++ extraLibraries pkgs; extraInstallCommands = '' @@ -263,7 +252,9 @@ in buildFHSUserEnv rec { exec steam ${extraArgs} "$@" ''; - inherit (steam) meta; + meta = steam.meta // lib.optionalAttrs (!withGameSpecificLibraries) { + description = steam.meta.description + " (without game specific libraries)"; + }; # allows for some gui applications to share IPC # this fixes certain issues where they don't render correctly @@ -279,7 +270,6 @@ in buildFHSUserEnv rec { targetPkgs = commonTargetPkgs; inherit multiPkgs profile extraInstallCommands; - inherit unshareIpc unsharePid; runScript = writeScript "steam-run" '' diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 2445ee9096c99..6cb7a23dff5ff 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { ./0001-fix-build-with-ffmpeg-4.patch ]; + postPatch = '' + sed '1i#include <ctime>' -i src/arch/ArchHooks/ArchHooks.h # gcc12 + ''; + nativeBuildInputs = [ cmake nasm ]; buildInputs = [ diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 679500f974c33..857617bc4bfa4 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { sha256 = "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p"; }; + postPatch = '' + sed '1i#include <memory>' -i external/partio_zip/zip_manager.hpp # gcc12 + ''; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index 4a7a2e92b106a..b9f9635321b8f 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of # `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here # TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index b0a49cc77d1fb..e12c19f6cb6a6 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 ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + icoutils + ]; buildInputs = [ - python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + python3 libGLU SDL2 lua5_3 zlib freetype wavpack + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa ]; - postInstall = '' + 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 0000000000000..4d56286cb40a4 --- /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?= <robert.mueller@uni-siegen.de> +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/theforceengine/default.nix b/pkgs/games/theforceengine/default.nix new file mode 100644 index 0000000000000..ffc9811e869e0 --- /dev/null +++ b/pkgs/games/theforceengine/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, libdevil +, rtaudio +, rtmidi +, glew +, alsa-lib +, cmake +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "theforceengine"; + version = "1.09.100"; + + src = fetchFromGitHub { + owner = "luciusDXL"; + repo = "TheForceEngine"; + rev = "v${version}"; + sha256 = "sha256-nw9yp/StaSi5thafVT1V5YA2ZCYGWNoHUvQTpK90Foc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + libdevil + rtaudio + rtmidi + glew + alsa-lib + ]; + + prePatch = '' + # use nix store path instead of hardcoded /usr/share for support data + substituteInPlace TheForceEngine/TFE_FileSystem/paths-posix.cpp \ + --replace "/usr/share" "$out/share" + ''; + + meta = with lib; { + description = "Modern \"Jedi Engine\" replacement supporting Dark Forces, mods, and in the future Outlaws."; + homepage = "https://theforceengine.github.io"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ devusb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index 46a5aae09ef3b..a787d0b25bffa 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: world.o:/build/tf-50b8/src/socket.h:24: multiple definition of # `world_decl'; command.o:/build/tf-50b8/src/socket.h:24: first defined here - NIX_CFLAGS_COMPILE="-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = { homepage = "https://tinyfugue.sourceforge.net/"; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 704d09d72de97..1a376f43aac51 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # disable parallel building as it caused sporadic build failures enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; makeFlags = [ "config=release" ]; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index a6ae1d9866e5a..92d8768e4ffd8 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: typespeed-typespeed.o:/build/typespeed-0.6.5/src/typespeed.h:69: multiple definition of # `opt'; typespeed-file.o:/build/typespeed-0.6.5/src/typespeed.h:69: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ "--datadir=\${out}/share/" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index f596ac2756b61..1272097ecb93e 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # r_gl.h:52: first defined here # TODO: drop once release contains upstream fix: # https://github.com/ufoai/ufoai/commit/8a3075fffdad294e - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = ''tar xvf "${srcData}"''; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 76dac1e5e2783..96a1ebf3f648d 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.4.3"; + version = "4.5.1"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-oPZdQEfWgVo4M0WDhKfDDB4GqnzQEM8x79FSa3jC+U0="; + hash = "sha256-bghFcLwfEonsBjB9Erhib45soR2UIOr4cYz5ROUOTFo="; }; dontUnpack = true; @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ tex ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; } diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 5a088f34a4cee..98b8917f6e2b0 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -33,15 +33,15 @@ }: let - version = "0.53.2"; - binary-deps-version = "6"; + version = "0.54.0"; + binary-deps-version = "8"; src = fetchFromGitHub { owner = "Unvanquished"; repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E="; + sha256 = "sha256-X2c6BHI4W6fOurLiBWIBZzJrZ+7RHMEwN8GJGz6e350="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -50,8 +50,8 @@ let version = binary-deps-version; src = fetchzip { - url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; - sha256 = "sha256-ERfg89oTf9JTtv/qRnTRIzFP+zMpHT8W4WAIxqogy9E="; + url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz "; + sha256 = "sha256-6r9j0HRMDC/7i8f4f5bBK4NmwsTpSChHrRWwz0ENAZo="; }; dontPatchELF = true; @@ -119,7 +119,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ="; + outputHash = "sha256-ua9Q5E5C4t8z/yNQp6qn1i9NNDAk4ohzvgpMbCBxb8Q="; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; @@ -135,9 +135,10 @@ in stdenv.mkDerivation rec { inherit version src binary-deps-version; preConfigure = '' - mkdir daemon/external_deps/linux64-${binary-deps-version}/ - cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/ - chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ + TARGET="linux-amd64-default_${binary-deps-version}" + mkdir daemon/external_deps/"$TARGET" + cp -r ${unvanquished-binary-deps}/* daemon/external_deps/"$TARGET"/ + chmod +w -R daemon/external_deps/"$TARGET"/ ''; nativeBuildInputs = [ @@ -202,7 +203,7 @@ in stdenv.mkDerivation rec { for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do install -Dm0755 -t $out/lib/ $f done - install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe + install -Dm0644 -t $out/lib/ irt_core-amd64.nexe mkdir $out/bin/ ${wrapBinary "daemon" "unvanquished"} diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index d199918218b37..9055a86d506a1 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: +{ lib +, stdenv +, fetchzip +, glib +, jre +, makeWrapper +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.10"; + version = "3.6.12"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-YQUKYsuDaCHChiRBQOKr813ptyc4UxZQ5aQFeC6tutU="; + sha256 = "sha256-NSGadwVn1/nvHiJFENBPDsOUPwesunZMsvn+ms7u4Sw="; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + glib + ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; installPhase = '' runHook preInstall @@ -37,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; + mainProgram = "vassal"; }; } diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index f38053a65a1d8..632d4fe7f2d81 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-Ah+aAuU2ioUfvtxfcSb4GNqriqY71ee5RhW2L9UMYFY="; + 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/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index b26fca15308f0..96c8e5ba7afbe 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.9"; + version = "1.17.10"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-Lii6WoAKS237vK2I9R8l2Q8ktp8WiArVYO5Vf93ummo="; + 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 0000000000000..563ed5d7db3bf --- /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 + env.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/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 51974034b3f08..5bc2ef7dbd91f 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: CMakeFiles/wswtv_server.dir/__/unix/unix_time.c.o:(.bss+0x8): multiple definition of # `c_pointcontents'; CMakeFiles/wswtv_server.dir/__/null/ascript_null.c.o:(.bss+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; cmakeFlags = [ "-DQFUSION_GAME=Warsow" ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 6b5e0c117cc53..75ea0d23e038f 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.7"; + version = "1.16.8"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk="; + hash = "sha256-P7OUiKJxJZ0rGdesnxpQMbRBgCHsLpyt8+pRDh27JYQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { libvorbis fribidi dbus libpng pcre openssl icu ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; + meta = with lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index 3c13fc1a9b782..2c56e0bba4f66 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -12,12 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libX11 libXt libXpm libXaw ]; preConfigure = "autoreconf --install"; - patches = if stdenv.buildPlatform.isDarwin then [ ./darwin.patch ] else []; - configureFlags = - if localStateDir != null then - ["--localstatedir=${localStateDir}"] - else - []; + patches = lib.optionals stdenv.buildPlatform.isDarwin [ ./darwin.patch ]; + configureFlags = lib.optionals (localStateDir != null) ["--localstatedir=${localStateDir}"]; meta = with lib; { description = "The falling tower game"; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index bb749b57d01ea..53254ba98f91d 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [libX11 libXt libXaw libXpm libXext]; nativeBuildInputs = [imake]; - NIX_CFLAGS_COMPILE=" -isystem ${libXpm.dev}/include/X11 "; + env.NIX_CFLAGS_COMPILE = " -isystem ${libXpm.dev}/include/X11 "; preConfigure = '' sed -e "s@/usr/@$out/share/@g" -i src/Imakefile diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 68b47e6225a59..4d8a6fa050568 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 xorgproto libXpm libXt ]; - NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11"; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index ebc7dff5406cb..84db2a1356c6f 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; # Fix SDL include problems - NIX_CFLAGS_COMPILE="-I${lib.getDev SDL}/include/SDL -I${SDL_image}/include/SDL"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL -I${SDL_image}/include/SDL"; # Fix linking errors makeFlags = [ "ZAZ_LIBS+=-lSDL" diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 737fed1e7f64d..e0c2031dde250 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -22,6 +22,9 @@ let url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; sha256 = "017v96aflrv07g8j8zk9mq8f8rqxl5228rjff5blq8dxpsv1sx7h"; }; + postPatch = '' + sed '1i#include <ctime>' -i zod_src/common.cpp # gcc12 + ''; nativeBuildInputs = [ makeWrapper ]; @@ -37,7 +40,7 @@ let hardeningDisable = [ "format" ]; NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; zod_engine = stdenv.mkDerivation { - inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; pname = "${name}-engine"; enableParallelBuilding = true; preBuild = "cd zod_src"; @@ -48,7 +51,7 @@ let ''; }; zod_map_editor = stdenv.mkDerivation { - inherit version src nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; + inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; pname = "${name}-map_editor"; enableParallelBuilding = true; preBuild = "cd zod_src"; diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 818d9deda4833..8524ea601b470 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { xorg.libXrender ]; - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; + env.NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; meta = with lib; { homepage = "https://www.logicalshift.co.uk/unix/zoom/"; diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 5a6ea08a8e16c..6c8c8f21a3a26 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-include stdio.h" "-Wno-error=stringop-truncation" "-Wno-error=deprecated-declarations" diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index a5091c525d42e..4edd8d0d85b65 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.1.2-1"; src = fetchzip { - url = "https://onlinesupport.fujixerox.com/driver_downloads/fxlinuxpdf112119031.zip"; + url = "https://support-fb.fujifilm.com/driver_downloads/fxlinuxpdf112119031.zip"; sha256 = "1mv07ch6ysk9bknfmjqsgxb803sj6vfin29s9knaqv17jvgyh0n3"; curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise }; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 8a0b981a82357..f290b9563cc75 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.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 3347030174783..eaba99839f61b 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -23,7 +23,7 @@ # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; - appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; + appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 2a34e36742d57..22ea3a5f86e37 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/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index b1095768691da..c9a7d10bd8b07 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of # `cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installTargets = [ "install-cups" ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index db7f92b219275..a300ff2ae6349 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication { # Remove all ImageProcessor functionality since that is closed source (fetchurl { - url = "https://sources.debian.org/data/main/h/hplip/3.22.4%2Bdfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch"; + url = "https://web.archive.org/web/20230226174550/https://sources.debian.org/data/main/h/hplip/3.22.10+dfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch"; sha256 = "sha256:18njrq5wrf3fi4lnpd1jqmaqr7ph5d7jxm7f15b1wwrbxir1rmml"; }) diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 464bc12f491a3..e33a40f0ad5b9 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { libusb1.dev ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=parentheses" "-Wno-error=unused-variable" diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index 2c55b6b50cef7..0e46011e7e102 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -1,75 +1,34 @@ { lib -, pkgs , stdenvNoCC , fetchFromGitHub , pkgsCross +, stdenv +, bash }: stdenvNoCC.mkDerivation (finalAttrs: let - system = lib.toLower stdenvNoCC.targetPlatform.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 = { - rev = "v${finalAttrs.version}"; - hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; - version = "1.10.3"; - }; - default = { - rev = "v${finalAttrs.version}"; - hash = "sha256-mboVLdPgZMzmqyeF0jAloEz6xqfIDiY/X98e7l2KZnw="; - version = "2.0"; - }; - }; + 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 - # Replace both basedir forms to support both DXVK 2.0 and older versions. - 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" \ - --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 @@ -79,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 7607c9ee44128..793264f9b30b8 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -5,31 +5,81 @@ , meson , ninja , windows -, src -, version +, dxvkVersion , spirv-headers , vulkan-headers -, dxvkPatches +, 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 version "2.0"; + 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 ] - ++ lib.optionals isDxvk2 [ spirv-headers vulkan-headers ]; + 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" + ''; - preConfigure = lib.optionalString isDxvk2 '' - ln -s ${lib.getDev spirv-headers}/include include/spirv/include - ln -s ${lib.getDev vulkan-headers}/include include/vulkan/include + # 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 = @@ -38,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"; @@ -48,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 037071630172d..0000000000000 --- 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 0000000000000..8fadb264fd3d8 --- /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 <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 21b2e3574319b..1432e37cfd213 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "5.0.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-rbb+OtzOZbTYJt4IH1QXKdQ9JevGLEvhcC+F7rW337k="; + hash = "sha256-+fXx/fVXOAjwo+TLP1pDTVge3VSvTLSGzTv7dSTeXxc="; # 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, @@ -31,7 +31,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-TxF0H1kZSn9VFrR8z5JJwWXCG6Gl8QH88qwQidGY7oc="; + vendorHash = "sha256-oQwlhlZHpUvGaOyozBpK5W9glzo8VKH7S3vih5c15OA="; nativeBuildInputs = [ installShellFiles @@ -49,8 +49,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20221224152051/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-IjakfeqjHshlGoamRJTnhUC8cTVMIY63F3vO6I/ZHO4="; + url = "https://web.archive.org/web/20230207211120/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-Vkl8V5AkiJMZLswSN0vTnz7S7/5lXftlWD5UZh//vUw="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 03a402225f1b1..57baeb7fe828f 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -2,18 +2,23 @@ buildPythonApplication rec { pname = "frescobaldi"; - version = "3.1.3"; + version = "3.2"; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; rev = "v${version}"; - sha256 = "1p8f4vn2dpqndw1dylmg7wms6vi69zcfj544c908s4r8rrmbycyf"; + sha256 = "sha256-q340ChF7VZcbLMW/nd1so7WScsPfbdeJUjTzsY5dkec="; }; propagatedBuildInputs = with python3Packages; [ - lilypond pygame python-ly sip_4 - pyqt5 poppler-qt5 + qpageview + lilypond + pygame + python-ly + sip_4 + pyqt5 + poppler-qt5 pyqtwebengine ]; @@ -30,7 +35,7 @@ buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" + "\${qtWrapperArgs[@]}" ]; meta = with lib; { diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 441f3ccb37f4e..536c654f0be7f 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -10,9 +10,10 @@ # Extra options , prefix ? "" + +, testers }: -with lib; let inherit (python3Packages) python dbus-python; shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; @@ -25,21 +26,21 @@ let optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optLibopus = shouldUsePkg libopus; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "${prefix}jack2"; version = "1.9.19"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "01s8i64qczxqawgrzrw19asaqmcspf5l2h3203xzg56wnnhhzcw7"; }; nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ aften AudioUnit CoreAudio Accelerate libobjc ]; @@ -52,9 +53,9 @@ stdenv.mkDerivation rec { wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" - ] ++ optional (optDbus != null) "--dbus" - ++ optional (optLibffado != null) "--firewire" - ++ optional (optAlsaLib != null) "--alsa"; + ] ++ lib.optional (optDbus != null) "--dbus" + ++ lib.optional (optLibffado != null) "--firewire" + ++ lib.optional (optAlsaLib != null) "--alsa"; postInstall = (if libOnly then '' rm -rf $out/{bin,share} @@ -63,11 +64,14 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH ''); - meta = { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { description = "JACK audio connection kit, version 2 with jackdbus"; homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; + pkgConfigModules = [ "jack" ]; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; }; -} +}) diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index ba77e9c3c91ad..4e7375a269168 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -2,6 +2,8 @@ # Optional Dependencies , alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null + +, testers }: let @@ -13,12 +15,12 @@ let optLibffado = shouldUsePkg libffado; optCelt = shouldUsePkg celt; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jack1"; version = "0.125.0"; src = fetchurl { - url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${finalAttrs.version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; @@ -30,11 +32,14 @@ stdenv.mkDerivation rec { buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; + pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/misc/kitty-themes/default.nix index ad6cdf9bfa64a..f9ac2181a41c0 100644 --- a/pkgs/misc/kitty-themes/default.nix +++ b/pkgs/misc/kitty-themes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2022-08-11"; + version = "unstable-2023-01-08"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = pname; - rev = "72cf0dc4338ab1ad85f5ed93fdb13318916cae14"; - sha256 = "d9mO2YqA7WD2dTPsmNeQg2dUR/iv2T/l7yxrt6WKX60="; + rev = "e0bb9d751033e82e455bf658744872c83f04b89d"; + sha256 = "sha256-ol/AWScGsskoxOEW32aGkJFgg8V6pIujoYIMQaVskWM="; }; installPhase = '' diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 9527c156e486e..759ecdc68e4d4 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.1"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; + sha256 = "sha256-1cWQh1ZKXNbwilK6gOfWUJuRxYXkQ4XcwPo5Jl0YFQk="; }; 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 a8472b66f1faa..468cd51439ec7 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 0000000000000..e9c3f48805afb --- /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/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index a2a7e79691660..b5f812d002cc9 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd, config }: let beat = package: extraArgs: buildGoModule (rec { pname = package; @@ -36,10 +36,12 @@ rec { metricbeat7 = beat "metricbeat" { meta.description = "Lightweight shipper for metrics"; passthru.tests = - assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath; - { - elk = nixosTests.elk.ELK-7; - }; + lib.optionalAttrs config.allowUnfree ( + assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.unfree.ELK-7; + } + ); }; packetbeat7 = beat "packetbeat" { buildInputs = [ libpcap ]; diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index 7d8cd24e3d82d..ff2579aa86565 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -76,9 +76,9 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=strict-prototypes" - ]; + ]); enableParallelBuilding = true; diff --git a/pkgs/misc/nflz/default.nix b/pkgs/misc/nflz/default.nix new file mode 100644 index 0000000000000..10a87f85b1178 --- /dev/null +++ b/pkgs/misc/nflz/default.nix @@ -0,0 +1,34 @@ +{ fetchCrate +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "nflz"; + version = "1.0.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw="; + }; + + cargoHash = "sha256-+SOoZFVJ6mASRKufQE4JmHGKR5rbBgg1PmCrI6dvvko="; + + # Tests do not work in the package published on crates.io, since the folder + # with test resources is not packaged. + doCheck = false; + + meta = { + description = "Numbered Files Leading Zeros helps you to manage ascending numbered file names"; + longDescription = '' + CLI to add leading zeros to ascending numbered file names. + NFLZ stands for Numbered Files Leading Zeros. + + This library helps you to manage files inside your file system that + belong to a set of ordered files. An example are photos from a camera. + ''; + homepage = "https://github.com/phip1611/nflz"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ phip1611 ]; + }; +} diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index de4bee278c796..0b9c1f4984cb3 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -3,7 +3,32 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + rich = super.rich.overrideAttrs (old: rec { + version = "12.4.0"; + src = fetchFromGitHub { + owner = "Textualize"; + repo = "rich"; + rev = "refs/tags/v${version}"; + hash = "sha256-ryJTusUNpvNF2031ICJWK8ScxHIh+LrXYg7nd0ph4aQ="; + }; + }); + textual = super.textual.overrideAttrs (old: rec { + version = "0.1.18"; + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual"; + rev = "refs/tags/v${version}"; + hash = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; + }; + }); + }; + }; +in + +python.pkgs.buildPythonApplication rec { pname = "rich-cli"; version = "1.8.0"; format = "pyproject"; @@ -15,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ rich click requests diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 2bcb42e85ec5d..3ec89194df872 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ./cstddef.patch ]; - NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; + env.NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; meta = { description = "Really Slick Screensavers Port to GLX"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index d2a6dfcec9546..ea8ba9d042bcb 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # "marbling" has NEON code that mixes signed and unsigned vector types - NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch "-flax-vector-conversions"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch "-flax-vector-conversions"; postInstall = '' for bin in $out/bin/*; do diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 966a451c060c4..88ed7a4772514 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -59,7 +59,7 @@ # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""} + ${lib.optionalString stdenv.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index e138a62e39aa8..2bbfeda4d3213 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/urbit/default.nix b/pkgs/misc/urbit/default.nix index 9ea1fc64c3f37..0cd7dd7e309d2 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,31 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja -, openssl, pkg-config, re2c, zlib +{ stdenv +, lib +, fetchzip }: +let + os = if stdenv.isDarwin then "macos" else "linux"; + arch = if stdenv.isAarch64 then "aarch64" else "x86_64"; + platform = "${os}-${arch}"; +in stdenv.mkDerivation rec { pname = "urbit"; - version = "0.7.3"; + version = "1.20"; - src = fetchFromGitHub { - owner = "urbit"; - repo = "urbit"; - rev = "v${version}"; - sha256 = "192843pjzh8z55fd0x70m3l1vncmixljia3nphgn7j7x4976xkp2"; - fetchSubmodules = true; + src = fetchzip { + url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; + sha256 = { + x86_64-linux = "sha256-nBIpf9akK4cXnR5y5Fcl1g7/FxL8BU/CH/WHGhYuP74="; + aarch64-linux = "sha256-ERSYXNh/vmAKr4PNonOxTm5/FRLNDWwHSHM6fIeY4Nc="; + x86_64-darwin = "sha256-Kk9hNzyWngnyqlyQ9hILFM81WVw1ZYimMj4K3ENtifE="; + aarch64-darwin = "sha256-i3ixj04J/fcb396ncINLF8eYw1mpFCYeIM3f74K6tqY="; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; - nativeBuildInputs = [ pkg-config ninja meson ]; - buildInputs = [ curl git gmp libsigsegv ncurses openssl re2c zlib ]; - - postPatch = '' - patchShebangs . + postInstall = '' + install -m755 -D vere-v${version}-${platform} $out/bin/urbit ''; + passthru.updateScript = ./update-bin.sh; + meta = with lib; { - description = "An operating function"; homepage = "https://urbit.org"; + description = "An operating function"; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; + maintainers = [ maintainers.matthew-levan ]; license = licenses.mit; - maintainers = with maintainers; [ mudri ]; - platforms = with platforms; linux; }; } diff --git a/pkgs/misc/urbit/update-bin.sh b/pkgs/misc/urbit/update-bin.sh new file mode 100755 index 0000000000000..b7ee514e10a7b --- /dev/null +++ b/pkgs/misc/urbit/update-bin.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/default.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find urbit in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://github.com/urbit/vere/releases/download/vere-v${VER}/${ARCH}.tgz"; + nix-prefetch "{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = \"vere\"; version = \"${VER}\"; + src = fetchzip { url = \"$URL\"; }; +} +" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +VERE_VER=$(curl https://bootstrap.urbit.org/vere/live/last) + +VERE_LINUX_AARCH64_SHA256=$(fetch_arch "$VERE_VER" "linux-aarch64") +VERE_LINUX_X64_SHA256=$(fetch_arch "$VERE_VER" "linux-x86_64") +VERE_DARWIN_AARCH64_SHA256=$(fetch_arch "$VERE_VER" "macos-aarch64") +VERE_DARWIN_X64_SHA256=$(fetch_arch "$VERE_VER" "macos-x86_64") + +sed -i "s/version = \".*\"/version = \"$VERE_VER\"/" "$NIX_DRV" + +replace_sha "aarch64-linux" "$VERE_LINUX_AARCH64_SHA256" +replace_sha "x86_64-linux" "$VERE_LINUX_X64_SHA256" +replace_sha "aarch64-darwin" "$VERE_DARWIN_AARCH64_SHA256" +replace_sha "x86_64-darwin" "$VERE_DARWIN_X64_SHA256" diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 9131f66491d5c..bb5fef313fa3e 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.6.1"; + version = "0.6.4"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - hash = "sha256-WiyRBF3rWLpOZ8mxT89ImRL++Oq9+b88oSKjr4tzCGs="; + hash = "sha256-pjNXDU1YgzaH4vtdQnnfRCSmbhIgeAiOP/uyhBNG/7s="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-R9xxIDqkU7FeulpD7PUM6aHgA67PVgqxHKYtdrjdaUo="; + cargoHash = "sha256-RWj1QCHYEtw+QzdX+YlFiMqMhvCfxYzj6SUzfhqrcM8="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 3a53916a46de0..136c9721c6bbb 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -2,7 +2,7 @@ , 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 }: @@ -75,6 +75,11 @@ in 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. @@ -388,6 +393,12 @@ in 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"; @@ -706,7 +717,7 @@ in makeScopeWithSplicing flex byacc gencat rpcgen ]; buildInputs = with self; [ include csu ]; - NIX_CFLAGS_COMPILE = "-B${self.csu}/lib"; + env.NIX_CFLAGS_COMPILE = "-B${self.csu}/lib"; makeFlags = [ "STRIP=-s" # flag to install, not command 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 0000000000000..3c3dcb6d5d67a --- /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 8903db9f36b7b..6bf884d382840 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -485,7 +485,7 @@ in makeScopeWithSplicing version = "9.2"; sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; - NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; + env.NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; rpcgen = mkDerivation { @@ -535,7 +535,7 @@ in makeScopeWithSplicing path = "usr.bin/uudecode"; version = "9.2"; sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isLinux "-DNO_BASE64"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; }; @@ -550,7 +550,7 @@ in makeScopeWithSplicing path = "usr.bin/config"; version = "9.2"; sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; - NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook makeMinimal install mandoc byacc flex rsync @@ -636,7 +636,7 @@ in makeScopeWithSplicing makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; hardeningDisable = [ "pic" ]; MKKMOD = "no"; - NIX_CFLAGS_COMPILE = [ "-Wa,--no-warn" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wa,--no-warn" ]; postBuild = '' make -C arch/$MACHINE/compile/$CONFIG $makeFlags @@ -680,6 +680,13 @@ in 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"; @@ -708,7 +715,7 @@ in makeScopeWithSplicing --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" substituteInPlace $COMPONENT_PATH/readline/Makefile --replace /usr/include "$out/include" ''; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-D__noinline=" "-D__scanflike(a,b)=" "-D__va_list=va_list" @@ -746,7 +753,7 @@ in makeScopeWithSplicing version = "9.2"; sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = with self; [ libterminfo ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-D__scanflike(a,b)=" "-D__va_list=va_list" "-D__warn_references(a,b)=" @@ -809,6 +816,16 @@ in makeScopeWithSplicing meta.platforms = lib.platforms.netbsd; }; + libpci = mkDerivation { + pname = "libpci"; + path = "lib/libpci"; + version = "9.2"; + sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; + env.NIX_CFLAGS_COMPILE = toString [ "-I." ]; + meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ sys.src ]; + }; + libpthread-headers = mkDerivation { pname = "libpthread-headers"; path = "lib/libpthread"; @@ -905,7 +922,7 @@ in makeScopeWithSplicing byacc genassym gencat lorder tsort statHook rsync rpcgen ]; buildInputs = with self; [ headers csu ]; - NIX_CFLAGS_COMPILE = "-B${self.csu}/lib -fcommon"; + env.NIX_CFLAGS_COMPILE = "-B${self.csu}/lib -fcommon"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index f648435eed276..72a3750284531 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 d7ac5d9fd9040..839548ae8ffd0 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 <stdint.h>" } { print }' \ + $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h + ''; + }); }; bareFrameworks = ( 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 a4f71f12821da..145c98496b49a 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,7 +63,7 @@ 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; @@ -64,8 +84,13 @@ let 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; + 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; 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 dc4ab1955b506..59cbc2b1063a1 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 0297f8897f12d..7be670425d7af 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 63ef2a1c263e0..9288097ef3699 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-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index b413744677d24..aeeb5c06b34c4 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" @@ -174,10 +172,10 @@ appleDerivation' stdenv { # stream: missing altogether # usb: complete - cp IOUSBFamily-630.4.5/IOUSBFamily/Headers/IOUSBLib.h $dest/usb - cp IOUSBFamily-630.4.5/IOUSBUserClient/Headers/IOUSBUserClient.h $dest/usb - cp IOUSBFamily-560.4.2/IOUSBFamily/Headers/USB.h $dest/usb # This file is empty in 630.4.5! - cp IOUSBFamily-630.4.5/IOUSBFamily/Headers/USBSpec.h $dest/usb + cp IOUSBFamily*-630.4.5/IOUSBFamily/Headers/IOUSBLib.h $dest/usb + cp IOUSBFamily*-630.4.5/IOUSBUserClient/Headers/IOUSBUserClient.h $dest/usb + cp IOUSBFamily*-560.4.2/IOUSBFamily/Headers/USB.h $dest/usb # This file is empty in 630.4.5! + cp IOUSBFamily*-630.4.5/IOUSBFamily/Headers/USBSpec.h $dest/usb # video: missing altogether ''; 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 bb09adce252e1..f4fe65b8066c7 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/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index f1b5e19feb22a..984910b34c939 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -7,7 +7,7 @@ appleDerivation { xcbuildFlags = [ "-target" "Security_frameworks_osx" ]; - # NIX_CFLAGS_COMPILE = "-Wno-error -I${xnu}/include/libkern -DPRIVATE -I${xnu}/Library/Frameworks/System.framework/Headers"; + # env.NIX_CFLAGS_COMPILE = "-Wno-error -I${xnu}/include/libkern -DPRIVATE -I${xnu}/Library/Frameworks/System.framework/Headers"; preBuild = '' dtrace -h -C -s OSX/libsecurity_utilities/lib/security_utilities.d -o OSX/libsecurity_utilities/lib/utilities_dtrace.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 2ca2d061591af..910b42b0c9d40 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, appleDerivation, fetchzip, bsdmake, perl, flex, bison +{ lib, stdenv, buildPackages, appleDerivation, fetchFromGitHub, bsdmake, perl, flex, bison }: # this derivation sucks @@ -10,9 +10,11 @@ # # the more recent adv_cmds release is used for everything else in this package -let recentAdvCmds = fetchzip { - url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz"; - sha256 = "0z081kcprzg5jcvqivfnwvvv6wfxzkjg2jc2lagsf8c7j7vgm8nn"; +let recentAdvCmds = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "adv_cmds"; + rev = "adv_cmds-158"; + hash = "sha256-1qL69pGHIaefooJJ8eT83XGz9+bW7Yg3k+X9fNkMCHw="; }; in appleDerivation { diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index df47d53514abd..ba0e5b3b78b9c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, pkgs }: +{ lib, stdenv, fetchurl, fetchFromGitHub, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -146,7 +146,7 @@ let then stdenv.fetchurlBoot else fetchurl; in fetch { - url = "http://www.opensource.apple.com/tarballs/${pname}/${pname}-${version}.tar.gz"; + url = "https://github.com/apple-oss-distributions/${pname}/archive/refs/tags/${pname}-${version}.tar.gz"; inherit sha256; }; @@ -188,24 +188,24 @@ let }); IOKitSpecs = { - IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq"; - IOFireWireFamily = fetchApple "osx-10.10.5" "059qa1m668kwvchl90cqcx35b31zaqdg61zi11y1imn5s389y2g1"; - IOFWDVComponents = fetchApple "osx-10.10.5" "1brr0yn6mxgapw3bvlhyissfksifzj2mqsvj9vmps6zwcsxjfw7m"; - IOFireWireAVC = fetchApple "osx-10.10.5" "194an37gbqs9s5s891lmw6prvd1m2362602s8lj5m89fp9h8mbal"; - IOFireWireSBP2 = fetchApple "osx-10.10.5" "1mym158kp46y1vfiq625b15ihh4jjbpimfm7d56wlw6l2syajqvi"; - IOFireWireSerialBusProtocolTransport = fetchApple "osx-10.10.5" "09kiq907qpk94zbij1mrcfcnyyc5ncvlxavxjrj4v5braxm78lhi"; - IOGraphics = fetchApple "osx-10.10.5" "1z0x3yrv0p8pfdqnvwf8rvrf9wip593lhm9q6yzbclz3fn53ad0p"; - IOHIDFamily = fetchApple "osx-10.10.5" "0yibagwk74imp3j3skjycm703s5ybdqw0qlsmnml6zwjpbrz5894"; - IONetworkingFamily = fetchApple "osx-10.10.5" "04as1hc8avncijf61mp9dmplz8vb1inhirkd1g74gah08lgrfs9j"; - IOSerialFamily = fetchApple "osx-10.10.5" "0jh12aanxcigqi9w6wqzbwjdin9m48zwrhdj3n4ki0h41sg89y91"; - IOStorageFamily = fetchApple "osx-10.9.5" "0w5yr8ppl82anwph2zba0ppjji6ipf5x410zhcm1drzwn4bbkxrj"; - IOBDStorageFamily = fetchApple "osx-10.10.5" "1rbvmh311n853j5qb6hfda94vym9wkws5w736w2r7dwbrjyppc1q"; - IOCDStorageFamily = fetchApple "osx-10.10.5" "1905sxwmpxdcnm6yggklc5zimx1558ygm3ycj6b34f9h48xfxzgy"; - IODVDStorageFamily = fetchApple "osx-10.10.5" "1fv82rn199mi998l41c0qpnlp3irhqp2rb7v53pxbx7cra4zx3i6"; + IOAudioFamily = fetchApple "osx-10.10.5" "sha256-frs2pm2OpGUOz68ZXsjktlyHlgn5oXM+ltbmAf//Cio="; + IOFireWireFamily = fetchApple "osx-10.10.5" "sha256-V9fNeo/Wj9dm1/XM4hkOInnMk01M6c9QSjJs5zJKB60="; + IOFWDVComponents = fetchApple "osx-10.10.5" "sha256-KenCX9C/Z2ErUK8tpKpm65gEmhn2NsXFxlzK7NKomaI="; + IOFireWireAVC = fetchApple "osx-10.10.5" "sha256-Gd8+PK/mk+xEXgF8dGAx+3jsXv4NX1GiBFyjyrf6sTo="; + IOFireWireSBP2 = fetchApple "osx-10.10.5" "sha256-Z3nP8pX1YG4Fbt7MrnqO06ihE9aYOex5Eib/rqOpoPk="; + IOFireWireSerialBusProtocolTransport = fetchApple "osx-10.10.5" "sha256-zdYE0UCKiVhDRGdWaH8L51ArbYTnsQOmcN/OMmpNdFA="; + IOGraphics = fetchApple "osx-10.10.5" "sha256-lXoW4sx3pyl5fg5Qde3sQi2i8rTLnpeCdDaTHjbfaMI="; + IOHIDFamily = fetchApple "osx-10.10.5" "sha256-b+S1p3p5d8olYE18VrBns4euerVINaQSFEp34sko5rM="; + IONetworkingFamily = fetchApple "osx-10.10.5" "sha256-NOpFOBKS6iwFj9DJxduZYZfZJuhDyBQw2QMKHbu7j40="; + IOSerialFamily = fetchApple "osx-10.10.5" "sha256-hpYrgXsuTul4CYoYIjQjerfvQRqISM2tCcfVXlnjbZo="; + IOStorageFamily = fetchApple "osx-10.9.5" "sha256-CeA4rHUrBKHsDeJU9ssIY9LQwDw09a+vQUyruosaLKA="; + IOBDStorageFamily = fetchApple "osx-10.10.5" "sha256-gD52RKXGKWGga/QGlutxsgsPNSN6gcRfFQRT8v51N3E="; + IOCDStorageFamily = fetchApple "osx-10.10.5" "sha256-+nyqH6lMPmIkDLYXNVSeR4vBYS165oyJx+DkCkKOGRg="; + IODVDStorageFamily = fetchApple "osx-10.10.5" "sha256-Jy3UuRzdd0bBdhJgI/f8vLXh2GdGs1RVN3G2iEs86kQ="; # There should be an IOStreamFamily project here, but they haven't released it :( - IOUSBFamily = fetchApple "osx-10.8.5" "1znqb6frxgab9mkyv7csa08c26p9p0ip6hqb4wm9c7j85kf71f4j"; # This is from 10.8 :( - IOUSBFamily_older = fetchApple "osx-10.8.4" "113lmpz8n6sibd27p42h8bl7a6c3myc6zngwri7gnvf8qlajzyml" "IOUSBFamily"; # This is even older :( - IOKitUser = fetchApple "osx-10.10.5" "1jzndziv97bhjxmla8nib5fpcswbvsxr04447g251ls81rw313lb"; + IOUSBFamily = fetchApple "osx-10.8.5" "sha256-FwgGoP97Sj47VGXMxbY0oUugKf7jtxAL1RzL6+315cU="; # This is from 10.8 :( + IOUSBFamily_older = fetchApple "osx-10.8.4" "sha256-5apCsqtHK0EC8x1uPTTll43x69eal/nsokfS80qLlxs=" "IOUSBFamily"; # This is even older :( + IOKitUser = fetchApple "osx-10.10.5" "sha256-3UHM3g91v4RugmONbM+SAPr1SfoUPY3QPcTwTpt+zuY="; # There should be an IOVideo here, but they haven't released it :( }; @@ -234,7 +234,7 @@ let in applePackage' namePath version sdkName sha256; # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. - adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; + adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "sha256-/OJLNpATyS31W5nWfJgSVO5itp8j55TRwG57/QLT5Fg=" {}; in @@ -242,70 +242,72 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. inherit (adv_cmds-boot) ps locale; - architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; - bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; - CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; - CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "0sgsqjcxbdm2g2zfpc50mzmk4b4ldyw7xvvkwiayhpczg1fga4ff" {}; - configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" { - Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; + architecture = applePackage "architecture" "osx-10.11.6" "sha256-cUKeMx6mOAxBSRHIdfzsrR65Qv86m7+20XvpKqVfwVI=" {}; + bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "sha256-CW8zP5QZMhWTGp+rhrm8oHE/vSLsRlv1VRAGe1OUDmI=" {}; + CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "sha256-UNaHvxzYzEBnYYuoMLqWUVprZa6Wqn/3XleoSCco050=" {}; + CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "sha256-FLgODBrfv+XsGaAjddncYAm/BIJJYw6LcwX/z7ncKFM=" {}; + configd = applePackage "configd" "osx-10.8.5" "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" { + Security = applePackage "Security/boot.nix" "osx-10.9.5" "sha256-7qr0IamjCXCobIJ6V9KtvbMBkJDfRCy4C5eqpHJlQLI=" {}; }; - copyfile = applePackage "copyfile" "osx-10.12.6" "0a70bvzndkava1a946cdq42lnjhg7i7b5alpii3lap6r5fkvas0n" {}; - Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; - dtrace = applePackage "dtrace" "osx-10.12.6" "0hpd6348av463yqf70n3xkygwmf1i5zza8kps4zys52sviqz3a0l" {}; - dyld = applePackage "dyld" "osx-10.12.6" "0q4jmk78b5ajn33blh4agyq6v2a63lpb3fln78az0dy12bnp1qqk" {}; - eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; - IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; - launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; - libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; - Libc = applePackage "Libc" "osx-10.12.6" "183wcy1nlj2wkpfsx3k3lyv917mk8r2p72qw8lb89mbjsw3yw0xx" { - Libc_10-9 = fetchzip { - url = "http://www.opensource.apple.com/tarballs/Libc/Libc-997.90.3.tar.gz"; - sha256 = "1xchgxkxg5288r2b9yfrqji2gsgdap92k4wx2dbjwslixws12pq7"; + copyfile = applePackage "copyfile" "osx-10.12.6" "sha256-uHqLFOIpXK+n0RHyOZzVsP2DDZcFDivKCnqHBaXvHns=" {}; + Csu = applePackage "Csu" "osx-10.11.6" "sha256-h6a/sQMEVeFxKNWAPgKBXjWhyL2L2nvX9BQUMaTQ6sY=" {}; + dtrace = applePackage "dtrace" "osx-10.12.6" "sha256-Icr22ozixHquI0kRB2XZ+LlxD6V46sJHsHy4L/tDXZg=" {}; + dyld = applePackage "dyld" "osx-10.12.6" "sha256-JmKnOZtBPf96zEx7vhYHLBSTOPyKN71IdYE3R0IeJww=" {}; + eap8021x = applePackage "eap8021x" "osx-10.11.6" "sha256-54P3+YhVhOanoZQoqswDnr/GbR/AdEERse135nyuIQo=" {}; + IOKit = applePackage "IOKit" "osx-10.11.6" "" { inherit IOKitSrcs; }; + launchd = applePackage "launchd" "osx-10.9.5" "sha256-dmV0UK7hG9wvTr+F4Z47nCFXcVZCV+cQ46WbE0DBtJs=" {}; + libauto = applePackage "libauto" "osx-10.9.5" "sha256-GnRcKq8jRbEsI/PSDphwUjWtpEIEcnLlQL9yxYLgSsU=" {}; + Libc = applePackage "Libc" "osx-10.12.6" "sha256-LSsL7S3KFgGU9qjK4atu/4wBh8ftgfsk6JOvg+ZTZOY=" { + Libc_10-9 = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "Libc"; + rev = "Libc-997.90.3"; + hash = "sha256-B18RNO+Rai5XE52TKdJV7eknosTZ+bRERkiU12d/kPU="; }; - Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; + Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "sha256-JvPSY7FzraGpqF/jYLfhU2o/2195NuKrXsryYfVtx3s=" {}; }; - libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; - libdispatch = applePackage "libdispatch" "osx-10.10.5" "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {}; - libiconv = applePackage "libiconv" "osx-10.12.6" "1gg5h6z8sk851bhv87vyxzs54jmqz6lh57ny8j4s51j7srja0nly" {}; - Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {}; - Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; - Libnotify = applePackage "Libnotify" "osx-10.12.6" "0p5qhvalf6j1w6n8xwywhn6dvbpzv74q5wqrgs8rwfpf74wg6s9z" {}; - libplatform = applePackage "libplatform" "osx-10.12.6" "0rh1f5ybvwz8s0nwfar8s0fh7jbgwqcy903cv2x8m15iq1x599yn" {}; - libpthread = applePackage "libpthread" "osx-10.12.6" "1j6541rcgjpas1fc77ip5krjgw4bvz6jq7bq7h9q7axb0jv2ns6c" {}; - libresolv = applePackage "libresolv" "osx-10.12.6" "077j6ljfh7amqpk2146rr7dsz5vasvr3als830mgv5jzl7l6vz88" {}; - Libsystem = applePackage "Libsystem" "osx-10.12.6" "1082ircc1ggaq3wha218vmfa75jqdaqidsy1bmrc4ckfkbr3bwx2" {}; - libutil = applePackage "libutil" "osx-10.12.6" "0lqdxaj82h8yjbjm856jjz9k2d96k0viimi881akfng08xk1246y" {}; - libunwind = applePackage "libunwind" "osx-10.12.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; - mDNSResponder = applePackage "mDNSResponder" "osx-10.12.6" "02ms1p8zlgmprzn65jzr7yaqxykh3zxjcrw0c06aayim6h0dsqfy" {}; - objc4 = applePackage "objc4" "osx-10.12.6" "1cj1vhbcs9pkmag2ms8wslagicnq9bxi2qjkszmp3ys7z7ccrbwz" {}; - ppp = applePackage "ppp" "osx-10.12.6" "1kcc2nc4x1kf8sz0a23i6nfpvxg381kipi0qdisrp8x9z2gbkxb8" {}; - removefile = applePackage "removefile" "osx-10.12.6" "0jzjxbmxgjzhssqd50z7kq9dlwrv5fsdshh57c0f8mdwcs19bsyx" {}; + libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {}; + libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {}; + libiconv = applePackage "libiconv" "osx-10.12.6" "sha256-ZzPFkchK3EU95UQUVVrR0t8iilhi/VnIkjjtP6KT2oI=" {}; + Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {}; + Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {}; + Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {}; + libplatform = applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {}; + libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {}; + libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {}; + Libsystem = applePackage "Libsystem" "osx-10.12.6" "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {}; + libutil = applePackage "libutil" "osx-10.12.6" "sha256-4PFuk+CTLwvd/Ll9GLBkiIM0Sh/CVaiKwh5m1noheRs=" {}; + libunwind = applePackage "libunwind" "osx-10.12.6" "sha256-CC0sndP/mKYe3dZu3v7fjuDASV4V4w7dAcnWMvpoquE=" {}; + mDNSResponder = applePackage "mDNSResponder" "osx-10.12.6" "sha256-ddZr6tropkpdMJhq/kUlm3OwO8b0yxtkrMpwec8R4FY=" {}; + objc4 = applePackage "objc4" "osx-10.12.6" "sha256-ZsxRpdsfv3Dxs7yBBCkjbKXKR6aXwkEpxc1XYXz7ueM=" {}; + ppp = applePackage "ppp" "osx-10.12.6" "sha256-M1zoEjjeKIDUEP6ACbpUJk3OXjobw4g/qzUmxGdX1J0=" {}; + removefile = applePackage "removefile" "osx-10.12.6" "sha256-UpNk27kGXnZss1ZXWVJU9jLz/NW63ZAZEDLhyCYoi9M=" {}; xnu = if stdenv.isx86_64 then - applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { + applePackage "xnu" "osx-10.12.6" "sha256-C8TPQlUT3RbzAy8YnZPNtr70hpaVG9Llv0h42s3NENI=" { python3 = pkgs.buildPackages.buildPackages.python3; # TODO(@Ericson2314) this shouldn't be needed. } else macosPackages_11_0_1.xnu; - hfs = applePackage "hfs" "osx-10.12.6" "1mj3xvqpq1mgd80b6kl1s04knqnap7hccr0gz8rjphalq14rbl5g" {}; - Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; - adv_cmds = applePackage "adv_cmds" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; - basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; - developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; - diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" { + hfs = applePackage "hfs" "osx-10.12.6" "sha256-eGi18HQFJrU5UHoBOE0LqO5gQ0xOf8+OJuAWQljfKE4=" {}; + Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "sha256-YHbGws901xONzAbo6sB5zSea4Wp0sgYUJ8YgwVfWxnE=" {}; + adv_cmds = applePackage "adv_cmds" "osx-10.11.6" "sha256-Ztp8ALWcviEpthoiY8ttWzGI8OcsLzsULjlqe8GIzw8=" {}; + basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "sha256-BYPPTg4/7x6RPs0WwwQlkNiZxxArV+7EVe6bM+a/I6Q=" {}; + developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "sha256-h0wMVlS6QdRvKOVJ74W9ziHYGApjvnk77AIR6ukYBRo=" {}; + diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "sha256-VX+hcZ7JhOA8EhwLloPlM3Yx79RXp9OYHV9Mi10uw3Q=" { macosPackages_11_0_1 = macosPackages_11_0_1; }; network_cmds = if stdenv.isx86_64 then - applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {} + applePackage "network_cmds" "osx-10.11.6" "sha256-I89CLIswGheewOjiNZwQTgWvWbhm0qtB5+KUqzxnQ5M=" {} else macosPackages_11_0_1.network_cmds; - file_cmds = applePackage "file_cmds" "osx-10.11.6" "1zfxbmasps529pnfdjvc13p7ws2cfx8pidkplypkswyff0nff4wp" {}; - shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "0084k271v66h4jqp7q7rmjvv7w4mvhx3aq860qs8jbd30canm86n" {}; - system_cmds = applePackage "system_cmds" "osx-10.11.6" "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {}; - text_cmds = applePackage "text_cmds" "osx-10.11.6" "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {}; - top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {}; - PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "1llimhvp0gjffd47322lnjq7cqwinx0c5z7ikli04ad5srpa68mh" {}; + file_cmds = applePackage "file_cmds" "osx-10.11.6" "sha256-JYy6HwmultKeZtLfaysbsyLoWg+OaTh7eJu54JkJC0Q=" {}; + shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "sha256-kmEOprkiJGMVcl7yHkGX8ymk/5KjE99gWuF8j2hK5hY=" {}; + system_cmds = applePackage "system_cmds" "osx-10.11.6" "sha256-KBdGlHeXo2PwgRQOOeElJ1RBqCY1Tdhn5KD42CMhdzI=" {}; + text_cmds = applePackage "text_cmds" "osx-10.11.6" "sha256-KSebU7ZyUsPeqn51nzuGNaNxs9pvmlIQQdkWXIVzDxw=" {}; + top = applePackage "top" "osx-10.11.6" "sha256-jbz64ODogtpNyLpXGSZj1jCBdFPVXcVcBkL1vc7g5qQ=" {}; + PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "sha256-bYGtYnBOcE5W03AZzfVTJXPZ6GgryGAMt/LgLPxFkVk=" {}; # `configdHeaders` can’t use an override because `pkgs.darwin.configd` on aarch64-darwin will # be replaced by SystemConfiguration.framework from the macOS SDK. - configdHeaders = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" { + configdHeaders = applePackage "configd" "osx-10.8.5" "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" { headersOnly = true; Security = null; }; @@ -315,5 +317,5 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { # TODO(matthewbauer): # To be removed, once I figure out how to build a newer Security version. - Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; + Security = applePackage "Security/boot.nix" "osx-10.9.5" "sha256-7qr0IamjCXCobIJ6V9KtvbMBkJDfRCy4C5eqpHJlQLI=" {}; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix b/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix index f57d224615f4b..7eeafec346551 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix @@ -3,6 +3,6 @@ { applePackage' }: { -bootstrap_cmds = applePackage' "bootstrap_cmds" "116" "developer-tools-11.3.1" "148xpqkf5xzpslqxch5l8h6vsz7sys8sdzk4ghbg9mkcivp8qa03" {}; -developer_cmds = applePackage' "developer_cmds" "66" "developer-tools-11.3.1" "0q08m4cxxwph7gxqravmx13l418p1i050bd46zwksn9j9zpw9mlr" {}; +bootstrap_cmds = applePackage' "bootstrap_cmds" "116" "developer-tools-11.3.1" "06nw99ajkd264vdi6n2zv252ppxp3wx3120hqf3jqdh6c1wavy0b" {}; +developer_cmds = applePackage' "developer_cmds" "66" "developer-tools-11.3.1" "0f7vphpscjcypq49gjckbs20xhm7yjalr4nnbphqcqp8v1al56dc" {}; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index 18233cfc5227f..23a5ae0067126 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -18,7 +18,7 @@ appleDerivation { # Workaround build failure on -fno-common toolchains: # duplicate symbol '_btype_2' in:args.o pr_comment.o - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; # temporary install phase until xcodebuild has "install" support installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index ec252dca41c20..30d123ab804c8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -8,7 +8,7 @@ in appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libutil ]; - NIX_CFLAGS_COMPILE = "-I."; + env.NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-lutil"; patchPhase = '' # ugly hacks for missing headers 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 1f13cbef9fc91..3b51022d59be7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,12 +1,12 @@ -{ 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"; + env.NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; NIX_LDFLAGS = "-L./Products/Release"; xcbuildFlags = [ "-target" "dtrace_frameworks" "-target" "dtrace" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index cfa66d2c35363..8d44cc86194fa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -19,7 +19,7 @@ appleDerivation { # Workaround build failure on -fno-common toolchains: # duplicate symbol '_chdname' in: ar_io.o tty_subs.o - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; # temporary install phase until xcodebuild has "install" support installPhase = '' 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 64de728805fd3..4082f5b760cf8 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/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index 517f53e9435da..1637ed7838956 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -3,44 +3,44 @@ { applePackage' }: { -adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0x8c25rh6fnzndbc26vcb65vcxilvqyfvm2klfyci1wr4bh3ixgk" {}; -architecture = applePackage' "architecture" "279" "macos-11.0.1" "1cgp33ywa30max6cyp69kvii299hx2vgwvmy3ms8n4gaq2mkpaky" {}; -basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; -bootstrap_cmds = applePackage' "bootstrap_cmds" "121" "macos-11.0.1" "09bwclws6adxb1ky9q35f4ikddk4mbalmgds0cmqaf7j23qxl3fv" {}; -CommonCrypto = applePackage' "CommonCrypto" "60178.40.2" "macos-11.0.1" "0r3b1mlfmbdzpwn6pbsbfaga3k63gpwcwbhkbi4r09aq82skl02v" {}; -configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "173i55wfzli9pg2x2rw437hs68h6l4ngss5jfgf18g26zjkjzv5v" {}; -copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "0qyp15qj3fdb7yx033n57l7s61d70mv17f43yiwcbhx09mmlrp07" {}; -Csu = applePackage' "Csu" "88" "macos-11.0.1" "029lgcyj0i16036h2lcx6fd6r1yf1bkj5dnvz905rh6ncl8skgdr" {}; -diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "1bqwkwkwd556rba5000ap77xrhaf4xnmy83mszd7a0yvl2xlma7j" {}; -dtrace = applePackage' "dtrace" "370.40.1" "macos-11.0.1" "1941yczmn94ng5zlnhf0i5mjw2f4g7znisgvhkhn5f86gxmd98wl" {}; -dyld = applePackage' "dyld" "832.7.1" "macos-11.0.1" "1s77ca6jg20z91qlph59da8j61m97y23vrw48xs4rywdzh4915n0" {}; -eap8021x = applePackage' "eap8021x" "304.40.1" "macos-11.0.1" "1ph3kcpf527s0jqsi60j2sgg3m8h128spf292d8kyc08siz9mf9c" {}; -file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "04789vn1wghclfr3ma3ncg716xdsxfj66hrcxi5h3h1ryag2ycfz" {}; -hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "1rhkmn2yj5p4wmi4aajy5hj2h0gxk63s8j4qz4ziy4g4bjpdgwmy" {}; -ICU = applePackage' "ICU" "66108" "macos-11.0.1" "1d76cyyqpwkzjlxfajm4nsglxmfrcafbnjwnjxc3j5w3nw67pqhx" {}; -Libc = applePackage' "Libc" "1439.40.11" "macos-11.0.1" "0d5xlnks4lc9391wg31c9126vflb40lc5ffkgxmf2kpyglac1280" {}; -libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "089i2bl4agpnfplrg23xbzma1674g0w05988nxdps6ghxl4kz66f" {}; -libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "0z7r42zfb8y48f0nrw0qw7fanfvimycimgnrg3jig101kjvjar98" {}; -libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0hqbsqggjrr0sv6h70lcr3gabgk9inyc8aq1b30wibgjm6crjwpp" {}; -Libinfo = applePackage' "Libinfo" "542.40.3" "macos-11.0.1" "0y5x6wxd3mwn6my1jdp8qrak3y7x7sgjdmwyw9cvvbn3kg9v6z1p" {}; -Libnotify = applePackage' "Libnotify" "279.40.4" "macos-11.0.1" "0aswflxki877izp6sacv35sydn6a3639cflv3zhs3i7vkfbsvbf5" {}; -libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1mhi8n66864y98dr3n0pkqad3aqim800kn9bxzp6h5jf2jni3aql" {}; -libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "18rb4dqjdf3krzi4hdj5i310gy49ipf01klbkp9g51i02a55gphq" {}; -libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "1ysvg6d28xyaky9sn7giglnsflhjsbj17h3h3i6knlzxnzznpkql" {}; -Librpcsvc = applePackage' "Librpcsvc" "26" "macos-11.0.1" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; -Libsystem = applePackage' "Libsystem" "1292.50.1" "macos-11.0.1" "0w16zaigq18jfsnw15pfyz2mkfqdkn0cc16q617kmgw2khld8j7j" {}; -libunwind = applePackage' "libunwind" "200.10" "macos-11.0.1" "1pmymcqpfk7lfxh6zqch429vfpvmd2m1dlg898170pkx5zhxisl2" {}; -libutil = applePackage' "libutil" "58.40.2" "macos-11.0.1" "1hhgashfj9g4vjv02070c5pn818a5n0bh5l81l2pflmvb2rrqs3f" {}; -mDNSResponder = applePackage' "mDNSResponder" "1310.40.42" "macos-11.0.1" "0d0b9wwah9rg7rwrr29dxd6iy0y4rlmss3wcz2wcqmnd2qb9x8my" {}; -network_cmds = applePackage' "network_cmds" "606.40.2" "macos-11.0.1" "1dlslk67npvmxx5m50385kmn3ysxih2iv220hhzkin11f8abdjv7" {}; -objc4 = applePackage' "objc4" "818.2" "macos-11.0.1" "177gmh9m9ajy6mvcd2sf7gqydgljy44n3iih0yqsn1b13j784azx" {}; -PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1n5yn6sc8w67g8iism6ilkyl33j46gcnlqcaq6k16zkngx6lprba" {}; -ppp = applePackage' "ppp" "877.40.2" "macos-11.0.1" "1z506z8ndvb1lfr4pypfy2bnig6qimhmq3yhjvqwfnliv91965iq" {}; -removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "1fhp47awi15f02385r25qgw1ag5z0kr1v3kvgqm3r8i8yysfqvwp" {}; -Security = applePackage' "Security" "59754.41.1" "macos-11.0.1" "00kqgg7k80ba70ar2c02f0q9yrdgqcb56nb9z5g0bxwkvi40ryph" {}; -shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "1mvp1fp34kkm4mi85fdn3i0l0gig4c0w09zg2mvkpxcf68cq2f69" {}; -system_cmds = applePackage' "system_cmds" "880.40.5" "macos-11.0.1" "1kys4vwfz4559sspdsfhmxc238nd8qgylqypza3zdzaqhfh7lx2x" {}; -text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "0cpnfpllwpx20hbxzg5i5488gcjyi9adnbac1sd5hpv3bq6z1hs5" {}; -top = applePackage' "top" "129" "macos-11.0.1" "1nyz5mvq7js3zhsi3dwxl5fslg6m7nhlgc6p2hr889xgyl5prw8f" {}; -xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "14wqkqp3lcxgpm1sjnsysybrc4ppzkghwv3mb5nr5v8ml37prkib" {}; +CommonCrypto = applePackage' "CommonCrypto" "60178.40.2" "macos-11.0.1" "129gsxhhcxqycg0zjrdrz2ay4dv2ih1ckafqh33qrc499z8dam2p" {}; +Csu = applePackage' "Csu" "88" "macos-11.0.1" "1lzp9x8iv60c2h12q2s89nf49b5hvpqq4a9li44zr2fxszn8lqxh" {}; +ICU = applePackage' "ICU" "66108" "macos-11.0.1" "0mclizp99daihghqy2sgzjkid8i93dsn5pi8q9p7b3156chrhw57" {}; +Libc = applePackage' "Libc" "1439.40.11" "macos-11.0.1" "12k5sbz2k1pl839w2lk9iw414zzl50zdjzgq2x6bm20yjbfj69qm" {}; +Libinfo = applePackage' "Libinfo" "542.40.3" "macos-11.0.1" "18jvl7cdg64x6clhsfv5pbzxis2aldddpca5r81xqakrmi9mck80" {}; +Libnotify = applePackage' "Libnotify" "279.40.4" "macos-11.0.1" "1vr11s0c42ssjs29shy1m8rj008np7aswdzjpimsfzyav47jb6y7" {}; +Librpcsvc = applePackage' "Librpcsvc" "26" "macos-11.0.1" "0wf6srbw28664wa0dckldbhrl9ydg70fms06rj6i7mvlrz1ccxk0" {}; +Libsystem = applePackage' "Libsystem" "1292.50.1" "macos-11.0.1" "0d3flh1p4kskic8ypi8wia4kinfbprx9fvyfqc3mcq0710i0gy77" {}; +PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1sb2nz92vdf6v3h17ry0vgw0z9zsva82lhdrhsf3k60jhfw1fi2v" {}; +Security = applePackage' "Security" "59754.41.1" "macos-11.0.1" "0jq70mnwkvrrhws64ipx0i68pi3n0sk95jlhacxxikdj9f4hpbsw" {}; +adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0sskwl3jc7llbrlyd1i7qlb03yhm1xkbxd1k9xhh7f9wqhlzq31j" {}; +architecture = applePackage' "architecture" "279" "macos-11.0.1" "19s93rqr9r98qh0rlndf7kv3v4n1ifh9i539mbpsx6kbixcx8vvp" {}; +basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "1913pzk376zfap2fwmrb233rkn4h4l2c65nd7s8ixvrz1r7cz0q5" {}; +bootstrap_cmds = applePackage' "bootstrap_cmds" "121" "macos-11.0.1" "0qgbgwijv7xqmm9gn74jibyw2dh516xpj7h1grj2j1i80m3b16bl" {}; +configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "024ny63lpwzgnm8g28hh8dldvmmislmrl298n721rm0blqjhahz5" {}; +copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "1j20909inn2iw8n51b8vk551wznfi3bhfziy8nbv08qj5lk50m04" {}; +diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "0wr60vyvgkbc4wyldnsqas0xss2k1fgmbdk3vnhj6v6jqa98l1ny" {}; +dtrace = applePackage' "dtrace" "370.40.1" "macos-11.0.1" "1qj74mix1x3drffr1qpafm57aby42bc61kynba5q0ppbcf0lrbp1" {}; +dyld = applePackage' "dyld" "832.7.1" "macos-11.0.1" "01q7fsibr6xp94l3w22sh8qfjgwzzf1v82mhgq39ivkxwwc4jdy0" {}; +eap8021x = applePackage' "eap8021x" "304.40.1" "macos-11.0.1" "1aihyklri64w380d1mvi830n5cnzs9gd38z8i9ccd37n48gmz88p" {}; +file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "0p077lnbcy8266m03a0fssj4214bjxh88y3qkspnzcvi0g84k43q" {}; +hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51dml9v098i4crr2m1vivnx4xj75" {}; +libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {}; +libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {}; +libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0lwa4brdwm4lvrdnxylzsn1yph4m7csgri2zkc4xb4xiisz32pwp" {}; +libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {}; +libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {}; +libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "045ahh8nvaam9whryc2f5g5xagwp7d187r80kcff82snp5p66aq1" {}; +libunwind = applePackage' "libunwind" "200.10" "macos-11.0.1" "0wa4ssr7skn5j0ncm1rigd56qmbs982zvwr3qpjn28krwp8wvigd" {}; +libutil = applePackage' "libutil" "58.40.2" "macos-11.0.1" "11s0vizk7bg0k0yjx21j8vaji4j4vk57131qbp07i9lpksb3bcy4" {}; +mDNSResponder = applePackage' "mDNSResponder" "1310.40.42" "macos-11.0.1" "0xxrqqbqsf0pagfs1yzwfbwf7lhr0sns97k18y7kh4ri0p09h44c" {}; +network_cmds = applePackage' "network_cmds" "606.40.2" "macos-11.0.1" "1jsy13nraarafq6wmgh3wyir8wrwfra148xsjns7cw7q5xn40a1w" {}; +objc4 = applePackage' "objc4" "818.2" "macos-11.0.1" "0m8mk1qd18wqjfn2jsq2lx6fxvllhmadmvz11jzg8vjw8pq91nw2" {}; +ppp = applePackage' "ppp" "877.40.2" "macos-11.0.1" "06xznc77j45zzi12m4cmr3jj853qlc8dbmynbg1z6m9qf5phdbgk" {}; +removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "0870ihxpmvj8ggaycwlismbgbw9768lz7w6mc9vxf8l6nlc43z4f" {}; +shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "0wbysc9lwf1xgl686r3yn95rndcmqlp17zc1ig9gsl5fxyy5bghh" {}; +system_cmds = applePackage' "system_cmds" "880.40.5" "macos-11.0.1" "064yqf84ny0cjpqmzmnhz05faay6axb2r4i6knnyc8n21yiip5dc" {}; +text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "17fn35m6i866zjrf8da6cq6crydp6vp4zq0aaab243rv1fx303yy" {}; +top = applePackage' "top" "129" "macos-11.0.1" "0d9pqmv3mwkfcv7c05hfvnvnn4rbsl92plr5hsazp854pshzqw2k" {}; +xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "11zjmpw11rcc6a0xlbwramra1rsr65s4ypnxwpajgbr2c657lipl" {}; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 9a95eb04e6efe..367c0f50d038e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -7,7 +7,7 @@ appleDerivation { # Work around error from <stdio.h> on aarch64-darwin: # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - NIX_CFLAGS_COMPILE = "-Wno-error=undef-prefix -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=undef-prefix -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; # "spray" requires some files that aren't compiling correctly in xcbuild. # "rtadvd" seems to fail with some missing constants. 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 2fc4afa77d9f8..315f0fb06219b 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/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index d42d142ef6ee7..0c40bc3b18688 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -9,10 +9,10 @@ appleDerivation { buildInputs = [ libutil Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF apple_sdk.frameworks.IOKit openbsm ]; - # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" + # env.NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; - NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" + env.NIX_CFLAGS_COMPILE = toString ([ "-DDAEMON_UID=1" "-DDAEMON_GID=1" "-DDEFAULT_AT_QUEUE='a'" "-DDEFAULT_BATCH_QUEUE='b'" @@ -28,7 +28,7 @@ appleDerivation { "-DAHZV1=64 " "-DAU_SESSION_FLAG_HAS_TTY=0x4000" "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000" - ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ "; + ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ "); patchPhase = '' substituteInPlace login.tproj/login.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 672bb443242bd..c99523d6c8616 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -20,7 +20,7 @@ appleDerivation { done ''; - NIX_CFLAGS_COMPILE=[ "-Wno-error=format-security" ]; # hardeningDisable doesn't cut it + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" ]; # hardeningDisable doesn't cut it meta = { platforms = lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix index ef766f7bd7f1e..2a47de021dc6c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/top/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/top/default.nix @@ -5,7 +5,7 @@ appleDerivation { buildInputs = [ apple_sdk.frameworks.IOKit ncurses libutil ]; # Workaround build failure on -fno-common toolchains: # duplicate symbol '_tsamp' in: main.o top.o - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lutil"; installPhase = '' install -D Products/Release/libtop.a $out/lib/libtop.a diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 266c2ef4dfef5..262cb3d6a3870 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -75,7 +75,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( ARCHS = arch; ARCH_CONFIGS = arch; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; preBuild = let macosVersion = "10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9 10.10 10.11" + diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/os-specific/darwin/grandperspective/default.nix new file mode 100644 index 0000000000000..a1156c7cb8730 --- /dev/null +++ b/pkgs/os-specific/darwin/grandperspective/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, undmg, ... }: + +stdenv.mkDerivation rec { + version = "3.0.1"; + pname = "grandperspective"; + + src = fetchurl { + inherit version; + url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${builtins.replaceStrings [ "." ] [ "_" ] version}.dmg"; + sha256 = "sha256-ZPqrlN9aw5q7656GmmxCnTRBw3lu9n952rIyun8MsiI="; + }; + + sourceRoot = "GrandPerspective.app"; + buildInputs = [ undmg ]; + installPhase = '' + mkdir -p "$out/Applications/GrandPerspective.app"; + cp -R . "$out/Applications/GrandPerspective.app"; + ''; + + meta = with lib; { + description = "Open-source macOS application to analyze disk usage"; + longDescription = '' + GrandPerspective is a small utility application for macOS that graphically shows the disk usage within a file + system. It can help you to manage your disk, as you can easily spot which files and folders take up the most + space. It uses a so called tree map for visualisation. Each file is shown as a rectangle with an area proportional to + the file's size. Files in the same folder appear together, but their placement is otherwise arbitrary. + ''; + homepage = "https://grandperspectiv.sourceforge.net"; + license = licenses.gpl2; + maintainers = with maintainers; [ eliandoran ]; + platforms = [ "x86_64-darwin" ]; + }; + +} diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 1313c18970438..c59f854b84756 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ld-mac.cc ''; - NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; buildInputs = [ clang libcxx ]; buildFlags = [ "USE_LIBCXX=1" "release" ]; diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 07645c5e61c65..16456c5fcad4c 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.1"; + version = "1.2.2"; buildInputs = [ AppKit @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-JqHPKLSFq+8hyOjVZbjh4AsHM8zSF7ZVxlEePmnEC2w="; + hash = "sha256-XowMXhGqPcxJ0DS3G41tpBO68va94a7SZHOOgguCxy0="; }; patches = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-isystem ${lib.getDev libcxx}/include/c++/v1" "-I${lib.getDev spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-headers}/include/spirv/unified1/" diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix new file mode 100644 index 0000000000000..37440659d7fd7 --- /dev/null +++ b/pkgs/os-specific/darwin/openwith/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: + +let + arch = if stdenv.isAarch64 then "arm64" else "x86_64"; +in +stdenv.mkDerivation rec { + pname = "openwith"; + version = "unstable-2022-10-28"; + + src = fetchFromGitHub { + owner = "jdek"; + repo = "openwith"; + rev = "a8a99ba0d1cabee7cb470994a1e2507385c30b6e"; + hash = "sha256-lysleg3qM2MndXeKjNk+Y9Tkk40urXA2ZdxY5KZNANo="; + }; + + nativeBuildInputs = [ swift ]; + + buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; + + makeFlags = [ "openwith_${arch}" ]; + + installPhase = '' + runHook preInstall + install openwith_${arch} -D $out/bin/openwith + runHook postInstall + ''; + + meta = with lib; { + description = "Utility to specify which application bundle should open specific file extensions"; + homepage = "https://github.com/jdek/openwith"; + license = licenses.unlicense; + maintainers = with maintainers; [ zowoq ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 57feb54614a0a..ef55246535296 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -10,13 +10,13 @@ in stdenv.mkDerivation rec { pname = "sketchybar"; - version = "2.13.2"; + version = "2.14.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${version}"; - sha256 = "sha256-EPpD1QuJXFFwWcs1gmhjf9zm6mkEM72Zr8NOAAgxI4I="; + hash = "sha256-TTpOFupLyCko5+EZJ3kJWu6OD35qfLpM8N7zq+eMvMM="; }; buildInputs = [ Carbon Cocoa DisplayServices SkyLight ]; diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index a1e3c49148792..7fe0f84606ce1 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 6d1929ef982ce..ec98a0b1cfb6c 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -41,31 +41,44 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); in lib.makeExtensible (self: { - xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; - xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; - xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; - xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; - xcode_9_3 = requireXcode "9.3" "12m9kb4759s2ky42b1vf7y38qqxn2j99s99adzc6ljnmy26ii12w"; - xcode_9_4 = requireXcode "9.4" "00az1cf9pm8zmvzs6yq04prdmxp8xi3ymxw94jjh4mh7hlbkhcb7"; - xcode_9_4_1 = requireXcode "9.4.1" "0y9kphj86c14jl6aibv57sd7ln0w06vdhzm8ysp0s98rfgyq2lbw"; - xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v"; - xcode_10_2 = requireXcode "10.2" "1xzybl1gvb3q5qwlwchanzpws4sb70i3plf0vrzvlfdp2hsb3pg7"; - xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; - xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; - xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; - xcode_11_1 = requireXcode "11.1" "1c2gzc4jhhx5a7ncg19sh1r99izhipybaqxl1ll52x5y8689awc1"; - xcode_11_2 = requireXcode "11.2" "1lm3q8zpvm184246h5j9mw4c1y9kk9sxnr3j98kfm0312n0l98gj"; - xcode_11_3 = requireXcode "11.3" "04rv6xlywy8xqfx9ma8ygsdw4yhckk2mq0qnklxnfly899iw4wza"; - xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4"; - xcode_11_4 = requireXcode "11.4" "065rpb3rdk19nv3rwyf9bk32ccbd0lld12gj12l89cyg65mhpyy7"; - xcode_11_5 = requireXcode "11.5" "1dizazq9nz1vjkc5gy7dd4x760mkfjiifk1hf6d9mscchdq8rfkw"; - xcode_11_6 = requireXcode "11.6" "1y4fhw1kiphzxdb4wpv697z5r0algvaldwq5iqv266797rnfql4x"; - xcode_11_7 = requireXcode "11.7" "0422rdc4j5qwyk59anbybxyfv0p26x0xryszm0wd8i44g66smlmj"; - xcode_12 = requireXcode "12" "1w3xm268pyn5m04wv22invd5kr2k4jqllgrzapv6n1sxxynxrh8z"; - xcode_12_0_1 = requireXcode "12.0.1" "1p6vd5ai0hh3cq6aflh4h21ar0shxnz8wlkaxwq7liwsdmkwzbl0"; - xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; - xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; - xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; + xcode_8_1 = requireXcode "8.1" "sha256-VuAovU/b4rcLh+xMtcsZmbTWwTk35VGfMSp+fqPbsqM="; + xcode_8_2 = requireXcode "8.2" "sha256-ohqgGD7JEEmXEvmfn/N9Ga2lM8jNwhIuh+ky7PQPzY4="; + xcode_9_1 = requireXcode "9.1" "sha256-LG7pVMh1rNh5uP/bASvV9sKvGDrSGWH90J4gzwcgYSk="; + xcode_9_2 = requireXcode "9.2" "sha256-jMiG2G2zoGw4m00CjkGE+2cn0qeOdSUcXosZI2577q0="; + xcode_9_3 = requireXcode "9.3" "sha256-XIQYjfDVSmrYbyolnZIUtmOMhj9uhyWIn0KncsiaqYo="; + xcode_9_4 = requireXcode "9.4" "sha256-ZzE4F4UHVgKlJIn36kfs6Pba8iUAe6P/rh/VmxwLXwE="; + xcode_9_4_1 = requireXcode "9.4.1" "sha256-fFGB/XMZJQ2u9qh+2LYBHFh6mj5lr6gMlSQwgyS8M3k="; + xcode_10_1 = requireXcode "10.1" "sha256-u4Br3SsWbPCv6r4vGHFQUQmfPb9oUEmcdCFktMlbTes="; + xcode_10_2 = requireXcode "10.2" "sha256-592xNBS3Obp/3sDROyI4SxPN77cKMk45Lnis/QJd/vc="; + xcode_10_2_1 = requireXcode "10.2.1" "sha256-r65DbLDpiFJ78VH2hvfp7ZVpehoI44PSnaeDbElZTYc="; + xcode_10_3 = requireXcode "10.3" "sha256-61lDed7/Wi6uVBaj6/fUELISvmH3j69dQE19Y91GwsQ="; + xcode_11 = requireXcode "11" "sha256-EDM5tjuzGTzlVUg6MJKup/Q2OBrFXjzFdXSRO+eQA+Q="; + xcode_11_1 = requireXcode "11.1" "sha256-gXGVkEG+dFEoDbRjtfyN8MeUcoA6hcfsUaVDKAn7T7A="; + xcode_11_2 = requireXcode "11.2" "sha256-8qFEgRVhgOomSnJk23WaM/nACK9JFmiIICjUfT/Co9I="; + xcode_11_3 = requireXcode "11.3" "sha256-6nPCY0rIU2c7nRYDXMWcDHrCm34eqZq6wx157mk3OxM="; + xcode_11_3_1 = requireXcode "11.3.1" "sha256-BI8Olfqyxh51jyNpydiRkPwTQ4OK+ZpHUybPkCSL1tw="; + xcode_11_4 = requireXcode "11.4" "sha256-x/sLazHPs4SoCPKJ0CgFbTEmxlzJeZ7HtinMlse6uRg="; + xcode_11_5 = requireXcode "11.5" "sha256-fLqMcIOM6ZqacTBMF6N0swJzOmnt+FfYlDt8m/BXP7Y="; + xcode_11_6 = requireXcode "11.6" "sha256-nVDsbD7pGCM2jgXzRtV+VIFc/klmX05W6x/eOAOHjvg="; + xcode_11_7 = requireXcode "11.7" "sha256-stKqjXmERNQ4qF/73EE34oLtfF9+WZXK9BwXSVjLQhA="; + xcode_12 = requireXcode "12" "sha256-H8Hcre9dB2v2VT8/SrEkU+RZ2rZRiM0JqMX6i4yoffA="; + xcode_12_0_1 = requireXcode "12.0.1" "sha256-gK7PZ22aR3ow72pSjr7tUIOsgoAEUqcMZgNCEFVp29w="; + xcode_12_1 = requireXcode "12.1" "sha256-l4+MW8IWMqR/9dxd9FVtfxJs3M/qtIcj6nyQ2cjxLfI="; + xcode_12_2 = requireXcode "12.2" "sha256-G8jku/9WB8Q1zgKWGbSv06bSWE385sPlc7xnfonjIJ4="; + xcode_12_3 = requireXcode "12.3" "sha256-CYU2fAeT+DWiK/mpRoGv57RjGfseL23BDU57SokPjk8="; + xcode_12_4 = requireXcode "12.4" "sha256-Qw4j+XFry85/AviHQVhjjjKLAfmRNNwMGN5G8FheJwQ="; + xcode_12_5 = requireXcode "12.5" "sha256-xiGffnV0P9Ojd6IrJSXILUX4oznPif7zm00WAksn3qU="; + xcode_12_5_1 = requireXcode "12.5.1" "sha256-zL0kS86ZzBkIrKLPKvWguDvXj9Tqbr7uR/VZaT/uZ9A="; + xcode_13 = requireXcode "13" "sha256-uTY6d5DBu4OOQLkxs3ExDfLXh50rE2LLlqtCbk3Qn6E="; + xcode_13_1 = requireXcode "13.1" "sha256-vd+4eFVaAyvXsdaExcfbDZSXOwkpt+rEbkBYSMjdUEA="; + xcode_13_2 = requireXcode "13.2" "sha256-guJXm/QnMfvUZwAcJwoy0QeO+DpDcUhs8AxVKvm9tYQ="; + xcode_13_2_1 = requireXcode "13.2.1" "sha256-r832Uu+Q8utK4zN0CtwiMCvMYT5HstWInyq4cNIaZJM="; + xcode_13_3 = requireXcode "13.3" "sha256-p2zaWMpmUeNHQtYOOaVdhCt3cgapvzL3l73/J+UwzCE="; + xcode_13_3_1 = requireXcode "13.3.1" "sha256-j71vpJVJpyj/IOlL+4+5lYgOlhf/zn+7ExIHbxL51cQ="; + xcode_13_4 = requireXcode "13.4" "sha256-IY1coss90GlBeJg/HQPMU8v2rOOxsqlY5q+2Qxe8nnY="; + xcode_13_4_1 = requireXcode "13.4.1" "sha256-Jk8fLgvnODoIhuVJqfV0KrpBBL40fRrHJbFmm44NRKE="; + xcode_14 = requireXcode "14" "sha256-E+wjPgQx/lbYAsauksdmGsygL5VPBA8R9pHB93eA7T0="; + xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs="; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index db8ede6feb81a..560f2bf301474 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -3,15 +3,16 @@ , fetchurl , alsa-topology-conf , alsa-ucm-conf +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; - version = "1.2.7.2"; + version = "1.2.8"; src = fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8="; + url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-GrAbdOM0JcqZwuNsCET9aIgnMZO9iYJA/o+TrMvL80c="; }; patches = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; @@ -41,7 +44,8 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; + pkgConfigModules = [ "alsa" "alsa-topology" ]; platforms = platforms.linux; maintainers = with maintainers; [ l-as ]; }; -} +}) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index 512fe605b6e51..4568ecf1e7a8b 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.7.1"; + version = "1.2.8"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-rFsqEnV4Pv8H4cs0w2xsWYd0JnmjQAN1B8BKncHSLKw="; + hash = "sha256-/uSnN4MP0l+WnYPaRqKyMb6whu/ZZvzAfSJeeCMmCug="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 2a98aa82ebbd5..7329dc7df2ce6 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation rec { systemd ]; + # Flag needed by GCC 12 but unrecognized by GCC 9 (aarch64-linux default now) + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (with stdenv; cc.isGNU && lib.versionAtLeast cc.version "12") [ + "-Wno-error=mismatched-new-delete" + ]); + patchPhase = '' patchShebangs scripts diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index da0660ad11395..e6961684d0e4a 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -5,15 +5,18 @@ , nixosTests }: +let + tag = "0.3.0"; +in stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-10-20-${kernel.version}"; + version = "${tag}-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "e6eb67c92d425d395eac1c4403629391bdd5064d"; - sha256 = "sha256-6rv5qZCjOqt0FaNFhA3tYg6/SdssvoT8kPVhalajgOo="; + rev = "v${tag}"; + sha256 = "sha256-ABFqkiIJuFapFsUIFHfw8+TujePZm7ZX/qHuFO2KdnQ="; }; hardeningDisable = [ "pic" ]; @@ -29,6 +32,15 @@ stdenv.mkDerivation { 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/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 47f76649dea94..808d1bc423763 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "atop"; - version = "2.7.1"; + version = "2.8.1"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "sha256-ykjS8X4HHe6tXm6cyeOIv2oycNaV5hl2s3lNTZJ7XE4="; + sha256 = "sha256-lwBYoZt5w0RPlx+FRXKg5jiR3C1fcDf/g3VwhUzg2h4="; }; nativeBuildInputs = lib.optionals withAtopgpu [ diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 5e552301fe48e..48d12abcf2f5e 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # configure script is not finding the right path - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; installPhase = '' make install SUBDIRS="lib daemon modules man" # all but samples diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix index 9167b4e5f89db..600e02de7074a 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 0000000000000..05ec0cfad222d --- /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 0000000000000..8d75ad454cfe2 --- /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/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 886bf3e6fee8c..8312d64acddc6 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { preBuild = '' substituteInPlace Makefile \ - --replace "\$(shell uname -r)" "${kernel.modDirVersion}" \ --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index e44f90a36367e..8ff4b16a1a533 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 020aee04af79d..303eb801478c4 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -130,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/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0c6a6f6486722..cb58ed48bb131 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-S43KS/qpzxU+Sgkcud4Cyx4yRjaT6SZzLv6R6bg5I2w="; + sha256 = "sha256-PBqq3u8zym+RY6xudJ66ItzDZEJBNvJDtve1GtxcOdQ="; }; buildInputs = with llvmPackages; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 3feb590eb5d64..8a510a4d0c5d6 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/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 7d6431b5ced6c..68c058789bbba 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 = "20230120"; + version = "20230228"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-uJtB+IldDVj9uwpUECu0kLx8WCjbLNFb6C0U0ZRjpXk="; + sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM="; }; # 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 5475a565b09ba..71bde6220a02d 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/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 70fc58232ab49..8a4a852a47327 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; # Fix build on Linux kernel >= 5.18 - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index 2b483e2c7c768..c6bf684f7fc88 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -10,24 +10,17 @@ , 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 @@ -76,23 +69,16 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [ coreutils util-linux - ]} --prefix DRACUT_PATH : ${lib.makeBinPath [ + ]} --suffix DRACUT_PATH : ${lib.makeBinPath [ bash binutils coreutils findutils - glibc gnugrep gnused gnutar - kbd - lvm2 - procps - rng-tools - squashfsTools - systemd + stdenv.cc.libc # for ldd command util-linux - busybox ]} wrapProgram $out/bin/dracut-catimages --set PATH ${lib.makeBinPath [ coreutils @@ -119,7 +105,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://dracut.wiki.kernel.org"; + homepage = "https://github.com/dracutdevs/dracut/wiki"; description = "An event driven initramfs infrastructure"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lilyinstarlight ]; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index bca24d9c90507..31a5dbd68f9d2 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "LOCALSTATEDIR=/var" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; preInstall = "mkdir -p $out/etc/sysconfig"; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index e4ac8c3929d6a..6243076a2111b 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # tests sporadically fail on musl + doCheck = !stdenv.hostPlatform.isMusl; meta = with lib; { homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index f0a05437b6823..a7843ee3894c4 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.8.0"; + version = "2.8.3"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-Nw86s93v8ahc/yt5sNsGz4LRwzDPtBnIZNno8vpFdsY="; + sha256 = "sha256-Z5BCqqC4FNKHqpocJ6CsHwhh5sszj5QfxiN6+Dkaqek="; }; hardeningDisable = [ "pic" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = kernel.makeFlags; # linux 3.12 - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; configurePhase = '' runHook preConfigure diff --git a/pkgs/os-specific/linux/error-inject/default.nix b/pkgs/os-specific/linux/error-inject/default.nix index 87a40580deb74..f4a5441721762 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/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b94f4351ff52b..f8f4f400ade22 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,16 +2,16 @@ 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"; + env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 03ab973c8b994..88ac5add34a74 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.05.00"; + version = "0.05.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0="; + hash = "sha256-raODDA1EKtZThFg0NV6EfrWj5mSQNaiekywfOfAvYXI="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index ee6f448112d88..3d2445df49806 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -1,11 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, kernel }: stdenv.mkDerivation rec { - # linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 - # Assertion moved here due to some tests unintenionally triggering it, - # e.g. nixosTests.kernel-latest; it's unclear how/why so far. - assertion = assert lib.versionOlder kernel.version "5.8"; null; - name = "exfat-nofuse-${version}-${kernel.version}"; version = "2020-04-15"; diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix new file mode 100644 index 0000000000000..d8769b0f04de1 --- /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 9ab8eac772cea..64607c5653eb5 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { # Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file substituteInPlace src/include/common.h \ --replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy' + + # Workaround for regression introduced in 0.9.72 preventing usage of + # end-of-options indicator "--" + # See https://github.com/netblue30/firejail/issues/5659 + substituteInPlace src/firejail/sandbox.c \ + --replace " && !arg_doubledash" "" ''; preConfigure = '' diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix index 42aca54e93320..28da48c31cd78 100644 --- a/pkgs/os-specific/linux/firmware/ath9k/default.nix +++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ m4 cmake perl ]; - NIX_CFLAGS_COMPILE = "-w"; # old libiberty emits fatal warnings + env.NIX_CFLAGS_COMPILE = "-w"; # old libiberty emits fatal warnings dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index ee36ab5744266..3ae23aa560716 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)'"; - - installPhase = "make prefix='$(out)' install"; - - cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U="; - - doCheck = false; + nativeBuildInputs = with rustPlatform; [ + rust.cargo + rust.rustc + pkg-config + cargoSetupHook + wrapGAppsHook + ]; + + buildInputs = [ + openssl + gtk3 + udev + ]; + + makeFlags = [ "prefix=$(out)" ]; meta = { description = "Graphical frontend for firmware management"; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 4571608798710..8939aef06c542 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -54,6 +54,7 @@ , libmbim , libcbor , xz +, enableFlashrom ? false }: let @@ -76,7 +77,7 @@ let # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental - haveFlashrom = false; + haveFlashrom = isx86 && enableFlashrom; runPythonCommand = name: buildCommandPython: runCommand name { nativeBuildInputs = [ python3 ]; @@ -116,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.9"; + version = "1.8.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -125,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - hash = "sha256-cZp5GsS6WYiuuT7EJ3i9ZdM8sHXQwJO1wE5eFoK+Uoo="; + hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; patches = [ @@ -332,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" @@ -347,6 +347,8 @@ let "fwupd/redfish.conf" ] ++ lib.optionals haveMSR [ "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" ]; # DisabledPlugins key in fwupd/daemon.conf diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index e882ddd69b436..a2229a0a60ce4 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -33,5 +33,8 @@ stdenvNoCC.mkDerivation rec { priority = 6; # give precedence to kernel firmware }; - passthru = { inherit version; }; + passthru = { + inherit version; + updateScript = ./update.sh; + }; } diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 2ed667f40ce73..4e59ca0b89eba 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 = "20221214"; - sourceHash = "sha256-vljUwXekmCYAH932wfbJe/hC4TDPRQOgEiPTUMeUKLE="; - outputHash = "sha256-h0cCqnl6XvSoeyq54JHvl45z7qe/7ZKrcMNJJeqVLMk="; + version = "20230210"; + sourceHash = "sha256-sjUO+DTjAMszfCkNSYjLS+AbceIVPVVH0OEho5VOIFA="; + outputHash = "sha256-ZcmMLenblgQngdYui0wNANXhB5a/z635nNXo/MO83R8="; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index d6b951a7f55c6..72c6f6235548d 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { hash = "sha512-KMHgj73eXHT++IE8DbCsFeJ87ngc9R3XxMUJy4Z3s4/MtMeB9zblADHkyJqz9oyeugeJTrDtuVETPBRo7M4Y8A=="; }; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-march=armv8-a+crc" ]; diff --git a/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix deleted file mode 100644 index b7289625dae9f..0000000000000 --- a/pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenvNoCC, lib, fetchFromGitHub }: - -stdenvNoCC.mkDerivation { - pname = "rtw89-firmware"; - - # 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; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/firmware/rtw89 - cp *.bin $out/lib/firmware/rtw89 - - runHook postInstall - ''; - - meta = with lib; { - description = "Driver for Realtek 8852AE, an 802.11ax device"; - homepage = "https://github.com/lwfinger/rtw89"; - license = licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ tvorog ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 1c3f3342e0815..100b51e301f99 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/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index e967dea1c3e1b..fd925ab654fa8 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - hash = "sha256-kkcZuX8tB7N8l9O3X6H92EqEqdAcqSbX+pwr7GrcRFY="; + hash = "sha256-4Im3YWhLs5Q+o4DtpSuSMuKtKqXaICL9/EB0q5um6mQ="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { --replace "/usr/local" "$out" ''; - vendorSha256 = "sha256-6zcHz7ePJFSxxfIlhVK2VEf6+soBoUInT9ZsZK/Ag78="; + vendorHash = "sha256-APW0XM6fTQOCw4tE1NA5VNN3fBUmsvn99NqqJnB3Q0s="; doCheck = false; diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index d20fb662ff55d..823f523db242b 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream gcc-10: # ld: g15_plugins.o:/build/g15daemon-1.9.5.3/g15daemon/./g15daemon.h:218: # multiple definition of `lcdlist_mutex'; utility_funcs.o:g15daemon.h:218: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 04eccaf024359..43d8de62991af 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple interface for devices supported by the linux UVC driver"; - homepage = "http://guvcview.sourceforge.net"; + homepage = "https://guvcview.sourceforge.net"; maintainers = [ maintainers.coconnor ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix index e876808b461a7..9e85281ea4c0a 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/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 8fb826833704d..d9ae091f8f0fe 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.364"; + version = "0.367"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-9fGYoyj7vN3j72H+6jv/R0MaWPZ+4UNQhCSWnZRZZS4="; + sha256 = "sha256-cFusLjRH7E3TCEREQH4Y9fZLjB6b5IJV/NThdS7c19A="; }; postPatch = '' @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pedrohlc ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 39429cba4b9c6..2917ace349fb2 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-MHjG14vZsuDrR9/SLotb7Uc3RW8Np9E2X0GXkSM+RxE="; + sha256 = "sha256-4DTYtUltmZ+nkm4ZLac+6JbBW3z+qby7sP33LwEXtcQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index a116aef7920a8..6aa369e4eb4a3 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.15"; + version = "7.17"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ClVFqq22QBQsH4iNNmp43fhyR5mWf6IGhqcAU71iF1E="; + sha256 = "sha256-vknJ/0id1mEMrWVB50PDOE6slunyRwfaezkp2PKsZNg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 951c84eaf492c..8396fd5e3d33b 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,42 +1,43 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns -, libcap, libidn2 +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, libxslt +, docbook_xsl_ns +, libcap +, libidn2 , iproute2 , apparmorRulesFromClosure }: -let - version = "20211215"; - sunAsIsLicense = { - fullName = "AS-IS, SUN MICROSYSTEMS license"; - url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "iputils"; - inherit version; + version = "20221126"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1vzdch1xi2x2j8mvnsr4wwwh7kdkgf926xafw5kkb74yy1wac5qv"; + hash = "sha256-XVoQhdjBmEK8TbCpaKLjebPw7ZT8iEvyLJDTCkzezeE="; }; - outputs = ["out" "apparmor"]; + outputs = [ "out" "apparmor" ]; # We don't have the required permissions inside the build sandbox: # /build/source/build/ping/ping: socket: Operation not permitted doCheck = false; mesonFlags = [ - "-DBUILD_RARPD=true" "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" "-DSKIP_TESTS=${lib.boolToString (!doCheck)}" ] - # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] @@ -65,23 +66,19 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/iputils/iputils"; + changelog = "https://github.com/iputils/iputils/releases/tag/${version}"; description = "A set of small useful utilities for Linux networking"; - inherit (src.meta) homepage; - changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; - license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos lheckemann ]; - longDescription = '' A set of small useful utilities for Linux networking including: - arping - clockdiff - ninfod - ping - rarpd - rdisc - tracepath + - arping: send ARP REQUEST to a neighbour host + - clockdiff: measure clock difference between hosts + - ping: send ICMP ECHO_REQUEST to network hosts + - tracepath: traces path to a network host discovering MTU along this path ''; + license = with licenses; [ gpl2Plus bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 600dd8a33a4a8..b221598c0e74e 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.8"; + version = "4.1.9"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; - rev = "v${version}"; - hash = "sha256-b+1EM172NRnnTcbJOwBQfytIRuIr8zZBlKBBV/e7Ttg="; + rev = "refs/tags/v${version}"; + hash = "sha256-sKrjn/XQANiXfkjNiFfvAkmONyQjVigFBKgcGkuIPs0="; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 34fbde9d676ac..a64787cac1ebc 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,11 +1,8 @@ { stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header -, bison ? null, flex ? null, python ? null, rsync ? null +, bison, flex, rsync , writeTextFile }: -assert stdenvNoCC.hostPlatform.isAndroid -> - (flex != null && bison != null && python != null && rsync != null); - let # As part of building a hostPlatform=mips kernel, Linux creates and runs a @@ -50,7 +47,7 @@ let nativeBuildInputs = [ perl elf-header ] ++ lib.optionals stdenvNoCC.hostPlatform.isAndroid [ - flex bison python rsync + bison flex rsync ] ++ lib.optionals (stdenvNoCC.buildPlatform.isDarwin && stdenvNoCC.hostPlatform.isMips) [ darwin-endian-h diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2fee060932ede..bbd743b4dfc2c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -70,12 +70,22 @@ let PM_ADVANCED_DEBUG = yes; PM_WAKELOCKS = yes; POWERCAP = yes; + # ACPI Firmware Performance Data Table Support + ACPI_FPDT = whenAtLeast "5.12" (option yes); + # ACPI Heterogeneous Memory Attribute Table Support + ACPI_HMAT = whenAtLeast "5.2" (option yes); + # ACPI Platform Error Interface + ACPI_APEI = (option yes); + # APEI Generic Hardware Error Source + ACPI_APEI_GHES = (option yes); } // optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; X86_AMD_PSTATE = whenAtLeast "5.17" yes; + # Intel DPTF (Dynamic Platform and Thermal Framework) Support + ACPI_DPTF = whenAtLeast "5.10" yes; }; external-firmware = { @@ -283,7 +293,7 @@ let DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; - DRM_VMWGFX_FBCON = yes; + DRM_VMWGFX_FBCON = whenOlder "6.2" yes; # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets @@ -431,7 +441,7 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_V2_ACL = yes; + NFSD_V2_ACL = whenOlder "6.2" yes; NFSD_V3 = whenOlder "5.18" yes; NFSD_V3_ACL = yes; NFSD_V4 = yes; @@ -457,7 +467,7 @@ let CEPH_FS_POSIX_ACL = yes; SQUASHFS_FILE_DIRECT = yes; - SQUASHFS_DECOMP_MULTI_PERCPU = yes; + SQUASHFS_DECOMP_MULTI_PERCPU = whenOlder "6.2" yes; SQUASHFS_XATTR = yes; SQUASHFS_ZLIB = yes; SQUASHFS_LZO = yes; @@ -502,8 +512,8 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG - RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG + RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules @@ -632,6 +642,9 @@ let XEN_SAVE_RESTORE = option yes; XEN_SCRUB_PAGES = whenOlder "4.19" yes; XEN_SELFBALLOONING = whenOlder "5.3" yes; + + # Enable device detection on virtio-mmio hypervisors + VIRTIO_MMIO_CMDLINE_DEVICES = yes; }; media = { @@ -830,7 +843,7 @@ let EFI_STUB = yes; # EFI bootloader in the bzImage itself EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = - whenAtLeast "5.8" yes; # initrd kernel parameter for EFI + whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI CGROUPS = yes; # used by systemd FHANDLE = yes; # used by systemd SECCOMP = yes; # used by systemd >= 231 diff --git a/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch b/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch new file mode 100644 index 0000000000000..2b59a508fdac0 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch @@ -0,0 +1,87 @@ +From 1640688018f329559c61352646f283f98938af31 Mon Sep 17 00:00:00 2001 +From: Cole Helbling <cole.helbling@determinate.systems> +Date: Thu, 16 Feb 2023 09:30:21 -0800 +Subject: [PATCH] Revert "RDMA/irdma: Report the correct link speed" + +This reverts commit 425c9bd06b7a70796d880828d15c11321bdfb76d. + +Some Equinix Metal instances, such as a3.large.x86, m3.large.x86 +(specific hardware revisions), and n3.large.x86, use the `ice` kernel +driver for their network cards, in conjunction with bonded devices. +However, this commit caused a regression where these bonded devices +would deadlock. This was initially reported by Jaroslav Pulchart on +the netdev mailing list[1], and there were follow-up patches from Dave +Ertman[2][3] that attempted to fix this but were not up to snuff for +various reasons[4]. + +Specifically, v2 of the patch ([3]) appears to fix the issue on some +devices (tested with 8086:159B network cards), while it is still broken +on others (such as an 8086:1593 network card). + +We revert the patch exposing the issue until upstream has a working +solution in order to make Equinix Metal instances work reliably again. + +[1]: https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/ +[2]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230111183145.1497367-1-david.m.ertman@intel.com/ +[3]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230215191757.1826508-1-david.m.ertman@intel.com/ +[4]: https://lore.kernel.org/netdev/cb31a911-ba80-e2dc-231f-851757cfd0b8@intel.com/T/#m6e53f8c43093693c10268140126abe99e082dc1c +--- + drivers/infiniband/hw/irdma/verbs.c | 35 ++++++++++++++++++++++++++--- + 1 file changed, 32 insertions(+), 3 deletions(-) + +diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c +index c5971a840b87..911902d2b93e 100644 +--- a/drivers/infiniband/hw/irdma/verbs.c ++++ b/drivers/infiniband/hw/irdma/verbs.c +@@ -60,6 +60,36 @@ static int irdma_query_device(struct ib_device *ibdev, + return 0; + } + ++/** ++ * irdma_get_eth_speed_and_width - Get IB port speed and width from netdev speed ++ * @link_speed: netdev phy link speed ++ * @active_speed: IB port speed ++ * @active_width: IB port width ++ */ ++static void irdma_get_eth_speed_and_width(u32 link_speed, u16 *active_speed, ++ u8 *active_width) ++{ ++ if (link_speed <= SPEED_1000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_SDR; ++ } else if (link_speed <= SPEED_10000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_FDR10; ++ } else if (link_speed <= SPEED_20000) { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_DDR; ++ } else if (link_speed <= SPEED_25000) { ++ *active_width = IB_WIDTH_1X; ++ *active_speed = IB_SPEED_EDR; ++ } else if (link_speed <= SPEED_40000) { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_FDR10; ++ } else { ++ *active_width = IB_WIDTH_4X; ++ *active_speed = IB_SPEED_EDR; ++ } ++} ++ + /** + * irdma_query_port - get port attributes + * @ibdev: device pointer from stack +@@ -87,9 +117,8 @@ static int irdma_query_port(struct ib_device *ibdev, u32 port, + props->state = IB_PORT_DOWN; + props->phys_state = IB_PORT_PHYS_STATE_DISABLED; + } +- +- ib_get_eth_speed(ibdev, port, &props->active_speed, +- &props->active_width); ++ irdma_get_eth_speed_and_width(SPEED_100000, &props->active_speed, ++ &props->active_width); + + if (rdma_protocol_roce(ibdev, 1)) { + props->gid_tbl_len = 32; +-- +2.39.0 + diff --git a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch b/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch deleted file mode 100644 index 0639f8b4e8fb9..0000000000000 --- a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 2cc99c9cdc8fde5e92e34f9655829449cebd3e00 Mon Sep 17 00:00:00 2001 -From: Dmitry Goldin <dgoldin+lkml@protonmail.ch> -Date: Fri, 4 Oct 2019 10:40:07 +0000 -Subject: kheaders: make headers archive reproducible - -In commit 43d8ce9d65a5 ("Provide in-kernel headers to make -extending kernel easier") a new mechanism was introduced, for kernels ->=5.2, which embeds the kernel headers in the kernel image or a module -and exposes them in procfs for use by userland tools. - -The archive containing the header files has nondeterminism caused by -header files metadata. This patch normalizes the metadata and utilizes -KBUILD_BUILD_TIMESTAMP if provided and otherwise falls back to the -default behaviour. - -In commit f7b101d33046 ("kheaders: Move from proc to sysfs") it was -modified to use sysfs and the script for generation of the archive was -renamed to what is being patched. - -Signed-off-by: Dmitry Goldin <dgoldin+lkml@protonmail.ch> -Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> -Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> - ---- - -nixos note: This patch is from -https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=2cc99c9cdc8fde5e92e34f9655829449cebd3e00 -I commented out the documentation part here, so that it easily applies -to linux 5.2 and 5.3, which does not ship with the reproducible build -documentation yet, which only was introduced recently. - ---- - Documentation/kbuild/reproducible-builds.rst | 13 +++++++++---- - kernel/gen_kheaders.sh | 5 ++++- - 2 files changed, 13 insertions(+), 5 deletions(-) - -#diff --git a/Documentation/kbuild/reproducible-builds.rst b/Documentation/kbuild/reproducible-builds.rst -#index ab92e98c89c8..503393854e2e 100644 -# --- a/Documentation/kbuild/reproducible-builds.rst -#+++ b/Documentation/kbuild/reproducible-builds.rst -#@@ -16,16 +16,21 @@ the kernel may be unreproducible, and how to avoid them. -# Timestamps -# ---------- -# -#-The kernel embeds a timestamp in two places: -#+The kernel embeds timestamps in three places: -# -# * The version string exposed by ``uname()`` and included in -# ``/proc/version`` -# -# * File timestamps in the embedded initramfs -# -#-By default the timestamp is the current time. This must be overridden -#-using the `KBUILD_BUILD_TIMESTAMP`_ variable. If you are building -#-from a git commit, you could use its commit date. -#+* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel -#+ headers embedded in the kernel or respective module, -#+ exposed via ``/sys/kernel/kheaders.tar.xz`` -#+ -#+By default the timestamp is the current time and in the case of -#+``kheaders`` the various files' modification times. This must -#+be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable. -#+If you are building from a git commit, you could use its commit date. -# -# The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros, -# and enables warnings if they are used. If you incorporate external -diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh -index 9ff449888d9c..aff79e461fc9 100755 ---- a/kernel/gen_kheaders.sh -+++ b/kernel/gen_kheaders.sh -@@ -71,7 +71,10 @@ done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1 - find $cpio_dir -type f -print0 | - xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;' - --tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null -+# Create archive and try to normalize metadata for reproducibility -+tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ -+ --owner=0 --group=0 --sort=name --numeric-owner \ -+ -Jcf $tarfile -C $cpio_dir/ . > /dev/null - - echo "$src_files_md5" > kernel/kheaders.md5 - echo "$obj_files_md5" >> kernel/kheaders.md5 --- -cgit 1.2-0.3.lf.el7 - diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 198cd86816466..5a1a710ba3b78 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -15,7 +15,6 @@ with lib.kernel; with (lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); -assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4"); { # Report BUG() conditions and kill the offending process. @@ -65,8 +64,8 @@ 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 = yes; # A port of the PaX structleak plugin - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = yes; # Also cover structs passed by address + GCC_PLUGIN_STRUCTLEAK = option yes; # A port of the PaX structleak plugin + GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = option yes; # Also cover structs passed by address GCC_PLUGIN_STACKLEAK = whenAtLeast "4.20" yes; # A port of the PaX stackleak plugin GCC_PLUGIN_RANDSTRUCT = whenOlder "5.19" yes; # A port of the PaX randstruct plugin GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenOlder "5.19" yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a2cace8bc1e49..9cfcfdfe661fb 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.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" + "name": "linux-hardened-4.14.307-hardened1.patch", + "sha256": "0fqif3brjhjfwdxjwm12allj5pdgdlfm83h6izlgxkn5iy05cviq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.307-hardened1/linux-hardened-4.14.307-hardened1.patch" }, - "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", - "version": "4.14.304" + "sha256": "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f", + "version": "4.14.307" }, "4.19": { "patch": { "extra": "-hardened1", - "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" + "name": "linux-hardened-4.19.274-hardened1.patch", + "sha256": "0hc2ci4jy2jhjmmqmmv6i2g6lj997d8hwgrh68qrraifzd3rjm23", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.274-hardened1/linux-hardened-4.19.274-hardened1.patch" }, - "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", - "version": "4.19.271" + "sha256": "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4", + "version": "4.19.274" }, "5.10": { "patch": { "extra": "-hardened1", - "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" + "name": "linux-hardened-5.10.170-hardened1.patch", + "sha256": "0fr0rzxrpmcddzamdnc15ywpd396dl8j7ycy19a789vhfz3132bz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.170-hardened1/linux-hardened-5.10.170-hardened1.patch" }, - "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", - "version": "5.10.165" + "sha256": "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2", + "version": "5.10.170" }, "5.15": { "patch": { "extra": "-hardened1", - "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" + "name": "linux-hardened-5.15.96-hardened1.patch", + "sha256": "032311r4phsp8cb4vzgdh3gsm4l5494138x1jfwfxhzkgmp4g4yh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.96-hardened1/linux-hardened-5.15.96-hardened1.patch" }, - "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", - "version": "5.15.90" + "sha256": "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l", + "version": "5.15.96" }, "5.4": { "patch": { "extra": "-hardened1", - "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" + "name": "linux-hardened-5.4.233-hardened1.patch", + "sha256": "11df6i0v7xsp363hdqfdixadn5db41ig51pd5fhknpdh1yrpx9by", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.233-hardened1/linux-hardened-5.4.233-hardened1.patch" }, - "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", - "version": "5.4.230" + "sha256": "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js", + "version": "5.4.233" }, "6.1": { "patch": { "extra": "-hardened1", - "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" + "name": "linux-hardened-6.1.14-hardened1.patch", + "sha256": "1r76nhg11sv654hg90gf6s9bmwdbmc88jh7wbpb9cyj63dw8dliv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.14-hardened1/linux-hardened-6.1.14-hardened1.patch" }, - "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", - "version": "6.1.8" + "sha256": "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52", + "version": "6.1.14" } } diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index 4e42288aff8d5..ef2abefb377bb 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -10,35 +10,6 @@ , which }: -let - py = python3.override { - packageOverrides = final: prev: rec { - docutils_old = prev.docutils.overridePythonAttrs (oldAttrs: rec { - version = "0.16"; - src = final.fetchPypi { - pname = "docutils"; - inherit version; - sha256 = "sha256-wt46YOnn0Hvia38rAMoDCcIH4GwQD5zCqUkx/HWkePw="; - }; - }); - - sphinx = (prev.sphinx.override rec { - alabaster = prev.alabaster.override { inherit pygments; }; - docutils = docutils_old; - pygments = prev.pygments.override { docutils = docutils_old; }; - }).overridePythonAttrs { - # fails due to duplicated packages - doCheck = false; - }; - - sphinx-rtd-theme = prev.sphinx-rtd-theme.override { - inherit sphinx; - docutils = docutils_old; - }; - }; - }; -in - stdenv.mkDerivation { pname = "linux-kernel-latest-htmldocs"; @@ -58,8 +29,8 @@ stdenv.mkDerivation { graphviz imagemagick perl - py.pkgs.sphinx - py.pkgs.sphinx-rtd-theme + python3.pkgs.sphinx + python3.pkgs.sphinx-rtd-theme which ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 3e5cc009576e2..612665fdfe32f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.304"; + version = "4.14.307"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; + sha256 = "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f"; }; } // (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 506d57d797139..279a07dfa8529 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.271"; + version = "4.19.274"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; + sha256 = "1a2w6knszfqg7ilnvxrs0kbgcviq90iqw9wp2d6y3qy9jfhnb8k4"; }; } // (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 7f984e43d7b7b..7f973445632da 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.165"; + version = "5.10.170"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"; + sha256 = "0pw2jnsnq2yxxvl4dkx6f7a8gczj8l484qpd4ibw737vprv1idd2"; }; } // (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 75f035ec2119e..54105ba9188ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.90"; + version = "5.15.96"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6"; + sha256 = "167g34xjbqxr5klqp127j2j15pms4jmgs0y7gr8zipiz2i69g39l"; }; } // (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 aef87aaa42110..38b5639579c2f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.230"; + version = "5.4.233"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; + sha256 = "09vnp4qcv7kwahbbvjznnv7pxq1cvbn11n0rn5rzx97jnia5f7js"; }; } // (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 index f1fc40ee7644b..9dd5767997c53 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.8"; + version = "6.1.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn"; + sha256 = "03c1pszgm0qwwz7l5fnmbr6ank632bsl81pdx48svizy3q0pcw52"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix new file mode 100644 index 0000000000000..b338b0f524d25 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.2.1"; + + # 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 = "0d154mps5967mgl8sxls6x5nw2ya1pmvxyahiwacx90fr7hhgk1g"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 698ca10016ca1..7e3ffb4720a3d 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 = "19027"; - sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv"; + rev = "19049"; + sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2"; } , ... }: 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 aefd662aa4d2c..98e4847ba4f20 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.162-rt78"; # updated by ./update-rt.sh + version = "5.10.168-rt83"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f"; + sha256 = "171mmgkjdsn6gx6z8kr5d80aygn4jjf8jc9zfh7m2c4dpab2azdn"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "146y62kzxm0d7bw8riqds0m8iilx3zd6yh5dfxr5q90jcjnah16x"; + sha256 = "08nz84yyjd8ffxhpiksqikhkhrn9a9x5mbfrz317sx6mf55wyxm0"; }; }; 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 index 15ddf9df91474..2fa2acf820abd 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.86-rt56"; # updated by ./update-rt.sh + version = "5.15.95-rt60"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40"; + sha256 = "06s4aqkk26fph8hm15m7cssjrwa5y7cqy9y2znfnf0w8sbqd2wga"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0y7pkzacxh1fsvnbmjq0ljfb4zjw6dq9br6rl8kr3w4dj56fmaxs"; + sha256 = "0plz9zcibhpqsrapykvvqqhz0i2sy7wrjd3jsypvia6j3vghrz4s"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 1a74c2503c043..0bf720edfaa13 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.221-rt79"; # updated by ./update-rt.sh + version = "5.4.230-rt80"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7"; + sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0zcakr41m1n683pwcm6d698nwgg7jyr7n8c63jmqh0959xxb2axy"; + sha256 = "19vcalg76vi66g3rk56ky873276is4r67sz2i4vympjq9bskrwrz"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 8a6d1a89dc87c..115d8ad93149c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-12-29" -, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37" -, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw=" +, 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 ? {} @@ -17,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 244fced25ef62..cef442ad20ca5 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2-rc2"; + version = "6.2-rc6"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-QRmOwtoGG2uNCNcAIAltrCT7zaD2V+RNe3bjHGn5+ts="; + 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 310178b9a1fd3..21e6790eb0b6d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -57,8 +57,12 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = [ perl libelf ] - ++ optional (lib.versionAtLeast version "5.13") zstd; + moduleBuildDependencies = [ + perl + libelf + # module makefiles often run uname commands to find out the kernel version + (buildPackages.deterministic-uname.override { inherit modDirVersion; }) + ] ++ optional (lib.versionAtLeast version "5.13") zstd; drvAttrs = config_: kernelConf: kernelPatches: configfile: let @@ -82,9 +86,6 @@ let buildDTBs = kernelConf.DTB or false; - installsFirmware = (config.isEnabled "FW_LOADER") && - (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && - (lib.versionOlder version "4.14"); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = rec { inherit version modDirVersion config kernelPatches configfile @@ -103,8 +104,6 @@ let # Required for deterministic builds along with some postPatch magic. ++ 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 # 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 @@ -197,7 +196,6 @@ let installFlags = [ "INSTALL_PATH=$(out)" ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") - ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware" ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"]; preInstall = let @@ -264,9 +262,7 @@ let else "install")) ]; - postInstall = (optionalString installsFirmware '' - mkdir -p $out/lib/firmware - '') + (if isModular then '' + postInstall = optionalString isModular '' mkdir -p $dev cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then @@ -339,10 +335,7 @@ let # Remove reference to kmod sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|' - '' else optionalString installsFirmware '' - make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ - $installFlags "''${installFlagsArray[@]}" - ''); + ''; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f941ca9f007ad..5912abf4181dd 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,9 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + fix-em-ice-bonding = { + name = "fix-em-ice-bonding"; + patch = ./fix-em-ice-bonding.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index ae028b980ce2b..dc9af21a6b20a 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation { libunwind zlib openssl - systemtap.stapBuild numactl python3 perl @@ -116,12 +115,13 @@ 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 ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 09562d42ec791..c72bb2a628b62 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.1.7"; - hash = "sha256-cgUxM40cDl4lzoF4St3ckKAtsle2PRehfSag3VaycrY="; + version = "6.1.13"; + hash = "sha256-H3bEKPzwqpeDWlsj3ciP5D8NXVBvi+oKisWXveHnjLQ="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index a5376d56418df..7dbf9c97291cd 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.6"; #zen + version = "6.2.1"; #zen suffix = "zen1"; #zen - sha256 = "14f24w8cww1096lawrk0absx6sqy4mm0f2wpsijgjx4br2ln7p4r"; #zen + sha256 = "1ypgdc4bz35cqqwp8nka6rx7m9dqfl6wzfb8ad27gqgxwzil3sjg"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.6"; #lqx - suffix = "lqx1"; #lqx - sha256 = "0w1ckias1j1baidyw1a6kq1za7i3ig0w1phkb4s7sw9p7bnhbrx1"; #lqx + version = "6.1.13"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1264cfkb3kfrava8g7byr10avkjg0k281annqppcqqjkyjf63q4y"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index fb44fba22f5bf..0d146613542dd 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; # _FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-O" + " -Wno-error=maybe-uninitialized"; # https://github.com/Aetf/kmscon/issues/49 configureFlags = [ diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index 5a58c198c0e48..56cfb8ef9c217 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.6"; + version = "3.4.7"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw="; + sha256 = "sha256-uYJhjxarAqJC/aY8UUy7sjhA89LVoCG6B7/APkE0ouk="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/pkgs/os-specific/linux/libnl-tiny/default.nix b/pkgs/os-specific/linux/libnl-tiny/default.nix new file mode 100644 index 0000000000000..fc520830f6a25 --- /dev/null +++ b/pkgs/os-specific/linux/libnl-tiny/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchgit, cmake, pkg-config }: + +stdenv.mkDerivation { + pname = "libnl-tiny"; + version = "unstable-2022-12-13"; + + src = fetchgit { + url = "https://git.openwrt.org/project/libnl-tiny.git"; + rev = "f5d9b7e4f534a69cbd35c3f150fa6d57b9d631e4"; + sha256 = "0c5ycsdas8rr5c33gd0mnmm515dq631fmdjn5mp2j1m0j1bk7hc0"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + preConfigure = '' + sed -e 's|''${prefix}/@CMAKE_INSTALL_LIBDIR@|@CMAKE_INSTALL_FULL_LIBDIR@|g' \ + -e 's|''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@|@CMAKE_INSTALL_FULL_INCLUDEDIR@|g' \ + -i libnl-tiny.pc.in + ''; + + meta = with lib; { + description = "Tiny OpenWrt fork of libnl"; + homepage = "https://git.openwrt.org/?p=project/libnl-tiny.git;a=summary"; + license = licenses.isc; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 08a55134e7735..c9eea70db9920 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postBuild = lib.optionalString (pythonSupport) '' cd python - ${python.interpreter} setup.py install --prefix=../pythonlib + ${python.pythonForBuild.interpreter} setup.py install --prefix=../pythonlib cd - ''; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 43c9bf74e3fa2..683448cbe41b6 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/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index fd697fed77638..ec6d3f5aa4bfe 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 18586afcd0135..2f5a0f7172ca7 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -6,12 +6,12 @@ with lib; stdenv.mkDerivation rec { pname = "libsemanage"; - version = "3.4"; + version = "3.5"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/libsemanage-${version}.tar.gz"; - sha256 = "sha256-k7QjohYAuOP7WbuSXUWD0SWPRb6/Y8Kb3jBN/T1S79Y="; + sha256 = "sha256-9TU05QJHU4KA7Q12xs6B2Ps5Ob1kytuJ2hDbpC5A3Zw="; }; outputs = [ "out" "dev" "man" ] ++ optional enablePython "py"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # 1278 | int i; # | ^ # cc1: all warnings being treated as errors - NIX_CFLAGS_COMPILE = [ "-Wno-error=clobbered" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=clobbered" ]; installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 108e65072314c..1dd15e1b0e74c 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "SHLIBDIR=$(out)/lib" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 46d0e94bb14ce..2049b7cf0e70a 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 c81949bf39a6c..427f2eb69c49b 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 46a633aec55ab..3cb79ae077803 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/libzbd/default.nix b/pkgs/os-specific/linux/libzbd/default.nix index f058e09bbd2ca..c5d8e9cf80a40 100644 --- a/pkgs/os-specific/linux/libzbd/default.nix +++ b/pkgs/os-specific/linux/libzbd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libzbd"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbd"; rev = "v${version}"; - sha256 = "GoCHwuR4ylyaN/FskIqKyAPe2A2O3iFVcI3UxPlqvtk="; + sha256 = "sha256-iMQjOWsgsS+uI8mqoOXHRAV1+SIu1McUAcrsY+/zcu8="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 3cdb64becb5ac..1ea2de63560b3 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: lockdep.o:/build/linux-5.0.21/tools/lib/lockdep/../../include/linux/rcu.h:5: multiple definition of # `rcu_scheduler_active'; common.o:/build/linux-5.0.21/tools/lib/lockdep/../../include/linux/rcu.h:5: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildPhase = '' make defconfig diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 756e135263500..f7b5b3fd1fa1a 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,46 +1,21 @@ -{ 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" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; makeFlags = kernel.makeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" @@ -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_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 2f48448541b32..5a5193997be08 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.17"; - hash = "sha256-cobPqWUYKMWJOJUJVGMzuNqWXfqEoaTIqz5oGkf6uuc="; + version = "2.03.18"; + hash = "sha256-n2g+KYDZXA3Ou9JcfBdwMsVhXXJnv8iF6r/OWSgPR2k="; } diff --git a/pkgs/os-specific/linux/mceinject/default.nix b/pkgs/os-specific/linux/mceinject/default.nix index 3e89ed83361f9..524225763742b 100644 --- a/pkgs/os-specific/linux/mceinject/default.nix +++ b/pkgs/os-specific/linux/mceinject/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; - NIX_CFLAGS_COMPILE = "-Os -g -Wall"; + env.NIX_CFLAGS_COMPILE = "-Os -g -Wall"; NIX_LDFLAGS = [ "-lpthread" ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 3683522f04f9a..83ad98d1b1d20 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20221108"; + version = "20230214"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-JZbBrD3fHgJogDw4u2YggDX7OCXCu5/XEZKzHuVJR9k="; + hash = "sha256-SwdE1c7OEg5nncs5QqaTKCL77KddeHw7ZilctQ4L9RA="; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index e38dd83e0dba6..d27e3ca6987b7 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook }: +{ lib, stdenv, fetchFromGitLab, autoreconfHook, fetchpatch, argp-standalone }: stdenv.mkDerivation rec { pname = "iucode-tool"; @@ -11,7 +11,17 @@ stdenv.mkDerivation rec { sha256 = "04dlisw87dd3q3hhmkqc5dd58cp22fzx3rzah7pvcyij135yjc3a"; }; + patches = [ + # build fix for musl libc, pending upstream review + # https://gitlab.com/iucode-tool/iucode-tool/-/merge_requests/4 + (fetchpatch { + url = "https://gitlab.com/iucode-tool/iucode-tool/-/commit/fda4aaa4727601dbe817fac001f234c19420351a.patch"; + hash = "sha256-BxYrXALpZFyJtFrgU5jFmzd1dIMPmpNgvYArgkwGt/w="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 925901d226764..efde55d651c36 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-11-09"; + version = "unstable-2023-02-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 = "c62dd8e415b12cc7f9a362db23cd384caf77ff03"; - sha256 = "zTrMounPmos+9Reyfa3xS5/5/tyMs0WapSmzqdXUBNk="; + passthru.rev = "d4c2910981ff99b983734426dfa99632fb81ac6b"; + sha256 = "926iFpZ6CqDw4n6YSrrnCm3Mu9F3wb3riqYH8mHZ2b4="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index de396e4f5c762..1100751f451e0 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; - sourceRoot = "."; - unpackCmd = '' - dpkg-deb -x "$src" . + dpkg-deb -x "$src" source ''; installPhase = '' diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index f1b129e80407a..91363969ffe6d 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, coreutils , pkg-config , perl , lvm2 @@ -9,31 +10,28 @@ , systemd , liburcu , json_c -, kmod +, linuxHeaders , cmocka , nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; 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"'", @@ -45,15 +43,16 @@ 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; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index c8ed8283ab35d..7a0fabf9d4682 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -94,12 +94,11 @@ stdenv.mkDerivation rec { NIX_DONT_SET_RPATH = true; preBuild = '' - ${if (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) then + ${lib.optionalString (stdenv.targetPlatform.libc == "musl" && stdenv.targetPlatform.isx86_32) "# the -x c flag is required since the file extension confuses gcc # that detect the file as a linker script. $CC -x c -c ${stack_chk_fail_local_c} -o __stack_chk_fail_local.o $AR r libssp_nonshared.a __stack_chk_fail_local.o" - else "" } ''; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 96dc2e6ffada4..0eedc5e08a1ff 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { patches = [ ./pci.patch ]; - NIX_CFLAGS_COMPILE="-Wno-error=implicit-fallthrough"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; postInstall = '' cd ../ diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index ee29180a8d9d8..17d0c69382069 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { version = mxu_version + "-${kernel.version}"; + nativeBuildInputs = kernel.moduleBuildDependencies; + preBuild = '' - sed -i -e "s/\$(uname -r).*/${kernel.modDirVersion}/g" driver/mxconf - sed -i -e "s/\$(shell uname -r).*/${kernel.modDirVersion}/g" driver/Makefile sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile ''; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index b892292477ce2..d7d04e8368db4 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" ]; patches = [ # fix paths in netatop.service diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 41c16f9f394c0..4dfacd4404fd0 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AIX & Linux Performance Monitoring tool"; - homepage = "http://nmon.sourceforge.net"; + homepage = "https://nmon.sourceforge.net"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ sveitser ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 02111abb4d043..db966722f70e2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,11 +25,11 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "525.85.05"; - sha256_64bit = "sha256-6mO0JTQDsiS7cxOol3qSDf6dID1mHdX2/CZYWnAXkUA="; - openSha256 = "sha256-iI41eex/pQhWdQwk9qc9AlnVYcO0HRA9ISoqNdVKN7g="; - settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; - persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + version = "525.89.02"; + sha256_64bit = "sha256-DkEsiMW9mPhCqDmm9kYU8g5MCVDvfP+xKxWKcWM1k+k="; + openSha256 = "sha256-MP9ir0Fuodar239r3PbqVxIHd0vHvpDj8Rw55TeFtZM="; + settingsSha256 = "sha256-7rHaJWm0XHJXsKL8VnU9XT15t/DU8jdsCXQwQT+KaV0="; + persistencedSha256 = "sha256-4AmOL6b3GKCjGs6bRDpQAkEG4n41X395znyQF1x9VEs="; }; latest = selectHighestVersion production (generic { @@ -51,14 +51,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.04"; - persistencedVersion = "525.78.01"; - settingsVersion = "525.78.01"; - sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0="; - openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w="; - settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw="; - persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA="; - url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + version = "525.47.11"; + persistencedVersion = "525.85.05"; + settingsVersion = "525.85.05"; + sha256_64bit = "sha256-R3W0Nn9HDluzF316kWDlBnmCgS/O3Atic4poJnjAdPU="; + openSha256 = "sha256-tZXzYQBx/3PzmHYrxmUD6iwxqwbi5/uVlN/7DU82oig="; + 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: diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 74addc6c5010f..ea9dbcabd0e90 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -127,8 +127,7 @@ let platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2 - broken = broken || (kernel != null && kernel.kernelAtLeast "6.2"); + inherit broken; }; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 5276dfd2aff4b..febae91106444 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { $out/bin/nvidia-persistenced ''; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 884ccdd6c52dd..5570228d78bfd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -25,7 +25,7 @@ let cd src/libXNVCtrl ''; - makeFlags = nvidia_x11.makeFlags ++ [ + makeFlags = [ "OUTPUTDIR=." # src/libXNVCtrl ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; + makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; preBuild = '' if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 8d7f2b527144a..11f094f72c9dc 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -42,6 +42,11 @@ let python3 ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=maybe-uninitialized" + ]); + meta = with lib; { homepage = "https://github.com/ClusterLabs/resource-agents"; description = "Combined repository of OCF agents from the RHCS and Linux-HA projects"; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 3aeef46255628..333153e65d4c2 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { autoreconfHook pkg-config ]; + buildInputs = [ dpdk_19_11 libconfig @@ -38,6 +39,12 @@ in stdenv.mkDerivation rec { libbpf ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + "-Wno-error=uninitialized" + ]; + # binaries will segfault otherwise dontStrip = true; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index bd81715bdacbf..1c1edc5abce0c 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.6"; + version = "1.3.7"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-pNU5isAZh9cPgaWZSSvWmSqukKV3TFGGntOKN6y1zIo="; + sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index d63cefe7943eb..d9b93eafdb0ee 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202211"; + version = "202302"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-/OSBzJ81xqw5LfS61DS7M33oDmfxDEzcU0NTVVbwWyI="; + hash = "sha256-69wdA6/bRN5gYl02GgA8mXnXxVZlHIGkhtC8vFKZVcA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index bca58bd808eba..b5f9d8a0a2c24 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { s,/etc/pcmcia,$out&,; " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' - + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if configOpts == null then "" else "ln -sf ${configOpts} ./config/config.opts") + + (lib.optionalString (firmware == []) ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'') + + (lib.optionalString (configOpts != null) "ln -sf ${configOpts} ./config/config.opts") ; makeFlags = [ "LEX=flex" ]; 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 0000000000000..4a651bf473e5b --- /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 20db1cdd74f94..b81bf74a3d9e0 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { RTE_SDK = dpdk; GUI = lib.optionalString withGtk "true"; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=address" + "-Wno-error=use-after-free" + ]; + # requires symbols from this file NIX_LDFLAGS = "-lrte_net_bond"; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 86f2e124ed293..bee805c57bc6a 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.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-P6DhsHnB+ak35JpUfD8Q8XbgMhI1QKKe31B8uMT2ZcY="; + hash = "sha256-+3b6yH5CuFdtjjTmW2mwuvNyhO8/8N7vv6st+ttztBQ="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 6ea2da037ac36..b0769f70ca488 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.1-53328"; + version = "18.2.0-53488"; 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-Vw9i7Diki+hKODeosxfCY5bL/UOfwgzeCC6+QmWfIZw="; + hash = "sha256-FpAbQQapIcZ7GsGjH4ZeJ81Ke+NUF7GvgV1wEDLKoUU="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 63de7453935ce..ecb0fe535d356 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -13,6 +13,10 @@ mkDerivation rec { sha256 = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg="; }; + postPatch = '' + sed '1i#include <array>' -i src/device.h # gcc12 + ''; + buildInputs = [ qtbase qtgraphicaleffects ]; nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 5e956f3baf342..6fc6e0012b319 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.15.25"; + version = "0.19.11"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; + hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 38cbabad520e5..389d5036b754c 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DLIBDIR=lib" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${harfbuzz.dev}/include/harfbuzz" # Workaround build failure on -fno-common toolchains: diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/os-specific/linux/rt-tests/default.nix index 67000776256c6..6185bf9912dd0 100644 --- a/pkgs/os-specific/linux/rt-tests/default.nix +++ b/pkgs/os-specific/linux/rt-tests/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "rt-tests"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-yuSfeYTaCZ0F1GXQkDnH8PBvyzR2w/XDitN8csHB9xE="; + sha256 = "sha256-LzN3YB3Lb7tjyEplrFaNYtiGwHUUTztZBsMrUndd2cU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 0f2e00c8382f5..ecfd6a87e6b47 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; @@ -30,9 +29,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ bc ]; - - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; preInstall = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index e50129f1e2b93..a89eb3702e8b8 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" - substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" substituteInPlace ./Makefile --replace /sbin/depmod \# substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index 0a385d0ca39f1..589408a302b32 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 a732d1c5d8e50..be4b954c1b618 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -2,19 +2,18 @@ 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" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" @@ -25,7 +24,6 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace "/sbin/depmod" "#" \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 6a1c4fc80daeb..bd682ec5933da 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,30 +2,27 @@ 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 ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; 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.isAarch then "y" else "n")) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 5e4b764431f42..c11493237cdcc 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; @@ -16,12 +16,11 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 6a0da0c5e19b6..c709c702f931e 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -11,16 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wx7xQBCfLu3UWB7ghp8dZ7OB2MFd5i8X0/ygyvW2K50="; }; - nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + env.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) [ @@ -30,7 +28,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 0e80a70fd57c4..476bce22fb112 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" ]; @@ -30,7 +24,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index edc2d5bc44c0e..35b068fd8d088 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 38ded6041f598..7cd15f194cc05 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-12-17"; + version = "${kernel.version}-unstable-2023-02-24"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "9a04d2bb9d882c7f2708560774d7b96a70d83f4b"; - sha256 = "sha256-PxTUCYBfyCDB8IjNKsp7aiPtSI3TFzGuJsHqG66e2Q0="; + rev = "51a2fb94893c562ec5f2fabce0b80e4da4eda812"; + sha256 = "sha256-nTas2EkghZeQhc8bTtoQfHEl8QJtClXi9V1IxlIThbI="; }; hardeningDisable = [ "pic" ]; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 80c14a0b38345..a2f7ca0e815dd 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -14,14 +14,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/depmod \# \ --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index 0af52023b2323..9a84018b4f0d1 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Adjust power management settings for Ryzen Mobile Processors."; homepage = "https://github.com/FlyGoat/RyzenAdj"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ asbachb ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/os-specific/linux/sasutils/default.nix index 743a3ed95540e..d30e7f608c77f 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.13"; + version = "0.4.0"; src = fetchFromGitHub { owner = "stanford-rc"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cPCmmJkhr4+STVHa7e3LZGZFd8KPkECMAVurhuG8H1s="; + sha256 = "sha256-9JRw+UoxU0I5RHuimzYrM/3j8UWHuicVpoOdRRrj2Wc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index 999a4b2578eee..e6b8e778a77a8 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semodule-utils"; - version = "3.4"; + version = "3.5"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-sMrGZfLTjx+pu82A6jQYyE3YImkqmEdRdv8iyS+zjTo="; + sha256 = "sha256-yaVQpzcFHrrywQL2ZcfsL4XnIyhwmAqgBnmYRZtBQoM="; }; buildInputs = [ libsepol ]; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 35a0355c0bc4b..2e554a0241b22 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; - rev = version; - sha256 = "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5"; + rev = "refs/tags/${version}"; + sha256 = "sha256-4T5FIdnKi35JSm+IoYA2gIBBRV0nN0YLEw9xvDqNcgo="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix index 5440e41753514..eed99122cd640 100644 --- a/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix +++ b/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { --replace '$(TEST_SUITE): $(PROVIDER_LIB) $(TEST_SUITE_OBJ)' '$(TEST_SUITE): $(TEST_SUITE_OBJ)' ''; - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; makeFlags = [ "-C src/Linux" diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index ba2d0967e45de..4a5e50d9c6abb 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -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 5213dc1e4fda8..053aaecbcbb7e 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -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/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index e9ee3c518fedf..328098dbea33a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h> - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 21f232d0c2da9..72a148c26e7c9 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,9 +1,8 @@ { 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, re2 +, yaml-cpp, nlohmann_json, re2 }: -with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake libsRev = "0.9.1"; @@ -23,6 +22,11 @@ let rev = "3.0.1+driver"; sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c="; }; + # Workaround for scap-driver compilation error on kernel 6.2: https://github.com/falcosecurity/libs/issues/918 + driverPatch = fetchpatch { + url = "https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f.patch"; + hash = "sha256-s7iHbOjVqHSWRY4gktZldgrU5OClqRmbqmDtUgFIeh0="; + }; in stdenv.mkDerivation rec { @@ -51,10 +55,10 @@ stdenv.mkDerivation rec { re2 protobuf grpc - libyamlcpp + yaml-cpp jsoncpp nlohmann_json - ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; + ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -68,6 +72,7 @@ stdenv.mkDerivation rec { chmod -R +w libs cp -r ${driver} driver-src chmod -R +w driver-src + patch -p1 -d driver-src < ${driverPatch} cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include" @@ -82,10 +87,10 @@ stdenv.mkDerivation rec { "-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))"; + env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; preConfigure = '' if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then @@ -93,7 +98,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" ''; @@ -106,7 +111,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/} @@ -121,7 +126,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/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 4d9844f516b0f..048d82b5a530c 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ]; - NIX_CFLAGS_COMPILE = "-DSYSV"; + env.NIX_CFLAGS_COMPILE = "-DSYSV"; installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ]; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 821d511330870..f5153eb5abc98 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation { # gcc-10. Otherwise build fails as: # ld: acpi/xsdt.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: multiple definition of # `e820_types'; memory.o:/build/syslinux-b404870/com32/gpllib/../gplinclude/memory.h:40: first defined here - NIX_CFLAGS_COMPILE="-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "BINDIR=$(out)/bin" diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 582667c0c7dad..ce7aa5f753f2e 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.1"; + version = "12.6.2"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - hash = "sha256-GP9aThSeJWjkM4Vjf3JDf+a6/MEyKpPRPRmB6UZKA0I="; + hash = "sha256-PncTSu2qb8V9l0XaZ+39iZDhmt7nGsRxliKSYcVj+0g="; }; buildInputs = [ gettext ]; 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 0000000000000..c64fdd8d34c0b --- /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 <nickcao@nichi.co> +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 fadb6a486c82d..9dda9cd2d4ae3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,6 +3,7 @@ { stdenv , lib , nixosTests +, pkgsCross , fetchFromGitHub , fetchpatch , fetchzip @@ -63,6 +64,7 @@ , withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools , kexec-tools , bashInteractive +, bash , libmicrohttpd , libfido2 , p11-kit @@ -93,6 +95,7 @@ , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl , 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 @@ -130,7 +133,7 @@ assert withHomed -> withCryptsetup; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "252.4"; + version = "252.5"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -138,7 +141,7 @@ let # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' releaseTimestamp = "1667246393"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly @@ -147,7 +150,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-8ejSEt3QyCSARGGVbXWac2dB9jdUpC4eX2rN0iENQX0="; + hash = "sha256-cNZRTuYFMR1z6KpELeQoJahMhRl4fKuRuc3xXH3KzlM="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -174,6 +177,7 @@ 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 { @@ -337,7 +341,7 @@ stdenv.mkDerivation { # when cross-compiling. + '' shopt -s extglob - patchShebangs tools test src/!(rpm) + patchShebangs tools test src/!(rpm|kernel-install) src/kernel-install/test-kernel-install.sh ''; outputs = [ "out" "man" "dev" ]; @@ -360,6 +364,7 @@ stdenv.mkDerivation { docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + bash (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) ] ++ lib.optionals withLibBPF [ @@ -380,9 +385,10 @@ stdenv.mkDerivation { libuuid linuxHeaders pam + bashInteractive # for patch shebangs ] - ++ lib.optional wantGcrypt libgcrypt + ++ lib.optionals wantGcrypt [ libgcrypt libgpg-error ] ++ lib.optional withTests glib ++ lib.optional withApparmor libapparmor ++ lib.optional wantCurl (lib.getDev curl) @@ -394,7 +400,6 @@ stdenv.mkDerivation { ++ lib.optional withLibseccomp libseccomp ++ lib.optional withNetworkd iptables ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpg-error ++ lib.optional withSelinux libselinux ++ lib.optional withRemote libmicrohttpd ++ lib.optionals withHomed [ p11-kit ] @@ -628,7 +633,7 @@ stdenv.mkDerivation { --replace "SYSTEMD_CGROUP_AGENTS_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ # Can't say ${polkit.bin}/bin/pkttyagent here because that would # lead to a cyclic dependency. "-UPOLKIT_AGENT_BINARY_PATH" @@ -693,6 +698,10 @@ stdenv.mkDerivation { mv $out/dont-strip-me $out/lib/systemd/boot/efi ''; + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) + # 'or p' is for manually specified buildPackages as they dont have __spliced + (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs); + passthru = { # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is @@ -706,6 +715,7 @@ stdenv.mkDerivation { tests = { inherit (nixosTests) switchTest; + cross = pkgsCross.aarch64-multiplatform.systemd; }; }; @@ -714,10 +724,10 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - badPlatforms = [ (plat: plat.isStatic) ]; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; maintainers = with maintainers; [ flokli kloenk mic92 ]; }; -} +}) diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/os-specific/linux/tinyalsa/default.nix index 45d9191eea081..cae778227c731 100644 --- a/pkgs/os-specific/linux/tinyalsa/default.nix +++ b/pkgs/os-specific/linux/tinyalsa/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DTINYALSA_USES_PLUGINS=ON" ]; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=sign-compare" ]; diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index 7e88e1b14b521..a26602b6b44cb 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; buildInputs = [ libxml2 ncurses ]; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; meta = with lib; { description = "Performance monitoring tool for Linux"; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 0aff1bdd789d4..6b349e70656ff 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/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index f743b00248464..e492bc2403fde 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "kernelshark"; - version = "2.1.1"; + version = "2.2.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"; rev = "kernelshark-v${version}"; - sha256 = "sha256-1M35y3EkMHbGkVv93Xwo4zApvy9usIcz1spm5Z+1iUs="; + sha256 = "sha256-VkUah8qAlOck9245f/zngtVpHmJdx6eQXqwzLwK2xjU="; }; outputs = [ "out" ]; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index cadf38b106ccc..b91f55dcd2fbb 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address-of-packed-member" ]; preConfigure = '' cd tools/usb/usbip diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 934367dcd11ba..475ccd848eb19 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; - NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; + env.NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index eeecc655aef92..3c8b7f6663f18 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -11,6 +11,7 @@ , nlsSupport ? true , translateManpages ? true , po4a +, installShellFiles }: stdenv.mkDerivation rec { @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ pkg-config installShellFiles ] ++ lib.optionals translateManpages [ po4a ]; buildInputs = [ zlib libxcrypt ] @@ -79,6 +80,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + installShellCompletion --bash bash-completion/* + ''; + meta = with lib; { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "A set of system utilities for Linux"; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index d5f3a729978de..8fa91e158e1c8 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A simple interface for devices supported by the linux UVC driver"; - homepage = "http://guvcview.sourceforge.net"; + homepage = "https://guvcview.sourceforge.net"; license = licenses.gpl3Plus; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index 162ae766a845d..73c579288bca0 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /sbin/modinfo "${kmod}/bin/modinfo" \ --replace 'test -z "$(DESTDIR)"' "0" for module in "vmmon-only" "vmnet-only"; do substituteInPlace "./$module/Makefile" \ --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \ - --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ --replace /bin/grep "${gnugrep}/bin/grep" done ''; diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 8955bcfa5126b..d01759e8ed699 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -9,11 +9,12 @@ , kmod , lxc , iproute2 -, nftables +, iptables , util-linux , which , wrapGAppsHook , xclip +, runtimeShell }: python3Packages.buildPythonApplication rec { @@ -50,14 +51,15 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; installPhase = '' - make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + make install PREFIX=$out USE_SYSTEMD=0 ''; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + patchShebangs --host $out/lib/waydroid/data/scripts wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ - --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} + --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]} wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [ "$out" @@ -71,6 +73,12 @@ python3Packages.buildPythonApplication rec { which xclip ]}" + + substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ + --replace '"sh"' '"${runtimeShell}"' + + substituteInPlace $out/share/applications/*.desktop \ + --replace "/usr" "$out" ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules index fa4148d874383..a243f68ed133b 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules +++ b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules @@ -1,14 +1,84 @@ -# Wooting One +# Wooting One Legacy SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input" # Wooting One update mode SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input" -# Wooting Two +# Wooting Two Legacy SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input" # Wooting Two update mode SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input" -# Wooting Two Lekker Edition +# Wooting One +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1100", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1100", MODE:="0660", GROUP="input" +# Wooting One Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660", GROUP="input" +# Wooting One 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input" + + +# Wooting Two +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input" +# Wooting Two Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1201", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1201", MODE:="0660", GROUP="input" +# Wooting Two 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1202", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1202", MODE:="0660", GROUP="input" + +# Wooting Lekker SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input" -# Wooting Two Lekker Edition update mode +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input" +# Wooting Lekker Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1211", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1211", MODE:="0660", GROUP="input" +# Wooting Lekker 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1212", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1212", MODE:="0660", GROUP="input" + +# Wooting Lekker update mode SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="121f", MODE:="0660", GROUP="input" + +# Wooting Two HE +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1220", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1220", MODE:="0660", GROUP="input" +# Wooting Two HE Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1221", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1221", MODE:="0660", GROUP="input" +# Wooting Two HE 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660", GROUP="input" + +# Wooting Two HE update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="122f", MODE:="0660", GROUP="input" + +# Wooting 60HE +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input" +# Wooting 60HE Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1301", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1301", MODE:="0660", GROUP="input" +# Wooting 60HE 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1302", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1302", MODE:="0660", GROUP="input" + +# Wooting 60HE update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="130f", MODE:="0660", GROUP="input" + +# Wooting 60HE (ARM) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1310", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1310", MODE:="0660", GROUP="input" +# Wooting 60HE (ARM) Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1311", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1311", MODE:="0660", GROUP="input" +# Wooting 60HE (ARM) 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1312", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1312", MODE:="0660", GROUP="input" + +# Wooting 60HE (ARM) update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="131f", MODE:="0660", GROUP="input" diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 2d954d83ecf3a..ba4fe8356ce76 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/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index af1dc126bfdc3..0d4126426c941 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ goibhniu fortuneteller2k ]; description = "Wacom digitizer driver for X11"; - homepage = "http://linuxwacom.sourceforge.net"; + homepage = "https://linuxwacom.sourceforge.net"; license = licenses.gpl2Only; platforms = platforms.linux; # Probably, works with other unixes as well }; diff --git a/pkgs/os-specific/solo5/0001-Fix-test.patch b/pkgs/os-specific/solo5/0001-Fix-test.patch new file mode 100644 index 0000000000000..bd01c129bec2f --- /dev/null +++ b/pkgs/os-specific/solo5/0001-Fix-test.patch @@ -0,0 +1,25 @@ +From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001 +From: Lana Black <lana@illuminati.industries> +Date: Sat, 11 Feb 2023 11:53:21 +0000 +Subject: [PATCH] Fix test. + +--- + tests/tests.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tests.bats b/tests/tests.bats +index c542b7a..98520ee 100644 +--- a/tests/tests.bats ++++ b/tests/tests.bats +@@ -196,7 +196,7 @@ xen_expect_abort() { + run test_hello/test_hello.hvt + case "${CONFIG_HOST}" in + Linux) +- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]] ++ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]]) + ;; + FreeBSD) + # XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not +-- +2.39.0 + diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index c449e46a998eb..c436f247866fb 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; + patches = [ ./0001-Fix-test.patch ]; + hardeningEnable = [ "pie" ]; configurePhase = '' diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index bf1e73f67b9ac..091897b69343f 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") + (lib.optionalString unicode "--enable-unicode") "--with-opengl" ]; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index b8ff3a6991399..f72f4dfcbfc2e 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-grxGXMskjpNHcL61xgX02ouxFodxnzuhORby0wcZM7E="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-mOn0RYWmGzIeHyVwVTGPUvFyVQ8Zu57KW7UkGMWRejA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-J98fqxPlr8XZMll63GC5G8SvzOS6egViHATKSKCfYQ4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-urdLtEOMJ2ZeaWezihpv5UU8Li2gnmYk6+gzn9E/3Nw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-09HyY9WL2vzA5L0nDG/ByHs/fWj+GiJUy3Rq9yWd4Ak="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-yWlo7adaQcPrM4zOPq5BLw6rZPYg2Qr2T1R7H8QZuvA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-1mFOlerwTOLUQGiVX1nyFfMC1vl7W0c+P/xnPjNTrYE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-pD1vs4NHWByZmEozdgpzBXDeSzbEBouyawd41Emf8QE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-eoITV5oAyGJBn607lfJgH/1C0dHkoEIvk3x6rKxKn+k="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.22/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-BpknO9qL4Jo31d/vRXjuU/wJWfCVvLfgh6tZLG/6ipI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_arm64.tar.gz"; +}; +armv6l-linux = fetchurl { + sha256 = "sha256-yUyRz/2hqvN8XkuzfMfG6ibYOb68WjJaqgAIAfoZH0s="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_armv6.tar.gz"; +}; +armv7l-linux = fetchurl { + sha256 = "sha256-MOvDKvq24+NFmgseZZA3zz0z6Vr/7OvO8sHpsDWvMuo="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.25/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index f179c974a6e1a..77a5530d30986 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.22"; + version = "0.107.25"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 14; + schema_version = 16; tests.adguardhome = nixosTests.adguardhome; }; diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh index 8a72bd5a7c990..b7defa8113fac 100755 --- a/pkgs/servers/adguardhome/update.sh +++ b/pkgs/servers/adguardhome/update.sh @@ -22,6 +22,8 @@ declare -A systems systems[linux_386]=i686-linux systems[linux_amd64]=x86_64-linux systems[linux_arm64]=aarch64-linux +systems[linux_armv6]=armv6l-linux +systems[linux_armv7]=armv7l-linux systems[darwin_amd64]=x86_64-darwin systems[darwin_arm64]=aarch64-darwin @@ -30,7 +32,7 @@ echo '{' >> "$bins" for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do url="$(jq -r '.browser_download_url' <<< "$asset")" - adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)" + adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64|armv6|armv7)' <<< "$url" || true)" if [ -n "$adg_system" ]; then fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" nix_system=${systems[$adg_system]} diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 9b75d1e0dbcfe..40c267b00ef60 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "admin-fe"; - version = "unstable-2022-09-10"; + version = "unstable-2023-02-11"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "admin-fe"; - rev = "e094e12c3ecb540df839fdf20c5a03d10454fcad"; - hash = "sha256-dqkW8p4x+5z1Hd8gp8V4+DsLm8EspVwPXDxtvlp1AIk="; + rev = "130c17808bc50269f8444612f4ab378a08cd5e43"; + hash = "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM="; }; patches = [ ./deps.patch ]; diff --git a/pkgs/servers/akkoma/pleroma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 71f3bcd8aee2a..a1f2c43d79ee3 100644 --- a/pkgs/servers/akkoma/pleroma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -6,20 +6,20 @@ }: stdenv.mkDerivation rec { - pname = "pleroma-fe"; - version = "unstable-2022-12-10"; + pname = "akkoma-fe"; + version = "unstable-2023-02-11"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; - repo = "pleroma-fe"; - rev = "9c9b4cc07c018a21c8261dd7680a97aa3a670756"; - hash = "sha256-jYJcG2Q5kxOH29G5WV/6Cx7a+b7FuFROEn/8ruh7cDc="; + repo = "akkoma-fe"; + rev = "8569b5946eebdb4e7c91252e1dcf88795c8e2538"; + hash = "sha256-fIkfKAFrcCioma3Hb0c20rfSWXevwWeJbyJm+dUSNlQ="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-pz6NHBYZRi+Rwx6H74895vFWGLSivI7Ul8XV6wMbgJg="; + hash = "sha256-Uet3zdjLdI4qpiuU4CtW2WwWGcFaOhotLLKfnsAUqho="; }; nativeBuildInputs = [ @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Frontend for Akkoma and Pleroma"; - homepage = "https://akkoma.dev/AkkomaGang/pleroma-fe/"; + description = "Frontend for Akkoma"; + homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; license = licenses.agpl3; maintainers = with maintainers; [ mvs ]; }; diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 5df95623dad4e..2b2e73e31c26d 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -9,14 +9,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; rev = "v${version}"; - hash = "sha256-Apt+6nI4zOCyRb5msPt5UF9vyaendyaOjrYBMl0DqRY="; + hash = "sha256-Ovi2AnfkeCDlv3INomPxu8R1ARexOzZHC8dOLucrDaQ="; }; postPatch = '' @@ -52,24 +52,16 @@ beamPackages.mixRelease rec { sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; }; }; - crypt = beamPackages.buildRebar3 rec { - name = "crypt"; - version = "0.4.3"; + credo = beamPackages.buildMix rec { + name = "credo"; + version = "1.7.0-dev"; src = fetchFromGitHub { - owner = "msantos"; - repo = "crypt"; - rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; - sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; + owner = "rrrene"; + repo = "credo"; + rev = "1c1b99ea41a457761383d81aaf6a606913996fe7"; + hash = "sha256-NdOg6p2J1D8VGGWabAMLs/qRVbi4BzN2DTHci++dJnA="; }; - - buildInputs = [ libxcrypt ]; - - postInstall = '' - mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so - ''; - - beamDeps = with final; [ elixir_make ]; }; elasticsearch = beamPackages.buildMix rec { name = "elasticsearch"; @@ -83,17 +75,6 @@ beamPackages.mixRelease rec { hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; }; }; - gettext = beamPackages.buildMix { - name = "gettext"; - version = "0.19.1"; - - src = fetchFromGitHub { - owner = "tusooa"; - repo = "gettext"; - rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808"; - hash = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0="; - }; - }; linkify = beamPackages.buildMix rec { name = "linkify"; version = "0.5.2"; @@ -120,20 +101,6 @@ beamPackages.mixRelease rec { beamDeps = with final; [ phoenix_view temple ]; }; - remote_ip = beamPackages.buildMix rec { - name = "remote_ip"; - version = "0.1.5"; - - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "remote_ip"; - rev = "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"; - sha256 = "0c7vmakcxlcs3j040018i7bfd6z0yq6fjfig02g5fgakx398s0x6"; - }; - beamDeps = with final; [ combine plug inet_cidr ]; - }; search_parser = beamPackages.buildMix rec { name = "search_parser"; version = "0.1.0"; diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix index f26d96c0f2161..27d88ec7b9e69 100644 --- a/pkgs/servers/akkoma/mix.nix +++ b/pkgs/servers/akkoma/mix.nix @@ -8,6 +8,19 @@ let self = packages // (overrides self packages); packages = with beamPackages; with self; { + argon2_elixir = buildMix rec { + name = "argon2_elixir"; + version = "3.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0mywrvzzm76glvajzxrdg6ka49xby30fpk9zl4dxamzm18kknxcb"; + }; + + beamDeps = [ comeonin elixir_make ]; + }; + base62 = buildMix rec { name = "base62"; version = "1.2.2"; @@ -75,12 +88,12 @@ let cachex = buildMix rec { name = "cachex"; - version = "3.4.0"; + version = "3.5.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1rfbbij81zmk6p75z33wg04mfcjqsxzzh67vclllvfjgmfqj609p"; + sha256 = "0jdh08np2d85h57s6718jb5xzjkc882g9knd12xgzn8d43xfphps"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -101,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "0.1.19"; + version = "0.1.20"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0291pdk3x7qzbv8laris1y90vi7g9akmykd23m2fz0nwlmhh2vp9"; + sha256 = "12n9bb4v9b9sx9xk11k98s4f4a532dmmn0x4ak28dj990mjvf850"; }; beamDeps = []; @@ -229,19 +242,6 @@ let beamDeps = []; }; - credo = buildMix rec { - name = "credo"; - version = "1.6.7"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1"; - }; - - beamDeps = [ bunt file_system jason ]; - }; - custom_base = buildMix rec { name = "custom_base"; version = "0.2.1"; @@ -294,14 +294,27 @@ let beamDeps = []; }; + dialyxir = buildMix rec { + name = "dialyxir"; + version = "1.2.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0qw4zyd86fjwsav744jvz1wpdbmy9nz645xqr9s1d1bs88v221v1"; + }; + + beamDeps = [ erlex ]; + }; + earmark = buildMix rec { name = "earmark"; - version = "1.4.33"; + version = "1.4.34"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "01mfb0c1vq72pira1622cmvaly2p6n4dxwmsrw10i9x0srii7cr1"; + sha256 = "012mwv4ixll3gmav9v0wzlin2948ghb2imnp20xi6nyqvbrhdcch"; }; beamDeps = [ earmark_parser ]; @@ -335,12 +348,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.9.2"; + version = "3.9.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; + sha256 = "0xgfz1pzylj22k0qa8zh4idvd4139b1lwnmq33na8fia2j69hpyy"; }; beamDeps = [ decimal jason telemetry ]; @@ -374,12 +387,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.9.1"; + version = "3.9.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "060iqmkqnsyy2kv05s218ady9lgnz7rvgknwz6xjks7jzyj71m2z"; + sha256 = "0w1zplm8ndf10dwxffg60iwzvbz3hyyiy761x91cvnwg6nsfxd8y"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -398,6 +411,19 @@ let beamDeps = []; }; + erlex = buildMix rec { + name = "erlex"; + version = "0.2.6"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"; + }; + + beamDeps = []; + }; + eternal = buildMix rec { name = "eternal"; version = "1.2.2"; @@ -426,12 +452,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.3.3"; + version = "2.4.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "017iswr9m2kwri2m5j3r9m0b7hk4vqqddbqy09k5d4nfz6vg0i00"; + sha256 = "1fsngrldq2g3i2f7y5m4d85sd7hx4jiwnfcxhs14bnalfziadpc5"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -491,12 +517,12 @@ let excoveralls = buildMix rec { name = "excoveralls"; - version = "0.12.3"; + version = "0.15.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1nnsr9dv7mybcxx3y5p2gqzyy3p479w21c55vvsq6hi6dihkx2jn"; + sha256 = "1rq7vqvzw7sa2r7n59bhbxbhcnjr6z44dkvq45mdb0h01kcnnhgq"; }; beamDeps = [ hackney jason ]; @@ -543,12 +569,12 @@ let finch = buildMix rec { name = "finch"; - version = "0.13.0"; + version = "0.14.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1k56zfbadpppn8flavb4aczq0npcqnlhg993l51c1k8dw76pv5a9"; + sha256 = "1pd805jyd4qbpb2md3kw443325yqynpkpyr2iixb9zf432psqnal"; }; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; @@ -593,17 +619,17 @@ let beamDeps = []; }; - gun = buildRebar3 rec { - name = "gun"; - version = "2.0.0-rc.2"; + gettext = buildMix rec { + name = "gettext"; + version = "0.20.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; + sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw"; }; - beamDeps = [ cowlib ]; + beamDeps = []; }; hackney = buildRebar3 rec { @@ -725,12 +751,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.2"; + version = "1.11.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1lj715gzl022yc47qsg9712x8nc9wi7x70msv8c3lpym92y3y54q"; + sha256 = "115k981kfg9jmafgs16rybc5qah6p0zgvni3bdyfl0pyp8av5lyw"; }; beamDeps = []; @@ -749,6 +775,19 @@ let beamDeps = []; }; + mail = buildMix rec { + name = "mail"; + version = "0.2.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1xbbdkyar8h0pdihfnsd84j1w3vfh9sk3xkz1llxz7y6m67kjawk"; + }; + + beamDeps = []; + }; + majic = buildMix rec { name = "majic"; version = "1.0.0"; @@ -907,12 +946,12 @@ let nimble_options = buildMix rec { name = "nimble_options"; - version = "0.4.0"; + version = "0.5.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; + sha256 = "1q6wa2ljprybfb9w2zg0gbppiwsnimgw5kcvakdp3z8mp42gk9sd"; }; beamDeps = []; @@ -959,12 +998,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.10.0"; + version = "3.16.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; + sha256 = "0a91jzgq6qp6ba5kxcz8fli2d1l49d8pz8dxikyfhwwbci5f42xv"; }; beamDeps = [ jason plug poison ]; @@ -1024,12 +1063,12 @@ let phoenix_live_dashboard = buildMix rec { name = "phoenix_live_dashboard"; - version = "0.6.5"; + version = "0.7.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0lmq1m7k465i9mzw35l7bx69n85mibwzd76976840r43sw6sakzg"; + sha256 = "1dq5vj1a6fzclr3fwj7y8rg2xq3yigvgqc3aaq664fvs7h3dypqf"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1037,15 +1076,15 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.17.12"; + version = "0.18.6"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1j4r1pjl60hphan7mf0fn60cnqkdc7hah9zmf4sz8vy1mbhdavdg"; + sha256 = "0wvbpi16bfn4hxyqs7907aln5di30v3hskzw2ggp1hy38kxnh9yf"; }; - beamDeps = [ jason phoenix phoenix_html telemetry ]; + beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; }; phoenix_pubsub = buildMix rec { @@ -1102,12 +1141,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.10.4"; + version = "1.14.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; + sha256 = "056wkb1b17mh5h9ncs2vbswvpjsm2iqc580nmyrvgznlqwr080mz"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1204,43 +1243,43 @@ let beamDeps = []; }; - quack = buildMix rec { - name = "quack"; - version = "0.1.1"; + ranch = buildRebar3 rec { + name = "ranch"; + version = "1.8.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0hr5ppds4a9vih14hzs3lfj07r5069w8ifr7022fn4j18jkvydnp"; + sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; }; - beamDeps = [ poison tesla ]; + beamDeps = []; }; - ranch = buildRebar3 rec { - name = "ranch"; - version = "1.8.0"; + recon = buildMix rec { + name = "recon"; + version = "2.5.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "1mwr6267lwl4p7f8jfk14s4cszxwra6zgf84hkcxz8fldzs86rkc"; }; beamDeps = []; }; - recon = buildMix rec { - name = "recon"; - version = "2.5.2"; + remote_ip = buildMix rec { + name = "remote_ip"; + version = "1.1.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "070f4dgfp1vzvz0fxwavzv9bd7nl5fx3rmmkyr0zy7g9vv426x9c"; + sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1"; }; - beamDeps = []; + beamDeps = [ combine plug ]; }; sleeplocks = buildRebar3 rec { @@ -1297,15 +1336,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.8.2"; + version = "1.9.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; + sha256 = "07ipsrp34s18c9zd5kglqsdc8z7gxa9aadsrklj0zf6azzrzzpvn"; }; - beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; + beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ]; }; syslog = buildRebar3 rec { @@ -1360,6 +1399,45 @@ let beamDeps = [ telemetry ]; }; + telemetry_metrics_prometheus = buildMix rec { + name = "telemetry_metrics_prometheus"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "09jdrv0ik5svi77djycva7a6a8sl05vp2nr7w17s8k94ndckcfyl"; + }; + + beamDeps = [ plug_cowboy telemetry_metrics_prometheus_core ]; + }; + + telemetry_metrics_prometheus_core = buildMix rec { + name = "telemetry_metrics_prometheus_core"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0sd0j7arhf22ickzdfmq656258dh14kzi61p0vgra007x1zhxl8d"; + }; + + beamDeps = [ telemetry telemetry_metrics ]; + }; + + telemetry_poller = buildRebar3 rec { + name = "telemetry_poller"; + version = "0.5.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1m1zcq65yz0wp1wx7mcy2iq37cyizbzrmv0c11x6xg0hj8375asc"; + }; + + beamDeps = [ telemetry ]; + }; + tesla = buildMix rec { name = "tesla"; version = "1.4.4"; @@ -1370,7 +1448,7 @@ let sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; }; - beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; + beamDeps = [ castore finch hackney jason mime mint poison telemetry ]; }; timex = buildMix rec { diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index d3647264becc2..0427f38d5f707 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sed -i '/management/d' CMakeLists.txt ''; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=maybe-uninitialized" ] ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index e1ff2e14cf34f..c69fcd6418249 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.11.7"; + version = "3.11.9"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-m1O/k/w9WLSRpKADo79DU+vf4z41l6nfJpIwpY1dGgA="; + hash = "sha256-b/SfUyn+x33SnFo/n/zTLxG4PWz34F2qQs4B4p2/Ty4="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 36927f4f6d3a9..3b345e994e302 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -9,22 +9,22 @@ }: let - # remove when upgrading to pjsip >2.12.1 + # remove when upgrading to pjsip >2.13 pjsip_patches = [ (fetchpatch { - name = "0150-CVE-2022-31031.patch"; - url = "https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202.patch"; - sha256 = "sha256-30kHrmB51UIw4x/J6/CD+vPKf/gBYDCcFoUpwEWkDMY="; + name = "0152-CVE-2022-39269.patch"; + url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; + sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; }) (fetchpatch { - name = "0151-CVE-2022-39244.patch"; - url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch"; - sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4="; + name = "pjsip-2.12.1-CVE-2022-23537.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23537.patch"; + sha256 = "sha256-KNSnHt0/o1qJk4r2z5bxbYxKAa7WBtzGOhRXkru3VK4="; }) (fetchpatch { - name = "0152-CVE-2022-39269.patch"; - url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; - sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; + name = "pjsip-2.12.1-CVE-2022-23547.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23547.patch"; + sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ="; }) ]; common = {version, sha256, externals}: stdenv.mkDerivation { diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index 756699e5adb98..5d60d42781378 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: stdenv.mkDerivation rec { pname = "asterisk-module-sccp"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "chan-sccp"; repo = "chan-sccp"; rev = "v${version}"; - sha256 = "sha256-YGHK4A03Ba/tnVTnu9VuhIy/xQ5C/7ZX8h9mxqKsnZI="; + sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU="; }; nativeBuildInputs = [ patchelf ]; diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 7e6943a6822d0..b1a6319a51d19 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,18 +1,18 @@ { "asterisk_16": { - "sha256": "406a91290e18d25a6fc23ae6b9c56b1fb2bd70216e336c74cf9c26b908c89c3d", - "version": "16.29.0" + "sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724", + "version": "16.30.0" }, "asterisk_18": { - "sha256": "a963dafeba0e7e1051a1ac56964999c111dbcdb25a47010bc1f772bf8edbed75", - "version": "18.15.0" + "sha256": "2d280794ae7505ed3dfc58b3190774cb491aa74c339fbde1a11740e6be79b466", + "version": "18.16.0" }, "asterisk_19": { - "sha256": "832a967c5a040b0768c0e8df1646762f7304019fcf7f2e065a8b4828fa4092b7", - "version": "19.7.0" + "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa", + "version": "19.8.0" }, "asterisk_20": { - "sha256": "949022c20dc6da65b456e1b1b5b42a7901bb41fc9ce20920891739e7220d72eb", - "version": "20.0.0" + "sha256": "4364dc762652e2fd4d3e7dc8428c83550ebae090b8a0e9d4820583e081778883", + "version": "20.1.0" } } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index b52b0fb0220e3..5bfb2881c4cc8 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -15,11 +15,11 @@ in optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" (stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.19.1"; + version = "7.19.5"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-icfyxuS6chh3ibXZ0V9YYB0oCDd9o5rmcDC5Rbr0tOQ="; + sha256 = "sha256-32syhzbFCWzwE2NftTY58aA+iD0kABraT4FA7mYU1II="; }; buildPhase = '' diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 37d6b7251a325..9ada37768ad17 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.6.2"; + version = "2.6.4"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - sha256 = "sha256-EXs+LNb87RWkmSWvs8nZIVqRJMutn+ntR241gqI7CUg="; + hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0="; + hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0="; }; - vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY="; + vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM="; subPackages = [ "cmd/caddy" ]; @@ -43,8 +43,12 @@ buildGoModule { substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy" substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy" + $out/bin/caddy manpage --directory manpages + installManPage manpages/* + installShellCompletion --cmd metal \ --bash <($out/bin/caddy completion bash) \ + --fish <($out/bin/caddy completion fish) \ --zsh <($out/bin/caddy completion zsh) ''; @@ -58,8 +62,8 @@ buildGoModule { meta = with lib; { homepage = "https://caddyserver.com"; - description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne techknowlogick ]; + maintainers = with maintainers; [ Br1ght0ne indeednotjames techknowlogick ]; }; } diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index 634a6aed14022..c20a0e325ec90 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.3.1"; + version = "0.3.2"; subPackages = [ "cmd/xcaddy" ]; @@ -10,19 +10,26 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-oGTtS5UlEebIqv4SM4q0YclASJNu8DNOLrGLRRAtkd8="; + hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs="; }; patches = [ + ./inject_version_info.diff ./use_tmpdir_on_darwin.diff ]; + ldflags = [ + "-s" + "-w" + "-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}" + ]; + vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y="; meta = with lib; { homepage = "https://github.com/caddyserver/xcaddy"; description = "Build Caddy with plugins"; license = licenses.asl20; - maintainers = with maintainers; [ tjni ]; + maintainers = with maintainers; [ tjni indeednotjames ]; }; } diff --git a/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/servers/caddy/xcaddy/inject_version_info.diff new file mode 100644 index 0000000000000..4d87aa6878781 --- /dev/null +++ b/pkgs/servers/caddy/xcaddy/inject_version_info.diff @@ -0,0 +1,16 @@ +diff --git a/cmd/main.go b/cmd/main.go +index ede7cd8..c553140 100644 +--- a/cmd/main.go ++++ b/cmd/main.go +@@ -401,8 +401,11 @@ func splitWith(arg string) (module, version, replace string, err error) { + return + } + ++var customVersion string ++ + // xcaddyVersion returns a detailed version string, if available. + func xcaddyVersion() string { ++ return customVersion + mod := goModule() + ver := mod.Version + if mod.Sum != "" { diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 14c4822f3fb45..0fd0ecd63797d 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , nixosTests , python3 +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -43,6 +44,12 @@ python3.pkgs.buildPythonApplication rec { # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters # are stored in the DB. ./db-migrations.patch + # Handle version 3.0 of flask-babel + (fetchpatch { + url = "https://github.com/janeczku/calibre-web/commit/94a6931d48d347ae6c07e2b5f0301e8cf97cf53d.patch"; + excludes = [ "requirements.txt" ]; + hash = "sha256-0DQ+LbIOOwjBXQh+b1w8dYQ3s+xZ6nFoH5GvgJdBAFI="; + }) ]; # calibre-web doesn't follow setuptools directory structure. The following is taken from the script @@ -59,6 +66,7 @@ python3.pkgs.buildPythonApplication rec { --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ --replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \ --replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \ + --replace "Flask-Babel>=0.11.1,<2.1.0" "Flask-Babel>=0.11.1" \ --replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \ --replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \ --replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \ diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 44edf3be7a81c..05808d605d267 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -11,12 +11,25 @@ let yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + # replaces esbuild's download script with a binary from nixpkgs patchEsbuild = path : version : '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 1bee79918927c..2281031a6449e 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.7.1"; + version = "22.05.8.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1hr62c9g0z3brgpa2l68pskraqxk52dk1iq1xkb0dr5w0cwhdpij"; + sha256 = "sha256-hL/FnHl+Fj62xGH1FVkB9jVtvrVxbPU73DlMWC6CyJ0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index fbbda3837b977..d4669488901a8 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ defaults.yaml - ${if confFile != "" then "cat ${confFile} >> defaults.yaml" else ""} + ${lib.optionalString (confFile != "") "cat ${confFile} >> defaults.yaml"} mv defaults.yaml $out/conf; # Link to extra jars diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index ccb57f55bb24d..9cf0b9ba0b20c 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # added to fix build with gcc7 - NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; + env.NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; postPatch = '' substituteInPlace Makefile.am \ diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index dab2d0ba45ae3..19284bd52da92 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.14.3"; + version = "1.15.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-zTsFLBd+7G+8HT8EGLSQaMhFfh/7s1tfu2gZtIMbkDs="; + sha256 = "sha256-WJQHBSwmcJiUGt69DMMZxs+xEk3z+fadSHoHvxb48ZU="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-tekrveDmUq6qYafRMm7knxp9+FevaDbu4DZusO6KDtA="; + vendorHash = "sha256-XwoZ/iwsZ/zXgPRGfBit5TO2NDS2pTEO0FT4KSUhJtA="; doCheck = false; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index b8c56f5486618..f73a6a6f633ed 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # ld: ...-libprom-0.1.1/include/prom_collector_registry.h:37: multiple definition of # `PROM_COLLECTOR_REGISTRY_DEFAULT'; ...-libprom-0.1.1/include/prom_collector_registry.h:37: first defined here # Should be fixed in libprom-1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; passthru.tests.coturn = nixosTests.coturn; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 9051f2e87e545..6f459e7ad2822 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.10.8"; + version = "0.11.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-D+hZWcywOCynGxMlJtsr5YaGxwRVGODNYO8jZROsGX8="; + sha256 = "sha256-EJUHpV+ZsMMSMsJGhF0Atblksg5rgI3a2qcRxLyZP38="; }; - vendorSha256 = "sha256-mNvie0PP0758AndWQ629oY4/aFGwiG358NhwYHSdxEU="; + vendorHash = "sha256-Ygd5wC4j0kAbEMMVct5WXZvkcYSqqK8d7ZZ9CDU1RHU="; subPackages = [ # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index d55f89b9477f3..b0762990f2d50 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool ]; # configureFlags = [ "--datadir=/run/current-system/share/dictd" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; meta = with lib; { description = "Dict protocol server and client"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 7a7a6de5dad4a..9934a4710d769 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.10"; + version = "9.18.11"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9BWpL+tiVotQhUoGPLIx4lc1H4ZyGG0KsDGkmz3iysY="; + sha256 = "sha256-j/M1KBIjDLy9pC34fK2WH5QWPT2kV8XkvvgFf9XfIVg="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index bb9ae3ced4d78..514e9cbbe0436 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-Kb4nkxuyZHJT5dqFSkqReFkN8q1uYm7wbhSIiLd8Hck="; + sha256 = "sha256-/+D/jATZhHSxLPB8RkPLUYAZ3O+/9l8XIhgokXz2SUQ="; }; - vendorSha256 = "sha256-nyMeKmGoypDrpZHYHGjhRnjgC3tbOX/dlj96pnXrdLE="; + vendorHash = "sha256-aWmwzIHScIMb3DPzr4eto2yETMgKd/hUy18X8KxQGos="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 2081f32ea67e9..3878b554afd21 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-UkvSuwWqLgWYKpca6FEPKBIwOrRIajhhtiIS0GsRJ80="; + hash = "sha256-fq9vrC8mVlxdhljUKiE3meBfTTvGjnxxbnF030ExWIY="; }; patches = [ diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index d4e61ee045e86..2e17dd81f6fe6 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "doh-proxy-rust"; - version = "0.9.7"; + version = "0.9.8"; src = fetchCrate { inherit version; crateName = "doh-proxy"; - sha256 = "sha256-rcLI5sLdqelnpfU7/T0s0l3rtpYBd77BBAXc4xSmCCE="; + sha256 = "sha256-+Z2eneEK6nhcJEKRa1VIolCTZ8to2mMQ8Ik7WEH+1w0="; }; - cargoHash = "sha256-zkZuyegz82xOBq2t0jkMo6SLLteOHuhrFcROZCQeiyk="; + cargoHash = "sha256-nlKzVQeLg3/nBIkD7QoBUWC93m9BiJrybf13Y/ns9gA="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 7e255c01d35d3..539dbd6a80657 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13"; + sha256 = "c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 929c76e7e2cac..ed64f6b791f45 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -3,7 +3,7 @@ , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb -, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle +, jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle # test-only deps. , cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.5.3"; + version = "5.6.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d"; + sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7"; }; outputs = [ "out" "dev" ]; @@ -63,7 +63,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] - ++ [ nghttp2 ] + ++ [ jemalloc nghttp2 ] ## optional dependencies; TODO: dnstap ; @@ -71,6 +71,7 @@ unwrapped = stdenv.mkDerivation rec { "-Dkeyfile_default=${dns-root-data}/root.ds" "-Droot_hints=${dns-root-data}/root.hints" "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/ + "-Dmalloc=jemalloc" "--default-library=static" # not used by anyone ] ++ optional doInstallCheck "-Dunit_tests=enabled" @@ -89,7 +90,7 @@ unwrapped = stdenv.mkDerivation rec { doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' - meson test --print-errorlogs + meson test --print-errorlogs --no-suite snowflake ''; meta = with lib; { diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index a41581d934c60..a449b242daf6e 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "17A0RwCSV+US8B/MRsvbnIWbZyocmyP684LocHZbDw0="; + sha256 = "sha256-Q4LT6E8TQBaFdyd53+3my8gVfs9nY/p/2x3TPuP3msc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index a4bcd8744e8ef..11fa40ff91bb9 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, nixosTests -, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd +, boost, yaml-cpp, libsodium, sqlite, protobuf, openssl, systemd , mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb }: @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb + yaml-cpp libsodium curl unixODBC openssl systemd lmdb tinycdb ]; # Configure phase requires 64-bit time_t even on 32-bit platforms. - NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.is32bit [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.is32bit [ "-D_TIME_BITS=64" "-D_FILE_OFFSET_BITS=64" - ]; + ]); configureFlags = [ "--disable-silent-rules" diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 11fd50bc581ad..a6b9a3340affa 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "domoticz"; - version = "2022.2"; + version = "2023.1"; src = fetchFromGitHub { owner = "domoticz"; repo = pname; rev = version; - sha256 = "sha256-xgHfbNY5qzBkrMaJvFQ+EqJ7tcy0LNdPLD1bD92WkKg="; + sha256 = "sha256-fXNS7EVMqGM4tYppgG+l/adBt9eyW8RBK3Cs/pb2kg4="; fetchSubmodules = true; }; @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ edcragg ]; homepage = "https://www.domoticz.com/"; + changelog = "https://github.com/domoticz/domoticz/blob/${version}/History.txt"; license = licenses.gpl3Plus; platforms = platforms.all; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix index 3dbc3994e6d62..1a25e77388054 100644 --- a/pkgs/servers/eris-go/default.nix +++ b/pkgs/servers/eris-go/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitea }: +{ lib, stdenv, buildGoModule, fetchFromGitea }: buildGoModule rec { pname = "eris-go"; - version = "20230123"; + version = "20230202"; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; repo = pname; rev = version; - hash = "sha256-jdeh5lhbu2hxVNdnU0GiMsdXRi8004Xgu2/tgFhqPao="; + hash = "sha256-o9FRlUtMk1h8sR+am2gNEQOMgAceRTdRusI4a6ikHUM="; }; - vendorHash = "sha256-mLyPaX5rDw0rR4PXtzpLMOrsYwTH3Y+COcrvwH7/qdo="; + vendorHash = "sha256-ZDJm7ZlDBVWLnuC90pOwa608GnuEgy0N/I96vvesZPY="; postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put"; # eris-get is a multicall binary @@ -22,5 +22,6 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; mainProgram = "eris-get"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index 7f5517fa7507a..c43821a928ee1 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.23"; + version = "3.4.24"; - vendorSha256 = "sha256-kq9KYe4wnPbOLHra5DHZH1N3w2R+dNF7ouF2c26e/cU="; + vendorHash = "sha256-8fWiei7hZ4NO1CIMPQaRe4gyBF1CUjcqU5Eghyiy64w="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-7HAA3MHDlsnTYDu5AmzpFfiWaarUGO09QHrPGLHolyM="; + sha256 = "sha256-jbMwSvCn9y4md60pWd7nF2Ck2XJDkYfg5olr1qVrPd4="; }; buildPhase = '' diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index 4272332787072..ede9f78e8d596 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin }: let - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-KQ3N6HBgdLnS/8UprT99gH9ttsy2cgfaWSL/ILX6t1A="; + hash = "sha256-VgWY622RJ8f4yA6TRC5IvatVFw2CP5lN3QBS3Xaevbc="; }; CGO_ENABLED = 0; @@ -25,11 +25,11 @@ let inherit CGO_ENABLED meta src version; - vendorSha256 = "sha256-u4N8YXmnVk5flPimdE4olr/1hVZoEDEgUwXRRTlX51o="; + vendorHash = "sha256-w/aWrQF/PAWTGMFUcpHiiDef6cvLLdYP06iwBdxrGkQ="; modRoot = "./server"; - postBuild = '' + preInstall = '' mv $GOPATH/bin/{server,etcd} ''; @@ -45,7 +45,7 @@ let inherit CGO_ENABLED meta src version; - vendorSha256 = "sha256-J4qW2Dzpwk85XW3oWvT1F5ec/jzkcLbTC+1CMBztWRw="; + vendorHash = "sha256-Bq5vOZCflLDAhhmwSww9JCahfL/JHKa3ZT4cwNXzW90="; modRoot = "./etcdutl"; }; @@ -55,7 +55,7 @@ let inherit CGO_ENABLED meta src version; - vendorSha256 = "sha256-+5zWXVErkFAvtkpNQtKn/jLOGUdHkXgeZWI7/RIMgMQ="; + vendorHash = "sha256-KUr0SrfuE5sh54THdvJwuMO/U6O+civ6onEPzNGqf18="; modRoot = "./etcdctl"; }; diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 079b87fe9a73e..1b50e3cbe4593 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -36,11 +36,8 @@ buildPythonPackage rec { pynacl redis typing-extensions - ] ++ lib.optional withLdap [ - python-ldap - ] ++ lib.optional withPostgres [ - psycopg2 - ]; + ] ++ lib.optional withLdap python-ldap + ++ lib.optional withPostgres psycopg2; installPhase = '' mkdir -p $out/bin $out/lib diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 0efadc6524a97..c778ed72328e9 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc="; }; - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix index fccc1ba0016b7..f50e3b19583ca 100644 --- a/pkgs/servers/filtron/default.nix +++ b/pkgs/servers/filtron/default.nix @@ -1,22 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "filtron"; version = "0.2.0"; - goPackagePath = "github.com/asciimoo/filtron"; - src = fetchFromGitHub { owner = "asciimoo"; repo = "filtron"; rev = "v${version}"; - sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26"; + hash = "sha256-RihxlJvbHq5PaJz89NHl/wyXrKjSiC4XYAs7LSKAo6E="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-1DRR16WiBGvhOpq12L5njJJRRCIA7ajs1Py9j/3cWPE="; + + patches = [ + # Update golang version in go.mod + (fetchpatch { + url = "https://github.com/asciimoo/filtron/commit/365a0131074b3b12aaa65194bfb542182a63413c.patch"; + hash = "sha256-QGR6YetEzA/b6tC4uD94LBkWv0+9PG7RD72Tpkn2gQU="; + }) + # Add missing go.sum file + (fetchpatch { + url = "https://github.com/asciimoo/filtron/commit/077769282b4e392e96a194c8ae71ff9f693560ea.patch"; + hash = "sha256-BhHbXDKiRjSzC6NKhKUiH6rjt/EgJcEprHMMJ1x/wiQ="; + }) + ]; - # The upstream test checks are obsolete/unmaintained. - doCheck = false; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Reverse HTTP proxy to filter requests by different rules."; diff --git a/pkgs/servers/filtron/deps.nix b/pkgs/servers/filtron/deps.nix deleted file mode 100644 index 61320f868d05d..0000000000000 --- a/pkgs/servers/filtron/deps.nix +++ /dev/null @@ -1,41 +0,0 @@ -[ - { - goPackagePath = "github.com/valyala/fasthttp"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasthttp"; - rev = "v1.41.0"; - sha256 = "sha256-lV9FP7GjnQk/kJACE9l5CZ/8kzORdNpYS5lPokEYrZM="; - }; - } - - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.15.12"; - sha256 = "sha256-D41sCSbaqX9tXIRcTU9TYyjPyZpuKLDeQMXETE2ulbM="; - }; - } - - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "v1.0.0"; - sha256 = "sha256-I9FPZ3kCNRB+o0dpMwBnwZ35Fj9+ThvITn8a3Jr8mAY="; - }; - } - - { - goPackagePath = "github.com/andybalholm/brotli"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/brotli"; - rev = "v1.0.4"; - sha256 = "sha256-gAnPRdGP4yna4hiRIEDyBtDOVJqd7RU27wlPu96Rdf8="; - }; - } -] diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 9d65198c8cef3..cdf8267c6abf2 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -60,6 +60,11 @@ let (lib.optionalString (!useClang) "-DUSE_LD=GOLD") ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=missing-template-keyword" + ]; + inherit patches; # fix up the use of the very weird and custom 'fdb_install' command by just diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index f5e504bb02c2f..1a316743a436f 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -24,11 +24,11 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - hash = "sha256-Xw7seQike8dSV6SIAsrK1Sc/HBOyaA8fhHzwrISKyBA="; + hash = "sha256-FEv37X7fIcrL0HUdQWAI+s4VZwI7ODKxGm2wejsH2cA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index d37a7247ecf4b..c13d4dda5056c 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; }; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix index 354412a4b73f0..351f54f21d498 100644 --- a/pkgs/servers/gemini/molly-brown/default.nix +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchgit, nixosTests }: +{ lib, buildGoModule, fetchgit, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "molly-brown"; - version = "unstable-2020-08-19"; - rev = "48f9a206c03c0470e1c132b9667c6daa3583dada"; - - goPackagePath = "tildegit.org/solderpunk/molly-brown"; + version = "unstable-2023-02-10"; src = fetchgit { - inherit rev; url = "https://tildegit.org/solderpunk/molly-brown.git"; - sha256 = "1w79a25mbgav95p78fkdm9j62chwwpkqv0m2wmh5my03yq398gya"; + rev = "56d8dde14abc90b784b7844602f12100af9756e0"; + hash = "sha256-kfopRyCrDaiVjKYseyWacIT9MJ8PzB8LAs6YMgYqCrs="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-czfHnXS9tf5vQQNXhWH7DStmhsorSc4Di/yZuv4LHRk="; + + ldflags = [ "-s" "-w" ]; passthru.tests.basic = nixosTests.molly-brown; diff --git a/pkgs/servers/gemini/molly-brown/deps.nix b/pkgs/servers/gemini/molly-brown/deps.nix deleted file mode 100644 index 95427e8f79079..0000000000000 --- a/pkgs/servers/gemini/molly-brown/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } -] diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix index 3eae9c2b33cbd..e9ac6e834979e 100644 --- a/pkgs/servers/geospatial/mapcache/default.nix +++ b/pkgs/servers/geospatial/mapcache/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mapcache"; - version = "1.12.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-NuiZMWcmsN5wDCd37Hvj3cazwT3Ea+OknV/YR3urZB0="; + sha256 = "sha256-+QP4xXhP+MNqnhMUtMdtKrcuJ0M2BXWu3mbxXzj5ybc="; }; nativeBuildInputs = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { "-DAPACHE_MODULE_DIR=${placeholder "out"}/modules" ]; + env.NIX_CFLAGS_COMPILE = "-std=c99"; + meta = with lib; { description = "A server that implements tile caching to speed up access to WMS layers"; homepage = "https://mapserver.org/mapcache/"; diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index a187259db69ee..6276ad90189d2 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -1,21 +1,51 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.6.2"; + version = "0.7.2"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-+XD4w6W6dyKuTItLQS0P/waksIVsPXVswcrCQ7jpw90="; + hash = "sha256-F7CAP7PrG71EdAe2hb13L/fKSiFyNHYHHweqg2GiJeU="; }; - cargoHash = "sha256-U3oNyMS4S44ybAtt1/b0AXDLiag41XWt9DT5mKLQzm8="; + cargoHash = "sha256-/bIMQJ2+39PShVx/W/tOeD+EjPNLw4NianwJl9wkwmk="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; - doCheck = false; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + checkFlags = [ + "--skip function_source_schemas" + "--skip function_source_tile" + "--skip function_source_tilejson" + "--skip pg_get_function_tiles" + "--skip pg_get_function_source_ok_rewrite" + "--skip pg_get_function_source_ok" + "--skip pg_get_composite_source_tile_minmax_zoom_ok" + "--skip pg_get_function_source_query_params_ok" + "--skip pg_get_composite_source_tile_ok" + "--skip pg_get_catalog" + "--skip pg_get_composite_source_ok" + "--skip pg_get_health_returns_ok" + "--skip pg_get_table_source_ok" + "--skip pg_get_table_source_rewrite" + "--skip pg_null_functions" + "--skip utils::test_utils::tests::test_bad_os_str" + "--skip utils::test_utils::tests::test_get_env_str" + "--skip pg_get_table_source_multiple_geom_tile_ok" + "--skip pg_get_table_source_tile_minmax_zoom_ok" + "--skip pg_tables_feature_id" + "--skip pg_get_table_source_tile_ok" + "--skip table_source_schemas" + "--skip tables_srid_ok" + "--skip tables_tile_ok" + "--skip table_source" + "--skip tables_tilejson" + "--skip tables_multiple_geom_ok" + ]; meta = with lib; { description = "Blazing fast and lightweight PostGIS vector tiles server"; diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/servers/gnss-share/default.nix new file mode 100644 index 0000000000000..81efe84d1c4f3 --- /dev/null +++ b/pkgs/servers/gnss-share/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitLab, lib }: +buildGoModule rec { + pname = "gnss-share"; + version = "0.6"; + src = fetchFromGitLab { + owner = "postmarketOS"; + repo = "gnss-share"; + rev = version; + hash = "sha256-vVmQlhzRISMBcYZh/9GQmOGzDgTzu2jSyIiEWdXPqOQ="; + }; + vendorHash = "sha256-hS/xSxZSMHP+qlvpJYV6EvXtWx9ESamJ8lOf926CqOw="; + meta = with lib; { + description = "share GNSS data between multiple clients"; + longDescription = '' + gnss-share is an app that facilitates sharing GNSS location data with multiple + clients, while providing a way to perform device-specific setup beforehand. For + some devices, it can also manage loading and storing A-GPS data. + + This is meant to replace things like gpsd, and gps-share, and work together + with geoclue* or other clients that support fetching NMEA location data over + sockets. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ balsoft ]; + }; +} diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index d1b11dfd3d55b..e8bc31abed836 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { atk dbus-glib gdk-pixbuf - gobject-introspection libX11 libXaw libXext diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/servers/haste-server/default.nix index de1747ac28537..cc445312e691d 100644 --- a/pkgs/servers/haste-server/default.nix +++ b/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "20919c946602b8151157f647e475e30687a43727"; + version = "ccc5049b07e9f90ec19fc2a88e5056367c53e202"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-IPGsddPRu4/jT1NsUNOwUjSL3+ikGzMR3X3ohY66uAk="; + hash = "sha256-ODFHB2QwfLPxfjFsHrblSeiqLc9nPo7EOPGQ3AoqzSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/haste-server/node-deps.nix b/pkgs/servers/haste-server/node-deps.nix index 863f58ef2db1a..36a5d6fd39764 100644 --- a/pkgs/servers/haste-server/node-deps.nix +++ b/pkgs/servers/haste-server/node-deps.nix @@ -49,13 +49,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "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=="; }; }; "argparse-2.0.1" = { @@ -67,13 +67,13 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "async-3.2.4" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "3.2.4"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; "async-cache-1.1.0" = { @@ -670,6 +670,15 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -1237,13 +1246,13 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-2.4.6" = { + "winston-2.4.7" = { name = "winston"; packageName = "winston"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.6.tgz"; - sha512 = "J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.7.tgz"; + sha512 = "vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg=="; }; }; "workerpool-6.1.0" = { @@ -1341,15 +1350,15 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../../nix/store/ksl6h7h03ks119z1skfipjh4irc8x80c-source; + src = ../../../../../../../../../nix/store/zmi5rwpy1kmyj52ymv3yc8ziiypjgrxd-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-2.0.1" - sources."async-3.2.4" + sources."async-2.6.4" sources."async-cache-1.1.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -1430,6 +1439,7 @@ let sources."isstream-0.1.2" sources."js-yaml-4.0.0" sources."locate-path-6.0.0" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."lru-cache-4.1.5" sources."mime-2.6.0" @@ -1495,7 +1505,7 @@ let sources."utils-merge-1.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" - sources."winston-2.4.6" + sources."winston-2.4.7" sources."workerpool-6.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 9ebf04b80bdd6..b3a01cd2f6899 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.0-beta.5"; + version = "0.6.0"; format = "other"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v"; + sha256 = "0wx0kj9brcd4i9fdc4hmp39cgr27qybya6bp108cfgfv9x7150iw"; }; dontBuild = true; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index b84632746c944..8ebcde82a4461 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.18.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-0viXsBRCiaxBTTKXJngSov5M7toscQUOdXDTr1l0U3I="; + hash = "sha256-RqJrqY1Eh5/TY+vMAO5fABmeV5aSzcLD4fX7j1QDN6w="; }; - vendorHash = "sha256-SuKT+b8g6xEK15ry2IAmpS/vwDG+zJqK9nfsWpHNXuU="; + vendorHash = "sha256-8p5NFxXKaZPsW4B6NMzfi0pqfVroIahSgA0fukvB3JI="; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index db7d40ad35d5a..1371bac15d66f 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -4,17 +4,18 @@ let python = python3.override { packageOverrides = self: super: { mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.3"; - src = oldAttrs.src.override { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + version = "0.16.10"; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k="; }; }); }; }; - -in python.pkgs.buildPythonApplication rec { +in +python.pkgs.buildPythonApplication rec { pname = "heisenbridge"; version = "1.13.1"; @@ -30,11 +31,10 @@ in python.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp irc + ruamel-yaml mautrix python-socks - pyyaml ]; nativeCheckInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 7af675de41fed..d44145dfecc34 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -5,21 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "4.0.8"; - disabled = python3.pythonOlder "3.6"; + version = "4.2.1"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "AppDaemon"; - repo = pname; - rev = version; - sha256 = "04a4qx0rbx2vpkzpibmwkpy7fawa6dbgqlrllryrl7dchbrf703q"; + repo = "appdaemon"; + rev = "refs/tags/${version}"; + hash = "sha256-4sN0optkMmyWb5Cd3F7AhcXYHh7aidJE/bieYMEKgSY="; }; - # relax dependencies postPatch = '' - substituteInPlace requirements.txt \ - --replace "deepdiff==5.2.3" "deepdiff" \ - --replace "pygments==2.8.1" "pygments" + # relax dependencies sed -i 's/==/>=/' requirements.txt ''; @@ -63,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; homepage = "https://github.com/AppDaemon/appdaemon"; + changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.rst"; license = licenses.mit; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 79e14605bde9f..dafb5b4976d23 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,12 +2,12 @@ # Do not edit! { - version = "2023.1.7"; + version = "2023.2.5"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ - abodepy + jaraco-abode ]; "accuweather" = ps: with ps; [ accuweather @@ -57,7 +57,10 @@ airthings-cloud ]; "airthings_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly airthings-ble bleak-retry-connector bleak @@ -65,13 +68,16 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "airtouch4" = ps: with ps; [ airtouch4pyapi @@ -99,10 +105,6 @@ pyturbojpeg aiohttp-cors ]; - "almond" = ps: with ps; [ - aiohttp-cors - pyalmond - ]; "alpha_vantage" = ps: with ps; [ alpha-vantage ]; @@ -148,6 +150,8 @@ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav + "anwb_energie" = ps: with ps; [ + ]; "apache_kafka" = ps: with ps; [ aiokafka ]; @@ -183,7 +187,10 @@ "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "aranet" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly aranet4 bleak-retry-connector bleak @@ -191,13 +198,16 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "arcam_fmj" = ps: with ps; [ arcam-fmj @@ -332,7 +342,10 @@ "bloomsky" = ps: with ps; [ ]; "bluemaestro" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluemaestro-ble @@ -340,13 +353,16 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "blueprint" = ps: with ps; [ ]; @@ -369,21 +385,49 @@ pyudev sqlalchemy ]; + "bluetooth_adapters" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; "bluetooth_le_tracker" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity @@ -435,7 +479,10 @@ btsmarthub_devicelist ]; "bthome" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters @@ -443,13 +490,16 @@ bluetooth-data-tools bthome-ble dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "bticino" = ps: with ps; [ ]; @@ -557,6 +607,8 @@ ]; "conversation" = ps: with ps; [ aiohttp-cors + hassil + home-assistant-intents ]; "coolmaster" = ps: with ps; [ pycoolmasternet-async @@ -631,7 +683,9 @@ dbus-fast fnvhash hass-nabucasa + hassil home-assistant-frontend + home-assistant-intents ifaddr janus pillow @@ -650,8 +704,8 @@ ]; "demo" = ps: with ps; [ aiohttp-cors - fnvhash - sqlalchemy + hassil + home-assistant-intents ]; "denon" = ps: with ps; [ ]; @@ -871,11 +925,15 @@ ifaddr sqlalchemy ]; + "energie_vanons" = ps: with ps; [ + ]; "energy" = ps: with ps; [ aiohttp-cors fnvhash sqlalchemy ]; + "energyzero" = ps: with ps; [ + ]; # missing inputs: energyzero "enigma2" = ps: with ps; [ openwebifpy ]; @@ -903,7 +961,10 @@ "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters @@ -911,13 +972,16 @@ bluetooth-data-tools construct dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ pescea @@ -931,6 +995,7 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend ifaddr @@ -945,6 +1010,28 @@ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside + "eufylife_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: eufylife_ble_client "everlights" = ps: with ps; [ pyeverlights ]; @@ -1008,6 +1095,8 @@ "fints" = ps: with ps; [ fints ]; + "fire_tv" = ps: with ps; [ + ]; "fireservicerota" = ps: with ps; [ pyfireservicerota ]; @@ -1025,21 +1114,27 @@ fixerio ]; "fjaraskupan" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fjaraskupan fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "fleetgo" = ps: with ps; [ ritassist @@ -1241,6 +1336,12 @@ ]; "google_domains" = ps: with ps; [ ]; + "google_mail" = ps: with ps; [ + aiohttp-cors + fnvhash + google-api-python-client + sqlalchemy + ]; "google_maps" = ps: with ps; [ locationsharinglib ]; @@ -1262,21 +1363,27 @@ "google_wifi" = ps: with ps; [ ]; "govee_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash govee-ble home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "gpsd" = ps: with ps; [ gps3 @@ -1478,14 +1585,18 @@ zeroconf ]; "homekit_controller" = ps: with ps; [ + aioesphomeapi aiohomekit aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend ifaddr @@ -1509,7 +1620,7 @@ pyhomeworks ]; "honeywell" = ps: with ps; [ - somecomfort + aiosomecomfort ]; "horizon" = ps: with ps; [ ]; # missing inputs: horimote @@ -1560,21 +1671,27 @@ iaqualink ]; "ibeacon" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend ibeacon-ble + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "icloud" = ps: with ps; [ pyicloud @@ -1602,6 +1719,7 @@ pillow ]; "imap" = ps: with ps; [ + aiohttp-cors aioimaplib ]; "imap_email_content" = ps: with ps; [ @@ -1614,21 +1732,27 @@ influxdb ]; "inkbird" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr inkbird-ble janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "input_boolean" = ps: with ps; [ ]; @@ -1741,21 +1865,27 @@ getmac ]; "kegtron" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus kegtron-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput @@ -1765,24 +1895,34 @@ ]; "keymitt_ble" = ps: with ps; [ pymicrobot + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "kira" = ps: with ps; [ pykira ]; + "kitchen_sink" = ps: with ps; [ + fnvhash + sqlalchemy + ]; "kiwi" = ps: with ps; [ kiwiki-client ]; @@ -1801,7 +1941,8 @@ konnected ]; "kostal_plenticore" = ps: with ps; [ - ]; # missing inputs: kostal_plenticore + pykoplenti + ]; "kraken" = ps: with ps; [ krakenex pykrakenapi @@ -1845,22 +1986,50 @@ "lcn" = ps: with ps; [ pypck ]; + "ld2410_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: ld2410-ble "led_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus led-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "legrand" = ps: with ps; [ ]; @@ -2052,20 +2221,26 @@ "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate "melnor" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors @@ -2109,6 +2284,8 @@ ]; "miflora" = ps: with ps; [ ]; + "mijndomein_energie" = ps: with ps; [ + ]; "mikrotik" = ps: with ps; [ librouteros ]; @@ -2131,21 +2308,27 @@ "mjpeg" = ps: with ps; [ ]; "moat" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus moat-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "mobile_app" = ps: with ps; [ pynacl @@ -2153,6 +2336,8 @@ aiohttp-cors fnvhash hass-nabucasa + hassil + home-assistant-intents pillow sqlalchemy ]; @@ -2180,6 +2365,28 @@ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; + "mopeka" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: mopeka_iot_ble "motion_blinds" = ps: with ps; [ aiohttp-cors fnvhash @@ -2457,9 +2664,13 @@ "open_meteo" = ps: with ps; [ open-meteo ]; - "openalpr_cloud" = ps: with ps; [ + "openai_conversation" = ps: with ps; [ + aiohttp-cors + hassil + home-assistant-intents + openai ]; - "openalpr_local" = ps: with ps; [ + "openalpr_cloud" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy @@ -2502,21 +2713,27 @@ pyoppleio ]; "oralb" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus oralb-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "oru" = ps: with ps; [ ]; # missing inputs: oru @@ -2525,6 +2742,14 @@ ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify + "otbr" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + janus + pillow + sqlalchemy + ]; # missing inputs: python-otbr-api "otp" = ps: with ps; [ pyotp ]; @@ -2703,21 +2928,27 @@ "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev qingping-ble sqlalchemy + zeroconf ]; "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client @@ -2739,7 +2970,8 @@ pyqvrpro ]; "qwikswitch" = ps: with ps; [ - ]; # missing inputs: pyqwikswitch + pyqwikswitch + ]; "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -2813,6 +3045,7 @@ renault-api ]; "reolink" = ps: with ps; [ + aiohttp-cors reolink-aio ]; "repairs" = ps: with ps; [ @@ -2896,23 +3129,48 @@ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound + "ruuvi_gateway" = ps: with ps; [ + aiohttp-cors + aioruuvigateway + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + fnvhash + home-assistant-frontend + janus + pillow + pyserial + pyudev + sqlalchemy + ]; "ruuvitag_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev ruuvitag-ble sqlalchemy + zeroconf ]; + "rympro" = ps: with ps; [ + ]; # missing inputs: pyrympro "sabnzbd" = ps: with ps; [ pysabnzbd ]; @@ -2990,20 +3248,26 @@ pysensibo ]; "sensirion_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; # missing inputs: sensirion-ble "sensor" = ps: with ps; [ fnvhash @@ -3012,38 +3276,50 @@ "sensorblue" = ps: with ps; [ ]; "sensorpro" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sensorpro-ble sqlalchemy + zeroconf ]; "sensorpush" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sensorpush-ble sqlalchemy + zeroconf ]; "sentry" = ps: with ps; [ sentry-sdk @@ -3068,6 +3344,9 @@ "seventeentrack" = ps: with ps; [ py17track ]; + "sfr_box" = ps: with ps; [ + sfrbox-api + ]; "sharkiq" = ps: with ps; [ sharkiq ]; @@ -3199,21 +3478,27 @@ pysnmplib ]; "snooz" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pysnooz pyudev sqlalchemy + zeroconf ]; "solaredge" = ps: with ps; [ solaredge @@ -3302,6 +3587,8 @@ ]; "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank + "starlink" = ps: with ps; [ + ]; # missing inputs: starlink-grpc-core "startca" = ps: with ps; [ xmltodict ]; @@ -3329,6 +3616,8 @@ "stookalert" = ps: with ps; [ stookalert ]; + "stookwijzer" = ps: with ps; [ + ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -3372,20 +3661,26 @@ ]; "switchbot" = ps: with ps; [ pyswitchbot + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -3491,40 +3786,52 @@ "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy thermobeacon-ble + zeroconf ]; "thermoplus" = ps: with ps; [ ]; "thermopro" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy thermopro-ble + zeroconf ]; "thermoworks_smoke" = ps: with ps; [ stringcase @@ -3537,6 +3844,8 @@ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; + "thread" = ps: with ps; [ + ]; "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ @@ -3550,21 +3859,27 @@ pytile ]; "tilt_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy tilt-ble + zeroconf ]; "time_date" = ps: with ps; [ ]; @@ -3576,7 +3891,7 @@ "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ - todoist + todoist-api-python ]; "tolo" = ps: with ps; [ tololib @@ -3937,21 +4252,27 @@ zeroconf ]; "xiaomi_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy xiaomi-ble + zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct @@ -3970,21 +4291,27 @@ yalesmartalarmclient ]; "yalexs_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy yalexs-ble + zeroconf ]; "yamaha" = ps: with ps; [ rxv @@ -4049,6 +4376,8 @@ "zestimate" = ps: with ps; [ xmltodict ]; + "zeversolar" = ps: with ps; [ + ]; # missing inputs: zeversolar "zha" = ps: with ps; [ aiohttp-cors bellows @@ -4123,7 +4452,6 @@ "alarmdecoder" "alert" "alexa" - "almond" "amberelectric" "ambiclimate" "ambient_station" @@ -4163,6 +4491,7 @@ "bluemaestro" "blueprint" "bluetooth" + "bluetooth_adapters" "bluetooth_le_tracker" "bmw_connected_drive" "bond" @@ -4315,6 +4644,7 @@ "google_assistant" "google_assistant_sdk" "google_domains" + "google_mail" "google_pubsub" "google_sheets" "google_translate" @@ -4372,6 +4702,7 @@ "ign_sismologia" "image_processing" "image_upload" + "imap" "imap_email_content" "influxdb" "inkbird" @@ -4403,10 +4734,12 @@ "kegtron" "keymitt_ble" "kira" + "kitchen_sink" "kmtronic" "knx" "kodi" "konnected" + "kostal_plenticore" "kraken" "kulersky" "lametric" @@ -4519,6 +4852,7 @@ "onewire" "onvif" "open_meteo" + "openai_conversation" "openalpr_cloud" "openerz" "openexchangerates" @@ -4566,6 +4900,7 @@ "qingping" "qld_bushfire" "qnap_qsw" + "qwikswitch" "rachio" "radarr" "radio_browser" @@ -4600,6 +4935,7 @@ "rss_feed_template" "rtsp_to_webrtc" "ruckus_unleashed" + "ruuvi_gateway" "ruuvitag_ble" "sabnzbd" "safe_mode" @@ -4621,6 +4957,7 @@ "sentry" "senz" "seventeentrack" + "sfr_box" "sharkiq" "shell_command" "shelly" @@ -4701,6 +5038,7 @@ "text" "thermobeacon" "thermopro" + "thread" "threshold" "tibber" "tile" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 024c023d35052..b5e42fca6ae4b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -78,22 +78,6 @@ let ]; }); - caldav = super.caldav.overridePythonAttrs (old: rec { - version = "0.9.1"; - src = fetchFromGitHub { - owner = "python-caldav"; - repo = "caldav"; - rev = "v${version}"; - hash = "sha256-Gil0v4pGyp5+TnYPjb8Vk0xTqnQKaeD8Ko/ZWhvkbUk="; - }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'xandikos<0.2.4'" "" \ - --replace ", 'radicale'" "" - ''; - nativeCheckInputs = old.nativeCheckInputs ++ [ self.nose ]; - }); - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "0.33"; src = fetchFromGitHub { @@ -114,15 +98,6 @@ let }; }); - icalendar = super.icalendar.overridePythonAttrs (oldAttrs: rec { - version = "4.1.0"; - src = self.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U="; - }; - }); - # Pinned due to API changes in 10.0 mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { version = "9.3.0"; @@ -176,27 +151,6 @@ let }; }); - pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { - version = "2.5.3"; - src = fetchFromGitHub { - owner = "riptideio"; - repo = "pymodbus"; - rev= "refs/tags/v${version}"; - hash = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; - }; - }); - - # Pinned due to API changes in 1.0.24 - pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec { - version = "1.0.22"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = "pysensibo"; - rev = "refs/tags/${version}"; - hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc="; - }; - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -206,6 +160,16 @@ let }; }); + pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { + version = "9.0.1"; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "pytradfri"; + rev = "refs/tags/${version}"; + hash = "sha256-xOdTzG0bF5p1QpkXv2btwrVugQRjSwdAj8bXcC0IoQg="; + }; + }); + python-telegram-bot = super.python-telegram-bot.overridePythonAttrs (oldAttrs: rec { version = "13.15"; src = fetchFromGitHub { @@ -235,25 +199,6 @@ let doCheck = false; }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { - version = "9.0.0"; - src = fetchFromGitHub { - owner = "home-assistant-libs"; - repo = "pytradfri"; - rev = "refs/tags/${version}"; - hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; - }; - }); - - pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec { - version = "0.0.10"; - src = super.fetchPypi { - pname = "pysoma"; - inherit version; - hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE="; - }; - }); - # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -304,8 +249,7 @@ let ]; python = python3.override { - # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); + packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; componentPackages = import ./component-packages.nix; @@ -321,12 +265,8 @@ let # Ensure that we are using a consistent package set extraBuildInputs = extraPackages python.pkgs; - # Create info about included packages and components - extraComponentsFile = writeText "home-assistant-components" (lib.concatStringsSep "\n" extraComponents); - extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); - # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.7"; + hassVersion = "2023.2.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -334,7 +274,7 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.9"; + disabled = python.pythonOlder "3.10"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -344,9 +284,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-z8dTFRs7Tm4WTQcYeHu9jlGbva9yNPhjmQ+CQY+9DN4="; + hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + # leave this in, so users don't have to constantly update their downstream patch handling patches = [ (substituteAll { @@ -368,6 +312,7 @@ in python.pkgs.buildPythonApplication rec { "ifaddr" "orjson" "PyJWT" + "pyOpenSSL" "requests" "typing-extensions" "yarl" @@ -382,7 +327,7 @@ in python.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python.pkgs; [ - # Only packages required in setup.py + # Only packages required in pyproject.toml aiohttp astral async-timeout @@ -400,6 +345,7 @@ in python.pkgs.buildPythonApplication rec { lru-dict orjson pip + pyopenssl pyjwt python-slugify pyyaml @@ -407,11 +353,9 @@ in python.pkgs.buildPythonApplication rec { voluptuous voluptuous-serialize yarl - # Not in setup.py, but used in homeassistant/util/package.py + # Implicit dependency via homeassistant/requirements.py setuptools - # Not in setup.py, but uncounditionally imported via tests/conftest.py - paho-mqtt - ] ++ componentBuildInputs ++ extraBuildInputs; + ]; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -423,22 +367,28 @@ in python.pkgs.buildPythonApplication rec { freezegun pytest-asyncio pytest-aiohttp - pytest-freezegun + pytest-freezer pytest-mock pytest-rerunfailures pytest-socket + pytest-timeout pytest-unordered pytest-xdist pytestCheckHook requests-mock respx stdlib-list - # required by tests/auth/mfa_modules + tomli + # required through tests/auth/mfa_modules/test_otp.py pyotp + # Sneakily imported in tests/conftest.py + paho-mqtt ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" "hue" + # for tests/test_config.py::test_merge_id_schema + "qwikswitch" ]; pytestFlagsArray = [ @@ -449,8 +399,8 @@ in python.pkgs.buildPythonApplication rec { "--only-rerun RuntimeError" # enable full variable printing on error "--showlocals" - # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' - "--deselect tests/helpers/test_system_info.py::test_container_installationtype" + # AssertionError: assert 1 == 0 + "--deselect tests/test_config.py::test_merge" # tests are located in tests/ "tests" ]; @@ -462,17 +412,6 @@ in python.pkgs.buildPythonApplication rec { "tests/pylint" # don't bulk test all components "tests/components" - # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 - "tests/auth/mfa_modules/test_notify.py" - ]; - - disabledTests = [ - # AssertionError: assert 1 == 0 - "test_merge" - # Tests are flaky - "test_config_platform_valid" - # Test requires pylint>=2.13.0 - "test_invalid_discovery_info" ]; preCheck = '' @@ -485,11 +424,6 @@ in python.pkgs.buildPythonApplication rec { export PATH=${inetutils}/bin:$PATH ''; - postInstall = '' - cp -v ${extraComponentsFile} $out/extra_components - cp -v ${extraPackagesFile} $out/extra_packages - ''; - passthru = { inherit availableComponents @@ -497,6 +431,7 @@ in python.pkgs.buildPythonApplication rec { getPackages python supportedComponentsWithTests; + pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); intents = python.pkgs.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 5be1d96b4c3c9..a3b1e7df1a5ee 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230110.0"; + version = "20230202.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-axtDtkIsTFWV8qtVvpYL4aDE5jbTdX4Qo5V+9taWuNo="; + hash = "sha256-Wo3bQnwTDSAC4EhJeYIXx1wODyx3wA2KMMaM3pJEkGw="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index d7ed384e8d537..8c8470113c4ce 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.1.25"; + version = "2023.1.31"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents"; rev = "refs/tags/${version}"; - hash = "sha256-nMEcN2b0XHF4yRRsHKMplxqcMLl+gJcPAdvwnySN+ug="; + hash = "sha256-buq/SLXDFP0xvIb2yGiHQzuL7HKvc7bxxdkhq4KHpvM="; }; sourceRoot = "source/package"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postInstall = '' pushd .. # https://github.com/home-assistant/intents/blob/main/script/package#L18 - ${python.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home-assistant-intents/home_assistant_intents/data + ${python.pythonForBuild.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data popd ''; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix new file mode 100644 index 0000000000000..01723e561e190 --- /dev/null +++ b/pkgs/servers/home-assistant/stubs.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, home-assistant +}: + +buildPythonPackage rec { + pname = "homeassistant-stubs"; + version = "2023.2.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "KapJI"; + repo = "homeassistant-stubs"; + rev = "refs/tags/${version}"; + hash = "sha256-MQYk4DWvmqtPl00L1c00JclKkTZe9EYMrm/LucUHBE0="; + }; + + nativeBuildInputs = [ + poetry-core + home-assistant + ]; + + pythonImportsCheck = [ + "homeassistant-stubs" + ]; + + doCheck = false; + + meta = with lib; { + description = "Typing stubs for Home Assistant Core"; + homepage = "https://github.com/KapJI/homeassistant-stubs"; + changelog = "https://github.com/KapJI/homeassistant-stubs/releases/tag/${version}"; + license = licenses.mit; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 375f05501a505..734823e9f4752 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -34,11 +34,6 @@ let }; extraDisabledTestPaths = { - tado = [ - # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com - "tests/components/tado/test_climate.py" - "tests/components/tado/test_water_heater.py" - ]; }; extraDisabledTests = { @@ -46,21 +41,9 @@ let # homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska) "test_services_play_media_audio" ]; - rfxtrx = [ - # bytearrray mismatch - "test_rfy_cover" - ]; - zha = [ - # 'manual_pick_radio_type' == 'choose_serial_port' - "test_options_flow_migration_reset_old_adapter" - ]; }; extraPytestFlagsArray = { - asuswrt = [ - # Sandbox network limitations, fails with unexpected error - "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" - ]; dnsip = [ # AssertionError: assert <FlowResultType.FORM: 'form'> == <FlowResultTy...create_entry'> "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" @@ -69,6 +52,9 @@ let # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; + logbook = [ + "--deselect tests/components/logbook/test_websocket_api.py::test_recorder_is_far_behind " + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" @@ -77,20 +63,6 @@ let # "TypeError: object Mock can't be used in 'await' expression "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" ]; - skybell = [ - # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 - "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" - ]; - stream = [ - # Tries to write to /example and gets "Permission denied" - "--deselect tests/components/stream/test_recorder.py::test_record_lookback" - "--deselect tests/components/stream/test_recorder.py::test_recorder_log" - "--deselect tests/components/stream/test_worker.py::test_get_image" - ]; - zha = [ - # AssertionError: assert 'manual_pick_radio_type' == 'choose_serial_port' - "--deselect tests/components/zha/test_config_flow.py::test_options_flow_restarts_running_zha_if_cancelled" - ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { @@ -104,8 +76,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; - disabledTests = old.disabledTests ++ extraDisabledTests.${component} or []; - disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; + disabledTests = old.disabledTests or [] ++ extraDisabledTests.${component} or []; + disabledTestPaths = old.disabledTestPaths or [] ++ extraDisabledTestPaths.${component} or [ ]; # components are more often racy than the core dontUsePytestXdist = true; @@ -121,9 +93,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - # all tests are skipped - # https://github.com/home-assistant/core/blob/dev/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py#L23 - "homeassistant_hardware" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 88c7c5a3def96..094c29c6e3065 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,22 +14,22 @@ , stdenv }: -buildGoModule rec { +buildGo120Module rec { pname = "evcc"; - version = "0.111.1"; + version = "0.113.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-2ZxEUhDNF2E5http8Pz21L0tw6r4UOK5XYDXbHJDnEU="; + hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ="; }; - vendorHash = "sha256-+qne/eB+z8e0vStC9V0w7jgWgo3vvkaR42dUe+/eXDE="; + vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-zrNfev2x5quuujifRHUufBK/GnR7QkCypHCyYb4nwkI="; + hash = "sha256-LGlM+itulqtlwyVKfVGiZtTpcCmx+lVvE3JOFkYRHXk="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 1b312218aeda8..a65de7cf229ca 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.33.0-96sse42"; + version = "4.34.0-100sse42"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc36/${pname}-${version}.fc36.x86_64.rpm"; - hash = "sha256-4gPK31XMd5JUp2+il1Qa7r0EaXVGEvKoYLNGSD2dLUs="; + hash = "sha256-MCRZ0XKi6pztVTuPQpPEn6wHsOwtSxR0Px9r12jnC9U="; }; unpackPhase = '' @@ -76,14 +76,6 @@ stdenv.mkDerivation rec { mkdir -p $out/etc cp -rv ./etc/hqplayer $out/etc/ - # udev rules - mkdir -p $out/etc/udev - cp -rv ./etc/udev/rules.d $out/etc/udev/ - - # kernel module cfgs - mkdir -p $out/etc - cp -rv ./etc/modules-load.d $out/etc/ - # systemd service file mkdir -p $out/lib/systemd cp -rv ./usr/lib/systemd/system $out/lib/systemd/ diff --git a/pkgs/servers/http/dave/default.nix b/pkgs/servers/http/dave/default.nix index f7052789d36a0..492e4989d753a 100644 --- a/pkgs/servers/http/dave/default.nix +++ b/pkgs/servers/http/dave/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub, mage }: +{ lib, buildGoModule, fetchFromGitHub, mage }: -buildGoPackage rec { +buildGoModule rec { pname = "dave"; version = "0.4.0"; @@ -8,20 +8,26 @@ buildGoPackage rec { owner = "micromata"; repo = "dave"; rev = "v${version}"; - sha256 = "sha256-wvsW4EwMWAgEV+LPeMhHL4AsuyS5TDMmpD9D4F1nVM4="; + hash = "sha256-wvsW4EwMWAgEV+LPeMhHL4AsuyS5TDMmpD9D4F1nVM4="; }; - goPackagePath = "github.com/micromata/dave"; + deleteVendor = true; + vendorHash = "sha256-iyq2DGdbdfJIRNkGAIKTk1LLDydpVX3juQFaG6H5vJQ="; + + patches = [ + # Add Go Modules support: + # - Based on https://github.com/micromata/dave/commit/46ae146dd2e95d57be35fa01885ea2c55fd8c279. + # - Bump golang.org/x/sys for Darwin. + ./go-modules.patch + ]; subPackages = [ "cmd/dave" "cmd/davecli" ]; - ldflags = - [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; meta = with lib; { homepage = "https://github.com/micromata/dave"; - description = - "A totally simple and very easy to configure stand alone webdav server"; + description = "A totally simple and very easy to configure stand alone webdav server"; license = licenses.asl20; maintainers = with maintainers; [ lunik1 ]; }; diff --git a/pkgs/servers/http/dave/go-modules.patch b/pkgs/servers/http/dave/go-modules.patch new file mode 100644 index 0000000000000..1090adb6f6281 --- /dev/null +++ b/pkgs/servers/http/dave/go-modules.patch @@ -0,0 +1,562 @@ +From 95b36ebc39e931ab033b199f8c243c2da489f25c Mon Sep 17 00:00:00 2001 +From: Christian Claus <c.claus@micromata.de> +Date: Tue, 27 Apr 2021 22:20:50 +0200 +Subject: [PATCH 1/2] add go modules file + +--- + go.mod | 30 +++++ + go.sum | 338 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 368 insertions(+) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..3a17483 +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,30 @@ ++module github.com/micromata/dave ++ ++go 1.12 ++ ++require ( ++ github.com/fsnotify/fsnotify v1.4.9 ++ github.com/hashicorp/hcl v1.0.0 ++ github.com/inconshreveable/mousetrap v1.0.0 ++ github.com/konsorten/go-windows-terminal-sequences v1.0.3 ++ github.com/magefile/mage v1.10.0 ++ github.com/magiconair/properties v1.8.2 ++ github.com/mitchellh/mapstructure v1.3.3 ++ github.com/pelletier/go-toml v1.8.0 ++ github.com/pkg/errors v0.9.1 ++ github.com/sirupsen/logrus v1.6.0 ++ github.com/spf13/afero v1.3.4 ++ github.com/spf13/cast v1.3.1 ++ github.com/spf13/cobra v1.0.0 ++ github.com/spf13/jwalterweatherman v1.1.0 ++ github.com/spf13/pflag v1.0.5 ++ github.com/spf13/viper v1.7.1 ++ github.com/stretchr/objx v0.1.1 // indirect ++ github.com/subosito/gotenv v1.2.0 ++ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a ++ golang.org/x/net v0.0.0-20200822124328-c89045814202 ++ golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 ++ golang.org/x/text v0.3.3 ++ gopkg.in/ini.v1 v1.60.1 ++ gopkg.in/yaml.v2 v2.3.0 ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..0164408 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,338 @@ ++cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= ++cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= ++cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= ++cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= ++cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= ++cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= ++cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= ++cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= ++cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= ++cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= ++dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= ++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= ++github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= ++github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= ++github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= ++github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= ++github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= ++github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= ++github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= ++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= ++github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= ++github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= ++github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= ++github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= ++github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= ++github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= ++github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= ++github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= ++github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= ++github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= ++github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= ++github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= ++github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= ++github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= ++github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= ++github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= ++github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= ++github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= ++github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= ++github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= ++github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= ++github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= ++github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= ++github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= ++github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= ++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= ++github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= ++github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= ++github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= ++github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= ++github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= ++github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= ++github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= ++github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= ++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= ++github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= ++github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= ++github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= ++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= ++github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= ++github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= ++github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= ++github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= ++github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= ++github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= ++github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= ++github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= ++github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= ++github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= ++github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= ++github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= ++github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= ++github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= ++github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= ++github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= ++github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= ++github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= ++github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= ++github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= ++github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= ++github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= ++github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= ++github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= ++github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= ++github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= ++github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= ++github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= ++github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= ++github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= ++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= ++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= ++github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= ++github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= ++github.com/magiconair/properties v1.8.2 h1:znVR8Q4g7/WlcvsxLBRWvo+vtFJUAbDn3w+Yak2xVMI= ++github.com/magiconair/properties v1.8.2/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= ++github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= ++github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= ++github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= ++github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= ++github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= ++github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= ++github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= ++github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= ++github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= ++github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= ++github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= ++github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= ++github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= ++github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= ++github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= ++github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= ++github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= ++github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= ++github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= ++github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= ++github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw= ++github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= ++github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= ++github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= ++github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= ++github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= ++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= ++github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= ++github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= ++github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= ++github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= ++github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= ++github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= ++github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= ++github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= ++github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= ++github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= ++github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= ++github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= ++github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= ++github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= ++github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= ++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= ++github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= ++github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= ++github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= ++github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= ++github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc= ++github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= ++github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= ++github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= ++github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= ++github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= ++github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= ++github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= ++github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= ++github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= ++github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= ++github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= ++github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= ++github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= ++github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= ++github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= ++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= ++github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= ++github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= ++github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= ++github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= ++github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= ++github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= ++go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= ++go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= ++go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= ++go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= ++go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= ++go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= ++golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= ++golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= ++golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= ++golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= ++golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= ++golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= ++golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= ++golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= ++golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= ++golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= ++golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= ++golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= ++golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= ++golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= ++golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= ++golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= ++golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= ++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= ++golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= ++golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= ++golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4= ++golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= ++golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= ++golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= ++golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= ++golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= ++golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= ++golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= ++golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= ++google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= ++google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= ++google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= ++google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= ++google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= ++google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= ++google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= ++google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= ++google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= ++google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= ++google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= ++google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= ++google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= ++google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= ++google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= ++gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= ++gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= ++gopkg.in/ini.v1 v1.60.1 h1:P5y5shSkb0CFe44qEeMBgn8JLow09MP17jlJHanke5g= ++gopkg.in/ini.v1 v1.60.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= ++gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= ++gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= ++gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= ++gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= ++rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +-- +2.39.0 + + +From cb3ef7b52fcd3e78b218b67420cb93e97a8e03ce Mon Sep 17 00:00:00 2001 +From: Aaron Jheng <wentworth@outlook.com> +Date: Fri, 27 Jan 2023 01:42:53 +0000 +Subject: [PATCH 2/2] Bump golang.org/x/sys + +--- + go.mod | 36 +++++++++++++++++++----------------- + go.sum | 16 ++++++++++++++++ + 2 files changed, 35 insertions(+), 17 deletions(-) + +diff --git a/go.mod b/go.mod +index 3a17483..c957ff4 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,30 +1,32 @@ + module github.com/micromata/dave + +-go 1.12 ++go 1.18 + + require ( + github.com/fsnotify/fsnotify v1.4.9 +- github.com/hashicorp/hcl v1.0.0 +- github.com/inconshreveable/mousetrap v1.0.0 +- github.com/konsorten/go-windows-terminal-sequences v1.0.3 + github.com/magefile/mage v1.10.0 +- github.com/magiconair/properties v1.8.2 +- github.com/mitchellh/mapstructure v1.3.3 +- github.com/pelletier/go-toml v1.8.0 + github.com/pkg/errors v0.9.1 + github.com/sirupsen/logrus v1.6.0 +- github.com/spf13/afero v1.3.4 +- github.com/spf13/cast v1.3.1 + github.com/spf13/cobra v1.0.0 +- github.com/spf13/jwalterweatherman v1.1.0 +- github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.7.1 +- github.com/stretchr/objx v0.1.1 // indirect +- github.com/subosito/gotenv v1.2.0 + golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a + golang.org/x/net v0.0.0-20200822124328-c89045814202 +- golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 +- golang.org/x/text v0.3.3 +- gopkg.in/ini.v1 v1.60.1 +- gopkg.in/yaml.v2 v2.3.0 ++) ++ ++require ( ++ github.com/hashicorp/hcl v1.0.0 // indirect ++ github.com/inconshreveable/mousetrap v1.0.0 // indirect ++ github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect ++ github.com/magiconair/properties v1.8.2 // indirect ++ github.com/mitchellh/mapstructure v1.3.3 // indirect ++ github.com/pelletier/go-toml v1.8.0 // indirect ++ github.com/spf13/afero v1.3.4 // indirect ++ github.com/spf13/cast v1.3.1 // indirect ++ github.com/spf13/jwalterweatherman v1.1.0 // indirect ++ github.com/spf13/pflag v1.0.5 // indirect ++ github.com/subosito/gotenv v1.2.0 // indirect ++ golang.org/x/sys v0.4.0 // indirect ++ golang.org/x/text v0.3.3 // indirect ++ gopkg.in/ini.v1 v1.60.1 // indirect ++ gopkg.in/yaml.v2 v2.3.0 // indirect + ) +diff --git a/go.sum b/go.sum +index 0164408..0f997b9 100644 +--- a/go.sum ++++ b/go.sum +@@ -11,6 +11,7 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl + cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= + cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= + dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= ++github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= + github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= + github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= + github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +@@ -35,6 +36,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 + github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= + github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= + github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +@@ -68,6 +70,7 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI + github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= + github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= + github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= ++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= + github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= + github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= + github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +@@ -95,21 +98,27 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO + github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= + github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= + github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= ++github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= + github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= + github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= + github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= + github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= ++github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= + github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= + github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= + github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= + github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= + github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= + github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= + github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= ++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= + github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g= + github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= + github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= + github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +@@ -142,6 +151,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE + github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= + github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= + github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= + github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= + github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +@@ -162,7 +172,9 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV + github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= + github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= + github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= ++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= + github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= ++github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= + github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= + github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= + github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +@@ -187,6 +199,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ + github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= + github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= + github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= + github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +@@ -270,6 +283,8 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4= + golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= ++golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +@@ -319,6 +334,7 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij + google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= + gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= + gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +-- +2.39.0 + diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index e7229a3d3a67f..00017e753e7f6 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fR3CeF+ScvDoPJaevAAShUdZDDjD/ocZQl7dIk2jHso="; + sha256 = "sha256-kUKqZEphEohBR8f6Y5j5QEFeLI14iaivKWVPimSiLkg="; }; - cargoSha256 = "sha256-VH/eu0qLh59J6uyj0RSqqEhlwghYg/JPp6u54BQzLPo="; + cargoHash = "sha256-rqMrsll82Ij0ZwYKJuC4st9sNrGFYB3x44vAOcUTtHQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/servers/http/envoy/use-system-python.patch b/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch index a2030cc75fd05..11871275f4ffc 100644 --- a/pkgs/servers/http/envoy/use-system-python.patch +++ b/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch @@ -1,5 +1,15 @@ +From 329ad7cb56e66464e5570bbb51dea0fd56c4d9ae Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown <git@lukegb.com> +Date: Sun, 19 Feb 2023 17:40:50 +0000 +Subject: [PATCH 1/2] nixpkgs: use system Python + +--- + bazel/python_dependencies.bzl | 4 ---- + bazel/repositories_extra.bzl | 13 +------------ + 2 files changed, 1 insertion(+), 16 deletions(-) + diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl -index d9dfb14a9b..b8e92452a7 100644 +index a5c3283d0a..1c2c31ebf2 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl @@ -1,10 +1,8 @@ @@ -14,7 +24,7 @@ index d9dfb14a9b..b8e92452a7 100644 extra_pip_args = ["--require-hashes"], ) @@ -12,14 +10,12 @@ def envoy_python_dependencies(): - # These need to use `pip_install` + # TODO(phlax): switch to `pip_parse` pip_install( # Note: dev requirements do *not* check hashes - python_interpreter_target = interpreter, @@ -22,17 +32,17 @@ index d9dfb14a9b..b8e92452a7 100644 requirements = "@envoy//tools/dev:requirements.txt", ) - pip_install( + pip_parse( name = "fuzzing_pip3", - python_interpreter_target = interpreter, - requirements = "@rules_fuzzing//fuzzing:requirements.txt", + requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt", extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl -index 885b41dec6..ac5605eb30 100644 +index 9d1b31c5d6..ac5605eb30 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl -@@ -1,22 +1,12 @@ +@@ -1,23 +1,12 @@ load("@emsdk//:deps.bzl", emsdk_deps = "deps") -load("@rules_python//python:repositories.bzl", "python_register_toolchains") load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") @@ -53,6 +63,10 @@ index 885b41dec6..ac5605eb30 100644 - python_register_toolchains( - name = "python%s" % ("_".join(python_version.split(".")[:-1])), - python_version = python_version, +- ignore_root_user_error = True, - ) - aspect_bazel_lib_dependencies() +-- +2.39.1 + diff --git a/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch new file mode 100644 index 0000000000000..594d51cce9dc1 --- /dev/null +++ b/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch @@ -0,0 +1,94 @@ +From 31d864a3b6a1a3455191e87ff680eb812f77dc3c Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown <git@lukegb.com> +Date: Sun, 19 Feb 2023 17:43:03 +0000 +Subject: [PATCH 2/2] nixpkgs: use system Go + +--- + bazel/dependency_imports.bzl | 29 +---------------------------- + bazel/repositories.bzl | 3 --- + bazel/repository_locations.bzl | 4 ++-- + 3 files changed, 3 insertions(+), 33 deletions(-) + +diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl +index 7dbdb0174e..e73662ed79 100644 +--- a/bazel/dependency_imports.bzl ++++ b/bazel/dependency_imports.bzl +@@ -15,7 +15,7 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis + load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") + + # go version for rules_go +-GO_VERSION = "1.18" ++GO_VERSION = "host" + + JQ_VERSION = "1.6" + YQ_VERSION = "4.24.4" +@@ -25,7 +25,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y + rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False) + go_rules_dependencies() + go_register_toolchains(go_version) +- envoy_download_go_sdks(go_version) + gazelle_dependencies(go_sdk = "go_sdk") + apple_rules_dependencies() + pip_dependencies() +@@ -134,29 +133,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y + # use_category = ["api"], + # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28" + ) +- +-def envoy_download_go_sdks(go_version): +- go_download_sdk( +- name = "go_linux_amd64", +- goos = "linux", +- goarch = "amd64", +- version = go_version, +- ) +- go_download_sdk( +- name = "go_linux_arm64", +- goos = "linux", +- goarch = "arm64", +- version = go_version, +- ) +- go_download_sdk( +- name = "go_darwin_amd64", +- goos = "darwin", +- goarch = "amd64", +- version = go_version, +- ) +- go_download_sdk( +- name = "go_darwin_arm64", +- goos = "darwin", +- goarch = "arm64", +- version = go_version, +- ) +diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl +index fca05b6062..a2f60014cb 100644 +--- a/bazel/repositories.bzl ++++ b/bazel/repositories.bzl +@@ -115,9 +115,6 @@ def _go_deps(skip_targets): + if "io_bazel_rules_go" not in skip_targets: + external_http_archive( + name = "io_bazel_rules_go", +- # TODO(wrowe, sunjayBhatia): remove when Windows RBE supports batch file invocation +- patch_args = ["-p1"], +- patches = ["@envoy//bazel:rules_go.patch"], + ) + external_http_archive("bazel_gazelle") + +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index e4e89d281a..fb62c4f8f3 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -878,8 +878,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( + project_name = "Go rules for Bazel", + project_desc = "Bazel rules for the Go language", + project_url = "https://github.com/bazelbuild/rules_go", +- version = "0.36.0", +- sha256 = "ae013bf35bd23234d1dea46b079f1e05ba74ac0321423830119d3e787ec73483", ++ version = "0.38.1", ++ sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d", + urls = ["https://github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.zip"], + use_category = ["build", "api"], + release_date = "2022-11-23", +-- +2.39.1 + diff --git a/pkgs/servers/http/envoy/bump-brotli.patch b/pkgs/servers/http/envoy/bump-brotli.patch deleted file mode 100644 index 5656b8f260cfa..0000000000000 --- a/pkgs/servers/http/envoy/bump-brotli.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl -index 454c54b0ef..2ac0623cf0 100644 ---- a/bazel/repository_locations.bzl -+++ b/bazel/repository_locations.bzl -@@ -510,8 +510,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( - project_url = "https://brotli.org", - # Use the dev branch of brotli to resolve compilation issues. - # TODO(rojkov): Remove when brotli > 1.0.9 is released. -- version = "0cd2e3926e95e7e2930f57ae3f4885508d462a25", -- sha256 = "93810780e60304b51f2c9645fe313a6e4640711063ed0b860cfa60999dd256c5", -+ version = "27dd7265403d8e8fed99a854b9c3e1db7d79525f", -+ sha256 = "e71238b12e30233bdf25997132b29ae49639a69f33fdef3ae18a47abfc0d5e4c", - strip_prefix = "brotli-{version}", - urls = ["https://github.com/google/brotli/archive/{version}.tar.gz"], - use_category = ["dataplane_ext"], diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index aed6a36be1d75..db040f8a2080b 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,8 +24,8 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.23.3"; - rev = "4801f5881893857fbc53a4061f0b20ef4ca91a5b"; + version = "1.25.1"; + rev = "bae2e9d642a6a8ae6c5d3810f77f3e888f0d97da"; }; in buildBazelPackage rec { @@ -36,13 +36,12 @@ buildBazelPackage rec { owner = "envoyproxy"; repo = "envoy"; inherit (srcVer) rev; - sha256 = "sha256-akAuFk+jESWWvLRCDQ0XDT1Eplutfj5uacAFQp714vM="; + sha256 = "sha256-qA3+bta2vXGtAYX3mg+CmSIEitk4576JQB/QLPsj9Vc="; postFetch = '' chmod -R +w $out rm $out/.bazelversion echo ${srcVer.rev} > $out/SOURCE_VERSION - sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl ''; }; @@ -51,20 +50,15 @@ buildBazelPackage rec { sed -i '/javabase=/d' .bazelrc sed -i '/"-Werror"/d' bazel/envoy_internal.bzl - # Use system Python. - sed -i -e '/python_interpreter_target =/d' -e '/@python3_10/d' bazel/python_dependencies.bzl + cp ${./protobuf.patch} bazel/protobuf.patch ''; patches = [ - # fix issues with brotli and GCC 11.2.0+ (-Werror=vla-parameter) - ./bump-brotli.patch - - # fix linux-aarch64 WAMR builds - # (upstream WAMR only detects aarch64 on Darwin, not Linux) - ./fix-aarch64-wamr.patch - # use system Python, not bazel-fetched binary Python - ./use-system-python.patch + ./0001-nixpkgs-use-system-Python.patch + + # use system Go, not bazel-fetched binary Go + ./0002-nixpkgs-use-system-Go.patch ]; nativeBuildInputs = [ @@ -81,10 +75,13 @@ buildBazelPackage rec { linuxHeaders ]; + # external/com_github_grpc_grpc/src/core/ext/transport/binder/transport/binder_transport.cc:756:29: error: format not a string literal and no format arguments [-Werror=format-security] + hardeningDisable = [ "format" ]; + fetchAttrs = { sha256 = { - x86_64-linux = "sha256-UXTh5sCN7PJxNbTaG47YnW7aQBBtu101UjfsWU1CtBw="; - aarch64-linux = "sha256-uynV2/RWBybR2bjErDjcfoacv5vsI4GJ3SL4OF1kFOE="; + x86_64-linux = "sha256-H2s8sTbmKF+yRfSzLsZAT2ckFuunFwh/FMSKj+GYyPM="; + aarch64-linux = "sha256-R9jzy/dpdCcGgT9yq59Wo/IN/bVo6fxnVPGhLMZ9fbM="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; @@ -149,6 +146,7 @@ buildBazelPackage rec { "--spawn_strategy=standalone" "--noexperimental_strict_action_env" "--cxxopt=-Wno-error" + "--linkopt=-Wl,-z,noexecstack" # Force use of system Java. "--extra_toolchains=@local_jdk//:all" diff --git a/pkgs/servers/http/envoy/fix-aarch64-wamr.patch b/pkgs/servers/http/envoy/fix-aarch64-wamr.patch deleted file mode 100644 index 4d8bc6c02adce..0000000000000 --- a/pkgs/servers/http/envoy/fix-aarch64-wamr.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl -index f48ebe7056..1e5cc5d663 100644 ---- a/bazel/envoy_build_system.bzl -+++ b/bazel/envoy_build_system.bzl -@@ -102,6 +102,7 @@ def envoy_cmake( - pdb_name = "", - cmake_files_dir = "$BUILD_TMPDIR/CMakeFiles", - generate_crosstool_file = False, -+ generate_args = [], - **kwargs): - cache_entries.update({"CMAKE_BUILD_TYPE": "Bazel"}) - cache_entries_debug = dict(cache_entries) -@@ -131,7 +132,7 @@ def envoy_cmake( - "@envoy//bazel:dbg_build": cache_entries_debug, - "//conditions:default": cache_entries, - }), -- generate_args = ["-GNinja"], -+ generate_args = ["-GNinja"] + generate_args, - targets = ["", "install"], - # TODO: Remove install target and make this work - install = False, -diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD -index 4d3a281669..b4716dfe2e 100644 ---- a/bazel/foreign_cc/BUILD -+++ b/bazel/foreign_cc/BUILD -@@ -394,6 +394,12 @@ envoy_cmake( - "WAMR_BUILD_LIBC_WASI": "0", - "WAMR_BUILD_TAIL_CALL": "1", - }, -+ generate_args = select({ -+ "//conditions:default": [], -+ "@platforms//cpu:aarch64": [ -+ "-DWAMR_BUILD_TARGET=AARCH64", -+ ], -+ }), - lib_source = "@com_github_wamr//:all", - out_static_libs = ["libvmlib.a"], - tags = ["skip_on_windows"], diff --git a/pkgs/servers/http/envoy/protobuf.patch b/pkgs/servers/http/envoy/protobuf.patch new file mode 100644 index 0000000000000..1cc071bd861a1 --- /dev/null +++ b/pkgs/servers/http/envoy/protobuf.patch @@ -0,0 +1,53 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 0f6e41e3a..c0d2bbccf 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -138,7 +138,7 @@ cc_library( + visibility = ["//visibility:public"], + deps = [":protobuf_lite"] + select({ + "//build_defs:config_msvc": [], +- "//conditions:default": ["@zlib//:zlib"], ++ "//conditions:default": ["//external:zlib"], + }), + ) + +@@ -755,7 +820,7 @@ cc_test( + "@com_google_googletest//:gtest_main", + ] + select({ + "//build_defs:config_msvc": [], +- "//conditions:default": ["@zlib//:zlib"], ++ "//conditions:default": ["//external:zlib"], + }), + ) + +diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py +index e7555ee10..a93beb1c5 100644 +--- a/python/google/protobuf/__init__.py ++++ b/python/google/protobuf/__init__.py +@@ -31,3 +31,10 @@ + # Copyright 2007 Google Inc. All Rights Reserved. + + __version__ = '4.21.12' ++ ++ ++if __name__ != '__main__': ++ try: ++ __import__('pkg_resources').declare_namespace(__name__) ++ except ImportError: ++ __path__ = __import__('pkgutil').extend_path(__path__, __name__) +diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc +index 9993811dc..d80006af7 100644 +--- a/src/google/protobuf/generated_message_tctable_lite.cc ++++ b/src/google/protobuf/generated_message_tctable_lite.cc +@@ -343,11 +343,6 @@ const char* TcParser::MiniParse(PROTOBUF_TC_PARAM_DECL) { + + namespace { + +-// Offset returns the address `offset` bytes after `base`. +-inline void* Offset(void* base, uint32_t offset) { +- return static_cast<uint8_t*>(base) + offset; +-} +- + // InvertPacked changes tag bits from the given wire type to length + // delimited. This is the difference expected between packed and non-packed + // repeated fields. diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index cc4b85518b2be..bdd8c4c43f6fd 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.62.0"; + version = "15.7.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-sGZUns6ad4FQ/5VYEi7hhgp35YIdbwyaMYPMbK8hlNA="; + sha256 = "sha256-Aj6XQVIdulwx6mWivwYafR4yrWiNaDeyje3LFQzZPfU="; }; - vendorSha256 = "sha256-UHSXhRfegqgKyFl2W/2am9VNIzVYeIuUsVlha8nAZw0="; + vendorHash = "sha256-mGcIN9gDCFfr1MvBdfR26LAbrAE2RNivhXP7fCNMyBQ="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/http/go-camo/default.nix b/pkgs/servers/http/go-camo/default.nix index cc180f9461d38..d7198f44bb4ab 100644 --- a/pkgs/servers/http/go-camo/default.nix +++ b/pkgs/servers/http/go-camo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3gjn8UAfj7jT/gncgXShrfI75DPwiNU4hHMVJlYDIPA="; + sha256 = "sha256-GRctsE+uAvyA0pcz+ym4sz3K80pUHoDipVsjFcdrT2A="; }; - vendorSha256 = "sha256-31B6LXCutIdPwxqMFTMUfxAaCuYW14py8Vu1EycBydE="; + vendorHash = "sha256-C66QxlMBupbHYktyzHapUrl0yk+pvWZN0BLhpjIGVzI="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 258eacf768c77..d56f83366f9e3 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = { homepage = "http://mini-httpd.nongnu.org/"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 06fa12725674e..7d0ab6ac42072 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -31,14 +31,12 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , passthru ? { tests = {}; } }: -with lib; - let moduleNames = map (mod: mod.name or (throw "The nginx module with source ${toString mod.src} does not have a `name` attribute. This prevents duplicate module detection and is no longer supported.")) modules; - mapModules = attrPath: flip concatMap modules + mapModules = attrPath: lib.flip lib.concatMap modules (mod: let supports = mod.supports or (_: true); in @@ -47,8 +45,8 @@ let in -assert assertMsg (unique moduleNames == moduleNames) - "nginx: duplicate modules: ${concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; +assert lib.assertMsg (lib.unique moduleNames == moduleNames) + "nginx: duplicate modules: ${lib.concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; stdenv.mkDerivation { inherit pname version nginxVersion; @@ -94,37 +92,37 @@ stdenv.mkDerivation { "--http-fastcgi-temp-path=/tmp/nginx_fastcgi" "--http-uwsgi-temp-path=/tmp/nginx_uwsgi" "--http-scgi-temp-path=/tmp/nginx_scgi" - ] ++ optionals withDebug [ + ] ++ lib.optionals withDebug [ "--with-debug" - ] ++ optionals withKTLS [ + ] ++ lib.optionals withKTLS [ "--with-openssl-opt=enable-ktls" - ] ++ optionals withStream [ + ] ++ lib.optionals withStream [ "--with-stream" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" - ] ++ optionals withMail [ + ] ++ lib.optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optionals withPerl [ + ] ++ lib.optionals withPerl [ "--with-http_perl_module" "--with-perl=${perl}/bin/perl" "--with-perl_modules_path=lib/perl5" - ] ++ optional withSlice "--with-http_slice_module" - ++ optional (gd != null) "--with-http_image_filter_module" - ++ optional (geoip != null) "--with-http_geoip_module" - ++ optional (withStream && geoip != null) "--with-stream_geoip_module" - ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" + ] ++ lib.optional withSlice "--with-http_slice_module" + ++ lib.optional (gd != null) "--with-http_image_filter_module" + ++ lib.optional (geoip != null) "--with-http_geoip_module" + ++ lib.optional (withStream && geoip != null) "--with-stream_geoip_module" + ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" - ] ++ optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); configurePlatforms = []; @@ -133,7 +131,7 @@ stdenv.mkDerivation { preConfigure = '' setOutputFlags= '' + preConfigure - + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; + + lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; patches = map fixPatch ([ (substituteAll { @@ -143,7 +141,7 @@ stdenv.mkDerivation { ''; }) ./nix-skip-check-logs-path.patch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (fetchpatch { url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch"; sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; @@ -161,7 +159,7 @@ stdenv.mkDerivation { inherit postPatch; - hardeningEnable = optional (!stdenv.isDarwin) "pie"; + hardeningEnable = lib.optional (!stdenv.isDarwin) "pie"; enableParallelBuilding = true; @@ -186,7 +184,7 @@ stdenv.mkDerivation { } // passthru.tests; }; - meta = if meta != null then meta else { + meta = if meta != null then meta else with lib; { description = "A reverse proxy and lightweight webserver"; homepage = "http://nginx.org"; license = licenses.bsd2; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 971e04dcd365b..d09c98ef2a20c 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -351,8 +351,8 @@ let self = { name = "njs"; src = fetchhg { url = "https://hg.nginx.org/njs"; - rev = "0.7.8"; - sha256 = "sha256-jsR8EOeW8tAo2utKznuUaCG4hK0oU0ZJSnnGmI5HUDk="; + rev = "0.7.10"; + sha256 = "sha256-/yKzY+BUFxLk8bWo+mqKfRVRsC2moe+WvhaRYIGdr6Y="; name = "nginx-njs"; }; diff --git a/pkgs/servers/http/tengine/check-resolv-conf.patch b/pkgs/servers/http/tengine/check-resolv-conf.patch index c46482b301490..83b4e1cf8eb21 100644 --- a/pkgs/servers/http/tengine/check-resolv-conf.patch +++ b/pkgs/servers/http/tengine/check-resolv-conf.patch @@ -2,13 +2,11 @@ diff --git a/auto/unix b/auto/unix index a38c12dc..025a4899 100644 --- a/auto/unix +++ b/auto/unix -@@ -1072,9 +1072,7 @@ ngx_feature_test='int fd; +@@ -1072,7 +1072,5 @@ ngx_feature_test='int fd; - # Auto read nameserver from /etc/resolv.conf. + # Tengine: auto read nameserver from /etc/resolv.conf. - if [ -f "/etc/resolv.conf" ]; then - have=NGX_RESOLVER_FILE - value=\"/etc/resolv.conf\" - . auto/define + have=NGX_RESOLVER_FILE value="\"/etc/resolv.conf\"" . auto/define -fi diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 84faf2aa432cf..6ab952af2638d 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "2.3.4"; + version = "2.4.0"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - sha256 = "sha256-0xue5XDvK9U64+rka8GRNv2lX62zcrYA1Tz7DrsA0ts="; + hash = "sha256-h/eSa2wCPvnX29wdtDHNQh8r1No1/YGinZNYU2MnsTM="; }; buildInputs = @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 875744898f62c..83d482e251a1c 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - hash = "sha256-DxAWSU6nleTRkgtU6cW5KEJ0aQuzom+kGwTOk1Kg8CI="; + hash = "sha256-UMC1puEM0PhIu+lJouOj81tI/E6fz1PzPN0FU7TNwTg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/servers/imaginary/default.nix index cfab6e2e9030e..8ab50dc957a68 100644 --- a/pkgs/servers/imaginary/default.nix +++ b/pkgs/servers/imaginary/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, vips +}: buildGoModule rec { pname = "imaginary"; @@ -11,6 +17,16 @@ buildGoModule rec { hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA="; }; + patches = [ + # add -return-size flag recommend by Nextcloud + # https://github.com/h2non/imaginary/pull/382 + (fetchpatch { + name = "return-width-and-height-of-generated-images.patch"; + url = "https://github.com/h2non/imaginary/commit/cfbf8d724cd326e835dfcb01e7224397c46037d3.patch"; + hash = "sha256-TwZ5WU5g9LXrenpfY52jYsc6KsEt2fjDq7cPz6ILlhA="; + }) + ]; + vendorHash = "sha256-BluY6Fz4yAKJ/A9aFuPPsgQN9N/5yd8g8rDfIZeYz5U="; buildInputs = [ vips ]; @@ -23,11 +39,13 @@ buildGoModule rec { "-X main.Version=${version}" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://fly.io/docs/app-guides/run-a-global-image-service"; changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}"; description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing"; license = licenses.mit; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ dotlambda urandom ]; }; } diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 7d2be47d140ee..a10c29a568d0f 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.13.1"; + version = "3.13.2"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-4P8Q8VM2+O4Du2u+LFmqGQYw8qvEuBGq2nz9FxvGQhE="; + sha256 = "sha256-0VB2nXVUtnAqM+cblYaulHFMv6dmztqiBwAxW/Ui1hs="; rev = "v${version}"; }; - vendorHash = "sha256-TUu/dWtjs/ua3uwi029gtev0rcAZBCN9AHD9RPZsaDI="; + vendorHash = "sha256-6rEGuuw3UJyWeaIm9v5P8/V0Nxd9ySe0PCf0rWRDB9s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index c1abe663ea900..9258e5a3f8660 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,15 +4,15 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "dbee027ed9b568469815b319332e029964bff7fb", - "sha256": "sha256-M0m3JtA9Qx5ZpgNujeUBC/7TVES9dKLEr5pKgn8l1cM=", - "version": "unstable-2023-01-22" + "rev": "0995e0447c2b54d80b55231830b847d41c19b404", + "sha256": "sha256-hXF836jxMriMJ/qcBJIF5cRvQG719PStKqTZQcIRqlw=", + "version": "unstable-2023-02-22" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", "version": "2.18.1" }, "videojs": { - "sha256": "0m09pc9acpzhfwwvc9dayl60nn28skmmglgvmlp48dlkqgfbgc27" + "sha256": "0zj8fgxdg6jsllaxn795xipa6yxh4yf08hb8x0idyg74q37gfh4c" } } diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a672433583c1f..d33a18ac98b65 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2688"; + version = "0.20.3160"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-e2uJ4uV6e3cwvnt3hw8qAYmUOhoyfX93YEgsV1pT/lZynYS7/FRF2jgo8ZUa1WC8lr/+tBQl+17jkxuQoIT7AA=="; + hash = "sha512-bn41nReIfRs99zwDgTJtQ1hrQRrn7EjQvYh5JDTU9ICBsJangnO8l1o8Xfn4jhxvcDJRDjaA7jG7TAoIC3WAFA=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; @@ -41,6 +41,7 @@ buildDotnetModule rec { meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; + changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; }; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index df3d7cf870e70..fa0296c55ebb3 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-atJKpr4XLedG+A26ijlZKKFbskpLpJw9ThZvMuQYw+s="; + sha256 = "sha256-32xl/dVMuT9olC0fuN9dZFz1c6N9sLA5V9qaSjqkfo4="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 19a82bd8b9394..31b4a457ec868 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "youtrack"; - version = "2021.4.35970"; + version = "2022.3.65371"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; - sha256 = "sha256-HB515TS0XXEAiT463nVHP/naeoF7nmeB+6EK0NJ+5c0="; + sha256 = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index 81536ab143ad5..7027d8a50c120 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kapowbang"; - version = "0.7.0"; + version = "0.7.1"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "BBVA"; repo = "kapow"; rev = "v${version}"; - sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA="; + sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4="; }; - vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8="; + vendorHash = "sha256-vvC9l/6b7AIEmCMVdeKMyi9ThIcAzjtV+uaQ4oSJZuU="; doCheck = false; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 7c9117f91c18a..b1d38c4adc3d4 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-01-07"; + version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "f1203d56f6bc2c84d00605a76525be4c13430324"; - sha256 = "sha256-7FJ+omzXpj49AThcv0xDilIekCyehtvpvck1+nrMS70="; + rev = "5644481590a16ac5b3d8c20874f0477d5d51a963"; + sha256 = "sha256-OGFVcUPw0sqTbJyrMvCxp8nER9/42ZRN4zIrpm/qh4E="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 47aca84a80b27..e1db293f64991 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.160.0"; + version = "0.161.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-maNOiC+hFv/mniU1spZVZrUJETT5sgdi1OmbYR2smFk="; + sha256 = "sha256-TZ/TxX9OgDGx8zD2mI8cTDPZSqBjkYN3Uy+W9MXbJOI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index e9562a082afda..abe468ce7f3f2 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-JDLY+TjhPgOieVgvzFCDygzXwMCca/fJNZPfx4WNeO0="; + hash = "sha256-IT4Rc74G8EFp+AbJCRWMKIvi5sZg/h7QT0M7U9B0Fu4="; }; - cargoHash = "sha256-2kQcTiOqculnDbd4MKBJXNn03d5Ppm+DliIEh8YV2pU="; + cargoHash = "sha256-AvOE6SvsztqutGDfew0fkluercpF+lQQlJ1E7/YKtBM="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 60c073e3a8283..442d590cf64f8 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.27.1"; + version = "0.29.4"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Q/Vl126EMRSNdStpZqFEkA0Kjzu6BeyBhokTQrrQXE="; + hash = "sha256-xGjCki0fQWXLXqCvNj6GjQ7qbFBcaJBPuPb8Aj1whLk="; }; - cargoSha256 = "sha256-TA0Rsya3vx6N/iAWpRmB7Byz7AIR0sdfk3kJ8wgvWHY="; + cargoHash = "sha256-+fEHD648za4tNEQiu1AYfFXf3Hbe9f0D3MFYJ0OCfqQ="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index d74e1a0fab642..2a5a0a2308b69 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -37,5 +37,9 @@ stdenv.mkDerivation rec { homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; + knownVulnerabilities = [ + "CVE-2022-48008" + "CVE-2022-48010" + ]; }; } diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 2bcd87c3b84d2..99e482323a46a 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; # fix build on gcc7+ and gcc11+ - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString ([ "-std=c++11" # c++17+ has errors "-Wno-error=builtin-declaration-mismatch" "-Wno-error=deprecated-copy" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "-Wno-error=nonnull" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ "-Wno-error=mismatched-new-delete" - ]; + ]); buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; installPhase = '' diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 852de800a6c98..f32316428a693 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: .libs/hash_drv.o:/build/dspam-3.10.2/src/util.h:96: multiple definition of `verified_user'; # .libs/libdspam.o:/build/dspam-3.10.2/src/util.h:96: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR" # and fix directory structure manually after that. diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index cd407ef37ec7f..1a911668a5401 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { ${lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -lm -lpthread -lz: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/: ''} ${lib.optionalString enableAuthDovecot '' diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index a990f3cdb0569..d4040458307fe 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -1,16 +1,22 @@ -{ lib, fetchpatch, python3, postfix, lynx +{ lib +, fetchpatch +, python3 +, docutils +, sphinx +, postfix +, lynx }: with python3.pkgs; buildPythonPackage rec { pname = "mailman"; - version = "3.3.5"; + version = "3.3.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "12mgxs1ndhdjjkydx48b95na9k9h0disfqgrr6wxx7vda6dqvcwz"; + hash = "sha256-g6wH7lXqK0yJ8AxO1HFxMvBicBJ9NGWlPePFyxl9Qc4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -33,6 +39,11 @@ buildPythonPackage rec { zope_configuration ]; + checkInputs = [ + docutils + sphinx + ]; + patches = [ (fetchpatch { url = "https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch"; @@ -64,9 +75,6 @@ buildPythonPackage rec { # 'runner' scripts. dontWrapPythonPrograms = true; - # requires flufl.testing, which the upstream has archived - doCheck = false; - meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 359f974f598c2..c462ada1d37c4 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -3,18 +3,7 @@ python3.override { packageOverrides = self: super: { # does not find tests - alembic = super.alembic.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - # Needed by mailman, see https://gitlab.com/mailman/mailman/-/issues/964 - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = super.fetchPypi { - inherit version; - inherit (oldAttrs) pname; - sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"; - }; - # does not find tests + alembic = super.alembic.overridePythonAttrs (oldAttrs: { doCheck = false; }); # Fixes `AssertionError: database connection isn't set to UTC` diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index aba0664b8f4fd..2795ba1af358a 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: getlistdelim.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: multiple definition of # `subtype_strs'; mlmmj-send.o:/build/mlmmj-1.3.0/src/../include/mlmmj.h:84: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' # grab all documentation files diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5759e57d3b491..f179bf96368ff 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableRedis + env.NIX_CFLAGS_COMPILE = lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" + lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql"; diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix index a5b6cf9228d58..844eb8dc3d88f 100644 --- a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix +++ b/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "OpenSMTPD filter for DKIM signing"; homepage = "http://imperialat.at/dev/filter-dkimsign/"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix index f740a12e53f5d..e9abdf0864f2d 100644 --- a/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Library for creating OpenSMTPD filters"; homepage = "http://imperialat.at/dev/libopensmtpd/"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index df04ade5b452d..d57aaa4ef29d0 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { --replace /bin/bash ${bash}/bin/bash; ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation"; makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index 521e6dafd8348..63447dffb3093 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , installShellFiles , testers , vsmtp @@ -9,30 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "vsmtp"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "viridIT"; repo = "vsmtp"; rev = "v${version}"; - hash = "sha256-uyu2NpHFDqJDcfQukG6TdRH7KuZnrYTULvLiABdvAog="; + hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM="; }; - patches = [ - # https://github.com/viridIT/vSMTP/pull/952 - # treewide: set GIT_HASH to unknown if git rev-parse HEAD fails - (fetchpatch { - url = "https://github.com/viridIT/vSMTP/commit/0ac4820c079e459f515825dfb451980119eaae9e.patch"; - includes = [ "src/vsmtp/vsmtp-core/build.rs" "src/vqueue/build.rs" ]; - hash = "sha256-kGjXsVokP6039rksaxw1EM/0zOlKIus1EaIEsFJvLE8="; - }) - ]; - - cargoHash = "sha256-A0Q6ciZJL13VzJgZIWZalrRElSNGHUN/9b8Csj4Tdak="; + cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4="; nativeBuildInputs = [ installShellFiles ]; - # too many upstream failures + # tests do not run well in the nix sandbox doCheck = false; postInstall = '' diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 50050acf40cc5..d942bb0b2e5ff 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock +, brotli # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -42,10 +43,10 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-fuU92fydoazSXBHwA+DG//gRgWVYQ1M3m2oNS2iwv4I="; + sha256 = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA="; }; - nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby ]; + nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; @@ -69,6 +70,17 @@ stdenv.mkDerivation rec { rails assets:precompile yarn cache clean --offline rm -rf ~/node_modules/.cache + + # Create missing static gzip and brotli files + gzip -9 -n -c ~/public/assets/500.html > ~/public/assets/500.html.gz + gzip -9 -n -c ~/public/packs/report.html > ~/public/packs/report.html.gz + find ~/public/assets -maxdepth 1 -type f -name ".*.json" | while read file; do + gzip -9 -n -c $file > $file.gz + done + brotli --best -f ~/public/packs/report.html -o ~/public/packs/report.html.br + find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' | while read file; do + brotli --best -f $file -o $file.br + done ''; installPhase = '' @@ -95,6 +107,22 @@ stdenv.mkDerivation rec { fi done + # Create missing static gzip and brotli files + find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' | while read file; do + gzip -9 -n -c $file > $file.gz + brotli --best -f $file -o $file.br + done + find public/emoji -type f -name "*.svg" | while read file; do + gzip -9 -n -c $file > $file.gz + brotli --best -f $file -o $file.br + done + ln -s assets/500.html.gz public/500.html.gz + ln -s assets/500.html.br public/500.html.br + ln -s packs/sw.js.gz public/sw.js.gz + ln -s packs/sw.js.br public/sw.js.br + ln -s packs/sw.js.map.gz public/sw.js.map.gz + ln -s packs/sw.js.map.br public/sw.js.map.br + rm -rf log ln -s /var/log/mastodon log ln -s /tmp tmp diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index c01eaaa5a5555..5c1a1e3d985ee 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r7ybdykxnn2544vcjmi51mxfpfqx3b4c7fjz15c57hamkhlalzf"; + sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "024a1c2ak1znkvys7pjkkan23wc0vhzyprl16gp9xcr4wy0l6dn4"; + sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "193gj013bx5axd4nwvlf6mq19rcvymkf72q9f7ml6v9yl6cc4qam"; + sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dygq5fxbrgynd2g7r51asyrap1d6cxravwh509kfmqpfbiq119s"; + sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13kr77v91wa7sfsq7h04g8zy1qxcbwhhf4k6zz8276b1d10szly5"; + sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m68my4dnj7q7986jwlb7gir0f7hahdsqbiaxfvgngwksa8fhrn1"; + sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05f497khf51wrsah927pnmpl0yrcx82gajjk8brcrrbbbd9arlp5"; + sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183d7laxvwrw1d02qgm8rg9ljjihfiyh4vzi58xm42z3fr3bbhky"; + sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dsxi813wyhx2d0bbyc0nla4ck6nmmi3z3765gdqf6xl3dha5r2j"; + sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvmvfka2s7am8m3zdllblxiyyy4yr3ca6q6q5r23fd2qs7rmbz0"; + sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5pq2swzgddmwwr6x1phbspk1vw8cl88ci8jbi18mrirjjfippr"; + sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vqb2bfq5db7x66f4n4z30c953y5q8pwwl2067nxhz6j0c486pzm"; + sha256 = "1nz23laxgrxbv5svswi3bksmbhz86j691n4099qp4049i5a5cx91"; type = "gem"; }; - version = "1.587.0"; + version = "1.701.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -261,10 +261,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; + sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; type = "gem"; }; - version = "3.130.2"; + version = "3.170.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -272,10 +272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; + sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; type = "gem"; }; - version = "1.56.0"; + version = "1.62.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -283,10 +283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; + sha256 = "1sg212jsj6ydyrr6r284mgqcl83kln2hfd9nlyisf3pj5lbdjd1c"; type = "gem"; }; - version = "1.114.0"; + version = "1.119.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -294,10 +294,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.2"; }; bcrypt = { groups = ["default" "pam_authentication"]; @@ -336,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + sha256 = "0mz9hz5clknznw8i5f3l2zb9103mlgh96djdhlvlfpf2chkr0s1z"; type = "gem"; }; - version = "2.4.10"; + version = "2.4.14"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -369,20 +369,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; + sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; type = "gem"; }; - version = "1.13.0"; + version = "1.16.0"; }; brakeman = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306"; + sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; type = "gem"; }; - version = "5.3.1"; + version = "5.4.0"; }; browser = { groups = ["default"]; @@ -400,10 +400,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjm184dhlw35ymi8ifpl5155vwl6wfzdc5qjvzv634gc365yz9j"; + sha256 = "1nd5zj5yqmhv9lrsqz8s2dqq28v4ywy95qrw7nzhhf89dl4dq49l"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; builder = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -421,10 +421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06rmq3s8q6xndxxl7qid9nf3hiaahs71jyiyyk3bx31hns1vkcci"; + sha256 = "0hyz68j0z0j24vcrs43swmlykhzypayv34kzrsbxda5lbi83gynm"; type = "gem"; }; - version = "7.0.3"; + version = "7.0.7"; }; bundler-audit = { dependencies = ["thor"]; @@ -508,10 +508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05df76mfhfab6d7ir0qy5xf1ad6kqdh2p6vfqv7nhlx45k1y4ysg"; + sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; type = "gem"; }; - version = "3.37.1"; + version = "3.38.0"; }; case_transform = { dependencies = ["activesupport"]; @@ -610,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; connection_pool = { groups = ["default" "test"]; @@ -663,10 +663,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; type = "gem"; }; - version = "1.7.1"; + version = "1.12.0"; + }; + date = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; }; debug_inspector = { groups = ["default" "development"]; @@ -737,10 +747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi81lynfdvbwhrc4ws746g3j8761vian4m9gxamdj9rjwj9jhls"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.4"; + version = "1.4.0"; }; domain_name = { dependencies = ["unf"]; @@ -759,10 +769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1znfhqxvfdvxh0z8qnh1n7iahk9hs8d243j5dvig2v933j4z3ykw"; + sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; type = "gem"; }; - version = "5.6.0"; + version = "5.6.4"; }; dotenv = { groups = ["default"]; @@ -853,10 +863,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; et-orbi = { dependencies = ["tzinfo"]; @@ -874,10 +884,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05is0kb650j8wrdi4rgkdls662chnhdg2p64pgq3zkd3d7l2a9zw"; + sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby"; type = "gem"; }; - version = "0.76.0"; + version = "0.95.0"; }; fabrication = { groups = ["development" "test"]; @@ -895,10 +905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47"; + sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; type = "gem"; }; - version = "2.23.0"; + version = "3.1.1"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -1091,10 +1101,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5"; type = "gem"; }; - version = "0.2.5"; + version = "0.3.0"; }; fugit = { dependencies = ["et-orbi" "raabro"]; @@ -1124,10 +1134,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lqizfap12ica5c6q74ldarzmbpmhgl156bap9xhamrlm4za4i7a"; + sha256 = "1pp9cf6b68pky9bndmals070kibab525wjn9igx9pc5h8z1jv5bd"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1135,10 +1145,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -1228,10 +1238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.1"; }; http-cookie = { dependencies = ["domain_name"]; @@ -1280,10 +1290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mi38zgpwvasjq0cqz674crwal5rsaw8f89bww9zsw2vk77bhaq9"; + sha256 = "0zjsgrlvwpqsnrza4ijlxjld4550c661sgbqp2j2wp638nlnls1a"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -1312,10 +1322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm"; + sha256 = "0dy04jx3n1ddz744b80mg7hp87miysnjp0h21lqr43hpmhdglxih"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; ipaddress = { groups = ["default"]; @@ -1332,20 +1342,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; json = { - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; json-canonicalization = { groups = ["default"]; @@ -1358,15 +1368,15 @@ version = "0.3.0"; }; 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-ld = { dependencies = ["htmlentities" "json-canonicalization" "link_header" "multi_json" "rack" "rdf"]; @@ -1385,10 +1395,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h0pfxyrsbifzhwfxj1ppaxbk7v2z8mw53a0mi49i986wyspxlgv"; + sha256 = "004s52m37b2kbw8dv4rdfm2d90h1023z1mw9zfcs0x87v8aq7zyn"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.2"; + }; + json-schema = { + dependencies = ["addressable"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4"; + type = "gem"; + }; + version = "3.0.0"; }; jsonapi-renderer = { groups = ["default"]; @@ -1405,10 +1426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1535,21 +1556,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "0n0pijrc465zzrv5flxc41375zwaz9yfc2n0r80zjwarc1ixkdx1"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0.1"; }; makara = { dependencies = ["activerecord"]; @@ -1598,10 +1619,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8qaf19yr4lhvdxk3cy3ifc47cgxdz2jybg6hzxsy9gh88c1f7v"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; method_source = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1613,17 +1634,6 @@ }; version = "1.0.0"; }; - microformats = { - dependencies = ["json" "nokogiri"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "094m75yw2cvadpvj4rawy6s4ykx9nvv8dhikxrp8zng2ywlaqmic"; - type = "gem"; - }; - version = "4.4.1"; - }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -1660,30 +1670,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; type = "gem"; }; - version = "1.5.4"; + version = "1.6.0"; }; multi_json = { groups = ["default"]; @@ -1705,6 +1715,17 @@ }; version = "2.1.1"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -1715,6 +1736,28 @@ }; version = "0.17.1"; }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default" "development"]; @@ -1726,6 +1769,17 @@ }; version = "4.0.0.rc1"; }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; net-ssh = { groups = ["default" "development"]; platforms = []; @@ -1752,10 +1806,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; type = "gem"; }; - version = "1.13.9"; + version = "1.14.1"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1773,10 +1827,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf"; + sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; type = "gem"; }; - version = "3.13.21"; + version = "3.13.23"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1823,15 +1877,15 @@ version = "1.10.3"; }; openid_connect = { - dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; + dependencies = ["activemodel" "attr_required" "json-jwt" "net-smtp" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7"; + sha256 = "1k9kdivp45v6vhzdrnl5fzhd378gjj2hl4w9bazbqnfm15rsnzc8"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.2"; }; openssl = { groups = ["default"]; @@ -1869,13 +1923,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "054xq22rwj26jag43s5fb4vb4x2252dz6rvgjn42id8ycs51my2w"; + sha256 = "1g9ivy30jx7hjl8l3il47dmc9xgla8dj762v5cw0mgzpd9rq6vr4"; type = "gem"; }; - version = "2.14.11"; + version = "2.14.14"; }; parallel = { - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1890,10 +1944,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.0.0"; }; parslet = { groups = ["default"]; @@ -1921,10 +1975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.5"; }; pghero = { dependencies = ["activerecord"]; @@ -1932,20 +1986,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a"; + sha256 = "0wi1mls8r6r43dy5m6dsdqk28q564164h97pp7a111pgkbdmxf83"; type = "gem"; }; - version = "2.8.3"; + version = "3.1.0"; }; pkg-config = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9vmkmpha34lwdhig08kb7z4wk3xmw49dvkl99nz9llxhzqr5hl"; + sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651"; type = "gem"; }; - version = "1.4.9"; + version = "1.5.1"; }; posix-spawn = { groups = ["default"]; @@ -1963,21 +2017,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f0zz3vwv1kyr43chvrpvhb8wm9qgcaz8ckc1lj2jxfp6xsss971"; + sha256 = "0dfknfwwlzmb594acgi6v080ngxbnhshn3gzvdh5x2vx1aqvwc5r"; type = "gem"; }; - version = "1.14.2"; + version = "1.18.0"; }; premailer-rails = { - dependencies = ["actionmailer" "premailer"]; + dependencies = ["actionmailer" "net-smtp" "premailer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q23clzqgzxcg1jld7hn5jy2yqxvana3iw66vmjgzz7y4ylf97b6"; + sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61"; type = "gem"; }; - version = "1.11.1"; + version = "1.12.0"; }; private_address_check = { groups = ["production" "test"]; @@ -2027,10 +2081,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -2049,10 +2103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17z2f7w3syh3c04c8m1v9pvb9pfpymk8b5plszr5l24hx374xvsd"; + sha256 = "1wb03yzy1j41822rbfh9nn77im3zh1f5v8di05cd8rsrdpws542b"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; raabro = { groups = ["default"]; @@ -2069,20 +2123,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-attack = { dependencies = ["rack"]; @@ -2112,10 +2166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; + sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.3"; }; rack-proxy = { dependencies = ["rack"]; @@ -2123,10 +2177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdr2r5phr3q7d6k9cnxjwlkaps0my0n43wq9mzw3xdqhg9wa3d6"; + sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.6"; }; rack-test = { dependencies = ["rack"]; @@ -2145,10 +2199,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01l06196jkidj07g8jdc43nr060r46hsjz8bk4bdk0lzzck94fvf"; + sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2178,10 +2232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -2211,10 +2265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iwziqrzk7f7r3w5pkfnbh1mqsfsywy7lvz2blqds3nval79dw2x"; + sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; type = "gem"; }; - version = "6.1.7"; + version = "6.1.7.2"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2253,20 +2307,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysa8v2xw0ln4kdwhkg6mh71v5wbancsz5cf945kbk47m1ybn271"; + sha256 = "1dngmsk9wg1vws56pl87dys0ns4bcn9arf8ip6zxa0gypr3ifq3m"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; redis = { groups = ["default" "test"]; @@ -2284,20 +2338,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; + sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + type = "gem"; + }; + version = "1.10.0"; + }; + redlock = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xvjwfzq7rqj4k311kidwmv5app3i7glz4miys6ixqy6c8yylz3c"; type = "gem"; }; - version = "1.9.0"; + version = "1.3.2"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.2"; }; request_store = { dependencies = ["rack"]; @@ -2449,37 +2514,70 @@ version = "0.6.0"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["development"]; + 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 = "088xzzq6vjsgi2cj9rnz2jlj5mghmgq1j250pn5zy8yqd39vxz71"; + sha256 = "0f4n844yr2jrbddf79cam8qg41k2gkpyjjgd4zgbd8df1ijbld6p"; type = "gem"; }; - version = "1.30.1"; + version = "1.44.1"; }; rubocop-ast = { dependencies = ["parser"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl"; + sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; type = "gem"; }; - version = "1.18.0"; + version = "1.24.1"; + }; + rubocop-capybara = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + type = "gem"; + }; + version = "2.17.0"; + }; + rubocop-performance = { + dependencies = ["rubocop" "rubocop-ast"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + type = "gem"; + }; + version = "1.16.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19x0d6jmryky5sx50qgsan1g0gxb7lcgrmfrwjsa5w6shcyvbp8c"; + sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; type = "gem"; }; - version = "2.15.0"; + version = "2.17.4"; + }; + rubocop-rspec = { + dependencies = ["rubocop" "rubocop-capybara"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + type = "gem"; + }; + version = "2.18.1"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2540,10 +2638,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; + sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; scenic = { dependencies = ["activerecord" "railties"]; @@ -2551,10 +2649,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl14f5lfidbvcx52q49xnxc4dccyrzyv38qjkda8dh07zsksw85"; + sha256 = "04sd4jmgnwpilr3k061x87yyryya2mj15a8602fip49lfxza5548"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; semantic_range = { groups = ["default"]; @@ -2572,10 +2670,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; + sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh"; type = "gem"; }; - version = "6.5.7"; + version = "6.5.8"; }; sidekiq-bulk = { dependencies = ["sidekiq"]; @@ -2600,15 +2698,15 @@ version = "4.0.3"; }; sidekiq-unique-jobs = { - dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"]; + dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "redis" "sidekiq" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13s723wy8sh8x7ff1b1r0vxk6y6ygcjvpirjp0inl5824ds15s12"; + sha256 = "02f91b24hrrn688wqvxb13lwvcgqb7g9k3sxylnydd6v89wr8mcg"; type = "gem"; }; - version = "7.1.27"; + version = "7.1.29"; }; simple-navigation = { dependencies = ["activesupport"]; @@ -2627,10 +2725,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09raw1gw0db9hfddgvzjwpk4hj1ng4dfq3igak80jkvhg4jdg7jp"; + sha256 = "0z4df65w9qpri315lpvzazdxa9xb7yj0j3d77q06wf0jnpvw4mzs"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2638,10 +2736,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-html = { groups = ["default" "test"]; @@ -2658,10 +2756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl3j7p3b5q7sxsx1va63c8imc5x6g99xablz08qrmqhpi0d6g6j"; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; smart_properties = { groups = ["default" "development" "test"]; @@ -2711,10 +2809,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc"; + sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; type = "gem"; }; - version = "0.2.22"; + version = "0.2.23"; }; statsd-ruby = { groups = ["default"]; @@ -2727,14 +2825,15 @@ version = "1.5.0"; }; stoplight = { + dependencies = ["redlock"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1628qf2ynldqz20h5lkaivk166qknk15gxg130n9pvz568k1sdp8"; + sha256 = "0rmhhqvvrn7874r9cjf4wpv36vnxvxsrgb1kfgdk3dalg4rig7q6"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; strong_migrations = { dependencies = ["activerecord"]; @@ -2810,6 +2909,16 @@ }; version = "2.0.11"; }; + timeout = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + type = "gem"; + }; + version = "0.3.1"; + }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; groups = ["default"]; @@ -2890,10 +2999,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; tzinfo-data = { dependencies = ["tzinfo"]; @@ -2901,10 +3010,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lslg5vvhx6w0mkbf6gpqvr9h8pj84wc639vk7ix7bqk61wgfch9"; + sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp"; type = "gem"; }; - version = "1.2022.4"; + version = "1.2022.7"; }; unf = { dependencies = ["unf_ext"]; @@ -2932,10 +3041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.2"; }; uniform_notifier = { groups = ["default" "development"]; @@ -3019,10 +3128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cq6m5qwm3bmi7hkjfmbg2cs4qjq4wswlrwcfk8l1svfqbi135v3"; + sha256 = "0fh4vijqiq1h7w28llk67y9csc0m4wkdivrsl4fsxg279v6j5z3i"; type = "gem"; }; - version = "5.4.3"; + version = "5.4.4"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -3094,10 +3203,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.6"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 8ab2543e47600..891e96d684818 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; - rev = "v4.0.2"; - sha256 = "1szb11bss66yvh8750pzib3r0w1fm9h84sf5daqsnbm871hgzlw0"; + rev = "v4.1.0"; + sha256 = "00nc80s1hz4sdpq81hsv2r9da3bjn4lgwpk7w24zy2016iwjjwbb"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index b79176c23c343..c283b30007c53 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.0.2" +"4.1.0" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 9fc2c676b9464..9253b93945b13 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.75.0"; + version = "1.77.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-cfvekrZRLbdsUqkkPF8hz9B4qsum1kpIL0aCnJf3HYg="; + hash = "sha256-//1BTiNH3n2eNjwOADb1OB7xp5QsH6arV5Pg3B7y3r0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oyXgHqOrMKs+mYGAI4Wn+fuVQWsQJIkPwCY4t+cUlQ4="; + hash = "sha256-B9Z+7VtbbX/S01aaMFHgXH60sg8Lmwku2XPRnpMpwjo="; }; postPatch = '' @@ -67,7 +67,6 @@ buildPythonApplication rec { pyasn1 pydantic pyicu - pyjwt pymacaroons pynacl pyopenssl diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 8716de1f1d773..d96e60ba780f2 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "matrix-appservice-irc"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = "refs/tags/${version}"; - hash = "sha256-8/jLONqf+0JRAK/SLj3qlG6Dm0VRl4h6YWeZnz4pVXc="; + hash = "sha256-krF/eUyGHB4M3sQVaBh7+OaHnM/g9XVaBa8gizPkLKE="; }; - npmDepsHash = "sha256-fGft7au5js9DRoXYccBPdJyaZ3zfsuCwUwWPOxwAodo="; + npmDepsHash = "sha256-VkVpFt3cwnBkN0AGDaE5Bd6xINGL6XugZ4TBsDONWCg="; nativeBuildInputs = [ python3 diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix new file mode 100644 index 0000000000000..9903dbb1184e4 --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, matrix-sdk-crypto-nodejs +, mkYarnPackage +, rust +, rustPlatform +, napi-rs-cli +, nodejs +}: + +let + data = lib.importJSON ./pin.json; +in +mkYarnPackage rec { + pname = "matrix-hookshot"; + version = data.version; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-hookshot"; + rev = data.version; + sha256 = data.srcHash; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = data.yarnHash; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-WolkDSS5wPxtltKzq4Er2nAQ0GrsF3imim3/Ge4eguQ="; + }; + + packageResolutions = { + "@matrix-org/matrix-sdk-crypto-nodejs" = "${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs"; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + napi-rs-cli + makeWrapper + ]; + + buildPhase = '' + runHook preBuild + cd deps/${pname} + napi build --target ${rust.toRustTargetSpec stdenv.targetPlatform} --dts ../src/libRs.d.ts --release ./lib + yarn run build:app:fix-defs + yarn run build:app + yarn run build:web + cd ../.. + runHook postBuild + ''; + + postInstall = '' + makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-hookshot" --add-flags \ + "$out/libexec/matrix-hookshot/deps/matrix-hookshot/lib/App/BridgeApp.js" + ''; + + doDist = false; + + meta = with lib; { + description = "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA"; + maintainers = with maintainers; [ chvp ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json new file mode 100644 index 0000000000000..6676f3bb9c306 --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -0,0 +1,111 @@ +{ + "name": "matrix-hookshot", + "version": "2.7.0", + "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", + "main": "lib/app.js", + "repository": "https://github.com/matrix-org/matrix-hookshot", + "author": "matrix.org", + "license": "Apache-2.0", + "napi": { + "name": "matrix-hookshot-rs" + }, + "engines": { + "node": ">=16" + }, + "scripts": { + "build:web": "vite build", + "build:app": "tsc --project tsconfig.json", + "build:app:rs": "napi build --dts ../src/libRs.d.ts --release ./lib", + "build:app:fix-defs": "ts-node scripts/definitions-fixer.ts src/libRs.d.ts", + "build:docs": "ts-node scripts/build-metrics-docs.ts > docs/metrics.md && mdbook build", + "dev:web": "vite dev", + "build": "scripts/build-app.sh", + "clean:web": "rimraf public/", + "clean:app": "tsc --build tsconfig.json --clean", + "clean:app:rs": "rimraf src/libRs.d.ts target/", + "clean:docs": "mdbook clean", + "clean": "scripts/clean.sh", + "prepare": "yarn build", + "start": "node --require source-map-support/register lib/App/BridgeApp.js", + "start:app": "node --require source-map-support/register lib/App/BridgeApp.js", + "start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js", + "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", + "test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts", + "test:cover": "nyc --reporter=lcov --reporter=text yarn test", + "lint": "yarn run lint:js && yarn run lint:rs", + "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'", + "lint:rs": "cargo fmt --all -- --check", + "generate-default-config": "ts-node src/Config/Defaults.ts --config > config.sample.yml", + "validate-config": "ts-node src/Config/Config.ts" + }, + "dependencies": { + "@alloc/quick-lru": "^5.2.0", + "@octokit/auth-app": "^3.3.0", + "@octokit/auth-token": "^2.4.5", + "@octokit/rest": "^18.10.0", + "@octokit/webhooks": "^9.1.2", + "ajv": "^8.11.0", + "axios": "^0.24.0", + "cors": "^2.8.5", + "express": "^4.17.3", + "figma-js": "^1.14.0", + "http-status-codes": "^2.2.0", + "ioredis": "^5.2.3", + "jira-client": "^8.0.0", + "markdown-it": "^12.3.2", + "matrix-appservice-bridge": "^6.0.0", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.3-element.0", + "matrix-widget-api": "^1.0.0", + "micromatch": "^4.0.4", + "mime": "^3.0.0", + "node-emoji": "^1.11.0", + "nyc": "^15.1.0", + "p-queue": "^6.6.2", + "prom-client": "^14.0.1", + "reflect-metadata": "^0.1.13", + "rss-parser": "^3.12.0", + "source-map-support": "^0.5.21", + "string-argv": "^0.3.1", + "tiny-typed-emitter": "^2.1.0", + "uuid": "^8.3.2", + "vm2": "^3.9.11", + "winston": "^3.3.3", + "xml2js": "^0.4.23", + "yaml": "^1.10.2" + }, + "devDependencies": { + "@codemirror/lang-javascript": "^6.0.2", + "@napi-rs/cli": "^2.2.0", + "@preact/preset-vite": "^2.2.0", + "@tsconfig/node16": "^1.0.3", + "@types/ajv": "^1.0.0", + "@types/chai": "^4.2.22", + "@types/cors": "^2.8.12", + "@types/express": "^4.17.14", + "@types/jira-client": "^7.1.0", + "@types/markdown-it": "^12.2.3", + "@types/micromatch": "^4.0.1", + "@types/mime": "^2.0.3", + "@types/mocha": "^9.0.0", + "@types/node": "^16", + "@types/node-emoji": "^1.8.1", + "@types/uuid": "^8.3.3", + "@types/xml2js": "^0.4.11", + "@typescript-eslint/eslint-plugin": "^5.4.0", + "@typescript-eslint/parser": "^5.4.0", + "@uiw/react-codemirror": "^4.12.3", + "chai": "^4.3.4", + "eslint": "^8.3.0", + "eslint-config-preact": "^1.3.0", + "eslint-plugin-mocha": "^9.0.0", + "mini.css": "^3.0.1", + "mocha": "^8.2.1", + "preact": "^10.5.15", + "rimraf": "^3.0.2", + "sass": "^1.51.0", + "ts-node": "^10.4.0", + "typescript": "^4.5.2", + "vite": "^2.9.13", + "vite-svg-loader": "^3.4.0" + } +} diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json new file mode 100644 index 0000000000000..d726307eeb000 --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -0,0 +1,5 @@ +{ + "version": "2.7.0", + "srcHash": "rW5fqKshnF2S4w55V2GaAa2RFVM+YbwRum9OwTTpYuA=", + "yarnHash": "0q71901ra9m9rbbczal1imqfba4b07bpr8hkpw1d1r9ghc2xjay4" +} diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh new file mode 100755 index 0000000000000..4d91ec7533297 --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env -S nix shell nixpkgs#nix nixpkgs#curl nixpkgs#jq nixpkgs#prefetch-yarn-deps nixpkgs#nix-prefetch-github nixpkgs#nix-prefetch-git --command bash + +if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for matrix-hookshot." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(curl "https://api.github.com/repos/matrix-org/matrix-hookshot/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +src="https://raw.githubusercontent.com/matrix-org/matrix-hookshot/$version" +src_hash=$(nix-prefetch-github matrix-org matrix-hookshot --rev ${version} | jq -r .sha256) + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +pushd $tmpdir +curl -O "$src/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +curl -O "$src/package.json" +cat > pin.json << EOF +{ + "version": "$version", + "srcHash": "$src_hash", + "yarnHash": "$yarn_hash" +} +EOF diff --git a/pkgs/servers/matrix-synapse/plugins/default.nix b/pkgs/servers/matrix-synapse/plugins/default.nix index e67d907545a8f..7c77bf933c5c0 100644 --- a/pkgs/servers/matrix-synapse/plugins/default.nix +++ b/pkgs/servers/matrix-synapse/plugins/default.nix @@ -1,6 +1,7 @@ { callPackage }: { + matrix-http-rendezvous-synapse = callPackage ./rendezvous.nix { }; matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; matrix-synapse-mjolnir-antispam = callPackage ./mjolnir-antispam.nix { }; matrix-synapse-pam = callPackage ./pam.nix { }; diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index 7eed01318f389..2cf0f50901bf5 100644 --- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -1,19 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, matrix-synapse }: buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "refs/tags/v${version}"; - sha256 = "sha256-pTQF3iUXJv953I/savQu/aUK0R1ujE6IrN68FkKO9sU="; + sha256 = "sha256-/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w="; }; sourceRoot = "./source/synapse_antispam"; - propagatedBuildInputs = [ matrix-synapse ]; + buildInputs = [ matrix-synapse ]; doCheck = false; # no tests pythonImportsCheck = [ "mjolnir" ]; @@ -25,8 +25,9 @@ buildPythonPackage rec { Mjolnir's Synapse module is a way to interpret ban lists and apply them to your entire homeserver. ''; - homepage = "https://github.com/matrix-org/mjolnir#synapse-module"; + homepage = "https://github.com/matrix-org/mjolnir/blob/main/docs/synapse_module.md"; license = licenses.asl20; maintainers = with maintainers; [ jojosch ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/matrix-synapse/plugins/pam.nix b/pkgs/servers/matrix-synapse/plugins/pam.nix index a14fe6d6a6c58..3f51631a75e34 100644 --- a/pkgs/servers/matrix-synapse/plugins/pam.nix +++ b/pkgs/servers/matrix-synapse/plugins/pam.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, twisted, python-pam }: +{ lib, buildPythonPackage, fetchFromGitHub, twisted, python-pam }: buildPythonPackage rec { pname = "matrix-synapse-pam"; @@ -12,4 +12,16 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ twisted python-pam ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "pam_auth_provider" ]; + + meta = with lib; { + description = "PAM auth provider for the Synapse Matrix server"; + homepage = "https://github.com/14mRh4X0r/matrix-synapse-pam"; + license = licenses.eupl12; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock b/pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock new file mode 100644 index 0000000000000..aea0259ed8392 --- /dev/null +++ b/pkgs/servers/matrix-synapse/plugins/rendezvous-Cargo.lock @@ -0,0 +1,1463 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "async-trait" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +dependencies = [ + "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 = "axum" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[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 = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "bytesize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +dependencies = [ + "serde", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "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 = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" + +[[package]] +name = "futures-executor" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" + +[[package]] +name = "futures-macro" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" + +[[package]] +name = "futures-task" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" + +[[package]] +name = "futures-util" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "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 = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[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 = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "humantime-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" +dependencies = [ + "humantime", + "serde", +] + +[[package]] +name = "hyper" +version = "0.14.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[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 = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "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 = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "matrix-http-rendezvous" +version = "0.1.12" +dependencies = [ + "axum", + "base64ct", + "bytes", + "headers", + "hyper", + "mime", + "sha2", + "time", + "tokio", + "tower", + "tower-http", + "tracing", + "ulid", +] + +[[package]] +name = "matrix-http-rendezvous-server" +version = "0.1.12" +dependencies = [ + "bytesize", + "clap", + "humantime", + "hyper", + "matrix-http-rendezvous", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "matrix-http-rendezvous-synapse" +version = "0.1.12" +dependencies = [ + "anyhow", + "bytesize", + "http-body", + "humantime", + "humantime-serde", + "matrix-http-rendezvous", + "pyo3", + "pyo3-asyncio", + "pyo3-log", + "pyo3-matrix-synapse-module", + "serde", + "tokio", + "tower", + "tracing", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.45.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num_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 = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "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.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06a3d8e8a46ab2738109347433cb7b96dffda2e4a218b03ef27090238886b147" +dependencies = [ + "anyhow", + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3564762e37035cfc486228e10b0528460fa026d681b5763873c693aa0d5c260" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "tokio", +] + +[[package]] +name = "pyo3-build-config" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75439f995d07ddfad42b192dfcf3bc66a7ecfd8b4a1f5f6f046aa5c2c5d7677d" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839526a5c07a17ff44823679b68add4a58004de00512a95b6c1c98a6dcac0ee5" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c8b57fe71fb5dcf38970ebedc2b1531cf1c14b1b9b4c560a182a57e115575c" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd44cf207476c6a9760c4653559be4f206efafb924d3e4cbf2721475fc0d6cc5" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1f43d8e30460f36350d18631ccf85ded64c059829208fe680904c65bcd0a4c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pyo3-matrix-synapse-module" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2662b4194d2d4c9fb7557d6dbe9194aadcc869168c1d934a06f8115db70d251" +dependencies = [ + "bytes", + "http", + "http-body", + "pyo3", + "pyo3-asyncio", + "pyo3-twisted-web", + "serde", + "serde_json", + "serde_path_to_error", + "tower-service", + "tracing", +] + +[[package]] +name = "pyo3-twisted-web" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fcbe795dddc1b3f4c0ded59b91bbcdcf605abc4e808a9a0b1b93882ea1390a" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pyo3", + "pyo3-asyncio", + "tower", +] + +[[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 = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustversion" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "target-lexicon" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" +dependencies = [ + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "tokio" +version = "1.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +dependencies = [ + "autocfg", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.42.0", +] + +[[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 = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ulid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +dependencies = [ + "rand", + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "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.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-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix new file mode 100644 index 0000000000000..fe1f2469ef2de --- /dev/null +++ b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, rustPlatform, setuptools-rust }: + +buildPythonPackage rec { + pname = "matrix-http-rendezvous-synapse"; + version = "0.1.12"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "rust-http-rendezvous-server"; + rev = "v${version}"; + sha256 = "sha256-minwa+7HLTNSBtBtt5pnoHsFnNEh834nsVw80+FIQi8="; + }; + + postPatch = '' + cp ${./rendezvous-Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src postPatch; + name = "${pname}-${version}"; + hash = "sha256-TyxDq6YxZUArRj5gpjB1afDQgtUlCVer3Uhq6YKvVYM="; + }; + + nativeBuildInputs = [ + setuptools-rust + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); + + preBuild = '' + cd synapse + ''; + + postBuild = '' + cd .. + ''; + + pythonImportsCheck = [ "matrix_http_rendezvous_synapse" ]; + + meta = with lib; { + description = "Implementation of MSC3886: Simple rendezvous capability"; + homepage = "https://github.com/matrix-org/rust-http-rendezvous-server"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index b4e4e87fb7dc9..11920c3e8b683 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "sha256-VqVrAmbKTfDhcvgayEE1wUeFBSTGczBrntIJQ5/uWzM="; }; + subPackages = [ "." ]; + vendorSha256 = null; meta = with lib; { diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 01819e8e99f20..e6eab7da86af0 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,21 +7,21 @@ buildGoModule rec { pname = "mattermost"; - version = "7.5.2"; + version = "7.7.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-Jm7bu/RoFp7h38Ygis3U2E7Hbbj4zmRPc4PacxxASsw="; + sha256 = "sha256-py1Ck/BGNGIlyVZXJPb9bYHLU8FTrBEIQwVkHvgHRLY"; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-Zvzme6Og/LLsT4XyFDAQscNgO+jCwwzDDytYOo4qM0U="; + sha256 = "sha256-4FrvKQdGKfwJM7Oc43kg1Iq4o/OT2/kl89bTKBO4EdQ"; }; - vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk="; + vendorSha256 = "sha256-qJSddirC0VVFgKsttmNFZ1AzGR7jo07jXzrt7+DswXs="; subPackages = [ "cmd/mattermost" ]; diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index db1f7c6d1f254..74389663455fb 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub, fetchpatch +{ fetchFromGitHub +, fetchpatch , lib , python3 -, protobuf3_20 -, enableE2be ? true, enableMetrics ? true, enableSqlite ? true +, enableE2be ? true +, enableMetrics ? true +, enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "0.4.0"; + version = "unstable-2023-01-25"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "v${version}"; - sha256 = "sha256-UVWYT0HTOUEkBG0n6KNhCSSO/2PAF1rIvCaw478z+q0="; + rev = "e2eb528745466468f059c506c22e500e0cd832aa"; + sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; }; patches = [ @@ -24,13 +26,6 @@ }) ]; - doCheck = false; - - postPatch = '' - sed -i requirements.txt \ - -e 's/asyncpg>=.*/asyncpg/' - ''; - baseConfigPath = "share/mautrix-googlechat/example-config.yaml"; postInstall = '' rm $out/example-config.yaml @@ -43,8 +38,12 @@ pycryptodome unpaddedbase64 ]; - metrics = [ prometheus-client ]; - sqlite = [ aiosqlite ]; + metrics = [ + prometheus-client + ]; + sqlite = [ + aiosqlite + ]; }; propagatedBuildInputs = with python3.pkgs; [ @@ -54,14 +53,14 @@ ruamel-yaml CommonMark python-magic - (protobuf.override { - protobuf = protobuf3_20; - }) + protobuf3 mautrix ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; + doCheck = false; + meta = with lib; { homepage = "https://github.com/mautrix/googlechat"; description = "A Matrix-Google Chat puppeting bridge"; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 7aada1e2eed5b..8ff6f1d36694b 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -11,6 +11,20 @@ python3.pkgs.buildPythonPackage rec { sha256 = "sha256-UbetU1n9zD/mVFaJc9FECDq/Zell1TI/aYPsGXGB8Js="; }; + postPatch = '' + # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook + substituteInPlace setup.py \ + --replace 'version=version' 'version="${version}"' + ''; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "mautrix" + ]; + propagatedBuildInputs = with python3.pkgs; [ CommonMark aiohttp @@ -31,12 +45,6 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "asyncpg>=0.20,<0.26" "asyncpg>=0.20" \ - --replace "mautrix>=0.16.0,<0.17" "mautrix>=0.16.0" - ''; - postInstall = '' mkdir -p $out/bin diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 468df32bbddde..7e2b4bfbcab04 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -2,35 +2,37 @@ , python3 , fetchFromGitHub , withE2BE ? true -, withHQthumbnails ? false }: let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0a1"; + version = "1.28.0a3"; pname = "tulir-telethon"; src = super.fetchPypi { inherit pname version; - sha256 = "sha256-tABAY4UlTyMK1ZafIFawegjBAtcnq3HMNbE1L6WaT3E="; + hash = "sha256-N1XQGpjfyUqcT+bsSBxC5Purvnd/+4NzVzMhiaq5yDo="; }; doCheck = false; }); }; }; -in python.pkgs.buildPythonPackage rec { +in +python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.12.2"; + version = "0.13.0"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; - rev = "v${version}"; - sha256 = "sha256-htCk0VLr6GfXbpYWF/2bmpko7gSVlkH6HwDjOMhW8is="; + rev = "refs/tags/v${version}"; + hash = "sha256-AfCo2uHOcSNCWXgrCLzJwl0Dj8n9Asdqm19wk0OeXgQ="; }; + format = "setuptools"; + patches = [ ./0001-Re-add-entrypoint.patch ]; propagatedBuildInputs = with python.pkgs; ([ @@ -43,19 +45,21 @@ in python.pkgs.buildPythonPackage rec { tulir-telethon asyncpg Mako - # optional + # speedups cryptg - cchardet aiodns brotli + # qr_login pillow qrcode + # formattednumbers phonenumbers + # metrics prometheus-client + # sqlite aiosqlite - ] ++ lib.optionals withHQthumbnails [ - moviepy ] ++ lib.optionals withE2BE [ + # e2be python-olm pycryptodome unpaddedbase64 diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 385fd1a78484c..9b5f2c8131647 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-fLYc0Z9lgNYjv4D+TpKP1+sBuILV1lf1IEDRYc8fUY4="; + hash = "sha256-0hnBqYwFVVlqv+8Cx2qvytDU6I+MPWQIpG4nYd7mPLM="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-RUTImaiiCsNHZHGTAXPXySP3tlEUJr6DLhmNA3ubgFs="; + vendorSha256 = "sha256-n3DBPI1gjbmP9m+xkGVoTSBcA0ELSokNZb9i3cYmAqc="; doCheck = false; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 83721ed601d19..aa7e4136017f3 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ] - ++ lib.optional stdenv.isDarwin "-Wno-error"; + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=deprecated-declarations" ] + ++ lib.optional stdenv.isDarwin "-Wno-error"); meta = with lib; { description = "A distributed memory object caching system"; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 42efd0e11584f..78eea7364ace9 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.45.1"; + version = "0.45.2.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-FfX/+SIJWnSSqTf0yH0xCDWbBdXbzVSoQESHCO5oQ4s="; + hash = "sha256-m891fWpY0W100MFyYtiL6fcZPrEW34cdo+61dj7cJvM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 8e657e1edc0f8..5e24e5e9a8eb6 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.41"; + version = "2.0.42"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-NhxzpNtRzLE9bVWIGSHwnok7RjqRp8Uan9uCvdigAyk="; + sha256 = "sha256-2ywaQubE/DZCTIX6a3vh1VH+/lfoe9gRzkqih8ULU8Q="; }; - vendorSha256 = "sha256-906gMXI6zEIIcXvT/ZqAM+5F0GVHbipUtdrPO6+32KQ="; + vendorSha256 = "sha256-KtYFjNqUIYgAwIkEhQwg5OdjIluyENeZ6Qo5TGKzA/s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index f433b219f3421..b655652b7e14b 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-01-20T02-05-44Z"; + version = "2023-02-22T18-23-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-svy+rmc7RPxKaoF8VbJUpmcYTShqhX7NpPOqzSZdrt4="; + sha256 = "sha256-Y11jqZiQUu0/YcrIGFJ2nOkPRG97sflluO3J0BJZ6kQ="; }; - vendorHash = "sha256-5s70UG9N6A2PklOYpvIU4Ot2vMVCEjOtue4DBaU+ryU="; + vendorHash = "sha256-9QYRUCD2iR2jx8G1FbkQqqPqIuXKxAKDy9whMRhOVP4="; doCheck = false; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index afee6b4241c40..b187a1d642453 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -23,7 +23,7 @@ , libxcb , libxkbcommon , libxmlxx -, libyamlcpp +, yaml-cpp , lttng-ust , mesa , nettle @@ -49,38 +49,23 @@ in stdenv.mkDerivation rec { pname = "mir"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "MirServer"; repo = "mir"; rev = "v${version}"; - hash = "sha256-103PJZEoSgtSbDGCanD2/XdpX6DXXx678GmghdZI7H4="; + hash = "sha256-c9lFlzoxj45Xx5FYd0O/arVCV9ilArzj5GrPuJigJ4E="; }; patches = [ - # These four patches fix various path concatenation problems and missing GNUInstallDirs variable uses that affect + # Fixes various path concatenation problems and missing GNUInstallDirs variable uses that affect # install locations and generated pkg-config files - # Remove when MirServer/mir/pull/2786 merged & a version > 2.11.0 has the fixes + # Remove when a version > 2.12.1 has the fixes (fetchpatch { - name = "0001-mir-Better-pkg-config-path-concatenations.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/a322be08002ae7b2682d3ca7037c314ce900d3c7.patch"; - hash = "sha256-6nScVan3eefXZb+0T9TvCjRQt+rCMj27sukpdGMVJzY="; - }) - (fetchpatch { - name = "0002-mir-Improve-mirtest-pkg-config.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/7a739fde27f5f5eff0ec33f766a807c3ff462663.patch"; - hash = "sha256-C2cDN4R0C4654Km27PJwKrNiFi/d0iz9/rcABS6eRVI="; - }) - (fetchpatch { - name = "0003-mir-Fix-GNUInstallDirs-variable-concatenations-in-CMake.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/543e1ec0162f95611b282d33a2e81a642dc75374.patch"; - hash = "sha256-nxgj8tTfSqjRxqi67hAuWM9d604TAwhNjUXwGDAEW6A="; - }) - (fetchpatch { - name = "0004-mir-More-GNUInstallDirs-variables-less-FULL.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/0cb0a1d5e3ac4aca25ca2ebacdcb984d7ff3a66a.patch"; - hash = "sha256-rnDvr8ul/GgajHYbpale+szNE6VDgENRY6PnBhfGMN8="; + name = "0001-mir-Better-install-path-concatenations-and-more-GNUInstallDirs-variables.patch"; + url = "https://github.com/MirServer/mir/commit/58c4ca628748278b1eb7a3721ad9a0c3590e28f2.patch"; + hash = "sha256-+FNVlApaVzA94cy4awulLwTtggD07xACbvjII/RxyRM="; }) ]; @@ -100,16 +85,6 @@ stdenv.mkDerivation rec { --replace 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0' done - # Patch in which tests we want to skip - substituteInPlace cmake/MirCommon.cmake \ - --replace 'set(test_exclusion_filter)' 'set(test_exclusion_filter "${lib.strings.concatStringsSep ":" [ - # These all fail in the same way: GDK_BACKEND expected to have "wayland", actually has "wayland,x11". - # They succeed when run interactively, don't know how to fix them. - "ExternalClient.empty_override_does_nothing" - "ExternalClient.strange_override_does_nothing" - "ExternalClient.another_strange_override_does_nothing" - ]}")' - # Fix Xwayland default substituteInPlace src/miral/x11_support.cpp \ --replace '/usr/bin/Xwayland' '${xwayland}/bin/Xwayland' @@ -124,10 +99,6 @@ stdenv.mkDerivation rec { substituteInPlace cmake/Doxygen.cmake \ --replace '"date"' '"date" "--date=@'"$SOURCE_DATE_EPOCH"'"' \ --replace "\''${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc" "\''${CMAKE_INSTALL_DOCDIR}" - - # Not installed on Mir HEAD anymore, hence not part of the MirServer/mir/pull/2786 patches - substituteInPlace examples/miral-kiosk/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" ''; strictDeps = true; @@ -158,7 +129,7 @@ stdenv.mkDerivation rec { libxcb libxkbcommon libxmlxx - libyamlcpp + yaml-cpp lttng-ust mesa nettle @@ -183,8 +154,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" "-DMIR_ENABLE_TESTS=${if doCheck then "ON" else "OFF"}" - # Eventually renamed to MIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN - "-DMIR_BAD_BUFFER_TEST_ENVIRONMENT_BROKEN=ON" + # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such + # https://github.com/MirServer/mir/pull/1947#issuecomment-811810872 + "-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON" + "-DMIR_EXCLUDE_TESTS=${lib.strings.concatStringsSep ";" [ + ]}" # These get built but don't get executed by default, yet they get installed when tests are enabled "-DMIR_BUILD_PERFORMANCE_TESTS=OFF" "-DMIR_BUILD_PLATFORM_TEST_HARNESS=OFF" @@ -193,7 +167,9 @@ stdenv.mkDerivation rec { inherit doCheck; preCheck = '' - export XDG_RUNTIME_DIR=$TMPDIR + # Needs to be exactly /tmp so some failing tests don't get run, don't know why they fail yet + # https://github.com/MirServer/mir/issues/2801 + export XDG_RUNTIME_DIR=/tmp ''; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 759ac94e568ca..b85be770e7910 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,42 +1,41 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchpatch -, pkg-config, zlib, geoip }: - -buildGoPackage rec { +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, zlib +, geoip +}: + +buildGoModule rec { pname = "mirrorbits"; - version = "0.4"; - rev = "v${version}"; + version = "0.5.1"; src = fetchFromGitHub { - inherit rev; owner = "etix"; repo = "mirrorbits"; - sha256 = "11f9wczajba147qk5j73pxjrvlxkgr598sjvgjn2b8nxm49g2pan"; + rev = "v${version}"; + hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM="; }; + vendorHash = null; + patches = [ + # Add Go Modules support (fetchpatch { - url = "https://github.com/etix/mirrorbits/commit/03a4e02214bdb7bb60240ddf25b887ccac5fb118.patch"; - sha256 = "08332cfxmp2nsfdj2ymg3lxkav8h44f6cf2h6g9jkn03mkliblm5"; + url = "https://github.com/etix/mirrorbits/commit/955a8b2e1aacea1cae06396a64afbb531ceb36d4.patch"; + hash = "sha256-KJgj3ynnjjiXG5qsUmzBiMjGEwfvM/9Ap+ZgUdhclik="; }) ]; - postPatch = '' - rm -rf testing - ''; - - # Fix build with go >=1.12 - preBuild = '' - sed -i s/"_Ctype_struct_GeoIPRecordTag"/"C.struct_GeoIPRecordTag"/ ./go/src/github.com/etix/geoip/geoip.go - ''; - - goPackagePath = "github.com/etix/mirrorbits"; - deleteVendor = true; - goDeps = ./deps.nix; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib geoip ]; - meta = { + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { description = "geographical download redirector for distributing files efficiently across a set of mirrors"; homepage = "https://github.com/etix/mirrorbits"; longDescription = '' @@ -47,8 +46,8 @@ buildGoPackage rec { the distribution of large-scale Open-Source projects with a lot of traffic. ''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fpletz ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/mirrorbits/deps.nix b/pkgs/servers/mirrorbits/deps.nix deleted file mode 100644 index 3736541266143..0000000000000 --- a/pkgs/servers/mirrorbits/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/etix/geoip"; - fetch = { - type = "git"; - url = "https://github.com/etix/geoip"; - rev = "db8457352061099b2a1840c712b3223900216588"; - sha256 = "1768237bngcjgw0s8wba0f4nw1xahg28cq2nd6vrbmhavd1ppim9"; - }; - } - { - goPackagePath = "github.com/etix/goftp"; - fetch = { - type = "git"; - url = "https://github.com/etix/goftp"; - rev = "0c13163a1028e83f0f1cce113dddd3900e935bc7"; - sha256 = "15kwk57yk63j28d1lwrykc9nr7ickqgk2fpw4g0b0404b95l101k"; - }; - } - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "70e1b1943d4fc9c56791abaa6f4d1e727b9ab925"; - sha256 = "1nw22r0vagmayjg51rz55yi9ppkd60ya0nzmp113mcz25vhxa0d0"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece77730c7e4724c61121037378659d9"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/youtube/vitess"; - fetch = { - type = "git"; - url = "https://github.com/youtube/vitess"; - rev = "6cf14dbf97f28eebd37dc2bc36374852946336a8"; - sha256 = "1g76q84wipyprn05brpjxf8xri87293r7nyf647crjy5d9k950lz"; - }; - } - { - goPackagePath = "gopkg.in/tylerb/graceful.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tylerb/graceful.v1"; - rev = "4654dfbb6ad53cb5e27f37d99b02e16c1872fbbb"; - sha256 = "1qspbrzr3h6c89v75c99avn7iizkfnjh901wp650vyy0j3p6ydnd"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index d3439b582a480..68edff754a887 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM="; + hash = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs="; }; vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 8c63b0fb940df..770ca8c76e868 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -14,13 +14,13 @@ let - version = "0.48.0"; + version = "0.49.1"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-FO2Vl3LeajvZ8CLtnsOSLXr//gaOWPbMthj70RHxp+Q="; + hash = "sha256-YaBtzMW2zUHRYJDDF+mMll2rMBAg5os2HSP0uEujoWI="; }; ui = callPackage ./ui { @@ -35,7 +35,7 @@ buildGoModule { inherit src version; - vendorSha256 = "sha256-LPoM5RFHfTTWZtlxc59hly12zzrY8wjXGZ6xW2teOFM="; + vendorSha256 = "sha256-9JDP58UxlSadMXD7gUl2oN+uiYN9RlGO4HMuZJhO9mw="; nativeBuildInputs = [ makeWrapper pkg-config ]; @@ -70,5 +70,7 @@ buildGoModule { sourceProvenance = with lib.sourceTypes; [ fromSource ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aciceri squalus ]; + # Broken on Darwin: sandbox-exec: pattern serialization length exceeds maximum (NixOS/nix#4119) + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/misc/navidrome/ui/node-packages.nix b/pkgs/servers/misc/navidrome/ui/node-packages.nix index e3d35ef909546..7392bf815b455 100644 --- a/pkgs/servers/misc/navidrome/ui/node-packages.nix +++ b/pkgs/servers/misc/navidrome/ui/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@adobe/css-tools-4.0.1" = { + name = "_at_adobe_slash_css-tools"; + packageName = "@adobe/css-tools"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz"; + sha512 = "+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g=="; + }; + }; "@ampproject/remapping-2.2.0" = { name = "_at_ampproject_slash_remapping"; packageName = "@ampproject/remapping"; @@ -1444,6 +1453,24 @@ let sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; }; }; + "@jest/types-26.6.2" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"; + sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; + }; + }; + "@jest/types-27.0.6" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "27.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz"; + sha512 = "aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g=="; + }; + }; "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -1561,13 +1588,13 @@ let sha512 = "GKHlJqLxUeHH3L3dGQ48ZavYrqGOTXkFkiEiuYMAnAvXAZP4rhMIqeHOPXSUQan4Bd8QnafDcpovOSLnadDmKw=="; }; }; - "@material-ui/styles-4.11.4" = { + "@material-ui/styles-4.11.5" = { name = "_at_material-ui_slash_styles"; packageName = "@material-ui/styles"; - version = "4.11.4"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.4.tgz"; - sha512 = "KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew=="; + url = "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz"; + sha512 = "o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA=="; }; }; "@material-ui/system-4.11.3" = { @@ -1588,13 +1615,13 @@ let sha512 = "7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A=="; }; }; - "@material-ui/utils-4.11.2" = { + "@material-ui/utils-4.11.3" = { name = "_at_material-ui_slash_utils"; packageName = "@material-ui/utils"; - version = "4.11.2"; + version = "4.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.2.tgz"; - sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA=="; + url = "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz"; + sha512 = "ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg=="; }; }; "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { @@ -1786,6 +1813,15 @@ let sha512 = "ka0W0KN5i6LfrSocduwliMMpqVgohtPFidKdMEOUjoOFCHcOOYkKsPRxfs5f15oPNHTm6ERAm0GV/+/LTKeiWg=="; }; }; + "@sindresorhus/is-0.14.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + }; "@sinonjs/commons-1.8.3" = { name = "_at_sinonjs_slash_commons"; packageName = "@sinonjs/commons"; @@ -1939,6 +1975,78 @@ let sha512 = "DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g=="; }; }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + }; + }; + "@testing-library/dom-7.31.2" = { + name = "_at_testing-library_slash_dom"; + packageName = "@testing-library/dom"; + version = "7.31.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz"; + sha512 = "3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ=="; + }; + }; + "@testing-library/dom-8.1.0" = { + name = "_at_testing-library_slash_dom"; + packageName = "@testing-library/dom"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/dom/-/dom-8.1.0.tgz"; + sha512 = "kmW9alndr19qd6DABzQ978zKQ+J65gU2Rzkl8hriIetPnwpesRaK4//jEQyYh8fEALmGhomD/LBQqt+o+DL95Q=="; + }; + }; + "@testing-library/jest-dom-5.16.5" = { + name = "_at_testing-library_slash_jest-dom"; + packageName = "@testing-library/jest-dom"; + version = "5.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz"; + sha512 = "N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA=="; + }; + }; + "@testing-library/react-11.2.7" = { + name = "_at_testing-library_slash_react"; + packageName = "@testing-library/react"; + version = "11.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz"; + sha512 = "tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA=="; + }; + }; + "@testing-library/react-12.1.5" = { + name = "_at_testing-library_slash_react"; + packageName = "@testing-library/react"; + version = "12.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz"; + sha512 = "OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg=="; + }; + }; + "@testing-library/react-hooks-7.0.2" = { + name = "_at_testing-library_slash_react-hooks"; + packageName = "@testing-library/react-hooks"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-7.0.2.tgz"; + sha512 = "dYxpz8u9m4q1TuzfcUApqi8iFfR6R0FaMbr2hjZJy1uC8z+bO/K4v8Gs9eogGKYQop7QsrBTFkv/BCF7MzD2Cg=="; + }; + }; + "@testing-library/user-event-13.5.0" = { + name = "_at_testing-library_slash_user-event"; + packageName = "@testing-library/user-event"; + version = "13.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz"; + sha512 = "5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg=="; + }; + }; "@tootallnate/once-1.1.2" = { name = "_at_tootallnate_slash_once"; packageName = "@tootallnate/once"; @@ -1957,6 +2065,15 @@ let sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; + "@types/aria-query-4.2.2" = { + name = "_at_types_slash_aria-query"; + packageName = "@types/aria-query"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz"; + sha512 = "HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="; + }; + }; "@types/babel__core-7.1.14" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; @@ -2155,6 +2272,15 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; + "@types/jest-26.0.23" = { + name = "_at_types_slash_jest"; + packageName = "@types/jest"; + version = "26.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz"; + sha512 = "ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA=="; + }; + }; "@types/json-schema-7.0.11" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -2182,6 +2308,15 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; + "@types/minimist-1.2.2" = { + name = "_at_types_slash_minimist"; + packageName = "@types/minimist"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; + sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; + }; + }; "@types/node-14.0.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -2191,6 +2326,15 @@ let sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; }; }; + "@types/normalize-package-data-2.4.0" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + }; + }; "@types/parse-json-4.0.0" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; @@ -2254,6 +2398,15 @@ let sha512 = "aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw=="; }; }; + "@types/react-dom-17.0.5" = { + name = "_at_types_slash_react-dom"; + packageName = "@types/react-dom"; + version = "17.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.5.tgz"; + sha512 = "ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ=="; + }; + }; "@types/react-redux-7.1.24" = { name = "_at_types_slash_react-redux"; packageName = "@types/react-redux"; @@ -2263,6 +2416,15 @@ let sha512 = "7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ=="; }; }; + "@types/react-test-renderer-17.0.1" = { + name = "_at_types_slash_react-test-renderer"; + packageName = "@types/react-test-renderer"; + version = "17.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz"; + sha512 = "3Fi2O6Zzq/f3QR9dRnlnHso9bMl7weKCviFmfF6B4LS1Uat6Hkm15k0ZAQuDz+UBq6B3+g+NM6IT2nr5QgPzCw=="; + }; + }; "@types/react-transition-group-4.4.1" = { name = "_at_types_slash_react-transition-group"; packageName = "@types/react-transition-group"; @@ -2326,6 +2488,15 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; + "@types/testing-library__jest-dom-5.9.5" = { + name = "_at_types_slash_testing-library__jest-dom"; + packageName = "@types/testing-library__jest-dom"; + version = "5.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz"; + sha512 = "ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ=="; + }; + }; "@types/trusted-types-2.0.2" = { name = "_at_types_slash_trusted-types"; packageName = "@types/trusted-types"; @@ -2344,6 +2515,15 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; + "@types/yargs-15.0.13" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "15.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; + sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; + }; + }; "@types/yargs-16.0.4" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -2758,6 +2938,15 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; + "ansi-align-3.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"; + sha512 = "ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw=="; + }; + }; "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -2776,6 +2965,15 @@ let sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; }; }; + "ansi-regex-4.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"; + sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; + }; + }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -2866,6 +3064,15 @@ let sha512 = "o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA=="; }; }; + "aria-query-5.0.2" = { + name = "aria-query"; + packageName = "aria-query"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/aria-query/-/aria-query-5.0.2.tgz"; + sha512 = "eigU3vhqSO+Z8BKDnVLN/ompjhf3pYzecKXz8+whRy+9gZu8n1TCGfwzQUUPnqdHl9ax1Hr9031orZ+UOEYr7Q=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -2929,6 +3136,15 @@ let sha512 = "5/+XXc6Sq/X0nKTqrnYfckvE4tIAMEJDSkGsdBl0OC6/Kvr38PHgT6amItyCKP2Fng1Ifi3mI+1r01f0opJQdQ=="; }; }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -3163,6 +3379,15 @@ let sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; "batch-0.6.1" = { name = "batch"; packageName = "batch"; @@ -3199,6 +3424,15 @@ let sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; @@ -3244,6 +3478,15 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; + "boxen-4.2.0" = { + name = "boxen"; + packageName = "boxen"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"; + sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -3298,6 +3541,15 @@ let sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; @@ -3334,6 +3586,15 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; + "cacheable-request-6.1.0" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -3388,6 +3649,15 @@ let sha512 = "QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="; }; }; + "camelcase-keys-6.2.2" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -3424,6 +3694,33 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; + "chalk-4.1.1" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -3451,6 +3748,15 @@ let sha512 = "oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="; }; }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; "check-types-11.1.2" = { name = "check-types"; packageName = "check-types"; @@ -3478,6 +3784,15 @@ let sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; }; }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; "ci-info-3.4.0" = { name = "ci-info"; packageName = "ci-info"; @@ -3505,13 +3820,13 @@ let sha512 = "JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="; }; }; - "classnames-2.3.1" = { + "classnames-2.3.2" = { name = "classnames"; packageName = "classnames"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz"; - sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; + url = "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"; + sha512 = "CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="; }; }; "clean-css-5.3.1" = { @@ -3523,6 +3838,42 @@ let sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; }; }; + "cli-boxes-2.2.1" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + }; + }; + "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=="; + }; + }; + "cli-spinners-2.6.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; + sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; + }; + }; + "cli-width-3.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; + }; + }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -3532,6 +3883,24 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; "clsx-1.1.1" = { name = "clsx"; packageName = "clsx"; @@ -3721,6 +4090,15 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; + "configstore-5.0.1" = { + name = "configstore"; + packageName = "configstore"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + }; "confusing-browser-globals-1.0.11" = { name = "confusing-browser-globals"; packageName = "confusing-browser-globals"; @@ -4009,6 +4387,15 @@ let sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; + "css.escape-1.5.1" = { + name = "css.escape"; + packageName = "css.escape"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz"; + sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; + }; + }; "cssdb-7.0.1" = { name = "cssdb"; packageName = "cssdb"; @@ -4171,6 +4558,24 @@ let sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; + "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"; + }; + }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + }; "decimal.js-10.4.1" = { name = "decimal.js"; packageName = "decimal.js"; @@ -4180,13 +4585,22 @@ let sha512 = "F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw=="; }; }; - "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"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; + }; + }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; "dedent-0.7.0" = { @@ -4198,6 +4612,15 @@ let sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; @@ -4225,6 +4648,24 @@ let sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; }; }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "defer-to-connect-1.1.3" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + }; + }; "define-lazy-prop-2.0.0" = { name = "define-lazy-prop"; packageName = "define-lazy-prop"; @@ -4342,6 +4783,15 @@ let sha512 = "gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="; }; }; + "diff-sequences-26.6.2" = { + name = "diff-sequences"; + packageName = "diff-sequences"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha512 = "Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="; + }; + }; "diff-sequences-27.5.1" = { name = "diff-sequences"; packageName = "diff-sequences"; @@ -4414,6 +4864,15 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; + "dom-accessibility-api-0.5.6" = { + name = "dom-accessibility-api"; + packageName = "dom-accessibility-api"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz"; + sha512 = "DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw=="; + }; + }; "dom-align-1.12.2" = { name = "dom-align"; packageName = "dom-align"; @@ -4531,6 +4990,15 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; + "dot-prop-5.3.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; + }; + }; "dotenv-10.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -4576,6 +5044,15 @@ let sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -4621,6 +5098,15 @@ let sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; }; }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -4657,6 +5143,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; "enhanced-resolve-5.10.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -4747,6 +5242,15 @@ let sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; + "escape-goat-2.1.1" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; + }; + }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -5098,6 +5602,15 @@ let sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -5161,6 +5674,15 @@ let sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; }; }; + "figures-3.2.0" = { + name = "figures"; + packageName = "figures"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; + }; + }; "file-entry-cache-6.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -5476,6 +5998,24 @@ let sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-5.2.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + }; "get-stream-6.0.1" = { name = "get-stream"; packageName = "get-stream"; @@ -5530,6 +6070,15 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; + "global-dirs-2.1.0" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; + sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; + }; + }; "global-modules-2.0.0" = { name = "global-modules"; packageName = "global-modules"; @@ -5575,6 +6124,15 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; + "got-9.6.0" = { + name = "got"; + packageName = "got"; + version = "9.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -5611,6 +6169,15 @@ let sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; + "hard-rejection-2.1.0" = { + name = "hard-rejection"; + packageName = "hard-rejection"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; + }; + }; "harmony-reflect-1.6.2" = { name = "harmony-reflect"; packageName = "harmony-reflect"; @@ -5683,6 +6250,15 @@ let sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; }; + "has-yarn-2.1.0" = { + name = "has-yarn"; + packageName = "has-yarn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -5719,6 +6295,15 @@ let sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; }; }; + "hosted-git-info-2.8.9" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + }; "hpack.js-2.1.6" = { name = "hpack.js"; packageName = "hpack.js"; @@ -5782,6 +6367,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "http-cache-semantics-4.1.1" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; + }; + }; "http-deceiver-1.2.7" = { name = "http-deceiver"; packageName = "http-deceiver"; @@ -5917,6 +6511,15 @@ let sha1 = "94d2bda96084453ef36fbc5aaec37e0f79f1fc14"; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; @@ -5953,6 +6556,15 @@ let sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + }; "import-local-3.1.0" = { name = "import-local"; packageName = "import-local"; @@ -5980,6 +6592,15 @@ let sha512 = "G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ=="; }; }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; "inflection-1.12.0" = { name = "inflection"; packageName = "inflection"; @@ -6025,6 +6646,15 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; + "ini-1.3.7" = { + name = "ini"; + packageName = "ini"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; + sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; + }; + }; "ini-1.3.8" = { name = "ini"; packageName = "ini"; @@ -6034,6 +6664,15 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; + "inquirer-7.3.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; + sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; + }; + }; "internal-slot-1.0.3" = { name = "internal-slot"; packageName = "internal-slot"; @@ -6106,6 +6745,15 @@ let sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; "is-core-module-2.10.0" = { name = "is-core-module"; packageName = "is-core-module"; @@ -6142,6 +6790,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -6178,6 +6835,24 @@ let sha1 = "56ff4db683a078c6082eb95dad7dc62e1d04f835"; }; }; + "is-installed-globally-0.3.2" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; + sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; + }; + }; + "is-interactive-1.0.0" = { + name = "is-interactive"; + packageName = "is-interactive"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; + }; + }; "is-mobile-2.2.2" = { name = "is-mobile"; packageName = "is-mobile"; @@ -6205,6 +6880,15 @@ let sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; }; + "is-npm-4.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz"; + sha512 = "96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="; + }; + }; "is-number-7.0.0" = { name = "is-number"; packageName = "is-number"; @@ -6232,6 +6916,33 @@ let sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; + "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-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"; + }; + }; "is-plain-obj-3.0.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -6322,6 +7033,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "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-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -6340,6 +7060,15 @@ let sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; + "is-yarn-global-0.3.0" = { + name = "is-yarn-global"; + packageName = "is-yarn-global"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -6466,6 +7195,15 @@ let sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; }; }; + "jest-diff-26.6.2" = { + name = "jest-diff"; + packageName = "jest-diff"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz"; + sha512 = "6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA=="; + }; + }; "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; @@ -6511,6 +7249,15 @@ let sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; }; }; + "jest-get-type-26.3.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha512 = "TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="; + }; + }; "jest-get-type-27.5.1" = { name = "jest-get-type"; packageName = "jest-get-type"; @@ -6808,6 +7555,15 @@ let 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"; + }; + }; "json-parse-even-better-errors-2.3.1" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; @@ -6853,22 +7609,22 @@ let sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; - "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=="; }; }; "jsonexport-2.5.2" = { @@ -6988,6 +7744,15 @@ let sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; }; }; + "keyv-3.1.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + }; + }; "kind-of-6.0.3" = { name = "kind-of"; packageName = "kind-of"; @@ -7033,6 +7798,15 @@ let sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ=="; }; }; + "latest-version-5.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + }; + }; "leven-3.1.0" = { name = "leven"; packageName = "leven"; @@ -7087,22 +7861,22 @@ let sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; }; }; - "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=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; + sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; }; }; - "loader-utils-3.2.0" = { + "loader-utils-3.2.1" = { name = "loader-utils"; packageName = "loader-utils"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz"; - sha512 = "HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"; + sha512 = "ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="; }; }; "locate-path-3.0.0" = { @@ -7213,6 +7987,15 @@ let sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; }; + "log-symbols-4.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; @@ -7231,6 +8014,24 @@ let sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "lowercase-keys-2.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -7240,6 +8041,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lz-string-1.4.4" = { + name = "lz-string"; + packageName = "lz-string"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz"; + sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; + }; + }; "magic-string-0.25.7" = { name = "magic-string"; packageName = "magic-string"; @@ -7267,6 +8077,24 @@ let sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "map-obj-4.3.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; + }; + }; "mdn-data-2.0.14" = { name = "mdn-data"; packageName = "mdn-data"; @@ -7303,6 +8131,15 @@ let sha512 = "ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw=="; }; }; + "meow-7.1.1" = { + name = "meow"; + packageName = "meow"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; + sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -7384,6 +8221,24 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; + "mimic-response-1.0.1" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + }; + "min-indent-1.0.1" = { + name = "min-indent"; + packageName = "min-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"; + sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; + }; + }; "mini-create-react-context-0.4.1" = { name = "mini-create-react-context"; packageName = "mini-create-react-context"; @@ -7411,15 +8266,6 @@ let sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - }; "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; @@ -7447,6 +8293,15 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; + "minimist-options-4.1.0" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"; + sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -7492,6 +8347,15 @@ let sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; }; }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; @@ -7510,6 +8374,15 @@ let sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; }; + "navidrome-music-player-4.25.1" = { + name = "navidrome-music-player"; + packageName = "navidrome-music-player"; + version = "4.25.1"; + src = fetchurl { + url = "https://registry.npmjs.org/navidrome-music-player/-/navidrome-music-player-4.25.1.tgz"; + sha512 = "bHYr84ATUf/4+/PUoTpUSmpF4/igBx2UPhgnPqvda4FND+GJZtb1ikbMs1U+mhkNEUebe+2I29ob1zY7YZdtjg=="; + }; + }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -7573,6 +8446,15 @@ let sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; }; }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; "normalize-path-3.0.0" = { name = "normalize-path"; packageName = "normalize-path"; @@ -7591,6 +8473,15 @@ let sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; }; }; + "normalize-url-4.5.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + }; + }; "normalize-url-6.1.0" = { name = "normalize-url"; packageName = "normalize-url"; @@ -7798,6 +8689,33 @@ let sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; }; + "ora-5.4.1" = { + name = "ora"; + packageName = "ora"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "p-cancelable-1.1.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + }; + }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -7861,6 +8779,15 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; + "package-json-6.5.0" = { + name = "package-json"; + packageName = "package-json"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + }; + }; "param-case-3.0.4" = { name = "param-case"; packageName = "param-case"; @@ -8734,6 +9661,24 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + }; + "prettier-2.8.2" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.2.tgz"; + sha512 = "BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw=="; + }; + }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -8752,6 +9697,24 @@ let sha512 = "AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="; }; }; + "pretty-format-26.6.2" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"; + sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; + }; + }; + "pretty-format-27.0.6" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "27.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz"; + sha512 = "8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ=="; + }; + }; "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; @@ -8824,6 +9787,15 @@ let sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -8833,6 +9805,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "pupa-2.1.1" = { + name = "pupa"; + packageName = "pupa"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + }; + }; "q-1.5.1" = { name = "q"; packageName = "q"; @@ -8878,6 +9859,15 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "quick-lru-4.0.1" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + }; "quick-lru-5.1.1" = { name = "quick-lru"; packageName = "quick-lru"; @@ -8923,6 +9913,15 @@ let sha512 = "w3020CLLmiammZOSKI4CsIWyD9ZFs/oNFWKSnPzvN6EqQI2dtSxxiycKjaxnwjKN7jmzNWe/5uzna0FIND4wgA=="; }; }; + "ra-test-3.18.3" = { + name = "ra-test"; + packageName = "ra-test"; + version = "3.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ra-test/-/ra-test-3.18.3.tgz"; + sha512 = "TcJgH1Eh1vMqW/QaoDf9ArFb15p4ToQRDntZofRF368/7xSXuuub1WdlLddGaRj2A4xITRUvnFyel7RVZ9QTtw=="; + }; + }; "ra-ui-materialui-3.18.3" = { name = "ra-ui-materialui"; packageName = "ra-ui-materialui"; @@ -8968,6 +9967,15 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; "rc-align-4.0.9" = { name = "rc-align"; packageName = "rc-align"; @@ -9121,6 +10129,15 @@ let sha512 = "U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA=="; }; }; + "react-error-boundary-3.1.3" = { + name = "react-error-boundary"; + packageName = "react-error-boundary"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.3.tgz"; + sha512 = "A+F9HHy9fvt9t8SNDlonq01prnU8AmkjvGKV4kk8seB9kU3xMEO8J/PQlLVmoOIDODl5U2kufSBs4vrWIqhsAA=="; + }; + }; "react-error-overlay-6.0.11" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -9202,6 +10219,15 @@ let sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; + "react-is-17.0.1" = { + name = "react-is"; + packageName = "react-is"; + version = "17.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz"; + sha512 = "NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA=="; + }; + }; "react-is-17.0.2" = { name = "react-is"; packageName = "react-is"; @@ -9220,15 +10246,6 @@ let sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; }; }; - "react-jinke-music-player-4.24.2" = { - name = "react-jinke-music-player"; - packageName = "react-jinke-music-player"; - version = "4.24.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-jinke-music-player/-/react-jinke-music-player-4.24.2.tgz"; - sha512 = "E1ipg12CpIF2C54vnAD7Q14yr4UiwbQJo60DoF9dkU0gWRLgo60oLhjw4mRxlbERurkeR/9Ml1a9hUnIa8el/Q=="; - }; - }; "react-lifecycles-compat-3.0.4" = { name = "react-lifecycles-compat"; packageName = "react-lifecycles-compat"; @@ -9319,6 +10336,24 @@ let sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; }; }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; + "read-pkg-up-7.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -9346,13 +10381,22 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; - "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.3.tgz"; + sha512 = "8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA=="; + }; + }; + "redent-3.0.0" = { + name = "redent"; + packageName = "redent"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; }; }; "redux-4.2.0" = { @@ -9454,6 +10498,24 @@ let sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; }; }; + "registry-auth-token-4.2.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; + }; + }; + "registry-url-5.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; + }; + }; "regjsgen-0.7.1" = { name = "regjsgen"; packageName = "regjsgen"; @@ -9607,6 +10669,24 @@ let sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; }; }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + }; + "restore-cursor-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=="; + }; + }; "retry-0.13.1" = { name = "retry"; packageName = "retry"; @@ -9652,6 +10732,15 @@ let sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; }; }; + "run-async-2.4.1" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; + }; + }; "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; @@ -9661,6 +10750,15 @@ let sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; + "rxjs-6.6.7" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -9805,6 +10903,15 @@ let sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; }; }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -9823,6 +10930,15 @@ let sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; + "semver-diff-3.1.1" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; + }; + }; "send-0.18.0" = { name = "send"; packageName = "send"; @@ -9976,13 +11092,13 @@ let sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; }; }; - "sortablejs-1.13.0" = { + "sortablejs-1.15.0" = { name = "sortablejs"; packageName = "sortablejs"; - version = "1.13.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.13.0.tgz"; - sha512 = "RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg=="; + url = "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz"; + sha512 = "bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="; }; }; "source-list-map-2.0.1" = { @@ -10057,6 +11173,42 @@ let sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; }; }; + "spdx-correct-3.1.1" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + }; + "spdx-exceptions-2.3.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + }; + "spdx-expression-parse-3.0.1" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + }; + "spdx-license-ids-3.0.9" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz"; + sha512 = "Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="; + }; + }; "spdy-4.0.2" = { name = "spdy"; packageName = "spdy"; @@ -10165,6 +11317,15 @@ let sha512 = "n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="; }; }; + "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.2" = { name = "string-width"; packageName = "string-width"; @@ -10237,6 +11398,15 @@ let sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; }; }; + "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.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -10291,6 +11461,24 @@ let sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; }; + "strip-indent-3.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; + }; + }; + "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"; + }; + }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -10453,6 +11641,15 @@ let sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; }; }; + "term-size-2.2.1" = { + name = "term-size"; + packageName = "term-size"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz"; + sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; + }; + }; "terminal-link-2.1.1" = { name = "terminal-link"; packageName = "terminal-link"; @@ -10507,6 +11704,15 @@ let sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; }; }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; "thunky-1.1.0" = { name = "thunky"; packageName = "thunky"; @@ -10534,6 +11740,15 @@ let sha512 = "lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="; }; }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; "tmpl-1.0.5" = { name = "tmpl"; packageName = "tmpl"; @@ -10552,6 +11767,15 @@ let sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-regex-range-5.0.1" = { name = "to-regex-range"; packageName = "to-regex-range"; @@ -10597,6 +11821,15 @@ let sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; }; + "trim-newlines-3.0.1" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; + }; + }; "tryer-1.0.1" = { name = "tryer"; packageName = "tryer"; @@ -10678,6 +11911,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.13.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + }; + }; "type-fest-0.16.0" = { name = "type-fest"; packageName = "type-fest"; @@ -10705,6 +11947,24 @@ let sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; + "type-fest-0.6.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; "type-fest-2.19.0" = { name = "type-fest"; packageName = "type-fest"; @@ -10876,6 +12136,15 @@ let sha512 = "/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg=="; }; }; + "update-notifier-4.1.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz"; + sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; + }; + }; "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; @@ -10894,6 +12163,15 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; + "url-parse-lax-3.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -10948,6 +12226,15 @@ let sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; }; }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; "value-equal-1.0.1" = { name = "value-equal"; packageName = "value-equal"; @@ -11020,6 +12307,15 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -11200,6 +12496,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "widest-line-3.1.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + }; + }; "word-wrap-1.2.3" = { name = "word-wrap"; packageName = "word-wrap"; @@ -11245,6 +12550,15 @@ let sha512 = "DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug=="; }; }; + "workbox-cli-6.5.4" = { + name = "workbox-cli"; + packageName = "workbox-cli"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-cli/-/workbox-cli-6.5.4.tgz"; + sha512 = "+Cc0jYh25MofhCROZqfQkpYSAGvykyrUVekuuPaLFbJ8qxX/zzX8hRRpglfwxDwokAjz8S20oEph4s+MyQc+Yw=="; + }; + }; "workbox-core-6.5.4" = { name = "workbox-core"; packageName = "workbox-core"; @@ -11407,6 +12721,15 @@ let sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; }; }; + "xdg-basedir-4.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + }; + }; "xml-name-validator-3.0.0" = { name = "xml-name-validator"; packageName = "xml-name-validator"; @@ -11470,6 +12793,15 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + 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"; @@ -11495,6 +12827,7 @@ let version = "0.1.0"; src = ./.; dependencies = [ + sources."@adobe/css-tools-4.0.1" sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.19.3" @@ -11755,6 +13088,11 @@ let sources."chalk-4.1.2" ]; }) + (sources."@jest/types-26.6.2" // { + dependencies = [ + sources."chalk-4.1.0" + ]; + }) sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -11769,10 +13107,10 @@ let sources."@material-ui/core-4.11.4" sources."@material-ui/icons-4.11.2" sources."@material-ui/lab-4.0.0-alpha.58" - sources."@material-ui/styles-4.11.4" + sources."@material-ui/styles-4.11.5" sources."@material-ui/system-4.11.3" sources."@material-ui/types-5.1.0" - sources."@material-ui/utils-4.11.2" + sources."@material-ui/utils-4.11.3" (sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" // { dependencies = [ sources."eslint-scope-5.1.1" @@ -11802,6 +13140,7 @@ let }) sources."@rushstack/eslint-patch-1.2.0" sources."@sinclair/typebox-0.24.44" + sources."@sindresorhus/is-0.14.0" sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@svgr/babel-plugin-add-jsx-attribute-5.4.0" @@ -11818,8 +13157,31 @@ let sources."@svgr/plugin-jsx-5.5.0" sources."@svgr/plugin-svgo-5.5.0" sources."@svgr/webpack-5.5.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."@testing-library/dom-8.1.0" // { + dependencies = [ + sources."@jest/types-27.0.6" + sources."@types/yargs-16.0.4" + sources."chalk-4.1.1" + (sources."pretty-format-27.0.6" // { + dependencies = [ + sources."ansi-styles-5.2.0" + ]; + }) + sources."react-is-17.0.2" + ]; + }) + (sources."@testing-library/jest-dom-5.16.5" // { + dependencies = [ + sources."aria-query-5.0.2" + ]; + }) + sources."@testing-library/react-12.1.5" + sources."@testing-library/react-hooks-7.0.2" + sources."@testing-library/user-event-13.5.0" sources."@tootallnate/once-1.1.2" sources."@trysound/sax-0.2.0" + sources."@types/aria-query-4.2.2" sources."@types/babel__core-7.1.14" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" @@ -11841,10 +13203,13 @@ let sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" + sources."@types/jest-26.0.23" sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" sources."@types/mime-3.0.1" + sources."@types/minimist-1.2.2" sources."@types/node-14.0.27" + sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.1" sources."@types/prop-types-15.7.3" @@ -11856,7 +13221,9 @@ let sources."csstype-3.0.6" ]; }) + sources."@types/react-dom-17.0.5" sources."@types/react-redux-7.1.24" + sources."@types/react-test-renderer-17.0.1" sources."@types/react-transition-group-4.4.1" sources."@types/resolve-1.17.1" sources."@types/retry-0.12.0" @@ -11864,8 +13231,10 @@ let sources."@types/serve-static-1.15.0" sources."@types/sockjs-0.3.33" sources."@types/stack-utils-2.0.1" + sources."@types/testing-library__jest-dom-5.9.5" sources."@types/trusted-types-2.0.2" sources."@types/ws-8.5.3" + sources."@types/yargs-15.0.13" sources."@types/yargs-parser-15.0.0" sources."@typescript-eslint/eslint-plugin-5.38.1" sources."@typescript-eslint/experimental-utils-5.38.1" @@ -11916,6 +13285,15 @@ let ]; }) sources."ajv-keywords-3.5.2" + (sources."ansi-align-3.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."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -11975,10 +13353,16 @@ let ]; }) sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" sources."batch-0.6.1" sources."bfj-7.0.2" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."buffer-5.7.1" + ]; + }) sources."bluebird-3.7.2" sources."blueimp-md5-2.19.0" (sources."body-parser-1.20.0" // { @@ -11990,6 +13374,11 @@ let }) sources."bonjour-service-1.0.14" sources."boolbase-1.0.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" @@ -11998,6 +13387,13 @@ let sources."buffer-from-1.1.1" sources."builtin-modules-3.2.0" sources."bytes-3.0.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + sources."normalize-url-4.5.1" + ]; + }) sources."call-bind-1.0.2" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { @@ -12007,17 +13403,31 @@ let }) sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."caniuse-api-3.0.0" sources."caniuse-lite-1.0.30001414" sources."case-sensitive-paths-webpack-plugin-2.4.0" + sources."chalk-3.0.0" sources."char-regex-1.0.2" + sources."chardet-0.7.0" sources."check-types-11.1.2" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" + sources."ci-info-2.0.0" sources."cjs-module-lexer-1.2.2" sources."classnames-2.2.6" sources."clean-css-5.3.1" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-width-3.0.0" sources."cliui-7.0.4" + sources."clone-1.0.4" + sources."clone-response-1.0.2" sources."clsx-1.1.1" sources."co-4.6.0" (sources."coa-2.0.2" // { @@ -12049,6 +13459,7 @@ let }) sources."compute-scroll-into-view-1.0.17" sources."concat-map-0.0.1" + sources."configstore-5.0.1" sources."confusing-browser-globals-1.0.11" sources."connect-history-api-fallback-2.0.0" sources."connected-react-router-6.9.1" @@ -12089,6 +13500,7 @@ let sources."css-tree-1.0.0-alpha.37" sources."css-vendor-2.0.8" sources."css-what-3.4.2" + sources."css.escape-1.5.1" sources."cssdb-7.0.1" sources."cssesc-3.0.0" sources."cssnano-5.1.13" @@ -12111,12 +13523,22 @@ let sources."data-urls-2.0.0" sources."date-fns-1.30.1" sources."debug-4.3.4" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) sources."decimal.js-10.4.1" - sources."decode-uri-component-0.2.0" + sources."decode-uri-component-0.2.2" + sources."decompress-response-3.3.0" sources."dedent-0.7.0" + sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-4.2.2" sources."default-gateway-6.0.3" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" sources."defined-1.0.0" @@ -12134,12 +13556,14 @@ let sources."detective-5.2.1" sources."diacritic-0.0.2" sources."didyoumean-1.2.2" + sources."diff-sequences-26.6.2" sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."dnd-core-14.0.1" sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."doctrine-3.0.0" + sources."dom-accessibility-api-0.5.6" sources."dom-align-1.12.2" sources."dom-converter-0.2.0" (sources."dom-helpers-5.2.1" // { @@ -12169,17 +13593,20 @@ let sources."tslib-2.4.0" ]; }) + sources."dot-prop-5.3.0" sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."downloadjs-1.4.7" sources."downshift-3.2.7" sources."duplexer-0.1.2" + sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."electron-to-chromium-1.4.267" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.10.0" sources."entities-2.2.0" sources."error-ex-1.3.2" @@ -12190,6 +13617,7 @@ let sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" + sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" (sources."escodegen-2.0.0" // { @@ -12305,6 +13733,7 @@ let sources."safe-buffer-5.2.1" ]; }) + sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" @@ -12312,6 +13741,7 @@ let sources."fastq-1.13.0" sources."faye-websocket-0.11.4" sources."fb-watchman-2.0.2" + sources."figures-3.2.0" sources."file-entry-cache-6.0.1" (sources."file-loader-6.2.0" // { dependencies = [ @@ -12369,10 +13799,16 @@ let sources."get-node-dimensions-1.2.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-package-type-0.1.0" + sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" + (sources."global-dirs-2.1.0" // { + dependencies = [ + sources."ini-1.3.7" + ]; + }) sources."global-modules-2.0.0" (sources."global-prefix-3.0.0" // { dependencies = [ @@ -12381,10 +13817,12 @@ let }) sources."globals-11.12.0" sources."globby-11.1.0" + sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" + sources."hard-rejection-2.1.0" sources."harmony-reflect-1.6.2" sources."has-1.0.3" sources."has-bigints-1.0.2" @@ -12392,10 +13830,12 @@ let sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."has-yarn-2.1.0" sources."he-1.2.0" sources."history-4.10.1" sources."hoist-non-react-statics-3.3.2" sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.9" (sources."hpack.js-2.1.6" // { dependencies = [ sources."isarray-1.0.0" @@ -12415,6 +13855,7 @@ let sources."domutils-2.8.0" ]; }) + sources."http-cache-semantics-4.1.1" sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" sources."http-parser-js-0.5.8" @@ -12435,17 +13876,25 @@ let sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."identity-obj-proxy-3.0.0" + sources."ieee754-1.2.1" sources."ignore-5.2.0" sources."immer-9.0.15" sources."immutable-4.0.0-rc.12" sources."import-fresh-3.3.0" + sources."import-lazy-2.1.0" sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."indefinite-observable-2.0.1" + sources."indent-string-4.0.0" sources."inflection-1.13.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."internal-slot-1.0.3" sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" @@ -12453,6 +13902,7 @@ let sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" + sources."is-ci-2.0.0" sources."is-core-module-2.10.0" sources."is-date-object-1.0.2" sources."is-docker-2.2.1" @@ -12461,11 +13911,20 @@ let sources."is-generator-fn-2.1.0" sources."is-glob-4.0.3" sources."is-in-browser-1.1.3" + (sources."is-installed-globally-0.3.2" // { + dependencies = [ + sources."is-path-inside-3.0.3" + ]; + }) + sources."is-interactive-1.0.0" sources."is-mobile-2.2.2" sources."is-module-1.0.0" sources."is-negative-zero-2.0.2" + sources."is-npm-4.0.0" sources."is-number-7.0.0" sources."is-number-object-1.0.7" + sources."is-obj-2.0.0" + sources."is-plain-obj-1.1.0" sources."is-potential-custom-element-name-1.0.1" sources."is-regex-1.1.4" sources."is-regexp-1.0.0" @@ -12475,8 +13934,10 @@ let sources."is-string-1.0.7" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."istanbul-lib-coverage-3.2.0" @@ -12536,6 +13997,11 @@ let sources."react-is-17.0.2" ]; }) + (sources."jest-diff-26.6.2" // { + dependencies = [ + sources."chalk-4.1.1" + ]; + }) sources."jest-docblock-27.5.1" (sources."jest-each-27.5.1" // { dependencies = [ @@ -12565,6 +14031,7 @@ let sources."chalk-4.1.2" ]; }) + sources."jest-get-type-26.3.0" (sources."jest-haste-map-27.5.1" // { dependencies = [ sources."@jest/types-27.5.1" @@ -12768,10 +14235,11 @@ let ]; }) sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" 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."jsonexport-2.5.2" sources."jsonfile-6.1.0" (sources."jss-10.6.0" // { @@ -12788,17 +14256,19 @@ let sources."jss-plugin-vendor-prefixer-10.6.0" sources."jsx-ast-utils-3.3.3" sources."jwt-decode-3.1.2" + sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kleur-3.0.3" sources."klona-2.0.5" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" + sources."latest-version-5.1.0" sources."leven-3.1.0" sources."levn-0.4.1" sources."lilconfig-2.0.6" sources."lines-and-columns-1.1.6" sources."loader-runner-4.3.0" - sources."loader-utils-2.0.0" + sources."loader-utils-2.0.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" @@ -12809,13 +14279,20 @@ let sources."lodash.sortby-4.7.0" sources."lodash.throttle-4.1.1" sources."lodash.uniq-4.5.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ sources."tslib-2.4.0" ]; }) + sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" + sources."lz-string-1.4.4" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { dependencies = [ @@ -12823,9 +14300,25 @@ let ]; }) sources."makeerror-1.0.12" + sources."map-obj-4.3.0" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" sources."memfs-3.4.7" + (sources."meow-7.1.1" // { + dependencies = [ + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."type-fest-0.13.1" + ]; + }) sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -12835,6 +14328,8 @@ let 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."min-indent-1.0.1" sources."mini-create-react-context-0.4.1" (sources."mini-css-extract-plugin-2.6.1" // { dependencies = [ @@ -12847,11 +14342,22 @@ let sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."multicast-dns-7.2.5" + sources."mute-stream-0.0.8" sources."nanoid-3.3.4" sources."natural-compare-1.4.0" + (sources."navidrome-music-player-4.25.1" // { + dependencies = [ + sources."classnames-2.3.2" + ]; + }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { @@ -12863,6 +14369,11 @@ let sources."node-int64-0.4.0" sources."node-polyglot-2.4.2" sources."node-releases-2.0.6" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" sources."normalize-url-6.1.0" @@ -12886,10 +14397,22 @@ let sources."onetime-5.1.2" sources."open-8.4.0" sources."optionator-0.9.1" + (sources."ora-5.4.1" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) + sources."os-tmpdir-1.0.2" + sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-retry-4.6.2" sources."p-try-2.2.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) (sources."param-case-3.0.4" // { dependencies = [ sources."tslib-2.4.0" @@ -13010,8 +14533,14 @@ let sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" sources."prelude-ls-1.2.1" + sources."prettier-2.8.2" sources."pretty-bytes-5.6.0" sources."pretty-error-4.0.0" + (sources."pretty-format-26.6.2" // { + dependencies = [ + sources."react-is-17.0.1" + ]; + }) sources."process-nextick-args-2.0.1" sources."promise-8.2.0" sources."prompts-2.4.2" @@ -13026,12 +14555,15 @@ let ]; }) sources."psl-1.9.0" + sources."pump-3.0.0" sources."punycode-2.1.1" + sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.10.3" sources."query-string-5.1.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" + sources."quick-lru-4.0.1" (sources."ra-core-3.18.3" // { dependencies = [ sources."inflection-1.12.0" @@ -13040,6 +14572,13 @@ let sources."ra-data-json-server-3.18.3" sources."ra-i18n-polyglot-3.18.3" sources."ra-language-english-3.18.3" + (sources."ra-test-3.18.3" // { + dependencies = [ + sources."@testing-library/dom-7.31.2" + sources."@testing-library/react-11.2.7" + sources."chalk-4.1.1" + ]; + }) (sources."ra-ui-materialui-3.18.3" // { dependencies = [ sources."inflection-1.12.0" @@ -13053,6 +14592,11 @@ let sources."bytes-3.1.2" ]; }) + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) sources."rc-align-4.0.9" sources."rc-motion-2.4.3" sources."rc-slider-9.7.2" @@ -13068,7 +14612,7 @@ let sources."chalk-4.1.2" sources."escape-string-regexp-4.0.0" sources."find-up-5.0.0" - sources."loader-utils-3.2.0" + sources."loader-utils-3.2.1" sources."locate-path-6.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -13080,6 +14624,7 @@ let sources."react-drag-listview-0.1.8" sources."react-draggable-4.4.3" sources."react-dropzone-10.2.2" + sources."react-error-boundary-3.1.3" sources."react-error-overlay-6.0.11" sources."react-final-form-6.5.3" sources."react-final-form-arrays-3.1.3" @@ -13088,11 +14633,6 @@ let sources."react-icons-4.4.0" sources."react-image-lightbox-5.1.4" sources."react-is-16.12.0" - (sources."react-jinke-music-player-4.24.2" // { - dependencies = [ - sources."classnames-2.3.1" - ]; - }) sources."react-lifecycles-compat-3.0.4" sources."react-measure-2.5.2" sources."react-modal-3.11.2" @@ -13121,11 +14661,8 @@ let sources."read-cache-1.0.0" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" - (sources."recursive-readdir-2.2.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."recursive-readdir-2.2.3" + sources."redent-3.0.0" sources."redux-4.2.0" sources."redux-saga-1.1.3" sources."regenerate-1.4.2" @@ -13136,6 +14673,8 @@ let sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."regexpu-core-5.2.1" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" sources."regjsgen-0.7.1" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -13173,6 +14712,8 @@ let ]; }) sources."resolve.exports-1.1.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."retry-0.13.1" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -13182,7 +14723,9 @@ let sources."serialize-javascript-4.0.0" ]; }) + sources."run-async-2.4.1" sources."run-parallel-1.2.0" + sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" @@ -13196,6 +14739,11 @@ let sources."select-hose-2.0.0" sources."selfsigned-2.1.1" sources."semver-7.3.7" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -13229,7 +14777,7 @@ let sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."sockjs-0.3.24" - sources."sortablejs-1.13.0" + sources."sortablejs-1.15.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -13240,6 +14788,10 @@ let }) sources."source-map-support-0.5.20" 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.9" sources."spdy-4.0.2" sources."spdy-transport-3.0.0" sources."sprintf-js-1.0.3" @@ -13273,6 +14825,7 @@ let sources."strip-bom-4.0.0" sources."strip-comments-2.0.1" sources."strip-final-newline-2.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.0" @@ -13305,6 +14858,7 @@ let sources."type-fest-0.16.0" ]; }) + sources."term-size-2.2.1" sources."terminal-link-2.1.1" (sources."terser-5.15.0" // { dependencies = [ @@ -13322,11 +14876,14 @@ let sources."test-exclude-6.0.0" sources."text-table-0.2.0" sources."throat-6.0.1" + sources."through-2.3.8" sources."thunky-1.1.0" sources."tiny-invariant-1.1.0" sources."tiny-warning-1.0.3" + sources."tmp-0.0.33" sources."tmpl-1.0.5" sources."to-fast-properties-2.0.0" + sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" (sources."tough-cookie-4.1.2" // { @@ -13335,10 +14892,11 @@ let ]; }) sources."tr46-2.1.0" + sources."trim-newlines-3.0.1" sources."tryer-1.0.1" (sources."tsconfig-paths-3.14.1" // { dependencies = [ - sources."json5-1.0.1" + sources."json5-1.0.2" sources."strip-bom-3.0.0" ]; }) @@ -13346,6 +14904,7 @@ let sources."tsutils-3.21.0" sources."type-check-0.4.0" sources."type-detect-4.0.8" + sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."typescript-4.8.4" @@ -13363,8 +14922,14 @@ let sources."unquote-1.1.1" sources."upath-1.2.0" sources."update-browserslist-db-1.0.9" + sources."update-notifier-4.1.3" sources."uri-js-4.4.1" sources."url-parse-1.5.10" + (sources."url-parse-lax-3.0.0" // { + dependencies = [ + sources."prepend-http-2.0.0" + ]; + }) sources."util-deprecate-1.0.2" sources."util.promisify-1.0.1" sources."utila-0.4.0" @@ -13375,6 +14940,7 @@ let sources."source-map-0.7.4" ]; }) + sources."validate-npm-package-license-3.0.4" sources."value-equal-1.0.1" sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" @@ -13383,6 +14949,7 @@ let sources."warning-4.0.3" sources."watchpack-2.4.0" sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" (sources."webpack-5.74.0" // { dependencies = [ @@ -13424,6 +14991,7 @@ let sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" + sources."widest-line-3.1.0" sources."word-wrap-1.2.3" (sources."workbox-background-sync-6.5.4" // { dependencies = [ @@ -13448,6 +15016,11 @@ let ]; }) sources."workbox-cacheable-response-6.5.4" + (sources."workbox-cli-6.5.4" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."workbox-core-6.5.4" (sources."workbox-expiration-6.5.4" // { dependencies = [ @@ -13472,6 +15045,7 @@ let sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-7.5.9" + sources."xdg-basedir-4.0.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -13483,13 +15057,18 @@ let sources."yargs-parser-20.2.9" ]; }) + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { homepage = "."; }; - production = true; + production = false; bypassCache = true; reconstructLock = false; }; diff --git a/pkgs/servers/misc/navidrome/update.nix b/pkgs/servers/misc/navidrome/update.nix index c559aa31858a8..124fbed4616b8 100644 --- a/pkgs/servers/misc/navidrome/update.nix +++ b/pkgs/servers/misc/navidrome/update.nix @@ -22,7 +22,7 @@ writeScript "update-navidrome" '' tempDir=$(mktemp -d) cp $src/ui/package.json $src/ui/package-lock.json $tempDir cd $tempDir - node2nix -l package-lock.json -c node-composition.nix + node2nix -d -l package-lock.json -c node-composition.nix cp *.nix $uiDir rm -rf $tempDir '' diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 0529a2bb07167..6aefa4f45342d 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.14.18"; + version = "0.15.0"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-M204aIFbs2VmwgZbOmkpuyqOfpom/FnKc6noEVMuZfs="; + sha256 = "sha256-xw9X6PVXl7fLQcwIQOA3s8DbXKBQ5aqZpnKPgd47gjM="; }; sourceRoot = "source/src"; diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 383b008962af3..312c2a475a64a 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-jDjP0sHzKHvat/2x6/vhi/ZtdooK3y5wDRujPgi+T4E="; + sha256 = "sha256-FQKZVkPD4DQKMduWW2g9vD1vvaFlU6QpNEj+g3yeE2Q="; }; - cargoSha256 = "sha256-VFOLNl9kh1EjJaWr3chjyFJqF81vNeqbVqtVElCkZyY="; + cargoHash = "sha256-scKbu69lrEfUpErs6gZyZOGb3OwCzDThbs6O0ZtJX/8="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 4162ea9d6ce39..72c18cd6d2ab6 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { runHook preBuild ln -s ${nodeDependencies}/lib/node_modules . + export HOME=$(mktemp -d) export PATH="${nodeDependencies}/bin:$PATH" npm run build diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/servers/monitoring/cockpit/default.nix new file mode 100644 index 0000000000000..76f2f777f60c4 --- /dev/null +++ b/pkgs/servers/monitoring/cockpit/default.nix @@ -0,0 +1,226 @@ +{ lib +, stdenv +, fetchzip +, fetchurl +, fetchFromGitHub +, autoreconfHook +, bashInteractive +, cacert +, coreutils +, dbus +, docbook_xml_dtd_43 +, docbook_xsl +, findutils +, gettext +, git +, glib +, glibc +, glib-networking +, gnused +, gnutls +, json-glib +, krb5 +, libssh +, libxcrypt +, libxslt +, makeWrapper +, nodejs +, nixosTests +, openssh +, openssl +, pam +, pkg-config +, polkit +, python3Packages +, ripgrep +, runtimeShell +, systemd +, udev +, xmlto +}: + +let + pythonWithGobject = python3Packages.python.withPackages (p: with p; [ + pygobject3 + ]); +in + +stdenv.mkDerivation rec { + pname = "cockpit"; + version = "284"; + + src = fetchFromGitHub { + owner = "cockpit-project"; + repo = "cockpit"; + rev = "80a7c7cfed9157915067666fe95b298896f2aea8"; + sha256 = "sha256-iAIW6nVUk1FJD2dQvDMREPVqrq0JkExJ7lVio//ALts="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + docbook_xml_dtd_43 + docbook_xsl + findutils + gettext + git + (lib.getBin libxslt) + nodejs + openssl + pam + pkg-config + pythonWithGobject.python + python3Packages.setuptools + systemd + ripgrep + xmlto + ]; + + buildInputs = [ + (lib.getDev glib) + libxcrypt + gnutls + json-glib + krb5 + libssh + polkit + udev + ]; + + patches = [ + # Instead of requiring Internet access to do an npm install to generate the package-lock.json + # it copies the package-lock.json already present in the node_modules folder fetched as a git + # submodule. + ./nerf-node-modules.patch + + # sysconfdir is $(prefix)/etc by default and it breaks the configuration file loading feature + # changing sysconfdir to /etc breaks the build in this part of the makefile because it tries + # to write to /etc inside the sandbox + # this patch redirects it to write to $out/etc instead of /etc + ./fix-makefiles.patch + ]; + + postPatch = '' + # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly + substituteInPlace configure.ac \ + --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' + patchShebangs \ + test/common/pixel-tests \ + test/common/run-tests \ + test/common/tap-cdp \ + test/static-code \ + tools/escape-to-c \ + tools/make-compile-commands \ + tools/node-modules \ + tools/termschutz \ + tools/webpack-make + + for f in node_modules/.bin/*; do + patchShebangs $(realpath $f) + done + + export HOME=$(mktemp -d) + + cp node_modules/.package-lock.json package-lock.json + + substituteInPlace src/systemd_ctypes/libsystemd.py \ + --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 + + for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do + # some files substituteInPlace report as missing and it's safe to ignore them + substituteInPlace "$(realpath "$f")" \ + --replace '"/usr/bin/' '"' \ + --replace '"/bin/' '"' || true + done + + substituteInPlace src/common/Makefile-common.am \ + --replace 'TEST_PROGRAM += test-pipe' "" # skip test-pipe because it hangs the build + + substituteInPlace test/pytest/*.py \ + --replace "'bash" "'${bashInteractive}/bin/bash" + + echo "m4_define(VERSION_NUMBER, [${version}])" > version.m4 + ''; + + configureFlags = [ + "--enable-prefix-only=yes" + "--sysconfdir=/etc" + "--disable-pcp" # TODO: figure out how to package its dependency + "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" + ]; + + enableParallelBuilding = true; + + preBuild = '' + patchShebangs \ + tools/test-driver + ''; + + postBuild = '' + find | grep cockpit-bridge + chmod +x \ + src/systemd/update-motd \ + src/tls/cockpit-certificate-helper \ + src/ws/cockpit-desktop + + patchShebangs \ + src/systemd/update-motd \ + src/tls/cockpit-certificate-helper \ + src/ws/cockpit-desktop + + PATH=${pythonWithGobject}/bin patchShebangs src/client/cockpit-client + + substituteInPlace src/ws/cockpit-desktop \ + --replace ' /bin/bash' ' ${runtimeShell}' + ''; + + fixupPhase = '' + runHook preFixup + + wrapProgram $out/libexec/cockpit-certificate-helper \ + --prefix PATH : ${lib.makeBinPath [ coreutils openssl ]} \ + --run 'cd $(mktemp -d)' + + wrapProgram $out/share/cockpit/motd/update-motd \ + --prefix PATH : ${lib.makeBinPath [ gnused ]} + + substituteInPlace $out/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ + --replace /usr $out + + runHook postFixup + ''; + + doCheck = true; + checkInputs = [ + bashInteractive + cacert + dbus + glib-networking + openssh + python3Packages.pytest + python3Packages.vulture + ]; + checkPhase = '' + export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules + export G_DEBUG=fatal-criticals + export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge + export PATH=$PATH:$(pwd) + + cockpit-bridge --version + make pytest -j$NIX_BUILD_CORES || true + make check -j$NIX_BUILD_CORES || true + test/static-code + npm run eslint + npm run stylelint + ''; + + passthru.tests = { inherit (nixosTests) cockpit; }; + + meta = with lib; { + description = "Web-based graphical interface for servers"; + homepage = "https://cockpit-project.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/servers/monitoring/cockpit/fix-makefiles.patch b/pkgs/servers/monitoring/cockpit/fix-makefiles.patch new file mode 100644 index 0000000000000..a22eb9f00ea8c --- /dev/null +++ b/pkgs/servers/monitoring/cockpit/fix-makefiles.patch @@ -0,0 +1,34 @@ +diff --git a/src/systemd/Makefile.am b/src/systemd/Makefile.am +index f28ea41df..684b82006 100644 +--- a/src/systemd/Makefile.am ++++ b/src/systemd/Makefile.am +@@ -23,10 +23,10 @@ dist_motd_SCRIPTS = src/systemd/update-motd + + # Automake: 'Variables using ... ‘sysconf’ ... are installed by install-exec.' + install-exec-hook:: +- mkdir -p $(DESTDIR)$(sysconfdir)/motd.d +- ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/motd.d/cockpit +- mkdir -p $(DESTDIR)$(sysconfdir)/issue.d +- ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/issue.d/cockpit.issue ++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/motd.d ++ ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/motd.d/cockpit ++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/issue.d ++ ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/issue.d/cockpit.issue + + tempconfdir = $(prefix)/lib/tmpfiles.d + nodist_tempconf_DATA = src/systemd/cockpit-tempfiles.conf +diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am +index ed4e4363e..77a35b0e5 100644 +--- a/src/ws/Makefile-ws.am ++++ b/src/ws/Makefile-ws.am +@@ -169,8 +169,8 @@ install-tests:: + $(INSTALL_DATA) mock-pam-conv-mod.so $(DESTDIR)$(pamdir)/ + + install-exec-hook:: +- mkdir -p $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d +- chmod 755 $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d ++ mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d ++ chmod 755 $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d + + dist_check_DATA += \ + src/ws/mock-combined.crt \ diff --git a/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch b/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch new file mode 100644 index 0000000000000..36b0e3861a4a9 --- /dev/null +++ b/pkgs/servers/monitoring/cockpit/nerf-node-modules.patch @@ -0,0 +1,12 @@ +diff --git a/tools/node-modules b/tools/node-modules +index 518875d..72b51e0 100755 +--- a/tools/node-modules ++++ b/tools/node-modules +@@ -7,6 +7,7 @@ V="${V-0}" # default to friendly messages + + set -eu + cd "${0%/*}/.." ++exit 0 + . tools/git-utils.sh + + cmd_remove() { diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index bf1bc6fa34d6d..c1d7d4fbd566e 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, systemd, nixosTests }: buildGoModule rec { pname = "grafana-agent"; @@ -38,7 +38,7 @@ buildGoModule rec { # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 - NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); # tries to access /sys: https://github.com/grafana/agent/issues/333 preBuild = '' @@ -48,7 +48,7 @@ buildGoModule rec { # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \ $out/bin/agent @@ -61,6 +61,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://grafana.com/products/cloud"; maintainers = with maintainers; [ flokli ]; - platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix new file mode 100644 index 0000000000000..ac9ec9f02d7bc --- /dev/null +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -0,0 +1,37 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "grafana-dash-n-grab"; + version = "0.3.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "esnet"; + repo = "gdg"; + sha256 = "sha256-M4V4ybOizXCLxTTuS17M0y2tRmjQmTIBdXVbumzOoeA="; + }; + + vendorSha256 = "sha256-pXo80Tean5OkQ0Sv2+/RlRnAtaClwGP7tuDC2irsh+E="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X github.com/esnet/gdg/version.GitCommit=${src.rev}" + ]; + + # The test suite tries to communicate with a running version of grafana locally. This fails if + # you don't have grafana running. + doCheck = false; + + meta = with lib; { + description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities"; + license = licenses.bsd3; + homepage = "https://github.com/esnet/gdg"; + maintainers = with maintainers; teams.bitnomial.members; + platforms = platforms.unix; + mainProgram = "gdg"; + changelog = + "https://github.com/esnet/gdg/releases/tag/v${version}"; + }; +} diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 952a9f94ceba3..e356b914c39c1 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -12,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-5oER0KMhBBu8AiawxHNoYIV+farcLBjB8HpO+1UluSY="; + sha256 = "sha256-CWA2xmVWvPeKCvssQAMHMYJ3CxJ7sIC7GX3qb3QFLuA="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 02f0ed567b923..71377d55b7a97 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.3.1"; + version = "9.3.6"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-XZsR6h7qG2EYKv0Zr/ZjDf4WqF16khqFzYIF3ekQ08c="; + sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-7LIcSPxvueQYxeofzmtvvlnSboeo+TOF6xVA+g+oHqE="; + sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM="; }; - vendorSha256 = "sha256-oV440W9r6b74JaY8Ej2OEIPpxhdUmjq77RJOoJb6Upw="; + vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 59425cfcf6919..76d66cd76355b 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.6"; + version = "2.13.7"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-Zrq+pw1dZyKVxpbsXeEPU3hLqcaYj/0wqB9HmYXnd0Y="; + sha256 = "sha256-YLNzXdR54DA9araC7pxZmopAZB90j9sx4gb3hOVsu0I="; }; patches = [ diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index 1b87942af4add..48044b14daa44 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -19,16 +19,16 @@ in buildGoModule rec { pname = "karma"; - version = "0.111"; + version = "0.112"; src = fetchFromGitHub { owner = "prymitive"; repo = "karma"; rev = "v${version}"; - hash = "sha256-jcJ8rdggM4kDCVTsEBDtZ9nNnutl+RwABx7zHY39tDs="; + hash = "sha256-Dzz5BgWrI5f9HlRm7Mna8JgUJlTVJia31v1In2zzcBY="; }; - vendorHash = "sha256-MYHgLKDSB/g/k4i+deBNeaeZ3BbHRnymwsNTTA7qNdU="; + vendorHash = "sha256-iYm19oAYPi3OUxp0wQsqgEkBLp3Fw2nCSdDI2vbV37w="; nativeBuildInputs = [ nodejs-18_x diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 70ac2f3ab9fd4..2290e16ef9e95 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.74.1"; + version = "0.75.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1CywtgvVORkDewFB9iz99aUT5gFi5vXWddGZGLFu7o="; + sha256 = "sha256-haJzhKb0DOMJAlK6tSsx0FMz9ZkYIHT8OGVjwIqzSgU="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-281Qz57n5qAOoqLofTFv5UcLs0xVz8iyV9yxDdsuljE="; + vendorHash = "sha256-VJy9bbVxcekrehq48yaSbZKP8o65IFmFJglYg92HP20="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 52f4ab6e2fa0a..9858cdd818e56 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-lyF7ugnNEJug1Vx24ISrtENk6RoIt7H1zaCPYUZbBmM="; + sha256 = "sha256-MOuLXtjmk9wjQMF2ez3NQ7YTKJtX/RItKbgfaANXzhU="; }; vendorSha256 = null; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index ad2eb36913142..e7c606dae54ff 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.71"; + version = "2.0.72"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "sha256-RIWZpvC4bVrm5DXnWyBw7/57oZR+Z3m+NfjmSjLSKi0="; + sha256 = "sha256-w2/S7MnL/LFYzNFtC2YbBjJRhVA5kLvwd3IWVHC+o9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index a58ec2bf7b299..edf82742bc53e 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = [ "all" ]; - CFLAGS = "-ldl"; # Do not create /var directories preInstall = '' diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index a734c6543310b..1708ff4cb5184 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.58.0"; + version = "2.60.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-nQE3UMZcIR063JuZkTN49imDYQGGnNzE1yaeR4k4mWY="; + hash = "sha256-BWzhsIiEjRb4Yq8vf3N1lnwT3uU1Unr/ThxfhEiMBtw="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix new file mode 100644 index 0000000000000..286463c1bef71 --- /dev/null +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "phlare"; + version = "0.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "phlare"; + sha256 = "sha256-q7y3sZMI1Kk7Ar0ER8RoU1Y7xAhFh89y/mzESjLrxcM="; + }; + + proxyVendor = true; + vendorHash = "sha256-Oz1qV+3sB0pOWGEMtp7mgMR9Ljd0rd9oa6NJO2azTJg="; + + ldflags = let + prefix = "github.com/grafana/phlare/pkg/util/build"; + in [ + "-s" "-w" + # https://github.com/grafana/phlare/blob/v0.5.1/Makefile#L32 + "-X ${prefix}.Version=${version}" + "-X ${prefix}.Branch=v${version}" + "-X ${prefix}.Revision=v${version}" + "-X ${prefix}.BuildUser=nix" + "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" + ]; + + subPackages = [ + "cmd/phlare" + "cmd/profilecli" + ]; + + meta = with lib; { + description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data."; + license = licenses.agpl3; + homepage = "https://grafana.com/oss/phlare"; + maintainers = with maintainers; [ cathalmullan ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 031da1c684758..17775b491c64b 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.10.0"; + version = "1.12.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-Yzdh9xpgPLbN9J5oBvrrPuVMTq2F3mpE544sAo7gmng="; + hash = "sha256-EFjWDoWPePbPX9j4vuI41TAlGcFRlUyPpSvJriZdR0U="; }; vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg="; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index f1044ca4f8167..95fd5135b4c11 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -5,9 +5,9 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.9.0"; + version = "0.9.1"; - disabled = python3.pythonOlder "3.7"; + disabled = python3.pythonOlder "3.8"; format = "pyproject"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-OUeTOnb9ZhdJWzO+Wzl+liv4u3mlbyJ4tWyCHU5loqc="; + hash = "sha256-o22Jn2x2mFczjQTttKEfrzGBAKpXSe9JT8kIA5WGjmA="; }; pythonRelaxDeps = true; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 33ac8316812c6..24784e23585e2 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "haproxy_exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "haproxy_exporter"; rev = "v${version}"; - sha256 = "sha256-u5o8XpKkuaNzAZAdA33GLd0QJSpqnkEbI8gW22G7FcY="; + sha256 = "sha256-hpZnMvHAAEbvzASK3OgfG34AhPkCdRM7eOm15PRemkA="; }; - vendorSha256 = "sha256-lDoW1rkOn2YkEf3QZdWBpm5fdzjkbER35XnXFr57D8c="; + vendorHash = "sha256-s9UVtV8N2SJ1ik864P6p2hPXJ2jstFY/XnWt9fuCDo0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 783c4e1b72dde..f4b96b1cf7a85 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.1"; + version = "0.11.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-fn/lMzrlodtCxzMMKwFyQts3PucSPHuIBva5eWsqM8s="; + hash = "sha256-UIB6/0rYOrS/B7CFffg0lPaAhSbmk0KSEogjCundXAU="; }; - vendorHash = "sha256-cj2EG674+tv3eIEv+4amLhwoQwzpke8W+b8E0Tq5d2g="; + vendorHash = "sha256-ueE1eE0cxr7+APvIEzR26Uprx0CXN1jfNLzGVgDmJQk="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index d05afd2205331..ce859d669c6a4 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-imO++i4bfxQnMNh+BOZRYvJAzqgehFIElpQX3NyQF+8="; + sha256 = "sha256-I44unG7eKBGxjm2HnCcm1ThlrDpDglXBork7meOOGiw="; }; vendorHash = "sha256-ji8JlEYChPBakt5y6+zcm1l04VzZ0/fjfGFJ9p+1KHE="; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index afe28b690f794..a4590277acc9e 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.45.0"; + version = "1.47.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-5KiqVrhb/yEaxgLJ3SB/WHNOfCbPzfJcgdPZ2kuNFEY="; + sha256 = "sha256-pSLFfArmG4DIgYUD8qz71P+7RYIQuUycnYzNFXNhZ8A="; }; - vendorSha256 = "sha256-SBag82QLLPeGowt10edaAnUWI36i71Ps0pdixiAXVB8="; + vendorHash = "sha256-Owfxy7WkucQ6BM8yjnZg9/8CgopGTtbQTTUuxoT3RRE="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix new file mode 100644 index 0000000000000..ee8002e661406 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "shelly_exporter"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "aexel90"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-L0TuBDq5eEahQvzqd1WuvmXuQbbblCM+Nvj15IybnVo="; + }; + + vendorSha256 = "sha256-BCrge2xLT4b4wpYA+zcsH64a/nfV8+HeZF7L49p2gEw="; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) shelly; }; + + meta = with lib; { + description = "Shelly humidity sensor exporter for prometheus"; + homepage = "https://github.com/aexel90/shelly_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [drupol]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 8f0be0901e058..488d3e22e6546 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zfs_exporter"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "pdf"; repo = pname; rev = "v" + version; - hash = "sha256-FY3P2wmNWyr7mImc1PJs1G2Ae8rZvDzq0kRZfiRTzyc="; + hash = "sha256-bc9bmGrRGhm58JzrVLLJBUc1zaGXqz2fqx+ZphidFbc="; }; - vendorSha256 = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; + vendorHash = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 9538872fb2c7e..be3b102bfbe5e 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.25.0"; + version = "1.25.1"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-p+2nsJT3WHYmJ1toIwFi/a/I0//OaUoJIHmQcFHHJ/A="; + sha256 = "sha256-r+kbF4TajBkZyp0B6Tb/Y1Nm7e2zQctDYEmyn0qTqW0="; }; - vendorSha256 = "sha256-xNio3bMFopMgDwdQdtFmkp3F0iWYHVqu9T42S5KNMU8="; + vendorHash = "sha256-AlmmWjwhC5xStcwo+NW0IwC+FteL4Ttwo717VgE8IHM="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 969292d6700b1..5184d2c6408ed 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.30.1"; + version = "0.30.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-fCH1smkgqDqs6N3ibBob5R1wsltwC3HV1elI37nfq0g="; + sha256 = "sha256-3IkqaWMQGJssxsAF+BZphEpufR4G5E5bYJvioSO2hJ4="; }; - vendorHash = "sha256-OEOlyExgJoEUY2qygBbrxKRkh26sXDX/gAKReeA6Du4="; + vendorHash = "sha256-JtjVdr23wI5ZM5LlFApWurTTzLkLI4nzA9/bWoOrGSM="; doCheck = false; diff --git a/pkgs/servers/monitoring/uptime-kuma/composition.nix b/pkgs/servers/monitoring/uptime-kuma/composition.nix deleted file mode 100644 index ca76a98f5a657..0000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ./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/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 943ee9ce15895..a5e11ac8a10b5 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -1,19 +1,17 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, nixosTests, iputils, nodejs, makeWrapper }: -let - deps = import ./composition.nix { inherit pkgs; }; -in -stdenv.mkDerivation (finalAttrs: { +{ pkgs, lib, fetchFromGitHub, buildNpmPackage, python3, nodejs, nixosTests }: + +buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.19.6"; + version = "1.20.0"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; - rev = finalAttrs.version; - sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; + rev = version; + sha256 = "sha256-dMjhCsTjXOwxhvJeL25KNkFhRCbCuxG7Ccz8mP7P38A="; }; - uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4="; + npmDepsHash = "sha256-Ks6KYHP6+ym9PGJ1a5nMxT7JXZyknHeaCmAkjJuCTXU="; patches = [ # Fixes the permissions of the database being not set correctly @@ -21,35 +19,21 @@ stdenv.mkDerivation (finalAttrs: { ./fix-database-permissions.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ python3 ]; + + CYPRESS_INSTALL_BINARY = 0; # Stops Cypress from trying to download binaries - installPhase = '' - mkdir -p $out/share/ - cp -r server $out/share/ - cp -r db $out/share/ - cp -r src $out/share/ - cp package.json $out/share/ - ln -s ${deps.package}/lib/node_modules/uptime-kuma/node_modules/ $out/share/ - ln -s ${finalAttrs.passthru.ui} $out/share/dist + postInstall = '' + cp -r dist $out/lib/node_modules/uptime-kuma/ ''; postFixup = '' makeWrapper ${nodejs}/bin/node $out/bin/uptime-kuma-server \ - --add-flags $out/share/server/server.js \ - --chdir $out/share/ + --add-flags $out/lib/node_modules/uptime-kuma/server/server.js \ + --chdir $out/lib/node_modules/uptime-kuma ''; - passthru = { - tests.uptime-kuma = nixosTests.uptime-kuma; - - updateScript = ./update.sh; - - ui = fetchzip { - name = "uptime-kuma-dist-${finalAttrs.version}"; - url = "https://github.com/louislam/uptime-kuma/releases/download/${finalAttrs.version}/dist.tar.gz"; - sha256 = finalAttrs.uiSha256; - }; - }; + passthru.tests.uptime-kuma = nixosTests.uptime-kuma; meta = with lib; { description = "A fancy self-hosted monitoring tool"; @@ -57,5 +41,4 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ julienmalka ]; }; -}) - +} diff --git a/pkgs/servers/monitoring/uptime-kuma/node-env.nix b/pkgs/servers/monitoring/uptime-kuma/node-env.nix deleted file mode 100644 index 5dad9ec63d47c..0000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <<EOF - #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore - EOF - - chmod +x $out/bin/tar - ''; - - # Function that generates a TGZ file from a NPM project - buildNodeSourceDist = - { name, version, src, ... }: - - stdenv.mkDerivation { - name = "node-tarball-${name}-${version}"; - inherit src; - buildInputs = [ nodejs ]; - buildPhase = '' - export HOME=$TMPDIR - tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) - ''; - installPhase = '' - mkdir -p $out/tarballs - mv $tgzFile $out/tarballs - mkdir -p $out/nix-support - echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - 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 .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 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, 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"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, 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"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - 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} --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 ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # 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 - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <<EOF - #! ${stdenv.shell} -e - $shellHook - exec ${stdenv.shell} - EOF - chmod +x $out/bin/shell - ''; - - # Provide the dependencies in a development shell through the NODE_PATH environment variable - inherit nodeDependencies; - shellHook = lib.optionalString (dependencies != []) '' - export NODE_PATH=${nodeDependencies}/lib/node_modules - export PATH="${nodeDependencies}/bin:$PATH" - ''; - } // extraArgs); -in -{ - buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; - buildNodePackage = lib.makeOverridable buildNodePackage; - buildNodeDependencies = lib.makeOverridable buildNodeDependencies; - buildNodeShell = lib.makeOverridable buildNodeShell; -} diff --git a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix b/pkgs/servers/monitoring/uptime-kuma/node-packages.nix deleted file mode 100644 index d840c3968ba3b..0000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/node-packages.nix +++ /dev/null @@ -1,5099 +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 = { - "@azure/abort-controller-1.1.0" = { - name = "_at_azure_slash_abort-controller"; - packageName = "@azure/abort-controller"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz"; - sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; - }; - }; - "@azure/core-auth-1.4.0" = { - name = "_at_azure_slash_core-auth"; - packageName = "@azure/core-auth"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz"; - sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; - }; - }; - "@azure/core-client-1.6.1" = { - name = "_at_azure_slash_core-client"; - packageName = "@azure/core-client"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz"; - sha512 = "mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA=="; - }; - }; - "@azure/core-http-compat-1.3.0" = { - name = "_at_azure_slash_core-http-compat"; - packageName = "@azure/core-http-compat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-1.3.0.tgz"; - sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; - }; - }; - "@azure/core-lro-2.4.0" = { - name = "_at_azure_slash_core-lro"; - packageName = "@azure/core-lro"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; - sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; - }; - }; - "@azure/core-paging-1.4.0" = { - name = "_at_azure_slash_core-paging"; - packageName = "@azure/core-paging"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; - sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; - }; - }; - "@azure/core-rest-pipeline-1.10.0" = { - name = "_at_azure_slash_core-rest-pipeline"; - packageName = "@azure/core-rest-pipeline"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.0.tgz"; - sha512 = "m6c4iAalfaf6sytOOQhLKFprEHSkSjQuRgkW7MTMnAN+GENDDL4XZJp7WKFnq9VpKUE+ggq+rp5xX9GI93lumw=="; - }; - }; - "@azure/core-tracing-1.0.1" = { - name = "_at_azure_slash_core-tracing"; - packageName = "@azure/core-tracing"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz"; - sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; - }; - }; - "@azure/core-util-1.1.1" = { - name = "_at_azure_slash_core-util"; - packageName = "@azure/core-util"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz"; - sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; - }; - }; - "@azure/identity-2.1.0" = { - name = "_at_azure_slash_identity"; - packageName = "@azure/identity"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-2.1.0.tgz"; - sha512 = "BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw=="; - }; - }; - "@azure/keyvault-keys-4.6.0" = { - name = "_at_azure_slash_keyvault-keys"; - packageName = "@azure/keyvault-keys"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.6.0.tgz"; - sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; - }; - }; - "@azure/logger-1.0.3" = { - name = "_at_azure_slash_logger"; - packageName = "@azure/logger"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz"; - sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; - }; - }; - "@azure/msal-browser-2.32.1" = { - name = "_at_azure_slash_msal-browser"; - packageName = "@azure/msal-browser"; - version = "2.32.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz"; - sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g=="; - }; - }; - "@azure/msal-common-7.6.0" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "7.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.6.0.tgz"; - sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; - }; - }; - "@azure/msal-common-9.0.1" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz"; - sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ=="; - }; - }; - "@azure/msal-common-9.0.2" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; - sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; - }; - }; - "@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=="; - }; - }; - "@babel/runtime-7.20.7" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; - sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; - }; - }; - "@breejs/later-4.1.0" = { - name = "_at_breejs_slash_later"; - packageName = "@breejs/later"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@breejs/later/-/later-4.1.0.tgz"; - sha512 = "QgGnZ9b7o4k0Ai1ZbTJWwZpZcFK9d+Gb+DyNt4UT9x6IEIs5HVu0iIlmgzGqN+t9MoJSpSPo9S/Mm51UtHr3JA=="; - }; - }; - "@grpc/grpc-js-1.7.3" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz"; - sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; - }; - }; - "@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=="; - }; - }; - "@js-joda/core-5.5.1" = { - name = "_at_js-joda_slash_core"; - packageName = "@js-joda/core"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.1.tgz"; - sha512 = "oTFmkyv5MhgkHdZhoe5lwRoKW0t4njPvK3g7ODvK/prkoC5bwylKcyQJMsmjvgHBXoy4u5iLnB5yQ7AljouHAA=="; - }; - }; - "@louislam/ping-0.4.2-mod.1" = { - name = "_at_louislam_slash_ping"; - packageName = "@louislam/ping"; - version = "0.4.2-mod.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@louislam/ping/-/ping-0.4.2-mod.1.tgz"; - sha512 = "KkRDo8qcF9kzzR0Hh8Iqz+XNnzKOdobUquP7UyBYrjxAB1jNT3qO0gvAZeDUknF28LXBPSzkiVlf1NG+tb/iyQ=="; - }; - }; - "@louislam/sqlite3-15.1.2" = { - name = "_at_louislam_slash_sqlite3"; - packageName = "@louislam/sqlite3"; - version = "15.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-15.1.2.tgz"; - sha512 = "VRquWrCKKwfOnzwVh6hOud8lHPvv2R7Jic3gyZCL5kiZpNfmJ71DLCV9SNgLaMDloU+mVWymLev8vehlf7xf5g=="; - }; - }; - "@mapbox/node-pre-gyp-1.0.10" = { - name = "_at_mapbox_slash_node-pre-gyp"; - packageName = "@mapbox/node-pre-gyp"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz"; - sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; - }; - }; - "@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=="; - }; - }; - "@socket.io/component-emitter-3.1.0" = { - name = "_at_socket.io_slash_component-emitter"; - packageName = "@socket.io/component-emitter"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz"; - sha512 = "+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="; - }; - }; - "@tediousjs/connection-string-0.3.0" = { - name = "_at_tediousjs_slash_connection-string"; - packageName = "@tediousjs/connection-string"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.3.0.tgz"; - sha512 = "d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="; - }; - }; - "@tootallnate/once-2.0.0" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - }; - "@types/accepts-1.3.5" = { - name = "_at_types_slash_accepts"; - packageName = "@types/accepts"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz"; - sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; - }; - }; - "@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/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/content-disposition-0.5.5" = { - name = "_at_types_slash_content-disposition"; - packageName = "@types/content-disposition"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.5.tgz"; - sha512 = "v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA=="; - }; - }; - "@types/cookie-0.4.1" = { - name = "_at_types_slash_cookie"; - packageName = "@types/cookie"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz"; - sha512 = "XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="; - }; - }; - "@types/cookies-0.7.7" = { - name = "_at_types_slash_cookies"; - packageName = "@types/cookies"; - version = "0.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.7.tgz"; - sha512 = "h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA=="; - }; - }; - "@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/cors/-/cors-2.8.13.tgz"; - sha512 = "RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA=="; - }; - }; - "@types/es-aggregate-error-1.0.2" = { - name = "_at_types_slash_es-aggregate-error"; - packageName = "@types/es-aggregate-error"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.2.tgz"; - sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; - }; - }; - "@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-serve-static-core-4.17.32" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.32"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; - sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; - }; - }; - "@types/http-assert-1.5.3" = { - name = "_at_types_slash_http-assert"; - packageName = "@types/http-assert"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.3.tgz"; - sha512 = "FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA=="; - }; - }; - "@types/http-errors-2.0.1" = { - name = "_at_types_slash_http-errors"; - packageName = "@types/http-errors"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz"; - sha512 = "/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="; - }; - }; - "@types/keygrip-1.0.2" = { - name = "_at_types_slash_keygrip"; - packageName = "@types/keygrip"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz"; - sha512 = "GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw=="; - }; - }; - "@types/koa-2.13.5" = { - name = "_at_types_slash_koa"; - packageName = "@types/koa"; - version = "2.13.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.5.tgz"; - sha512 = "HSUOdzKz3by4fnqagwthW/1w/yJspTgppyyalPVbgZf8jQWvdIXcVW5h2DGtw4zYntOaeRGx49r1hxoPWrD4aA=="; - }; - }; - "@types/koa-compose-3.2.5" = { - name = "_at_types_slash_koa-compose"; - packageName = "@types/koa-compose"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz"; - sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; - }; - }; - "@types/lodash-4.14.191" = { - name = "_at_types_slash_lodash"; - packageName = "@types/lodash"; - version = "4.14.191"; - src = fetchurl { - 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" = { - name = "_at_types_slash_mime"; - packageName = "@types/mime"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"; - sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; - }; - }; - "@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-18.11.18" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.11.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; - }; - }; - "@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/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/serve-static-1.15.0" = { - name = "_at_types_slash_serve-static"; - packageName = "@types/serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; - }; - }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "agent-base-6.0.2" = { - name = "agent-base"; - packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "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=="; - }; - }; - "anafanafo-2.0.0" = { - name = "anafanafo"; - packageName = "anafanafo"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/anafanafo/-/anafanafo-2.0.0.tgz"; - sha512 = "Nlfq7NC4AOkTJerWRIZcOAiMNtIDVIGWGvQ98O7Jl6Kr2Dk0dX5u4MqN778kSRTy5KRqchpLdF2RtLFEz9FVkQ=="; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; - }; - }; - "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=="; - }; - }; - "aproba-1.2.0" = { - name = "aproba"; - packageName = "aproba"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; - }; - }; - "aproba-2.0.0" = { - name = "aproba"; - packageName = "aproba"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; - sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; - }; - }; - "are-we-there-yet-1.1.7" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; - }; - }; - "are-we-there-yet-2.0.0" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; - sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; - }; - }; - "args-parser-1.3.0" = { - name = "args-parser"; - packageName = "args-parser"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/args-parser/-/args-parser-1.3.0.tgz"; - sha512 = "If3Zi4BSjlQIJ9fgAhSiKi0oJtgMzSqh0H4wvl7XSeO16FKx7QqaHld8lZeEajPX7y1C5qKKeNgyrfyvmjmjUQ=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "asn1-0.2.6" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; - sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - }; - "await-lock-2.2.2" = { - name = "await-lock"; - packageName = "await-lock"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/await-lock/-/await-lock-2.2.2.tgz"; - sha512 = "aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw=="; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; - }; - }; - "aws4-1.11.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; - }; - }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; - "axios-0.27.2" = { - name = "axios"; - packageName = "axios"; - version = "0.27.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; - }; - }; - "axios-ntlm-1.3.0" = { - name = "axios-ntlm"; - packageName = "axios-ntlm"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios-ntlm/-/axios-ntlm-1.3.0.tgz"; - sha512 = "NPNsIMO1SGX5scs3ZWJqsV7iRLvET+DlRl94aZ7Sx14zA8RTQh9EDxsJmxB9cKjardKfp2Vge444uYYLfvWC0Q=="; - }; - }; - "badge-maker-3.3.1" = { - name = "badge-maker"; - packageName = "badge-maker"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/badge-maker/-/badge-maker-3.3.1.tgz"; - sha512 = "OO/PS7Zg2E6qaUWzHEHt21Q5VjcFBAJVA8ztgT/fIdSZFBUwoyeo0ZhA6V5tUM8Vcjq8DJl6jfGhpjESssyqMQ=="; - }; - }; - "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=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "base64id-2.0.0" = { - name = "base64id"; - packageName = "base64id"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"; - sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; - }; - }; - "basic-auth-2.0.1" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; - sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; - }; - }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; - }; - }; - "bcryptjs-2.4.3" = { - name = "bcryptjs"; - packageName = "bcryptjs"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; - sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; - }; - }; - "binary-search-1.3.6" = { - name = "binary-search"; - packageName = "binary-search"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz"; - sha512 = "nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA=="; - }; - }; - "bintrees-1.0.2" = { - name = "bintrees"; - packageName = "bintrees"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz"; - sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; - }; - }; - "bl-4.1.0" = { - name = "bl"; - packageName = "bl"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - }; - "bl-5.1.0" = { - name = "bl"; - packageName = "bl"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz"; - sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="; - }; - }; - "body-parser-1.19.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; - }; - }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; - }; - }; - "boolean-3.2.0" = { - name = "boolean"; - packageName = "boolean"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz"; - sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; - }; - }; - "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=="; - }; - }; - "bree-7.1.5" = { - name = "bree"; - packageName = "bree"; - version = "7.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bree/-/bree-7.1.5.tgz"; - sha512 = "YAs4VQDjc6p3NhNNHBkS9NXK4wryeMq7Y/SCMcgFh0cSD4oXk7B9v53/cqzoejdelD30KEliumzrd4awka+YhQ=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "buffer-6.0.3" = { - name = "buffer"; - packageName = "buffer"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"; - sha512 = "FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="; - }; - }; - "buffer-equal-constant-time-1.0.1" = { - name = "buffer-equal-constant-time"; - packageName = "buffer-equal-constant-time"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha512 = "zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="; - }; - }; - "buffer-from-1.1.2" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - }; - "buffer-writer-2.0.0" = { - name = "buffer-writer"; - packageName = "buffer-writer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "cacheable-lookup-6.0.4" = { - name = "cacheable-lookup"; - packageName = "cacheable-lookup"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz"; - sha512 = "mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A=="; - }; - }; - "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=="; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; - }; - }; - "char-width-table-consumer-1.0.0" = { - name = "char-width-table-consumer"; - packageName = "char-width-table-consumer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/char-width-table-consumer/-/char-width-table-consumer-1.0.0.tgz"; - sha512 = "Fz4UD0LBpxPgL9i29CJ5O4KANwaMnX/OhhbxzvNa332h+9+nRKyeuLw4wA51lt/ex67+/AdsoBQJF3kgX2feYQ=="; - }; - }; - "chardet-1.4.0" = { - name = "chardet"; - packageName = "chardet"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-1.4.0.tgz"; - sha512 = "NpwMDdSIprbYx1CLnfbxEIarI0Z+s9MssEgggMNheGM+WD68yOhV7IEA/3r6tr0yTRgQD0HuZJDw32s99i6L+A=="; - }; - }; - "check-password-strength-2.0.7" = { - name = "check-password-strength"; - packageName = "check-password-strength"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/check-password-strength/-/check-password-strength-2.0.7.tgz"; - sha512 = "VyklBkB6dOKnCIh63zdVr7QKVMN9/npwUqNAXxWrz8HabVZH/n/d+lyNm1O/vbXFJlT/Hytb5ouYKYGkoeZirQ=="; - }; - }; - "cheerio-1.0.0-rc.12" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.12"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz"; - sha512 = "VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q=="; - }; - }; - "cheerio-select-2.1.0" = { - name = "cheerio-select"; - packageName = "cheerio-select"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz"; - sha512 = "9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g=="; - }; - }; - "chownr-2.0.0" = { - name = "chownr"; - packageName = "chownr"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - }; - "chroma-js-2.4.2" = { - name = "chroma-js"; - packageName = "chroma-js"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz"; - sha512 = "U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="; - }; - }; - "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=="; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; - }; - }; - "color-convert-0.5.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz"; - sha512 = "RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "colorette-2.0.19" = { - name = "colorette"; - packageName = "colorette"; - version = "2.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"; - sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; - }; - }; - "combine-errors-3.0.3" = { - name = "combine-errors"; - packageName = "combine-errors"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz"; - sha512 = "C8ikRNRMygCwaTx+Ek3Yr+OuZzgZjduCOfSQBjbM8V3MfgcjSTeto/GXP6PAwKvJz/v15b7GHZvx5rOlczFw/Q=="; - }; - }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; - "command-exists-1.2.9" = { - name = "command-exists"; - packageName = "command-exists"; - version = "1.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz"; - sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; - }; - }; - "commander-9.4.1" = { - name = "commander"; - packageName = "commander"; - version = "9.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; - 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=="; - }; - }; - "commist-1.1.0" = { - name = "commist"; - packageName = "commist"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz"; - sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; - }; - }; - "compare-versions-3.6.0" = { - name = "compare-versions"; - packageName = "compare-versions"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz"; - sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "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=="; - }; - }; - "concat-stream-2.0.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; - sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; - }; - }; - "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"; - sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; - }; - }; - "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-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; - }; - }; - "cors-2.8.5" = { - name = "cors"; - packageName = "cors"; - version = "2.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; - sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; - }; - }; - "cron-validate-1.4.5" = { - name = "cron-validate"; - packageName = "cron-validate"; - version = "1.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cron-validate/-/cron-validate-1.4.5.tgz"; - sha512 = "nKlOJEnYKudMn/aNyNH8xxWczlfpaazfWV32Pcx/2St51r2bxWbGhZD7uwzMcRhunA/ZNL+Htm/i0792Z59UMQ=="; - }; - }; - "css-color-converter-2.0.0" = { - name = "css-color-converter"; - packageName = "css-color-converter"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-color-converter/-/css-color-converter-2.0.0.tgz"; - sha512 = "oLIG2soZz3wcC3aAl/7Us5RS8Hvvc6I8G8LniF/qfMmrm7fIKQ8RIDDRZeKyGL2SrWfNqYspuLShbnjBMVWm8g=="; - }; - }; - "css-select-5.1.0" = { - name = "css-select"; - packageName = "css-select"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz"; - sha512 = "nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg=="; - }; - }; - "css-unit-converter-1.1.2" = { - name = "css-unit-converter"; - packageName = "css-unit-converter"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz"; - sha512 = "IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA=="; - }; - }; - "css-what-6.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"; - sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; - }; - }; - "custom-error-instance-2.1.1" = { - name = "custom-error-instance"; - packageName = "custom-error-instance"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz"; - sha512 = "p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg=="; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; - }; - }; - "dayjs-1.11.7" = { - name = "dayjs"; - packageName = "dayjs"; - version = "1.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"; - sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; - }; - }; - "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=="; - }; - }; - "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-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - }; - "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=="; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; - }; - }; - "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=="; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha512 = "3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg=="; - }; - }; - "detect-libc-2.0.1" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; - sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; - }; - }; - "dev-null-0.1.1" = { - name = "dev-null"; - packageName = "dev-null"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dev-null/-/dev-null-0.1.1.tgz"; - sha512 = "nMNZG0zfMgmdv8S5O0TM5cpwNbGKRGPCxVsr0SmA3NZZy9CYBbuNLL0PD3Acx9e5LIUgwONXtM9kM6RlawPxEQ=="; - }; - }; - "dom-serializer-2.0.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz"; - sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="; - }; - }; - "domelementtype-2.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; - sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; - }; - }; - "domhandler-5.0.3" = { - name = "domhandler"; - packageName = "domhandler"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz"; - sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="; - }; - }; - "domutils-3.0.1" = { - name = "domutils"; - packageName = "domutils"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz"; - sha512 = "z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q=="; - }; - }; - "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"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; - }; - }; - "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"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "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=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "engine.io-6.2.1" = { - name = "engine.io"; - packageName = "engine.io"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz"; - sha512 = "ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA=="; - }; - }; - "engine.io-client-6.2.3" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "6.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz"; - sha512 = "aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw=="; - }; - }; - "engine.io-parser-5.0.4" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz"; - sha512 = "+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg=="; - }; - }; - "entities-4.4.0" = { - name = "entities"; - packageName = "entities"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"; - sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; - }; - }; - "env-paths-2.2.1" = { - name = "env-paths"; - packageName = "env-paths"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; - sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; - }; - }; - "es-abstract-1.20.5" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.20.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz"; - sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; - }; - }; - "es-aggregate-error-1.0.9" = { - name = "es-aggregate-error"; - packageName = "es-aggregate-error"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.9.tgz"; - sha512 = "fvnX40sb538wdU6r4s35cq4EY6Lr09Upj40BEVem4LEsuW8XgQep9yD5Q1U2KftokNp1rWODFJ2qwZSsAjFpbg=="; - }; - }; - "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-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "esm-3.2.25" = { - name = "esm"; - packageName = "esm"; - version = "3.2.25"; - src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz"; - sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "events-3.3.0" = { - name = "events"; - packageName = "events"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - }; - "express-4.17.3" = { - name = "express"; - packageName = "express"; - version = "4.17.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; - }; - }; - "express-basic-auth-1.2.1" = { - name = "express-basic-auth"; - packageName = "express-basic-auth"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-basic-auth/-/express-basic-auth-1.2.1.tgz"; - sha512 = "L6YQ1wQ/mNjVLAmK3AG1RK6VkokA1BIY6wmiH304Xtt/cLTps40EusZsU1Uop+v9lTDPxdtzbFmdXfFO3KEnwA=="; - }; - }; - "express-static-gzip-2.1.7" = { - name = "express-static-gzip"; - packageName = "express-static-gzip"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.7.tgz"; - sha512 = "QOCZUC+lhPPCjIJKpQGu1Oa61Axg9Mq09Qvit8Of7kzpMuwDeMSqjjQteQS3OVw/GkENBoSBheuQDWPlngImvw=="; - }; - }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; - }; - }; - "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=="; - }; - }; - "finalhandler-1.1.2" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; - }; - }; - "form-data-2.3.3" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; - }; - }; - "form-data-4.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "fs-minipass-2.1.0" = { - name = "fs-minipass"; - packageName = "fs-minipass"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - 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=="; - }; - }; - "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=="; - }; - }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="; - }; - }; - "gauge-3.0.2" = { - name = "gauge"; - packageName = "gauge"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; - sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; - }; - }; - "generate-function-2.3.1" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; - sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; - }; - }; - "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.3" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; - }; - }; - "get-package-type-0.1.0" = { - name = "get-package-type"; - packageName = "get-package-type"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; - sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; - }; - }; - "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=="; - }; - }; - "getopts-2.3.0" = { - name = "getopts"; - packageName = "getopts"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/getopts/-/getopts-2.3.0.tgz"; - sha512 = "5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA=="; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; - }; - }; - "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=="; - }; - }; - "globalthis-1.0.3" = { - name = "globalthis"; - packageName = "globalthis"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - }; - "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"; - version = "4.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; - }; - }; - "har-validator-5.1.5" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; - sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; - }; - }; - "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-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=="; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; - }; - }; - "help-me-3.0.0" = { - name = "help-me"; - packageName = "help-me"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz"; - sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; - }; - }; - "hoek-6.1.3" = { - name = "hoek"; - packageName = "hoek"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz"; - sha512 = "YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="; - }; - }; - "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-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; - "http-graceful-shutdown-3.1.12" = { - name = "http-graceful-shutdown"; - packageName = "http-graceful-shutdown"; - version = "3.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.12.tgz"; - sha512 = "z3mH1HUwRESrauPjvjH5QuH2Ce4uLlWonPFgZnwAyxIFYROxIMcNNWwNltN+s8fHF/aGlsfQDOICHLXsabK43w=="; - }; - }; - "http-proxy-agent-5.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; - }; - }; - "https-proxy-agent-5.0.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - }; - "human-interval-2.0.1" = { - name = "human-interval"; - packageName = "human-interval"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/human-interval/-/human-interval-2.0.1.tgz"; - sha512 = "r4Aotzf+OtKIGQCB3odUowy4GfUDTy3aTWTfLd7ZF2gBCy3XW3v/dJLRefZnOFFnjqs5B1TypvS8WarpBkYUNQ=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "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"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "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.4" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; - }; - }; - "interpret-2.2.0" = { - name = "interpret"; - packageName = "interpret"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"; - sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; - }; - }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; - }; - }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "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.7" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; - sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; - }; - }; - "is-core-module-2.11.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; - }; - }; - "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-docker-2.2.1" = { - name = "is-docker"; - packageName = "is-docker"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - }; - "is-extglob-1.0.0" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; - sha512 = "7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; - }; - }; - "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-2.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; - sha512 = "a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg=="; - }; - }; - "is-invalid-path-0.1.0" = { - name = "is-invalid-path"; - packageName = "is-invalid-path"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz"; - sha512 = "aZMG0T3F34mTg4eTdszcGXx54oiZ4NtHSft3hWNJMGJXUUqdIj3cOZuHcU0nCWWcY3jd7yRe/3AEm3vSNTpBGQ=="; - }; - }; - "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-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha512 = "Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="; - }; - }; - "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-string-and-not-blank-0.0.2" = { - name = "is-string-and-not-blank"; - packageName = "is-string-and-not-blank"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string-and-not-blank/-/is-string-and-not-blank-0.0.2.tgz"; - sha512 = "FyPGAbNVyZpTeDCTXnzuwbu9/WpNXbCfbHXLpCRpN4GANhS00eEIP5Ef+k5HYSNIzIhdN9zRDoBj6unscECvtQ=="; - }; - }; - "is-string-blank-1.0.1" = { - name = "is-string-blank"; - packageName = "is-string-blank"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string-blank/-/is-string-blank-1.0.1.tgz"; - sha512 = "9H+ZBCVs3L9OYqv8nuUAzpcT9OTgMD1yAWrG7ihlnibdkbtB850heAmYWxHuXc4CHy4lKeK69tN+ny1K7gBIrw=="; - }; - }; - "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-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - }; - "is-valid-path-0.1.1" = { - name = "is-valid-path"; - packageName = "is-valid-path"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz"; - sha512 = "+kwPrVDu9Ms03L90Qaml+79+6DZHqHyRoANI6IsZJ/g8frhnfchDOBCa0RbQ6/kdHt5CS5OeIEyrYznNuVN+8A=="; - }; - }; - "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=="; - }; - }; - "is-wsl-2.2.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - }; - "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"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "isemail-3.2.0" = { - name = "isemail"; - packageName = "isemail"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz"; - sha512 = "zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg=="; - }; - }; - "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=="; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; - }; - }; - "joi-14.3.1" = { - name = "joi"; - packageName = "joi"; - version = "14.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-14.3.1.tgz"; - sha512 = "LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ=="; - }; - }; - "js-md4-0.3.2" = { - name = "js-md4"; - packageName = "js-md4"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz"; - sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA=="; - }; - }; - "js-sdsl-4.1.4" = { - name = "js-sdsl"; - packageName = "js-sdsl"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz"; - sha512 = "Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="; - }; - }; - "jsbi-4.3.0" = { - name = "jsbi"; - packageName = "jsbi"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbi/-/jsbi-4.3.0.tgz"; - sha512 = "SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g=="; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; - }; - }; - "jsesc-3.0.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; - sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; - }; - }; - "json-schema-0.4.0" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; - sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; - }; - }; - "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-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; - }; - }; - "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=="; - }; - }; - "jsprim-1.4.2" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; - sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; - }; - }; - "just-performance-4.3.0" = { - name = "just-performance"; - packageName = "just-performance"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/just-performance/-/just-performance-4.3.0.tgz"; - sha512 = "L7RjvtJsL0QO8xFs5wEoDDzzJwoiowRw6Rn/GnvldlchS2JQr9wFYPiwZcDfrbbujEKqKN0tvENdbjXdYhDp5Q=="; - }; - }; - "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=="; - }; - }; - "jwa-2.0.0" = { - name = "jwa"; - packageName = "jwa"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"; - sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; - }; - }; - "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=="; - }; - }; - "jws-4.0.0" = { - name = "jws"; - packageName = "jws"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"; - sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="; - }; - }; - "jwt-decode-3.1.2" = { - name = "jwt-decode"; - packageName = "jwt-decode"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz"; - sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; - }; - }; - "knex-2.4.0" = { - name = "knex"; - packageName = "knex"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/knex/-/knex-2.4.0.tgz"; - sha512 = "i0GWwqYp1Hs2yvc2rlDO6nzzkLhwdyOZKRdsMTB8ZxOs2IXQyL5rBjSbS1krowCh6V65T4X9CJaKtuIfkaPGSA=="; - }; - }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha512 = "nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="; - }; - }; - "limiter-2.1.0" = { - name = "limiter"; - packageName = "limiter"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/limiter/-/limiter-2.1.0.tgz"; - sha512 = "361TYz6iay6n+9KvUUImqdLuFigK+K79qrUtBsXhJTLdH4rIt/r1y8r1iozwh8KbZNpujbFTSh74mJ7bwbAMOw=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash-es-4.17.21" = { - name = "lodash-es"; - packageName = "lodash-es"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"; - sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; - }; - }; - "lodash._baseiteratee-4.7.0" = { - name = "lodash._baseiteratee"; - packageName = "lodash._baseiteratee"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz"; - sha512 = "nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ=="; - }; - }; - "lodash._basetostring-4.12.0" = { - name = "lodash._basetostring"; - packageName = "lodash._basetostring"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"; - sha512 = "SwcRIbyxnN6CFEEK4K1y+zuApvWdpQdBHM/swxP962s8HIxPO3alBH5t3m/dl+f4CMUug6sJb7Pww8d13/9WSw=="; - }; - }; - "lodash._baseuniq-4.6.0" = { - name = "lodash._baseuniq"; - packageName = "lodash._baseuniq"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; - sha512 = "Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A=="; - }; - }; - "lodash._createset-4.0.3" = { - name = "lodash._createset"; - packageName = "lodash._createset"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"; - sha512 = "GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA=="; - }; - }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha512 = "O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ=="; - }; - }; - "lodash._stringtopath-4.8.0" = { - name = "lodash._stringtopath"; - packageName = "lodash._stringtopath"; - version = "4.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz"; - sha512 = "SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ=="; - }; - }; - "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"; - sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; - }; - }; - "lodash.get-4.4.2" = { - name = "lodash.get"; - packageName = "lodash.get"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; - }; - }; - "lodash.uniqby-4.5.0" = { - name = "lodash.uniqby"; - packageName = "lodash.uniqby"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz"; - sha512 = "IRt7cfTtHy6f1aRVA5n7kT8rgN3N1nH6MOWLcHfpWG2SH19E3JksLK38MktLxZDhlAjCP9jpIXkOnRXlu6oByQ=="; - }; - }; - "long-4.0.0" = { - name = "long"; - packageName = "long"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; - 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=="; - }; - }; - "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-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=="; - }; - }; - "make-dir-3.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "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.7" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; - }; - }; - "minipass-3.3.6" = { - name = "minipass"; - packageName = "minipass"; - version = "3.3.6"; - src = fetchurl { - 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" = { - name = "minizlib"; - packageName = "minizlib"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - }; - "mkdirp-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; - "mqtt-4.3.7" = { - name = "mqtt"; - packageName = "mqtt"; - version = "4.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz"; - sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; - }; - }; - "mqtt-packet-6.10.0" = { - name = "mqtt-packet"; - packageName = "mqtt-packet"; - version = "6.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz"; - sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; - }; - }; - "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=="; - }; - }; - "ms-2.1.3" = { - name = "ms"; - packageName = "ms"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - }; - "mssql-8.1.4" = { - name = "mssql"; - packageName = "mssql"; - version = "8.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-8.1.4.tgz"; - sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ=="; - }; - }; - "mysql2-2.3.3" = { - name = "mysql2"; - packageName = "mysql2"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-2.3.3.tgz"; - sha512 = "wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA=="; - }; - }; - "named-placeholders-1.1.2" = { - name = "named-placeholders"; - packageName = "named-placeholders"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz"; - sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; - }; - }; - "nanoclone-0.2.1" = { - name = "nanoclone"; - packageName = "nanoclone"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"; - sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; - }; - }; - "native-duplexpair-1.0.0" = { - name = "native-duplexpair"; - packageName = "native-duplexpair"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/native-duplexpair/-/native-duplexpair-1.0.0.tgz"; - sha512 = "E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "node-abort-controller-3.0.1" = { - name = "node-abort-controller"; - packageName = "node-abort-controller"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; - }; - }; - "node-addon-api-4.3.0" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz"; - sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; - }; - }; - "node-cloudflared-tunnel-1.0.10" = { - name = "node-cloudflared-tunnel"; - packageName = "node-cloudflared-tunnel"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/node-cloudflared-tunnel/-/node-cloudflared-tunnel-1.0.10.tgz"; - sha512 = "QBTH4bcTePgiwYdK5vYZhZl7GNr3Pqnj5V3Tg1w5HvnK4VhLZe5BUuhqKvzzCA604yhoD2I1ATdnOl6axSJu/w=="; - }; - }; - "node-fetch-2.6.7" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; - }; - }; - "node-gyp-7.1.2" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz"; - sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; - }; - }; - "node-radius-client-1.0.0" = { - name = "node-radius-client"; - packageName = "node-radius-client"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-radius-client/-/node-radius-client-1.0.0.tgz"; - sha512 = "FkR9cMV5hNoX+kKDUTzuagvEixlLiaEJQ1/ywOdhahsihKrGDhVZmnCvmrCStA589MT3yuC/J2eKc6z68IGdBw=="; - }; - }; - "node-radius-utils-1.2.0" = { - name = "node-radius-utils"; - packageName = "node-radius-utils"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-radius-utils/-/node-radius-utils-1.2.0.tgz"; - sha512 = "i3Sf6khnenl0aXumo0whAlfPWTaBqHxEnVBBxpu3dZ7q69NkPPv71rvPjlDZ5wkeKCTNNUTECljerS5kcYQxRw=="; - }; - }; - "nodemailer-6.6.5" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.5.tgz"; - sha512 = "C/v856DBijUzHcHIgGpQoTrfsH3suKIRAGliIzCstatM2cAa+MYX3LuyCrABiO/cdJTxgBBHXxV1ztiqUwst5A=="; - }; - }; - "nopt-5.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; - sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; - }; - }; - "notp-2.0.3" = { - name = "notp"; - packageName = "notp"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/notp/-/notp-2.0.3.tgz"; - sha512 = "oBig/2uqkjQ5AkBuw4QJYwkEWa/q+zHxI5/I5z6IeP2NT0alpJFsP/trrfCC+9xOAgQSZXssNi962kp5KBmypQ=="; - }; - }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; - }; - }; - "npmlog-5.0.1" = { - name = "npmlog"; - packageName = "npmlog"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; - sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; - }; - }; - "nth-check-2.1.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"; - sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; - }; - }; - "number-allocator-1.0.12" = { - name = "number-allocator"; - packageName = "number-allocator"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.12.tgz"; - sha512 = "sGB0qoQGmKimery9JubBQ9pQUr1V/LixJAk3Ygp7obZf6mpSXime8d7XHEobbIimkdZpgjkNlLt6G7LPEWFYWg=="; - }; - }; - "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"; - sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; - }; - }; - "numbered-1.1.0" = { - name = "numbered"; - packageName = "numbered"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/numbered/-/numbered-1.1.0.tgz"; - sha512 = "pv/ue2Odr7IfYOO0byC1KgBI10wo5YDauLhxY6/saNzAdAs0r1SotGCPzzCLNPL0xtrAwWRialLu23AAu9xO1g=="; - }; - }; - "oauth-sign-0.9.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - 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"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "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.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; - sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "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=="; - }; - }; - "open-8.4.0" = { - name = "open"; - packageName = "open"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; - "p-timeout-3.2.0" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; - sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; - }; - }; - "p-wait-for-3.2.0" = { - name = "p-wait-for"; - packageName = "p-wait-for"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.2.0.tgz"; - sha512 = "wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA=="; - }; - }; - "packet-reader-1.0.0" = { - name = "packet-reader"; - packageName = "packet-reader"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; - }; - }; - "parse5-7.1.2" = { - name = "parse5"; - packageName = "parse5"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz"; - sha512 = "Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw=="; - }; - }; - "parse5-htmlparser2-tree-adapter-7.0.0" = { - name = "parse5-htmlparser2-tree-adapter"; - packageName = "parse5-htmlparser2-tree-adapter"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz"; - sha512 = "B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "password-hash-1.2.2" = { - name = "password-hash"; - packageName = "password-hash"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/password-hash/-/password-hash-1.2.2.tgz"; - sha512 = "Dy/5+Srojwv+1XnMrK2bn7f2jN3k2p90DfBVA0Zd6PrjWF7lXHOTWgKT4uBp1gIsqV7/llYqm+hj+gwDBF/Fmg=="; - }; - }; - "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-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=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; - }; - }; - "pg-8.8.0" = { - name = "pg"; - packageName = "pg"; - version = "8.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; - }; - }; - "pg-connection-string-2.5.0" = { - name = "pg-connection-string"; - packageName = "pg-connection-string"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; - sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; - }; - }; - "pg-int8-1.0.1" = { - name = "pg-int8"; - packageName = "pg-int8"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; - }; - }; - "pg-pool-3.5.2" = { - name = "pg-pool"; - packageName = "pg-pool"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz"; - sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; - }; - }; - "pg-protocol-1.5.0" = { - name = "pg-protocol"; - packageName = "pg-protocol"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; - }; - }; - "pg-types-2.2.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; - }; - }; - "pgpass-1.0.5" = { - name = "pgpass"; - packageName = "pgpass"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; - sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; - }; - }; - "pkginfo-0.4.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; - sha512 = "8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ=="; - }; - }; - "postgres-array-2.0.0" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; - }; - }; - "postgres-bytea-1.0.0" = { - name = "postgres-bytea"; - packageName = "postgres-bytea"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha512 = "xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w=="; - }; - }; - "postgres-date-1.0.7" = { - name = "postgres-date"; - packageName = "postgres-date"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; - sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; - }; - }; - "postgres-interval-1.2.0" = { - name = "postgres-interval"; - packageName = "postgres-interval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "prom-client-13.2.0" = { - name = "prom-client"; - packageName = "prom-client"; - version = "13.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz"; - sha512 = "wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ=="; - }; - }; - "prometheus-api-metrics-3.2.2" = { - name = "prometheus-api-metrics"; - packageName = "prometheus-api-metrics"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prometheus-api-metrics/-/prometheus-api-metrics-3.2.2.tgz"; - sha512 = "5hT17HAjflPkrHSYQ7lorsKygo0PhLau/FQ6SQhw0XWAm10GwKfLQmIVP6b3LJBnc4WNOf/QKHce2RfcZMLjJQ=="; - }; - }; - "property-expr-2.0.5" = { - name = "property-expr"; - packageName = "property-expr"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz"; - sha512 = "IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="; - }; - }; - "protobufjs-7.1.2" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz"; - sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; - }; - }; - "psl-1.9.0" = { - name = "psl"; - packageName = "psl"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; - sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "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=="; - }; - }; - "q-1.5.1" = { - name = "q"; - packageName = "q"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; - }; - }; - "qs-6.5.3" = { - name = "qs"; - packageName = "qs"; - version = "6.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; - sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; - }; - }; - "qs-6.9.7" = { - name = "qs"; - packageName = "qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - }; - "radius-1.1.4" = { - name = "radius"; - packageName = "radius"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/radius/-/radius-1.1.4.tgz"; - sha512 = "UWuzdF6xf3NpsXFZZmUEkxtEalDXj8hdmMXgbGzn7vOk6zXNsiIY2I6SJ1euHt7PTQuMoz2qDEJB+AfJDJgQYw=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.4.3" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; - }; - }; - "readable-stream-2.3.7" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - 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=="; - }; - }; - "rechoir-0.8.0" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz"; - sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; - }; - }; - "redbean-node-0.2.0" = { - name = "redbean-node"; - packageName = "redbean-node"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.2.0.tgz"; - sha512 = "bHbNgVpkLOn7i/kvfvGDVGzfDgvf20qVRm4EvQV9tD2V2nhcegYUITzAF3XSL2XVirrb5vmWy85vxM44faBnYw=="; - }; - }; - "regenerator-runtime-0.13.11" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.11"; - src = fetchurl { - 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" = { - 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=="; - }; - }; - "reinterval-1.1.0" = { - name = "reinterval"; - packageName = "reinterval"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="; - }; - }; - "request-2.88.2" = { - name = "request"; - packageName = "request"; - version = "2.88.2"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; - }; - }; - "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-5.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"; - sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; - }; - }; - "rfdc-1.3.0" = { - name = "rfdc"; - packageName = "rfdc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"; - sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; - }; - }; - "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=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safe-regex-test-1.0.0" = { - name = "safe-regex-test"; - packageName = "safe-regex-test"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; - }; - }; - "safe-timers-1.1.0" = { - name = "safe-timers"; - packageName = "safe-timers"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-timers/-/safe-timers-1.1.0.tgz"; - sha512 = "9aqY+v5eMvmRaluUEtdRThV1EjlSElzO7HuCj0sTW9xvp++8iJ9t/RWGNWV6/WHcUJLHpyT2SNf/apoKTU2EpA=="; - }; - }; - "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=="; - }; - }; - "semver-6.3.0" = { - name = "semver"; - packageName = "semver"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - }; - "semver-7.3.8" = { - name = "semver"; - packageName = "semver"; - version = "7.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; - }; - }; - "send-0.17.2" = { - name = "send"; - packageName = "send"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; - }; - }; - "seq-queue-0.0.5" = { - name = "seq-queue"; - packageName = "seq-queue"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz"; - sha512 = "hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="; - }; - }; - "serve-static-1.14.2" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "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=="; - }; - }; - "smart-buffer-4.2.0" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - }; - "socket.io-4.5.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "4.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz"; - sha512 = "m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ=="; - }; - }; - "socket.io-adapter-2.4.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz"; - sha512 = "W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg=="; - }; - }; - "socket.io-client-4.5.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "4.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.4.tgz"; - sha512 = "ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g=="; - }; - }; - "socket.io-parser-4.2.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz"; - sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g=="; - }; - }; - "socks-2.7.1" = { - name = "socks"; - packageName = "socks"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; - }; - }; - "socks-proxy-agent-6.1.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz"; - sha512 = "t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew=="; - }; - }; - "split2-3.2.2" = { - name = "split2"; - packageName = "split2"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; - sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; - }; - }; - "split2-4.1.0" = { - name = "split2"; - packageName = "split2"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz"; - sha512 = "VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="; - }; - }; - "sprintf-js-1.1.2" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; - }; - }; - "sqlstring-2.3.3" = { - name = "sqlstring"; - packageName = "sqlstring"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz"; - sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; - }; - }; - "sshpk-1.17.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; - }; - }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - }; - "stoppable-1.1.0" = { - name = "stoppable"; - packageName = "stoppable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz"; - sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; - }; - }; - "stream-shift-1.0.1" = { - name = "stream-shift"; - packageName = "stream-shift"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; - }; - }; - "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"; - sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; - }; - }; - "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.6" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.6"; - src = fetchurl { - 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.6" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; - sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - 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" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "tar-6.1.13" = { - name = "tar"; - packageName = "tar"; - version = "6.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; - }; - }; - "tarn-3.0.2" = { - name = "tarn"; - packageName = "tarn"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz"; - sha512 = "51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ=="; - }; - }; - "tcp-ping-0.1.1" = { - name = "tcp-ping"; - packageName = "tcp-ping"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tcp-ping/-/tcp-ping-0.1.1.tgz"; - sha512 = "7Ed10Ds0hYnF+O1lfiZ2iSZ1bCAj+96Madctebmq7Y1ALPWlBY4YI8C6pCL+UTlshFY5YogixKLpgDP/4BlHrw=="; - }; - }; - "tdigest-0.1.2" = { - name = "tdigest"; - packageName = "tdigest"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz"; - sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; - }; - }; - "tedious-14.7.0" = { - name = "tedious"; - packageName = "tedious"; - version = "14.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-14.7.0.tgz"; - sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; - }; - }; - "thirty-two-1.0.2" = { - name = "thirty-two"; - packageName = "thirty-two"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz"; - sha512 = "OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA=="; - }; - }; - "tildify-2.0.0" = { - name = "tildify"; - packageName = "tildify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz"; - sha512 = "Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "topo-3.0.3" = { - name = "topo"; - packageName = "topo"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz"; - sha512 = "IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ=="; - }; - }; - "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=="; - }; - }; - "tough-cookie-2.5.0" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - }; - "tslib-2.4.1" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; - sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; - }; - }; - "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"; - sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; - }; - }; - "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=="; - }; - }; - "underscore-1.13.6" = { - name = "underscore"; - packageName = "underscore"; - version = "1.13.6"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; - sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "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=="; - }; - }; - "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"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuid-3.4.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; - }; - }; - "uuid-8.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=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; - }; - }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - }; - "which-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=="; - }; - }; - "wide-align-1.1.5" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; - sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; - }; - }; - "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=="; - }; - }; - "ws-7.5.9" = { - name = "ws"; - packageName = "ws"; - version = "7.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; - }; - }; - "ws-8.2.3" = { - name = "ws"; - packageName = "ws"; - version = "8.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz"; - sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; - }; - }; - "xmlhttprequest-ssl-2.0.0" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"; - sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; - }; - }; - "xtend-4.0.2" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - }; - "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" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; - }; - }; - "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-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=="; - }; - }; - "yup-0.32.9" = { - name = "yup"; - packageName = "yup"; - version = "0.32.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yup/-/yup-0.32.9.tgz"; - sha512 = "Ci1qN+i2H0XpY7syDQ0k5zKQ/DoxO0LzPg8PAR/X4Mpj6DqaeCoIYEEjDJwhArh3Fa7GWbQQVDZKeXYlSH4JMg=="; - }; - }; - }; - args = { - name = "uptime-kuma"; - packageName = "uptime-kuma"; - version = "1.19.6"; - src = ./.; - 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-http-compat-1.3.0" - sources."@azure/core-lro-2.4.0" - sources."@azure/core-paging-1.4.0" - sources."@azure/core-rest-pipeline-1.10.0" - sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.1.1" - (sources."@azure/identity-2.1.0" // { - dependencies = [ - sources."jwa-2.0.0" - sources."jws-4.0.0" - ]; - }) - sources."@azure/keyvault-keys-4.6.0" - sources."@azure/logger-1.0.3" - (sources."@azure/msal-browser-2.32.1" // { - dependencies = [ - sources."@azure/msal-common-9.0.1" - ]; - }) - sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { - dependencies = [ - sources."@azure/msal-common-9.0.2" - ]; - }) - sources."@babel/runtime-7.20.7" - sources."@breejs/later-4.1.0" - sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.4" - sources."@js-joda/core-5.5.1" - sources."@louislam/ping-0.4.2-mod.1" - sources."@louislam/sqlite3-15.1.2" - (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."@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."@socket.io/component-emitter-3.1.0" - sources."@tediousjs/connection-string-0.3.0" - sources."@tootallnate/once-2.0.0" - sources."@types/accepts-1.3.5" - sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.35" - sources."@types/content-disposition-0.5.5" - sources."@types/cookie-0.4.1" - sources."@types/cookies-0.7.7" - sources."@types/cors-2.8.13" - sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" - sources."@types/http-assert-1.5.3" - sources."@types/http-errors-2.0.1" - sources."@types/keygrip-1.0.2" - sources."@types/koa-2.13.5" - sources."@types/koa-compose-3.2.5" - sources."@types/lodash-4.14.191" - sources."@types/long-4.0.2" - sources."@types/mime-3.0.1" - sources."@types/node-18.11.18" - sources."@types/qs-6.9.7" - sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.15.0" - sources."abbrev-1.1.1" - sources."accepts-1.3.8" - sources."agent-base-6.0.2" - sources."ajv-6.12.6" - sources."anafanafo-2.0.0" - sources."ansi-regex-5.0.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."args-parser-1.3.0" - sources."array-flatten-1.1.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."await-lock-2.2.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."axios-0.27.2" - (sources."axios-ntlm-1.3.0" // { - dependencies = [ - sources."axios-0.21.4" - ]; - }) - sources."badge-maker-3.3.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."base64id-2.0.0" - sources."basic-auth-2.0.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bcryptjs-2.4.3" - sources."binary-search-1.3.6" - sources."bintrees-1.0.2" - sources."bl-4.1.0" - (sources."body-parser-1.19.2" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."ms-2.0.0" - sources."qs-6.9.7" - ]; - }) - sources."boolbase-1.0.0" - sources."boolean-3.2.0" - sources."brace-expansion-1.1.11" - sources."bree-7.1.5" - sources."buffer-5.7.1" - sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.2" - sources."buffer-writer-2.0.0" - sources."bytes-3.0.0" - sources."cacheable-lookup-6.0.4" - sources."call-bind-1.0.2" - sources."caseless-0.12.0" - sources."char-width-table-consumer-1.0.0" - sources."chardet-1.4.0" - sources."check-password-strength-2.0.7" - sources."cheerio-1.0.0-rc.12" - sources."cheerio-select-2.1.0" - sources."chownr-2.0.0" - sources."chroma-js-2.4.2" - sources."cliui-7.0.4" - sources."code-point-at-1.1.0" - sources."color-support-1.1.3" - sources."colorette-2.0.19" - sources."combine-errors-3.0.3" - sources."combined-stream-1.0.8" - sources."command-exists-1.2.9" - (sources."commist-1.1.0" // { - dependencies = [ - sources."leven-2.1.0" - ]; - }) - sources."compare-versions-3.6.0" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."concat-map-0.0.1" - sources."concat-stream-2.0.0" - sources."console-control-strings-1.1.0" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.4" - sources."cookie-0.4.2" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" - sources."cors-2.8.5" - sources."cron-validate-1.4.5" - (sources."css-color-converter-2.0.0" // { - dependencies = [ - sources."color-convert-0.5.3" - sources."color-name-1.1.4" - ]; - }) - sources."css-select-5.1.0" - sources."css-unit-converter-1.1.2" - sources."css-what-6.1.0" - sources."custom-error-instance-2.1.1" - sources."dashdash-1.14.1" - sources."dayjs-1.11.7" - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - 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."denque-2.1.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."detect-libc-2.0.1" - sources."dev-null-0.1.1" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.0.1" - sources."duplexify-4.1.2" - sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.11" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - (sources."engine.io-6.2.1" // { - dependencies = [ - sources."ws-8.2.3" - ]; - }) - (sources."engine.io-client-6.2.3" // { - dependencies = [ - sources."ws-8.2.3" - ]; - }) - sources."engine.io-parser-5.0.4" - sources."entities-4.4.0" - sources."env-paths-2.2.1" - sources."es-abstract-1.20.5" - sources."es-aggregate-error-1.0.9" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."esm-3.2.25" - sources."etag-1.8.1" - sources."events-3.3.0" - (sources."express-4.17.3" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."qs-6.9.7" - sources."safe-buffer-5.2.1" - ]; - }) - sources."express-basic-auth-1.2.1" - sources."express-static-gzip-2.1.7" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - (sources."finalhandler-1.1.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."follow-redirects-1.15.2" - sources."forever-agent-0.6.1" - sources."form-data-4.0.0" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - (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."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."gauge-3.0.2" - sources."generate-function-2.3.1" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."get-package-type-0.1.0" - sources."get-symbol-description-1.0.0" - sources."getopts-2.3.0" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."globalthis-1.0.3" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.10" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" - sources."help-me-3.0.0" - sources."hoek-6.1.3" - sources."htmlparser2-8.0.1" - sources."http-errors-1.8.1" - sources."http-graceful-shutdown-3.1.12" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."human-interval-2.0.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.4" - sources."interpret-2.2.0" - sources."ip-2.0.0" - sources."ipaddr.js-1.9.1" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-core-module-2.11.0" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - (sources."is-invalid-path-0.1.0" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."is-negative-zero-2.0.2" - sources."is-number-object-1.0.7" - sources."is-property-1.0.2" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-string-and-not-blank-0.0.2" - sources."is-string-blank-1.0.1" - sources."is-symbol-1.0.4" - sources."is-typedarray-1.0.0" - sources."is-valid-path-0.1.1" - sources."is-weakref-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isemail-3.2.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."joi-14.3.1" - sources."js-md4-0.3.2" - sources."js-sdsl-4.1.4" - sources."jsbi-4.3.0" - sources."jsbn-0.1.1" - sources."jsesc-3.0.2" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - (sources."jsonwebtoken-9.0.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" - ]; - }) - sources."just-performance-4.3.0" - sources."jwa-1.4.1" - sources."jws-3.2.2" - sources."jwt-decode-3.1.2" - (sources."knex-2.4.0" // { - dependencies = [ - sources."commander-9.5.0" - sources."resolve-from-5.0.0" - ]; - }) - sources."limiter-2.1.0" - sources."lodash-4.17.21" - sources."lodash-es-4.17.21" - sources."lodash._baseiteratee-4.7.0" - sources."lodash._basetostring-4.12.0" - sources."lodash._baseuniq-4.6.0" - sources."lodash._createset-4.0.3" - sources."lodash._root-3.0.1" - sources."lodash._stringtopath-4.8.0" - sources."lodash.camelcase-4.3.0" - sources."lodash.get-4.4.2" - sources."lodash.uniqby-4.5.0" - sources."long-4.0.0" - sources."make-dir-3.1.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-1.2.7" - (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."mqtt-4.3.7" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."mqtt-packet-6.10.0" - sources."yallist-4.0.0" - ]; - }) - sources."ms-2.1.3" - (sources."mssql-8.1.4" // { - dependencies = [ - sources."commander-9.4.1" - ]; - }) - (sources."mysql2-2.3.3" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."named-placeholders-1.1.2" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."nanoclone-0.2.1" - sources."native-duplexpair-1.0.0" - sources."negotiator-0.6.3" - sources."node-abort-controller-3.0.1" - sources."node-addon-api-4.3.0" - sources."node-cloudflared-tunnel-1.0.10" - (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-7.1.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."gauge-2.7.4" - sources."is-fullwidth-code-point-1.0.0" - sources."lru-cache-6.0.0" - sources."npmlog-4.1.2" - sources."readable-stream-2.3.7" - sources."semver-7.3.8" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."yallist-4.0.0" - ]; - }) - sources."node-radius-client-1.0.0" - sources."node-radius-utils-1.2.0" - sources."nodemailer-6.6.5" - sources."nopt-5.0.0" - sources."notp-2.0.3" - sources."npmlog-5.0.1" - sources."nth-check-2.1.1" - sources."number-allocator-1.0.12" - sources."number-is-nan-1.0.1" - sources."numbered-1.1.0" - 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."on-finished-2.3.0" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."open-8.4.0" - sources."p-finally-1.0.0" - sources."p-timeout-3.2.0" - sources."p-wait-for-3.2.0" - sources."packet-reader-1.0.0" - sources."parse5-7.1.2" - sources."parse5-htmlparser2-tree-adapter-7.0.0" - sources."parseurl-1.3.3" - sources."password-hash-1.2.2" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."performance-now-2.1.0" - sources."pg-8.8.0" - sources."pg-connection-string-2.5.0" - sources."pg-int8-1.0.1" - sources."pg-pool-3.5.2" - sources."pg-protocol-1.5.0" - sources."pg-types-2.2.0" - (sources."pgpass-1.0.5" // { - dependencies = [ - sources."split2-4.1.0" - ]; - }) - sources."pkginfo-0.4.1" - sources."postgres-array-2.0.0" - sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.7" - sources."postgres-interval-1.2.0" - sources."process-nextick-args-2.0.1" - sources."prom-client-13.2.0" - (sources."prometheus-api-metrics-3.2.2" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."property-expr-2.0.5" - (sources."protobufjs-7.1.2" // { - dependencies = [ - sources."long-5.2.1" - ]; - }) - sources."proxy-addr-2.0.7" - sources."pseudomap-1.0.2" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."q-1.5.1" - sources."qs-6.5.3" - sources."radius-1.1.4" - sources."range-parser-1.2.1" - (sources."raw-body-2.4.3" // { - dependencies = [ - sources."bytes-3.1.2" - sources."iconv-lite-0.4.24" - ]; - }) - sources."readable-stream-3.6.0" - sources."rechoir-0.8.0" - (sources."redbean-node-0.2.0" // { - dependencies = [ - sources."@types/node-14.18.36" - ]; - }) - sources."regenerator-runtime-0.13.11" - sources."regexp.prototype.flags-1.4.3" - sources."reinterval-1.1.0" - (sources."request-2.88.2" // { - dependencies = [ - sources."form-data-2.3.3" - sources."http-signature-1.2.0" - sources."jsprim-1.4.2" - sources."uuid-3.4.0" - ]; - }) - sources."require-directory-2.1.1" - sources."resolve-1.22.1" - sources."rfdc-1.3.0" - sources."rimraf-3.0.2" - sources."safe-buffer-5.1.2" - sources."safe-regex-test-1.0.0" - sources."safe-timers-1.1.0" - sources."safer-buffer-2.1.2" - sources."semver-6.3.0" - (sources."send-0.17.2" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - ]; - }) - sources."seq-queue-0.0.5" - sources."serve-static-1.14.2" - sources."set-blocking-2.0.0" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."smart-buffer-4.2.0" - sources."socket.io-4.5.4" - sources."socket.io-adapter-2.4.0" - sources."socket.io-client-4.5.4" - sources."socket.io-parser-4.2.1" - sources."socks-2.7.1" - sources."socks-proxy-agent-6.1.1" - sources."split2-3.2.2" - sources."sprintf-js-1.1.2" - sources."sqlstring-2.3.3" - sources."sshpk-1.17.0" - sources."statuses-1.5.0" - sources."stoppable-1.1.0" - sources."stream-shift-1.0.1" - sources."string-width-4.2.3" - 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" - ]; - }) - sources."strip-ansi-6.0.1" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tar-6.1.13" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) - sources."tarn-3.0.2" - sources."tcp-ping-0.1.1" - sources."tdigest-0.1.2" - (sources."tedious-14.7.0" // { - dependencies = [ - sources."bl-5.1.0" - sources."buffer-6.0.3" - ]; - }) - sources."thirty-two-1.0.2" - sources."tildify-2.0.0" - sources."toidentifier-1.0.1" - sources."topo-3.0.3" - sources."toposort-2.0.2" - sources."tough-cookie-2.5.0" - sources."tslib-2.4.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."unbox-primitive-1.0.2" - sources."underscore-1.13.6" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."wide-align-1.1.5" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-7.5.9" - sources."xmlhttprequest-ssl-2.0.0" - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - sources."yup-0.32.9" - ]; - buildInputs = globalBuildInputs; - meta = { - license = "MIT"; - }; - production = true; - 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/servers/monitoring/uptime-kuma/package.json b/pkgs/servers/monitoring/uptime-kuma/package.json deleted file mode 100644 index 55c8c436ee82a..0000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/package.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "uptime-kuma", - "version": "1.19.6", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/louislam/uptime-kuma.git" - }, - "engines": { - "node": "14.* || >=16.*" - }, - "scripts": { - "install-legacy": "npm install", - "update-legacy": "npm update", - "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .", - "lint-fix:js": "eslint --ext \".js,.vue\" --fix --ignore-path .gitignore .", - "lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore", - "lint-fix:style": "stylelint \"**/*.{vue,css,scss}\" --fix --ignore-path .gitignore", - "lint": "npm run lint:js && npm run lint:style", - "dev": "concurrently -k -r \"wait-on tcp:3000 && npm run start-server-dev \" \"npm run start-frontend-dev\"", - "start-frontend-dev": "cross-env NODE_ENV=development vite --host --config ./config/vite.config.js", - "start": "npm run start-server", - "start-server": "node server/server.js", - "start-server-dev": "cross-env NODE_ENV=development node server/server.js", - "build": "vite build --config ./config/vite.config.js", - "test": "node test/prepare-test-server.js && npm run jest-backend", - "test-with-build": "npm run build && npm test", - "jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js", - "tsc": "tsc", - "vite-preview-dist": "vite preview --host --config ./config/vite.config.js", - "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine", - "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", - "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", - "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", - "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push", - "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push", - "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", - "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push", - "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", - "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push", - "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist", - "download-dist": "node extra/download-dist.js", - "mark-as-nightly": "node extra/mark-as-nightly.js", - "reset-password": "node extra/reset-password.js", - "remove-2fa": "node extra/remove-2fa.js", - "compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1", - "test-install-script-centos7": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/centos7.dockerfile .", - "test-install-script-alpine3": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/alpine3.dockerfile .", - "test-install-script-ubuntu": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu.dockerfile .", - "test-install-script-ubuntu1604": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1604.dockerfile .", - "test-nodejs16": "docker build --progress plain -f test/ubuntu-nodejs16.dockerfile .", - "simple-dns-server": "node extra/simple-dns-server.js", - "simple-mqtt-server": "node extra/simple-mqtt-server.js", - "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix", - "ncu-patch": "npm-check-updates -u -t patch", - "release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js", - "release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts", - "git-remove-tag": "git tag -d", - "build-dist-and-restart": "npm run build && npm run start-server-dev", - "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", - "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e", - "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js", - "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js", - "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"", - "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go" - }, - "dependencies": { - "@grpc/grpc-js": "~1.7.3", - "@louislam/ping": "~0.4.2-mod.1", - "@louislam/sqlite3": "15.1.2", - "args-parser": "~1.3.0", - "axios": "~0.27.0", - "axios-ntlm": "1.3.0", - "badge-maker": "~3.3.1", - "bcryptjs": "~2.4.3", - "bree": "~7.1.5", - "cacheable-lookup": "~6.0.4", - "chardet": "~1.4.0", - "check-password-strength": "^2.0.5", - "cheerio": "~1.0.0-rc.12", - "chroma-js": "~2.4.2", - "command-exists": "~1.2.9", - "compare-versions": "~3.6.0", - "compression": "~1.7.4", - "dayjs": "~1.11.5", - "express": "~4.17.3", - "express-basic-auth": "~1.2.1", - "express-static-gzip": "~2.1.7", - "form-data": "~4.0.0", - "http-graceful-shutdown": "~3.1.7", - "http-proxy-agent": "~5.0.0", - "https-proxy-agent": "~5.0.1", - "iconv-lite": "~0.6.3", - "jsesc": "~3.0.2", - "jsonwebtoken": "~9.0.0", - "jwt-decode": "~3.1.2", - "limiter": "~2.1.0", - "mqtt": "~4.3.7", - "mssql": "~8.1.4", - "mysql2": "~2.3.3", - "node-cloudflared-tunnel": "~1.0.9", - "node-radius-client": "~1.0.0", - "nodemailer": "~6.6.5", - "notp": "~2.0.3", - "password-hash": "~1.2.2", - "pg": "~8.8.0", - "pg-connection-string": "~2.5.0", - "prom-client": "~13.2.0", - "prometheus-api-metrics": "~3.2.1", - "protobufjs": "~7.1.1", - "redbean-node": "~0.2.0", - "socket.io": "~4.5.3", - "socket.io-client": "~4.5.3", - "socks-proxy-agent": "6.1.1", - "tar": "~6.1.11", - "tcp-ping": "~0.1.1", - "thirty-two": "~1.0.2" - }, - "devDependencies": { - "@actions/github": "~5.0.1", - "@babel/eslint-parser": "~7.17.0", - "@babel/preset-env": "^7.15.8", - "@fortawesome/fontawesome-svg-core": "~1.2.36", - "@fortawesome/free-regular-svg-icons": "~5.15.4", - "@fortawesome/free-solid-svg-icons": "~5.15.4", - "@fortawesome/vue-fontawesome": "~3.0.0-5", - "@popperjs/core": "~2.10.2", - "@types/bootstrap": "~5.1.9", - "@vitejs/plugin-legacy": "~2.1.0", - "@vitejs/plugin-vue": "~3.1.0", - "@vue/compiler-sfc": "~3.2.36", - "@vuepic/vue-datepicker": "~3.4.8", - "aedes": "^0.46.3", - "babel-plugin-rewire": "~1.2.0", - "bootstrap": "5.1.3", - "chart.js": "~3.6.2", - "chartjs-adapter-dayjs": "~1.0.0", - "concurrently": "^7.1.0", - "core-js": "~3.26.1", - "cross-env": "~7.0.3", - "cypress": "^10.1.0", - "delay": "^5.0.0", - "dns2": "~2.0.1", - "eslint": "~8.14.0", - "eslint-plugin-vue": "~8.7.1", - "favico.js": "~0.3.10", - "jest": "~27.2.5", - "postcss-html": "~1.5.0", - "postcss-rtlcss": "~3.7.2", - "postcss-scss": "~4.0.4", - "prismjs": "~1.29.0", - "qrcode": "~1.5.0", - "rollup-plugin-visualizer": "^5.6.0", - "sass": "~1.42.1", - "stylelint": "~14.7.1", - "stylelint-config-standard": "~25.0.0", - "terser": "~5.15.0", - "timezones-list": "~3.0.1", - "typescript": "~4.4.4", - "v-pagination-3": "~0.1.7", - "vite": "~3.1.0", - "vite-plugin-compression": "^0.5.1", - "vue": "next", - "vue-chart-3": "3.0.9", - "vue-confirm-dialog": "~1.0.2", - "vue-contenteditable": "~3.0.4", - "vue-i18n": "~9.2.2", - "vue-image-crop-upload": "~3.0.3", - "vue-multiselect": "~3.0.0-alpha.2", - "vue-prism-editor": "~2.0.0-alpha.2", - "vue-qrcode": "~1.0.0", - "vue-router": "~4.0.14", - "vue-toastification": "~2.0.0-rc.5", - "vuedraggable": "~4.1.0", - "wait-on": "^6.0.1" - } -} diff --git a/pkgs/servers/monitoring/uptime-kuma/update.sh b/pkgs/servers/monitoring/uptime-kuma/update.sh deleted file mode 100755 index 3bc5fb5588632..0000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq - -set -euo pipefail - -latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/louislam/uptime-kuma/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; uptime-kuma.version or (lib.getVersion uptime-kuma)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "uptime-kuma is up-to-date: $currentVersion" - exit 0 -fi - -update-source-version uptime-kuma 0 0000000000000000000000000000000000000000000000000000000000000000 -update-source-version uptime-kuma "$latestVersion" - -store_src="$(command nix-build . -A uptime-kuma.src --no-out-link)" - -cd "$(dirname "${BASH_SOURCE[0]}")" - -node2nix \ - --nodejs-16 \ - --lock "$store_src/package-lock.json" \ - --composition ./composition.nix - - diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index b52015e1c3df5..4c34f2719186c 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC -, snmpSupport ? true, net-snmp +, snmpSupport ? stdenv.buildPlatform == stdenv.hostPlatform, net-snmp , sshSupport ? true, libssh2 , sqliteSupport ? false, sqlite , mysqlSupport ? false, libmysqlclient @@ -60,6 +60,11 @@ in find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; + makeFlags = [ + "AR:=$(AR)" + "RANLIB:=$(RANLIB)" + ]; + postInstall = '' mkdir -p $out/share/zabbix/database/ '' + optionalString sqliteSupport '' diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index c46568d24da14..73595e6909ce7 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -20,13 +20,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2022-04-23"; + version = "unstable-2022-11-18"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "cd520ba91728abb5a3d959269fbd8e4f40d1eb0b"; - sha256 = "sha256-sopX9t+LjYldx+syKwU3I0x/VYy4hLyXfitG0uumayE="; + rev = "362bc1a3d3ad397416f7fc48b8efe33837428b90"; + sha256 = "sha256-cebRHOx2hg470jM1CoQAk13Whv+KN2qx97BTlpjxSZg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 2792cb1dcb772..2ea8ee144a499 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.11"; + version = "0.23.12"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-vgLH4kOluK9cOmTrvpBfR87Iunn0EzH9GmiUvsjsG4I="; + sha256 = "sha256-BnEtSkZjUBK0flVttOrjkT4RCQh9F7+MDZGm2+MMrX8="; }; buildInputs = [ @@ -166,7 +166,7 @@ let ++ lib.optional (builtins.elem "documentation" features_) "man"; # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream - NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; CXXFLAGS = lib.optionals stdenv.isDarwin [ "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 5091f41b50f2e..ee56a44c11ca5 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -1,32 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtls, sqlite }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config +, cyclonedds, libmysqlclient, mariadb, mbedtls, sqlite, zeromq +}: stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.15.1"; + version = "0.15.5"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-h4TCorZfg9Sin4CZPRifUkqeg4F2V1DluolerSeREs4="; + hash = "sha256-eIwUsYPpRZMl1oCuuZeOj0SCBHDaJdmdWdoI4yuqxrg="; fetchSubmodules = true; }; + patches = [ + # Fix the conflict on function naming in ddsproxy + (fetchpatch { + url = "https://github.com/emqx/nanomq/commit/20f436a3b9d45f9809d7c7f0714905c657354631.patch"; + hash = "sha256-ISMlf9QW73oogMTlifi/r08uSxBpzRYvBSJBB1hn2xY="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "DESTINATION /etc" "DESTINATION $out/etc" ''; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ mbedtls sqlite ]; + buildInputs = [ cyclonedds libmysqlclient mariadb mbedtls sqlite zeromq ]; cmakeFlags = [ + "-DBUILD_BENCH=ON" + "-DBUILD_DDS_PROXY=ON" "-DBUILD_NANOMQ_CLI=ON" - "-DNNG_ENABLE_TLS=ON" + "-DBUILD_ZMQ_GATEWAY=ON" + "-DENABLE_RULE_ENGINE=ON" "-DNNG_ENABLE_SQLITE=ON" + "-DNNG_ENABLE_TLS=ON" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + meta = with lib; { description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge"; homepage = "https://nanomq.io/"; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index db2a6da7e5c61..76cbb2730cbb8 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.11"; + version = "2.9.14"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-iYiQYGwvxW7GF32h+E1vg3x6sml7zGk40jbY8akmOnM="; + hash = "sha256-S9K/Cu/zJufA789D/F874c+KiXley93m/wOcXZGc1aI="; }; - vendorHash = "sha256-qApohNp//N/eBljpa+D2fR19rqw8Bd8wdmME9fzqDxc="; + vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 391644379ef37..33a1825cde365 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -27,6 +27,7 @@ let ''; meta = with lib; { + changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}"; description = "Sharing solution for files, calendars, contacts and more"; homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin ma27 ]; @@ -50,13 +51,13 @@ in { ''; nextcloud24 = generic { - version = "24.0.9"; - sha256 = "580a3384c9c09aefb8e9b41553d21a6e20001799549dbd25b31dea211d97dd1e"; + version = "24.0.10"; + sha256 = "sha256-B6+0gO9wn39BpcR0IsIuMa81DH8TWuDOlTZR9O1qRbk="; }; nextcloud25 = generic { - version = "25.0.3"; - sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; + version = "25.0.4"; + sha256 = "sha256-wyUeAIOpQwPi1piLNS87Mwgqeacmsw/3RnCbD+hpoaY="; }; # tip: get the sha with: diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix new file mode 100644 index 0000000000000..b6f916f182712 --- /dev/null +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "notify_push"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "nextcloud"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DGWdVsKA8Y1r+/n+vPkRmFt1EAwPYDmFiUcyWZrXeRM="; + }; + + cargoHash = "sha256-H0rkY3hQaOBP8Cai22ppQpZJS1vyFx5uo4k9Paa2yS0="; + + passthru = { + test_client = rustPlatform.buildRustPackage { + pname = "${pname}-test_client"; + inherit src version; + + buildAndTestSubdir = "test_client"; + + cargoHash = "sha256-a8KcWnHr1bCS255ChOC6piXfVo/nJy/yVHNLCuHXoq4="; + }; + }; + + meta = with lib; { + description = "Update notifications for nextcloud clients"; + homepage = "https://github.com/nextcloud/notify_push"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ajs124 ]; + }; +} diff --git a/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 0b775a81e88a4..ebafd2b4df8ac 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/pkgs/servers/nextcloud/packages/24.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "0zlpm7vgsh96wn7pnya04ylfhakvywwdq4605i6vssbw96ibg18d", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.4/calendar-v3.5.4.tar.gz", - "version": "3.5.4", + "sha256": "1gf1gn8n85dya47y286hwknms2pj0lhgj09c29gkzgzb4wipa3ww", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.5/calendar-v3.5.5.tar.gz", + "version": "3.5.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz", - "version": "4.2.3", + "sha256": "1r0z0ldywzaw7a87hlsbn1f9pxqndqpxxa6khn70yh02cjrzh03m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.5/contacts-v4.2.5.tar.gz", + "version": "4.2.5", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -60,9 +60,9 @@ ] }, "forms": { - "sha256": "1cwf3445qivig293m6yqr92r25hwjyif5sgw0b6nvccqqpyk6vdd", - "url": "https://github.com/nextcloud/forms/releases/download/v2.5.1/forms.tar.gz", - "version": "2.5.1", + "sha256": "1payxppd2j0n67kcswb3dkk2a467fahwakxs7wqsfqgqgr9mcbl4", + "url": "https://github.com/nextcloud/forms/releases/download/v2.5.2/forms.tar.gz", + "version": "2.5.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -70,9 +70,9 @@ ] }, "groupfolders": { - "sha256": "0i7jp351lpxx7jv5rj47gkfrs2915nj6fwni919nniqqnz4yml7p", - "url": "https://github.com/nextcloud/groupfolders/releases/download/v12.0.2/groupfolders.tar.gz", - "version": "12.0.2", + "sha256": "09lz63n9i040lndzmpm6rdlpviaa8m9skpjw98m18miamdmqbf0d", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v12.0.3/groupfolders-v12.0.3.tar.gz", + "version": "12.0.3", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -100,9 +100,9 @@ ] }, "mail": { - "sha256": "10wbi0q23a5qqc7a0ppqi71qrimczay2s5pzl7r94z5c715ag0yv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.1/mail-v1.15.1.tar.gz", - "version": "1.15.1", + "sha256": "1agpdxf8lnsdxpk1nmypxam5p8i8xiyzsyb34cv2lksd2ziirmp5", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.2/mail-v1.15.2.tar.gz", + "version": "1.15.2", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -110,9 +110,9 @@ ] }, "news": { - "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", - "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", - "version": "20.0.0", + "sha256": "17kz5499jkv43w8wcd1p982hpkw2akgzpv9cjj8qqjhvzv4qr171", + "url": "https://github.com/nextcloud/news/releases/download/21.0.0-beta1/news.tar.gz", + "version": "21.0.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -129,6 +129,16 @@ "agpl" ] }, + "notify_push": { + "sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz", + "version": "0.6.0", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "sha256": "6117b7b8c5c7133975e4ebf482814cdcd3f94a1b3c76ea1b5eed47bdd1fbfcbb", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.5.8/onlyoffice.tar.gz", @@ -140,9 +150,9 @@ ] }, "polls": { - "sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11", - "url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz", - "version": "3.8.3", + "sha256": "0qdm0hnljkv0df1s929awyjj1gsp3d6xv9llr52cxv66kkfx086y", + "url": "https://github.com/nextcloud/polls/releases/download/v3.8.4/polls.tar.gz", + "version": "3.8.4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -160,9 +170,9 @@ ] }, "spreed": { - "sha256": "0frilxny4mvp34fxw0k8al3r5apy3q6vq7z35jkph3vaq1889m9k", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.7/spreed-v14.0.7.tar.gz", - "version": "14.0.7", + "sha256": "1wih7gr2dxl69fdvarkgnxcwq47vbhwdmdvs8h70pqwrgss950hs", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.9/spreed-v14.0.9.tar.gz", + "version": "14.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 98ab7ebe3e241..b0c271b54f19f 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "04g1xm3q46j7harxr0n56r7kkkqjxvah7xijddyq5fj7icr6qf5d", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.1/calendar-v4.2.1.tar.gz", - "version": "4.2.1", + "sha256": "0m0ixj4gaaqgnlk492ihkcxrxbww91jyalh40hdgnsryb9wrpkfp", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.0-alpha1/calendar-v4.3.0-alpha1.tar.gz", + "version": "4.3.0-alpha.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "097a71if6kkc7nphfc8b6llqlsskjwp1vg83134hzgfscvllvaj8", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.2/contacts-v5.0.2.tar.gz", - "version": "5.0.2", + "sha256": "1m00r6cpqyrg2b0p8hg4wqkb3wn643fy63ax7qksp39rn18smrwk", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.1.0/contacts-v5.1.0.tar.gz", + "version": "5.1.0", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "forms": { - "sha256": "1400gfgmqyrhakb5p8csb794cap9f9gn385mrsgw2i241lfv8iqw", - "url": "https://github.com/nextcloud/forms/releases/download/v3.0.3/forms.tar.gz", - "version": "3.0.3", + "sha256": "0b2qvrnhsxdknlc8bpr4hmxqdk18f9vy8ry6nm49k4lbrsfg97nq", + "url": "https://github.com/nextcloud/forms/releases/download/v3.1.0/forms.tar.gz", + "version": "3.1.0", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -60,9 +60,9 @@ ] }, "groupfolders": { - "sha256": "0g9czmhh5pvs120827b1cbzk58kq30s4269c4y79lx1k07jssq88", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.0/groupfolders-v13.1.0.tar.gz", - "version": "13.1.0", + "sha256": "1khzwqlzndkcpmwcv841l0fl3bg469ify0kcdgz9i5x2l2m5b5l9", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.1/groupfolders-v13.1.1.tar.gz", + "version": "13.1.1", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -80,9 +80,9 @@ ] }, "mail": { - "sha256": "09ymxs6g9p2398k4aff5f1iq5a0r5mid83yg9y9k1k0msqac94zg", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.2/mail-v2.2.2.tar.gz", - "version": "2.2.2", + "sha256": "161ksx7g32fkpwxq3vij2vw6sxblv7xrxggsxnx2wj14ik3wxclv", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.3.0-alpha.4/mail-v2.3.0-alpha.4.tar.gz", + "version": "2.3.0-alpha.4", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -90,9 +90,9 @@ ] }, "news": { - "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", - "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", - "version": "20.0.0", + "sha256": "17kz5499jkv43w8wcd1p982hpkw2akgzpv9cjj8qqjhvzv4qr171", + "url": "https://github.com/nextcloud/news/releases/download/21.0.0-beta1/news.tar.gz", + "version": "21.0.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -109,6 +109,16 @@ "agpl" ] }, + "notify_push": { + "sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz", + "version": "0.6.0", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "sha256": "0gy4n86q7b5qmy609ncibp94v1b3z9msc0129572qz2zyxfqxq3i", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.6.8/onlyoffice.tar.gz", @@ -120,9 +130,9 @@ ] }, "polls": { - "sha256": "1amywiw91acp4g90wazmqmnw51s7z6rf27bdrzxrcqryd8igsniq", - "url": "https://github.com/nextcloud/polls/releases/download/v4.1.0-beta4/polls.tar.gz", - "version": "4.1.0-beta4", + "sha256": "0mqc9zmxrm98byy6v13si3hwii8hx85998c4kv91vk6ad0sfxjhb", + "url": "https://github.com/nextcloud/polls/releases/download/v4.1.2/polls.tar.gz", + "version": "4.1.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -130,9 +140,9 @@ ] }, "registration": { - "sha256": "0gx5hr2k42bj5mxfnkx0ny8p6nbdy84hzq2cg106w0lj4d7kgkl5", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.0.0/registration-v2.0.0.tar.gz", - "version": "2.0.0", + "sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz", + "version": "2.1.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", "homepage": "https://github.com/nextcloud/registration", "licenses": [ @@ -140,9 +150,9 @@ ] }, "spreed": { - "sha256": "1w5v866lkd0skv666vhz75zwalr2w83shrhdvv354kill9k53awh", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.2/spreed-v15.0.2.tar.gz", - "version": "15.0.2", + "sha256": "0pav5xcnj55vs04fm1fc2kpaz46k0rdlvv7xn6idwgh860anzp4g", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.4/spreed-v15.0.4.tar.gz", + "version": "15.0.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -160,9 +170,9 @@ ] }, "twofactor_nextcloud_notification": { - "sha256": "0941h1l8clrb4brmrn214r33m49iqzanahm1d2gx171f5hbr7bp0", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.5.0/twofactor_nextcloud_notification-v3.5.0.tar.gz", - "version": "3.5.0", + "sha256": "13afyhiy7yk0fcf32792dwabjcixnw5b4hkxykw0xby3hnh0m3l2", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.6.0/twofactor_nextcloud_notification-v3.6.0.tar.gz", + "version": "3.6.0", "description": "Allows using any of your logged in devices as second factor", "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", "licenses": [ @@ -180,9 +190,9 @@ ] }, "twofactor_webauthn": { - "sha256": "06ip0ks2ngpxirfybkc6j7nlnwsx2kf7f0rl855j648zf1y369hp", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.0.0/twofactor_webauthn-v1.0.0.tar.gz", - "version": "1.0.0", + "sha256": "00nll7jfrmqw537r0g07yq7g9lh1kckiiigxgwyd4nh5j6f56v15", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.1.1/twofactor_webauthn-v1.1.1.tar.gz", + "version": "1.1.1", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -190,9 +200,9 @@ ] }, "unsplash": { - "sha256": "17qqn6kwpvkq21c92jyy3pfvjaj5xms1hr07fnn39zxg0nmwjdd8", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.1.1/unsplash.tar.gz", - "version": "2.1.1", + "sha256": "0zakbrgjc3i6rl0nqwxfsfwybbqpr50c8c10d6s7r9m4gck0y2bm", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.0/unsplash.tar.gz", + "version": "2.2.0", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index a837578902360..ba55e92332c98 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -12,6 +12,7 @@ , "mail" , "news" , "notes" +, "notify_push" , "onlyoffice" , "polls" , "registration" diff --git a/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch index 328288b39c0d4..f8ff9b7c553c5 100644 --- a/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ b/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -1,4 +1,4 @@ -From 045f33745f863ba20acfc3fe335c575d9cd87884 Mon Sep 17 00:00:00 2001 +From e01014a745b7f4dbdde2ee0e293c25c4e5eeaabb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 10 Sep 2022 15:18:05 +0200 Subject: [PATCH] Setup: remove custom dbuser creation behavior @@ -25,15 +25,15 @@ user to operate Nextcloud (which is a good thing in fact). [1] https://github.com/nextcloud/server/pull/33513 --- - lib/private/Setup/MySQL.php | 53 -------------------------------- - lib/private/Setup/PostgreSQL.php | 26 ---------------- - 2 files changed, 79 deletions(-) + lib/private/Setup/MySQL.php | 56 -------------------------------- + lib/private/Setup/PostgreSQL.php | 26 --------------- + 2 files changed, 82 deletions(-) diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index 2c16cac3d2..9b2265091f 100644 +index fbce31b0f57..9b2265091f0 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php -@@ -142,59 +142,6 @@ class MySQL extends AbstractDatabase { +@@ -142,62 +142,6 @@ class MySQL extends AbstractDatabase { $rootUser = $this->dbUser; $rootPassword = $this->dbPassword; @@ -79,6 +79,9 @@ index 2c16cac3d2..9b2265091f 100644 - $i++; - } - } +- } else { +- // Reuse existing password if a database config is already present +- $this->dbPassword = $rootPassword; - } - } catch (\Exception $ex) { - $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ @@ -94,7 +97,7 @@ index 2c16cac3d2..9b2265091f 100644 'dbuser' => $this->dbUser, 'dbpassword' => $this->dbPassword, diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php -index bc24909dc3..e49e5508e1 100644 +index bc24909dc3d..e49e5508e15 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -45,32 +45,6 @@ class PostgreSQL extends AbstractDatabase { @@ -131,5 +134,5 @@ index bc24909dc3..e49e5508e1 100644 $this->config->setValues([ 'dbuser' => $this->dbUser, -- -2.36.2 +2.39.1 diff --git a/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch index 1d22c927f3879..5aa71c58bfec5 100644 --- a/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ b/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -1,4 +1,4 @@ -From fc3e14155b3c4300b691ab46579830e725457a54 Mon Sep 17 00:00:00 2001 +From 1adc542ca1d7f60067febd692596eb6e8f334f9c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 10 Sep 2022 15:18:05 +0200 Subject: [PATCH] Setup: remove custom dbuser creation behavior @@ -25,15 +25,15 @@ user to operate Nextcloud (which is a good thing in fact). [1] https://github.com/nextcloud/server/pull/33513 --- - lib/private/Setup/MySQL.php | 53 -------------------------------- - lib/private/Setup/PostgreSQL.php | 37 ---------------------- - 2 files changed, 90 deletions(-) + lib/private/Setup/MySQL.php | 56 -------------------------------- + lib/private/Setup/PostgreSQL.php | 37 --------------------- + 2 files changed, 93 deletions(-) diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index e3004c269bc..bc958e84e44 100644 +index caa73edccec..bc958e84e44 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php -@@ -141,59 +141,6 @@ class MySQL extends AbstractDatabase { +@@ -141,62 +141,6 @@ class MySQL extends AbstractDatabase { $rootUser = $this->dbUser; $rootPassword = $this->dbPassword; @@ -79,6 +79,9 @@ index e3004c269bc..bc958e84e44 100644 - $i++; - } - } +- } else { +- // Reuse existing password if a database config is already present +- $this->dbPassword = $rootPassword; - } - } catch (\Exception $ex) { - $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ @@ -142,5 +145,5 @@ index af816c7ad04..e49e5508e15 100644 $this->config->setValues([ 'dbuser' => $this->dbUser, -- -2.38.1 +2.39.1 diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 58c4dd42936e1..87ce4ce1889f7 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nfd"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = lib.toUpper pname; rev = "NFD-${version}"; - sha256 = "sha256-8Zm8oxbpw9qD31NuofDdgPYnTWIz5E04NhkZhiRkK9E="; + sha256 = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk="; fetchSubmodules = true; }; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" "--with-tests" ] ++ lib.optional (!withWebSocket) "--without-websocket"; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Named Data Networking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ lib.maintainers.bertof ]; + maintainers = with maintainers; [ bertof ]; }; } diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 9b2ac7a5567f2..3d15654300cac 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,5 +1,5 @@ { - # gcc 11.2 suggested on 3.10.0. + # gcc 11.2 suggested on 3.10.3. # gcc 11.3.0 unsupported yet, investigate gcc support when upgrading # See https://github.com/arangodb/arangodb/issues/17454 gcc10Stdenv @@ -32,13 +32,13 @@ in gcc10Stdenv.mkDerivation rec { pname = "arangodb"; - version = "3.10.0"; + version = "3.10.3"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0vjdiarfnvpfl4hnqgr7jigxgq3b3zhx88n8liv1zqa1nlvykfrb"; + sha256 = "sha256-Jp2rvapTe0CtyYfh1YLJ5eUngh8V+BCUQ/OgH3nE2Ro="; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ gcc10Stdenv.mkDerivation rec { # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; postPatch = '' sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi diff --git a/pkgs/servers/nosql/cassandra/4.json b/pkgs/servers/nosql/cassandra/4.json index fd0a4be8f49b8..cf13954ad8630 100644 --- a/pkgs/servers/nosql/cassandra/4.json +++ b/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.0.7", - "sha256": "03k7mvm5im4lahl8wfafk5ljxd95b6zsmskip4kcpzqi6naf6s4s" + "version": "4.1.0", + "sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4" } diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 6a6aa65395c98..45bea6fed4c5b 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python2 +, python , makeWrapper , gawk , bash @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { fi done - wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin + wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin runHook postInstall ''; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 77f4aa5a300e9..2b7431ba9d28c 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,29 +5,32 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.7.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-i3XCYVJfZ2sF4XGOxaBZqBOw7nRdzcGKhNNdqQMccPU="; + sha256 = "sha256-lJlj5GNgrllcaEednxVCmMPHG2aU4z3mKkm9t0cO5Tk="; }; postPatch = '' - echo ${version} > internal/util/version/gen/version.txt + echo v${version} > build/version/version.txt + echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-qyAc5EVg8QPTnXQjqJGpT3waDrfn8iXz+O1iESCzCIc="; + vendorSha256 = "sha256-I5ucq3K0lRsokG9lahmBUH9mIYa5tgHnL+vxKSzW1hw="; CGO_ENABLED = 0; subPackages = [ "cmd/ferretdb" ]; + tags = [ "ferretdb_tigris" ]; + meta = with lib; { description = "A truly Open Source MongoDB alternative"; - homepage = "https://github.com/FerretDB/FerretDB"; + homepage = "https://www.ferretdb.io/"; license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya noisersup julienmalka ]; }; } diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 185c246e6fac1..a80975926e8db 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -33,7 +33,7 @@ let Version: ${libflux_version} Description: Library for the InfluxData Flux engine Cflags: -I/out/include - Libs: -L/out/lib -lflux -ldl -lpthread + Libs: -L/out/lib -lflux -lpthread ''; passAsFile = [ "pkgcfg" ]; postInstall = '' diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 41bba89996bf2..4f86cc4da5309 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -51,7 +51,7 @@ let Version: ${libflux_version} Description: Library for the InfluxData Flux engine Cflags: -I/out/include - Libs: -L/out/lib -lflux -ldl -lpthread + Libs: -L/out/lib -lflux -lpthread ''; passAsFile = [ "pkgcfg" ]; postInstall = '' diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index a253e6d7fbc9c..643d82a7fd2ba 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -7,7 +7,7 @@ , pcre-cpp , snappy , zlib -, libyamlcpp +, yaml-cpp , sasl , openssl , libpcap @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { curl gperftools libpcap - libyamlcpp + yaml-cpp openssl pcre-cpp variants.python @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; sconsFlags = [ diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 0bba23e7e38c4..0f788dd9d3876 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-std=c11" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.isDarwin; diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix index 375224dfdc283..fa6234a34eba1 100644 --- a/pkgs/servers/nzbhydra2/default.nix +++ b/pkgs/servers/nzbhydra2/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchzip, makeWrapper, jre, python3, unzip }: - +{ + lib, + stdenv, + fetchzip, + makeWrapper, + jre, + python3, + unzip, +}: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "3.14.2"; + version = "4.7.6"; src = fetchzip { url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; - sha512 = "sha512-wC2GhCjkRt/rmLAhe6nDCdF4PsfBpOo0T4BOSdw4wlBr7eCfo4Cibt9VvK6DNLuDk7EGkUfxvw9HI9sbRJlpCw=="; + hash = "sha512-vc+VInEnh00bASxcEwSjJcsa0QJHmtRzSz30uW60wGmA24tlaJYSk42N5KpGFbkQkOkb2ijHmKGxPogSa4izRQ=="; stripRoot = false; }; - nativeBuildInputs = [ jre makeWrapper unzip ]; + nativeBuildInputs = [jre makeWrapper unzip]; installPhase = '' runHook preInstall @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { description = "Usenet meta search"; homepage = "https://github.com/theotherp/nzbhydra2"; license = licenses.asl20; - maintainers = with maintainers; [ jamiemagee ]; + maintainers = with maintainers; [jamiemagee]; platforms = with platforms; linux; }; } diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index 51417fce2666e..517d288b8f7b3 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-4MJLvc2ExIAwGnEkBvMJSINp+7SxOyhtKnNNA9QVxMk="; + sha256 = "sha256-PBea6VYJkjBf19AQ702OtLsHJ230Sc3e3K9HAccL0BM="; }; preferLocalBuild = true; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index d6e2f20ecdbef..8ebed1c274643 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation { ) '' + optionalString withTsm '' export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\"" - export XBSA_XLIBS="-ldl" ''; buildFlags = [ "all_nolibafs" ]; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 3af259d0e7264..cd1f71b77ec8a 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -37,6 +37,44 @@ stdenv.mkDerivation { buildInputs = [ libkrb5 ]; + patches = [ + # LINUX: Run the 'sparse' checker if available + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=2cf76b31ce4c912b1151c141818f6e8c5cddcab2"; + hash = "sha256-//7HSlotx70vWDEMB8P8or4ZmmXZthgioUOkvOcJpgk="; + }) + # cf: Detect how to pass CFLAGS to linux kbuild + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=57df4dff496ca9bea04510759b8fdd9cd2cc0009"; + hash = "sha256-pJnW9bVz2ZQZUvZ+PcZ5gEgCL5kcbTGxsyMNvM2IseU="; + }) + # cf: Handle autoconf linux checks with -Werror + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b17625959386459059f6f43875d8817383554481"; + hash = "sha256-Kqx5QEX1p4UoIsWxqvJVX4IyCQFiWxtAOgvAtk+ULuQ="; + }) + # Linux: Fix functions without prototypes + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=3084117f10bd62acb1182cb54fc85b1d96738f70"; + hash = "sha256-nNyqDQfS9zzlS2i3dbfud2tQOaTQ1x/rZcQEsaLu3qc="; + }) + # Linux: Check for block_dirty_folio + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=f0fee2c7752d18ff183d60bcfba4c98c3348cd5f"; + hash = "sha256-tnNlVjZ5exC+jo78HC/y8yp0L8KQroFvVRzTC+O6vlY="; + }) + # Linux: Replace lru_cache_add with folio_add_lru + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b885159cc2bc6c746aec1d54cdd8a515d1115d14"; + hash = "sha256-ptPALSbZPSGu8PMmZiOkHUd5x0UItqIM7U7wJlxtSL8="; + }) + # LINUX 5.13: set .proc_lseek in proc_ops + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f"; + hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8="; + }) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix index dc39a81dccffc..f9ccdcf26d15c 100644 --- a/pkgs/servers/openbgpd/default.nix +++ b/pkgs/servers/openbgpd/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: bgpd-rde_peer.o:/build/source/src/bgpd/bgpd.h:133: multiple definition of `bgpd_process'; # bgpd-bgpd.o:/build/source/src/bgpd/bgpd.h:133: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index e4f558c790b2b..47ca62c6d01ed 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep +, esbuild, nodejs-16_x, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x-openssl_1_1; + nodejs = nodejs-16_x; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; @@ -17,29 +17,42 @@ let aarch64-darwin = "darwin-arm64"; }.${system} or (throw "Unsupported system ${system}"); + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + # replaces esbuild's download script with a binary from nixpkgs patchEsbuild = path : version : '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.73.1"; + version = "1.75.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "DZWAzNRRRZ/eElwRGvSK7TxstKK6X1Tj+uAxD4SOScQ="; + sha256 = "ZR4gEE+bLVjcGxhoRYQqfxDjk0ulPmdb5IV041qf954="; }; yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - nativeBuildInputs = [ cacert yarn git ]; + nativeBuildInputs = [ cacert yarn' git ]; buildPhase = '' export HOME=$PWD @@ -56,7 +69,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-7UBXigQj7c+fuHPIM5BbRe02DuL+cs6VbQ/D84Yk8i4="; + outputHash = "sha256-KcGhHFglBJDyircYUxpsMLRtQblYx3u/BMQq35A0qhE="; }; nativeBuildInputs = [ @@ -129,6 +142,8 @@ in stdenv.mkDerivation rec { jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json popd '' + '' + export NODE_OPTIONS=--openssl-legacy-provider + # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index ed163f2547df1..452163ee82cf0 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=stringop-overflow" + "-Wno-error=uninitialized" + ]; + postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; meta = { diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix new file mode 100644 index 0000000000000..12dba25d1e6d2 --- /dev/null +++ b/pkgs/servers/oxigraph/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, IOKit +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "oxigraph"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7KbDZKKJPk3QTp4siIbdB6xKbslw73Lhc7NoeOuA0Og="; + fetchSubmodules = true; + }; + + cargoSha256 = "sha256-Yqn6hwejg6LzcqW0MiUN3tqrOql6cpu/5plaOz+2/ns="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; + + cargoBuildFlags = [ "--package" "oxigraph_server" ]; + + # requires packaging of the associated python modules + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/oxigraph/oxigraph"; + description = "SPARQL graph database"; + platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + maintainers = with maintainers; [ astro ]; + license = with licenses; [ asl20 mit ]; + }; +} diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c7d1ec7f36e28..abc89d8e81294 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.30.1.6562-915986d62"; + version = "1.31.0.6654-02189b09f"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-fUt8fh4jeZiUbDoc8ivuSpx0Hf4ShYYcfJUJjU+GCxQ="; + sha256 = "sha256-ttkvYD+ALxfZpQutI1VyTbmQi/7hmvZ+YMUv3lskeWU="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-ho/r/ouaFsdCH0xcFuy4TWamu0c/ZBZDJO6cYQK/pW0="; + sha256 = "sha256-TTEcyIBFiuJTNHeJ9wu+4o2ol72oCvM9FdDPC83J3Mc="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 71b1bf567847f..c8da1b233c21a 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.11.3"; + version = "0.12.3"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M55IylFGAKy9TEIyLSHGbf9FjU5OjvoHjwYkiS31Zpk="; + sha256 = "sha256-/uqUOuNHFyah6nrQI3lRNkB2vpV9vKXJog1ck0zoruo="; }; - vendorHash = "sha256-D8nFoTggxYNj7ZSY1rvA4YSJHbB7wwpPSu1g+S3c1C0="; + vendorHash = "sha256-8NBudXcU3cjSbo6qpGZVLtbrLedzwijwrbiTgC+OMcU="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index e03d6e6827a15..7ad43825b1516 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "3.0"; + version = "3.1"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "17vmbfr7ika6kmq9jqa3rpd4cr71arapav7hlmggnj7a9yw5b9mg"; + sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg="; }; buildInputs = [ libressl libxcrypt ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 01eeb6fcb1aa6..0e3626228a49c 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -1,33 +1,39 @@ { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let + pname = "prowlarr"; + + unsupported = throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"; + os = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else - throw "Not supported on ${stdenv.hostPlatform.system}."; + unsupported; arch = { - x86_64-linux = "x64"; + aarch64-darwin = "arm64"; aarch64-linux = "arm64"; x86_64-darwin = "x64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + x86_64-linux = "x64"; + }.${stdenv.hostPlatform.system} or unsupported; hash = { - x64-linux_hash = "sha256-w9je2dcVMDhUCG2zK9uQWpTXQh3zw+0yL/qVrl3DqzE="; - arm64-linux_hash = "sha256-j5pxMTLE2Mk91q76Y1n8j3pG/1aPrGkkvSjzAI8nJro="; - x64-osx_hash = "sha256-ILz3zNQNUwFGMLvz4sqZMzsN+tw/HNpr5mFLSIKQ4Gg="; - }."${arch}-${os}_hash"; + aarch64-darwin = "sha256-S9CrYDCwIssAtcP4pI1csbOOFKaZgM6UKEDNBp2VwVo="; + aarch64-linux = "sha256-UkoTWD4ljSfx/FzH5kQBpp/Bg+xwvc7n9KLBrqNNSR0="; + x86_64-darwin = "sha256-Wru+pwISVgjnSVe8HbiwU4M1aIIK5AGzml/2yqMGIlo="; + x86_64-linux = "sha256-eJRJ1LvQsmlMeWoUmGrAyLfoebG8g/Kl2lBQxMjIyTY="; + }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { - pname = "prowlarr"; - version = "1.1.1.2377"; + inherit pname; + version = "1.2.2.2699"; src = fetchurl { - url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; - sha256 = hash; + url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,8 +60,14 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "An indexer manager/proxy built on the popular arr .net/reactjs base stack"; homepage = "https://wiki.servarr.com/prowlarr"; + changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ jdreaver ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; }; } diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh index d61edda5a0a31..883f299d9aa00 100755 --- a/pkgs/servers/prowlarr/update.sh +++ b/pkgs/servers/prowlarr/update.sh @@ -7,17 +7,19 @@ dirname="$(dirname "$0")" updateHash() { + # nixos version=$1 - arch=$2 - os=$3 + system=$2 - hashKey="${arch}-${os}_hash" + # prowlarr + arch=$3 + os=$4 - url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz" + url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.master.$version.$os-core-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) sriHash="$(nix hash to-sri --type sha256 $hash)" - sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" + sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/default.nix" } updateVersion() @@ -27,16 +29,8 @@ updateVersion() currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version) -# N.B. Prowlarr is still in development, so -# https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest -# returns nothing. Once this endpoint returns something, we should use -# it. Until then, we use jq to sort releases (N.B. the "sort_by(. | -# split(".") | map(tonumber))" incantation is to sort the version -# number properly and not as a string). - -# latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name") -# latestVersion="$(expr $latestTag : 'v\(.*\)')" -latestVersion=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/git/refs/tags | jq '. | map(.ref | sub("refs/tags/v";"")) | sort_by(. | split(".") | map(tonumber)) | .[-1]' -r) +latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name") +latestVersion="$(expr $latestTag : 'v\(.*\)')" if [[ "$currentVersion" == "$latestVersion" ]]; then echo "Prowlarr is up-to-date: ${currentVersion}" @@ -45,6 +39,7 @@ fi updateVersion $latestVersion -updateHash $latestVersion x64 linux -updateHash $latestVersion arm64 linux -updateHash $latestVersion x64 osx +updateHash $latestVersion aarch64-darwin arm64 osx +updateHash $latestVersion aarch64-linux arm64 linux +updateHash $latestVersion x86_64-darwin x64 osx +updateHash $latestVersion x86_64-linux x64 linux diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 57977ebf40965..0c15e21f5a369 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,7 +36,7 @@ }: stdenv.mkDerivation rec { - pname = "${if libOnly then "lib" else ""}pulseaudio"; + pname = "${lib.optionalString libOnly "lib"}pulseaudio"; version = "16.1"; src = fetchurl { diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 99a52827b0f98..aef97256c1ade 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A Usenet/BitTorrent movie downloader"; homepage = "https://radarr.video/"; + changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ edwtjo purcell ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/redpanda/base64.nix b/pkgs/servers/redpanda/base64.nix new file mode 100644 index 0000000000000..305456c55ccf8 --- /dev/null +++ b/pkgs/servers/redpanda/base64.nix @@ -0,0 +1,26 @@ +{ clangStdenv +, cmake +, fetchFromGitHub +, lib +}: +let + pname = "base64"; + version = "0.5.0"; +in +clangStdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "aklomp"; + repo = "base64"; + rev = "v${version}"; + sha256 = "sha256-2HNI9ycT9f+NLwLElEuR61qmTguOsI+kNxv01ipxSqQ="; + }; + nativeBuildInputs = [ cmake ]; + meta = with lib; { + description = "Fast Base64 stream encoder/decoder in C99, with SIMD acceleration"; + license = licenses.bsd2; + homepage = "https://github.com/aklomp/base64"; + maintainers = with maintainers; [ avakhrenev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 84b63d5984e3b..c59aa621cc4d6 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,48 +1,52 @@ -{ lib, stdenv, fetchzip }: - +{ buildGoModule +, callPackage +, doCheck ? !stdenv.isDarwin # Can't start localhost test server in MacOS sandbox. +, fetchFromGitHub +, installShellFiles +, lib +, stdenv +}: let - version = "22.3.5"; - platform = if stdenv.isLinux then "linux" else "darwin"; - arch = if stdenv.isAarch64 then "arm" else "amd"; - sha256s = { - darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; - darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-wsUuSCstYucjMpFsqssPGEhm3zCrAdE9Mldtkypbthg="; - linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; - }; -in stdenv.mkDerivation rec { - pname = "redpanda"; - inherit version; - - src = fetchzip { - url = "https://github.com/redpanda-data/redpanda/releases/download/v${version}/rpk-${platform}-${arch}64.zip"; - sha256 = sha256s.${platform}.${arch}; + version = "22.3.13"; + src = fetchFromGitHub { + owner = "redpanda-data"; + repo = "redpanda"; + rev = "v${version}"; + sha256 = "sha256-cUQFDXWnQYSLcfKFYg6BLrxF77iX+Yx3hcul4tMxdoc="; }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp rpk $out/bin - - ${lib.optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/rpk - ''} - - runHook postInstall + server = callPackage ./server.nix { inherit src version; }; +in +buildGoModule rec { + pname = "redpanda-rpk"; + inherit doCheck src version; + modRoot = "./src/go/rpk"; + runVend = false; + vendorSha256 = "sha256-JVZuHRh3gavIGArxDkqUQsL5oBjz35EKGsC75Sy+cMo="; + + ldflags = [ + ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' + ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.rev=v${version}"'' + ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/container/common.tag=v${version}"'' + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/rpk generate shell-completion $shell > rpk.$shell + installShellCompletion rpk.$shell + done ''; - # stripping somehow completely breaks it - dontStrip = true; + passthru = { + inherit server; + }; meta = with lib; { - description = "Redpanda is a streaming data platform for developers. Kafka API compatible. 10x faster. No ZooKeeper. No JVM! "; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsl11; + description = "Redpanda client"; homepage = "https://redpanda.com/"; - maintainers = with maintainers; [ happysalada ]; + license = licenses.bsl11; + maintainers = with maintainers; [ avakhrenev happysalada ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/redpanda/hdr-histogram.nix b/pkgs/servers/redpanda/hdr-histogram.nix new file mode 100644 index 0000000000000..91000649e130d --- /dev/null +++ b/pkgs/servers/redpanda/hdr-histogram.nix @@ -0,0 +1,28 @@ +{ clangStdenv +, cmake +, fetchFromGitHub +, lib +, zlib +}: +let + pname = "HdrHistogram_c"; + version = "0.11.5"; +in +clangStdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "HdrHistogram"; + repo = "HdrHistogram_c"; + rev = version; + sha256 = "sha256-29if+0H8wdpQBN48lt0ylGgtUCv/tJYZnG5LzcIqXDs="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + meta = with lib; { + description = "C port of the HdrHistogram"; + license = licenses.bsd2; + homepage = "https://github.com/HdrHistogram/HdrHistogram_c"; + maintainers = with maintainers; [ avakhrenev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/rapidjson.nix b/pkgs/servers/redpanda/rapidjson.nix new file mode 100644 index 0000000000000..99ada8c05f88e --- /dev/null +++ b/pkgs/servers/redpanda/rapidjson.nix @@ -0,0 +1,32 @@ +# rapidjson used in nixpkgs is too old. Although it is technically a latest release, it was made in 2016. +# Redpanda uses its own version +{ clangStdenv +, cmake +, fetchFromGitHub +, lib +, pkg-config +}: + +clangStdenv.mkDerivation rec { + pname = "rapidjson"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "redpanda-data"; + repo = "rapidjson"; + rev = "27c3a8dc0e2c9218fe94986d249a12b5ed838f1d"; + sha256 = "sha256-wggyCL5uEsnJDxkYAUsXOjoO1MNQBGB05E6aSpsNcl0="; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + + doCheck = false; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + maintainers = with maintainers; [ avakhrenev ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/redpanda.patch b/pkgs/servers/redpanda/redpanda.patch new file mode 100644 index 0000000000000..c3ee76d3c9ae4 --- /dev/null +++ b/pkgs/servers/redpanda/redpanda.patch @@ -0,0 +1,73 @@ +diff --git a/cmake/main.cmake b/cmake/main.cmake +index 8c60c4214..194f33a21 100644 +--- a/cmake/main.cmake ++++ b/cmake/main.cmake +@@ -15,15 +15,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_UNITY_BUILD_BATCH_SIZE 10) + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +-list(APPEND BASE_LD_FLAGS_LIST +- -L${REDPANDA_DEPS_INSTALL_DIR}/lib +- -L${REDPANDA_DEPS_INSTALL_DIR}/lib64 +- -fuse-ld=lld) +-set(PKG_CONFIG_PATH_LIST +- ${REDPANDA_DEPS_INSTALL_DIR}/lib64/pkgconfig +- ${REDPANDA_DEPS_INSTALL_DIR}/share/pkgconfig +- ${REDPANDA_DEPS_INSTALL_DIR}/lib/pkgconfig +- ) + + list(APPEND BASE_CXX_FLAGS_LIST -fPIC) + list(APPEND BASE_C_FLAGS_LIST -fPIC) +diff --git a/cmake/testing.cmake b/cmake/testing.cmake +index 7f149dc82..7c57aa3dd 100644 +--- a/cmake/testing.cmake ++++ b/cmake/testing.cmake +@@ -24,6 +24,7 @@ message(STATUS "RP_ENABLE_BENCHMARK_TESTS=${RP_ENABLE_BENCHMARK_TESTS}") + message(STATUS "RP_ENABLE_HONEY_BADGER_TESTS=${RP_ENABLE_HONEY_BADGER_TESTS}") + + function (rp_test) ++ return() + set(options + INTEGRATION_TEST UNIT_TEST BENCHMARK_TEST HBADGER_TEST) + set(oneValueArgs BINARY_NAME TIMEOUT PREPARE_COMMAND POST_COMMAND) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eecd145ed..b9efa89b5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -5,4 +5,5 @@ find_package(Boost REQUIRED + unit_test_framework) + find_package(absl REQUIRED) + add_subdirectory(v) +-add_subdirectory(go/kreq-gen) ++# Don't build kafka-request-generator, it is needed only for tests ++# add_subdirectory(go/kreq-gen) +diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt +index 075da485e..af7ede2bc 100644 +--- a/src/v/CMakeLists.txt ++++ b/src/v/CMakeLists.txt +@@ -58,7 +58,9 @@ else() + if(${ENABLE_GIT_HASH}) + message(FATAL_ERROR "ENABLE_GIT_HASH cannot be 'on' when ENABLE_GIT_VERSION is 'off'") + endif() +- set(GIT_VER "no_version") ++ if(NOT GIT_VER) ++ set(GIT_VER "no_version") ++ endif() + endif() + + if(${ENABLE_GIT_HASH}) +@@ -71,8 +73,12 @@ if(${ENABLE_GIT_HASH}) + set(GIT_CLEAN_DIRTY "") + endif() + else() +- set(GIT_SHA1 "000") +- set(GIT_CLEAN_DIRTY "-dev") ++ if(NOT GIT_SHA1) ++ set(GIT_SHA1 "000") ++ endif() ++ if(NOT GIT_CLEAN_DIRTY) ++ set(GIT_CLEAN_DIRTY "-dev") ++ endif() + endif() + + configure_file(version.h.in version.h @ONLY) diff --git a/pkgs/servers/redpanda/seastar-fixes.patch b/pkgs/servers/redpanda/seastar-fixes.patch new file mode 100644 index 0000000000000..c6b12b88c1498 --- /dev/null +++ b/pkgs/servers/redpanda/seastar-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/include/seastar/core/std-coroutine.hh b/include/seastar/core/std-coroutine.hh +index ea364bee..57474529 100644 +--- a/include/seastar/core/std-coroutine.hh ++++ b/include/seastar/core/std-coroutine.hh +@@ -87,7 +87,7 @@ class coroutine_handle<void> { + + explicit operator bool() const noexcept { return _pointer; } + +- static coroutine_handle from_address(void* ptr) noexcept { ++ static constexpr coroutine_handle from_address(void* ptr) noexcept { + coroutine_handle hndl; + hndl._pointer = ptr; + return hndl; diff --git a/pkgs/servers/redpanda/seastar.nix b/pkgs/servers/redpanda/seastar.nix new file mode 100644 index 0000000000000..3c7120e6c8762 --- /dev/null +++ b/pkgs/servers/redpanda/seastar.nix @@ -0,0 +1,84 @@ +{ boost175 +, c-ares +, cmake +, cryptopp +, fetchFromGitHub +, fmt_8 +, gnutls +, hwloc +, lib +, libsystemtap +, libtasn1 +, liburing +, libxfs +, lksctp-tools +, llvmPackages_14 +, lz4 +, ninja +, numactl +, openssl +, pkg-config +, python3 +, ragel +, valgrind +, yaml-cpp +}: +let + pname = "seastar"; + version = "22.11.0"; +in +llvmPackages_14.stdenv.mkDerivation { + inherit pname version; + strictDeps = true; + src = fetchFromGitHub { + owner = "redpanda-data"; + repo = "seastar"; + rev = "30d3a28bde08d2228b4e560c173b89fdd94c3f05"; + sha256 = "sha256-Xzu7AJMkvE++BGEqluod3fwMEIpDnbCczmlEad0/4v4="; + }; + nativeBuildInputs = [ + cmake + ninja + openssl + pkg-config + python3 + ragel + ]; + buildInputs = [ + libsystemtap + libxfs + ]; + propagatedBuildInputs = [ + boost175 + c-ares + gnutls + cryptopp + fmt_8 + hwloc + libtasn1 + liburing + lksctp-tools + lz4 + numactl + valgrind + yaml-cpp + ]; + patches = [ + ./seastar-fixes.patch + ]; + postPatch = '' + patchShebangs ./scripts/seastar-json2code.py + ''; + cmakeFlags = [ + "-DSeastar_EXCLUDE_DEMOS_FROM_ALL=ON" + "-DSeastar_EXCLUDE_TESTS_FROM_ALL=ON" + ]; + doCheck = false; + meta = with lib; { + description = "High performance server-side application framework."; + license = licenses.asl20; + homepage = "https://seastar.io/"; + maintainers = with maintainers; [ avakhrenev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/redpanda/server.nix b/pkgs/servers/redpanda/server.nix new file mode 100644 index 0000000000000..9cb050eb5f45a --- /dev/null +++ b/pkgs/servers/redpanda/server.nix @@ -0,0 +1,123 @@ +{ abseil-cpp +, avro-cpp +, callPackage +, ccache +, cmake +, crc32c +, croaring +, ctre +, curl +, dpdk +, git +, lib +, llvmPackages_14 +, llvm_14 +, ninja +, p11-kit +, pkg-config +, procps +, protobuf3_21 +, python3 +, snappy +, src +, unzip +, version +, writeShellScriptBin +, xxHash +, zip +, zstd +}: +let + pname = "redpanda"; + pythonPackages = p: with p; [ jinja2 ]; + seastar = callPackage ./seastar.nix { }; + base64 = callPackage ./base64.nix { }; + hdr-histogram = callPackage ./hdr-histogram.nix { }; + kafka-codegen-venv = python3.withPackages (ps: [ + ps.jinja2 + ps.jsonschema + ]); + rapidjson = callPackage ./rapidjson.nix { }; +in +llvmPackages_14.stdenv.mkDerivation rec { + inherit pname version src; + + preConfigure = '' + # setup sccache + export CCACHE_DIR=$TMPDIR/sccache-redpanda + mkdir -p $CCACHE_DIR + ''; + patches = [ + ./redpanda.patch + ]; + postPatch = '' + # Fix 'error: use of undeclared identifier 'roaring'; did you mean 'Roaring + # qualified reference to 'Roaring' is a constructor name rather than a type in this context' + substituteInPlace \ + ./src/v/storage/compacted_offset_list.h \ + ./src/v/storage/compaction_reducers.cc \ + ./src/v/storage/compaction_reducers.h \ + ./src/v/storage/segment_utils.h \ + ./src/v/storage/segment_utils.cc \ + --replace 'roaring::Roaring' 'Roaring' + + patchShebangs ./src/v/rpc/rpc_compiler.py + ''; + + doCheck = false; + + nativeBuildInputs = [ + (python3.withPackages pythonPackages) + (writeShellScriptBin "kafka-codegen-venv" "exec -a $0 ${kafka-codegen-venv}/bin/python3 $@") + ccache + cmake + curl + git + llvm_14 + ninja + pkg-config + procps + seastar + unzip + zip + ]; + + cmakeFlags = [ + "-DREDPANDA_DEPS_SKIP_BUILD=ON" + "-DRP_ENABLE_TESTS=OFF" + "-Wno-dev" + "-DGIT_VER=${version}" + "-DGIT_CLEAN_DIRTY=\"\"" + ]; + + buildInputs = [ + abseil-cpp + avro-cpp + base64 + crc32c + croaring + ctre + dpdk + hdr-histogram + p11-kit + protobuf3_21 + rapidjson + seastar + snappy + xxHash + zstd + ]; + + meta = with lib; { + description = "Kafka-compatible streaming platform."; + license = licenses.bsl11; + longDescription = '' + Redpanda is a Kafka-compatible streaming data platform that is + proven to be 10x faster and 6x lower in total costs. It is also JVM-free, + ZooKeeper-free, Jepsen-tested and source available. + ''; + homepage = "https://redpanda.com/"; + maintainers = with maintainers; [ avakhrenev happysalada ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix index 775850ea32e04..7edc3dd89b2a4 100644 --- a/pkgs/servers/roapi/http.nix +++ b/pkgs/servers/roapi/http.nix @@ -5,7 +5,7 @@ let pname = "roapi-http"; version = "0.6.0"; - target = if stdenv.isDarwin then "apple-darwin" else ""; + target = lib.optionalString stdenv.isDarwin "apple-darwin"; in # TODO build from source, currently compilation fails on darwin on snmalloc with # ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index f1ff08b930cfc..067f9b48d58ef 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1193"; + version = "2.0-1202"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-yvM4mEFBelT8Nox0vzI4tlQbxDUkoMAB6q8l5LW8+b4="; + hash = "sha256-YeBzXnw/BpJDUJ7fUf7TH0zQcpCjUm9peB7zPO2ZsYI="; }; dontConfigure = true; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 09412c8858f5a..526dcde57f192 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.21.1"; + version = "0.21.5"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-hYO/MMZBb9YczvIq4mn1XE9rhnaTg9t35by/GHtvdJQ="; + hash = "sha256-BwifUZxTM5/7UdSCN7glPU1MWLu7yBxfVAHInGLf4yA="; }; - vendorHash = "sha256-Q1zeKGu20kOpjqdLCB7stuWBqi/2EyWK7vMRAYUCJKg="; + vendorHash = "sha256-OO4Ak+dmf6yOCZmV/lVhrHnseWoi2MysUh+NKpwrZxI="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 8cc792f145923..c4987cdd28867 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub{ owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EKW/Cik4La66bI7EVbFnhivk1o0nIudJdBW7F5dbQaI="; + sha256 = "sha256-tx2ipgvYDdCwcWFeZ/qgGXyKe+kHLuOgDAz/8vf2zEs="; }; - cargoSha256 = "sha256-zIrvBHPthPAzReojmBLb0odDQGcGwZS10rP15qb/zgs="; + cargoHash = "sha256-/zji2sFaOweBo666LqfNRpO/0vi1eAGgOReeuvQIaEQ="; # Some tests need network checkFlags = [ diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 531a2e31a4b24..a0a6eb72e7431 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.7.2"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Zzqqh/3ijOTVVm5ksmsHY4LOL034VXHeZ7XsEg8cxY0="; + sha256 = "sha256-1gGvdc6TJrkFIrN+TUL/7EejApgpgAQxnQbp8RMknHQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index df235abe98c4b..4828e613595ab 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,9 +20,12 @@ , gnutls , systemd , samba +, talloc , jansson +, ldb , libtasn1 , tdb +, tevent , libxcrypt , cmocka , rpcsvc-proto @@ -48,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.17.4"; + version = "4.17.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-wFEgedtMrHB8zqTBiuu9ay6zrPbpBzXn9kWjJr4fRTc="; + hash = "sha256-67eIDUdP/AnXO1/He8vWV/YjWRAzczGpwk1/acoRRCs="; }; outputs = [ "out" "dev" "man" ]; @@ -100,8 +103,11 @@ stdenv.mkDerivation rec { libarchive zlib gnutls + ldb + talloc libtasn1 tdb + tevent libxcrypt ] ++ optionals stdenv.isLinux [ liburing systemd ] ++ optionals stdenv.isDarwin [ libiconv ] @@ -143,6 +149,7 @@ stdenv.mkDerivation rec { ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" + "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb" ] ++ optional enableLibunwind "--with-libunwind" ++ optional enableProfiling "--with-profiling-data" ++ optional (!enableAcl) "--without-acl-support" diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index d44885360f9a2..ef55409d280f1 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -19,7 +19,7 @@ protobuf, cryptopp, libxfs, - libyamlcpp, + yaml-cpp, libsystemtap, lksctp-tools, lz4, @@ -64,7 +64,7 @@ gcc8Stdenv.mkDerivation { protobuf cryptopp libxfs - libyamlcpp + yaml-cpp libsystemtap lksctp-tools lz4 diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix new file mode 100644 index 0000000000000..6859562d4f622 --- /dev/null +++ b/pkgs/servers/search/khoj/default.nix @@ -0,0 +1,110 @@ +{ lib +, fetchFromGitHub +, python3 +, qt6 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "khoj"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "debanjum"; + repo = "khoj"; + rev = "refs/tags/${version}"; + hash = "sha256-9kKK0DXpLfPB2LMnYcC6BKgZaoRsNHBZVe4thI7b9tk="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "dateparser == 1.1.1" "dateparser" \ + --replace "defusedxml == 0.7.1" ""defusedxml"" \ + --replace "fastapi == 0.77.1" "fastapi" \ + --replace "jinja2 == 3.1.2" "jinja2" \ + --replace "openai == 0.20.0" "openai" \ + --replace "pillow == 9.3.0" "pillow" \ + --replace "pydantic == 1.9.1" "pydantic" \ + --replace "pyyaml == 6.0" "pyyaml" \ + --replace "pyqt6 == 6.3.1" "pyqt6" \ + --replace "rich >= 13.3.1" "rich" \ + --replace "schedule == 1.1.0" "schedule" \ + --replace "sentence-transformers == 2.2.2" "sentence-transformers" \ + --replace "torch == 1.13.1" "torch" \ + --replace "uvicorn == 0.17.6" "uvicorn" + ''; + + nativeBuildInputs = with python3.pkgs; [ + hatch-vcs + hatchling + ] ++ (with qt6; [ + wrapQtAppsHook + ]); + + buildInputs = with qt6; [ + qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ + dateparser + defusedxml + fastapi + jinja2 + numpy + openai + pillow + pydantic + pyqt6 + pyyaml + rich + schedule + sentence-transformers + torch + uvicorn + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "khoj" + ]; + + disabledTests = [ + # Tests require network access + "test_search_with_valid_content_type" + "test_update_with_valid_content_type" + "test_regenerate_with_valid_content_type" + "test_image_search" + "test_notes_search" + "test_notes_search_with_only_filters" + "test_notes_search_with_include_filter" + "test_notes_search_with_exclude_filter" + "test_image_metadata" + "test_image_search" + "test_image_search_query_truncated" + "test_image_search_by_filepath" + "test_asymmetric_setup_with_missing_file_raises_error" + "test_asymmetric_setup_with_empty_file_raises_error" + "test_asymmetric_reload" + "test_asymmetric_setup" + "test_asymmetric_search" + "test_entry_chunking_by_max_tokens" + "test_incremental_update" + ]; + + meta = with lib; { + description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; + homepage = "https://github.com/debanjum/khoj"; + changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index c6878df1e04af..eb88b7345d9df 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nixosTests }: -let version = "0.30.5"; +let version = "1.0.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "meilisearch"; repo = "MeiliSearch"; - rev = "v${version}"; - hash = "sha256-DvMMBF5Z2VdV3ObuD/gquZeimglyzFFVzgUq+/ra+Hc="; + rev = "refs/tags/v${version}"; + hash = "sha256-2HfwNoluPPOOAdCaqUVaZcAd8M2naPYAsphZO1Inefg="; }; - cargoHash = "sha256-vA3DhGc0EuSdUeXYyG5iuuy7yK+22xPJjI67+/ctUFA="; + cargoHash = "sha256-HuVNI1Y+rhuAzAkDUuJJCZ500WuGPgABFfEbJNXaVpA="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { doCheck = false; meta = with lib; { - description = "Powerful, fast, and an easy to use search engine "; + description = "Powerful, fast, and an easy to use search engine"; homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix new file mode 100644 index 0000000000000..b8274d894b272 --- /dev/null +++ b/pkgs/servers/search/opensearch/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jre_headless +, util-linux +, gnugrep +, coreutils +, autoPatchelfHook +, zlib +, nixosTests +}: + +stdenvNoCC.mkDerivation rec { + pname = "opensearch"; + version = "2.5.0"; + + src = fetchurl { + url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; + hash = "sha256-WPD5StVBb/hK+kP/1wkQQBKRQma/uaP+8ULeIFUBL1U="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ]; + patches = [./opensearch-home-fix.patch ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R bin config lib modules plugins $out + + substituteInPlace $out/bin/opensearch \ + --replace 'bin/opensearch-keystore' "$out/bin/opensearch-keystore" + + wrapProgram $out/bin/opensearch \ + --prefix PATH : "${lib.makeBinPath [ util-linux gnugrep coreutils ]}" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" + + runHook postInstall + ''; + + passthru.tests = nixosTests.opensearch; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + homepage = "https://github.com/opensearch-project/OpenSearch"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ shyim ]; + }; +} diff --git a/pkgs/servers/search/opensearch/opensearch-home-fix.patch b/pkgs/servers/search/opensearch/opensearch-home-fix.patch new file mode 100644 index 0000000000000..25d0130d6d9b4 --- /dev/null +++ b/pkgs/servers/search/opensearch/opensearch-home-fix.patch @@ -0,0 +1,26 @@ +diff -Naur a/bin/opensearch-env b/bin/opensearch-env +--- a/bin/opensearch-env 2017-12-12 13:31:51.000000000 +0100 ++++ b/bin/opensearch-env 2017-12-18 19:51:12.282809695 +0100 +@@ -19,18 +19,10 @@ + fi + done + +-# determine OpenSearch home; to do this, we strip from the path until we find +-# bin, and then strip bin (there is an assumption here that there is no nested +-# directory under bin also named bin) +-OPENSEARCH_HOME=`dirname "$SCRIPT"` +- +-# now make OPENSEARCH_HOME absolute +-OPENSEARCH_HOME=`cd "$OPENSEARCH_HOME"; pwd` +- +-while [ "`basename "$OPENSEARCH_HOME"`" != "bin" ]; do +- OPENSEARCH_HOME=`dirname "$OPENSEARCH_HOME"` +-done +-OPENSEARCH_HOME=`dirname "$OPENSEARCH_HOME"` ++if [ -z "$OPENSEARCH_HOME" ]; then ++ echo "You must set the OPENSEARCH_HOME var" >&2 ++ exit 1 ++fi + + # now set the classpath + OPENSEARCH_CLASSPATH="$OPENSEARCH_HOME/lib/*" \ No newline at end of file diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index abde1176ceda3..47e4f04bac891 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -3,20 +3,23 @@ , fetchFromGitHub , protobuf , stdenv +, pkg-config +, openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "0.11.2"; + version = "1.0.2"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-MT2k4k/g97iXVUCz1dYJdL+JBCLKTWqE2u2Yiuvd/nw="; + sha256 = "sha256-AVglZr3J9fEWgE2g5UHt1j6YQud/viGp0IvuR9XRntE="; }; - cargoSha256 = "sha256-86F7B+SKaAxu7c3kyYurI5jPnnbvtdD0jouNCzT0A50="; + cargoSha256 = "sha256-4hzixh1/nVIMRsBSoldmbtpcpBMmvxik3lV/h4FPOrk="; prePatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace .cargo/config.toml \ @@ -24,9 +27,14 @@ rustPlatform.buildRustPackage rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - nativeBuildInputs = [ protobuf rustPlatform.bindgenHook ]; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-faligned-allocation"; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + nativeBuildInputs = [ protobuf rustPlatform.bindgenHook pkg-config ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; meta = with lib; { description = "Vector Search Engine for the next generation of AI applications"; diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index a55967920fe34..915575db65f03 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-cSA7ndpIV3VvIZTBa9NCIlJn57EtT1qxrB0UsMENUS0="; + hash = "sha256-gB3r7Q4M4pXHB9cfCRU8hMccWaJ170es0CJfbo/7lsg="; }; - vendorHash = "sha256-C45KA+9tdj+fR3DUBLdG2dGzT59zuAJczpKVoiAZ7lg="; + vendorHash = "sha256-og3mn0iYl6aubcSAUohqG4ZSqdBB4AQYZtpKfbp7kcQ="; ldflags = [ "-s" diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index dbe478568ac64..5bfe05a86dff6 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,58 +1,106 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, openssl, avahi, alsa-lib, glib, libdaemon, popt, libconfig, libpulseaudio, soxr -, enableDbus ? stdenv.isLinux +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, openssl_1_1 +, avahi +, alsa-lib +, libplist +, glib +, libdaemon +, libsodium +, libgcrypt +, ffmpeg +, libuuid +, unixtools +, popt +, libconfig +, libpulseaudio +, libjack2 +, pipewire +, soxr +, enableAirplay2 ? false +, enableStdout ? true +, enableAlsa ? true +, enablePulse ? true +, enablePipe ? true +, enablePipewire ? true +, enableJack ? true , enableMetadata ? false , enableMpris ? stdenv.isLinux +, enableDbus ? stdenv.isLinux +, enableSoxr ? true +, enableLibdaemon ? false }: -with lib; stdenv.mkDerivation rec { - version = "3.3.9"; + version = "4.1.1"; pname = "shairport-sync"; src = fetchFromGitHub { - sha256 = "sha256-JLgnsLjswj0qus1Vd5ZtPQbbIp3dp2pI7OfQG4JrdW8="; rev = version; repo = "shairport-sync"; owner = "mikebrady"; + hash = "sha256-EKt5mH9GmzeR4zdPDFOt26T9STpG1khVrY4DFIv5Maw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ - openssl + buildInputs = with lib; [ + openssl_1_1 avahi - alsa-lib - libdaemon popt libconfig - libpulseaudio - soxr - ] ++ optional stdenv.isLinux glib; + ] + ++ optional enableLibdaemon libdaemon + ++ optional enableAlsa alsa-lib + ++ optional enablePulse libpulseaudio + ++ optional enablePipewire pipewire + ++ optional enableJack libjack2 + ++ optional enableSoxr soxr + ++ optionals enableAirplay2 [ + libplist + libsodium + libgcrypt + libuuid + ffmpeg + unixtools.xxd + ] + ++ optional stdenv.isLinux glib; - prePatch = '' + postPatch = '' sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' mpris-service.c ''; enableParallelBuilding = true; - configureFlags = [ - "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout" - "--with-avahi" "--with-ssl=openssl" "--with-soxr" + configureFlags = with lib; [ "--without-configfiles" "--sysconfdir=/etc" + "--with-ssl=openssl" + "--with-stdout" + "--with-avahi" ] - ++ optional enableDbus "--with-dbus-interface" - ++ optional enableMetadata "--with-metadata" - ++ optional enableMpris "--with-mpris-interface"; + ++ optional enablePulse "--with-pa" + ++ optional enablePipewire "--with-pw" + ++ optional enableAlsa "--with-alsa" + ++ optional enableJack "--with-jack" + ++ optional enableStdout "--with-stdout" + ++ optional enablePipe "--with-pipe" + ++ optional enableSoxr "--with-soxr" + ++ optional enableDbus "--with-dbus-interface" + ++ optional enableMetadata "--with-metadata" + ++ optional enableMpris "--with-mpris-interface" + ++ optional enableLibdaemon "--with-libdaemon" + ++ optional enableAirplay2 "--with-airplay-2"; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/mikebrady/shairport-sync"; description = "Airtunes server and emulator with multi-room capabilities"; license = licenses.mit; - maintainers = with maintainers; [ lnl7 ]; + maintainers = with maintainers; [ lnl7 jordanisaacs ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/sharing/default.nix b/pkgs/servers/sharing/default.nix new file mode 100644 index 0000000000000..dd5df06ad46de --- /dev/null +++ b/pkgs/servers/sharing/default.nix @@ -0,0 +1,32 @@ +{ buildNpmPackage +, fetchFromGitHub +, lib +}: + +buildNpmPackage rec { + pname = "sharing"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "parvardegr"; + repo = pname; + rev = "v${version}"; + hash = "sha256-y5tAbyRGxr6lagU/+pLBN0VIpk3+SzKyXOehQk6NW+M="; + }; + + npmDepsHash = "sha256-2DwFkkoODDuLOxF63F1ywoXzjcMn/+H2ycRWlJlNcCI="; + + dontNpmBuild = true; + + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + meta = with lib; { + description = "Command-line tool to share directories and files to mobile devices"; + homepage = "https://github.com/parvardegr/sharing"; + license = licenses.mit; + maintainers = with maintainers; [ ChaosAttractor ]; + }; +} diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index d752c1bb8aee5..1e93613808d5a 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { (enableFeature true "arcfour") ]; - NIX_CFLAGS_COMPILE + env.NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; doCheck = true; diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index 0940d1a0ece36..e59b9d73d5a85 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wssSegekRBUXxpru5WGGu6BLX6BFEgV0QliNJToRFg="; + sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY="; }; - cargoSha256 = "sha256-P8Zr5KTjXD0qHkf6QfyfN39PjokpZUfywhzVjIO5rE8="; + cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index fb34b3c5af406..4be9a13404ae8 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -88,12 +88,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-66kwEN42LjTh/oEdFeOyXP2fU88tjR1K5ZWQJkKcDLQ="; + sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw="; }; postPatch = '' @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; # Using c++14 because of build error # gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications @@ -153,5 +153,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ misuzu ]; platforms = with lib.platforms; unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index e6f35124a6fcc..be9e815b9ec46 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,22 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "skydns"; - version = "2.5.3a"; - rev = version; - - goPackagePath = "github.com/skynetservices/skydns"; + version = "unstable-2019-10-15"; src = fetchFromGitHub { - inherit rev; owner = "skynetservices"; repo = "skydns"; - sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; + rev = "94b2ea0d8bfa43395656ea94d4a6235bdda47129"; + hash = "sha256-OWLJmGx21UoWwrm6YNbPYdj3OgEZz7C+xccnkMOZ71g="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-J3+DACU9JuazGCZZrfKxHukG5M+nb+WbV3eTG8EaT/w="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/skynetservices/skydns/commit/37be34cd64a3037a6d5a3b3dbb673f391e9d7eb1.patch"; + hash = "sha256-JziYREg3vw8NMIPd8Zv8An7XUj+U6dvgRcaZph0DLPg="; + }) + ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; - meta = { + meta = with lib; { + description = "A distributed service for announcement and discovery of services"; + homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; + maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/servers/skydns/deps.nix b/pkgs/servers/skydns/deps.nix deleted file mode 100644 index a4f4eb1204582..0000000000000 --- a/pkgs/servers/skydns/deps.nix +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; - sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; - sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "40456948a47496dc22168e6af39297a2f8fbf38c"; - sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; - sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/stathat/go"; - fetch = { - type = "git"; - url = "https://github.com/stathat/go"; - rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93"; - sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; - sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; - sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } -] diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 3a5c3b47e6b0d..4309aaadf9dbc 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.24.6"; + version = "2.26.3"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-CGpPmarY990084/Whkk3YjzupPqU4FqAfpTXNFXIAH4="; + sha256 = "sha256-kNfFQnUFfIS9x6da0nmm4cHK16ZTScQXOa7lL6QFBDQ="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index d29453556be25..6e1f4c696517e 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-MziobrOqEUsg/XhzLChNker3OU9YAH0LmQ+i+UYoPkE="; + sha256 = "sha256-7LegGf/fCWJQfiayqkbg0S13NOICzxxCWxS+vXHmP08="; }; - vendorSha256 = "sha256-YmAPZtGq2wWqrmTwFOPvSZ3pXa3hUFd+TQfU+Nzhlvs="; + vendorHash = "sha256-k/IKpeSjgCYQRBRW/TMThQOFWfx1BFJpHpwMQxITkxY="; doCheck = false; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index b3d898dde651d..ee6cb17ff0ff5 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-v30F6JhLmPLuYVyegjMPOjUKQ51xxrNfYMqaEPmRuwI="; + hash = "sha256-OH5O0wOg36sAKWr8sFPYU8RX/S9DbbSnGJvQ1v2pXmQ="; }; - vendorHash = "sha256-TMwijafZ5ILTr9ZA5CG5uFFIZe6EmnLAL2zD25l/1gs="; + vendorHash = "sha256-drnVAWMj7x8HlEQXoichgl35qW07tsk3JvXU/d1ukAc="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 982242a0e78f0..6f13caff076f3 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-/tYQqS0l5Z/yeNd6GJHONtD3YeQ7nvvWcilBAahDDPA="; + hash = "sha256-kmbZ0fi7rbJUsMREOH+IxHIDfZ2qy+AD8Px9pu4eSxM="; }; - vendorHash = "sha256-3JQgtWaPi2e9lSXF+3IIXDptQXjFJOBsMPfisEea8kE="; + vendorHash = "sha256-4Y/98VEZWjk2k4UPtGEumOMbjjR4V1OnPvj5mxuX/DQ="; meta = with lib; { description = "Command line for managing SpiceDB"; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 2026ad05f3ffe..19a128dfc0038 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi"; }; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]); inherit nativeBuildInputs buildInputs; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9eacea78a37eb..60a6c88c4dd67 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -13,13 +13,17 @@ let # Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 - , linux-pam, numactl, pmdk + , linux-pam, numactl , fmt_8 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true , withEmbedded ? false + , withNuma ? false }: + let + isCross = stdenv.buildPlatform != stdenv.hostPlatform; + libExt = stdenv.hostPlatform.extensions.sharedLibrary; mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]); @@ -45,7 +49,7 @@ let ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) - ++ (if (lib.versionOlder version "10.6") + ++ (if (lib.versionOlder version "10.5") then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] else [ openssl curl ]); @@ -99,7 +103,7 @@ let ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [ # workaround for https://jira.mariadb.org/browse/MDEV-29925 "-Dhave_C__Wl___as_needed=" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals isCross [ # revisit this if nixpkgs supports any architecture whose stack grows upwards "-DSTACK_DIRECTION=-1" "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" @@ -169,16 +173,13 @@ let buildInputs = common.buildInputs ++ [ bzip2 lz4 lzo snappy xz zstd cracklib judy libevent libxml2 - ] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl + ] ++ lib.optional withNuma numactl ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] - ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; - propagatedBuildInputs = lib.optionals withEmbedded - (lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.lib - ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl); + propagatedBuildInputs = lib.optional withNuma numactl; postPatch = '' substituteInPlace scripts/galera_new_cluster.sh \ @@ -197,7 +198,7 @@ let "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" "-DWITHOUT_TOKUDB=1" - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [ + ] ++ lib.optionals withNuma [ "-DWITH_NUMA=ON" ] ++ lib.optionals (!withStorageMroonga) [ "-DWITHOUT_MROONGA=1" @@ -239,38 +240,53 @@ let }; in self: { + # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.27"; - hash = "sha256-SKHyIMoYuwxGN513/pjrdQvMcFLnPxDjJ26ipcUbirI="; + version = "10.4.28"; + hash = "sha256-AD/SPzxu5RYXbhtisLQ822zdPc1OMPhVwcWrK6r1qGw="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.18"; - hash = "sha256-NZOw3MDy6A6YF3AZ9dz6XMjBQXLOFhpvpQ+AhPLO90k="; + version = "10.5.19"; + hash = "sha256-JExKJCSQZBBmI8uEqm3lFN3xeH3oZmQHUoK7qOxXV/Q="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { - # Supported until 2026-07 - version = "10.6.11"; - hash = "sha256-V4S6TF2Hk7rbpYNIV2gk2YSewVLpy+5HoXZRYdhAyUo="; + # Supported until 2026-07-06 + version = "10.6.12"; + hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_108 = self.callPackage generic { - # Supported until 2023-05 - version = "10.8.6"; - hash = "sha256-qal8eZtpnhDJOWW71wQ0U/eiDhQL0inSCaoWFvKfv20="; + # Supported until 2023-05-20. TODO: remove ahead of 23.05 branchoff + version = "10.8.7"; + hash = "sha256-A6uqsKMvNTjqZZFbrUBBWf2mHEJE9HZJpC6xdUIGuAI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_109 = self.callPackage generic { - # Supported until 2023-08 - version = "10.9.4"; - hash = "sha256-Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ="; + # Supported until 2023-08-22. TODO: remove ahead of 23.05 branchoff? + version = "10.9.5"; + hash = "sha256-CXYrdcZEuUEukV0w4bJm3tc5ZRf8L9hrvmf+zDcGWtw="; + inherit (self.darwin) cctools; + inherit (self.darwin.apple_sdk.frameworks) CoreServices; + }; + mariadb_1010 = self.callPackage generic { + # Supported until 2023-11-17 + version = "10.10.3"; + hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130="; + inherit (self.darwin) cctools; + inherit (self.darwin.apple_sdk.frameworks) CoreServices; + }; + mariadb_1011 = self.callPackage generic { + # Supported until 2028-02-16 + version = "10.11.2"; + hash = "sha256-HIne4MrtD2i8Kh0gPrmKEjFQ5qF59u4PH8C6Pwjccdw="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index a292f691629db..cd91f2ef63d64 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchurl, cmake, python3 -, bison, openssl, readline, bzip2 -}: +{ lib, stdenv, fetchurl, cmake, python3, bison, openssl, readline, bzip2 }: stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.45.11"; + version = "11.45.13"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-0Hme9ohyRuiN9CAZq7SAWGcQxNakiDVWEoL+wt1GsfY="; + sha256 = "sha256-TYTzC1oiU/YwrJNABwyA50qSB12cwrMurqYFVCtSAcc="; }; postPatch = '' diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 758794ba876c2..6eca03c19447a 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "11.2.2"; + version = "12.2.0"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-MLB2R5ATVBewGaCle8NYPR1mZt2U3CCvEwf2dkBfNTI="; + sha256 = "sha256-Z0z9cDAF7TZ8IJr3Uh2xU0nK2+aNgerk5hO1kY+/wfY="; }; dontUnpack = true; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index f6f40bcd69571..ff277e06805c0 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - sha256 = "sha256-Szebu6jheBKKHO5KW9GuEW3ts9phIbcowY8PVMiB8yg="; + sha256 = "sha256-Pmx4jnDwZyx7OMiKbKdvMfN4axJWiZgMwGOrdSylgjQ="; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 93df798c8bcb6..38f3dfb96f2a0 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -62,7 +62,7 @@ let buildFlags = [ "world" ]; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; @@ -207,45 +207,45 @@ let in self: { postgresql_11 = self.callPackage generic { - version = "11.18"; + version = "11.19"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-0k8g78UukYrPvMoh6c6ijg4mO4RqDECPz6w7PEoPdQQ="; + hash = "sha256-ExCeK3HxE5QFwnIB2jczphrOcu4cIo2cnwMg4GruFMI="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.13"; + version = "12.14"; psqlSchema = "12"; - hash = "sha256-tsYjBGr0VI8RqEtAeTTWddEe0HDHk9FbBGg79fMi4C0="; + hash = "sha256-eFYQI304LIQtNW40cTjljAb/6uJA5swLUqxevMMNBD4="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.9"; + version = "13.10"; psqlSchema = "13"; - hash = "sha256-7xlmwKXkn77TNwrSgkkoy2sRZGF67q4WBtooP38zpBU="; + hash = "sha256-W7z1pW2FxE86iwWPtGhi/0nLyRg00H4pXQLm3jwhbfI="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.6"; + version = "14.7"; psqlSchema = "14"; - hash = "sha256-UIhA/BgJ05q3InTV8Tfau5/X+0+TPaQWiu67IAae3yI="; + hash = "sha256-zvYPAJj6gQHBVG9CVORbcir1QxM3lFs3ryBwB2MNszE="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; }; postgresql_15 = self.callPackage generic { - version = "15.1"; + version = "15.2"; psqlSchema = "15"; - hash = "sha256-ZP3yPXNK+tDf5Ad9rKlqxR3NaX5ori09TKbEXLFOIa4="; + hash = "sha256-maIXH8PWtbX1a3V6ejy4XVCaOOQnOAXe8jlB7SuEaMc="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index e437de887c78c..eaf631b4a8b2d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.4.2"; + version = "1.5.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P0Fd10Q1p+KrExb35G6otHpc6pD61WnMll45H2jkevM="; + hash = "sha256-EBmydzzT0GB1TaGpnxwj1Cq1vvnDlZ+wqJ5Dc3KDT38="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 1def48d46d976..e8a9a6fc09c12 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-pz9eHmd7GC30r0uUObOlrcdkAX4c+szjYAXS1U999CE="; + hash = "sha256-UhKJmYnqkxORb0eVqxbu+yaamZ7ISJTbSwArg76YY/Q="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix new file mode 100644 index 0000000000000..c5e536363fda3 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql }: + +stdenv.mkDerivation rec { + pname = "pgaudit"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "pgaudit"; + repo = "pgaudit"; + rev = version; + hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + }; + + buildInputs = [ libkrb5 openssl postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "Open Source PostgreSQL Audit Logging"; + homepage = "https://github.com/pgaudit/pgaudit"; + maintainers = with maintainers; [ idontgetoutmuch ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 77137d4447b23..8eb0cb7f42f84 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - sha256 = "sha256-I+MIQjZNsKHLsiCtvip73fA2LYPR7PVFgTBNtn+CtFE="; + hash = "sha256-bOckX7zvHhgJDDhoAm+VZVIeVIf2hG/3oWZWuTtnZPo="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4c5b006099185..14078659aeac0 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.6"; + version = "2.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-8HFyIzJ1iF3K2vTlibFallvkMKjFTJ2DO64fORToD8E="; + hash = "sha256-zl7AF+1hj6UFnf9sKO40ZTzm7edKguUYFqaT5/qf8Ic="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 7c9e8fa695958..045e381edd734 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.2"; + version = "2.10.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-3n3nqAVow8nIocXPsgCZcNkV+jr/G5/CmnSUfj2WMWo="; + sha256 = "sha256-3Pne4L9P8mJv2ja6EpxtpCBCYvlCP6D5CzDtkkvE23c="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 80065bde4ba16..2bf9db061a918 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -24,6 +24,8 @@ self: super: { pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; + pgaudit = super.callPackage ./ext/pgaudit.nix { }; + pgroonga = super.callPackage ./ext/pgroonga.nix { }; pgvector = super.callPackage ./ext/pgvector.nix { }; diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index a2d48d388c2ef..3f995c0e62d2c 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "proxysql"; - version = "2.4.5"; + version = "2.5.0"; src = fetchFromGitHub { owner = "sysown"; repo = pname; rev = version; - hash = "sha256-JWrll6VF0Ss1DlPNrh+xd3sGMclMeb6dlVgHd/UaNs0="; + hash = "sha256-psQzKycavS9xr24wGiRkr255IXW79AoG9fUEBkvPMZk="; }; patches = [ @@ -68,10 +68,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # otherwise, it looks for …-1.15 - ACLOCAL = "aclocal"; - AUTOMAKE = "automake"; - GIT_VERSION = version; dontConfigure = true; @@ -140,6 +136,18 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config + pushd libmicrohttpd/libmicrohttpd + autoreconf + popd + + pushd libconfig/libconfig + autoreconf + popd + + pushd libdaemon/libdaemon + autoreconf + popd + popd patchShebangs . ''; diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index a5c4d7f80cc20..05f8834c95383 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index fba4e6a1..ceff4f3d 100644 +index e7dae058..09c28859 100644 --- a/Makefile +++ b/Makefile @@ -57,11 +57,7 @@ endif @@ -15,7 +15,7 @@ index fba4e6a1..ceff4f3d 100644 USERCHECK := $(shell getent passwd proxysql) GROUPCHECK := $(shell getent group proxysql) -@@ -724,16 +720,10 @@ cleanbuild: +@@ -784,16 +780,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -36,20 +36,21 @@ index fba4e6a1..ceff4f3d 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 13eed9c5..9abb2262 100644 +index 23ef204c..3fbcc4a7 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -65,18 +65,11 @@ endif +@@ -65,10 +65,7 @@ endif libinjection/libinjection/src/libinjection.a: - cd libinjection && rm -rf libinjection-*/ || true - cd libinjection && tar -zxf libinjection-3.10.0.tar.gz --ifneq ($(CENTOSVER),6) + ifneq ($(CENTOSVER),6) - cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff --endif - sed -i 's/CC=/CC?=/' libinjection/libinjection/src/Makefile - cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE} + cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch + endif + ifeq ($(UNAME_S),Darwin) +@@ -80,8 +77,6 @@ endif libinjection: libinjection/libinjection/src/libinjection.a libssl/openssl/libssl.a: @@ -58,16 +59,25 @@ index 13eed9c5..9abb2262 100644 cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests -@@ -93,8 +86,6 @@ ifeq ($(MIN_VERSION),$(lastword $(sort $(GCC_VERSION) $(MIN_VERSION)))) +@@ -99,9 +94,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS))) endif libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a - cd libhttpserver && rm -rf libhttpserver-*/ || true - cd libhttpserver && tar -zxf libhttpserver-0.18.1.tar.gz - ifeq ($(REQUIRE_PATCH), true) +-#ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch src/httpserver/basic_auth_fail_response.hpp < ../basic_auth_fail_response.hpp.patch cd libhttpserver/libhttpserver && patch src/httpserver/create_webserver.hpp < ../create_webserver.hpp.patch -@@ -117,34 +108,16 @@ endif + cd libhttpserver/libhttpserver && patch src/httpserver/deferred_response.hpp < ../deferred_response.hpp.patch +@@ -112,7 +104,6 @@ libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmi + cd libhttpserver/libhttpserver && patch src/httpserver/http_response.hpp < ../http_response.hpp.patch + cd libhttpserver/libhttpserver && patch src/httpserver/string_response.hpp < ../string_response.hpp.patch + cd libhttpserver/libhttpserver && patch -p0 < ../re2_regex.patch +-#endif + cd libhttpserver/libhttpserver && patch -p0 < ../final_val_post_process.patch + cd libhttpserver/libhttpserver && patch -p0 < ../empty_uri_log_crash.patch + ifeq ($(UNAME_S),FreeBSD) +@@ -124,35 +115,17 @@ endif libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -82,6 +92,7 @@ index 13eed9c5..9abb2262 100644 - cd curl && rm -rf curl-*/ || true - cd curl && tar -zxf curl-*.tar.gz - #cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} + cd curl/curl && patch configure < ../configure.patch cd curl/curl && CFLAGS=-fPIC ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-librtmp --without-libpsl --without-zstd --with-ssl=$(shell pwd)/libssl/openssl/ --enable-shared=no && CC=${CC} CXX=${CXX} ${MAKE} curl: curl/curl/lib/.libs/libcurl.a @@ -96,13 +107,13 @@ index 13eed9c5..9abb2262 100644 - cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.68.tar.gz - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch -endif --ifeq ($(OS),Darwin) +-ifeq ($(UNAME_S),Darwin) - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch -endif cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a -@@ -155,8 +128,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: +@@ -163,8 +136,6 @@ cityhash/cityhash/src/.libs/libcityhash.a: cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/liblz4.a: @@ -111,16 +122,16 @@ index 13eed9c5..9abb2262 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/liblz4.a -@@ -181,8 +152,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -189,8 +160,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: - cd libdaemon && rm -rf libdaemon-*/ || true - cd libdaemon && tar -zxf libdaemon-0.14.tar.gz - cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && ./configure --disable-examples + cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -253,17 +222,12 @@ sqlite3/sqlite3/sqlite3.o: +@@ -264,17 +233,12 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: @@ -138,7 +149,7 @@ index 13eed9c5..9abb2262 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p0 < ../include_limits.patch -@@ -273,10 +237,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: +@@ -284,10 +248,6 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a re2/re2/obj/libre2.a: @@ -147,9 +158,9 @@ index 13eed9c5..9abb2262 100644 -# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile -# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - cd re2/re2 && sed -i -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile - cd re2/re2 && sed -i -e 's/RE2_CXXFLAGS?=-std=c++11 /RE2_CXXFLAGS?=-std=c++11 -fPIC /' Makefile -@@ -285,8 +245,6 @@ re2/re2/obj/libre2.a: + ifeq ($(UNAME_S),Darwin) + cd re2/re2 && sed -i '' -e 's/-O3 /-O3 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile +@@ -301,8 +261,6 @@ endif re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix new file mode 100644 index 0000000000000..713072953be28 --- /dev/null +++ b/pkgs/servers/sql/rqlite/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "rqlite"; + version = "7.6.1"; + + src = fetchFromGitHub { + owner = "rqlite"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WvEnMAz3dKG8xMlQzm7E0TmAgvsrRED50bb4Ved1+4U="; + }; + + vendorSha256 = "sha256-qirt5g7dcjAnceejrBnfhDpA4LSEj7eOuznSlfUBUgo="; + + subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; + + # Leaving other flags from https://github.com/rqlite/rqlite/blob/master/package.sh + # since automatically retriving those is nontrivial and inessential + ldflags = [ + "-s" "-w" + "-X github.com/rqlite/rqlite/cmd.Version=${src.rev}" + ]; + + # Tests are in a different subPackage which fails trying to access the network + doCheck = false; + + meta = with lib; { + description = "The lightweight, distributed relational database built on SQLite"; + homepage = "https://github.com/rqlite/rqlite"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 492f323d3845a..0e0c84e97de6e 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.14.1"; + version = "2.14.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - sha256 = "1x9l39yf65a8ji8x84h583s82hlj6s99gj0fsm4sh2l4i8yrq2yb"; + sha256 = "sha256-c+bPe1t7Nhpx5fwwpLYtsuzxleLd4b1SwBFBaySmLOg="; }; - cargoSha256 = "sha256-Ox1mHjeBprxmuqPIVxeTXDyFcEuipSJ7UjXZjcLElIs="; + cargoSha256 = "sha256-K+YXl1SFVe6aBt663QXlQFD8jB5pvlLwNqUvUP+5aU8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/servers/stayrtr/default.nix index a168cf5b1eec0..0193f3ede5665 100644 --- a/pkgs/servers/stayrtr/default.nix +++ b/pkgs/servers/stayrtr/default.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "stayrtr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bgp"; repo = "stayrtr"; rev = "v${version}"; - sha256 = "10ndb8p7znnjycwg56m63gzqf9zc6lq9mcvz4n48j0c4il5xyn8x"; + sha256 = "sha256-oRFBvue5Tcgty1GgsZGb/CMHmKM0mIc5vWOMsL/0IfI="; }; - vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; + vendorHash = "sha256-VomrmyNa5I6AVSpw5sg0e4b7w/JlFQINBYm+eh1FoNw="; ldflags = [ "-s" diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 359dbfb5979dd..65189094d0c76 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = version; - hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU="; + hash = "sha256-zxpqQpzmPPU6V5QITK9SgAAI7l3/7+h0u3/bZgiU7y4="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE="; + cargoHash = "sha256-U0xHqOh0ii4PE9UYKo+diqSoZ1ZjzBmHILvAhHSZD0A="; buildFeatures = [ "grpcio/openssl" ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b936fd316283c..d0ce2ee87d6f6 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.36.0"; + version = "1.36.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-hNyEABs/GdfOx6vLTVBgbOzkbFvEDYZ0y1y0a0mIsfA="; + hash = "sha256-5rGRe4ENIQVz8KDy1OuSKtD7UMVYmU2DaJAn7wrhXVQ="; }; - vendorSha256 = "sha256-Jy3kjUA8qLhcw9XLw4Xo1zhD+IWZrDNM79TsbnKpx/g="; + vendorHash = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index cf1ef65b61a82..52c21cb63674d 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -2,17 +2,21 @@ , buildGoModule , rustPlatform , fetchFromGitHub +, fetchYarnDeps , makeWrapper , symlinkJoin , CoreFoundation , AppKit , libfido2 +, nodejs , openssl , pkg-config , protobuf , Security , stdenv , xdg-utils +, yarn +, yarn2nix-moretea , nixosTests , withRdpClient ? true @@ -23,13 +27,13 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - hash = "sha256-8S+r5pd8icOljGkxqLsZKmh4+nIwPQErs7RK88q0vOQ="; + hash = "sha256-jJfOgcwKkNFO/5XHxMoapZxM8Tb0kEgKVA7SrMU7uW4="; }; - version = "11.1.4"; + version = "11.3.4"; rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - cargoHash = "sha256-XuJTdpb2eIeXnVtuSOlHjZQ8PpwxK4/4siK2S2h6xIw="; + cargoHash = "sha256-TSIwLCY01ygCWT73LR/Ch7NwPQA3a3r0PyL3hUzBNr4="; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -50,19 +54,49 @@ let ''; }; - webassets = fetchFromGitHub { - owner = "gravitational"; - repo = "webassets"; - # Submodule rev from https://github.com/gravitational/teleport/tree/v11.1.4 - rev = "5f2597d5987804d37e61da8ae9d1a5a2d6b43ef4"; - hash = "sha256-meRinI4VsJuRoJznVULHL38bUIu352lf5LRPLlef1OA="; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-MAGeWzA366yzpjdCY0+X6RV5MKcsHa/xD5CJu6ce1FU="; + }; + + webassets = stdenv.mkDerivation { + pname = "teleport-webassets"; + inherit src version; + + nativeBuildInputs = [ + nodejs + yarn + yarn2nix-moretea.fixup_yarn_lock + ]; + + configurePhase = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = '' + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + fixup_yarn_lock yarn.lock + + yarn install --offline \ + --frozen-lockfile \ + --ignore-engines --ignore-scripts + patchShebangs . + + yarn build-ui-oss + ''; + + installPhase = '' + mkdir -p $out + cp -R webassets/. $out + ''; }; in buildGoModule rec { pname = "teleport"; inherit src version; - vendorHash = "sha256-nlwBjeh0BlZ3vUQxvaYW0aK5Y2YK1gEar9s1IMJJEMY="; + vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA="; + proxyVendor = true; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "libfido2" "webassets_embed" ] @@ -85,10 +119,7 @@ buildGoModule rec { outputs = [ "out" "client" ]; preBuild = '' - mkdir -p build - echo "making webassets" - cp -r ${webassets}/* webassets/ - make -j$NIX_BUILD_CORES lib/web/build/webassets + cp -r ${webassets} webassets '' + lib.optionalString withRdpClient '' ln -s ${rdpClient}/lib/* lib/ ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/ diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index e9fabdfbd687e..7781f30809b09 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "6.5.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U3RGQADiS3mNq+4U+Qn+LMYbX8vxkTmofnRc+yrAcIA="; + sha256 = "sha256-u0Zl2SULBWrUu3V7VbbbkSMPoRijWQRYCMcqD4nC3Bw="; }; - vendorSha256 = "sha256-ljPFNjnmPaUx1PHtjlJh9ubKBDS3PgvbqTce9pi3GSc="; + vendorHash = "sha256-0fvvCOvRM3NbcUln5UfR/jTxVKZuQudgm6GivKaYm2c="; ldflags = [ "-s" diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix index ab059b518e745..86da469e34683 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeymarker"; inherit version; vendorSha256 = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU="; - src = fetchurl { - url = "https://github.com/honeycombio/honeymarker/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeymarker"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix index c7fde50e15d0f..60e6a537e42eb 100644 --- a/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix @@ -1,6 +1,6 @@ generic: { v0_2_1 = generic { version = "0.2.1"; - sha256 = "0gp427bsc1y7k6j1sqgl8r3kng5b0qhmqd4bpfb9139ivmp2sykk"; + sha256 = "sha256-tiwX94CRvXnUYpiux94XhOj2abn1Uc+wjcDOmw79ab4="; }; } diff --git a/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/pkgs/servers/tracing/honeycomb/honeytail/default.nix index cbe901f2859a1..b5c21ed1d94a3 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeytail"; inherit version; vendorSha256 = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY="; - src = fetchurl { - url = "https://github.com/honeycombio/honeytail/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeytail"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix index 370d645ab6269..295cc7c6353e2 100644 --- a/pkgs/servers/tracing/honeycomb/honeytail/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeytail/versions.nix @@ -1,6 +1,6 @@ generic: { v1_6_0 = generic { version = "1.6.0"; - sha256 = "039svpvqjck7s3rq86s29xgcyxl1wr0zj90s3jsyp058zk1dgwdy"; + sha256 = "sha256-S0hIgNNzF1eNe+XJs+PT7EUIl5oJCXu+B/zQago4sf8="; }; } diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index 839b8ec053f73..e1009c35a8823 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeyvent"; inherit version; vendorSha256 = null; - src = fetchurl { - url = "https://github.com/honeycombio/honeyvent/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeyvent"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix index 831de6c93372f..1bf2443aa183a 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix @@ -1,6 +1,6 @@ generic: { v1_1_0 = generic { version = "1.1.0"; - sha256 = "0ar2m25ngdd1wk7d70j2781wbrvhjhf9cj9qvp24jjrhqng6hvn7"; + sha256 = "sha256-yFQEOshjaH6fRCQ7IZChANI9guZlTXk35p1NzQvxUdI="; }; } diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index d058a0b2931a5..169222e4d43d7 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-m7tfDd0Yjg4+VHZPxYJXEx2XNNodepMcPLucBjvd88s="; + sha256 = "sha256-sVvQQm2hE5J6ZesL8YRkdq/OwzHziBCsa3D/b1kYPpw="; }; vendorSha256 = null; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 60eb9a22a8299..4bc0a230d3ccd 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.9.6"; + version = "2.9.8"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-T1yJT45bCjGizS6bqkzc6EF9uhJ3dhXsSc5X3di6SJ4="; + sha256 = "sha256-3vrMh0zrJQhIG9VAlG/iHlOVlUFlE4qd0EkOB0ckAtY="; stripRoot = false; }; - vendorSha256 = "sha256-g/UL+cUenWW94afWIGFU2fBSpo48YcUIUaX/1M5vhNk="; + vendorSha256 = "sha256-NyI+3wYRZ3L98qwrkDfrbJK4S+Wdx/UJ8FlLAMhaL7A="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 2bd4cf324823b..8d2f4f42afb3e 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; - version = "2.10.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; rev = "v${version}"; - sha256 = "sha256-a8IZZbTlVU8Cu1F/HwEnsUW3eRqaTnKuJ166WJIw9/A="; + sha256 = "sha256-sHKht4EXKIibk+McMR+fKv7eZFJsGgZWhfxlLssA/Sw="; }; dontBuild = true; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 833d31de40131..75466c0ee21ce 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -75,10 +75,13 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" - ]; + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but unrecognized with GCC 9 + "-Wno-error=use-after-free" + ]); configureFlags = [ # disable dvbscan, as having it enabled causes a network download which diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/servers/ucarp/default.nix index a3b02d493e2e5..b9a8bbea48045 100644 --- a/pkgs/servers/ucarp/default.nix +++ b/pkgs/servers/ucarp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: daemonize.o:/build/ucarp-1.5.2/src/ip_carp.h:73: multiple definition of # `__packed'; ucarp.o:/build/ucarp-1.5.2/src/ip_carp.h:73: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Userspace implementation of CARP"; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index acfb546277fa1..b88509555ba60 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -66,7 +66,7 @@ in rec { }; unifi7 = generic { - version = "7.3.76"; - sha256 = "sha256-/g/gCAhCT+8eyYDiIkF8WnTIWgEzneiAYHXj1pYj/dA="; + version = "7.3.83"; + sha256 = "sha256-mDbF9vfoWjvABxcOIRngStji7xBllgZfUhVA9kF6ERU="; }; } diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index 789f3ba8d679a..d04c0cd99ff69 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.61.1"; + version = "1.63.2"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-eLTIpRmKewBghUYFot8I3iTeiI6wlU7WNs8/X3w+U80="; + sha256 = "sha256-K1DlGpamX+MkVpevhZBINtNawkPfN5ofHOcsiBHgnC4="; }; postPatch = '' diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 68d43313db244..89b1dd7f550e8 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libxslt, groff, ncurses, pkg-config, readline, libedit +{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libunwind, libxslt, groff, ncurses, pkg-config, readline, libedit , coreutils, python3, makeWrapper, nixosTests }: let @@ -18,6 +18,7 @@ let ] ++ lib.optional (lib.versionOlder version "7") pcre ++ lib.optional (lib.versionAtLeast version "7") pcre2 + ++ lib.optional stdenv.hostPlatform.isDarwin libunwind ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; buildFlags = [ "localstatedir=/var/spool" ]; @@ -31,7 +32,7 @@ let ''; # https://github.com/varnishcache/varnish-cache/issues/1875 - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; outputs = [ "out" "dev" "man" ]; @@ -41,7 +42,6 @@ let }; meta = with lib; { - broken = stdenv.isDarwin; description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 31aaad835bdb5..c3bac64ef8514 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; doCheck = true; diff --git a/pkgs/servers/web-apps/5etools/default.nix b/pkgs/servers/web-apps/5etools/default.nix new file mode 100644 index 0000000000000..03335be5ae84d --- /dev/null +++ b/pkgs/servers/web-apps/5etools/default.nix @@ -0,0 +1,19 @@ +{ fetchFromGitHub, lib }: + +fetchFromGitHub rec { + pname = "5etools"; + version = "1.175.2"; + + owner = "5etools-mirror-1"; + repo = "5etools-mirror-1.github.io"; + rev = "v${version}"; + hash = "sha256-0+QjtcmKsfcSehvn4DChBhSVooy9wlqaSCgeAFgeL+w="; + + meta = with lib; { + description = "A suite of browser-based tools for players and DMs of D&D 5e"; + homepage = "https://5e.tools"; + changelog = "https://github.com/5etools-mirror-1/5etools-mirror-1.github.io/releases/tag/v${version}"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 75fe60e2557a1..e96528d7cd6ac 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "22.11.1"; + version = "23.01.1"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0yofstZiTK/I6c8go5ENivq41nOfL+0mzIHgbQSEUWo="; + sha256 = "sha256-S4yGys1Lc2FAd3RKI4KdE9X12rsQyVcPQ+Biwwrnb0I="; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 24340a54e81e1..f07b07c3a3ecf 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,20 +15,20 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-337e447997148b9e5024c2d0ae69618b1cbf80d6"; + name = "aws-aws-sdk-php-c600a07da531d6c29af791b9d2e8b6df796aa14b"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/337e447997148b9e5024c2d0ae69618b1cbf80d6"; - sha256 = "1pwghj67zah616cvdrbs2fwgwn99jhxi95mdfq6l2jhpy59gymkc"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/c600a07da531d6c29af791b9d2e8b6df796aa14b"; + sha256 = "03iisnif804dkgnynn24y6ji1hnq95ryv8vwgwi6398apcz6vypn"; }; }; }; "bacon/bacon-qr-code" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "bacon-bacon-qr-code-d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; + name = "bacon-bacon-qr-code-8674e51bb65af933a5ffaf1c308a660387c35c22"; src = fetchurl { - url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; - sha256 = "0k2z8a6qz5xg1p85vwcp58yqbiw8bmnp3hg2pjcaqlimnf65v058"; + url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22"; + sha256 = "0hb0w6m5rwzghw2im3yqn6ly2kvb3jgrv8jwra1lwd0ik6ckrngl"; }; }; }; @@ -85,10 +85,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"; + name = "doctrine-dbal-88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"; - sha256 = "09kv9g6693gr3i2wbfc1riyzgfkm5kkamhzfj4skrsw14pvacsgf"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"; + sha256 = "1xz7yyq0r8378zb4jrac13z0762pid0dxxnaj0rx82f7vwbxaqas"; }; }; }; @@ -235,10 +235,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-7411d9fa71c1b0fd73a33e225f14512b74e6c81e"; + name = "laravel-framework-e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/7411d9fa71c1b0fd73a33e225f14512b74e6c81e"; - sha256 = "0pdxr823p52cf284yfqwncii52g4zgk2gw5prn774h26v42dwaqw"; + url = "https://api.github.com/repos/laravel/framework/zipball/e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49"; + sha256 = "1k7afj4himxmhv02lmq8dc992m2vdkw8hcjyfcnff99cv555z9ph"; }; }; }; @@ -255,20 +255,20 @@ let "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-1cd1682b709b8808a5b5dbb68179a58d1342aa7b"; + name = "laravel-socialite-dae03ca4ecfe3badafcdfb81965d2279080051f4"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/1cd1682b709b8808a5b5dbb68179a58d1342aa7b"; - sha256 = "0h37rw9ndh56dh71d8jaxidpnyr7xs42nnim88aaxas304j7jdwa"; + url = "https://api.github.com/repos/laravel/socialite/zipball/dae03ca4ecfe3badafcdfb81965d2279080051f4"; + sha256 = "1cv67knibrhyfbimgbnig4hrnq2rjyi7kqmsqyqs7il2nizl51vm"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-5062061b4924af3392225dd482ca7b4d85d8b8ef"; + name = "laravel-tinker-74d0b287cc4ae65d15c368dd697aae71d62a73ad"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef"; - sha256 = "0smv55xbj6pk223v3nfd0fi5n4l8v85c4pra98ahq3615xma3k8c"; + url = "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad"; + sha256 = "1rhppd4zzz47abjahid8hdhwrzjrnbwkcy0cqqws5dia4x81k7xb"; }; }; }; @@ -375,20 +375,20 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-ad35dd71a6a212b98e4b87e97389b6fa85f0e347"; + name = "nesbot-carbon-09acf64155c16dc6f580f36569ae89344e9734a3"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347"; - sha256 = "1a7qlk82jfxnf84v4vwwgs9b325mb07whkc5vxrqjjjp8krncxbi"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3"; + sha256 = "1m4sb4vnimg3238g0mivnxgfmf3lwkb3v2njmird20jrh48k4c69"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"; + name = "nikic-php-parser-570e980a201d8ed0236b0a62ddf2c9cbb2034039"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"; - sha256 = "0lsw925jy1y1vvsx5da6abn1ky7g6whaxx9g524jgqgbaljrjhxm"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039"; + sha256 = "1q3hnpjya4rsxfh72ccs2vj3gz8h0sn12290w8wvkz9pvi0qmmmr"; }; }; }; @@ -465,10 +465,10 @@ let "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-dbc2307d5c69aeb22db136c52e91130d7f2ca761"; + name = "phpseclib-phpseclib-f28693d38ba21bb0d9f0c411ee5dae2b178201da"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761"; - sha256 = "1xpb0wi54rg33w7w357l6vh1kg9yh0pwabhmf8r9ih35s05n58a9"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da"; + sha256 = "11hvq1mwk2zn1fgrwvifh5z4md178vzka5nfykj8l28vk7r0vb98"; }; }; }; @@ -575,10 +575,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-1acec99d6684a54ff92f8b548a4e41b566963778"; + name = "psy-psysh-e9eadffbed9c9deb5426fd107faae0452bf20a36"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778"; - sha256 = "169v5160qhq07n3mvhifrgvjqrbm0306nn2ibiqwrcfqyyhq43z0"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36"; + sha256 = "0yaj5ixg8zb6hh9swpcc29dcrpffjn4cxp61qz2zqbizvq2d6z0z"; }; }; }; @@ -595,10 +595,10 @@ let "ramsey/collection" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a"; + name = "ramsey-collection-ad7475d1c9e70b190ecffc58f2d989416af339b4"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a"; - sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6"; + url = "https://api.github.com/repos/ramsey/collection/zipball/ad7475d1c9e70b190ecffc58f2d989416af339b4"; + sha256 = "1a1wqdwdrbzkf2hias2kw9crr31265pn027vm69pr7alyq2qrzfw"; }; }; }; @@ -725,20 +725,20 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-ea59bb0edfaf9f28d18d8791410ee0355f317669"; + name = "symfony-console-58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669"; - sha256 = "1qvr9av4c9kac5q2lpwiwq269rq5pxdvnvb32asysifw30zd5j3d"; + url = "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"; + sha256 = "1r8a7hra81wfs10m235qhq9xdgini4gx9hf86l1ijbp7k6aszk7b"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-c1681789f059ab756001052164726ae88512ae3d"; + name = "symfony-css-selector-052ef49b660f9ad2a3adb311c555c9bc11ba61f4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d"; - sha256 = "1v1kpfqc4njdpqqa668vkz7mqxsklzbsf62pcgdvkbg724ck4zis"; + url = "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4"; + sha256 = "1nracybpl4i2w6vcfhymd0p7bj9cnk5s2frp6dah4anfhmdjk16a"; }; }; }; @@ -755,20 +755,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-539cf1428b8442303c6e876ad7bf5a7babd91091"; + name = "symfony-error-handler-b900446552833ad2f91ca7dd52aa8ffe78f66cb2"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/539cf1428b8442303c6e876ad7bf5a7babd91091"; - sha256 = "0x2r3kpip9cmdn5d47isamyas13sl43y50wfk23zwj5vh70qgh5s"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/b900446552833ad2f91ca7dd52aa8ffe78f66cb2"; + sha256 = "0rsp4l6azy715r638xbxp8aydksz8v8r2kaz2590bg7c44v52zf0"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; + name = "symfony-event-dispatcher-8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; - sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"; + sha256 = "0mp91rpqbjarbh9jzyqa8cv012ilarwa9yx2rhqvms8bhk0aq7qi"; }; }; }; @@ -785,40 +785,40 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-7872a66f57caffa2916a584db1aa7f12adc76f8c"; + name = "symfony-finder-40c08632019838dfb3350f18cf5563b8080055fc"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c"; - sha256 = "111qy05azqwj14v0k034lwd970slx081x56pnicyxsbg3yc9wmnp"; + url = "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc"; + sha256 = "0gszqsqjgjf05hrycks1sgvizlfx1y6qnwh8cvcih50nmqn2q950"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-75bd663ff2db90141bfb733682459d5bbe9e29c3"; + name = "symfony-http-foundation-b64a0e2df212d5849e4584cabff0cf09c5d6866a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3"; - sha256 = "195w56aicv57nmcwsai6jklicb9qqak4imk4xwsgc3i98yw3md2w"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a"; + sha256 = "01l1349d2pab5vsihripq8718988yz1kh67bpp3j1xvgzd09b5a1"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-fc63c8c3e1036d424820cc993a4ea163778dc5c7"; + name = "symfony-http-kernel-5da6f57a13e5d7d77197443cf55697cdf65f1352"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/fc63c8c3e1036d424820cc993a4ea163778dc5c7"; - sha256 = "0z1cg1ac1r00c0i5apvk8rrglwswcy6gx9w9v5kmk7ajijnk583m"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/5da6f57a13e5d7d77197443cf55697cdf65f1352"; + sha256 = "1y0mqas5v4rhrmsgizv6pqqhxy49hm6wfs1wahaaxcm3zjip1504"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"; + name = "symfony-mime-2a83d82efc91c3f03a23c8b47a896df168aa5c63"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"; - sha256 = "1r06lijy4zbqppyfnvnq2arbjn0dwzb1d14lcy5wsbh3k3bgpsvq"; + url = "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63"; + sha256 = "1rkg5728y052hq1sag41w46kxnmyfm6jf5bn29canbnx05x32xly"; }; }; }; @@ -935,10 +935,10 @@ let "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-5c9b129efe9abce9470e384bf65d8a7e262eee69"; + name = "symfony-routing-4ce2df9a469c19ba45ca6aca04fec1c358a6e791"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69"; - sha256 = "0pa3zqqsa9jf362zdhg8jhppv1z7nnj6hq65dym473p1c3zwyfxb"; + url = "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791"; + sha256 = "1dqnxgkm817msrimhfs9l3d3k4zsjy7zgy2avaq23sm4yvm3nbyw"; }; }; }; @@ -955,10 +955,10 @@ let "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"; + name = "symfony-string-55733a8664b8853b003e70251c58bc8cb2d82a6b"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"; - sha256 = "1hwji8pwsfb79sdrigbisxs0cjnhs1qbm6rrflhqyhpviwvbhyqx"; + url = "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b"; + sha256 = "0mbagzl3kmrfdkvrb2nddngnzz0cy18r59gipmfsa60n1d7bww4l"; }; }; }; @@ -985,20 +985,20 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-6894d06145fefebd9a4c7272baa026a1c394a430"; + name = "symfony-var-dumper-ad74890513d07060255df2575703daf971de92c7"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430"; - sha256 = "055s38szlhpxrhv1kjawsm5rwh6dr7drk9jpyj6a5r0g4jn63m72"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7"; + sha256 = "0i1k6x0rfg17fjbcqgppp0vmhp7y597vik7vs6475v20rmvhdncd"; }; }; }; "tijsverkoyen/css-to-inline-styles" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-4348a3a06651827a27d989ad1d13efec6bb49b19"; + name = "tijsverkoyen-css-to-inline-styles-c42125b83a4fa63b187fdf29f9c93cb7733da30c"; src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/4348a3a06651827a27d989ad1d13efec6bb49b19"; - sha256 = "0fs2w9hw0drf1hszidrmplrph7ay8m8pv58pqv26v0228m4l6vlm"; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c"; + sha256 = "0ckk04hwwz0fdkfr20i7xrhdjcnnw1b0liknbb81qyr1y4b7x3dd"; }; }; }; diff --git a/pkgs/servers/web-apps/bookstack/update.sh b/pkgs/servers/web-apps/bookstack/update.sh index f61a511059020..f8db51edf745e 100755 --- a/pkgs/servers/web-apps/bookstack/update.sh +++ b/pkgs/servers/web-apps/bookstack/update.sh @@ -7,7 +7,7 @@ if ! command -v composer2nix &> /dev/null; then exit 1 fi -CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; bookstack.version)') +CURRENT_VERSION=$(nix eval -f ../../../.. --raw bookstack.version) TARGET_VERSION_REMOTE=$(curl https://api.github.com/repos/bookstackapp/bookstack/releases/latest | jq -r ".tag_name") TARGET_VERSION=${TARGET_VERSION_REMOTE:1} BOOKSTACK=https://github.com/bookstackapp/bookstack/raw/$TARGET_VERSION_REMOTE diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 7a9b390d014ef..b5b02fc70c84e 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -1,25 +1,59 @@ -{ stdenv, pkgs, makeWrapper, runCommand, lib, writeShellScript -, fetchFromGitHub, bundlerEnv, callPackage - -, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk, nettools -, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead -, oxipng, libpsl, redis, postgresql, which, brotli, procps, rsync, icu -, fetchYarnDeps, yarn, fixup_yarn_lock, nodePackages, nodejs-14_x +{ stdenv +, pkgs +, makeWrapper +, runCommand +, lib +, writeShellScript +, fetchFromGitHub +, bundlerEnv +, callPackage + +, ruby_3_1 +, replace +, gzip +, gnutar +, git +, cacert +, util-linux +, gawk +, nettools +, imagemagick +, optipng +, pngquant +, libjpeg +, jpegoptim +, gifsicle +, jhead +, oxipng +, libpsl +, redis +, postgresql +, which +, brotli +, procps +, rsync +, icu +, fetchYarnDeps +, yarn +, fixup_yarn_lock +, nodePackages , nodejs-16_x , plugins ? [] }@args: let - version = "2.9.0.beta14"; + version = "3.1.0.beta2"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-rdH6tALfhZyCGq1dtOQyuRlEYHSmWgvSz2qG6jrwPu0="; + sha256 = "sha256-wkNTm5/QyujPcMUrnc6eWmjhrRQAthhmejmjpy6zmbE="; }; + ruby = ruby_3_1; + runtimeDeps = [ # For backups, themes and assets rubyEnv.wrappedRuby @@ -165,7 +199,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "1rj8bbhmrnnhaiqw2bik8dilk7g35yhis5p7yww57zy4k5ghjvlw"; + sha256 = "0ryc4p5s35mzg1p71z98x5fvr5fpldmgghdi1viha4ckbpv153lw"; }; nativeBuildInputs = runtimeDeps ++ [ @@ -174,7 +208,7 @@ let nodePackages.uglify-js nodePackages.terser yarn - nodejs-14_x + nodejs-16_x ]; outputs = [ "out" "javascripts" ]; diff --git a/pkgs/servers/web-apps/discourse/how_to_update.md b/pkgs/servers/web-apps/discourse/how_to_update.md new file mode 100644 index 0000000000000..c402325babc85 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/how_to_update.md @@ -0,0 +1,24 @@ +To update discourse, do the following: + +1. Switch to and work from the `master` branch and the directory this + file is in. +2. Run `./update.py print-diffs` and update the nginx settings and + backend settings accordingly. If you don't know how to, ask for + help - do not skip this step! +3. Run `./update.py update`. +4. Run `nix build -L -f ../../../../ discourse.tests` to make sure the + update works. Also test manually, if possible. +5. If the update works, commit it. If not, apply necessary fixes and + commit. No manual fixes that would be overwritten by the + `./update.py` script should be committed - the script should be + fixed instead. +6. Run `./update.py update-mail-receiver`. If there's an update, do + step 4 and 5 again. +7. Run `./update.py update-plugins`. +8. Run `nix build -L -f ../../../../ discourseAllPlugins.tests` to + make sure the plugins build and discourse starts with them. Also + test manually, if possible. +9. If the update works, commit it. If not, apply necessary fixes and + commit. No manual fixes that would be overwritten by the + `./update.py` script should be committed - the script should be + fixed instead. diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index 0712a06863e5c..4ddb8995b6220 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -18,6 +18,7 @@ in discourse-oauth2-basic = callPackage ./discourse-oauth2-basic {}; discourse-openid-connect = callPackage ./discourse-openid-connect {}; discourse-prometheus = callPackage ./discourse-prometheus {}; + discourse-reactions = callPackage ./discourse-reactions {}; discourse-saved-searches = callPackage ./discourse-saved-searches {}; discourse-solved = callPackage ./discourse-solved {}; discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 4903be6b65211..e6c32028f65dd 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "889df32cc61792ed7b1981a08f0b0e9c46da2a56"; - sha256 = "sha256-ggMmIzjb4CBNAJTf8E09iaN5AGPj+BDzRf2y3h4DCMc="; + rev = "c6e6a883f66670e5cfc1eb973af8ac5b7c20f815"; + sha256 = "sha256-OwNV+ZNogUgd6ZKdXwUqoMqcZKc4jbf276rHIYQzjYc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index 824803dfc0267..4e5ea7be8e65b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "88ff27dc22198075f1ee8aba3f2b032187b73b9c"; - sha256 = "sha256-MSwX4qEgrWMTNhF1UE6/GMvo/ZPvg8KZF3DvQutRBVY="; + rev = "f9ebbf016c8c5c763473ff36cc30fdcdf8fcf480"; + sha256 = "sha256-7iCKhMdVlFdHMXxU8mQMU1vFiAbr1qKvG29VdAki+14="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-bbcode-color"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile index faf4db6ca825b..76faf85df5e2f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile @@ -3,4 +3,4 @@ source "https://rubygems.org" # gem "rails" -gem 'rrule', '0.4.4', require: false +gem "rrule", "0.4.4", require: false diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index b5284f49fa85c..91e6d08c2717e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - minitest (5.16.3) + minitest (5.17.0) rrule (0.4.4) activesupport (>= 2.3) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) PLATFORMS @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.3.25 + 2.4.6 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index b757603142101..28e1001b7f079 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "f4f16d958e5cec5fab109d09a7bfb50fc2b8da12"; - sha256 = "sha256-TWIWHOVeq3IKjinycaoiVccFKaP4UbNUpZ5n/SQ6afA="; + rev = "b71d4979370dcbd6f193b2ac5cfa0267f8a19fed"; + sha256 = "sha256-XGybZqoM0nX8acLo3iwo+zD+zA4pz/ekLOnmDRNIVSo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 3b4dd74420300..d2203b1825863 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f"; type = "gem"; }; - version = "7.0.4"; + version = "7.0.4.2"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; rrule = { dependencies = ["activesupport"]; @@ -58,9 +58,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 091979831eac6..eb3da42373a89 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "fe92bc1324fe0d2519f0e33b3fd89a4bed21b2e9"; - sha256 = "sha256-m+DDS93XJAN9RqX8pXeA78gY+p+7A2ey1oblGpcB4L0="; + rev = "b30b20d43ba5cbbb1ff1476bb43e97d5b8a807e8"; + sha256 = "sha256-XROYSqGy4Z39VAlMXCbx9d+kivpknN98Kn/HhoC4ndQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index dd4733f5186c5..41c816249c21c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "f6dde41cba2722970cc1a49f47636174a6ec7797"; - sha256 = "sha256-Cn+Ti1DYcFRqunEEFjGJuhnICO+53IX7tF7U8MkzJX0="; + rev = "0522ad64143c9aedb27e00b642e82cad1273c83b"; + sha256 = "sha256-GsoDVZkmKEX8+HwwQXptmmRuykTDqkbsL4WbFsL/PSo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index 8cf1c3e662a69..7c402028d6600 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "c97060bd9dc1287d258cac6b7222a9a61d4f97c7"; - sha256 = "sha256-fVGTYz/2PK5rq/7SE/hkQoWYiIzOcmZ9AHNe5f+osxY="; + rev = "4a7f3df360a8e4ff3bbebfed33ea545b1c72506e"; + sha256 = "sha256-lu8Ry3sUsKnr1nMfR29hbhsfJXLaN5NPuz8iGfsfHTc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 6e7da0de992fc..f80e625147d32 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "467b6c8a91a08ca71080b9bbff2e0cd45dc4efe5"; - sha256 = "sha256-65Osh9oud/Gfy6dVJ4QXqT+A0wdIN33BeaCUIfyWEGA="; + rev = "556d12ac507b140d1ed9d307cad58fa8e1d8cfdd"; + sha256 = "sha256-fcO/j506kIydnipx6VsuMkj4Wb2MmPCo3LSrj9Fnczc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index eebe6101a9085..154f75965f3ff 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "908d9096a81e1d706da231558f9a0547357fe73a"; - sha256 = "sha256-77MTXMTjuwG1qIhYwUlNBNA39p/eyPF2+IHFpUiG8uo="; + rev = "bf1c4574a61b053c136e2b181ba2fedb6c16f838"; + sha256 = "sha256-voo3Q+e/Ud1Hg+SdHlvRsxoacFnPOQXwWu/g6n5cR3Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile index 8b69b657f2adc..c24a3e860d7cd 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -3,5 +3,5 @@ source "https://rubygems.org" # gem "rails" -gem 'sawyer', '0.9.2' -gem 'octokit', '5.6.1' +gem "sawyer", "0.9.2" +gem "octokit", "5.6.1" diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 0aba4fb103cab..6093b573ed542 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,14 +3,14 @@ GEM specs: addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) - faraday (2.7.1) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.0) + public_suffix (5.0.1) ruby2_keywords (0.0.5) sawyer (0.9.2) addressable (>= 2.3.5) @@ -24,4 +24,4 @@ DEPENDENCIES sawyer (= 0.9.2) BUNDLED WITH - 2.3.25 + 2.4.6 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index cf0e425cbdea8..743002c0ec807 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "873cb13a0dcb3e70360adb86a2e293f377536626"; - sha256 = "sha256-r3+RXVb0k2UFiMeBQ998Obw7GQg1/uyUzpxFP9g5yXs="; + rev = "148f28c1089288c9527fab1dcb88f13a5a5b0d10"; + sha256 = "sha256-u91X+YFoKE0lP4RnNWX2XzNrJvlOQPbuZzFqBEVf84w="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index fae128695754d..8d9cd6e219bf8 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; ruby2_keywords = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile index 2602ef5c72b57..e140770e4e6ae 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile @@ -5,5 +5,5 @@ source "https://rubygems.org" # gem "rails" gem 'pyu-ruby-sasl', '0.0.3.3', require: false gem 'rubyntlm', '0.3.4', require: false -gem 'net-ldap', '0.14.0' +gem 'net-ldap', '0.17.1' gem 'omniauth-ldap', '1.0.5' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock index 915a95cd82781..c923e26408e0f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: hashie (5.0.0) - net-ldap (0.14.0) + net-ldap (0.17.1) omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -12,17 +12,17 @@ GEM pyu-ruby-sasl (~> 0.0.3.2) rubyntlm (~> 0.3.4) pyu-ruby-sasl (0.0.3.3) - rack (2.2.4) + rack (2.2.6.2) rubyntlm (0.3.4) PLATFORMS ruby DEPENDENCIES - net-ldap (= 0.14.0) + net-ldap (= 0.17.1) omniauth-ldap (= 1.0.5) pyu-ruby-sasl (= 0.0.3.3) rubyntlm (= 0.3.4) BUNDLED WITH - 2.3.22 + 2.4.6 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 5e7ed51852e69..0fff98865e329 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; - rev = "84635b1c352b2145b8e6074d94047f1e2020dcbc"; - sha256 = "sha256-yCCSger7qa9R/BMaQdcFtLXqLPj3i3y4tTanz+ufZTw="; + rev = "2f7a04b9fbeda0c8ab5c70e9012e4914ede9a707"; + sha256 = "sha256-zBug9PHgvRsdQjvfWE5Bylm+0Ot+jBHFrbux7+Kn72c="; }; meta = with lib; { homepage = "https://github.com/jonmbake/discourse-ldap-auth"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix index bea800d6b507f..c7a026a0c2dba 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18fyxfbh32ai72cwgz8s9w0fg0xq7j534y217flw54mmzsj8i6qp"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.14.0"; + version = "0.17.1"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 98f89d0f241e1..d15a962c19d85 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "45563f691aafcd0d76f07db9c105d42f3e3d5ba0"; - sha256 = "sha256-s2mzV1YdUG9vjw1LKm+jZriQfWYN5Jn232z3Cc7NFeg="; + rev = "69494ca5a4d708e16e35f1daebeaa53e3edbca2c"; + sha256 = "sha256-C0iVUwj+Lbe6TGfkbu6WxdCeMWVjBaejUh6fXVTqq08="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index 565495d9e4e80..59c64586dc17b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -7,4 +7,4 @@ gem 'bcrypt', '3.1.13' gem 'unix-crypt', '1.3.0' gem 'ffi', '1.15.5', require: false gem 'ffi-compiler', '1.0.1', require: false -gem 'argon2', '2.1.1' +gem 'argon2', '2.2.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index e7e49724b57df..4c6c3bab99876 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - argon2 (2.1.1) - ffi (~> 1.14) + argon2 (2.2.0) + ffi (~> 1.15) ffi-compiler (~> 1.0) bcrypt (3.1.13) ffi (1.15.5) @@ -16,11 +16,11 @@ PLATFORMS ruby DEPENDENCIES - argon2 (= 2.1.1) + argon2 (= 2.2.0) bcrypt (= 3.1.13) ffi (= 1.15.5) ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.3.23 + 2.4.6 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 8c022162512fb..c0c89d98be2c7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "54a451e3dea4416c763c9afacfb6e9fcc05f135a"; - sha256 = "sha256-14gxO4hYEOSz2Fenl4tO8xeM1AkPaCilV4cnoJQNHGY="; + rev = "f78774242eb9bf49a72d2800a39a24eeaa3b401a"; + sha256 = "sha256-QJO+ei9/l7ye+kWE9VmiIuNCiOH66kd3vds49qlIztY="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index d9471aea82a9c..97aa9bfc70485 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g4qsdq072fyrsa7r0sg456dhrb017jmzdbnnzl2c80ha40bbmhg"; + sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; bcrypt = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index 3ce7519dc525a..6fe8171593dbc 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "43a30dde4a64a01250f4447e74806db65ee7ae1a"; - sha256 = "sha256-/3AE5cDELKfKwEY+XqaZ6SzJp6XAnW83r67kzLGaV2M="; + rev = "fd552d5eee75ba5710ce92bcd2fa7457ec98bcab"; + sha256 = "sha256-+58QfVvA6BqI/5AfdI4RiSSMzWHvAJMxPvDS2r5FieU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile index 63a7cf62749bf..9753a02ce0940 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile @@ -3,4 +3,5 @@ source "https://rubygems.org" # gem "rails" -gem 'prometheus_exporter', File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip +gem "webrick", "1.7.0" +gem "prometheus_exporter", File.read(File.expand_path("../prometheus_exporter_version", __FILE__)).strip diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 0f46eaf43f2ad..d9da3253d0d54 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -1,13 +1,16 @@ GEM remote: https://rubygems.org/ specs: - prometheus_exporter (0.5.0) + prometheus_exporter (2.0.6) + webrick + webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - prometheus_exporter (= 0.5.0) + prometheus_exporter (= 2.0.6) + webrick (= 1.7.0) BUNDLED WITH - 2.3.25 + 2.4.6 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 13127cf3d3e95..8d6ddb4199a4a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "72fff206ba18ad5ca3112fed2f5f0ce6a17ca6f8"; - sha256 = "sha256-lSZZTcoWeFJTXnHLgry5ezYGmCBuMFJ96dtkOQKKRJc="; + rev = "78324fbaa8cfa3040ee7e01ac793ad2515b6c004"; + sha256 = "sha256-xzI6gzRztLuEzFHlMi3iXZP9bRRMsRHRQEBrwqyzpdk="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix index e62e01926837b..b6f3158174c17 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix @@ -1,12 +1,23 @@ { prometheus_exporter = { + dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kmabnxz466zqnyqlzc693ny4l7i0rxvmc0znswvizc0zg4pri80"; + sha256 = "0pb4k6px8b36bvnw3d14j31s33ns60dcwxixbcgvhpzavd7fparb"; type = "gem"; }; - version = "0.5.0"; + version = "2.0.6"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch index 416386f4ecd3c..9aebfd8aa7943 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/no-git-version.patch @@ -2,7 +2,7 @@ diff --git a/lib/internal_metric/global.rb b/lib/internal_metric/global.rb index 682571b..7bdd431 100644 --- a/lib/internal_metric/global.rb +++ b/lib/internal_metric/global.rb -@@ -30,30 +30,7 @@ module DiscoursePrometheus::InternalMetric +@@ -30,28 +30,7 @@ module DiscoursePrometheus::InternalMetric @active_app_reqs = 0 @queued_app_reqs = 0 @fault_logged = {} @@ -10,7 +10,7 @@ index 682571b..7bdd431 100644 - begin - @@version = nil - -- out, error, status = Open3.capture3('git rev-parse HEAD') +- out, error, status = Open3.capture3("git rev-parse HEAD") - - if status.success? - @@version ||= out.chomp @@ -26,9 +26,7 @@ index 682571b..7bdd431 100644 - - @@retries ||= 10 - @@retries -= 1 -- if @@retries < 0 -- @@version = -1 -- end +- @@version = -1 if @@retries < 0 - end + @@version = -1 end diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version index 8f0916f768f04..157e54f3e4d5b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/prometheus_exporter_version @@ -1 +1 @@ -0.5.0 +2.0.6 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix new file mode 100644 index 0000000000000..8cc2f18ef8b43 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-reactions"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-reactions"; + rev = "aba16d53d15ceca9ae18595ae85defbd10fe0256"; + sha256 = "sha256-mGyMQGNa5Q2hMQkdIsa1JArA6cqSK+FmGSDJFZxS/go="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-reactions"; + maintainers = with maintainers; [ bbenno ]; + license = licenses.mit; + description = "Allows users to react to a post from a choice of emojis, rather than only the like heart"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 3108d617ceb90..f2d139abedba0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "be97918d0bbac81b98ab96773d5c8c01313ac0c2"; - sha256 = "sha256-2HTFfaJkLXuuMDa3m7Ppkh9v4BnLfKXyWiRN4c+xaNI="; + rev = "d0b568efe6f829617a5bb85793f0ec1d697f2a96"; + sha256 = "sha256-455ovBExE2+vuZOc0bESAbhtTOXqkMrQ//mVSIitLig="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 11a8789ca2ea9..f71ca930ace57 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "a078219a9785f995a0a41c64b97bb0f2930a3ba1"; - sha256 = "sha256-P3rWEgPoMtzapSqARMFe5/IGT/QtTUFx8LB1kf6vBiU="; + rev = "8580f96fdf64abf8b22fa4b28d67a4cb0d72fc42"; + sha256 = "sha256-YpUybEXQuPeDxxdX9dMNw4h6Mh/zNUaiR3bwzck5Urg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 19838e88a8f0a..6d386c26248d2 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "a7727a1c6b6f921365e1cee802e0c16512bbf8ee"; - sha256 = "sha256-60Sg8C7a4vXq/IApcskL0hgceoIHhWqACphcgfrbNig="; + rev = "a5fdb9096d638ac4a2a3f8ea6b02b6cb04c667d8"; + sha256 = "sha256-S2Xtd/csB1YI85OA+2UO+OgF5u75Oi2YgIukQNOTQjk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index e5e3d8f2b9779..0acf676855eae 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "1ecf494a789235d7ceaf2c8f6cad49176347e6b6"; - sha256 = "sha256-6UX7VGuZ+AT44ExfZNFWxFwgEx9zBJ3fQbO1vgCa5bE="; + rev = "54e134c9b4dfeeb7585ff2c2a782990308733d8b"; + sha256 = "sha256-0V+4G2XxUjL424DChFIFjCKm2zWaTAXOSiB9Ic8/lF0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index bfdb7f6739f34..8dab5b1b39374 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "0f24d14d2dc861e404cb28f63832b93ed41b44eb"; - sha256 = "sha256-7cstjcuZ6OUn7u85UEp/B4pycepEK8CHg4W/O4ePoQg="; + rev = "cb9a2df92788b0a285a595d4acf1749620f62974"; + sha256 = "sha256-Hu61ULEXUxb/cjH7Z47hpBchyUTkz0QqunWoW8mSVQg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index b35e4805cc496..4bd110bf4bfc4 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -1,51 +1,51 @@ # frozen_string_literal: true -source 'https://rubygems.org' +source "https://rubygems.org" # if there is a super emergency and rubygems is playing up, try #source 'http://production.cf.rubygems.org' -gem 'bootsnap', require: false, platform: :mri +gem "bootsnap", require: false, platform: :mri def rails_master? - ENV["RAILS_MASTER"] == '1' + ENV["RAILS_MASTER"] == "1" end if rails_master? - gem 'arel', git: 'https://github.com/rails/arel.git' - gem 'rails', git: 'https://github.com/rails/rails.git' + gem "arel", git: "https://github.com/rails/arel.git" + gem "rails", git: "https://github.com/rails/rails.git" else # NOTE: Until rubygems gives us optional dependencies we are stuck with this needing to be explicit # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = '7.0.3.1' - gem 'actionmailer', rails_version - gem 'actionpack', rails_version - gem 'actionview', rails_version - gem 'activemodel', rails_version - gem 'activerecord', rails_version - gem 'activesupport', rails_version - gem 'railties', rails_version - gem 'sprockets-rails' + rails_version = "7.0.4.1" + gem "actionmailer", rails_version + gem "actionpack", rails_version + gem "actionview", rails_version + gem "activemodel", rails_version + gem "activerecord", rails_version + gem "activesupport", rails_version + gem "railties", rails_version + gem "sprockets-rails" end -gem 'json' +gem "json" # TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals -# This is a desired upgrade we should get to. -gem 'sprockets', '3.7.2' +# We intend to drop sprockets rather than upgrade to 4.x +gem "sprockets", git: "https://github.com/rails/sprockets", branch: "3.x" # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master -gem 'actionview_precompiler', require: false +gem "actionview_precompiler", require: false -gem 'discourse-seed-fu' +gem "discourse-seed-fu" -gem 'mail', git: 'https://github.com/discourse/mail.git' -gem 'mini_mime' -gem 'mini_suffix' +gem "mail", git: "https://github.com/discourse/mail.git" +gem "mini_mime" +gem "mini_suffix" -gem 'redis' +gem "redis" # This is explicitly used by Sidekiq and is an optional dependency. # We tell Sidekiq to use the namespace "sidekiq" which triggers this @@ -53,79 +53,79 @@ gem 'redis' # redis namespace support is optional # We already namespace stuff in DiscourseRedis, so we should consider # just using a single implementation in core vs having 2 namespace implementations -gem 'redis-namespace' +gem "redis-namespace" # NOTE: AM serializer gets a lot slower with recent updates # we used an old branch which is the fastest one out there # are long term goal here is to fork this gem so we have a # better maintained living fork -gem 'active_model_serializers', '~> 0.8.3' +gem "active_model_serializers", "~> 0.8.3" -gem 'http_accept_language', require: false +gem "http_accept_language", require: false -gem 'discourse-fonts', require: 'discourse_fonts' +gem "discourse-fonts", require: "discourse_fonts" -gem 'message_bus' +gem "message_bus" -gem 'rails_multisite' +gem "rails_multisite" -gem 'fast_xs', platform: :ruby +gem "fast_xs", platform: :ruby -gem 'xorcist' +gem "xorcist" -gem 'fastimage' +gem "fastimage" -gem 'aws-sdk-s3', require: false -gem 'aws-sdk-sns', require: false -gem 'excon', require: false -gem 'unf', require: false +gem "aws-sdk-s3", require: false +gem "aws-sdk-sns", require: false +gem "excon", require: false +gem "unf", require: false -gem 'email_reply_trimmer' +gem "email_reply_trimmer" -gem 'image_optim' -gem 'multi_json' -gem 'mustache' -gem 'nokogiri' -gem 'loofah' -gem 'css_parser', require: false +gem "image_optim" +gem "multi_json" +gem "mustache" +gem "nokogiri" +gem "loofah" +gem "css_parser", require: false -gem 'omniauth' -gem 'omniauth-facebook' -gem 'omniauth-twitter' -gem 'omniauth-github' +gem "omniauth" +gem "omniauth-facebook" +gem "omniauth-twitter" +gem "omniauth-github" -gem 'omniauth-oauth2', require: false +gem "omniauth-oauth2", require: false -gem 'omniauth-google-oauth2' +gem "omniauth-google-oauth2" # pending: https://github.com/ohler55/oj/issues/789 -gem 'oj', '3.13.14' +gem "oj", "3.13.14" -gem 'pg' -gem 'mini_sql' -gem 'pry-rails', require: false -gem 'pry-byebug', require: false -gem 'r2', require: false -gem 'rake' +gem "pg" +gem "mini_sql" +gem "pry-rails", require: false +gem "pry-byebug", require: false +gem "r2", require: false +gem "rake" -gem 'thor', require: false -gem 'diffy', require: false -gem 'rinku' -gem 'sidekiq' -gem 'mini_scheduler' +gem "thor", require: false +gem "diffy", require: false +gem "rinku" +gem "sidekiq" +gem "mini_scheduler" -gem 'execjs', require: false -gem 'mini_racer' +gem "execjs", require: false +gem "mini_racer" -gem 'highline', require: false +gem "highline", require: false -gem 'rack' +gem "rack" -gem 'rack-protection' # security -gem 'cbor', require: false -gem 'cose', require: false -gem 'addressable' -gem 'json_schemer' +gem "rack-protection" # security +gem "cbor", require: false +gem "cose", require: false +gem "addressable" +gem "json_schemer" gem "net-smtp", require: false gem "net-imap", require: false @@ -135,138 +135,147 @@ gem "digest", require: false # Gems used only for assets and not required in production environments by default. # Allow everywhere for now cause we are allowing asset debugging in production group :assets do - gem 'uglifier' + gem "uglifier" end group :test do - gem 'capybara', require: false - gem 'webmock', require: false - gem 'fakeweb', require: false - gem 'minitest', require: false - gem 'simplecov', require: false - gem 'selenium-webdriver', require: false + gem "capybara", require: false + gem "webmock", require: false + gem "fakeweb", require: false + gem "minitest", require: false + gem "simplecov", require: false + gem "selenium-webdriver", require: false gem "test-prof" - gem 'webdrivers', require: false + gem "webdrivers", require: false end group :test, :development do - gem 'rspec' - gem 'listen', require: false - gem 'certified', require: false - gem 'fabrication', require: false - gem 'mocha', require: false + gem "rspec" + gem "listen", require: false + gem "certified", require: false + gem "fabrication", require: false + gem "mocha", require: false - gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false + gem "rb-fsevent", require: RUBY_PLATFORM =~ /darwin/i ? "rb-fsevent" : false - gem 'rspec-rails' + gem "rspec-rails" - gem 'shoulda-matchers', require: false - gem 'rspec-html-matchers' - gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem 'rubocop-discourse', require: false - gem 'parallel_tests' + gem "shoulda-matchers", require: false + gem "rspec-html-matchers" + gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri + gem "rubocop-discourse", require: false + gem "parallel_tests" - gem 'rswag-specs' + gem "rswag-specs" - gem 'annotate' + gem "annotate" + + gem "syntax_tree" + gem "syntax_tree-disable_ternary" end group :development do - gem 'ruby-prof', require: false, platform: :mri - gem 'bullet', require: !!ENV['BULLET'] - gem 'better_errors', platform: :mri, require: !!ENV['BETTER_ERRORS'] - gem 'binding_of_caller' - gem 'yaml-lint' + gem "ruby-prof", require: false, platform: :mri + gem "bullet", require: !!ENV["BULLET"] + gem "better_errors", platform: :mri, require: !!ENV["BETTER_ERRORS"] + gem "binding_of_caller" + gem "yaml-lint" end if ENV["ALLOW_DEV_POPULATE"] == "1" - gem 'discourse_dev_assets' - gem 'faker', "~> 2.16" + gem "discourse_dev_assets" + gem "faker", "~> 2.16" else group :development, :test do - gem 'discourse_dev_assets' - gem 'faker', "~> 2.16" + gem "discourse_dev_assets" + gem "faker", "~> 2.16" end end # this is an optional gem, it provides a high performance replacement # to String#blank? a method that is called quite frequently in current # ActiveRecord, this may change in the future -gem 'fast_blank', platform: :ruby +gem "fast_blank", platform: :ruby # this provides a very efficient lru cache -gem 'lru_redux' +gem "lru_redux" -gem 'htmlentities', require: false +gem "htmlentities", require: false # IMPORTANT: mini profiler monkey patches, so it better be required last # If you want to amend mini profiler to do the monkey patches in the railties # we are open to it. by deferring require to the initializer we can configure discourse installs without it -gem 'rack-mini-profiler', require: ['enable_rails_patches'] +gem "rack-mini-profiler", require: ["enable_rails_patches"] -gem 'unicorn', require: false, platform: :ruby -gem 'puma', require: false -gem 'rbtrace', require: false, platform: :mri -gem 'gc_tracer', require: false, platform: :mri +gem "unicorn", require: false, platform: :ruby +gem "puma", require: false +gem "rbtrace", require: false, platform: :mri +gem "gc_tracer", require: false, platform: :mri # required for feed importing and embedding -gem 'ruby-readability', require: false +gem "ruby-readability", require: false # rss gem is a bundled gem from Ruby 3 onwards -gem 'rss', require: false +gem "rss", require: false -gem 'stackprof', require: false, platform: :mri -gem 'memory_profiler', require: false, platform: :mri +gem "stackprof", require: false, platform: :mri +gem "memory_profiler", require: false, platform: :mri -gem 'cppjieba_rb', require: false +gem "cppjieba_rb", require: false -gem 'lograge', require: false -gem 'logstash-event', require: false -gem 'logstash-logger', require: false -gem 'logster' +gem "lograge", require: false +gem "logstash-event", require: false +gem "logstash-logger", require: false +gem "logster" # NOTE: later versions of sassc are causing a segfault, possibly dependent on processer architecture # and until resolved should be locked at 2.0.1 -gem 'sassc', '2.0.1', require: false +gem "sassc", "2.0.1", require: false gem "sassc-rails" -gem 'rotp', require: false +gem "rotp", require: false -gem 'rqrcode' +gem "rqrcode" -gem 'rubyzip', require: false +gem "rubyzip", require: false -gem 'sshkey', require: false +gem "sshkey", require: false -gem 'rchardet', require: false -gem 'lz4-ruby', require: false, platform: :ruby +gem "rchardet", require: false +gem "lz4-ruby", require: false, platform: :ruby -gem 'sanitize' +gem "sanitize" if ENV["IMPORT"] == "1" - gem 'mysql2' - gem 'redcarpet' + gem "mysql2" + gem "redcarpet" # NOTE: in import mode the version of sqlite can matter a lot, so we stick it to a specific one - gem 'sqlite3', '~> 1.3', '>= 1.3.13' - gem 'ruby-bbcode-to-md', git: 'https://github.com/nlalonde/ruby-bbcode-to-md' - gem 'reverse_markdown' - gem 'tiny_tds' - gem 'csv' + gem "sqlite3", "~> 1.3", ">= 1.3.13" + gem "ruby-bbcode-to-md", git: "https://github.com/nlalonde/ruby-bbcode-to-md" + gem "reverse_markdown" + gem "tiny_tds" + gem "csv" - gem 'parallel', require: false + gem "parallel", require: false end -gem 'webpush', require: false -gem 'colored2', require: false -gem 'maxminddb' +gem "web-push" +gem "colored2", require: false +gem "maxminddb" -gem 'rails_failover', require: false +gem "rails_failover", require: false -gem 'faraday' -gem 'faraday-retry' +gem "faraday" +gem "faraday-retry" # workaround for faraday-net_http, see # https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 -gem 'net-http' +gem "net-http" + +# workaround for prometheus-client +gem "webrick", require: false + +# Workaround until Ruby ships with cgi version 0.3.6 or higher. +gem "cgi", ">= 0.3.6", require: false diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index b4024ed108c14..b211c594948f4 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -5,28 +5,37 @@ GIT mail (2.8.0.edge) mini_mime (>= 0.1.1) +GIT + remote: https://github.com/rails/sprockets + revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a + branch: 3.x + specs: + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + GEM remote: https://rubygems.org/ specs: - actionmailer (7.0.3.1) - actionpack (= 7.0.3.1) - actionview (= 7.0.3.1) - activejob (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionmailer (7.0.4.1) + actionpack (= 7.0.4.1) + actionview (= 7.0.4.1) + activejob (= 7.0.4.1) + activesupport (= 7.0.4.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.3.1) - actionview (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionpack (7.0.4.1) + actionview (= 7.0.4.1) + activesupport (= 7.0.4.1) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.3.1) - activesupport (= 7.0.3.1) + actionview (7.0.4.1) + activesupport (= 7.0.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -35,15 +44,15 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (7.0.3.1) - activesupport (= 7.0.3.1) + activejob (7.0.4.1) + activesupport (= 7.0.4.1) globalid (>= 0.3.6) - activemodel (7.0.3.1) - activesupport (= 7.0.3.1) - activerecord (7.0.3.1) - activemodel (= 7.0.3.1) - activesupport (= 7.0.3.1) - activesupport (7.0.3.1) + activemodel (7.0.4.1) + activesupport (= 7.0.4.1) + activerecord (7.0.4.1) + activemodel (= 7.0.4.1) + activesupport (= 7.0.4.1) + activesupport (7.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -82,7 +91,7 @@ GEM bootsnap (1.15.0) msgpack (~> 1.2) builder (3.2.4) - bullet (7.0.4) + bullet (7.0.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -97,11 +106,11 @@ GEM xpath (~> 3.2) cbor (0.5.9.6) certified (1.0.0) - childprocess (4.1.0) + cgi (0.3.6) chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) connection_pool (2.3.0) cose (1.3.0) cbor (~> 0.5.9) @@ -110,12 +119,13 @@ GEM crack (0.4.5) rexml crass (1.0.6) - css_parser (1.12.0) + css_parser (1.14.0) addressable + date (3.3.3) debug_inspector (1.1.0) diff-lcs (1.5.0) diffy (3.4.2) - digest (3.1.0) + digest (3.1.1) discourse-fonts (0.0.9) discourse-seed-fu (2.3.12) activerecord (>= 3.1) @@ -127,15 +137,15 @@ GEM ecma-re-validator (0.4.0) regexp_parser (~> 2.2) email_reply_trimmer (0.1.13) - erubi (1.11.0) - excon (0.94.0) + erubi (1.12.0) + excon (0.97.2) execjs (2.8.1) exifr (1.3.10) fabrication (2.30.0) faker (2.23.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) - faraday (2.7.1) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -147,14 +157,14 @@ GEM ffi (1.15.5) fspath (3.1.2) gc_tracer (1.5.1) - globalid (1.0.0) + globalid (1.0.1) activesupport (>= 5.0) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.0.1) hashie (5.0.0) - highline (2.0.3) - hkdf (0.3.0) + highline (2.1.0) + hkdf (1.0.0) htmlentities (4.3.4) http_accept_language (2.1.1) i18n (1.12.0) @@ -168,7 +178,7 @@ GEM image_size (3.2.0) in_threads (1.6.0) jmespath (1.6.2) - json (2.6.2) + json (2.6.3) json-schema (3.0.0) addressable (>= 2.8) json_schemer (0.2.23) @@ -176,15 +186,10 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.5.0) + jwt (2.6.0) kgio (2.11.4) libv8-node (16.10.0.0) - libv8-node (16.10.0.0-aarch64-linux) - libv8-node (16.10.0.0-arm64-darwin) - libv8-node (16.10.0.0-x86_64-darwin) - libv8-node (16.10.0.0-x86_64-darwin-19) - libv8-node (16.10.0.0-x86_64-linux) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) literate_randomizer (0.4.0) @@ -197,7 +202,7 @@ GEM logstash-logger (0.26.1) logstash-event (~> 1.2) logster (2.11.3) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -205,11 +210,11 @@ GEM matrix (0.4.2) maxminddb (0.1.22) memory_profiler (1.0.1) - message_bus (4.3.0) + message_bus (4.3.2) rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) mini_racer (0.6.3) libv8-node (~> 16.10.0.0) mini_scheduler (0.15.0) @@ -217,35 +222,28 @@ GEM mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.16.3) + minitest (5.17.0) mocha (2.0.2) ruby2_keywords (>= 0.0.5) msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) - net-http (0.2.2) + net-http (0.3.2) uri - net-imap (0.3.1) + net-imap (0.3.4) + date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.1.3) + net-protocol (0.2.1) timeout net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.9) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.9-aarch64-linux) - racc (~> 1.4) - nokogiri (1.13.9-arm64-darwin) - racc (~> 1.4) - nokogiri (1.13.9-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.9-x86_64-linux) - racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) snaky_hash (~> 2.0) @@ -281,18 +279,19 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.0.1) + openssl (3.0.2) openssl-signature_algorithm (1.2.1) openssl (> 2.0, < 3.1) optimist (3.0.1) parallel (1.22.1) - parallel_tests (4.0.0) + parallel_tests (4.1.0) parallel - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) pg (1.4.5) + prettier_print (1.2.0) progress (3.6.0) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) @@ -300,23 +299,23 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.0) - puma (6.0.0) + public_suffix (5.0.1) + puma (6.0.2) nio4r (~> 2.0) r2 (0.2.7) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (3.0.4) + rack-protection (3.0.5) rack 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.5.0) + loofah (~> 2.19, >= 2.19.1) rails_failover (0.8.1) activerecord (> 6.0, < 7.1) concurrent-ruby @@ -324,9 +323,9 @@ GEM rails_multisite (4.0.1) activerecord (> 5.0, < 7.1) railties (> 5.0, < 7.1) - railties (7.0.3.1) - actionpack (= 7.0.3.1) - activesupport (= 7.0.3.1) + railties (7.0.4.1) + actionpack (= 7.0.4.1) + activesupport (= 7.0.4.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -342,15 +341,15 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.7.1) - redis-namespace (1.9.0) + redis (4.8.0) + redis-namespace (1.10.0) redis (>= 4) - regexp_parser (2.6.1) + regexp_parser (2.6.2) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) - rotp (6.2.1) + rotp (6.2.2) rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) @@ -361,13 +360,13 @@ GEM rspec-mocks (~> 3.12.0) rspec-core (3.12.0) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -386,24 +385,27 @@ GEM json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.1) rspec-core (>= 2.14) - rubocop (1.39.0) + rubocop (1.44.0) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.23.0, < 2.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.23.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) - rubocop-discourse (3.0) + rubocop-capybara (2.17.0) + rubocop (~> 1.41) + rubocop-discourse (3.0.3) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.15.0) + rubocop-rspec (2.18.1) rubocop (~> 1.33) - ruby-prof (1.4.3) + rubocop-capybara (~> 2.17) + ruby-prof (1.4.5) ruby-progressbar (1.11.0) ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) @@ -422,18 +424,17 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.6.1) - childprocess (>= 0.5, < 5.0) + selenium-webdriver (4.8.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - shoulda-matchers (5.2.0) + shoulda-matchers (5.3.0) activesupport (>= 5.2.0) sidekiq (6.5.8) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) @@ -442,19 +443,19 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.22) - test-prof (1.0.11) + stackprof (0.2.23) + syntax_tree (5.2.0) + prettier_print (>= 1.2.0) + syntax_tree-disable_ternary (1.0.0) + test-prof (1.1.0) thor (1.2.1) tilt (2.0.11) - timeout (0.3.0) + timeout (0.3.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) uglifier (4.2.0) @@ -462,14 +463,18 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) - uri (0.11.0) + uri (0.12.0) uri_template (0.7.0) version_gem (1.1.1) + web-push (3.0.0) + hkdf (~> 1.0) + jwt (~> 2.0) + openssl (~> 3.0) webdrivers (5.2.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) @@ -478,28 +483,26 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpush (1.1.0) - hkdf (~> 0.2) - jwt (~> 2.0) + webrick (1.7.0) websocket (1.2.9) xorcist (1.1.3) xpath (3.2.0) nokogiri (~> 1.8) - yaml-lint (0.0.10) + yaml-lint (0.1.2) zeitwerk (2.6.6) PLATFORMS ruby DEPENDENCIES - actionmailer (= 7.0.3.1) - actionpack (= 7.0.3.1) - actionview (= 7.0.3.1) + actionmailer (= 7.0.4.1) + actionpack (= 7.0.4.1) + actionview (= 7.0.4.1) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 7.0.3.1) - activerecord (= 7.0.3.1) - activesupport (= 7.0.3.1) + activemodel (= 7.0.4.1) + activerecord (= 7.0.4.1) + activesupport (= 7.0.4.1) addressable annotate aws-sdk-s3 @@ -512,6 +515,7 @@ DEPENDENCIES capybara cbor certified + cgi (>= 0.3.6) colored2 cose cppjieba_rb @@ -583,7 +587,7 @@ DEPENDENCIES rack-protection rails_failover rails_multisite - railties (= 7.0.3.1) + railties (= 7.0.4.1) rake rb-fsevent rbtrace @@ -609,20 +613,23 @@ DEPENDENCIES shoulda-matchers sidekiq simplecov - sprockets (= 3.7.2) + sprockets! sprockets-rails sshkey stackprof + syntax_tree + syntax_tree-disable_ternary test-prof thor uglifier unf unicorn + web-push webdrivers webmock - webpush + webrick xorcist yaml-lint BUNDLED WITH - 2.3.25 + 2.4.6 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 3971d6ef9c0d4..180214df0cb90 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdh4av6w6calnvvms6r8w3k3gaw0xy1lgsrjjf5d5gxq09nk7y7"; + sha256 = "1v4ra6jx4bynzj3im6fjbyyy1h6582qg72r6i42myls84z75qsxk"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f9y1qjnrwbwab3hf6nzlpr4v1fr1wq39l6dw3i1y3i6n8w04sb5"; + sha256 = "1g823r92w9c1si2mxd82mibdva1fyw0ccin0dc2bpbszk6zfyxrh"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csycx6zlzrp6pw58s4nkm2qaz720cdhgxjkwjsd0qla75kvsyln"; + sha256 = "1pfnbkq1hzzxzrnc0m1dd0l2cad6x041dfv3ndrkk5llcjarphx2"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hn978lx6lasac267mincy6wwcir5gyix7gwrbvvk7rg7bsbmbk"; + sha256 = "0yrjvd2w3l6fd5s984hn885dwcxj078ggfbbr1cpynjnqxrvvm6f"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s9gjs1a49n7rfhz84glw6w62swlrqdqjhs8421kaa72iwxavq16"; + sha256 = "0y1v2jy4cwi6dkd9yr399kw53smaiyiqx7bsnljwmsz98g125sdw"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lb838wvarms8bs8hvfkccdsp4cjc0y9wjsxvw71h4ir3mys4jqg"; + sha256 = "1c3wvrym6ib2a6ljc4n572gsrr46hazp7f0zijm8jdc8zp3yx5vi"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; + sha256 = "1j0ms94ng1hsxb37aar5j3n4mabjqvjkcl70adjrqib7grriyq7b"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -262,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f2phbpsiw8zwmmb1h6s82c4s2banzd04ch7vn6pdz91map233l1"; + sha256 = "0hyz68j0z0j24vcrs43swmlykhzypayv34kzrsbxda5lbi83gynm"; type = "gem"; }; - version = "7.0.4"; + version = "7.0.7"; }; byebug = { groups = ["development" "test"]; @@ -312,15 +312,15 @@ }; version = "1.0.0"; }; - childprocess = { - groups = ["default" "test"]; + cgi = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; + sha256 = "18zc1z8va9j1gcv131p605wmkvn1p5958mmvvy7v45ki8c0w7qn5"; type = "gem"; }; - version = "4.1.0"; + version = "0.3.6"; }; chunky_png = { groups = ["default"]; @@ -361,10 +361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; connection_pool = { groups = ["default"]; @@ -424,10 +424,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; }; debug_inspector = { groups = ["default" "development"]; @@ -464,10 +474,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + sha256 = "01qkpbkxq83ip3iysfh2kjrg9sh2n2q91prhyxh3vq10lcfzv9l1"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; discourse-fonts = { groups = ["default"]; @@ -541,20 +551,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981"; + sha256 = "17prxavwwskpv7dfl3npl0pgqiqg99rrmakqj1n4m5hl69jqz8y4"; type = "gem"; }; - version = "0.94.0"; + version = "0.97.2"; }; execjs = { groups = ["assets" "default"]; @@ -613,10 +623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; @@ -725,10 +735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; + sha256 = "040bxzfd7mz1p6z4bc9vk5yrf762hdllvf98hmk848fq28xc5dsk"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; guess_html_encoding = { groups = ["default"]; @@ -775,20 +785,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; hkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04fixg0a51n4vy0j6c1hvisa2yl33m3jrrpxpb5sq6j511vjriil"; + sha256 = "03g3yvfnlcjv2qw3b3yahg0x7zhwcd1bwxyj6gbn5jrc7k4kfrqg"; type = "gem"; }; - version = "0.3.0"; + version = "1.0.0"; }; htmlentities = { groups = ["default"]; @@ -867,10 +877,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; json-schema = { dependencies = ["addressable"]; @@ -899,10 +909,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "1x8zp1a2pnngxh7631s0kn0r665qkwzfp16kifmp93r4zj6ci8v8"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; kgio = { groups = ["default"]; @@ -936,10 +946,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; literate_randomizer = { groups = ["default" "development"]; @@ -999,10 +1009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; lru_redux = { groups = ["default"]; @@ -1083,10 +1093,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "039ab2bbzxhfgy3w7wrxznqzjyikiqm6dnl36pk7cmkb1d30fxdk"; + sha256 = "07acv6l89b1c0d3dfq84jb0vzbv489agcw60n7rnvk10y4x58bn5"; type = "gem"; }; - version = "4.3.0"; + version = "4.3.2"; }; method_source = { groups = ["default" "development" "test"]; @@ -1113,10 +1123,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1166,10 +1176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -1232,21 +1242,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j4f0wgyps0qyms4p6fjqva63xy13wvy7bx5qg5gmzzwm3kqs1fr"; + sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; type = "gem"; }; - version = "0.2.2"; + version = "0.3.2"; }; net-imap = { - dependencies = ["net-protocol"]; + dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s1d01q6mljiiv6y2w6znmhmnm2b5lkw8d13wip9x23a820z8cjw"; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.4"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1265,10 +1275,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; type = "gem"; }; - version = "0.1.3"; + version = "0.2.1"; }; net-smtp = { dependencies = ["net-protocol"]; @@ -1297,10 +1307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; type = "gem"; }; - version = "1.13.9"; + version = "1.14.0"; }; oauth = { dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; @@ -1427,10 +1437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2fhxa2alw3qxhg6qlxs0v6f8rsadhp6r6sv33i9fh793k2zpr3"; + sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1473,10 +1483,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xr8406nknbg2z561m3nkny51zkhpd02ng0fbjc9jaachp7ksz1y"; + sha256 = "1p0y8cgdmfwyg7plwlsjf9afshm81wj9ah8nprmpfrv28adg3vn6"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; parser = { dependencies = ["ast"]; @@ -1484,10 +1494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.3.0"; + version = "3.2.0.0"; }; pg = { groups = ["default"]; @@ -1499,6 +1509,16 @@ }; version = "1.4.5"; }; + prettier_print = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bbw4czjr2ch6m57rgjib5a35hx3g18975vwzm2iwq13pvdj9hzk"; + type = "gem"; + }; + version = "1.2.0"; + }; progress = { groups = ["default"]; platforms = []; @@ -1515,10 +1535,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; type = "gem"; }; - version = "0.14.1"; + version = "0.14.2"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -1547,10 +1567,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -1558,10 +1578,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra"; + sha256 = "15hj8r6wp23k187ajmp13kldk53ygm84q4caq7nlndrn8jlcsps0"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.2"; }; r2 = { groups = ["default"]; @@ -1578,10 +1598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rack = { groups = ["default" "development" "test"]; @@ -1592,10 +1612,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1614,10 +1634,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kljmw1lhzqjcwnwadr5m2khii0h2lsah447zb9vgirrv5jszg9h"; + sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; rack-test = { dependencies = ["rack"]; @@ -1647,10 +1667,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.3"; + version = "1.5.0"; }; rails_failover = { dependencies = ["activerecord" "concurrent-ruby" "railties"]; @@ -1680,10 +1700,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnrhx0sdixz5xm2vi482ngs4alh8l725kh96v6mfk0x0qlbdsaw"; + sha256 = "0q8as8yq6ni256fc6bmcqmdch1bksbhsg5lmaqmi4bpi33f06g01"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1772,10 +1792,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; + sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; type = "gem"; }; - version = "4.7.1"; + version = "4.8.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -1783,20 +1803,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; + sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rj7xcg7bkfw6y0h4wg8y3s4nmks9qrzdxag4zaw41xjqfanlysf"; + sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; type = "gem"; }; - version = "2.6.1"; + version = "2.6.2"; }; request_store = { dependencies = ["rack"]; @@ -1834,10 +1854,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fi6g1nn97cg2m2jmh9cwxcd90gd4hn7b71hdr3kh76c0rmpqp7"; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; type = "gem"; }; - version = "6.2.1"; + version = "6.2.2"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -1888,10 +1908,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.2"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -1910,10 +1930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; + sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.3"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -1964,10 +1984,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ggxkq68ddxmynr2lyrvzr8qbrdvc2irxlx9ihxmvdpkg1vimr3w"; + sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1"; type = "gem"; }; - version = "1.39.0"; + version = "1.44.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -1975,10 +1995,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; + sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + type = "gem"; + }; + version = "1.24.1"; + }; + rubocop-capybara = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; type = "gem"; }; - version = "1.23.0"; + version = "2.17.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -1986,21 +2017,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1afsyw78pkv1ry5x5ww0krv75lg2lnv7b72sy9bbk6ni87fzsk1q"; + sha256 = "0m6jqyh44vfibqcnxi0xz69xgrbf8vpps90h6al5qdbibm9dmajd"; type = "gem"; }; - version = "3.0"; + version = "3.0.3"; }; rubocop-rspec = { - dependencies = ["rubocop"]; + dependencies = ["rubocop" "rubocop-capybara"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4"; + sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; type = "gem"; }; - version = "2.15.0"; + version = "2.18.1"; }; ruby-prof = { groups = ["development"]; @@ -2011,10 +2042,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m"; + sha256 = "09n13bzm1p956z318xx1v7ikqdp2i971v7p3kwf3170axz368ccy"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.5"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -2091,15 +2122,15 @@ version = "2.1.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; + dependencies = ["rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wj32kci0v4r7a5rdiq7yrf1763k2ap01dp09flr56hgnb75asx8"; + sha256 = "1dkcyq2hfvf4wdj7q5cqqlka1dw6gz28dckxf4r17jmd53ymwg28"; type = "gem"; }; - version = "4.6.1"; + version = "4.8.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2107,10 +2138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hv1xk153sspi6iif7a2m64shshpjr37l44c8qnqlfpzv0dxlm2"; + sha256 = "11igjgh16dl5pwqizdmclzlzpv7mbmnh8fx7m9b5kfsjhwxqdfpn"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; sidekiq = { dependencies = ["connection_pool" "rack" "redis"]; @@ -2129,10 +2160,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-html = { groups = ["default" "test"]; @@ -2170,9 +2201,11 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; + fetchSubmodules = false; + rev = "f4d3dae71ef29c44b75a49cfbf8032cce07b423a"; + sha256 = "0ps1zb411nrwih0rdp6vrnx0n4n18jcwks2x06iw52gvswlv49ry"; + type = "git"; + url = "https://github.com/rails/sprockets"; }; version = "3.7.2"; }; @@ -2206,20 +2239,41 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc"; + sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; type = "gem"; }; - version = "0.2.22"; + version = "0.2.23"; + }; + syntax_tree = { + dependencies = ["prettier_print"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sqjjz3ja2563p4dgw46wfx0knpcp176gfvx8gfmkv8h166qnkqg"; + type = "gem"; + }; + version = "5.2.0"; + }; + syntax_tree-disable_ternary = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gdi6zx4hqpxd81zas3dlw1jrdp98fvsqj4p7f42x5lhpfzz04zc"; + type = "gem"; + }; + version = "1.0.0"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08f6lj1yh1ykwdaz5zkqpj5hn4vl4vid2x74k135cbggw3j9grdq"; + sha256 = "15fcfjplc1zqahrha6rxgwnmjlyp41qkj4369fbxdfp0iaxb15pg"; type = "gem"; }; - version = "1.0.11"; + version = "1.1.0"; }; thor = { groups = ["default" "development" "test"]; @@ -2246,10 +2300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2"; + sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2299,10 +2353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.2"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2336,10 +2390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w00162maixmqp7nwm8mmbvwnnpmjilwbim8yk2ypxy3x3ih6l69"; + sha256 = "11c4n5rri8d45c47krpg76n98mqh36l0kp2qrkb4dxnkp4flay6y"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; uri_template = { groups = ["default"]; @@ -2361,6 +2415,17 @@ }; version = "1.1.1"; }; + web-push = { + dependencies = ["hkdf" "jwt" "openssl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jsximg9v44rpclhjxp03fxk68jx675pghwxc66wj7rn9h9fc54i"; + type = "gem"; + }; + version = "3.0.0"; + }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; groups = ["test"]; @@ -2383,16 +2448,15 @@ }; version = "3.18.1"; }; - webpush = { - dependencies = ["hkdf" "jwt"]; + webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9ma580q80czw46gi1bvsr2iwxr63aiyr7i9gilav6hbhg3sxv3"; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; type = "gem"; }; - version = "1.1.0"; + version = "1.7.0"; }; websocket = { groups = ["default" "test"]; @@ -2430,10 +2494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9n4sg7i0334yac7dcrhnhv5rzvrccgnh687n9x77ba3awk4yx1"; + sha256 = "12jc68af2mwdkr9iqay2v6qgq47yk5g82sd171riibk62wbhp5p3"; type = "gem"; }; - version = "0.0.10"; + version = "0.1.2"; }; zeitwerk = { groups = ["default" "development" "test"]; diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index aa0ddbd60ede9..dee31918eac9e 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -294,8 +294,9 @@ def update_plugins(): {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, {'name': 'discourse-math'}, {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, - {'name': 'discourse-prometheus'}, {'name': 'discourse-openid-connect'}, + {'name': 'discourse-prometheus'}, + {'name': 'discourse-reactions'}, {'name': 'discourse-saved-searches'}, {'name': 'discourse-solved'}, {'name': 'discourse-spoiler-alert'}, @@ -406,7 +407,9 @@ def update_plugins(): gemfile = rubyenv_dir / "Gemfile" version_file_regex = re.compile(r'.*File\.expand_path\("\.\./(.*)", __FILE__\)') gemfile_text = '' - for line in repo.get_file('plugin.rb', rev).splitlines(): + plugin_file = repo.get_file('plugin.rb', rev) + plugin_file = plugin_file.replace(",\n", ", ") # fix split lines + for line in plugin_file.splitlines(): if 'gem ' in line: line = ','.join(filter(lambda x: ":require_name" not in x, line.split(','))) gemfile_text = gemfile_text + line + os.linesep diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index ea413c996fb5a..480250900b3c7 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -17,7 +17,9 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE="; }; - passthru.tests = nixosTests.freshrss; + passthru.tests = { + inherit (nixosTests) freshrss-sqlite freshrss-pgsql; + }; buildInputs = [ php ]; diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index b292ef34bc542..d8dc1e940b108 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "2.5"; + version = "2.6.1"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-luwFY1iBtFL+Ye7nP68eIgqlpvMUKnxwdNxkBI7pX/c="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-m6QN0FsuNY81iZYAXf7OaPJ6WCJhDSpF52H5k7SqwRY="; }; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 8b270883050af..d2b57a96e702d 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -12,14 +12,14 @@ mkYarnPackage rec { pname = "hedgedoc"; - version = "1.9.6"; + version = "1.9.7"; # we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies # in development and production and the web assets muts be compiled with js-yaml 3 while development # uses js-yaml 4 which breaks the text editor src = fetchzip { url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz"; - hash = "sha256-NoA4mv9LyvShr4fdfBSHgDoyxY59ubRC8YC6hvOimZc="; + hash = "sha256-tPkhnnKDS5TICsW66YCOy7xWFj5usLyDMbYMYQ3Euoc="; }; nativeBuildInputs = [ which makeWrapper ]; @@ -30,7 +30,7 @@ mkYarnPackage rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - sha256 = "1xxq02mgys3bp7ivgsr9hyafd866ygw2bp3rbld2500afvayz89v"; + sha256 = "0qkc26ks33vy00jgpv4445wzgxx1mzi70pkm1l8y9amgd9wf9aig"; }; configurePhase = '' @@ -78,7 +78,7 @@ mkYarnPackage rec { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; homepage = "https://hedgedoc.org"; - maintainers = with maintainers; [ willibutz SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/web-apps/hedgedoc/package.json b/pkgs/servers/web-apps/hedgedoc/package.json index fa874dfe93787..68c35025eded7 100644 --- a/pkgs/servers/web-apps/hedgedoc/package.json +++ b/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.9.6", + "version": "1.9.7", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -27,6 +27,7 @@ "body-parser": "^1.15.2", "chance": "^1.0.4", "cheerio": "^0.22.0", + "clean-webpack-plugin": "^4.0.0", "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^7.1.2", @@ -68,7 +69,7 @@ "minio": "7.0.32", "moment": "^2.17.1", "morgan": "^1.7.0", - "mysql2": "^2.0.0", + "mysql2": "^3.0.0", "node-fetch": "^2.6.1", "passport": "^0.6.0", "passport-dropbox-oauth2": "^1.1.0", @@ -89,7 +90,8 @@ "prometheus-api-metrics": "^3.2.0", "randomcolor": "^0.6.0", "readline-sync": "^1.4.7", - "rimraf": "^3.0.2", + "rimraf": "^4.0.0", + "sanitize-filename": "^1.6.3", "scrypt-kdf": "^2.0.1", "sequelize": "^5.21.1", "shortid": "2.2.16", @@ -134,7 +136,7 @@ "url": "https://github.com/hedgedoc/hedgedoc.git" }, "devDependencies": { - "abcjs": "6.1.6", + "abcjs": "6.1.9", "babel-cli": "6.26.0", "babel-core": "6.26.3", "babel-loader": "7.1.5", @@ -144,16 +146,16 @@ "babel-runtime": "6.26.0", "bootstrap": "3.4.1", "bootstrap-validator": "0.11.9", - "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", + "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git#hedgedoc/1.9.7", "copy-webpack-plugin": "6.4.1", "css-loader": "5.2.7", "emojify.js": "1.1.0", - "esbuild-loader": "2.20.0", + "esbuild-loader": "3.0.1", "escape-html": "1.0.3", - "eslint": "8.27.0", + "eslint": "8.34.0", "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.26.0", - "eslint-plugin-n": "15.5.0", + "eslint-plugin-import": "2.27.5", + "eslint-plugin-n": "15.6.1", "eslint-plugin-node": "11.1.0", "eslint-plugin-promise": "6.1.1", "eslint-plugin-standard": "4.1.0", @@ -168,7 +170,7 @@ "html-webpack-plugin": "4.5.2", "imports-loader": "1.2.0", "ionicons": "2.0.1", - "jquery": "3.6.1", + "jquery": "3.6.3", "jquery-mousewheel": "3.1.13", "jquery-ui": "1.13.2", "js-cookie": "3.0.1", @@ -182,7 +184,7 @@ "mathjax": "2.7.9", "mermaid": "9.1.7", "mini-css-extract-plugin": "1.6.2", - "mocha": "10.1.0", + "mocha": "10.2.0", "mock-require": "3.0.3", "optimize-css-assets-webpack-plugin": "6.0.1", "prismjs": "1.29.0", @@ -206,6 +208,6 @@ }, "optionalDependencies": { "bufferutil": "^4.0.0", - "utf-8-validate": "^5.0.1" + "utf-8-validate": "^6.0.0" } } diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 36121c10595ab..7f7abbdb4afc5 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.16.7", + "version": "0.17.1", "author": "Dessalines <tyhou13@gmx.com>", "license": "AGPL-3.0", "scripts": { @@ -9,7 +9,7 @@ "build:prod": "webpack --mode=production", "clean": "yarn run rimraf dist", "dev": "yarn start", - "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src", + "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'", "prebuild:dev": "yarn clean && node generate_translations.js", "prebuild:prod": "yarn clean && node generate_translations.js", "prepare": "husky install", @@ -17,82 +17,91 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.21.0", - "autosize": "^5.0.1", - "check-password-strength": "^2.0.5", - "choices.js": "^10.1.0", + "@babel/plugin-proposal-decorators": "^7.20.13", + "@babel/plugin-transform-runtime": "^7.19.6", + "@babel/plugin-transform-typescript": "^7.20.13", + "@babel/preset-env": "7.20.2", + "@babel/preset-typescript": "^7.18.6", + "@babel/runtime": "^7.20.13", + "autosize": "^5.0.2", + "babel-loader": "^9.1.2", + "babel-plugin-inferno": "^6.6.0", + "check-password-strength": "^2.0.7", + "choices.js": "^10.2.0", "classnames": "^2.3.1", + "clean-webpack-plugin": "^4.0.0", + "copy-webpack-plugin": "^11.0.0", + "css-loader": "^6.7.3", "emoji-short-name": "^2.0.0", - "express": "~4.18.0", - "i18next": "^21.6.16", - "inferno": "^7.4.11", - "inferno-create-element": "^7.4.11", + "express": "~4.18.2", + "html-to-text": "^9.0.3", + "i18next": "^22.4.9", + "inferno": "^8.0.5", + "inferno-create-element": "^8.0.5", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^7.4.11", - "inferno-i18next-dess": "^0.0.1", - "inferno-router": "^7.4.11", - "inferno-server": "^7.4.11", + "inferno-hydrate": "^8.0.5", + "inferno-i18next-dess": "0.0.2", + "inferno-router": "^8.0.5", + "inferno-server": "^8.0.5", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", + "lemmy-js-client": "0.17.0-rc.62", "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "moment": "^2.29.3", + "mini-css-extract-plugin": "^2.7.2", + "moment": "^2.29.4", + "node-fetch": "^2.6.1", "register-service-worker": "^1.7.2", - "rxjs": "^7.5.5", - "sass": "^1.51.0", - "serialize-javascript": "^6.0.0", + "run-node-webpack-plugin": "^1.3.0", + "rxjs": "^7.8.0", + "sanitize-html": "^2.8.1", + "sass": "^1.57.1", + "sass-loader": "^13.2.0", + "serialize-javascript": "^6.0.1", "tippy.js": "^6.3.7", - "toastify-js": "^1.11.2", + "toastify-js": "^1.12.0", "tributejs": "^5.1.3", + "webpack": "5.75.0", + "webpack-cli": "^5.0.1", + "webpack-node-externals": "^3.0.0", "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.17.9", - "@babel/plugin-transform-runtime": "^7.17.0", - "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.11", - "@babel/preset-typescript": "^7.16.0", - "@babel/runtime": "^7.17.9", + "@babel/core": "^7.20.12", "@types/autosize": "^4.0.0", - "@types/express": "^4.17.13", - "@types/node": "^17.0.29", - "@types/node-fetch": "^2.6.1", + "@types/express": "^4.17.16", + "@types/html-to-text": "^9.0.0", + "@types/markdown-it": "^12.2.3", + "@types/markdown-it-container": "^2.0.5", + "@types/node": "^18.11.18", + "@types/node-fetch": "^2.6.2", + "@types/sanitize-html": "^2.8.0", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.21.0", - "babel-loader": "^8.2.5", - "babel-plugin-inferno": "^6.4.0", - "bootstrap": "^5.1.3", - "bootswatch": "^5.1.3", - "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.2.4", - "css-loader": "^6.7.1", - "eslint": "^8.14.0", - "eslint-plugin-prettier": "^4.0.0", - "husky": "^7.0.4", + "@types/toastify-js": "^1.11.1", + "@typescript-eslint/eslint-plugin": "^5.49.0", + "@typescript-eslint/parser": "^5.49.0", + "bootstrap": "^5.2.3", + "bootswatch": "^5.2.3", + "eslint": "^8.33.0", + "eslint-plugin-inferno": "^7.32.1", + "eslint-plugin-prettier": "^4.2.1", + "husky": "^8.0.3", "import-sort-style-module": "^6.0.0", - "lemmy-js-client": "0.16.4", - "lint-staged": "^12.4.1", - "mini-css-extract-plugin": "^2.6.0", - "node-fetch": "^2.6.1", - "prettier": "^2.6.2", + "lint-staged": "^13.1.0", + "prettier": "^2.8.3", "prettier-plugin-import-sort": "^0.0.7", - "prettier-plugin-organize-imports": "^2.3.4", - "prettier-plugin-packagejson": "^2.2.17", - "rimraf": "^3.0.2", - "run-node-webpack-plugin": "^1.3.0", - "sass-loader": "^12.6.0", - "sortpack": "^2.2.0", + "prettier-plugin-organize-imports": "^3.2.2", + "prettier-plugin-packagejson": "^2.4.2", + "rimraf": "^4.1.2", + "sortpack": "^2.3.3", "style-loader": "^3.3.1", - "terser": "^5.13.0", - "typescript": "^4.6.3", - "webpack": "5.72.0", - "webpack-cli": "^4.9.2", - "webpack-dev-server": "4.8.1", - "webpack-node-externals": "^3.0.0" + "terser": "^5.16.2", + "typescript": "^4.9.5", + "webpack-dev-server": "4.11.1" }, "engines": { "node": ">=8.9.0" diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index d27a5319309b8..05960e62965d7 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.16.7", - "serverSha256": "sha256-S0WomoWm3Bf3M6W6Q1+emLuwC4IPxGlM5aqY8yTPG6Q=", - "serverCargoSha256": "sha256-PxIFgQ6ngkpZInJX55feFg/R+nVO30z6q+apZKBXlkg=", - "uiSha256": "sha256-gM+L/gMNMuQQTnnlrGRqAlXKBrf27bpbZWoqufpb3LE=", - "uiYarnDepsSha256": "sha256-2NiDuqAyZeNn3c3XDeP2m5hHej4w4/gcabxfHgC8PV4=" + "version": "0.17.1", + "serverSha256": "sha256-2pSa3IvmEoZbDS3U0yvZfocpgmoHJKm6n2ggPCCXtxY=", + "serverCargoSha256": "sha256-uVqRuOSr5Smjpe/HUhIebrBaxJNdMOzHrtQkzTKsLC8=", + "uiSha256": "sha256-JehU0Bk0S1qjYRlQSQzQOYSLUScDAAbKp8O9zH40XRc=", + "uiYarnDepsSha256": "sha256-AeY6k1qkubTefUofq9ISzXq3huNWHoSpQFFRgCMdFhQ=" } diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 0f80c3f4276a3..c438c79186927 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.67.1"; + version = "0.67.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - sha256 = "sha256-oc9rG1dHi5YEU8VdwldHDv1qporMk8K7wpXOrCgcc0w="; + sha256 = "sha256-O5t//UwF+AVFxeBQHRIZM5RSf4+DgUE5LHWVRKxJLfc="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { node_modules=$out/share/outline/node_modules build=$out/share/outline/build + # On NixOS the WorkingDirectory is set to the build directory, as + # this contains files needed in the onboarding process. This folder + # must also contain the `public` folder for mail notifications to + # work, as it contains the mail templates. + ln -s $out/share/outline/public $build/public + makeWrapper ${nodejs}/bin/node $out/bin/outline-server \ --add-flags $build/server/index.js \ --set NODE_ENV production \ diff --git a/pkgs/servers/web-apps/outline/yarn.lock b/pkgs/servers/web-apps/outline/yarn.lock index 4cc338dbf6f06..f5b7c69fd4d8b 100644 --- a/pkgs/servers/web-apps/outline/yarn.lock +++ b/pkgs/servers/web-apps/outline/yarn.lock @@ -76,12 +76,12 @@ 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.18.10", "@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.18.10" + "@babel/types" "^7.20.7" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -110,17 +110,18 @@ browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@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== +"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.9", "@babel/helper-create-class-features-plugin@^7.20.7": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819" + integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ== 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-function-name" "^7.19.0" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-create-regexp-features-plugin@^7.16.0": @@ -157,13 +158,13 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-function-name@^7.16.0", "@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== +"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9", "@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/template" "^7.18.6" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" "@babel/helper-hoist-variables@^7.16.0", "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -172,12 +173,12 @@ 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== +"@babel/helper-member-expression-to-functions@^7.18.9", "@babel/helper-member-expression-to-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05" + integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw== dependencies: - "@babel/types" "^7.18.9" + "@babel/types" "^7.20.7" "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6": version "7.18.6" @@ -221,16 +222,17 @@ "@babel/helper-wrap-function" "^7.16.0" "@babel/types" "^7.16.0" -"@babel/helper-replace-supers@^7.16.0", "@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-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.18.9", "@babel/helper-replace-supers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" + integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" "@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6": version "7.18.6" @@ -239,12 +241,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== +"@babel/helper-skip-transparent-expression-wrappers@^7.16.0", "@babel/helper-skip-transparent-expression-wrappers@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" + integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.20.0" "@babel/helper-split-export-declaration@^7.16.0", "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" @@ -263,7 +265,7 @@ 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.14.5", "@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6": +"@babel/helper-validator-option@^7.14.5", "@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== @@ -296,10 +298,10 @@ 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", "@babel/parser@^7.7.0": - 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.18.11", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.0": version "7.16.2" @@ -582,12 +584,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" - integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== +"@babel/plugin-syntax-typescript@^7.20.0", "@babel/plugin-syntax-typescript@^7.7.2": + 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/plugin-transform-arrow-functions@^7.16.0": version "7.16.0" @@ -867,14 +869,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-typescript@^7.16.7": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" - integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== +"@babel/plugin-transform-typescript@^7.18.6": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz#673f49499cd810ae32a1ea5f3f8fab370987e055" + integrity sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-typescript" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-typescript" "^7.20.0" "@babel/plugin-transform-unicode-escapes@^7.16.0": version "7.16.0" @@ -994,14 +996,14 @@ "@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.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" - integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== +"@babel/preset-typescript@^7.18.6": + 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.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-transform-typescript" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-validator-option" "^7.18.6" + "@babel/plugin-transform-typescript" "^7.18.6" "@babel/runtime-corejs3@^7.10.2": version "7.12.5" @@ -1018,35 +1020,35 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.16.0", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@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== +"@babel/template@^7.16.0", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@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.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@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.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" + integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.10" + "@babel/generator" "^7.20.7" "@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.20.7" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" - integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -10062,10 +10064,10 @@ jsdom@^19.0.0: ws "^8.2.3" xml-name-validator "^4.0.0" -jsdom@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" - integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== +jsdom@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" + integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== dependencies: abab "^2.0.6" acorn "^8.8.1" diff --git a/pkgs/servers/web-apps/outline/yarn.nix b/pkgs/servers/web-apps/outline/yarn.nix index 8f4cbb4b8b353..6e2aa068aeabb 100644 --- a/pkgs/servers/web-apps/outline/yarn.nix +++ b/pkgs/servers/web-apps/outline/yarn.nix @@ -58,11 +58,11 @@ }; } { - name = "_babel_generator___generator_7.18.12.tgz"; + name = "_babel_generator___generator_7.20.7.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.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.20.12.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_class_features_plugin___helper_create_class_features_plugin_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz"; + sha512 = "9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ=="; }; } { @@ -130,11 +130,11 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.18.9.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.19.0.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=="; }; } { @@ -146,11 +146,11 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.20.7.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_member_expression_to_functions___helper_member_expression_to_functions_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz"; + sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw=="; }; } { @@ -194,11 +194,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.20.7.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_replace_supers___helper_replace_supers_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"; + sha512 = "vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A=="; }; } { @@ -210,11 +210,11 @@ }; } { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.20.0.tgz"; path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"; + sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg=="; }; } { @@ -274,11 +274,11 @@ }; } { - name = "_babel_parser___parser_7.18.11.tgz"; + name = "_babel_parser___parser_7.20.7.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.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; } { @@ -570,11 +570,11 @@ }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.10.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.20.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz"; - sha512 = "xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ=="; + 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=="; }; } { @@ -858,11 +858,11 @@ }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.8.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.20.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz"; - sha512 = "bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ=="; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz"; + sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw=="; }; } { @@ -906,11 +906,11 @@ }; } { - name = "_babel_preset_typescript___preset_typescript_7.16.7.tgz"; + name = "_babel_preset_typescript___preset_typescript_7.18.6.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz"; - sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; + 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=="; }; } { @@ -930,27 +930,27 @@ }; } { - name = "_babel_template___template_7.18.10.tgz"; + name = "_babel_template___template_7.20.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + 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.18.11.tgz"; + name = "_babel_traverse___traverse_7.20.12.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.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; } { - name = "_babel_types___types_7.20.5.tgz"; + name = "_babel_types___types_7.20.7.tgz"; path = fetchurl { - name = "_babel_types___types_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz"; - sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; + name = "_babel_types___types_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; } { @@ -10482,11 +10482,11 @@ }; } { - name = "jsdom___jsdom_20.0.3.tgz"; + name = "jsdom___jsdom_21.0.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_20.0.3.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; - sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; + name = "jsdom___jsdom_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz"; + sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; }; } { diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix index cd89da9430422..b200ae637f56c 100644 --- a/pkgs/servers/web-apps/phylactery/default.nix +++ b/pkgs/servers/web-apps/phylactery/default.nix @@ -1,20 +1,24 @@ -{ lib, buildGoPackage, fetchFromSourcehut, nixosTests }: +{ lib, buildGoModule, fetchFromSourcehut, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "phylactery"; version = "0.1.2"; - goPackagePath = "git.sr.ht/~cnx/phylactery"; - src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; - sha256 = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ="; + hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ="; }; - # Upstream repo doesn't provide any test. - doCheck = false; + vendorHash = null; + + preBuild = '' + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; + passthru.tests.phylactery = nixosTests.phylactery; meta = with lib; { diff --git a/pkgs/servers/web-apps/phylactery/go.mod b/pkgs/servers/web-apps/phylactery/go.mod new file mode 100644 index 0000000000000..4ec9652e23fec --- /dev/null +++ b/pkgs/servers/web-apps/phylactery/go.mod @@ -0,0 +1,3 @@ +module git.sr.ht/~cnx/phylactery + +go 1.18 diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 0026e5bdbcf17..60a8e22a48455 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -27,7 +27,7 @@ toPythonModule (buildPythonApplication rec { certifi python-dateutil flask - flaskbabel + flask-babel gevent grequests jinja2 diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 0ddfc5351e3f2..9ea17db9ee13b 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2022-09-01"; + version = "unstable-2023-03-13"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "174e5242569812618af4ebd9a646ba2a6ded5459"; - sha256 = "sha256-Q1+4HkgOoTRtW5XYWpC5dpukkrjG5fP0585soo/srmQ="; + rev = "295c87a926c3deb1e438234550a9d8fbbaad17fa"; + sha256 = "sha256-ItPFUyyuctx/yyMVUn5Ez9f+taNiV6FR0q9wz1jwk8M="; }; postPatch = '' @@ -26,11 +26,11 @@ python3.pkgs.buildPythonApplication rec { babel certifi python-dateutil + fasttext-predict flask - flaskbabel + flask-babel brotli jinja2 - langdetect lxml pygments pyyaml @@ -56,6 +56,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 5d138132377e0..90d238f32329a 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "shiori"; - version = "1.5.3"; + version = "1.5.4"; - vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY="; + vendorHash = "sha256-8aiaG2ry/XXsosbrLBmwnjbwIhbKMdM6WHae07MG7WI="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8="; + sha256 = "sha256-QZTYhRz65VLs3Ytv0k8ptfeQ/36M2VBXFaD9zhQXDh8="; }; passthru.tests = { diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index d5a422606af16..93cb0e1bbbcb6 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -5,13 +5,13 @@ , libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE="; + hash = "sha256-lHUEV5yYLs3oc8Arl3KX8G/OEAoLmS7pRLCGsRAJAr4="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 829ad9442f0c7..7dd98c553fc70 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-KBUN/vBm2st5mfqmrwUv8w4QcgSKerfY51LQbWRn7To="; + sha256 = "sha256-VSzjP6fC9zxUnY3ZhapRUXUS4V7+BVvXJKrxm71CK4o="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-ke4jhOhD24zSpQI1nxKoJ05yN/SfCku+wiNuDKr78rw="; + vendorSha256 = "sha256-8qaEMHBZcop1wH3tmNKAAMEYA4qrE6dlwxhRsCDeZaY="; # checks need to be disabled because of needed internet for some checks doCheck = false; @@ -48,6 +48,7 @@ buildGoModule rec { passthru.tests.vikunja = nixosTests.vikunja; meta = { + changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; description = "API of the Vikunja to-do list app"; homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index 6cbca199ea621..14787835f79f3 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.20.2"; + version = "0.20.3"; + src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-7WvitR40eJPPdqwZm8C7spvEIdFIY3SGc/w4VY7spgk="; + sha256 = "sha256-+VtdgbJaXcPlO70Gqsur6osBb7iAvVnPv2iaHbs2Rmk="; }; nativeBuildInputs = [ unzip ]; @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { passthru.tests.vikunja = nixosTests.vikunja; meta = { + changelog = "https://kolaente.dev/vikunja/frontend/src/tag/v${version}/CHANGELOG.md"; description = "Frontend of the Vikunja to-do list app"; homepage = "https://vikunja.io/"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 955eac2c6c334..1e6763c39c3e7 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -16,7 +16,7 @@ let pname = "wallabag"; - version = "2.5.2"; + version = "2.5.4"; in stdenv.mkDerivation { inherit pname version; @@ -27,7 +27,7 @@ stdenv.mkDerivation { "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz" "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz" ]; - hash = "sha256-Q989SorGPm3KBuQhGAinYU6HGIa9RrhtRPvwGALU6jk="; + hash = "sha256-yVMQXjGB8Yv1klQaHEbDGMZmOtANRocFJnawKn10xhg="; }; patches = [ @@ -45,8 +45,12 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' + runHook preInstall + mkdir $out cp -R * $out/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 6df706e22b79c..cf1167798dd62 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.295"; + version = "2.5.297"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-itiW9/QtNpc8cFS5skwlc3JSWoVqbBbIcSlEd+GRkH0="; + sha256 = "sha256-58TAlioeBjNYRk2Ku6kFxHLffcDq3HwlqklqBkEIhLM="; }; sourceRoot = "."; diff --git a/pkgs/servers/web-apps/wordpress/generic.nix b/pkgs/servers/web-apps/wordpress/generic.nix index e15640c882812..d2d97dab35d9f 100644 --- a/pkgs/servers/web-apps/wordpress/generic.nix +++ b/pkgs/servers/web-apps/wordpress/generic.nix @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + # remove non-essential plugins and themes + rm -r wp-content/{plugins,themes} + mkdir wp-content/plugins + cat << EOF > wp-content/plugins/index.php + <?php + // Silence is golden. + EOF + cp -a wp-content/{plugins,themes} + mkdir -p $out/share/wordpress cp -r . $out/share/wordpress diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 19d23531f6b02..a60c06854183d 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -5,4 +5,10 @@ url = "https://storage.googleapis.com/${name}/${name}-stable/${version}/${name}-${version}-wordpress.zip"; hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI="; }; + themes.geist = fetchzip rec { + name = "geist"; + version = "2.0.3"; + url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; + hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + }; } diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 43580d9d22d50..f68c9f34ea9c8 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-oaptZaXG7qFjTPeasM4NjOBfa9jsEzqg+kKTge1mXv4="; + sha256 = "sha256-ZffVc/nLWaiUhg0DcLfDTiGVuK0MCSOpBd2gVG2rT0c="; }; - vendorSha256 = "sha256-Ifn230KHFDQ1RaKAVnd8EBsBZdpJY4Dx/KO+o1cm50k="; + vendorHash = "sha256-FUTyTdGqdzuObpYW1ZSnhj24+MJiYG1NmSU4BZ6SlHM="; doCheck = false; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 2d132b389be68..3cf65e990795a 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -12,6 +12,7 @@ in stdenv.mkDerivation { ./no_title_crash.patch ./extern-patch.patch ]; + configureFlags = [ "--enable-xplugin-dock-support" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libXinerama diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ed9efb690fa8d..41bc0609c91aa 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -22,18 +22,18 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { pname = "bdftopcf"; - version = "1.1"; + version = "1.1.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; - sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; + url = "https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz"; + sha256 = "026rzs92h9jsc7r0kvvyvwhm22q0805gp38rs14x6ghg7kam7j8i"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ]; + buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; }) {}; @@ -178,11 +178,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "font-alias"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; - sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; + url = "mirror://xorg/individual/font/font-alias-1.0.4.tar.bz2"; + sha256 = "0xjjjindczv3g7m1597l0x19zz75xy70wh5garghz61fpzl1l4gk"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -696,11 +696,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "font-util"; - version = "1.3.1"; + version = "1.3.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; - sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; + url = "mirror://xorg/individual/font/font-util-1.3.3.tar.xz"; + sha256 = "1lpb5qd2drilql4wl644m682hvmv67hdbbisnrm0ah4wfy8ci4g7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -890,18 +890,18 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans }: stdenv.mkDerivation { pname = "libX11"; - version = "1.8.1"; + version = "1.8.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.1.tar.xz"; - sha256 = "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v"; + url = "mirror://xorg/individual/lib/libX11-1.8.4.tar.xz"; + sha256 = "sha256-yaKHpa76mATOPPr89Rb+lu0/fo5FwOLuWehMhnV99Rg="; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libxcb xtrans ]; + buildInputs = [ xorgproto libpthreadstubs libxcb xtrans ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1180,11 +1180,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { pname = "libXpm"; - version = "3.5.13"; + version = "3.5.15"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; - sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; + url = "mirror://xorg/individual/lib/libXpm-3.5.15.tar.xz"; + sha256 = "1hfivygzrzpq81vg9z2l46pd5nrzm326k6z3cfw6syiibin91fv0"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1516,11 +1516,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { pname = "lndir"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; - sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; + url = "mirror://xorg/individual/util/lndir-1.0.4.tar.xz"; + sha256 = "11syg5hx3f7m1d2p7zw717lryk819h6wk8h4vmapfdxvsflkfd1y"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3372,11 +3372,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { pname = "xprop"; - version = "1.2.5"; + version = "1.2.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2"; - sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; + url = "mirror://xorg/individual/app/xprop-1.2.6.tar.xz"; + sha256 = "0vjqnn42gscw1z2wdj24kdwjwvd7mw58pj0nm9203k1fn4jqa2sq"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3436,11 +3436,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { pname = "xset"; - version = "1.2.4"; + version = "1.2.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; - sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; + url = "mirror://xorg/individual/app/xset-1.2.5.tar.xz"; + sha256 = "0bsyyx3k32k9vpb8x3ks7hlfr03nm0i14fv3cg6n4f2vcdajsscz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6de759498b21c..2972f04300882 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -3,7 +3,8 @@ lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, - libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, + libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, + ncompress, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, ApplicationServices, Carbon, Cocoa, Xplugin, @@ -25,7 +26,7 @@ self: super: { wrapWithXFileSearchPathHook = callPackage ({ makeBinaryWrapper, makeSetupHook, writeScript }: makeSetupHook { name = "wrapWithXFileSearchPathHook"; - deps = [ makeBinaryWrapper ]; + propagatedBuildInputs = [ makeBinaryWrapper ]; } (writeScript "wrapWithXFileSearchPathHook.sh" '' wrapWithXFileSearchPath() { paths=( @@ -183,6 +184,7 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; + outputDoc = "devdoc"; outputs = [ "out" "dev" "devdoc" ]; }); @@ -313,6 +315,7 @@ self: super: libXpm = super.libXpm.overrideAttrs (attrs: { outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; + XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; }); libXpresent = super.libXpresent.overrideAttrs (attrs: { @@ -328,7 +331,13 @@ self: super: }); libpciaccess = super.libpciaccess.overrideAttrs (attrs: { - meta = attrs.meta // { platforms = lib.platforms.linux; }; + buildInputs = lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]); + + meta = attrs.meta // { + # https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/master/configure.ac#L108-114 + platforms = lib.fold (os: ps: ps ++ lib.platforms.${os}) [] + [ "cygwin" "freebsd" "linux" "netbsd" "openbsd" "illumos" ]; + }; }); setxkbmap = super.setxkbmap.overrideAttrs (attrs: { @@ -449,7 +458,7 @@ self: super: xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: { - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-overflow" ]; }); xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: { @@ -583,6 +592,7 @@ self: super: xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; @@ -731,35 +741,24 @@ self: super: attrs = if (abiCompat == null || lib.hasPrefix abiCompat version) then attrs_passed // { - buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; postPatch = '' - for i in dri3/*.c - do - sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i - done - '';} - else if (abiCompat == "1.18") then { - name = "xorg-server-1.18.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2"; - sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - postPatch = lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h"; - meta.platforms = lib.platforms.unix; - meta.broken = stdenv.isDarwin; - } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; + buildInputs = attrs_passed.buildInputs ++ + lib.optional (libdrm != null) libdrm.dev; + postPatch = '' + for i in dri3/*.c + do + sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i + done + ''; + } + else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; in attrs // (let version = lib.getVersion attrs; commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ - zlib libGL libGLU dbus - xorgproto - libXext pixman libXfont libxshmfence libunwind - libXfont2 + dbus libGL libGLU libXext libXfont libXfont2 libepoxy libunwind + libxshmfence pixman xorgproto zlib ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. @@ -853,9 +852,14 @@ self: super: url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/ccdd431cd8f1cabae9d744f0514b6533c438908c.diff"; sha256 = "sha256-IGPsjS7KgRPLrs1ImBXvIFCa8Iu5ZiAHRZvHlBYP8KQ="; }) + (fetchpatch { + name = "CVE-2023-0494.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ba6d8c37071131a49790243cdac55392ecf71ec.diff"; + sha256 = "sha256-/+IuGk09OYVEIB/Y+DTKf7kfHyukEFX/6u1FDIGJieY="; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -878,6 +882,11 @@ self: super: "--disable-tls" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + postInstall = '' rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others @@ -889,7 +898,7 @@ self: super: ''; passthru.version = version; # needed by virtualbox guest additions } else { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook xorg.utilmacros xorg.fontutil ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook bootstrap_cmds xorg.utilmacros xorg.fontutil ]; buildInputs = commonBuildInputs ++ [ bootstrap_cmds automake autoconf Xplugin Carbon Cocoa @@ -925,6 +934,7 @@ self: super: configureFlags = [ # note: --enable-xquartz is auto "CPPFLAGS=-I${./darwin/dri}" + "--disable-glamor" "--with-default-font-path=" "--with-apple-application-name=XQuartz" "--with-apple-applications-dir=\${out}/Applications" @@ -985,7 +995,7 @@ self: super: xinit = (super.xinit.override { stdenv = if isDarwin then clangStdenv else stdenv; }).overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds; + nativeBuildInputs = attrs.nativeBuildInputs ++ lib.optional isDarwin bootstrap_cmds; depsBuildBuild = [ buildPackages.stdenv.cc ]; configureFlags = [ "--with-xserver=${xorg.xorgserver.out}/bin/X" diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 608b66b093eae..f5d004fd0f651 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -8,7 +8,7 @@ https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 +https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2 @@ -60,11 +60,11 @@ mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.5.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.6.tar.xz mirror://xorg/individual/app/xrandr-1.5.1.tar.xz mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 -mirror://xorg/individual/app/xset-1.2.4.tar.bz2 +mirror://xorg/individual/app/xset-1.2.5.tar.xz mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 @@ -135,7 +135,7 @@ mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 -mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2 +mirror://xorg/individual/font/font-alias-1.0.4.tar.bz2 mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2 mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2 mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2 @@ -163,7 +163,7 @@ mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2 mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-util-1.3.1.tar.bz2 +mirror://xorg/individual/font/font-util-1.3.3.tar.xz mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.1.tar.xz +mirror://xorg/individual/lib/libX11-1.8.4.tar.xz mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libxcb-1.14.tar.xz @@ -193,7 +193,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.15.tar.xz mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 @@ -213,7 +213,7 @@ mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz mirror://xorg/individual/proto/xorgproto-2021.5.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 -mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 +mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index ae30254614492..c76295cec83fb 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "22.1.7"; + version = "22.1.8"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-1Tr6xscZU/XPZtA9KJ2s2JYdpb0wnB3/El1ZVdnbX3Y="; + sha256 = "sha256-0R7u5zKQuI6o2kKn2TUN7fq6hWzkrkTljARa2eyqL3M="; }; depsBuildBuild = [ @@ -95,11 +95,12 @@ stdenv.mkDerivation rec { zlib ]; mesonFlags = [ - "-Dxwayland_eglstream=true" - "-Ddefault_font_path=${defaultFontPath}" - "-Dxkb_bin_dir=${xkbcomp}/bin" - "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" - "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" + (lib.mesonBool "xwayland_eglstream" true) + (lib.mesonOption "default_font_path" defaultFontPath) + (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin") + (lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb") + (lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled") + (lib.mesonBool "libunwind" (libunwind != null)) ]; meta = with lib; { diff --git a/pkgs/servers/xteve/default.nix b/pkgs/servers/xteve/default.nix new file mode 100644 index 0000000000000..a65d375389722 --- /dev/null +++ b/pkgs/servers/xteve/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "xteve"; + version = "2.2.0.200"; + + src = fetchFromGitHub { + owner = "xteve-project"; + repo = "xTeVe"; + rev = version; + hash = "sha256-hD4GudSkGZO41nR/CgcMg/SqKjpAO1yJDkfwa8AUges="; + }; + + vendorSha256 = "sha256-oPkSWpqNozfSFLIFsJ+e2pOL6CcR91YHbqibEVF2aSk="; + + meta = with lib; { + description = "M3U Proxy for Plex DVR and Emby Live TV"; + homepage = "https://github.com/xteve-project/xTeVe"; + license = licenses.mit; + maintainers = with maintainers; [ nrhelmi ]; + }; +} diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 837ffc070a1b1..e24397773d512 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.29.2"; + version = "1.30.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-f3M5QgSN7j/zfKAmJiAPGSEa2pS77zJKUamQrZMllYY="; + hash = "sha256-e/pV2W9POUxKhuX5RT9INEqneC65V4dg66ywTR9YUyI="; }; - npmDepsHash = "sha256-cVX26bshHNOAPVhJQ3G88orrqQvxsF3FnR3/TNVZZJY="; + npmDepsHash = "sha256-sHXTwT5gXi5CkfMU/eZDMgsX2qymMhvUEtfUo6MV3hA="; nativeBuildInputs = [ python3 diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 7735243d3babd..00b4a707ed08c 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -12,6 +12,8 @@ , withDocs ? false , texinfo , forFHSEnv ? false + +, pkgsStatic }: let @@ -37,7 +39,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" "info" ]; - NIX_CFLAGS_COMPILE = '' + separateDebugInfo = true; + + env.NIX_CFLAGS_COMPILE = '' -DSYS_BASHRC="/etc/bashrc" -DSYS_BASH_LOGOUT="/etc/bash_logout" '' + lib.optionalString (!forFHSEnv) '' @@ -50,13 +54,14 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; - patches = upstreamPatches - ++ [ ./pgrp-pipe-5.patch ] - ++ lib.optional stdenv.hostPlatform.isStatic (fetchurl { + patches = upstreamPatches ++ [ + ./pgrp-pipe-5.patch + (fetchurl { name = "fix-static.patch"; url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51"; sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk="; - }); + }) + ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") @@ -113,6 +118,7 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/bash"; + tests.static = pkgsStatic.bash; }; meta = with lib; { diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 912985c1cfed0..32185663e1337 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-UPm0B3sv2+0/tS7NdqY5fpvMbI9B7CxixWF9M74H5w0="; + sha256 = "sha256-vpYBgDX0CxTNphmdwrI56AtlPlf2DGf3BZ+jWwdanpw="; }; - vendorHash = "sha256-l4DG6sZyFqu4OlxxL6mmcXTGljxY7xk5u5QlOr8dBNI="; + vendorHash = "sha256-Qi2fkAdO0clpKowSdoxyanIB65oagqEnw5gCqVHPJb0="; subPackages = [ "./cmd/carapace" ]; diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 5b085a091e01f..718dbfec7a642 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -32,6 +32,10 @@ lib.makeScope newScope (self: with self; { pisces = callPackage ./pisces.nix { }; + plugin-git = callPackage ./plugin-git.nix { }; + + puffer = callPackage ./puffer.nix { }; + pure = callPackage ./pure.nix { }; sponge = callPackage ./sponge.nix { }; diff --git a/pkgs/shells/fish/plugins/grc.nix b/pkgs/shells/fish/plugins/grc.nix index f506ba36c13cc..1149c082cac06 100644 --- a/pkgs/shells/fish/plugins/grc.nix +++ b/pkgs/shells/fish/plugins/grc.nix @@ -11,6 +11,10 @@ buildFishPlugin { sha256 = "sha256-NQa12L0zlEz2EJjMDhWUhw5cz/zcFokjuCK5ZofTn+Q="; }; + postInstall = '' + cp conf.d/executables $out/share/fish/vendor_conf.d/ + ''; + meta = with lib; { description = "grc Colourizer for some commands on Fish shell"; license = licenses.mit; diff --git a/pkgs/shells/fish/plugins/plugin-git.nix b/pkgs/shells/fish/plugins/plugin-git.nix new file mode 100644 index 0000000000000..7d1774b642dfe --- /dev/null +++ b/pkgs/shells/fish/plugins/plugin-git.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "plugin-git"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "jhillyerd"; + repo = "plugin-git"; + rev = "v0.1"; + sha256 = "sha256-MfrRQdcj7UtIUgtqKjt4lqFLpA6YZgKjE03VaaypNzE"; + }; + + meta = with lib; { + description = "Git plugin for fish (similar to oh-my-zsh git)"; + homepage = "https://github.com/jhillyerd/plugin-git"; + license = licenses.mit; + maintainers = with maintainers; [ unsolvedcypher ]; + }; +} diff --git a/pkgs/shells/fish/plugins/puffer.nix b/pkgs/shells/fish/plugins/puffer.nix new file mode 100644 index 0000000000000..0365c55e53516 --- /dev/null +++ b/pkgs/shells/fish/plugins/puffer.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "puffer"; + version = "unstable-2022-10-07"; + + src = fetchFromGitHub { + owner = "nickeb96"; + repo = "puffer-fish"; + rev = "fd0a9c95da59512beffddb3df95e64221f894631"; + hash = "sha256-aij48yQHeAKCoAD43rGhqW8X/qmEGGkg8B4jSeqjVU0="; + }; + + meta = with lib; { + description = "Text Expansions for Fish"; + homepage = "https://github.com/nickeb96/puffer-fish"; + license = licenses.mit; + maintainers = with maintainers; [ quantenzitrone ]; + }; +} diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index c1980309e1f18..20e1331dbcb9e 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "hilbish"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-5GPJVusF3/WbEE5VH45Wyxq40wbNxgjO8QI2cLMpdN0="; + sha256 = "sha256-iXDBo3bcmjsDy+iUREpg+sDTFN2LeF7jA+mg62LKeIs="; fetchSubmodules = true; }; subPackages = [ "." ]; - vendorSha256 = "sha256-Kiy1JR3X++naY2XNLpnGujrNQt7qlL0zxv8E96cHmHo="; + vendorHash = "sha256-Kiy1JR3X++naY2XNLpnGujrNQt7qlL0zxv8E96cHmHo="; ldflags = [ "-s" diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 1f8e77394221f..134f0a7ab1852 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "murex"; - version = "3.0.9310"; + version = "3.1.3100"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UjEEP5gDS20PXgzeN1q/j9eydEF/EaB2+TyugHPbbqE="; + sha256 = "sha256-haYS3M3Cg+RBGbH5Af/9qcTkKroqx76r1Fb6Bf08lgY="; }; - vendorHash = "sha256-vr8r0C01FlJOiAJjbkHxxFpC8hlQNPdoWGARZUl8YGs="; + vendorHash = "sha256-GKgwll9Cl+FMYwn07F7d33VXl4a9lcC7muzNvRzmR4k="; subPackages = [ "." ]; diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix new file mode 100644 index 0000000000000..345f917ddcd01 --- /dev/null +++ b/pkgs/shells/nix-your-shell/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: +rustPlatform.buildRustPackage rec { + pname = "nix-your-shell"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "MercuryTechnologies"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-g5TC+4DGbTAlG39R8QIM5cB3/mtkp/vz8puB0Kr6aag="; + }; + + cargoSha256 = "sha256-AiWKSWwMh6KWCTTRRCBxekv2rukz+ijnRit11K/AnhU="; + + meta = with lib; { + description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; + homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; + license = [ licenses.mit ]; + maintainers = [ maintainers._9999years ]; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 68b2f95a40340..a5f9ae2f94e59 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -11,11 +11,9 @@ , python3 , xorg , libiconv +, Libsystem , AppKit -, Foundation , Security -# darwin.apple_sdk.sdk -, sdk , nghttp2 , libgit2 , withExtraFeatures ? true @@ -26,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-KFCsZmD83FqnB553Tbub95I7s8QGBMZ3rviKAQNcKqA="; + sha256 = "sha256-u8/SvuR/RpJaBX4Dr3Onrk0AVpIAeVb+399+NUpgkfI="; }; - cargoSha256 = "sha256-DpPyvNr1gh7w9HesmkH6N3ZGOmoZx/BDOQ0fQk84bE8="; + cargoSha256 = "sha256-hnSumfZd9ylEx3dkTGW2s4VSv107MHOn21ytOcimhPw="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; @@ -45,22 +43,8 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = [ openssl zstd ] - ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - Foundation - ( - # Pull a header that contains a definition of proc_pid_rusage(). - # (We pick just that one because using the other headers from `sdk` is not - # compatible with our C++ standard library. This header is already in - # the standard library on aarch64) - # See also: - # https://github.com/shanesveller/nixpkgs/tree/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/development/libraries/webkitgtk/default.nix - # https://github.com/shanesveller/nixpkgs/blob/90ed23b1b23c8ee67928937bdec7ddcd1a0050f5/pkgs/tools/system/btop/default.nix#L32-L38 - runCommand "${pname}_headers" { } '' - install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h - '' - ) - ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals stdenv.isDarwin [ zlib libiconv Libsystem Security ] + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; buildFeatures = lib.optional withExtraFeatures "extra"; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index bff43f683fae3..ec29091091880 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,16 +1,24 @@ -{ stdenv, lib, fetchurl, withReadline ? true, readline }: +{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }: +let + readline-all = symlinkJoin { + name = "readline-all"; paths = [ readline readline.dev ]; + }; +in stdenv.mkDerivation rec { pname = "oil"; - version = "0.12.9"; + version = "0.14.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-HY/SZiVOfOrA69gGxEp+qdRnuTJ72XveAk9Xp45zcf8="; + hash = "sha256-ZrT2vHfbc0S9Q9e9lDiyptfSC3CIiQs8Co9FODil7oY="; }; postPatch = '' patchShebangs build + # TODO: workaround for https://github.com/oilshell/oil/issues/1467 + # check for removability on updates :) + substituteInPlace configure --replace "echo '#define HAVE_READLINE 1'" "echo '#define HAVE_READLINE 1' && return 0" ''; preInstall = '' @@ -19,7 +27,12 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = lib.optional withReadline readline; - configureFlags = lib.optional withReadline "--with-readline"; + configureFlags = [ + "--datarootdir=${placeholder "out"}" + ] ++ lib.optionals withReadline [ + "--with-readline" + "--readline=${readline-all}" + ]; # Stripping breaks the bundles by removing the zip file from the end. dontStrip = true; diff --git a/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/pkgs/shells/zsh/agdsn-zsh-config/default.nix new file mode 100644 index 0000000000000..5fcad36035ddf --- /dev/null +++ b/pkgs/shells/zsh/agdsn-zsh-config/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "agdsn-zsh-config"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "agdsn"; + repo = "agdsn-zsh-config"; + rev = "v${version}"; + sha256 = "sha256-/l2fE4ZsZ6f89fYG9sTEV1mrXZ3MLXx6K3CTUQHiAsc="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D -m644 zshrc-base-hw.zsh "$out/etc/zsh/zshrc" + install -D -m644 zshrc-home.zsh "$out/etc/skel/.zshrc" + install -D -m644 zshrc-home.zsh "$out/etc/zsh/newuser.zshrc.recommended" + install -D -m644 profile-d-agdsn-zsh-config.sh "$out/etc/profile.d/agdsn-zsh-config.sh" + + runHook postInstall + ''; + + meta = with lib; { + description = "A modified version of the Grml Zsh configuration specialised for the needs of system administration"; + homepage = "https://github.com/agdsn/agdsn-zsh-config"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fugi ]; + }; +} diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 59e9fa8d8d487..73b9b55b0b8a1 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -2,26 +2,15 @@ stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - version = "0.4.4"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { - owner = "spwhitt"; + owner = "nix-community"; repo = "nix-zsh-completions"; - rev = version; - sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf"; + rev = "6a1bfc024481bdba568f2ced65e02f3a359a7692"; + hash = "sha256-aXetjkl5nPuYHHyuX59ywXF+4Xg+PUCV6Y2u+g18gEk="; }; - # https://github.com/spwhitt/nix-zsh-completions/issues/42 - # - # _nix completion is broken. Remove it; _nix provided by the nix - # package will be used instead. It is not sufficient to set low - # meta.priority below if nix is installed in the system profile and - # nix-zsh-completions in an user profile. In that case, the broken - # version takes precedence over the good one. - postPatch = '' - rm _nix - ''; - strictDeps = true; installPhase = '' mkdir -p $out/share/zsh/{site-functions,plugins/nix} @@ -30,9 +19,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/spwhitt/nix-zsh-completions"; + homepage = "https://github.com/nix-community/nix-zsh-completions"; description = "ZSH completions for Nix, NixOS, and NixOps"; - priority = 6; # prevent collisions with nix 2.4's built-in completions license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ece3722cfcd1e..879d894283514 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-01-17"; + version = "2023-02-23"; pname = "oh-my-zsh"; - rev = "61dd3682e69aa990a8a3589c5c61ea2e1edf8312"; + rev = "8a008e1f51d451db21232edd6f1709e6c5ea334e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "5ixM/cQdhr/ycXoL2G1Mvc77zxN3Di75W2Hhst8HvZ0="; + sha256 = "GXrDcM3MMDLHJ64xyyiORK6UPepFPaNbaZ5rNmV4zlk="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f78723ee6e2b8..249cb1b5154db 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-BmzYAgP5Z77VqcpAB49cQLNuvQX1qcKmAh9BuXsy2pA="; + sha256 = "sha256-FgTCdSSDp8pvscRUD4vVk/peoCI4e9FPoCuHP25wxXA="; }; strictDeps = true; dontConfigure = true; @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { ## the `zimfw.zsh` where we currently are. postFixup = '' substituteInPlace $out/zimfw.zsh \ - --replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" + --replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" \ + --replace "\''${(q-)ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" ''; meta = with lib; { diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/shells/zsh/zsh-clipboard/default.nix index eb395d7447284..312731e7cb162 100644 --- a/pkgs/shells/zsh/zsh-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-clipboard/default.nix @@ -4,13 +4,12 @@ stdenv.mkDerivation rec { pname = "zsh-clipboard"; version = "1.0"; - src = ./.; - + dontUnpack = true; strictDeps = true; dontBuild = true; installPhase = '' - install -D -m0444 -t $out/share/zsh/plugins/clipboard ./clipboard.plugin.zsh + install -D -m0444 -T ${./clipboard.plugin.zsh} $out/share/zsh/plugins/clipboard/clipboard.plugin.zsh ''; meta = with lib; { diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index ff1a5f7d9c75a..0bfbd9cd4b73c 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "zsh-forgit"; - version = "23.01.0"; + version = "23.02.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - sha256 = "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk="; + sha256 = "sha256-PGFYw7JbuYHOVycPlYcRItElcyuKEg2cGv4wn6In5Mo="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 4f5e21ec8cf72..3fd0920e9b3f6 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -7,25 +7,25 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec { - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "v${version}"; - sha256 = "17giwdjrsmr71xskxxf506n8kaab8zx77fv267fx37ifi57nffk5"; + rev = "refs/tags/v${version}"; + hash = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk="; }; }); in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; - rev = "v${version}"; - sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c"; + rev = "refs/tags/v${version}"; + hash = "sha256-fgrwbWj6CcPoZ6GbCZ47HRUg8ZSJWOsa7aipEqYuE0Q="; }; strictDeps = true; @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { ''; meta = { + changelog = "https://github.com/romkatv/powerlevel10k/releases/tag/v${version}"; description = "A fast reimplementation of Powerlevel9k ZSH theme"; homepage = "https://github.com/romkatv/powerlevel10k"; license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.hexa ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 3bf0bbb286ced..3e24e84b8c726 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2023-01-12"; + version = "unstable-2023-01-31"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "e50b93ca882aa58b0119b2e90818c4157e30c794"; - sha256 = "25mz5UMTCHAVjtUhQsWTMsAGAweAwwTdGNLHMp2LCBM="; + rev = "fc444f57e11131b2cad68f474bcf1201cba062a4"; + sha256 = "pypWlWWEBKGT98GVg5yVdzrWJb28jsw2xzGeYhO2DNk="; fetchSubmodules = true; }; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 85bd8d2087f66..8ff64ff9a3ae5 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -100,6 +100,7 @@ rec { + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (pkgs.buildPackages.makeSetupHook { + name = "darwin-portable-libSystem-hook"; substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; }; @@ -141,7 +142,7 @@ rec { Example: stdenvNoOptimise = addAttrsToDerivation - { NIX_CFLAGS_COMPILE = "-O0"; } + { env.NIX_CFLAGS_COMPILE = "-O0"; } stdenv; */ addAttrsToDerivation = extraAttrs: stdenv: stdenv.override (old: { @@ -175,7 +176,7 @@ rec { stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { dontStrip = true; - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; + env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; }); }); @@ -196,7 +197,7 @@ rec { impureUseNativeOptimizations = stdenv: stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; + env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; NIX_ENFORCE_NO_NATIVE = false; preferLocalBuild = true; @@ -221,7 +222,7 @@ rec { withCFlags = compilerFlags: stdenv: stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; + env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }); }); } diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 2ee8c070ae19e..6cc6271eedbe6 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -98,7 +98,6 @@ rec { doSign = localSystem.isAarch64 && last != null; doUpdateAutoTools = localSystem.isAarch64 && last != null; - inherit (last.pkgs) runCommandLocal; mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -737,6 +736,7 @@ rec { pcre.out gettext binutils.bintools + binutils.bintools.lib darwin.binutils darwin.binutils.bintools curl.out diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 5e549e48287c5..2cc44b319ffaa 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -71,7 +71,7 @@ in rec { cp ${gawk}/bin/gawk $out/bin cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin - cp ${gzip}/bin/gzip $out/bin + cp ${gzip}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2_.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 94998bbfa0fee..4b0ca649ee94d 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -242,7 +242,7 @@ let remediationMsg = (builtins.getAttr reason remediation) attrs; msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}" else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway." - + (if remediationMsg != "" then "\n${remediationMsg}" else ""); + + (lib.optionalString (remediationMsg != "") "\n${remediationMsg}"); isEnabled = lib.findFirst (x: x == reason) null showWarnings; in if isEnabled != null then builtins.trace msg true else true; @@ -271,7 +271,8 @@ let sourceProvenance = listOf lib.types.attrs; maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix priority = int; - platforms = listOf (oneOf [ str (attrsOf anything) (functionTo bool) ]); # see lib.meta.platformMatch + pkgConfigModules = listOf str; + platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch hydraPlatforms = listOf str; broken = bool; unfree = bool; @@ -321,7 +322,7 @@ let }" else "key 'meta.${k}' is unrecognized; expected one of: \n [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + checkMeta = meta: lib.optionals config.checkMeta (lib.remove null (lib.mapAttrsToList checkMetaAttr meta)); checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 517cfc03aea5f..6bf319d07308a 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -18,33 +18,34 @@ let # separate lines, because Nix would only show the last line of the comment. # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`. - args = rattrs (args // { inherit finalPackage; }); + args = rattrs (args // { inherit finalPackage overrideAttrs; }); # ^^^^ - finalPackage = - mkDerivationSimple - (f0: - let - f = self: super: - # Convert f0 to an overlay. Legacy is: - # overrideAttrs (super: {}) - # We want to introduce self. We follow the convention of overlays: - # overrideAttrs (self: super: {}) - # Which means the first parameter can be either self or super. - # This is surprising, but far better than the confusion that would - # arise from flipping an overlay's parameters in some cases. - let x = f0 super; - in - if builtins.isFunction x - then - # Can't reuse `x`, because `self` comes first. - # Looks inefficient, but `f0 super` was a cheap thunk. - f0 self super - else x; + overrideAttrs = f0: + let + f = self: super: + # Convert f0 to an overlay. Legacy is: + # overrideAttrs (super: {}) + # We want to introduce self. We follow the convention of overlays: + # overrideAttrs (self: super: {}) + # Which means the first parameter can be either self or super. + # This is surprising, but far better than the confusion that would + # arise from flipping an overlay's parameters in some cases. + let x = f0 super; in - makeDerivationExtensible - (self: let super = rattrs self; in super // f self super)) - args; + if builtins.isFunction x + then + # Can't reuse `x`, because `self` comes first. + # Looks inefficient, but `f0 super` was a cheap thunk. + f0 self super + else x; + in + makeDerivationExtensible + (self: let super = rattrs self; in super // f self super); + + finalPackage = + mkDerivationSimple overrideAttrs args; + in finalPackage; # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs), @@ -173,6 +174,13 @@ let separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; + # Turn a derivation into its outPath without a string context attached. + # See the comment at the usage site. + unsafeDerivationToUntrackedOutpath = drv: + if lib.isDerivation drv + then builtins.unsafeDiscardStringContext drv.outPath + else drv; + noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated ++ depsHostHost ++ depsHostHostPropagated ++ buildInputs ++ propagatedBuildInputs @@ -392,10 +400,8 @@ else let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamily = platform: with platform; /**/ if isAarch32 then "arm" - else if isAarch64 then "aarch64" else if isx86_32 then "x86" - else if isx86_64 then "x86_64" - else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + else platform.uname.processor; crossFile = builtins.toFile "cross-file.conf" '' [properties] @@ -446,6 +452,40 @@ else let "/bin/sh" ]; __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; + } // + # If we use derivations directly here, they end up as build-time dependencies. + # This is especially problematic in the case of disallowed*, since the disallowed + # derivations will be built by nix as build-time dependencies, while those + # derivations might take a very long time to build, or might not even build + # successfully on the platform used. + # We can improve on this situation by instead passing only the outPath, + # without an attached string context, to nix. The out path will be a placeholder + # which will be replaced by the actual out path if the derivation in question + # is part of the final closure (and thus needs to be built). If it is not + # part of the final closure, then the placeholder will be passed along, + # but in that case we know for a fact that the derivation is not part of the closure. + # This means that passing the out path to nix does the right thing in either + # case, both for disallowed and allowed references/requisites, and we won't + # build the derivation if it wouldn't be part of the closure, saving time and resources. + # While the problem is less severe for allowed*, since we want the derivation + # to be built eventually, we would still like to get the error early and without + # having to wait while nix builds a derivation that might not be used. + # See also https://github.com/NixOS/nix/issues/4629 + lib.optionalAttrs (attrs ? disallowedReferences) { + disallowedReferences = + map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; + } // + lib.optionalAttrs (attrs ? disallowedRequisites) { + disallowedRequisites = + map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; + } // + lib.optionalAttrs (attrs ? allowedReferences) { + allowedReferences = + lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; + } // + lib.optionalAttrs (attrs ? allowedRequisites) { + allowedRequisites = + lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; }; validity = checkMeta { inherit meta attrs; }; @@ -530,6 +570,12 @@ lib.extendDerivation # them as runtime dependencies (since Nix greps for store paths # through $out to find them) args = [ "-c" "export > $out" ]; + + # inputDerivation produces the inputs; not the outputs, so any + # restrictions on what used to be the outputs don't serve a purpose + # anymore. + disallowedReferences = [ ]; + disallowedRequisites = [ ]; }); inherit meta passthru overrideAttrs; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b07420bb4185c..1a637bf13fdd2 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,4 +1,5 @@ # shellcheck shell=bash +# shellcheck disable=1090,2154,2123,2034,2178,2048,2068,1091 __nixpkgs_setup_set_original=$- set -eu set -o pipefail @@ -27,12 +28,18 @@ if [ -n "$__structuredAttrs" ]; then # ex: out=/nix/store/... export "$outputName=${outputs[$outputName]}" done - # $NIX_ATTRS_JSON_FILE points to the wrong location in sandbox - # https://github.com/NixOS/nix/issues/6736 - export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json" - export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" + + # $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox + # https://github.com/NixOS/nix/issues/6736; please keep around until the + # fix reaches *every patch version* that's >= lib/minver.nix + if ! [[ -e "$NIX_ATTRS_JSON_FILE" ]]; then + export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json" + fi + if ! [[ -e "$NIX_ATTRS_SH_FILE" ]]; then + export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" + fi else - : ${outputs:=out} + : "${outputs:=out}" fi getAllOutputNames() { @@ -125,11 +132,6 @@ _eval() { ###################################################################### # Logging. -# Obsolete. -stopNest() { true; } -header() { echo "$1"; } -closeNest() { true; } - # Prints a command such that all word splits are unambiguous. We need # to split the command in three parts because the middle format string # will be, and must be, repeated for each argument. The first argument @@ -210,8 +212,8 @@ addToSearchPath() { # syntax when they switch to setting __structuredAttrs = true. prependToVar() { local -n nameref="$1" + local useArray type - useArray= if [ -n "$__structuredAttrs" ]; then useArray=true else @@ -243,8 +245,8 @@ prependToVar() { # Same as above appendToVar() { local -n nameref="$1" + local useArray type - useArray= if [ -n "$__structuredAttrs" ]; then useArray=true else @@ -398,7 +400,7 @@ fi # implementation uses zip archive and zip does not support dates going back to # 1970. export SOURCE_DATE_EPOCH -: ${SOURCE_DATE_EPOCH:=315532800} +: "${SOURCE_DATE_EPOCH:=315532800}" # Wildcard expansions that don't match should expand to an empty list. @@ -448,7 +450,6 @@ runHook addInputsHook # Package accumulators -# shellcheck disable=SC2034 declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget declare -a pkgsHostHost pkgsHostTarget declare -a pkgsTargetTarget @@ -473,7 +474,6 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) # those variables are declared here, since where and if they are used varies -# shellcheck disable=SC2034 declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks # Add env hooks for all sorts of deps with the specified host offset. @@ -521,7 +521,7 @@ findInputs() { local -r targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( hostOffset <= targetOffset )) || exit 1 local varVar="${pkgAccumVarVars[hostOffset + 1]}" local varRef="$varVar[$((targetOffset - hostOffset))]" @@ -610,12 +610,12 @@ findInputs() { # in each list must be store paths, and therefore space-free. # Make sure all are at least defined as empty -: ${depsBuildBuild=} ${depsBuildBuildPropagated=} -: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=} -: ${depsBuildTarget=} ${depsBuildTargetPropagated=} -: ${depsHostHost=} ${depsHostHostPropagated=} -: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=} -: ${depsTargetTarget=} ${depsTargetTargetPropagated=} +: "${depsBuildBuild=}" "${depsBuildBuildPropagated=}" +: "${nativeBuildInputs=}" "${propagatedNativeBuildInputs=}" "${defaultNativeBuildInputs=}" +: "${depsBuildTarget=}" "${depsBuildTargetPropagated=}" +: "${depsHostHost=}" "${depsHostHostPropagated=}" +: "${buildInputs=}" "${propagatedBuildInputs=}" "${defaultBuildInputs=}" +: "${depsTargetTarget=}" "${depsTargetTargetPropagated=}" for pkg in ${depsBuildBuild[@]} ${depsBuildBuildPropagated[@]}; do findInputs "$pkg" -1 -1 @@ -650,7 +650,7 @@ activatePackage() { local -r targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( hostOffset <= targetOffset )) || exit 1 if [ -f "$pkg" ]; then source "$pkg" @@ -798,10 +798,6 @@ unset _HOST_PATH unset _XDG_DATA_DIRS -# Make GNU Make produce nested output. -export NIX_INDENT_MAKE=1 - - # Normalize the NIX_BUILD_CORES variable. The value might be 0, which # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. @@ -888,7 +884,7 @@ substituteStream() { # fail loudly if provided with a binary (containing null bytes) consumeEntire() { # read returns non-0 on EOF, so we want read to fail - if IFS='' read -r -d '' $1 ; then + if IFS='' read -r -d '' "$1" ; then echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 return 1 fi @@ -999,16 +995,58 @@ stripHash() { } +recordPropagatedDependencies() { + # Propagate dependencies into the development output. + declare -ra flatVars=( + # Build + depsBuildBuildPropagated + propagatedNativeBuildInputs + depsBuildTargetPropagated + # Host + depsHostHostPropagated + propagatedBuildInputs + # Target + depsTargetTargetPropagated + ) + declare -ra flatFiles=( + "${propagatedBuildDepFiles[@]}" + "${propagatedHostDepFiles[@]}" + "${propagatedTargetDepFiles[@]}" + ) + + local propagatedInputsIndex + for propagatedInputsIndex in "${!flatVars[@]}"; do + local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]" + local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}" + + [[ "${!propagatedInputsSlice}" ]] || continue + + mkdir -p "${!outputDev}/nix-support" + # shellcheck disable=SC2086 + printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile" + done +} + + unpackCmdHooks+=(_defaultUnpack) _defaultUnpack() { local fn="$1" + local destination if [ -d "$fn" ]; then + destination="$(stripHash "$fn")" + + if [ -e "$destination" ]; then + echo "Cannot copy $fn to $destination: destination already exists!" + echo "Did you specify two \"srcs\" with the same \"name\"?" + return 1 + fi + # We can't preserve hardlinks because they may have been # introduced by store optimization, which might break things # in the build. - cp -pr --reflink=auto -- "$fn" "$(stripHash "$fn")" + cp -pr --reflink=auto -- "$fn" "$destination" else @@ -1033,7 +1071,7 @@ _defaultUnpack() { unpackFile() { curSrc="$1" - header "unpacking source archive $curSrc" 3 + echo "unpacking source archive $curSrc" if ! runOneHook unpackCmd "$curSrc"; then echo "do not know how to unpack source archive $curSrc" exit 1 @@ -1079,7 +1117,7 @@ unpackPhase() { # Find the source directory. # set to empty if unset - : ${sourceRoot=} + : "${sourceRoot=}" if [ -n "${setSourceRoot:-}" ]; then runOneHook setSourceRoot @@ -1130,7 +1168,7 @@ patchPhase() { fi for i in "${patchesArray[@]}"; do - header "applying patch $i" 3 + echo "applying patch $i" local uncompress=cat case "$i" in *.gz) @@ -1183,7 +1221,7 @@ configurePhase() { runHook preConfigure # set to empty if unset - : ${configureScript=} + : "${configureScript=}" if [[ -z "$configureScript" && -x ./configure ]]; then configureScript=./configure @@ -1253,7 +1291,7 @@ buildPhase() { runHook preBuild if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile, doing nothing" + echo "no Makefile or custom buildPhase, doing nothing" else foundMakefile=1 @@ -1323,6 +1361,15 @@ checkPhase() { installPhase() { runHook preInstall + # Dont reuse 'foundMakefile' set in buildPhase, a makefile may have been created in buildPhase + if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then + echo "no Makefile or custom installPhase, doing nothing" + runHook postInstall + return + else + foundMakefile=1 + fi + if [ -n "$prefix" ]; then mkdir -p "$prefix" fi @@ -1365,36 +1412,8 @@ fixupPhase() { done - # Propagate dependencies & setup hook into the development output. - declare -ra flatVars=( - # Build - depsBuildBuildPropagated - propagatedNativeBuildInputs - depsBuildTargetPropagated - # Host - depsHostHostPropagated - propagatedBuildInputs - # Target - depsTargetTargetPropagated - ) - declare -ra flatFiles=( - "${propagatedBuildDepFiles[@]}" - "${propagatedHostDepFiles[@]}" - "${propagatedTargetDepFiles[@]}" - ) - - local propagatedInputsIndex - for propagatedInputsIndex in "${!flatVars[@]}"; do - local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]" - local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}" - - [[ "${!propagatedInputsSlice}" ]] || continue - - mkdir -p "${!outputDev}/nix-support" - # shellcheck disable=SC2086 - printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile" - done - + # record propagated dependencies & setup hook into the development output. + recordPropagatedDependencies if [ -n "${setupHook:-}" ]; then mkdir -p "${!outputDev}/nix-support" @@ -1436,7 +1455,7 @@ installCheckPhase() { echo "no Makefile or custom installCheckPhase, doing nothing" #TODO(@oxij): should flagsArray influence make -n? elif [[ -z "${installCheckTarget:-}" ]] \ - && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then + && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" >/dev/null 2>&1; then echo "no installcheck target in ${makefile:-Makefile}, doing nothing" else # Old bash empty array hack @@ -1485,15 +1504,15 @@ distPhase() { showPhaseHeader() { local phase="$1" case "$phase" in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - installCheckPhase) header "running install tests";; - *) header "$phase";; + unpackPhase) echo "unpacking sources";; + patchPhase) echo "patching sources";; + configurePhase) echo "configuring";; + buildPhase) echo "building";; + checkPhase) echo "running tests";; + installPhase) echo "installing";; + fixupPhase) echo "post-installation fixup";; + installCheckPhase) echo "running install tests";; + *) echo "$phase";; esac } @@ -1503,19 +1522,23 @@ showPhaseFooter() { local startTime="$2" local endTime="$3" local delta=$(( endTime - startTime )) - (( $delta < 30 )) && return + (( delta < 30 )) && return local H=$((delta/3600)) local M=$((delta%3600/60)) local S=$((delta%60)) echo -n "$phase completed in " - (( $H > 0 )) && echo -n "$H hours " - (( $M > 0 )) && echo -n "$M minutes " + (( H > 0 )) && echo -n "$H hours " + (( M > 0 )) && echo -n "$M minutes " echo "$S seconds" } genericBuild() { + # variable used by our gzip wrapper to add -n. + # gzip is in common-path.nix and is added to nix-shell but we only want to change its behaviour in nix builds. do not move to a setupHook in gzip. + export GZIP_NO_TIMESTAMPS=1 + if [ -f "${buildCommandPath:-}" ]; then source "$buildCommandPath" return @@ -1548,7 +1571,7 @@ genericBuild() { if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&$NIX_LOG_FD + echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" fi showPhaseHeader "$curPhase" diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index f394869ea915b..5b5677eef1366 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -17,6 +17,15 @@ else LD_BINARY=$out/lib/ld-*so.? fi +# path to version-specific libraries, like libstdc++.so +LIBSTDCXX_SO_DIR=$(echo $out/lib/gcc/*/*) + +# Move version-specific libraries out to avoid library mix when we +# upgrade gcc. +# TODO(trofi): update bootstrap tarball script and tarballs to put them +# into expected location directly. +LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/mv $out/lib/libstdc++.* $LIBSTDCXX_SO_DIR/ + # On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So # use a copy of patchelf. LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf . @@ -25,8 +34,8 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do if [ -L "$i" ]; then continue; fi if [ -z "${i##*/liblto*}" ]; then continue; fi echo patching "$i" - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" + LD_LIBRARY_PATH=$out/lib:$LIBSTDCXX_SO_DIR $LD_BINARY \ + ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib:$LIBSTDCXX_SO_DIR --force-rpath "$i" done for i in $out/lib/librt-*.so $out/lib/libpcre*; do diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 870fb04c3883f..8781907382862 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -104,8 +104,8 @@ let '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" - ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} - ${if system == "mipsel-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} + ${lib.optionalString (system == "x86_64-linux") "NIX_LIB64_IN_SELF_RPATH=1"} + ${lib.optionalString (system == "mipsel-linux") "NIX_LIB32_IN_SELF_RPATH=1"} ''; @@ -296,7 +296,7 @@ in overrides = self: super: { inherit (prevStage) - ccWrapperStdenv + ccWrapperStdenv gettext gcc-unwrapped coreutils gnugrep perl gnum4 bison; dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } ); @@ -332,7 +332,8 @@ in # and that can fail to load. Therefore we upgrade `ld` to use newer libc; # apparently the interpreter needs to match libc, too. bintools = self.stdenvNoCC.mkDerivation { - inherit (prevStage.bintools.bintools) name; + pname = prevStage.bintools.bintools.pname + "-patchelfed-ld"; + inherit (prevStage.bintools.bintools) version; enableParallelBuilding = true; dontUnpack = true; dontBuild = true; @@ -369,7 +370,7 @@ in overrides = self: super: rec { inherit (prevStage) ccWrapperStdenv - binutils coreutils gnugrep + binutils coreutils gnugrep gettext perl patchelf linuxHeaders gnum4 bison libidn2 libunistring; ${localSystem.libc} = getLibc prevStage; gcc-unwrapped = diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index e98ba0c085950..3aa7f6a3df537 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -115,7 +115,7 @@ in with pkgs; rec { cp ${gawk.out}/bin/gawk $out/bin cp -d ${gawk.out}/bin/awk $out/bin cp ${tarMinimal.out}/bin/tar $out/bin - cp ${gzip.out}/bin/gzip $out/bin + cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake.out}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin @@ -272,16 +272,17 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) - export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" - export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" - export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" + rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) + libc_includes=${bootstrapTools}/include-glibc '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) - export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}" - export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" - export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" + rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) + libc_includes=${bootstrapTools}/include-libc '' + '' + # path to version-specific libraries, like libstdc++.so + cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*) + export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}" + export CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" + export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" echo '#include <stdio.h>' >> foo.c echo '#include <limits.h>' >> foo.c diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 87862b84bc1b2..bae4ff2c93b26 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -12,9 +12,9 @@ let else "/bin/bash"; path = - (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ - (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ - (if system == "x86_64-solaris" then [ "/opt/local/gnu" ] else []) ++ + (lib.optionals (system == "i686-solaris") [ "/usr/gnu" ]) ++ + (lib.optionals (system == "i686-netbsd") [ "/usr/pkg" ]) ++ + (lib.optionals (system == "x86_64-solaris") [ "/opt/local/gnu" ]) ++ ["/" "/usr" "/usr/local"]; prehookBase = '' diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 352f58397c6b8..05861ee5e0eb6 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -11,9 +11,9 @@ final: prev: let "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; - # maybe fixed by https://github.com/NVIDIA/cuda-samples/pull/133 "11.7" = throw "The tag 11.7 of cuda-samples does not exist"; - "11.8" = throw "The tag 11.8 of cuda-samples does not exist"; + "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc="; + "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; }.${prev.cudaVersion}; in { diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 818001018b3ae..71d065179d172 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -51,6 +51,8 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); + pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }); + rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; @@ -59,6 +61,8 @@ with pkgs; nixos-functions = callPackage ./nixos-functions {}; + overriding = callPackage ./overriding.nix { }; + patch-shebangs = callPackage ./patch-shebangs {}; texlive = callPackage ./texlive {}; diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix new file mode 100644 index 0000000000000..edc1b27cf4f1d --- /dev/null +++ b/pkgs/test/overriding.nix @@ -0,0 +1,56 @@ +{ lib, pkgs, stdenvNoCC }: + +let + tests = + let + p = pkgs.python3Packages.xpybutil.overridePythonAttrs (_: { dontWrapPythonPrograms = true; }); + in + [ + ({ + name = "overridePythonAttrs"; + expr = !lib.hasInfix "wrapPythonPrograms" p.postFixup; + expected = true; + }) + ({ + name = "repeatedOverrides-pname"; + expr = repeatedOverrides.pname == "a-better-hello-with-blackjack"; + expected = true; + }) + ({ + name = "repeatedOverrides-entangled-pname"; + expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack"; + expected = true; + }) + ]; + + addEntangled = origOverrideAttrs: f: + origOverrideAttrs ( + lib.composeExtensions f (self: super: { + passthru = super.passthru // { + entangled = super.passthru.entangled.overrideAttrs f; + overrideAttrs = addEntangled self.overrideAttrs; + }; + }) + ); + + entangle = pkg1: pkg2: pkg1.overrideAttrs (self: super: { + passthru = super.passthru // { + entangled = pkg2; + overrideAttrs = addEntangled self.overrideAttrs; + }; + }); + + example = entangle pkgs.hello pkgs.figlet; + + overrides1 = example.overrideAttrs (_: super: { pname = "a-better-${super.pname}"; }); + + repeatedOverrides = overrides1.overrideAttrs (_: super: { pname = "${super.pname}-with-blackjack"; }); +in + +stdenvNoCC.mkDerivation { + name = "test-overriding"; + passthru = { inherit tests; }; + buildCommand = '' + touch $out + '' + lib.concatMapStringsSep "\n" (t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${t.name} success') || (echo '${t.name} fail' && exit 1)") tests; +} diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 5ff18298f217a..c7bb07f625ed6 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -4,7 +4,8 @@ { stdenv , pkgs , lib -, +, runCommand +, testers }: let @@ -99,6 +100,25 @@ in # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; }); + outputs-no-out = runCommand "outputs-no-out-assert" { + result = testers.testBuildFailure (stdenv.mkDerivation { + NIX_DEBUG = 1; + name = "outputs-no-out"; + outputs = ["foo"]; + buildPhase = ":"; + installPhase = '' + touch $foo + ''; + }); + + # Assumption: the first output* variable to be configured is + # _overrideFirst outputDev "dev" "out" + expectedMsg = "error: _assignFirst: could not find a non-empty variable to assign to outputDev.\n The following variables were all unset or empty:\n dev out"; + } '' + grep -F "$expectedMsg" $result/testBuildFailure.log >/dev/null + touch $out + ''; + test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; }; # Test compatibility with derivations using `env` as a regular variable. diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 7f25d7dbd2db0..d7c409e621562 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -23,19 +23,29 @@ }; make-symlinks-relative = stdenv.mkDerivation { name = "test-make-symlinks-relative"; + outputs = [ "out" "man" ]; buildCommand = '' mkdir -p $out/{bar,baz} + mkdir -p $man/share/{x,y} source1="$out/bar/foo" destination1="$out/baz/foo" + source2="$man/share/x/file1" + destination2="$man/share/y/file2" echo foo > $source1 + echo foo > $source2 ln -s $source1 $destination1 + ln -s $source2 $destination2 echo "symlink before patching: $(readlink $destination1)" + echo "symlink before patching: $(readlink $destination2)" - _makeSymlinksRelative + _makeSymlinksRelativeInAllOutputs echo "symlink after patching: $(readlink $destination1)" ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) + echo "symlink after patching: $(readlink $destination2)" + ([[ -e $destination2 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) + ([[ $(readlink $destination2) == "../x/file1" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) ''; }; move-docs = stdenv.mkDerivation { @@ -105,7 +115,7 @@ name = "test-reproducible-builds"; buildCommand = '' # can't be tested more precisely because the value of random-seed changes depending on the output - [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] + [[ $env.NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] touch $out ''; }; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index 2146853e6a7ee..9723ef69b8507 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, perl -, ffmpeg, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo +, ffmpeg-full, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = let binPath = lib.makeBinPath [ - ffmpeg + ffmpeg-full imagemagick xdpyinfo xprop diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 847d13315f8de..4a2a0e8b59044 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -14,7 +14,7 @@ , xdotool }: -let release = "20180821"; in +let release = "20220825"; in stdenv.mkDerivation { pname = "keynav"; version = "0.${release}.0"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "jordansissel"; repo = "keynav"; - rev = "78f9e076a5618aba43b030fbb9344c415c30c1e5"; - sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d"; + rev = "28a1ba9a045c62a9d2bc5c3474a66d96c8bf5c32"; + hash = "sha256-y4ONq6fDBFhVGASvz28zlJRXfkCE/j8GDcbq/j8xvUY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 64fa84ba4a19f..b5aff9271639e 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { xorg.xkbcomp xorg.xkeyboardconfig libtirpc ]; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; postPatch = '' diff --git a/pkgs/tools/X11/paperview/default.nix b/pkgs/tools/X11/paperview/default.nix new file mode 100644 index 0000000000000..790eaed53ab5a --- /dev/null +++ b/pkgs/tools/X11/paperview/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "paperview"; + version = "unstable-2020-09-22"; + + src = fetchFromGitHub { + owner = "glouw"; + repo = "paperview"; + rev = "40162fb76566fec8163c338c169c2fcd9df6ef42"; + hash = "sha256-rvf89vMIT274+Hva+N4KFu1iT2XE6fq5Bi4kOQg2M0g="; + }; + + buildInputs = [ + SDL2 + libX11 + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A high performance X11 animated wallpaper setter"; + homepage = "https://github.com/glouw/paperview"; + platforms = platforms.linux; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + }; +} diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/tools/X11/sunpaper/default.nix index 419aa046909fe..9f760bb4a93fb 100644 --- a/pkgs/tools/X11/sunpaper/default.nix +++ b/pkgs/tools/X11/sunpaper/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "sunpaper"; - version = "unstable-2022-04-01"; + version = "2.0"; src = fetchFromGitHub { owner = "hexive"; repo = "sunpaper"; - rev = "8d518dfddb5e80215ef3b884ff009df1d4bb74c2"; - sha256 = "sCG7igD2ZwfHoRpR3Kw7dAded4hG2RbMLR/9nH+nZh8="; + rev = "v${version}"; + sha256 = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM="; }; buildInputs = [ diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index 13234a8149765..e9d6d42b06892 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ gtk ]; diff --git a/pkgs/tools/X11/xosview/default.nix b/pkgs/tools/X11/xosview/default.nix index ca8eac38aa216..3b09b150a0fc2 100644 --- a/pkgs/tools/X11/xosview/default.nix +++ b/pkgs/tools/X11/xosview/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xosview"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "hills"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-CoBVFTCpvZkIe/g+17JNV1y0G9K+t+p3EE9C5kuBe2k="; + hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw="; }; dontConfigure = true; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 2f793e3180880..72cb79388cfcd 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -156,7 +156,7 @@ in buildPythonApplication rec { ]); # error: 'import_cairo' defined but not used - NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; setupPyBuildFlags = [ "--with-Xdummy" diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index ac009e1b091a3..62d6fa3803e33 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ../../src/lib/libactive_directory.a(active_directory.o):/build/adtool-1.3.3/src/lib/active_directory.h:31: # multiple definition of `system_config_file'; adtool.o:/build/adtool-1.3.3/src/tools/../../src/lib/active_directory.h:31: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index 8bee8a2e7a533..f0aa3edd8a69c 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-yX95qmcyouSSjEHorMpRJjZyrxIjQorwTpGtGZN4s6s="; + sha256 = "sha256-QsdTrd9p89SiLCmvNlsLk9ET2BVeaJncDyWzycn5CLw="; }; - cargoSha256 = "sha256-DweJ608aJChn2ezAM7Ly0cwtLAvM1DZ5gc4WUVyKIco="; + cargoHash = "sha256-lCtG7UmXJegGVbjyYn9YJWSynikOK4qPmLS1XNesMUk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "This is a small utility, typically used in conjunction with Ignition, which reads metadata from a given cloud-provider and applies it to the system."; license = licenses.asl20; maintainers = [ maintainers.arianvp ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 471acf211dfc5..909b793cc62ab 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.141"; + version = "3.0.150"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-DHUr820X3aUoUE3b22Xrd8JX8aB5arFk1nSWo/UdfPc="; + sha256 = "sha256-NzdE3s3DKeh7/EG6Pvf6I2nU2ZfhUtRZIlW1+6cI2jc="; }; - vendorSha256 = "sha256-aviRsflpS9/o2B7mpYQE7d9ahLclM+jiVz+cJOlegCY="; + vendorHash = "sha256-GVx0mgpbftyy9Eni3IYFmvWcaGnm5Nuqh4KvGeqhVu4="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 34219c35cf150..023a91df83325 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,18 +6,23 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.9.6"; + version = "1.9.9"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3IqWmd3Qi2eVSR9vmZSTt5GLrlO4akjOGdpzndh6nT8="; + sha256 = "sha256-ulnRVyfJ0L1iJ3zVvn3VUYGXDV/UwhqdcC8D4wnjNys="; }; - vendorSha256 = "sha256-f0HrQzHK1JDWmRrnqG/N4X8TG0DP/IRWd6b7QR/vyzo="; + vendorSha256 = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; nativeBuildInputs = [ makeWrapper ]; + ldflags = [ + "-X main.Version=${version}" + "-X main.Tag=nixpkgs" + ]; + postInstall = '' wrapProgram $out/bin/aws-sso \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} diff --git a/pkgs/tools/admin/aws-sso-creds/default.nix b/pkgs/tools/admin/aws-sso-creds/default.nix index ec91c33a0448e..d4ca59da71376 100644 --- a/pkgs/tools/admin/aws-sso-creds/default.nix +++ b/pkgs/tools/admin/aws-sso-creds/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-creds"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "jaxxstorm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iyTdVvbqewLPLJB0LjeMB0HvLTi4B3B/HDCvgSlZoNE="; + sha256 = "sha256-V50t1L4+LZnMaET3LTp1nt7frNpu95KjgbQ5Onqt5sI="; }; - vendorSha256 = "sha256-SIsM3S9i5YKj8DvE90DxxinqZkav+1gIha1xZiDBuHQ="; + vendorHash = "sha256-0jXZpdiSHMn94MT3mPNtbfV7owluWhy1iAvQIBdebdE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index b1add5d142521..420149b51f963 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,16 +25,22 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.17"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.10.3"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-5d/XEkM01SJj9M3e+5qbJrwWX+CU8fb097D45+Hp/Qc="; + hash = "sha256-ogwJTsd2xrWp54utcyG1QO7hGxBC6S4hVlmmGESyPBQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0" \ + --replace "cryptography>=3.3.2,<38.0.5" "cryptography>=3.3.2" + ''; + nativeBuildInputs = [ flit-core ]; @@ -63,13 +69,6 @@ with py.pkgs; buildPythonApplication rec { pytestCheckHook ]; - postPatch = '' - sed -i pyproject.toml \ - -e 's/colorama.*/colorama",/' \ - -e 's/cryptography.*/cryptography",/' \ - -e 's/distro.*/distro",/' - ''; - postInstall = '' mkdir -p $out/${python3.sitePackages}/awscli/data ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index ee17b39f70548..bfdbc45507f4b 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-4S9r8ez67bmhjEMp3w2xJVgkFN12B+pcyYVLc5P2Il0="; + hash = "sha256-Dl1wwK4OSv/nvhT7bH6qOdX4/qL3xFdmz5qiYaEm59Y="; }; - vendorSha256 = "sha256-Ly0U13C3WaGHRlu5Lj5MtdnTStTAJb4NUQpCY+7PeT0="; + vendorHash = "sha256-NqEpJHBZfzUQJ+H8CQBDdb37nlwA+JuXhZzfCAyO0Co="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 44752c09fb235..230ce913b591e 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cli53"; - version = "0.8.18"; + version = "0.8.21"; src = fetchFromGitHub { owner = "barnybug"; repo = "cli53"; rev = version; - sha256 = "sha256-RgU4+/FQEqNpVxBktZUwoVD9ilLrTm5ZT7D8jbt2sRM="; + sha256 = "sha256-N7FZfc3kxbMY2ooj+ztlj6xILF3gzT60Yb/puWg58V4="; }; - vendorSha256 = "sha256-uqBa2YrQwXdTemP9yB2otkSFWJqDxw/NAvIvlEbhk90="; + vendorHash = "sha256-LKJXoXZS866UfJ+Edwf6AkAZmTV2Q1OI1mZfbsxHb3s="; ldflags = [ "-s" diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 61753bb8330b9..6c090a11b3463 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.126.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-ul02G6FULaSFMtQfmqrSRSAgAxx5/cpG6qeDrGB2m5g="; + sha256 = "sha256-SJI9EB0k45SJmWQ/pivlZMQdiE237vpLwNB2Y33ntrw="; }; - vendorHash = "sha256-Z6elKuSGvXPjMk8upqJ2Z0I5Cu3s3LeGUkQFcUKheH0="; + vendorHash = "sha256-wrt8Mtek74ljCgp1Sxi/jKxCv61H7HqCLHXKrwS7ex4="; doCheck = false; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index c3536358552fa..c441e996300a5 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.660.0) - aws-sdk-core (3.167.0) + aws-partitions (1.716.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.59.0) + aws-sdk-kms (1.62.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.1) + aws-sdk-s3 (1.119.1) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -36,8 +36,8 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.94.0) - faraday (1.10.2) + excon (0.99.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.211.0) + fastlane (2.212.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.31.0) + google-apis-androidpublisher_v3 (0.34.0) google-apis-core (>= 0.9.1, < 2.a) - google-apis-core (0.9.1) + google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -117,8 +117,8 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.16.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.12.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-storage_v1 (0.19.0) @@ -148,11 +148,11 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.6.1) - json (2.6.2) - jwt (2.5.0) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) memoist (0.16.2) - mini_magick (4.11.0) + mini_magick (4.12.0) mini_mime (1.1.2) multi_json (1.15.0) multipart-post (2.0.0) @@ -160,8 +160,8 @@ GEM naturally (2.2.1) optparse (0.1.1) os (1.1.4) - plist (3.6.0) - public_suffix (5.0.0) + plist (3.7.0) + public_suffix (5.0.1) rake (13.0.6) representable (3.2.0) declarative (< 0.1.0) @@ -178,7 +178,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally terminal-notifier (2.0.0) @@ -194,7 +194,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - webrick (1.7.0) + webrick (1.8.1) word_wrap (1.0.0) xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) @@ -215,4 +215,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.3.24 + 2.4.6 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index d65a7bd02d79e..5bd70e1f6ad80 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ycbhr5329f13sjm1f3vc0iid3mmnxyg8230sp98p8jxh4c8bkwv"; + sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1"; type = "gem"; }; - version = "1.660.0"; + version = "1.716.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; + sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; type = "gem"; }; - version = "3.167.0"; + version = "3.170.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c"; + sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; type = "gem"; }; - version = "1.59.0"; + version = "1.62.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn"; + sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp"; type = "gem"; }; - version = "1.117.1"; + version = "1.119.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; + sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; claide = { groups = ["default"]; @@ -213,10 +213,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981"; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; type = "gem"; }; - version = "0.94.0"; + version = "0.99.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d5ipsv069dhgv9zhxgj8pz4j52yhgvfm01aq881yz7qgjd7ilxp"; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; type = "gem"; }; - version = "1.10.2"; + version = "1.10.3"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h8w77nq8sbvqvv01sq3xynrizfg80yzas9wlbx3a18gqsvk4hjh"; + sha256 = "0b22m2dkydyv2si55b1jzznzgxf2ycx2aarv1j5p25k861h2gsml"; type = "gem"; }; - version = "2.211.0"; + version = "2.212.1"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14rndcs6jlq679cq760ww3grnqsq71kbq0sjsllgf9mngsxhcg7n"; + sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp"; type = "gem"; }; - version = "0.31.0"; + version = "0.34.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -400,10 +400,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0"; + sha256 = "184zkm5agi7r5fl79hgahjpydsc4d23nd2ynh2sr9z8gs2w4h82f"; type = "gem"; }; - version = "0.9.1"; + version = "0.11.0"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -411,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07d6c8pf4fam9bzkz5fjqypklclq774m0h7ahyxv0hn5zb3hkw4b"; + sha256 = "0ysil0bkh755kmf9xvw5szhk1yyh3gqzwfsrbwsrl77gsv7jarcs"; type = "gem"; }; - version = "0.16.0"; + version = "0.17.0"; }; google-apis-playcustomapp_v1 = { dependencies = ["google-apis-core"]; @@ -528,30 +528,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; memoist = { groups = ["default"]; @@ -568,10 +568,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; mini_mime = { groups = ["default"]; @@ -648,20 +648,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; rake = { groups = ["default"]; @@ -761,10 +761,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x"; + sha256 = "0sr3z4kmp6ym7synicyilj9vic7i9nxgaszqx6n1xn1ss7s7g45r"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.10"; }; terminal-notifier = { groups = ["default"]; @@ -874,10 +874,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; word_wrap = { groups = ["default"]; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 4ade3c16cd034..b833fc1c08986 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.31"; + version = "0.32.0"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-A5XRokrYRENaw0poq9e3o2OwCPn0GZaAT2fPjYu3p0M="; + sha256 = "sha256-3k3FoRU1yCtntVe3WTGUuhIBTD6KRvSsDISbjmNvzQI="; }; - vendorHash = "sha256-g8sTQXUk162SlA1iLEMGZ6O3FvF+8v/XINtZR8o0m8U="; + vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 72d293de211a8..d1010fcec62a3 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -3,6 +3,8 @@ , google-cloud-sdk , system , snapshotPath +, autoPatchelfHook +, python3 , ... }: @@ -100,9 +102,7 @@ let pname = component.id; version = component.version.version_string; src = - if lib.hasAttrByPath [ "data" "source" ] component - then "${baseUrl}/${component.data.source}" - else ""; + lib.optionalString (lib.hasAttrByPath [ "data" "source" ] component) "${baseUrl}/${component.data.source}"; sha256 = lib.attrByPath [ "data" "checksum" ] "" component; dependencies = builtins.map (dep: builtins.getAttr dep components) component.dependencies; platforms = @@ -137,12 +137,12 @@ let }: stdenv.mkDerivation { inherit pname version snapshot; src = - if src != "" then - builtins.fetchurl + lib.optionalString (src != "") + (builtins.fetchurl { url = src; inherit sha256; - } else ""; + }) ; dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install @@ -161,6 +161,11 @@ let # Write the snapshot file to the `.install` folder cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json ''; + nativeBuildInputs = [ + autoPatchelfHook + python3 + stdenv.cc.cc + ]; passthru = { dependencies = filterForSystem dependencies; }; diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index 7c852ac35ec2c..be2c8401efc29 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4sExRKq4J94cQYqjxaXCKa2aEeptCG+TTvrDOrJfBUg="; + sha256 = "sha256-uz4wimhOfeHSL949m+biIhjfDwwEGnTiJWaz/r3Rsko="; }; - vendorSha256 = "sha256-afbQQsluZjgliNxSOGcTS1DJwj7en5NpxtuzCDAyv98="; + vendorHash = "sha256-qbmaebQcD3cN+tbmzzJbry0AXz2LZFMoqbcBwGGrRo4="; subPackages = [ "." ]; diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 88621f2365696..7f5ee05fe3ccf 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.8"; + version = "1.6.10"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0="; + sha256 = "sha256-tff/L/rNkZXl7Ublg4MckDPul/BhdNJVUXGtPcdi3Fk="; }; - vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8="; + vendorHash = "sha256-4Zt+1spcUR04NU7Pl3ImnOnwtj9Rsgz2aLYqaFDLvyU="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 9d7c35a73bea8..aab033b0ee28d 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YaJT+gTnw9A2joL8D3P7fs/NTyHpH4gDhg6STv19SZU="; + sha256 = "sha256-FT1cXnMyMrEpZpTMp+kE8ueHReAYf2XQZ/9Nw53TYbg="; }; - vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; + vendorSha256 = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ="; doCheck = false; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4faebec280618..c17f751274167 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -7,13 +7,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "lexicon"; - version = "3.9.4"; + version = "3.11.7"; format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-TySgIxBEl2RolndAkEN4vCIDKaI48vrh2ocd+CTn7Ow="; }; @@ -23,32 +23,54 @@ buildPythonApplication rec { propagatedBuildInputs = [ beautifulsoup4 - boto3 cryptography - dnspython - future - localzone - oci - pynamecheap + importlib-metadata pyyaml requests - softlayer tldextract - transip - xmltodict - zeep ]; + passthru.optional-dependencies = { + route53 = [ + boto3 + ]; + localzone = [ + localzone + ]; + softlayer = [ + softlayer + ]; + gransy = [ + zeep + ]; + ddns = [ + dnspython + ]; + oci = [ + oci + ]; + full = [ + boto3 + dnspython + localzone + oci + softlayer + zeep + ]; + }; + nativeCheckInputs = [ mock pytestCheckHook pytest-xdist vcrpy - ]; + ] ++ passthru.optional-dependencies.full; disabledTestPaths = [ # Tests require network access "lexicon/tests/providers/test_auto.py" + # Tests require an additional setup + "lexicon/tests/providers/test_localzone.py" ]; pythonImportsCheck = [ @@ -58,6 +80,7 @@ buildPythonApplication rec { meta = with lib; { description = "Manipulate DNS records of various DNS providers in a standardized way"; homepage = "https://github.com/AnalogJ/lexicon"; + changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index a0db37fba54ce..9f164d86140c7 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -32,14 +32,14 @@ buildGoModule rec { pname = "lxd"; - version = "5.10"; + version = "5.11"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU="; + hash = "sha256-6z6C1nWmnHLdLtLf7l1f4riGhuP2J2mt8mVWZIiege0="; }; vendorSha256 = null; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index bf1ad3cfe47b5..c1753fe1a563c 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -30,16 +30,24 @@ buildPythonApplication rec { sqlparse ]; - nativeCheckInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook glibcLocales ]; - checkPhase = '' + preCheck = '' export HOME=. export LC_ALL="en_US.UTF-8" - - py.test \ - --ignore=mycli/packages/paramiko_stub/__init__.py ''; + disabledTestPaths = [ + "mycli/packages/paramiko_stub/__init__.py" + ]; + + disabledTests = [ + # Note: test_auto_escaped_col_names is currently failing due to a bug upstream. + # TODO: re-enable this test once there is a fix upstream. See + # https://github.com/dbcli/mycli/issues/1103 for details. + "test_auto_escaped_col_names" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "cryptography == 36.0.2" "cryptography" diff --git a/pkgs/tools/admin/pgadmin/check-system-config-dir.patch b/pkgs/tools/admin/pgadmin/check-system-config-dir.patch new file mode 100644 index 0000000000000..f614bab64e6fd --- /dev/null +++ b/pkgs/tools/admin/pgadmin/check-system-config-dir.patch @@ -0,0 +1,17 @@ +diff --git a/web/config.py b/web/config.py +index 4774043..5b73fd3 100644 +--- a/web/config.py ++++ b/web/config.py +@@ -884,6 +884,12 @@ if os.path.exists(system_config_dir + '/config_system.py'): + user_config_settings.update(config_system_settings) + except ImportError: + pass ++ except PermissionError: ++ print(f"Permission denied to open {str(system_config_dir + '/config_system.py')}. \n \ ++ If you are running pgadmin4-desktopmode please make sure you disable \n \ ++ the pgadmin NixOS module first. If you rely on settings in \n \ ++ {str(system_config_dir + '/config_system.py')}, please check the correct permissions.") ++ pass + + # Update settings for 'LOG_FILE', 'SQLITE_PATH', 'SESSION_DB_PATH', + # 'AZURE_CREDENTIAL_CACHE_DIR', 'KERBEROS_CCACHE_DIR', 'STORAGE_DIR' \ No newline at end of file diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index d5c6932c44f8a..a83d96779de6a 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -6,15 +6,19 @@ , sphinx , nixosTests , pkgs +, fetchPypi +, postgresqlTestHook +, postgresql +, server-mode ? true }: let pname = "pgadmin"; - version = "6.18"; + version = "6.19"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-qqilmJLpJ3XNd8dwk7bDAAPxt8sou5zydFMPcJGcGoo="; + sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI="; }; yarnDeps = mkYarnModules { @@ -25,55 +29,21 @@ let yarnNix = ./yarn.nix; }; - # move buildDeps here to easily pass to test suite - buildDeps = with pythonPackages; [ - flask - flask-gravatar - flask-login - flask_mail - flask_migrate - flask-sqlalchemy - flask-wtf - flask-compress - passlib - pytz - simplejson - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - flask-babelex - flask-babel - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - botocore - boto3 - azure-mgmt-subscription - azure-mgmt-rdbms - azure-mgmt-resource - azure-identity - ]; # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + # flask-security-too 4.1.5 is incompatible with flask-babel 3.x + flask-babel = prev.flask-babel.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = fetchPypi { + inherit pname version; + sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + }; + nativeBuildInputs = [ ]; + format = "setuptools"; + outputs = [ "out" ]; + }); # flask 2.2 is incompatible with pgadmin 6.18 # https://redmine.postgresql.org/issues/7651 flask = prev.flask.overridePythonAttrs (oldAttrs: rec { @@ -92,12 +62,12 @@ let hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; }; }); - # pgadmin 6.18 is incompatible with the major flask-security-too update to 5.0.x + # pgadmin 6.19 is incompatible with the major flask-security-too update to 5.0.x flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { version = "4.1.5"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; + hash = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; }; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ final.pythonPackages.flask_mail @@ -119,6 +89,8 @@ pythonPackages.buildPythonApplication rec { patches = [ # Expose setup.py for later use ./expose-setup.py.patch + # check for permission of /etc/pgadmin/config_system and don't fail + ./check-system-config-dir.patch ]; postPatch = '' @@ -134,10 +106,12 @@ pythonPackages.buildPythonApplication rec { # relax dependencies sed 's|==|>=|g' -i requirements.txt - # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ - --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ - --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" + --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" + ${lib.optionalString (!server-mode) '' + substituteInPlace web/config.py \ + --replace "SERVER_MODE = True" "SERVER_MODE = False" + ''} ''; preBuild = '' @@ -185,23 +159,110 @@ pythonPackages.buildPythonApplication rec { pythonPackages.wheel ]; - # tests need an own data, log directory - # and a working and correctly setup postgres database - # checks will be run through nixos/tests - doCheck = false; - - # speaklater3 is separate because when passing buildDeps - # to the test, it fails there due to a collision with speaklater - propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; + propagatedBuildInputs = with pythonPackages; [ + flask + flask-gravatar + flask-login + flask_mail + flask_migrate + flask-sqlalchemy + flask-wtf + flask-compress + passlib + pytz + simplejson + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + botocore + boto3 + azure-mgmt-subscription + azure-mgmt-rdbms + azure-mgmt-resource + azure-identity + sphinxcontrib-youtube + dnspython + greenlet + speaklater3 + ]; passthru.tests = { - standalone = nixosTests.pgadmin4-standalone; - # regression and function tests of the package itself - package = import ../../../../nixos/tests/pgadmin4.nix { inherit pkgs buildDeps; pythonEnv = pythonPackages; }; + inherit (nixosTests) pgadmin4; }; + nativeCheckInputs = [ + postgresqlTestHook + postgresql + pythonPackages.testscenarios + pythonPackages.selenium + ]; + + checkPhase = '' + runHook preCheck + + ## Setup ## + + # pgadmin needs a home directory to save the configuration + export HOME=$TMPDIR + cd pgadmin4 + + # set configuration for postgresql test + # also ensure Server Mode is set to false. If not, the tests will fail, since pgadmin expects read/write permissions + # in /var/lib/pgadmin and /var/log/pgadmin + # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226 + cp -v regression/test_config.json.in regression/test_config.json + substituteInPlace regression/test_config.json --replace "localhost" "$PGHOST" + substituteInPlace regression/runtests.py --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False" + + ## Browser test ## + + # don't bother to test kerberos authentication + python regression/runtests.py --pkg browser --exclude browser.tests.test_kerberos_with_mocking + + ## Reverse engineered SQL test ## + + python regression/runtests.py --pkg resql + + runHook postCheck + ''; + meta = with lib; { - description = "Administration and development platform for PostgreSQL"; + description = "Administration and development platform for PostgreSQL${optionalString (!server-mode) ". Desktop Mode"}"; + longDescription = '' + pgAdmin 4 is designed to meet the needs of both novice and experienced Postgres users alike, + providing a powerful graphical interface that simplifies the creation, maintenance and use of database objects. + ${if server-mode then '' + This version is build with SERVER_MODE set to True (the default). It will require access to `/var/lib/pgadmin` + and `/var/log/pgadmin`. This is the default version for the NixOS module `services.pgadmin`. + This should NOT be used in combination with the `pgadmin4-desktopmode` package as they will interfere. + '' else '' + This version is build with SERVER_MODE set to False. It will require access to `~/.pgadmin/`. This version is suitable + for single-user deployment or where access to `/var/lib/pgadmin` cannot be granted or the NixOS module cannot be used. + This should NOT be used in combination with the NixOS module `pgadmin` as they will interfere. + ''} + ''; homepage = "https://www.pgadmin.org/"; license = licenses.mit; changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html"; diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index cd30686bf065f..462d82e2134dd 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -112,7 +112,6 @@ "classnames": "^2.2.6", "closest": "^0.0.1", "codemirror": "^5.59.2", - "context-menu": "^2.0.0", "convert-units": "^2.3.4", "cssnano": "^5.0.2", "dagre": "^0.8.4", @@ -123,8 +122,6 @@ "insert-if": "^1.1.0", "ip-address": "^7.1.0", "jquery": "^3.6.0", - "jquery-contextmenu": "^2.9.2", - "jquery-ui": "^1.13.2", "json-bignumber": "^1.0.1", "jsoneditor": "^9.5.4", "jsoneditor-react": "^3.1.1", @@ -140,14 +137,13 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", "react": "^17.0.1", "react-aspen": "^1.1.0", "react-checkbox-tree": "^1.7.2", - "react-data-grid": "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8", + "react-data-grid": "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "^17.0.1", @@ -169,7 +165,7 @@ "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.19.3", "valid-filename": "^2.0.1", - "webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", + "webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", "wkx": "^0.5.0", "xterm": "^4.11.0", "xterm-addon-fit": "^0.5.0", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 463e68254ff51..df20a984a8f70 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -2340,7 +2340,7 @@ aspen-core@^1.0.4: p-series "^1.1.0" path-fx "^2.1.1" -aspen-decorations@^1.0.2, aspen-decorations@^1.1.1: +aspen-decorations@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz#7d0ca740efab1aa4fd91a1f3db81ac29186607a3" integrity sha512-Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ== @@ -3385,13 +3385,6 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -context-menu@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz#565f13210248e3442700e6b1a2d63406f2b08552" - integrity sha512-VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg== - dependencies: - tiny-emitter "^2.0.2" - convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" @@ -6133,21 +6126,14 @@ jmespath@^0.16.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== -jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: +jquery-contextmenu@^2.6.4: version "2.9.2" resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced" integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw== dependencies: jquery "^3.5.0" -jquery-ui@^1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" - integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q== - dependencies: - jquery ">=1.8.0 <4.0.0" - -"jquery@>=1.7.1 <4.0.0", "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0: +"jquery@>=1.7.1 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0: version "3.6.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== @@ -6238,16 +6224,16 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" 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== + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" jsoneditor-react@^3.1.1: version "3.1.2" @@ -7831,27 +7817,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6": - version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6" - dependencies: - "@types/classnames" "^2.2.6" - "@types/react" "^16.7.18" - "@types/react-dom" "^16.0.11" - aspen-decorations "^1.1.1" - browserfs "^1.4.3" - classnames "^2.2.6" - context-menu "^2.0.0" - insert-if "^1.1.0" - lodash "4.*" - notificar "^1.0.1" - path-fx "^2.0.0" - react "^16.6.3" - react-aspen "^1.2.0" - react-dom "^16.6.3" - react-virtualized-auto-sizer "^1.0.6" - valid-filename "^2.0.1" - picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -8531,7 +8496,7 @@ re-resizable@6.9.6: dependencies: fast-memoize "^2.5.1" -react-aspen@^1.1.0, react-aspen@^1.2.0: +react-aspen@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95" integrity sha512-w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg== @@ -8552,9 +8517,9 @@ react-checkbox-tree@^1.7.2: nanoid "^3.0.0" prop-types "^15.5.8" -"react-data-grid@git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8": +"react-data-grid@git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8": version "7.0.0-beta.14" - resolved "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8" + resolved "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: clsx "^1.1.1" @@ -8576,16 +8541,6 @@ react-dnd@^16.0.1: fast-deep-equal "^3.1.3" hoist-non-react-statics "^3.3.2" -react-dom@^16.6.3: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" - react-dom@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" @@ -8747,15 +8702,6 @@ react-window@^1.3.1, react-window@^1.8.5: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@^16.6.3: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - react@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" @@ -9117,14 +9063,6 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -9997,11 +9935,6 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" -tiny-emitter@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" @@ -10404,9 +10337,9 @@ watchpack@^2.4.0: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" -"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8": +"webcabin-docker@git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8": version "2.2.5" - resolved "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8" + resolved "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8" dependencies: "@fortawesome/fontawesome-free" "^5.14.0" FileSaver "^0.10.0" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index 0b9a478657431..d4c5e2c7b1ce1 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -3434,14 +3434,6 @@ }; } { - name = "context_menu___context_menu_2.0.0.tgz"; - path = fetchurl { - name = "context_menu___context_menu_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz"; - sha512 = "VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg=="; - }; - } - { name = "convert_source_map___convert_source_map_1.9.0.tgz"; path = fetchurl { name = "convert_source_map___convert_source_map_1.9.0.tgz"; @@ -6386,14 +6378,6 @@ }; } { - name = "jquery_ui___jquery_ui_1.13.2.tgz"; - path = fetchurl { - name = "jquery_ui___jquery_ui_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz"; - sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; - }; - } - { name = "jquery___jquery_3.6.1.tgz"; path = fetchurl { name = "jquery___jquery_3.6.1.tgz"; @@ -6530,19 +6514,19 @@ }; } { - name = "json5___json5_1.0.1.tgz"; + name = "json5___json5_1.0.2.tgz"; path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + name = "json5___json5_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz"; + sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.3.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.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -8362,22 +8346,6 @@ }; } { - name = "pgadmin4-treeview"; - path = - let - repo = fetchgit { - url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "96ceb7f27f43660a804e61d23a76aeb9aa188bb6"; - sha256 = "1hvr7arywz8rql19ma6w6lj5hrfn8xr4cyiia4bw5l8d061ak1gj"; - }; - in - runCommand "pgadmin4-treeview" { 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} . - ''; - } - { name = "picocolors___picocolors_1.0.0.tgz"; path = fetchurl { name = "picocolors___picocolors_1.0.0.tgz"; @@ -9148,18 +9116,16 @@ { name = "react-data-grid.git"; path = - let - repo = fetchgit { - url = "https://github.com/EnterpriseDB/react-data-grid.git/"; - rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8"; - sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15"; - }; - in - runCommand "react-data-grid.git" { 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 = fetchgit { + url = "https://github.com/pgadmin-org/react-data-grid.git/"; + rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8"; + sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15"; + }; + in runCommand "react-data-grid.git" { 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} . + ''; } { name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz"; @@ -9178,14 +9144,6 @@ }; } { - name = "react_dom___react_dom_16.14.0.tgz"; - path = fetchurl { - name = "react_dom___react_dom_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; - sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; - }; - } - { name = "react_dom___react_dom_17.0.2.tgz"; path = fetchurl { name = "react_dom___react_dom_17.0.2.tgz"; @@ -9362,14 +9320,6 @@ }; } { - name = "react___react_16.14.0.tgz"; - path = fetchurl { - name = "react___react_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; - sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; - }; - } - { name = "react___react_17.0.2.tgz"; path = fetchurl { name = "react___react_17.0.2.tgz"; @@ -9786,14 +9736,6 @@ }; } { - name = "scheduler___scheduler_0.19.1.tgz"; - path = fetchurl { - name = "scheduler___scheduler_0.19.1.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; - sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; - }; - } - { name = "scheduler___scheduler_0.20.2.tgz"; path = fetchurl { name = "scheduler___scheduler_0.20.2.tgz"; @@ -10770,14 +10712,6 @@ }; } { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - path = fetchurl { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; - sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; - }; - } - { name = "tiny_warning___tiny_warning_1.0.3.tgz"; path = fetchurl { name = "tiny_warning___tiny_warning_1.0.3.tgz"; @@ -11290,20 +11224,18 @@ }; } { - name = "wcDocker"; + name = "wcdocker"; path = - let - repo = fetchgit { - url = "https://github.com/EnterpriseDB/wcDocker/"; - rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8"; - sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg"; - }; - in - runCommand "wcDocker" { 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 = fetchgit { + url = "https://github.com/pgadmin-org/wcdocker/"; + rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8"; + sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg"; + }; + in runCommand "wcdocker" { 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} . + ''; } { name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index efdfae8268a9f..99eedf9991193 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVxlfwCA+EetV4QYB6uEKe1yWt3sCvMPZwyIr6Td7Bw="; + sha256 = "sha256-PTUATmnpJGeY0Ushf7sAapsZ51VC2IdnKMzYJX5+h9A="; }; - cargoSha256 = "sha256-uUxwQIQTzQkKgR4F4sf4J1G2LaXiGbIvA6VM55zLK2E="; + cargoHash = "sha256-jxGdozSEIop2jBL4lK3ZcEuuR7P8qDoQD/Lrl4yaBN0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index bba35702afb42..4e3c3b187b45b 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,48 +1,48 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.51.1"; + version = "3.55.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-linux-x64.tar.gz"; - sha256 = "1cm45ka0js5q06sj4h2848232pydy3fjibg97aq4cj7av0l9vrxq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-x64.tar.gz"; + sha256 = "078mvn8aj94z9vbnxzl6q2kgncbna4z72l6q8j06dmx63m7gqs9m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; - sha256 = "0g3s60yscxrwzbq40zii0mnh2z9yggz0wc2kg9yrfzybrmsmx8z3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz"; + sha256 = "0c5rw7nk9sw2mcccq0a9apy0rfsd14jkg6wqivf0vc0c5frwhgqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-linux-amd64.tar.gz"; - sha256 = "1vdl1jipyq004ldqwa12bjvijy3dchp1c5i89fdgrrgb0bv9yshp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-amd64.tar.gz"; + sha256 = "11f8lha7cqqcp2kfw3mlagsislwn78kl26cw3dcliy82x64wkrm6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz"; - sha256 = "1hbjni74gqyfsp4amn1mimz53v89fhrmpq3aa46a6mgvv47215ks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-amd64.tar.gz"; + sha256 = "17h8iiq50jlwdihjm3x8x4sncyjpgdsrymzz8wjjw6lcyd8mzad9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-linux-amd64.tar.gz"; - sha256 = "15qs31vpip7dbzmhaa2rh6439qdd9b88dblkilwr3rypwiwdsdvy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-amd64.tar.gz"; + sha256 = "0jv6gwjpdjhla4dgi6cfcz6c4h38fsc8c5ak168k40d4ixin8g5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-amd64.tar.gz"; - sha256 = "01zjsw7f9r2andc6am09qhs2gy9189i3bvkdyxmv6bkh7907z8pg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-amd64.tar.gz"; + sha256 = "1whpm1l1x1mk32npdsdc4fji1z8yyrcma4xfvjsm7cg5mc01c3a2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-linux-amd64.tar.gz"; - sha256 = "1zf30vvq83r6yyfnh2n3vpp2mbc12c4r7kcff0xl1xlhswggkshc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-amd64.tar.gz"; + sha256 = "1vpwvpmkj8ca7cjb9b4mcrxwdwyzljrzgqrkfak8vs95a895752f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-linux-amd64.tar.gz"; - sha256 = "00gz6y7af600h6q317wnvkajfw1b2l841s6hlyx6fcdsk005jlq6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-amd64.tar.gz"; + sha256 = "0d8a66iv03b8wsfx8jidgmvq126ypw5i6dnyd3hz6kd1vbyvvp4d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-linux-amd64.tar.gz"; - sha256 = "1zk1i090bp23xihv4v3y9nz0k54jijf6450ld115kky1cgnbvy4a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-amd64.tar.gz"; + sha256 = "0pddkbqldlrz9xz0bmv6i0hm0m5gxv7ms8p5p710ww5jbyj6gni6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz"; - sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-amd64.tar.gz"; + sha256 = "13fffl50is67mzgj9910a7zw2mhq9k53qbdwsj1g5j4jq8r2p0xs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-amd64.tar.gz"; @@ -53,12 +53,12 @@ sha256 = "1nk8aprac0bcw5lx75plwg07hlx1jmbbscima0j5g36gkw6lhln2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-linux-amd64.tar.gz"; - sha256 = "03vgim1pvmvxr7218i4diyfzwgywxc6sqk561ql1msnz1cz1pv51"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-amd64.tar.gz"; + sha256 = "0cyrrxd2iyrf8zbvn46vbi6ayg93l284y66lwcggdqh3snj3gc7y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-amd64.tar.gz"; - sha256 = "0dwnrqng4w02wcmznksdxksak9kgfrj6pg2jny175a1lr6584blf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-amd64.tar.gz"; + sha256 = "09k4ni7dl3jndf85ypg00xlxij0ik6j1ndvw1yi4w8shikvy18rx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-amd64.tar.gz"; @@ -69,40 +69,40 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-linux-amd64.tar.gz"; - sha256 = "1w8sclkkzaj88kzx3g4lxg490v5hawv68j6y7a10a11v69qjv6lb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-linux-amd64.tar.gz"; + sha256 = "15mygp5kbj3z868dfz3w00srm88qn6i38dgfsclhs2flj9h989wh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-linux-amd64.tar.gz"; - sha256 = "14x5wjfkjc86j2v63k0n7cl28s7bbsia6rx3xsh65alphr1lazhr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-amd64.tar.gz"; + sha256 = "1dql09k9dgz4d91i893xcli4wq1c0i4fmxjcm2ss4cvnkipzhdxv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-linux-amd64.tar.gz"; - sha256 = "00h2gs0xcq74jgi18bv2ypqiy7ifxjfkfbdgncycknvg95lifmqa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-amd64.tar.gz"; + sha256 = "1s76ghsi9p9fda3j2nqyn3q1gjvfssxn74r7zapjl41day6h84wc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz"; sha256 = "094vc026li9s76y05p778siikq0dg6lgqdnx4cby4qqipfwvnf7m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-linux-amd64.tar.gz"; - sha256 = "1mm6b8pik79axixyca6vi1vcmwcwpksli3pf26a7q3cxn7qlillb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-linux-amd64.tar.gz"; + sha256 = "0798n2rl43scazjhdmyfx7pi0dfil4gdwl46q5gaqf6jpk4wakdw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-amd64.tar.gz"; sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-amd64.tar.gz"; - sha256 = "1xx1i59c08p2vkclq5z5brlzp6hyk7qyi09xvx49159gqidzxlv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-amd64.tar.gz"; + sha256 = "180jdyhqv0jkqhfwmn12c62cp3c7839d56vbj3ibi9rjmvipwlg9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; - sha256 = "0cndpj0fiqy90sv6r5zvd2kcs5xbk84w8619lwgi0n03isylilc0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-amd64.tar.gz"; + sha256 = "0hanfcw21n7d2m6zzj98mgfq3kdc70xp7bqc4lilmh6f90dhcrhy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-amd64.tar.gz"; - sha256 = "01lvr1zzm0xl5larfz44wfxssi2k5kh6mn8mpif89vj0s3z0zxyq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; + sha256 = "02ma55cxc8hhcc9lybaz4dn7842jmq5cf01wyjd1xnrchzcska1q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-amd64.tar.gz"; @@ -117,40 +117,40 @@ sha256 = "1cdz32s7bfri7n81gviyg3gh1l6pz95fp6alwrsn797adl3qq3s7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-amd64.tar.gz"; - sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-amd64.tar.gz"; + sha256 = "0p9kfy12334lzdj3c283fc572rfqav4xvf041z2as28hvbdi5jnc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-amd64.tar.gz"; - sha256 = "1nxa130a46icjqd7vr466klg445xl3611185vn7s4h7vcm2h30s9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-amd64.tar.gz"; + sha256 = "0ddy78rh7m9ikgsl317ibsf4xdyny9034aa6f6dp64bif4mn0mz2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz"; - sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-amd64.tar.gz"; + sha256 = "04bx4hnha1jnbzn0s5rpixqw7xniqih0g3fi4pjmgzbgjcgjgl7q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-amd64.tar.gz"; - sha256 = "1xf1xikal6fp381pxb7xnq37vx3ica81452xckgpsdn0b2dybxlz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-amd64.tar.gz"; + sha256 = "08ydgbcssw7v58j24a2km15ww2hdkvmz27013iabig22c88is0w1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-amd64.tar.gz"; - sha256 = "08wlq27x0ca3x0k9aw9cbpm43f0mn4xsgpxyzfyvbn1hjmcbf388"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-amd64.tar.gz"; + sha256 = "1x0s7k6wplami10qfk8i4qf5cqfzn3pa601yn30hhq0k16g5vm65"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-linux-amd64.tar.gz"; - sha256 = "1yq72jgvarbh754a1ym9b8jk40jmk25ly78cw2wj31a96rxv1qp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-amd64.tar.gz"; + sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-linux-amd64.tar.gz"; - sha256 = "1y05aaj5nw5aqg7bv3sn4hkiq7d5grnsh4dw5v6yr3s564hl0lbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-amd64.tar.gz"; + sha256 = "1k9q3b06fy61bvfgr76f22v7q0qaxrb8msm25k77h0x9di48mn1c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz"; - sha256 = "1l3iplqqndvx98bcil1z2vhnmaldvrgyggbs2f15jyz4iv2k822k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-amd64.tar.gz"; + sha256 = "01jsl59rwns87ybx1hmfr634ma381i7xmx40ahrrfpg851mzsgig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-amd64.tar.gz"; - sha256 = "1rkn9l16mfr97h9hi5i0kfm4lh6xm5wwxj4mwz8rwwiwfr963zw9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0svlqccq9rb00hz8g5fbpb7r6wf5wbjacab8rvjcb13wvrc8rx54"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-amd64.tar.gz"; @@ -163,44 +163,44 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-darwin-x64.tar.gz"; - sha256 = "1kabmpwzqaiss5va97vdq1lnshz9pywpiipni8jcg289az8bld6y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-x64.tar.gz"; + sha256 = "12yzj1ibdvki61q2vq9vygj6sl0s1x783v111q7wl328s3383pgj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; - sha256 = "0f62xfma1d299625ydj3f95anz47l41dyasq9vpvsi1cqii6h4a1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz"; + sha256 = "1l26w106lrhy3gn3x1x3hc8gackxzm7ipvx37vqxmb2xhraq952z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "0jhirs5ric5jgnncf152l2f1q80kdqw9asr1xj3h7iybjlxa5gk8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "01w2hh6vf3smjn7dqlfxhfnl1k6fm7mdrafk1ngzyaqg76ggn52j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz"; - sha256 = "127b62pznybyp4scv1avwpw4ni540496yki0h0k4blm5gnrvr600"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-amd64.tar.gz"; + sha256 = "0iyyfx84wn1q2k51llhajlv1vm4yhs6i8654ic00pxp0nrv6gnk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-darwin-amd64.tar.gz"; - sha256 = "1iw5xzgyfjr6j9dmhvmbnfhw8q4x94af5jb3jzzhbfjnsrbricwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-amd64.tar.gz"; + sha256 = "0a6hvi15z2viyv97xdq2s1kgrhz45f21rh4zcx4y7kqbv0v4a9aa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-amd64.tar.gz"; - sha256 = "0ypm2xknhz09cmzj57d5r8axn4jscb8r8z9sqx88y3fsh14s3j6d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-amd64.tar.gz"; + sha256 = "0fmv68gr11gap5gczfw51fwwyasxamxd24zwn0gp0rzc4600qd2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-darwin-amd64.tar.gz"; - sha256 = "0zgp9cmz1haih3p8z3nd62nsh09vd4n4dfcvzb7rw7kbzz6z31h8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-amd64.tar.gz"; + sha256 = "181q2hdj6wxj9c3jyndcnkgrz8rh6sqzzqjl6r4g681ci5j4nqrd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-darwin-amd64.tar.gz"; - sha256 = "0dp69dqmn7qyc6ib9gajlrjh6dq302i9pf9nw1wmsbpf46ycksyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "1xgxqx62116g4i17m4lpzgpcgwqhjisbfc4cvs49n31h0g2xlfl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-darwin-amd64.tar.gz"; - sha256 = "0nk8mhj5lbkdkczfj0d0pxxxamigjvj7777lrs9f7i9v4b0ywiri"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "1bjhnaqdclz0ajjvgiqal0k1x6ri0fz4z4ww25hbwjqlvyd4n7ww"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz"; - sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0f7v1x363gr46q3ls90zq79wzbg2qwgcbrj2203g9pzly6x399p9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-amd64.tar.gz"; @@ -211,12 +211,12 @@ sha256 = "0jh6v9skyxf4ljiqc5070c1r8gkgaic6wy7w7264c1xfrnwsy31g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "0lqhnyvbgllrjmpwfgwsvjf1942vr2g4lrcdag29xfg9s5xqk224"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-amd64.tar.gz"; + sha256 = "1dz6vi3c067f51p3ya43hahc82w9r3ywhxdxmbnjc1sk7py1pbi4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-amd64.tar.gz"; - sha256 = "08v8s77plv9fv5bjx6g6wfq1fxknmmacws33zgl06vqdgdsfg1gx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-amd64.tar.gz"; + sha256 = "1a70h0apgxk5d70rki612s71wd6p0lg1g4v2w564q1f94fpqp9vb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-amd64.tar.gz"; @@ -227,40 +227,40 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "015wqmygcagx3abwwisf5iyi6xaakw2wxs2nc4clis9q0g6dnw3y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "0dzxv7qkk68bxw9p5xbmb40sqqnbf8dckpk352f5802x78wxhaf5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-darwin-amd64.tar.gz"; - sha256 = "1jykny20wxgvcry2dh6cfbbzf3bhpf855xv9s0z5dpv74kxm51q6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-amd64.tar.gz"; + sha256 = "17madjffjskjbgg2ab942d1dqpq74ff618a4yjkz679l490z14mi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-darwin-amd64.tar.gz"; - sha256 = "0np6bcjiz6z0qbim22qsq0xr409779c5vb5i8yqkp2znvh79744h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-amd64.tar.gz"; + sha256 = "1gjl4yx3g8p487yv61jslkiy1ar7qijhmsm6s52ghxyh8w2wfbrj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz"; sha256 = "12imy2q8bl255cmc26swa6kflcb08gkh7mnvwxss8nzj0a6rl8vw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-darwin-amd64.tar.gz"; - sha256 = "1cbvk8xxsgg0hzw1kc6f0mn77ws3aw1zrvmx67mgjjab2ljz6aks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-darwin-amd64.tar.gz"; + sha256 = "016n1dknmlhizjh6z923kr68ma7z0xhbxg29kjfay83gn216r4am"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-amd64.tar.gz"; sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-amd64.tar.gz"; - sha256 = "1sgfc3f5h82zlqbgl29p9jffr125yypfh6hjfnpqjpy25mlxcpz8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-amd64.tar.gz"; + sha256 = "0ca581x90ypw73z0dmy7b21sc0npqivnhfnv5r8pf2abwhbkpny0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; - sha256 = "1vl28h3vjxlcl86s8c74qx34wfxwx5rc0ba26zjjv0q91pklmlh8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-amd64.tar.gz"; + sha256 = "0y78a6sc81mnbr7djj4nmyra5n3bmqnm9jic0552mqikw59jsikw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "1ga3gb8b7ik070gah73jwjd9l26rfzk2a0a5zdxw0jf7qlmwirf6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; + sha256 = "07sav5r6z3xlx953jyv3b3wq7q6nv3sbh44fx753yqfh7ahagpn5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-amd64.tar.gz"; @@ -275,40 +275,40 @@ sha256 = "1p79wp1sk5ka9xisjmmrv9s7aw6dghp22lkiz15vzrqwifm6nxmb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-amd64.tar.gz"; - sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-amd64.tar.gz"; + sha256 = "02vp3lar6nj9ssy7cr194vni6vqg2v8rnvwxixbc5ijq5azz5ipi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-amd64.tar.gz"; - sha256 = "0is852yq285vs2n79qdq20jn9y0f981a622gfq8c0l7hkjqc97dz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-amd64.tar.gz"; + sha256 = "071x2z4kb2m5cvlgpmk7ha7857c85fhqb56jas5r8c2vn70spqpv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz"; - sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-amd64.tar.gz"; + sha256 = "143802ikmgjgk1w7rkkl4q9hb2skvx4pf5wxi6h5rziav03w97p3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-amd64.tar.gz"; - sha256 = "08nr4qwilg4l3rrjndpr5r9k7fccdqlfzgh0i2np7hk3d5g5nar7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-amd64.tar.gz"; + sha256 = "01qxkbfqyyqmqcz7h4vn779ncc9p72q6b77lyyijrav1s9jbd54s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-amd64.tar.gz"; - sha256 = "1f1wfj5vwa13d5rz2kfg9p3l12p0nl6vgyc6wiad2j5cmk9rmzd8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-amd64.tar.gz"; + sha256 = "0mg35il3xdr43y5fq7420dal7a2nmg542v7njm71m98rdw2jlnnq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-darwin-amd64.tar.gz"; - sha256 = "0g1kh5zkkr9m1k5qmmmkay089j0yqbz9qap6k7gii1k601mm09sf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-darwin-amd64.tar.gz"; - sha256 = "1pxvsxk0w4q9fqrf3q4a93ah4plhwsdwy9sapwwmh2nld489y5ld"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-amd64.tar.gz"; + sha256 = "0j7ydd39gp86srlk3319hniy9wikjyp4zc0gnxxq641dddnpscdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz"; - sha256 = "1gxk3gcyqk688m9dv2p4flbm1dw0z9478xip6jqaiw4awkrzbnns"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-amd64.tar.gz"; + sha256 = "1jn1j72s3dqjw0xdyk7mncw61fzqmwg4sqbbh7f3708wv1rznv5a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "0bmdfvdh2smwpdmz8jhkn4cl4zrn7jqw8nmf7y7zkpwpiw8647ir"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "1g7jcwrff8nd1m6fmvfri3nfgby8agcwmq60ascd45mkianwf2i8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-amd64.tar.gz"; @@ -321,44 +321,44 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-linux-arm64.tar.gz"; - sha256 = "1blk2aghrpqwxh8hy2k476n4arg7xrp043kivc18yxrrzs6347hq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-arm64.tar.gz"; + sha256 = "0q8bb5mh2zqrf45g1sbwbxlhwvn4j467czbi0zy0iwy3wp7gpp8s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; - sha256 = "10gmwqfhvz1yp0ld69w01fmjnfw907pa0pmzjndm3p9fwqjrr2nd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz"; + sha256 = "0a0gy3im1ymjqn1pfc1ds8rikp0zsn3msc7g3zrvqlqkypih5fmy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-linux-arm64.tar.gz"; - sha256 = "1bfl5yps753zz6z3w02ykyhb8fpwrlkga7jlwk9g0grh7zmimc1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1dhhsdxcg3jhf9yjhjpgsdz92vwj52v45d34paa0qy5xmdw89g23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz"; - sha256 = "1qrg5sq8fqyn9vq92xmdx0pql7hy4dhha3lxjp5ka386bf6jmamc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-arm64.tar.gz"; + sha256 = "1cg68j7nn0jx3zdfhkxmgbms27xk7mllwll6pwmp1rljh04p48ap"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-linux-arm64.tar.gz"; - sha256 = "1yqqnc03hv79l1px8qxppwf8n3shdcd8jd46q1xm9f9fm7bkxd9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-arm64.tar.gz"; + sha256 = "0hgnwzslhcxf1xp3dza9adf1dlc1v3fsgb22n0dqq65hyixkdlar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-arm64.tar.gz"; - sha256 = "0m773l7289rqpkyzmfbdsg4v6m531p8mp4mjhr6px5amii7875qz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-arm64.tar.gz"; + sha256 = "0sl8af8arqjg70p9ndw72adfpv8rybw4nb3n120cnwrz3bw0sfqy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-linux-arm64.tar.gz"; - sha256 = "0sbw6qk2a5gncwdsg3647l0kjcykh5j4l7wk6hdviycgy5r0gjhz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-arm64.tar.gz"; + sha256 = "0bcv46ib2pbsp41rxqb60mvj7f9b2rab6r342rr27azxvf6jzc8i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-linux-arm64.tar.gz"; - sha256 = "1dxg730fn59h0vj3pblc068d55p04f6hhsmkwrgh06br8mp2xv45"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-arm64.tar.gz"; + sha256 = "1z5x90z92q34ibfzm98ir308b7yw9ryw0whdrfrbxd97qdzq226b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-linux-arm64.tar.gz"; - sha256 = "1b3c1z5kgk9jdz57l5wn317ia2fz9mxyai4anzfik13b0dpkngl4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-arm64.tar.gz"; + sha256 = "064fbh583gfpilb7rn7rwazmf79q8m361nh9jcqxs6r7mihb0ch4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz"; - sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-arm64.tar.gz"; + sha256 = "1m1f2fn5y7ybhzds5hlp545pxk3p1mli7vadr95227bws88fnzcl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-arm64.tar.gz"; @@ -369,12 +369,12 @@ sha256 = "1hd08gd2v3wl81amvcf821vzmmh7agw8cspnl6fqc7g69agn1l12"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-linux-arm64.tar.gz"; - sha256 = "0liagz2nd3qx686rnqysfb28bd42qp3d7qmgnq364676q9qqqkak"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-arm64.tar.gz"; + sha256 = "14qpxps76y1jc995l9h1m3nwbkna0fsa6hm32m11qw9c4clk7npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-arm64.tar.gz"; - sha256 = "0bx2dczfm1zqpkclyf1pj0m0iv2w7c3dlqdajfgism3inyb6313c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-arm64.tar.gz"; + sha256 = "0n8vimvn4p7mcrgnd0v8l1q21pswhlxs1mph4928lnpk8h68hz51"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-arm64.tar.gz"; @@ -385,40 +385,40 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-linux-arm64.tar.gz"; - sha256 = "1j4qp9pf9iy7hzq5pvj2ysk149s5012bi03il2qz3qcz2ga983p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-linux-arm64.tar.gz"; + sha256 = "1ad76i2avaaxfhq5bvhdmp3wy2c0zs959i3i1hsda2qdw5c91rjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-linux-arm64.tar.gz"; - sha256 = "0ppb9qwjwz3s4ysidpyakvadrbpzqgpljbcvpgfd4xgqkgmrm88j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-arm64.tar.gz"; + sha256 = "1biq7rjw49d8vpfsb9ab0ixr2a42y404nxa9v8ndkyhqskmjgz68"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-linux-arm64.tar.gz"; - sha256 = "0qj7akqm6gdis29nmiq2cbmiyqp97fbwv6wh63y2c6nwyi2qmxv4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-arm64.tar.gz"; + sha256 = "0y454009cwryi6bcz9k6398bbngdslxkpcvdnl270jk1rkk0b2qz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz"; sha256 = "0yjy3i95jsdqwmb7qgixlnhzsr6hiv14jcsydjk9j821zw4xrwpr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-linux-arm64.tar.gz"; - sha256 = "16q5kspbl882sa115lfcb8h8sx1i6lhm14xyzsfkmhznqny3lbv8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-linux-arm64.tar.gz"; + sha256 = "1y931wca5hppiwxya68rj6ymhavw7kkpqd67awpls6f7j4y0wwjl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-arm64.tar.gz"; sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-arm64.tar.gz"; - sha256 = "1cv9y65n4fh3308r2y61n7k6h5531kk9a14qfbix1dmiv9zkg2jc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-arm64.tar.gz"; + sha256 = "0xj174k6qk5fkivzj9481smgvvv3i1861kbjiplsfkka8j6wcw09"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; - sha256 = "1wkswrjh31m8smlwwl50n7z4pfg7gs0lkis2bqiwlyma2zqdqggr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-arm64.tar.gz"; + sha256 = "087hbcb5y7l3gmr7x2y5kzp1ykdj0samm7vbn5iy2y2rpwirszpw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-arm64.tar.gz"; - sha256 = "0s2qma2cl69ghvkjapvsgfrry6c1icbm6rxglqfdg6da1lrabx40"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; + sha256 = "0073vppvkfqz02jwanycy49ria8in7bpikhkqjz84imrprj9l9ic"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-arm64.tar.gz"; @@ -433,40 +433,40 @@ sha256 = "1knyj2djz077c38kls5gyjn0v83qif8qddgji488mr8k8nf4k6lg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-arm64.tar.gz"; - sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-arm64.tar.gz"; + sha256 = "07agbpg8v32zq27395zzjpvpi5sr8ryzi16hj4jk1144g0bi7gxd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-arm64.tar.gz"; - sha256 = "0r7zm66p47f0b0f3x219s36mvinwij8jyjqi5jafbvzbrmwfrnmk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-arm64.tar.gz"; + sha256 = "0sr7hxxczs90sqhaz3asp1bd3bcld0nw00gah0m36rdr3kb8d2zl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz"; - sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-arm64.tar.gz"; + sha256 = "1w5l6m13113lak1yv4kfhh07adqz3pci9zyzx57llic4mccczpan"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-arm64.tar.gz"; - sha256 = "0p82fkch37zr53vl6wk2i1c8aplv8nk5hypjgzhjcg64a7ahlsv3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-arm64.tar.gz"; + sha256 = "0bj92iyhsc62dlr6nx93h3wqf0d2rb7bqlwy52lyrmww2cv4wvw6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-arm64.tar.gz"; - sha256 = "0d82rsr1aqkpvv0vaz3d11dwqnyww2na0vx7dqjxw5zf34z78h87"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-arm64.tar.gz"; + sha256 = "05xhgy6n4msxvi72a898g4bas7aqxdvj5a4vf1mjf80f55m8hc8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-linux-arm64.tar.gz"; - sha256 = "11n751m4z2gjslvf28xazhq123yfqyyhshni97ad5ki23i1v785l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-arm64.tar.gz"; + sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-linux-arm64.tar.gz"; - sha256 = "0h80hzx69bl61zbh25lqjsjvffc2b7l1nf6dlny5vnb4yk17wfxi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-arm64.tar.gz"; + sha256 = "1vrshbjdvn01jm38dq91v38q1m30nvx8siyk2ppx5b3zp5kgdlfl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz"; - sha256 = "1ivbdpls45zjzw4v2hi7g3zfhy0nlnnh026bkzzfnfan1isnpp87"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-arm64.tar.gz"; + sha256 = "1psibvdvnqmcjyd4knwxqq97k72da7qgrm2g08n41bvjdv10j6hh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-arm64.tar.gz"; - sha256 = "065bcvm1p6fbhnhq4r0l5km7z7srd6yfpj05qd070lp5iaz90mp7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-linux-arm64.tar.gz"; + sha256 = "158iqlvxdc38yn2cdifp94v4jmqbybczm98g3fc8n1ny2wr7akny"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-arm64.tar.gz"; @@ -479,44 +479,44 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-darwin-arm64.tar.gz"; - sha256 = "1mfvrdnyygakcyhc03jbgip4vgdj709w9zphz75r2dahz5mn4mjp"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-arm64.tar.gz"; + sha256 = "1c5vivch4ddj63pbiq61890lpnf1jdn3xlv127njmp5syb6ankzl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; - sha256 = "1v6dwsjbqmg9qnlhf5jl98r5c171xnsp3fnyfkg2h8874scg2gpp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz"; + sha256 = "1g8adp2q0r4fvaahyx0jqgqvp972h1kjzxrvlfw5012z76qnar47"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-darwin-arm64.tar.gz"; - sha256 = "069gdbxd82wps9fl7684g7fcd8yk93v2mfjkslyv5x3fkf4xn377"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "0454pqi4qrb9iv30ghj4jqjhxi32b5yrsp0vi7x23m8c474y676m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz"; - sha256 = "10wjnyrwrmg1qjsqlizf9g85wadss3nxmdsh87cjvdbkfb3crp3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-arm64.tar.gz"; + sha256 = "0fndz76l1h6isspr60ng0dr3rv0v1rs8kp8w5ssx9ixi9r6nvqc5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-darwin-arm64.tar.gz"; - sha256 = "0g882459cqbxcl9ml7mdc4s4xx6kg7srk56n0x7ypj3k0j7hjbd0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-arm64.tar.gz"; + sha256 = "1nh9hsv9sc0l9vfamhv8ixbra9xnldai0h3dfgrmy0zl3v1njmh1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-arm64.tar.gz"; - sha256 = "02v0p3ksv0rlz1fk216fr1q3smnxw3fvzpbd9bichsmp8hids4gq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-arm64.tar.gz"; + sha256 = "0jhr9h8m54kc9yqmxmd8di78yk1r6l6p2v621123vbj407l1san4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-darwin-arm64.tar.gz"; - sha256 = "15bxhlc36lzdrgrr7f3xzc3x4pf2pyf6gdghckgk5s045b14kw6i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-arm64.tar.gz"; + sha256 = "0jq26kj5v6fj2sw3yyygk0gnawbx85fj4vfn68a9lsfm10xl624p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-darwin-arm64.tar.gz"; - sha256 = "1808vgyc5inrngfwj0l8szngcg6vw9k5fhhqlhiwqf1skwikln4j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "1s0bk2bbwpqw1qng4mq8kcbz0jnizdvv3xfnhzr30b79qndg22yg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-darwin-arm64.tar.gz"; - sha256 = "0v4vjzg79316mqv40b5010adihg57gcjrvkbafmdw7g0qanbks2v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "1zz4j434ngckir5nk8cbnvac8vxfrf92qw3gcrhrnj65bpv8703i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz"; - sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-arm64.tar.gz"; + sha256 = "01jcrbvhyapbzhm1z4gbpi38vah69inx70mr96mmsfmn7zs95l0p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-arm64.tar.gz"; @@ -527,12 +527,12 @@ sha256 = "1ss8dak6lk03s391914wxs1y20h4k0khqab7k15lajvl6jm13809"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "10ygprngyfxvh96b14605hphanx2ja62l6lpqllwj88jdx1ds1nz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-arm64.tar.gz"; + sha256 = "0g1n0vkr1lqny1rgb1pgmsvyr2rc0jsj4j6m0ibgcps6j3g9h207"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-arm64.tar.gz"; - sha256 = "1gzh37b5jmpz3ih7s7r11vx7wpph7pvn3iidy6gckrs9rw9jp7l4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-arm64.tar.gz"; + sha256 = "0jghq2bl0p7wwdipdqqvrpfdj1n1cl9q53ssjhmaj2f9vmikhdsi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-arm64.tar.gz"; @@ -543,40 +543,40 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "0vdrj3w6w9qw823fwr1i8j3gqirknvx5yiinp8sglsx9xb6p9q5i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "0ssvm9dwpiisk1n93a522bcc5ijfqz2c25b1qgjsmlgd93phias4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-darwin-arm64.tar.gz"; - sha256 = "1c06qf38mwli099rv1jhi0wgfq35g2byd3dcq7s8m0plfvvjciip"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-arm64.tar.gz"; + sha256 = "156yw48m0aglrk3b6ajz29x3cs9c9fdka4k91h8bss2r0badn9lf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-darwin-arm64.tar.gz"; - sha256 = "1i2rfi2qwpm2bk1qrdvjymk1dpw9469vqw0ja441i863cvd7ipx3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-arm64.tar.gz"; + sha256 = "140rvajb742r84sb3wjvrr1nvvl6a3lraj5k6lf1hlgvi4rv0q0y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz"; sha256 = "1lkj6zjzhg7s06p75wia14jjsfqs2wza08m4bbcpc4s99b4p6274"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.27.0-darwin-arm64.tar.gz"; - sha256 = "1m1w4qds6jbmpw4xwy87bgf8d4nzv8kj29mdnfqbf3hssvzk2zc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.28.0-darwin-arm64.tar.gz"; + sha256 = "06qv3bmmcrv9rxv5xain2rk2grfqij6czy2nqay07bjpy2awzh40"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-arm64.tar.gz"; sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-arm64.tar.gz"; - sha256 = "1a38gi1y1vwvgxhid070hsl7la8wnwxzs8473hm1w12lq9kymh0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-arm64.tar.gz"; + sha256 = "0pyl0rdwgd4vm4rcass0va4r036nwwj9imwi026gha4y9b3138cp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; - sha256 = "0x883w9nvvxdsm0knxzzfnnv0lbbysbs04ym681qxzy9pi7ijhj3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1wcslax3iih2ripcla3rqcyc4qxy7qcs5gix9n811b6dx20ppdqv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-arm64.tar.gz"; - sha256 = "05pjh1xlg82v8vfzkcnn6krnjkd5njfgrfy392vfqcp235z569s6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; + sha256 = "0z0ands2dp6jjy9rbb9rmijlp56m4mrw79f8513kj6nqp1dyalr1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-arm64.tar.gz"; @@ -591,40 +591,40 @@ sha256 = "1cl9qj041z8fgc95vgsx7y0f5jxyjr8cjb5ain4gl501v4s88hn9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-arm64.tar.gz"; - sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-arm64.tar.gz"; + sha256 = "0aav8v0hk9r647yxy2a4mxj45iqbjab26q3xm093z43sdq05rm0a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-arm64.tar.gz"; - sha256 = "1vzyn88xw94b2kgd0gmvsjz1k7bjvmf9gyynnn2xsmzzs6jmhl1d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-arm64.tar.gz"; + sha256 = "0m4385fndkwrag12w0yclbw0krhij27wa49wckwpvhn80syj80nr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz"; - sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-arm64.tar.gz"; + sha256 = "02882h0sgrcxdjsddmqld4k4637h3dmblkb42kjrdq6d518gfivn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-arm64.tar.gz"; - sha256 = "1y1hb4s9214a5nlm0byzm0w4n1c190w57b0q4grl064hnw6490v1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-arm64.tar.gz"; + sha256 = "07p28832jrndwcmmp1whky2dp218jhc070cm12frypn06ipy0n9q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-arm64.tar.gz"; - sha256 = "0nhmi6m22xlxbxq6scknj3025wpmmf32vly5k7dpzjai695n48s7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-arm64.tar.gz"; + sha256 = "1k4yvbmhpaf244bwv94swz7nvp07pllica40q2kcgz9aynb9zljy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-darwin-arm64.tar.gz"; - sha256 = "0yyr5dv612ar8c12w74zwp0n1v77lry548fs6b0d20cc3a6d10gb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-darwin-arm64.tar.gz"; - sha256 = "0ss4q1l4x0jwagcqcjkb65ksrfai8j4lb3xdbbfk58yxcmk5wwr3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-arm64.tar.gz"; + sha256 = "0hh9m53pc07mfpi2zl1hzqg58fh0i6vbm0s9vppxvn2nnl5bd0wy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz"; - sha256 = "1iabwi9cf0pvfhhhxbhp8283bzhd58rwwfcrhgh1wh9kgr0icqlx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-arm64.tar.gz"; + sha256 = "1lnbsfcv1vrgc2hzmqwydxp9j6w9cmgpkpm83hmzz2ryy2vn6g07"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-arm64.tar.gz"; - sha256 = "02739v2jq70s9vxvibffd9xnhfpy0zp3724n79pdcjygj5xw32g9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1hy2w6x8mr7bi1pkaz4s8881w1nvl1nhrlqmc371xkpfkaahhj25"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix index c1c76934945f8..5882149807825 100644 --- a/pkgs/tools/admin/pulumi-packages/default.nix +++ b/pkgs/tools/admin/pulumi-packages/default.nix @@ -6,6 +6,7 @@ in { pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { }; pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { }; + pulumi-command = callPackage' ./pulumi-command.nix { }; pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { }; pulumi-language-python = callPackage ./pulumi-language-python.nix { }; pulumi-random = callPackage' ./pulumi-random.nix { }; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix new file mode 100644 index 0000000000000..3b181ceb05b0d --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix @@ -0,0 +1,33 @@ +{ lib +, mkPulumiPackage +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-command"; + version = "0.7.1"; + rev = "v${version}"; + hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8="; + vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM="; + cmdGen = "pulumi-gen-command"; + cmdRes = "pulumi-resource-command"; + extraLdflags = [ + "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" + ]; + + postConfigure = '' + pushd .. + + ${cmdGen} provider/cmd/pulumi-resource-command/schema.json --version ${version} + + popd + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A Pulumi provider to execute commands and scripts either locally or remotely as part of the Pulumi resource model"; + homepage = "https://github.com/pulumi/pulumi-command"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch trundle ]; + }; +} diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 0a76b4303b294..68a0936c7eba3 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "pulumi"; - version = "3.52.0"; + version = "3.55.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; + sdkVendorHash = "sha256-ZE+df01jRx3nDiPGdlh1JNJn5NqsHW22fiUzeNlkzF8="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-UxVIk7LMF7h/Ba09EgkIuna5iAfqKEuzU0qSKJRPpfw="; + hash = "sha256-x5XebYFpxFi2QgrrK+wdMFOLiJLnRmar4gsply8F718="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorSha256 = "sha256-tr3sp9b9xh5NLK1AO88QQVzYbIysmmgRW2s1IRNHFUI="; + vendorSha256 = "sha256-8vchyD3MTi9Fxrd6SiywFK4tadyauvDxjs9RmoJuULA="; sourceRoot = "${src.name}/pkg"; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 5354feea8c6e4..3b35207e84991 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.4"; + version = "0.49.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-NAdY4JdUWDnawKl9D6Z4DXQP6ibn+4jHap08p0vu3Mc="; + hash = "sha256-O5JUWD7Wbe/5BM5fr6z76Re7PpRwFJV++lze+pv5el0="; }; - vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo="; + vendorHash = "sha256-Hb4bqOK4h68ZCN/bTPQLd4hC7oZUrj21DupVA4GrlNA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 9c4a215dba8b3..918cd6bdf6182 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.10.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-Xy4arniOrCln58swFExd0ZoU6wymKYFinReMs7YudeY="; + sha256 = "sha256-tE2r2d3dagMvfPq/2G61KMPZyz6YQG3jAD+MjQ3uYbg="; }; - vendorHash = "sha256-BNiF90jovSyCcRGfv6Kya4fLpqV2VF2Qa3QqdyQio5c="; + vendorHash = "sha256-eqVAX6l7wsHqFjzwLiTSwryLHxl0aJqQOmjyGeM+1co="; ldflags = [ "-w" diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 104365de5d41e..57661c862b8c1 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.66.2"; + version = "0.73.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CIFK4XIYpRK9CJOwQUV6kRGU++iWJCdMBR7v6xh0iaY="; + hash = "sha256-FJGdp1scqzyeCWKIyTVNkaGNb4rbFLWvHDVWV4V5iBw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-ttvfzlSFgh0xQ0W/ftLeSrJNOzg7Iq1qdLgflGy7N8Q="; + vendorHash = "sha256-/OwLARY5skfBfr9eJpP6YJuZrtghSGp4fZ7GfzoOiq8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index e4933986176e8..d48171b195863 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-77X+AvHFWfYYIio3c+EYf11jg/1IbYhNUweRIDHMOZw="; }; - patches = [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/TigerVNC/tigervnc/pull/1383.patch"; @@ -65,6 +64,10 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=array-bounds" + ]; + postBuild = lib.optionalString stdenv.isLinux '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index c162521870bac..079cff0dc3251 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.36.1"; + version = "0.37.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4="; + sha256 = "sha256-fndA2rApDXwKeQEQ9Vy/9iJBJPcRWt+yJfvRdNDOwZU="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU="; + vendorHash = "sha256-91UPIz5HM82d6s8kHEb9w/vLQgXmoV8fIcbRyXDMNL8="; excludedPackages = "misc"; diff --git a/pkgs/tools/admin/uacme/default.nix b/pkgs/tools/admin/uacme/default.nix index fabc4923dd74d..039c817bdf20e 100644 --- a/pkgs/tools/admin/uacme/default.nix +++ b/pkgs/tools/admin/uacme/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "ACMEv2 client written in plain C with minimal dependencies"; homepage = "https://github.com/ndilieto/uacme"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index 21bfc34ea82ec..b2df5a856cea6 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wander"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BcjK1GNj6URk6PmZIqG/t6vvy5ZXo3Z6wDqY1kbLSfw="; + sha256 = "sha256-g9QAdwAqy3OA+nYsSpVLUPv1gn6N12339fgmYFT6Iys="; }; - vendorSha256 = "sha256-iTaZ5/0UrLJ3JE3FwQpvjKKrhqklG4n1WFTJhWfj/rI="; + vendorHash = "sha256-iTaZ5/0UrLJ3JE3FwQpvjKKrhqklG4n1WFTJhWfj/rI="; ldflags = [ "-s" "-w" "-X=github.com/robinovitch61/wander/cmd.Version=v${version}" ]; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 150230f775a49..06fb4aae1a0eb 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -53,12 +53,23 @@ stdenv.mkDerivation rec { sourceRoot = "."; - patches = [ ./fix-build-on-darwin.patch ]; + patches = [ + ./fix-build-on-darwin.patch + ./fix-cross-mingw-build.patch + ]; patchFlags = [ "-p0" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + postPatch = lib.optionalString stdenv.hostPlatform.isMinGW '' + substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \ + --replace windres.exe ${stdenv.cc.targetPrefix}windres + ''; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-Wno-deprecated-copy-dtor" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + "-Wno-conversion" + "-Wno-unused-macros" + ]); inherit makefile; @@ -73,7 +84,8 @@ stdenv.mkDerivation rec { # aarch64-darwin so we don't need additional changes for it ++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] # it's the compression code with the restriction, see DOC/License.txt - ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; + ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ] + ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "IS_MINGW=1" "MSYSTEM=1" ]; nativeBuildInputs = lib.optionals useUasm [ uasm ]; @@ -84,7 +96,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/*/7zz + install -Dm555 -t $out/bin b/*/7zz${stdenv.hostPlatform.extensions.executable} install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -109,7 +121,7 @@ stdenv.mkDerivation rec { # the unRAR compression code is disabled by default lib.optionals enableUnfree [ unfree ]; maintainers = with maintainers; [ anna328p peterhoeg jk ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; mainProgram = "7zz"; }; } diff --git a/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch b/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch new file mode 100644 index 0000000000000..59608b52b7930 --- /dev/null +++ b/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch @@ -0,0 +1,659 @@ +diff --git C/7zVersion.rc C/7zVersion.rc +index 6ed26de7445..675e9bb0321 100755 +--- C/7zVersion.rc ++++ C/7zVersion.rc +@@ -5,7 +5,7 @@ + #define MY_VFT_APP 0x00000001L + #define MY_VFT_DLL 0x00000002L + +-// #include <WinVer.h> ++// #include <winver.h> + + #ifndef MY_VERSION + #include "7zVersion.h" +diff --git C/7zip_gcc_c.mak C/7zip_gcc_c.mak +index d41810478db..43cdd51271e 100755 +--- C/7zip_gcc_c.mak ++++ C/7zip_gcc_c.mak +@@ -93,7 +93,7 @@ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll + endif + + +-LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32 ++LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32 + + CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE + # -Wno-delete-non-virtual-dtor +diff --git C/Alloc.c C/Alloc.c +index 142a1ea2219..0d0107c56f4 100755 +--- C/Alloc.c ++++ C/Alloc.c +@@ -6,7 +6,7 @@ + #include <stdio.h> + + #ifdef _WIN32 +-#include <Windows.h> ++#include <windows.h> + #endif + #include <stdlib.h> + +diff --git C/CpuArch.c C/CpuArch.c +index a0e93e8b08e..36e0be0b1c8 100755 +--- C/CpuArch.c ++++ C/CpuArch.c +@@ -217,7 +217,7 @@ BoolInt CPU_Is_InOrder() + } + + #if !defined(MY_CPU_AMD64) && defined(_WIN32) +-#include <Windows.h> ++#include <windows.h> + static BoolInt CPU_Sys_Is_SSE_Supported() + { + OSVERSIONINFO vi; +@@ -275,7 +275,7 @@ BoolInt CPU_IsSupported_SHA() + // #include <stdio.h> + + #ifdef _WIN32 +-#include <Windows.h> ++#include <windows.h> + #endif + + BoolInt CPU_IsSupported_AVX2() +@@ -351,7 +351,7 @@ BoolInt CPU_IsSupported_PageGB() + + #ifdef _WIN32 + +-#include <Windows.h> ++#include <windows.h> + + BoolInt CPU_IsSupported_CRC32() { return IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) ? 1 : 0; } + BoolInt CPU_IsSupported_CRYPTO() { return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) ? 1 : 0; } +diff --git C/DllSecur.c C/DllSecur.c +index a37c1b3e2c5..16755bba930 100755 +--- C/DllSecur.c ++++ C/DllSecur.c +@@ -5,7 +5,7 @@ + + #ifdef _WIN32 + +-#include <Windows.h> ++#include <windows.h> + + #include "DllSecur.h" + +diff --git C/Threads.h C/Threads.h +index e9493afff62..71972558d48 100755 +--- C/Threads.h ++++ C/Threads.h +@@ -5,7 +5,7 @@ + #define __7Z_THREADS_H + + #ifdef _WIN32 +-#include <Windows.h> ++#include <windows.h> + #else + + #if defined(__linux__) +diff --git C/Util/7zipInstall/7zipInstall.c C/Util/7zipInstall/7zipInstall.c +index 2c498bb4392..d791bc4181c 100755 +--- C/Util/7zipInstall/7zipInstall.c ++++ C/Util/7zipInstall/7zipInstall.c +@@ -10,7 +10,7 @@ + #endif + + #include <windows.h> +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "../../7z.h" + #include "../../7zAlloc.h" +diff --git C/Util/7zipInstall/resource.rc C/Util/7zipInstall/resource.rc +index 4d6a91feda1..c19f601f69f 100755 +--- C/Util/7zipInstall/resource.rc ++++ C/Util/7zipInstall/resource.rc +@@ -1,6 +1,6 @@ + #include <winnt.h> + #include <WinUser.h> +-#include <CommCtrl.h> ++#include <commctrl.h> + + #define USE_COPYRIGHT_CR + #include "../../7zVersion.rc" +diff --git C/Util/7zipUninstall/7zipUninstall.c C/Util/7zipUninstall/7zipUninstall.c +index 89cd764dbe9..32ece1c6c14 100755 +--- C/Util/7zipUninstall/7zipUninstall.c ++++ C/Util/7zipUninstall/7zipUninstall.c +@@ -11,7 +11,7 @@ + // #define SZ_ERROR_ABORT 100 + + #include <windows.h> +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "../../7zVersion.h" + +diff --git C/Util/7zipUninstall/resource.rc C/Util/7zipUninstall/resource.rc +index 506e0665cdd..ae1dfedc83b 100755 +--- C/Util/7zipUninstall/resource.rc ++++ C/Util/7zipUninstall/resource.rc +@@ -1,6 +1,6 @@ + #include <winnt.h> + #include <WinUser.h> +-#include <CommCtrl.h> ++#include <commctrl.h> + + #define USE_COPYRIGHT_CR + #include "../../7zVersion.rc" +diff --git CPP/7zip/7zip_gcc.mak CPP/7zip/7zip_gcc.mak +index 2a24e06aa1f..fb32b933201 100755 +--- CPP/7zip/7zip_gcc.mak ++++ CPP/7zip/7zip_gcc.mak +@@ -113,8 +113,8 @@ MY_MKDIR=mkdir + DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll + endif + +-LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 $(LIB_HTMLHELP) +-LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI) ++LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 $(LIB_HTMLHELP) ++LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI) + + CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE + # -Wno-delete-non-virtual-dtor +diff --git CPP/7zip/Bundles/Fm/StdAfx.h CPP/7zip/Bundles/Fm/StdAfx.h +index c15e07939da..d1e094cc339 100755 +--- CPP/7zip/Bundles/Fm/StdAfx.h ++++ CPP/7zip/Bundles/Fm/StdAfx.h +@@ -9,8 +9,8 @@ + + #include "../../../Common/Common.h" + +-#include <CommCtrl.h> +-#include <ShlObj.h> +-#include <Shlwapi.h> ++#include <commctrl.h> ++#include <shlobj.h> ++#include <shlwapi.h> + + #endif +diff --git CPP/7zip/Bundles/SFXWin/SfxWin.cpp CPP/7zip/Bundles/SFXWin/SfxWin.cpp +index cf3bad389a0..260484c11e4 100755 +--- CPP/7zip/Bundles/SFXWin/SfxWin.cpp ++++ CPP/7zip/Bundles/SFXWin/SfxWin.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <Shlwapi.h> ++#include <shlwapi.h> + + #include "../../../Common/MyInitGuid.h" + +diff --git CPP/7zip/Bundles/SFXWin/StdAfx.h CPP/7zip/Bundles/SFXWin/StdAfx.h +index f263ecb77c5..e96640e995c 100755 +--- CPP/7zip/Bundles/SFXWin/StdAfx.h ++++ CPP/7zip/Bundles/SFXWin/StdAfx.h +@@ -6,7 +6,7 @@ + #include "../../../Common/Common.h" + + #include <commctrl.h> +-#include <ShlObj.h> ++#include <shlobj.h> + + // #define printf(x) NO_PRINTF_(x) + // #define sprintf(x) NO_SPRINTF_(x) +diff --git CPP/7zip/Crypto/RandGen.cpp CPP/7zip/Crypto/RandGen.cpp +index c123109a15b..c3709ccff6b 100755 +--- CPP/7zip/Crypto/RandGen.cpp ++++ CPP/7zip/Crypto/RandGen.cpp +@@ -19,7 +19,7 @@ + + #ifdef USE_STATIC_RtlGenRandom + +-// #include <NTSecAPI.h> ++// #include <ntsecapi.h> + + EXTERN_C_BEGIN + #ifndef RtlGenRandom +diff --git CPP/7zip/GuiCommon.rc CPP/7zip/GuiCommon.rc +index 565ee702ef9..13043ef4c53 100755 +--- CPP/7zip/GuiCommon.rc ++++ CPP/7zip/GuiCommon.rc +@@ -4,7 +4,7 @@ + // #include <WinUser.h> + + // for Windows CE: +-#include <CommCtrl.h> ++#include <commctrl.h> + + + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +diff --git CPP/7zip/MyVersionInfo.rc CPP/7zip/MyVersionInfo.rc +index eddf8935c84..90e65376be8 100755 +--- CPP/7zip/MyVersionInfo.rc ++++ CPP/7zip/MyVersionInfo.rc +@@ -1,2 +1,2 @@ + #include "MyVersion.h" +-#include "..\..\C\7zVersion.rc" ++#include "../../C/7zVersion.rc" +diff --git CPP/7zip/UI/Common/Update.cpp CPP/7zip/UI/Common/Update.cpp +index 5490ff445a0..003ee6634ea 100755 +--- CPP/7zip/UI/Common/Update.cpp ++++ CPP/7zip/UI/Common/Update.cpp +@@ -1163,7 +1163,7 @@ static HRESULT EnumerateInArchiveItems( + + #if defined(_WIN32) && !defined(UNDER_CE) + +-#include <MAPI.h> ++#include <mapi.h> + + #endif + +diff --git CPP/7zip/UI/Console/Main.cpp CPP/7zip/UI/Console/Main.cpp +index 363572cd3dd..765f55293a7 100755 +--- CPP/7zip/UI/Console/Main.cpp ++++ CPP/7zip/UI/Console/Main.cpp +@@ -5,7 +5,7 @@ + #include "../../../Common/MyWindows.h" + + #ifdef _WIN32 +-#include <Psapi.h> ++#include <psapi.h> + #else + #include <unistd.h> + #include <sys/ioctl.h> +diff --git CPP/7zip/UI/Explorer/ContextMenu.h CPP/7zip/UI/Explorer/ContextMenu.h +index e60ffccf11b..aea34e7de07 100755 +--- CPP/7zip/UI/Explorer/ContextMenu.h ++++ CPP/7zip/UI/Explorer/ContextMenu.h +@@ -5,7 +5,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "MyExplorerCommand.h" + +diff --git CPP/7zip/UI/Explorer/DllExportsExplorer.cpp CPP/7zip/UI/Explorer/DllExportsExplorer.cpp +index 84c92e2e2d3..df126d8d232 100755 +--- CPP/7zip/UI/Explorer/DllExportsExplorer.cpp ++++ CPP/7zip/UI/Explorer/DllExportsExplorer.cpp +@@ -11,7 +11,7 @@ + #include "../../../Common/MyWindows.h" + // #include "../../../Common/IntToString.h" + +-#include <OleCtl.h> ++#include <olectl.h> + + #include "../../../Common/MyInitGuid.h" + +diff --git CPP/7zip/UI/Explorer/MyExplorerCommand.h CPP/7zip/UI/Explorer/MyExplorerCommand.h +index b1997f0da6e..d1d038df11b 100755 +--- CPP/7zip/UI/Explorer/MyExplorerCommand.h ++++ CPP/7zip/UI/Explorer/MyExplorerCommand.h +@@ -17,7 +17,7 @@ + ShObjIdl.h : old Windows SDK + ShObjIdl_core.h : new Windows 10 SDK */ + +-#include <ShObjIdl.h> ++#include <shobjidl.h> + + #ifndef __IShellItem_INTERFACE_DEFINED__ + #define __IShellItem_INTERFACE_DEFINED__ +diff --git CPP/7zip/UI/Explorer/StdAfx.h CPP/7zip/UI/Explorer/StdAfx.h +index 35e8b337d68..16883ceda1b 100755 +--- CPP/7zip/UI/Explorer/StdAfx.h ++++ CPP/7zip/UI/Explorer/StdAfx.h +@@ -9,6 +9,6 @@ + + #include "../../../Common/Common.h" + +-#include <ShlObj.h> ++#include <shlobj.h> + + #endif +diff --git CPP/7zip/UI/FileManager/BrowseDialog.cpp CPP/7zip/UI/FileManager/BrowseDialog.cpp +index e43172385b6..286faeeb660 100755 +--- CPP/7zip/UI/FileManager/BrowseDialog.cpp ++++ CPP/7zip/UI/FileManager/BrowseDialog.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <CommCtrl.h> ++#include <commctrl.h> + + #ifndef UNDER_CE + #include "../../../Windows/CommonDialog.h" +diff --git CPP/7zip/UI/FileManager/FM.cpp CPP/7zip/UI/FileManager/FM.cpp +index b0b3715c9a5..14af8c32288 100755 +--- CPP/7zip/UI/FileManager/FM.cpp ++++ CPP/7zip/UI/FileManager/FM.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <Shlwapi.h> ++#include <shlwapi.h> + + #include "../../../../C/Alloc.h" + #ifdef _WIN32 +diff --git CPP/7zip/UI/FileManager/FSFolderCopy.cpp CPP/7zip/UI/FileManager/FSFolderCopy.cpp +index b0e1146816d..16208e58f6b 100755 +--- CPP/7zip/UI/FileManager/FSFolderCopy.cpp ++++ CPP/7zip/UI/FileManager/FSFolderCopy.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <WinBase.h> ++#include <winbase.h> + + #include "../../../Common/Defs.h" + #include "../../../Common/StringConvert.h" +diff --git CPP/7zip/UI/FileManager/HelpUtils.cpp CPP/7zip/UI/FileManager/HelpUtils.cpp +index 94253a70f5c..3f4479dbddd 100755 +--- CPP/7zip/UI/FileManager/HelpUtils.cpp ++++ CPP/7zip/UI/FileManager/HelpUtils.cpp +@@ -24,7 +24,7 @@ void ShowHelpWindow(LPCSTR) + #include "../../../Windows/FileName.h" + + #else +-#include <HtmlHelp.h> ++#include <htmlhelp.h> + #endif + + #include "../../../Common/StringConvert.h" +diff --git CPP/7zip/UI/FileManager/MyWindowsNew.h CPP/7zip/UI/FileManager/MyWindowsNew.h +index c0fe8439b98..ba7d608b90e 100755 +--- CPP/7zip/UI/FileManager/MyWindowsNew.h ++++ CPP/7zip/UI/FileManager/MyWindowsNew.h +@@ -5,7 +5,7 @@ + + #ifdef _MSC_VER + +-#include <ShObjIdl.h> ++#include <shobjidl.h> + + #ifndef __ITaskbarList3_INTERFACE_DEFINED__ + #define __ITaskbarList3_INTERFACE_DEFINED__ +diff --git CPP/7zip/UI/FileManager/Panel.cpp CPP/7zip/UI/FileManager/Panel.cpp +index f7162e502ac..2eaf9e1266b 100755 +--- CPP/7zip/UI/FileManager/Panel.cpp ++++ CPP/7zip/UI/FileManager/Panel.cpp +@@ -2,7 +2,7 @@ + + #include "StdAfx.h" + +-#include <WindowsX.h> ++#include <windowsx.h> + // #include <stdio.h> + + #include "../../../Common/IntToString.h" +diff --git CPP/7zip/UI/FileManager/Panel.h CPP/7zip/UI/FileManager/Panel.h +index 5a9fef01de2..1f2b86a8e43 100755 +--- CPP/7zip/UI/FileManager/Panel.h ++++ CPP/7zip/UI/FileManager/Panel.h +@@ -5,7 +5,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "../../../../C/Alloc.h" + +diff --git CPP/7zip/UI/FileManager/PanelItemOpen.cpp CPP/7zip/UI/FileManager/PanelItemOpen.cpp +index 6af42c96923..595acdbb563 100755 +--- CPP/7zip/UI/FileManager/PanelItemOpen.cpp ++++ CPP/7zip/UI/FileManager/PanelItemOpen.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <TlHelp32.h> ++#include <tlhelp32.h> + + #include "../../../Common/IntToString.h" + +diff --git CPP/7zip/UI/FileManager/RootFolder.cpp CPP/7zip/UI/FileManager/RootFolder.cpp +index 6984434026f..d50c1eb832e 100755 +--- CPP/7zip/UI/FileManager/RootFolder.cpp ++++ CPP/7zip/UI/FileManager/RootFolder.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "../../../Common/StringConvert.h" + +diff --git CPP/7zip/UI/FileManager/StdAfx.h CPP/7zip/UI/FileManager/StdAfx.h +index 74cfbc6deef..88960aa8c58 100755 +--- CPP/7zip/UI/FileManager/StdAfx.h ++++ CPP/7zip/UI/FileManager/StdAfx.h +@@ -14,8 +14,8 @@ + + // #include "../../../Common/MyWindows.h" + +-// #include <CommCtrl.h> +-// #include <ShlObj.h> +-// #include <Shlwapi.h> ++// #include <commctrl.h> ++// #include <shlobj.h> ++// #include <shlwapi.h> + + #endif +diff --git CPP/7zip/UI/FileManager/SysIconUtils.cpp CPP/7zip/UI/FileManager/SysIconUtils.cpp +index 43c613244a8..1cdf1d4c5b3 100755 +--- CPP/7zip/UI/FileManager/SysIconUtils.cpp ++++ CPP/7zip/UI/FileManager/SysIconUtils.cpp +@@ -10,7 +10,7 @@ + + #include "SysIconUtils.h" + +-#include <ShlObj.h> ++#include <shlobj.h> + + #define MY_CAST_FUNC (void(*)()) + // #define MY_CAST_FUNC +diff --git CPP/7zip/UI/FileManager/SysIconUtils.h CPP/7zip/UI/FileManager/SysIconUtils.h +index ba747d9ded0..2eedc4be403 100755 +--- CPP/7zip/UI/FileManager/SysIconUtils.h ++++ CPP/7zip/UI/FileManager/SysIconUtils.h +@@ -5,7 +5,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <CommCtrl.h> ++#include <commctrl.h> + + #include "../../../Common/MyString.h" + +diff --git CPP/7zip/UI/FileManager/SystemPage.cpp CPP/7zip/UI/FileManager/SystemPage.cpp +index ff68172e2bf..06025259c85 100755 +--- CPP/7zip/UI/FileManager/SystemPage.cpp ++++ CPP/7zip/UI/FileManager/SystemPage.cpp +@@ -4,7 +4,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "../../../Common/Defs.h" + #include "../../../Common/StringConvert.h" +diff --git CPP/7zip/UI/GUI/GUI.cpp CPP/7zip/UI/GUI/GUI.cpp +index 0cc2ee3afcc..4ffc2384668 100755 +--- CPP/7zip/UI/GUI/GUI.cpp ++++ CPP/7zip/UI/GUI/GUI.cpp +@@ -8,7 +8,7 @@ + + #include "../../../Common/MyWindows.h" + +-#include <Shlwapi.h> ++#include <shlwapi.h> + + #include "../../../Common/MyInitGuid.h" + +diff --git CPP/7zip/UI/GUI/StdAfx.h CPP/7zip/UI/GUI/StdAfx.h +index 498b2fcbe4b..3c830f6a3d4 100755 +--- CPP/7zip/UI/GUI/StdAfx.h ++++ CPP/7zip/UI/GUI/StdAfx.h +@@ -11,9 +11,9 @@ + + // #include "../../../Common/MyWindows.h" + +-// #include <CommCtrl.h> +-// #include <ShlObj.h> +-// #include <Shlwapi.h> ++// #include <commctrl.h> ++// #include <shlobj.h> ++// #include <shlwapi.h> + + // #define printf(x) NO_PRINTF_(x) + // #define sprintf(x) NO_SPRINTF_(x) +diff --git CPP/Common/MyInitGuid.h CPP/Common/MyInitGuid.h +index 6895097371a..6b2f3f35d5a 100755 +--- CPP/Common/MyInitGuid.h ++++ CPP/Common/MyInitGuid.h +@@ -29,7 +29,7 @@ Also we need IID_IUnknown that is initialized in some file for linking: + #include <basetyps.h> + #endif + +-#include <InitGuid.h> ++#include <initguid.h> + + #ifdef UNDER_CE + DEFINE_GUID(IID_IUnknown, +diff --git CPP/Common/MyWindows.h CPP/Common/MyWindows.h +index 69eed8f6446..f48680f9d05 100755 +--- CPP/Common/MyWindows.h ++++ CPP/Common/MyWindows.h +@@ -5,7 +5,7 @@ + + #ifdef _WIN32 + +-#include <Windows.h> ++#include <windows.h> + + #ifdef UNDER_CE + #undef VARIANT_TRUE +diff --git CPP/Windows/Control/ComboBox.h CPP/Windows/Control/ComboBox.h +index 8ab9ce5027d..8b12599b785 100755 +--- CPP/Windows/Control/ComboBox.h ++++ CPP/Windows/Control/ComboBox.h +@@ -5,7 +5,7 @@ + + #include "../../Common/MyWindows.h" + +-#include <CommCtrl.h> ++#include <commctrl.h> + + #include "../Window.h" + +diff --git CPP/Windows/Control/ImageList.h CPP/Windows/Control/ImageList.h +index e59443058b8..f72ea0d1990 100755 +--- CPP/Windows/Control/ImageList.h ++++ CPP/Windows/Control/ImageList.h +@@ -3,7 +3,7 @@ + #ifndef __WINDOWS_CONTROL_IMAGE_LIST_H + #define __WINDOWS_CONTROL_IMAGE_LIST_H + +-#include <CommCtrl.h> ++#include <commctrl.h> + + #include "../Defs.h" + +diff --git CPP/Windows/Control/ListView.h CPP/Windows/Control/ListView.h +index 56e1100c726..cbd9cd1e21d 100755 +--- CPP/Windows/Control/ListView.h ++++ CPP/Windows/Control/ListView.h +@@ -5,7 +5,7 @@ + + #include "../../Common/MyWindows.h" + +-#include <CommCtrl.h> ++#include <commctrl.h> + + #include "../Window.h" + +diff --git CPP/Windows/Control/ProgressBar.h CPP/Windows/Control/ProgressBar.h +index 741315dd4dd..f18d89c14f0 100755 +--- CPP/Windows/Control/ProgressBar.h ++++ CPP/Windows/Control/ProgressBar.h +@@ -5,7 +5,7 @@ + + #include "../../Common/MyWindows.h" + +-#include <CommCtrl.h> ++#include <commctrl.h> + + #include "../Window.h" + +diff --git CPP/Windows/Control/PropertyPage.h CPP/Windows/Control/PropertyPage.h +index 97c87b3b453..551c95994c2 100755 +--- CPP/Windows/Control/PropertyPage.h ++++ CPP/Windows/Control/PropertyPage.h +@@ -5,7 +5,7 @@ + + #include "../../Common/MyWindows.h" + +-#include <PrSht.h> ++#include <prsht.h> + + #include "Dialog.h" + +diff --git CPP/Windows/FileIO.h CPP/Windows/FileIO.h +index 9146491d236..e11022f82d4 100755 +--- CPP/Windows/FileIO.h ++++ CPP/Windows/FileIO.h +@@ -17,7 +17,7 @@ + #ifdef _WIN32 + + #if defined(_WIN32) && !defined(UNDER_CE) +-#include <WinIoCtl.h> ++#include <winioctl.h> + #endif + + #else +diff --git CPP/Windows/ProcessUtils.h CPP/Windows/ProcessUtils.h +index 64ebe3775e4..de46c6f52a5 100755 +--- CPP/Windows/ProcessUtils.h ++++ CPP/Windows/ProcessUtils.h +@@ -3,7 +3,7 @@ + #ifndef __WINDOWS_PROCESS_UTILS_H + #define __WINDOWS_PROCESS_UTILS_H + +-#include <Psapi.h> ++#include <psapi.h> + + #include "../Common/MyString.h" + +diff --git CPP/Windows/SecurityUtils.h CPP/Windows/SecurityUtils.h +index de62035ec86..18a083fc580 100755 +--- CPP/Windows/SecurityUtils.h ++++ CPP/Windows/SecurityUtils.h +@@ -3,7 +3,7 @@ + #ifndef __WINDOWS_SECURITY_UTILS_H + #define __WINDOWS_SECURITY_UTILS_H + +-#include <NTSecAPI.h> ++#include <ntsecapi.h> + + #include "Defs.h" + +diff --git CPP/Windows/Shell.h CPP/Windows/Shell.h +index 30388bc5a70..dc3daa5e60b 100755 +--- CPP/Windows/Shell.h ++++ CPP/Windows/Shell.h +@@ -4,7 +4,7 @@ + #define __WINDOWS_SHELL_H + + #include "../Common/MyWindows.h" +-#include <ShlObj.h> ++#include <shlobj.h> + + #include "../Common/MyString.h" + diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index 561567f8b1549..2ade0f88a8d0d 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper catch2 ]; - buildInputs = [ boost libpng libjpeg zlib openssl libwebp ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ boost libiconv libjpeg libpng libwebp openssl zlib ]; postPatch = '' cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h + sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12 ''; checkPhase = '' diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/tools/archivers/bomutils/default.nix index 90a97af03678e..1b147d10ec284 100644 --- a/pkgs/tools/archivers/bomutils/default.nix +++ b/pkgs/tools/archivers/bomutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # fix # src/lsbom.cpp:70:10: error: reference to 'data' is ambiguous # which refers to std::data from C++17 - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = with lib; { homepage = "https://github.com/hogliux/bomutils"; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index b38a9aa185a08..43be673ca2c91 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 6b4a77fdb0581..a1c22835752b8 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -1,24 +1,26 @@ { lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: let - version = "6.12"; + version = "6.21"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; + # Use `nix store prefetch-file <url>` to generate the hashes for the other systems + # TODO: create update script srcUrl = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-Vh8Hyd3Y2tDapXY+xZ+6W+X7SQGDsy1x61L28sieYKw="; + hash = "sha256-mDeRmLTjF0ZLv4JoLrgI8YBFFulBSKfOPb6hrxDZIkU="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-ZaGn5OzqVzDojJn8bTrbRh1wvYXM7SK91jl96mbNAeA="; + hash = "sha256-3fr5aVkh/r6OfBEcZULJSZp5ydakJOLRPlgzMdlwGTM="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-SR80VxKgLrJqO0JGWMMGUuIuIgGgxcVH+5fCWnVqJks="; + hash = "sha256-OR9HBlRteTzuyQ06tyXTSrFTBHFwmZ41kUfvgflogT4="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-9gfKEr3DE4hMWm9QT79mKgURvzn+BKmyppTJhs00u2c="; + hash = "sha256-UN3gmEuIpCXwmw3/l+KdarAYLy1DxGoPAOB2bfJTGbw="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); manSrc = fetchurl { diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 226300952222e..74f1bcfe9b8b1 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.2.3"; + version = "6.2.5"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - hash = "sha256-Egk25B+CbNY9d6WArupkwbef0+JDT1jOgYTng7UeWwE="; + hash = "sha256-mjl0QQ0dNA45mN0qb5j6776DjK1VYmbnFK37Doz5N3w="; }; postPatch = '' diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index e7f22ad0ff965..f61bc9df66d58 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -51,6 +51,15 @@ stdenv.mkDerivation rec { ]; sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj"; }) + (fetchurl { + urls = [ + # original link (will be dead eventually): + "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" + + "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" + ]; + sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc="; + }) ] ++ lib.optional enableNLS (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 8862ad8030bff..3a3223728a7ae 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,14 +2,14 @@ coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.19"; + version = "0.5.4.20"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "sha256-YCfjOGbjjv4ntNDK3E49hYCVYDhMsRBJ7zsHt8hqQ7Y="; + sha256 = "sha256-OzcfIFYaWez2B1lmAYvhm+knuYbyMu2ohs+kGEVG7K0="; }; nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index ab91cfc648348..82329537251e8 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "INSTALL=cp" ]; - patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; + patches = lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; buildInputs = lib.optional enableNLS libnatspec ++ lib.optional stdenv.isCygwin libiconv; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index fce137cf3b461..a83c1c81c416d 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.01.08"; + version = "2023.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-PUaGjZFMYwG9BduIgmzhi5DTkGfSN9VtAUkqrAZ2xbo="; + hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g="; }; meta = with lib; { diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 73c71ee6f1a15..2c9143d51f895 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libopus libvorbis libogg libpulseaudio alsa-lib libsamplerate libjack2 lame ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; configureFlags = [ "--with-faac-prefix=${faac}" diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix index dd3f04021327f..69a0f570d3bc0 100644 --- a/pkgs/tools/audio/fmtoy/default.nix +++ b/pkgs/tools/audio/fmtoy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fmtoy"; - version = "unstable-2021-12-24"; + version = "unstable-2022-12-23"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "0de6703b3373eb5bf19fd3deaae889286f330c21"; - sha256 = "0sr6klkmjd2hd2kyb9y0x986d6lsy8bziizfc6cmhkqcq92fh45c"; + rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; + sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; }; postPatch = '' @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vampirefrog/fmtoy"; description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unknown license situation + # Unclear if gpl3Only or gpl3Plus # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.unfree; + license = licenses.gpl3; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index fb9ef49c548e0..e15a048b991ce 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; meta = { description = "A simple and lightweight volume icon that sits in your system tray"; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 411aaece5329f..5f61a9660f2a2 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -23,70 +23,75 @@ stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath runtimePackages} ''; - nativeBuildInputs = [ makeWrapper pkg-config ]; + + strictDeps = true; + + nativeBuildInputs = + [ makeWrapper pkg-config which + ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir + ]; + buildInputs = [ - libjpeg - which - ocamlPackages.ocaml ocamlPackages.findlib + libjpeg - # Mandatory dependencies - ocamlPackages.dtools - ocamlPackages.duppy - ocamlPackages.mm - ocamlPackages.ocaml_pcre - ocamlPackages.menhir ocamlPackages.menhirLib - ocamlPackages.camomile - ocamlPackages.ocurl - ocamlPackages.uri - ocamlPackages.sedlex + # Mandatory dependencies + ocamlPackages.dtools + ocamlPackages.duppy + ocamlPackages.mm + ocamlPackages.ocaml_pcre + ocamlPackages.menhir ocamlPackages.menhirLib + ocamlPackages.camomile + ocamlPackages.ocurl + ocamlPackages.uri + ocamlPackages.sedlex - # Recommended dependencies - ocamlPackages.ffmpeg + # Recommended dependencies + ocamlPackages.ffmpeg - # Optional dependencies - ocamlPackages.camlimages - ocamlPackages.gd4o - ocamlPackages.alsa - ocamlPackages.ao - ocamlPackages.bjack - ocamlPackages.cry - ocamlPackages.dssi - ocamlPackages.faad - ocamlPackages.fdkaac - ocamlPackages.flac - ocamlPackages.frei0r - ocamlPackages.gstreamer - ocamlPackages.inotify - ocamlPackages.ladspa - ocamlPackages.lame - ocamlPackages.lastfm - ocamlPackages.lilv - ocamlPackages.lo - ocamlPackages.mad - ocamlPackages.magic - ocamlPackages.ogg - ocamlPackages.opus - ocamlPackages.portaudio - ocamlPackages.pulseaudio - ocamlPackages.shine - ocamlPackages.samplerate - ocamlPackages.soundtouch - ocamlPackages.speex - ocamlPackages.srt - ocamlPackages.ssl - ocamlPackages.taglib - ocamlPackages.theora - ocamlPackages.vorbis - ocamlPackages.xmlplaylist - ocamlPackages.posix-time2 - ocamlPackages.tsdl - ocamlPackages.tsdl-image - ocamlPackages.tsdl-ttf + # Optional dependencies + ocamlPackages.camlimages + ocamlPackages.gd4o + ocamlPackages.alsa + ocamlPackages.ao + ocamlPackages.bjack + ocamlPackages.cry + ocamlPackages.dssi + ocamlPackages.faad + ocamlPackages.fdkaac + ocamlPackages.flac + ocamlPackages.frei0r + ocamlPackages.gstreamer + ocamlPackages.inotify + ocamlPackages.ladspa + ocamlPackages.lame + ocamlPackages.lastfm + ocamlPackages.lilv + ocamlPackages.lo + ocamlPackages.mad + ocamlPackages.magic + ocamlPackages.ogg + ocamlPackages.opus + ocamlPackages.portaudio + ocamlPackages.pulseaudio + ocamlPackages.shine + ocamlPackages.samplerate + ocamlPackages.soundtouch + ocamlPackages.speex + ocamlPackages.srt + ocamlPackages.ssl + ocamlPackages.taglib + ocamlPackages.theora + ocamlPackages.vorbis + ocamlPackages.xmlplaylist + ocamlPackages.posix-time2 + ocamlPackages.tsdl + ocamlPackages.tsdl-image + ocamlPackages.tsdl-ttf - # Undocumented dependencies - ocamlPackages.graphics - ocamlPackages.cohttp-lwt-unix - ]; + # Undocumented dependencies + ocamlPackages.graphics + ocamlPackages.cohttp-lwt-unix + ]; meta = with lib; { description = "Swiss-army knife for multimedia streaming"; diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 9318b22aaf8c5..53261bc6b56f6 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.5.3"; + version = "1.5.4b"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Iw4n3xcc+589/42SfnAklEWTkgwZKAk84dS8fXXLcvs="; + sha256 = "sha256-SMAllqxfae8bNLBkxsY4OmjoIzxFZ0dwIRYconlNZ18="; }; - cargoSha256 = "sha256-Ss6UUznt9g3XWdeCuMG0y9NxWpGOmHbKsQqOMGOK2jo="; + cargoSha256 = "sha256-vqKKv8eNXkDqcgjlybisSmNBijpvHEKsFAENYjD8zQI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index 35685fd5fb2f5..ba80aa6ad0e36 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -53,7 +53,10 @@ stdenv.mkDerivation rec { "-Dversion=${version}" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString ([ + # Needed with GCC 12 + "-Wno-error=address" + ] ++ lib.optionals stdenv.isDarwin [ "-Wno-sometimes-uninitialized" "-Wno-tautological-pointer-compare" ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/tools/audio/nanotts/default.nix b/pkgs/tools/audio/nanotts/default.nix index 85f786d208103..a68f1593b6467 100644 --- a/pkgs/tools/audio/nanotts/default.nix +++ b/pkgs/tools/audio/nanotts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt, alsa-lib }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt, alsa-lib, alsa-plugins, makeWrapper }: stdenv.mkDerivation { pname = "nano-tts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; strictDeps = true; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool makeWrapper ]; buildInputs = [ popt alsa-lib ]; patchPhase = '' @@ -23,6 +23,8 @@ stdenv.mkDerivation { installPhase = '' install -Dm755 -t $out/bin nanotts install -Dm644 -t $out/share/lang $src/lang/* + wrapProgram $out/bin/nanotts \ + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib ''; meta = { diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index b59016e2c9f18..2398b5483ea6f 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.0.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = version; - sha256 = "sha256-lw+POI47bW66NlmMPJKAkqAYhOnyGaFqcS2cX5LRBbk="; + rev = "refs/tags/v${version}" ; + hash = "sha256-7/10t1yE7Gbs+cyj8I9vJoDeaxEz9Azc2j3f6QCjDGM="; }; # The upstream download script tries to download the models to the @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/ggerganov/whisper.cpp"; license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ dit7ya ]; }; } diff --git a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index 419ddced72b94..11498e6c75eed 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch @@ -1,5 +1,5 @@ diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh -index cf54623..5e9c905 100755 +index 7075080..5e9c905 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh @@ -9,18 +9,6 @@ @@ -16,7 +16,7 @@ index cf54623..5e9c905 100755 - fi -} - --models_path=$(get_script_path) +-models_path="$(get_script_path)" - # Whisper models models=( "tiny.en" "tiny" "base.en" "base" "small.en" "small" "medium.en" "medium" "large-v1" "large" ) diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 3d881717e792e..0a82f37e04d32 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; # work around a problem related to gtk3 updates - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; postInstall = ""; diff --git a/pkgs/tools/audio/pw-volume/default.nix b/pkgs/tools/audio/pw-volume/default.nix new file mode 100644 index 0000000000000..ddd9f4aa1a2a2 --- /dev/null +++ b/pkgs/tools/audio/pw-volume/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, fetchurl +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "pw-volume"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "smasher164"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-u7Ct9Kfwld/h3b6hUZdfHNuDGE4NA3MwrmgUj4g64lw="; + }; + + cargoPatches = [ + (fetchurl { + # update Cargo.lock + url = "https://github.com/smasher164/pw-volume/commit/be104eaaeb84def26b392cc44bb1e7b880bef0fc.patch"; + sha256 = "sha256-gssRcKpqxSAvW+2kJzIAR/soIQ3xg6LDZ7OeXds4ulY="; + }) + ]; + + cargoSha256 = "sha256-Vzd5ZbbzJh2QqiOrBOszsNqLwxM+mm2lbGd5JtKZzEM="; + + meta = with lib; { + description = "Basic interface to PipeWire volume controls"; + homepage = "https://github.com/smasher164/pw-volume"; + license = licenses.mit; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/soco-cli/default.nix b/pkgs/tools/audio/soco-cli/default.nix index 72e5323f60f3b..068f916e4ef01 100644 --- a/pkgs/tools/audio/soco-cli/default.nix +++ b/pkgs/tools/audio/soco-cli/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "soco-cli"; - version = "0.4.21"; + version = "0.4.55"; format = "setuptools"; disabled = python3.pythonOlder "3.6"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "avantrec"; repo = pname; rev = "v${version}"; - sha256 = "1kz2zx59gjfs01jiyzmps8j6yca06yqn6wkidvdk4s3izdm0rarw"; + sha256 = "sha256-zdu1eVtVBTYa47KjGc5fqKN6olxp98RoLGT2sNCfG9E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index c76dd693ad8d7..e8ceaee81925a 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.0.6"; + version = "4.0.7"; format = "pyproject"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-oZyEh76nNKMeEenz0dNLQ5Hd9jRaot6He8toxDSZZ/8="; + hash = "sha256-+hkdrPi3INs16SeAl+iXOE9KFDzG/TYXB3CDd8Tigwk="; }; nativeBuildInputs = with python3.pkgs; [ @@ -39,6 +39,8 @@ python3.pkgs.buildPythonApplication rec { pydantic fastapi platformdirs + pykakasi + syncedlyrics ]; nativeCheckInputs = with python3.pkgs; [ @@ -87,6 +89,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Download your Spotify playlists and songs along with album art and metadata"; homepage = "https://github.com/spotDL/spotify-downloader"; + changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 0a084498a96d7..8096fc22a2c5b 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,19 +1,10 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , espeak-ng }: -# USAGE: -# $ tts-server --list_models -# # pick your favorite vocoder/tts model -# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan -# -# If you upgrade from an old version you may have to delete old models from ~/.local/share/tts -# -# For now, for deployment check the systemd unit in the pull request: -# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 - let python = python3.override { packageOverrides = self: super: { @@ -24,7 +15,7 @@ let src = super.fetchPypi { pname = "librosa"; inherit version; - sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3"; + hash = "sha256-xT0F52iuSj5VOuIcLlAVKT5e+/1cEtSX8RBMtRnMprM="; }; }); }; @@ -32,14 +23,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.9.0"; + version = "0.11.1"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; - rev = "v${version}"; - sha256 = "sha256-p4I583Rs/4eig7cnOcJjri2ugOLAeF2nvPIvMZrN1Ss="; + rev = "refs/tags/v${version}"; + hash = "sha256-EVFFETiGbrouUsrIhMFZEex3UGCCWTI3CC4yFAcERyw="; }; postPatch = let @@ -51,7 +42,6 @@ python.pkgs.buildPythonApplication rec { "mecab-python3" "numba" "numpy" - "umap-learn" "unidic-lite" ]; in '' @@ -60,10 +50,13 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt + # only used for notebooks and visualization + sed -r -i -e '/umap-learn/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ cython + packaging ]; propagatedBuildInputs = with python.pkgs; [ @@ -82,6 +75,7 @@ python.pkgs.buildPythonApplication rec { mecab-python3 nltk numba + packaging pandas pypinyin pysbd @@ -92,7 +86,6 @@ python.pkgs.buildPythonApplication rec { torchaudio-bin tqdm trainer - umap-learn unidic-lite webrtcvad ]; @@ -102,7 +95,7 @@ python.pkgs.buildPythonApplication rec { # cython modules are not installed for some reasons ( cd TTS/tts/utils/monotonic_align - ${python.interpreter} setup.py install --prefix=$out + ${python.pythonForBuild.interpreter} setup.py install --prefix=$out ) ''; @@ -133,7 +126,10 @@ python.pkgs.buildPythonApplication rec { "test_models_offset_2_step_3" "test_run_all_models" "test_synthesize" + "test_voice_cloning" "test_voice_conversion" + "test_multi_speaker_multi_lingual_model" + "test_single_speaker_model" # Mismatch between phonemes "test_text_to_ids_phonemes_with_eos_bos_and_blank" # Takes too long @@ -148,9 +144,13 @@ python.pkgs.buildPythonApplication rec { "tests/tts_tests/test_align_tts_train.py" "tests/tts_tests/test_fast_pitch_speaker_emb_train.py" "tests/tts_tests/test_fast_pitch_train.py" + "tests/tts_tests/test_fastspeech_2_speaker_emb_train.py" + "tests/tts_tests/test_fastspeech_2_train.py" "tests/tts_tests/test_glow_tts_d-vectors_train.py" "tests/tts_tests/test_glow_tts_speaker_emb_train.py" "tests/tts_tests/test_glow_tts_train.py" + "tests/tts_tests/test_neuralhmm_tts_train.py" + "tests/tts_tests/test_overflow_train.py" "tests/tts_tests/test_speedy_speech_train.py" "tests/tts_tests/test_tacotron2_d-vectors_train.py" "tests/tts_tests/test_tacotron2_speaker_emb_train.py" diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index 9571e1160666b..e0a14a82124cb 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2022-12-30"; + version = "unstable-2023-01-27"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "6c2c21dfc871f8cb9c33a77fe7db01419b6ad97d"; - sha256 = "qe8cHGf8X7JjjoiRQ/S3q/WhyvgrMEwsCo7QoQkmg5w="; + rev = "fc55484b5902191e5467e6044bb90c1c74a0c938"; + sha256 = "Ho0yYoe1TIlVxMauz/harP1xSw42wdcklj/O6fA+VEk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 60af9b430a94b..9de97fe52f486 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , substituteAll , pkgsi686Linux +, fetchpatch , dbus , meson , ninja @@ -103,6 +104,14 @@ in multiStdenv.mkDerivation rec { # Patch the chainloader to search for libyabridge through NIX_PROFILES ./libyabridge-from-nix-profiles.patch + + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-8.0.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch"; + sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU="; + includes = [ "meson.build" ]; + }) ]; postPatch = '' diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index dc77b5de403ff..dcc4caaa63625 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.7.2"; + version = "1.7.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU="; + sha256 = "sha256-TNh0laNAyHkIZLC51hzchSIDvsHst2aPxoRdI6Mdr84="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 00fee9414765e..f1033d275aab8 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: listindex.o:/build/btar-1.1.1/loadindex.h:12: multiple definition of # `ptr'; main.o:/build/btar-1.1.1/loadindex.h:12: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildInputs = [ librsync ]; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index ab5ae59977de4..03d4f70711bef 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -28,10 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://bupstash.io"; license = licenses.mit; platforms = platforms.unix; - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ andrewchambers ]; }; } diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index f17a805531c70..bb312656ed061 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -18,6 +18,7 @@ args @ { lzo, xz, zlib, + zstd, CoreFoundation, }: @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { lzo xz zlib + zstd ] ++ lib.optionals stdenv.isLinux [ attr e2fsprogs diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index b5a694482cb82..dfde510441c0d 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.22"; + version = "0.3.23"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-NSIWuzgv3dQ2Kpl1HOoghrOaKztDjZs8NjF9k41kZQY="; + sha256 = "sha256-na9k26+GDdASZ37n0QtFuRDMtq338QOlXTf0X4raOJI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index d5a2863d968d8..7a82105661292 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource disk backup software"; - homepage = "http://www.partimage.org"; + homepage = "https://www.partimage.org"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index e6bdca7c92d85..d8ab7956ade77 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.43"; + version = "2.44"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-JZHE68d8fzqr0kI35TxoVB3Frt/v22xkZexfzhkqzBU="; + sha256 = "sha256-N56HUW1JZNvaqzU01xaZ8BsFA2KW4z8ixulPngYCIY0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 44683fa3884c3..71756025196cb 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-qWVmsW16eQM7d+HoHR2qE7GpcC5HK7TIhhx6J2glKpA="; + hash = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-zhLFMvp97mQclaLwH4Hl8jFNMmoYrf8AtVv49RDq7lM="; + vendorHash = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms="; subPackages = [ "cmd/restic" ]; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 53836da125089..8738f5dc4e247 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; preBuild = '' - ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace + ${python3Packages.python.pythonForBuild.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index ef94eee2429fa..03bd62924048d 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -159,16 +159,6 @@ let ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" done ''; - - # since 7b9fd5d1c9802131ca0a01ff08a3ff64379d2df4 - # autopatchelf misses to add $out/lib to rpath; - # we have to call autopatchelf manually as it would - # run too late and overwrite our rpath otherwise - dontAutoPatchelf = true; - postFixup = '' - autoPatchelf $out - patchelf --add-rpath $out/lib $out/lib/* - ''; }; binPath = lib.makeBinPath ([ acl gnugrep procps ] diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index 9b618ccec5051..24b4684745ce1 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # zbackup uses dynamic exception specifications which are not # allowed in C++17 - NIX_CFLAGS_COMPILE = [ "--std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "--std=c++14" ]; buildInputs = [ zlib openssl protobuf lzo libunwind ]; nativeBuildInputs = [ cmake protobufc ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 0fa67bbd9320c..d3aa726afbb97 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # Needed on gcc >= 6. - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 6f9c7a656d1b7..efa6638099492 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcap zlib bzip2 perl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isMusl "-D__THROW="; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D__THROW="; # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 2d764d2f7da0d..159be4e14b619 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY="; }; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-std=c++11" ]); + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libtiff ]; propagatedBuildInputs = [ tesseract ]; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index dfac5af0980be..3d15cbd395c40 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,18 +4,19 @@ , cmake , fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic +, testers }: # ?TODO: there's also python lib in there -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brotli"; version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { cp ../docs/*.3 $out/share/man/man3/ ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; @@ -72,6 +75,10 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + pkgConfigModules = [ + "libbrotlidec" + "libbrotlienc" + ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix index ca5670a2e512a..e9d6f7c44dab2 100644 --- a/pkgs/tools/compression/bzip2/1_1.nix +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -3,9 +3,10 @@ , meson , python3 , ninja +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bzip2-unstable"; version = "2020-08-11"; @@ -34,10 +35,13 @@ stdenv.mkDerivation rec { strictDeps = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "High-quality data compression program"; license = licenses.bsdOriginal; + pkgConfigModules = [ "bz2" ]; platforms = platforms.all; maintainers = []; }; -} +}) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 3b48195d11d69..be456cf594427 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl , linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin , autoreconfHook +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -8,7 +9,9 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) version; +in { pname = "bzip2"; version = "1.0.8"; @@ -53,12 +56,15 @@ stdenv.mkDerivation rec { ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0 ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "High-quality data compression program"; homepage = "https://www.sourceware.org/bzip2"; changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD"; license = licenses.bsdOriginal; + pkgConfigModules = [ "bzip2" ]; platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; -} +}) diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 55ef5309d57da..37a4519c9454a 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -3,9 +3,10 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; version = "1.2.2"; @@ -14,12 +15,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kspalaiologos"; repo = "bzip3"; - rev = version; + rev = finalAttrs.version; hash = "sha256-B59Z7+5SFjt/UgppNtdUtzw96y+EVglHoKzq9Il9ud8="; }; postPatch = '' - echo -n "${version}" > .tarball-version + echo -n "${finalAttrs.version}" > .tarball-version patchShebangs build-aux # build-aux/ax_subst_man_date.m4 calls git if the file exists @@ -35,12 +36,15 @@ stdenv.mkDerivation rec { "--disable-arch-native" ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "A better and stronger spiritual successor to BZip2"; homepage = "https://github.com/kspalaiologos/bzip3"; - changelog = "https://github.com/kspalaiologos/bzip3/blob/${src.rev}/NEWS"; + changelog = "https://github.com/kspalaiologos/bzip3/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; + pkgConfigModules = [ "bzip3" ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/tools/compression/crabz/default.nix index c4d9e06e4c8a9..b68d3af1a8442 100644 --- a/pkgs/tools/compression/crabz/default.nix +++ b/pkgs/tools/compression/crabz/default.nix @@ -2,42 +2,23 @@ , rustPlatform , fetchFromGitHub , cmake -, stdenv -, libiconv -, CoreFoundation -, Security }: rustPlatform.buildRustPackage rec { pname = "crabz"; - version = "0.7.10"; + version = "0.8.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A1mjnGnFKgCdwr2J0MBUzpL/UI9nOHDxbrZ9UazqZik="; + sha256 = "sha256-w/e0NFmBsYNEECT+2zHEm/UUpp5LxPYr0BdKikT2o1M="; }; - cargoSha256 = "sha256-YxO0YPY82Q6dXOBs2ZoSAv14p67kNsmhGOiwt+voD5I="; + cargoSha256 = "sha256-9VOJeRvyudZSCaUZ1J9gHMEoWXEnEhCZPxvfYGRKzj0="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - CoreFoundation - Security - ]; - - # link System as a dylib instead of a framework on macos - postPatch = lib.optionalString stdenv.isDarwin '' - core_affinity=../$(stripHash $cargoDeps)/core_affinity - oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - substituteInPlace $core_affinity/src/lib.rs --replace framework dylib - substituteInPlace $core_affinity/.cargo-checksum.json \ - --replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - ''; - meta = with lib; { description = "A cross platform, fast, compression and decompression tool"; homepage = "https://github.com/sstadick/crabz"; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 771188a98cd9f..24f81d99da3c9 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl +, makeWrapper , xz -, writeText }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ xz.bin ]; + nativeBuildInputs = [ xz.bin makeWrapper ]; makeFlags = [ "SHELL=/bin/sh" @@ -40,12 +40,13 @@ stdenv.mkDerivation rec { preFixup = '' sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH" }' $out/bin/* - ''; - - # set GZIP env variable to "-n" to stop gzip from adding timestamps + '' + # run gzip with "-n" when $GZIP_NO_TIMESTAMPS (set by stdenv's setup.sh) is set to stop gzip from adding timestamps # to archive headers: https://github.com/NixOS/nixpkgs/issues/86348 - setupHook = writeText "setup-hook" '' - export GZIP="-n" + # if changing so that there's no longer a .gzip-wrapped then update copy in make-bootstrap-tools.nix + + '' + wrapProgram $out/bin/gzip \ + --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}" ''; meta = { diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 7fa7b4e35c858..b41b3c843da6e 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { version = "1.23"; outputs = [ "out" "man" "info" ]; - nativeBuildInputs = [ texinfo ]; - src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 6d27b84e8c4c7..81144fb14b193 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with lib; { homepage = "http://compression.ca/pbzip2/"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c556f31e6918a..d176b32d60cfd 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,39 +1,17 @@ -{ lib, stdenv, fetchurl, ucl, zlib, perl, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "upx"; - version = "3.96"; - src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz"; - sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7"; + version = "4.0.2"; + src = fetchFromGitHub { + owner = "upx"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-5jqEdMlHmsD88kT/EGieL7DktppVdfWyJWGRNRKbRc4="; }; - buildInputs = [ ucl zlib perl ]; - - patches = [ - (fetchpatch { - url = "https://github.com/upx/upx/commit/13bc031163863cb3866aa6cdc018dff0697aa5d4.patch"; - sha256 = "sha256-7uazgx1lOgHh2J7yn3yb1q9lTJsv4BbexdGlWRiAG/M="; - name = "CVE-2021-20285.patch"; - }) - ]; - - preConfigure = '' - export UPX_UCLDIR=${ucl} - ''; - - makeFlags = [ - "-C" "src" - "CHECK_WHITESPACE=true" - - # Disable blanket -Werror. Triggers failues on minor gcc-11 warnings. - "CXXFLAGS_WERROR=" - ]; - - installPhase = '' - mkdir -p $out/bin - cp src/upx.out $out/bin/upx - ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { homepage = "https://upx.github.io/"; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 59f1901bd9fd0..d49cc314b4a81 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "eV6gSUxm1QmwUt3DbcY71jTln/Kg85wWo7VkTdAdh+Y="; + sha256 = "3Rcqy1OGemgBL5TBc4lAGy8nShqlro+Ey/uLfjg+qNM="; }; strictDeps = true; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 6a489779cb02f..ca04ead396b72 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -8,17 +8,26 @@ , buildContrib ? stdenv.hostPlatform == stdenv.buildPlatform , doCheck ? stdenv.hostPlatform == stdenv.buildPlatform , nix-update-script + +# for passthru.tests +, libarchive +, rocksdb +, arrow-cpp +, libzip +, curl +, python3Packages +, haskellPackages }: stdenv.mkDerivation rec { pname = "zstd"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "sha256-yJvhcysxcbUGuDOqe/TQ3Y5xyM2AUw6r1THSHOqmUy0="; + sha256 = "sha256-2blY4hY4eEcxY8K9bIhYPbfb//rt/+J2TmvxABPG78A="; }; nativeBuildInputs = [ cmake ] @@ -91,6 +100,14 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests = { + inherit libarchive rocksdb arrow-cpp; + libzip = libzip.override { withZstd = true; }; + curl = curl.override { zstdSupport = true; }; + python-zstd = python3Packages.zstd; + haskell-zstd = haskellPackages.zstd; + haskell-hs-zstd = haskellPackages.hs-zstd; + }; }; meta = with lib; { diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index d9c609d7c0a9e..5ca592aa45650 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { # gcc-10. Otherwise build fails as: # ld: lib/auth_rpc.o:/build/source/lib/../9pfs.h:35: multiple definition of # `logfile'; 9pfs.o:/build/source/9pfs.h:35: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index b56bfba62cd4f..02dd1a7aafe05 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # avoid build failures like: # ld: afpcmd-cmdline_main.o:/build/source/cmdline/cmdline_afp.h:4: multiple definition of # `full_url'; afpcmd-cmdline_afp.o:/build/source/cmdline/cmdline_afp.c:27: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildInputs = [ fuse readline libgcrypt gmp ]; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index b5d08770ed786..4abea4a242361 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "apfs-fuse-unstable"; - version = "2020-09-28"; + version = "2023-01-04"; src = fetchFromGitHub { owner = "sgan81"; repo = "apfs-fuse"; - rev = "ee71aa5c87c0831c1ae17048951fe9cd7579c3db"; - sha256 = "0wvsx708km1lnhghny5y69k694x0zy8vlbndswkb7sq81j1r6kwx"; + rev = "1f041d7af5df5423832e54e9f358fd9234773fcc"; + hash = "sha256-EmhCvIwyVJvib/ZHzCsULh8bOjhzKRu47LojX+L40qQ="; fetchSubmodules = true; }; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index eb54f08a3a268..f96ee77d93391 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2022-12-29"; + version = "unstable-2023-01-31"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "42cf74fd1d0ef58927967e6236988e86cfc0d086"; - sha256 = "sha256-N/1heStwmB7CzE/ddTud/ywnMdhq8ZkLju+x0UL0yjY="; + rev = "3c39b422acd3346321185be0ce263809e2a9a23f"; + hash = "sha256-2ci/m4JfodLiPoWfP+QCEqlk0k48zq3mKb8Pdrtln0o="; }; postPatch = '' diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index a620a07d4753e..a74d182fb3563 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -24,7 +24,11 @@ in stdenv.mkDerivation rec { pname = "blobfuse"; inherit version src; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + "-Wno-error=catch-value" + ]; buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index a24481bbae9ec..8c04f5d23387e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-a+Zn2X89ZcC6V8MxyYsL07E89g2NMfqK0liCqtnXnXo="; + sha256 = "sha256-03/J7E+ld4sgqnVI/nBus6MAM4wUczGCca5UAk2scWc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index 05a2ac8d306f6..300cfa88181db 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.7.2"; + version = "3.8.0"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-8RbuM+lXkwO5Z1H+SKDGHyNNYYC8VVG9feX46SHC/Q0="; + sha256 = "sha256-WN0oASficXdy0Q1BLm37ndGhjcIk1lm38owdk1K/ryY="; }; preConfigure = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index d9ec176220baf..a42d7cce67d42 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, runCommand, fetchurl +{ lib, stdenv, runCommand, fetchurl, fetchpatch , ensureNewerSourcesHook , cmake, pkg-config , which, git -, boost175 +, boost175, xz , libxml2, zlib, lz4 , openldap, lttng-ust , babeltrace, gperf @@ -152,6 +152,21 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch + # pacific: include/buffer: include <memory> + # fixes build with gcc 12 + # https://github.com/ceph/ceph/pull/47295 + (fetchpatch { + url = "https://github.com/ceph/ceph/pull/47295/commits/df88789a38c053513d3b2a9b7d12a952fc0c9042.patch"; + hash = "sha256-je65kBfa5hR0ZKo6ZI10XmD5ZUbKj5rxlGxxI9ZJVfo="; + }) + (fetchpatch { + url = "https://github.com/ceph/ceph/pull/47295/commits/2abcbe4e47705e6e0fcc7d9d9b75625f563199af.patch"; + hash = "sha256-8sWQKoZNHuGuhzX/F+3fY4+kjsrwsfoMdVpfVSj2x5w="; + }) + (fetchpatch { + url = "https://github.com/ceph/ceph/pull/47295/commits/13dc077cf6c65a3b8c4f13d896847b9964b3fcbb.patch"; + hash = "sha256-byfiZh9OJrux/y5m3QCPg0LET6q33ZDXmp/CN+yOSQQ="; + }) ]; nativeBuildInputs = [ @@ -167,7 +182,7 @@ in rec { ]; buildInputs = cryptoLibsMap.${cryptoStr} ++ [ - boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 + boost xz ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka cryptsetup sqlite lua icu bzip2 diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 8c8fe31624fe7..f1e08f0362d25 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; - homepage = "http://curlftpfs.sourceforge.net"; + homepage = "https://curlftpfs.sourceforge.net"; license = licenses.gpl2Only; platforms = platforms.unix; }; diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch index 0e31725936fa5..0f8741ca28f3f 100644 --- a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch +++ b/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch @@ -1,42 +1,26 @@ -From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Wed, 11 Nov 2020 11:58:25 +0100 -Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked - ---- - src/dav_fuse.c | 2 +- - src/umount_davfs.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - diff --git a/src/dav_fuse.c b/src/dav_fuse.c -index 734bc1f..4501433 100644 +index 6311428..1b1698d 100644 --- a/src/dav_fuse.c +++ b/src/dav_fuse.c -@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, - unmounting = 1; +@@ -189,7 +189,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, pid_t pid = fork(); if (pid == 0) { + #if defined(__linux__) - execl("/bin/umount", "umount", "-il", mountpoint, NULL); + execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL); - _exit(EXIT_FAILURE); - } - } + #elif defined(__FreeBSD__) + execl("/sbin/umount", "umount", "-v", mountpoint, NULL); + #endif diff --git a/src/umount_davfs.c b/src/umount_davfs.c -index b7019c3..75e3b4b 100644 +index 6a82fd2..93958be 100644 --- a/src/umount_davfs.c +++ b/src/umount_davfs.c -@@ -122,9 +122,9 @@ main(int argc, char *argv[]) +@@ -50,7 +50,7 @@ + #endif - char *umount_command = NULL; - if (mpoint) { -- umount_command = ne_concat("umount -i '", mpoint, "'", NULL); -+ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL); - } else { -- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL); -+ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL); - error(0, 0, - _("\n" - " can't evaluate PID file name;\n" --- -2.28.0 - + #if defined(__linux__) +-#define UMOUNT_CMD "umount -i" ++#define UMOUNT_CMD "@wrapperDir@/umount -i" + #elif defined(__FreeBSD__) + #define UMOUNT_CMD "umount" + #endif diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index ab9609635c5ef..1efef2d9b53cb 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch +, autoreconfHook , neon , procps , substituteAll @@ -10,17 +11,22 @@ stdenv.mkDerivation rec { pname = "davfs2"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; - sha256 = "sha256-zj65SOzlgqUck0zLDMcOZZg5FycXyv8XP2ml4q+QxcA="; + sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ neon zlib ]; patches = [ ./fix-sysconfdir.patch + ./disable-suid.patch (substituteAll { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; @@ -33,11 +39,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ - "sbindir=$(out)/sbin" - "ssbindir=$(out)/sbin" - ]; - meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; @@ -52,5 +53,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/tools/filesystems/davfs2/disable-suid.patch b/pkgs/tools/filesystems/davfs2/disable-suid.patch new file mode 100644 index 0000000000000..074e08d157cd2 --- /dev/null +++ b/pkgs/tools/filesystems/davfs2/disable-suid.patch @@ -0,0 +1,9 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index bbde353..bcbed04 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -54,4 +54,3 @@ LIBS += @LIBICONV@ + endif + + install-exec-hook: +- chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch index f71248a28f4d5..7094a93a9f1ae 100644 --- a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch +++ b/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch @@ -1,19 +1,20 @@ -diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am ---- davfs2-1.4.7-orig/etc/Makefile.am 2013-02-21 11:45:00.185763558 +0100 -+++ davfs2-1.4.7/etc/Makefile.am 2013-02-21 11:53:05.423197775 +0100 -@@ -24,17 +24,17 @@ +diff --git a/etc/Makefile.am b/etc/Makefile.am +index 5a01282..6a40921 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -24,17 +24,17 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@ install-data-local: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) -- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf -- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets +- $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf +- $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(DESTDIR)$(pkgsysconfdir)/secrets - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private - chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private + $(mkinstalldirs) $(out)$(pkgsysconfdir) -+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf -+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets ++ $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf ++ $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(out)$(pkgsysconfdir)/secrets + $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs + $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private + chmod 700 $(out)$(pkgsysconfdir)/certs/private @@ -27,34 +28,3 @@ diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am + echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ + rm -f $(out)$(pkgsysconfdir)/$$f; \ done -diff -ubr davfs2-1.4.7-orig/etc/Makefile.in davfs2-1.4.7/etc/Makefile.in ---- davfs2-1.4.7-orig/etc/Makefile.in 2013-02-21 11:45:00.185763558 +0100 -+++ davfs2-1.4.7/etc/Makefile.in 2013-02-21 11:53:27.241207128 +0100 -@@ -408,19 +408,19 @@ - - install-data-local: $(dist_pkgdata_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) -- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf -- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private -- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private -+ $(mkinstalldirs) $(out)$(pkgsysconfdir) -+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf -+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets -+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs -+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private -+ chmod 700 $(out)$(pkgsysconfdir)/certs/private - - uninstall-local: - @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \ -- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \ -+ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ -+ rm -f $(out)$(pkgsysconfdir)/$$f; \ - done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index e7eecbf766ee1..9c38852e4e90e 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -5,8 +5,8 @@ let patches = [ (fetchpatch { name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; - url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/f45d04854a40cb52ae0e6736916d5955cb68b8ee/patch/btrfs-progs-v5.12.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; - sha256 = "0c7dd44q2ww6k9nk5dh6m0f0wbd8x84vb2m61fk6a44nsv2fwz1x"; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/ecc2664c380616ec75cfc1e600b5514cdff5c687/patch/btrfs-progs-v6.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; + sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; }) ]; }); diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index bf1f7ba55d2b0..d3a75e420db91 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: libupnp/upnp/.libs/libupnp.a(libupnp_la-gena_ctrlpt.o):libupnp/upnp/src/inc/upnpapi.h:163: # multiple definition of `pVirtualDirList'; libupnp/upnp/.libs/libupnp.a(libupnp_la-upnpapi.o):libupnp/upnp/src/inc/upnpapi.h:163: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = { homepage = "https://djmount.sourceforge.net/"; diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index bfec1dcf09931..dff1700d73fc2 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "eiciel"; - version = "0.10.0-rc2"; + version = "0.10.0"; outputs = [ "out" "nautilusExtension" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "rofirrim"; repo = "eiciel"; rev = version; - sha256 = "+MXoT6J4tKuFaSvUTcM15cKWLUnS0kYgBfqH+5lz6KY="; + sha256 = "0lhnrxhbg80pqjy9f8yiqi7x48rb6m2cmkffv25ssjynsmdnar0s"; }; nativeBuildInputs = [ @@ -46,11 +46,6 @@ stdenv.mkDerivation rec { "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-4" ]; - postPatch = '' - # https://github.com/rofirrim/eiciel/pull/9 - substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" - ''; - meta = with lib; { description = "Graphical editor for ACLs and extended attributes"; homepage = "https://rofi.roger-ferrer.org/eiciel/"; diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index 877d95c5b3d90..cb3cbe5d7f289 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libbsd }: +{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }: stdenv.mkDerivation rec { version = "332.25"; @@ -8,9 +8,12 @@ stdenv.mkDerivation rec { url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz"; sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; }) - (fetchurl { - url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; - sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; + (fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "diskdev_cmds"; + rev = "diskdev_cmds-${version}"; + hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A="; + name = sourceRoot; }) ]; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 9181dff70d340..e1edac0c61049 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.19.3"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-TDA1T36iY3xRFX0mBYazKeyzoDD7RPWRxQfUF7Rv5vA="; + sha256 = "sha256-uSCFm6aWNPFPcja+KB6TU7iVVYkDdD82pFjA9dOpSs8="; }; - cargoHash = "sha256-rBZ9cYk5Gzs8hy8fRgO8I0zaBncl8CwQoX5I0qzHBYE="; + cargoHash = "sha256-uxtZ+aUUhfWGCLysOcWi5En1eRui8Ja+nyD3S2WEWQM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index 39052ecba9356..5e78a1266873d 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-std=c++14" + ]); + installPhase = '' mkdir -p $out/bin cp iDSK $out/bin diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index afe1f2ffcd972..c11e416f71a94 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -36,7 +36,7 @@ rec { patches = [ ./irods_root_path.patch ]; # fix build with recent llvm versions - NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; postPatch = common.postPatch + '' patchShebangs ./test diff --git a/pkgs/tools/filesystems/jefferson/default.nix b/pkgs/tools/filesystems/jefferson/default.nix new file mode 100644 index 0000000000000..f16e1d3168821 --- /dev/null +++ b/pkgs/tools/filesystems/jefferson/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "jefferson"; + version = "0.4.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "onekey-sec"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zW38vcDw4Jz5gO9IHrWRlvUznKvUyPbxkYMxn7VSTpA="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + cstruct + python-lzo + ]; + + pythonImportsCheck = [ + "jefferson" + ]; + + # upstream has no tests + doCheck = false; + + meta = with lib; { + description = "JFFS2 filesystem extraction tool"; + homepage = "https://github.com/onekey-sec/jefferson"; + license = licenses.mit; + maintainers = with maintainers; [ tnias ]; + }; +} diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 599326c8fbfbf..0ddd6cfd4dad7 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: extract.o:/build/jfsutils-1.1.15/fscklog/extract.c:67: multiple definition of # `xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; # this required for wipefreespace postInstall = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IBM JFS utilities"; - homepage = "http://jfs.sourceforge.net"; + homepage = "https://jfs.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/kio-admin/default.nix b/pkgs/tools/filesystems/kio-admin/default.nix new file mode 100644 index 0000000000000..7e4a97fa255ab --- /dev/null +++ b/pkgs/tools/filesystems/kio-admin/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }: + +stdenv.mkDerivation rec { + pname = "kio-admin"; + version = "1.0.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "system"; + repo = "kio-admin"; + rev = "v${version}"; + hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ qtbase kio ki18n polkit-qt ]; + + meta = with lib; { + description = "Manage files as administrator using the admin:// KIO protocol."; + homepage = "https://invent.kde.org/system/kio-admin"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ k900 ]; + }; +} diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 898ba9ed3c15e..55b796ec32543 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.116"; + version = "3.0.117"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-/+l4BURvL1R6te6tlXRJx7YBDyYuMrGnzzhMc9XeXKc="; + sha256 = "sha256-6zBMAi9ruPPlcnpdgqwl35QZ5u4MyFPUa70yvGTkHpo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index c6583410ff3c8..8c3986d817d77 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libuuid ]; - NIX_CFLAGS_COMPILE = [ "-std=gnu90" "-D_GNU_SOURCE" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu90" "-D_GNU_SOURCE" ]; meta = { inherit version; diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix index 78bc6bd55c46b..ace05d0616652 100644 --- a/pkgs/tools/filesystems/rmfuse/default.nix +++ b/pkgs/tools/filesystems/rmfuse/default.nix @@ -1,44 +1,49 @@ -{ poetry2nix, pkgs, lib }: +{ lib +, python3 +, fetchFromGitHub +}: -let - pythonPackages = (poetry2nix.mkPoetryPackages { - projectDir = ./.; - overrides = [ - poetry2nix.defaultPoetryOverrides - (import ./poetry-git-overlay.nix { inherit pkgs; }) - (self: super: { +python3.pkgs.buildPythonApplication rec { + pname = "rmfuse"; + version = "unstable-2021-06-06"; - rmfuse = super.rmfuse.overridePythonAttrs(old: { - meta = old.meta // { - description = "RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem."; - longDescription = '' - RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. - ''; - license = lib.licenses.mit; - homepage = "https://github.com/rschroll/rmfuse"; - maintainers = [ lib.maintainers.adisbladis ]; - }; - }); + format = "pyproject"; - reportlab = let - ft = pkgs.freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); - in super.reportlab.overridePythonAttrs(old: { - postPatch = '' - substituteInPlace setup.py \ - --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" - ''; + src = fetchFromGitHub { + owner = "rschroll"; + repo = "rmfuse"; + rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; + hash = "sha256-W3kS6Kkmp8iWMOYFL7r1GyjSQvFotBXQCuTMK0vyHQ8="; + }; - NIX_CFLAGS_COMPILE = "-I${pkgs.freetype}/include/freetype2"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'bidict = "^' 'bidict = ">=' + ''; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkg-config - ]; - buildInputs = old.buildInputs ++ [ - pkgs.freetype - ]; - }); + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; - }) - ]; - }).python.pkgs; -in pythonPackages.rmfuse + propagatedBuildInputs = with python3.pkgs; [ + bidict + rmrl + rmcl + pyfuse3 + xdg + ]; + + meta = { + description = "FUSE access to the reMarkable Cloud"; + homepage = "https://github.com/rschroll/rmfuse"; + license = lib.licenses.mit; + longDescription = '' + RMfuse provides access to your reMarkable Cloud files in the form of a + FUSE filesystem. These files are exposed either in their original format, + or as PDF files that contain your annotations. This lets you manage files + in the reMarkable Cloud using the same tools you use on your local + system. + ''; + maintainers = with lib.maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix deleted file mode 100644 index 2ee4f805fb2d1..0000000000000 --- a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs }: -self: super: { - - rmfuse = super.rmfuse.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/rschroll/rmfuse.git"; - rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; - sha256 = "03qxy95jpk741b81bd38y51d4a0vynx2y1g662bci9r6m7l14yav"; - }; - } - ); - -} diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/tools/filesystems/rmfuse/poetry.lock deleted file mode 100644 index 4c588fc99e9f3..0000000000000 --- a/pkgs/tools/filesystems/rmfuse/poetry.lock +++ /dev/null @@ -1,596 +0,0 @@ -[[package]] -name = "anyio" -version = "2.2.0" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" - -[package.extras] -curio = ["curio (>=1.4)"] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - -[[package]] -name = "asks" -version = "2.4.12" -description = "asks - async http" -category = "main" -optional = false -python-versions = ">= 3.6.2" - -[package.dependencies] -anyio = ">=2.0,<3.0" -async_generator = "*" -h11 = "*" - -[[package]] -name = "async-generator" -version = "1.10" -description = "Async generators and context managers for Python 3.5+" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "attrs" -version = "21.4.0" -description = "Classes Without Boilerplate" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] -docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] - -[[package]] -name = "bidict" -version = "0.21.4" -description = "The bidirectional mapping library for Python." -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "cffi" -version = "1.15.0" -description = "Foreign Function Interface for Python calling C code." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "cssselect2" -version = "0.6.0" -description = "CSS selectors for Python ElementTree" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -tinycss2 = "*" -webencodings = "*" - -[package.extras] -doc = ["sphinx", "sphinx-rtd-theme"] -test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] - -[[package]] -name = "h11" -version = "0.13.0" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "idna" -version = "3.3" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "lxml" -version = "4.9.0" -description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" - -[package.extras] -cssselect = ["cssselect (>=0.7)"] -html5 = ["html5lib"] -htmlsoup = ["beautifulsoup4"] -source = ["Cython (>=0.29.7)"] - -[[package]] -name = "outcome" -version = "1.1.0" -description = "Capture the outcome of Python function calls." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -attrs = ">=19.2.0" - -[[package]] -name = "pdfrw" -version = "0.4" -description = "PDF file reader/writer library" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "pillow" -version = "9.1.1" -description = "Python Imaging Library (Fork)" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-issues (>=3.0.1)", "sphinx-removed-in", "sphinx-rtd-theme (>=1.0)", "sphinxext-opengraph"] -tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] - -[[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 = "pyfuse3" -version = "3.2.1" -description = "Python 3 bindings for libfuse 3 with async I/O support" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -trio = ">=0.15" - -[[package]] -name = "reportlab" -version = "3.6.9" -description = "The Reportlab Toolkit" -category = "main" -optional = false -python-versions = ">=3.7, <4" - -[package.dependencies] -pillow = ">=4.0.0" - -[package.extras] -rlpycairo = ["rlPyCairo (>=0.0.5)"] - -[[package]] -name = "rmcl" -version = "0.4.2" -description = "reMarkable Cloud Library" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" - -[package.dependencies] -asks = ">=2.4.12,<3.0.0" -trio = ">=0.18.0,<0.19.0" -xdg = ">=5.0.1,<6.0.0" - -[[package]] -name = "rmfuse" -version = "0.2.3" -description = "" -category = "main" -optional = false -python-versions = "^3.7" -develop = false - -[package.dependencies] -bidict = "^0.21.2" -pyfuse3 = {version = "^3.2.0", optional = true} -rmcl = "^0.4.2" -rmrl = "^0.2.1" -xdg = "^5.0.1" - -[package.extras] -pyfuse3 = ["pyfuse3 (>=3.2.0,<4.0.0)"] -llfuse = ["llfuse (>=1.4.1,<2.0.0)"] - -[package.source] -type = "git" -url = "https://github.com/rschroll/rmfuse.git" -reference = "master" -resolved_reference = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2" - -[[package]] -name = "rmrl" -version = "0.2.1" -description = "Render reMarkable documents to PDF" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" - -[package.dependencies] -pdfrw = ">=0.4,<0.5" -reportlab = ">=3.5.59,<4.0.0" -svglib = ">=1.0.1,<2.0.0" -xdg = ">=5.0.1,<6.0.0" - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "sortedcontainers" -version = "2.4.0" -description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "svglib" -version = "1.3.0" -description = "A pure-Python library for reading and converting SVG" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -cssselect2 = ">=0.2.0" -lxml = "*" -reportlab = "*" -tinycss2 = ">=0.6.0" - -[[package]] -name = "tinycss2" -version = "1.1.1" -description = "A tiny CSS parser" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -webencodings = ">=0.4" - -[package.extras] -doc = ["sphinx", "sphinx-rtd-theme"] -test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] - -[[package]] -name = "trio" -version = "0.18.0" -description = "A friendly Python library for async concurrency and I/O" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -async-generator = ">=1.9" -attrs = ">=19.2.0" -cffi = {version = ">=1.14", markers = "os_name == \"nt\" and implementation_name != \"pypy\""} -idna = "*" -outcome = "*" -sniffio = "*" -sortedcontainers = "*" - -[[package]] -name = "webencodings" -version = "0.5.1" -description = "Character encoding aliases for legacy web content" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "xdg" -version = "5.1.1" -description = "Variables defined by the XDG Base Directory Specification" -category = "main" -optional = false -python-versions = ">=3.6,<4.0" - -[metadata] -lock-version = "1.1" -python-versions = "^3.8" -content-hash = "3da90f3013f1220c9081c0a11dac7d8cd05c5a47ebda40fbb4357e44503e99a3" - -[metadata.files] -anyio = [ - {file = "anyio-2.2.0-py3-none-any.whl", hash = "sha256:aa3da546ed17f097ca876c78024dea380a3b7fa80759abfdda59f12176a3dac8"}, - {file = "anyio-2.2.0.tar.gz", hash = "sha256:4a41c5b3a65ed92e469d51b6fba3779301850ea2e352afcf9e36c46f21ee14a9"}, -] -asks = [ - {file = "asks-2.4.12.tar.gz", hash = "sha256:38de944eb350e7e4e3a918055fa8ff033da5f7b5ff385c1160a2d6b9d84783b0"}, -] -async-generator = [ - {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"}, - {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"}, -] -attrs = [ - {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, - {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, -] -bidict = [ - {file = "bidict-0.21.4-py3-none-any.whl", hash = "sha256:3ac67daa353ecf853a1df9d3e924f005e729227a60a8dbada31a4c31aba7f654"}, - {file = "bidict-0.21.4.tar.gz", hash = "sha256:42c84ffbe6f8de898af6073b4be9ea7ccedcd78d3474aa844c54e49d5a079f6f"}, -] -cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, -] -cssselect2 = [ - {file = "cssselect2-0.6.0-py3-none-any.whl", hash = "sha256:3a83b2a68370c69c9cd3fcb88bbfaebe9d22edeef2c22d1ff3e1ed9c7fa45ed8"}, - {file = "cssselect2-0.6.0.tar.gz", hash = "sha256:5b5d6dea81a5eb0c9ca39f116c8578dd413778060c94c1f51196371618909325"}, -] -h11 = [ - {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"}, - {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"}, -] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] -lxml = [ - {file = "lxml-4.9.0-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:b5031d151d6147eac53366d6ec87da84cd4d8c5e80b1d9948a667a7164116e39"}, - {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5d52e1173f52020392f593f87a6af2d4055dd800574a5cb0af4ea3878801d307"}, - {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3af00ee88376022589ceeb8170eb67dacf5f7cd625ea59fa0977d719777d4ae8"}, - {file = "lxml-4.9.0-cp27-cp27m-win32.whl", hash = "sha256:1057356b808d149bc14eb8f37bb89129f237df488661c1e0fc0376ca90e1d2c3"}, - {file = "lxml-4.9.0-cp27-cp27m-win_amd64.whl", hash = "sha256:f6d23a01921b741774f35e924d418a43cf03eca1444f3fdfd7978d35a5aaab8b"}, - {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56e19fb6e4b8bd07fb20028d03d3bc67bcc0621347fbde64f248e44839771756"}, - {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4cd69bca464e892ea4ed544ba6a7850aaff6f8d792f8055a10638db60acbac18"}, - {file = "lxml-4.9.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:94b181dd2777890139e49a5336bf3a9a3378ce66132c665fe8db4e8b7683cde2"}, - {file = "lxml-4.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:607224ffae9a0cf0a2f6e14f5f6bce43e83a6fbdaa647891729c103bdd6a5593"}, - {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:11d62c97ceff9bab94b6b29c010ea5fb6831743459bb759c917f49ba75601cd0"}, - {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:70a198030d26f5e569367f0f04509b63256faa76a22886280eea69a4f535dd40"}, - {file = "lxml-4.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3cf816aed8125cfc9e6e5c6c31ff94278320d591bd7970c4a0233bee0d1c8790"}, - {file = "lxml-4.9.0-cp310-cp310-win32.whl", hash = "sha256:65b3b5f12c6fb5611e79157214f3cd533083f9b058bf2fc8a1c5cc5ee40fdc5a"}, - {file = "lxml-4.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:0aa4cce579512c33373ca4c5e23c21e40c1aa1a33533a75e51b654834fd0e4f2"}, - {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:63419db39df8dc5564f6f103102c4665f7e4d9cb64030e98cf7a74eae5d5760d"}, - {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d8e5021e770b0a3084c30dda5901d5fce6d4474feaf0ced8f8e5a82702502fbb"}, - {file = "lxml-4.9.0-cp35-cp35m-win32.whl", hash = "sha256:f17b9df97c5ecdfb56c5e85b3c9df9831246df698f8581c6e111ac664c7c656e"}, - {file = "lxml-4.9.0-cp35-cp35m-win_amd64.whl", hash = "sha256:75da29a0752c8f2395df0115ac1681cefbdd4418676015be8178b733704cbff2"}, - {file = "lxml-4.9.0-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:e4d020ecf3740b7312bacab2cb966bb720fd4d3490562d373b4ad91dd1857c0d"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b71c52d69b91af7d18c13aef1b0cc3baee36b78607c711eb14a52bf3aa7c815e"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cf04a1a38e961d4a764d2940af9b941b66263ed5584392ef875ee9c1e360a3"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:915ecf7d486df17cc65aeefdb680d5ad4390cc8c857cf8db3fe241ed234f856a"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e564d5a771b4015f34166a05ea2165b7e283635c41b1347696117f780084b46d"}, - {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c2a57755e366e0ac7ebdb3e9207f159c3bf1afed02392ab18453ce81f5ee92ee"}, - {file = "lxml-4.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:00f3a6f88fd5f4357844dd91a1abac5f466c6799f1b7f1da2df6665253845b11"}, - {file = "lxml-4.9.0-cp36-cp36m-win32.whl", hash = "sha256:9093a359a86650a3dbd6532c3e4d21a6f58ba2cb60d0e72db0848115d24c10ba"}, - {file = "lxml-4.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1690c4d37674a5f0cdafbc5ed7e360800afcf06928c2a024c779c046891bf09"}, - {file = "lxml-4.9.0-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:6af7f51a6010748fc1bb71917318d953c9673e4ae3f6d285aaf93ef5b2eb11c1"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:eabdbe04ee0a7e760fa6cd9e799d2b020d098c580ba99107d52e1e5e538b1ecb"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b1e22f3ee4d75ca261b6bffbf64f6f178cb194b1be3191065a09f8d98828daa9"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:53b0410b220766321759f7f9066da67b1d0d4a7f6636a477984cbb1d98483955"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d76da27f5e3e9bc40eba6ed7a9e985f57547e98cf20521d91215707f2fb57e0f"}, - {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:686565ac77ff94a8965c11829af253d9e2ce3bf0d9225b1d2eb5c4d4666d0dca"}, - {file = "lxml-4.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b62d1431b4c40cda43cc986f19b8c86b1d2ae8918cfc00f4776fdf070b65c0c4"}, - {file = "lxml-4.9.0-cp37-cp37m-win32.whl", hash = "sha256:4becd16750ca5c2a1b1588269322b2cebd10c07738f336c922b658dbab96a61c"}, - {file = "lxml-4.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e35a298691b9e10e5a5631f8f0ba605b30ebe19208dc8f58b670462f53753641"}, - {file = "lxml-4.9.0-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:aa7447bf7c1a15ef24e2b86a277b585dd3f055e8890ac7f97374d170187daa97"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:612ef8f2795a89ba3a1d4c8c1af84d8453fd53ee611aa5ad460fdd2cab426fc2"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:1bfb791a8fcdbf55d1d41b8be940393687bec0e9b12733f0796668086d1a23ff"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:024684e0c5cfa121c22140d3a0898a3a9b2ea0f0fd2c229b6658af4bdf1155e5"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:81c29c8741fa07ecec8ec7417c3d8d1e2f18cf5a10a280f4e1c3f8c3590228b2"}, - {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6467626fa74f96f4d80fc6ec2555799e97fff8f36e0bfc7f67769f83e59cff40"}, - {file = "lxml-4.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9cae837b988f44925d14d048fa6a8c54f197c8b1223fd9ee9c27084f84606143"}, - {file = "lxml-4.9.0-cp38-cp38-win32.whl", hash = "sha256:5a49ad78543925e1a4196e20c9c54492afa4f1502c2a563f73097e2044c75190"}, - {file = "lxml-4.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:bb7c1b029e54e26e01b1d1d912fc21abb65650d16ea9a191d026def4ed0859ed"}, - {file = "lxml-4.9.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d0d03b9636f1326772e6854459728676354d4c7731dae9902b180e2065ba3da6"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:9af19eb789d674b59a9bee5005779757aab857c40bf9cc313cb01eafac55ce55"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:dd00d28d1ab5fa7627f5abc957f29a6338a7395b724571a8cbff8fbed83aaa82"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:754a1dd04bff8a509a31146bd8f3a5dc8191a8694d582dd5fb71ff09f0722c22"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7679344f2270840dc5babc9ccbedbc04f7473c1f66d4676bb01680c0db85bcc"}, - {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d882c2f3345261e898b9f604be76b61c901fbfa4ac32e3f51d5dc1edc89da3cb"}, - {file = "lxml-4.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4e97c8fc761ad63909198acc892f34c20f37f3baa2c50a62d5ec5d7f1efc68a1"}, - {file = "lxml-4.9.0-cp39-cp39-win32.whl", hash = "sha256:cf9ec915857d260511399ab87e1e70fa13d6b2972258f8e620a3959468edfc32"}, - {file = "lxml-4.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:1254a79f8a67a3908de725caf59eae62d86738f6387b0a34b32e02abd6ae73db"}, - {file = "lxml-4.9.0-pp37-pypy37_pp73-macosx_10_15_x86_64.whl", hash = "sha256:03370ec37fe562238d385e2c53089076dee53aabf8325cab964fdb04a9130fa0"}, - {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f386def57742aacc3d864169dfce644a8c396f95aa35b41b69df53f558d56dd0"}, - {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ea3f2e9eb41f973f73619e88bf7bd950b16b4c2ce73d15f24a11800ce1eaf276"}, - {file = "lxml-4.9.0-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:2d10659e6e5c53298e6d718fd126e793285bff904bb71d7239a17218f6a197b7"}, - {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:fcdf70191f0d1761d190a436db06a46f05af60e1410e1507935f0332280c9268"}, - {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:2b9c2341d96926b0d0e132e5c49ef85eb53fa92ae1c3a70f9072f3db0d32bc07"}, - {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:615886ee84b6f42f1bdf1852a9669b5fe3b96b6ff27f1a7a330b67ad9911200a"}, - {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:94f2e45b054dd759bed137b6e14ae8625495f7d90ddd23cf62c7a68f72b62656"}, - {file = "lxml-4.9.0.tar.gz", hash = "sha256:520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7"}, -] -outcome = [ - {file = "outcome-1.1.0-py2.py3-none-any.whl", hash = "sha256:c7dd9375cfd3c12db9801d080a3b63d4b0a261aa996c4c13152380587288d958"}, - {file = "outcome-1.1.0.tar.gz", hash = "sha256:e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967"}, -] -pdfrw = [ - {file = "pdfrw-0.4-py2.py3-none-any.whl", hash = "sha256:758289edaa3b672e9a1a67504be73c18ec668d4e5b9d5ac9cbc0dc753d8d196b"}, - {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"}, -] -pillow = [ - {file = "Pillow-9.1.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe"}, - {file = "Pillow-9.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"}, - {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c857532c719fb30fafabd2371ce9b7031812ff3889d75273827633bca0c4602"}, - {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:59789a7d06c742e9d13b883d5e3569188c16acb02eeed2510fd3bfdbc1bd1530"}, - {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d45dbe4b21a9679c3e8b3f7f4f42a45a7d3ddff8a4a16109dff0e1da30a35b2"}, - {file = "Pillow-9.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e9ed59d1b6ee837f4515b9584f3d26cf0388b742a11ecdae0d9237a94505d03a"}, - {file = "Pillow-9.1.1-cp310-cp310-win32.whl", hash = "sha256:b3fe2ff1e1715d4475d7e2c3e8dabd7c025f4410f79513b4ff2de3d51ce0fa9c"}, - {file = "Pillow-9.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5b650dbbc0969a4e226d98a0b440c2f07a850896aed9266b6fedc0f7e7834108"}, - {file = "Pillow-9.1.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:0b4d5ad2cd3a1f0d1df882d926b37dbb2ab6c823ae21d041b46910c8f8cd844b"}, - {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9370d6744d379f2de5d7fa95cdbd3a4d92f0b0ef29609b4b1687f16bc197063d"}, - {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b761727ed7d593e49671d1827044b942dd2f4caae6e51bab144d4accf8244a84"}, - {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a66fe50386162df2da701b3722781cbe90ce043e7d53c1fd6bd801bca6b48d4"}, - {file = "Pillow-9.1.1-cp37-cp37m-win32.whl", hash = "sha256:2b291cab8a888658d72b575a03e340509b6b050b62db1f5539dd5cd18fd50578"}, - {file = "Pillow-9.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1d4331aeb12f6b3791911a6da82de72257a99ad99726ed6b63f481c0184b6fb9"}, - {file = "Pillow-9.1.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8844217cdf66eabe39567118f229e275f0727e9195635a15e0e4b9227458daaf"}, - {file = "Pillow-9.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b6617221ff08fbd3b7a811950b5c3f9367f6e941b86259843eab77c8e3d2b56b"}, - {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20d514c989fa28e73a5adbddd7a171afa5824710d0ab06d4e1234195d2a2e546"}, - {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:088df396b047477dd1bbc7de6e22f58400dae2f21310d9e2ec2933b2ef7dfa4f"}, - {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53c27bd452e0f1bc4bfed07ceb235663a1df7c74df08e37fd6b03eb89454946a"}, - {file = "Pillow-9.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3f6c1716c473ebd1649663bf3b42702d0d53e27af8b64642be0dd3598c761fb1"}, - {file = "Pillow-9.1.1-cp38-cp38-win32.whl", hash = "sha256:c67db410508b9de9c4694c57ed754b65a460e4812126e87f5052ecf23a011a54"}, - {file = "Pillow-9.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:f054b020c4d7e9786ae0404278ea318768eb123403b18453e28e47cdb7a0a4bf"}, - {file = "Pillow-9.1.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c17770a62a71718a74b7548098a74cd6880be16bcfff5f937f900ead90ca8e92"}, - {file = "Pillow-9.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a"}, - {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f372d0f08eff1475ef426344efe42493f71f377ec52237bf153c5713de987251"}, - {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09e67ef6e430f90caa093528bd758b0616f8165e57ed8d8ce014ae32df6a831d"}, - {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66daa16952d5bf0c9d5389c5e9df562922a59bd16d77e2a276e575d32e38afd1"}, - {file = "Pillow-9.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d78ca526a559fb84faaaf84da2dd4addef5edb109db8b81677c0bb1aad342601"}, - {file = "Pillow-9.1.1-cp39-cp39-win32.whl", hash = "sha256:55e74faf8359ddda43fee01bffbc5bd99d96ea508d8a08c527099e84eb708f45"}, - {file = "Pillow-9.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:7c150dbbb4a94ea4825d1e5f2c5501af7141ea95825fadd7829f9b11c97aaf6c"}, - {file = "Pillow-9.1.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:769a7f131a2f43752455cc72f9f7a093c3ff3856bf976c5fb53a59d0ccc704f6"}, - {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:488f3383cf5159907d48d32957ac6f9ea85ccdcc296c14eca1a4e396ecc32098"}, - {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b525a356680022b0af53385944026d3486fc8c013638cf9900eb87c866afb4c"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6e760cf01259a1c0a50f3c845f9cad1af30577fd8b670339b1659c6d0e7a41dd"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4165205a13b16a29e1ac57efeee6be2dfd5b5408122d59ef2145bc3239fa340"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937a54e5694684f74dcbf6e24cc453bfc5b33940216ddd8f4cd8f0f79167f765"}, - {file = "Pillow-9.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8"}, - {file = "Pillow-9.1.1.tar.gz", hash = "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0"}, -] -pycparser = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] -pyfuse3 = [ - {file = "pyfuse3-3.2.1.tar.gz", hash = "sha256:22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33"}, -] -reportlab = [ - {file = "reportlab-3.6.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4ba8eebfa4383e4680d6e7e6dba9c45c1fe19bbc0a754db4d84823f1a9511e56"}, - {file = "reportlab-3.6.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37dda88dbe16dd3f4f9039464637cce66e462c0b95e5763dbd45ac5799136d3a"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10681d89a0ca37bb4036283fb8c0efac9ac1b22265dbdf350bda0448be33e00c"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cebd0b28a0e875a9ce789514700f80659269ecf2a8fcef0aa10b8ae52b40474a"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ec84055cf2c83783958b74eadf0e577eb0cd9088c8b5d536e9ddc0f4a9f8c70"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:90f74627cafecf3924741ab8b0690a19df4214eb56b1cfce2dc74a15c9744034"}, - {file = "reportlab-3.6.9-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2c2fd861f10b2cd49ccf29a31da9ad5c3b95aa437804e4fd0351ed4eb695f74"}, - {file = "reportlab-3.6.9-cp310-cp310-win32.whl", hash = "sha256:e492e87886423192af1fafde23907bcd9d2fdccfc22f67e18aa5c73db3a380a3"}, - {file = "reportlab-3.6.9-cp310-cp310-win_amd64.whl", hash = "sha256:d1bf9455aff37beb421a4447d89d6dd77bb46f677c0bab4eb0272cdb79faad2f"}, - {file = "reportlab-3.6.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0a7f2b7232c3ffb451b649d55c51a6dd0c8104ad7bbcfe355addf7619705e7fa"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1967dbc9930917d75c39784712a137d432dbc2e5ca9e132a2453319c2619ccff"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:32a5c5cd9625a40feec956f460355b4813bc3187c4f8dc9efd9f1a7f8f854e34"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8cb82b6d14ad4bd915acacc8f114c6a7bab8b9b1503cabb930e433ebd320f90c"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0e767cf4507ca8eed7dde8511f0889b0f19f160a2bdf9ef07742b2aaeceed9f2"}, - {file = "reportlab-3.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a114761ad3ba6e0cdfacf14a8fb2cb8f5713b115ca1f0c17f3cd638d0a5b4bd"}, - {file = "reportlab-3.6.9-cp37-cp37m-win32.whl", hash = "sha256:bbaab798991863952c593c0459dcb82e0aade837675593310e13cba2ce7fb45a"}, - {file = "reportlab-3.6.9-cp37-cp37m-win_amd64.whl", hash = "sha256:ab1ffe4ec7be99ad348791116d436610afdc7a9a02a968997f31eaa62eaadad8"}, - {file = "reportlab-3.6.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:496f42840604255ce06777bc129048b3bab966213bbac4f07fbe4ceb6a2e0482"}, - {file = "reportlab-3.6.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a441afdfe31870b964bccde042d7172ed3c0077f519bbf3ed7d9d34c406b6b91"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4fbe23ac870adf90544d2014c572dba6ec4d772afad6505bb91f171ddad12839"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de724c78f4eb1363b1195dce85a2a8806e7509b69ac5c842a714d942ea534d63"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:713574da534b6ce73d884f1574c35a565e438af4888fcc75e752f1de02e356a7"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:193671445b4885128d8800d3e416eb2fa4fd89bafae08cc9889c0752fe5ad8c2"}, - {file = "reportlab-3.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff0e014a3a3fe286c642ef51213c41684a156b9ed293ef205e8890bc1dbbfdc7"}, - {file = "reportlab-3.6.9-cp38-cp38-win32.whl", hash = "sha256:23f5aed2d212096f2fe95d56f868d63f839a08bf7e389237e644d93981274222"}, - {file = "reportlab-3.6.9-cp38-cp38-win_amd64.whl", hash = "sha256:09b2ca175129a34292399fc4c6a8b1739f6c5946368fcaa6f931d69385b2f720"}, - {file = "reportlab-3.6.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cb21666fc9edec9716553bfcfe0c30d1bbbe2731910a96f07ec65652974e5f83"}, - {file = "reportlab-3.6.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d927bf802bf53c1b5a3878a22e9be310900877984e7c436a3a99bdd19cfec4c3"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce3a3aad287c8532f62223f5720b5504e31abe3dce52a27bd2a25f508c0d846e"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9a5f63bc381c0f945402ef4c1bccc74a8eed28f6be6596704b1db7d82ec89fe"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:50f8e30f5410efc69b0217261b1f21912888da392a4549e79c7aaaac85f01bfa"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:15294435f786968bcdf1a7a67bcc23a136470b6ea26919497f5c76ff0f653041"}, - {file = "reportlab-3.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9b5e9115363545a727d8ebe7e4b94f7cf6f26113261a269d50d88b8db4eb726"}, - {file = "reportlab-3.6.9-cp39-cp39-win32.whl", hash = "sha256:e1fc1b1f5d9d1c2e18b5e60602dfa7854b2330ba0efc312ef605abf588abea9c"}, - {file = "reportlab-3.6.9-cp39-cp39-win_amd64.whl", hash = "sha256:92a6613af9877e3ad2a1c5a16a122514a4f9f8d9b91b1f22e7fa0fa796617b36"}, - {file = "reportlab-3.6.9.tar.gz", hash = "sha256:5d0cc3682456ad213150f6dbffe7d47eab737d809e517c316103376be548fb84"}, -] -rmcl = [ - {file = "rmcl-0.4.2-py3-none-any.whl", hash = "sha256:09534999cd233e5e8db531e51aab87eee7d72aa5a2592bcf100e2d015110cf52"}, - {file = "rmcl-0.4.2.tar.gz", hash = "sha256:58de4758e7e3cb7acbf28fcfa80f4155252afdfb191beb4ba4aa36961f66cc67"}, -] -rmfuse = [] -rmrl = [ - {file = "rmrl-0.2.1-py3-none-any.whl", hash = "sha256:c35b9f20494a6034a16e916d7351575efb3e3f77acabe9094453a7f6013eaa86"}, - {file = "rmrl-0.2.1.tar.gz", hash = "sha256:c532bef4168350e6ab17cf37c6481dc12b6a78e007c073503f082f36215b71c9"}, -] -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -sortedcontainers = [ - {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"}, - {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"}, -] -svglib = [ - {file = "svglib-1.3.0.tar.gz", hash = "sha256:a38998b95d1bb99564dc9dffaf15e4e9453761f2790d2dd4147a4ad5fbac1078"}, -] -tinycss2 = [ - {file = "tinycss2-1.1.1-py3-none-any.whl", hash = "sha256:fe794ceaadfe3cf3e686b22155d0da5780dd0e273471a51846d0a02bc204fec8"}, - {file = "tinycss2-1.1.1.tar.gz", hash = "sha256:b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf"}, -] -trio = [ - {file = "trio-0.18.0-py3-none-any.whl", hash = "sha256:a42af0634ba729cbfe8578be058750c6471dac19fbc7167ec6a3ca3f966fb424"}, - {file = "trio-0.18.0.tar.gz", hash = "sha256:87a66ae61f27fe500c9024926a9ba482c07e1e0f56380b70a264d19c435ba076"}, -] -webencodings = [ - {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, - {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, -] -xdg = [ - {file = "xdg-5.1.1-py3-none-any.whl", hash = "sha256:865a7b56ed1d4cd2fce2ead1eddf97360843619757f473cd90b75f1817ca541d"}, - {file = "xdg-5.1.1.tar.gz", hash = "sha256:aa619f26ccec6088b2a6018721d4ee86e602099b24644a90a8d3308a25acd06c"}, -] diff --git a/pkgs/tools/filesystems/rmfuse/pyproject.toml b/pkgs/tools/filesystems/rmfuse/pyproject.toml deleted file mode 100644 index e3f1767b4cfa9..0000000000000 --- a/pkgs/tools/filesystems/rmfuse/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[tool.poetry] -name = "rmfuse-env" -version = "0.1.0" -description = "" -authors = [] - -[tool.poetry.dependencies] -python = "^3.8" -rmfuse = {git = "https://github.com/rschroll/rmfuse.git", extras = ["pyfuse3"]} - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/pkgs/tools/filesystems/rmfuse/update b/pkgs/tools/filesystems/rmfuse/update deleted file mode 100755 index 77cfe9ff86d9c..0000000000000 --- a/pkgs/tools/filesystems/rmfuse/update +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p poetry poetry2nix.cli -set -eu -poetry lock -poetry2nix lock diff --git a/pkgs/tools/filesystems/rnm/default.nix b/pkgs/tools/filesystems/rnm/default.nix new file mode 100644 index 0000000000000..69ba0270ecc0c --- /dev/null +++ b/pkgs/tools/filesystems/rnm/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, gmp +, jpcre2 +, pcre2 +}: + +stdenv.mkDerivation rec { + pname = "rnm"; + version = "4.0.9"; + + src = fetchFromGitHub { + owner = "neurobin"; + repo = "rnm"; + rev = "refs/tags/${version}"; + hash = "sha256-cMWIxRuL7UCDjGr26+mfEYBPRA/dxEt0Us5qU92TelY="; + }; + + buildInputs = [ + gmp + jpcre2 + pcre2 + ]; + + meta = with lib; { + homepage = "https://neurobin.org/projects/softwares/unix/rnm/"; + description = "Bulk rename utility"; + changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog"; + platforms = lib.platforms.all; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index d0a1e09163675..bfe9f22747568 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,15 +4,21 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.3"; + version = "2.0.2"; src = fetchFromGitHub { - sha256 = "sha256-DOf+kpflDd2U1nXDLKYts/yf121CrBFIBI47OQa5XBs="; + sha256 = "sha256-xmOtL4v3UxdjrL09sSfXyF5FoMrNerSqG9nvEuwMvNM="; rev = version; repo = "s3backer"; owner = "archiecobbs"; }; + patches = [ + # from upstream, after latest release + # https://github.com/archiecobbs/s3backer/commit/303a669356fa7cd6bc95ac7076ce51b1cab3970a + ./fix-darwin-builds.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl expat ]; @@ -22,11 +28,6 @@ stdenv.mkDerivation rec { 'AC_CHECK_DECLS(fdatasync)' "" ''; - autoreconfPhase = '' - patchShebangs ./autogen.sh - ./autogen.sh - ''; - meta = with lib; { homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; diff --git a/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch new file mode 100644 index 0000000000000..e5755f1cb9b08 --- /dev/null +++ b/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch @@ -0,0 +1,25 @@ +From 303a669356fa7cd6bc95ac7076ce51b1cab3970a Mon Sep 17 00:00:00 2001 +From: Adrian Ho <the.gromgit@gmail.com> +Date: Tue, 6 Sep 2022 10:49:10 +0800 +Subject: [PATCH] Enable macOS builds + +macOS requires explicit `environ` declaration. +--- + s3backer.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/s3backer.h b/s3backer.h +index ccc9053..383e246 100644 +--- a/s3backer.h ++++ b/s3backer.h +@@ -90,6 +90,10 @@ + #include <zlib.h> + #include <fuse.h> + ++#ifdef __APPLE__ ++extern char **environ; ++#endif ++ + #ifndef FUSE_OPT_KEY_DISCARD + #define FUSE_OPT_KEY_DISCARD -4 + #endif \ No newline at end of file diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index d31e466331c04..58ef6442d8d04 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Mount an S3 bucket as filesystem through FUSE"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index ba5fd9ccfc1b8..258814b8905b4 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of # `verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installFlags = [ "INSTALL_DIR=\${out}/bin" ]; diff --git a/pkgs/tools/filesystems/simple-mtpfs/default.nix b/pkgs/tools/filesystems/simple-mtpfs/default.nix new file mode 100644 index 0000000000000..3cb2aa97007b9 --- /dev/null +++ b/pkgs/tools/filesystems/simple-mtpfs/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, pkg-config +, fuse +, libmtp +}: +stdenv.mkDerivation rec { + pname = "simple-mtpfs"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "phatina"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vAqi2owa4LJK7y7S7TwkPAqDxzyHrZZBTu0MBwMT0gI="; + }; + + nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ]; + buildInputs = [ fuse libmtp ]; + + meta = with lib; { + description = "Simple MTP fuse filesystem driver"; + homepage = "https://github.com/phatina/simple-mtpfs"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/tools/filesystems/sshfs-fuse/common.nix index 262c081e35079..932c7693dc88f 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/common.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/common.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { buildInputs = [ fuse glib ]; nativeCheckInputs = [ which python3Packages.pytest ]; - NIX_CFLAGS_COMPILE = lib.optionalString + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 7e0c30ebf19c3..0b16c74652940 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8="; + hash = "sha256-PM+griFtuFT9g+Pqx33frWrucVCXSzfyWAJJXAzrMtI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q="; + hash = "sha256-P5GKMNifnEvGcsg0hGZn6hg3/S44fUIzqf5Qjp4R/EM="; }; postPatch = '' diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index cd6cbe5e7993d..e892d89dc3b30 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of # `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here - NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1 -fcommon"; + env.NIX_CFLAGS_COMPILE = "-I ${subversion.dev}/include/subversion-1 -fcommon"; NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1"; meta = { diff --git a/pkgs/tools/filesystems/ubi_reader/default.nix b/pkgs/tools/filesystems/ubi_reader/default.nix new file mode 100644 index 0000000000000..0d2e059b78f0f --- /dev/null +++ b/pkgs/tools/filesystems/ubi_reader/default.nix @@ -0,0 +1,29 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ubi_reader"; + version = "0.8.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "jrspruitt"; + repo = pname; + rev = "v${version}-master"; + hash = "sha256-tjQs1F9kcFrC9FDkfdnax0C8O8Bg7blkpL7GU56eeWU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ python-lzo ]; + + # There are no tests in the source + doCheck = false; + + meta = with lib; { + description = "Collection of Python scripts for reading information about and extracting data from UBI and UBIFS images"; + homepage = "https://github.com/jrspruitt/ubi_reader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ vlaci ]; + }; +} diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index ec3fd6efefae4..f50f98d33dc25 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = "-std=gnu90"; + env.NIX_CFLAGS_COMPILE = "-std=gnu90"; preConfigure = '' sed -e '1i#include <limits.h>' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index b9eefb0b02c28..4519ee9d42a6b 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -1,12 +1,12 @@ -{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}: +{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse }: stdenv.mkDerivation rec { pname = "wiimms-iso-tools"; - version = "3.02a"; + version = "3.05a"; src = fetchurl { - url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.tar.bz2"; - sha256 = "074cvcaqz23xyihslc6n64wwxwcnl6xp7l0750yb9pc0wrqxmj69"; + url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.txz"; + hash = "sha256-5aikiPJkZf9OwD8QmQ7ijhBOtFQpkIErvb6gOvEu2L0="; }; buildInputs = [ zlib ncurses fuse ]; @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs setup.sh - patchShebangs gen-template.sh - patchShebangs gen-text-file.sh + patchShebangs setup.sh gen-template.sh gen-text-file.sh + substituteInPlace setup.sh --replace gcc "$CC" + substituteInPlace Makefile --replace gcc "$CC" ''; - # Workaround build failure on -fno-common toolchains like upstream gcc-10. - NIX_CFLAGS_COMPILE = "-Wno-error=format-security -fcommon"; INSTALL_PATH = "$out"; installPhase = '' @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://wit.wiimm.de"; description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ nilp0inter ]; }; } diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 98c9ae525f4e0..c58dbff9ac733 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # c++17 (gcc-11's default) breaks the build as: # zkadapter.h:616:33: error: ISO C++17 does not allow dynamic exception specifications - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix new file mode 100644 index 0000000000000..0aed7016feac8 --- /dev/null +++ b/pkgs/tools/games/alice-tools/default.nix @@ -0,0 +1,106 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, bison +, flex +, libiconv +, libpng +, libjpeg +, libwebp +, zlib +, withGUI ? true +, qtbase ? null +, wrapQtAppsHook ? null +}: + +assert withGUI -> qtbase != null && wrapQtAppsHook != null; + +stdenv.mkDerivation rec { + pname = "alice-tools"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "nunuhara"; + repo = "alice-tools"; + rev = version; + fetchSubmodules = true; + hash = "sha256-uXiNNneAOTDupgc+ZvaeRNbEQFJBv4ppdEc3kZeUsg8="; + }; + + patches = [ + # These two patches (one to alice-tools, one to a subproject) improve DCF & PCF parsing + # Remove them when version > 0.12.1 + (fetchpatch { + url = "https://github.com/nunuhara/alice-tools/commit/c800e85b37998d7a47060f5da4b1782d7201a042.patch"; + excludes = [ "subprojects/libsys4" ]; + hash = "sha256-R5ckFHqUWHdAPkFa53UbVeLgxJg/8qGLTQWwj5YRJc4="; + }) + (fetchpatch { + url = "https://github.com/nunuhara/libsys4/commit/cff2b826d1618fb17616cdd288ab0c50f35e8032.patch"; + stripLen = 1; + extraPrefix = "subprojects/libsys4/"; + hash = "sha256-CmetiVP2kGL+MwuE9OoEDrDFxzwWvv1TtZuq1li1uIw="; + }) + ]; + + postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") '' + substituteInPlace src/meson.build \ + --replace qt5 qt6 + ''; + + mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [ + # Qt6 requires at least C++17, project uses compiler's default, default too old on Darwin & aarch64-linux + "-Dcpp_std=c++17" + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + bison + flex + ] ++ lib.optionals withGUI [ + wrapQtAppsHook + ]; + + buildInputs = [ + libiconv + libpng + libjpeg + libwebp + zlib + ] ++ lib.optionals withGUI [ + qtbase + ]; + + dontWrapQtApps = true; + + # Default install step only installs a static library of a build dependency + installPhase = '' + runHook preInstall + + install -Dm755 src/alice $out/bin/alice + '' + lib.optionalString withGUI '' + install -Dm755 src/galice $out/bin/galice + wrapQtApp $out/bin/galice + '' + '' + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Tools for extracting/editing files from AliceSoft games"; + homepage = "https://github.com/nunuhara/alice-tools"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = if withGUI then "galice" else "alice"; + }; +} diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix index cd18b8b09df55..203c58b8f6190 100644 --- a/pkgs/tools/games/joystickwake/default.nix +++ b/pkgs/tools/games/joystickwake/default.nix @@ -1,16 +1,16 @@ { lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "joystickwake"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "foresto"; repo = pname; - rev = "v${version}"; - sha256 = "0f990bvykjjq2rzzbm158kajnqxigfzcrzap11dc415wkvn25k6q"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0rVVxaaAFHkmJeG3e181x7faTIeFwupplWepoyxc51g="; }; - propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; + propagatedBuildInputs = with python3.pkgs; [ dbus-next pyudev xlib ]; postInstall = '' # autostart file diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix index f7931ded7bb03..59133ab46ef5a 100644 --- a/pkgs/tools/games/minecraft/packwiz/default.nix +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packwiz"; - version = "unstable-2022-10-29"; + version = "unstable-2023-02-13"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "f00dc9844ffdd6ee5c0526a79b0084429e9cb130"; - sha256 = "sha256-YpihFWdcKfHJLEs+jHzHH7G+m/E8i5y2yp7IubObNhY="; + rev = "4b336e46e277d4b252c11f43080576dc23b001d2"; + sha256 = "sha256-f6560XrnriKNq89aOxfJjN4mDdtYzMSOUlRWwItLuHk="; }; - vendorSha256 = "sha256-09S8RFdCvtE50EICLIKCTnTjG/0XsGf+yq9SNObKmRA="; + vendorSha256 = "sha256-yL5pWbVqf6mEpgYsItLnv8nwSmoMP+SE0rX/s7u2vCg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 8140b34c1e97f..6bb5fc8ff207d 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -1,38 +1,43 @@ -{ lib -, stdenv -, buildDotnetModule -, fetchFromGitHub -, autoPatchelfHook -, wrapGAppsHook -, dotnetCorePackages -, fontconfig -, gtk3 -, openssl -, libX11 -, libXi -, xinput +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + autoPatchelfHook, + wrapGAppsHook, + dotnetCorePackages, + fontconfig, + gtk3, + libunwind, + openssl, + xinput, + xorg, }: - buildDotnetModule rec { pname = "opentracker"; - version = "1.8.2"; + version = "1.8.5"; src = fetchFromGitHub { owner = "trippsc2"; repo = pname; - rev = version; - sha256 = "0nsmyb1wd86465iri9jxl3jp74gxkscvnmr3687ddbia3dv4fz0z"; + rev = "refs/tags/${version}"; + hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg=="; }; - dotnet-runtime = dotnetCorePackages.runtime_3_1; - dotnet-sdk = dotnetCorePackages.sdk_3_1; + patches = [./remove-project.patch]; + + dotnet-runtime = dotnetCorePackages.runtime_6_0; nugetDeps = ./deps.nix; projectFile = "OpenTracker.sln"; - executables = [ "OpenTracker" ]; + executables = ["OpenTracker"]; doCheck = true; + disabledTests = [ + "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue" + "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected" + ]; nativeBuildInputs = [ autoPatchelfHook @@ -43,17 +48,27 @@ buildDotnetModule rec { stdenv.cc.cc.lib fontconfig gtk3 + libunwind ]; - runtimeDeps = [ - gtk3 - openssl - libX11 - libXi - xinput - ]; + runtimeDeps = + [ + gtk3 + openssl + xinput + ] + ++ (with xorg; [ + libICE + libSM + libX11 + libXi + ]); - autoPatchelfIgnoreMissingDeps = [ "libc.musl-x86_64.so.1" ]; # Attempts to patchelf unneeded SOs + # Attempts to patchelf unneeded SOs + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + "libintl.so.8" + ]; meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; @@ -65,8 +80,8 @@ buildDotnetModule rec { binaryNativeCode ]; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [maintainers.ivar]; mainProgram = "OpenTracker"; - platforms = [ "x86_64-linux" ]; + platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/tools/games/opentracker/deps.nix index fd7e7b3c27c73..b6185c4c34b44 100644 --- a/pkgs/tools/games/opentracker/deps.nix +++ b/pkgs/tools/games/opentracker/deps.nix @@ -2,65 +2,66 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Autofac"; version = "6.0.0"; sha256 = "1faz8j3caqh4f2w4bcicz5x67f63f6463jikg89sr9qmqbv778hn"; }) - (fetchNuGet { pname = "Autofac"; version = "6.1.0"; sha256 = "0g1iic7y19rm536dzsllabw7phbgb6wzghhpfmdxz7yp7zrfjk15"; }) - (fetchNuGet { pname = "Autofac.Extras.Moq"; version = "6.0.0"; sha256 = "1jbdzwr712iq11s3i24a4b7g6025djkmf40fcrfiqkihvdrfprcw"; }) - (fetchNuGet { pname = "Avalonia"; version = "0.10.0"; sha256 = "0wf8nqdj0xi6drzw676vm5ac2kaxcd76af4y1cirfw4j7lxvs344"; }) + (fetchNuGet { pname = "Autofac"; version = "6.3.0"; sha256 = "0zg0lsqzb8hh7l97mfd2z3fxdab86sbmxkaprzi41v0hs1x3jd9b"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.12"; sha256 = "1hb6v8sm7gd8aswdv0slnk8cvvxs5ac82knc3pzvxj0js2n4lnv2"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.0"; sha256 = "0yry5kwbp03lznv2zay39p2ry2jsdf7s1syjzf93dd64pgl5bwpk"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.0"; sha256 = "1vwaxxnzcgkdrxvrkjcxpc9c839pxmm6ajq83xiqzn5f4vvx29di"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.0"; sha256 = "1fw6bbbm7g1w4s6hyskkx7p59i3p965bly8p50dmfs31ls01jfrx"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.0"; sha256 = "08z3vybk474yxaipd7nqqr9xycgprggcri4lp61ns3p3fj599ydp"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.0"; sha256 = "05wdf7gc5v03gia29srq44g49ijqg45vygargm087m2s63i134jk"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.0"; sha256 = "1kfzn349rllp7ngydvxqn84hmgxrkbgf7mgrqwcagq809f73mzyp"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.0"; sha256 = "0azkwfi72gy7158fpfs6i0iixixy00zfkgsh939pfzy7fkz5pq8m"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.0"; sha256 = "0527966nmjdhzdq6dwhjhyc79kmy56ymhxsmrp344jn43d67kmnr"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.0"; sha256 = "1d5w7pl1xx9l250mhdq3jnpy5zl77j8n3ccjjxfg8sc7rnyd2fx9"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.0"; sha256 = "0lyfmhh0q1dzzb5blp76phj894wl6ab0kn1pcprxqvj94dcwric8"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.0"; sha256 = "0asja6g20c6wzxmvx0knkdk6f5fbrx99n82zcrj4y2irhmmzjhxy"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.0"; sha256 = "10g6i9y00a13cy3y889y3z8i5p5arpif53q3xx9k6k0qzcq6zq51"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.0"; sha256 = "0s1mha3m912lmzaw87a841807fcx150vmhwcbfb8mnhqf6qgdwjy"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions.DragAndDrop"; version = "0.10.0"; sha256 = "1hi9ii7r6xr6avac0a2fs1fq9x34iw23hn1qmnzskbj6jz1pzsbj"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.0"; sha256 = "0nqpxbn390g98vyhvp4rvbchxlrcc8vkjjkakgz15crk1irf941b"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.0.0"; sha256 = "10zq7mb1gvm946grw7fxa5dh1xwccqmk5jmwx6pqn7kbjp9frkpy"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.12"; sha256 = "1r8qi0kgd9rqbacnriy5sa684d12vxi45a6n2a4w7ydxr97zv5nm"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.12"; sha256 = "17ng7vvmynnmll7fb8zkjlhcn0ksg7p4v6kw207yq72acgvyn96g"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.12"; sha256 = "17skzs05iv5ljgnqm36zrbhrh3x20xf5hgni543i02zffj2015ki"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.12"; sha256 = "00920pdiv8wlpym0s80nz8lfmw515ikrr5f2a6sr4kmjwfd9cffj"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.12"; sha256 = "18glwqn4a8p3rz5zsp1xyrm5xwv853056nykf7mdcv1lglh74fsm"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.12"; sha256 = "1j6gxg0n55923rbw2p7z6yh27i81xrzpqarb268d3hd6hgjycwc1"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.12"; sha256 = "04ga7f8bmz3bqp4dsc4fzrphfq61zf62hlz4nbazf1igx0jzdygy"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.12"; sha256 = "0ghrb8yf4qahwlpa2appk7q0m0n01q0s65nx1xj1plpi4jr6vvw2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.12"; sha256 = "1qj0sw4780za3p6hbwvx1p3b6px3s5vp3ml3vvyak1bajvifz969"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.12"; sha256 = "1af174qca95gxf04zhxm716mi1dazfz7k3995i1nyaz7hygs3p04"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.12"; sha256 = "1jjg4lhg0a95laffwm7imgs92q06whrfkaszm7svgfv1ryazv71q"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.12"; sha256 = "0j897knwxpl6sss8v2wrhy4bw4nw4jqc04n8b8d4s76jaqcr3z2h"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.12"; sha256 = "0nyqg66sg7garc2k729k3dqixbb3asvsjd2kxympfx9q6xyz6vrh"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.12"; sha256 = "13qbmz39bf29wvq82b1irci8y50fjhhj563cdwd235nm633sixqb"; }) + (fetchNuGet { pname = "Castle.Core"; version = "4.4.1"; sha256 = "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7"; }) + (fetchNuGet { pname = "Citrus.Avalonia"; version = "1.6.1"; sha256 = "1hl98dmgmm6ml5gl70v7vg577n7vn6bjxaq82sgnql5g623pg18x"; }) (fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; sha256 = "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.1.1"; sha256 = "14xcqkw87zbjljy1pb727kwq5a4dfmsf5vg99fq0xxb71q828nvh"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.6.1.7"; sha256 = "0xm4dr6cs5n1ywbbpp1jrxfk8rn1iy61kdm29kb6bqj1q0gv8zyv"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.6.1.7"; sha256 = "1slackrhcwsjn3f6sa0nlrcynzmx5pbqv8j33l9w6z9w7ssq4wkn"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.9.0"; sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.9.0"; sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.9.0"; sha256 = "0hrihj0q96vjlbfvkq9l4maqdf6rqdznr7cpj82iw51n8kbzj8s3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "5.0.3"; sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.9.0"; sha256 = "0kds9i8bla540787qchbzayrg50ai40pxyai2vihc1m2l39h4mdf"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.4.11"; sha256 = "1vrrwkmqrdzr4ncjihfzik5ykmy1234iyp2q5qk8spz6y0gwq2h8"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.4.9"; sha256 = "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw"; }) + (fetchNuGet { pname = "ExpectedObjects"; version = "3.5.4"; sha256 = "1mklg6dx8biaaf9jxp09rddsw66l42r4fpsgnmm6szn6fj2n888k"; }) + (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-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-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.1"; sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.1"; sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.0.1"; sha256 = "0ncbld51ja7hp6p2cabw0dx4km2syiz0z58al62h21cpbjfnls5p"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0"; sha256 = "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.0.1"; sha256 = "0zhrlk30js7dp6i76zd7zilaxq26gwsl3pk85p919039786sqs9p"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.1"; sha256 = "1761mvkp5mwhw150fvazdhh4ybvxpvx05g9znf8n1fqx832wxrw5"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.1"; sha256 = "12ilya3x6g5frbwmh41mwygax9v8vrycq3vnzhv3r258jwv69974"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "6.0.1"; sha256 = "13v33cm88px9wymlxidzgy2ljaq33h1xna3lgdggmy7w4bbdkddh"; }) (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.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "Moq"; version = "4.7.0"; sha256 = "1y1lzg7scrzl5x8cxsbrgkpg79mf3v0ylnpgjw8q6hib2rhsi8ff"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (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 = "NSubstitute"; version = "4.3.0"; sha256 = "026kx6fab9r1a0m8p9hlznp73qhh44k4i0352szvchsis6vlj9gm"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "Packaging.Targets"; version = "0.1.155"; sha256 = "0iija7gskcbrj8qgj5lqxqsfpz8k58fbvjnix6rccpzgvb16dkhy"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "12.1.1"; sha256 = "1mwv9fi2zazp9ddwci9xfzrmi4pyp8n69r8ilc4lp5lvr1c6chih"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "13.2.2"; sha256 = "1f9jh3d8lblqpva4iy5c6qvnya3cc0fp6mva3f9z3q7ll8v4h62h"; }) + (fetchNuGet { pname = "Packaging.Targets"; version = "0.1.220"; sha256 = "0ci4jkkqk70vwzf2sgc44a8dap70afp6yhvj967shy7anffxb511"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "13.2.10"; sha256 = "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "17.1.17"; sha256 = "1v0w88mk8bh68lcj968q61zyx6l07himild605c2xi5lb6a42z71"; }) (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"; }) @@ -75,46 +76,44 @@ (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 = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0-dev-00909"; sha256 = "1rz1zzyamnl8g4ccscaaij2bkhpd4md4sr9k28i0zwvij4kpj22z"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.80.2"; sha256 = "17n0f4gfxz69fzd7zmgimbxfja15vq902arap2rqjr1hxp8sck7g"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.80.2"; sha256 = "1951b7rpisaymb37j846jq01pjd05l4fjlnf56blh33ihxyj2jzi"; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) (fetchNuGet { pname = "Splat"; version = "10.0.1"; sha256 = "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9"; }) - (fetchNuGet { pname = "Splat"; version = "9.6.1"; sha256 = "1sd3gbcv21vwl3spcpmy4d7nzcs0x6m72qj8qfbv4dvgpvbv5sdy"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "Splat"; version = "14.1.17"; sha256 = "1akhj04sbxhhfj6zdlr5c0sh696747b0x46g3ayv4yl15kwq6pz5"; }) (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.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.0.1"; sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.0.1"; sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; }) + (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.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.1.0"; sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (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.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.1"; sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; }) + (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.TraceSource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (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.Drawing.Common"; version = "5.0.1"; sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; }) + (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.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.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (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"; }) @@ -128,7 +127,6 @@ (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.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) (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"; }) @@ -162,6 +160,7 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) (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"; }) @@ -182,7 +181,7 @@ (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 = "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.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"; }) @@ -200,10 +199,9 @@ (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.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) - (fetchNuGet { pname = "ThemeEditor.Controls.ColorPicker"; version = "0.10.0"; sha256 = "0sib6cf2xkss48rm3shbwr57rbzz7d2zq0fvjp0hwsa1mb985p2b"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.1"; sha256 = "095vinsbb9pbphbhh7x7rxvs8a3b9w1nnz7gxn9bw5is01qnhgdm"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "ThemeEditor.Controls.ColorPicker"; version = "0.10.12"; sha256 = "17kh28fkywqmz5yams8wzr50ihkv52y24gk8bz9fxl6kfzmgk0ky"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.10.1"; sha256 = "1wafa009cjj1rziias2n00ap0g8kdg2iig5sjlrxj2kld24lgbli"; }) (fetchNuGet { pname = "WebSocketSharp-netstandard"; version = "1.0.1"; sha256 = "0q89wiqpli72333zsa04d1vzq9xj0583hn5mih9sdd84myksz5b0"; }) (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) diff --git a/pkgs/tools/games/opentracker/remove-project.patch b/pkgs/tools/games/opentracker/remove-project.patch new file mode 100644 index 0000000000000..22a2068512e07 --- /dev/null +++ b/pkgs/tools/games/opentracker/remove-project.patch @@ -0,0 +1,14 @@ +diff --git a/OpenTracker.sln b/OpenTracker.sln +index 0a8c438..77124e1 100644 +--- a/OpenTracker.sln ++++ b/OpenTracker.sln +@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 + VisualStudioVersion = 16.0.29806.167 + MinimumVisualStudioVersion = 10.0.40219.1 + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker", "OpenTracker\OpenTracker.csproj", "{9D32A24F-7FF0-4632-B663-5AD2D64A6C87}" +- ProjectSection(ProjectDependencies) = postProject +- {732A9A56-32B4-4149-B3A5-F2A4F48293D3} = {732A9A56-32B4-4149-B3A5-F2A4F48293D3} +- EndProjectSection + EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker.Models", "OpenTracker.Models\OpenTracker.Models.csproj", "{5DB05A1F-56E3-4035-8898-5CFB22DB3568}" + EndProject diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index 039e46f71944f..56e94807fec16 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "scarab"; - version = "1.19.0.0"; + version = "1.20.0.0"; src = fetchFromGitHub { owner = "fifty-six"; repo = pname; rev = "v${version}"; - sha256 = "10pmzy7nhcam0686kpn64cgar59shzzy5k7j3vrgmnm27zgkr22v"; + sha256 = "sha256-VfXIxir4SaELuF2QpqbVzTvlkYxwERa0ddGEn1OAh04="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 13e8705f768cc..64e4a49445af0 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation rec { pname = "agi"; - version = "3.2.1"; + version = "3.3.0"; src = fetchzip { url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-wguQERJ5Zvcodk7QMtloCwI4qYmatmHCFhgArbS07EA="; + sha256 = "sha256-vKq1pe4Z0blSvNgez+/MP2rA0+QfCyr3RsCGX4GMR08="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 2b17fa796e845..f060216935047 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { LINKFLAGS += ${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)} - -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss + -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ljpeg -ltiff -lpng -lssl ; ''; in '' diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 310045cd23201..0e9b83e45600e 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-FIskGHamKYYUtYmgwh7dS+bs2UPWIyBiviPkDAbVY+0="; + sha256 = "sha256-BtSe14LWb7v+I0V75C1Ej+klZVU22L6FQfNUPp27IQQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 8e287f0073494..ec2e5ce64c937 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.83"; + version = "2.85"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - hash = "sha256-Kz1uh3fMbADd39seunfL5O2Q31VLGKhu/ZuKi9/kuEc="; + hash = "sha256-GyW9OEolV97WtrSdIxp4MCP3JIyA1c/DQSqg8jLC0WQ="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--with-context=$out/share/texmf/tex/context/third" ]; - NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; + env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' mv $out/share/info/asymptote/*.info $out/share/info/ diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index ac777051d10ad..1a1b52502f7d1 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { # gcc-10. Otherwise build fails as: # ld: CMakeFiles/rbal.dir/src/statsearchbl.cpp.o:(.bss+0x0): # multiple definition of `minrow'; CMakeFiles/rbal.dir/src/linban.c.o:(.bss+0xa3a): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postPatch = '' rm cuneiform_src/Kern/hhh/tigerh/h/strings.h diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 252510f805968..6722e1d781923 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -35,7 +35,7 @@ gcc9Stdenv.mkDerivation rec { ++ optional jpegSupport libjpeg ++ optional pngSupport libpng; - NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; + env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; meta = with lib; { description = "A lightweight, highly customizable and scriptable image viewer"; diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix index 2c486b4753229..4004be69ffb0a 100644 --- a/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-CkZxxMoV2cqyh4ck81ODPxTYuSeQ8Q33a/4lL7UOfIY="; + hash = "sha256-9MDmeHid/faHeBjBfPgpRMjMMXZeHKP0VZZJtEQgBhs="; fetchSubmodules = true; }; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 532201c4818ab..5723d40141def 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-iG7XaPBNTmt/yNMeSY8UKwesFJFUECAsOYQ0idegk1w="; + sha256 = "sha256-JJSAU9z3JOlvfW6AW/P/KrjhOcD0ax8TmqgqM48rlAo="; }; - cargoHash = "sha256-7bjsxbUsHjsVER0HaQ+x0dkaAI2sb7if8mS6JwQIbzc="; + cargoHash = "sha256-UV2iQFbeGvJs8kEowYRNv8DxEGwaIWL1/3A2oUCcauw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 9615b57e0c1a7..5503e9eb38e03 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glmark2"; - version = "2021.12"; + version = "2023.01"; src = fetchFromGitHub { owner = "glmark2"; repo = "glmark2"; rev = version; - sha256 = "sha256-S6KkazkG+kdx02MPwrYvCFWSOtM6t5xT0OTE9PLCzas="; + sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 0e6d0b0adb4e9..f9766650ec419 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -14,7 +14,6 @@ , libtiff , libpng , curl -, krita ? null , gimp ? null , gmic , cimg @@ -26,6 +25,8 @@ , gnused , coreutils , jq +, nix-update-script +, gimpPlugins }: let @@ -38,13 +39,6 @@ let description = "GIMP plugin for the G'MIC image processing framework"; }; - krita = { - extraDeps = [ - krita - ]; - description = "Krita plugin for the G'MIC image processing framework"; - }; - standalone = { description = "Versatile front-end to the image processing framework G'MIC"; }; @@ -58,13 +52,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc="; + sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w="; }; nativeBuildInputs = [ @@ -105,7 +99,17 @@ mkDerivation rec { wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" ''; + passthru = { + tests = { + gimp-plugin = gimpPlugins.gmic; + }; + + updateScript = nix-update-script { }; + }; + meta = with lib; { + # Broken since 3.2.0 update, cannot handle system gmic and cimg. + broken = true; description = variants.${variant}.description; homepage = "http://gmic.eu/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6e811e1aa3dfc..52499196bba4b 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -21,11 +21,12 @@ , gnused , coreutils , jq +, gmic-qt }: stdenv.mkDerivation rec { pname = "gmic"; - version = "3.2.0"; + version = "3.2.1"; outputs = [ "out" "lib" "dev" "man" ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { owner = "dtschump"; repo = "gmic"; rev = "v.${version}"; - hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs="; + hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI="; }; # TODO: build this from source @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M="; + hash = "sha256-f8d9jTVnHwSoyMuiM+Qv86e/BYX9SSx9cl3borihxnc="; }; nativeBuildInputs = [ @@ -81,6 +82,11 @@ stdenv.mkDerivation rec { ''; passthru = { + tests = { + # Needs to update in lockstep. + inherit gmic-qt; + }; + updateScript = writeShellScript "${pname}-update-script" '' set -o errexit PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]} @@ -95,7 +101,7 @@ stdenv.mkDerivation rec { for component in src gmic_stdlib; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run - update-source-version "--source-key=$component" "gmic" 0 "$(printf '0%.0s' {1..64})" + update-source-version "--source-key=$component" "gmic" 0 "${lib.fakeHash}" update-source-version "--source-key=$component" "gmic" $latestVersion done ''; diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix index 2406df8152690..78cb959a8fc22 100644 --- a/pkgs/tools/graphics/hobbits/default.nix +++ b/pkgs/tools/graphics/hobbits/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "hobbits"; - version = "0.53.2"; + version = "0.54.0"; src = fetchFromGitHub { owner = "Mahlet-Inc"; repo = "hobbits"; rev = "v${version}"; - hash = "sha256-X2DotmzqeIESkO6o39si4kEkRhLO7yBr6Djh+0s+lFc="; + hash = "sha256-zbpYVoWOffMxx2RS5gXw+rpwdxoRutH/yzZqJIc57UU="; }; postPatch = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_PFFFT=ON" ]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; meta = with lib; { description = "A multi-platform GUI for bit-based analysis, processing, and visualization"; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 07f605a4cbffb..b450537b5a428 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Fixes a build failure on aarch64-darwin. Define for all Darwin targets for when x86_64-darwin # upgrades to a newer SDK. - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; patchPhase = '' patchShebangs extresso/extresso diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/tools/graphics/ifm/default.nix index 7b9d49b1273ff..854a35262b078 100644 --- a/pkgs/tools/graphics/ifm/default.nix +++ b/pkgs/tools/graphics/ifm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: libvars.a(vars-freeze-lex.o):src/libvars/vars-freeze-lex.l:23: # multiple definition of `line_number'; ifm-main.o:src/ifm-main.c:46: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory diff --git a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch b/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch deleted file mode 100644 index 13e18fd04476b..0000000000000 --- a/pkgs/tools/graphics/jbig2enc/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 53ce5fe7e73d7ed95c9e12b52dd4984723f865fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@gmail.com> -Date: Sun, 6 Apr 2014 21:25:27 +0200 -Subject: [PATCH] fix build with leptonica 1.70 - ---- - configure.ac | 1 + - src/jbig2.cc | 13 +++++++++---- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fe37c22..753a607 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,7 @@ AC_CHECK_LIB([lept], [findFileFormatStream], [], [ - echo "Error! Leptonica not detected." - exit -1 - ]) -+AC_CHECK_FUNCS(expandBinaryPower2Low,,) - # test for function - it should detect leptonica dependecies - - # Check for possible dependancies of leptonica. -diff --git a/src/jbig2.cc b/src/jbig2.cc -index e10f042..515c1ef 100644 ---- a/src/jbig2.cc -+++ b/src/jbig2.cc -@@ -130,11 +130,16 @@ segment_image(PIX *pixb, PIX *piximg) { - // input color image, so we have to do it this way... - // is there a better way? - // PIX *pixd = pixExpandBinary(pixd4, 4); -- PIX *pixd = pixCreate(piximg->w, piximg->h, 1); -- pixCopyResolution(pixd, piximg); -- if (verbose) pixInfo(pixd, "mask image: "); -- expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, -+ PIX *pixd; -+#ifdef HAVE_EXPANDBINARYPOWER2LOW -+ pixd = pixCreate(piximg->w, piximg->h, 1); -+ pixCopyResolution(pixd, piximg); -+ expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl, - pixd4->data, pixd4->w, pixd4->h, pixd4->wpl, 4); -+#else -+ pixd = pixExpandBinaryPower2(pixd4, 4); -+#endif -+ if (verbose) pixInfo(pixd, "mask image: "); - - pixDestroy(&pixd4); - pixDestroy(&pixsf4); diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix deleted file mode 100644 index ea5008dcf5cba..0000000000000 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: - -stdenv.mkDerivation rec { - pname = "jbig2enc"; - version = "0.28"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "jbig2enc"; - rev = "${version}-dist"; - hash = "sha256-Y3IVTjvO5tqn/O076y/llnTyenKpbx1WyT/JFZ/s0VY="; - }; - - propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; - - patches = [ - # https://github.com/agl/jbig2enc/commit/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa - ./53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.patch - ]; - - # This is necessary, because the resulting library has - # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib - # in its rpath, which means that patchelf --shrink-rpath removes - # the /nix/store one. By cleaning up before fixup, we ensure that - # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. - preFixup = '' - make clean - ''; - - meta = { - description = "Encoder for the JBIG2 image compression format"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/tools/graphics/libyafaray/default.nix b/pkgs/tools/graphics/libyafaray/default.nix index db48aa678cc55..22bbfddbcf5d4 100644 --- a/pkgs/tools/graphics/libyafaray/default.nix +++ b/pkgs/tools/graphics/libyafaray/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-UVBA1vXOuLg4RT+BdF4rhbZ6I9ySeZX0N81gh3MH84I="; }; + postPatch = '' + sed '1i#include <memory>' -i \ + include/geometry/poly_double.h include/noise/noise_generator.h # gcc12 + ''; + preConfigure = '' NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" ''; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index eb0a6ec11fc95..c0c770631032d 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.0.2"; + version = "11.1.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4468"; - sha256 = "EW96q9DsM1lQ3QZAmp0hZhQ6icsZFDGa3wYmjCQmBRE="; + rev = "4489"; + sha256 = "00qagNgNZ+9sedBme0WmJfedF4WST8EFeqUJ5Wx3yEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index 4297db1c8bcd6..08ec885aed143 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "nip2"; - version = "8.7.1"; + version = "8.9.1"; src = fetchurl { url = "https://github.com/libvips/nip2/releases/download/v${version}/nip2-${version}.tar.gz"; - sha256 = "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"; + sha256 = "sha256-t14m6z+5lPqpiOjgdDbKwqSWXCyrCL7zlo6BeoZtds0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index a2adb7ee61d97..e63875c19cd31 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: +{ lib +, stdenv +, fetchzip +, autoreconfHook +, dos2unix +, doxygen +, freeimage +, libpgf +}: stdenv.mkDerivation rec { pname = "pgf"; - version = "6.14.12"; + version = "7.21.7"; - src = fetchurl { - url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; - sha256 = "1vfm12cfq3an3xg0679bcwdmjq2x1bbij1iwsmm60hwmrm3zvab0"; + src = fetchzip { + url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip"; + hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0="; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool dos2unix libpgf freeimage doxygen ]; - - patchPhase = '' - sed 1i'#include <inttypes.h>' -i src/PGF.cpp - sed s/__int64/int64_t/g -i src/PGF.cpp - rm include/FreeImage.h include/FreeImagePlus.h + postPatch = '' + find . -type f | xargs dos2unix + mv README.txt README ''; - preConfigure = "dos2unix configure.ac; sh autogen.sh"; + nativeBuildInputs = [ + autoreconfHook + dos2unix + doxygen + ]; -# configureFlags = optional static "--enable-static --disable-shared"; + buildInputs = [ + freeimage + libpgf + ]; meta = { homepage = "https://www.libpgf.org/"; diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index aed3d485c4ad2..d750d243fc36c 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -1,6 +1,9 @@ { lib , stdenv , fetchfossil +, tcl + +, enableTcl ? true }: stdenv.mkDerivation { @@ -19,14 +22,27 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace open "test -f" ''; + nativeBuildInputs = lib.optional enableTcl tcl.tclPackageHook; + + buildInputs = lib.optional enableTcl tcl; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + buildFlags = [ "pikchr" ] ++ lib.optional enableTcl "piktcl"; + installPhase = '' + runHook preInstall install -Dm755 pikchr $out/bin/pikchr install -Dm755 pikchr.out $out/lib/pikchr.o install -Dm644 pikchr.h $out/include/pikchr.h + '' + lib.optionalString enableTcl '' + cp -r piktcl $out/lib/piktcl + '' + '' + runHook postInstall ''; + dontWrapTclBinaries = true; + doCheck = true; checkTarget = "test"; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 3ee17eb630a1e..ac5855304f4ad 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -7,14 +7,15 @@ , libjpeg , gd , freetype +, runCommand }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ploticus"; version = "2.42"; src = fetchurl { - url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz"; + url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_src.tar.gz"; sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; }; @@ -42,6 +43,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postPatch = '' + substituteInPlace src/pl.h --subst-var out + ''; + preBuild = '' cd src ''; @@ -62,6 +67,16 @@ stdenv.mkDerivation rec { ln -s "pl" "$out/bin/ploticus" ''; + passthru.tests = { + prefab = runCommand "ploticus-prefab-test" { + buildInputs = [ finalAttrs.finalPackage ]; + } '' + # trivial test to see if the prefab path munging works + mkdir $out/ + pl -prefab scat inlinedata="A 1 2" x=2 y=3 -png -o $out/out.png + ''; + }; + meta = with lib; { description = "A non-interactive software package for producing plots and charts"; longDescription = '' @@ -77,4 +92,4 @@ stdenv.mkDerivation rec { homepage = "https://ploticus.sourceforge.net/"; platforms = with platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 2067d1a97e2e6..c759b23b79a7c 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 0cf407faa0dc3..88993dbe8ce64 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_gfx libjpeg libpng opencv ]; makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL -I${SDL_gfx}/include/SDL"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL}/include/SDL -I${SDL_gfx}/include/SDL"; # Disable building of linux-only demos on darwin systems patches = lib.optionals stdenv.isDarwin [ ./0001-dont-build-demos.patch ]; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index f48fcd4a451fe..db546583f37cb 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OEknK4uLINui6U+mz0P9K36pEzfx+TevGvLqM0RXkSM="; + sha256 = "sha256-ppBJx3Yax2w8/D9DQayS+jfqFP1sa9pdVGeAHExg+9Y="; }; - cargoSha256 = "sha256-L3Km+VIoIun1wjKyJ3dscK5PSfQVR7qyjU6y1j9quSg="; + cargoHash = "sha256-l/Ytlzyoo27geZZ7wFYHStqD6TvMuI4SC0+DYjTK57w="; meta = with lib; { description = "An SVG rendering library"; diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix index bccb336b702ce..a0b2accb6b025 100644 --- a/pkgs/tools/graphics/sanjuuni/default.nix +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sanjuuni"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "MCJack123"; repo = "sanjuuni"; rev = version; - sha256 = "sha256-WWDbPwiU4YD8XCMuqLWEGinpHkq2FNJZsz3GyVqjDHQ="; + sha256 = "sha256-8IbdLXWUtT2VN6Eu1b8x4DnyI8JOd/12t0XDa6o3N+A="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/MCJack123/sanjuuni"; description = "A command-line tool that converts images and videos into a format that can be displayed in ComputerCraft"; + changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}"; maintainers = [ maintainers.tomodachi94 ]; license = licenses.gpl2Plus; broken = stdenv.isDarwin; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 4a75e28deb8ac..b66c2d0a7590f 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.236.0"; + version = "1.3.239.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "sdk-${finalAttrs.version}"; - hash = "sha256-zx/fjDKgteWizC3O1bL4WSwwPNw2/2m0xCnCiOttgAo="; + hash = "sha256-Awtsz4iMuS3JuvaYHRxjo56EnnZPjo9YGfeYAi7lmJY="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index ce97f1c703488..e61489fadf00d 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application for generating 3D structures by specifying a design grammar"; - homepage = "http://structuresynth.sourceforge.net"; + homepage = "https://structuresynth.sourceforge.net"; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 14831c70b0478..db44108112f3c 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -8,9 +8,10 @@ , Foundation , python3 , fetchFromGitHub -, fetchpatch -, autoreconfHook +, meson +, ninja , gtk-doc +, docbook-xsl-nons , gobject-introspection # Optional dependencies , libjpeg @@ -38,15 +39,15 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.13.3"; + version = "8.14.1"; - outputs = [ "bin" "out" "man" "dev" ]; + outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo="; + hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -56,9 +57,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - autoreconfHook - gtk-doc + meson + ninja + docbook-xsl-nons gobject-introspection + ] ++ lib.optionals (!stdenv.isDarwin) [ + gtk-doc ]; buildInputs = [ @@ -95,11 +99,17 @@ stdenv.mkDerivation rec { glib ]; - autoreconfPhase = '' - NOCONFIGURE=1 ./autogen.sh - ''; + mesonFlags = [ + "-Dcgif=disabled" + "-Dspng=disabled" + "-Dpdfium=disabled" + "-Dnifti=disabled" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-Dgtk_doc=true" + ]; meta = with lib; { + changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; homepage = "https://libvips.github.io/libvips/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index ba96d721632c4..39492eefb8303 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.27"; + version = "3.28"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-B/FBX63JnBdshNLVMPA0qGnm0c/RGilIahX3VjJnpkI="; + hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "DEFINES+=wayland" "CONFIG+=release" - ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; @@ -51,10 +51,11 @@ stdenv.mkDerivation rec { Client application to display hardware implementation details for GPUs supporting the Vulkan API by Khronos. The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc. ''; - homepage = "https://vulkan.gpuinfo.org/"; - platforms = platforms.unix; - license = licenses.gpl2Only; + homepage = "https://vulkan.gpuinfo.org/"; + platforms = platforms.unix; + license = licenses.gpl2Only; maintainers = with maintainers; [ pedrohlc ]; + changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; }; diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index a5581e7d6f1dd..003a3c18bfbf6 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchurl , cmake +, ffmpeg , libdrm , libglvnd , libffi @@ -29,6 +30,7 @@ let # does not search for system-wide installations. # It also expects the version specified in the repository, which can be incompatible # with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages. + # The revisions are extracted from https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/fetch_sources.py#L290 amber = fetchFromGitHub { owner = "google"; repo = "amber"; @@ -44,43 +46,49 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "22d39cd684d136a81778cc17a0226ffad40d1cee"; - hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw="; + rev = "a0ad0d7067521fff880e36acfb8ce453421c3f25"; + hash = "sha256-ZKkFHGitLjw5LPJW1TswIJ+KulkrS8C4G3dUF5U/F2c="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0"; - hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + rev = "f98473ceeb1d33700d01e20910433583e5256030"; + hash = "sha256-RSUmfp9QZ7yRbLdFygz9mDfrgUUT8og+ZD9/6VkghMo="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468"; - hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc="; + rev = "87d5b782bec60822aa878941e6b13c0a9a954c9b"; + hash = "sha256-Bv10LM6YXaH2V64oqAcrps23higHzCjlIYYBob5zS4A="; + }; + video-parser = fetchFromGitHub { + owner = "nvpro-samples"; + repo = "vk_video_samples"; + rev = "7d68747d3524842afaf050c5e00a10f5b8c07904"; + hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "135da3a538263ef0d194cab25e2bb091119bdc42"; - hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4="; + rev = "9a2e576a052a1e65a5d41b593e693ff02745604b"; + hash = "sha256-DBA2FeV0G/HI8GUMtGYO52jk7wM4HMlKLDA4b+Wmo+k="; }; in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.4.1"; + version = "1.3.5.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g="; + hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA="; }; outputs = [ "out" "lib" ]; prePatch = '' - mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs + mkdir -p external/renderdoc/src external/spirv-headers external/video-parser external/vulkan-docs cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h @@ -89,11 +97,13 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${glslang} external/glslang/src cp -r ${spirv-tools} external/spirv-tools/src cp -r ${spirv-headers} external/spirv-headers/src + cp -r ${video-parser} external/video-parser/src cp -r ${vulkan-docs} external/vulkan-docs/src chmod u+w -R external ''; buildInputs = [ + ffmpeg libdrm libffi libglvnd diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index bf60e8ed85f32..63d763a893daf 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.236.0"; + version = "1.3.239.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "sdk-${version}"; - hash = "sha256-NlBS7UuV2AZPY5VyoqTnTf63M7fHIPQDZRtMZ4XwMzA="; + hash = "sha256-0t9HGyiYk3twYQLFCcWsrPiXY1dqjdCadjP4yMLoFwA="; }); nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 11cef8eeb886b..ec1862df9cd77 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -10,6 +10,7 @@ , libXrandr , libffi , libxcb +, pkg-config , wayland , which , xcbutilkeysyms @@ -24,18 +25,18 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.3.236.0"; + version = "1.3.239.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - hash = "sha256-0dGD3InmEd9hO8+uVGMqBHXXfyX8tswyuOaZCftudz0="; + hash = "sha256-zgkuTy9ccg8D/riA1CM/PnbXW1R0jWEINtcEVilETwk="; fetchSubmodules = true; }); - nativeBuildInputs = [ cmake python3 jq which ]; + nativeBuildInputs = [ cmake python3 jq which pkg-config ]; buildInputs = [ expat diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 8e94997db6c8e..da84038fd0fdb 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.236.0"; + version = "1.3.239.0"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - hash = "sha256-PmNTpdAkXJkARLohRtUOuKTZPoKgeVF4DAo1wsAq5xE="; + hash = "sha256-DQGwxTZzS0eATKodMpeJaQdXADvomiqPOspDYoPFZjI="; }); nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch b/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch index 5cbcec6a8a145..5d09bff9c958c 100644 --- a/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch +++ b/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch @@ -1,8 +1,8 @@ diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt -index 616fbc96..d2811c8d 100644 +index a2f026e7..327f5dba 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt -@@ -262,14 +262,7 @@ else() +@@ -257,14 +257,7 @@ else() endif() if(APPLE) @@ -18,7 +18,7 @@ index 616fbc96..d2811c8d 100644 else() install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() -@@ -309,14 +302,7 @@ else() +@@ -302,14 +295,7 @@ else() endif() if(APPLE) @@ -35,10 +35,10 @@ index 616fbc96..d2811c8d 100644 install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake -index 9b823f95..238c3e67 100644 +index 9b823f95..0c43a2c9 100644 --- a/cube/macOS/cube/cube.cmake +++ b/cube/macOS/cube/cube.cmake -@@ -72,12 +69,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" +@@ -72,12 +72,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" # Copy the MoltenVK lib into the bundle. if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") add_custom_command(TARGET vkcube POST_BUILD @@ -56,10 +56,10 @@ index 9b823f95..238c3e67 100644 DEPENDS vulkan) endif() diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake -index eae4de3c..0acd18f9 100644 +index eae4de3c..e528ae26 100644 --- a/cube/macOS/cubepp/cubepp.cmake +++ b/cube/macOS/cubepp/cubepp.cmake -@@ -74,12 +71,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" +@@ -74,12 +74,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" # Copy the MoltenVK lib into the bundle. if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") add_custom_command(TARGET vkcubepp POST_BUILD @@ -107,10 +107,10 @@ index bad3c414..b498906d 100644 find_library(COCOA NAMES Cocoa) diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt -index fb236a5b..3c8270d4 100644 +index d23dcf89..32aa0ebb 100644 --- a/vulkaninfo/CMakeLists.txt +++ b/vulkaninfo/CMakeLists.txt -@@ -139,9 +139,4 @@ elseif(APPLE) +@@ -136,9 +136,5 @@ elseif(APPLE) add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT) endif() @@ -119,37 +119,5 @@ index fb236a5b..3c8270d4 100644 -else() - install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -endif() -- +install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/vulkaninfo/macOS/vulkaninfo.cmake b/vulkaninfo/macOS/vulkaninfo.cmake -index 9614530e..56af3b89 100644 ---- a/vulkaninfo/macOS/vulkaninfo.cmake -+++ b/vulkaninfo/macOS/vulkaninfo.cmake -@@ -48,26 +48,4 @@ set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json - MACOSX_PACKAGE_LOCATION - "Resources/vulkan/icd.d") --# Xcode projects need some extra help with what would be install steps. --if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") -- add_custom_command(TARGET vulkaninfo-bundle POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -- ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vulkaninfo.app/Contents/Frameworks/libMoltenVK.dylib -- DEPENDS vulkan) --else() -- add_custom_command(TARGET vulkaninfo-bundle POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -- ${CMAKE_CURRENT_BINARY_DIR}/vulkaninfo.app/Contents/Frameworks/libMoltenVK.dylib -- DEPENDS vulkan) --endif() -- --# Keep RPATH so fixup_bundle can use it to find libraries --set_target_properties(vulkaninfo-bundle PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) --install(TARGETS vulkaninfo-bundle BUNDLE DESTINATION "vulkaninfo") --# Fix up the library search path in the executable to find (loader) libraries in the bundle. When fixup_bundle() is passed a bundle --# in the first argument, it looks at the Info.plist file to determine the BundleExecutable. In this case, the executable is a --# script, which can't be fixed up. Instead pass it the explicit name of the executable. --install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/vulkaninfo/vulkaninfo.app/Contents/MacOS/vulkaninfo \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+install(TARGETS vulkaninfo-bundle BUNDLE DESTINATION "Applications") diff --git a/pkgs/tools/graphics/wgpu-utils/default.nix b/pkgs/tools/graphics/wgpu-utils/default.nix index 460d45c1eac29..ce445ce6a00fd 100644 --- a/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/pkgs/tools/graphics/wgpu-utils/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-utils"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu"; rev = "v${version}"; - hash = "sha256-jHjV2A949m/KyAkkdaP00d5j+V96jRQah4LKs8LcYQk="; + hash = "sha256-MdomiE/qHpyVFlgH5wGsFDiXIp6p1wHXsAtmlo/XfEg="; }; - cargoHash = "sha256-XbEgcPLL3UZ4zdV90AEFI8RlkZAMuLXznlkBcAG/0l8="; + cargoHash = "sha256-83iQ/YcItRsTfp73xi5LZF8AyvyAXJCHuNWXgc1wHkM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 9bf4a281e062a..3542c06ac09b5 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; # Disable assertions which include -dev QtBase file paths. - NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG"; + env.NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG"; configureFlags = [ "--without-python" diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/tools/inputmethods/evdevremapkeys/default.nix index 73344ca269005..497a4abc5956e 100644 --- a/pkgs/tools/inputmethods/evdevremapkeys/default.nix +++ b/pkgs/tools/inputmethods/evdevremapkeys/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "evdevremapkeys"; - version = "0.1.0"; + version = "unstable-2021-05-04"; src = fetchFromGitHub { owner = "philipl"; repo = pname; - rev = "68fb618b8142e1b45d7a1e19ea9a5a9bbb206144"; - sha256 = "0c9slflakm5jqd8s1zpxm7gmrrk0335m040d7m70hnsak42jvs2f"; + rev = "9b6f372a9bdf8b27d39f7e655b74f6b9d1a8467f"; + sha256 = "sha256-FwRbo0RTiiV2AB7z6XOalMnwMbj15jM4Dxs41TsIOQI="; }; propagatedBuildInputs = with python3Packages; [ @@ -16,6 +16,7 @@ python3Packages.buildPythonPackage rec { pyxdg python-daemon evdev + pyudev ]; # hase no tests diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 8afd4804e0ed2..e7b65f6c2147f 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -1,20 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitea }: rustPlatform.buildRustPackage rec { pname = "evscript"; - version = "unstable-2021-06-16"; + version = "unstable-2022-11-20"; - src = fetchFromGitHub { - owner = "unrelentingtech"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "valpackett"; repo = pname; - rev = "25912c0b6446f31b0f64485af3fa4aa8a93b33df"; - sha256 = "sha256-apq3kHipEX6zOTNwqpIQR46JqmeE7EKVSOGrNNSkyu8="; + rev = "ba997c9723a91717c683f08e9957d0ecea3da6cd"; + sha256 = "sha256-wuTPcBUuPK1D4VO8BXexx9AdiPM+X0TkJ3G7b7ofER8="; }; - cargoSha256 = "sha256-1aR9/fhJQ+keRIxSG2cpY1HTalE6nM+MTb1Za3Tot28="; + cargoSha256 = "sha256-5jcb/MajXV9bp0T9Og8d5TEzTwQyiyPTPHeWh8Ewr8Q="; meta = with lib; { - homepage = "https://github.com/unrelentingtech/evscript"; + homepage = "https://codeberg.org/valpackett/evscript"; description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; license = licenses.unlicense; maintainers = with maintainers; [ milesbreslin ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix index 5422efb9d38df..5a5fb2da22827 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-unikey/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fcitx gettext ]; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; preInstall = '' substituteInPlace src/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index d8181142c09ff..e90b694997a9b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.19.10"; + version = "2.20.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "Ie3cQ1YC+LB5I5LtKyJ0RO+dyjFbVsemW110t3gPmCM="; + hash = "sha256-evKCKPddQ4yRgI0NDOk6iEkS4910cYhLTvicLxJEbxE="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch b/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch new file mode 100644 index 0000000000000..cb587ccf47d8b --- /dev/null +++ b/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch @@ -0,0 +1,21 @@ +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh +index 601c1c3f..fcb7305d 100755 +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then + umount $TMPDIR/cache/gvfs + fi + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index e3403e334b8b4..e3b4acf7f28dd 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { pythonInterpreter = python3Runtime.interpreter; pythonSitePackages = python3.sitePackages; }) + ./build-without-dbus-launch.patch ]; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 5d5bd7bdfc2be..843584a7d443d 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp, +{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, yaml-cpp, libevdev, udev, boost }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libevdev udev libyamlcpp boost ]; + buildInputs = [ libevdev udev yaml-cpp boost ]; meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index 9824a46d43ee8..f8caefa6087a5 100644 --- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }: +{ stdenv, lib, fetchFromGitLab, pkg-config, yaml-cpp, libevdev }: stdenv.mkDerivation rec { pname = "dual-function-keys"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevdev libyamlcpp ]; + buildInputs = [ libevdev yaml-cpp ]; prePatch = '' substituteInPlace config.mk --replace \ diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix index 66ce5b04cd7f9..f04964fbb8398 100644 --- a/pkgs/tools/inputmethods/lisgd/default.nix +++ b/pkgs/tools/inputmethods/lisgd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - hash = "sha256-VH+wZyVnfPqFxRwITU/LzkOAexFKm39LlcFxzhjRMdY="; + hash = "sha256-3kmGpgZpCH7CkN+d1+5ygXOi8E0Ojcgw6Fbd0T9z7z0="; }; inherit patches; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index f20e2899f1859..bb974fbc8b58c 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, libiconv, skktools }: +{ lib, stdenv, fetchurl, buildPackages, iconv, skktools }: let # kana to kanji @@ -25,15 +25,13 @@ let url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; }; - - iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc; in stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2020-03-24"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ iconv skktools ]; strictDeps = true; @@ -51,8 +49,7 @@ stdenv.mkDerivation { for src in $srcs; do dst=$out/share/$(dictname $src) echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - ${lib.getBin iconvBin}/bin/iconv \ - -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst + iconv -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst done # combine .L .edict and .assoc for convenience diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 298de6a641efa..ff9786cfe3ba4 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-oz3+hNNjQ/5vXWPMuhA2N2KK8W8S42WeSeDbhV4oJ9M="; + sha256 = "sha256-/0XeFW0cdS1/UaE/z2FROwk2dTyZMqXjiBzt62x8f8o="; }; patches = lib.optionals withPantheon [ diff --git a/pkgs/tools/misc/0x/Cargo.lock b/pkgs/tools/misc/0x/Cargo.lock new file mode 100644 index 0000000000000..4c0c44ae6ea1e --- /dev/null +++ b/pkgs/tools/misc/0x/Cargo.lock @@ -0,0 +1,232 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "argh" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" +dependencies = [ + "argh_shared", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "argh_shared" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "colorous" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882e392738ed515520f38708166e9efec85ee154f80bf1fc64510e2fc54bf481" + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "ohx" +version = "0.1.0" +dependencies = [ + "argh", + "colorous", + "palette", +] + +[[package]] +name = "palette" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" +dependencies = [ + "approx", + "num-traits", + "palette_derive", + "phf", +] + +[[package]] +name = "palette_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" +dependencies = [ + "find-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "proc-macro2" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +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 = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + +[[package]] +name = "serde" +version = "1.0.143" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "syn" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" diff --git a/pkgs/tools/misc/0x/add-Cargo-lock.diff b/pkgs/tools/misc/0x/add-Cargo-lock.diff deleted file mode 100644 index 01498c2977b6d..0000000000000 --- a/pkgs/tools/misc/0x/add-Cargo-lock.diff +++ /dev/null @@ -1,236 +0,0 @@ -diff -Naur 0x-main.old/Cargo.lock 0x-main/Cargo.lock ---- 0x-main.old/Cargo.lock 1969-12-31 21:00:00.000000000 -0300 -+++ 0x-main/Cargo.lock 2022-08-12 02:28:29.538688138 -0300 -@@ -0,0 +1,232 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "approx" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -+dependencies = [ -+ "num-traits", -+] -+ -+[[package]] -+name = "argh" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" -+dependencies = [ -+ "argh_derive", -+ "argh_shared", -+] -+ -+[[package]] -+name = "argh_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" -+dependencies = [ -+ "argh_shared", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "argh_shared" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" -+ -+[[package]] -+name = "autocfg" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -+ -+[[package]] -+name = "colorous" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "882e392738ed515520f38708166e9efec85ee154f80bf1fc64510e2fc54bf481" -+ -+[[package]] -+name = "find-crate" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" -+dependencies = [ -+ "toml", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "ohx" -+version = "0.1.0" -+dependencies = [ -+ "argh", -+ "colorous", -+ "palette", -+] -+ -+[[package]] -+name = "palette" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49" -+dependencies = [ -+ "approx", -+ "num-traits", -+ "palette_derive", -+ "phf", -+] -+ -+[[package]] -+name = "palette_derive" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427" -+dependencies = [ -+ "find-crate", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "phf" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -+dependencies = [ -+ "phf_macros", -+ "phf_shared", -+] -+ -+[[package]] -+name = "phf_generator" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -+dependencies = [ -+ "phf_shared", -+ "rand", -+] -+ -+[[package]] -+name = "phf_macros" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -+dependencies = [ -+ "phf_generator", -+ "phf_shared", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "phf_shared" -+version = "0.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -+dependencies = [ -+ "siphasher", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -+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 = "rand" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -+dependencies = [ -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -+ -+[[package]] -+name = "serde" -+version = "1.0.143" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" -+ -+[[package]] -+name = "siphasher" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -+ -+[[package]] -+name = "syn" -+version = "1.0.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" diff --git a/pkgs/tools/misc/0x/default.nix b/pkgs/tools/misc/0x/default.nix index a8264df3c34cf..b76c13e662873 100644 --- a/pkgs/tools/misc/0x/default.nix +++ b/pkgs/tools/misc/0x/default.nix @@ -14,9 +14,13 @@ rustPlatform.buildRustPackage { hash = "sha256-NzD/j8rBfk/cpoBnkFHFqpXz58mswLZr8TUS16vlrZQ="; }; - cargoPatches = [ ./add-Cargo-lock.diff ]; + cargoLock = { + lockFile = ./Cargo.lock; + }; - cargoHash = "sha256-3qaPGIbl1jF4784KGxbfBTgW/0ayxIO9Ufp9vkhIJa4="; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; meta = with lib; { homepage = "https://github.com/mcy/0x"; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index 5c7c488af8522..d95efa0dbd085 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-qp9K0lF7joFhfepncUoHvekMS+fZcPaBrsWY2DKmIUs="; + sha256 = "sha256-svEk+IFttkCXmoAOFH3k2rRC/OL9HXOLiuGrCh10YNc="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/tools/misc/asdf-vm/default.nix index 17e3dc37a5e69..89f76afbbc5e2 100644 --- a/pkgs/tools/misc/asdf-vm/default.nix +++ b/pkgs/tools/misc/asdf-vm/default.nix @@ -37,13 +37,13 @@ ${asdfReshimFile} ''; in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "sha256-SCMDf+yEJNDIeF2EqGkgfA+xJek1OmMysxolBdIEnUM="; + sha256 = "sha256-ZNmqWDjPEtmQhDUTkTw0Gy2pox1PyRK4U9Q0vxjZSlw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 85808e43c49c7..8a364c50fe0f5 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.13.2"; + version = "1.13.3"; format = "other"; nativeBuildInputs = [ installShellFiles desktop-file-utils ]; @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { owner = "phillipberndt"; repo = "autorandr"; rev = "refs/tags/${version}"; - sha256 = "sha256-Yn950V7DgLhwYSoGyUvjTH0Vwg/FodxhKsBP5iLTgqA="; + sha256 = "sha256-3zWYOOVYpj+s7VKagnbI55MNshM5WtbCFD6q9tRCzes="; }; meta = with lib; { diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index d7da86688616a..bed377663328b 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -1,17 +1,18 @@ -{ fetchFromGitHub -, lib +{ lib +, fetchFromGitHub , stdenv , python3Packages }: + python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - sha256 = "sha256-4mbu3Z48jZQqRft4vkz/x4a7kAOiTrQfnyQpXl3MJn0="; + hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo="; }; patches = [ @@ -45,6 +46,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://www.pgbarman.org/"; description = "Backup and Recovery Manager for PostgreSQL"; + changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS"; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 4f0905b5cf714..0fdb2736d2018 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.215"; + version = "1.217"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "+xqxI4qaIJc6z7BcVDcKg4dhc+xH56ZEspWf7UPdHnY="; + sha256 = "sha256-Rsud1DEsI946F8VzaF+S8nqTMih7ILWPhfx4zqa4Y9E="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/tools/misc/bdfresize/default.nix index f1ac559fb672d..ef3ffc873aa95 100644 --- a/pkgs/tools/misc/bdfresize/default.nix +++ b/pkgs/tools/misc/bdfresize/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Tool to resize BDF fonts"; homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 0add7340ed5ad..2e5ebd1e56a2b 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml perl ]; meta = with lib; { description = "A collection of tools for translating from BibTeX to HTML"; diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix new file mode 100644 index 0000000000000..6e50eebe722af --- /dev/null +++ b/pkgs/tools/misc/boxxy/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "boxxy"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "queer"; + repo = "boxxy"; + rev = "v${version}"; + hash = "sha256-BTVbx6Fk10A2SayXAH4hRRcUqI6+3VEW25vj3sdApqI="; + }; + + cargoHash = "sha256-eCi8dcaeNjuU7a7W4IJqz9bRbde6PLy/WJCipgancRE="; + + meta = with lib; { + description = "Puts bad Linux applications in a box with only their files"; + homepage = "https://github.com/queer/boxxy"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya figsoda ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index c920aebd32168..f21c6d779e660 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,20 +11,21 @@ , Security , xorg , zlib +, buildPackages }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.19.0"; + version = "1.20.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-pg+eHmClDd04tWljQUS0IRyMzkHnkpkofuhz/KyQbWo="; + hash = "sha256-TSaHngDLD2Tit4ixFDT2OhoqLGMIXj5rgxLwX06nHNw="; }; - cargoHash = "sha256-+RUYC39L7yyh1xYPfZn7tDIf1cmmBuGcqTNibFk7s6M="; + cargoHash = "sha256-66iEMcgd3Tx6134ggqckOf61RMn/w5x2a61Dlfs1GUc="; nativeBuildInputs = [ installShellFiles @@ -47,24 +48,20 @@ rustPlatform.buildRustPackage rec { --replace "#version" "${version}" ''; - postInstall = '' - # Do not nag users about installing shell integration, since - # it is impure. - wrapProgram $out/bin/broot \ - --set BR_INSTALL no - + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' # Install shell function for bash. - $out/bin/broot --print-shell-function bash > br.bash + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/broot --print-shell-function bash > br.bash install -Dm0444 -t $out/etc/profile.d br.bash # Install shell function for zsh. - $out/bin/broot --print-shell-function zsh > br.zsh + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/broot --print-shell-function zsh > br.zsh install -Dm0444 br.zsh $out/share/zsh/site-functions/br # Install shell function for fish - $out/bin/broot --print-shell-function fish > br.fish + ${stdenv.hostPlatform.emulator buildPackages} $out/bin/broot --print-shell-function fish > br.fish install -Dm0444 -t $out/share/fish/vendor_functions.d br.fish + '' + '' # install shell completion files OUT_DIR=$releaseDir/build/broot-*/out @@ -73,6 +70,11 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $OUT_DIR/{_br,_broot} installManPage man/broot.1 + + # Do not nag users about installing shell integration, since + # it is impure. + wrapProgram $out/bin/broot \ + --set BR_INSTALL no ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 34d05852a7e8a..71656745ac2c1 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2 -, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python +, kservice, libatasmart, libxcb, yaml-cpp, libpwquality, parted, polkit-qt, python , qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation , nixos-extensions ? false @@ -43,7 +43,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ boost kparts.dev kpmcore.out kservice.dev kirigami2 - libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python + libatasmart libxcb yaml-cpp libpwquality parted polkit-qt python qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; diff --git a/pkgs/tools/misc/ccal/default.nix b/pkgs/tools/misc/ccal/default.nix new file mode 100644 index 0000000000000..55ccb7f774c9c --- /dev/null +++ b/pkgs/tools/misc/ccal/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, fetchurl +, makeWrapper +, ghostscript_headless # for ps2pdf binary +}: + +stdenv.mkDerivation rec { + pname = "ccal"; + version = "2.5.3"; + src = fetchurl { + url = "http://ccal.chinesebay.com/ccal/${pname}-${version}.tar.gz"; + sha256 = "sha256-PUy9yfkFzgKrSEBB+79/C3oxmuajUMbBbWNuGlpQ35Y="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "CXX:=$(CXX)" "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; + installTargets = [ "install" "install-man" ]; + + # ccalpdf depends on a `ps2pdf` binary in PATH + postFixup = '' + wrapProgram $out/bin/ccalpdf \ + --prefix PATH : ${lib.makeBinPath [ ghostscript_headless ]}:$out/bin + ''; + + meta = { + homepage = "http://ccal.chinesebay.com/ccal.htm"; + description = "Command line Chinese calendar viewer, similar to cal"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sharzy ]; + platforms = lib.platforms.all; + }; +} + diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 20c4221a08161..d57475fb59383 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-wELV3Jp11Iv3G//VOAosL5QDnbNTyEAvq9hmLWDdPBU="; + sha256 = "sha256-2YL+ncT1UcanslFnMIMonvGugD7HxO6taYZtKK6kmEc="; }; - vendorHash = "sha256-XFJGw76Fz9tzknWuzc1aw1uJ34UQfFLe1WUVtPGbn64="; + vendorHash = "sha256-eAWgLR3wqcTmlA3hG9IGgTm/Q+EKcypXYXRdtRAb94o="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 3d2214cc0bccf..cdb5e7bbd8ad4 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.29.3"; + version = "2.31.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-WrGbCyAjrwZHBMXxqrw7vC5J8b7xn7FUeoZ9IANRf0g="; + hash = "sha256-yozW+Yb8uHOA5NfAQ+QWVylgJUM8b8DTKPUHxCNi9SU="; }; - vendorHash = "sha256-0heLEQFKxKxeNZGBd3GcTsOfhmDyxZRynVrAkF6vHvk="; + vendorHash = "sha256-8kG3GTb3dpLNeFppuLwvB+cjM0K1mp3QJgXTDieLgW8="; doCheck = false; diff --git a/pkgs/tools/misc/codevis/default.nix b/pkgs/tools/misc/codevis/default.nix new file mode 100644 index 0000000000000..d160c214454da --- /dev/null +++ b/pkgs/tools/misc/codevis/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, oniguruma +}: + +rustPlatform.buildRustPackage rec { + pname = "codevis"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "sloganking"; + repo = "codevis"; + rev = "v${version}"; + hash = "sha256-iw5ULK67AHLoffveZghk57lPQwE2oX+iwlO0dmdpE4E="; + }; + + cargoHash = "sha256-IxQ8rnB+2xTBiFvxy2yo27HtBu0zLvbQzyoxH/4waxQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + oniguruma + ]; + + RUSTONIG_SYSTEM_LIBONIG = true; + + meta = with lib; { + description = "A tool to take all source code in a folder and render them to one image"; + homepage = "https://github.com/sloganking/codevis"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix index a386853247dca..2d81a940dd57b 100644 --- a/pkgs/tools/misc/coinlive/default.nix +++ b/pkgs/tools/misc/coinlive/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "coinlive"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mayeranalytics"; repo = pname; rev = "v${version}"; - hash = "sha256-i21C1ZSAPoUOBlnDQl40/17yRqmNx3wkjswHJeV9vko="; + hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; }; - cargoSha256 = "sha256-0pUXCY5rZWh26KGD2OU2+M9L0RtCIan6hmuNeIeBEHI="; + cargoSha256 = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4="; nativeBuildInputs = [ pkg-config @@ -30,6 +30,11 @@ rustPlatform.buildRustPackage rec { Security ]; + checkFlags = [ + # requires network access + "--skip=utils::test_get_infos" + ]; + meta = with lib; { description = "Live cryptocurrency prices CLI"; homepage = "https://github.com/mayeranalytics/coinlive"; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index c2a3cd10803f8..2a4c2c0016689 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -15,6 +15,7 @@ , gobject-introspection , argyllcms , meson +, mesonEmulatorHook , ninja , vala , libgudev @@ -75,6 +76,8 @@ stdenv.mkDerivation rec { shared-mime-info vala wrapGAppsNoGuiHook + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/tools/misc/completely/Gemfile b/pkgs/tools/misc/completely/Gemfile new file mode 100644 index 0000000000000..bfae92920327a --- /dev/null +++ b/pkgs/tools/misc/completely/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'completely' diff --git a/pkgs/tools/misc/completely/Gemfile.lock b/pkgs/tools/misc/completely/Gemfile.lock new file mode 100644 index 0000000000000..656c96cbc40cd --- /dev/null +++ b/pkgs/tools/misc/completely/Gemfile.lock @@ -0,0 +1,20 @@ +GEM + remote: https://rubygems.org/ + specs: + colsole (0.8.2) + completely (0.5.2) + colsole (~> 0.6) + mister_bin (~> 0.7.2) + docopt (0.6.1) + mister_bin (0.7.3) + colsole (~> 0.7) + docopt (~> 0.6) + +PLATFORMS + ruby + +DEPENDENCIES + completely + +BUNDLED WITH + 2.4.5 diff --git a/pkgs/tools/misc/completely/default.nix b/pkgs/tools/misc/completely/default.nix new file mode 100644 index 0000000000000..7e0129f6d1b3f --- /dev/null +++ b/pkgs/tools/misc/completely/default.nix @@ -0,0 +1,21 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp { + pname = "completely"; + + gemdir = ./.; + exes = [ "completely" ]; + + passthru.updateScript = bundlerUpdateScript "completely"; + + meta = with lib; { + description = "Generate bash completion scripts using a simple configuration file"; + homepage = "https://github.com/DannyBen/completely"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/tools/misc/completely/gemset.nix b/pkgs/tools/misc/completely/gemset.nix new file mode 100644 index 0000000000000..a078a113f6d44 --- /dev/null +++ b/pkgs/tools/misc/completely/gemset.nix @@ -0,0 +1,44 @@ +{ + colsole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp"; + type = "gem"; + }; + version = "0.8.2"; + }; + completely = { + dependencies = ["colsole" "mister_bin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b"; + type = "gem"; + }; + version = "0.5.2"; + }; + docopt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k"; + type = "gem"; + }; + version = "0.6.1"; + }; + mister_bin = { + dependencies = ["colsole" "docopt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd"; + type = "gem"; + }; + version = "0.7.3"; + }; +} diff --git a/pkgs/tools/misc/copier/default.nix b/pkgs/tools/misc/copier/default.nix new file mode 100644 index 0000000000000..55d1ea6693e70 --- /dev/null +++ b/pkgs/tools/misc/copier/default.nix @@ -0,0 +1,51 @@ +{ lib, git, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "copier"; + version = "7.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "copier-org"; + repo = "copier"; + rev = "v${version}"; + sha256 = "sha256-8lTvyyKfAkvnUvw3e+r9C/49QASR8Zeokm509jxGK2g="; + }; + + POETRY_DYNAMIC_VERSIONING_BYPASS = version; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + python3.pkgs.poetry-dynamic-versioning + ]; + + propagatedBuildInputs = with python3.pkgs; [ + colorama + dunamai + iteration-utilities + jinja2 + jinja2-ansible-filters + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + packaging + pathspec + plumbum + pydantic + pygments + pyyaml + pyyaml-include + questionary + ]; + + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ git ] }" + ]; + + meta = with lib; { + description = "Library and command-line utility for rendering projects templates"; + homepage = "https://copier.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix index 923b7d55cae3c..7e0a6d0c706e1 100644 --- a/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, libyamlcpp +, yaml-cpp , nvramtool , qtbase , qtsvg @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ]; - buildInputs = [ libyamlcpp qtbase qtsvg ]; + buildInputs = [ yaml-cpp qtbase qtsvg ]; postPatch = '' substituteInPlace src/application/*.cpp \ diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index a89621e8fe5f8..8ecbe342034a7 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -149,10 +149,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString stdenv.hostPlatform.isSunOS "1"; - NIX_CFLAGS_COMPILE = [] + env.NIX_CFLAGS_COMPILE = toString ([] # Work around a bogus warning in conjunction with musl. ++ optional stdenv.hostPlatform.isMusl "-Wno-error" - ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"; + ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"); # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index a81e078cdb350..4711a2f3dc39f 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; rev = version; - sha256 = "sha256-+Z4R6eRYNU0/wmrrTCLabY1zgxGbdSkgrfJd8rI5fZo="; + hash = "sha256-3nHsdCndZx7TIbRXhuGdQx8fh8Ff7gYBQyNXIkJ2zPc="; }; - cargoSha256 = "sha256-hkqGOl6ew3GBMPem8bPRy0PYphHhXJVv6iQiH6lK0kE="; + cargoHash = "sha256-jBl7+ElK+SEe92qygTocd6R1sgdHf+RpTVJZymhf3mQ="; nativeBuildInputs = [ pkg-config @@ -59,6 +59,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { + changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; description = "A simple, fast and easy to use app to remove unnecessary files from your computer"; homepage = "https://github.com/qarmin/czkawka"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 7bf751652d4ec..898f7aefabfee 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , pkg-config , glib @@ -15,11 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.3.2"; + version = "1.4.1"; - src = fetchurl { - url = "http://www.ddcutil.com/tarballs/${pname}-${version}.tar.gz"; - sha256 = "sha256-vZI7OquGjZ0koArdOWKkfFtfRzCvtXm8lGFCUklloEI="; + src = fetchFromGitHub { + owner = "rockowitz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-y3mubdInYa4gpxhdw2JcRhnhd12O7jNq/oF3qoP82LU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 6b710f2e2c0d0..c2b0f3fd2aefc 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils bash-completion help2man ] ++ - (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); + (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps Moo FileHomeDir IPCRun FileDirList FileTouch ]); preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 0ace2196ed8cb..40370f33ab7e4 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.19.0"; + version = "2.19.2"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-cb2WW0FpY5GMzll7sgbDRcgiKYSVZjJ8e8BabywF9wg="; + sha256 = "sha256-A39lYXkHinvppZVm2V9HXmtcbR4jOiHRtABQeryqLG8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-79dUeQOf6hiSRzz5mLWcSP5bLXMOU5YcE9ecd/t9VaI="; + cargoHash = "sha256-7SrNPf1inu8zaIMErJ6zADDFkLMPvR6zCg44Vv1DarM="; doCheck = false; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index bd4452263a92d..b6a17a38b5bf3 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-+YcHiW4kR4JeIY6zv1WJ97dCIakvtbn8+b9tLFH+aLE="; + sha256 = "sha256-g1i003nBbTYIuKG4ZCQSoI8gINTVc8BKRoO3UOeHOGE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,12 +16,19 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-yKj9CBoEC6UJf4L+XO2qi69//45lSqblMe8ofnLctEw="; + cargoHash = "sha256-jtQ/nkD5XMD2rsq550XsRK416wOCR3OuhgGPeuC3jzc="; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; doCheck = false; + postInstall = '' + installManPage man-page/dust.1 + installShellCompletion completions/dust.{bash,fish} --zsh completions/_dust + ''; + meta = with lib; { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/tools/misc/easeprobe/default.nix index b0f85d7fc147a..36f0bf6d73a6c 100644 --- a/pkgs/tools/misc/easeprobe/default.nix +++ b/pkgs/tools/misc/easeprobe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "easeprobe"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "megaease"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y9R2OgK+slQUvUMS3E6aX8WVCQ1fSMAruGKggxYRniA="; + sha256 = "sha256-FBraLP/wsoJiVLjAqNZettMDOd8W8l1j4t8ETyvqrcQ="; }; - vendorSha256 = "sha256-ZfqBSPnIm2GHPREowHmEEPnOovYjoarxrkPeYmZBkIc="; + vendorHash = "sha256-Z2JLFLVTdPGFFHnjNA1JS1lYjGimdvMLiXQyNi+91Hc="; subPackages = [ "cmd/easeprobe" ]; diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix index 7cd621be76a89..8bfeae8586aeb 100644 --- a/pkgs/tools/misc/edir/default.nix +++ b/pkgs/tools/misc/edir/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "edir"; - version = "2.7.3"; + version = "2.16"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp"; + sha256 = "ro1GZkJ6xDZcMRaWTAW/a2qhFbZAxsduvGO3C4sOI+A="; }; meta = with lib; { diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/tools/misc/edk2-uefi-shell/default.nix index d399c7dabc159..7547f9b3e476d 100644 --- a/pkgs/tools/misc/edk2-uefi-shell/default.nix +++ b/pkgs/tools/misc/edk2-uefi-shell/default.nix @@ -14,7 +14,7 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: { ++ lib.optionals stdenv.cc.isClang [ llvmPackages.bintools llvmPackages.llvm ]; strictDeps = true; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-fno-pic" "-Qunused-arguments" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-fno-pic" "-Qunused-arguments" ]); # Set explicitly to use Python 3 from nixpkgs. Otherwise, the build system will detect and try to # use `/usr/bin/python3` on Darwin when sandboxing is disabled. diff --git a/pkgs/tools/misc/eget/default.nix b/pkgs/tools/misc/eget/default.nix index c0c8a2a547940..b4fa3edb1cff8 100644 --- a/pkgs/tools/misc/eget/default.nix +++ b/pkgs/tools/misc/eget/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "eget"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahmvsSBR/WhKhBSMc+GE3RfuGK6wJIKSvqXPcff1HAI="; + sha256 = "sha256-OOqfZ2uS3sYBH9xrlQN1iSNdNE9RGi6qiDXfPgf2aB0="; }; - vendorSha256 = "sha256-J8weaJSC+k8BnijG2Jm2GYUZmEhASrrCDxb46ZGmCMI="; + vendorSha256 = "sha256-A3lZtV0pXh4KxINl413xGbw2Pz7OzvIQiFSRubH428c="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/pkgs/tools/misc/empty/default.nix b/pkgs/tools/misc/empty/default.nix index d8fa41ef02a32..296cd7c52583c 100644 --- a/pkgs/tools/misc/empty/default.nix +++ b/pkgs/tools/misc/empty/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://empty.sourceforge.net"; + homepage = "https://empty.sourceforge.net"; description = "A simple tool to automate interactive terminal applications"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/tools/misc/engage/default.nix b/pkgs/tools/misc/engage/default.nix new file mode 100644 index 0000000000000..c01dcc2e68796 --- /dev/null +++ b/pkgs/tools/misc/engage/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchgit +}: + +let + pname = "engage"; + version = "0.1.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + # fetchFromGitLab doesn't work on GitLab's end for unknown reasons + src = fetchgit { + url = "https://or.computer.surgery/charles/${pname}"; + rev = "v${version}"; + hash = "sha256-7zLFgTLeAIaMMoj0iThH/5UhnV9OUGe9CVwbbShCieo="; + }; + + cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo="; + + meta = { + description = "A task runner with DAG-based parallelism"; + homepage = "https://or.computer.surgery/charles/engage"; + changelog = "https://or.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ CobaltCause ]; + }; +} diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 04abea26cabc8..b9b5bfcc021bb 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20221213.0"; + version = "20230214.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LwP+LBHzEWjPUih6aaZnI7Yh85vsa1Md1YgBWkLOUIs="; + hash = "sha256-TfQIvvLLsYubLbai2RNJkCu96nYFEWbdZU8WaJbpUwU="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 6b891dcf37507..a02f418f8f2c9 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,4 +1,5 @@ { lib +, callPackage , python3 , fetchFromGitHub , platformio @@ -13,16 +14,16 @@ let }; }; in -with python.pkgs; buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2022.12.4"; + version = "2023.2.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HU4S6U5v0r93z4T6JpclEF6Cw6vy0VoprVyI4Z2Ti7s="; + hash = "sha256-xy4g0BVJz4NjM6NoKNa5TrUSvr96O+eviuBqLz9LWso="; }; postPatch = '' @@ -42,7 +43,7 @@ with python.pkgs; buildPythonApplication rec { # They have validation functions like: # - validate_cryptography_installed # - validate_pillow_installed - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ aioesphomeapi click colorama @@ -71,12 +72,11 @@ with python.pkgs; buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - nativeCheckInputs = [ + nativeCheckInputs = with python.pkgs; [ hypothesis mock pytest-asyncio pytest-mock - pytest-sugar pytestCheckHook ]; @@ -92,7 +92,7 @@ with python.pkgs; buildPythonApplication rec { ''; passthru = { - dashboard = esphome-dashboard; + dashboard = python.pkgs.esphome-dashboard; updateScript = callPackage ./update.nix {}; }; diff --git a/pkgs/tools/misc/esphome/update.nix b/pkgs/tools/misc/esphome/update.nix index ea41376620546..6b05162f3955f 100644 --- a/pkgs/tools/misc/esphome/update.nix +++ b/pkgs/tools/misc/esphome/update.nix @@ -1,12 +1,23 @@ { writeShellScript , lib +, curl +, jq , git +, gnugrep +, gnused , nix-update }: writeShellScript "update-esphome" '' - PATH=${lib.makeBinPath [ git nix-update ]} + PATH=${lib.makeBinPath [ curl gnugrep gnused jq git nix-update ]} - nix-update esphome.dashboard - nix-update esphome + LATEST=$(curl https://api.github.com/repos/esphome/esphome/releases/latest | jq -r '.name') + echo "Latest version: $LATEST" + + DASHBOARD_VERSION=$(curl https://raw.githubusercontent.com/esphome/esphome/$LATEST/requirements.txt | \ + grep "esphome-dashboard==" | sed "s/.*=//") + echo "Dashboard version: $DASHBOARD_VERSION" + + nix-update esphome.dashboard --version $DASHBOARD_VERSION + nix-update esphome --version $LATEST '' diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index a62e266874d61..9efa31d365377 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,29 +1,19 @@ { lib , fetchFromGitHub -, fetchpatch , python3 }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - hash = "sha256-haLwf3loOvqdqQN/iuVBciQ6nCnuc9AqqOGKvDwLBHE="; + hash = "sha256-SwMdemCk3e3RyXTzoXIqDRywpg3ogE9nQjXGBz0BjwE="; }; - patches = [ - ./test-call-bin-directly.patch - (fetchpatch { - name = "bitstring-4-compatibility.patch"; - url = "https://github.com/espressif/esptool/commit/ee27a6437576797d5f58c31e1c39f3a232a71df0.patch"; - hash = "sha256-8/AzR3HK79eQQRSaGEKU4YKn/piPCPjm/G9pvizKuUE="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ bitstring cryptography @@ -34,19 +24,18 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pyelftools - pytest + pytestCheckHook ]; # tests mentioned in `.github/workflows/test_esptool.yml` checkPhase = '' runHook preCheck - export ESPSECURE_PY=$out/bin/espsecure.py - export ESPTOOL_PY=$out/bin/esptool.py - ${python3.interpreter} test/test_imagegen.py - ${python3.interpreter} test/test_espsecure.py - ${python3.interpreter} test/test_merge_bin.py - ${python3.interpreter} test/test_modules.py + pytest test/test_imagegen.py + pytest test/test_espsecure.py + pytest test/test_merge_bin.py + pytest test/test_image_info.py + pytest test/test_modules.py runHook postCheck ''; diff --git a/pkgs/tools/misc/esptool/test-call-bin-directly.patch b/pkgs/tools/misc/esptool/test-call-bin-directly.patch deleted file mode 100644 index b7d7727800903..0000000000000 --- a/pkgs/tools/misc/esptool/test-call-bin-directly.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/test/test_espsecure.py b/test/test_espsecure.py -index 25b0b87..627005c 100755 ---- a/test/test_espsecure.py -+++ b/test/test_espsecure.py -@@ -35,7 +35,7 @@ class EspSecureTestCase: - Returns output as a string if there is any, - raises an exception if espsecure.py fails - """ -- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ") -+ cmd = [ESPSECURE_PY] + args.split(" ") - print("\nExecuting {}...".format(" ".join(cmd))) - - try: -diff --git a/test/test_esptool.py b/test/test_esptool.py -index 042a1ce..b294e26 100755 ---- a/test/test_esptool.py -+++ b/test/test_esptool.py -@@ -57,7 +57,10 @@ try: - ESPTOOL_PY = os.environ["ESPTOOL_PY"] - except KeyError: - ESPTOOL_PY = os.path.join(TEST_DIR, "..", "esptool/__init__.py") --ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py") -+try: -+ ESPSECURE_PY = os.environ["ESPSECURE_PY"] -+except KeyError: -+ ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py") - ESPRFC2217SERVER_PY = os.path.join(TEST_DIR, "..", "esp_rfc2217_server.py") - - RETURN_CODE_FATAL_ERROR = 2 -@@ -74,7 +77,6 @@ class ESPRFC2217Server(object): - def __init__(self, rfc2217_port=None): - self.port = rfc2217_port or self.get_free_port() - self.cmd = [ -- sys.executable, - ESPRFC2217SERVER_PY, - "-p", - str(self.port), -@@ -130,7 +132,7 @@ class ESPRFC2217Server(object): - class EsptoolTestCase: - def run_espsecure(self, args): - -- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ") -+ cmd = [ESPSECURE_PY] + args.split(" ") - print("\nExecuting {}...".format(" ".join(cmd))) - try: - output = subprocess.check_output( -@@ -155,7 +157,7 @@ class EsptoolTestCase: - Raises an exception if esptool.py fails. - """ - trace_args = ["--trace"] if arg_trace else [] -- cmd = [sys.executable, ESPTOOL_PY] + trace_args -+ cmd = [ESPTOOL_PY] + trace_args - if chip_name or arg_chip is not None and chip_name != "auto": - cmd += ["--chip", chip_name or arg_chip] - if rfc2217_port or arg_port is not None: -diff --git a/test/test_imagegen.py b/test/test_imagegen.py -index a1feec2..01bd59c 100755 ---- a/test/test_imagegen.py -+++ b/test/test_imagegen.py -@@ -108,7 +108,7 @@ class BaseTestCase: - Run esptool.py image_info on a binary file, - assert no red flags about contents. - """ -- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "image_info", binpath] -+ cmd = [ESPTOOL_PY, "--chip", chip, "image_info", binpath] - try: - output = subprocess.check_output(cmd) - output = output.decode("utf-8") -@@ -123,7 +123,7 @@ class BaseTestCase: - - def run_elf2image(self, chip, elf_path, version=None, extra_args=[]): - """Run elf2image on elf_path""" -- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "elf2image"] -+ cmd = [ESPTOOL_PY, "--chip", chip, "elf2image"] - if version is not None: - cmd += ["--version", str(version)] - cmd += [elf_path] + extra_args -diff --git a/test/test_merge_bin.py b/test/test_merge_bin.py -index 8230069..2df5f8c 100755 ---- a/test/test_merge_bin.py -+++ b/test/test_merge_bin.py -@@ -39,7 +39,6 @@ class TestMergeBin: - output_file.close() - - cmd = [ -- sys.executable, - ESPTOOL_PY, - "--chip", - chip, diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 5ebbbe1e118b4..5850fada2a70f 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , libmnl , pkg-config , writeScript @@ -8,13 +9,23 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1URsk95XDOaPOx6mnb+hL8/Wf8GYl/ZV0/GCMeK4GNY="; + sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; }; + patches = [ + # Patch that fixes build with musl libc + # NOTE remove on next release, since it is applied in upstream + (fetchpatch { + name = "Fix-build-with-musl-libc.patch"; + url = "https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/patch/marvell.c?id=41be533331fc3c6b711dbe532405782d3b8be5d1"; + sha256 = "sha256-CItvt/eeNJkr1sOzaaHZhAnaybDutL9cT2O6XwQll+M="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/tools/misc/f2/default.nix index 943ce72cc6ced..48b14b867059b 100644 --- a/pkgs/tools/misc/f2/default.nix +++ b/pkgs/tools/misc/f2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "f2"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ayoisaiah"; repo = "f2"; rev = "v${version}"; - sha256 = "sha256-bNcPzvjVBH7x60kNjlUILiQGG3GDmqIB5T2WP3+nZ+s="; + sha256 = "sha256-2+wp9hbPDH8RAeQNH1OYDfFlev+QTsEHixYb/luR9F0="; }; - vendorSha256 = "sha256-Cahqk+7jDMUtZq0zhBll1Tfryu2zSPBN7JKscV38360="; + vendorHash = "sha256-sOTdP+MuOH9jB3RMajeUx84pINSuWVRw5p/9lrOj6uo="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index c226ad329dd22..6309483dd88f2 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.29.1"; + version = "0.29.3"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-spWfZx2br7gSLS0xaUBvMgvA326ISh16i/s0K3m1HCI="; + sha256 = "sha256-dz7Mxi5KIZYw0oLic50hNT6rWbQpfiBE4hlZsxNfKsA="; }; - cargoSha256 = "sha256-qwjwauM2ejeMEbajVD8Deuhl/qMcB7MsvjR2CYGaF+M="; + cargoHash = "sha256-I9pd+Q3b++ujynfpZq88lqPSUOc/SXWpNzR/CwtNEPA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 85bc47dab545c..38055706004ba 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -1,17 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, testers, fd }: rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.6.0"; + version = "8.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-RVGCSUYyWo2wKRIrnci+aWEAPW9jHhMfYkYJkCgd7f8="; + hash = "sha256-y7IrwMLQnvz1PeKt8BE9hbEBwQBiUXM4geYbiTjMymw="; }; - cargoSha256 = "sha256-PT95U1l+BVX7sby3GKktZMmbNNQoPYR8nL+H90EnqZY="; + cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo="; auditable = true; # TODO: remove when this is the default @@ -31,6 +31,10 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh contrib/completion/_fd ''; + passthru.tests.version = testers.testVersion { + package = fd; + }; + meta = with lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 18ffdb71cde4a..6d96c33e5eef8 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jg2rMiFXtN3oLru1gTaTyIo5eBEI23paKJiDV6KZZE4="; + sha256 = "sha256-9qvIxKg/fj08wYY2fK5J1nWzojStUb9ArXwvA/cTOcQ="; }; - cargoHash = "sha256-9Gri/EBaUiCpFBL0f132JDD4Zl5v40e8JmlRvm019S4="; + cargoHash = "sha256-kVnA8w2YVg6+h1V1O4cvciuB7GM4/LULFsGrzy8xUMQ="; nativeBuildInputs = [ pandoc installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 03be0c8b3be38..35ea4e992d887 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -7,16 +7,29 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.43"; + version = "5.44"; src = fetchurl { urls = [ "https://astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-jIAV6Rrg6NAyHZTHgjmJLvnbxwxK3gAIwOlYlKv7GZE="; + sha256 = "sha256-N1HH+6jbyDHLjXzIr/IQNUWbjOUVXviwiAon0ChHXzs="; }; + patches = [ + # Backport fix to identification for pyzip files. + # Needed for strip-nondeterminism. + # https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/issues/20 + ./pyzip.patch + + # Backport fix for --uncompress always detecting contents as "empty" + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/file/files/file-5.44-decompress-empty.patch?h=dfc57da515a2aaf085bea68267cc727f1bfaa691"; + hash = "sha256-fUzRQAlLWczBmR5iA1Gk66mHjP40MJcMdgCtm2+u1SQ="; + }) + ]; + strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/file/pyzip.patch b/pkgs/tools/misc/file/pyzip.patch new file mode 100644 index 0000000000000..57f9e7ef8b64e --- /dev/null +++ b/pkgs/tools/misc/file/pyzip.patch @@ -0,0 +1,36 @@ +From dc71304b3b1fd2ed5f7098d59fb7f6ef10cfdc85 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <christos@zoulas.com> +Date: Sat, 31 Dec 2022 20:24:08 +0000 +Subject: [PATCH] pyzip improvements (FC Stegerman) + +--- + magic/Magdir/archive | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/magic/Magdir/archive b/magic/Magdir/archive +index a706556d5..d58201e69 100644 +--- a/magic/Magdir/archive ++++ b/magic/Magdir/archive +@@ -1,5 +1,5 @@ + #------------------------------------------------------------------------------ +-# $File: archive,v 1.179 2022/12/21 15:50:59 christos Exp $ ++# $File: archive,v 1.180 2022/12/31 20:24:08 christos Exp $ + # archive: file(1) magic for archive formats (see also "msdos" for self- + # extracting compressed archives) + # +@@ -1876,9 +1876,14 @@ + # https://en.wikipedia.org/wiki/ZIP_(file_format)#End_of_central_directory_record_(EOCD) + # by Michal Gorny <mgorny@gentoo.org> + -2 uleshort 0 +->&-22 string PK\005\006 Zip archive, with extra data prepended ++>&-22 string PK\005\006 ++# without #! ++>>0 string !#! Zip archive, with extra data prepended + !:mime application/zip + !:ext zip/cbz ++# with #! ++>>0 string/w #!\ a ++>>>&-1 string/T x %s script executable (Zip archive) + + # ACE archive (from http://www.wotsit.org/download.asp?f=ace) + # by Stefan `Sec` Zehl <sec@42.org> diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b522499d79095..a76074918a662 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "flashrom"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; - hash = "sha256-iaf/W+sIyJuHlbvSU6UblFNUeoZMMXkzAilrVrvFbWU="; + hash = "sha256-oFMjRFPM0BLnnzRDvcxhYlz5e3/Xy0zdi/v/vosUliM="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { ++ lib.optional jlinkSupport libjaylink; postPatch = '' - substituteInPlace util/z60_flashrom.rules \ - --replace "plugdev" "flashrom" + substituteInPlace util/flashrom_udev.rules \ + --replace 'GROUP="plugdev"' 'TAG+="uaccess", TAG+="udev-acl"' ''; makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"; postInstall = '' - install -Dm644 util/z60_flashrom.rules $out/lib/udev/rules.d/flashrom.rules + install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules ''; meta = with lib; { diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 50f51cfd71190..4cd81c8c640f9 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.13.3"; + version = "5.13.4"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ="; + hash = "sha256-W+9KmKZ1bPfQfv1DXCJrIswriw4ivBVZPW81tfvRBc0="; }; udevRules = fetchurl { @@ -47,7 +47,7 @@ in appimageTools.wrapAppImage { ''; meta = { - description = "Configure FLEXOPTIX Universal Transcievers in seconds"; + description = "Configure FLEXOPTIX Universal Transceivers in seconds"; homepage = "https://www.flexoptix.net"; changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog"; license = lib.licenses.unfree; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 2c78a0a62136a..2f430dea25c9b 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-kgjLjGloudigDTP6K4W8Tv42uK/dHyH1W2aI9+uh/ws="; + sha256 = "sha256-jHbxROO21cgbhEiWv9wQJyHWGGK14nGQuk9Fc9ufHqg="; }; nativeBuildInputs = [ cmake flex bison ]; @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" ]; # _FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-O" ] + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-O" ] # Workaround build failure on -fno-common toolchains: # ld: /monkey/mk_tls.h:81: multiple definition of `mk_tls_server_timeout'; # flb_config.c.o:include/monkey/mk_tls.h:81: first defined here # TODO: drop when upstream gets a fix for it: # https://github.com/fluent/fluent-bit/issues/5537 - ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index aa3d16a5fa566..6aee2be9118c9 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index fa6df2cebff41..7b59dd92df46d 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-m+tKNz7tUWkm/Vg9DhcfZyaBgZh+Mcf0mRfc5/SW2Os="; + hash = "sha256-XZ0S6cps3WIMqWUHivXPKSN2PiZsSEmETnu9sglwXKw="; }; vendorHash = "sha256-MsMwBBualAwJzCrv/WNBJakv6LcKZYsDUqkNmivUMOQ="; diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix new file mode 100644 index 0000000000000..ade42a7d0d3a8 --- /dev/null +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitea +, editline +, readline +, historyType ? "internal" +, predefinedBuildType ? "BSD" +}: + +assert lib.elem historyType [ "editline" "readline" "internal" ]; +assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ]; +stdenv.mkDerivation (self: { + pname = "gavin-bc"; + version = "6.2.4"; + + src = fetchFromGitea { + domain = "git.gavinhoward.com"; + owner = "gavin"; + repo = "bc"; + rev = self.version; + hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw="; + }; + + buildInputs = + (lib.optional (historyType == "editline") editline) + ++ (lib.optional (historyType == "readline") readline); + + configureFlags = [ + "--disable-nls" + "--predefined-build-type=${historyType}" + ] + ++ (lib.optional (historyType == "editline") "--enable-editline") + ++ (lib.optional (historyType == "readline") "--enable-readline"); + + meta = { + homepage = "https://git.gavinhoward.com/gavin/bc"; + description = "Gavin Howard's BC calculator implementation"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index ba9117a29722e..77be76f2d2edd 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-JA9bvRb8u0qG6ZsQR9qJ3yaV9ni/MkdWo9xRtmPp92I="; + sha256 = "sha256-fCS6cSD3w2EbLL1yNfH+NKxswRUY4zyCR07gKGXW4Yc="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/tools/misc/gh-actions-cache/default.nix new file mode 100644 index 0000000000000..4c80d032ab10b --- /dev/null +++ b/pkgs/tools/misc/gh-actions-cache/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gh-actions-cache"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "actions"; + repo = "gh-actions-cache"; + rev = "v${version}"; + hash = "sha256-5iCj6z4HCMVFeplb3dGP/V60z6zMUnUPVBMnPi4yU1Q="; + }; + + vendorHash = "sha256-i9akQ0IjH9NItjYvMWLiGnFQrfZhA7SOvPZiUvdtDrk="; + + ldflags = [ + "-s" + "-w" + ]; + + # Tests need network + doCheck = false; + + meta = { + description = "gh extension to manage GitHub Actions caches"; + homepage = "https://github.com/actions/gh-actions-cache"; + changelog = "https://github.com/actions/gh-actions-cache/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index c690df170b84a..131db58c0b806 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -1,22 +1,32 @@ { lib , fetchFromGitHub , buildGoModule +, testers +, gh-dash }: buildGoModule rec { pname = "gh-dash"; - version = "3.6.0"; + version = "3.7.6"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - sha256 = "sha256-pQd41uQdfkbqIjdUIwUnKS/Qso495Ips8P2CXPd8JRU="; + hash = "sha256-EYDSfxFOnMuPDZaG1CYQtYLNe6afm/2YYlQPheAKXDg="; }; vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/dlvhdr/gh-dash/cmd.Version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { package = gh-dash; }; + }; meta = { description = "gh extension to display a dashboard with pull requests and issues"; diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index c1de69ff1b9a7..15725d8fd58a2 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -1,26 +1,15 @@ { lib -, buildPythonPackage +, python3 , fetchFromGitHub -, setuptools -, setuptools-scm -, pythonOlder , sdcc -, amaranth -, fx2 -, libusb1 -, aiohttp -, pyvcd -, bitarray -, crcmod , yosys , icestorm , nextpnr }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "glasgow"; version = "unstable-2021-12-12"; - disabled = pythonOlder "3.7"; # python software/setup.py --version realVersion = "0.1.dev1679+g${lib.substring 0 7 src.rev}"; @@ -31,9 +20,9 @@ buildPythonPackage rec { sha256 = "EsQ9ZjalKDQ54JOonra4yPDI56cF5n86y/Rd798cZsU="; }; - nativeBuildInputs = [ setuptools-scm sdcc ]; + nativeBuildInputs = [ python3.pkgs.setuptools-scm sdcc ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ setuptools amaranth fx2 @@ -49,7 +38,7 @@ buildPythonPackage rec { enableParallelBuilding = true; preBuild = '' - make -C firmware LIBFX2=${fx2}/share/libfx2 + make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2 cp firmware/glasgow.ihex software/glasgow cd software export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" @@ -59,7 +48,7 @@ buildPythonPackage rec { doInstallCheck = false; checkPhase = '' - python -W ignore::DeprecationWarning test.py + ${python3.interpreter} -W ignore::DeprecationWarning test.py ''; makeWrapperArgs = [ diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index ad7704d5d4096..dd550df598c47 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.14.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kA+7kAFAAZngbub2gHoiqEcSkcbxv0DPqbAT3MDBHtI="; + sha256 = "sha256-yoio22D8k4rO8lRLoGSJGl8raMVO9fOGHFobAZngcxw="; }; - vendorSha256 = "sha256-v3ZF2WDp4EmHA8RnP39o21cy9+n4cKkKZ0gSowv4nvk="; + vendorSha256 = "sha256-RSAT9VtsdXvWDhIZlOjwCF9nhONPXCSEaxVlgW14IKA="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ca12c1f25887e..b6125b9faf761 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -339,7 +339,7 @@ stdenv.mkDerivation rec { separateDebugInfo = !xenSupport; # Work around a bug in the generated flex lexer (upstream flex bug?) - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; preConfigure = '' for i in "tests/util/"*.in @@ -386,9 +386,7 @@ stdenv.mkDerivation rec { # save target that grub is compiled for grubTarget = if efiSupport then "${efiSystemsInstall.${stdenv.hostPlatform.system}.target}-efi" - else if inPCSystems - then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" - else ""; + else lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; doCheck = false; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index 3137c820eeac8..b6883e5708021 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -4,7 +4,10 @@ let efiSystemsBuild = { i686-linux.target = "i386"; x86_64-linux.target = "x86_64"; + armv7l-linux.target = "arm"; aarch64-linux.target = "aarch64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; }; in ( diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 2d07932dab2e8..559eec9bbdd06 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" "pic" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree + env.NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree preConfigure = '' for i in "tests/util/"*.in @@ -103,10 +103,7 @@ stdenv.mkDerivation rec { ]; # save target that grub is compiled for - grubTarget = - if inPCSystems - then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc" - else ""; + grubTarget = lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; doCheck = false; # On -j16 races with early header creation: diff --git a/pkgs/tools/misc/gtklp/default.nix b/pkgs/tools/misc/gtklp/default.nix index 8eafd98e267f5..af98ed1ae1b73 100644 --- a/pkgs/tools/misc/gtklp/default.nix +++ b/pkgs/tools/misc/gtklp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar'; # file.o:libgtklp/libgtklp.h:83: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' substituteInPlace include/defaults.h --replace "netscape" "firefox" diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 051e98862bd2a..3bde0466cdbad 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchpatch , fetchurl , fixDarwinDylibNames @@ -95,13 +96,15 @@ stdenv.mkDerivation rec { "NC_TEST-nctest" ]; - checkPhase = let excludedTestsRegex = if (excludedTests != []) - then "(" + (lib.concatStringsSep "|" excludedTests) + ")" - else ""; in '' - runHook preCheck - ctest -E "${excludedTestsRegex}" --output-on-failure - runHook postCheck - ''; + checkPhase = + let + excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; + in + '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; outputs = [ "bin" "dev" "out" ]; @@ -117,7 +120,7 @@ stdenv.mkDerivation rec { szip javaSupport jdk - ; + ; }; meta = with lib; { diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 76efc76678116..f32fba46d5500 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -16,6 +16,7 @@ , jdk , usev110Api ? false , threadsafe ? false +, python3 }: # cpp and mpi options are mutually exclusive @@ -25,7 +26,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.12.2"; + version = "1.14.0"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-Goi742ITos6gyDlyAaRZZD5xVcnckeBiZ1s/sH7jiv4="; + sha256 = "sha256-5OeUM0UO2uKGWkxjKBiLtFORsp10+MU47mmfCxFsK6A="; }; passthru = { @@ -90,6 +91,10 @@ stdenv.mkDerivation rec { moveToOutput 'bin/h5pcc' "''${!outputDev}" ''; + passthru.tests = { + inherit (python3.pkgs) h5py; + }; + meta = { description = "Data model, library, and file format for storing and managing data"; longDescription = '' diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index 1eb1080c16b86..f44787924d94c 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Hyde46"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WCyu6vW0l8J2Xh8OGXMXVDBs287m2nPlRHeA0j8uvlk="; + sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc="; }; buildInputs = [ ncurses openssl ] @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-Cku9NnrjWT7VmOCryb0sbCQibG+iU9CHT3Cvd6M/9f4="; + cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4="; meta = with lib; { description = "CLI command organizer written in rust"; diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 5cedfd0c70619..73df1d3a9796a 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.6"; + version = "1.4.7"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-bbAJV4G5FAY0mSfrbIEs0eNFARZD74dUvHEBQuPc0rI="; + hash = "sha256-DfPU42X9WCvOXf/BvFkfIM4yWQnunBgjjSfncaL6HPA="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix index 4d00ffb03b4bf..ed7b0ab43182b 100644 --- a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix +++ b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "iam-policy-json-to-terraform"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "flosell"; repo = pname; rev = "${version}"; - sha256 = "sha256-O3JlBWT2YVu3mv/BCbs65k7HMF4cRCihd59wZzeoxcI="; + sha256 = "sha256-ovmWZpeHt1L8zNzG7+2BohteSjpYADMivi+AP0Vm8/E="; }; - vendorSha256 = "sha256-IXWt/yFapDamfZClI6gm5vPA5VW2gV2iEq5c/nJXiiA="; + vendorHash = "sha256-1WTc7peTJI3IvHJqznqRz29uQ2NG0CZpAAzlyYymZCQ="; meta = with lib; { description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document "; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index f4629f4867fd8..5bb1559af2d26 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.16"; + version = "0.10.17"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-HvDUL6hrWLJtwPA2gPiCLVmNA+O29+bIAMNNgBHu+XA="; + sha256 = "sha256-lAHZ6G7DnK2Pu3If5qZ12UF/NYNgd9utiz/dgkgJcjk="; }; - vendorHash = "sha256-S51NwHeJm3gSJ+9r8RgGY3zHJFddI8uNfYSpQl33M3M="; + vendorHash = "sha256-hfJY0yKr0OsgMKtVkfkbQ6nLGPnyS+PT23qQwuXiuqs="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix index e920a587fe3be..7f9a33927db95 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/tools/misc/instaloader/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "instaloader"; - version = "4.9.5"; + version = "4.9.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "instaloader"; repo = "instaloader"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3uO5EVK5mR3BwDF885onEraP3NYACTRwnGOsM009uig="; + sha256 = "sha256-ZxvJPDj+r7KSyXpYNQIgnda5OS77GOFM901ZHgR6c4k="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 7eba8fdfbdc56..75d92050aeedc 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.0.7"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-egM3ZlY/xjUu/Bxg58d7YET2PT3prf6ooZY+s/9faWQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-ELj80stWOwACsCGmjt2QR8TxBFpvlYmVN7hWDPee8YE="; }; - vendorSha256 = "sha256-Y6ErkDHnXJtdzEykD5EZYHRfHDPicE0sAzT2UXUNTGY="; + vendorHash = "sha256-xm7Iup4+xhcJ+Bzv56A0C3+2Fxz53qY8fqlVsMtFLd8="; modRoot = "."; subPackages = [ @@ -33,6 +33,7 @@ buildGoModule rec { For example - Blind SQLi, Blind CMDi, SSRF, etc. ''; homepage = "https://github.com/projectdiscovery/interactsh"; + changelog = "https://github.com/projectdiscovery/interactsh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ hanemile ]; }; diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index c61398a78dc42..555f4a529b92d 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "intermodal"; @@ -8,19 +8,28 @@ rustPlatform.buildRustPackage rec { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0mn0wm3bihn7ffqk0p79mb1hik54dbhc9diq1wh9ylpld2iqmz68"; + hash = "sha256-yPyKo2j0Up8gDzi2xOBqpMwIw6rpXDCxc8fCuEblwFY="; }; - cargoSha256 = "1bvs23rb25qdwbrygzq11p8cvck5lxjp9llvs1cjdh0qzr65jwla"; + cargoHash = "sha256-inJZTP4YwCZZ0JvSdGWnZbLN0A0B/+fz4g0XsfIQeq8="; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd imdl \ + --bash <($out/bin/imdl completions bash) \ + --fish <($out/bin/imdl completions fish) \ + --zsh <($out/bin/imdl completions zsh) + ''; + meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; homepage = "https://github.com/casey/intermodal"; license = licenses.cc0; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne xrelkd ]; mainProgram = "imdl"; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index c3a0c5aa906d4..3e788ad0d14bb 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2023-01-25"; + version = "unstable-2023-02-28"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "4bffe0f0d9d0e1496ae5cfb7579e813277c29b0f"; - sha256 = "oDQBJz6KKV72DfhNEXjAZNeolufIUQwhroczCuYnGQA="; + rev = "04e60a278abcda47301f6be2c23755e5e1004661"; + sha256 = "/p+mSn9ZL5H9aTIygpbgFaW5uBBBlSQfh/OksI0bMbY="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 7a8a6aa8a848a..48b7726dad7bf 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.32.0"; - vendorSha256 = "sha256-nL+2Yc4gI2+SoxoaGlazecsrcVkVh6Ig9sqITSOa5e0="; + version = "2.34.2"; + vendorHash = "sha256-23UlxJAuX5kH1gMskcL2Wh8eh2VtFabyuvJfulmuYeg="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-EyDX4OrBAzc5eYR660SrGIG61TRlWnnV/GAtXy7DfEI="; + sha256 = "sha256-x9lQcga5aspabJ/MYaVn8UJ+Zp6Bjrlzh28q6Uuwem0="; }; postInstall = '' diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix index 3d71482d4ead9..9a9fa5c9162a1 100644 --- a/pkgs/tools/misc/kakoune-cr/default.nix +++ b/pkgs/tools/misc/kakoune-cr/default.nix @@ -44,7 +44,7 @@ crystal.buildCrystalPackage rec { homepage = "https://github.com/alexherbo2/kakoune.cr"; description = "A command-line tool for Kakoune"; license = licenses.unlicense; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 02e783fa1e099..ef31e582f5c1f 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-P/MxIehxj+FE5hvWge7Q2EwL57ObV8ibRZtmko0mphY="; + sha256 = "sha256-GSjS/6wetm3kHXdGyeenzALZ3tVi7BMM/GLS1ZhMQas="; }; - cargoSha256 = "sha256-dQDfL5yN2ufFpQCXZ5Il0Qzhb/d7FETCVJg3DOMJPWQ="; + cargoHash = "sha256-dgbi0mUI8WqqXF1VNOTbHuCKcvb4B18/1vBlJZ8Jivs="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/krunner-translator/default.nix b/pkgs/tools/misc/krunner-translator/default.nix new file mode 100644 index 0000000000000..c97428b9469c9 --- /dev/null +++ b/pkgs/tools/misc/krunner-translator/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, krunner +, kconfigwidgets +, ktextwidgets +, kservice +, ki18n +, translate-shell +, qtbase +, qtdeclarative +, qtlocation +}: + +stdenv.mkDerivation rec { + pname = "krunner-translator"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "naraesk"; + repo = pname; + rev = "v${version}"; + sha256 = "8MusGvNhTxa8Sm8WiSwRaVIfZOeXmgcO4T6H9LqFGLs="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + dontWrapQtApps = true; + + buildInputs = [ + krunner + kconfigwidgets + ktextwidgets + kservice + ki18n + qtbase + qtdeclarative + qtlocation + ]; + + postPatch = '' + substituteInPlace src/translateShellProcess.cpp --replace "start(\"trans\", arguments);" "start(\"${translate-shell}/bin/trans\", arguments);" + ''; + + meta = with lib; { + description = "A plugin for KRunner which integrates a translator, supports Google Translate, Bing Translator, youdao and Baidu Fanyi"; + homepage = "https://github.com/naraesk/krunner-translator"; + license = licenses.gpl3; + maintainers = with maintainers; [ pongo1231 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 84bda9e684b3b..a3fbd6a7fc071 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2022.2"; + version = "2023"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vl7ozawd4Ra+yDarRpmPhjF7deJELaxo07L4/qVV4fw="; + sha256 = "sha256-VQ416ieqZ+UqI2sgsh+YPkcdn2SmtXFhPqJd1tp49EQ="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 3a7338221bac7..43dab4772d5f1 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -15,6 +15,7 @@ let perl' = perl.withPackages (p: with p; [ AuthenSASL ConvertASN1 + IOSocketSSL perlldap ]); in diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index dd0d34f50fe57..2b9ba694d3f62 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation { pname = "ldapvi"; - version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; + version = "unstable-2012-04-28"; # use latest git, it includes some important patches since 2007 release src = fetchgit { url = "http://www.lichteblau.com/git/ldapvi.git"; + rev = "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40"; sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 9635f8e1a8cce..45cd96382381b 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; configureScript = "sh autogen.sh"; diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/tools/misc/ledit/default.nix index 18efb8c952858..6070bfb2fafbd 100644 --- a/pkgs/tools/misc/ledit/default.nix +++ b/pkgs/tools/misc/ledit/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin ''; - buildInputs = [ + strictDeps = true; + + nativeBuildInputs = [ ocaml camlp5 ]; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index a7212ccf7648a..19f4c455965fd 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,18 +1,41 @@ -{ lib, stdenv, fetchurl, ncurses, lessSecure ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, ncurses +, pcre2 +}: stdenv.mkDerivation rec { pname = "less"; version = "608"; + # Only tarballs on the website are valid releases, + # other versions, e.g. git tags are considered snapshots. src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; - sha256 = "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6"; + hash = "sha256-ppq+LgoSZ3fgIdO3OqMiLhsmHxDmRiTUHsB5aFpqwgk="; }; - configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. - ++ lib.optionals lessSecure [ "--with-secure" ]; + patches = [ + (fetchpatch { + # https://github.com/advisories/GHSA-5xw7-xf7p-gm82 + name = "CVE-2022-46663.patch"; + url = "https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch"; + hash = "sha256-gWgCzoMt1WyVJVKYzkMq8HfaTlU1XUtC8fvNFUQT0sI="; + }) + ]; - buildInputs = [ ncurses ]; + configureFlags = [ + # Look for ‘sysless’ in /etc. + "--sysconfdir=/etc" + "--with-regex=pcre2" + ]; + + buildInputs = [ + ncurses + pcre2 + ]; meta = with lib; { homepage = "https://www.greenwoodsoftware.com/less/"; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 88f9a81561b71..347d6eae7ce42 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,13 +1,10 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, secp256k1 }: -let +stdenv.mkDerivation rec { pname = "libbitcoin"; version = "3.6.0"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = pname; repo = pname; @@ -34,7 +31,6 @@ in stdenv.mkDerivation { homepage = "https://libbitcoin.info/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; - # AGPL with a lesser clause license = licenses.agpl3; }; diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix index b880c66f971cd..5662b356f34eb 100644 --- a/pkgs/tools/misc/license-generator/default.nix +++ b/pkgs/tools/misc/license-generator/default.nix @@ -1,20 +1,20 @@ { lib, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "license-generator"; - version = "0.8.1"; + pname = "license-generator"; + version = "1.0.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I="; - }; + src = fetchCrate { + inherit pname version; + hash = "sha256-ijA/AqLeQ9/XLeCriWNUA6R3iKyq+QPDH5twSvqFmEA="; + }; - cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y="; + cargoHash = "sha256-FfkCV4anPHElGGIOYDSzHam5ohVGpOgtu/nM0aw9HzU="; - meta = with lib; { - description = "Command-line tool for generating license files"; - homepage = "https://github.com/azu/license-generator"; - license = licenses.mit; - maintainers = with maintainers; [ loicreynier ]; - }; + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; } diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 510a169f21506..8a81286eebbe6 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -17,14 +17,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0"; - patches = [ - # Support for 2022, https://github.com/raftario/licensor/pull/68 - (fetchpatch { - name = "support-for-2022.patch"; - url = "https://github.com/raftario/licensor/commit/6b2f248e5ad9e454fe30d71397691e47ac69b19e.patch"; - sha256 = "sha256-kXiY5s2kuU+ibV3RpBoy7y3cmJU+gECBTsmRXWBOTP8="; - }) - ]; + # https://github.com/raftario/licensor/issues/67 + postPatch = '' + sed "/Copyright (c) 2021/s/2021/$(date +%Y)/" -i tests/integration.rs + ''; meta = with lib; { description = "Write licenses to stdout"; diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/tools/misc/lilo/default.nix index f72cdc422be0c..17b485ca8da63 100644 --- a/pkgs/tools/misc/lilo/default.nix +++ b/pkgs/tools/misc/lilo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: identify.o:(.bss+0x0): multiple definition of `identify'; # common.o:(.bss+0x160): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "DESTDIR=${placeholder "out"}" diff --git a/pkgs/tools/misc/lipl/default.nix b/pkgs/tools/misc/lipl/default.nix new file mode 100644 index 0000000000000..b24fcaa3d2d1f --- /dev/null +++ b/pkgs/tools/misc/lipl/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "lipl"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "yxdunc"; + repo = "lipl"; + rev = "v${version}"; + hash = "sha256-ZeYz9g06vMsOk3YDmy0I+8e6BtLfweXqVH5uRt+mtes="; + }; + + cargoHash = "sha256-hcvC12dd6KDi7kYilXtBtyDQQG62YPMvSZA5trFqwWc="; + + meta = with lib; { + description = "A command line tool to analyse the output over time of custom shell commands"; + homepage = "https://github.com/yxdunc/lipl"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 5a68c7697cc4f..211df2186f784 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE"; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo"; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/locate-dominating-file/default.nix b/pkgs/tools/misc/locate-dominating-file/default.nix index 8932b6f62259b..7e0d0664b563e 100644 --- a/pkgs/tools/misc/locate-dominating-file/default.nix +++ b/pkgs/tools/misc/locate-dominating-file/default.nix @@ -2,43 +2,35 @@ , bash , fetchFromGitHub , lib -, stdenvNoCC +, resholve +, coreutils , getopt }: let version = "0.0.1"; in -stdenvNoCC.mkDerivation { +resholve.mkDerivation { pname = "locate-dominating-file"; inherit version; src = fetchFromGitHub { owner = "roman"; repo = "locate-dominating-file"; rev = "v${version}"; - sha256 = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY="; + hash = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY="; }; - doCheck = true; - postPatch = '' for file in $(find src tests -type f); do patchShebangs "$file" done ''; - buildInputs = [ getopt ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp src/locate-dominating-file.sh $out/bin/locate-dominating-file - - runHook postInstall - ''; + buildInputs = [ getopt coreutils ]; checkInputs = [ (bats.withLibraries (p: [ p.bats-support p.bats-assert ])) ]; + doCheck = true; + checkPhase = '' runHook preCheck @@ -47,7 +39,26 @@ stdenvNoCC.mkDerivation { runHook postCheck ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp src/locate-dominating-file.sh $out/bin/locate-dominating-file + + runHook postInstall + ''; + + solutions.default = { + scripts = [ "bin/locate-dominating-file" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + getopt + ]; + }; + meta = with lib; { + homepage = "https://github.com/roman/locate-dominating-file"; description = "Program that looks up in a directory hierarchy for a given filename"; license = licenses.mit; maintainers = [ maintainers.roman ]; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e245a05182dad..624a89ef9794e 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ liblockfile ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=format-overflow" + ]; + installPhase = '' runHook preInstall mkdir -p $out/bin $out/man/man1 diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 96c04c092b047..e8553b7f9e581 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureLocal = '' MANPATH_DEFAULT="/run/current-system/sw/share/man" MANPATH_BASE="$MANPATH_DEFAULT" - OSNAME="NixOS" + OSNAME="Nixpkgs" PREFIX="$out" LD_OHASH="-lutil" # Use symlinks instead of hardlinks (more commonly used in nixpkgs) diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index 911cde27cc64c..9bed612bd5982 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dsHTnaK1Bna6Gbr/J+PYjeZ0WqJh696sliTd5JF1C+o="; + sha256 = "sha256-cpNNStPgGnEtiiHgpiLUvEFu78NtyJIVgjrkh6N+dLU="; }; - vendorSha256 = "sha256-RblYkQSOMOKaI4ODkNae3rxJEaxkzwA2SuoMr+Z2/ew="; + vendorHash = "sha256-t6bTbgOTWNz3nz/Tgwkd+TCBhN++0UaV0LqaEsO9YCI="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 1273e8c63e388..885ab1b0176a5 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "massren"; version = "1.5.6"; @@ -8,10 +8,32 @@ buildGoPackage rec { owner = "laurent22"; repo = "massren"; rev = "v${version}"; - sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64="; + hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64="; }; - goPackagePath = "github.com/laurent22/massren"; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/laurent22/massren/commit/83df215b6e112d1ec375b08d8c44dadc5107155d.patch"; + hash = "sha256-FMTmUrv6zGq11vexUirAuK3H6r78RtoipqyWoh+pzrs="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + + preCheck = + let + skippedTests = [ + # Possible error about github.com/mattn/go-sqlite3 + "Test_guessEditorCommand" + "Test_processFileActions" + ]; + in + '' + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; meta = with lib; { description = "Easily rename multiple files using your text editor"; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 8349e0fd4d717..ef5b8e56fa0a9 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes. ''; - homepage = "http://mcrypt.sourceforge.net"; + homepage = "https://mcrypt.sourceforge.net"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; maintainers = [ lib.maintainers.qknight ]; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index a2dae74457df4..547bbba890466 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.01"; + version = "6.10"; src = fetchFromGitHub { owner = "memtest86plus"; repo = "memtest86plus"; rev = "v${finalAttrs.version}"; - hash = "sha256-BAY8hR8Sl9Hp9Zps0INL43cNqJwXX689m9rfa4dHrqs="; + hash = "sha256-f40blxh/On/mC4m+eLNeWzdYzYoYpFOSBndVnREx68U="; }; # Binaries are booted directly by BIOS/UEFI or bootloader diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index dc446d3f0a199..46bf31ed667ed 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-3wLfQvbwx+OFrCl5vMV7Zps4e4iEYFhqPiVCo5hDqgw="; })]; + postPatch = '' + sed '1i#include <ctime>' -i src/Log.cxx # gcc12 + ''; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ libmpdclient diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/tools/misc/mpy-utils/default.nix new file mode 100644 index 0000000000000..ea816126858bd --- /dev/null +++ b/pkgs/tools/misc/mpy-utils/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, python3, buildPythonApplication, fetchPypi, fusepy, pyserial }: + +buildPythonApplication rec { + pname = "mpy-utils"; + version = "0.1.13"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4="; + }; + + propagatedBuildInputs = [ fusepy pyserial ]; + + meta = with lib; { + description = "MicroPython development utility programs"; + homepage = "https://github.com/nickzoic/mpy-utils"; + license = licenses.mit; + maintainers = with maintainers; [ aciceri ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 5b154c8c9aceb..1cd914bec657e 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.3"; + version = "0.16.5"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jvQCXSdEw8xQ8m2xBLDu7pw9K51lAH3nzCr2N0/+Kuw="; + sha256 = "sha256-Rn3aXwez/WUGpuRvA6lkuECchpYek8KDMh6xzZOV9v0="; }; - vendorSha256 = "sha256-rosoPXNb3NYI5mM0gt3Fpg2XZtSLt90jxcBqALx7Lno="; + vendorHash = "sha256-EkLeB2zUJkKCWsJxMiYHSDgr0/8X24MT0Jp0nuYebds="; doCheck = false; diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 207de747d2c59..84c71bd85d073 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.3.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-R5B49648X9UP2al4VRRAl/T9clgvCztYxpbDHwQmDM8="; + sha256 = "sha256-5QuNv6sRr/pfw0Vk+jfSjpowWfsD4kh7c2YoEEuUeKE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index b8b5d93c38130..d535061cde644 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xkr49rzYz3rY/T15ANqxMgdFoEUxAenjdPmnf3Ku0UE="; + hash = "sha256-kNkgAk51Ixi0aXds5X4Ds8cC1JMprZglruqzbDur+ZM="; }; XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ pSub SuperSandro2000 ]; + maintainers = with maintainers; [ pSub SuperSandro2000 rodrgz ]; }; } diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index bebe77faaa7d4..40c060b631551 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "noti"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; rev = version; - sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA="; + hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 232c913d4a77b..ee76230dc555f 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -10,16 +10,16 @@ let in buildGoModule rec { pname = "ntfy-sh"; - version = "1.30.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-MgjCfYYv4tBZHsoj9oXGKYOQb0Anp0zVD/vc+UpAiAc="; + sha256 = "sha256-xtQO9E5qt2g3JMXmqePnfEsvvOIlgZqAup9DkJJ0ClI="; }; - vendorSha256 = "sha256-8TQVpJ02EPve1OUP6RHbvwBug8larSO3BgBiCfL2614="; + vendorSha256 = "sha256-kfXan6LAVJ4ka34nP7ObAB2uISyQT9QrymOFFderdlQ="; doCheck = false; diff --git a/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh b/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh index a7cafab319eef..83e2e2b7b420c 100755 --- a/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh +++ b/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh @@ -6,6 +6,7 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ --nodejs-14 \ --node-env ../../../development/node-packages/node-env.nix \ --development \ - --lock ./package-lock-temp.json \ --output node-packages.nix \ --composition node-composition.nix +# removed temporarily because of https://github.com/svanderburg/node2nix/issues/312 +# --lock ./package-lock-temp.json \ diff --git a/pkgs/tools/misc/ntfy-sh/node-packages.nix b/pkgs/tools/misc/ntfy-sh/node-packages.nix index 2ce76e5ababf3..588e68c1b6ec6 100644 --- a/pkgs/tools/misc/ntfy-sh/node-packages.nix +++ b/pkgs/tools/misc/ntfy-sh/node-packages.nix @@ -31,22 +31,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.10" = { + "@babel/compat-data-7.21.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.10"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz"; - sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz"; + sha512 = "gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="; }; }; - "@babel/core-7.20.7" = { + "@babel/core-7.21.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz"; - sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz"; + sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -58,13 +58,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.20.7" = { + "@babel/generator-7.21.1" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.7"; + version = "7.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz"; + sha512 = "1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -94,22 +94,22 @@ let sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.20.7" = { + "@babel/helper-create-class-features-plugin-7.21.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.7.tgz"; - sha512 = "LtoWbDXOaidEf50hmdDqn9g8VEzsorMexoWMQdQODbvmqYmaF23pBP5VNPAGIFHsFQCIeKokDiz3CH5Y2jlY6w=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz"; + sha512 = "Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.20.5" = { + "@babel/helper-create-regexp-features-plugin-7.21.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.20.5"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz"; - sha512 = "m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz"; + sha512 = "N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg=="; }; }; "@babel/helper-define-polyfill-provider-0.3.3" = { @@ -139,13 +139,13 @@ let sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.19.0" = { + "@babel/helper-function-name-7.21.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; + sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; }; }; "@babel/helper-hoist-variables-7.18.6" = { @@ -157,13 +157,13 @@ let sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.20.7" = { + "@babel/helper-member-expression-to-functions-7.21.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz"; - sha512 = "9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"; + sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q=="; }; }; "@babel/helper-module-imports-7.18.6" = { @@ -175,13 +175,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.7" = { + "@babel/helper-module-transforms-7.21.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; - sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"; + sha512 = "79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -265,13 +265,13 @@ let sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; }; - "@babel/helper-validator-option-7.18.6" = { + "@babel/helper-validator-option-7.21.0" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"; + sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="; }; }; "@babel/helper-wrap-function-7.20.5" = { @@ -283,13 +283,13 @@ let sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.20.7" = { + "@babel/helpers-7.21.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"; + sha512 = "XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA=="; }; }; "@babel/highlight-7.18.6" = { @@ -301,13 +301,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.20.7" = { + "@babel/parser-7.21.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; + sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -346,22 +346,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.20.7" = { + "@babel/plugin-proposal-class-static-block-7.21.0" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"; + sha512 = "XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw=="; }; }; - "@babel/plugin-proposal-decorators-7.20.7" = { + "@babel/plugin-proposal-decorators-7.21.0" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz"; - sha512 = "JB45hbUweYpwAGjkiM7uCyXMENH2lG+9r3G2E+ttc2PRXAoEkpfd/KW5jDg4j8RS6tLtTG1jZi9LbHZVSfs1/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz"; + sha512 = "MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -436,13 +436,13 @@ let sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.20.7" = { + "@babel/plugin-proposal-optional-chaining-7.21.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz"; - sha512 = "T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"; + sha512 = "p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA=="; }; }; "@babel/plugin-proposal-private-methods-7.18.6" = { @@ -454,13 +454,13 @@ let sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.20.5" = { + "@babel/plugin-proposal-private-property-in-object-7.21.0" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.20.5"; + version = "7.21.0"; src = fetchurl { - 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=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"; + sha512 = "ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { @@ -508,13 +508,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.19.0" = { + "@babel/plugin-syntax-decorators-7.21.0" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz"; - sha512 = "xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz"; + sha512 = "tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -688,22 +688,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.9" = { + "@babel/plugin-transform-block-scoping-7.21.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.9"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.9.tgz"; - sha512 = "hwZN0kr16UkIF/kR9F9x8gd1kTkQl1vyAF2lkUmlTuCtTKOGLE5blQctuxEeKXwz0dkArQ9RYL8+HLb/75KGMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"; + sha512 = "Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ=="; }; }; - "@babel/plugin-transform-classes-7.20.7" = { + "@babel/plugin-transform-classes-7.21.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz"; - sha512 = "LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"; + sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ=="; }; }; "@babel/plugin-transform-computed-properties-7.20.7" = { @@ -751,22 +751,22 @@ let sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.19.0" = { + "@babel/plugin-transform-flow-strip-types-7.21.0" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.19.0"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz"; - sha512 = "sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz"; + sha512 = "FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w=="; }; }; - "@babel/plugin-transform-for-of-7.18.8" = { + "@babel/plugin-transform-for-of-7.21.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.8"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"; + sha512 = "LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ=="; }; }; "@babel/plugin-transform-function-name-7.18.9" = { @@ -796,31 +796,31 @@ let sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.20.7" = { + "@babel/plugin-transform-modules-amd-7.20.11" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.20.7"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.7.tgz"; - sha512 = "+1IVLD+dHOzRZWNFFSoyPZz4ffsVmOP+OhhjeahLKpU97v/52LcCb9RabRl5eHM1/HAuH5Dl0q9Pyzrq1v2otQ=="; + 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.20.7" = { + "@babel/plugin-transform-modules-commonjs-7.21.2" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.7.tgz"; - sha512 = "76jqqFiFdCD+RJwEdtBHUG2/rEKQAmpejPbAKyQECEE3/y4U5CMPc9IXvipS990vgQhzq+ZRw6WJ+q4xJ/P24w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"; + sha512 = "Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA=="; }; }; - "@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" = { @@ -895,13 +895,13 @@ let sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.20.7" = { + "@babel/plugin-transform-react-jsx-7.21.0" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; - sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz"; + sha512 = "6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg=="; }; }; "@babel/plugin-transform-react-jsx-development-7.18.6" = { @@ -940,13 +940,13 @@ let sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; - "@babel/plugin-transform-runtime-7.19.6" = { + "@babel/plugin-transform-runtime-7.21.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.19.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz"; - sha512 = "PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz"; + sha512 = "ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.18.6" = { @@ -994,13 +994,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.20.7" = { + "@babel/plugin-transform-typescript-7.21.0" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.20.7"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz"; - sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz"; + sha512 = "xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -1048,31 +1048,31 @@ let sha512 = "zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg=="; }; }; - "@babel/preset-typescript-7.18.6" = { + "@babel/preset-typescript-7.21.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.18.6"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; - sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz"; + sha512 = "myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg=="; }; }; - "@babel/runtime-7.20.7" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.20.7"; + "@babel/regjsgen-0.8.0" = { + name = "_at_babel_slash_regjsgen"; + packageName = "@babel/regjsgen"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; - sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; + url = "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"; + sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-corejs3-7.20.7" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.20.7"; + "@babel/runtime-7.21.0" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz"; - sha512 = "jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz"; + sha512 = "xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw=="; }; }; "@babel/template-7.20.7" = { @@ -1084,22 +1084,22 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.10" = { + "@babel/traverse-7.21.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.10"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.10.tgz"; - sha512 = "oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz"; + sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; }; }; - "@babel/types-7.20.7" = { + "@babel/types-7.21.2" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.20.7"; + version = "7.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; - sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz"; + sha512 = "3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1246,22 +1246,22 @@ let 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=="; }; }; - "@emotion/babel-plugin-11.10.5" = { + "@emotion/babel-plugin-11.10.6" = { name = "_at_emotion_slash_babel-plugin"; packageName = "@emotion/babel-plugin"; - version = "11.10.5"; + version = "11.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz"; - sha512 = "xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA=="; + url = "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.6.tgz"; + sha512 = "p2dAqtVrkhSa7xz1u/m9eHYdLi+en8NowrmXeF/dKtJpU8lCWli8RUAati7NcSl0afsBott48pdnANuD0wh9QQ=="; }; }; "@emotion/cache-11.10.5" = { @@ -1300,13 +1300,13 @@ let sha512 = "G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="; }; }; - "@emotion/react-11.10.5" = { + "@emotion/react-11.10.6" = { name = "_at_emotion_slash_react"; packageName = "@emotion/react"; - version = "11.10.5"; + version = "11.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz"; - sha512 = "TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A=="; + url = "https://registry.npmjs.org/@emotion/react/-/react-11.10.6.tgz"; + sha512 = "6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw=="; }; }; "@emotion/serialize-1.1.1" = { @@ -1327,13 +1327,13 @@ let sha512 = "zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="; }; }; - "@emotion/styled-11.10.5" = { + "@emotion/styled-11.10.6" = { name = "_at_emotion_slash_styled"; packageName = "@emotion/styled"; - version = "11.10.5"; + version = "11.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz"; - sha512 = "8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw=="; + url = "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.6.tgz"; + sha512 = "OXtBzOmDSJo5Q0AFemHCfl+bUueT8BIcPSxu0EGTpGk6DmI5dnhSzQANm1e1ze0YZL7TDyAyy6s/b/zmGOS3Og=="; }; }; "@emotion/unitless-0.8.0" = { @@ -1372,13 +1372,22 @@ let sha512 = "AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="; }; }; - "@eslint/eslintrc-1.4.0" = { + "@eslint/eslintrc-2.0.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.4.0"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz"; + sha512 = "fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A=="; + }; + }; + "@eslint/js-8.35.0" = { + name = "_at_eslint_slash_js"; + packageName = "@eslint/js"; + version = "8.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; - sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz"; + sha512 = "JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw=="; }; }; "@humanwhocodes/config-array-0.11.8" = { @@ -1633,67 +1642,67 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@mui/base-5.0.0-alpha.111" = { + "@mui/base-5.0.0-alpha.118" = { name = "_at_mui_slash_base"; packageName = "@mui/base"; - version = "5.0.0-alpha.111"; + version = "5.0.0-alpha.118"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.111.tgz"; - sha512 = "2wfIPpl97S4dPzD0QOM3UIzQ/EuXCYQvHmXxTpfKxev/cfkzOe7Ik/McoYUBbtM1bSOqH3W276R/L2LF9cyXqQ=="; + url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.118.tgz"; + sha512 = "GAEpqhnuHjRaAZLdxFNuOf2GDTp9sUawM46oHZV4VnYPFjXJDkIYFWfIQLONb0nga92OiqS5DD/scGzVKCL0Mw=="; }; }; - "@mui/core-downloads-tracker-5.11.1" = { + "@mui/core-downloads-tracker-5.11.9" = { name = "_at_mui_slash_core-downloads-tracker"; packageName = "@mui/core-downloads-tracker"; - version = "5.11.1"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.1.tgz"; - sha512 = "QVqVNlZ2K+LqUDE5kFgYd0r4KekR/dv2cNYbAutQWbfOA8VPVUVrDz0ELrEcoe8TjM/CwnsmGvaDh/YSNl/ALA=="; + url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.9.tgz"; + sha512 = "YGEtucQ/Nl91VZkzYaLad47Cdui51n/hW+OQm4210g4N3/nZzBxmGeKfubEalf+ShKH4aYDS86XTO6q/TpZnjQ=="; }; }; - "@mui/icons-material-5.11.0" = { + "@mui/icons-material-5.11.9" = { name = "_at_mui_slash_icons-material"; packageName = "@mui/icons-material"; - version = "5.11.0"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.0.tgz"; - sha512 = "I2LaOKqO8a0xcLGtIozC9xoXjZAto5G5gh0FYUMAlbsIHNHIjn4Xrw9rvjY20vZonyiGrZNMAlAXYkY6JvhF6A=="; + url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.9.tgz"; + sha512 = "SPANMk6K757Q1x48nCwPGdSNb8B71d+2hPMJ0V12VWerpSsbjZtvAPi5FAn13l2O5mwWkvI0Kne+0tCgnNxMNw=="; }; }; - "@mui/material-5.11.1" = { + "@mui/material-5.11.10" = { name = "_at_mui_slash_material"; packageName = "@mui/material"; - version = "5.11.1"; + version = "5.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/material/-/material-5.11.1.tgz"; - sha512 = "yaZiXvcrl2vgUK+VO24780BWRgwdAMmAyuMVZnRTts1Yu0tWd6PjIYq2ZtaOlpj6/LbaSS+Q2kSfxYnDQ20CEQ=="; + url = "https://registry.npmjs.org/@mui/material/-/material-5.11.10.tgz"; + sha512 = "hs1WErbiedqlJIZsljgoil908x4NMp8Lfk8di+5c7o809roqKcFTg2+k3z5ucKvs29AXcsdXrDB/kn2K6dGYIw=="; }; }; - "@mui/private-theming-5.11.1" = { + "@mui/private-theming-5.11.9" = { name = "_at_mui_slash_private-theming"; packageName = "@mui/private-theming"; - version = "5.11.1"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.1.tgz"; - sha512 = "nnHg7kA5RwFRhy0wiDYe59sLCVGORpPypL1JcEdhv0+N0Zbmc2E/y4z2zqMRZ62MAEscpro7cQbvv244ThA84A=="; + url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.9.tgz"; + sha512 = "XMyVIFGomVCmCm92EvYlgq3zrC9K+J6r7IKl/rBJT2/xVYoRY6uM7jeB+Wxh7kXxnW9Dbqsr2yL3cx6wSD1sAg=="; }; }; - "@mui/styled-engine-5.11.0" = { + "@mui/styled-engine-5.11.9" = { name = "_at_mui_slash_styled-engine"; packageName = "@mui/styled-engine"; - version = "5.11.0"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.0.tgz"; - sha512 = "AF06K60Zc58qf0f7X+Y/QjaHaZq16znliLnGc9iVrV/+s8Ln/FCoeNuFvhlCbZZQ5WQcJvcy59zp0nXrklGGPQ=="; + url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.9.tgz"; + sha512 = "bkh2CjHKOMy98HyOc8wQXEZvhOmDa/bhxMUekFX5IG0/w4f5HJ8R6+K6nakUUYNEgjOWPYzNPrvGB8EcGbhahQ=="; }; }; - "@mui/system-5.11.1" = { + "@mui/system-5.11.9" = { name = "_at_mui_slash_system"; packageName = "@mui/system"; - version = "5.11.1"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/system/-/system-5.11.1.tgz"; - sha512 = "BEA2S0hay8n8CcZftkeAVsi0nsb5ZjdnZRCahv5lX7QJYwDjO4ucJ6lnvxHe2v/9Te1LLjTO7ojxu/qM6CE5Cg=="; + url = "https://registry.npmjs.org/@mui/system/-/system-5.11.9.tgz"; + sha512 = "h6uarf+l3FO6l75Nf7yO+qDGrIoa1DM9nAMCUFZQsNCDKOInRzcptnm8M1w/Z3gVetfeeGoIGAYuYKbft6KZZA=="; }; }; "@mui/types-7.2.3" = { @@ -1705,13 +1714,13 @@ let sha512 = "tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw=="; }; }; - "@mui/utils-5.11.1" = { + "@mui/utils-5.11.9" = { name = "_at_mui_slash_utils"; packageName = "@mui/utils"; - version = "5.11.1"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.1.tgz"; - sha512 = "lMAPgIJoil8V9ZxsMbEflMsvZmWcHbRVMc4JDY9jPO9V4welpF43h/O267b1RqlcRnC5MEbVQV605GYkTZY29Q=="; + url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.9.tgz"; + sha512 = "eOJaqzcEs4qEwolcvFAmXGpln+uvouvOS9FUX6Wkrte+4I8rZbjODOBDVNlK+V6/ziTfD4iNKC0G+KfOTApbqg=="; }; }; "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { @@ -1768,13 +1777,13 @@ let sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; }; - "@remix-run/router-1.2.0" = { + "@remix-run/router-1.3.2" = { name = "_at_remix-run_slash_router"; packageName = "@remix-run/router"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.2.0.tgz"; - sha512 = "GO82KYYTWPRCgdNtnheaZG3LcViUlxRFlHM7ykh7N+ufoXi6PVIHoP+9RUG/vuzl2hr9i/h6EA1Eq+2HpqJ0gQ=="; + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.2.tgz"; + sha512 = "t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA=="; }; }; "@rollup/plugin-babel-5.3.1" = { @@ -2002,13 +2011,13 @@ let sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; - "@types/babel__core-7.1.20" = { + "@types/babel__core-7.20.0" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.20"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz"; - sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz"; + sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ=="; }; }; "@types/babel__generator-7.6.4" = { @@ -2074,13 +2083,13 @@ let sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; }; }; - "@types/eslint-8.4.10" = { + "@types/eslint-8.21.1" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.4.10"; + version = "8.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz"; - sha512 = "Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.1.tgz"; + sha512 = "rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ=="; }; }; "@types/eslint-scope-3.7.4" = { @@ -2119,31 +2128,31 @@ let sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; }; }; - "@types/express-4.17.15" = { + "@types/express-4.17.17" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.15"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; - sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; - "@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/graceful-fs-4.1.5" = { + "@types/graceful-fs-4.1.6" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; - sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw=="; }; }; "@types/html-minifier-terser-6.1.0" = { @@ -2155,13 +2164,13 @@ let sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; }; }; - "@types/http-proxy-1.17.9" = { + "@types/http-proxy-1.17.10" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.9"; + version = "1.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; - sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz"; + sha512 = "Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g=="; }; }; "@types/istanbul-lib-coverage-2.0.4" = { @@ -2218,13 +2227,13 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-18.11.17" = { + "@types/node-18.14.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.17"; + version = "18.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz"; - sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz"; + sha512 = "1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA=="; }; }; "@types/parse-json-4.0.0" = { @@ -2281,13 +2290,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/react-18.0.26" = { + "@types/react-18.0.28" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.0.26"; + version = "18.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz"; - sha512 = "hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz"; + sha512 = "RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew=="; }; }; "@types/react-is-17.0.3" = { @@ -2353,13 +2362,13 @@ let sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; }; }; - "@types/serve-static-1.15.0" = { + "@types/serve-static-1.15.1" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"; + sha512 = "NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ=="; }; }; "@types/sockjs-0.3.33" = { @@ -2380,40 +2389,40 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/trusted-types-2.0.2" = { + "@types/trusted-types-2.0.3" = { name = "_at_types_slash_trusted-types"; packageName = "@types/trusted-types"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz"; - sha512 = "F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="; + url = "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz"; + sha512 = "NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="; }; }; - "@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-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=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz"; + sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; - "@types/yargs-17.0.17" = { + "@types/yargs-17.0.22" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "17.0.17"; + version = "17.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz"; - sha512 = "72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz"; + sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g=="; }; }; "@types/yargs-parser-21.0.0" = { @@ -2425,85 +2434,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.47.0" = { + "@typescript-eslint/eslint-plugin-5.53.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz"; - sha512 = "AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz"; + sha512 = "alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw=="; }; }; - "@typescript-eslint/experimental-utils-5.47.0" = { + "@typescript-eslint/experimental-utils-5.53.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.47.0.tgz"; - sha512 = "DAP8xOaTAJLxouU0QrATiw8o/OHxxbUBXtkf9v+bCCU6tbJUn24xwB1dHFw3b5wYq4XvC1z5lYEN0g/Rx1sjzA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.53.0.tgz"; + sha512 = "4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw=="; }; }; - "@typescript-eslint/parser-5.47.0" = { + "@typescript-eslint/parser-5.53.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.0.tgz"; - sha512 = "udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.53.0.tgz"; + sha512 = "MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ=="; }; }; - "@typescript-eslint/scope-manager-5.47.0" = { + "@typescript-eslint/scope-manager-5.53.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz"; - sha512 = "dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz"; + sha512 = "Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w=="; }; }; - "@typescript-eslint/type-utils-5.47.0" = { + "@typescript-eslint/type-utils-5.53.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz"; - sha512 = "1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz"; + sha512 = "HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw=="; }; }; - "@typescript-eslint/types-5.47.0" = { + "@typescript-eslint/types-5.53.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.0.tgz"; - sha512 = "eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.53.0.tgz"; + sha512 = "5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A=="; }; }; - "@typescript-eslint/typescript-estree-5.47.0" = { + "@typescript-eslint/typescript-estree-5.53.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz"; - sha512 = "LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz"; + sha512 = "eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w=="; }; }; - "@typescript-eslint/utils-5.47.0" = { + "@typescript-eslint/utils-5.53.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.47.0.tgz"; - sha512 = "U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.53.0.tgz"; + sha512 = "VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g=="; }; }; - "@typescript-eslint/visitor-keys-5.47.0" = { + "@typescript-eslint/visitor-keys-5.53.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.47.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz"; - sha512 = "ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz"; + sha512 = "JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -2686,13 +2695,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "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-globals-6.0.0" = { @@ -2776,13 +2785,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.11.2" = { + "ajv-8.12.0" = { name = "ajv"; packageName = "ajv"; - version = "8.11.2"; + version = "8.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; - sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; + sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; }; }; "ajv-formats-2.1.1" = { @@ -2911,13 +2920,13 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "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=="; }; }; "array-flatten-1.1.1" = { @@ -3046,22 +3055,31 @@ let sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; }; }; - "axe-core-4.6.1" = { + "available-typed-arrays-1.0.5" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + }; + }; + "axe-core-4.6.3" = { name = "axe-core"; packageName = "axe-core"; - version = "4.6.1"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.1.tgz"; - sha512 = "lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w=="; + url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz"; + sha512 = "/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="; }; }; - "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=="; }; }; "babel-jest-27.5.1" = { @@ -3244,13 +3262,13 @@ let sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; - "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" = { @@ -3298,13 +3316,13 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.21.4" = { + "browserslist-4.21.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.4"; + version = "4.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"; + sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w=="; }; }; "bser-2.1.1" = { @@ -3415,13 +3433,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001441" = { + "caniuse-lite-1.0.30001458" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001441"; + version = "1.0.30001458"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; - sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"; + sha512 = "lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w=="; }; }; "case-sensitive-paths-webpack-plugin-2.4.0" = { @@ -3496,13 +3514,13 @@ let sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; }; }; - "ci-info-3.7.0" = { + "ci-info-3.8.0" = { name = "ci-info"; packageName = "ci-info"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz"; - sha512 = "2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"; + sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; }; }; "cjs-module-lexer-1.2.2" = { @@ -3514,13 +3532,13 @@ let sha512 = "cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="; }; }; - "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=="; }; }; "cliui-7.0.4" = { @@ -3739,13 +3757,13 @@ 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=="; }; }; "convert-source-map-1.9.0" = { @@ -3775,31 +3793,31 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; - "core-js-3.26.1" = { + "core-js-3.29.0" = { name = "core-js"; packageName = "core-js"; - version = "3.26.1"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz"; - sha512 = "21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; + sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; }; - "core-js-compat-3.26.1" = { + "core-js-compat-3.29.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.26.1"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.1.tgz"; - sha512 = "622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz"; + sha512 = "ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ=="; }; }; - "core-js-pure-3.26.1" = { + "core-js-pure-3.29.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.26.1"; + version = "3.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.1.tgz"; - sha512 = "VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.29.0.tgz"; + sha512 = "v94gUjN5UTe1n0yN/opTihJ8QBWD2O8i19RfTZR7foONPWArnjB96QA/wk5ozu1mm6ja3udQCzOzwQXTxi3xOQ=="; }; }; "core-util-is-1.0.3" = { @@ -3973,13 +3991,13 @@ let sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; - "cssdb-7.2.0" = { + "cssdb-7.4.1" = { name = "cssdb"; packageName = "cssdb"; - version = "7.2.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz"; - sha512 = "JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg=="; + url = "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz"; + sha512 = "0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ=="; }; }; "cssesc-3.0.0" = { @@ -3991,22 +4009,22 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; - "cssnano-5.1.14" = { + "cssnano-5.1.15" = { name = "cssnano"; packageName = "cssnano"; - version = "5.1.14"; + version = "5.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz"; - sha512 = "Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz"; + sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="; }; }; - "cssnano-preset-default-5.2.13" = { + "cssnano-preset-default-5.2.14" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "5.2.13"; + version = "5.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz"; - sha512 = "PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz"; + sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="; }; }; "cssnano-utils-3.1.0" = { @@ -4126,6 +4144,15 @@ let sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; }; + "deep-equal-2.2.0" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz"; + sha512 = "RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw=="; + }; + }; "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; @@ -4135,13 +4162,13 @@ let sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; - "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-gateway-6.0.3" = { @@ -4162,13 +4189,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.4" = { + "define-properties-1.2.0" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; "defined-1.0.1" = { @@ -4252,13 +4279,13 @@ let sha512 = "v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw=="; }; }; - "dexie-3.2.2" = { + "dexie-3.2.3" = { name = "dexie"; packageName = "dexie"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/dexie/-/dexie-3.2.2.tgz"; - sha512 = "q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg=="; + url = "https://registry.npmjs.org/dexie/-/dexie-3.2.3.tgz"; + sha512 = "iHayBd4UYryDCVUNa3PMsJMEnd8yjyh5p7a+RFeC8i8n476BC9wMhVvqiImq5zJZJf5Tuer+s4SSj+AA3x+ZbQ=="; }; }; "dexie-react-hooks-1.1.1" = { @@ -4486,13 +4513,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "electron-to-chromium-1.4.284" = { + "electron-to-chromium-1.4.311" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.284"; + version = "1.4.311"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz"; + sha512 = "RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw=="; }; }; "emittery-0.10.2" = { @@ -4585,13 +4612,13 @@ let sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; }; }; - "es-abstract-1.20.5" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.5"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz"; - sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -4603,6 +4630,15 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; + "es-get-iterator-1.1.3" = { + name = "es-get-iterator"; + packageName = "es-get-iterator"; + version = "1.1.3"; + src = fetchurl { + 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" = { name = "es-module-lexer"; packageName = "es-module-lexer"; @@ -4612,6 +4648,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"; @@ -4684,13 +4729,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.30.0" = { + "eslint-8.35.0" = { name = "eslint"; packageName = "eslint"; - version = "8.30.0"; + version = "8.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz"; - sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; + sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; }; }; "eslint-config-react-app-7.0.1" = { @@ -4702,13 +4747,13 @@ let sha512 = "K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA=="; }; }; - "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-module-utils-2.7.4" = { @@ -4729,13 +4774,13 @@ let sha512 = "dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ=="; }; }; - "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-jest-25.7.0" = { @@ -4747,22 +4792,22 @@ let sha512 = "PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ=="; }; }; - "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-react-7.31.11" = { + "eslint-plugin-react-7.32.2" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; - version = "7.31.11"; + version = "7.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz"; - sha512 = "TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw=="; + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz"; + sha512 = "t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg=="; }; }; "eslint-plugin-react-hooks-4.6.0" = { @@ -4774,13 +4819,13 @@ let sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="; }; }; - "eslint-plugin-testing-library-5.9.1" = { + "eslint-plugin-testing-library-5.10.2" = { name = "eslint-plugin-testing-library"; packageName = "eslint-plugin-testing-library"; - version = "5.9.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.9.1.tgz"; - sha512 = "6BQp3tmb79jLLasPHJmy8DnxREe+2Pgf7L+7o09TSWPfdqqtQfRZmZNetr5mOs3yqZk/MRNxpN3RUpJe0wB4LQ=="; + url = "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.10.2.tgz"; + sha512 = "f1DmDWcz5SDM+IpCkEX0lbFqrrTs8HRsEElzDEqN/EBI0hpRj8Cns5+IVANXswE8/LeybIJqPAOQIFu2j5Y5sw=="; }; }; "eslint-scope-5.1.1" = { @@ -4855,13 +4900,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.4.0" = { + "esquery-1.4.2" = { name = "esquery"; packageName = "esquery"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"; + sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng=="; }; }; "esrecurse-4.3.0" = { @@ -5008,13 +5053,13 @@ let sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; }; - "fastq-1.14.0" = { + "fastq-1.15.0" = { name = "fastq"; packageName = "fastq"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz"; - sha512 = "eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; }; "faye-websocket-0.11.4" = { @@ -5161,6 +5206,15 @@ let sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; + "for-each-0.3.3" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + }; + }; "fork-ts-checker-webpack-plugin-6.5.2" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; @@ -5296,13 +5350,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-own-enumerable-property-symbols-3.0.2" = { @@ -5404,13 +5458,22 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.19.0" = { + "globals-13.20.0" = { name = "globals"; packageName = "globals"; - version = "13.19.0"; + version = "13.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; - sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; + }; + }; + "globalthis-1.0.3" = { + name = "globalthis"; + packageName = "globalthis"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; "globby-11.1.0" = { @@ -5521,6 +5584,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"; @@ -5719,6 +5791,15 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; + "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=="; + }; + }; "i18next-21.10.0" = { name = "i18next"; packageName = "i18next"; @@ -5800,13 +5881,13 @@ let sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; }; - "immer-9.0.16" = { + "immer-9.0.19" = { name = "immer"; packageName = "immer"; - version = "9.0.16"; + version = "9.0.19"; 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=="; }; }; "import-fresh-3.3.0" = { @@ -5872,13 +5953,13 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; - "internal-slot-1.0.4" = { + "internal-slot-1.0.5" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; + sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; }; }; "ipaddr.js-1.9.1" = { @@ -5899,6 +5980,24 @@ let sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; + "is-arguments-1.1.1" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + 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"; @@ -6007,6 +6106,15 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; + "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-module-1.0.0" = { name = "is-module"; packageName = "is-module"; @@ -6106,6 +6214,15 @@ let sha512 = "AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="; }; }; + "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"; @@ -6142,6 +6259,15 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; + "is-typed-array-1.1.10" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.10"; + src = fetchurl { + 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" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -6151,6 +6277,15 @@ let sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; }; }; + "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"; @@ -6160,6 +6295,15 @@ 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-wsl-2.2.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -6178,6 +6322,15 @@ 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=="; + }; + }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -6565,22 +6718,22 @@ let sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; }; }; - "js-base64-3.7.3" = { + "js-base64-3.7.5" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.3"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.3.tgz"; - sha512 = "PAr6Xg2jvd7MCR6Ld9Jg3BmTcjYsHEBx1VlwEwULb/qowPf5VD9kEMagj23Gm7JRnSvE/Da/57nChZjnvL8v6A=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; + sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; - "js-sdsl-4.2.0" = { + "js-sdsl-4.3.0" = { name = "js-sdsl"; packageName = "js-sdsl"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz"; - sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; }; "js-tokens-4.0.0" = { @@ -6682,22 +6835,22 @@ let sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; - "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.2" = { + "json5-2.2.3" = { name = "json5"; packageName = "json5"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; "jsonfile-6.1.0" = { @@ -6745,13 +6898,13 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; - "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=="; }; }; "language-subtag-registry-0.3.22" = { @@ -6763,13 +6916,13 @@ let sha512 = "tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="; }; }; - "language-tags-1.0.7" = { + "language-tags-1.0.5" = { name = "language-tags"; packageName = "language-tags"; - version = "1.0.7"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/language-tags/-/language-tags-1.0.7.tgz"; - sha512 = "bSytju1/657hFjgUzPAPqszxH62ouE8nQFoFaVlIQfne4wO/wXC9A4+m8jYve7YBBvi59eq0SUpcshvG8h5Usw=="; + url = "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz"; + sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ=="; }; }; "leven-3.1.0" = { @@ -7015,13 +7168,13 @@ let sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; - "memfs-3.4.12" = { + "memfs-3.4.13" = { name = "memfs"; packageName = "memfs"; - version = "3.4.12"; + version = "3.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.12.tgz"; - sha512 = "BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz"; + sha512 = "omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg=="; }; }; "merge-descriptors-1.0.1" = { @@ -7132,22 +7285,22 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.1.2" = { + "minimatch-5.1.6" = { name = "minimatch"; packageName = "minimatch"; - version = "5.1.2"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimist-1.2.7" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; "mkdirp-0.5.6" = { @@ -7276,13 +7429,13 @@ let sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; }; }; - "node-releases-2.0.8" = { + "node-releases-2.0.10" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz"; - sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"; + sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="; }; }; "normalize-path-3.0.0" = { @@ -7366,13 +7519,22 @@ 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-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; }; }; "object-keys-1.1.1" = { @@ -7483,13 +7645,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "open-8.4.0" = { + "open-8.4.2" = { name = "open"; packageName = "open"; - version = "8.4.0"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; + sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; }; }; "optionator-0.8.3" = { @@ -7771,13 +7933,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.20" = { + "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; - version = "8.4.20"; + version = "8.4.21"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz"; - sha512 = "6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; + sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; }; }; "postcss-attribute-case-insensitive-5.0.2" = { @@ -7843,13 +8005,13 @@ let sha512 = "pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg=="; }; }; - "postcss-colormin-5.3.0" = { + "postcss-colormin-5.3.1" = { name = "postcss-colormin"; packageName = "postcss-colormin"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; - sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz"; + sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ=="; }; }; "postcss-convert-values-5.1.3" = { @@ -8023,13 +8185,13 @@ let sha512 = "0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ=="; }; }; - "postcss-js-4.0.0" = { + "postcss-js-4.0.1" = { name = "postcss-js"; packageName = "postcss-js"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz"; - sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ=="; + url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz"; + sha512 = "dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw=="; }; }; "postcss-lab-function-4.2.1" = { @@ -8086,13 +8248,13 @@ let sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ=="; }; }; - "postcss-merge-rules-5.1.3" = { + "postcss-merge-rules-5.1.4" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz"; - sha512 = "LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA=="; + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz"; + sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="; }; }; "postcss-minify-font-values-5.1.0" = { @@ -8338,13 +8500,13 @@ let sha512 = "9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w=="; }; }; - "postcss-reduce-initial-5.1.1" = { + "postcss-reduce-initial-5.1.2" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz"; - sha512 = "//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w=="; + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz"; + sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg=="; }; }; "postcss-reduce-transforms-5.1.0" = { @@ -8518,13 +8680,13 @@ let sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; - "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=="; }; }; "q-1.5.1" = { @@ -8707,22 +8869,22 @@ let sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="; }; }; - "react-router-6.6.0" = { + "react-router-6.8.1" = { name = "react-router"; packageName = "react-router"; - version = "6.6.0"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.6.0.tgz"; - sha512 = "+VPfCIaFbkW7BAiB/2oeprxKAt1KLbl+zXZ10CXOYezKWgBmTKyh8XjI53eLqY5kd7uY+V4rh3UW44FclwUU+Q=="; + url = "https://registry.npmjs.org/react-router/-/react-router-6.8.1.tgz"; + sha512 = "Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg=="; }; }; - "react-router-dom-6.6.0" = { + "react-router-dom-6.8.1" = { name = "react-router-dom"; packageName = "react-router-dom"; - version = "6.6.0"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.6.0.tgz"; - sha512 = "qC4jnvpfCPKVle1mKLD75IvZLcbVJyFMlSn16WY9ZiOed3dgSmqhslCf/u3tmSccWOujkdsT/OwGq12bELmvjg=="; + url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.1.tgz"; + sha512 = "67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ=="; }; }; "react-scripts-5.0.1" = { @@ -8752,22 +8914,22 @@ let sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; }; }; - "readable-stream-2.3.7" = { + "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; + sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.6.1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; }; }; "readdirp-3.6.0" = { @@ -8851,22 +9013,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.2.2" = { + "regexpu-core-5.3.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz"; - sha512 = "T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw=="; - }; - }; - "regjsgen-0.7.1" = { - name = "regjsgen"; - packageName = "regjsgen"; - version = "0.7.1"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"; - sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz"; + sha512 = "nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ=="; }; }; "regjsparser-0.9.1" = { @@ -8977,13 +9130,13 @@ let sha512 = "05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA=="; }; }; - "resolve.exports-1.1.0" = { + "resolve.exports-1.1.1" = { name = "resolve.exports"; packageName = "resolve.exports"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz"; - sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; + url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz"; + sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="; }; }; "retry-0.13.1" = { @@ -9211,13 +9364,13 @@ let sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; }; }; - "serialize-javascript-6.0.0" = { + "serialize-javascript-6.0.1" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; + sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; }; "serve-index-1.9.1" = { @@ -9274,13 +9427,13 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shell-quote-1.7.4" = { + "shell-quote-1.8.0" = { name = "shell-quote"; packageName = "shell-quote"; - version = "1.7.4"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz"; - sha512 = "8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw=="; + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz"; + sha512 = "QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ=="; }; }; "side-channel-1.0.4" = { @@ -9526,6 +9679,15 @@ let sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; }; }; + "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=="; + }; + }; "string-length-4.0.2" = { name = "string-length"; packageName = "string-length"; @@ -9598,15 +9760,6 @@ 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=="; - }; - }; "stringify-object-3.3.0" = { name = "stringify-object"; packageName = "stringify-object"; @@ -9787,13 +9940,13 @@ let sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; - "tailwindcss-3.2.4" = { + "tailwindcss-3.2.7" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.2.4"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz"; - sha512 = "AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.7.tgz"; + sha512 = "B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ=="; }; }; "tapable-1.1.3" = { @@ -9841,13 +9994,13 @@ let sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; }; - "terser-5.16.1" = { + "terser-5.16.5" = { name = "terser"; packageName = "terser"; - version = "5.16.1"; + version = "5.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz"; - sha512 = "xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; + sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; }; }; "terser-webpack-plugin-5.3.6" = { @@ -9877,13 +10030,13 @@ let sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; - "throat-6.0.1" = { + "throat-6.0.2" = { name = "throat"; packageName = "throat"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz"; - sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; + url = "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz"; + sha512 = "WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="; }; }; "throttle-debounce-2.3.0" = { @@ -9985,13 +10138,13 @@ let sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; - "tsconfig-paths-3.14.1" = { + "tsconfig-paths-3.14.2" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"; + sha512 = "o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g=="; }; }; "tslib-1.14.1" = { @@ -10003,13 +10156,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.1" = { + "tslib-2.5.0" = { name = "tslib"; packageName = "tslib"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; - sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; }; }; "tsutils-3.21.0" = { @@ -10084,6 +10237,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-to-buffer-3.1.5" = { name = "typedarray-to-buffer"; packageName = "typedarray-to-buffer"; @@ -10093,15 +10255,6 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-4.9.4" = { - name = "typescript"; - packageName = "typescript"; - version = "4.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; - }; - }; "unbox-primitive-1.0.2" = { name = "unbox-primitive"; packageName = "unbox-primitive"; @@ -10543,6 +10696,24 @@ 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.9" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; + sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; + }; + }; "word-wrap-1.2.3" = { name = "word-wrap"; packageName = "word-wrap"; @@ -10741,13 +10912,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.11.0" = { + "ws-8.12.1" = { name = "ws"; packageName = "ws"; - version = "8.11.0"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz"; - sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; + url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz"; + sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; }; }; "xml-name-validator-3.0.0" = { @@ -10848,32 +11019,46 @@ let src = ./.; dependencies = [ sources."@ampproject/remapping-2.2.0" + sources."@apideck/better-ajv-errors-0.3.6" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" - sources."@babel/core-7.20.7" + sources."@babel/compat-data-7.21.0" + (sources."@babel/core-7.21.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) (sources."@babel/eslint-parser-7.19.1" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" + sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.21.1" // { 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" - sources."@babel/helper-create-class-features-plugin-7.20.7" - sources."@babel/helper-create-regexp-features-plugin-7.20.5" - sources."@babel/helper-define-polyfill-provider-0.3.3" + (sources."@babel/helper-compilation-targets-7.20.7" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.21.0" + sources."@babel/helper-create-regexp-features-plugin-7.21.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-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.20.7" + sources."@babel/helper-member-expression-to-functions-7.21.0" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.7" + sources."@babel/helper-module-transforms-7.21.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" @@ -10883,17 +11068,17 @@ let 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-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.21.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.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.20.7" - sources."@babel/plugin-proposal-decorators-7.20.7" + sources."@babel/plugin-proposal-class-static-block-7.21.0" + sources."@babel/plugin-proposal-decorators-7.21.0" 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" @@ -10902,15 +11087,15 @@ let sources."@babel/plugin-proposal-numeric-separator-7.18.6" 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.20.7" + sources."@babel/plugin-proposal-optional-chaining-7.21.0" sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.20.5" + sources."@babel/plugin-proposal-private-property-in-object-7.21.0" sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.19.0" + sources."@babel/plugin-syntax-decorators-7.21.0" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-flow-7.18.6" @@ -10930,21 +11115,21 @@ let 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.9" - sources."@babel/plugin-transform-classes-7.20.7" + sources."@babel/plugin-transform-block-scoping-7.21.0" + sources."@babel/plugin-transform-classes-7.21.0" 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" - sources."@babel/plugin-transform-flow-strip-types-7.19.0" - sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-flow-strip-types-7.21.0" + sources."@babel/plugin-transform-for-of-7.21.0" 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.20.7" - sources."@babel/plugin-transform-modules-commonjs-7.20.7" - 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.21.2" + 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.20.5" sources."@babel/plugin-transform-new-target-7.18.6" @@ -10953,29 +11138,37 @@ let sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-constant-elements-7.20.2" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.21.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.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" - sources."@babel/plugin-transform-runtime-7.19.6" + (sources."@babel/plugin-transform-runtime-7.21.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/plugin-transform-shorthand-properties-7.18.6" 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.7" + sources."@babel/plugin-transform-typescript-7.21.0" 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-env-7.20.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.18.6" - sources."@babel/preset-typescript-7.18.6" - sources."@babel/runtime-7.20.7" - sources."@babel/runtime-corejs3-7.20.7" + sources."@babel/preset-typescript-7.21.0" + sources."@babel/regjsgen-0.8.0" + sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.10" - sources."@babel/types-7.20.7" + sources."@babel/traverse-7.21.2" + sources."@babel/types-7.21.2" sources."@bcoe/v8-coverage-0.2.3" sources."@csstools/normalize.css-12.0.0" sources."@csstools/postcss-cascade-layers-1.1.1" @@ -10992,28 +11185,28 @@ let 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."@emotion/babel-plugin-11.10.5" + sources."@csstools/selector-specificity-2.1.1" + sources."@emotion/babel-plugin-11.10.6" sources."@emotion/cache-11.10.5" sources."@emotion/hash-0.9.0" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" - sources."@emotion/react-11.10.5" + sources."@emotion/react-11.10.6" sources."@emotion/serialize-1.1.1" sources."@emotion/sheet-1.2.1" - sources."@emotion/styled-11.10.5" + sources."@emotion/styled-11.10.6" sources."@emotion/unitless-0.8.0" sources."@emotion/use-insertion-effect-with-fallbacks-1.0.0" sources."@emotion/utils-1.2.0" sources."@emotion/weak-memoize-0.3.0" - (sources."@eslint/eslintrc-1.4.0" // { + (sources."@eslint/eslintrc-2.0.0" // { dependencies = [ sources."argparse-2.0.1" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."js-yaml-4.1.0" - sources."type-fest-0.20.2" ]; }) + sources."@eslint/js-8.35.0" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -11102,15 +11295,27 @@ let sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@mui/base-5.0.0-alpha.111" - sources."@mui/core-downloads-tracker-5.11.1" - sources."@mui/icons-material-5.11.0" - sources."@mui/material-5.11.1" - sources."@mui/private-theming-5.11.1" - sources."@mui/styled-engine-5.11.0" - sources."@mui/system-5.11.1" + (sources."@mui/base-5.0.0-alpha.118" // { + dependencies = [ + sources."react-is-18.2.0" + ]; + }) + sources."@mui/core-downloads-tracker-5.11.9" + sources."@mui/icons-material-5.11.9" + (sources."@mui/material-5.11.10" // { + dependencies = [ + sources."react-is-18.2.0" + ]; + }) + sources."@mui/private-theming-5.11.9" + sources."@mui/styled-engine-5.11.9" + sources."@mui/system-5.11.9" sources."@mui/types-7.2.3" - sources."@mui/utils-5.11.1" + (sources."@mui/utils-5.11.9" // { + dependencies = [ + sources."react-is-18.2.0" + ]; + }) (sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" // { dependencies = [ sources."eslint-scope-5.1.1" @@ -11126,7 +11331,7 @@ let ]; }) sources."@popperjs/core-2.11.6" - sources."@remix-run/router-1.2.0" + sources."@remix-run/router-1.3.2" sources."@rollup/plugin-babel-5.3.1" sources."@rollup/plugin-node-resolve-11.2.1" sources."@rollup/plugin-replace-2.4.2" @@ -11156,7 +11361,7 @@ let sources."@svgr/webpack-5.5.0" sources."@tootallnate/once-1.1.2" sources."@trysound/sax-0.2.0" - sources."@types/babel__core-7.1.20" + sources."@types/babel__core-7.20.0" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.18.3" @@ -11164,28 +11369,28 @@ let sources."@types/bonjour-3.5.10" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.4.10" + sources."@types/eslint-8.21.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.0" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.31" - sources."@types/graceful-fs-4.1.5" + sources."@types/express-4.17.17" + sources."@types/express-serve-static-core-4.17.33" + sources."@types/graceful-fs-4.1.6" sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-proxy-1.17.9" + sources."@types/http-proxy-1.17.10" 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/json5-0.0.29" sources."@types/mime-3.0.1" - sources."@types/node-18.11.17" + sources."@types/node-18.14.2" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.2" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/react-18.0.26" + sources."@types/react-18.0.28" sources."@types/react-is-17.0.3" sources."@types/react-transition-group-4.4.5" sources."@types/resolve-1.17.1" @@ -11193,42 +11398,27 @@ let sources."@types/scheduler-0.16.2" sources."@types/semver-7.3.13" sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.0" + sources."@types/serve-static-1.15.1" sources."@types/sockjs-0.3.33" sources."@types/stack-utils-2.0.1" - sources."@types/trusted-types-2.0.2" - sources."@types/ws-8.5.3" - sources."@types/yargs-16.0.4" + sources."@types/trusted-types-2.0.3" + sources."@types/ws-8.5.4" + sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" - (sources."@typescript-eslint/eslint-plugin-5.47.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" - ]; - }) - sources."@typescript-eslint/experimental-utils-5.47.0" - sources."@typescript-eslint/parser-5.47.0" - sources."@typescript-eslint/scope-manager-5.47.0" - sources."@typescript-eslint/type-utils-5.47.0" - sources."@typescript-eslint/types-5.47.0" - (sources."@typescript-eslint/typescript-estree-5.47.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" - ]; - }) - (sources."@typescript-eslint/utils-5.47.0" // { + sources."@typescript-eslint/eslint-plugin-5.53.0" + sources."@typescript-eslint/experimental-utils-5.53.0" + sources."@typescript-eslint/parser-5.53.0" + sources."@typescript-eslint/scope-manager-5.53.0" + sources."@typescript-eslint/type-utils-5.53.0" + sources."@typescript-eslint/types-5.53.0" + sources."@typescript-eslint/typescript-estree-5.53.0" + (sources."@typescript-eslint/utils-5.53.0" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.47.0" + sources."@typescript-eslint/visitor-keys-5.53.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -11248,7 +11438,7 @@ let sources."@xtuc/long-4.2.2" sources."abab-2.0.6" 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" @@ -11268,19 +11458,23 @@ let sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" ]; }) sources."ajv-keywords-3.5.2" - sources."ansi-escapes-4.3.2" + (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."anymatch-3.1.3" sources."arg-5.0.2" sources."argparse-1.0.10" - sources."aria-query-4.2.2" + sources."aria-query-5.1.3" sources."array-flatten-2.1.2" sources."array-includes-3.1.6" sources."array-union-2.1.0" @@ -11294,8 +11488,9 @@ let sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."autoprefixer-10.4.13" - sources."axe-core-4.6.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."babel-jest-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -11315,7 +11510,11 @@ let sources."babel-plugin-jest-hoist-27.5.1" sources."babel-plugin-macros-3.1.0" sources."babel-plugin-named-asset-import-0.3.8" - sources."babel-plugin-polyfill-corejs2-0.3.3" + (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-plugin-transform-react-remove-prop-types-0.4.24" @@ -11332,27 +11531,30 @@ let dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" - sources."iconv-lite-0.4.24" sources."ms-2.0.0" ]; }) - sources."bonjour-service-1.0.14" + sources."bonjour-service-1.1.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.4" + sources."browserslist-4.21.5" sources."bser-2.1.1" sources."buffer-from-1.1.2" sources."builtin-modules-3.3.0" sources."bytes-3.0.0" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camel-case-4.1.2" + (sources."camel-case-4.1.2" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001441" + sources."caniuse-lite-1.0.30001458" sources."case-sensitive-paths-webpack-plugin-2.4.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -11367,9 +11569,9 @@ let ]; }) sources."chrome-trace-event-1.0.3" - sources."ci-info-3.7.0" + sources."ci-info-3.8.0" sources."cjs-module-lexer-1.2.2" - (sources."clean-css-5.3.1" // { + (sources."clean-css-5.3.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -11384,7 +11586,7 @@ let sources."colord-2.9.3" sources."colorette-2.0.19" sources."combined-stream-1.0.8" - sources."commander-8.3.0" + sources."commander-7.2.0" sources."common-path-prefix-3.0.0" sources."common-tags-1.8.2" sources."commondir-1.0.1" @@ -11400,13 +11602,13 @@ let sources."confusing-browser-globals-1.0.11" sources."connect-history-api-fallback-2.0.0" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.26.1" - sources."core-js-compat-3.26.1" - sources."core-js-pure-3.26.1" + sources."core-js-3.29.0" + sources."core-js-compat-3.29.0" + sources."core-js-pure-3.29.0" sources."core-util-is-1.0.3" sources."cosmiconfig-7.1.0" sources."cross-fetch-3.1.5" @@ -11415,16 +11617,10 @@ let 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.3" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" - ]; - }) + sources."css-loader-6.7.3" (sources."css-minimizer-webpack-plugin-3.4.1" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" @@ -11432,18 +11628,18 @@ let ]; }) sources."css-prefers-color-scheme-6.0.3" - sources."css-select-4.3.0" + sources."css-select-2.1.0" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."css-what-6.1.0" - sources."cssdb-7.2.0" + sources."css-what-3.4.2" + sources."cssdb-7.4.1" sources."cssesc-3.0.0" - sources."cssnano-5.1.14" - sources."cssnano-preset-default-5.2.13" + sources."cssnano-5.1.15" + sources."cssnano-preset-default-5.2.14" sources."cssnano-utils-3.1.0" (sources."csso-4.2.0" // { dependencies = [ @@ -11463,17 +11659,19 @@ let (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.3" sources."dedent-0.7.0" + sources."deep-equal-2.2.0" sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."default-gateway-6.0.3" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."defined-1.0.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" @@ -11487,7 +11685,7 @@ let ]; }) sources."detective-5.2.1" - sources."dexie-3.2.2" + sources."dexie-3.2.3" sources."dexie-react-hooks-1.1.1" sources."didyoumean-1.2.2" sources."diff-sequences-27.5.1" @@ -11498,22 +11696,34 @@ let sources."doctrine-3.0.0" sources."dom-converter-0.2.0" sources."dom-helpers-5.2.1" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.3.0" + ]; + }) + sources."domelementtype-1.3.1" (sources."domexception-2.0.1" // { dependencies = [ sources."webidl-conversions-5.0.0" ]; }) - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."dot-case-3.0.4" + (sources."domhandler-4.3.1" // { + dependencies = [ + sources."domelementtype-2.3.0" + ]; + }) + sources."domutils-1.7.0" + (sources."dot-case-3.0.4" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.284" + sources."electron-to-chromium-1.4.311" sources."emittery-0.8.1" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" @@ -11522,9 +11732,11 @@ let sources."entities-2.2.0" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.20.5" + sources."es-abstract-1.21.1" sources."es-array-method-boxes-properly-1.0.0" + sources."es-get-iterator-1.1.3" 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."escalade-3.1.1" @@ -11539,22 +11751,21 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.30.0" // { + (sources."eslint-8.35.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."globals-13.19.0" + sources."globals-13.20.0" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" sources."supports-color-7.2.0" - sources."type-fest-0.20.2" ]; }) sources."eslint-config-react-app-7.0.1" - (sources."eslint-import-resolver-node-0.3.6" // { + (sources."eslint-import-resolver-node-0.3.7" // { dependencies = [ sources."debug-3.2.7" ]; @@ -11565,23 +11776,28 @@ let ]; }) sources."eslint-plugin-flowtype-8.0.3" - (sources."eslint-plugin-import-2.26.0" // { + (sources."eslint-plugin-import-2.27.5" // { dependencies = [ - sources."debug-2.6.9" + sources."debug-3.2.7" sources."doctrine-2.1.0" - sources."ms-2.0.0" + sources."semver-6.3.0" ]; }) sources."eslint-plugin-jest-25.7.0" - sources."eslint-plugin-jsx-a11y-6.6.1" - (sources."eslint-plugin-react-7.31.11" // { + (sources."eslint-plugin-jsx-a11y-6.7.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."eslint-plugin-react-7.32.2" // { dependencies = [ sources."doctrine-2.1.0" sources."resolve-2.0.0-next.4" + sources."semver-6.3.0" ]; }) sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-plugin-testing-library-5.9.1" + sources."eslint-plugin-testing-library-5.10.2" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -11591,7 +11807,7 @@ let sources."eslint-visitor-keys-3.3.0" (sources."eslint-webpack-plugin-3.2.0" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."has-flag-4.0.0" sources."jest-worker-28.1.3" @@ -11602,7 +11818,7 @@ let }) sources."espree-9.4.1" sources."esprima-4.0.1" - sources."esquery-1.4.0" + sources."esquery-1.4.2" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."estree-walker-1.0.1" @@ -11628,7 +11844,7 @@ let }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.14.0" + sources."fastq-1.15.0" sources."faye-websocket-0.11.4" sources."fb-watchman-2.0.2" sources."file-entry-cache-6.0.1" @@ -11636,7 +11852,7 @@ let (sources."filelist-1.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.1.2" + sources."minimatch-5.1.6" ]; }) sources."filesize-8.0.7" @@ -11653,6 +11869,7 @@ let sources."flat-cache-3.0.4" sources."flatted-3.2.7" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" (sources."fork-ts-checker-webpack-plugin-6.5.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -11662,12 +11879,9 @@ let sources."cosmiconfig-6.0.0" sources."fs-extra-9.1.0" sources."has-flag-4.0.0" - sources."lru-cache-6.0.0" sources."schema-utils-2.7.0" - sources."semver-7.3.8" sources."supports-color-7.2.0" sources."tapable-1.1.3" - sources."yallist-4.0.0" ]; }) sources."form-data-3.0.1" @@ -11683,7 +11897,7 @@ let 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-own-enumerable-property-symbols-3.0.2" sources."get-package-type-0.1.0" sources."get-stream-6.0.1" @@ -11698,6 +11912,7 @@ let ]; }) sources."globals-11.12.0" + sources."globalthis-1.0.3" sources."globby-11.1.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.10" @@ -11709,29 +11924,36 @@ let 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."he-1.2.0" - (sources."hoist-non-react-statics-3.3.2" // { - dependencies = [ - sources."react-is-16.13.1" - ]; - }) + sources."hoist-non-react-statics-3.3.2" sources."hoopy-0.1.4" (sources."hpack.js-2.1.6" // { dependencies = [ - sources."readable-stream-2.3.7" + sources."isarray-1.0.0" + sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) sources."html-encoding-sniffer-2.0.1" sources."html-entities-2.3.3" sources."html-escaper-2.0.2" - sources."html-minifier-terser-6.1.0" + (sources."html-minifier-terser-6.1.0" // { + dependencies = [ + sources."commander-8.3.0" + ]; + }) sources."html-parse-stringify-3.0.1" sources."html-webpack-plugin-5.5.0" - sources."htmlparser2-6.1.0" + (sources."htmlparser2-6.1.0" // { + dependencies = [ + sources."dom-serializer-1.4.1" + sources."domelementtype-2.3.0" + sources."domutils-2.8.0" + ]; + }) sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" sources."http-parser-js-0.5.8" @@ -11740,23 +11962,26 @@ let sources."http-proxy-middleware-2.0.6" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" + sources."humanize-duration-3.28.0" sources."i18next-21.10.0" sources."i18next-browser-languagedetector-6.1.8" sources."i18next-http-backend-1.4.5" - sources."iconv-lite-0.6.3" + sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."idb-7.1.1" sources."identity-obj-proxy-3.0.0" sources."ignore-5.2.4" - sources."immer-9.0.16" + sources."immer-9.0.19" sources."import-fresh-3.3.0" sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."ipaddr.js-2.0.1" + 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" @@ -11769,6 +11994,7 @@ let sources."is-fullwidth-code-point-3.0.0" sources."is-generator-fn-2.1.0" sources."is-glob-4.0.3" + sources."is-map-2.0.2" sources."is-module-1.0.0" sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" @@ -11780,17 +12006,25 @@ let sources."is-regex-1.1.4" sources."is-regexp-1.0.0" sources."is-root-2.1.0" + 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" + sources."is-typed-array-1.1.10" sources."is-typedarray-1.0.0" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" sources."is-wsl-2.2.0" - sources."isarray-1.0.0" + sources."isarray-2.0.5" sources."isexe-2.0.0" sources."istanbul-lib-coverage-3.2.0" - sources."istanbul-lib-instrument-5.2.1" + (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" @@ -11932,6 +12166,7 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."strip-bom-4.0.0" sources."supports-color-7.2.0" ]; }) @@ -11943,10 +12178,7 @@ let 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."jest-util-27.5.1" // { @@ -11978,9 +12210,11 @@ let }) sources."@jest/test-result-28.1.3" sources."@jest/types-28.1.3" - sources."@types/yargs-17.0.17" + sources."@types/yargs-17.0.22" + sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" + sources."char-regex-2.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emittery-0.10.2" @@ -12003,17 +12237,10 @@ let sources."ansi-styles-5.2.0" ]; }) + sources."react-is-18.2.0" sources."slash-4.0.0" - (sources."string-length-5.0.1" // { - dependencies = [ - sources."char-regex-2.0.1" - ]; - }) - (sources."strip-ansi-7.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) + sources."string-length-5.0.1" + sources."strip-ansi-7.0.1" sources."supports-color-7.2.0" ]; }) @@ -12033,13 +12260,14 @@ let sources."supports-color-8.1.1" ]; }) - sources."js-base64-3.7.3" - sources."js-sdsl-4.2.0" + sources."js-base64-3.7.5" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" (sources."jsdom-16.7.0" // { dependencies = [ sources."tr46-2.1.0" + sources."webidl-conversions-6.1.0" sources."whatwg-url-8.7.0" ]; }) @@ -12048,15 +12276,15 @@ let sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.2" + sources."json5-2.2.3" sources."jsonfile-6.1.0" sources."jsonpointer-5.0.1" sources."jsx-ast-utils-3.3.3" sources."kind-of-6.0.3" sources."kleur-3.0.3" - sources."klona-2.0.5" + sources."klona-2.0.6" sources."language-subtag-registry-0.3.22" - sources."language-tags-1.0.7" + sources."language-tags-1.0.5" sources."leven-3.1.0" sources."levn-0.4.1" sources."lilconfig-2.0.6" @@ -12071,14 +12299,22 @@ let sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" sources."loose-envify-1.4.0" - sources."lower-case-2.0.2" + (sources."lower-case-2.0.2" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."lru-cache-5.1.1" sources."magic-string-0.25.9" - sources."make-dir-3.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."makeerror-1.0.12" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" - sources."memfs-3.4.12" + sources."memfs-3.4.13" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -12090,7 +12326,7 @@ let sources."mimic-fn-2.1.0" (sources."mini-css-extract-plugin-2.7.2" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" @@ -12098,7 +12334,7 @@ let }) sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.7" + sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."multicast-dns-7.2.5" @@ -12107,20 +12343,25 @@ let sources."natural-compare-lite-1.4.0" sources."negotiator-0.6.3" sources."neo-async-2.6.2" - sources."no-case-3.0.4" + (sources."no-case-3.0.4" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."node-fetch-2.6.7" sources."node-forge-1.3.1" sources."node-int64-0.4.0" - sources."node-releases-2.0.8" + sources."node-releases-2.0.10" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" sources."normalize-url-6.1.0" sources."npm-run-path-4.0.1" - sources."nth-check-2.1.1" + sources."nth-check-1.0.2" sources."nwsapi-2.2.2" 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."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."object.entries-1.1.6" @@ -12133,18 +12374,26 @@ let sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.0" + sources."open-8.4.2" sources."optionator-0.9.1" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-retry-4.6.2" sources."p-try-2.2.0" - sources."param-case-3.0.4" + (sources."param-case-3.0.4" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."parse5-6.0.1" sources."parseurl-1.3.3" - sources."pascal-case-3.1.2" + (sources."pascal-case-3.1.2" // { + dependencies = [ + sources."tslib-2.5.0" + ]; + }) sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -12173,7 +12422,7 @@ let sources."path-exists-3.0.0" ]; }) - sources."postcss-8.4.20" + sources."postcss-8.4.21" sources."postcss-attribute-case-insensitive-5.0.2" sources."postcss-browser-comments-4.0.0" sources."postcss-calc-8.2.4" @@ -12181,7 +12430,7 @@ let 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-colormin-5.3.1" sources."postcss-convert-values-5.1.3" sources."postcss-custom-media-8.0.2" sources."postcss-custom-properties-12.1.11" @@ -12201,20 +12450,14 @@ let sources."postcss-image-set-function-4.0.7" sources."postcss-import-14.1.0" sources."postcss-initial-4.0.1" - sources."postcss-js-4.0.0" + sources."postcss-js-4.0.1" sources."postcss-lab-function-4.2.1" sources."postcss-load-config-3.1.4" - (sources."postcss-loader-6.2.1" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" - ]; - }) + sources."postcss-loader-6.2.1" 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-merge-rules-5.1.4" sources."postcss-minify-font-values-5.1.0" sources."postcss-minify-gradients-5.1.1" sources."postcss-minify-params-5.1.4" @@ -12242,16 +12485,21 @@ let sources."postcss-place-7.0.5" sources."postcss-preset-env-7.8.3" sources."postcss-pseudo-class-any-link-7.1.6" - sources."postcss-reduce-initial-5.1.1" + sources."postcss-reduce-initial-5.1.2" sources."postcss-reduce-transforms-5.1.0" sources."postcss-replace-overflow-wrap-4.0.0" sources."postcss-selector-not-6.0.1" sources."postcss-selector-parser-6.0.11" (sources."postcss-svgo-5.1.0" // { dependencies = [ - sources."commander-7.2.0" + sources."css-select-4.3.0" sources."css-tree-1.1.3" + sources."css-what-6.1.0" + sources."dom-serializer-1.4.1" + sources."domelementtype-2.3.0" + sources."domutils-2.8.0" sources."mdn-data-2.0.14" + sources."nth-check-2.1.1" sources."source-map-0.6.1" sources."svgo-2.8.0" ]; @@ -12270,18 +12518,14 @@ let sources."process-nextick-args-2.0.1" sources."promise-8.3.0" sources."prompts-2.4.2" - (sources."prop-types-15.8.1" // { - dependencies = [ - sources."react-is-16.13.1" - ]; - }) + sources."prop-types-15.8.1" (sources."proxy-addr-2.0.7" // { dependencies = [ sources."ipaddr.js-1.9.1" ]; }) sources."psl-1.9.0" - sources."punycode-2.1.1" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.11.0" sources."querystringify-2.2.0" @@ -12293,7 +12537,6 @@ let (sources."raw-body-2.5.1" // { dependencies = [ sources."bytes-3.1.2" - sources."iconv-lite-0.4.24" ]; }) sources."react-18.2.0" @@ -12313,20 +12556,14 @@ let sources."react-error-overlay-6.0.11" sources."react-i18next-11.18.6" sources."react-infinite-scroll-component-6.1.0" - sources."react-is-18.2.0" + sources."react-is-16.13.1" sources."react-refresh-0.11.0" - sources."react-router-6.6.0" - sources."react-router-dom-6.6.0" - (sources."react-scripts-5.0.1" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.8" - sources."yallist-4.0.0" - ]; - }) + sources."react-router-6.8.1" + sources."react-router-dom-6.8.1" + sources."react-scripts-5.0.1" sources."react-transition-group-4.4.5" sources."read-cache-1.0.0" - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.3" sources."regenerate-1.4.2" @@ -12336,15 +12573,23 @@ let sources."regex-parser-2.2.11" sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" - sources."regexpu-core-5.2.2" - sources."regjsgen-0.7.1" + sources."regexpu-core-5.3.1" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" ]; }) sources."relateurl-0.2.7" - sources."renderkid-3.0.0" + (sources."renderkid-3.0.0" // { + dependencies = [ + sources."css-select-4.3.0" + sources."css-what-6.1.0" + sources."dom-serializer-1.4.1" + sources."domelementtype-2.3.0" + sources."domutils-2.8.0" + sources."nth-check-2.1.1" + ]; + }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" @@ -12362,7 +12607,7 @@ let sources."source-map-0.6.1" ]; }) - sources."resolve.exports-1.1.0" + sources."resolve.exports-1.1.1" sources."retry-0.13.1" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -12387,7 +12632,12 @@ let sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.1.1" - sources."semver-6.3.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" // { @@ -12398,7 +12648,7 @@ let 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."debug-2.6.9" @@ -12414,7 +12664,7 @@ let sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shell-quote-1.7.4" + sources."shell-quote-1.8.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" @@ -12423,7 +12673,11 @@ let sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-js-1.0.2" - sources."source-map-loader-3.0.2" + (sources."source-map-loader-3.0.2" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) (sources."source-map-support-0.5.21" // { dependencies = [ sources."source-map-0.6.1" @@ -12448,6 +12702,7 @@ let }) sources."stacktrace-js-2.0.2" sources."statuses-2.0.1" + sources."stop-iteration-iterator-1.0.0" sources."string-length-4.0.2" sources."string-natural-compare-3.0.1" (sources."string-width-4.2.3" // { @@ -12458,10 +12713,14 @@ let sources."string.prototype.matchall-4.0.8" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" - sources."string_decoder-1.3.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."stringify-object-3.3.0" sources."strip-ansi-6.0.1" - sources."strip-bom-4.0.0" + sources."strip-bom-3.0.0" sources."strip-comments-2.0.1" sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" @@ -12477,21 +12736,9 @@ let }) sources."supports-preserve-symlinks-flag-1.0.0" sources."svg-parser-2.0.4" - (sources."svgo-1.3.2" // { - dependencies = [ - sources."css-select-2.1.0" - sources."css-what-3.4.2" - sources."dom-serializer-0.2.2" - (sources."domutils-1.7.0" // { - dependencies = [ - sources."domelementtype-1.3.1" - ]; - }) - sources."nth-check-1.0.2" - ]; - }) + sources."svgo-1.3.2" sources."symbol-tree-3.2.4" - (sources."tailwindcss-3.2.4" // { + (sources."tailwindcss-3.2.7" // { dependencies = [ sources."color-name-1.1.4" ]; @@ -12504,7 +12751,7 @@ let ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.1" // { + (sources."terser-5.16.5" // { dependencies = [ sources."commander-2.20.3" ]; @@ -12512,7 +12759,7 @@ let sources."terser-webpack-plugin-5.3.6" sources."test-exclude-6.0.0" sources."text-table-0.2.0" - sources."throat-6.0.1" + sources."throat-6.0.2" sources."throttle-debounce-2.3.0" sources."thunky-1.1.0" sources."tmpl-1.0.5" @@ -12526,24 +12773,19 @@ let }) sources."tr46-0.0.3" sources."tryer-1.0.1" - (sources."tsconfig-paths-3.14.1" // { + (sources."tsconfig-paths-3.14.2" // { dependencies = [ - sources."json5-1.0.1" - sources."strip-bom-3.0.0" - ]; - }) - sources."tslib-2.4.1" - (sources."tsutils-3.21.0" // { - dependencies = [ - sources."tslib-1.14.1" + sources."json5-1.0.2" ]; }) + sources."tslib-1.14.1" + sources."tsutils-3.21.0" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.21.3" + sources."type-fest-0.20.2" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.9.4" sources."unbox-primitive-1.0.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" @@ -12574,7 +12816,7 @@ let sources."walker-1.0.8" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - sources."webidl-conversions-6.1.0" + sources."webidl-conversions-3.0.1" (sources."webpack-5.75.0" // { dependencies = [ sources."@types/estree-0.0.51" @@ -12584,7 +12826,7 @@ let }) (sources."webpack-dev-middleware-5.3.3" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" @@ -12592,11 +12834,11 @@ let }) (sources."webpack-dev-server-4.11.1" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" - sources."ws-8.11.0" + sources."ws-8.12.1" ]; }) (sources."webpack-manifest-plugin-4.1.1" // { @@ -12608,27 +12850,20 @@ let sources."webpack-sources-3.2.3" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - (sources."whatwg-encoding-1.0.5" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."whatwg-encoding-1.0.5" sources."whatwg-fetch-3.6.2" sources."whatwg-mimetype-2.3.0" - (sources."whatwg-url-5.0.0" // { - dependencies = [ - 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-collection-1.0.1" + sources."which-typed-array-1.1.9" sources."word-wrap-1.2.3" sources."workbox-background-sync-6.5.4" sources."workbox-broadcast-update-6.5.4" (sources."workbox-build-6.5.4" // { dependencies = [ - sources."@apideck/better-ajv-errors-0.3.6" - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."fs-extra-9.1.0" sources."json-schema-traverse-1.0.0" sources."source-map-0.8.0-beta.0" @@ -12681,7 +12916,7 @@ let }; production = false; bypassCache = true; - reconstructLock = false; + reconstructLock = true; }; in { diff --git a/pkgs/tools/misc/ntfy-sh/package.json b/pkgs/tools/misc/ntfy-sh/package.json index e97191b004bcd..9e919ef74b70d 100644 --- a/pkgs/tools/misc/ntfy-sh/package.json +++ b/pkgs/tools/misc/ntfy-sh/package.json @@ -15,6 +15,7 @@ "@mui/material": "latest", "dexie": "^3.2.1", "dexie-react-hooks": "^1.1.1", + "humanize-duration": "^3.27.3", "i18next": "^21.6.14", "i18next-browser-languagedetector": "^6.1.4", "i18next-http-backend": "^1.4.0", diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index 9154c1eabbe34..4a6cb10b60315 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-AJHmHTkKHd99GCBlVv2t8Q9kUlCtOcK+ukYzEs5U3S4="; + hash = "sha256-TtH0sfWFWe3oYK/8jJslqjrEY5rR7HGAVDD5iQ2+spY="; }; - cargoSha256 = "sha256-0QUuYNzKN8dbGiJq2JxElR39zIlqvHXjPzT1dGc6cRM="; + cargoSha256 = "sha256-vwLlqRjiJU3ecLURAZabmIBivYW1zAfMLUhaJzh57ig="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 823606395ab9b..e6f03942cfe04 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = version; - sha256 = "sha256-3wXZBPYths3+Vhtq4W2BTR47V63o0bq++fWLIpWrm7Y="; + sha256 = "sha256-8YPexoTwtjYWSI2TP6mN3nkN8++3Upy+5AeQhb+HyyY="; }; - cargoSha256 = "sha256-xBw2OMJMale4MWRyy6v0E0ZE4A98QXLyRu0k7L+9q8k="; + cargoSha256 = "sha256-FF7JRZsrWyZKIFcOutjnCwgJzrmcOqcPA6bx1m5k7Pk="; cargoPatches = [ # enable pkg-config feature of zstd diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 647b6aa0c198c..e9448f84fd245 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.69.1"; + version = "0.71.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-p/epsqaDQNPS2gd3fN/Ny0XtGIeoKI7hdZVI1bqvg4s="; + sha256 = "sha256-Y6HSz81edWklXhTbaK9LvdwmgNPRMtI1BD0IfcjWl3I="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorHash = "sha256-AIn38bjnYX9gAaKXTyIA7Lv5/oRzy3BMK5Q+9JvapFI="; + vendorHash = "sha256-Zi9Rkfm+y0jZySwMJxAa5Sx/r5WAYvOVez3J0yQza2w="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 0429e854338ba..0ad5b060119eb 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,34 +1,299 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python3, git +{ lib +, stdenv +, autoconf +, automake +, bash +, curl +, fetchFromGitHub +, fetchMavenArtifact +, fetchurl +, git +, jdk8 +, makeWrapper +, nettools +, python3 }: -let jdk = jdk8; jre = jdk8.jre; in - -stdenv.mkDerivation rec { +let + jdk = jdk8; + jre = jdk8.jre; + artifacts = { + apache = [ + (fetchMavenArtifact { + groupId = "org.apache.commons"; + artifactId = "commons-math3"; + version = "3.4.1"; + hash = "sha256-0QdbFKcQhwOLC/0Zjw992OSbWzUp2OLrqZ59nrhWXks="; + }) + ]; + guava = [ + (fetchMavenArtifact { + groupId = "com.google.guava"; + artifactId = "guava"; + version = "18.0"; + hash = "sha256-1mT7/APS5c6cqypE+wHx0L+d/r7MwaRzsfnqMfefb5k="; + }) + ]; + gwt = [ + (fetchMavenArtifact { + groupId = "com.google.gwt"; + artifactId = "gwt-dev"; + version = "2.6.0"; + hash = "sha256-4MLdI7q5fkftHTMoN7W3l5zsq1QB2R/8bF86vEqBI+A="; + }) + (fetchMavenArtifact { + groupId = "com.google.gwt"; + artifactId = "gwt-user"; + version = "2.6.0"; + hash = "sha256-HR5/aopn605inHeENNHBAqKrjkvIl9wPDM+nOwOpiEg="; + }) + (fetchMavenArtifact { + groupId = "net.opentsdb"; + artifactId = "opentsdb-gwt-theme"; + version = "1.0.0"; + hash = "sha256-JJsjcRlQmIrwpOtMweH12e/Ut5NG8R50VPiOAMMGEdc="; + }) + ]; + hamcrest = [ + (fetchMavenArtifact { + url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; + groupId = "org.hamcrest"; + artifactId = "hamcrest-core"; + version = "1.3"; + hash = "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok="; + }) + ]; + hbase = [ + (fetchMavenArtifact { + groupId = "org.hbase"; + artifactId = "asynchbase"; + version = "1.8.2"; + hash = "sha256-D7mKprHMW23dE0SzdNsagv3Hp2G5HUN7sKfs1nVzQF4="; + }) + ]; + jackson = [ + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-annotations"; + version = "2.9.5"; + hash = "sha256-OKDkUASfZDVwrayZiIqjSA7C3jhXkKcJaQi/Q7/AhdY="; + }) + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-core"; + version = "2.9.5"; + hash = "sha256-or66oyWtJUVbAhScZ+YFI2en1/wc533gAO7ShKUhTqw="; + }) + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-databind"; + version = "2.9.5"; + hash = "sha256-D7TgecEY51LMlMFa0i5ngrDfxdwJFF9IE/s52C5oYEc="; + }) + ]; + javacc = [ + (fetchMavenArtifact { + groupId = "net.java.dev.javacc"; + artifactId = "javacc"; + version = "6.1.2"; + hash = "sha256-7Qxclglhz+tDE4LPAVKCewEVZ0fbN5LRv5PoHjLCBKs="; + }) + ]; + javassist = [ + (fetchMavenArtifact { + groupId = "org.javassist"; + artifactId = "javassist"; + version = "3.21.0-GA"; + hash = "sha256-eqWeAx+UGYSvB9rMbKhebcm9OkhemqJJTLwDTvoSJdA="; + }) + ]; + jexl = [ + (fetchMavenArtifact { + groupId = "commons-logging"; + artifactId = "commons-logging"; + version = "1.1.1"; + hash = "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8="; + }) + (fetchMavenArtifact { + groupId = "org.apache.commons"; + artifactId = "commons-jexl"; + version = "2.1.1"; + hash = "sha256-A8mp+uXaeM5SwL8kRnzDc1W34jGW3/SDniwP8BigEwY="; + }) + ]; + jgrapht = [ + (fetchMavenArtifact { + groupId = "org.jgrapht"; + artifactId = "jgrapht-core"; + version = "0.9.1"; + hash = "sha256-5u8cEVaJ7aCBQrhtUkYg2mQ7bp8BNAUletB/QtxcaXg="; + }) + ]; + junit = [ + (fetchMavenArtifact { + groupId = "junit"; + artifactId = "junit"; + version = "4.11"; + hash = "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4="; + }) + ]; + kryo = [ + (fetchMavenArtifact { + groupId = "org.ow2.asm"; + artifactId = "asm"; + version = "4.0"; + hash = "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.kryo"; + artifactId = "kryo"; + version = "2.21.1"; + hash = "sha256-adEG73euU3sZBp9WUQNLZBN6Y3UAZXTAxjsuvDuy7q4="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.minlog"; + artifactId = "minlog"; + version = "1.2"; + hash = "sha256-pnjLGqj10D2QHJksdXQYQdmKm8PVXa0C6E1lMVxOYPI="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.reflectasm"; + artifactId = "reflectasm"; + version = "1.07"; + classifier = "shaded"; + hash = "sha256-CKcOrbSydO2u/BGUwfdXBiGlGwqaoDaqFdzbe5J+fHY="; + }) + ]; + logback = [ + (fetchMavenArtifact { + groupId = "ch.qos.logback"; + artifactId = "logback-classic"; + version = "1.0.13"; + hash = "sha256-EsGTDKkWU0IqxJ/qM/zovhsfzS0iIM6jg8R5SXbHQY8="; + }) + (fetchMavenArtifact { + groupId = "ch.qos.logback"; + artifactId = "logback-core"; + version = "1.0.13"; + hash = "sha256-7NjyT5spQShOmPFU/zND5yDLMcj0e2dVSxRXRfWW87g="; + }) + ]; + mockito = [ + (fetchMavenArtifact { + groupId = "org.mockito"; + artifactId = "mockito-core"; + version = "1.9.5"; + hash = "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o="; + }) + ]; + netty = [ + (fetchMavenArtifact { + groupId = "io.netty"; + artifactId = "netty"; + version = "3.10.6.Final"; + hash = "sha256-h2ilD749k6iNjmAA6l1o4w9Q3JFbN2TDxYcPcMT7O0k="; + }) + ]; + objenesis = [ + (fetchMavenArtifact { + groupId = "org.objenesis"; + artifactId = "objenesis"; + version = "1.3"; + hash = "sha256-3U7z0wkQY6T+xXjLsrvmwfkhwACRuimT3Nmv0l/5REo="; + }) + ]; + powermock = [ + (fetchMavenArtifact { + groupId = "org.powermock"; + artifactId = "powermock-mockito-release-full"; + version = "1.5.4"; + classifier = "full"; + hash = "sha256-GWXaFG/ZtPlc7uKrghQHNAPzEu2k5VGYCYTXIlbylb4="; + }) + ]; + protobuf = [ + (fetchMavenArtifact { + groupId = "com.google.protobuf"; + artifactId = "protobuf-java"; + version = "2.5.0"; + hash = "sha256-4MHGRXXABWAXJefGoCzr+eEoXoiPdWsqHXP/qNclzHQ="; + }) + ]; + slf4j = [ + (fetchMavenArtifact { + groupId = "org.slf4j"; + artifactId = "log4j-over-slf4j"; + version = "1.7.7"; + hash = "sha256-LjcWxCtsAm/jzd2pK7oaVZsTZjjcexj7qKQSxBiVecI="; + }) + (fetchMavenArtifact { + groupId = "org.slf4j"; + artifactId = "slf4j-api"; + version = "1.7.7"; + hash = "sha256-aZgMA4yhsTGSZWFZFhfZwl+r/Hspgor5FZfKhXDPNf4="; + }) + ]; + suasync = [ + (fetchMavenArtifact { + groupId = "com.stumbleupon"; + artifactId = "async"; + version = "1.4.0"; + hash = "sha256-FJ1HH68JOkjNtkShjLTJ8K4NO/A/qu88ap7J7SEndrM="; + }) + ]; + validation-api = [ + (fetchMavenArtifact { + groupId = "javax.validation"; + artifactId = "validation-api"; + version = "1.0.0.GA"; + hash = "sha256-5FnzE+vG2ySD+M6q05rwcIY2G0dPqS5A9ELo3l2Yldw="; + }) + (fetchMavenArtifact { + groupId = "javax.validation"; + artifactId = "validation-api"; + version = "1.0.0.GA"; + classifier = "sources"; + hash = "sha256-o5TVKpt/4rsU8HGNKzyDCP/o836RGVYBI5jVXJ+fm1Q="; + }) + ]; + zookeeper = [ + (fetchMavenArtifact { + groupId = "org.apache.zookeeper"; + artifactId = "zookeeper"; + version = "3.4.6"; + hash = "sha256-ijdaHvmMvA4fbp39DZbZFLdNN60AtL+Bvrd/qPNNM64="; + }) + ]; + }; +in stdenv.mkDerivation rec { pname = "opentsdb"; - version = "2.4.0"; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; + src = fetchFromGitHub { + owner = "OpenTSDB"; + repo = "opentsdb"; + rev = "refs/tags/v${version}"; + hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-35476.patch"; - url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; - sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; - }) + nativeBuildInputs = [ + autoconf + automake + makeWrapper ]; - nativeBuildInputs = [ makeWrapper autoconf automake ]; buildInputs = [ curl jdk nettools python3 git ]; preConfigure = '' + chmod +x build-aux/fetchdep.sh.in patchShebangs ./build-aux/ ./bootstrap ''; + preBuild = lib.concatStrings (lib.mapAttrsToList (dir: lib.concatMapStrings (artifact: '' + ln -s ${artifact}/share/java/* third_party/${dir} + '')) artifacts); + postInstall = '' wrapProgram $out/bin/tsdb \ --set JAVA_HOME "${jre}" \ diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/tools/misc/oscclip/default.nix index a22490633d8f2..ea715fe934ecb 100644 --- a/pkgs/tools/misc/oscclip/default.nix +++ b/pkgs/tools/misc/oscclip/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/rumpelsepp/oscclip"; license = licenses.gpl3Only; - maintainers = [ maintainers.traxys ]; + maintainers = with maintainers; [ rumpelsepp traxys ]; }; } diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index ece0818303285..013c5d72f8c8b 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g="; + hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; }; postPatch = '' @@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_RAPIDJSON=ON" "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index c0ef2a037db6c..0a41ef0f8bec5 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -43,13 +43,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2022.7"; + version = "2023.1"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-i+KpJhyU6LnsQRM4D/xID4WYJF+zIaAJutT65LgiQR8="; + sha256 = "sha256-3XkrFnaToZccn24xaAE9kGrANRAP9scZo7Mi60S5b1U="; }; patches = [ diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index 68d89d1a6e4a9..b9efcd2502860 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, bash, buildGoModule, fetchFromGitHub, getent, stdenv }: +{ lib, bash, buildGoModule, fetchFromGitHub, getent, nix-update-script, stdenv }: buildGoModule rec { pname = "otel-cli"; - version = "0.0.20"; + version = "0.2.0"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-bWdkuw0uEE75l9YCo2Dq1NpWXuMH61RQ6p7m65P1QCE="; + hash = "sha256-hez/jHet7W4FnOjgLb0jE1FhoNimiLGaOuTI44UWbSA="; }; - vendorHash = "sha256-IJ2Gq5z1oNvcpWPh+BMs46VZMN1lHyE+M7kUinTSRr8="; + vendorHash = "sha256-gVRgqBgiFnPU6MRZi/Igs7nDPMwJYsdln7vPAcxTvPU="; preCheck = '' ln -s $GOPATH/bin/otel-cli . @@ -20,6 +20,8 @@ buildGoModule rec { --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`' ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { homepage = "https://github.com/equinix-labs/otel-cli"; description = "A command-line tool for sending OpenTelemetry traces"; diff --git a/pkgs/tools/misc/pandoc-katex/default.nix b/pkgs/tools/misc/pandoc-katex/default.nix index 6a56651221cf8..fdcfef878449e 100644 --- a/pkgs/tools/misc/pandoc-katex/default.nix +++ b/pkgs/tools/misc/pandoc-katex/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pandoc-katex"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "xu-cheng"; repo = pname; rev = version; - hash = "sha256-TGilWr/Q8K+YP6FYfZqJOwtTAFiY+YX7AAole4TiSoE="; + hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM="; }; - cargoSha256 = "sha256-CEyS7dMG+5e/LwEKdYlHFVCBm2FPKVjJlrMFB+QGm+Y="; + cargoHash = "sha256-Qf+QYOIBmSgax7p5K32SkaDT0MoKUY4TkxLbf/ZbM+U="; meta = with lib; { description = "Pandoc filter to render math equations using KaTeX"; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index acb66e3dca635..e1fa8cc0b730d 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-RIjdNfX4jsMwpgbE1aTzT6bysIFGUi33o5m030fF6mg="; + sha256 = "sha256-bbePMbI1YF0YvakO5vlURdE7UG3pLiuByImYvDq9cRY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 615e9e528d728..04fe534984ed4 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook , gtk2, hicolor-icon-theme, intltool, pkg-config -, which, wrapGAppsHook, xdotool }: +, which, wrapGAppsHook, xdotool, libappindicator-gtk2 }: stdenv.mkDerivation rec { pname = "parcellite"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor-icon-theme ]; + buildInputs = [ gtk2 hicolor-icon-theme libappindicator-gtk2 ]; NIX_LDFLAGS = "-lgio-2.0"; preFixup = '' diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 5cb5d4f968034..38a71dd02a131 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , python3Packages }: @@ -8,36 +7,34 @@ with python3Packages; buildPythonApplication rec { pname = "parquet-tools"; - version = "0.2.9"; - disabled = pythonOlder "3.8"; + version = "0.2.12"; format = "pyproject"; src = fetchFromGitHub { owner = "ktrueda"; repo = "parquet-tools"; - rev = version; - sha256 = "0aw0x7lhagp4dwis09fsizr7zbhdpliav0ns5ll5qny7x4m6rkfy"; + rev = "refs/tags/${version}"; + hash = "sha256-5bK+kW550DgBhcH5INozwGKKjM+xXblmFg2Tu2rnos4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ktrueda/parquet-tools/commit/1c70a07e1c9f17c8890d23aad3ded5dd6c706cb3.patch"; - sha256 = "08j1prdqj8ksw8gwiyj7ivshk82ahmywbzmywclw52nlnniig0sa"; - }) - ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'thrift = "^0.13.0"' 'thrift = "*"' \ - --replace 'halo = "^0.0.29"' 'halo = "*"' substituteInPlace tests/test_inspect.py \ --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ --replace "serialized_size: 2222" "serialized_size: 2221" \ --replace "format_version: 1.0" "format_version: 2.6" ''; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "halo" + "tabulate" + "thrift" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ boto3 @@ -50,20 +47,25 @@ buildPythonApplication rec { ]; nativeCheckInputs = [ - pytestCheckHook moto pytest-mock + pytestCheckHook ]; disabledTests = [ - # these tests try to read python code as parquet and fail + # These tests try to read Python code as parquet and fail "test_local_wildcard" "test_local_and_s3_wildcard_files" ]; + pythonImportsCheck = [ + "parquet_tools" + ]; + meta = with lib; { description = "A CLI tool for parquet files"; homepage = "https://github.com/ktrueda/parquet-tools"; + changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index af19108ff2104..05367d2e52ba9 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+LLAZeK4sV7oEeN3zNqWBkbCLaaGgJMLidZqlTQeymo="; + sha256 = "sha256-Uwi21dNhpDhrcLS2Ra0vaRsvdqEz7FX7SPILeq12ZnE="; }; - vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY="; + vendorHash = "sha256-BGm3LvKOtlba/BtZ4Ue3Tzphlj5ZSqSzXTF8gSgRYEU="; doCheck = false; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index f2eafc38472de..18c48f2b15cd8 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.6.4"; + version = "2.6.6"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-9jNRXAP+qNihqr30/dSHqzDkyh+GauafMQBkBit5gmc="; + sha256 = "sha256-MX4na74T8+6As8e+izWz1O+xhNGfS2EKUT6goqy+sms="; }; - vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08="; + vendorHash = "sha256-Sfjp8EQeTlXayYSBO72KWLj+CScNUM5O49AP1qEfQTw="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 9cabb74b231de..cdf77b0af427e 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { buildInputs = [ wine_custom libX11 libGLU libGL curl ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; patches = [ ./pipelight.patch diff --git a/pkgs/tools/misc/pkgtop/default.nix b/pkgs/tools/misc/pkgtop/default.nix new file mode 100644 index 0000000000000..1d2f0c048f264 --- /dev/null +++ b/pkgs/tools/misc/pkgtop/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pkgtop"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "pkgtop"; + rev = version; + hash = "sha256-Skk7Zur2UMxNjrJmcp+FvUuNvbh9HmzuZ5mWcvhxcKk="; + }; + + vendorHash = "sha256-dlDbNym7CNn5088znMNgGAr2wBM3+nYv3q362353aLs="; + + postInstall = '' + mv $out/bin/{cmd,pkgtop} + ''; + + meta = with lib; { + description = "Interactive package manager and resource monitor designed for the GNU/Linux"; + homepage = "https://github.com/orhun/pkgtop"; + changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index ddbb7708ec8b4..607bc53033d5f 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2023.0"; + version = "1.2023.1"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-FYyP6CZb+uarXlGEAPyt6KKvciZ5XsfjilDW0JObpDw="; + sha256 = "sha256-SaUk+gaMCpKF1HR9tpEhbZNmKV70LPHeH/YPsU8WGsU="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 6b3f42e377eff..a016fb08e3ebf 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.0"; + version = "1.2023.1"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-1hP+HJCI1HCqd0qJCthac7cMiEnyUPz1M7fvF8AXh08="; + sha256 = "sha256-ObNiuD0le5FOEGvaIr3jl+Lix74Xvpso/YIqyHGGHAs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/tools/misc/pokemonsay/default.nix index f61b93a874f22..7053e4ba80733 100644 --- a/pkgs/tools/misc/pokemonsay/default.nix +++ b/pkgs/tools/misc/pokemonsay/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , cowsay , coreutils , findutils @@ -8,15 +9,23 @@ stdenvNoCC.mkDerivation rec { pname = "pokemonsay"; - version = "unstable-2021-10-05"; + version = "1.0.0"; src = fetchFromGitHub { owner = "HRKings"; repo = "pokemonsay-newgenerations"; - rev = "baccc6d2fe1897c48f60d82ff9c4d4c018f5b594"; + rev = "v${version}"; hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g="; }; + patches = [ + (fetchpatch { # https://github.com/HRKings/pokemonsay-newgenerations/pull/5 + name = "word-wrap-fix.patch"; + url = "https://github.com/pbsds/pokemonsay-newgenerations/commit/7056d7ba689479a8e6c14ec000be1dfcd83afeb0.patch"; + hash = "sha256-aqUJkyJDWArLjChxLZ4BbC6XAB53LAqARzTvEAxrFCI="; + }) + ]; + postPatch = '' substituteInPlace pokemonsay.sh \ --replace \ @@ -51,8 +60,11 @@ stdenvNoCC.mkDerivation rec { cp pokemons/*.cow $out/share/pokemonsay ''; - checkPhase = '' - $out/bin/pokemonsay --list-pokemon + doInstallCheck = true; + installCheckPhase = '' + (set -x + test "$($out/bin/pokemonsay --list | wc -l)" -ge 891 + ) ''; meta = with lib; { diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 8adb5a02f8c13..f51fcf254f982 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -61,7 +61,8 @@ buildPythonPackage rec { libiconv ]; - doCheck = true; + # i686-linux: dotnet-sdk not available + doCheck = stdenv.buildPlatform.system != "i686-linux"; postPatch = '' substituteInPlace pre_commit/resources/hook-tmpl \ @@ -158,6 +159,9 @@ buildPythonPackage rec { "test_sub_staged" "test_submodule_does_not_discard_changes" "test_submodule_does_not_discard_changes_recurse" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # requires gcc bump + "test_rust_hook" ]; pythonImportsCheck = [ diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index 9feee484170e6..94eeace1dc2e6 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index f2a2adca4c7eb..7bfa19a285580 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.7.2"; + version = "5.7.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo="; + sha256 = "sha256-HZ771Q1UXnRds6o3EnZMyeu7Lt3IDFVFiUTc5snU0Bo="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' + installManPage pspg.1 installShellCompletion --bash --cmd pspg bash-completion.sh ''; diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 144038f60f411..2c5403d4a1444 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -12,22 +12,18 @@ python3.pkgs.buildPythonApplication rec { pname = "qmk"; version = "1.1.1"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; + hash = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; }; nativeBuildInputs = with python3.pkgs; [ - nose2 - setuptools-scm - yapf + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ - appdirs - argcomplete - colorama dotty-dict hid hjson @@ -50,14 +46,6 @@ python3.pkgs.buildPythonApplication rec { pkgsCross.avr.libcCross ]; - # buildPythonApplication requires setup.py; the setup.py file crafted below - # acts as a wrapper to setup.cfg - postConfigure = '' - touch setup.py - echo "from setuptools import setup" >> setup.py - echo "setup()" >> setup.py - ''; - # no tests implemented doCheck = false; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index e21842e3604ee..d5d86c1985162 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanslub42/rlwrap"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 srapenne ]; + maintainers = with maintainers; [ srapenne ]; }; } diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 850bdb83c8987..e3969d01eec3e 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; + patches = [ + # pass through NIX_* environment variables to scons. + ./scons-nix-env.patch + ]; + nativeBuildInputs = [ pkg-config sphinx @@ -56,9 +61,6 @@ stdenv.mkDerivation rec { ]; prePatch = '' - export CFLAGS="$NIX_CFLAGS_COMPILE" - export LDFLAGS="''${NIX_LDFLAGS//-rpath /-Wl,-rpath=}" - # remove sources of nondeterminism substituteInPlace lib/cmdline.c \ --replace "__DATE__" "\"Jan 1 1970\"" \ @@ -67,6 +69,7 @@ stdenv.mkDerivation rec { --replace "gzip -c " "gzip -cn " ''; + # Otherwise tries to access /usr. prefixKey = "--prefix="; sconsFlags = lib.optionals (!withGui) [ "--without-gui" ]; diff --git a/pkgs/tools/misc/rmlint/scons-nix-env.patch b/pkgs/tools/misc/rmlint/scons-nix-env.patch new file mode 100644 index 0000000000000..10ed5698be3a7 --- /dev/null +++ b/pkgs/tools/misc/rmlint/scons-nix-env.patch @@ -0,0 +1,19 @@ +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 +@@ -559,10 +559,7 @@ options = dict( + SHLINKCOMSTR=link_shared_library_message, + LINKCOMSTR=link_program_message, + PREFIX=GetOption('prefix'), +- ENV = dict([ (key, os.environ[key]) +- for key in os.environ +- if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH'] +- ]) ++ ENV = os.environ, + ) + + if ARGUMENTS.get('VERBOSE') == "1": diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 2ca7478b742f7..b5762fd651abc 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # ld: libmkimxboot.a(elf.c.o):utils/imxtools/sbtools/misc.h:43: multiple definition of `g_nr_keys'; # libmkimxboot.a(mkimxboot.c.o):utils/imxtools/sbtools/misc.h:43: first defined here # TODO: try to remove with 1.5.1 update. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 7b9b362d79355..3c3b02dd3f98d 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2022.13"; + version = "2023.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3lU+Xmfyjs6AFnf+vE5xMSAntRoNeHBVrOJZLvv1YyY="; + hash = "sha256-JNLp1IHbIRpe3Au2iUsx7x065rirQlzT9bg7CoqHCyg="; }; nativeBuildInputs = [ @@ -114,6 +114,9 @@ stdenv.mkDerivation rec { env NOCONFIGURE=1 ./autogen.sh ''; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + meta = with lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/tools/misc/sagoin/default.nix index 638acb962df69..704267da2793f 100644 --- a/pkgs/tools/misc/sagoin/default.nix +++ b/pkgs/tools/misc/sagoin/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "sagoin"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BCsNsBD+ZkxhIy1yC+N0AqbEsQ2ElfWLtnBOG+0hHXk="; + sha256 = "sha256-CSkij/3WCeEq26Uhlrgdf503hGf0OwSUQNmx5mspD08="; }; - cargoSha256 = "sha256-B8P92utlmZlxNfzBidNUaGw7BhgkOPwD0yahtKZ2yto="; + cargoSha256 = "sha256-Zos3ox6VQv9t1KoblAJhVblTOQOn9rJyvaXK48Y/K1c="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices ]; postInstall = '' diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 57bcd98b89d7b..36ef0fdc96a56 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; # otherwise does not find SIGWINCH - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = with lib; { homepage = "https://codemadness.org/sfeed-simple-feed-parser.html"; diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 93f67bd2defbf..46c5714ce9667 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: src/shallot.o:(.bss+0x8): multiple definition of `lucky_thread'; src/error.o:(.bss+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 6ca75c64f56f0..9a3c350b7977e 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.1.0"; + version = "5.2.2"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-cD+xq2LVaTZGjFj+SleQlNT3sAV6N4nG4RVbH015OOA="; + sha256 = "sha256-kdntnzGpu1NUP6rrBaH7ASwE7XT18vHcgf39bp5A4ds="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index fc30e71aaf5f7..705cf9f90d706 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -7,6 +7,27 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== +"@babel/code-frame@^7.0.0": + 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/helper-validator-identifier@^7.18.6": + 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/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/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + "@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" @@ -15,21 +36,20 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.14.1": - 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== +"@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.2.1": version "1.2.1" @@ -44,10 +64,10 @@ minimatch "^3.0.4" plist "^3.0.4" -"@fortawesome/fontawesome-free@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" - integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== +"@fortawesome/fontawesome-free@6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304" + integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A== "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" @@ -66,23 +86,33 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@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== -"@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" + 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/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/debug@^4.1.6": version "4.1.7" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" @@ -105,6 +135,18 @@ "@types/minimatch" "*" "@types/node" "*" +"@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/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 "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" @@ -116,14 +158,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.11.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz#78a6d7ec962b596fc2d2ec102c4dd3ef073fea6a" - integrity sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A== + version "18.11.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d" + integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw== "@types/node@^16.11.26": - version "16.11.68" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c" - integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ== + version "16.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65" + integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw== "@types/plist@^3.0.1": version "3.0.2" @@ -133,6 +175,13 @@ "@types/node" "*" xmlbuilder ">=11.0.1" +"@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/verror@^1.10.3": version "1.10.6" resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" @@ -144,9 +193,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" - integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== + version "17.0.22" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a" + integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g== dependencies: "@types/yargs-parser" "*" @@ -184,6 +233,13 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -280,10 +336,10 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== +axios@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3" + integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -325,10 +381,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -bootstrap@5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0" - integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ== +bootstrap@5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b" + integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ== brace-expansion@^1.1.7: version "1.1.11" @@ -417,18 +473,37 @@ builder-util@23.6.0: 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== +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" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" chalk@^4.0.2, chalk@^4.1.1: version "4.1.2" @@ -454,9 +529,9 @@ chromium-pickle-js@^0.2.0: integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" - integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== + version "3.7.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" + integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== cli-truncate@^2.1.0: version "2.1.0" @@ -491,6 +566,13 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -498,6 +580,11 @@ color-convert@^2.0.1: 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.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -537,19 +624,21 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -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" - 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 sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== +cosmiconfig@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97" + integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ== + dependencies: + import-fresh "^3.2.1" + js-yaml "^4.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + crc@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" @@ -598,13 +687,6 @@ debug@^2.6.8: dependencies: ms "2.0.0" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== - dependencies: - mimic-response "^1.0.0" - decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -617,10 +699,10 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +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.4" @@ -645,10 +727,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.1045489: - version "0.0.1045489" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz#f959ad560b05acd72d55644bc3fb8168a83abf28" - integrity sha512-D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ== +devtools-protocol@0.0.1068969: + version "0.0.1068969" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz#8b9a4bc48aed1453bed08d62b07481f9abf4d6d8" + integrity sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ== dir-compare@^2.4.0: version "2.4.0" @@ -698,11 +780,6 @@ 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.5" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" - integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== - ejs@^3.1.7: version "3.1.8" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" @@ -753,12 +830,12 @@ electron-publish@23.6.0: lazy-val "^1.0.5" mime "^2.5.2" -electron@^21.0.1: - version "21.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz#8eb65d69b36aa8dac0ee7330eab70181df211c8b" - integrity sha512-oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg== +electron@^22.0.0: + version "22.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5" + integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g== dependencies: - "@electron/get" "^1.14.1" + "@electron/get" "^2.0.0" "@types/node" "^16.11.26" extract-zip "^2.0.1" @@ -767,11 +844,6 @@ emoji-regex@^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 sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -784,6 +856,13 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -794,6 +873,11 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +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" @@ -932,15 +1016,15 @@ get-caller-file@^2.0.5: 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== + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.3" -get-stream@^4.0.0, get-stream@^4.1.0: +get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== @@ -983,16 +1067,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.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" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - globalthis@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" @@ -1000,22 +1074,22 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" +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" "^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.6, graceful-fs@^4.2.0: version "4.2.10" @@ -1027,6 +1101,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== +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" @@ -1059,9 +1138,9 @@ hosted-git-info@^4.1.0: lru-cache "^6.0.0" http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== http-proxy-agent@^5.0.0: version "5.0.0" @@ -1072,6 +1151,14 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" +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.1, 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" @@ -1100,6 +1187,14 @@ ieee754@^1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== +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" + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1113,11 +1208,16 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.4, ini@~1.3.0: +ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" @@ -1179,6 +1279,11 @@ jake@^10.8.5: filelist "^1.0.1" minimatch "^3.0.4" +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -1186,10 +1291,15 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== +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: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== json-schema-traverse@^0.4.1: version "0.4.1" @@ -1202,9 +1312,9 @@ json-stringify-safe@^5.0.1: integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json5@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^4.0.0: version "4.0.0" @@ -1230,28 +1340,28 @@ keytar@^7.9.0: node-addon-api "^4.3.0" prebuild-install "^7.0.1" -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" lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -lodash@^4.17.10, lodash@^4.17.15: +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== + +lodash@^4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -1288,7 +1398,7 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mimic-response@^1.0.0, mimic-response@^1.0.1: +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== @@ -1313,9 +1423,9 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: brace-expansion "^1.1.7" minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -1325,12 +1435,17 @@ minimist@^1.2.0, minimist@^1.2.3: integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass@^3.0.0: - version "3.3.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" - integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + 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.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz#26fc3364d5ea6cb971c6e5259eac67a0887510d1" + integrity sha512-4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -1370,9 +1485,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^3.3.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718" - integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A== + version "3.31.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355" + integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ== dependencies: semver "^7.3.5" @@ -1393,18 +1508,10 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -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@^2.0.0: version "2.0.2" @@ -1425,16 +1532,33 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +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-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + path-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" @@ -1450,16 +1574,16 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - plist@^3.0.1, plist@^3.0.4: version "3.0.6" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" @@ -1486,21 +1610,11 @@ prebuild-install@^7.0.1: tar-fs "^2.0.0" tunnel-agent "^0.6.0" -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== - progress@2.0.3, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -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-from-env@1.1.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" @@ -1515,35 +1629,42 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -puppeteer-core@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz#8d0198550e04c7d5e0847200ba257b2a777dbd3b" - integrity sha512-OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g== +puppeteer-core@19.4.0: + version "19.4.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz#3f52945d8cfa20cf8721a7902afcd8a1a299b54d" + integrity sha512-gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ== dependencies: cross-fetch "3.1.5" debug "4.3.4" - devtools-protocol "0.0.1045489" + devtools-protocol "0.0.1068969" extract-zip "2.0.1" https-proxy-agent "5.0.1" proxy-from-env "1.1.0" rimraf "3.0.2" tar-fs "2.1.1" unbzip2-stream "1.4.3" - ws "8.9.0" + ws "8.10.0" -puppeteer@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz#848986e6ecec37b19cd5a7327ad2fcf1f1cb83fd" - integrity sha512-3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw== +puppeteer@19.4.0: + version "19.4.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz#3adfcb415e96d7b5900a66a1097947272313ee9f" + integrity sha512-sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg== dependencies: + cosmiconfig "8.0.0" + devtools-protocol "0.0.1068969" https-proxy-agent "5.0.1" progress "2.0.3" proxy-from-env "1.1.0" - puppeteer-core "19.0.0" + puppeteer-core "19.4.0" + +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== rc@^1.2.7: version "1.2.8" @@ -1580,12 +1701,22 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== +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-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== + +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: version "3.0.2" @@ -1706,9 +1837,9 @@ simple-get@^4.0.0: simple-concat "^1.0.0" 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== + 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" @@ -1789,6 +1920,13 @@ sumchecker@^3.0.1: dependencies: debug "^4.1.0" +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -1818,13 +1956,13 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + 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 "^3.0.0" + minipass "^4.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -1856,11 +1994,6 @@ tmp@^0.2.0: dependencies: rimraf "^3.0.0" -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -1880,11 +2013,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -1915,13 +2043,6 @@ 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 sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== - dependencies: - prepend-http "^2.0.0" - utf8-byte-length@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" @@ -1982,10 +2103,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@8.9.0: - version "8.9.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e" - integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== +ws@8.10.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" + integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2002,15 +2123,15 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^21.0.0: +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@^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== + 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 "^8.0.1" escalade "^3.1.1" @@ -2018,7 +2139,7 @@ yargs@^17.5.1: 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" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index b22d280d8a0ad..e77dea2cc2714 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -10,6 +10,30 @@ }; } { + name = "_babel_code_frame___code_frame_7.18.6.tgz"; + path = fetchurl { + 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_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + path = fetchurl { + 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_highlight___highlight_7.18.6.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; + }; + } + { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; @@ -18,11 +42,11 @@ }; } { - name = "_electron_get___get_1.14.1.tgz"; + name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { - name = "_electron_get___get_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; - sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + name = "_electron_get___get_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; + sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; }; } { @@ -34,11 +58,11 @@ }; } { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz"; - sha512 = "CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ=="; + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz"; + sha512 = "viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A=="; }; } { @@ -58,19 +82,19 @@ }; } { - name = "_sindresorhus_is___is_0.14.0.tgz"; + name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { - name = "_sindresorhus_is___is_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + name = "_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 = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_szmarczak_http_timer___http_timer_4.0.6.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 = "_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=="; }; } { @@ -82,6 +106,14 @@ }; } { + name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; + path = fetchurl { + 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_debug___debug_4.1.7.tgz"; path = fetchurl { name = "_types_debug___debug_4.1.7.tgz"; @@ -106,6 +138,22 @@ }; } { + 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=="; + }; + } + { + 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"; @@ -122,19 +170,19 @@ }; } { - name = "_types_node___node_18.11.3.tgz"; + name = "_types_node___node_18.11.19.tgz"; path = fetchurl { - name = "_types_node___node_18.11.3.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz"; - sha512 = "fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A=="; + name = "_types_node___node_18.11.19.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz"; + sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; }; } { - name = "_types_node___node_16.11.68.tgz"; + name = "_types_node___node_16.18.12.tgz"; path = fetchurl { - name = "_types_node___node_16.11.68.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz"; - sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; + name = "_types_node___node_16.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz"; + sha512 = "vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw=="; }; } { @@ -146,6 +194,14 @@ }; } { + 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=="; + }; + } + { name = "_types_verror___verror_1.10.6.tgz"; path = fetchurl { name = "_types_verror___verror_1.10.6.tgz"; @@ -162,11 +218,11 @@ }; } { - name = "_types_yargs___yargs_17.0.13.tgz"; + name = "_types_yargs___yargs_17.0.22.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; - sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; + name = "_types_yargs___yargs_17.0.22.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz"; + sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g=="; }; } { @@ -210,6 +266,14 @@ }; } { + 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"; @@ -306,11 +370,11 @@ }; } { - name = "axios___axios_1.1.3.tgz"; + name = "axios___axios_1.3.2.tgz"; path = fetchurl { - name = "axios___axios_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz"; - sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; + name = "axios___axios_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz"; + sha512 = "1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw=="; }; } { @@ -362,11 +426,11 @@ }; } { - name = "bootstrap___bootstrap_5.2.2.tgz"; + name = "bootstrap___bootstrap_5.2.3.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_5.2.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz"; - sha512 = "dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ=="; + name = "bootstrap___bootstrap_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz"; + sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="; }; } { @@ -458,11 +522,35 @@ }; } { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; + 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=="; + }; + } + { + 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 = "chalk___chalk_2.4.2.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 = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -498,11 +586,11 @@ }; } { - name = "ci_info___ci_info_3.5.0.tgz"; + name = "ci_info___ci_info_3.7.1.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; - sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; + name = "ci_info___ci_info_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz"; + sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; }; } { @@ -538,6 +626,14 @@ }; } { + 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"; @@ -546,6 +642,14 @@ }; } { + 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"; @@ -602,14 +706,6 @@ }; } { - name = "config_chain___config_chain_1.1.13.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - } - { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -618,6 +714,14 @@ }; } { + name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz"; + sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ=="; + }; + } + { name = "crc___crc_3.8.0.tgz"; path = fetchurl { name = "crc___crc_3.8.0.tgz"; @@ -666,14 +770,6 @@ }; } { - 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"; - sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; - }; - } - { name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { name = "decompress_response___decompress_response_6.0.0.tgz"; @@ -690,11 +786,11 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "defer_to_connect___defer_to_connect_2.0.1.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 = "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=="; }; } { @@ -730,11 +826,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz"; - sha512 = "D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ=="; + name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz"; + sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ=="; }; } { @@ -778,14 +874,6 @@ }; } { - name = "duplexer3___duplexer3_0.1.5.tgz"; - path = fetchurl { - name = "duplexer3___duplexer3_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz"; - sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; - }; - } - { name = "ejs___ejs_3.1.8.tgz"; path = fetchurl { name = "ejs___ejs_3.1.8.tgz"; @@ -818,11 +906,11 @@ }; } { - name = "electron___electron_21.2.0.tgz"; + name = "electron___electron_22.2.0.tgz"; path = fetchurl { - name = "electron___electron_21.2.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz"; - sha512 = "oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg=="; + name = "electron___electron_22.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz"; + sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g=="; }; } { @@ -834,14 +922,6 @@ }; } { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - } - { name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; @@ -858,6 +938,14 @@ }; } { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + } + { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; @@ -874,6 +962,14 @@ }; } { + 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"; @@ -1034,11 +1130,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.0.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_intrinsic___get_intrinsic_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; } { @@ -1082,14 +1178,6 @@ }; } { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - path = fetchurl { - name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; - }; - } - { name = "globalthis___globalthis_1.0.3.tgz"; path = fetchurl { name = "globalthis___globalthis_1.0.3.tgz"; @@ -1098,11 +1186,11 @@ }; } { - 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=="; }; } { @@ -1122,6 +1210,14 @@ }; } { + 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"; @@ -1162,11 +1258,11 @@ }; } { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; } { @@ -1178,6 +1274,14 @@ }; } { + name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; + path = fetchurl { + 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"; @@ -1210,6 +1314,14 @@ }; } { + 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 = "inflight___inflight_1.0.6.tgz"; path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; @@ -1234,6 +1346,14 @@ }; } { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; + }; + } + { name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { name = "is_ci___is_ci_3.0.1.tgz"; @@ -1314,6 +1434,14 @@ }; } { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + } + { name = "js_yaml___js_yaml_4.1.0.tgz"; path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; @@ -1322,11 +1450,19 @@ }; } { - 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"; - sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; + 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=="; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; } { @@ -1346,11 +1482,11 @@ }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.3.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.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -1378,11 +1514,11 @@ }; } { - 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=="; }; } { @@ -1394,19 +1530,19 @@ }; } { - name = "lodash___lodash_4.17.21.tgz"; + name = "lines_and_columns___lines_and_columns_1.2.4.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 = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; } { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + name = "lodash___lodash_4.17.21.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 = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -1490,11 +1626,11 @@ }; } { - name = "minimatch___minimatch_5.1.0.tgz"; + name = "minimatch___minimatch_5.1.6.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + name = "minimatch___minimatch_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; } { @@ -1506,11 +1642,19 @@ }; } { - name = "minipass___minipass_3.3.4.tgz"; + name = "minipass___minipass_3.3.6.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=="; + 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.2.tgz"; + path = fetchurl { + name = "minipass___minipass_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz"; + sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A=="; }; } { @@ -1570,11 +1714,11 @@ }; } { - name = "node_abi___node_abi_3.28.0.tgz"; + name = "node_abi___node_abi_3.31.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.28.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz"; - sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; + name = "node_abi___node_abi_3.31.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; } { @@ -1602,19 +1746,11 @@ }; } { - name = "normalize_url___normalize_url_4.5.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; - }; - } - { - name = "npm_conf___npm_conf_1.1.3.tgz"; + name = "normalize_url___normalize_url_6.1.0.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=="; }; } { @@ -1642,11 +1778,11 @@ }; } { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; + name = "p_cancelable___p_cancelable_2.1.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 = "p_cancelable___p_cancelable_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; } { @@ -1658,6 +1794,22 @@ }; } { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + } + { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -1682,19 +1834,19 @@ }; } { - name = "pend___pend_1.2.0.tgz"; + name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { - name = "pend___pend_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; } { - name = "pify___pify_3.0.0.tgz"; + name = "pend___pend_1.2.0.tgz"; path = fetchurl { - name = "pify___pify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; }; } { @@ -1714,14 +1866,6 @@ }; } { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; - }; - } - { name = "progress___progress_2.0.3.tgz"; path = fetchurl { name = "progress___progress_2.0.3.tgz"; @@ -1730,14 +1874,6 @@ }; } { - name = "proto_list___proto_list_1.2.4.tgz"; - path = fetchurl { - name = "proto_list___proto_list_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; - }; - } - { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; @@ -1754,27 +1890,35 @@ }; } { - name = "punycode___punycode_2.1.1.tgz"; + name = "punycode___punycode_2.3.0.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 = "punycode___punycode_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; } { - name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; + name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; path = fetchurl { - name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz"; - sha512 = "OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g=="; + name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz"; + sha512 = "gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ=="; }; } { - name = "puppeteer___puppeteer_19.0.0.tgz"; + name = "puppeteer___puppeteer_19.4.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_19.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz"; - sha512 = "3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw=="; + name = "puppeteer___puppeteer_19.4.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz"; + sha512 = "sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg=="; + }; + } + { + name = "quick_lru___quick_lru_5.1.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=="; }; } { @@ -1810,11 +1954,27 @@ }; } { - name = "responselike___responselike_1.0.2.tgz"; + 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=="; + }; + } + { + 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 = "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"; - sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; + name = "responselike___responselike_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; } { @@ -1970,11 +2130,11 @@ }; } { - name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + name = "simple_update_notifier___simple_update_notifier_1.1.0.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=="; + 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=="; }; } { @@ -2074,6 +2234,14 @@ }; } { + 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"; @@ -2098,11 +2266,11 @@ }; } { - name = "tar___tar_6.1.11.tgz"; + name = "tar___tar_6.1.13.tgz"; path = fetchurl { - name = "tar___tar_6.1.11.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + name = "tar___tar_6.1.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; } { @@ -2138,14 +2306,6 @@ }; } { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - path = fetchurl { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - } - { name = "tr46___tr46_0.0.3.tgz"; path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; @@ -2170,14 +2330,6 @@ }; } { - name = "tunnel___tunnel_0.0.6.tgz"; - path = fetchurl { - name = "tunnel___tunnel_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; - }; - } - { name = "type_fest___type_fest_0.13.1.tgz"; path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; @@ -2218,14 +2370,6 @@ }; } { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; - }; - } - { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; @@ -2298,11 +2442,11 @@ }; } { - name = "ws___ws_8.9.0.tgz"; + name = "ws___ws_8.10.0.tgz"; path = fetchurl { - name = "ws___ws_8.9.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz"; - sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; + name = "ws___ws_8.10.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz"; + sha512 = "+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw=="; }; } { @@ -2338,11 +2482,11 @@ }; } { - name = "yargs___yargs_17.6.0.tgz"; + name = "yargs___yargs_17.6.2.tgz"; path = fetchurl { - name = "yargs___yargs_17.6.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz"; - sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; + name = "yargs___yargs_17.6.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; + sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; }; } { diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/tools/misc/shim/default.nix index a988d496276f2..ea13cc1bd66f3 100644 --- a/pkgs/tools/misc/shim/default.nix +++ b/pkgs/tools/misc/shim/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { buildInputs = [ elfutils ]; - NIX_CFLAGS_COMPILE = [ "-I${toString elfutils.dev}/include" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${toString elfutils.dev}/include" ]; makeFlags = lib.optional (vendorCertFile != null) "VENDOR_CERT_FILE=${vendorCertFile}" diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index bdd6221d66714..331d307c133fc 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.10.2"; + version = "0.10.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-LkPkwYsaSLfaZktHF23Fgaks+fDlbB1S6SRgXtJRBqQ="; + sha256 = "sha256-d0gzeyOc9UudgTrTFt5OhUAsTy/SYMvRMyph2yAD9H8="; }; nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" "vim" ]; - cargoSha256 = "sha256-lG26dgvjqCZ/4KgzurMrlhl+JKec+xLt/5uA6XcsSPk="; + cargoHash = "sha256-ZLA1ZE/VLZyzQzIECcabxKup409YBZRpHdhR2k/+4lY="; postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index d0736761bada0..05b008997b7fd 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , glew @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; + patches = [ + (fetchpatch { + # From Upstream PR#135: https://github.com/naelstrof/slop/pull/135 + name = "Fix-linking-of-GLEW-library.patch"; + url = "https://github.com/naelstrof/slop/commit/811b7e44648b9dd6c1da1554e70298cf4157e5fe.patch"; + sha256 = "sha256-LNUrAeVZUJFNOt1csOaIid7gLBdtqRxp8AcC7f3cnIQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index c757882c12a27..b96aa7c39998a 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; postInstall = '' rm -r $out/etc/cron.* diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5280943e994a2..e9257bd359638 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.12.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-HS+vtF+h5M6lbk7TROAXwrHpj92SeC+j0TjmP6ycH2Q="; + hash = "sha256-MgCYlcJoNJ3eChH7WLKgvgblmz9Wy6JplULjeGGiEXY="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8="; + cargoHash = "sha256-sdETcvmz9mWTXEt9h7vP+FKolhnamkwtbkYiJE/HVX0="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 26869c3ee01d0..52fa4306ee3e1 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "steampipe"; - version = "0.16.4"; + version = "0.18.6"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-awZlA02lKYpFdvCsGUC8Blv8FHek5XskkljseDGjDmk="; + sha256 = "sha256-H/R+NXFaZ23vWN16/Ft5oP+Xvc97VY98cQth5+LtqnA="; }; - vendorSha256 = "sha256-6l3bBxGhdZGIXmdzgF44TGZQqT6gSUHSwOAE2SlgLgg="; + vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M="; proxyVendor = true; patchPhase = '' runHook prePatch # Patch test that relies on looking up homedir in user struct to prefer ~ substituteInPlace pkg/steampipeconfig/shared_test.go \ - --replace '"github.com/turbot/go-kit/helpers"' "" \ - --replace 'filepaths.SteampipeDir, _ = helpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"'; + --replace 'filehelpers "github.com/turbot/go-kit/files"' "" \ + --replace 'filepaths.SteampipeDir, _ = filehelpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"'; runHook postPatch ''; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 737752660a9e2..f0f87fbfab9f5 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.58.0"; + version = "1.62.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-uHTE4x8cCM2O4dtqqV7zm7Eqi8xsqqxSUbcFvV2Vgv8="; + hash = "sha256-x3Bh/xB/x71xNjVL5zqp1ag8TPQoxOpuOyDE1f54sGQ="; }; - vendorHash = "sha256-qMkAmtt9ERYcZEdxqFAI9P99niP3l13iQ6M4cDCz5Kw="; + vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; CGO_CFLAGS = [ "-Wno-format-security" ]; diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix index cc68fa7c55fd7..a576e70a37140 100644 --- a/pkgs/tools/misc/tea/default.nix +++ b/pkgs/tools/misc/tea/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tea"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "tea"; rev = "v${version}"; - sha256 = "sha256-Bvee8m/BXvPtaaD8xjVg9qzorO0ln6xHP1upPgWoD+A="; + sha256 = "sha256-sZfg8+LIu1Ejvmr/o4X3EOz3fv+RvLhrGRf2yy+6t8c="; }; vendorSha256 = "sha256-nb0lQEAaIYlGpodFQLhMk/24DmTgg5K3zQ4s/XY+Z1w="; diff --git a/pkgs/tools/misc/thumbs/default.nix b/pkgs/tools/misc/thumbs/default.nix index 60a1dce08c08f..26b6c7d5f9469 100644 --- a/pkgs/tools/misc/thumbs/default.nix +++ b/pkgs/tools/misc/thumbs/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-6htKiXMMyYRFefJzvDnmdx3CJ3XL8zONhGlV2wcbr9g="; - cargoPatches = [ ./fix.patch ]; + patches = [ ./fix.patch ]; + meta = with lib; { homepage = "https://github.com/fcsonline/tmux-thumbs"; description = "A lightning fast version copy/pasting like vimium/vimperator"; diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/tools/misc/timer/default.nix new file mode 100644 index 0000000000000..abfd48b83a8d4 --- /dev/null +++ b/pkgs/tools/misc/timer/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, timer }: + +buildGoModule rec { + pname = "timer"; + version = "unstable-2023-02-01"; + + src = fetchFromGitHub { + owner = "caarlos0"; + repo = "timer"; + rev = "1f437baceb1ca76b341fdc229fe45938b282f2aa"; + hash = "sha256-u+naemEiKufKYROuJB55u8QgiIgg4nLsB+FerUImtXs="; + }; + + vendorHash = "sha256-n4AjaojcDAYbgOIuaAJ4faVJqV+/0uby5OHRMsyL9Dg="; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = timer; + }; + + meta = with lib; { + description = "A `sleep` with progress"; + homepage = "https://github.com/caarlos0/timer"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/misc/tmux/CVE-2022-47016.patch b/pkgs/tools/misc/tmux/CVE-2022-47016.patch new file mode 100644 index 0000000000000..e6ced830421ee --- /dev/null +++ b/pkgs/tools/misc/tmux/CVE-2022-47016.patch @@ -0,0 +1,72 @@ +From 01f753df5dc269cf054b94c3f210aa880872d602 Mon Sep 17 00:00:00 2001 +From: nicm <nicm> +Date: Wed, 24 Aug 2022 07:22:30 +0000 +Subject: [PATCH] Check for NULL returns from bufferevent_new. + +(cherry picked from commit e86752820993a00e3d28350cbe46878ba95d9012) +--- + control.c | 4 ++++ + file.c | 4 ++++ + window.c | 2 ++ + 3 files changed, 10 insertions(+) + +diff --git a/control.c b/control.c +index 73286e00..6183a006 100644 +--- a/control.c ++++ b/control.c +@@ -775,6 +775,8 @@ control_start(struct client *c) + + cs->read_event = bufferevent_new(c->fd, control_read_callback, + control_write_callback, control_error_callback, c); ++ if (cs->read_event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cs->read_event, EV_READ); + + if (c->flags & CLIENT_CONTROLCONTROL) +@@ -782,6 +784,8 @@ control_start(struct client *c) + else { + cs->write_event = bufferevent_new(c->out_fd, NULL, + control_write_callback, control_error_callback, c); ++ if (cs->write_event == NULL) ++ fatalx("out of memory"); + } + bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW, + 0); +diff --git a/file.c b/file.c +index b2f155fe..04a907bf 100644 +--- a/file.c ++++ b/file.c +@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer, + + cf->event = bufferevent_new(cf->fd, NULL, file_write_callback, + file_write_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_WRITE); + goto reply; + +@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer, + + cf->event = bufferevent_new(cf->fd, file_read_callback, NULL, + file_read_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_READ); + return; + +diff --git a/window.c b/window.c +index c0cd9bdc..294a1f08 100644 +--- a/window.c ++++ b/window.c +@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp) + + wp->event = bufferevent_new(wp->fd, window_pane_read_callback, + NULL, window_pane_error_callback, wp); ++ if (wp->event == NULL) ++ fatalx("out of memory"); + wp->ictx = input_init(wp, wp->event, &wp->palette); + + bufferevent_enable(wp->event, EV_READ|EV_WRITE); +-- +2.39.1 + diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 139cadc70642c..a630dbc374117 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , bison , libevent @@ -35,6 +36,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-SygHxTe7N4y7SdzKixPFQvqRRL57Fm8zWYHfTpW+yVY="; }; + patches = [ + ./CVE-2022-47016.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 1b21a4d6029be..4750897b7801c 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -6,11 +6,11 @@ let in pypkgs.buildPythonApplication rec { pname = "tmuxp"; - version = "1.23.0"; + version = "1.27.0"; src = pypkgs.fetchPypi { inherit pname version; - sha256 = "Ix/43QFOa0kCP5xndszFGk0p12w/t/z+fVcYRIj9y0s="; + sha256 = "sha256-QAk+rcNYjhAgkJX2fa0bl3dHrB4yyYQ/oNlUX3IQMR8="; }; # No tests in archive diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 44029fb5d4efa..8679a655df9c4 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.2.4"; + version = "10.3.1"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-b1nWTQ+m4b6XzDTR36ubf5nTdUuWK94F2P4Q3tUvHAw="; + hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps="; }; - cargoHash = "sha256-7GSkFh0Fefl9VlCdPdVZ9IsyN0IKUob5c43v84PtrcI="; + cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0="; nativeBuildInputs = [ installShellFiles @@ -31,10 +31,10 @@ rustPlatform.buildRustPackage rec { Foundation ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-framework" "AppKit" - ]; + ]); postInstall = '' installShellCompletion --cmd topgrade \ diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix index 8e9bbba446162..f8da452c52f7d 100644 --- a/pkgs/tools/misc/torrenttools/default.nix +++ b/pkgs/tools/misc/torrenttools/default.nix @@ -10,7 +10,7 @@ , fmt , gsl-lite , howard-hinnant-date -, libyamlcpp +, yaml-cpp , ninja , nlohmann_json , openssl @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { fmt gsl-lite howard-hinnant-date - libyamlcpp + yaml-cpp nlohmann_json openssl re2 diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 16f4d1eb55173..7a062eb35efa1 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "sha256-T3qE9xlcEoZOcY52XfYPpN34zzQl6mfcRnyuldnIvCk="; + sha256 = "sha256-3boPoq/wm0af0DqEWcUCUyCmVFopVMitRHJI1xsjAWM="; }; depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; checkTarget = "tests"; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; meta = with lib; { description = "Lightweight implementation of some Unix command line utilities"; diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix index fb42a886fee52..edaf1893f3265 100644 --- a/pkgs/tools/misc/trashy/default.nix +++ b/pkgs/tools/misc/trashy/default.nix @@ -1,21 +1,15 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, rustPlatform, fetchCrate, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "trashy"; version = "2.0.0"; - src = fetchFromGitHub { - owner = "oberblastmeister"; - repo = "trashy"; - rev = "v${version}"; - sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM="; + src = fetchCrate { + inherit pname version; + hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o="; }; - cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; - - # this patch must be removed after oberblastmeister/trashy#70 is solved or new - # version is released. - cargoPatches = [ ./lock-version.patch ]; + cargoHash = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; nativeBuildInputs = [ installShellFiles ]; @@ -27,9 +21,11 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A simple, fast, and featureful alternative to rm and trash-cli."; + description = "A simple, fast, and featureful alternative to rm and trash-cli"; homepage = "https://github.com/oberblastmeister/trashy"; + changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ oberblastmeister ]; + mainProgram = "trash"; }; } diff --git a/pkgs/tools/misc/trashy/lock-version.patch b/pkgs/tools/misc/trashy/lock-version.patch deleted file mode 100644 index 3e95a3fbfddae..0000000000000 --- a/pkgs/tools/misc/trashy/lock-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 7af0268..dc197a0 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -889,7 +889,7 @@ dependencies = [ - - [[package]] - name = "trashy" --version = "1.0.3" -+version = "2.0.0" - dependencies = [ - "aho-corasick", - "ansi_term", diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index 248630795cb08..ae521167431d7 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - homepage = "http://ttylog.sourceforge.net"; + homepage = "https://ttylog.sourceforge.net"; description = "Simple serial port logger"; longDescription = '' A serial port logger which can be used to print everything to stdout diff --git a/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix new file mode 100644 index 0000000000000..5aca983252df1 --- /dev/null +++ b/pkgs/tools/misc/turbo/default.nix @@ -0,0 +1,91 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, git +, nodejs +, protobuf +, protoc-gen-go +, protoc-gen-go-grpc +, rustPlatform +, pkg-config +, openssl +, extra-cmake-modules +, fontconfig +, go +}: +let + version = "1.7.0"; + src = fetchFromGitHub { + owner = "vercel"; + repo = "turbo"; + rev = "v${version}"; + sha256 = "YTuEv2S3jNV2o7HJML+P6OMazgwgRhUPnd/zaTWfDWs="; + }; + + go-turbo = buildGoModule rec { + inherit src version; + pname = "go-turbo"; + modRoot = "cli"; + + vendorSha256 = "Kx/CLFv23h2TmGe8Jwu+S3QcONfqeHk2fCW1na75c0s="; + + nativeBuildInputs = [ + git + nodejs + protobuf + protoc-gen-go + protoc-gen-go-grpc + ]; + + preBuild = '' + make compile-protos + ''; + + preCheck = '' + # Some tests try to run mkdir $HOME + HOME=$TMP + + # Test_getTraversePath requires that source is a git repo + # pwd: /build/source/cli + pushd .. + git config --global init.defaultBranch main + git init + popd + ''; + + }; +in +rustPlatform.buildRustPackage rec { + pname = "turbo"; + inherit src version; + cargoBuildFlags = [ + "--package" + "turbo" + ]; + RELEASE_TURBO_CLI = "true"; + + cargoSha256 = "ENw6NU3Fedd+OJEEWgL8A54aowNqjn3iv7rxlr+/4ZE="; + RUSTC_BOOTSTRAP = 1; + nativeBuildInputs = [ + pkg-config + extra-cmake-modules + ]; + buildInputs = [ + openssl + fontconfig + ]; + + postInstall = '' + ln -s ${go-turbo}/bin/turbo $out/bin/go-turbo + ''; + + # Browser tests time out with chromium and google-chrome + doCheck = false; + + meta = with lib; { + description = "High-performance build system for JavaScript and TypeScript codebases"; + homepage = "https://turbo.build/"; + maintainers = with maintainers; [ dlip ]; + license = licenses.mpl20; + }; +} diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix index 204914c280c64..abe5c75f8b86c 100644 --- a/pkgs/tools/misc/tvnamer/default.nix +++ b/pkgs/tools/misc/tvnamer/default.nix @@ -4,16 +4,20 @@ let python' = python3.override { - packageOverrides = self: super: rec { + packageOverrides = final: prev: rec { # tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6 - requests-cache = super.requests-cache.overridePythonAttrs (super: rec { + requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec { version = "0.5.2"; - src = self.fetchPypi { - inherit (super) pname; + src = final.fetchPypi { + inherit (oldAttrs) pname; inherit version; sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs="; }; + nativeBuildInputs = with final; [ + setuptools + ]; + # too many changes have been made to requests-cache based on version 0.6 so # simply disable tests doCheck = false; diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/tools/misc/twspace-crawler/default.nix new file mode 100644 index 0000000000000..eead04e0138c6 --- /dev/null +++ b/pkgs/tools/misc/twspace-crawler/default.nix @@ -0,0 +1,23 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "twspace-crawler"; + version = "1.11.13"; + + src = fetchFromGitHub { + owner = "HitomaruKonpaku"; + repo = "twspace-crawler"; + rev = "v${version}"; + hash = "sha256-MGFVIQDb++oVbTQubl7CNYwT/ofTNFQfFiveXcNgQpA="; + }; + + npmDepsHash = "sha256-zKy/DngBwnfUqG6JfCULoDIrg1V16hX0Q4zNz45z888="; + + meta = with lib; { + description = "Script to monitor & download Twitter Spaces 24/7"; + homepage = "https://github.com/HitomaruKonpaku/twspace-crawler"; + changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/raw/v${version}/CHANGELOG.md"; + license = licenses.isc; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/tools/misc/uair/default.nix new file mode 100644 index 0000000000000..90036a6b45760 --- /dev/null +++ b/pkgs/tools/misc/uair/default.nix @@ -0,0 +1,37 @@ +{ fetchFromGitHub +, installShellFiles +, lib +, rustPlatform +, scdoc +}: + +rustPlatform.buildRustPackage rec { + pname = "uair"; + version = "v0.5.1"; + + src = fetchFromGitHub { + owner = "metent"; + repo = pname; + rev = version; + hash = "sha256-qxfdKU3SFGVpp3OG0m+0qDvs5cB2bAaTF8+K6zwXRnI="; + }; + + cargoHash = "sha256-XmEbXzpynkUPXywaf4wPcWq9zf3gNOHkcVr2jz3WNnc="; + + nativeBuildInputs = [ installShellFiles scdoc ]; + + preFixup = '' + scdoc < docs/uair.1.scd > docs/uair.1 + scdoc < docs/uair.5.scd > docs/uair.5 + scdoc < docs/uairctl.1.scd > docs/uairctl.1 + + installManPage docs/*.[1-9] + ''; + + meta = with lib; { + description = "An extensible pomodoro timer"; + homepage = "https://github.com/metent/uair"; + license = licenses.mit; + maintainers = with maintainers; [ thled ]; + }; +} diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/tools/misc/undocker/default.nix index 25f6b385ac5df..f80642f1e8129 100644 --- a/pkgs/tools/misc/undocker/default.nix +++ b/pkgs/tools/misc/undocker/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "undocker"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromSourcehut { owner = "~motiejus"; repo = pname; rev = "v${version}"; - hash = "sha256-SmtM25sijcm5NF0ZrSqrRQDXiLMNp8WGAZX9yKvj1rQ="; + hash = "sha256-I+pTbr1lKELyYlyHrx2gB+aeZ3/PmcePQfXu1ckhKAk="; }; vendorHash = null; @@ -18,7 +18,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://git.sr.ht/~motiejus/undocker"; description = "A CLI tool to convert a Docker image to a flattened rootfs tarball"; - license = licenses.mit; + license = licenses.asl20; maintainers = with maintainers; [ jordanisaacs ]; }; } diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index 6903039f6a5ce..89ce91ef3e199 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "usbimager"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitLab { owner = "bztsrc"; repo = pname; rev = version; - sha256 = "1j0g1anmdwc3pap3m4kfzqjfkn7q0vpmqniii2kcz7svs5h3ybga"; + sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; }; sourceRoot = "source/src/"; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index fa17625d592c7..1ac2e31243376 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-03Y7966xB+3iJ1LSZPiuXMR7krhb6Wiri455ycA50SU="; + sha256 = "sha256-r4IpmwZaRKzesvq7jAjCvfvZVmfcvwj23zMH3VnlC4I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-97yyOZCw4bJMpbH2ubyNtAJa7EwJY0AnPWMiUUzIM0M="; + hash = "sha256-ZbGLBjjAsdEhWK3/RS+yRI70xqV+5fzg76Y2Lip1m9A="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix index 03105b13e4cea..f86320a59b32c 100644 --- a/pkgs/tools/misc/uwufetch/default.nix +++ b/pkgs/tools/misc/uwufetch/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, viu }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, viu }: stdenv.mkDerivation rec { pname = "uwufetch"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "TheDarkBug"; repo = pname; rev = version; - hash = "sha256-2kktKdQ1xjQRIQR2auwveHgNWGaX1jdJsdlgWrH6l2g="; + hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA="; }; - patches = [ - # cannot find images in /usr - ./fix-paths.patch - ]; + postPatch = '' + substituteInPlace uwufetch.c \ + --replace "/usr/lib/uwufetch" "$out/lib/uwufetch" \ + --replace "/usr/local/lib/uwufetch" "$out/lib/uwufetch" \ + --replace "/etc/uwufetch/config" "$out/etc/uwufetch/config" + # fix command_path for package manager (nix-store) + substituteInPlace fetch.c \ + --replace "/usr/bin" "/run/current-system/sw/bin" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "local/bin" "bin" \ + --replace "local/lib" "lib" \ + --replace "local/include" "include" \ + --replace "local/share" "share" + ''; nativeBuildInputs = [ makeWrapper ]; @@ -24,13 +35,9 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" - "ETC_DIR=${placeholder "out"}" + "ETC_DIR=${placeholder "out"}/etc" ]; - postPatch = '' - substituteAllInPlace uwufetch.c - ''; - postFixup = '' wrapProgram $out/bin/uwufetch \ --prefix PATH ":" ${lib.makeBinPath [ viu ]} @@ -40,6 +47,7 @@ stdenv.mkDerivation rec { description = "A meme system info tool for Linux"; homepage = "https://github.com/TheDarkBug/uwufetch"; license = licenses.gpl3Plus; + platforms = platforms.unix; maintainers = with maintainers; [ lourkeur ]; }; } diff --git a/pkgs/tools/misc/uwufetch/fix-paths.patch b/pkgs/tools/misc/uwufetch/fix-paths.patch deleted file mode 100644 index 4869104819d63..0000000000000 --- a/pkgs/tools/misc/uwufetch/fix-paths.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/uwufetch.c b/uwufetch.c -index f2d7857..8191888 100644 ---- a/uwufetch.c -+++ b/uwufetch.c -@@ -160,9 +160,9 @@ void print_image(struct info* user_info) { - if (strcmp(user_info->os_name, "android") == 0) - sprintf(command, "viu -t -w 18 -h 8 /data/data/com.termux/files/usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for android - else if (strcmp(user_info->os_name, "macos") == 0) -- sprintf(command, "viu -t -w 18 -h 8 /usr/local/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); -+ sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); - else -- sprintf(command, "viu -t -w 18 -h 8 /usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems -+ sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems - } - printf("\n"); - if (system(command) != 0) // if viu is not installed or the image is missing -@@ -587,9 +587,9 @@ void print_ascii(struct info* user_info) { - if (strcmp(user_info->os_name, "android") == 0) - sprintf(ascii_file, "/data/data/com.termux/files/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name); - else if (strcmp(user_info->os_name, "macos") == 0) -- sprintf(ascii_file, "/usr/local/lib/uwufetch/ascii/%s.txt", user_info->os_name); -+ sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", user_info->os_name); - else -- sprintf(ascii_file, "/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name); -+ sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", user_info->os_name); - - file = fopen(ascii_file, "r"); - if (!file) { diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 3a7d51f4c7c3e..4d1783b53acc7 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -2,15 +2,16 @@ let pname = "via"; - version = "2.0.5"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; - sha256 = "sha256-APNtzfeV6z8IF20bomcgMq7mwcK1fbDdFF77Xr0UPOs="; + sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; profile = '' diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index 78cf177b3dec5..c7f65527e0819 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vsh"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "0skd16j969mb2kgq503wskaw8clyhkw135ny2nsqv5j2zjpr71ap"; + sha256 = "13qa9r7kij6aqhackzmsn38vyhmajgmhflnrd9rarfhhyg6ldv4z"; }; # vendor directory is part of repository diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index fddef03c9cf8a..485006228b00a 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8n"; + version = "0.9.8v"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-uH4nyhc3u9yuUZfMJ8rU8cZGtyqMfL+LyNB0/h3X45E="; + sha256 = "sha256-7ECYbw51MXhYsbQxnuS4QUr5HN0cIUqgMx7V7D/kYTg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index a2bd46321b74d..96915f5c9fdf5 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20221229"; + version = "20230201"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-a2oQmsrwVpz3Zg0g3NFTuD4yjpuT2uTnO5hbvMaxi/g="; + sha256 = "sha256-J/QwB5Hny8+dFfiEIfmONdOu5mMRNoQwYk4sGlqL5oM="; }; meta = with lib; { diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix new file mode 100644 index 0000000000000..c04c98e053155 --- /dev/null +++ b/pkgs/tools/misc/wakapi/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wakapi"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "muety"; + repo = pname; + rev = version; + sha256 = "1bhd96la2ipwna9lic50pd5klcc3xj9yqd5rd1cgzznbm4ylpjqb"; + }; + + vendorHash = "sha256-fkSXaP9hHCCyO8mFB5CKPExifuNjTvDnXupjCVllG9I"; + + # Not a go module required by the project, contains development utilities + excludedPackages = [ "scripts" ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + homepage = "https://wakapi.dev/"; + changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; + description = "A minimalist self-hosted WakaTime-compatible backend for coding statistics"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index bc43d77bbfba5..5499cac9a8a17 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "sha256-LaPH6nGQanweAG0niS75hr7zbO/9A3iZjS8wHD//oJ4="; + sha256 = "sha256-rbJONP3ge+2+WzCIpTUZeieQz9Q/MZfEUmQVbZ+9Dro="; }; sourceRoot = "source/src"; @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + installPhase = '' mkdir -p $out/share/wimboot/ cp wimboot.x86_64.efi $out/share/wimboot diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index 105a1f734dc9c..d570014494042 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgsf glib libxml2 ]; - NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; meta = { description = "Excellent MS Word filter lib, used in most Office suites"; license = lib.licenses.lgpl2; - homepage = "http://wvware.sourceforge.net"; + homepage = "https://wvware.sourceforge.net"; }; } diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index d1244cc73c47d..df8b4933aa696 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC" ''; - buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ]; + strictDeps = true; + nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp4 ]; + buildInputs = [ ncurses remind ]; preferLocalBuild = true; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index aec0bd62addd7..11fb3f5b7045b 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2022.09.04"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; + url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; rev = "v${version}"; sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw="; }; diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index 8168f9603a5a0..410531d5a74d9 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.2.40"; + version = "0.2.42"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sOCdNQ+prQRdj3Oeaa4HLhufbwtClUzzhnMDwSU4SJE="; + sha256 = "sha256-VR2ZUt0qvQBaFZr7Gui/LywsRrPubQlzYj1PQj05xhY="; }; - cargoSha256 = "sha256-b41D/sg+qD/SbwQvEqv3sFWuW15VQ4gEiL51I7/hOmI="; + cargoHash = "sha256-rX0fwJM8sHTuHIsmk9JpgWrTq1EA6Ksx7fFqWqY5R4k="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/tools/misc/xstow/default.nix index c46bef50caf25..694634cf0bfe3 100644 --- a/pkgs/tools/misc/xstow/default.nix +++ b/pkgs/tools/misc/xstow/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A replacement of GNU Stow written in C++"; - homepage = "http://xstow.sourceforge.net"; + homepage = "https://xstow.sourceforge.net"; license = licenses.gpl2Only; maintainers = with maintainers; [ nzbr ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index f55926d0ae39a..4ebaea963c29e 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace ./config.h --replace \ "#include \"ascii/gnu.h\"" "#include \"ascii/nixos.h\"" + + sed '1i#include <array>' -i config.h # gcc12 ''; # Fixes installation path diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index bc4e6b7a46755..dd2377c2b6fa0 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -7,7 +7,8 @@ python3.pkgs.buildPythonApplication rec { pname = "you-get"; - version = "0.4.1620"; + version = "0.4.1650"; + format = "setuptools"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -15,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-wCDaT9Nz1ZiSsqFwX1PXHq6QF6fjLRI9wwvvWxcmYOY="; + sha256 = "sha256-s8lEz3pjzEaMzMiBbc5/wAjC5rW6Uq7+XOIIGBijrUc="; }; patches = [ @@ -36,6 +37,10 @@ python3.pkgs.buildPythonApplication rec { --bash contrib/completion/you-get-completion.bash ''; + pythonImportsCheck = [ + "you_get" + ]; + meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index f99632fac2de2..d9331a8c28afd 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -13,6 +13,7 @@ , ffmpegSupport ? true , rtmpSupport ? true , withAlias ? false # Provides bin/youtube-dl for backcompat +, update-python-libraries }: buildPythonPackage rec { @@ -20,11 +21,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.1.6"; + version = "2023.2.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ong6NnUc7RY2j0CzuoZas5swaJ7YBW8e4jRqo4OaCw8="; + sha256 = "sha256-mvkt5e/8GTvbUSFtnr8oh02WGA0gL651Kw2fKmM4Dzo="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; @@ -53,6 +54,8 @@ buildPythonPackage rec { ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; + passthru.updateScript = [ update-python-libraries (toString ./.) ]; + meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index 968a280dae823..cf3652fbec60a 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -2,24 +2,16 @@ buildGoModule rec { pname = "ytarchive"; - version = "0.3.2"; + version = "unstable-2023-02-21"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "v${version}"; - hash = "sha256-fBYwLGg1h5pn8ZP5vZmzzIEvuXlBJ27p4tv7UVMwOEw="; + rev = "90aaf17b5e86eec52a95752e3c2dba4f54ee1068"; + hash = "sha256-JRjQRbMqtd04/aO6NkInoDqfOrHnDrXj4C4/URiU6yo="; }; - patches = [ - # Increase the Go version required. See https://github.com/Kethsar/ytarchive/pull/127 - (fetchpatch { - url = "https://github.com/Kethsar/ytarchive/commit/2a995ead4448d03c975378a1932ad975da1a6383.patch"; - sha256 = "sha256-Y+y/Sp/xOS9tBT+LQQ9vE+4n/2RH10umFEEEEVXgtuc="; - }) - ]; - - vendorHash = "sha256-8uTDcu8ucPzck+1dDoySGtc3l1+1USxCfUvdS+ncsnU="; + vendorHash = "sha256-sjwQ/zEYJRkeWUDB7TzV8z+kET8lVRnQkXYbZbcUeHY="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 60fc7c2ac7090..a8a7dfd3ee687 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,14 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC, gengetopt, cmake +{ lib +, stdenv +, fetchurl +, pkg-config +, openssl +, check +, pcsclite +, PCSC +, gengetopt +, cmake , withApplePCSC ? stdenv.isDarwin +, gitUpdater +, testers +, yubico-piv-tool }: stdenv.mkDerivation rec { pname = "yubico-piv-tool"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; - hash = "sha256-oCoS2VRdHvehuZhgbYm3tlWl9aFDdzbPUdsIP4dvVak="; + hash = "sha256-2ona/YthhapjU0Z1P53bKa8pvEq9kt2B832dZWC11k4="; }; postPatch = '' @@ -29,8 +41,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; + passthru = { + updateScript = gitUpdater { + url = "https://github.com/Yubico/yubico-piv-tool.git"; + rev-prefix = "yubico-piv-tool-"; + }; + tests.version = testers.testVersion { + inherit version; + package = yubico-piv-tool; + command = "yubico-piv-tool --version"; + }; + }; + meta = with lib; { homepage = "https://developers.yubico.com/yubico-piv-tool/"; + changelog = "https://developers.yubico.com/yubico-piv-tool/Release_Notes.html"; description = '' Used for interacting with the Privilege and Identification Card (PIV) application on a YubiKey diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 730dfabe00f21..5487d9835cd51 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,14 +3,14 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; src = fetchFromGitHub { repo = "yubikey-manager"; rev = "refs/tags/${version}"; owner = "Yubico"; - sha256 = "sha256-ZQQhRiUsQwLaOY8NCzSc/PTmRewTL0ECBKj7Uj+6Gn8="; + sha256 = "sha256-Dj3ftyFeVgM0YMFI8cbiH5dmc8SKi2SBbScnc0+ad0M="; }; postPatch = '' @@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = - with python3Packages; ([ + with python3Packages; [ click cryptography pyscard @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { six fido2 keyring - ]) ++ [ + ] ++ [ libu2f-host libusb1 yubikey-personalization diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index d246eb29b6144..b132125d928b7 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b16"; + version = "2.0.0b18"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-aGmayZGXmEyVuUKDKrgcYuPKsib/c5ou5CZ+Sag6Evk="; + hash = "sha256-BuubfySQfw4ljWTc1yyW4Zqle0VTimFLQ6enZA3joeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 4f4576dfe297d..439af060fa19d 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tQTa/iIo7kpcQq1p2romoOG2qNOiSDH7DHx3iZYLY8w="; + hash = "sha256-N439ubEayoyfGrzkXE7+TeJQkddy8PZn5Lhmc/X5VxU="; }; - cargoHash = "sha256-naWkSXQHfImd6R+RHKkmTe8UiqxknZEFYoJ0g/URCVY="; + cargoHash = "sha256-cIHz672jd8NKLyLvwsZInLerdA9MXRgWdpJFgMSgs9Q="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index 703af40864ae5..290b37889977c 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -9,7 +9,7 @@ gccStdenv.mkDerivation rec { sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format" "-Wno-error=format-truncation" "-Wno-error=pointer-compare" diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 30367eb14e454..8198b21e9094a 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80="; }; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; postPatch = '' for file in ./examples/*/*.pl; do diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 06b04170a3f3b..a8db0e93d5d3b 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; # Expects pre-GCC5 inline semantics - NIX_CFLAGS_COMPILE = "-std=gnu89"; + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; doCheck = true; diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 6fad1174bbf07..7ff1b06c3b803 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "atinout"; version = "0.9.2-alpha"; - NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; LANG = if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://atinout.sourceforge.net"; + homepage = "https://atinout.sourceforge.net"; description = "Tool for talking to modems"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 5714a75e50e57..6e8c7669f0ddf 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib +, stdenv +, fetchurl +, nixosTests +}: stdenv.mkDerivation rec { pname = "babeld"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-mrWdesdB82MN8j+cO2fGApTYs0q2IjmPm4l3OoeOyx4="; + hash = "sha256-HbIrYZMHDqJFChq1EZb9cvWKEyn3gMsDiOLksud2jLs="; }; - preBuild = '' - makeFlags="PREFIX=$out ETCDIR=$out/etc" - ''; + outputs = [ + "out" + "man" + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "ETCDIR=${placeholder "out"}/etc" + ]; passthru.tests.babeld = nixosTests.babeld; diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 8b8659f28151f..0ec15e9c35c3d 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-0gqd/bEj8ZDpf/3J2iZnGswTO6k8aJOuRiZXMZLm7zo="; + sha256 = "sha256-y1Btpp1xzjAezLaIJBF2+ghMgC/p8mHS/hStGIaKb1o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 12e429b7bcba8..48e64b202c6ef 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # outputs = [ "out" "man" ]; - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; patches = [ ./ubuntu-0.17-9.patch diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 846c966d00c47..5d8ab54b16243 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,38 +1,67 @@ -{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }: - -stdenv.mkDerivation rec { - pname = "burpsuite"; - version = "2021.12"; +{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }: +let + version = "2023.1.2"; src = fetchurl { name = "burpsuite.jar"; urls = [ - "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" - "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-BLX/SgHctXciOZoA6Eh4zuDJoxNSZgvoj2Teg1fV80g="; + sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540"; }; - dontUnpack = true; - dontBuild = true; - installPhase = '' - runHook preInstall + name = "burpsuite-${version}"; + description = "An integrated platform for performing security testing of web applications"; + desktopItem = makeDesktopItem rec { + name = "burpsuite"; + exec = name; + icon = name; + desktopName = "Burp Suite Community Edition"; + comment = description; + categories = [ "Development" "Security" "System" ]; + }; - mkdir -p $out/bin - echo '#!${runtimeShell} - eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)" - mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64" - ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome" - exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite - chmod +x $out/bin/burpsuite +in +buildFHSUserEnv { + inherit name; - runHook postInstall - ''; + runScript = "${jdk}/bin/java -jar ${src}"; - preferLocalBuild = true; + targetPkgs = pkgs: with pkgs; [ + alsa-lib + at-spi2-core + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libudev0-shim + libxkbcommon + mesa.drivers + nspr + nss + pango + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; + + extraInstallCommands = '' + mv "$out/bin/${name}" "$out/bin/burpsuite" # name includes the version number + mkdir -p "$out/share/pixmaps" + ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64community.png > "$out/share/pixmaps/burpsuite.png" + cp -r ${desktopItem}/share/applications $out/share + ''; meta = with lib; { - description = "An integrated platform for performing security testing of web applications"; + inherit description; longDescription = '' Burp Suite is an integrated platform for performing security testing of web applications. Its various tools work seamlessly together to support the entire testing process, from @@ -43,8 +72,8 @@ stdenv.mkDerivation rec { downloadPage = "https://portswigger.net/burp/freedownload"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = jdk11.meta.platforms; - hydraPlatforms = []; + platforms = jdk.meta.platforms; + hydraPlatforms = [ ]; maintainers = with maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index d7dac44b2802c..d14dd66e14078 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -1,24 +1,28 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "chisel"; - version = "1.7.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3EaVUGcwkJWX0FxIaHddUehJIdbxAPfBm8esXKCUuhM="; + rev = "refs/tags/v${version}"; + hash = "sha256-N2voSclNH7lGbUkZo2gkrEb6XoA5f0BzNgAzQs1lOKQ="; }; - vendorSha256 = "sha256-Oko9nduKW76NIUCVyF0lPzEH+TFT1el9VGIbm5lQXtM="; + vendorHash = "sha256-p/5g4DLoUhEPFBtAbMiIgc6O4eAfbiqBjCqYkyUHy70="; - ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/jpillora/chisel/share.BuildVersion=${version}" + ]; - # tests require access to the network + # Tests require access to the network doCheck = false; meta = with lib; { @@ -30,6 +34,7 @@ buildGoModule rec { used to provide a secure endpoint into your network. ''; homepage = "https://github.com/jpillora/chisel"; + changelog = "https://github.com/jpillora/chisel/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d46d8bd2c576d..45e6a33e3c8ed 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -35,14 +35,14 @@ rustPlatform.buildRustPackage rec { libuv ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString ([ "-O2" "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ "-Wno-error=stringop-overread" - ]; + ]); passthru.tests.basic = nixosTests.cjdns; diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/tools/networking/clash-meta/default.nix new file mode 100644 index 0000000000000..e4f2e8399ff5b --- /dev/null +++ b/pkgs/tools/networking/clash-meta/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { + pname = "clash-meta"; + version = "1.14.2"; + + src = fetchFromGitHub { + owner = "MetaCubeX"; + repo = "Clash.Meta"; + rev = "v${version}"; + sha256 = "sha256-sn+0TNXCK4af4zfkf09hLsFkuvkcyjhwh35kKo993FQ="; + }; + + vendorHash = "sha256-3j+5fF57eu7JJd3rnrWYwuWDivycUkUTTzptYaK3G/Q="; + + # Do not build testing suit + excludedPackages = [ "./test" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/Dreamacro/clash/constant.Version=${version}" + ]; + + tags = [ + "with_gvisor" + ]; + + # network required + doCheck = false; + + postInstall = '' + mv $out/bin/clash $out/bin/clash-meta + ''; + + meta = with lib; { + description = "Another Clash Kernel"; + homepage = "https://github.com/MetaCubeX/Clash.Meta"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index e5594d2e0c435..74156366730c7 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SE+nZIatvwyc6JubMb7YUlNiJv+LYtJjFMlKEoJzEn8="; + hash = "sha256-f/iSnSaRr1dqMRKb7GDZdc2WuykO42XMSNKwMOwuagc="; }; - vendorSha256 = "sha256-ikcGZ1Gfxb4zBkav8MDi3+xNbvhqHIk6NhLfI2ne3ns="; + vendorHash = "sha256-fDn6UlijI2TJPF4FS50u1MMDxnd8eDTbqHLnGso/FoU="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 6094177712e55..d09d889c829ae 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -4,27 +4,43 @@ , dpkg , autoPatchelfHook , makeWrapper +, copyDesktopItems +, makeDesktopItem , dbus , nftables }: stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2022.8.936"; + version = "2023.1.133"; src = fetchurl { - url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2022_8_936_1_amd64_1923bb9dba.deb"; - sha256 = "sha256-ZuJyMl6g8KDwxc9UipH63naJ4dl/84Vhk7ini/VNPno="; + url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"; + sha256 = "sha256-Yo1JnbXi9vbYYAkmwk4S7JZZE45SV4p4dB55Rt+w+LA="; }; nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper + copyDesktopItems ]; buildInputs = [ dbus ]; + desktopItems = [ + (makeDesktopItem { + name = "com.cloudflare.WarpCli"; + desktopName = "Cloudflare Zero Trust Team Enrollment"; + categories = [ "Utility" "Security" "ConsoleOnly" ]; + noDisplay = true; + mimeTypes = [ "x-scheme-handler/com.cloudflare.warp" ]; + exec = "warp-cli teams-enroll-token %u"; + startupNotify = false; + terminal = true; + }) + ]; + unpackPhase = '' dpkg-deb -x ${src} ./ ''; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 976708c038cd0..9d638c48000a9 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ dbus ncurses json_c connman ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/networking/connman/connman/default.nix b/pkgs/tools/networking/connman/connman/default.nix index bfe609f852684..da1a6107e463f 100644 --- a/pkgs/tools/networking/connman/connman/default.nix +++ b/pkgs/tools/networking/connman/connman/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ lib +, nixosTests +, stdenv , fetchurl , fetchpatch , pkg-config @@ -170,6 +172,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.connman = nixosTests.connman; + meta = with lib; { description = "A daemon for managing internet connections"; homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 77d8de4294b06..1ff3a511f6928 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.2"; + version = "9.6.3"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MaIvxO2bvLGrZmBLXZk2vgW1NtyoVKRxXEZALEwI/lY="; + sha256 = "sha256-nAziLnuLkkPl1/RskKEehvQBMG4sYTEv+uPOQemum9w="; }; - vendorSha256 = "sha256-X+DxN0DAyZ/z8YRRjuezegcPHa6SJ3/XXPYP+1Apmjw="; + vendorSha256 = "sha256-yZ7S/6I5xdrfmyPkZsUUavXum8RqEVrlgrkJMQZc6IQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/tools/networking/croc/test-local-relay.nix index bdcecb6b54c2a..a3aa0f3c966df 100644 --- a/pkgs/tools/networking/croc/test-local-relay.nix +++ b/pkgs/tools/networking/croc/test-local-relay.nix @@ -2,18 +2,27 @@ stdenv.mkDerivation { name = "croc-test-local-relay"; - meta.timeout = 300; + + nativeBuildInputs = [ croc ]; + buildCommand = '' - HOME=$(mktemp -d) - # start a local relay - ${croc}/bin/croc relay --ports 11111,11112 & - # start sender in background - MSG="See you later, alligator!" - ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & - # wait for things to settle - sleep 1 - MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple) - # compare - [ "$MSG" = "$MSG2" ] && touch $out + HOME=$(mktemp -d) + # start a local relay + croc relay --ports 11111,11112 & + # start sender in background + MSG="See you later, alligator!" + croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & + # wait for things to settle + sleep 1 + MSG2=$(croc --relay localhost:11111 --yes correct-horse-battery-staple) + # compare + [ "$MSG" = "$MSG2" ] && touch $out ''; + + __darwinAllowLocalNetworking = true; + + meta = { + timeout = 300; + broken = stdenv.isDarwin; + }; } diff --git a/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch b/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch new file mode 100644 index 0000000000000..fd22299a7627a --- /dev/null +++ b/pkgs/tools/networking/curl/7.88.0-http2-breakage.patch @@ -0,0 +1,101 @@ +From 3103de2053ca8cacf9cdbe78764ba6814481709f Mon Sep 17 00:00:00 2001 +Date: Wed, 15 Feb 2023 22:11:13 +0100 +Subject: [PATCH] http2: buffer/pausedata and output flush fix. + + * do not process pending input data when copying pausedata to the + caller + * return CURLE_AGAIN if the output buffer could not be completely + written out. + +Ref: #10525 +Closes #10529 +--- + lib/http2.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/lib/http2.c b/lib/http2.c +index 46fc746457726..1ef5d3949218f 100644 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -467,6 +467,7 @@ static CURLcode flush_output(struct Curl_cfilter *cf, + } + if((size_t)written < buflen) { + Curl_dyn_tail(&ctx->outbuf, buflen - (size_t)written); ++ return CURLE_AGAIN; + } + else { + Curl_dyn_reset(&ctx->outbuf); +@@ -1790,6 +1791,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + + stream->pausedata += nread; + stream->pauselen -= nread; ++ drain_this(cf, data); + + if(stream->pauselen == 0) { + DEBUGF(LOG_CF(data, cf, "[h2sid=%u] Unpaused", stream->stream_id)); +@@ -1798,18 +1800,6 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + + stream->pausedata = NULL; + stream->pauselen = 0; +- +- /* When NGHTTP2_ERR_PAUSE is returned from +- data_source_read_callback, we might not process DATA frame +- fully. Calling nghttp2_session_mem_recv() again will +- continue to process DATA frame, but if there is no incoming +- frames, then we have to call it again with 0-length data. +- Without this, on_stream_close callback will not be called, +- and stream could be hanged. */ +- if(h2_process_pending_input(cf, data, err) != 0) { +- nread = -1; +- goto out; +- } + } + DEBUGF(LOG_CF(data, cf, "[h2sid=%u] recv: returns unpaused %zd bytes", + stream->stream_id, nread)); +@@ -1933,6 +1923,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + drained_transfer(cf, data); + } + ++ *err = CURLE_OK; + nread = retlen; + DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_h2_recv -> %zd", + stream->stream_id, nread)); + + +From 87ed650d04dc1a6f7944a5d952f7d5b0934a19ac Mon Sep 17 00:00:00 2001 +From: Harry Sintonen <sintonen@iki.fi> +Date: Thu, 16 Feb 2023 06:26:26 +0200 +Subject: [PATCH] http2: set drain on stream end + +Ensure that on_frame_recv() stream end will trigger a read if there is +pending data. Without this it could happen that the pending data is +never consumed. + +This combined with https://github.com/curl/curl/pull/10529 should fix +https://github.com/curl/curl/issues/10525 + +Ref: https://github.com/curl/curl/issues/10525 +Closes #10530 +--- + lib/http2.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/http2.c b/lib/http2.c +index 1ef5d3949218f..bdb5e7378e9cb 100644 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -868,6 +868,14 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + } ++ if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { ++ /* Stream has ended. If there is pending data, ensure that read ++ will occur to consume it. */ ++ if(!data->state.drain && stream->memlen) { ++ drain_this(cf, data_s); ++ Curl_expire(data, 0, EXPIRE_RUN_NOW); ++ } ++ } + break; + case NGHTTP2_HEADERS: + DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame HEADERS", stream_id)); diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 311e9e1b8c765..21173d4d070b7 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -33,6 +33,7 @@ , phpExtensions , python3 , tests +, testers , fetchpatch }: @@ -47,18 +48,19 @@ assert !(opensslSupport && wolfsslSupport); stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.87.0"; + version = "7.88.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - hash = "sha256-XW4Sh2G3EQlG0Sdq/28PJm8rcm9eYZ9+CgV6R0FV8wc="; + hash = "sha256-yB9DntAkQvapuVg237OpjgxHdhDKey9NWqH8MpVD0z8="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch + ./7.88.0-http2-breakage.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -178,6 +180,7 @@ stdenv.mkDerivation (finalAttrs: { # Additional checking with support http3 protocol. # nginx-http3 = useThisCurl nixosTests.nginx-http3; nginx-http3 = nixosTests.nginx-http3; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }; @@ -189,5 +192,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); + pkgConfigModules = [ "libcurl" ]; }; }) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 9087e1864bf51..68a9a8c19ff28 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -26,7 +26,7 @@ let boolToUpper = b: lib.toUpper (lib.boolToString b); in stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.8.4"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; - sha256 = "sha256-fjC1VB4I0y2/WuA8a8q+rsBjrsEKZkd4eCIie0VBrj4="; + sha256 = "sha256-UZ1W90bobqP9YVvEnlWbUg3wfgUeHKPYwJIGeVjzsrc="; }; preConfigure = '' diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix index 3a19bf627a139..4045748fc4476 100644 --- a/pkgs/tools/networking/dcap/default.nix +++ b/pkgs/tools/networking/dcap/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "dcap"; - version = "2.47.12"; + version = "2.47.14"; src = fetchFromGitHub { owner = "dCache"; repo = "dcap"; rev = version; - sha256 = "sha256-pNLEN1YLQGMJNuv8n6bec3qONbwNOYbYDDvkwuP5AR4="; + sha256 = "sha256-hn4nkFTIbSUUhvf9UfsEqVhphAdNWmATaCrv8jOuC0Y="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 7446403f6b20b..757a7208c4d2c 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; - NIX_CFLAGS_COMPILE = builtins.toString [ + env.NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index b6e5229a2f20a..92254231bf7c0 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ./Port-linux/libLowLevel.a(libLowLevel_a-interface.o):(.bss+0x4): multiple definition of `interface_auto_up'; # ./Port-linux/libLowLevel.a(libLowLevel_a-lowlevel-linux-link-state.o):(.bss+0x74): first defined here - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1" + " -fcommon"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1" + " -fcommon"; meta = with lib; { description = "Portable DHCPv6 implementation"; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index 957cbed63102f..1ff6c33bcc26b 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: resume.o:/build/dirb222/src/variables.h:15: multiple definition of `curl'; # crea_wordlist.o:/build/dirb222/src/variables.h:15: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' mkdir -p $out/share/dirb/ diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index b2cb534de40d9..5457cf4ab53c4 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.2"; + version = "2.1.4"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-vFUbsgLgwQGb/2rValFRuZXguxyAJzOBMLnbVs0swes="; + sha256 = "sha256-98DeCrDp0TmPCSvOrJ7KgIQZBR2K1fFJrmNccZ7nSug="; }; meta = with lib; { diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index 919469065c0b9..f36fa1d2d98f0 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dnsmonster"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "mosajjal"; repo = pname; rev = "v${version}"; - hash = "sha256-fpyx2/2P2tMx/n5pCZkUie3uU9jarRU2QVMBs8jEc6Q="; + hash = "sha256-2k/WyAM8h2P2gCLt2J9m/ZekrzCyf/LULGOQYy5bsZs="; }; - vendorSha256 = "sha256-kZkzTi3i8J6K8x+nSjGeyzEBRPeDEP6qX5KMv/weAXg="; + vendorHash = "sha256-gAjR1MoudBAx1dxGObIVPqJdfehWkKckKtwM7sTP0w4="; buildInputs = [ libpcap diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 0b878a678e654..f4d6dcdb9965c 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-V8wFswGs4p045mOyLA1Zrlz4JtfojHbUir0esS2iUIs="; + sha256 = "sha256-HLh+Z+ik7F52MBqQEMf1PuqTB32JOrpS8sHrqqln5kU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 5fb8fc33997b5..a0ca8453ec929 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "sha256-J4zg5mAZ/xXKxBbEYYZRNjlbyUD/SDD/LSu43FrCbBE="; + sha256 = "sha256-x+ljh96RkmZQBPxUcXwcYQhRQAxMB8YOAsdg3aiht+U="; }; - cargoSha256 = "sha256-N0Rj6n8mQHZR4/4m1FHcqCKDqG7GeVxUs2XN0oxQVqQ="; + cargoHash = "sha256-GPa3gfqY3fiBI75+hLlqnR1+vUUWCxkracOdR6SsJFk="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 8e641ec83e73e..592ec23086577 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -60,8 +60,8 @@ in gcc9Stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook rpcsvc-proto ]; buildInputs = [ glib pcap libtirpc libnsl ]; - NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ldl -ltirpc"; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc"; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; postPatch = '' for patch in debian/patches/*.patch; do patch < $patch diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index 80d68c7ccd7d4..9043c37b2495a 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -4,7 +4,7 @@ , patchelf , fetchFromGitHub , rustPlatform -, makeWrapper +, makeBinaryWrapper , pkg-config , curl , Security @@ -13,22 +13,25 @@ , xz , perl , substituteAll +# for passthru.tests: +, edgedb +, testers }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "2.0.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "v${version}"; - sha256 = "sha256-U+fF0t+dj8wUfCviNu/zcoz3lhMXcQlDgz8B3gB+EJI="; + sha256 = "sha256-iL8tD6cvFVWqsQAk6HBUqdz7MJ3lT2XmExGQvdQdIWs="; }; - cargoSha256 = "sha256-Pm3PBg7sbFwLHaozfsbQbPd4gmcMUHxmGT4AsQRDX0g="; + cargoSha256 = "sha256-dGeRTo6pFwDKd/nTaA3R9DWGiAL0Dm6jEVR1zhF6/BQ="; - nativeBuildInputs = [ makeWrapper pkg-config perl ]; + nativeBuildInputs = [ makeBinaryWrapper pkg-config perl ]; buildInputs = [ curl @@ -46,6 +49,11 @@ rustPlatform.buildRustPackage rec { doCheck = false; + passthru.tests.version = testers.testVersion { + package = edgedb; + command = "edgedb --version"; + }; + meta = with lib; { description = "EdgeDB cli"; homepage = "https://www.edgedb.com/docs/cli/index"; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index d711bc2726d4f..6bf26bfb4d4cb 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,19 +10,26 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; - rev = version; - sha256 = "sha256-NlaQhQtGQzOaTD18NMiicQOrovRuTCUq54vxu34JqIU="; + rev = "refs/tags/${version}"; + hash = "sha256-9mtXtBq08lL6qQg1Pq1WNwbkG0yi99mCpxNuBvr14ms="; }; - cargoSha256 = "sha256-I9OyH02JNdNgGK3918XwS5wt+11VppCTqzo50LuhnvI="; + cargoHash = "sha256-pKNqO43aFXZ/cbjNWt3tmBBbSTSKqVF7biNCPI1flvI="; - nativeBuildInputs = [ installShellFiles perl ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ + installShellFiles + perl + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; postInstall = '' installManPage ${pname}.1 @@ -31,6 +38,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "The fastest and cross-platform subdomain enumerator"; homepage = "https://github.com/Edu4rdSHL/findomain"; + changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Br1ght0ne ]; }; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 4d6c54564bb27..030de9840fe30 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.46.1"; + version = "0.47.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/itziNmIDIuj3sKpB+SEiiwvJqdH5nmTkpFdMSY5L0g="; + sha256 = "sha256-S2qccDzS+Kj1tEAUR4a0G/4Eu3DAF7lY7ffxU6aykVU="; }; - vendorHash = "sha256-dU9rhYgYgP1qTPR3ykUgyg+B1bBVJwizWooyCpdpnm0="; + vendorHash = "sha256-ffkXNE3LkgdCGfO6K9lGxEMxT/9Q1o0m3BMtu6tDHdk="; doCheck = false; diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index 6a8e7abd100eb..2c52f055575a1 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.11"; + version = "6.18.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EJ1lnSeawWezOYZxAHx3QX9kWGoayWZ2vkFY21l+Ijc="; + hash = "sha256-b+zDoiOD80BTP5VDpW/swur8zJOqYEWe05e/ZupZjyk="; }; # needs a Docker setup diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 6558d72ecd93c..5b00de2fda85f 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,22 +1,19 @@ -{ stdenv, lib, fetchFromGitHub -, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +{ stdenv, lib, fetchurl +, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.8"; + version = "1.4.9"; - src = fetchFromGitHub { - owner = "yuezk"; - repo = "GlobalProtect-openconnect"; - fetchSubmodules = true; - rev = "v${version}"; - sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; + src = fetchurl { + url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; + hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ openconnect qtwebsockets qtwebengine ]; + buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; patchPhase = '' substituteInPlace GPService/gpservice.h \ diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 9e27cf7039f4f..b0de8d09c7afa 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM="; + sha256 = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs="; }; vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 0c12652586bec..f36ee2d3e206e 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gost"; - version = "2.11.1"; + version = "2.11.5"; src = fetchFromGitHub { owner = "ginuerzh"; repo = "gost"; rev = "v${version}"; - sha256 = "1mxgjvx99bz34f132827bqk56zgvh5rw3h2xmc524wvx59k9zj2a"; + sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8="; }; - vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh"; + vendorHash = "sha256-lA4uW0cc0XqU9pjVEMapFLb3eD20Lea9PbkgL3sjJns="; postPatch = '' substituteInPlace http2_test.go \ diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix new file mode 100644 index 0000000000000..2a1c3a962a344 --- /dev/null +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, automake, cmake, autoconf, curl, numactl }: + +stdenv.mkDerivation rec { + pname = "grpc_cli"; + version = "1.52.1"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-TE4Q2L4TF0bhgQyPcfgYolb5VXDWjOIyt5mv/HNIfTk="; + fetchSubmodules = true; + }; + nativeBuildInputs = [ automake cmake autoconf ]; + buildInputs = [ curl numactl ]; + cmakeFlags = [ "-DgRPC_BUILD_TESTS=ON" ]; + makeFlags = [ "grpc_cli" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=format-security"; + installPhase = '' + runHook preInstall + + install -Dm555 grpc_cli "$out/bin/grpc_cli" + + runHook postInstall + ''; + meta = with lib; { + description = "The command line tool for interacting with grpc services."; + homepage = "https://github.com/grpc/grpc"; + license = licenses.asl20; + maintainers = with maintainers; [ doriath ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/tools/networking/haguichi/default.nix index 34ba1da28e4a1..deb51191306d3 100644 --- a/pkgs/tools/networking/haguichi/default.nix +++ b/pkgs/tools/networking/haguichi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ztefn"; repo = "haguichi"; rev = version; - sha256 = "1kgjl9g9lyg00cfx4x28s4xyqsqk5057xv6k2cj6ckg9lkxaixvc"; + hash = "sha256-bPeo+qTpTWYkE9PsfgooE2vsO9FIdNIdA+B5ml6i8s0="; }; nativeBuildInputs = [ @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Graphical frontend for Hamachi on Linux"; homepage = "https://haguichi.net/"; diff --git a/pkgs/tools/networking/haguichi/update.sh b/pkgs/tools/networking/haguichi/update.sh new file mode 100755 index 0000000000000..49a76a79d7ae2 --- /dev/null +++ b/pkgs/tools/networking/haguichi/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -euo pipefail + +version="$( + curl -s https://api.github.com/repos/ztefn/haguichi/releases | + jq '.[] | select(.target_commitish!="elementary") | .tag_name' --raw-output | + sort --version-sort --reverse | + head -n1 +)" + +update-source-version haguichi "$version" diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 1453fea66f533..7e9cec19de029 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-Y7xuwDAtDrvh+nacGWBmQN6DSsjLB0R7gHmctWPcDz8="; + sha256 = "sha256-sX5RuWUxhDtKmdLDtiGCgbyYi/Ykyf+Q4Z8MvLol0Gc="; }; buildInputs = [ openssl zlib libxcrypt ] diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index e821163f2298b..936e582a1a4f7 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.6"; + version = "1.3.7"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0NLlBNYTJ+hmQLH/UYwIOIbq3G1sDo/A03xFHsXdzig="; + sha256 = "sha256-XdqQQw87gvWvdx150fQhnCio478PNCQBMw/g/l/T1ZA="; }; makeFlags = [ diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 40851d370c79d..2fe0f15b38525 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,21 +1,30 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "httplab"; version = "0.4.0"; - rev = "v${version}"; - - goPackagePath = "github.com/gchaincl/httplab"; src = fetchFromGitHub { - owner = "gchaincl"; + owner = "qustavo"; repo = "httplab"; - inherit rev; - sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs"; + rev = "v${version}"; + hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA="; }; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch"; + hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/gchaincl/httplab"; + homepage = "https://github.com/qustavo/httplab"; description = "Interactive WebServer"; license = licenses.mit; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 4a56b8b651ebd..5b598bba1d23b 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-CQDyIGUIijNphOVo+aYZ7SqkxE4md9+H3D/g7jdqV+M="; + sha256 = "sha256-sY2bSCcC+mMuYqLmh+oH76nqg/ybh/nyz3trNH2xPQM="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-wNiEULv+0WlZruxibcKqsw4Ym3retwjoGKXxzACcEeA="; + cargoSha256 = "sha256-Zv7TTQw4UcuQBhEdjD5nwcE1LonUHLUFf9BVhRWWuDo="; postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index bd8e6e6d31c75..94365191cdc33 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "HyNetwork"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9ib/29yCfI4oS2yZQUePzZ+5FVTevvJCPjpTXmKnKeA="; + sha256 = "sha256-CQgCFtvQDvhHTk10gpxfAvEJLz/i+CXXyzGrxi26hBk="; }; - vendorSha256 = "sha256-sRPnPKVuvcUHEldKVpgmGFGpwOSK5qh4EfeUQMFdMw8="; + vendorSha256 = "sha256-sN+2XYoC+dDs6QKxwxuBCW4dOf4elSNKdOrbMxjOtSY="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 041fe636bd96d..e26900159047a 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.45.1"; + version = "2.46.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-gyHnLoELjL/IQbtgH2W25xw30l+9akH7jgQfjp4y5sg="; + sha256 = "sha256-9qk3oRNM/xmKQQGIx44R79JYUK/J7rOrR+la+lnu74s="; }; buildInputs = [ boost zlib openssl ] diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 137ce03b2520e..100164ff3db7e 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: tui.o:/build/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; # iftop.o:/build/iftop-1.0pre4/ui_common.h:41: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; passthru.tests = { inherit (nixosTests) iftop; }; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 226cfb9ce8ef5..a684f3a580f56 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = ''sed -i "s,/sbin/route,${nettools}/bin/route," src/tun.c''; - NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\""; + env.NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\""; installFlags = [ "prefix=\${out}" ]; diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix index 0b3c8007af6eb..d2754469fadec 100644 --- a/pkgs/tools/networking/iouyap/default.nix +++ b/pkgs/tools/networking/iouyap/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: netmap.o:(.bss+0x20): multiple definition of `sizecheck'; iouyap.o:(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' install -D -m555 iouyap $out/bin/iouyap; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 7e2eef70b8a2e..fabbbb40e7a70 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libyamlcpp, systemd +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl , libxml2, docbook5 }: @@ -14,13 +14,17 @@ stdenv.mkDerivation rec { sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r"; }; + postPatch = '' + sed '1i#include <array>' -i src/dynports/dynports.cc # gcc12 + ''; + nativeBuildInputs = [ meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout systemd ]; - buildInputs = [ libyamlcpp ]; + buildInputs = [ yaml-cpp ]; doCheck = true; diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 0d6c2f617dd2b..a05372a1577a5 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; - rev = "${pname}-${version}"; - hash = "sha256-oim234254qUWITfgBfB2theMgpVnGHNmrzwE5ULM2M4="; + rev = "refs/tags/${pname}-${version}"; + hash = "sha256-/CW+CmtKc96tVEh5cB6x+/Hb4WnbVi+3AZ0CEao0NE4="; }; vendorSha256 = null; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; + changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 025169a9fd353..9026a60e2f3ac 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Work around error from <stdio.h> on aarch64-darwin: # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] # TODO: this should probably be fixed at a lower level than this? - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-undef-prefix"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix"; meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index f02e3bef9e198..e6df2850a1c9c 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { this is necessary for dsniff to compile; otherwise g_thread_init is a missing symbol when linking (?!?) */ - NIX_CFLAGS_COMPILE="-Dg_thread_init= "; + env.NIX_CFLAGS_COMPILE = "-Dg_thread_init= "; meta = with lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 1618dac132eef..c2a9cf4252450 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.3.3"; + version = "0.4.3"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - sha256 = "sha256-KXyvoHtPC71QkB+X6cRCBxAUcTuy+j8/ZAJe7n6EdGc="; + hash = "sha256-O/qiznQs+x7qBYXVItd0W7a0irEzRf0We7kW7HHLqcw="; }; postConfigure = '' @@ -17,14 +17,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-extldflags '-static'" ]; - vendorSha256 = "sha256-dzHdPgOjYXSozDxehkVNQocsYdH0u0p80c1THUzedk8="; + vendorHash = "sha256-If0K6DmkGk3AmO3eb/ocAl1RJeBN/xgY7dOh9lnVLh8="; doCheck = false; # tests require network access meta = with lib; { homepage = "https://github.com/tnpitsecurity/ligolo-ng"; description = "A tunneling/pivoting tool that uses a TUN interface"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 7c5e09b950ae1..f5fc34487aa1d 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # ld: liblsh.a(unix_user.o):/build/lsh-2.0.4/src/server_userauth.h:108: multiple definition of # `server_userauth_none_preauth'; lshd.o:/build/lsh-2.0.4/src/server_userauth.h:108: first defined here # Should be present in upcoming 2.1 release. - NIX_CFLAGS_COMPILE = "-std=gnu90 -fcommon"; + env.NIX_CFLAGS_COMPILE = "-std=gnu90 -fcommon"; buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam libxcrypt ]; diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index a9f786324d25f..375149655ae68 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lxi-tools"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "lxi-tools"; rev = "v${version}"; - sha256 = "sha256-1CuE/OuClVqw8bG1N8DFNqqQGmXyGyk1LICrcHyuVxw="; + sha256 = "sha256-F9svLaQnQyVyC5KzDnaGwB8J/nBZ3zzOVwYNxWBPifU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 8cca06ca95ff0..a0eebed8e8517 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.10.3"; + version = "0.11.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gnHeG1LaW10HmVF/+0OmOgaMz3X4ub4UpBiFQaGIah0="; + sha256 = "sha256-fOD28O6ycRIniQz841PGJzEFGtYord/y44mdqyAmNDg="; }; - cargoSha256 = "sha256-+hTXkPf4r+PF+k0+miY634sQ9RONHmtyF2hVowl/zuk="; + cargoHash = "sha256-r089P2VOeIIW0FjkO4oqVXbrxDND4loagVfVMm5EtaE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3d15124b7d267..4eb1a47383227 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -23,15 +23,18 @@ , sasl , system-sendmail , libxcrypt + +, pythonSupport ? true +, guileSupport ? true }: stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.14"; + version = "3.15"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-wMWzj+qLRaSvzUNkh/Knb9VSUJLQN4gTputVQsIScTk="; + hash = "sha256-t9DChsNS/MfaeXjP1hfMZnNrIfqJGqT4iFX1FjVPLds="; }; separateDebugInfo = true; @@ -56,16 +59,16 @@ stdenv.mkDerivation rec { gdbm gnutls gss - guile libmysqlclient mailcap ncurses pam - python3 readline sasl libxcrypt - ] ++ lib.optionals stdenv.isLinux [ nettools ]; + ] ++ lib.optionals stdenv.isLinux [ nettools ] + ++ lib.optionals pythonSupport [ python3 ] + ++ lib.optionals guileSupport [ guile ]; patches = [ ./fix-build-mb-len-max.patch @@ -78,7 +81,7 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = false; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; configureFlags = [ @@ -88,33 +91,18 @@ stdenv.mkDerivation rec { "--with-path-sendmail=${system-sendmail}/bin/sendmail" "--with-mail-rc=/etc/mail.rc" "DEFAULT_CUPS_CONFDIR=${mailcap}/etc" # provides mime.types to mimeview - ]; - - readmsg-tests = let - p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; - in [ - (fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; }) - (fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; }) - (fetchurl { url = "${p}/twomsg.at"; sha256 = "15m29rg2xxa17xhx6jp4s2vwa9d4khw8092vpygqbwlhw68alk9g"; }) - (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) - ]; + ] ++ lib.optional (!pythonSupport) "--without-python" + ++ lib.optional (!guileSupport) "--without-guile"; nativeCheckInputs = [ dejagnu ]; - doCheck = false; # fails 1 out of a bunch of tests, looks like a bug + doCheck = !stdenv.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. doInstallCheck = false; # fails preCheck = '' - # Add missing test files - cp ${builtins.toString readmsg-tests} readmsg/tests/ - for f in hdr.at nohdr.at twomsg.at weed.at; do - mv readmsg/tests/*-$f readmsg/tests/$f - done # Disable comsat tests that fail without tty in the sandbox. tty -s || echo > comsat/tests/testsuite.at - # Disable lmtp tests that require root spool. - echo > maidag/tests/lmtp.at - # Disable mda tests that require /etc/passwd to contain root. - grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at + # Remove broken macro + sed -i '/AT_TESTED/d' libmu_scm/tests/testsuite.at # Provide libraries for mhn. export LD_LIBRARY_PATH=$(pwd)/lib/.libs ''; @@ -141,9 +129,8 @@ stdenv.mkDerivation rec { Scheme. The utilities provided by Mailutils include imap4d and pop3d mail - servers, mail reporting utility comsatd, general-purpose mail delivery - agent maidag, mail filtering program sieve, and an implementation of MH - message handling system. + servers, mail reporting utility comsatd, mail filtering program sieve, + and an implementation of MH message handling system. ''; license = with licenses; [ @@ -154,6 +141,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej vrthra ]; homepage = "https://www.gnu.org/software/mailutils/"; + changelog = "https://git.savannah.gnu.org/cgit/mailutils.git/tree/NEWS"; # Some of the dependencies fail to build on {cyg,dar}win. platforms = platforms.gnu ++ platforms.unix; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 4f312d0e6ad0a..5eb8ffa3e8303 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-01-11T03-14-16Z"; + version = "2023-02-16T19-20-11Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-wxI4m4RAvi2YCx+RWO9HQyn927O3PUJ/A9i/5IOtbZ8="; + sha256 = "sha256-UL49sZ8dBiXexmWt8rAUn2b2d58KJ8/5FyoojO7Y/68="; }; - vendorHash = "sha256-Exhw9H+qayQnpT4qCaeOsmbTCmCy80UKk8ZxDuOOHcA="; + vendorHash = "sha256-CdMpzYmJxOu4HvsQMJDZxRr7MWB4xN6ivEWldIptVnU="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index 120d1f19be2ab..43891d612bb1a 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "unstable-2019-07-15"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git"; rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; }; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 01c70f3bf3f58..752cd74d77ab7 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,38 +1,84 @@ -{ lib, stdenv, fetchurl -, glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3 -, libmbim, libqmi, systemd, vala, gobject-introspection, dbus +{ lib +, stdenv +, fetchFromGitLab +, glib +, udev +, libgudev +, polkit +, ppp +, gettext +, pkg-config +, libxslt +, python3 +, libmbim +, libqmi +, systemd +, bash-completion +, meson +, ninja +, vala +, gobject-introspection +, dbus }: stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.12"; + version = "1.20.4"; - src = fetchurl { - url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-tGTkkl2VWmyobdCGFudjsmrkbX/Tfb4oFnjjQGWx5DA="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "ModemManager"; + rev = version; + hash = "sha256-OWP23EQ7a8rghhV7AC9yinCxRI0xwcntB5dl9XtgK6M="; }; - nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; + patches = [ + # Since /etc is the domain of NixOS, not Nix, we cannot install files there. + # But these are just placeholders so we do not need to install them at all. + ./no-dummy-dirs-in-sysconfdir.patch + ]; - buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; + nativeBuildInputs = [ + meson + ninja + vala + gobject-introspection + gettext + pkg-config + libxslt + ]; + + buildInputs = [ + glib + udev + libgudev + polkit + ppp + libmbim + libqmi + systemd + bash-completion + dbus + ]; nativeInstallCheckInputs = [ - python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 + python3 + python3.pkgs.dbus-python + python3.pkgs.pygobject3 ]; - configureFlags = [ - "--with-polkit" - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" - "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + mesonFlags = [ + "-Dudevdir=${placeholder "out"}/lib/udev" + "-Ddbus_policy_dir=${placeholder "out"}/share/dbus-1/system.d" "--sysconfdir=/etc" "--localstatedir=/var" - "--with-systemd-suspend-resume" - "--with-systemd-journal" + "-Dvapi=true" ]; postPatch = '' - patchShebangs tools/test-modemmanager-service.py + patchShebangs \ + tools/test-modemmanager-service.py ''; # In Nixpkgs g-ir-scanner is patched to produce absolute paths, and @@ -47,8 +93,6 @@ stdenv.mkDerivation rec { ''; installCheckTarget = "check"; - enableParallelBuilding = true; - meta = with lib; { description = "WWAN modem manager, part of NetworkManager"; homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/"; diff --git a/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch b/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch new file mode 100644 index 0000000000000..d293efa7b2456 --- /dev/null +++ b/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch @@ -0,0 +1,20 @@ +diff --git a/data/dispatcher-connection/meson.build b/data/dispatcher-connection/meson.build +index 2e7ef8b4..e0f4aa66 100644 +--- a/data/dispatcher-connection/meson.build ++++ b/data/dispatcher-connection/meson.build +@@ -21,5 +21,4 @@ install_data( + ) + + mkdir_cmd = 'mkdir -p ${DESTDIR}@0@' +-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_connectiondiruser)) + meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_connectiondirpackage)) +diff --git a/data/dispatcher-fcc-unlock/meson.build b/data/dispatcher-fcc-unlock/meson.build +index 5dc3b6a0..25a948a1 100644 +--- a/data/dispatcher-fcc-unlock/meson.build ++++ b/data/dispatcher-fcc-unlock/meson.build +@@ -39,5 +39,4 @@ foreach output, input: vidpids + endforeach + + mkdir_cmd = 'mkdir -p ${DESTDIR}@0@' +-meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdiruser)) + meson.add_install_script('sh', '-c', mkdir_cmd.format(mm_prefix / mm_fccunlockdirpackage)) diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/tools/networking/moodle-dl/default.nix index 95140467f7a2c..b4f3dfa0aaa6b 100644 --- a/pkgs/tools/networking/moodle-dl/default.nix +++ b/pkgs/tools/networking/moodle-dl/default.nix @@ -2,29 +2,26 @@ python3Packages.buildPythonApplication rec { pname = "moodle-dl"; - version = "2.1.2.5"; + version = "2.2.2.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1gc4037dwyi48h4vi0bam23rr7pfyn6jrz334radz0r6rk94y8lz"; + hash = "sha256-76JU/uYJH7nVWCR+d8vvjYCCSMfe/8R9l756AmzZPHU="; }; - # nixpkgs (and the GitHub upstream for readchar) are missing 2.0.1 - postPatch = '' - substituteInPlace setup.py --replace 'readchar>=2.0.1' 'readchar>=2.0.0' - ''; - propagatedBuildInputs = with python3Packages; [ sentry-sdk colorama - readchar - youtube-dl + yt-dlp certifi html2text requests - slixmpp + aioxmpp ]; + # upstream has no tests + doCheck = false; + meta = with lib; { homepage = "https://github.com/C0D3D3V/Moodle-Downloader-2"; maintainers = [ maintainers.kmein ]; diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index dcedbb1409c5c..2702c740dda2c 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -1,9 +1,9 @@ { buildGoModule , cmake , fetchFromGitHub -, fetchpatch , go , lib +, libsecret , pkg-config , polkit , python3 @@ -15,28 +15,20 @@ , qtwebsockets , rustPlatform , stdenv -, which , wireguard-tools , wrapQtAppsHook }: let pname = "mozillavpn"; - version = "2.12.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-T8dPM90X4soVG/plKsf7DM9XgdX5Vcp0i6zTE60gbq0="; + hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk="; }; - patches = [ - # vpnglean: Add Cargo.lock file - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/5236/commits/6fdc689001619a06b752fa629647642ea66f4e26.patch"; - hash = "sha256-j666Z31D29WIL3EXbek2aLzA4Fui/9VZvupubMDG24Q="; - }) - ]; netfilter-go-modules = (buildGoModule { inherit pname version src; @@ -48,26 +40,27 @@ let inherit src; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-/DmKSV0IKxZV0Drh6dTsiqgZhuxt6CoegXpYdqN4UzQ="; + hash = "sha256-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-6qyMARhPPgTryEtaBNrIPN9ja/fe7Fyx38iGuTd+Dk8="; + hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0="; }; vpngleanDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}-vpnglean"; preBuild = "cd vpnglean"; - hash = "sha256-8OLTQmRvy6pATEBX2za6f9vMEqwkf9L5VyERtAN2BDQ="; + hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI="; }; in stdenv.mkDerivation { - inherit pname version src patches; + inherit pname version src; buildInputs = [ + libsecret polkit qt5compat qtbase @@ -81,13 +74,11 @@ stdenv.mkDerivation { pkg-config python3 python3.pkgs.glean-parser - python3.pkgs.lxml python3.pkgs.pyyaml python3.pkgs.setuptools rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - which wrapQtAppsHook ]; @@ -110,15 +101,13 @@ stdenv.mkDerivation { dontCargoSetupPostUnpack = true; postPatch = '' - for file in linux/*.service linux/extra/*.desktop src/platforms/linux/daemon/*.service; do - substituteInPlace "$file" --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" - done + substituteInPlace src/apps/vpn/platforms/linux/daemon/org.mozilla.vpn.dbus.service --replace /usr/bin/mozillavpn "$out/bin/mozillavpn" substituteInPlace scripts/addon/build.py \ --replace 'qtbinpath = args.qtpath' 'qtbinpath = "${qttools.dev}/bin"' \ --replace 'rcc = os.path.join(qtbinpath, rcc_bin)' 'rcc = "${qtbase.dev}/libexec/rcc"' - substituteInPlace src/cmake/linux.cmake \ + substituteInPlace src/apps/vpn/cmake/linux.cmake \ --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ --replace '${"$"}{POLKIT_POLICY_DIR}' "$out/share/polkit-1/actions" \ --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index f8d615b525ef3..d0e59e1fd8384 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -2,23 +2,27 @@ , lib , stdenv , fetchFromGitHub +, CoreServices , Security }: rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - hash = "sha256-vC8HmwJCHMKQUsYBwRmr88tmZxPKNvI6hxlcjG2AV3Q="; + hash = "sha256-2i8C1XgfI3MXnwXZzY6n8tIcw45G9h3vZqRlFaVoLH0="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + Security + ]; - cargoHash = "sha256-9qXoMugmL6B9vC/yrMJxZ5p792ZJmrTzk/khRVTkHf4="; + cargoHash = "sha256-YXVH7kx5CiurTeXiphjDgcYxxovKtTF3Q9y/XOyVPUA="; meta = with lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/pkgs/tools/networking/mqtt-benchmark/default.nix b/pkgs/tools/networking/mqtt-benchmark/default.nix new file mode 100644 index 0000000000000..a2ab1b61520e8 --- /dev/null +++ b/pkgs/tools/networking/mqtt-benchmark/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mqtt-benchmark"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "krylovsk"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-gejLDtJ1geO4eDBapHjXgpc+M2TRGKcv5YzybmIyQSs="; + }; + + vendorHash = "sha256-ZN5tNDIisbhMMOA2bVJnE96GPdZ54HXTneFQewwJmHI="; + + meta = with lib; { + description = "MQTT broker benchmarking tool"; + homepage = "https://github.com/krylovsk/mqtt-benchmark"; + changelog = "https://github.com/krylovsk/mqtt-benchmark/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 8c09f1e430f69..9d2286e2271f1 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.13"; + version = "1.8.14"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-uXrJOBF3X8UF1ktTfAoYgzc0QBLvyzzGQVJVfs8tjng="; + hash = "sha256-m6if0Br9WRPR8POwOM0Iwido3UR/V0BlkuaLcWsf/c0="; }; postPatch = '' diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index c35cf14717c02..e3d51912c702e 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.12.0-dev"; + version = "0.13.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-NBZmu0VcVUhJSdM3fzZ+4Q5oX8uxO6GLpEUq74x8HUU="; + hash = "sha256-EIglOoHL1ZmkFUn2MTU+ISQmaX96kCxelwk5ylHlMHk="; }; - vendorHash = "sha256-1JxyP6CrJ4/g7o3eGeN1kRXJU/jNLEB8fW1bjJytQqQ="; + vendorHash = "sha256-1RJAmz3Tw6c2Y7lXlXvq/aEkVLO+smkwuNJbi7aBUNo="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix new file mode 100644 index 0000000000000..71c32ae7ad7d9 --- /dev/null +++ b/pkgs/tools/networking/muffet/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "muffet"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "raviqqe"; + repo = "muffet"; + rev = "v${version}"; + hash = "sha256-Kk0HRs4mzpEI9URFIegAVWejBZLGWW08vdsjw9ZHLxU="; + }; + + vendorHash = "sha256-auTDSL3J+LuW6M5LRAWJCvL1xAiyqluPt6EQpFztYpA="; + + meta = with lib; { + description = "A website link checker which scrapes and inspects all pages in a website recursively"; + homepage = "https://github.com/raviqqe/muffet"; + changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/networking/n2n/default.nix b/pkgs/tools/networking/n2n/default.nix index 77c7d4161d1f7..08028910f82af 100644 --- a/pkgs/tools/networking/n2n/default.nix +++ b/pkgs/tools/networking/n2n/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Peer-to-peer VPN"; homepage = "https://www.ntop.org/products/n2n/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 8156caad7c3df..02dd29c0fda58 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: bookmark.o: (.bss+0x20): multiple definition of `gBm'; # gpshare.o:(.bss+0x0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' find -name Makefile.in | xargs sed -i '/^TMPDIR=/d' diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 05804ab29c000..425ddb4404357 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -12,25 +12,25 @@ stdenv.mkDerivation rec { pname = "ndn-tools"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = pname; rev = "ndn-tools-${version}"; - sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA="; + sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8="; }; nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; - doCheck = false; + doCheck = false; # some tests fail because of the sandbox environment checkPhase = '' runHook preCheck build/unit-tests diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 521c8ff2f20c2..6f4483cd7283c 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nebula"; @@ -17,6 +17,10 @@ buildGoModule rec { ldflags = [ "-X main.Build=${version}" ]; + passthru.tests = { + inherit (nixosTests) nebula; + }; + meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index bac09558e7fbb..46037d2c4fdc4 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -3,23 +3,24 @@ , fetchFromGitHub , installShellFiles , mandown +, protobuf , nixosTests }: rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nG+HTwF3v8FUK2SE+I312Ec5y6YPShS9si9Pc2SG1jc="; + hash = "sha256-EuhnI7N8Ry6qV4q3QxdHdTuJ7F4gIA3a9NZnb33KWZ8="; }; - cargoHash = "sha256-szIG1udBCZj18sN3IiQtOuR8qw/xWhTMgb/n4lyTwvs="; + cargoHash = "sha256-2FEtYnIRg4s92K8Kr123tuZqUsGOauel2JdeSF0bFGo="; - nativeBuildInputs = [ installShellFiles mandown ]; + nativeBuildInputs = [ installShellFiles mandown protobuf ]; postBuild = '' make -C docs netavark.1 diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c1becc886a59e..3549d8f26f43f 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ajfNHkdYNJCuDhFmww1X0d9F0dmo2/h0GlfLYWvTHKc="; + sha256 = "sha256-H4jqpy1ELRfTUhLO8Ylv6a/uKkvapdVhIGM0e3WPdlo="; }; - vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q="; + vendorHash = "sha256-2/kk4qTO85fYnNO5vXIFxxFR55xZ5wenogJTMsLfYsg="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/networkd-dispatcher/default.nix b/pkgs/tools/networking/networkd-dispatcher/default.nix new file mode 100644 index 0000000000000..b8812cb678deb --- /dev/null +++ b/pkgs/tools/networking/networkd-dispatcher/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitLab +, python3Packages +, asciidoc +, makeWrapper +, iw +}: + +stdenv.mkDerivation rec { + pname = "networkd-dispatcher"; + version = "2.2.4"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "craftyguy"; + repo = pname; + rev = version; + hash = "sha256-yO9/HlUkaQmW/n9N3vboHw//YMzBjxIHA2zAxgZNEv0="; + }; + + postPatch = '' + # Fix paths in systemd unit file + substituteInPlace networkd-dispatcher.service \ + --replace "/usr/bin/networkd-dispatcher" "$out/bin/networkd-dispatcher" \ + --replace "/etc/conf.d" "$out/etc/conf.d" + # Remove conditions on existing rules path + sed -i '/ConditionPathExistsGlob/g' networkd-dispatcher.service + ''; + + nativeBuildInputs = [ + asciidoc + makeWrapper + python3Packages.wrapPython + ]; + + checkInputs = with python3Packages; [ + dbus-python + iw + mock + pygobject3 + pytestCheckHook + ]; + + pythonPath = with python3Packages; [ + configparser + dbus-python + pygobject3 + ]; + + installPhase = '' + runHook preInstall + install -D -m755 -t $out/bin networkd-dispatcher + install -Dm644 networkd-dispatcher.service $out/lib/systemd/system/networkd-dispatcher.service + install -Dm644 networkd-dispatcher.conf $out/etc/conf.d/networkd-dispatcher.conf + install -D networkd-dispatcher.8 -t $out/share/man/man8/ + runHook postInstall + ''; + + doCheck = true; + + postFixup = '' + wrapPythonPrograms + wrapProgram $out/bin/networkd-dispatcher --prefix PATH : ${lib.makeBinPath [ iw ]} + ''; + + meta = with lib; { + description = "Dispatcher service for systemd-networkd connection status changes"; + homepage = "https://gitlab.com/craftyguy/networkd-dispatcher"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 03c205f2d647e..5cd15525da72e 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -58,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.40.6"; + version = "1.40.12"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-LwJbLVr33lk7v0fBfk2YorlgjqkKgmD7CAgL6XQ5U04="; + sha256 = "sha256-wCJ+BKttAylmLfoKftxGbgQGJek2odjo4CoFM6cRca8="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index f7e98b2b92fd3..1ade86eb5d084 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; version = "1.4.0"; - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 8c8d0dd6a3223..aff411ea0ed9b 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -5,7 +5,7 @@ let pname = "NetworkManager-iodine"; version = "unstable-2019-11-05"; in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool autoreconfHook pkg-config ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = "intltoolize"; configureFlags = [ diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index 11a414a8a6a02..cef05f1161062 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -20,7 +20,7 @@ }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; version = "1.20.4"; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index af4c18e1ce3a7..8f3ed67abcfba 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -23,25 +23,24 @@ , glib , substituteAll , lib +, _experimental-update-script-combinators +, makeHardcodeGsettingsPatch }: stdenv.mkDerivation rec { pname = "libnma"; - version = "1.10.4"; + version = "1.10.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "eecw3aGfmzSIb0BkqhcPGiMmsIMp1lXYC2fpBsf3i3w="; + sha256 = "U6b7KxkK03xZhsrtPpi+3nw8YCOZ7k+TyPwFQwPXbas="; }; patches = [ # Needed for wingpanel-indicator-network and switchboard-plug-network ./hardcode-gsettings.patch - # Removing path from eap schema to fix bug when creating new VPN connection - # https://gitlab.gnome.org/GNOME/libnma/-/issues/18 - ./remove-path-from-eap.patch ]; nativeBuildInputs = [ @@ -86,10 +85,24 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; + hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { + schemaIdToVariableMapping = { + "org.gnome.nm-applet.eap" = "NM_APPLET_GSETTINGS"; + }; + inherit src; }; + updateScript = + let + updateSource = gnome.updateScript { + packageName = "libnma"; + versionPolicy = "odd-unstable"; + }; + updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "libnma.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateGsettingsPatch + ]; }; meta = with lib; { diff --git a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch index 9b2f5366950cb..a68f96113d34a 100644 --- a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch +++ b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch @@ -1,26 +1,24 @@ +diff --git a/src/nma-ws/nma-eap.c b/src/nma-ws/nma-eap.c +index fa36907..81df821 100644 --- a/src/nma-ws/nma-eap.c +++ b/src/nma-ws/nma-eap.c -@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection) - static GSettings * - _get_ca_ignore_settings (NMConnection *connection) - { -+ g_autoptr (GSettingsSchemaSource) *schema_source; -+ g_autoptr (GSettingsSchema) *schema; - GSettings *settings; - char *path = NULL; - const char *uuid; - - g_return_val_if_fail (connection, NULL); - -+ schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL); -+ schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE); -+ - uuid = nm_connection_get_uuid (connection); +@@ -252,7 +252,18 @@ _get_ca_ignore_settings (NMConnection *connection) g_return_val_if_fail (uuid && *uuid, NULL); - + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); - settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); -+ settings = g_settings_new_full (schema, NULL, path); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@NM_APPLET_GSETTINGS@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.nm-applet.eap", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, path); ++ } g_free (path); - + return settings; diff --git a/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch b/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch deleted file mode 100644 index fe00ff9d9a9be..0000000000000 --- a/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Wed, 9 Nov 2022 08:00:19 +0000 -Subject: [PATCH] gschema: Remove path from eap schema - -This one needs to be relocatable, otherwise creating a new VPN -connection will fail with: - - settings object created with schema 'org.gnome.nm-applet.eap' - and path '/org/gnome/nm-applet/eap/<uuid>/', - but path '/org/gnome/nm-applet/eap/' is specified by schema - -Fixes: https://bugs.archlinux.org/task/76490 ---- - org.gnome.nm-applet.eap.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in -index 0fc3ca9f..f4a56ea6 100644 ---- a/org.gnome.nm-applet.eap.gschema.xml.in -+++ b/org.gnome.nm-applet.eap.gschema.xml.in -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <schemalist> -- <schema id="org.gnome.nm-applet.eap" path="/org/gnome/nm-applet/eap/" gettext-domain="nm-applet"> -+ <schema id="org.gnome.nm-applet.eap" gettext-domain="nm-applet"> - <key name="ignore-ca-cert" type="b"> - <default>false</default> - <summary>Ignore CA certificate</summary> --- -GitLab - diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 6b05dcdcd854a..3e4fbb36513ba 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; version = "1.3.1"; - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 7e2b938e4c8b8..297ada3cc2aad 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # To build with GCC 8+ it needs: CXXFLAGS = "-Wno-class-memaccess -Wno-ignored-qualifiers"; # CMake can't find json_c without: - NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" "-Wno-error=address-of-packed-member" "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" "-Wno-error=address-of-packed-member" "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; doCheck = false; # requires network access diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 3733998c10b16..2b8b09d174c6b 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ="; }; diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index e81eb7b0a448d..35bef11e64415 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -1,27 +1,34 @@ -{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, pkg-config +, openssl +, darwin +}: rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-NSre4OHzREVM8y9njMkS/whQ0+Ed+R+cLYfRWKmhA98="; + sha256 = "sha256-lk4CePSvJb8W/3TAWyRhMcUUi7ZRdIs097Ny0ipXIuc="; }; - cargoSha256 = "sha256-GPP2eespnxDQoKZkqoPXEthRKk84szFl0LNTeqJQLNs="; + cargoSha256 = "sha256-cBtK/38b+W4GKiH+u9ouT52tapGUcPsHfC4DlNDHyjg="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; - buildInputs = lib.optional stdenv.isLinux openssl - ++ lib.optional stdenv.isDarwin Security; - - # remove cargo config so it can find the linker - postPatch = '' - rm .cargo/config.toml - ''; + buildInputs = lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # tests don't work inside the sandbox doCheck = false; diff --git a/pkgs/tools/networking/oonf-olsrd2/default.nix b/pkgs/tools/networking/oonf-olsrd2/default.nix index e86bfbd1961a5..bc7cbe8d491da 100644 --- a/pkgs/tools/networking/oonf-olsrd2/default.nix +++ b/pkgs/tools/networking/oonf-olsrd2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # ld: CMakeFiles/oonf_dlep_proxy.dir/router/dlep_router_session.c.o:(.bss+0x0): # multiple definition of `LOG_DLEP_ROUTER'; CMakeFiles/oonf_dlep_proxy.dir/router/dlep_router.c.o:(.bss+0x0): first defined here # Can be removed once release with https://github.com/OLSR/OONF/pull/40 is out. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; cmakeFlags = [ "-DOONF_NO_WERROR=yes" diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index a8f2d3df42304..307fdbebd1586 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.16.7"; + version = "3.17.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-GebDgdz45INM1Sf7T0qDjFeBqRftMHjGLIAWTM/1REY="; + hash = "sha256-xOWGRDK9HyKU/WrLSLgmKpF82UTxxgIMOL1zCQDjtpU="; }; - vendorHash = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E="; + vendorHash = "sha256-r8kyL9gpdDesY8Mbm4lONAhWC4We26Z9uG7QMt1JT9c="; subPackages = [ "cmd/ooniprobe" ]; meta = with lib; { + changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}"; description = "The Open Observatory of Network Interference command line network probe"; homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 339b2aecbaa58..70496caf992cd 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.2.1"; + version = "6.4.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-8shgDywj7hEj7r9H7w9A2zhmJ+dbA0DKFhgsEPQXT6k="; + sha256 = "sha256-Na6tMA4MlGn72dMM9G9BU4l9yygpEgkcpOySEtzp0VE="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 555fd43035e68..e35c8d71cce9d 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -15,6 +15,8 @@ , zlib , vpnc-scripts , PCSC +, useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile +, xdg-utils , autoreconfHook }: @@ -32,7 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux p11-kit; + ++ lib.optional stdenv.isLinux p11-kit + ++ lib.optional useDefaultExternalBrowser xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index e0e0b6078f730..1ea893948dc5e 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -26,6 +26,3 @@ in rec { useOpenSSL = true; }; } - - - diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f9ad037d55dae..13e41d0e6fd05 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "9.1p1"; + version = "9.2p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.1p1"; + version = "9.2p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ @@ -32,10 +32,19 @@ in # HPN Patch from FreeBSD ports (fetchpatch { - name = "ssh-hpn.patch"; - url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ae66cffc19f357cbd51d5841c9b110a9ffd63e32/security/openssh-portable/files/extra-patch-hpn"; + name = "ssh-hpn-wo-channels.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn"; stripLen = 1; - sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; + excludes = [ "channels.c" ]; + sha256 = "sha256-kSj0oE7gNHfIciy0/ErhdfrbmfjQmd8hduyiRXFnVZA="; + }) + + (fetchpatch { + name = "ssh-hpn-channels.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn"; + extraPrefix = ""; + includes = [ "channels.c" ]; + sha256 = "sha256-pDLUbjv5XIyByEbiRAXC3WMUPKmn15af1stVmcvr7fE="; }) ]; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 65e20ca67774d..0ef5076eaf99b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -5,7 +5,6 @@ , iproute2 , lzo , openssl -, openssl_1_1 , pam , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd @@ -74,12 +73,6 @@ let in { - openvpn_24 = generic { - version = "2.4.12"; - sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; - extraBuildInputs = [ openssl_1_1 ]; - }; - openvpn = generic { version = "2.5.8"; sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"; diff --git a/pkgs/tools/networking/openvpn3/default.nix b/pkgs/tools/networking/openvpn3/default.nix index 62935600d083e..32de1a28b63b7 100644 --- a/pkgs/tools/networking/openvpn3/default.nix +++ b/pkgs/tools/networking/openvpn3/default.nix @@ -23,20 +23,20 @@ let openvpn3-core = fetchFromGitHub { owner = "OpenVPN"; repo = "openvpn3"; - rev = "c4fa5a69c5d2e4ba4a86e79da8de0fc95f95edc3"; - sha256 = "sha256-VhQkx35JKNqXKgg4i+/aJYIg3iXPGlC57wDrjDpvTyE="; + rev = "7590cb109349809b948e8edaeecabdbfe24e4b17"; + hash = "sha256-S9D/FQa7HYj0FJnyb5dCrtgTH9Nf2nvtyp/VHiebq7I="; }; in stdenv.mkDerivation rec { pname = "openvpn3"; # also update openvpn3-core - version = "18_beta"; + version = "19_beta"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "openvpn3-linux"; rev = "v${version}"; - sha256 = "sha256-4TKRnHjEm6QRE2artAa0t1VC+0XPgz3VpCfQS8tnrFQ="; + hash = "sha256-5dhxJBJMtNvxLZdcvJSOIDdLVBu3i9ak4A+hz5YsIds="; }; postPatch = '' diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index b06e4558fbbf1..139078f2f6fce 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export sourceRoot=$(realpath */gtests/net/packetdrill) ''; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=unused-result" "-Wno-error=stringop-truncation" "-Wno-error=address-of-packed-member" diff --git a/pkgs/tools/networking/phodav/2.0.nix b/pkgs/tools/networking/phodav/2.0.nix deleted file mode 100644 index fa809d0595918..0000000000000 --- a/pkgs/tools/networking/phodav/2.0.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, pkg-config -, libsoup -, meson -, ninja -}: - -stdenv.mkDerivation rec { - pname = "phodav"; - version = "2.5"; - - outputs = [ "out" "dev" "lib" ]; - - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; - }; - - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; - sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; - sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; - }) - ]; - - mesonFlags = [ - "-Davahi=disabled" - "-Dsystemd=disabled" - "-Dgtk_doc=disabled" - "-Dudev=disabled" - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; - - nativeBuildInputs = [ - pkg-config - meson - ninja - ]; - - buildInputs = [ - libsoup - ]; - - meta = with lib; { - description = "WebDav server implementation and library using libsoup 2"; - homepage = "https://wiki.gnome.org/phodav"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix index 87b20daf97953..ca33e4862478c 100644 --- a/pkgs/tools/networking/pingu/default.nix +++ b/pkgs/tools/networking/pingu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pingu"; - version = "0.0.3"; + version = "0.0.5"; src = fetchFromGitHub { owner = "sheepla"; repo = "pingu"; rev = "v${version}"; - sha256 = "sha256-KYCG3L5x0ZdcyseffB0GoKpLZ/VG/qjMDh10qrLn62Y="; + sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE="; }; - vendorSha256 = "sha256-HkESF/aADGPixOeh+osFnjzhpz+/4NIsJOjpyyFF9Eg="; + vendorHash = "sha256-xn6la6E0C5QASXxNee1Py/rBs4ls9X/ePeg4Q1e2UyU="; meta = with lib; { description = "Ping command implementation in Go but with colorful output and pingu ascii art"; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index be50397bf1d0a..eee0dfd030680 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -7,6 +7,7 @@ , openssl , bash , nixosTests +, writeTextDir }: stdenv.mkDerivation rec { @@ -38,6 +39,17 @@ stdenv.mkDerivation rec { bash ]; + # This can be removed when ppp 2.5.0 is released: + # https://github.com/ppp-project/ppp/commit/509f04959ad891d7f981f035ed461d51bd1f74b0 + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isMusl (writeTextDir "include/net/ppp_defs.h" '' + #ifndef _NET_PPP_DEFS_H + #define _NET_PPP_DEFS_H 1 + + #include <linux/ppp_defs.h> + + #endif /* net/ppp_defs.h */ + ''); + postPatch = '' for file in $(find -name Makefile.linux); do substituteInPlace "$file" --replace '-m 4550' '-m 550' @@ -53,6 +65,14 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lcrypt"; + # This can probably be removed if version > 2.4.9, as IPX support + # has been removed upstream[1]. Just check whether pkgsMusl.ppp + # still builds. + # + # [1]: https://github.com/ppp-project/ppp/commit/c2881a6b71a36d28a89166e82820dc5e711fd775 + env.NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.hostPlatform.isMusl "-UIPX_CHANGE"; + installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 09cca7d2eef22..a5ecaa79e9054 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3373.6"; + version = "1.3.3430.77"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-Ttg6SNDcNIQlbNnKQY32hmsrgLhzHkeQfwlmCHe0bI0="; + sha256 = "sha256-tB6BAtLIlsU7mQmJ/Ec94X2r0mmGJlefc2NkyDhQ2Ek="; }; modRoot = "cli"; - vendorSha256 = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; + vendorHash = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 5cfb6f88f0d46..56778defe335a 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Proxifier for SOCKS proxies"; - homepage = "http://proxychains.sourceforge.net"; + homepage = "https://proxychains.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix index 9ad1d2bd77b0b..e67a17cea8633 100644 --- a/pkgs/tools/networking/q/default.nix +++ b/pkgs/tools/networking/q/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "q"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "natesales"; repo = "q"; rev = "v${version}"; - sha256 = "sha256-M2TgDha+F4hY7f9sabzZEdsxdp8rdXDZB4ktmpDF5D8="; + sha256 = "sha256-WPVHMAau3+0jcIrRhRL5dy6h+J13LKj5GwQMJi7hGvo="; }; - vendorHash = "sha256-216NwRlU7mmr+ebiBwq9DVtFb2SpPgkGUrVZMUAY9rI="; + vendorHash = "sha256-0Yd8y1SkxmfIFZuSheMGQnurlFv3sxkSDgGrQJLR3iU="; doCheck = false; # tries to resolve DNS diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 7f15ef91e1be8..6202a0a614dc9 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "radsecproxy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-gSXjwQ9zJPVNzGqLsZzTEQ0OxbQUiUJYGxrEm56DZDE="; + sha256 = "sha256-/ldW2JQd8GuG0uspfa56vtzPg4ucj+HCL8gbo9oLReM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/rathole/default.nix b/pkgs/tools/networking/rathole/default.nix index bed5f81b55dfb..65cd33eb24435 100644 --- a/pkgs/tools/networking/rathole/default.nix +++ b/pkgs/tools/networking/rathole/default.nix @@ -32,6 +32,8 @@ rustPlatform.buildRustPackage rec { __darwinAllowLocalNetworking = true; + doCheck = false; # https://github.com/rapiz1/rathole/issues/222 + meta = with lib; { description = "Reverse proxy for NAT traversal"; homepage = "https://github.com/rapiz1/rathole"; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 9fe7d88f12c3e..050cadf3ed641 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: crypto/dh_groups.o:src/crypto/../globule.h:141: multiple definition of # `globule'; /build/ccrzO6vA.o:src/globule.h:141: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; setSourceRoot = '' sourceRoot=$(echo */src) diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/tools/networking/redfang/default.nix index 9e18d687dc0f0..8e799b7d41fd3 100644 --- a/pkgs/tools/networking/redfang/default.nix +++ b/pkgs/tools/networking/redfang/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; buildInputs = [ bluez ]; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 0dfeb900c9a86..6584edca5e689 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/share/man/man1" ''; - NIX_CFLAGS_COMPILE=" -Wno-error "; + env.NIX_CFLAGS_COMPILE = " -Wno-error "; meta = with lib; { description = "Attachment extractor for MIME messages"; diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix index f8c52cdc43ce5..cb73eaf6b59da 100644 --- a/pkgs/tools/networking/s3rs/default.nix +++ b/pkgs/tools/networking/s3rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "s3rs"; - version = "0.4.16"; + version = "0.4.19"; src = fetchFromGitHub { owner = "yanganto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n95ejw6EZ4zXzP16xFoUkVn1zIMcVgINy7m5NOz063A="; + sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8="; }; - cargoSha256 = "sha256-eecQi03w7lq3VAsv9o+3kulwhAXPoxuDPMu/ZCQEom4="; + cargoHash = "sha256-Q1EqEyNxWIx3wD8zuU7/MO3Qz6zsfBZbtT/IIUmJccE="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index d4e2b590b08ca..0330e1cb7b5d9 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -18,8 +18,17 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; - cargoBuildFlags = [ - "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun" + buildFeatures = [ + "trust-dns" + "local-http-native-tls" + "local-tunnel" + "local-socks4" + "local-redir" + "local-dns" + "local-tun" + "aead-cipher-extra" + "aead-cipher-2022" + "aead-cipher-2022-extra" ]; # all of these rely on connecting to www.example.com:80 diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 1642bb2944d49..ae6c495b6c87a 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk="; }; - vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + vendorSha256 = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8="; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 9f1664744bca2..6d039cf541fb8 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-OH4tuSnMdrJSkD7vxEA8dpQxWqh6bUXCOJ/y0fe2pME="; + hash = "sha256-CwXhCJo6Nq0dZaTcUetsSpvNKme1PN6pzMRX1QeY3gg="; }; - vendorHash = "sha256-kCNtbtDnB7JZzsfUd2yMDi+pascHfxIbPVMwUVsP78g="; + vendorHash = "sha256-cLaMtnTSmCZoPwfeQpWXCiFtmDm3vA6AD12H5h8Obhk="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 89a7d706ccdcf..c2aeaaa18e00b 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: transport.o:/build/source/sipsak.h:323: multiple definition of # `address'; auth.o:/build/source/sipsak.h:323: first defined here - NIX_CFLAGS_COMPILE = "-std=gnu89 -fcommon"; + env.NIX_CFLAGS_COMPILE = "-std=gnu89 -fcommon"; src = fetchFromGitHub { owner = "sipwise"; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f58fd9a998b1a..2ac9931f2ca58 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2022.10"; + version = "2022.12"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "GIIW+2/1fuHTmYev/QvuO5Yb2ozbyw/45qQkym36US8="; + sha256 = "sha256-DPJ1GrqZQyiW2s5JBZszcB/Is0Is2f/O/6Riz/M3wAs="; }; installPhase = '' diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 999d30bd92933..908166bb15422 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-7iwRbik3hUj6Zv3tqLKqhGUIag6OnWRhpWqW6NTI+FU="; + sha256 = "sha256-r2NRIb6qbA1B5HlVNRqa9ongQpyiyPskhembPHX3Lgc="; }; - vendorHash = "sha256-wHLYVf8QurMbmdLNkTFGgmncOJlJHZF8PwYTUniXOGY="; + vendorHash = "sha256-dnfm4KiVD89bnHV7bfw5aXWHGdcH9JBdrtvuS6s8N5w="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index edd5b0603e6b9..00c0ad7bd131d 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -5,6 +5,7 @@ , readline , stdenv , which +, buildPackages }: stdenv.mkDerivation rec { @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs + passthru.tests = lib.optionalAttrs stdenv.buildPlatform.isLinux { + musl = buildPackages.pkgsMusl.socat; + }; + meta = with lib; { description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; diff --git a/pkgs/tools/networking/speedtest-rs/default.nix b/pkgs/tools/networking/speedtest-rs/default.nix new file mode 100644 index 0000000000000..ecf9801c39be3 --- /dev/null +++ b/pkgs/tools/networking/speedtest-rs/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "speedtest-rs"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "nelsonjchen"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-/d6A+Arlcc3SCKPSkYXwvqY2BRyAbA33Ah+GddHcc5M="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "sha256-4TJEM+oMjx/aaZgY2Y679pYFTdEWWFpWDYrK/o2b5UM="; + + meta = with lib; { + description = "Command line internet speedtest tool written in rust"; + homepage = "https://github.com/nelsonjchen/speedtest-rs"; + changelog = "https://github.com/nelsonjchen/speedtest-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index 766c9a0950210..b502f8e4b91f9 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ssldump"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "adulau"; repo = "ssldump"; rev = "v${version}"; - sha256 = "sha256-nk1sXQN9cPIZD7Xlg8CHmKySfvfWl2j0CGxmIyvA6z4="; + sha256 = "sha256-mK8n+Dn7fUzmclUzlIqGjO2zzIVKQEhSRvYeuFwVJx8="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An SSLv3/TLS network protocol analyzer"; - homepage = "http://ssldump.sourceforge.net"; + homepage = "https://ssldump.sourceforge.net"; license = "BSD-style"; maintainers = with maintainers; [ aycanirican ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/sslsplit/default.nix b/pkgs/tools/networking/sslsplit/default.nix index c3a343d7fa1e0..6712d44569c42 100644 --- a/pkgs/tools/networking/sslsplit/default.nix +++ b/pkgs/tools/networking/sslsplit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libevent, libpcap, libnet, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, libevent, libpcap, libnet, zlib }: stdenv.mkDerivation rec { pname = "sslsplit"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l"; }; + patches = [ + (fetchpatch { + name = "fix-openssl-3-build.patch"; + url = "https://github.com/droe/sslsplit/commit/e17de8454a65d2b9ba432856971405dfcf1e7522.patch"; + hash = "sha256-sEwP7f2PSqXdMqLub9zrfQgH8I4oe9klVPzNpJjrPJ8="; + }) + ]; + buildInputs = [ openssl libevent libpcap libnet zlib ]; makeFlags = [ diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 244dd3bbcdc00..4be019c5fa072 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchurl, openssl, nixosTests }: +{ lib, stdenv, fetchurl, openssl +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, nixosTests +}: + stdenv.mkDerivation rec { pname = "stunnel"; version = "5.67"; + outputs = [ "out" "doc" "man" ]; + src = fetchurl { url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz"; sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456"; @@ -11,11 +17,19 @@ stdenv.mkDerivation rec { # not the output of `nix-prefetch-url` }; - buildInputs = [ openssl ]; + enableParallelBuilding = true; + + buildInputs = [ + openssl + ] ++ lib.optionals systemdSupport [ + systemd + ]; + configureFlags = [ "--with-ssl=${openssl.dev}" "--sysconfdir=/etc" "--localstatedir=/var" + (lib.enableFeature systemdSupport "systemd") ]; postInstall = '' diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 88c87eabe195b..d56da29687e68 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wc/cm3vePIXBCcInsLZ3n/QV/3qHmGGrPr6coUqJPpE="; + sha256 = "sha256-Ii9R1Iwqgo0kFQgoZStz4qAKb31Y67qCa+zIaEnXuRU="; }; - vendorSha256 = "sha256-uynfhwCR13UZR/Bk/oPwMuifLGn33qVPEyrpOSgeafY="; + vendorHash = "sha256-dSKjtgxJlHUL8MQTnrsjXDqQ17Ywdyq4AVWy3rv/GFY="; modRoot = "./v2"; diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index 8b0c987059ef3..ba8b46d486b69 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "subnetcalc"; - version = "2.4.20"; + version = "2.4.21"; src = fetchFromGitHub { owner = "dreibh"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-ZKEcDLwZPPgbaSx+LvTHNWcdYR/mZEGLc9b0Fb+CyEE="; + sha256 = "sha256-cFlNx59PaI5GvbEKUplNEq5HVCNt40ZJUvMj2UIbe2A="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 73ccdb43fef86..9ccf68aa54370 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.1"; + version = "4.99.3"; src = fetchurl { - url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4="; + url = "http://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; + sha256 = "sha256-rXWm7T3A2XMpRbLlSDy0Hci0tSihaTFeSZxoYZUuc7M="; }; postPatch = '' @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - configureFlags = lib.optional - (stdenv.hostPlatform != stdenv.buildPlatform) - "ac_cv_linux_vers=2"; + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "ac_cv_linux_vers=2"; meta = with lib; { description = "Network sniffer"; diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 35d76009f380a..9602e197cbfe5 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , dbus , fetchFromGitHub , openssl @@ -8,21 +9,20 @@ , Cocoa , Foundation , Security -, stdenv }: rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "veeso"; repo = pname; - rev = "v${version}"; - hash = "sha256-AyDENQj73HzNh1moO/KJl7OG80w65XiYmIl8d9/iAtE="; + rev = "refs/tags/v${version}"; + hash = "sha256-+5ljnCVbaiqqfXCJjMMInoLjLmZjCIoDkQi9pS6VKpc="; }; - cargoHash = "sha256-NgBQvWtwkAvp0V7zWGw+lNAcVqqDMAeNC0KNIBrwjEE="; + cargoHash = "sha256-GoWVDU1XVjbzZlGPEuHucnxcvhf4Rqx/nSEVygD9gCo="; nativeBuildInputs = [ pkg-config @@ -41,9 +41,9 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-framework" "AppKit" - ]; + ]); # Requires network access doCheck = false; @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Terminal tool for file transfer and explorer"; homepage = "https://github.com/veeso/termscp"; + changelog = "https://github.com/veeso/termscp/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index 987315b8351cb..15fd047353270 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: main.o:/build/tftp-hpa-5.2/tftp/main.c:98: multiple definition of # `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here - NIX_CFLAGS_COMPILE="-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index dedafc52f979e..8de6a67faedde 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.84"; + version = "1.0.86"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NlEEakmut4WMI+mpm+SJOgHmWELRcl/dZJspks3VoqY="; + sha256 = "sha256-xQzTGFptw/L+o8ivXGTxIzVFbAMrsMXvwUjCFS4rhdw="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { "SD_NOTIFY=1" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 173d2432a7723..24f96e63d7996 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { pname = "tinc"; version = "1.1pre18"; - src = fetchgit { + src = fetchFromGitHub { + owner = "gsliepen"; + repo = "tinc"; rev = "release-${version}"; - url = "git://tinc-vpn.org/tinc"; - sha256 = "0a7d1xg34p54sv66lckn8rz2bpg7bl01najm2rxiwbsm956y7afm"; + hash = "sha256-1anjTUlVLx57FlUqGwBd590lfkZ2MmrM1qRcMl4P7Sg="; }; outputs = [ "out" "man" "info" ]; diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index 4b283a5eccd83..71e5dea12be68 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyfecvpn"; - version = "20210116.0"; + version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = pname; rev = version; - sha256 = "sha256-Ng5AZJfrnNXSSbhJKBc+giNp2yOWta0EozWHB7lFUmw="; + sha256 = "sha256-g4dduREH64TDK3Y2PKc5RZiISW4h2ALRh8vQK7jvCZU="; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index e3eac708aed06..9d092aac560ca 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "traceroute"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; - sha256 = "sha256-j8jVBG6FXXWIYHuzGfW4LjuhPpHV1GNoYyYuY4a7r3Y="; + sha256 = "sha256-UHwmjyl3tOIYznPn6+1Fug2XCoykmV3Zy7H/6OmbWx8="; }; makeFlags = [ diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index f07bf5bdca3a8..5d1ca8e4ee7db 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = [ "-levent" "-ltirpc" ]; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; configureFlags = [ "--with-libevent" ]; diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 924d2c3afa0f3..ff34a39fc0b99 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.18"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; - rev = version; - sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs="; + rev = "06428f13c638180dd349a4c42a17b569ab51a25f"; + sha256 = "sha256-84jGcR/E1QoqIlbGu67muYUtZU66ZJtj4tdZvmYbII4="; }; - cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk="; + cargoSha256 = "sha256-bVHvQRtnKwrwS0huax6OrteYfxws2Ce2fFaBQ3oeoow="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/tools/networking/udp2raw/default.nix index fdb95b121f2d7..1bb063925236f 100644 --- a/pkgs/tools/networking/udp2raw/default.nix +++ b/pkgs/tools/networking/udp2raw/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "udp2raw"; - version = "20200818.0"; + version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = "udp2raw"; rev = version; - hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8="; + hash = "sha256-mchSaqw6sOJ7+dydCM8juP7QMOVUrPL4MFA79Rvyjdo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 96a71c1aba46e..690cf3d97013b 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - hash = "sha256-3LyV14kdn5EMZuTtyfHy/eTeou7Bjjr591rtRKAvE0E="; + hash = "sha256-7kCFzszhJYTmAPPYFKKPqCLfqs7B+UyEv9Z/ilVxpfQ="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 17a55d86b9a37..31c004986355f 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl ]; buildInputs = [ libubox json_c ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=dangling-pointer" + ]); + meta = with lib; { description = "Tiny QMI command line utility"; homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary"; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 4bd2f872caf3e..fa80f7348abb5 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${lib.getLib openssl}/lib,' ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${openssl.dev}/include/openssl"; installPhase = '' diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index b0cca0985b6f9..b8f358a53eada 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.2.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-Q7yro9jHNr+HSJkoO7D+T05+AK26eLtw9NfvDTWeMw8="; + hash = "sha256-dgWpfpJiPYQmVg7CHRE8f9hX5vgC2TuLpTfMAksDurs="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-uXxqqPNSa2s1KmBPzvYVdTmOLxaWer9+AupdvL3+qYU="; + vendorSha256 = "sha256-BEMdh1zQdjVEu0GJt6KJyWN5P9cUHfs04iNZWxzZ0Yo="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix index 23ba50cc7cb1b..45a7838b2f6e6 100644 --- a/pkgs/tools/networking/v2raya/default.nix +++ b/pkgs/tools/networking/v2raya/default.nix @@ -11,12 +11,14 @@ let pname = "v2raya"; version = "2.0.0"; + src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; rev = "v${version}"; sha256 = "sha256-1fWcrMd+TSrlS1H0z7XwVCQzZAa8DAFtlekEZNRMAPA="; }; + web = mkYarnPackage { inherit pname version; src = "${src}/gui"; @@ -32,21 +34,32 @@ let dontInstall = true; dontFixup = true; }; + + assetsDir = symlinkJoin { + name = "assets"; + paths = [ v2ray-geoip v2ray-domain-list-community ]; + }; + in buildGoModule { inherit pname version; + src = "${src}/service"; vendorSha256 = "sha256-Ud4pwS0lz7zSTowg3gXNllfDyj8fu33H1L20szxPcOA="; + ldflags = [ "-s" "-w" "-X github.com/v2rayA/v2rayA/conf.Version=${version}" ]; + subPackages = [ "." ]; + nativeBuildInputs = [ makeWrapper ]; preBuild = '' cp -a ${web} server/router/web ''; + postInstall = '' install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps @@ -55,11 +68,9 @@ buildGoModule { wrapProgram $out/bin/v2rayA \ --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \ - --prefix XDG_DATA_DIRS ":" ${symlinkJoin { - name = "assets"; - paths = [ v2ray-geoip v2ray-domain-list-community ]; - }}/share + --prefix XDG_DATA_DIRS ":" ${assetsDir}/share ''; + meta = with lib; { description = "A Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel"; homepage = "https://github.com/v2rayA/v2rayA"; diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index a3b6b0f738ab9..7b6a760f5f009 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "vpnc-scripts"; - version = "unstable-2021-09-24"; + version = "unstable-2023-01-03"; src = fetchgit { url = "https://gitlab.com/openconnect/vpnc-scripts.git"; - rev = "b749c2cadc2f32e2efffa69302861f9a7d4a4e5f"; - sha256 = "sha256-DDGpxzQBaOOG+MYDXnVEB6/Q4qmdNM+86XNRNl01UqU="; + rev = "22756827315bc875303190abb3756b5b1dd147ce"; + hash = "sha256-EWrDyXg47Ur9mFutaG8+oYOCAW9AZowzwwJp3YbogIY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index cf49ad0be3e26..4c2354b5f7fbb 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: dns_resolv.o:(.bss+0x20): multiple definition of `system_info'; webalizer.o:(.bss+0x76e0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index b0bc3346526cc..6d19aea8040d9 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -7,6 +7,7 @@ , makeWrapper , openresolv , procps +, bash }: stdenv.mkDerivation rec { @@ -24,6 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 74280724ca40c..20efd6f0182aa 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 + env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff b/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff new file mode 100644 index 0000000000000..b94ca03bb3176 --- /dev/null +++ b/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff @@ -0,0 +1,29 @@ +diff -Naur source-old/pyproject.toml source-new/pyproject.toml +--- source-old/pyproject.toml 1980-01-02 00:00:00.000000000 -0300 ++++ source-new/pyproject.toml 2023-02-04 10:09:48.087418202 -0300 +@@ -29,11 +29,11 @@ + "Topic :: Security", + ] + dependencies = [ +- "pydantic~=1.10.2", +- "python-dotenv~=0.21.0", +- "requests~=2.28.1", +- "rich~=12.6.0", +- "shodan~=1.28.0", ++ "pydantic", ++ "python-dotenv", ++ "requests", ++ "rich", ++ "shodan", + ] + dynamic = ["version"] + +@@ -63,7 +63,7 @@ + "mypy", + "pytest", + "pytest-cov", +- "types-requests~=2.28.1", ++ "types-requests", + ] + [tool.hatch.envs.default.scripts] + typecheck = "mypy -p {args:wtfis}" diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/tools/networking/wtfis/default.nix new file mode 100644 index 0000000000000..06c321d99d6ef --- /dev/null +++ b/pkgs/tools/networking/wtfis/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +let + pname = "wtfis"; + version = "0.6.1"; +in python3.pkgs.buildPythonApplication { + inherit pname version; + + src = fetchFromGitHub { + owner = "pirxthepilot"; + repo = "wtfis"; + rev = "refs/tags/v${version}"; + hash = "sha256-bHgv5+HoM1hFhpkqml+HxqiMDvKbMqsTH+zYtDrV7Ko="; + }; + + patches = [ + # TODO: get rid of that newbie patch + ./000-pyproject-remove-versions.diff + ]; + + format = "pyproject"; + + propagatedBuildInputs = [ + python3.pkgs.hatchling + python3.pkgs.pydantic + python3.pkgs.rich + python3.pkgs.shodan + python3.pkgs.python-dotenv + ]; + + meta = { + homepage = "https://github.com/pirxthepilot/wtfis"; + description = "Passive hostname, domain and IP lookup tool for non-robots"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index f806b46b6944f..06cda8490021c 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,41 +1,40 @@ -{ stdenv -, lib -, pkg-config +{ lib , rustPlatform , fetchFromGitHub , installShellFiles +, pkg-config , withNativeTls ? true +, stdenv , Security -, libiconv -, openssl }: +, openssl +}: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-4rFtbCfx6QFdp62FPjOYAhSWM03g3rXsF4pD22+EhcA="; + sha256 = "sha256-2qZ+FGc8Y8HLJaQluVv036NG77lvaqsc3I5cmkD+r/M="; }; - cargoSha256 = "sha256-av/F1FHMd0o9NvwA2Q9mqSd89ZEqmUaVxC+JmSwEHhI="; + cargoSha256 = "sha256-0lPEZ8Th3PAw6AEnb+ciKMhi5wysFCvYwiHd9/o8VVc="; buildFeatures = lib.optional withNativeTls "native-tls"; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals withNativeTls - (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]); + (if stdenv.isDarwin then [ Security ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; postInstall = '' - installShellCompletion --cmd xh \ - --bash completions/xh.bash \ - --fish completions/xh.fish \ + installShellCompletion \ + completions/xh.{bash,fish} \ --zsh completions/_xh installManPage doc/xh.1 @@ -43,7 +42,6 @@ rustPlatform.buildRustPackage rec { install -m444 -Dt $out/share/doc/xh README.md CHANGELOG.md - # https://github.com/ducaale/xh#xh-and-xhs ln -s $out/bin/xh $out/bin/xhs ''; @@ -61,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ payas ]; + maintainers = with maintainers; [ figsoda payas ]; }; } diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index e59715e61f383..f250d6de13f20 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -20,16 +20,16 @@ let in buildGoModule rec { pname = "xray"; - version = "1.7.2"; + version = "1.7.5"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - sha256 = "sha256-jwCvo6+YXC471VqGWzcrnrLWOSJW2tBKa5SoynQg0Lo="; + sha256 = "sha256-WCku/7eczcsGiIuTy0sSQKUKXlH14TpdVg2/ZPdaiHQ="; }; - vendorSha256 = "sha256-P2g0MqlBScm6yTnpvL5T6l9ntsb4tK9k3Civ7rTevrE="; + vendorSha256 = "sha256-2P7fI7fUnShsAl95mPiJgtr/eobt+DMmaoxZcox0eu8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 93683bc6f7fa1..5f9a2ec98f6bc 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -16,7 +16,7 @@ , systemd , voms , zlib -, enableTests ? true +, enableTests ? stdenv.isLinux # If not null, the builder will # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. , externalEtc ? "/etc" @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.5.1"; + version = "5.5.3"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-PaLT3+5FucPnWLStWxtBBqTKs8hvogKMrZteSNY+xXI="; + hash = "sha256-61+8M6ubKX/GnsPLTql6XzGw/PTljpiXoDa1YoECya4="; }; outputs = [ "bin" "out" "dev" "man" ]; @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { openssl readline zlib + fuse ] ++ lib.optionals stdenv.isLinux [ - fuse systemd voms ] diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 8c81e39b14264..f3beaf20dcce7 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -15,13 +15,13 @@ let pname = "zerotierone"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-p900bw+BGzyMwH91W9NRfYS1ZUW74YaALwr1Gv9BlvQ="; + sha256 = "sha256-MhkGcmt1YPvlePF54XsLVFUX+P979uUqhtJjudRx69g="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 151a53f15258e..84bd3e8916221 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { path = lib.makeBinPath ([ coreutils findutils gnugrep - ] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else [])); + ] ++ (lib.optionals stdenv.isDarwin [ darwin.DarwinTools ])); is_darwin = if stdenv.isDarwin then "yes" else "no"; sandboxtest = ./sandbox.nix; diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh index c309e8be1649f..6ec8273504692 100755 --- a/pkgs/tools/nix/info/info.sh +++ b/pkgs/tools/nix/info/info.sh @@ -70,7 +70,7 @@ nixev() { } desc_system() { - nixev '(import <nixpkgs> {}).stdenv.hostPlatform.system' + nixev 'builtins.currentSystem' } desc_host_os() { @@ -98,7 +98,7 @@ desc_multi_user() { } desc_nixpkgs_path() { - nixev '<nixpkgs>' + nixev '<nixpkgs>' 2>/dev/null || echo "not found" } channel_facts() { diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix new file mode 100644 index 0000000000000..c60f88022cccc --- /dev/null +++ b/pkgs/tools/nix/nix-init/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pkg-config +, zstd +, stdenv +, darwin +, nix +, nurl +, callPackage +, spdx-license-list-data +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-init"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-init"; + rev = "v${version}"; + hash = "sha256-x9UrBCnEGz6nI1XGBLjIeiF3qi3EvynAfafiuhQdt9Q="; + }; + + cargoHash = "sha256-RUfprANAbj8w8LPRwQEF9SD9fhWb1CEcwbvOa6DX9Xk="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; + + buildInputs = [ + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + wrapProgram $out/bin/nix-init \ + --prefix PATH : ${lib.makeBinPath [ nix nurl ]} + installManPage artifacts/nix-init.1 + installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init + ''; + + GEN_ARTIFACTS = "artifacts"; + NIX_LICENSES = callPackage ./license.nix { }; + SPDX_LICENSE_LIST_DATA = "${spdx-license-list-data.json}/json/details"; + ZSTD_SYS_USE_PKG_CONFIG = true; + + meta = with lib; { + description = "Command line tool to generate Nix packages from URLs"; + homepage = "https://github.com/nix-community/nix-init"; + changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/nix/nix-init/license.nix b/pkgs/tools/nix/nix-init/license.nix new file mode 100644 index 0000000000000..0a1ad4fce122d --- /dev/null +++ b/pkgs/tools/nix/nix-init/license.nix @@ -0,0 +1,77 @@ +# vendored from src/licenses.nix + +{ lib, writeText }: + +let + inherit (lib) + concatMapAttrs + filterAttrs + flip + id + intersectLists + licenses + mapAttrsToList + optionalAttrs + pipe + warn + attrNames + concatStringsSep + length + ; + + licenseMap = flip concatMapAttrs licenses + (k: v: optionalAttrs (v ? spdxId && !v.deprecated) { ${v.spdxId} = k; }); + + deprecatedAliases = { + "AGPL-3.0" = "agpl3Only"; + "BSD-2-Clause-FreeBSD" = "bsd2WithViews"; + "BSD-2-Clause-NetBSD" = "bsd2"; + "GFDL-1.1" = "fdl11Only"; + "GFDL-1.2" = "fdl12Only"; + "GFDL-1.3" = "fdl13Only"; + "GPL-1.0" = "gpl1Only"; + "GPL-1.0+" = "gpl1Plus"; + "GPL-2.0" = "gpl2Only"; + "GPL-2.0+" = "gpl2Plus"; + "GPL-3.0" = "gpl3Only"; + "GPL-3.0+" = "gpl3Plus"; + "LGPL-2.0" = "lgpl2Only"; + "LGPL-2.0+" = "lgpl2Plus"; + "LGPL-2.1" = "lgpl21Only"; + "LGPL-2.1+" = "lgpl21Plus"; + "LGPL-3.0" = "lgpl3Only"; + "LGPL-3.0+" = "lgpl3Plus"; + }; + + lints = { + "deprecated licenses" = intersectLists + (attrNames licenseMap) + (attrNames deprecatedAliases); + + "invalid aliases" = attrNames (filterAttrs + (k: v: licenses.${v}.deprecated or true) + deprecatedAliases); + }; + + lint = flip pipe + (flip mapAttrsToList lints (k: v: + if v == [ ] then + id + else + warn "${k}: ${concatStringsSep ", " v}")); + + inserts = lint (mapAttrsToList + (k: v: '' xs.insert("${k}", "${v}");'') + (deprecatedAliases // licenseMap)); +in + +writeText "license.rs" '' + fn get_nix_licenses() -> rustc_hash::FxHashMap<&'static str, &'static str> { + let mut xs = std::collections::HashMap::with_capacity_and_hasher( + ${toString (length inserts)}, + Default::default(), + ); + ${concatStringsSep "\n " inserts} + xs + } +'' diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix new file mode 100644 index 0000000000000..065404f36c204 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, python3 +, python3Minimal +, runCommand +}: + +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 stdenv.isDarwin then python3 else python3Minimal).override { + self = python; + includeSiteCustomize = true; + }); + + # TODO add our own small test suite, maybe add tests for these deps to channels? + markdown-it-py-no-tests = python.pkgs.markdown-it-py.override { + disableTests = true; + }; + mdit-py-plugins-no-tests = python.pkgs.mdit-py-plugins.override { + markdown-it-py = markdown-it-py-no-tests; + disableTests = true; + }; + + makeDeps = pkgs: small: + if small + then [ + markdown-it-py-no-tests + mdit-py-plugins-no-tests + ] + else [ + pkgs.markdown-it-py + pkgs.mdit-py-plugins + ]; +in + +python.pkgs.buildPythonApplication rec { + pname = "nixos-render-docs"; + version = "0.0"; + format = "pyproject"; + + src = lib.cleanSourceWith { + filter = name: type: + lib.cleanSourceFilter name type + && ! (type == "directory" + && builtins.elem + (baseNameOf name) + [ + ".pytest_cache" + ".mypy_cache" + "__pycache__" + ]); + src = ./src; + }; + + nativeBuildInputs = [ + python.pkgs.setuptools + python.pkgs.pytestCheckHook + ]; + + propagatedBuildInputs = makeDeps python.pkgs true; + + pytestFlagsArray = [ "-vvrP" "tests/" ]; + + # NOTE this is a CI test rather than a build-time test because we want to keep the + # build closures small. mypy has an unreasonably large build closure for docs builds. + passthru.tests.typing = runCommand "${pname}-mypy" { + nativeBuildInputs = [ + (python3.withPackages (p: [ p.mypy p.pytest ] ++ makeDeps p false)) + ]; + } '' + mypy --strict ${src} + touch $out + ''; + + meta = with lib; { + description = "Renderer for NixOS manual and option docs"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py new file mode 100644 index 0000000000000..1c58accb41662 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py @@ -0,0 +1,58 @@ +import argparse +import os +import sys +import textwrap +import traceback +from io import StringIO +from pprint import pprint +from typing import Any, Dict + +from .md import Converter +from . import manual +from . import options +from . import parallel + +def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None: + print(f"\x1b[1;31m{_desc_text}:\x1b[0m", file=sys.stderr) + # destructure Exception and RuntimeError specifically so we can show nice + # messages for errors that weren't given their own exception type with + # a good pretty-printer. + if type(e) is Exception or type(e) is RuntimeError: + args = e.args + if len(args) and isinstance(args[0], str): + print("\t", args[0], file=sys.stderr, sep="") + args = args[1:] + buf = StringIO() + for arg in args: + pprint(arg, stream=buf) + if extra_info := buf.getvalue(): + print(f"\x1b[1;34mextra info:\x1b[0m", file=sys.stderr) + print(textwrap.indent(extra_info, "\t"), file=sys.stderr, end="") + else: + print(e) + if e.__cause__ is not None: + print("", file=sys.stderr) + pretty_print_exc(e.__cause__, _desc_text="caused by") + +def main() -> None: + parser = argparse.ArgumentParser(description='render nixos manual bits') + parser.add_argument('-j', '--jobs', type=int, default=None) + + commands = parser.add_subparsers(dest='command', required=True) + + options.build_cli(commands.add_parser('options')) + manual.build_cli(commands.add_parser('manual')) + + args = parser.parse_args() + try: + parallel.pool_processes = args.jobs + if args.command == 'options': + options.run_cli(args) + elif args.command == 'manual': + manual.run_cli(args) + else: + raise RuntimeError('command not hooked up', args) + except Exception as e: + traceback.print_exc() + pretty_print_exc(e) + sys.exit(1) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py new file mode 100644 index 0000000000000..637185227e83f --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py @@ -0,0 +1,262 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from dataclasses import dataclass +from typing import Any, cast, Optional +from urllib.parse import quote + +from .md import Renderer + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +_asciidoc_escapes = { + # escape all dots, just in case one is pasted at SOL + ord('.'): "{zwsp}.", + # may be replaced by typographic variants + ord("'"): "{apos}", + ord('"'): "{quot}", + # passthrough character + ord('+'): "{plus}", + # table marker + ord('|'): "{vbar}", + # xml entity reference + ord('&'): "{amp}", + # crossrefs. < needs extra escaping because links break in odd ways if they start with it + ord('<'): "{zwsp}+<+{zwsp}", + ord('>'): "{gt}", + # anchors, links, block attributes + ord('['): "{startsb}", + ord(']'): "{endsb}", + # superscript, subscript + ord('^'): "{caret}", + ord('~'): "{tilde}", + # bold + ord('*'): "{asterisk}", + # backslash + ord('\\'): "{backslash}", + # inline code + ord('`'): "{backtick}", +} +def asciidoc_escape(s: str) -> str: + s = s.translate(_asciidoc_escapes) + # :: is deflist item, ;; is has a replacement but no idea why + return s.replace("::", "{two-colons}").replace(";;", "{two-semicolons}") + +@dataclass(kw_only=True) +class List: + head: str + +@dataclass() +class Par: + sep: str + block_delim: str + continuing: bool = False + +class AsciiDocRenderer(Renderer): + __output__ = "asciidoc" + + _parstack: list[Par] + _list_stack: list[List] + _attrspans: list[str] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._parstack = [ Par("\n\n", "====") ] + self._list_stack = [] + self._attrspans = [] + + def _enter_block(self, is_list: bool) -> None: + self._parstack.append(Par("\n+\n" if is_list else "\n\n", self._parstack[-1].block_delim + "=")) + def _leave_block(self) -> None: + self._parstack.pop() + def _break(self, force: bool = False) -> str: + result = self._parstack[-1].sep if force or self._parstack[-1].continuing else "" + self._parstack[-1].continuing = True + return result + + def _admonition_open(self, kind: str) -> str: + pbreak = self._break() + self._enter_block(False) + return f"{pbreak}[{kind}]\n{self._parstack[-2].block_delim}\n" + def _admonition_close(self) -> str: + self._leave_block() + return f"\n{self._parstack[-1].block_delim}\n" + + def _list_open(self, token: Token, head: str) -> str: + attrs = [] + if (idx := token.attrs.get('start')) is not None: + attrs.append(f"start={idx}") + if token.meta['compact']: + attrs.append('options="compact"') + if self._list_stack: + head *= len(self._list_stack[0].head) + 1 + self._list_stack.append(List(head=head)) + return f"{self._break()}[{','.join(attrs)}]" + def _list_close(self) -> str: + self._list_stack.pop() + return "" + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return asciidoc_escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._break() + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return " +\n" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f" " + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return f"``{asciidoc_escape(token.content)}``" + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self.fence(token, tokens, i, options, env) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return f"link:{quote(cast(str, token.attrs['href']), safe='/:')}[" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "]" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._enter_block(True) + # allow the next token to be a block or an inline. + return f'\n{self._list_stack[-1].head} {{empty}}' + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return "\n" + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._list_open(token, '*') + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._list_close() + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "__" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "__" + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "**" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "**" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + attrs = f"[source,{token.info}]\n" if token.info else "" + code = token.content + if code.endswith('\n'): + code = code[:-1] + return f"{self._break(True)}{attrs}----\n{code}\n----" + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + pbreak = self._break(True) + self._enter_block(False) + return f"{pbreak}[quote]\n{self._parstack[-2].block_delim}\n" + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return f"\n{self._parstack[-1].block_delim}" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("NOTE") + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("CAUTION") + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("IMPORTANT") + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("TIP") + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("WARNING") + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"{self._break()}[]" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._break() + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._enter_block(True) + return ":: {empty}" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return "\n" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + content = asciidoc_escape(token.content) + if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)): + return f"link:{quote(url, safe='/:')}[{content}]" + return f"[.{token.meta['name']}]``{asciidoc_escape(token.content)}``" + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return f"[[{token.attrs['id']}]]" + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + (id_part, class_part) = ("", "") + if id := token.attrs.get('id'): + id_part = f"[[{id}]]" + if s := token.attrs.get('class'): + if s == 'keycap': + class_part = "kbd:[" + self._attrspans.append("]") + else: + return super().attr_span_begin(token, tokens, i, options, env) + else: + self._attrspans.append("") + return id_part + class_part + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._attrspans.pop() + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return token.markup.replace("#", "=") + " " + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._list_open(token, '.') + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._list_close() diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py new file mode 100644 index 0000000000000..4a708b1f92c66 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py @@ -0,0 +1,231 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from dataclasses import dataclass +from typing import Any, cast, Optional + +from .md import md_escape, md_make_code, Renderer + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +@dataclass(kw_only=True) +class List: + next_idx: Optional[int] = None + compact: bool + first_item_seen: bool = False + +@dataclass +class Par: + indent: str + continuing: bool = False + +class CommonMarkRenderer(Renderer): + __output__ = "commonmark" + + _parstack: list[Par] + _link_stack: list[str] + _list_stack: list[List] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._parstack = [ Par("") ] + self._link_stack = [] + self._list_stack = [] + + def _enter_block(self, extra_indent: str) -> None: + self._parstack.append(Par(self._parstack[-1].indent + extra_indent)) + def _leave_block(self) -> None: + self._parstack.pop() + self._parstack[-1].continuing = True + def _break(self) -> str: + self._parstack[-1].continuing = True + return f"\n{self._parstack[-1].indent}" + def _maybe_parbreak(self) -> str: + result = f"\n{self._parstack[-1].indent}" * 2 if self._parstack[-1].continuing else "" + self._parstack[-1].continuing = True + return result + + def _admonition_open(self, kind: str) -> str: + pbreak = self._maybe_parbreak() + self._enter_block("") + return f"{pbreak}**{kind}:** " + def _admonition_close(self) -> str: + self._leave_block() + return "" + + def _indent_raw(self, s: str) -> str: + if '\n' not in s: + return s + return f"\n{self._parstack[-1].indent}".join(s.splitlines()) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return self._indent_raw(md_escape(token.content)) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._maybe_parbreak() + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f" {self._break()}" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._break() + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return md_make_code(token.content) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self.fence(token, tokens, i, options, env) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + self._link_stack.append(cast(str, token.attrs['href'])) + return "[" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"]({md_escape(self._link_stack.pop())})" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + lst = self._list_stack[-1] + lbreak = "" if not lst.first_item_seen else self._break() * (1 if lst.compact else 2) + lst.first_item_seen = True + head = " -" + if lst.next_idx is not None: + head = f" {lst.next_idx}." + lst.next_idx += 1 + self._enter_block(" " * (len(head) + 1)) + return f'{lbreak}{head} ' + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return "" + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.append(List(compact=bool(token.meta['compact']))) + return self._maybe_parbreak() + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "*" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "*" + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "**" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "**" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + code = token.content + if code.endswith('\n'): + code = code[:-1] + pbreak = self._maybe_parbreak() + return pbreak + self._indent_raw(md_make_code(code, info=token.info, multiline=True)) + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + pbreak = self._maybe_parbreak() + self._enter_block("> ") + return pbreak + "> " + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return "" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Note") + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Caution") + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Important") + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Tip") + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Warning") + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.append(List(compact=False)) + return "" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + pbreak = self._maybe_parbreak() + self._enter_block(" ") + # add an opening zero-width non-joiner to separate *our* emphasis from possible + # emphasis in the provided term + return f'{pbreak} - *{chr(0x200C)}' + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"{chr(0x200C)}*" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + return "" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return "" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._parstack[-1].continuing = True + content = md_make_code(token.content) + if token.meta['name'] == 'manpage' and (url := self._manpage_urls.get(token.content)): + return f"[{content}]({url})" + return content # no roles in regular commonmark + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # there's no way we can emit attrspans correctly in all cases. we could use inline + # html for ids, but that would not round-trip. same holds for classes. since this + # renderer is only used for approximate options export and all of these things are + # not allowed in options we can ignore them for now. + return "" + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return token.markup + " " + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.append( + List(next_idx = cast(int, token.attrs.get('start', 1)), + compact = bool(token.meta['compact']))) + return self._maybe_parbreak() + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py new file mode 100644 index 0000000000000..e6a761dcf13fd --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py @@ -0,0 +1,294 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from typing import Any, cast, Optional, NamedTuple + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from xml.sax.saxutils import escape, quoteattr + +from .md import Renderer + +_xml_id_translate_table = { + ord('*'): ord('_'), + ord('<'): ord('_'), + ord(' '): ord('_'), + ord('>'): ord('_'), + ord('['): ord('_'), + ord(']'): ord('_'), + ord(':'): ord('_'), + ord('"'): ord('_'), +} +def make_xml_id(s: str) -> str: + return s.translate(_xml_id_translate_table) + +class Deflist: + has_dd = False + +class Heading(NamedTuple): + container_tag: str + level: int + # special handling for <part> titles: whether partinfo was already closed from elsewhere + # or still needs closing. + partintro_closed: bool = False + +class DocBookRenderer(Renderer): + __output__ = "docbook" + _link_tags: list[str] + _deflists: list[Deflist] + _headings: list[Heading] + _attrspans: list[str] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._link_tags = [] + self._deflists = [] + self._headings = [] + self._attrspans = [] + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + result = super().render(tokens, options, env) + result += self._close_headings(None, env) + return result + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # HACK to support docbook links and xrefs. link handling is only necessary because the docbook + # manpage stylesheet converts - in urls to a mathematical minus, which may be somewhat incorrect. + for i, token in enumerate(tokens): + if token.type != 'link_open': + continue + token.tag = 'link' + # turn [](#foo) into xrefs + if token.attrs['href'][0:1] == '#' and tokens[i + 1].type == 'link_close': # type: ignore[index] + token.tag = "xref" + # turn <x> into links without contents + if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: + tokens[i + 1].content = '' + + return super().renderInline(tokens, options, env) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para>" + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</para>" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<literallayout>\n</literallayout>" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # should check options.breaks() and emit hard break if so + return "\n" + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"<literal>{escape(token.content)}</literal>" + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"<programlisting>{escape(token.content)}</programlisting>" + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._link_tags.append(token.tag) + href = cast(str, token.attrs['href']) + (attr, start) = ('linkend', 1) if href[0] == '#' else ('xlink:href', 0) + return f"<{token.tag} {attr}={quoteattr(href[start:])}>" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"</{self._link_tags.pop()}>" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<listitem>" + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</listitem>\n" + # HACK open and close para for docbook change size. remove soon. + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + spacing = ' spacing="compact"' if token.meta.get('compact', False) else '' + return f"<para><itemizedlist{spacing}>\n" + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n</itemizedlist></para>" + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<emphasis>" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</emphasis>" + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<emphasis role=\"strong\">" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</emphasis>" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"<programlisting{info}>{escape(token.content)}</programlisting>" + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para><blockquote>" + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</blockquote></para>" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para><note>" + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</note></para>" + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para><caution>" + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</caution></para>" + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para><important>" + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</important></para>" + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para><tip>" + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</tip></para>" + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "<para><warning>" + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</warning></para>" + # markdown-it emits tokens based on the html syntax tree, but docbook is + # slightly different. html has <dl>{<dt/>{<dd/>}}</dl>, + # docbook has <variablelist>{<varlistentry><term/><listitem/></varlistentry>}<variablelist> + # we have to reject multiple definitions for the same term for time being. + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists.append(Deflist()) + return "<para><variablelist>" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists.pop() + return "</variablelist></para>" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists[-1].has_dd = False + return "<varlistentry><term>" + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</term>" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if self._deflists[-1].has_dd: + raise Exception("multiple definitions per term not supported") + self._deflists[-1].has_dd = True + return "<listitem>" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "</listitem></varlistentry>" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if token.meta['name'] == 'command': + return f"<command>{escape(token.content)}</command>" + if token.meta['name'] == 'file': + return f"<filename>{escape(token.content)}</filename>" + if token.meta['name'] == 'var': + return f"<varname>{escape(token.content)}</varname>" + if token.meta['name'] == 'env': + return f"<envar>{escape(token.content)}</envar>" + if token.meta['name'] == 'option': + return f"<option>{escape(token.content)}</option>" + if token.meta['name'] == 'manpage': + [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] + section = section[:-1] + man = f"{page}({section})" + title = f"<refentrytitle>{escape(page)}</refentrytitle>" + vol = f"<manvolnum>{escape(section)}</manvolnum>" + ref = f"<citerefentry>{title}{vol}</citerefentry>" + if man in self._manpage_urls: + return f"<link xlink:href={quoteattr(self._manpage_urls[man])}>{ref}</link>" + else: + return ref + raise NotImplementedError("md node not supported yet", token) + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # we currently support *only* inline anchors and the special .keycap class to produce + # <keycap> docbook elements. + (id_part, class_part) = ("", "") + if s := token.attrs.get('id'): + id_part = f'<anchor xml:id={quoteattr(cast(str, s))} />' + if s := token.attrs.get('class'): + if s == 'keycap': + class_part = "<keycap>" + self._attrspans.append("</keycap>") + else: + return super().attr_span_begin(token, tokens, i, options, env) + else: + self._attrspans.append("") + return id_part + class_part + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._attrspans.pop() + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + start = f' startingnumber="{token.attrs["start"]}"' if 'start' in token.attrs else "" + spacing = ' spacing="compact"' if token.meta.get('compact', False) else '' + return f"<orderedlist{start}{spacing}>" + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"</orderedlist>" + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + hlevel = int(token.tag[1:]) + result = self._close_headings(hlevel, env) + (tag, attrs) = self._heading_tag(token, tokens, i, options, env) + self._headings.append(Heading(tag, hlevel)) + attrs_str = "".join([ f" {k}={quoteattr(v)}" for k, v in attrs.items() ]) + return result + f'<{tag}{attrs_str}>\n<title>' + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + heading = self._headings[-1] + result = '</title>' + if heading.container_tag == 'part': + # generate the same ids as were previously assigned manually. if this collides we + # rely on outside schema validation to catch it! + maybe_id = "" + assert tokens[i - 2].type == 'heading_open' + if id := cast(str, tokens[i - 2].attrs.get('id', "")): + maybe_id = " xml:id=" + quoteattr(id + "-intro") + result += f"<partintro{maybe_id}>" + return result + def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if id := token.attrs.get('id'): + return f"<anchor xml:id={quoteattr(cast(str, id))} />" + return "" + def example_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + + def _close_headings(self, level: Optional[int], env: MutableMapping[str, Any]) -> str: + # we rely on markdown-it producing h{1..6} tags in token.tag for this to work + result = [] + while len(self._headings): + if level is None or self._headings[-1].level >= level: + heading = self._headings.pop() + if heading.container_tag == 'part' and not heading.partintro_closed: + result.append("</partintro>") + result.append(f"</{heading.container_tag}>") + else: + break + return "\n".join(result) + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: + attrs = {} + if id := token.attrs.get('id'): + attrs['xml:id'] = cast(str, id) + return ("section", attrs) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py new file mode 100644 index 0000000000000..1b796d9f04861 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py @@ -0,0 +1,336 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from dataclasses import dataclass +from typing import Any, cast, Iterable, Optional + +import re + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +from .md import Renderer + +# roff(7) says: +# +# > roff documents may contain only graphable 7-bit ASCII characters, the space character, +# > and, in certain circumstances, the tab character. The backslash character ‘\’ indicates +# > the start of an escape sequence […] +# +# mandoc_char(7) says about the `'~^ characters: +# +# > In prose, this automatic substitution is often desirable; but when these characters have +# > to be displayed as plain ASCII characters, for example in source code samples, they require +# > escaping to render as follows: +# +# since we don't want these to be touched anywhere (because markdown will do all substituations +# we want to have) we'll escape those as well. we also escape " (macro metacharacter), - (might +# turn into a typographic hyphen), and . (roff request marker at SOL, changes spacing semantics +# at EOL). groff additionally does not allow unicode escapes for codepoints below U+0080, so +# those need "proper" roff escapes/replacements instead. +_roff_unicode = re.compile(r'''[^\n !#$%&()*+,\-./0-9:;<=>?@A-Z[\\\]_a-z{|}]''', re.ASCII) +_roff_escapes = { + ord('"'): "\\(dq", + ord("'"): "\\(aq", + ord('-'): "\\-", + ord('.'): "\\&.", + ord('\\'): "\\e", + ord('^'): "\\(ha", + ord('`'): "\\(ga", + ord('~'): "\\(ti", +} +def man_escape(s: str) -> str: + s = s.translate(_roff_escapes) + return _roff_unicode.sub(lambda m: f"\\[u{ord(m[0]):04X}]", s) + +# remove leading and trailing spaces from links and condense multiple consecutive spaces +# into a single space for presentation parity with html. this is currently easiest with +# regex postprocessing and some marker characters. since we don't want to drop spaces +# from code blocks we will have to specially protect *inline* code (luckily not block code) +# so normalization can turn the spaces inside it into regular spaces again. +_normalize_space_re = re.compile(r'''\u0000 < *| *>\u0000 |(?<= ) +''') +def _normalize_space(s: str) -> str: + return _normalize_space_re.sub("", s).replace("\0p", " ") + +def _protect_spaces(s: str) -> str: + return s.replace(" ", "\0p") + +@dataclass(kw_only=True) +class List: + width: int + next_idx: Optional[int] = None + compact: bool + first_item_seen: bool = False + +# this renderer assumed that it produces a set of lines as output, and that those lines will +# be pasted as-is into a larger output. no prefixing or suffixing is allowed for correctness. +# +# NOTE that we output exclusively physical markup. this is because we have to use the older +# mandoc(7) format instead of the newer mdoc(7) format due to limitations in groff: while +# using mdoc in groff works fine it is not a native format and thus very slow to render on +# manpages as large as configuration.nix.5. mandoc(1) renders both really quickly, but with +# groff being our predominant manpage viewer we have to optimize for groff instead. +# +# while we do use only physical markup (adjusting indentation with .RS and .RE, adding +# vertical spacing with .sp, \f[BIRP] escapes for bold/italic/roman/$previous font, \h for +# horizontal motion in a line) we do attempt to copy the style of mdoc(7) semantic requests +# as appropriate for each markup element. +class ManpageRenderer(Renderer): + __output__ = "man" + + # whether to emit mdoc .Ql equivalents for inline code or just the contents. this is + # mainly used by the options manpage converter to not emit extra quotes in defaults + # and examples where it's already clear from context that the following text is code. + inline_code_is_quoted: bool = True + link_footnotes: Optional[list[str]] = None + + _href_targets: dict[str, str] + + _link_stack: list[str] + _do_parbreak_stack: list[bool] + _list_stack: list[List] + _font_stack: list[str] + + def __init__(self, manpage_urls: Mapping[str, str], href_targets: dict[str, str], + parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._href_targets = href_targets + self._link_stack = [] + self._do_parbreak_stack = [] + self._list_stack = [] + self._font_stack = [] + + def _join_block(self, ls: Iterable[str]) -> str: + return "\n".join([ l for l in ls if len(l) ]) + def _join_inline(self, ls: Iterable[str]) -> str: + return _normalize_space(super()._join_inline(ls)) + + def _enter_block(self) -> None: + self._do_parbreak_stack.append(False) + def _leave_block(self) -> None: + self._do_parbreak_stack.pop() + self._do_parbreak_stack[-1] = True + def _maybe_parbreak(self, suffix: str = "") -> str: + result = f".sp{suffix}" if self._do_parbreak_stack[-1] else "" + self._do_parbreak_stack[-1] = True + return result + + def _admonition_open(self, kind: str) -> str: + self._enter_block() + return ( + '.sp\n' + '.RS 4\n' + f'\\fB{kind}\\fP\n' + '.br' + ) + def _admonition_close(self) -> str: + self._leave_block() + return ".RE" + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._do_parbreak_stack = [ False ] + self._font_stack = [ "\\fR" ] + return super().render(tokens, options, env) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return man_escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._maybe_parbreak() + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".br" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return " " + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + s = _protect_spaces(man_escape(token.content)) + return f"\\fR\\(oq{s}\\(cq\\fP" if self.inline_code_is_quoted else s + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self.fence(token, tokens, i, options, env) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + href = cast(str, token.attrs['href']) + self._link_stack.append(href) + text = "" + if tokens[i + 1].type == 'link_close' and href in self._href_targets: + # TODO error or warning if the target can't be resolved + text = self._href_targets[href] + self._font_stack.append("\\fB") + return f"\\fB{text}\0 <" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + href = self._link_stack.pop() + text = "" + if self.link_footnotes is not None: + try: + idx = self.link_footnotes.index(href) + 1 + except ValueError: + self.link_footnotes.append(href) + idx = len(self.link_footnotes) + text = "\\fR" + man_escape(f"[{idx}]") + self._font_stack.pop() + return f">\0 {text}{self._font_stack[-1]}" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._enter_block() + lst = self._list_stack[-1] + maybe_space = '' if lst.compact or not lst.first_item_seen else '.sp\n' + lst.first_item_seen = True + head = "•" + if lst.next_idx is not None: + head = f"{lst.next_idx}." + lst.next_idx += 1 + return ( + f'{maybe_space}' + f'.RS {lst.width}\n' + f"\\h'-{len(head) + 1}'\\fB{man_escape(head)}\\fP\\h'1'\\c" + ) + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return ".RE" + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.append(List(width=4, compact=bool(token.meta['compact']))) + return self._maybe_parbreak() + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.append("\\fI") + return "\\fI" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.pop() + return self._font_stack[-1] + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.append("\\fB") + return "\\fB" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._font_stack.pop() + return self._font_stack[-1] + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + s = man_escape(token.content).rstrip('\n') + return ( + '.sp\n' + '.RS 4\n' + '.nf\n' + f'{s}\n' + '.fi\n' + '.RE' + ) + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + maybe_par = self._maybe_parbreak("\n") + self._enter_block() + return ( + f"{maybe_par}" + ".RS 4\n" + f"\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c" + ) + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return ".RE" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open("Note") + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Caution") + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Important") + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Tip") + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_open( "Warning") + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonition_close() + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".RS 4" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".RE" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return ".PP" + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._enter_block() + return ".RS 4" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._leave_block() + return ".RE" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if token.meta['name'] in [ 'command', 'env', 'option' ]: + return f'\\fB{man_escape(token.content)}\\fP' + elif token.meta['name'] in [ 'file', 'var' ]: + return f'\\fI{man_escape(token.content)}\\fP' + elif token.meta['name'] == 'manpage': + [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] + section = section[:-1] + return f'\\fB{man_escape(page)}\\fP\\fR({man_escape(section)})\\fP' + else: + raise NotImplementedError("md node not supported yet", token) + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # mdoc knows no anchors so we can drop those, but classes must be rejected. + if 'class' in token.attrs: + return super().attr_span_begin(token, tokens, i, options, env) + return "" + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in manpages", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in manpages", token) + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # max item head width for a number, a dot, and one leading space and one trailing space + width = 3 + len(str(cast(int, token.meta['end']))) + self._list_stack.append( + List(width = width, + next_idx = cast(int, token.attrs.get('start', 1)), + compact = bool(token.meta['compact']))) + return self._maybe_parbreak() + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._list_stack.pop() + return "" diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py new file mode 100644 index 0000000000000..efc8b02e8d6b2 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py @@ -0,0 +1,227 @@ +import argparse +import json + +from abc import abstractmethod +from collections.abc import Mapping, MutableMapping, Sequence +from pathlib import Path +from typing import Any, cast, NamedTuple, Optional, Union +from xml.sax.saxutils import escape, quoteattr + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +from . import options +from .docbook import DocBookRenderer, Heading +from .md import Converter + +class ManualDocBookRenderer(DocBookRenderer): + _toplevel_tag: str + + def __init__(self, toplevel_tag: str, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._toplevel_tag = toplevel_tag + self.rules |= { + 'included_sections': lambda *args: self._included_thing("section", *args), + 'included_chapters': lambda *args: self._included_thing("chapter", *args), + 'included_preface': lambda *args: self._included_thing("preface", *args), + 'included_parts': lambda *args: self._included_thing("part", *args), + 'included_appendix': lambda *args: self._included_thing("appendix", *args), + 'included_options': self.included_options, + } + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + wanted = { 'h1': 'title' } + wanted |= { 'h2': 'subtitle' } if self._toplevel_tag == 'book' else {} + for (i, (tag, kind)) in enumerate(wanted.items()): + if len(tokens) < 3 * (i + 1): + raise RuntimeError(f"missing {kind} ({tag}) heading") + token = tokens[3 * i] + if token.type != 'heading_open' or token.tag != tag: + assert token.map + raise RuntimeError(f"expected {kind} ({tag}) heading in line {token.map[0] + 1}", token) + for t in tokens[3 * len(wanted):]: + if t.type != 'heading_open' or (info := wanted.get(t.tag)) is None: + continue + assert t.map + raise RuntimeError( + f"only one {info[0]} heading ({t.markup} [text...]) allowed per " + f"{self._toplevel_tag}, but found a second in lines [{t.map[0] + 1}..{t.map[1]}]. " + "please remove all such headings except the first or demote the subsequent headings.", + t) + + # books get special handling because they have *two* title tags. doing this with + # generic code is more complicated than it's worth. the checks above have verified + # that both titles actually exist. + if self._toplevel_tag == 'book': + assert tokens[1].children + assert tokens[4].children + if (maybe_id := cast(str, tokens[0].attrs.get('id', ""))): + maybe_id = "xml:id=" + quoteattr(maybe_id) + return (f'<book xmlns="http://docbook.org/ns/docbook"' + f' xmlns:xlink="http://www.w3.org/1999/xlink"' + f' {maybe_id} version="5.0">' + f' <title>{self.renderInline(tokens[1].children, options, env)}</title>' + f' <subtitle>{self.renderInline(tokens[4].children, options, env)}</subtitle>' + f' {super().render(tokens[6:], options, env)}' + f'</book>') + + return super().render(tokens, options, env) + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: + (tag, attrs) = super()._heading_tag(token, tokens, i, options, env) + # render() has already verified that we don't have supernumerary headings and since the + # book tag is handled specially we can leave the check this simple + if token.tag != 'h1': + return (tag, attrs) + return (self._toplevel_tag, attrs | { + 'xmlns': "http://docbook.org/ns/docbook", + 'xmlns:xlink': "http://www.w3.org/1999/xlink", + }) + + def _included_thing(self, tag: str, token: Token, tokens: Sequence[Token], i: int, + options: OptionsDict, env: MutableMapping[str, Any]) -> str: + result = [] + # close existing partintro. the generic render doesn't really need this because + # it doesn't have a concept of structure in the way the manual does. + if self._headings and self._headings[-1] == Heading('part', 1): + result.append("</partintro>") + self._headings[-1] = self._headings[-1]._replace(partintro_closed=True) + # must nest properly for structural includes. this requires saving at least + # the headings stack, but creating new renderers is cheap and much easier. + r = ManualDocBookRenderer(tag, self._manpage_urls, None) + for (included, path) in token.meta['included']: + try: + result.append(r.render(included, options, env)) + except Exception as e: + raise RuntimeError(f"rendering {path}") from e + return "".join(result) + def included_options(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return cast(str, token.meta['rendered-options']) + + # TODO minimize docbook diffs with existing conversions. remove soon. + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return super().paragraph_open(token, tokens, i, options, env) + "\n " + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + super().paragraph_close(token, tokens, i, options, env) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"<programlisting>\n{escape(token.content)}</programlisting>" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"<programlisting{info}>\n{escape(token.content)}</programlisting>" + +class DocBookConverter(Converter): + def __renderer__(self, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt]) -> ManualDocBookRenderer: + return ManualDocBookRenderer('book', manpage_urls, parser) + + _base_paths: list[Path] + _revision: str + + def __init__(self, manpage_urls: Mapping[str, str], revision: str): + super().__init__(manpage_urls) + self._revision = revision + + def convert(self, file: Path) -> str: + self._base_paths = [ file ] + try: + with open(file, 'r') as f: + return self._render(f.read()) + except Exception as e: + raise RuntimeError(f"failed to render manual {file}") from e + + def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: + tokens = super()._parse(src, env) + for token in tokens: + if token.type != "fence" or not token.info.startswith("{=include=} "): + continue + typ = token.info[12:].strip() + if typ == 'options': + token.type = 'included_options' + self._parse_options(token) + elif typ in [ 'sections', 'chapters', 'preface', 'parts', 'appendix' ]: + token.type = 'included_' + typ + self._parse_included_blocks(token, env) + else: + raise RuntimeError(f"unsupported structural include type '{typ}'") + return tokens + + def _parse_included_blocks(self, token: Token, env: Optional[MutableMapping[str, Any]]) -> None: + assert token.map + included = token.meta['included'] = [] + for (lnum, line) in enumerate(token.content.splitlines(), token.map[0] + 2): + line = line.strip() + path = self._base_paths[-1].parent / line + if path in self._base_paths: + raise RuntimeError(f"circular include found in line {lnum}") + try: + self._base_paths.append(path) + with open(path, 'r') as f: + tokens = self._parse(f.read(), env) + included.append((tokens, path)) + self._base_paths.pop() + except Exception as e: + raise RuntimeError(f"processing included file {path} from line {lnum}") from e + + def _parse_options(self, token: Token) -> None: + assert token.map + + items = {} + for (lnum, line) in enumerate(token.content.splitlines(), token.map[0] + 2): + if len(args := line.split(":", 1)) != 2: + raise RuntimeError(f"options directive with no argument in line {lnum}") + (k, v) = (args[0].strip(), args[1].strip()) + if k in items: + raise RuntimeError(f"duplicate options directive {k} in line {lnum}") + items[k] = v + try: + id_prefix = items.pop('id-prefix') + varlist_id = items.pop('list-id') + source = items.pop('source') + except KeyError as e: + raise RuntimeError(f"options directive {e} missing in block at line {token.map[0] + 1}") + if items.keys(): + raise RuntimeError( + f"unsupported options directives in block at line {token.map[0] + 1}", + " ".join(items.keys())) + + try: + conv = options.DocBookConverter( + self._manpage_urls, self._revision, False, 'fragment', varlist_id, id_prefix) + with open(self._base_paths[-1].parent / source, 'r') as f: + conv.add_options(json.load(f)) + token.meta['rendered-options'] = conv.finalize(fragment=True) + except Exception as e: + raise RuntimeError(f"processing options block in line {token.map[0] + 1}") from e + + + +def _build_cli_db(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('infile', type=Path) + p.add_argument('outfile', type=Path) + +def _run_cli_db(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = DocBookConverter(json.load(manpage_urls), args.revision) + converted = md.convert(args.infile) + args.outfile.write_text(converted) + +def build_cli(p: argparse.ArgumentParser) -> None: + formats = p.add_subparsers(dest='format', required=True) + _build_cli_db(formats.add_parser('docbook')) + +def run_cli(args: argparse.Namespace) -> None: + if args.format == 'docbook': + _run_cli_db(args) + else: + raise RuntimeError('format not hooked up', args) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py new file mode 100644 index 0000000000000..96cc8af69bce9 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py @@ -0,0 +1,505 @@ +from abc import ABC +from collections.abc import Mapping, MutableMapping, Sequence +from typing import Any, Callable, cast, get_args, Iterable, Literal, NoReturn, Optional + +import dataclasses +import re + +from .types import RenderFn + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from mdit_py_plugins.container import container_plugin # type: ignore[attr-defined] +from mdit_py_plugins.deflist import deflist_plugin # type: ignore[attr-defined] +from mdit_py_plugins.myst_role import myst_role_plugin # type: ignore[attr-defined] + +_md_escape_table = { + ord('*'): '\\*', + ord('<'): '\\<', + ord('['): '\\[', + ord('`'): '\\`', + ord('.'): '\\.', + ord('#'): '\\#', + ord('&'): '\\&', + ord('\\'): '\\\\', +} +def md_escape(s: str) -> str: + return s.translate(_md_escape_table) + +def md_make_code(code: str, info: str = "", multiline: Optional[bool] = None) -> str: + # for multi-line code blocks we only have to count ` runs at the beginning + # of a line, but this is much easier. + multiline = multiline or info != "" or '\n' in code + longest, current = (0, 0) + for c in code: + current = current + 1 if c == '`' else 0 + longest = max(current, longest) + # inline literals need a space to separate ticks from content, code blocks + # need newlines. inline literals need one extra tick, code blocks need three. + ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') + return f"{ticks}{info}{sep}{code}{sep}{ticks}" + +AttrBlockKind = Literal['admonition', 'example'] + +AdmonitionKind = Literal["note", "caution", "tip", "important", "warning"] + +class Renderer(markdown_it.renderer.RendererProtocol): + _admonitions: dict[AdmonitionKind, tuple[RenderFn, RenderFn]] + _admonition_stack: list[AdmonitionKind] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + self._manpage_urls = manpage_urls + self.rules = { + 'text': self.text, + 'paragraph_open': self.paragraph_open, + 'paragraph_close': self.paragraph_close, + 'hardbreak': self.hardbreak, + 'softbreak': self.softbreak, + 'code_inline': self.code_inline, + 'code_block': self.code_block, + 'link_open': self.link_open, + 'link_close': self.link_close, + 'list_item_open': self.list_item_open, + 'list_item_close': self.list_item_close, + 'bullet_list_open': self.bullet_list_open, + 'bullet_list_close': self.bullet_list_close, + 'em_open': self.em_open, + 'em_close': self.em_close, + 'strong_open': self.strong_open, + 'strong_close': self.strong_close, + 'fence': self.fence, + 'blockquote_open': self.blockquote_open, + 'blockquote_close': self.blockquote_close, + 'dl_open': self.dl_open, + 'dl_close': self.dl_close, + 'dt_open': self.dt_open, + 'dt_close': self.dt_close, + 'dd_open': self.dd_open, + 'dd_close': self.dd_close, + 'myst_role': self.myst_role, + "admonition_open": self.admonition_open, + "admonition_close": self.admonition_close, + "attr_span_begin": self.attr_span_begin, + "attr_span_end": self.attr_span_end, + "heading_open": self.heading_open, + "heading_close": self.heading_close, + "ordered_list_open": self.ordered_list_open, + "ordered_list_close": self.ordered_list_close, + "example_open": self.example_open, + "example_close": self.example_close, + } + + self._admonitions = { + "note": (self.note_open, self.note_close), + "caution": (self.caution_open,self.caution_close), + "tip": (self.tip_open, self.tip_close), + "important": (self.important_open, self.important_close), + "warning": (self.warning_open, self.warning_close), + } + self._admonition_stack = [] + + def _join_block(self, ls: Iterable[str]) -> str: + return "".join(ls) + def _join_inline(self, ls: Iterable[str]) -> str: + return "".join(ls) + + def admonition_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + tag = token.meta['kind'] + self._admonition_stack.append(tag) + return self._admonitions[tag][0](token, tokens, i, options, env) + def admonition_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonitions[self._admonition_stack.pop()][1](token, tokens, i, options, env) + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + def do_one(i: int, token: Token) -> str: + if token.type == "inline": + assert token.children is not None + return self.renderInline(token.children, options, env) + elif token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return self._join_block(map(lambda arg: do_one(*arg), enumerate(tokens))) + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + def do_one(i: int, token: Token) -> str: + if token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return self._join_inline(map(lambda arg: do_one(*arg), enumerate(tokens))) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def attr_span_end(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def example_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + +def _is_escaped(src: str, pos: int) -> bool: + found = 0 + while pos >= 0 and src[pos] == '\\': + found += 1 + pos -= 1 + return found % 2 == 1 + +# the contents won't be split apart in the regex because spacing rules get messy here +_ATTR_SPAN_PATTERN = re.compile(r"\{([^}]*)\}") +# this one is for blocks with attrs. we want to use it with fullmatch() to deconstruct an info. +_ATTR_BLOCK_PATTERN = re.compile(r"\s*\{([^}]*)\}\s*") + +def _parse_attrs(s: str) -> Optional[tuple[Optional[str], list[str]]]: + (id, classes) = (None, []) + for part in s.split(): + if part.startswith('#'): + if id is not None: + return None # just bail on multiple ids instead of trying to recover + id = part[1:] + elif part.startswith('.'): + classes.append(part[1:]) + else: + return None # no support for key=value attrs like in pandoc + + return (id, classes) + +def _parse_blockattrs(info: str) -> Optional[tuple[AttrBlockKind, Optional[str], list[str]]]: + if (m := _ATTR_BLOCK_PATTERN.fullmatch(info)) is None: + return None + if (parsed_attrs := _parse_attrs(m[1])) is None: + return None + id, classes = parsed_attrs + # check that we actually support this kind of block, and that is adheres to + # whetever restrictions we want to enforce for that kind of block. + if len(classes) == 1 and classes[0] in get_args(AdmonitionKind): + # don't want to support ids for admonitions just yet + if id is not None: + return None + return ('admonition', id, classes) + if classes == ['example']: + return ('example', id, classes) + return None + +def _attr_span_plugin(md: markdown_it.MarkdownIt) -> None: + def attr_span(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: + if state.src[state.pos] != '[': + return False + if _is_escaped(state.src, state.pos - 1): + return False + + # treat the inline span like a link label for simplicity. + label_begin = state.pos + 1 + label_end = markdown_it.helpers.parseLinkLabel(state, state.pos) + input_end = state.posMax + if label_end < 0: + return False + + # match id and classes in any combination + match = _ATTR_SPAN_PATTERN.match(state.src[label_end + 1 : ]) + if not match: + return False + + if not silent: + if (parsed_attrs := _parse_attrs(match[1])) is None: + return False + id, classes = parsed_attrs + + token = state.push("attr_span_begin", "span", 1) # type: ignore[no-untyped-call] + if id: + token.attrs['id'] = id + if classes: + token.attrs['class'] = " ".join(classes) + + state.pos = label_begin + state.posMax = label_end + state.md.inline.tokenize(state) + + state.push("attr_span_end", "span", -1) # type: ignore[no-untyped-call] + + state.pos = label_end + match.end() + 1 + state.posMax = input_end + return True + + md.inline.ruler.before("link", "attr_span", attr_span) + +def _inline_comment_plugin(md: markdown_it.MarkdownIt) -> None: + def inline_comment(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: + if state.src[state.pos : state.pos + 4] != '<!--': + return False + if _is_escaped(state.src, state.pos - 1): + return False + for i in range(state.pos + 4, state.posMax - 2): + if state.src[i : i + 3] == '-->': # --> + state.pos = i + 3 + return True + + return False + + md.inline.ruler.after("autolink", "inline_comment", inline_comment) + +def _block_comment_plugin(md: markdown_it.MarkdownIt) -> None: + def block_comment(state: markdown_it.rules_block.StateBlock, startLine: int, endLine: int, + silent: bool) -> bool: + pos = state.bMarks[startLine] + state.tShift[startLine] + posMax = state.eMarks[startLine] + + if state.src[pos : pos + 4] != '<!--': + return False + + nextLine = startLine + while nextLine < endLine: + pos = state.bMarks[nextLine] + state.tShift[nextLine] + posMax = state.eMarks[nextLine] + + if state.src[posMax - 3 : posMax] == '-->': + state.line = nextLine + 1 + return True + + nextLine += 1 + + return False + + md.block.ruler.after("code", "block_comment", block_comment) + +_HEADER_ID_RE = re.compile(r"\s*\{\s*\#([\w.-]+)\s*\}\s*$") + +def _heading_ids(md: markdown_it.MarkdownIt) -> None: + def heading_ids(state: markdown_it.rules_core.StateCore) -> None: + tokens = state.tokens + # this is purposely simple and doesn't support classes or other kinds of attributes. + for (i, token) in enumerate(tokens): + if token.type == 'heading_open': + children = tokens[i + 1].children + assert children is not None + if len(children) == 0 or children[-1].type != 'text': + continue + if m := _HEADER_ID_RE.search(children[-1].content): + tokens[i].attrs['id'] = m[1] + children[-1].content = children[-1].content[:-len(m[0])].rstrip() + + md.core.ruler.before("replacements", "heading_ids", heading_ids) + +def _compact_list_attr(md: markdown_it.MarkdownIt) -> None: + @dataclasses.dataclass + class Entry: + head: Token + end: int + compact: bool = True + + def compact_list_attr(state: markdown_it.rules_core.StateCore) -> None: + # markdown-it signifies wide lists by setting the wrapper paragraphs + # of each item to hidden. this is not useful for our stylesheets, which + # signify this with a special css class on list elements instead. + stack = [] + for token in state.tokens: + if token.type in [ 'bullet_list_open', 'ordered_list_open' ]: + stack.append(Entry(token, cast(int, token.attrs.get('start', 1)))) + elif token.type in [ 'bullet_list_close', 'ordered_list_close' ]: + lst = stack.pop() + lst.head.meta['compact'] = lst.compact + if token.type == 'ordered_list_close': + lst.head.meta['end'] = lst.end - 1 + elif len(stack) > 0 and token.type == 'paragraph_open' and not token.hidden: + stack[-1].compact = False + elif token.type == 'list_item_open': + stack[-1].end += 1 + + md.core.ruler.push("compact_list_attr", compact_list_attr) + +def _block_attr(md: markdown_it.MarkdownIt) -> None: + def assert_never(value: NoReturn) -> NoReturn: + assert False + + def block_attr(state: markdown_it.rules_core.StateCore) -> None: + stack = [] + for token in state.tokens: + if token.type == 'container_blockattr_open': + if (parsed_attrs := _parse_blockattrs(token.info)) is None: + # if we get here we've missed a possible case in the plugin validate function + raise RuntimeError("this should be unreachable") + kind, id, classes = parsed_attrs + if kind == 'admonition': + token.type = 'admonition_open' + token.meta['kind'] = classes[0] + stack.append('admonition_close') + elif kind == 'example': + token.type = 'example_open' + if id is not None: + token.attrs['id'] = id + stack.append('example_close') + else: + assert_never(kind) + elif token.type == 'container_blockattr_close': + token.type = stack.pop() + + md.core.ruler.push("block_attr", block_attr) + +class Converter(ABC): + __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] + + def __init__(self, manpage_urls: Mapping[str, str]): + self._manpage_urls = manpage_urls + + self._md = markdown_it.MarkdownIt( + "commonmark", + { + 'maxNesting': 100, # default is 20 + 'html': False, # not useful since we target many formats + 'typographer': True, # required for smartquotes + }, + renderer_cls=lambda parser: self.__renderer__(self._manpage_urls, parser) + ) + self._md.use( + container_plugin, + name="blockattr", + validate=lambda name, *args: _parse_blockattrs(name), + ) + self._md.use(deflist_plugin) + self._md.use(myst_role_plugin) + self._md.use(_attr_span_plugin) + self._md.use(_inline_comment_plugin) + self._md.use(_block_comment_plugin) + self._md.use(_heading_ids) + self._md.use(_compact_list_attr) + self._md.use(_block_attr) + self._md.enable(["smartquotes", "replacements"]) + + def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: + return self._md.parse(src, env if env is not None else {}) + + def _render(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> str: + env = {} if env is None else env + tokens = self._parse(src, env) + return self._md.renderer.render(tokens, self._md.options, env) # type: ignore[no-any-return] diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py new file mode 100644 index 0000000000000..f29d8fdb89682 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -0,0 +1,631 @@ +from __future__ import annotations + +import argparse +import json + +from abc import abstractmethod +from collections.abc import Mapping, MutableMapping, Sequence +from markdown_it.utils import OptionsDict +from markdown_it.token import Token +from typing import Any, Optional +from urllib.parse import quote +from xml.sax.saxutils import escape, quoteattr + +import markdown_it + +from . import parallel +from .asciidoc import AsciiDocRenderer, asciidoc_escape +from .commonmark import CommonMarkRenderer +from .docbook import DocBookRenderer, make_xml_id +from .manpage import ManpageRenderer, man_escape +from .md import Converter, md_escape, md_make_code +from .types import OptionLoc, Option, RenderedOption + +def option_is(option: Option, key: str, typ: str) -> Optional[dict[str, str]]: + if key not in option: + return None + if type(option[key]) != dict: + return None + if option[key].get('_type') != typ: # type: ignore[union-attr] + return None + return option[key] # type: ignore[return-value] + +class BaseConverter(Converter): + __option_block_separator__: str + + _options: dict[str, RenderedOption] + + def __init__(self, manpage_urls: Mapping[str, str], + revision: str, + markdown_by_default: bool): + super().__init__(manpage_urls) + self._options = {} + self._revision = revision + self._markdown_by_default = markdown_by_default + + def _sorted_options(self) -> list[tuple[str, RenderedOption]]: + keys = list(self._options.keys()) + keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) + for p in self._options[opt].loc ]) + return [ (k, self._options[k]) for k in keys ] + + def _format_decl_def_loc(self, loc: OptionLoc) -> tuple[Optional[str], str]: + # locations can be either plain strings (specific to nixpkgs), or attrsets + # { name = "foo/bar.nix"; url = "https://github.com/....."; } + if isinstance(loc, str): + # Hyperlink the filename either to the NixOS github + # repository (if it’s a module and we have a revision number), + # or to the local filesystem. + if not loc.startswith('/'): + if self._revision == 'local': + href = f"https://github.com/NixOS/nixpkgs/blob/master/{loc}" + else: + href = f"https://github.com/NixOS/nixpkgs/blob/{self._revision}/{loc}" + else: + href = f"file://{loc}" + # Print the filename and make it user-friendly by replacing the + # /nix/store/<hash> prefix by the default location of nixos + # sources. + if not loc.startswith('/'): + name = f"<nixpkgs/{loc}>" + elif 'nixops' in loc and '/nix/' in loc: + name = f"<nixops/{loc[loc.find('/nix/') + 5:]}>" + else: + name = loc + return (href, name) + else: + return (loc['url'] if 'url' in loc else None, loc['name']) + + @abstractmethod + def _decl_def_header(self, header: str) -> list[str]: raise NotImplementedError() + + @abstractmethod + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: raise NotImplementedError() + + @abstractmethod + def _decl_def_footer(self) -> list[str]: raise NotImplementedError() + + def _render_decl_def(self, header: str, locs: list[OptionLoc]) -> list[str]: + result = [] + result += self._decl_def_header(header) + for loc in locs: + href, name = self._format_decl_def_loc(loc) + result += self._decl_def_entry(href, name) + result += self._decl_def_footer() + return result + + def _render_code(self, option: Option, key: str) -> list[str]: + if lit := option_is(option, key, 'literalMD'): + return [ self._render(f"*{key.capitalize()}:*\n{lit['text']}") ] + elif lit := option_is(option, key, 'literalExpression'): + code = md_make_code(lit['text']) + return [ self._render(f"*{key.capitalize()}:*\n{code}") ] + elif key in option: + raise Exception(f"{key} has unrecognized type", option[key]) + else: + return [] + + def _render_description(self, desc: str | dict[str, str]) -> list[str]: + if isinstance(desc, str) and self._markdown_by_default: + return [ self._render(desc) ] if desc else [] + elif isinstance(desc, dict) and desc.get('_type') == 'mdDoc': + return [ self._render(desc['text']) ] if desc['text'] else [] + else: + raise Exception("description has unrecognized type", desc) + + @abstractmethod + def _related_packages_header(self) -> list[str]: raise NotImplementedError() + + def _convert_one(self, option: dict[str, Any]) -> list[str]: + blocks: list[list[str]] = [] + + if desc := option.get('description'): + blocks.append(self._render_description(desc)) + if typ := option.get('type'): + ro = " *(read only)*" if option.get('readOnly', False) else "" + blocks.append([ self._render(f"*Type:*\n{md_escape(typ)}{ro}") ]) + + if option.get('default'): + blocks.append(self._render_code(option, 'default')) + if option.get('example'): + blocks.append(self._render_code(option, 'example')) + + if related := option.get('relatedPackages'): + blocks.append(self._related_packages_header()) + blocks[-1].append(self._render(related)) + if decl := option.get('declarations'): + blocks.append(self._render_decl_def("Declared by", decl)) + if defs := option.get('definitions'): + blocks.append(self._render_decl_def("Defined by", defs)) + + for part in [ p for p in blocks[0:-1] if p ]: + part.append(self.__option_block_separator__) + + return [ l for part in blocks for l in part ] + + # this could return a TState parameter, but that does not allow dependent types and + # will cause headaches when using BaseConverter as a type bound anywhere. Any is the + # next best thing we can use, and since this is internal it will be mostly safe. + @abstractmethod + def _parallel_render_prepare(self) -> Any: raise NotImplementedError() + # this should return python 3.11's Self instead to ensure that a prepare+finish + # round-trip ends up with an object of the same type. for now we'll use BaseConverter + # since it's good enough so far. + @classmethod + @abstractmethod + def _parallel_render_init_worker(cls, a: Any) -> BaseConverter: raise NotImplementedError() + + def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: + try: + return RenderedOption(option['loc'], self._convert_one(option)) + except Exception as e: + raise Exception(f"Failed to render option {name}") from e + + @classmethod + def _parallel_render_step(cls, s: BaseConverter, a: Any) -> RenderedOption: + return s._render_option(*a) + + def add_options(self, options: dict[str, Any]) -> None: + mapped = parallel.map(self._parallel_render_step, options.items(), 100, + self._parallel_render_init_worker, self._parallel_render_prepare()) + for (name, option) in zip(options.keys(), mapped): + self._options[name] = option + + @abstractmethod + def finalize(self) -> str: raise NotImplementedError() + +class OptionDocsRestrictions: + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + def attr_span_begin(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + def example_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + +class OptionsDocBookRenderer(OptionDocsRestrictions, DocBookRenderer): + # TODO keep optionsDocBook diff small. remove soon if rendering is still good. + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + token.meta['compact'] = False + return super().ordered_list_open(token, tokens, i, options, env) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + token.meta['compact'] = False + return super().bullet_list_open(token, tokens, i, options, env) + +class DocBookConverter(BaseConverter): + __renderer__ = OptionsDocBookRenderer + __option_block_separator__ = "" + + def __init__(self, manpage_urls: Mapping[str, str], + revision: str, + markdown_by_default: bool, + document_type: str, + varlist_id: str, + id_prefix: str): + super().__init__(manpage_urls, revision, markdown_by_default) + self._document_type = document_type + self._varlist_id = varlist_id + self._id_prefix = id_prefix + + def _parallel_render_prepare(self) -> Any: + return (self._manpage_urls, self._revision, self._markdown_by_default, self._document_type, + self._varlist_id, self._id_prefix) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> DocBookConverter: + return cls(*a) + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + if lit := option_is(option, key, 'literalDocBook'): + return [ f"<para><emphasis>{key.capitalize()}:</emphasis> {lit['text']}</para>" ] + else: + return super()._render_code(option, key) + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + if isinstance(desc, str) and not self._markdown_by_default: + return [ f"<nixos:option-description><para>{desc}</para></nixos:option-description>" ] + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ + "<para>", + " <emphasis>Related packages:</emphasis>", + "</para>", + ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ + f"<para><emphasis>{header}:</emphasis></para>", + "<simplelist>" + ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + if href is not None: + href = " xlink:href=" + quoteattr(href) + return [ + f"<member><filename{href}>", + escape(name), + "</filename></member>" + ] + + def _decl_def_footer(self) -> list[str]: + return [ "</simplelist>" ] + + def finalize(self, *, fragment: bool = False) -> str: + result = [] + + if not fragment: + result.append('<?xml version="1.0" encoding="UTF-8"?>') + if self._document_type == 'appendix': + result += [ + '<appendix xmlns="http://docbook.org/ns/docbook"', + ' xml:id="appendix-configuration-options">', + ' <title>Configuration Options</title>', + ] + result += [ + f'<variablelist xmlns:xlink="http://www.w3.org/1999/xlink"', + ' xmlns:nixos="tag:nixos.org"', + ' xmlns="http://docbook.org/ns/docbook"', + f' xml:id="{self._varlist_id}">', + ] + + for (name, opt) in self._sorted_options(): + id = make_xml_id(self._id_prefix + name) + result += [ + "<varlistentry>", + # NOTE adding extra spaces here introduces spaces into xref link expansions + (f"<term xlink:href={quoteattr('#' + id)} xml:id={quoteattr(id)}>" + + f"<option>{escape(name)}</option></term>"), + "<listitem>" + ] + result += opt.lines + result += [ + "</listitem>", + "</varlistentry>" + ] + + result.append("</variablelist>") + if self._document_type == 'appendix': + result.append("</appendix>") + + return "\n".join(result) + +class OptionsManpageRenderer(OptionDocsRestrictions, ManpageRenderer): + pass + +class ManpageConverter(BaseConverter): + def __renderer__(self, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt] = None) -> OptionsManpageRenderer: + return OptionsManpageRenderer(manpage_urls, self._options_by_id, parser) + + __option_block_separator__ = ".sp" + + _options_by_id: dict[str, str] + _links_in_last_description: Optional[list[str]] = None + + def __init__(self, revision: str, markdown_by_default: bool, + *, + # only for parallel rendering + _options_by_id: Optional[dict[str, str]] = None): + self._options_by_id = _options_by_id or {} + super().__init__({}, revision, markdown_by_default) + + def _parallel_render_prepare(self) -> Any: + return ((self._revision, self._markdown_by_default), { '_options_by_id': self._options_by_id }) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> ManpageConverter: + return cls(*a[0], **a[1]) + + def _render_option(self, name: str, option: dict[str, Any]) -> RenderedOption: + assert isinstance(self._md.renderer, OptionsManpageRenderer) + links = self._md.renderer.link_footnotes = [] + result = super()._render_option(name, option) + self._md.renderer.link_footnotes = None + return result._replace(links=links) + + def add_options(self, options: dict[str, Any]) -> None: + for (k, v) in options.items(): + self._options_by_id[f'#{make_xml_id(f"opt-{k}")}'] = k + return super().add_options(options) + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + if lit := option_is(option, key, 'literalDocBook'): + raise RuntimeError("can't render manpages in the presence of docbook") + else: + assert isinstance(self._md.renderer, OptionsManpageRenderer) + try: + self._md.renderer.inline_code_is_quoted = False + return super()._render_code(option, key) + finally: + self._md.renderer.inline_code_is_quoted = True + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + if isinstance(desc, str) and not self._markdown_by_default: + raise RuntimeError("can't render manpages in the presence of docbook") + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ + '\\fIRelated packages:\\fP', + '.sp', + ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ + f'\\fI{man_escape(header)}:\\fP', + ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + return [ + '.RS 4', + f'\\fB{man_escape(name)}\\fP', + '.RE' + ] + + def _decl_def_footer(self) -> list[str]: + return [] + + def finalize(self) -> str: + result = [] + + result += [ + r'''.TH "CONFIGURATION\&.NIX" "5" "01/01/1980" "NixOS" "NixOS Reference Pages"''', + r'''.\" disable hyphenation''', + r'''.nh''', + r'''.\" disable justification (adjust text to left margin only)''', + r'''.ad l''', + r'''.\" enable line breaks after slashes''', + r'''.cflags 4 /''', + r'''.SH "NAME"''', + self._render('{file}`configuration.nix` - NixOS system configuration specification'), + r'''.SH "DESCRIPTION"''', + r'''.PP''', + self._render('The file {file}`/etc/nixos/configuration.nix` contains the ' + 'declarative specification of your NixOS system configuration. ' + 'The command {command}`nixos-rebuild` takes this file and ' + 'realises the system configuration specified therein.'), + r'''.SH "OPTIONS"''', + r'''.PP''', + self._render('You can use the following options in {file}`configuration.nix`.'), + ] + + for (name, opt) in self._sorted_options(): + result += [ + ".PP", + f"\\fB{man_escape(name)}\\fR", + ".RS 4", + ] + result += opt.lines + if links := opt.links: + result.append(self.__option_block_separator__) + md_links = "" + for i in range(0, len(links)): + md_links += "\n" if i > 0 else "" + if links[i].startswith('#opt-'): + md_links += f"{i+1}. see the {{option}}`{self._options_by_id[links[i]]}` option" + else: + md_links += f"{i+1}. " + md_escape(links[i]) + result.append(self._render(md_links)) + + result.append(".RE") + + result += [ + r'''.SH "AUTHORS"''', + r'''.PP''', + r'''Eelco Dolstra and the Nixpkgs/NixOS contributors''', + ] + + return "\n".join(result) + +class OptionsCommonMarkRenderer(OptionDocsRestrictions, CommonMarkRenderer): + pass + +class CommonMarkConverter(BaseConverter): + __renderer__ = OptionsCommonMarkRenderer + __option_block_separator__ = "" + + def _parallel_render_prepare(self) -> Any: + return (self._manpage_urls, self._revision, self._markdown_by_default) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> CommonMarkConverter: + return cls(*a) + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + # NOTE this duplicates the old direct-paste behavior, even if it is somewhat + # incorrect, since users rely on it. + if lit := option_is(option, key, 'literalDocBook'): + return [ f"*{key.capitalize()}:* {lit['text']}" ] + else: + return super()._render_code(option, key) + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + # NOTE this duplicates the old direct-paste behavior, even if it is somewhat + # incorrect, since users rely on it. + if isinstance(desc, str) and not self._markdown_by_default: + return [ desc ] + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ "*Related packages:*" ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ f"*{header}:*" ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + if href is not None: + return [ f" - [{md_escape(name)}]({href})" ] + return [ f" - {md_escape(name)}" ] + + def _decl_def_footer(self) -> list[str]: + return [] + + def finalize(self) -> str: + result = [] + + for (name, opt) in self._sorted_options(): + result.append(f"## {md_escape(name)}\n") + result += opt.lines + result.append("\n\n") + + return "\n".join(result) + +class OptionsAsciiDocRenderer(OptionDocsRestrictions, AsciiDocRenderer): + pass + +class AsciiDocConverter(BaseConverter): + __renderer__ = AsciiDocRenderer + __option_block_separator__ = "" + + def _parallel_render_prepare(self) -> Any: + return (self._manpage_urls, self._revision, self._markdown_by_default) + @classmethod + def _parallel_render_init_worker(cls, a: Any) -> AsciiDocConverter: + return cls(*a) + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + # NOTE this duplicates the old direct-paste behavior, even if it is somewhat + # incorrect, since users rely on it. + if lit := option_is(option, key, 'literalDocBook'): + return [ f"*{key.capitalize()}:* {lit['text']}" ] + else: + return super()._render_code(option, key) + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + # NOTE this duplicates the old direct-paste behavior, even if it is somewhat + # incorrect, since users rely on it. + if isinstance(desc, str) and not self._markdown_by_default: + return [ desc ] + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ "__Related packages:__" ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ f"__{header}:__\n" ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + if href is not None: + return [ f"* link:{quote(href, safe='/:')}[{asciidoc_escape(name)}]" ] + return [ f"* {asciidoc_escape(name)}" ] + + def _decl_def_footer(self) -> list[str]: + return [] + + def finalize(self) -> str: + result = [] + + for (name, opt) in self._sorted_options(): + result.append(f"== {asciidoc_escape(name)}\n") + result += opt.lines + result.append("\n\n") + + return "\n".join(result) + +def _build_cli_db(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('--document-type', required=True) + p.add_argument('--varlist-id', required=True) + p.add_argument('--id-prefix', required=True) + p.add_argument('--markdown-by-default', default=False, action='store_true') + p.add_argument("infile") + p.add_argument("outfile") + +def _build_cli_manpage(p: argparse.ArgumentParser) -> None: + p.add_argument('--revision', required=True) + p.add_argument("infile") + p.add_argument("outfile") + +def _build_cli_commonmark(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('--markdown-by-default', default=False, action='store_true') + p.add_argument("infile") + p.add_argument("outfile") + +def _build_cli_asciidoc(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('--markdown-by-default', default=False, action='store_true') + p.add_argument("infile") + p.add_argument("outfile") + +def _run_cli_db(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = DocBookConverter( + json.load(manpage_urls), + revision = args.revision, + markdown_by_default = args.markdown_by_default, + document_type = args.document_type, + varlist_id = args.varlist_id, + id_prefix = args.id_prefix) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def _run_cli_manpage(args: argparse.Namespace) -> None: + md = ManpageConverter( + revision = args.revision, + # manpage rendering only works if there's no docbook, so we can + # also set markdown_by_default with no ill effects. + markdown_by_default = True) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def _run_cli_commonmark(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = CommonMarkConverter( + json.load(manpage_urls), + revision = args.revision, + markdown_by_default = args.markdown_by_default) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def _run_cli_asciidoc(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = AsciiDocConverter( + json.load(manpage_urls), + revision = args.revision, + markdown_by_default = args.markdown_by_default) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def build_cli(p: argparse.ArgumentParser) -> None: + formats = p.add_subparsers(dest='format', required=True) + _build_cli_db(formats.add_parser('docbook')) + _build_cli_manpage(formats.add_parser('manpage')) + _build_cli_commonmark(formats.add_parser('commonmark')) + _build_cli_asciidoc(formats.add_parser('asciidoc')) + +def run_cli(args: argparse.Namespace) -> None: + if args.format == 'docbook': + _run_cli_db(args) + elif args.format == 'manpage': + _run_cli_manpage(args) + elif args.format == 'commonmark': + _run_cli_commonmark(args) + elif args.format == 'asciidoc': + _run_cli_asciidoc(args) + else: + raise RuntimeError('format not hooked up', args) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py new file mode 100644 index 0000000000000..c968d3a1322cf --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py @@ -0,0 +1,58 @@ +# this module only has to exist because cpython has a global interpreter lock +# and markdown-it is pure python code. ideally we'd just use thread pools, but +# the GIL prohibits this. + +import multiprocessing + +from typing import Any, Callable, ClassVar, Iterable, Optional, TypeVar + +R = TypeVar('R') +S = TypeVar('S') +T = TypeVar('T') +A = TypeVar('A') + +pool_processes: Optional[int] = None + +# this thing is impossible to type because there's so much global state involved. +# wrapping in a class to get access to Generic[] parameters is not sufficient +# because mypy is too weak, and unnecessarily obscures how much global state is +# needed in each worker to make this whole brouhaha work. +_map_worker_fn: Any = None +_map_worker_state_fn: Any = None +_map_worker_state_arg: Any = None + +def _map_worker_init(*args: Any) -> None: + global _map_worker_fn, _map_worker_state_fn, _map_worker_state_arg + (_map_worker_fn, _map_worker_state_fn, _map_worker_state_arg) = args + +# NOTE: the state argument is never passed by any caller, we only use it as a localized +# cache for the created state in lieu of another global. it is effectively a global though. +def _map_worker_step(arg: Any, state: Any = []) -> Any: + global _map_worker_fn, _map_worker_state_fn, _map_worker_state_arg + # if a Pool initializer throws it'll just be retried, leading to endless loops. + # doing the proper initialization only on first use avoids this. + if not state: + state.append(_map_worker_state_fn(_map_worker_state_arg)) + return _map_worker_fn(state[0], arg) + +def map(fn: Callable[[S, T], R], d: Iterable[T], chunk_size: int, + state_fn: Callable[[A], S], state_arg: A) -> list[R]: + """ + `[ fn(state, i) for i in d ]` where `state = state_fn(state_arg)`, but using multiprocessing + if `pool_processes` is not `None`. when using multiprocessing is used the state function will + be run once in ever worker process and `multiprocessing.Pool.imap` will be used. + + **NOTE:** neither `state_fn` nor `fn` are allowed to mutate global state! doing so will cause + discrepancies if `pool_processes` is not None, since each worker will have its own copy. + + **NOTE**: all data types that potentially cross a process boundary (so, all of them) must be + pickle-able. this excludes lambdas, bound functions, local functions, and a number of other + types depending on their exact internal structure. *theoretically* the pool constructor + can transfer non-pickleable data to worker processes, but this only works when using the + `fork` spawn method (and is thus not available on darwin or windows). + """ + if pool_processes is None: + state = state_fn(state_arg) + return [ fn(state, i) for i in d ] + with multiprocessing.Pool(pool_processes, _map_worker_init, (fn, state_fn, state_arg)) as p: + return list(p.imap(_map_worker_step, d, chunk_size)) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py new file mode 100644 index 0000000000000..d20e056aacdc7 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py @@ -0,0 +1,15 @@ +from collections.abc import Sequence, MutableMapping +from typing import Any, Callable, Optional, Tuple, NamedTuple + +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +OptionLoc = str | dict[str, str] +Option = dict[str, str | dict[str, str] | list[OptionLoc]] + +class RenderedOption(NamedTuple): + loc: list[str] + lines: list[str] + links: Optional[list[str]] = None + +RenderFn = Callable[[Token, Sequence[Token], int, OptionsDict, MutableMapping[str, Any]], str] diff --git a/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml b/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml new file mode 100644 index 0000000000000..d66643ef8421b --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml @@ -0,0 +1,15 @@ +[project] +name = "nixos-render-docs" +version = "0.0" +description = "Renderer for NixOS manual and option docs" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", +] + +[project.scripts] +nixos-render-docs = "nixos_render_docs:main" + +[build-system] +requires = ["setuptools"] diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py b/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py new file mode 100644 index 0000000000000..73a64fde8364e --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py @@ -0,0 +1,62 @@ +sample1 = """\ +:::: {.warning} +foo +::: {.note} +nested +::: +:::: + +[ + multiline +](link) + +{manpage}`man(1)` reference + +[some [nested]{#a} anchors]{#b} + +*emph* **strong** *nesting emph **and strong** and `code`* + +- wide bullet + +- list + +1. wide ordered + +2. list + +- narrow bullet +- list + +1. narrow ordered +2. list + +> quotes +>> with *nesting* +>> +>> nested code block +> +> - and lists +> - ``` +> containing code +> ``` +> +> and more quote + +100. list starting at 100 +1. goes on + +deflist +: > with a quote + > and stuff + + code block + + ``` + fenced block + ``` + + text + +more stuff in same deflist +: foo +""" diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py new file mode 100644 index 0000000000000..487506469954b --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py @@ -0,0 +1,143 @@ +import nixos_render_docs + +from sample_md import sample1 + +class Converter(nixos_render_docs.md.Converter): + __renderer__ = nixos_render_docs.asciidoc.AsciiDocRenderer + +def test_lists() -> None: + c = Converter({}) + # attaching to the nth ancestor list requires n newlines before the + + assert c._render("""\ +- a + + b +- c + - d + - e + + 1 + + f +""") == """\ +[] +* {empty}a ++ +b + +* {empty}c ++ +[options="compact"] +** {empty}d ++ +[] +** {empty}e ++ +1 + + ++ +f +""" + +def test_full() -> None: + c = Converter({ 'man(1)': 'http://example.org' }) + assert c._render(sample1) == """\ +[WARNING] +==== +foo + +[NOTE] +===== +nested +===== + +==== + + +link:link[ multiline ] + +link:http://example.org[man(1)] reference + +[[b]]some [[a]]nested anchors + +__emph__ **strong** __nesting emph **and strong** and ``code``__ + +[] +* {empty}wide bullet + +* {empty}list + + +[] +. {empty}wide ordered + +. {empty}list + + +[options="compact"] +* {empty}narrow bullet + +* {empty}list + + +[options="compact"] +. {empty}narrow ordered + +. {empty}list + + +[quote] +==== +quotes + +[quote] +===== +with __nesting__ + +---- +nested code block +---- +===== + +[options="compact"] +* {empty}and lists + +* {empty} ++ +---- +containing code +---- + + +and more quote +==== + +[start=100,options="compact"] +. {empty}list starting at 100 + +. {empty}goes on + + +[] + +deflist:: {empty} ++ +[quote] +===== +with a quote and stuff +===== ++ +---- +code block +---- ++ +---- +fenced block +---- ++ +text + + +more stuff in same deflist:: {empty}foo +""" diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py new file mode 100644 index 0000000000000..5e0d63eb6723d --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py @@ -0,0 +1,92 @@ +import nixos_render_docs + +from sample_md import sample1 + +from typing import Mapping, Optional + +import markdown_it + +class Converter(nixos_render_docs.md.Converter): + __renderer__ = nixos_render_docs.commonmark.CommonMarkRenderer + +# NOTE: in these tests we represent trailing spaces by ` ` and replace them with real space later, +# since a number of editors will strip trailing whitespace on save and that would break the tests. + +def test_indented_fence() -> None: + c = Converter({}) + s = """\ +> - ```foo +> thing +> +> rest +> ```\ +""".replace(' ', ' ') + assert c._render(s) == s + +def test_full() -> None: + c = Converter({ 'man(1)': 'http://example.org' }) + assert c._render(sample1) == f"""\ +**Warning:** foo + +**Note:** nested + +[ +multiline +](link) + +[` man(1) `](http://example.org) reference + +some nested anchors + +*emph* **strong** *nesting emph **and strong** and ` code `* + + - wide bullet + + - list + + 1. wide ordered + + 2. list + + - narrow bullet + - list + + 1. narrow ordered + 2. list + +> quotes +> +> > with *nesting* +> > +> > ``` +> > nested code block +> > ``` +> +> - and lists +> - ``` +> containing code +> ``` +> +> and more quote + + 100. list starting at 100 + 101. goes on + + - *deflist* + + > with a quote + > and stuff + + ``` + code block + ``` + + ``` + fenced block + ``` + + text + + - *more stuff in same deflist* + + foo""".replace(' ', ' ') diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py new file mode 100644 index 0000000000000..0b73cdc8e7c72 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py @@ -0,0 +1,102 @@ +import nixos_render_docs + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +def test_heading_id_absent() -> None: + c = Converter({}) + assert c._parse("# foo") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo', markup='', info='', meta={}, block=False, hidden=False) + ], + content='foo', markup='', info='', meta={}, block=True, hidden=False), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_present() -> None: + c = Converter({}) + assert c._parse("# foo {#foo}\n## bar { #bar}\n### bal { #bal} ") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'foo'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='heading_open', tag='h2', nesting=1, attrs={'id': 'bar'}, map=[1, 2], level=0, + children=None, content='', markup='##', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=1, + content='bar { #bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='bar', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h2', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='##', info='', meta={}, block=True, hidden=False), + Token(type='heading_open', tag='h3', nesting=1, attrs={'id': 'bal'}, map=[2, 3], level=0, + children=None, content='', markup='###', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[2, 3], level=1, + content='bal { #bal}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='bal', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h3', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='###', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_incomplete() -> None: + c = Converter({}) + assert c._parse("# foo {#}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_double() -> None: + c = Converter({}) + assert c._parse("# foo {#a} {#b}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'b'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#a} {#b}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#a}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_suffixed() -> None: + c = Converter({}) + assert c._parse("# foo {#a} s") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#a} s', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#a} s', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py new file mode 100644 index 0000000000000..660c410a85cca --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py @@ -0,0 +1,186 @@ +import nixos_render_docs +import pytest + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +@pytest.mark.parametrize("ordered", [True, False]) +def test_list_wide(ordered: bool) -> None: + t, tag, m, e1, e2, i1, i2 = ( + ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") + ) + c = Converter({}) + meta = { 'end': int(e2[:-1]) } if ordered else {} + meta['compact'] = False + assert c._parse(f"{e1} a\n\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 3], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 2], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=3, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[2, 3], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[2, 3], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[2, 3], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + +@pytest.mark.parametrize("ordered", [True, False]) +def test_list_narrow(ordered: bool) -> None: + t, tag, m, e1, e2, i1, i2 = ( + ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") + ) + c = Converter({}) + meta = { 'end': int(e2[:-1]) } if ordered else {} + meta['compact'] = True + assert c._parse(f"{e1} a\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=3, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + assert c._parse(f"{e1} - a\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={'compact': True}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=5, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + assert c._parse(f"{e1} - a\n{e2} - b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta=meta, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={'compact': True}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=5, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={}, map=[1, 2], level=2, + children=None, content='', markup='-', info='', meta={'compact': True}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=5, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py new file mode 100644 index 0000000000000..fbfd21358a857 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py @@ -0,0 +1,177 @@ +import nixos_render_docs + +from sample_md import sample1 + +from typing import Mapping, Optional + +import markdown_it + +class Converter(nixos_render_docs.md.Converter): + def __renderer__(self, manpage_urls: Mapping[str, str], + parser: Optional[markdown_it.MarkdownIt] = None + ) -> nixos_render_docs.manpage.ManpageRenderer: + return nixos_render_docs.manpage.ManpageRenderer(manpage_urls, self.options_by_id, parser) + + def __init__(self, manpage_urls: Mapping[str, str], options_by_id: dict[str, str] = {}): + self.options_by_id = options_by_id + super().__init__(manpage_urls) + +def test_inline_code() -> None: + c = Converter({}) + assert c._render("1 `x a x` 2") == "1 \\fR\\(oqx a x\\(cq\\fP 2" + +def test_fonts() -> None: + c = Converter({}) + assert c._render("*a **b** c*") == "\\fIa \\fBb\\fI c\\fR" + assert c._render("*a [1 `2`](3) c*") == "\\fIa \\fB1 \\fR\\(oq2\\(cq\\fP\\fI c\\fR" + +def test_expand_link_targets() -> None: + c = Converter({}, { '#foo1': "bar", "#foo2": "bar" }) + assert (c._render("[a](#foo1) [](#foo2) [b](#bar1) [](#bar2)") == + "\\fBa\\fR \\fBbar\\fR \\fBb\\fR \\fB\\fR") + +def test_collect_links() -> None: + c = Converter({}, { '#foo': "bar" }) + assert isinstance(c._md.renderer, nixos_render_docs.manpage.ManpageRenderer) + c._md.renderer.link_footnotes = [] + assert c._render("[a](link1) [b](link2)") == "\\fBa\\fR[1]\\fR \\fBb\\fR[2]\\fR" + assert c._md.renderer.link_footnotes == ['link1', 'link2'] + +def test_dedup_links() -> None: + c = Converter({}, { '#foo': "bar" }) + assert isinstance(c._md.renderer, nixos_render_docs.manpage.ManpageRenderer) + c._md.renderer.link_footnotes = [] + assert c._render("[a](link) [b](link)") == "\\fBa\\fR[1]\\fR \\fBb\\fR[1]\\fR" + assert c._md.renderer.link_footnotes == ['link'] + +def test_full() -> None: + c = Converter({ 'man(1)': 'http://example.org' }) + assert c._render(sample1) == """\ +.sp +.RS 4 +\\fBWarning\\fP +.br +foo +.sp +.RS 4 +\\fBNote\\fP +.br +nested +.RE +.RE +.sp +\\fBmultiline\\fR +.sp +\\fBman\\fP\\fR(1)\\fP reference +.sp +some nested anchors +.sp +\\fIemph\\fR \\fBstrong\\fR \\fInesting emph \\fBand strong\\fI and \\fR\\(oqcode\\(cq\\fP\\fR +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +wide bullet +.RE +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-3'\\fB1\\&.\\fP\\h'1'\\c +wide ordered +.RE +.sp +.RS 4 +\\h'-3'\\fB2\\&.\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +narrow bullet +.RE +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-3'\\fB1\\&.\\fP\\h'1'\\c +narrow ordered +.RE +.RS 4 +\\h'-3'\\fB2\\&.\\fP\\h'1'\\c +list +.RE +.sp +.RS 4 +\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c +quotes +.sp +.RS 4 +\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c +with \\fInesting\\fR +.sp +.RS 4 +.nf +nested code block +.fi +.RE +.RE +.sp +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +and lists +.RE +.RS 4 +\\h'-2'\\fB\\[u2022]\\fP\\h'1'\\c +.sp +.RS 4 +.nf +containing code +.fi +.RE +.RE +.sp +and more quote +.RE +.sp +.RS 6 +\\h'-5'\\fB100\\&.\\fP\\h'1'\\c +list starting at 100 +.RE +.RS 6 +\\h'-5'\\fB101\\&.\\fP\\h'1'\\c +goes on +.RE +.RS 4 +.PP +deflist +.RS 4 +.RS 4 +\\h'-3'\\fI\\(lq\\(rq\\fP\\h'1'\\c +with a quote and stuff +.RE +.sp +.RS 4 +.nf +code block +.fi +.RE +.sp +.RS 4 +.nf +fenced block +.fi +.RE +.sp +text +.RE +.PP +more stuff in same deflist +.RS 4 +foo +.RE +.RE""" diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py new file mode 100644 index 0000000000000..9608ed6392188 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py @@ -0,0 +1,14 @@ +import nixos_render_docs + +from markdown_it.token import Token +import pytest + +def test_option_headings() -> None: + c = nixos_render_docs.options.DocBookConverter({}, 'local', False, 'none', 'vars', 'opt-') + with pytest.raises(RuntimeError) as exc: + c._render("# foo") + assert exc.value.args[0] == 'md token not supported in options doc' + assert exc.value.args[1] == Token( + type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False + ) diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py new file mode 100644 index 0000000000000..1d836a916d964 --- /dev/null +++ b/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -0,0 +1,452 @@ +import nixos_render_docs + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +def test_attr_span_parsing() -> None: + c = Converter({}) + assert c._parse("[]{#test}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[]{#test}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{.test}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[]{.test}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'class': 'test'}, map=None, + level=0, children=None, content='', markup='', info='', meta={}, block=False, + hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{.test1 .test2 #foo .test3 .test4}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[]{.test1 .test2 #foo .test3 .test4}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, + attrs={'class': 'test1 test2 test3 test4', 'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{#a #a}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[]{#a #a}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[]{#a #a}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("[]{foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[]{foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[]{foo}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_attr_span_formatted() -> None: + c = Converter({}) + assert c._parse("a[b c `d` ***e***]{#test}f") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a[b c `d` ***e***]{#test}f', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, + children=None, content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='b c ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=1, + children=None, content='d', markup='`', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=1, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_open', tag='strong', nesting=1, attrs={}, map=None, level=2, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=3, children=None, + content='e', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_close', tag='strong', nesting=-1, attrs={}, map=None, level=2, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='f', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_attr_span_in_heading() -> None: + c = Converter({}) + # inline anchors in headers are allowed, but header attributes should be preferred + assert c._parse("# foo []{#bar} baz") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo []{#bar} baz', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' baz', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_attr_span_on_links() -> None: + c = Converter({}) + assert c._parse("[ [a](#bar) ]{#foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[ [a](#bar) ]{#foo}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_open', tag='a', nesting=1, attrs={'href': '#bar'}, map=None, level=1, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_close', tag='a', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_attr_span_nested() -> None: + # inline anchors may contain more anchors (even though this is a bit pointless) + c = Converter({}) + assert c._parse("[ [a]{#bar} ]{#foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[ [a]{#bar} ]{#foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=1, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=1, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_attr_span_escaping() -> None: + c = Converter({}) + assert c._parse("\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("\\\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='\\', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_begin', tag='span', nesting=1, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='attr_span_end', tag='span', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("\\\\\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='\\[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + ], + content='\\\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_basic() -> None: + c = Converter({}) + assert c._parse("a <!-- foo --><!----> b") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a <!-- foo --><!----> b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a<!-- b -->") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a<!-- b -->', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_does_not_nest_in_code() -> None: + c = Converter({}) + assert c._parse("`a<!-- b -->c`") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='`a<!-- b -->c`', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=0, children=None, + content='a<!-- b -->c', markup='`', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_does_not_nest_elsewhere() -> None: + c = Converter({}) + assert c._parse("*a<!-- b -->c*") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='*a<!-- b -->c*', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='ac', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_can_be_escaped() -> None: + c = Converter({}) + assert c._parse("a\\<!-- b -->c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a\\<!-- b -->c', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a<!-- b -->c', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a\\\\<!-- b -->c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a\\c', markup='', info='', meta={}, block=False, hidden=False) + ], + content='a\\\\<!-- b -->c', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a\\\\\\<!-- b -->c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a\\<!-- b -->c', markup='', info='', meta={}, block=False, hidden=False) + ], + content='a\\\\\\<!-- b -->c', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_block_comment() -> None: + c = Converter({}) + assert c._parse("<!-- a -->") == [] + assert c._parse("<!-- a\n-->") == [] + assert c._parse("<!--\na\n-->") == [] + assert c._parse("<!--\n\na\n\n-->") == [] + assert c._parse("<!--\n\n```\n\n\n```\n\n-->") == [] + +def test_heading_attributes() -> None: + c = Converter({}) + assert c._parse("# foo *bar* {#hid}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'hid'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo *bar* {#hid}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='bar', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("# foo--bar {#id-with--double-dashes}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'id-with--double-dashes'}, map=[0, 1], + level=0, children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo--bar {#id-with--double-dashes}', markup='', info='', meta={}, block=True, + hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo–bar', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_admonitions() -> None: + c = Converter({}) + assert c._parse("::: {.note}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.note}', meta={'kind': 'note'}, block=True, + hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.caution}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.caution}', meta={'kind': 'caution'}, + block=True, hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.tip}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.tip}', meta={'kind': 'tip'}, block=True, + hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.important}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.important}', meta={'kind': 'important'}, + block=True, hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.warning}") == [ + Token(type='admonition_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {.warning}', meta={'kind': 'warning'}, + block=True, hidden=False), + Token(type='admonition_close', tag='div', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + +def test_example() -> None: + c = Converter({}) + assert c._parse("::: {.example}") == [ + Token(type='example_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup=':::', info=' {.example}', meta={}, block=True, hidden=False), + Token(type='example_close', tag='div', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {#eid .example}") == [ + Token(type='example_open', tag='div', nesting=1, attrs={'id': 'eid'}, map=[0, 1], level=0, + children=None, content='', markup=':::', info=' {#eid .example}', meta={}, block=True, + hidden=False), + Token(type='example_close', tag='div', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=':::', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("::: {.example .note}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='::: {.example .note}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='::: {.example .note}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index c923b5a05824f..87bba496859f4 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.10"; + version = "2.12.11"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-VKgnnrEG1cx4cx6StWh+XaCe5meSU9LqZRH1ElMQkfk="; + sha256 = "sha256-vhEjzCuMvMZmzkCQK25JG3tT33KnX2fJbqdaTaeuhgo="; }; nativeBuildInputs = [ pkg-config scdoc ] @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "PKGCONFIGDIR=$(out)/lib/pkgconfig" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=unused-result" "-Wno-error=deprecated-declarations" ]; diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 556b96ea2095e..3fa9528add12b 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -40,7 +40,7 @@ let # Workaround build failure on -fno-common toolchains: # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index cad54499e3044..e4edd20221a50 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-fFD2P6j4sozee0UFXfFok304LyiwBF1RM4KbcGNu+HI="; + hash = "sha256-cR0ixSnvyj6ZQ9rZielxXr8JfmMJKNru3S++WH4O/YU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 77fed6e67e7d2..c7e9581d99b2a 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "apx"; - version = "1.4.2"; + version = "1.7.0-1"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = pname; - rev = version; - sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY="; + rev = "v${version}"; + hash = "sha256-tonI3S0a08MbR369qaKS2BoWc3QzXWzTuGx/zSgUz7s="; }; vendorSha256 = null; diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 43a32eccda16d..2e0ceb53e4f9c 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ../readelf-mini/libreadelf-mini.a(dwarf.o):/build/source/readelf-mini/dwarf.c:64: # multiple definition of `do_wide'; ../readelf-mini/libreadelf-mini.a(readelf-mini.o):/build/source/readelf-mini/readelf-mini.c:170: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' install -d $out/bin diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index d46db680c88f6..d980143281f4a 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-EPrXIDi0yO+AVriQgi3t91CLtmYtgmyEfWtFD+wH8As="; + hash = "sha256-5M2VVrYH+IAa1P7Qz9gUPS3YNdqeVOoa1riV8eTtoYE="; }; - cargoHash = "sha256-/1b3GF0flhvejZ3C/yOzRGl50sWR4IxprwRoMUYEvm8="; + cargoHash = "sha256-kdhzoExiUAevid5NCCDTkK5CO+esa/SRGOcrITlr2fo="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 1df83b44ca62d..e79bfc889dcfa 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -2,19 +2,21 @@ , stdenv , fetchFromGitHub , fetchpatch +, bzip2 , cli11 , cmake , curl , ghc_filesystem , libarchive , libsolv -, libyamlcpp +, yaml-cpp , nlohmann_json , python3 , reproc , spdlog , termcolor , tl-expected +, fmt_9 }: let @@ -34,33 +36,39 @@ let }); spdlog' = spdlog.overrideAttrs (oldAttrs: { - # Required for header files. See alse: - # https://github.com/gabime/spdlog/pull/1241 (current solution) - # https://github.com/gabime/spdlog/issues/1897 (previous solution) - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DSPDLOG_FMT_EXTERNAL=OFF" - ]; + # Use as header-only library. + # + # Spdlog 1.11 requires fmt version 8 while micromamba requires + # version 9. spdlog may use its bundled version of fmt, + # though. Micromamba is not calling spdlog functions with + # fmt-types in their signature. I.e. we get away with removing + # fmt_8 from spdlog's propagated dependencies and using fmt_9 for + # micromamba itself. + dontBuild = true; + cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DSPDLOG_FMT_EXTERNAL=OFF" ]; + propagatedBuildInputs = []; }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-t1DfLwBGW6MfazuFludn6/fdYWFaMnkhXva6bvus694="; + sha256 = "sha256-KGlH5i/lI6c1Jj1ttAOrip8BKECaea5D202TJMcFDmM="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ + bzip2 cli11 nlohmann_json curl libarchive - libyamlcpp + yaml-cpp libsolv' reproc spdlog' @@ -68,6 +76,7 @@ stdenv.mkDerivation rec { ghc_filesystem python3 tl-expected + fmt_9 ]; cmakeFlags = [ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 4647ce071d2d3..bf407558d485c 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.23.0"; + version = "2.26.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g6Rnn5IcuyY3117vDNT9BzG7OtZNsw3Jnmggnjjtj+U="; + sha256 = "sha256-MRtmfRriHArmzSfSr4Wf3+2wA3sOlHZs2HKQ2d+Bd20="; }; - vendorHash = "sha256-olzrU2kari2r/wjhtS7QWj9yU8T9lKlfXXA8z/Dbqm8="; + vendorHash = "sha256-UUpi/6R36g6ofnEmn/qxEeJlzM/INYD4FuvRaBZ6pss="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 51d70f15dfcb6..3d42d4907e79f 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-HSgW9qKXIWu+nzlWjR7HoIrjO1yn48a0U/E76VwrpQ0="; + hash = "sha256-O0Ro9vwf2kDhGFs32puQIeW/rSSduC9sD5zV8e/GtvA="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 8771411262166..246e7c9c98100 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "sha256-TDGtnSgY897fRm1BWLlQZQa8v6Wu5/JIF4UH+1CZm4U="; + sha256 = "sha256-/btQP7I4zpIA0MWEQJVYnR1XhyudPnYD5Qx4vrW+Uq8="; }; - cargoSha256 = "sha256-z1lLpZBD4HjO6gLw96wbucfchRgZs26Q8Gl+hpUB1xo="; + cargoSha256 = "sha256-CzLBOLtzIYqdWjTDKHVnc1YXXyj1HqvXzoFYHS0qxog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl sqlite ] diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 2e20f1ad3dc2f..a24fd43bc6fa0 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-7HZ5LEQAhA1TXQZVfeUGOruwgqJBkSFtmDLR8PLSiOw="; + sha256 = "sha256-Q3yExefODBrrziRnCYETrJgSn42BOR7ZsL8pu3q5D/w="; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 72978db577a6b..f0032916db9d3 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -169,6 +169,8 @@ self = stdenv.mkDerivation { "--disable-init-state" ] ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" + ] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [ + "--enable-embedded-sandbox-shell" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [ "--with-system=${stdenv.hostPlatform.nix.system}" ] ++ lib.optionals (!withLibseccomp) [ @@ -179,6 +181,10 @@ self = stdenv.mkDerivation { ]; makeFlags = [ + # gcc runs multi-threaded LTO using make and does not yet detect the new fifo:/path style + # of make jobserver. until gcc adds support for this we have to instruct make to use this + # old style or LTO builds will run their linking on only one thread, which takes forever. + "--jobserver-style=pipe" "profiledir=$(out)/etc/profile.d" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0" ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1534de533cbee..365ec641c1384 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -39,6 +39,13 @@ let aws-sdk-cpp = aws-sdk-cpp-nix; }; + # https://github.com/NixOS/nix/pull/7585 + patch-monitorfdhup = fetchpatch2 { + name = "nix-7585-monitor-fd-hup.patch"; + url = "https://github.com/NixOS/nix/commit/1df3d62c769dc68c279e89f68fdd3723ed3bcb5a.patch"; + sha256 = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk="; + }; + # https://github.com/NixOS/nix/pull/7473 patch-sqlite-exception = fetchpatch2 { name = "nix-7473-sqlite-exception-add-message.patch"; @@ -53,6 +60,9 @@ in lib.makeExtensible (self: { url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; }; + patches = [ + patch-monitorfdhup + ]; }).override { boehmgc = boehmgc-nix_2_3; }; nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; @@ -78,6 +88,7 @@ in lib.makeExtensible (self: { url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; }) + patch-monitorfdhup patch-sqlite-exception ]; }; @@ -93,22 +104,24 @@ in lib.makeExtensible (self: { url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; }) + patch-monitorfdhup patch-sqlite-exception ]; }; nix_2_12 = common { - version = "2.12.0"; - sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI="; + version = "2.12.1"; + sha256 = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU="; patches = [ ./patches/flaky-tests.patch + patch-monitorfdhup patch-sqlite-exception ]; }; nix_2_13 = common { - version = "2.13.2"; - sha256 = "sha256-MtVatZVsV+dtjdD4AC4bztrnDFas+WZYHzQMt41FwzU="; + version = "2.13.3"; + sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; }; stable = self.nix_2_13; diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 3c44dbdbe1440..0796a0914f1f5 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -40,6 +40,4 @@ stdenv.mkDerivation { ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - preBuild = "unset NIX_INDENT_MAKE"; } diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 2fbdebebb10d3..f62e6e246f691 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,21 +1,48 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, xz, attr, acl, libxml2 -, autoreconfHook }: +{ lib +, stdenv +, fetchurl +, pkg-config +, curl +, gpgme +, libarchive +, bzip2 +, xz +, attr +, acl +, libxml2 +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "0.6.0"; pname = "opkg"; + version = "0.6.1"; + src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "sha256-VoRHIu/yN9rxSqbmgUNvMkUhPFWQ7QzaN6ed9jf/Okw="; + hash = "sha256-6H/MtXXGTTrAVZREAWonlfEhJZhqDaiWurl8ShovGyo="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ curl gpgme libarchive bzip2 xz attr acl libxml2 ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + curl + gpgme + libarchive + bzip2 + xz + attr + acl + libxml2 + ]; meta = with lib; { description = "A lightweight package management system based upon ipkg"; homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; - license = licenses.gpl2; + changelog = "https://git.yoctoproject.org/opkg/tree/NEWS?h=v${version}"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index dd11549663c9a..53975a024b7a0 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,15 +24,19 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.3.4"; + version = "2.4.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zaSNM5Ey4oI2MtUPYBHG0PCMgJdasVatwkjaRBrT1RQ="; + hash = "sha256-g+fQxq2kwhNXXEJG2n5n4f9GMkmmLsjpHoay152fcVQ="; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = [ blinker cachecontrol @@ -40,9 +44,6 @@ buildPythonApplication rec { findpython installer packaging - pdm-pep517 - pep517 - pip platformdirs pyproject-hooks python-dotenv @@ -50,20 +51,22 @@ buildPythonApplication rec { resolvelib rich shellingham - tomli tomlkit unearth virtualenv ] ++ cachecontrol.optional-dependencies.filecache - ++ lib.optionals (pythonOlder "3.8") [ + ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - typing-extensions ]; nativeCheckInputs = [ pytestCheckHook pytest-mock + pytest-rerunfailures pytest-xdist ]; @@ -83,8 +86,11 @@ buildPythonApplication rec { "test_use_invalid_wrapper_python" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://pdm.fming.dev"; + changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; description = "A modern Python package manager with PEP 582 support"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix new file mode 100644 index 0000000000000..a2bac43e5924e --- /dev/null +++ b/pkgs/tools/package-management/pkg/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl +, bzip2, libarchive, libbsd, lzma, openssl, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pkg"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "freebsd"; + repo = "pkg"; + rev = finalAttrs.version; + sha256 = "W66g8kVvaPJSyOZcgyDcUBrWQQ5YDkRqofSWfIsjd+k="; + }; + + setOutputFlags = false; + separateDebugInfo = true; + + nativeBuildInputs = [ m4 pkg-config tcl ]; + buildInputs = [ bzip2 libarchive lzma openssl zlib ] + ++ lib.optional stdenv.isLinux libbsd; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/etc + ''; + + meta = with lib; { + homepage = "https://github.com/freebsd/pkg"; + description = "Package management tool for FreeBSD"; + maintainers = with maintainers; [ qyliss ]; + platforms = with platforms; darwin ++ freebsd ++ linux ++ netbsd ++ openbsd; + license = licenses.bsd2; + }; +}) diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 069b6f24eaa56..eaaa2dc57d475 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -1,13 +1,13 @@ { lib -, stdenv , python3 -, fetchFromGitHub -, installShellFiles }: let python = python3.override { packageOverrides = self: super: { + poetry = self.callPackage ./unwrapped.nix { }; + + # version overrides required by poetry and its plugins dulwich = super.dulwich.overridePythonAttrs (old: rec { version = "0.20.50"; src = self.fetchPypi { @@ -18,118 +18,30 @@ let }); }; }; -in python.pkgs.buildPythonApplication rec { - pname = "poetry"; - version = "1.3.2"; - format = "pyproject"; - - disabled = python.pkgs.pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "python-poetry"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + plugins = with python.pkgs; { + poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { }; + poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { }; }; - nativeBuildInputs = [ - installShellFiles - ]; - - propagatedBuildInputs = with python.pkgs; [ - cachecontrol - cleo - crashtest - dulwich - filelock - html5lib - jsonschema - keyring - packaging - pexpect - pkginfo - platformdirs - poetry-core - poetry-plugin-export - requests - requests-toolbelt - shellingham - tomlkit - trove-classifiers - virtualenv - ] ++ lib.optionals (stdenv.isDarwin) [ - xattr - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.8") [ - backports-cached-property - ] ++ cachecontrol.optional-dependencies.filecache; - - postInstall = '' - installShellCompletion --cmd poetry \ - --bash <($out/bin/poetry completions bash) \ - --fish <($out/bin/poetry completions fish) \ - --zsh <($out/bin/poetry completions zsh) \ - ''; - - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; + # selector is a function mapping pythonPackages to a list of plugins + # e.g. poetry.withPlugins (ps: with ps; [ poetry-plugin-up ]) + withPlugins = selector: let + selected = selector plugins; + in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selected; - nativeCheckInputs = with python.pkgs; [ - cachy - deepdiff - flatdict - pytestCheckHook - httpretty - pytest-mock - pytest-xdist - ]; + # save some build time when adding plugins by disabling tests + doCheck = selected == [ ]; - preCheck = ('' - export HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 - export no_proxy='*'; - ''); + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; - postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - unset no_proxy - ''; - - disabledTests = [ - # touches network - "git" - "solver" - "load" - "vcs" - "prereleases_if_they_are_compatible" - "test_executor" - # requires git history to work correctly - "default_with_excluded_data" - # toml ordering has changed - "lock" - # fs permission errors - "test_builder_should_execute_build_scripts" - ] ++ lib.optionals (python.pythonAtLeast "3.10") [ - # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended - "test_info_setup_complex_pep517_error" - ]; - - # Allow for package to use pep420's native namespaces - pythonNamespaces = [ - "poetry" - ]; - - meta = with lib; { - changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; - homepage = "https://python-poetry.org/"; - description = "Python dependency management and packaging made easy"; - license = licenses.mit; - maintainers = with maintainers; [ jakewaksbaum dotlambda ]; - }; -} + passthru = rec { + inherit plugins withPlugins; + }; + })); +in withPlugins (ps: [ ]) diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix b/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix new file mode 100644 index 0000000000000..85eb0b5d19b11 --- /dev/null +++ b/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, poetry +, safety +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "poetry-audit-plugin"; + version = "0.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "opeco17"; + repo = "poetry-audit-plugin"; + rev = "refs/tags/${version}"; + hash = "sha256-49OnYz3EFiqOe+cLgfynjy14Ve4Ga6OUrLdM8HhZuKQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + safety + ]; + + pythonImportsCheck = [ "poetry_audit_plugin" ]; + + nativeCheckInputs = [ + poetry # for the executable + pytestCheckHook + ]; + + # requires networking + doCheck = false; + + meta = { + description = "Poetry plugin for checking security vulnerabilities in dependencies"; + homepage = "https://github.com/opeco17/poetry-audit-plugin"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix new file mode 100644 index 0000000000000..e84546573dacc --- /dev/null +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytestCheckHook +, pytest-mock +, poetry +}: + +buildPythonPackage rec { + pname = "poetry-plugin-up"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "MousaZeidBaker"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-16p0emvgWa56Km8U5HualCSStbulqyINbC3Jez9Y1n0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + poetry + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Poetry plugin to simplify package updates"; + homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up"; + changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; + license = licenses.mit; + maintainers = [ maintainers.k900 ]; + }; +} diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix new file mode 100644 index 0000000000000..e98c571ddb75f --- /dev/null +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -0,0 +1,149 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, installShellFiles +, cachecontrol +, cleo +, crashtest +, dulwich +, filelock +, html5lib +, jsonschema +, keyring +, packaging +, pexpect +, pkginfo +, platformdirs +, poetry-core +, poetry-plugin-export +, requests +, requests-toolbelt +, shellingham +, tomlkit +, trove-classifiers +, virtualenv +, xattr +, tomli +, importlib-metadata +, backports-cached-property +, cachy +, deepdiff +, flatdict +, pytestCheckHook +, httpretty +, pytest-mock +, pytest-xdist +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "poetry"; + version = "1.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + cachecontrol + cleo + crashtest + dulwich + filelock + html5lib + jsonschema + keyring + packaging + pexpect + pkginfo + platformdirs + poetry-core + poetry-plugin-export + requests + requests-toolbelt + shellingham + tomlkit + trove-classifiers + virtualenv + ] ++ lib.optionals (stdenv.isDarwin) [ + xattr + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ] ++ lib.optionals (pythonOlder "3.8") [ + backports-cached-property + ] ++ cachecontrol.optional-dependencies.filecache; + + postInstall = '' + installShellCompletion --cmd poetry \ + --bash <($out/bin/poetry completions bash) \ + --fish <($out/bin/poetry completions fish) \ + --zsh <($out/bin/poetry completions zsh) \ + ''; + + nativeCheckInputs = [ + cachy + deepdiff + flatdict + pytestCheckHook + httpretty + pytest-mock + pytest-xdist + ]; + + preCheck = ('' + export HOME=$TMPDIR + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 + export no_proxy='*'; + ''); + + postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + unset no_proxy + ''; + + disabledTests = [ + # touches network + "git" + "solver" + "load" + "vcs" + "prereleases_if_they_are_compatible" + "test_executor" + # requires git history to work correctly + "default_with_excluded_data" + # toml ordering has changed + "lock" + # fs permission errors + "test_builder_should_execute_build_scripts" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended + "test_info_setup_complex_pep517_error" + ]; + + # Allow for package to use pep420's native namespaces + pythonNamespaces = [ + "poetry" + ]; + + meta = with lib; { + changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://python-poetry.org/"; + description = "Python dependency management and packaging made easy"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum dotlambda ]; + }; +} diff --git a/pkgs/tools/package-management/repro-get/default.nix b/pkgs/tools/package-management/repro-get/default.nix new file mode 100644 index 0000000000000..42b000658c886 --- /dev/null +++ b/pkgs/tools/package-management/repro-get/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, testers +, repro-get +, cacert +}: + +buildGoModule rec { + pname = "repro-get"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "reproducible-containers"; + repo = "repro-get"; + rev = "v${version}"; + sha256 = "sha256-2B4jNP58t+cfeHi5pICtB9+NwujRzkhl1d/cPkWlNrk="; + }; + + vendorHash = "sha256-GM8sKIZb2G9dBj2RoRO80hQrv8D+hHYo0O9FbBuK780="; + + nativeBuildInputs = [ installShellFiles ]; + + # The pkg/version test requires internet access, so disable it here and run it + # in passthru.pkg-version + preCheck = '' + rm -rf pkg/version + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/reproducible-containers/${pname}/pkg/version.Version=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd repro-get \ + --bash <($out/bin/repro-get completion bash) \ + --fish <($out/bin/repro-get completion fish) \ + --zsh <($out/bin/repro-get completion zsh) + ''; + + passthru.tests = { + "pkg-version" = repro-get.overrideAttrs (old: { + # see invalidateFetcherByDrvHash + name = "${repro-get.pname}-${builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf repro-get.drvPath))}"; + subPackages = [ "pkg/version" ]; + installPhase = '' + rm -rf $out + touch $out + ''; + preCheck = ""; + outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + outputs = [ "out" ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ]; + }); + version = testers.testVersion { + package = repro-get; + command = "HOME=$(mktemp -d) repro-get -v"; + inherit version; + }; + }; + + meta = with lib; { + description = "Reproducible apt/dnf/apk/pacman, with content-addressing"; + homepage = "https://github.com/reproducible-containers/repro-get"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 130c9a42558e4..11d08c0dfd5a4 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "1.1.0"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; - rev = "v${version}"; - hash = "sha256-bjUDImMFwMhRjCa7XzGlqR8h+KfTsyxonrQlRGgApwo="; + rev = "refs/tags/v${version}"; + hash = "sha256-J+zQrokrAX5tRU/2RPPSaFDyfsACPHHQYbK5sO99CMs="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 0e491fcbb27ac..7cb1dd91c26a7 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] ++ lib.optional stdenv.isLinux elfutils; - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + env.NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; configureFlags = [ "--with-external-db" diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 46aaf4a94d66c..c948c66b47f12 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libarchive ]; - patches = [ ./cert-paths.patch ]; + patches = [ + ./cert-paths.patch + # fix openssl 3 + (fetchpatch { + url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch"; + hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ="; + }) + ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations"; postPatch = '' # fix unprefixed ranlib (needed on cross) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index c25db9e2d3987..11b276ca05d2c 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -51,6 +51,11 @@ let --replace '"clang++"' '"clang++-UNSUPPORTED"' ''; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=use-after-free" + ]; + makeFlags = [ "PREFIX=$(out)" ]; buildPhase = '' common="$makeFlags -j$NIX_BUILD_CORES" diff --git a/pkgs/tools/security/age-plugin-yubikey/default.nix b/pkgs/tools/security/age-plugin-yubikey/default.nix index 67c850eba4aee..2a7701ed9e3f0 100644 --- a/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "age-plugin-yubikey"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x4J8lE4Peenu3I7bZ3yoLpyukkMHD2re63GCni0cfnI="; + sha256 = "sha256-b7/65mfUr4p8tP4uU/BFonW0DqTTMIhEgB2xIwIxQVg="; }; - cargoSha256 = "sha256-Qp7AXy044G17FxR2sopN00cgX91A8TAydrwvJrAfhns="; + cargoSha256 = "sha256-LnHpinNZZHrIEWrVW0t1ja5WN57/fmiSmZlB0ylau8Y="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index c2196cea686ac..2b64480c4a00a 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-kPDNTwsfI+8nOgsLv2aONrLGSRZhw5YzNntJ2tbE0oI="; + sha256 = "sha256-11dqfOi/DdfFrFTeboPyFkixXG+fCJ2jpHM55qsQ1jw="; }; - cargoSha256 = "sha256-fTdTgbeOQXEpLHq9tHiPLkttvaxS/WJ86h3jRdrfbJM="; + cargoHash = "sha256-u0vceIurenYnKfF3gWNw304hX4vVFoszZD7AMwffOmc="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix new file mode 100644 index 0000000000000..785caa8f536d2 --- /dev/null +++ b/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "argocd-vault-plugin"; + version = "1.13.1"; + + src = fetchFromGitHub { + owner = "argoproj-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BuPNmGWKvjWkMCyyAFZeSCcnBUeaoduw7fZe07WD3Jo="; + }; + + vendorHash = "sha256-jxuYT63FxylQinJ9paPk/Ut0aFX5gdLOS4ugzrtRIF0="; + + # integration tests require filesystem and network access for credentials + doCheck = false; + + meta = with lib; { + homepage = "https://argocd-vault-plugin.readthedocs.io"; + changelog = "https://github.com/argoproj-labs/argocd-vault-plugin/releases/tag/v${version}"; + description = "An Argo CD plugin to retrieve secrets from Secret Management tools and inject them into Kubernetes secrets"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 103c8aceed829..8180f9013df8a 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-fvRSx/I4SM9xWhooPPKFuRLSCYOxE+scqi6jRsGFOXo="; + sha256 = "sha256-A5enH7JqnLZ9Tte+FMpMVqq1g1JveYJbzH1Qum5In5E="; }; - cargoSha256 = "sha256-5wXeFomQs/aEbImmlyUzmYyDRXFp3qZSFOzk0g7pNEo="; + cargoHash = "sha256-LVc7CgRS57p7TUaTo8L94YArYC7eI0wegzNMcTiJrEg="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 3e4072c8eaa68..4895e3def1813 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "0.0.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-NdD1b/yHB1fizAl/5UsksQ5jrj1OW46Ff4eABPPam7w="; + hash = "sha256-AndX0PISGKhVmUFcJ2pCu8dqH67nVCe+25MIcF9d+8A="; }; - vendorHash = "sha256-/L3fGDa3aJit9forggszIjpekowh4LbNhxiJjHhzARs="; + vendorHash = "sha256-+a6GgKHQ1D/hW9MEutyfbNbyDJuQGJ7Vd9Pz6w08lfo="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f265444f53abd..3cbf1c46e640b 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -1,73 +1,155 @@ -{ atomEnv -, autoPatchelfHook -, dpkg -, fetchurl -, lib +{ lib +, buildNpmPackage +, dbus +, electron +, fetchFromGitHub +, glib +, gnome +, gtk3 +, jq , libsecret -, libxshmfence , makeDesktopItem , makeWrapper -, stdenv -, udev +, moreutils +, nodejs-16_x +, pkg-config +, python3 +, rustPlatform , wrapGAppsHook }: -stdenv.mkDerivation rec { - pname = "bitwarden"; - version = "2022.12.0"; +let + description = "A secure and free password manager for all of your devices"; + icon = "bitwarden"; + + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; - src = fetchurl { - url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-deQG1GEYmnQmO5+jASsiQmDphb+4Jyq9aSn/A4z++uE="; + version = "2023.2.0"; + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "clients"; + rev = "desktop-v${version}"; + sha256 = "/k2r+TikxVGlz8cnOq5zF3oUYw4zj31vDAD7OQFQlC4="; + }; + + desktop-native = rustPlatform.buildRustPackage rec { + pname = "bitwarden-desktop-native"; + inherit src version; + sourceRoot = "source/apps/desktop/desktop_native"; + cargoSha256 = "sha256-zLftfmWYYUAaMvIT21qhVsHzxnNdQhFBH0fRBwVduAc="; + + patchFlags = [ "-p4" ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libsecret + ]; + + nativeCheckInputs = [ + dbus + (gnome.gnome-keyring.override { useWrappedDaemon = false; }) + ]; + + checkFlags = [ + "--skip=password::password::tests::test" + ]; + + checkPhase = '' + runHook preCheck + + export HOME=$(mktemp -d) + export -f cargoCheckHook runHook _eval _callImplicitHook + dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + -- bash -e -c cargoCheckHook + runHook postCheck + ''; }; desktopItem = makeDesktopItem { name = "bitwarden"; exec = "bitwarden %U"; - icon = "bitwarden"; - comment = "A secure and free password manager for all of your devices"; + inherit icon; + comment = description; desktopName = "Bitwarden"; categories = [ "Utility" ]; }; - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; - dontWrapGApps = true; +in - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; +buildNpmPackage' { + pname = "bitwarden"; + inherit src version; - buildInputs = [ libsecret libxshmfence ] ++ atomEnv.packages; + makeCacheWritable = true; + npmBuildFlags = [ + "--workspace apps/desktop" + ]; + npmDepsHash = "sha256-aFjN1S0+lhHjK3VSYfx0F5X8wSJwRRr6zQpPGt2VpxE="; - unpackPhase = "dpkg-deb -x $src ."; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - installPhase = '' - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" - - # Desktop file - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/"* "$out/share/applications" + nativeBuildInputs = [ + jq + makeWrapper + moreutils + python3 + ]; + + preBuild = '' + jq 'del(.scripts.postinstall)' apps/desktop/package.json | sponge apps/desktop/package.json + jq '.scripts.build = ""' apps/desktop/desktop_native/package.json | sponge apps/desktop/desktop_native/package.json + cp ${desktop-native}/lib/libdesktop_native.so apps/desktop/desktop_native/desktop_native.linux-x64-musl.node ''; - runtimeDependencies = [ - (lib.getLib udev) - ]; + postBuild = '' + pushd apps/desktop + + "$(npm bin)"/electron-builder \ + --dir \ + -c.electronDist=${electron}/lib/electron \ + -c.electronVersion=${electron.version} + + popd + ''; + + installPhase = '' + mkdir $out + + pushd apps/desktop/dist/linux-unpacked + mkdir -p $out/opt/Bitwarden + cp -r locales resources{,.pak} $out/opt/Bitwarden + popd + + makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ + --add-flags $out/opt/Bitwarden/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications - postFixup = '' - makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ - "''${gappsWrapperArgs[@]}" + pushd apps/desktop/resources/icons + for icon in *.png; do + dir=$out/share/icons/hicolor/"''${icon%.png}"/apps + mkdir -p "$dir" + cp "$icon" "$dir"/${icon}.png + done + popd ''; meta = with lib; { - description = "A secure and free password manager for all of your devices"; + inherit description; homepage = "https://bitwarden.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3; - maintainers = with maintainers; [ kiwi ]; + license = lib.licenses.gpl3; + maintainers = with maintainers; [ amarshall kiwi ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix index dc0179fa35e54..37724d87394df 100644 --- a/pkgs/tools/security/boofuzz/default.nix +++ b/pkgs/tools/security/boofuzz/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , python3 }: @@ -7,12 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "boofuzz"; version = "0.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "jtpereyda"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-mbxImm5RfYWq1JCCSvvG58Sxv2ad4BOh+RLvtNjQCKE="; + rev = "refs/tags/v${version}"; + hash = "sha256-mbxImm5RfYWq1JCCSvvG58Sxv2ad4BOh+RLvtNjQCKE="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -41,6 +42,10 @@ python3.pkgs.buildPythonApplication rec { "TestNoResponseFailure" "TestProcessMonitor" "TestSocketConnection" + # SyntaxError: invalid syntax, https://github.com/jtpereyda/boofuzz/issues/663 + "test_msg_60_bytes" + ] ++ lib.optionals stdenv.isDarwin [ + "test_time_repeater" ]; pythonImportsCheck = [ @@ -50,6 +55,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Network protocol fuzzing tool"; homepage = "https://github.com/jtpereyda/boofuzz"; + changelog = "https://github.com/jtpereyda/boofuzz/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index 200cd96c238b3..b00aede158182 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70="; + sha256 = "sha256-O9HOsj0R6oHI7jjG4FBqbrSAQSVomgeD7tyPDNCNmIo="; }; postPatch = '' diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 27cf191018e43..4c00f41919c99 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.17.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-JD3ZFRWGCJq5VDGkTgIZuZPScQrNF4vsuCavBD3pigA="; + sha256 = "sha256-1WLhT94FNZ7be58uov/0vtvB7ET/WNY/tPSIuaW5zfc="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index 4936b23af3cc4..bc99a499b70f3 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "cariddi"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-8Z2iswjl85rsIhHMAGD3kYJanBWToWBVidglWMg7omw="; + rev = "refs/tags/v${version}"; + hash = "sha256-pO1FXlkaQveDIfMSWiLB9QvVxmFJixc/HHcEuhg5KmY="; }; - vendorSha256 = "sha256-mXzI3NF1afMvQ4STPpbehoarfOT35P01IotXPVYNnio="; + vendorHash = "sha256-zDKByBISZNRb4sMCrHKGlp4EBtifBfj92tygcaBH/Fc="; meta = with lib; { description = "Crawler for URLs and endpoints"; homepage = "https://github.com/edoardottt/cariddi"; + changelog = "https://github.com/edoardottt/cariddi/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/tools/security/certipy/default.nix index 8bf3e6983b6d1..589e1f97e64b4 100644 --- a/pkgs/tools/security/certipy/default.nix +++ b/pkgs/tools/security/certipy/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "certipy"; - version = "2.0.9"; + version = "4.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; - rev = version; - hash = "sha256-84nGRKZ0UlMDAZ1Wo5Hgy9XSAyEh0Tio9+3OZVFZG5k="; + rev = "refs/tags/${version}"; + hash = "sha256-vwlWAbA4ExYAPRInhEsjRCNuL2wqMhAmYKO78Vi4OGo="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -22,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { ldap3 pyasn1 pycryptodome + requests_ntlm ]; # Project has no tests @@ -34,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services"; homepage = "https://github.com/ly4k/Certipy"; + changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index 6bcdf1dbc457b..a7c99132a3386 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "certstrap"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "square"; repo = "certstrap"; rev = "v${version}"; - sha256 = "sha256-kmlbz6Faw5INzw+fB1KXjo9vmuaZEp4PvuMldqyFrPo="; + sha256 = "sha256-mbZtomR8nnawXr3nGVSEuVObe79M1CqTlYN/aEpKmcU="; }; - vendorSha256 = null; + vendorSha256 = "sha256-r7iYhTmFKTjfv11fEerC72M7JBp64rWfbkoTKzObNqM="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index edb10f384bdf7..2acdc9bb09f07 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -40,6 +40,11 @@ python3.pkgs.buildPythonApplication rec { mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux ''; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=dangling-pointer" + ]; + preInstall = lib.optionalString withDriver '' mkdir -p $out/${python3.pkgs.python.sitePackages}/drivers/linux mv $CHIPSEC_BUILD_LIB/chipsec/helper/linux/chipsec.ko \ diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index e9e6314f2015b..aa8c68382a394 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - hash = "sha256-vaObuFaQLm3WB36jE6Pri+zNSH4AgqlZF4d/Kymc2G4="; + hash = "sha256-CHLcG4L/TNfo5DI/r17kGh9mroCGXQVCkIW5RjVdhu4="; }; patches = [ diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index 51aefd496c55f..f03a1a17171a5 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HLBW7a2sjA/bs8VJkwQNqM6YPEfa1onMoK89G5Fsb8s="; + hash = "sha256-TV2knPG5n5l8APeAmpDfu6vQLtEhjqH21JXAZLk0DDI="; }; vendorHash = "sha256-xMHlooXuLECQi7co2/WvY0TIoV0S5OgcBklICCFk3ls="; diff --git a/pkgs/tools/security/commix/default.nix b/pkgs/tools/security/commix/default.nix index 3b2ba60291dce..4bbfd66e6237c 100644 --- a/pkgs/tools/security/commix/default.nix +++ b/pkgs/tools/security/commix/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "commix"; - version = "3.6"; + version = "3.7"; format = "setuptools"; src = fetchFromGitHub { owner = "commixproject"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QdhJp7oUqOY8Z36haIrHgP4hVGaFXlOxNVg1ams7uhg="; + hash = "sha256-pqfb0CkWTPq6B8T7nn25lWuEQFRRziCDWYm5a1S3mIY="; }; postInstall = '' diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index fc1b583ccc7fb..2fcde94f90038 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -1,28 +1,40 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, installShellFiles, PCSC, pivKeySupport ? true, pkcs11Support ? true }: - +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, pcsclite +, pkg-config +, installShellFiles +, PCSC +, pivKeySupport ? true +, pkcs11Support ? true +, testers +, cosign +}: buildGoModule rec { pname = "cosign"; - version = "1.13.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R7MhfAnVJJ2NK8zV408xAk8Q6aWn9Gw6DOmFFX26x1Q="; + sha256 = "sha256-919oxYi4e56EhSBN0FdcEZBA430owaDnKHkgTneScXw="; }; - buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) + buildInputs = + lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-DpPEDttQnRGHVNiIpMGj14KvZEGR0Y80sZOffjQ3UHk="; + vendorSha256 = "sha256-DtFywktiGHlsdOFVpKUtKLYXJYwQYy1VISfUYVXlOG8="; subPackages = [ "cmd/cosign" ]; - tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; + tags = [ ] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; ldflags = [ "-s" @@ -31,12 +43,15 @@ buildGoModule rec { "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; + __darwinAllowLocalNetworking = true; + preCheck = '' # test all paths unset subPackages + rm pkg/cosign/ctlog_test.go # Require network access rm pkg/cosign/tlog_test.go # Require network access - rm pkg/cosign/verify_test.go # Require network access + rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access ''; postInstall = '' @@ -46,11 +61,17 @@ buildGoModule rec { --zsh <($out/bin/cosign completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = cosign; + command = "cosign version"; + version = "v${version}"; + }; + meta = with lib; { homepage = "https://github.com/sigstore/cosign"; changelog = "https://github.com/sigstore/cosign/releases/tag/v${version}"; description = "Container Signing CLI with support for ephemeral keys and Sigstore signing"; license = licenses.asl20; - maintainers = with maintainers; [ lesuisse jk ]; + maintainers = with maintainers; [ lesuisse jk developer-guy ]; }; } diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/tools/security/credslayer/default.nix index c8e403f3b9e51..7d9d675779301 100644 --- a/pkgs/tools/security/credslayer/default.nix +++ b/pkgs/tools/security/credslayer/default.nix @@ -21,8 +21,9 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = with python3.pkgs; [ - wireshark-cli + py pytestCheckHook + wireshark-cli ]; pytestFlagsArray = [ diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix index b85a5c39656ea..51370ad8dcc2d 100644 --- a/pkgs/tools/security/dieharder/default.nix +++ b/pkgs/tools/security/dieharder/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: include/dieharder/parse.h:21: multiple definition of `splitbuf'; # include/dieharder/parse.h:21: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildInputs = [ gsl ]; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index f4accf3f80985..c6b5581a334f6 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.53.0"; + version = "3.55.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-Z6GQQYvf+qXunrazNR0a7nCBx84JLtHWeK2+WV1RuwU="; + sha256 = "sha256-Gbf82zOyVr66ZKS7JJ8esiF8RzDG3KkzQah5wdPfeoY="; }; vendorHash = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix index 8a902068d27b5..fcd94f66fbc59 100644 --- a/pkgs/tools/security/echidna/default.nix +++ b/pkgs/tools/security/echidna/default.nix @@ -10,13 +10,13 @@ }: mkDerivation rec { pname = "echidna"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "crytic"; repo = "echidna"; rev = "v${version}"; - sha256 = "sha256-DiEZGbd08QLP8zgrIssGYL6h18AprcWZSYp1mMu9TRw="; + sha256 = "sha256-8bChe+qA4DowfuwsR5wLckb56fXi102g8vL2gAH/kYE="; }; isLibrary = true; diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/tools/security/efitools/default.nix index c9deb16ff4412..59cb794d718e1 100644 --- a/pkgs/tools/security/efitools/default.nix +++ b/pkgs/tools/security/efitools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; rev = "v${version}"; sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index d73a93d851b74..a4b6f6c164f32 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.4"; + version = "5.1.10"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - sha256 = "pHzjLyQFn7UvFrPUcI/ZQHMOwVp6ndnX9YegJzlhERM="; + hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/enc/default.nix b/pkgs/tools/security/enc/default.nix new file mode 100644 index 0000000000000..00d6d0211f80c --- /dev/null +++ b/pkgs/tools/security/enc/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, installShellFiles +}: + +buildGoModule rec { + pname = "enc"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "life4"; + repo = "enc"; + rev = "v${version}"; + sha256 = "Tt+J/MnYJNewSl5UeewS0b47NGW2yzfcVHA5+9UQWSs="; + }; + vendorSha256 = "lB6GkE6prfBG7OCOJ1gm23Ee5+nAgmJg8I9Nqe1fsRw="; + + proxyVendor = true; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = "."; + + ldflags = [ + "-s" + "-w" + "-X github.com/life4/enc/version.GitCommit=${version}" + ]; + + nativeCheckInputs = [ git ]; + + postInstall = '' + installShellCompletion --cmd enc \ + --bash <($out/bin/enc completion bash) \ + --fish <($out/bin/enc completion fish) \ + --zsh <($out/bin/enc completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/life4/enc"; + changelog = "https://github.com/life4/enc/releases/tag/v${version}"; + description = "A modern and friendly alternative to GnuPG"; + longDescription = '' + Enc is a CLI tool for encryption, a modern and friendly alternative to GnuPG. + It is easy to use, secure by default and can encrypt and decrypt files using password or encryption keys, + manage and download keys, and sign data. + Our goal was to make encryption available to all engineers without the need to learn a lot of new words, concepts, + and commands. It is the most beginner-friendly CLI tool for encryption, and keeping it that way is our top priority. + ''; + license = licenses.mit; + maintainers = with maintainers; [ rvnstn ]; + }; +} diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix index d583286939323..2c9ab122e657f 100644 --- a/pkgs/tools/security/enum4linux-ng/default.nix +++ b/pkgs/tools/security/enum4linux-ng/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "enum4linux-ng"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "cddmp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-InE0VRk9hK7JEKL202/2RclrJHAHFAol3DxKnVA+lq4="; + hash = "sha256-qO34sVK8eunALPCzLoCqWkO78tG4iEavij8jClCRi88="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/tools/security/erosmb/default.nix index 90165b6581648..b7984feac5136 100644 --- a/pkgs/tools/security/erosmb/default.nix +++ b/pkgs/tools/security/erosmb/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "erosmb"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; src = fetchFromGitHub { owner = "viktor02"; repo = "EroSmb"; rev = "refs/tags/v${version}"; - hash = "sha256-ThJwBKpxoTwHP84OlVKH62gQ3kfv83J8HNs5Mizi8Ck="; + hash = "sha256-9Zs5Z+3JiBiJkV9Ixl5pPmLv0dUT59CT0UkQDsmneWc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix index ebee997d80482..86cd382576df8 100644 --- a/pkgs/tools/security/evtx/default.nix +++ b/pkgs/tools/security/evtx/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "evtx"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "omerbenamram"; repo = pname; - rev = "v${version}"; - hash = "sha256-iexSMcD4XHEYeVWWQXQ7VLZwtUQeEkvrLxMXuxYuxts="; + rev = "refs/tags/v${version}"; + hash = "sha256-aa04Ia11+Ae1amc3JAtYdSWf+f/fenTt0Bny/AauaHo="; }; - cargoSha256 = "sha256-6dDv4+yEKxFjbguMfQxPm18PgZ2DC9IVbmpw2N94mEo="; + cargoHash = "sha256-4pQP+cvKfOvRgWRFa4+/dEpBq+gfcOuEENC5aP4Cp7U="; postPatch = '' # CLI tests will fail in the sandbox @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Parser for the Windows XML Event Log (EVTX) format"; homepage = "https://github.com/omerbenamram/evtx"; + changelog = "https://github.com/omerbenamram/evtx/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9718f0095d02b..46852f61e9703 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-11-22"; + version = "2023-02-28"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G871FvwekcF5uMq7NRoWuIb9UqzIbMniboKlUzgCaeI="; + hash = "sha256-hEuOGnAWyX3oBfrUWBhT58WAjDWTWeLIYuyfUs3q0Jc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 459f9f12c1ea0..daa0e84711584 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , python3 , fetchpatch +, installShellFiles }: python3.pkgs.buildPythonApplication rec { @@ -14,6 +15,10 @@ python3.pkgs.buildPythonApplication rec { sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE="; }; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles ]; + pythonPath = with python3.pkgs; lib.optionals stdenv.isLinux [ systemd @@ -71,6 +76,8 @@ python3.pkgs.buildPythonApplication rec { '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/etc" + + installManPage man/*.[1-9] '' + lib.optionalString stdenv.isLinux '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/usr" diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 18862b7940df9..3831ff4d8e228 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ffuf"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-dqABifXA104NCPdrWhB79cZQloJrqwJ45rlh+M/lRrs="; + rev = "refs/tags/v${version}"; + hash = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk="; }; - vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; + vendorHash = "sha256-nqv45e1W7MA8ElsJ7b4XWs26OicJ7IXmh93+wkueZg4="; meta = with lib; { description = "Fast web fuzzer written in Go"; @@ -24,6 +24,7 @@ buildGoModule rec { or web servers. ''; homepage = "https://github.com/ffuf/ffuf"; + changelog = "https://github.com/ffuf/ffuf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index d099cd2c0dbee..9640b0d1fc982 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "0.6.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZWDvFSx+zH/P0ZfdqxAe+c4jFUH8mfY1vpUXlIxw1sI="; + sha256 = "sha256-b2rn4et7Ze8XRc1Oa/DCfpva/rihtBLapbGlpYGvOjc="; # 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-LLvaaOZzp9b99eYOsfvbPRwZqSNfoinVUfYDmPiw5Mk="; + vendorHash = "sha256-8iNXBSEaKApu+qjGIYOLU6z/sxIVQhltgBRG9eN4RXw="; nativeBuildInputs = [ installShellFiles ]; @@ -29,14 +29,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/sigstore/fulcio/pkg/server.gitVersion=v${version}" - "-X github.com/sigstore/fulcio/pkg/server.gitTreeState=clean" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; # ldflags based on metadata from git and source preBuild = '' - ldflags+=" -X github.com/sigstore/fulcio/pkg/server.gitCommit=$(cat COMMIT)" - ldflags+=" -X github.com/sigstore/fulcio/pkg/server.buildDate=$(cat SOURCE_DATE_EPOCH)" + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; preCheck = '' @@ -59,7 +59,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/fulcio --help - $out/bin/fulcio version | grep "v${version}" + $out/bin/fulcio version 2>&1 | grep "v${version}" runHook postInstallCheck ''; diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index 0f5051db0a4dd..438c22f0046cd 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -2,22 +2,28 @@ , stdenv , fetchFromGitHub , python3 +, cacert }: python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "1.0.3"; + version = "1.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CoZ3niGuEjcaSyIGc0MIy95v64nTbhgqW/0uz4a/f1o="; + hash = "sha256-McHzHK404kDB992T2f84dZHDxujpPIz4qglYMmv3kTw="; }; + pythonRelaxDeps = [ + "msgspec" + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -29,22 +35,19 @@ python3.pkgs.buildPythonApplication rec { construct msgspec pydantic + pygit2 tabulate - tomlkit - xdg + tomli zstandard ]; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook + pytest-asyncio ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.8.0"' 'aiofiles = ">=0.8.0"' \ - --replace 'zstandard = "^0.17.0"' 'zstandard = "*"' - ''; - pythonImportsCheck = [ "gallia" ]; @@ -54,10 +57,11 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - description = "Pentesting framework with the focus on the automotive domain"; + description = "Extendable Pentesting Framework for the Automotive Domain"; homepage = "https://github.com/Fraunhofer-AISEC/gallia"; + changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v${version}"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + maintainers = with maintainers; [ fab rumpelsepp ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 2857019612d50..169d029ef148f 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -19,13 +19,13 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.2.2"; + version = "10.2.3"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - sha256 = "sha256-AiyY6mGM+jHu9n39t/cYj+I5CE+a3vA4P0THNEFoZrk="; + sha256 = "sha256-YhjKRlFlF89H05NsTS69SB108rNiiWijvZZY9fR+Ebc="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index adae9873010e9..3e245e02feb4b 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.15.3"; + version = "8.16.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-eY4RqXDeEsriSdVtEQQKw3NPBOe/UzhXjh1TkW3fWp0="; + hash = "sha256-EazTDPJMMUGmGSfQ5d7J1opv/KlapQLZZYxjbzBRaUY="; }; vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 5fa9bc0beddba..390665fe44fd8 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ../util/libutil.a(estream-printf.o):/build/gnupg-1.4.23/util/../include/memory.h:100: multiple definition of # `memory_debug_mode'; gpgsplit.o:/build/gnupg-1.4.23/tools/../include/memory.h:100: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; doCheck = true; diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/24.nix index 2030e8195e680..c1f2825e8e93c 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages +, nixosTests , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap , pinentry, readline, sqlite, zlib @@ -11,11 +12,11 @@ assert guiSupport -> enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.3.7"; + version = "2.4.0"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7hY6X7nsmf/BsY5l+u+NCGgAxXE9FaZyq1fTeZ2oNmk="; + sha256 = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -29,19 +30,13 @@ stdenv.mkDerivation rec { patches = [ ./fix-libusb-include-path.patch ./tests-add-test-cases-for-import-without-uid.patch - ./allow-import-of-previously-known-keys-even-without-UI.patch + # TODO: Refresh patch? Doesn't apply on 2.4.0 + #./allow-import-of-previously-known-keys-even-without-UI.patch ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch # Patch for DoS vuln from https://seclists.org/oss-sec/2022/q3/27 ./v3-0001-Disallow-compressed-signatures-and-certificates.patch - # Fix regression when using YubiKey devices as smart cards. - # See https://dev.gnupg.org/T6070 for details. - # Committed upstream, remove this patch when updating to the next release. - (fetchpatch { - url = "https://dev.gnupg.org/rGf34b9147eb3070bce80d53febaa564164cd6c977?diff=1"; - sha256 = "sha256-J/PLSz8yiEgtGv+r3BTGTHrikV70AbbHQPo9xbjaHFE="; - }) ]; postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 @@ -85,6 +80,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.connman = nixosTests.gnupg; + meta = with lib; { homepage = "https://gnupg.org"; description = "Modern release of the GNU Privacy Guard, a GPL OpenPGP implementation"; diff --git a/pkgs/tools/security/go-cve-search/default.nix b/pkgs/tools/security/go-cve-search/default.nix index e68970b0b2670..d4b231c63a185 100644 --- a/pkgs/tools/security/go-cve-search/default.nix +++ b/pkgs/tools/security/go-cve-search/default.nix @@ -1,20 +1,20 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "go-cve-search"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "s-index"; repo = pname; - rev = "v${version}"; - sha256 = "0hbv829daviskwsyp9xjcvl52m22986b2cylf2rldnxw5x8zqdvd"; + rev = "refs/tags/v${version}"; + hash = "sha256-ofa6lfA3XKj70YM6AVNKRgGI53teK7OB09luAom8HpQ="; }; - vendorSha256 = "0bhxk39ivbkhwjvq6415lax1pzn208b7px1id0d1nry93bk2zynd"; + vendorHash = "sha256-QXYjLPrfIPcZE8UTcE1kR9QQIusR/rAJG+e/IQ4P0PU="; # Tests requires network access doCheck = false; @@ -26,6 +26,7 @@ buildGoModule rec { and Exposures). ''; homepage = "https://github.com/s-index/go-cve-search"; + changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/go-dork/default.nix b/pkgs/tools/security/go-dork/default.nix new file mode 100644 index 0000000000000..5e6c21d2397ba --- /dev/null +++ b/pkgs/tools/security/go-dork/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-dork"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "dwisiswant0"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-tFmXutX3UnKAFFS4mO4PCv7Bhw1wJ7qjdA1ROryqYZU="; + }; + + vendorHash = "sha256-6V58RRRPamBMDAf0gg4sQMQkoD5dWauCFtPrwf5EasI="; + + meta = with lib; { + description = "Dork scanner"; + homepage = "https://github.com/dwisiswant0/go-dork"; + changelog = "https://github.com/dwisiswant0/go-dork/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index 8dd91679d0934..279b6cd6c9fcd 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobuster"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "OJ"; repo = "gobuster"; rev = "v${version}"; - hash = "sha256-GSpCmJx60DMGr6hDaL//i0gteJniU2jJO+sEDp+eUvg="; + hash = "sha256-Ohv/FgMbniItbrcrncAe9QKVjrhxoZ80BGYJmJtJpPk="; }; - vendorHash = "sha256-xY+RoM19bsoSCRJk7caMjU3jkUoWkOYRYKHfQjiVVPo="; + vendorHash = "sha256-ZbY5PyXKcTB9spVGfW2Qhj8SV9alOSH0DyXx1dh/NgQ="; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index c4e910aa0352f..7f7a18534734e 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,18 +13,18 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.3"; + version = "1.15.4"; nativeBuildInputs = [ installShellFiles makeWrapper ]; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass"; rev = "v${version}"; - hash = "sha256-xXXlpr+qwks+hWTPMu9xJVIamLriipzm0XQqOpg8Ipw="; + hash = "sha256-Jm5H36DI6Mqdnm34+GUMEYxEefXLxgnwWo4fhKOayxY="; }; - vendorHash = "sha256-Tb7eIv2G/VfRP1J6taJjAOtZQakA2pcocZ9kZemcZo0="; + vendorHash = "sha256-IJSEU6a3AhA/cVTWXhVtNtvA/D0hyRlqL7pec1Tlyio="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 9e585e27dc278..f0632291a9a48 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-x8hf1cZw+Hhizp8/vA8qJ+A6ERJUenjMeiuW8IFb/N0="; + hash = "sha256-S97KQ/yCyE1wBDao5KBKWPvoH+DmwpEJRiB6uJCGyFA="; }; - vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I="; + vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index c6db9a1d652a3..d28db3bca2e30 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-KqW1q3CnniNeQFypeZ6x/ov58SOMfAX5P2MMDKjMYBg="; + hash = "sha256-tqZVzYO3yKyUxfC+pxG+QuW9GBoPBteOdJMchepZ1jo="; }; - vendorHash = "sha256-w1Kxocrwcgn0g6ZBJ7obHraHK397bJltUFkm+/p4H5Y="; + vendorHash = "sha256-48KwEcB5KRUwrKCuyNhhuSVRXE3U5/yVYE2xO05AeF8="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index f82b00fd201be..7ce9c4cc87095 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-5thMhZr/ZlMHMKS2ZOyuua1ZfQ2od7QGSDBQsVsf9Os="; + hash = "sha256-gizUFoe+oAmEKHMlua/zsR+fUltGw2cp98XAgXzCm0U="; }; - vendorHash = "sha256-Gt5nd+3BkNQrdcq5+a70rdBXvCang/2ayZuyyZWON64="; + vendorHash = "sha256-vMrP6rC0uPsRyFZdU2E9mPp031eob+36NcGueNP1Y7o="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index dc9646ce91dd8..abb8eb653c5bd 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-YnCX+DDZoKbiwbT8lNvAh0ANNCtEPvaLr9LCvLX8nwo="; + hash = "sha256-gwvrwLJTh58PiRsEC3juhnA/q6cX3nRh/hiunKnPvDQ="; }; - vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I="; + vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index a70c3a8ca6442..d7c158e6a004d 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -1,27 +1,38 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, gotrue-supabase +}: buildGoModule rec { pname = "gotrue"; - version = "2.41.4"; + version = "2.47.1"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-wHsjCf9TdRZ80l4nGEsLlB4J7pXv65fOv4pfFy3Wp/0="; + hash = "sha256-GBrdYlWvtlz/A/5Tn58EPYBL3X73D44GzbN1OrzwU8U="; }; - vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU="; + vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo="; ldflags = [ "-s" "-w" - "-X=github.com/netlify/gotrue/utilities.Version=${version}" + "-X=github.com/netlify/gotrue/internal/utilities.Version=${version}" ]; # integration tests require network to connect to postgres database doCheck = false; + passthru.tests.version = testers.testVersion { + package = gotrue-supabase; + command = "gotrue version"; + inherit version; + }; + meta = with lib; { homepage = "https://github.com/supabase/gotrue"; description = "A JWT based API for managing users and issuing JWT tokens"; diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 9565c11dad5a9..d0523a5d58ebd 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "govulncheck"; - version = "unstable-2022-09-02"; + version = "unstable-2023-02-17"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; - rev = "27dd78d2ca392c1738e54efe513a2ecb7bf46000"; - sha256 = "sha256-G35y1V4W1nLZ+QGvIQwER9whBIBDFUVptrHx78orcI0="; + rev = "b91abcc5ae3c412965b4c8131c4373040c69e1b7"; + sha256 = "sha256-DYeG7SbjoH7rLD+Q0/5VC85bT2x7YxB4tAj1wmHkI4A="; }; - vendorSha256 = "sha256-9FH9nq5cEyhMxrrvfQAOWZ4aThMsU0HwlI+0W0uVHZ4="; + vendorSha256 = "sha256-+luU71QHNs7xxXQOLtd+Ka8+ETv5sA+gv+4g7Ogm5TI="; subPackages = [ "cmd/govulncheck" ]; @@ -30,12 +30,14 @@ buildGoModule rec { rm vulncheck/binary_test.go # - just have resolution issues rm vulncheck/{source,vulncheck}_test.go + rm internal/govulncheck/callstacks_test.go ''; ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck"; + downloadPage = "https://github.com/golang/vuln"; description = "The database client and tools for the Go vulnerability database, also known as vuln"; longDescription = '' Govulncheck reports known vulnerabilities that affect Go code. It uses diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 4ab4d468d068c..8b003ea4701f7 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -6,6 +6,7 @@ , libgpg-error , libxcb , libxkbcommon +, pkg-config , python3 , AppKit , Foundation @@ -16,20 +17,21 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.9.1"; + version = "0.9.4"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-eUUHH6bPfYjkHo7C7GWzewTpT8je7TQK9M8mTM5v59s="; + hash = "sha256-2OMjqY1oTVKyEuCJrGGSQfgjQPSOQRx6LPhoFUuf/pw="; }; - cargoHash = "sha256-GtSvDfG9lRUirm4d6PSaOBLTHZJT2PH0Sx/9GVquX5M="; + cargoHash = "sha256-EhnQvVXv08l4ONnuIudU0WBw5AptD7OcvPUNOdpRZj4="; nativeBuildInputs = [ gpgme # for gpgme-config libgpg-error # for gpg-error-config + pkg-config python3 ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index f745a2374ff32..f73710c1d19b7 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.55.0"; + version = "0.57.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-Y72h1YCf42RinGw2mKZb8Bz8ip+LUW377xwJht67Q1s="; + hash = "sha256-NACasOoCABoHmb4U5LvQ8EPO7G10A7uQtX4th/WJqrw="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-xzBOZyzwxVFTFgtmu7DLBpdkV9bwzJ9RETkdyV2HtQo="; + vendorHash = "sha256-DLY0tcacGFcP17IqUVvpVkUjd2xQMO5JZxltmL4b+Wo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 3ea38e060407e..b20abbb8bf20f 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0dm39g3k77sa70zrjsqadidg27a6iqq61jzfdxazpllnrw4mjy4w"; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; preConfigure = '' sed -i 's,/etc,'$out'/etc,' src/haka/haka.c diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 5baeb71ce8992..9ddc16c9b27ea 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { doCheck = true; checkPhase = "./hash_extender --test"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + installPhase = '' mkdir -p $out/bin cp hash_extender $out/bin diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 8f5e48ee37ec5..1a7e45c8024d2 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hologram"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "AdRoll"; repo = "hologram"; rev = version; - sha256 = "sha256-rdV/oVo+M5ALyU3a3XlA4kt+TLg0Rnr7/qDyZ9iuIb4="; + hash = "sha256-b65mplfDuwk8lEfJLKBY7BF0yGRksxHjwbEW6A7moo4="; }; postPatch = '' @@ -17,14 +17,14 @@ buildGoModule rec { rm -f agent/metadata_service_test.go server/persistent_ldap_test.go server/server_test.go ''; - vendorSha256 = "sha256-pEYMpBiNbq5eSDiFT+9gMjGHDeTzWIej802Zz6Xtays="; + vendorHash = "sha256-HI5+02qSQVLy6ZKaFjy1bWtvVk5bqMBg1umu2ic5HuY="; ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aaronjheng ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 7b26825b70c91..bcf55ea52639d 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-XGKz4Y04EpfJGkEfUE20Egv9dFiSEHOpDcQ2OfJ9wu8="; + hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM="; }; - vendorHash = "sha256-PsASCNHR52E4TSIK5s0ReJptKcondq39Dn2PsMQ8laA="; + vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix index 2047b311222ed..4e7567d45fdac 100644 --- a/pkgs/tools/security/iaito/default.nix +++ b/pkgs/tools/security/iaito/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "iaito"; - version = "5.8.0"; + version = "5.8.2"; srcs = [ (fetchFromGitHub rec { owner = "radareorg"; repo = "iaito"; rev = version; - hash = "sha256-LqJu30Bp+JgB+y3MDyPVuFmEoXTpfA7K2pxv1ZCABx0="; + hash = "sha256-6Do06u9axqH+DpGASEce8j3iGlrkIZGv50seyazOo1w="; name = repo; }) (fetchFromGitHub rec { @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { ]; # the radare2 binary package seems to not install all necessary headers. - NIX_CFLAGS_COMPILE = [ "-I" "${radare2.src}/shlr/sdb/include/sdb" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I" "${radare2.src}/shlr/sdb/include/sdb" ]; postBuild = '' pushd ../../../iaito-translations - make build PREFIX=$out + make build -j$NIX_BUILD_CORES PREFIX=$out popd ''; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { install -m644 -Dt $out/share/pixmaps ../img/iaito-o.svg pushd ../../../iaito-translations - make install PREFIX=$out -j$NIX_BUILD_CORES + make install -j$NIX_BUILD_CORES PREFIX=$out popd runHook postInstall diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index be50d6483228a..6b1c4bc8e3414 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { owner = "ranguli"; repo = pname; rev = "db02d921e2519b77523a200ca2d78417802463db"; - sha256 = "0lgqypcd5lzb2yqd5lr02pba24m26ghly4immxgz13svi8f6vzm9"; + hash = "sha256-qf5tHIpbj/BfrzUST+EzohKh1hUg09KwF+vT0tj1+FE="; }; nativeBuildInputs = with py.pkgs; [ @@ -76,7 +76,8 @@ buildPythonApplication rec { --replace '"hurry.filesize" = "^0.9"' "" \ --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \ --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' \ - --replace 'termcolor = "^1.1.0"' 'termcolor = "*"' + --replace 'termcolor = "^1.1.0"' 'termcolor = "*"' \ + --replace 'tabulate = "^0.8.9"' 'tabulate = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index acda29b53ac8c..6a6ce8dc61192 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -1,24 +1,33 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, python3 +, libxcb +, AppKit +, SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-clbd4xHHGpFIr4s3Jocw4oQ3GbyGWMxZEVgj6JpVK94="; + hash = "sha256-lTxHG+Gul9yMdNPXiomP6crzF5J4wIKzeNyEHnlNM/4="; }; - cargoSha256 = "sha256-gfrC9TOs/Vz3K1gVr6MJ1QAKCE5WOD8VZ/tjOw3Y1uI="; + cargoHash = "sha256-X5WlEvOmbZ3STogoFjDhT2zF5Udt6ABaD+f1qBvmNYE="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit libiconv ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration AppKit ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix index 16f3a4f52a4e1..69622b71e0e1f 100644 --- a/pkgs/tools/security/kestrel/default.nix +++ b/pkgs/tools/security/kestrel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kestrel"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "finfet"; repo = pname; rev = "v${version}"; - hash = "sha256-aJKqx/PY7BanzE5AtqmKxvkULgXXqueGnDniLd9tHOg="; + hash = "sha256-kEM81HIfWETVrUiqXu1+3az+Stg3GdjHE7FaxXJgNYk="; }; - cargoHash = "sha256-UnXaDdQzoYP1N2FnLjOQgiJKnCyCojXKKxVlWYZT0DE="; + cargoHash = "sha256-xv35oFawFLVXZS3Eum6RCo8LcVvHftfv+UvJYYmIDx4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index 9492475aadb54..f06482a0524db 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,15 +2,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.6.10"; + version = "0.6.12"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-0rhs5MZzf9E848FxYuZdXTarYG1BwnfS9HDz9iYR/vo="; + rev = "refs/tags/v${version}"; + hash = "sha256-QF3aSb8Od8KaINuOs981gDJlp8Iv/WUve+LH+rkrBis="; }; - vendorSha256 = "sha256-uaFEtWI5tdL0egaJPTKh7k66Kyjq+N8YDlUGJDtFRqY="; + + vendorHash = "sha256-PM8VnPNMLhDhRVy6xafW0kuTHgd374r0Ol2U9k8LNIw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 67a3ec76005c8..5aadac1760fdc 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.35" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.4" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d478e29640a3b..afffd279837cc 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 8bc83af1beb142de1ed3d81d2ef943443d07bff9 - ref: refs/tags/6.2.35 + revision: b37bae6ba447ad490205554e35ae2d0b54561f08 + ref: refs/tags/6.3.4 specs: - metasploit-framework (6.2.35) - actionpack (~> 6.0) - activerecord (~> 6.0) - activesupport (~> 6.0) + metasploit-framework (6.3.4) + actionpack (~> 7.0) + activerecord (~> 7.0) + activesupport (~> 7.0) aws-sdk-ec2 aws-sdk-iam aws-sdk-s3 @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.105) + metasploit-payloads (= 2.0.108) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -53,6 +53,7 @@ GIT pg puma railties + rasn1 rb-readline recog redcarpet @@ -98,52 +99,51 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.4.2) + actionview (= 7.0.4.2) + activesupport (= 7.0.4.2) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (7.0.4.2) + activesupport (= 7.0.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activesupport (6.1.7) + activemodel (7.0.4.2) + activesupport (= 7.0.4.2) + activerecord (7.0.4.2) + activemodel (= 7.0.4.2) + activesupport (= 7.0.4.2) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) afm (0.2.2) arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.693.0) - aws-sdk-core (3.168.4) + aws-partitions (1.716.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.357.0) + aws-sdk-ec2 (1.366.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.73.0) + aws-sdk-iam (1.75.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.61.0) + aws-sdk-kms (1.62.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) + aws-sdk-s3 (1.119.1) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -151,10 +151,10 @@ GEM aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.18) bcrypt_pbkdf (1.1.0) - bindata (2.4.14) + bindata (2.4.15) bson (4.15.0) builder (3.2.4) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) @@ -173,9 +173,9 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.1.0) + faker (3.1.1) i18n (>= 1.8.11, < 2) - faraday (2.7.2) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -217,11 +217,12 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) - metasploit-concern (4.0.5) - activemodel (~> 6.0) - activesupport (~> 6.0) - railties (~> 6.0) - metasploit-credential (6.0.1) + metasploit-concern (5.0.1) + activemodel (~> 7.0) + activesupport (~> 7.0) + railties (~> 7.0) + zeitwerk + metasploit-credential (6.0.2) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -231,26 +232,26 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (4.0.6) - activemodel (~> 6.0) - activesupport (~> 6.0) - railties (~> 6.0) - metasploit-payloads (2.0.105) - metasploit_data_models (5.0.6) - activerecord (~> 6.0) - activesupport (~> 6.0) + metasploit-model (5.0.1) + activemodel (~> 7.0) + activesupport (~> 7.0) + railties (~> 7.0) + metasploit-payloads (2.0.108) + metasploit_data_models (6.0.2) + activerecord (~> 7.0) + activesupport (~> 7.0) arel-helpers metasploit-concern metasploit-model (>= 3.1) pg - railties (~> 6.0) + railties (~> 7.0) recog webrick metasploit_payloads-mettle (1.0.20) method_source (1.0.0) mini_portile2 (2.8.1) minitest (5.17.0) - mqtt (0.5.0) + mqtt (0.6.0) msgpack (1.6.0) multi_json (1.15.0) mustermann (3.0.0) @@ -265,7 +266,7 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.14.0) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) @@ -287,10 +288,10 @@ GEM ttfunk pg (1.4.5) public_suffix (5.0.1) - puma (6.0.2) + puma (6.1.0) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.5) + rack (2.2.6.2) rack-protection (3.0.5) rack rack-test (2.0.2) @@ -298,19 +299,22 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + railties (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rake (13.0.6) + rasn1 (0.12.1) + strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.0.3) nokogiri - redcarpet (3.5.1) + redcarpet (3.6.0) reline (0.3.2) io-console (~> 0.5) rex-arch (0.1.14) @@ -321,12 +325,12 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.29) + rex-core (0.1.30) rex-encoder (0.1.6) metasm rex-arch rex-text - rex-exploitation (0.1.36) + rex-exploitation (0.1.37) jsobfu metasm rex-arch @@ -344,21 +348,21 @@ GEM rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.9) + rex-random_identifier (0.1.10) rex-text rex-registry (0.1.4) rex-rop_builder (0.1.4) metasm rex-core rex-text - rex-socket (0.1.45) + rex-socket (0.1.47) rex-core - rex-sslscan (0.1.8) + rex-sslscan (0.1.9) rex-core rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.47) + rex-text (0.2.49) rex-zip (0.1.4) rex-text rexml (3.2.5) @@ -366,7 +370,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.2.1) + ruby_smb (3.2.4) bindata openssl-ccm openssl-cmac @@ -384,19 +388,20 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.0.5) tilt (~> 2.0) - sqlite3 (1.6.0) + sqlite3 (1.6.1) mini_portile2 (~> 2.8.0) sshkey (2.0.0) + strptime (0.2.5) swagger-blocks (3.0.0) thin (1.8.1) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.2.1) - tilt (2.0.11) - timeout (0.3.1) + tilt (2.1.0) + timeout (0.3.2) ttfunk (1.7.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2022.7) tzinfo (>= 1.0.0) @@ -406,12 +411,12 @@ GEM unix-crypt (1.3.0) warden (1.2.9) rack (>= 2.0.9) - webrick (1.7.0) + webrick (1.8.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) win32api (0.1.0) - windows_error (0.1.4) + windows_error (0.1.5) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -426,7 +431,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.2) webrick - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -435,4 +440,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.3 + 2.4.6 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 9666b751dd2ba..10ce3bc93ca1c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.35"; + version = "6.3.4"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-nojwez1Ol13K1D/bbl7t0KEUJZxtdLD2pqo08fkZf04="; + sha256 = "sha256-HlW30Y+fEAB3URY2/tnAf1RR02gduBjZcHLc7eyz5dM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 8dbe93bd59eba..b4f1d2cb84860 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dygq5fxbrgynd2g7r51asyrap1d6cxravwh509kfmqpfbiq119s"; + sha256 = "02q8mjgw70szmhx3hc5pdcf0yhk5hfhhvfng24xghiqkx7dkgf21"; type = "gem"; }; - version = "6.1.7"; + version = "7.0.4.2"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m68my4dnj7q7986jwlb7gir0f7hahdsqbiaxfvgngwksa8fhrn1"; + sha256 = "07fn4brsrz308b01rqql0n582zqva5q8ws2gnx2jdm9ab2ph1l4i"; type = "gem"; }; - version = "6.1.7"; + version = "7.0.4.2"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183d7laxvwrw1d02qgm8rg9ljjihfiyh4vzi58xm42z3fr3bbhky"; + sha256 = "1a961ak8n53d783k5p0n4clgvlbp9vkwxk32ysfww28nl00jlr0r"; type = "gem"; }; - version = "6.1.7"; + version = "7.0.4.2"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dsxi813wyhx2d0bbyc0nla4ck6nmmi3z3765gdqf6xl3dha5r2j"; + sha256 = "159z1m6294f2v1mjzbjbfajahiks4x2mg0s01hw407a9y23q07ln"; type = "gem"; }; - version = "6.1.7"; + version = "7.0.4.2"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5pq2swzgddmwwr6x1phbspk1vw8cl88ci8jbi18mrirjjfippr"; + sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f"; type = "gem"; }; - version = "6.1.7"; + version = "7.0.4.2"; }; addressable = { groups = ["default"]; @@ -104,60 +104,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gjsrdkswp0xlfcv9y45i6456dbv4xl1cka4lpfw6bwjbhnqcjc8"; + sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1"; type = "gem"; }; - version = "1.693.0"; + version = "1.716.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; + sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; type = "gem"; }; - version = "3.168.4"; + version = "3.170.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lifj9m433ri4k1xm06n06minnb1sblxxc0gzgjc1a7q5xcldqmy"; + sha256 = "1caq5zkjxn06lk9jzf3izm2b94f9zj738nr4x83zx95warj3v2qp"; type = "gem"; }; - version = "1.357.0"; + version = "1.366.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lkjrgmk56p5aymkh4y070jxzgfnc3jz95fxxkcflhy7wkkkkza0"; + sha256 = "1n6hg0sfnhm5yhfvs68fikfpkq9hydiw2081fdikpf0fwp5ny8zw"; type = "gem"; }; - version = "1.73.0"; + version = "1.75.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; + sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; type = "gem"; }; - version = "1.61.0"; + version = "1.62.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; + sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp"; type = "gem"; }; - version = "1.117.2"; + version = "1.119.1"; }; aws-sigv4 = { groups = ["default"]; @@ -194,10 +194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mz9hz5clknznw8i5f3l2zb9103mlgh96djdhlvlfpf2chkr0s1z"; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; type = "gem"; }; - version = "2.4.14"; + version = "2.4.15"; }; bson = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; cookiejar = { groups = ["default"]; @@ -334,20 +334,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ppi7v8prf5856fslygvh64nwa4k2bsb9mablygb5gj0x5c7k29w"; + sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17lacy6n0hsayafvgxgzmngfq2x62b2arbn32bj2yyzmgxwyxhqn"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; @@ -584,62 +584,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqjv9sqj628zdbb9xlwsmaq9fy52gxwv8ggpvib3sfi1ckvwgn1"; + sha256 = "12qhihgrhlxcr8pss42blf9jx6sdwp85kg0790n6lf6knz9yi7yc"; type = "gem"; }; - version = "4.0.5"; + version = "5.0.1"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "061zkhiq7gpp0kjk1alaz0r266makzj3ahjzq6j9qxm4z9xiis4d"; + sha256 = "1ik61iv34a0nfszrb3aq9ia63n6hv1vgjgy6kdkl8xy7i455kyss"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "8bc83af1beb142de1ed3d81d2ef943443d07bff9"; - sha256 = "0kkz37wz2d5alvvb0x3dkhji98fhxmg6xnrzsk55v5sf7mxz124y"; + rev = "b37bae6ba447ad490205554e35ae2d0b54561f08"; + sha256 = "1lz5ngnfvp3jf3ciif0xd39m2m3zq3czwdhna5vh044ziz8vfm8y"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.35"; + version = "6.3.4"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17kmw9gx4mdimv5wbf3935g43ad9spdx9bshdgk5y754kw80cnqd"; + sha256 = "01i35h3wl7qly2kx20f5r1x00grmfd5vnarjvi3qjjyy380qw793"; type = "gem"; }; - version = "4.0.6"; + version = "5.0.1"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zp4njsk9ybrhjr7pb06nmnm3shmxc69ra2hxvz0bwhq4syr1xsl"; + sha256 = "0kqm9vzh562vckxcc751bc4yr4fgprlwjjmwq1sjw7zhh27bmz82"; type = "gem"; }; - version = "2.0.105"; + version = "2.0.108"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dli79r6rh77mwh6xqjzvz5kld70j93myg0gd5q0jxjhimwcrgya"; + sha256 = "07k32bv9qnxg9vcq29p0r6qcfrhwby3aydpir3z8a7h8iz17lz9i"; type = "gem"; }; - version = "5.0.6"; + version = "6.0.2"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1khsry5mf63y03r6v91f4vrbn88277ksv7d69z3xmqs9sgpri9"; + sha256 = "14iacsn0l8kl5pw9giaz2p3i06dwwj0mad9m0949bl5g8g35vsb3"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; msgpack = { groups = ["default"]; @@ -807,10 +807,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; + sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7"; type = "gem"; }; - version = "1.14.0"; + version = "1.14.2"; }; nori = { groups = ["default"]; @@ -927,10 +927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15hj8r6wp23k187ajmp13kldk53ygm84q4caq7nlndrn8jlcsps0"; + sha256 = "1ymaq2m30yx35sninw8mjknsjw23k6458ph9k350khwwn1hh2d1k"; type = "gem"; }; - version = "6.0.2"; + version = "6.1.0"; }; racc = { groups = ["default"]; @@ -947,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xjykbmngjhb4p02b7yghf0gqgqjfpi6i028x9g6q6xs782ci3j"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.5"; + version = "2.2.6.2"; }; rack-protection = { groups = ["default"]; @@ -987,20 +987,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; railties = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iwziqrzk7f7r3w5pkfnbh1mqsfsywy7lvz2blqds3nval79dw2x"; + sha256 = "0056s3hh67mjqwb2gjsarx6v3ay2cb8dqiwj1zf84krlbj83l9kz"; type = "gem"; }; - version = "6.1.7"; + version = "7.0.4.2"; }; rake = { groups = ["default"]; @@ -1012,6 +1012,16 @@ }; version = "13.0.6"; }; + rasn1 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05n3ki7jlkll0rf6zrqi41a9fc6zmw87f94ai21jgmvsswjfx15i"; + type = "gem"; + }; + version = "0.12.1"; + }; rb-readline = { groups = ["default"]; platforms = []; @@ -1037,10 +1047,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; reline = { groups = ["default"]; @@ -1077,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gnd998r7s8fl7ma0wavlwyxw244vr2mjgsrs53d455gxjxk4xi8"; + sha256 = "1djg6dk804l55vhnp8wm6phir9wgvb7biv4jiyi78w95cxb1vfk6"; type = "gem"; }; - version = "0.1.29"; + version = "0.1.30"; }; rex-encoder = { groups = ["default"]; @@ -1097,10 +1107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j2lp6kz4a67n7dk7kxlxx8kc32dfdbrz649hhqj47k15nafnyy1"; + sha256 = "15fcisxsxcs6kvg84cv4xdxpd0bhajbmdssrbbvacblvwxn0yydb"; type = "gem"; }; - version = "0.1.36"; + version = "0.1.37"; }; rex-java = { groups = ["default"]; @@ -1157,10 +1167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cpni5hnc3r6bi2n6zx8h6vi0mv99zabw4rggyy95cbwf6smmaxp"; + sha256 = "11gdz9n44jlhq1w5swq63705gliwjc7jg7avgprgw2j4sscnypjp"; type = "gem"; }; - version = "0.1.9"; + version = "0.1.10"; }; rex-registry = { groups = ["default"]; @@ -1187,20 +1197,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r73q8i832gzrq1hqawqlvnmw0w1g8jc28z8q7kxjaqf4dd9gprz"; + sha256 = "02s5x8i0iz5x5y45xasdqx7iz6z9yyqycqmrn41q9rlys4689jwj"; type = "gem"; }; - version = "0.1.45"; + version = "0.1.47"; }; rex-sslscan = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01lxd8zjkgzrr93dry1as7x7ir3n924fz6z1pplwm68jfcqvzw0v"; + sha256 = "0lgwadsmdwdkv9irxlvrc2x0wh1c1r1b9254blpc797ksh5qm4l1"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.9"; }; rex-struct2 = { groups = ["default"]; @@ -1217,10 +1227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xihmiw7fqbjpxi1zh6hb8whbq45saxllvlk00mjp2l3dn0p7hb"; + sha256 = "0s25qqgjqz98240mfx9a39449v2f89yga3qm718zkdzks4f99c0x"; type = "gem"; }; - version = "0.2.47"; + version = "0.2.49"; }; rex-zip = { groups = ["default"]; @@ -1287,10 +1297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsxb9bi3x4kxhhsaa4araxfz0zk573v0j4xv64d3p176kii6cmm"; + sha256 = "1vzwh4r2056cyagx0kggrl82yi9ldhj5slp0rdy8fdchh6ac95rg"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.4"; }; rubyntlm = { groups = ["default"]; @@ -1348,10 +1358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x"; + sha256 = "064g96zvvx6rb60jl06dmcc73n16m2d89n7w3hdkh79lgsjszf2l"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; sshkey = { groups = ["default"]; @@ -1363,6 +1373,16 @@ }; version = "2.0.0"; }; + strptime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ycs0xz58kymf7yp4h56f0nid2z7g3s18dj7pa3p790pfzzpgvcq"; + type = "gem"; + }; + version = "0.2.5"; + }; swagger-blocks = { groups = ["default"]; platforms = []; @@ -1398,20 +1418,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; type = "gem"; }; - version = "2.0.11"; + version = "2.1.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; ttfunk = { groups = ["default"]; @@ -1428,10 +1448,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; tzinfo-data = { groups = ["default"]; @@ -1488,10 +1508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; websocket-driver = { groups = ["default"]; @@ -1528,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmm2if81ia33hp18h8yrgnpgcdyrxziyf185r0zx8qy7n8mlchl"; + sha256 = "1825v7hvcl0xss6scyfv76i0cs0kvj72wy20kn7xqylw9avjga2r"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; winrm = { groups = ["default"]; @@ -1568,9 +1588,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.7"; }; } diff --git a/pkgs/tools/security/mfoc-hardnested/default.nix b/pkgs/tools/security/mfoc-hardnested/default.nix new file mode 100644 index 0000000000000..ee6d5a3dd30f7 --- /dev/null +++ b/pkgs/tools/security/mfoc-hardnested/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnfc, xz }: + +stdenv.mkDerivation rec { + pname = "mfoc-hardnested"; + version = "unstable-2021-08-14"; + + src = fetchFromGitHub { + owner = "nfc-tools"; + repo = pname; + rev = "2c25bf05a0b13827b9d06382c5d384b2e5c88238"; + hash = "sha256-fhfevQCw0E5TorHx61Vltpmv7DAjgH73i27O7aBKxz4="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libnfc xz ]; + + meta = with lib; { + description = "A fork of mfoc integrating hardnested code from the proxmark"; + license = licenses.gpl2; + homepage = "https://github.com/nfc-tools/mfoc-hardnested"; + maintainers = with maintainers; [ azuwis ]; + platforms = platforms.unix; + broken = (stdenv.isDarwin && stdenv.isAarch64); # Undefined symbols "_memalign" referenced + }; +} diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 3378e0d332c7f..0253bdaeba454 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.7.2"; + version = "0.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA="; + hash = "sha256-F/25fVNM3ZSYqg6oeKT/PxCXBB3z5INBKMqYGAbFiQM="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 71028d4d0b39d..041a066ed37fd 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; - rev = "v${version}"; - sha256 = "sha256-XX9c5Qix79eRZkmZxDjFiiTnh66bBLhSunUrIS2FdCA="; + rev = "refs/tags/v${version}"; + hash = "sha256-o+5UOyFg1jhFmBDtkVPgJVk50fPt0uxvV6qiPrRtQZw="; }; - vendorSha256 = "sha256-w3prgkemFPLZ/OC0TPQL7kzKPcBLhYTw/IHP1vQlC2s="; + vendorHash = "sha256-Y7eQeoTt0TM4ZKWKVbltYY+k9Vq0TroVywQduwvlLQg="; buildInputs = [ libpcap @@ -36,6 +36,7 @@ buildGoModule rec { all ports that return a reply. ''; homepage = "https://github.com/projectdiscovery/naabu"; + changelog = "https://github.com/projectdiscovery/naabu/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 579f793297932..9e534298198c4 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-limgyp13eh2FuD1MzqQn+NQ30fOJsvr8UT4kZrxnIPM="; + hash = "sha256-YjcvxDCIXHyc/7+lpg29wDrpe8WmQPWbhXvpIpWO17k="; }; - vendorHash = "sha256-nmZpYShVNAqBO8adxCSt9t3ocB3elWna06pIBG6dQNY="; + vendorHash = "sha256-DE2S70Jfd6Vgx7BXGbhSWTbRIbp8cbiuf8bolHCYMxg="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/security/octosuite/default.nix b/pkgs/tools/security/octosuite/default.nix new file mode 100644 index 0000000000000..88b29dce721c4 --- /dev/null +++ b/pkgs/tools/security/octosuite/default.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "octosuite"; + version = "3.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bellingcat"; + repo = "octosuite"; + rev = "refs/tags/${version}"; + hash = "sha256-C73txVtyWTcIrJSApBy4uIKDcuUq0HZrGM6dqDVLkKY="; + }; + + postPatch = '' + # pyreadline3 is Windows-only + substituteInPlace setup.py \ + --replace ', "pyreadline3"' "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + psutil + requests + rich + ]; + + pythonImportsCheck = [ + "octosuite" + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Advanced Github OSINT framework"; + homepage = "https://github.com/bellingcat/octosuite"; + changelog = "https://github.com/bellingcat/octosuite/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 140f032a5fde8..dcb1c0bb0cbe8 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -1,18 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, openldap +, openssl +, trousers +}: stdenv.mkDerivation rec { pname = "opencryptoki"; - version = "3.8.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l"; + hash = "sha256-ym13I34H3d1JuVBnItkceUbqpjYFhD+mPgWYHPetF7Y="; }; - nativeBuildInputs = [ autoreconfHook libtool bison flex ]; - buildInputs = [ openssl trousers ]; + nativeBuildInputs = [ + autoreconfHook + bison + flex + ]; + + buildInputs = [ + openldap + openssl + trousers + ]; postPatch = '' substituteInPlace configure.ac \ @@ -20,18 +38,22 @@ stdenv.mkDerivation rec { --replace "groupadd" "true" \ --replace "chmod" "true" \ --replace "chgrp" "true" - substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out" ''; configureFlags = [ - "--prefix=$(out)" + "--prefix=" "--disable-ccatok" "--disable-icatok" ]; enableParallelBuilding = true; + installFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + meta = with lib; { + changelog = "https://github.com/opencryptoki/opencryptoki/blob/${src.rev}/ChangeLog"; description = "PKCS#11 implementation for Linux"; homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; diff --git a/pkgs/tools/security/openpgp-card-tools/default.nix b/pkgs/tools/security/openpgp-card-tools/default.nix index c3c512081c620..3b0b5ee14d1c2 100644 --- a/pkgs/tools/security/openpgp-card-tools/default.nix +++ b/pkgs/tools/security/openpgp-card-tools/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.9.0"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Mvnj8AEhREP+nGrioC9IHYX3k6sKGKzOh00V8nslyhw="; + sha256 = "sha256-Wgj6YZSQj8+BcyPboUTadUOg6Gq6VxV4GRW8TWbnRfc="; }; - cargoHash = "sha256-0KRq8GsrQaLJ6fopZpdzgxIWHIse9QWDo24IQj1eAhc="; + cargoHash = "sha256-u6xzKDCtv5FzaYgn5wab6ZPICJ/DaqUxiRS80xaEa1A="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 54cf67ecb9d6c..51e9434f82e8f 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin Carbon ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; configureFlags = [ "--enable-zlib" diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 3c43c51c103ab..1aa606f592742 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildPhase = '' echo "en diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 3057f6fa896a3..588370bd3a4b2 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-wU42911t4L2tsVBdmNnc1ABu3zEv94SRi9Z0/8zfUJs="; + hash = "sha256-5078mJbqiWu+Q0oOWaCJ8YUlSTRDLjmztAhtVyFlvN8="; }; - vendorHash = "sha256-8z/oRR2ru4SNdxgqelAQGmAPvOEvh9jlLl17k7Cv20g="; + vendorHash = "sha256-LxwP1eK88H/XsGsu8YA3ksZnYJcOr7OzqWmZDRHO5kU="; ldflags = [ "-s" diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 40736cdc86bad..b420263c209b2 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index d5fe8c4faa44c..ec2a5f3fb3058 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,6 +1,7 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub +, autoreconfHook , makeWrapper , pkg-config , systemd @@ -13,11 +14,13 @@ stdenv.mkDerivation rec { pname = "pcsc-tools"; - version = "1.6.0"; + version = "1.6.2"; - src = fetchurl { - url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZRyN10vLM9tMFpNc5dgN0apusgup1cS5YxoJgybvi58="; + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = pname; + rev = version; + sha256 = "sha256-c7md8m1llvz0EQqA0qY4aGb3guGFoj+8uS4hUTzie5o="; }; postPatch = '' @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus perlPackages.perl pcsclite ] ++ lib.optional stdenv.isLinux systemd; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; postInstall = '' wrapProgram $out/bin/scriptor \ @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools used to test a PC/SC driver, card or reader"; - homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"; + homepage = "https://pcsc-tools.apdu.fr/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix index f04ac1b1a4014..6eb35099db2a9 100644 --- a/pkgs/tools/security/pomerium-cli/default.nix +++ b/pkgs/tools/security/pomerium-cli/default.nix @@ -8,16 +8,16 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-lWrEWi9wT//9sTEJqo4BnjjzeYnmb2KFbVetXfsYk04="; + sha256 = "sha256-0JMMa85gMTZA0JtxpONVMakbsapAoCXdiL3+Whv5Pp0="; }; - vendorSha256 = "sha256-uME7g7zhA1ir1drmHB1FjLPJ1Km9XcvHHNIsIdOvYfo="; + vendorHash = "sha256-eATNBUQNspDdksF06VHIzwzEJfaFBlJt9OtONxH49s4="; subPackages = [ "cmd/pomerium-cli" diff --git a/pkgs/tools/security/posteid-seed-extractor/default.nix b/pkgs/tools/security/posteid-seed-extractor/default.nix new file mode 100644 index 0000000000000..176b210b37794 --- /dev/null +++ b/pkgs/tools/security/posteid-seed-extractor/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication { + pname = "posteid-seed-extractor"; + version = "unstable-2022-02-23"; + + src = fetchFromGitHub { + owner = "simone36050"; + repo = "PosteID-seed-extractor"; + rev = "667e2997a98aa3273a6bf6b4b34ca77715120e7f"; + hash = "sha256-smNwp67HYbZuMrl0uf2X2yox2JqeEV6WzIBp4dALwgw="; + }; + + format = "other"; + + pythonPath = with python3Packages; [ + certifi + cffi + charset-normalizer + cryptography + idna + jwcrypto + pycparser + pycryptodome + pyotp + qrcode + requests + urllib3 + wrapt + ]; + + installPhase = '' + runHook preInstall + install -Dm755 extractor.py $out/bin/posteid-seed-extractor + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/simone36050/PosteID-seed-extractor"; + description = "Extract OTP seed instead of using PosteID app"; + license = licenses.mit; + maintainers = with maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index a366dbf8224d8..6b021e9702772 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "proxmark3-rrg"; - version = "4.15864"; + version = "4.16191"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - sha256 = "sha256-vFebyXKC/vf8W8fGkTpSGTA0ZmfwnXSuuiOjV/u9240="; + sha256 = "sha256-l0aDp0s9ekUUHqkzGfVoSIf/4/GN2uiVGL/+QtKRCOs="; }; nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 42b0864225d2a..12e226c1ede0e 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "22.12.1"; + version = "23.2.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PdLnR01BDfb3+WsOvOZTsDHWXRNK0pLTxCXOuWik0L0="; + sha256 = "sha256-9WrOyBOoSif1P67Z19HW56RvsojoubeT58P0rM18XSk="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -30,11 +30,6 @@ python3.pkgs.buildPythonApplication rec { tqdm ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt-toolkit==3.0.19" "prompt-toolkit>=3.0.19" - ''; - # Project has no tests doCheck = false; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index a5eb83f1e0b5c..04b3f1aecbd06 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -26,61 +26,47 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.4.3"; + version = "1.5.0"; src = fetchCrate { inherit version; crateName = pname; - sha256 = "sha256-teeGKQNf+nuUcF9BcdiTV/ycENTbcGvPZZ34FdOO31k="; + sha256 = "sha256-3kSBE2D+kC9CTbWlCKPro9fLu2tnd6LFTV4EshHMm3Y="; }; - cargoSha256 = "sha256-Soquc3OuGlDsGSwNCvYOWQeraYpkzX1oJwmM03Rc3Jg="; + cargoSha256 = "sha256-DL3qaUZxWnzsJOxi8+GtXBbZC7vfsridJWqhOTdcsgM="; nativeBuildInputs = [ - pkg-config - makeWrapper installShellFiles - ]; + ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - postPatch = '' - patchShebangs bin/git-credential-rbw - substituteInPlace bin/git-credential-rbw \ - --replace rbw $out/bin/rbw - '' + lib.optionalString withFzf '' - patchShebangs bin/rbw-fzf - substituteInPlace bin/rbw-fzf \ - --replace fzf ${fzf}/bin/fzf \ - --replace perl ${perl}/bin/perl - '' + lib.optionalString withRofi '' - patchShebangs bin/rbw-rofi - substituteInPlace bin/rbw-rofi \ - --replace rofi ${rofi}/bin/rofi \ - --replace xclip ${xclip}/bin/xclip - '' + lib.optionalString withRofi '' - patchShebangs bin/pass-import - substituteInPlace bin/pass-import \ - --replace pass ${pass}/bin/pass - ''; - - preConfigure = '' + preConfigure = lib.optionalString stdenv.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" export OPENSSL_LIB_DIR="${lib.getLib openssl}/lib" ''; postInstall = '' - for shell in bash zsh fish; do - $out/bin/rbw gen-completions $shell > rbw.$shell - installShellCompletion rbw.$shell - done - cp bin/git-credential-rbw $out/bin + install -Dm755 -t $out/bin bin/git-credential-rbw + installShellCompletion --cmd rbw \ + --bash <($out/bin/rbw gen-completions bash) \ + --fish <($out/bin/rbw gen-completions fish) \ + --zsh <($out/bin/rbw gen-completions zsh) '' + lib.optionalString withFzf '' - cp bin/rbw-fzf $out/bin + install -Dm755 -t $out/bin bin/rbw-fzf + substituteInPlace $out/bin/rbw-fzf \ + --replace fzf ${fzf}/bin/fzf \ + --replace perl ${perl}/bin/perl '' + lib.optionalString withRofi '' - cp bin/rbw-rofi $out/bin + install -Dm755 -t $out/bin bin/rbw-rofi + substituteInPlace $out/bin/rbw-rofi \ + --replace rofi ${rofi}/bin/rofi \ + --replace xclip ${xclip}/bin/xclip '' + lib.optionalString withPass '' - cp bin/pass-import $out/bin + install -Dm755 -t $out/bin bin/pass-import + substituteInPlace $out/bin/pass-import \ + --replace pass ${pass}/bin/pass ''; meta = with lib; { diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index d4fb4676e4aec..ec7a387af244a 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -12,7 +12,7 @@ # https://www.nist.gov/programs-projects/nist-randomness-beacon , curl, jansson, libxml2, withNistBeacon ? false , libp11, opensc, withPkcs11 ? true -, librtlsdr, withRtlsdr ? true +, rtl-sdr, withRtlsdr ? true }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withJitterEntropy [ jitterentropy ] ++ lib.optionals withNistBeacon [ curl jansson libxml2 ] ++ lib.optionals withPkcs11 [ libp11 libp11.passthru.openssl ] - ++ lib.optionals withRtlsdr [ librtlsdr ]; + ++ lib.optionals withRtlsdr [ rtl-sdr ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index d4b6cacc64db3..afd41660390d6 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.2"; + version = "2.36.3"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-87s9lcI3URQOfl1zStSVOwmRonC740pZKAqZhDDdMaE="; + sha256 = "sha256-xNOID8/xdC4vkq8TAocvBVu2jVMDwioFBqlmFcMmMII="; }; - vendorSha256 = "sha256-cxfanKv25U8U6FQ1YfOXghAR8GYQB9PN0TkfLzG4UbI="; + vendorHash = "sha256-APwtLd8+Imy4cBSlm4sHPdA/DQCN4pDFSM/R5ib3k4E="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index befc07e2e18d0..d3295de5bad8f 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.8.0"; + version = "4.10.2"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LGxSiubZECNwoFkkJOySI4LOmwk7DXVtY74XBCsr+uk="; + sha256 = "sha256-GQs+wBq47sn3h8I87p+HErBmLMs8Dzh9xj3xMYDsXm4="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-j8/sVdqxLmrvQwHn+uj8+q+ne98xcIeQKS1VQJcrkh0="; + vendorSha256 = "sha256-W213KQu4FuJcT/cJOvS+WMw1fXBcSoZ4yssI06JAIc8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index bae83462872b7..fa07080d2dfa6 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -4,34 +4,27 @@ , autoreconfHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "secp256k1"; - version = "unstable-2022-02-06"; + version = "0.2.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "5dcc6f8dbdb1850570919fc9942d22f728dbc0af"; - sha256 = "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wYJIMCoo6ryeQN4ZnvEkJ5/332+AkaOwgplDuQQC5MU="; }; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-benchmark=no" - "--enable-exhaustive-tests=no" - "--enable-experimental" - "--enable-module-ecdh" "--enable-module-recovery" - "--enable-module-schnorrsig" - "--enable-tests=yes" ]; doCheck = true; - checkPhase = "./tests"; - meta = with lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index c83c7fb4cfe3a..345e36756f666 100644 --- a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -1,25 +1,37 @@ { lib +, stdenv , rustPlatform , fetchFromGitLab , pkg-config , nettle +, openssl +, darwin }: rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - hash = "sha256-liQNz833/3hi3eMi+/iEZ8fT9FFi+MrDIYbQD+dQ/p0="; + hash = "sha256-8aKT39gq6o7dnbhKbDxewd4R2e2IsbYU8vaDwYemes8="; }; - cargoHash = "sha256-bnScLSI94obYQH5YzoHY4DtGScKc4m24+SIg1d2kAKw="; + cargoHash = "sha256-Z6cXCHLrK+BcIeVCKH2l8n9SivZsZPhXGhaMObn6rjo="; - nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; - buildInputs = [ nettle ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + ]; + + buildInputs = [ + nettle + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # gpgconf: error creating socket directory doCheck = false; diff --git a/pkgs/tools/security/shellclear/default.nix b/pkgs/tools/security/shellclear/default.nix new file mode 100644 index 0000000000000..32be52bae267d --- /dev/null +++ b/pkgs/tools/security/shellclear/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "shellclear"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "rusty-ferris-club"; + repo = "shellclear"; + rev = "refs/tags/v${version}"; + hash = "sha256-/0pqegVxrqqxaQ2JiUfkkFK9hp+Vuq7eTap052HEcJs="; + }; + + cargoHash = "sha256-vPd1cFfoSkOnXH3zKQUB0zWDzEtao50AUrUzhpZIkgI="; + + meta = with lib; { + description = "Secure shell history commands by finding sensitive data"; + homepage = "https://github.com/rusty-ferris-club/shellclear"; + changelog = "https://github.com/rusty-ferris-club/shellclear/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 15c0d662ce2cb..96f0e44716c5a 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KREYWM5WOdPzLbOlrATiCCfFwE951KEo03yWNfyG8Bw="; + rev = "refs/tags/v${version}"; + hash = "sha256-+LplLeczLS+9EG0tZsiEs162/65zMCZfDDEq0iYQrGY="; }; - cargoSha256 = "sha256-Ul53/hDUFRb4xmILoMXXk2t465Vv+MQP4iLNn1twwnc="; + cargoHash = "sha256-FpoRO2g+R+Fo146kM0W8b1LHTEBHbGXURoX5jJk7lqY="; nativeBuildInputs = [ pkg-config @@ -37,8 +37,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; + changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ fab xrelkd ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 7c7562d1adb63..f3cb9e85dcecb 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.5.4"; + version = "1.5.5"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DHN1JL4CYnme3hPbkNPXWXsgFpJ9BIRnGPl/csr43iY="; + sha256 = "sha256-nx4a5VH5UIvvBwwzB77XdBv/2ofoOY7iVgXFYyGclnI="; }; - vendorHash = "sha256-5MveK7wZ4KpUEZ4lhm95/8bOi5NtYR4n0fSfZhC+GPo="; + vendorHash = "sha256-RRC1eOSJBbaGMoc81OMu4OGDL950L7u1mheQLSpUXJk="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 8e4b3e697312b..ba776b8af3e3f 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { provide drop in security for users who wish to prevent recovery of deleted information, even if the machine is compromised. ''; - homepage = "http://srm.sourceforge.net"; + homepage = "https://srm.sourceforge.net"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 8a6cc97ff15d6..6ba21884325e5 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-zIF7R0zIoqQx0epTJAVdesT6IOoNek7Blt7W3Ulng4A="; + sha256 = "sha256-BDJEvA6kDBxE43+l2GGaGJxv1BETZGJ9poAqXg/NfOY="; }; - vendorHash = "sha256-JX5jUIMwd+eCYRytaf+EXV/xHh6CCS2Ia0K+UQZxG7E="; + vendorHash = "sha256-2uBrd1AJyKPJBgMp2ANng9dSjye3iTNaUg+tuLsKEts="; ldflags = [ "-buildid=" ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index fdf9f2f047d14..06047a1925c66 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-fSVRDmgDbByAWVzvidrtqCQE+LzS1WpzOAt12ZiNBT4="; + hash = "sha256-d21TQRPRDEDYj7Fqf7R7mHj2tLPd/EXNkeL56KyLgIg="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-oW1C0EEaNsT4ne1g4kyb+A8sbXgzCAJlhJHUmdH2r/0="; + vendorHash = "sha256-Oh8tldLuM3j17OUX1TkgyOL9Ae/x1H8FrB2lNbtZ8pI="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index d3885acee0181..0acc6e6a971e3 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.12p2"; + version = "1.9.13"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-uaCxrg8d3Zvn8+r+cL4F7oH1cvb1NmMsRM1BAbsqhTk="; + hash = "sha256-P1VFW0btsKEp2SXcw5ly8S98f7eNDMq2AX7hbIF35DY="; }; prePatch = '' diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 1c2e9cbd4ab4e..8000ae9afc8c2 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: pam.o:/build/super-3.30.0/super.h:293: multiple definition of # `Method'; super.o:/build/super-3.30.0/super.h:293: first defined here - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -fcommon"; + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -fcommon"; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 1a66d7aea0dd7..989743fda8947 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "teler"; - version = "2.0.0-dev.2"; + version = "2.0.0-dev.3"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - hash = "sha256-GlpQBmJ7HSKPFieM7E5NOnqGlUjQv9Ywe6XF5QIi+c4="; + hash = "sha256-2QrHxToHxHTjSl76q9A8fXCkOZkCwh1fu1h+HDUGsGA="; }; - vendorHash = "sha256-g2YBMyLDGQZKxDBcZ1mca16jxODnJzcmMfFivBn6SdE="; + vendorHash = "sha256-gV/PJFcANeYTYUJG3PYNsApYaeBLx76+vVBvcuKDYO4="; ldflags = [ "-s" diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index bc694986c8d11..fcd1487dfb5dd 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; - rev = "v${version}"; - hash = "sha256-XcMDdnqx64UcEzD44z34sm5TmshPOTb5tivBnGXQLjo="; + rev = "refs/tags/v${version}"; + hash = "sha256-EzdyJzUPoWcLux6RiEZL3DiB65T+pgY70bpD1fX1JN4="; }; - vendorHash = "sha256-HjWUV5gfh2WnUAayZIj6LGFs0rMv2n7v6zJJrzBHBwg="; + vendorHash = "sha256-yTndvnlCmXsQSpImcwuwSXB0WuF2naGJEHfU1iAJApM="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 084d8638c9a16..620d38f377098 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-5roEaWdvjMYoQJqfMxRKryb9frDnpoJOYTG5g2MSIy0="; + hash = "sha256-9Cs5lkt7lAgCl/q2Xc8W5A8/frKER/d3mS1KH9jAy68="; }; - vendorHash = "sha256-g7v7n8xwYOuE4ojOEjgNmbyytPuwbxQx1R6fXHpVrYU="; + vendorHash = "sha256-eQnrSE45UGRbJ7zO6TdBh6UKooUEnhVxg4cdgoFu5eM="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index cd3504b45f4cc..d9dd354aac82c 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-abrmd"; - version = "2.4.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "0lsng4sb9ikfpp0scvl9wmh0zpjdmdf5bqbjnpfyh4gk25qxn9mw"; + sha256 = "sha256-l0ncCMsStaeFACRU3Bt6F1zyiOTGY6wOHewA4AD58Ww="; }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index a7147911a865f..a2687103e382a 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-9jVx0j7dltAkoiRTJry5o2+sLPia71psBaOwhS0pLJk="; + sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM="; }; nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/tools/security/tracee/default.nix index bb4b558fc6855..89a8ba6bcc2f4 100644 --- a/pkgs/tools/security/tracee/default.nix +++ b/pkgs/tools/security/tracee/default.nix @@ -19,15 +19,15 @@ let in buildGoModule rec { pname = "tracee"; - version = "0.9.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w/x7KhopkADKvpDc5TE5Kf34pRY6HP3kX1Lqujnl0b8="; + sha256 = "sha256-fAbii/DEXx9WJpolc7amqF9TQj4oE5x0TCiNOtVasGo="; }; - vendorSha256 = "sha256-5RXNRNoMydFcemNGgyfqcUPtfMVgMYdiyWo/sZi8GQw="; + vendorSha256 = "sha256-eenhIsiJhPLgwJo2spIGURPkcsec3kO4L5UJ0FWniQc="; patches = [ ./use-our-libbpf.patch @@ -64,11 +64,10 @@ buildGoModule rec { mkdir -p $out/{bin,share/tracee} - cp ./dist/tracee-ebpf $out/bin - cp ./dist/tracee-rules $out/bin + mv ./dist/tracee-{ebpf,rules} $out/bin/ - cp -r ./dist/rules $out/share/tracee/ - cp -r ./cmd/tracee-rules/templates $out/share/tracee/ + mv ./dist/rules $out/share/tracee/ + mv ./cmd/tracee-rules/templates $out/share/tracee/ runHook postInstall ''; @@ -105,7 +104,12 @@ buildGoModule rec { is delivered as a Docker image that monitors the OS and detects suspicious behavior based on a pre-defined set of behavioral patterns. ''; - license = licenses.asl20; + license = with licenses; [ + # general license + asl20 + # pkg/ebpf/c/* + gpl2Plus + ]; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch b/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch deleted file mode 100644 index 88a3e49725079..0000000000000 --- a/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go -index afbc5330..13745c70 100644 ---- a/tests/integration/integration_test.go -+++ b/tests/integration/integration_test.go -@@ -246,8 +246,8 @@ func Test_EventFilters(t *testing.T) { - eventFunc: checkExecve, - }, - { -- name: "trace only execve events that starts with /usr/bin", -- filterArgs: []string{"event=execve", "execve.pathname=/usr/bin*"}, -+ name: "trace only execve events that starts with /run", -+ filterArgs: []string{"event=execve", "execve.pathname=/run*"}, - eventFunc: checkExecve, - }, - { diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index bec2084fd140a..5502de2d6272a 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-usercheck" ]; - NIX_CFLAGS_COMPILE = [ "-DALLOW_NON_TSS_CONFIG_FILE" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DALLOW_NON_TSS_CONFIG_FILE" ]; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/tools/security/truecrack/default.nix index e90eed4d6612b..aebbbc79f8f4e 100644 --- a/pkgs/tools/security/truecrack/default.nix +++ b/pkgs/tools/security/truecrack/default.nix @@ -33,7 +33,7 @@ gccStdenv.mkDerivation rec { # `t_rc'; CpuCore.o:/build/source/src/Crypto/CpuAes.h:1237: first defined here # TODO: remove on upstream fixes it: # https://gitlab.com/kalilinux/packages/truecrack/-/issues/1 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index c5b83d3d5f62d..83786aced77af 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.25.3"; + version = "3.28.4"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-w2Wz1mGlpC7EQ7Xos1zDd88HVcLN0TITx3IEn4qyc0s="; + hash = "sha256-GEmWgS8Y56LJbVxmDXVUk5MHZwP9W0Wo7o/YKvZD7ts="; }; - vendorHash = "sha256-71gPd42kaJaLpyXH1FpCf6sRiKmyGNuGxkX3QV8vvHY="; + vendorHash = "sha256-d8xc7yCyG1xfno/8ANe5eu7irP2yKDY2LKs3XdlktQk="; # Test cases run git clone and require network access doCheck = false; diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index cce4aefdfc190..b029b710fc181 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-yRHWhvbXpKrjJJ/Xwm3IVVOMyilFUvmsjPcDcciFc9U="; + sha256 = "sha256-/XBjGbpQIeO7UehcZv2kN4k2ZOsfhduUteURAqaUpwQ="; }; - vendorSha256 = "sha256-l837w2K3GsDTb9EEeYPfyrnkRSkv0FyoPr29Ud+iiJ8="; + vendorHash = "sha256-l837w2K3GsDTb9EEeYPfyrnkRSkv0FyoPr29Ud+iiJ8="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 42a4e1ccb7559..5c2a2e9b0d898 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-P/mQoW4lG6U83WEjn5urpFa7q5mN+XOrIOkzf2pslwQ="; + sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE="; }; - vendorSha256 = "sha256-Z1iwJXbnSqIu/zo7iKLnh0yy1Dh0e5HwXoBkkt9xaqA="; + vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vaultwarden/update.nix b/pkgs/tools/security/vaultwarden/update.nix index 0fc4b45a1296c..44af26ada0d8e 100644 --- a/pkgs/tools/security/vaultwarden/update.nix +++ b/pkgs/tools/security/vaultwarden/update.nix @@ -1,5 +1,7 @@ { writeShellScript , lib +, nix +, nix-prefetch-git , nix-update , curl , git @@ -9,7 +11,7 @@ }: writeShellScript "update-vaultwarden" '' - PATH=${lib.makeBinPath [ curl git gnugrep gnused jq nix-update ]} + PATH=${lib.makeBinPath [ curl git gnugrep gnused jq nix nix-prefetch-git nix-update ]} set -euxo pipefail @@ -17,6 +19,11 @@ writeShellScript "update-vaultwarden" '' nix-update "vaultwarden" --version "$VAULTWARDEN_VERSION" URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/Dockerfile.j2" - WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"([^\"]+)\".*/\\1/") + WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"v([^\"]+)\".*/\\1/") + old_hash_bw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.src.outputHash) + old_hash_vw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) + new_hash_bw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/bitwarden/clients.git --rev "web-v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) + new_hash_vw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) + sed -e "s#$old_hash_bw#$new_hash_bw#" -e "s#$old_hash_vw#$new_hash_vw#" -i pkgs/tools/security/vaultwarden/webvault.nix nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION" '' diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 74a75e24339cf..28b60517ad655 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -1,28 +1,73 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, git +, nixosTests +, nodejs-16_x +, python3 +}: + +let + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; -stdenv.mkDerivation rec { - pname = "vaultwarden-webvault"; version = "2022.12.0"; - src = fetchurl { - url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - hash = "sha256-QC3/aqIF2NdJPHmwUbvJR62wsUGBrgsHJCyqBJ/0gMc="; + bw_web_builds = fetchFromGitHub { + owner = "dani-garcia"; + repo = "bw_web_builds"; + rev = "v${version}"; + hash = "sha256-4yUE0ySUCKmmbca+T8qjqSO0AHZEUAHZ4nheRjpDnZo="; }; +in buildNpmPackage' { + pname = "vaultwarden-webvault"; + inherit version; + + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "clients"; + rev = "web-v${version}"; + hash = "sha256-CsbnnP12P7JuGDOm5Ia73SzET/jCx3qRbz9vdUf7lCA="; + }; + + npmDepsHash = "sha256-wWOtVGNOzY2s82nfQDuWgA4ukpJxJr8Z7Y+rFPq2QdU="; + + postPatch = '' + ln -s ${bw_web_builds}/{patches,resources} .. + PATH="${git}/bin:$PATH" VAULT_VERSION=${bw_web_builds.rev} \ + bash ${bw_web_builds}/scripts/apply_patches.sh + ''; + + nativeBuildInputs = [ + python3 + ]; + + makeCacheWritable = true; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - buildCommand = '' - mkdir -p $out/share/vaultwarden/ - cd $out/share/vaultwarden/ - tar xf $src - mv web-vault vault + npmBuildScript = "dist:oss:selfhost"; + + npmBuildFlags = [ + "--workspace" "apps/web" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/vaultwarden + mv apps/web/build $out/share/vaultwarden/vault + runHook postInstall ''; - passthru.tests = nixosTests.vaultwarden; + passthru = { + inherit bw_web_builds; + tests = nixosTests.vaultwarden; + }; meta = with lib; { description = "Integrates the web vault into vaultwarden"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with maintainers; [ msteen mic92 ]; + maintainers = with maintainers; [ dotlambda msteen mic92 ]; }; } diff --git a/pkgs/tools/security/vt-cli/default.nix b/pkgs/tools/security/vt-cli/default.nix index eccafd7b0edd7..3a549d7e6f1ab 100644 --- a/pkgs/tools/security/vt-cli/default.nix +++ b/pkgs/tools/security/vt-cli/default.nix @@ -10,11 +10,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; - rev = version; - sha256 = "0jqr2xf6f9ywavkx5hzcfnky8ax23ahdj24hjsnq6zlpdqvfn1xb"; + rev = "refs/tags/${version}"; + hash = "sha256-qwfrNm6XfoOtlpAI2aAaoivkp3Xsw9LnVtwnZ1wXGUs="; }; - vendorSha256 = "sha256-XN6dJpoJe9nJn+Tr9SYD64LE0XFiO2vlpdyI9SrZZjQ="; + vendorHash = "sha256-XN6dJpoJe9nJn+Tr9SYD64LE0XFiO2vlpdyI9SrZZjQ="; ldflags = [ "-X github.com/VirusTotal/vt-cli/cmd.Version=${version}" @@ -25,7 +25,9 @@ buildGoModule rec { meta = with lib; { description = "VirusTotal Command Line Interface"; homepage = "https://github.com/VirusTotal/vt-cli"; + changelog = "https://github.com/VirusTotal/vt-cli/releases/tag/${version}"; license = licenses.asl20; + mainProgram = "vt"; maintainers = with maintainers; [ dit7ya ]; }; } diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 6aec3dd105f28..49c0f8cd14fbe 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.1.3"; + version = "3.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; - rev = version; - sha256 = "sha256-alrJVe4Miarkk8BziC8Y333b3swJ4b4oQpP2WAdT2rc="; + rev = "refs/tags/${version}"; + hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc="; }; propagatedBuildInputs = with python3.pkgs; [ aiocache aiosqlite + arsenic beautifulsoup4 brotli browser-cookie3 @@ -63,15 +64,15 @@ python3.pkgs.buildPythonApplication rec { "test_bad_separator_used" "test_blind" "test_chunked_timeout" - "test_cookies" - "test_drop_cookies" - "test_save_and_restore_state" - "test_explorer_extract_links" "test_cookies_detection" + "test_cookies" "test_csrf_cases" "test_detection" "test_direct" + "test_dom_detection" + "test_drop_cookies" "test_escape_with_style" + "test_explorer_extract_links" "test_explorer_filtering" "test_false" "test_frame" @@ -79,21 +80,21 @@ python3.pkgs.buildPythonApplication rec { "test_html_detection" "test_implies_detection" "test_inclusion_detection" + "test_merge_with_and_without_redirection" "test_meta_detection" + "test_multi_detection" "test_no_crash" "test_options" "test_out_of_band" - "test_multi_detection" - "test_vulnerabilities" "test_partial_tag_name_escape" "test_prefix_and_suffix_detection" "test_qs_limit" "test_rare_tag_and_event" "test_redirect_detection" "test_request_object" + "test_save_and_restore_state" "test_script" "test_ssrf" - "test_merge_with_and_without_redirection" "test_tag_name_escape" "test_timeout" "test_title_false_positive" @@ -102,6 +103,7 @@ python3.pkgs.buildPythonApplication rec { "test_unregistered_cname" "test_url_detection" "test_verify_dns" + "test_vulnerabilities" "test_warning" "test_whole" "test_xss_inside_tag_input" @@ -111,9 +113,12 @@ python3.pkgs.buildPythonApplication rec { "test_xss_with_weak_csp" "test_xxe" # Requires a PHP installation - "test_timesql" "test_cookies" + "test_loknop_lfi_to_rce" "test_redirect" + "test_timesql" + "test_xss_inside_href_link" + "test_xss_inside_src_iframe" # TypeError: Expected bytes or bytes-like object got: <class 'str'> "test_persister_upload" ]; @@ -138,6 +143,7 @@ python3.pkgs.buildPythonApplication rec { if a script is vulnerable. ''; homepage = "https://wapiti-scanner.github.io/"; + changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix new file mode 100644 index 0000000000000..a384280c2f401 --- /dev/null +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -0,0 +1,46 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "yaralyzer"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "michelcrypt4d4mus"; + repo = "yaralyzer"; + rev = "refs/tags/v${version}"; + hash = "sha256-QsMO/fnHy4puuToUHSS05fWnXHdAVnWFFBVq3cb0Zj4="; + }; + + pythonRelaxDeps = [ + "rich" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + chardet + python-dotenv + rich + rich-argparse-plus + yara-python + ]; + + pythonImportsCheck = [ + "yaralyzer" + ]; + + meta = with lib; { + description = "Tool to visually inspect and force decode YARA and regex matches"; + homepage = "https://github.com/michelcrypt4d4mus/yaralyzer"; + changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/yatas/default.nix b/pkgs/tools/security/yatas/default.nix new file mode 100644 index 0000000000000..d42068fe687cb --- /dev/null +++ b/pkgs/tools/security/yatas/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "yatas"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "padok-team"; + repo = "YATAS"; + rev = "refs/tags/v${version}"; + hash = "sha256-BjcqEO+rDEjPttGgTH07XyQKLcs/O+FarKTWjqXWQOo="; + }; + + vendorHash = "sha256-QOFt9h4Hdt+Mx82yw4mjAoyUXHeprvjRoLYLBnihwJo="; + + meta = with lib; { + description = "Tool to audit AWS infrastructure for misconfiguration or potential security issues"; + homepage = "https://github.com/padok-team/YATAS"; + changelog = "https://github.com/padok-team/YATAS/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 83c2e535403d6..77b6b86ffd6e1 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -10,19 +10,31 @@ , pkg-config , pcsclite , help2man +, darwin +, libiconv }: stdenv.mkDerivation rec { pname = "yubihsm-shell"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = version; - sha256 = "sha256-rSIdI6ECLte+dEbT8NOUqS8jkozRhbo+eqFrdhTIKpY="; + hash = "sha256-zWhvECPdZnrbSAVPDVZk54SWHVkd/HEQxS3FgXoqXHY="; }; + postPatch = '' + # Can't find libyubihsm at runtime because of dlopen() in C code + substituteInPlace lib/yubihsm.c \ + --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \ + --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so" + # ld: unknown option: -z + substituteInPlace CMakeLists.txt cmake/SecurityFlags.cmake \ + --replace "AppleClang" "Clang" + ''; + nativeBuildInputs = [ pkg-config cmake @@ -34,16 +46,17 @@ stdenv.mkDerivation rec { libusb1 libedit curl - pcsclite openssl + ] ++ lib.optionals stdenv.isLinux [ + pcsclite + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.PCSC + libiconv ]; - postPatch = '' - # Can't find libyubihsm at runtime because of dlopen() in C code - substituteInPlace lib/yubihsm.c \ - --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \ - --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so" - ''; + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DDISABLE_LTO=ON" + ]; meta = with lib; { description = "yubihsm-shell and libyubihsm"; diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix index aa697b447ac0d..6d21bbe6f565c 100644 --- a/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "yubikey-touch-detector"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "maximbaz"; repo = "yubikey-touch-detector"; rev = version; - sha256 = "sha256-3tZyaOrNzLfcCORhTSMEu8EvnNUjva8hBNotHgANS0g="; + sha256 = "sha256-y/iDmxlhu2Q6Zas0jsv07HQPkNdMrOQaXWy/cuWvpMk="; }; - vendorSha256 = "sha256-OitI9Yp4/mRMrNH4yrWSL785+3mykPkvzarrc6ipOeg="; + vendorHash = "sha256-OitI9Yp4/mRMrNH4yrWSL785+3mykPkvzarrc6ipOeg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 88f39e8a63e45..92f30e4ddbc93 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation rec { "iasl" ]; - NIX_CFLAGS_COMPILE = "-O3"; + env.NIX_CFLAGS_COMPILE = toString [ + "-O3" + # Needed with GCC 12 + "-Wno-dangling-pointer" + ]; enableParallelBuilding = true; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 829bd30e4e941..ceee8c9efa6c0 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.57"; + version = "1.0.62"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wb7X4eDG9vZLJF5b9JPb0JVjQgstFo7Zr1MnidKcuZI="; + sha256 = "sha256-3T9/VAr/ZrGTZZK3rsIpnOeKdp9WxPO0JkGamDi3hyM="; }; - cargoHash = "sha256-BcIGaAGTwm8QBvrL7J91asNEpnFdsgDtRPDSWdE9JHI="; + cargoHash = "sha256-rNMEXvAGpKxn2t6uvgTx3sc3tpGCXmzOM/iPWwWq2JM="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 9fcdfa5843f21..5a11a1740b276 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "sha256-m8Ga0aG+TjWFRo2O2f+NVvdDLGExsPuBGQx6r6mBMXk="; + sha256 = "sha256-XsbD5WYa05tldwBylr6CLwARo61/g4IN686pkCpGGM4="; }; buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix deleted file mode 100644 index 6bc0e4527a85c..0000000000000 --- a/pkgs/tools/system/bpytop/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, python3Packages -, fetchFromGitHub -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "bpytop"; - version = "1.0.68"; - - src = fetchFromGitHub { - owner = "aristocratos"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-NHfaWWwNpGhqu/ALcW4p4X6sktEyLbKQuNHpAUUw4LY="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - propagatedBuildInputs = with python3Packages; [ python psutil ]; - - dontBuild = true; - - postPatch = '' - sed -i -e "s#/usr/\[local/\]#$out/#g" \ - -e "s#/usr/{td}#$out/#g" \ - -e "s#THEME_DIR: str = \"\"#THEME_DIR: str = \"$out/share/bpytop/themes\"#" \ - ./bpytop.py - ''; - - installPhase = '' - mkdir -p $out/{bin,libexec,share/bpytop}/ - cp -r ./themes $out/share/bpytop/ - cp ./bpytop.py $out/libexec/ - - makeWrapper ${python3Packages.python.interpreter} $out/bin/bpytop \ - --add-flags "$out/libexec/bpytop.py" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with lib; { - description = "A resource monitor; python port of bashtop"; - homepage = src.meta.homepage; - license = licenses.asl20; - maintainers = with maintainers; [ aw ]; - platforms = with platforms; linux ++ freebsd ++ darwin; - }; -} diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index a9e7c0c81def5..746f83690e7dd 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clinfo"; - version = "3.0.21.02.21"; + version = "3.0.23.01.25"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; rev = version; - sha256 = "sha256-0ijfbfv1F6mnt1uFH/A4yOADJoAFrPMa3yAOFJW53ek="; + sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU="; }; buildInputs = lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 829d249da5b04..d18225a93b9bc 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ddrescue"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; - sha256 = "sha256-5RPNOpDZgQ392RGX1AqkD23wFZe/tez9+yBd4RJ8VR8="; + sha256 = "sha256-OMgMmMWkTxXlNmPkUQCX/WjW7CB1jv3zqSUDfBgyMus="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index ce5e16e4eb4bf..fc81c35fa4626 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: /build/ccltHly5.o:(.bss+0x119f8): multiple definition of `start_time'; /build/cc9evx3L.o:(.bss+0x10978): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 37e8d664f23f2..8507c7c7cec0e 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { url = "https://github.com/rhboot/efivar/commit/ca48d3964d26f5e3b38d73655f19b1836b16bd2d.patch"; hash = "sha256-DkNFIK4i7Eypyf2UeK7qHW36N2FSVRJ2rnOVLriWi5c="; }) + (fetchpatch { + name = "musl-backport.patch"; + url = "https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3.patch"; + sha256 = "7/E0gboU0A45/BY6jGPLuvds6qKtNjzpgKgdNTaVaZQ="; + }) ]; nativeBuildInputs = [ pkg-config mandoc ]; diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/tools/system/erdtree/default.nix new file mode 100644 index 0000000000000..7cd1deb3ced69 --- /dev/null +++ b/pkgs/tools/system/erdtree/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "erdtree"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "solidiquis"; + repo = pname; + rev = "v${version}"; + hash = "sha256-W9rTsumZZ3O0kOc+dT9TC/Z/Katb3q6yFreAVCvX5qo="; + }; + + cargoHash = "sha256-6jFBNkiCFBQbpiYkNZ6dyXH/ZnFHZYFliMZFlE/DodM="; + + meta = with lib; { + description = "File-tree visualizer and disk usage analyzer"; + homepage = "https://github.com/solidiquis/erdtree"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + mainProgram = "et"; + }; +} diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index d1d18809a5b5f..c6c091c1fba1b 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, yaml-cpp, openssl, ruby, util-linux }: stdenv.mkDerivation rec { pname = "facter"; @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + postPatch = '' + sed '1i#include <array>' -i lib/src/facts/glib/load_average_resolver.cc # gcc12 + ''; + CXXFLAGS = lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lblkid"; @@ -19,10 +23,10 @@ stdenv.mkDerivation rec { "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ]; + buildInputs = [ boost cpp-hocon curl leatherman libwhereami yaml-cpp openssl ruby util-linux ]; meta = with lib; { homepage = "https://github.com/puppetlabs/facter"; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 0e1f118c2054b..140ce91fd66cc 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # -fcommon: Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: api.o:(.bss+0xbdba0): multiple definition of `wildcard'; main.o:(.bss+0xbd760): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "mac" ]; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index eedb0f07d13a9..2d5cafc4de1c0 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; meta = with lib; { - homepage = "http://gdmap.sourceforge.net"; + homepage = "https://gdmap.sourceforge.net"; description = "Recursive rectangle map of disk usage"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index b9391d7000fbb..21691b0d44722 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.21.1"; + version = "5.22.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QxepFU/ZQWVH19AeoSnXAAUhLO6VKmrZIIpVw1tTft4="; + hash = "sha256-bWeMZ1tQkJsRJbolZBue9UzM4Qs7K5Rj5Z80Uotyb8I="; }; vendorHash = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48="; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 305761e0c3be4..215818862cdb5 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk="; + sha256 = "sha256-OrlNE1A71q4XAauYNfumV1Ev1wBpFIBxPiw7aF++yjM="; }; nativeBuildInputs = [ autoreconfHook ] diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix index c2ec5b9ddffb7..7f020f54f9de9 100644 --- a/pkgs/tools/system/htop/htop-vim.nix +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -2,17 +2,17 @@ htop.overrideAttrs (oldAttrs: rec { pname = "htop-vim"; - version = "unstable-2022-05-24"; + version = "unstable-2023-02-16"; src = fetchFromGitHub { owner = "KoffeinFlummi"; repo = pname; - rev = "830ef7144940875d9d9716e33aff8651d164026e"; - sha256 = "sha256-ojStkpWvhb+W3dWyRev0VwjtCVL/I9L8FhtXcQ+ODLA="; + rev = "b2b58f8f152343b70c33b79ba51a298024278621"; + hash = "sha256-ZfdBAlnjoy8g6xwrR/i2+dGldMOfLlX6DRlNqB8pkGM="; }; meta = with lib; { - inherit (htop.meta) platforms license; + inherit (oldAttrs.meta) platforms license; description = "An interactive process viewer for Linux, with vim-style keybindings"; homepage = "https://github.com/KoffeinFlummi/htop-vim"; maintainers = with maintainers; [ thiagokokada ]; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index d691a86e246ca..b08d705cad17e 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -e "s@/var@$out/var@g" -i Makefile */Makefile */*/Makefile ''; - NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; meta = with lib; { description = "An easy-to-use IPMI server management utility"; diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix index e0c1ebee90b43..85ae689f32247 100644 --- a/pkgs/tools/system/jsvc/default.nix +++ b/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-Xd6J/TOGCDAtBl3baKJnOYnztJH+C+L2+e9RC0BUqEw="; + sha256 = "sha256-J5Gzd6R8CMqhsgRPrrHhD//LdpcVEQKnBB7i/pLL8ns="; }; buildInputs = [ commonsDaemon ]; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 2ef4d13c366b5..d9b1bc06b2059 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , lib , rustPlatform , withCmd ? false @@ -6,16 +7,24 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/v3P5C0F/FVPJqJ38dzSnAc7ua2fOs3BeX9BDoQ8bDw="; + sha256 = "sha256-mQSbsJ+3mKoDMg0ewwR7UvXUq+5WA9aTPKWCaTz8nDE="; }; - cargoHash = "sha256-KXsW0fgbBy0tf/He0vH9Xq8yGuz77H/jeIabgw3ppy8="; + cargoHash = "sha256-Pu96OGfnXNaIse/IcwFJWxGMlKOVhZ6DtvgXJkHh+Ao="; + + cargoPatches = [ + (fetchpatch { + name = "serialize-cfg-parsing-tests-for-1.2.0.patch"; + url = "https://github.com/jtroo/kanata/commit/9ef1e80fbcb40402262e08bd9196d000f73f686d.patch"; + hash = "sha256-/FhyaYx4usDjGoVfRktf9dtwjY4oXdMQKqxLz00/NPY="; + }) + ]; buildFeatures = lib.optional withCmd "cmd"; diff --git a/pkgs/tools/system/mac-fdisk/default.nix b/pkgs/tools/system/mac-fdisk/default.nix index 292b77d2d2cf7..94e7996c16163 100644 --- a/pkgs/tools/system/mac-fdisk/default.nix +++ b/pkgs/tools/system/mac-fdisk/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index a84113fe20ba0..d5612331e8295 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,15 @@ let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.37.1"; + # Don't forget to update go.d.plugin.nix as well + version = "1.38.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-SsrdjFENPkI7Ed1gKt28sygJ5NgZ5un+5baIQ3Kv7yE="; + sha256 = "sha256-y+rjqS95JS1PU+iR8c7spcg1UoYCjpzbpunTAgTJ35U="; fetchSubmodules = true; }; @@ -66,7 +67,7 @@ in stdenv.mkDerivation rec { # We pick zlib.dev as a simple canary package with pkg-config input. disallowedReferences = [ zlib.dev ]; - NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index ebc552687cf7a..5b45ddbb3ae2c 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,17 +1,16 @@ -{ lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { +{ lib, fetchFromGitHub, buildGo119Module }: +buildGo119Module rec { pname = "netdata-go.d.plugin"; - version = "0.32.3"; + version = "0.50.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "sha256-SayFqr6n6OLLUXseYiR8iBIf2xeDEHXHD0qBrgHY6+o="; + sha256 = "5kDc6zszVuFTDkNMuHBRwrfDnH+AdD6ULzmywtvL8iA="; }; - vendorSha256 = "sha256-tIuHWfAjvr5s2nJSnhnMZIjyy77BbobwgQoDOy4gdGI="; + vendorSha256 = "sha256-Wv6xqzpQxlZCrVnS+g9t1qiYCkm3NfXfW8XDYA9Txxs="; doCheck = false; diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 0daaf6ee7ed3d..44d0063414e2c 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -2,7 +2,7 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am index a0a972e8f..b4a2a5f53 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -78,15 +78,7 @@ diff --git a/system/Makefile.am b/system/Makefile.am index a88ccab65..bda6ee2b6 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -3,7 +3,6 @@ - - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in - CLEANFILES = \ -- edit-config \ - netdata-openrc \ - netdata.logrotate \ - netdata.service \ -@@ -20,15 +19,13 @@ include $(top_srcdir)/build/subst.inc +@@ -19,15 +19,13 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch index fa7a0e7ad9c29..a03593896d968 100644 --- a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -3,7 +3,7 @@ Shrink closure size by avoiding paths embedded from configure call. https://github.com/NixOS/nixpkgs/issues/175693 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c -@@ -248,7 +248,9 @@ void print_build_info(void) { +@@ -247,7 +247,9 @@ void print_build_info(void) { char *prebuilt_distro = NULL; get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix new file mode 100644 index 0000000000000..ef56a9ea1d6b4 --- /dev/null +++ b/pkgs/tools/system/nsc/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "nsc"; + version = "2.7.6"; + + src = fetchFromGitHub { + owner = "nats-io"; + repo = pname; + rev = "v${version}"; + hash = "sha256-aieUCQ5JVJQs4RoTGaXwfTv3xC1ozSsQyfCLsD245go="; + }; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + "-X main.builtBy=nixpkgs" + ]; + + vendorHash = "sha256-gDwppx0ORG+pXzTdGtUVbiFyTD/P7avt+/V89Gl0QYY="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd nsc \ + --bash <($out/bin/nsc completion bash) \ + --fish <($out/bin/nsc completion fish) \ + --zsh <($out/bin/nsc completion zsh) + ''; + + preCheck = '' + # Tests attempt to write to the home directory. + export HOME=$(mktemp -d) + ''; + + meta = { + description = "A tool for creating NATS account and user access configurations"; + homepage = "https://github.com/nats-io/nsc"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ cbrewster ]; + mainProgram = "nsc"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix index 70a0311c3e435..29a80152ed6ae 100644 --- a/pkgs/tools/system/nvitop/default.nix +++ b/pkgs/tools/system/nvitop/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "0.10.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-nGdEMLxpw2Ts0dypkoZg3r2NF4IeT1ykbRmrmf9qxrA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GcwPFPE9opGMvdeIUg0Pj6qkk0qPU8MNnFTq9qIxFFs="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix index 87fc683063c7e..b10d9e81caa18 100644 --- a/pkgs/tools/system/pdisk/default.nix +++ b/pkgs/tools/system/pdisk/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchzip +, fetchFromGitHub , fetchpatch , installShellFiles , libbsd @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { pname = "pdisk"; version = "0.9"; - src = fetchzip { - url = "https://opensource.apple.com/tarballs/pdisk/pdisk-${lib.versions.minor version}.tar.gz"; - sha256 = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = pname; + rev = "${pname}-${lib.versions.minor version}"; + hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; }; patches = [ @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { IOKit ]; - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; enableParallelBuilding = true; diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/tools/system/rex/default.nix index 2bb67333121e8..cf59a22cecee2 100644 --- a/pkgs/tools/system/rex/default.nix +++ b/pkgs/tools/system/rex/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchurl, perlPackages, rsync, ... }: +{ pkgs, lib, fetchurl, perlPackages, rsync, installShellFiles, ... }: perlPackages.buildPerlPackage rec { pname = "Rex"; @@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec { rsync ]; - nativeBuildInputs = with perlPackages; [ ParallelForkManager ]; + nativeBuildInputs = with perlPackages; [ installShellFiles ParallelForkManager ]; propagatedBuildInputs = with perlPackages; [ AWSSignature4 @@ -44,6 +44,17 @@ perlPackages.buildPerlPackage rec { doCheck = false; + outputs = [ "out" ]; + + fixupPhase = '' + for sh in bash zsh; do + substituteInPlace ./share/rex-tab-completion.$sh \ + --replace 'perl' "${pkgs.perl.withPackages (ps: [ ps.YAML ])}/bin/perl" + done + installShellCompletion --name _rex --zsh ./share/rex-tab-completion.zsh + installShellCompletion --name rex --bash ./share/rex-tab-completion.bash + ''; + meta = { homepage = "https://www.rexify.org"; description = "The friendly automation framework"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 47542d25370d1..09a4a3e4ef76e 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -17,6 +17,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE="; }; + postPatch = '' + sed '1i#include <cstring>' -i src/rocm_smi{,_gpu_metrics}.cc # since gcc12 probably + ''; + nativeBuildInputs = [ cmake wrapPython ]; patches = [ ./cmake.patch ]; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 993bfdaf834a8..f360697efbd36 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/s0ix-selftest-tool/default.nix b/pkgs/tools/system/s0ix-selftest-tool/default.nix new file mode 100644 index 0000000000000..193fbb0aef5fd --- /dev/null +++ b/pkgs/tools/system/s0ix-selftest-tool/default.nix @@ -0,0 +1,81 @@ +{ + acpica-tools, + bash, + bc, + coreutils, + fetchFromGitHub, + gawk, + gnugrep, + gnused, + linuxPackages, + lib, + pciutils, + powertop, + resholve, + stdenv, + util-linux, + xorg, + xxd, +}: +resholve.mkDerivation { + pname = "s0ix-selftest-tool"; + version = "unstable-2022-11-04"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "S0ixSelftestTool"; + rev = "1b6db3c3470a3a74b052cb728a544199661d18ec"; + hash = "sha256-w97jfdppW8kC8K8XvBntmkfntIctXDQCWmvug+H1hKA="; + }; + + # don't use the bundled turbostat binary + postPatch = '' + substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat' + substituteInPlace s0ix-selftest-tool.sh --replace 'sudo ' "" + + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool" + runHook postInstall + ''; + + solutions = { + default = { + scripts = ["bin/s0ix-selftest-tool"]; + interpreter = lib.getExe bash; + inputs = [ + acpica-tools + bc + coreutils + gawk + gnugrep + gnused + linuxPackages.turbostat + pciutils + powertop + util-linux + xorg.xset + xxd + ]; + execer = [ + "cannot:${util-linux}/bin/dmesg" + "cannot:${powertop}/bin/powertop" + "cannot:${util-linux}/bin/rtcwake" + "cannot:${linuxPackages.turbostat}/bin/turbostat" + ]; + }; + }; + + meta = with lib; { + homepage = "https://github.com/intel/S0ixSelftestTool"; + description = "A tool for testing the S2idle path CPU Package C-state and S0ix failures"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [adamcstephens]; + }; +} diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 1c0bedff474e4..ff7149a4063aa 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { resets and other helpful low level operations on a number of other device classes. ''; - homepage = "http://safecopy.sourceforge.net"; + homepage = "https://safecopy.sourceforge.net"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index aa9ffa6f391a1..7c94c9c89e5d1 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.15.01"; + version = "0.15.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-reHO426jUI0/jGhVFfurQ5dsRol4e9YlcE7p7nZyBCU="; + hash = "sha256-ryZoW2N93f1jDNF+qZ8y9brPGrTLiOFi2ciIEh1Lt1c="; }; postPatch = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "BASHDIR=${placeholder "out"}/share/bash-completion/completions" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/tools/system/systeroid/default.nix index 4fd26b5d487c5..88b19d1b92b5b 100644 --- a/pkgs/tools/system/systeroid/default.nix +++ b/pkgs/tools/system/systeroid/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "systeroid"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VkkobNYkz8FunyaS6EJpfqOvDdwZJE+P2YTSJCgHZI0="; + sha256 = "sha256-uQa6n8DESnpO9xzfExywY6lG3nZkNSpjgEm5b+ayc8I="; }; postPatch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",' ''; - cargoSha256 = "sha256-ulmU33j2edzMA/L4KXiM5M6RhH3MmMAkA2DuHxdj2uk="; + cargoHash = "sha256-baxXSjbS/5i9xnQGdPYPqgu0c2HGEAU7j7X8wtKSznA="; buildInputs = [ xorg.libxcb diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 10cbed470689a..8bc290d6a673f 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -41,7 +41,7 @@ assert enableQt -> qwt != null; nativeBuildInputs = [ pkg-config ]; - NIX_CFLAGS_COMPILE="-Wno-unused"; + env.NIX_CFLAGS_COMPILE = "-Wno-unused"; meta = with lib; { homepage = "https://www.cgsecurity.org/wiki/Main_Page"; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index a564c946bcf4f..dc6920a97bdce 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, libyamlcpp +, yaml-cpp , pkg-config , procps , coreutils @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; + buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart; meta = { description = "A simple, lightweight fan control program"; diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index efbc9ed3dd3fd..f09c0480865ff 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages, pciutils }: stdenv.mkDerivation rec { pname = "throttled"; @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { ]; # The upstream unit both assumes the install location, and tries to run in a virtualenv - postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service''; + postPatch = '' + sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service + + substituteInPlace throttled.py --replace "'setpci'" "'${pciutils}/bin/setpci'" + ''; installPhase = '' runHook preInstall diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix index 7b9c8f2e57dfd..43d7480fc7572 100644 --- a/pkgs/tools/system/uefitool/common.nix +++ b/pkgs/tools/system/uefitool/common.nix @@ -34,7 +34,7 @@ mkDerivation rec { description = "UEFI firmware image viewer and editor"; homepage = "https://github.com/LongSoft/uefitool"; license = licenses.bsd2; - maintainers = with maintainers; [ ajs124 ]; + maintainers = with maintainers; [ ]; # uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs platforms = platforms.linux; }; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 77e030eb086c7..4718173e430d2 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,38 +1,34 @@ { lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, xz }: stdenv.mkDerivation rec { - version = "20180311"; - checkout = "4c84e077858c809ee80a9a6f9b38185cf7dcded7"; + version = "111.15329"; pname = "vboot_reference"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference"; - rev = checkout; - sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj"; + rev = "1a1cb5c9a38030a5868e2aaad295c68432c680fd"; # refs/heads/release-R111-15329.B + sha256 = "sha256-56/hqqFiKHw0/ah0D20U1ueIU2iq8I4Wn5DiEWxB9qA="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libyaml xz ]; + buildInputs = [ libuuid libyaml openssl xz ]; enableParallelBuilding = true; - patches = [ ./dont_static_link.patch ]; - - NIX_CFLAGS_COMPILE = [ - # fix build with gcc9 - "-Wno-error" - # workaround build failure on -fno-common toolchains: - # ld: /build/source/build/futility/vb2_helper.o:(.bss+0x0): multiple definition of - # `vboot_version'; /build/source/build/futility/futility.o:(.bss+0x0): first defined here - # TODO: remove it when next release contains: - # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/df4d2000a22db673a788b8e57e8e7c0cc3cee777 - "-fcommon" + env.NIX_CFLAGS_COMPILE = toString [ + # This apparently doesn't work as expected: + # - https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R111-15329.B/Makefile#439 + # Let's apply the same flag manually. + "-Wno-error=deprecated-declarations" ]; postPatch = '' substituteInPlace Makefile \ --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' + # Drop flag unrecognized by GCC 9 (for e.g. aarch64-linux) + substituteInPlace Makefile \ + --replace "-Wno-unknown-warning" "" ''; preBuild = '' @@ -42,6 +38,13 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + "USE_FLASHROM=0" + # Upstream has weird opinions about DESTDIR + # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R111-15329.B/Makefile#51 + "UB_DIR=${placeholder "out"}/bin" + "UL_DIR=${placeholder "out"}/lib" + "UI_DIR=${placeholder "out"}/include/vboot" + "US_DIR=${placeholder "out"}/share/vboot" ]; postInstall = '' @@ -53,6 +56,6 @@ stdenv.mkDerivation rec { description = "Chrome OS partitioning and kernel signing tools"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ lheckemann samueldr ]; }; } diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/pkgs/tools/system/vboot_reference/dont_static_link.patch deleted file mode 100644 index 506b942e246e4..0000000000000 --- a/pkgs/tools/system/vboot_reference/dont_static_link.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ---- a/Makefile -+++ b/Makefile -@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2 - # Link tests for external repos - ${BUILD}/host/linktest/extern: ${HOSTLIB} - ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} --${BUILD}/host/linktest/extern: LDLIBS += -static -+#${BUILD}/host/linktest/extern: LDLIBS += -static - TEST_OBJS += ${BUILD}/host/linktest/extern.o - - .PHONY: hostlib -@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL - ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} - - # Utilities for auto-update toolkits must be statically linked. --${UTIL_BINS_STATIC}: LDFLAGS += -static -+${UTIL_BINS_STATIC}: - - - .PHONY: utils -@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN} - - ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} - @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" -- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} -+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} - - ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} - ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/tools/system/wslu/default.nix index f765da194c0e5..6337e479bb31e 100644 --- a/pkgs/tools/system/wslu/default.nix +++ b/pkgs/tools/system/wslu/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; }; + patches = [ + ./fallback-conf-nix-store.diff + ]; + + postPatch = '' + substituteInPlace src/wslu-header \ + --subst-var out + ''; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff new file mode 100644 index 0000000000000..6315e78d7de4e --- /dev/null +++ b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff @@ -0,0 +1,22 @@ +diff --git a/src/wslu-header b/src/wslu-header +index 5f33925..159c6af 100644 +--- a/src/wslu-header ++++ b/src/wslu-header +@@ -169,11 +169,17 @@ if [ -f "$HOME/.config/wslu/conf" ]; then + debug_echo "$HOME/.config/wslu/conf found, sourcing" + source "$HOME/.config/wslu/conf" + fi ++ + if [ -f "$HOME/.wslurc" ]; then + debug_echo "$HOME/.wslurc found, sourcing" + source "$HOME/.wslurc" + fi + ++if [ -f "@out@/share/wslu/conf" ]; then ++ debug_echo "@out@/share/wslu/conf found, sourcing" ++ source "@out@/share/wslu/conf" ++fi ++ + # functions + + function help { diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 57d0f548f00e6..282bd31571d90 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -8,6 +8,8 @@ , llvmPackages }: +assert nvidiaSupport -> stdenv.isLinux; + rustPlatform.buildRustPackage rec { pname = "zenith"; version = "0.13.1"; @@ -19,6 +21,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-N/DvPVYGM/DjTvKvOlR60q6rvNyfAQlnvFnFG5nbUmQ="; }; + # remove cargo config so it can find the linker on aarch64-linux + postPatch = '' + rm .cargo/config + ''; + cargoSha256 = "sha256-Y/vvRJpv82Uc+Bu3lbZxRsu4TL6sAjz5AWHAHkwh98Y="; nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; @@ -39,8 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; - # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 - # see https://github.com/NixOS/nixpkgs/pull/88616 - platforms = platforms.x86; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/zfxtop/default.nix b/pkgs/tools/system/zfxtop/default.nix new file mode 100644 index 0000000000000..79a88ade3dde3 --- /dev/null +++ b/pkgs/tools/system/zfxtop/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zfxtop"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ssleert"; + repo = "zfxtop"; + rev = version; + hash = "sha256-9o32sryffcCt/sBnaT5QzD5oLRfJHgq1yKP8d0pk2JQ="; + }; + + vendorHash = "sha256-H1X7j77Wp8ipgNTMZbFwoSA7NrILahFK8YwoP1W3h2c="; + + meta = with lib; { + description = "fetch top for gen Z with X written by bubbletea enjoyer"; + homepage = "https://github.com/ssleert/zfxtop"; + license = licenses.bsd2; + maintainers = with maintainers; [ wozeparrot ]; + }; +} diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix new file mode 100644 index 0000000000000..f4003ed934d69 --- /dev/null +++ b/pkgs/tools/system/zps/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zps"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "zps"; + rev = version; + hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c="; + }; + + nativeBuildInputs = [ + cmake + ]; + + postInstall = '' + mkdir -p $out/share/applications + substitute ../.application/zps.desktop $out/share/applications/zps.desktop \ + --replace Exec=zps Exec=$out/zps \ + ''; + + meta = with lib; { + description = "A small utility for listing and reaping zombie processes on GNU/Linux"; + homepage = "https://github.com/orhun/zps"; + changelog = "https://github.com/orhun/zps/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/zram-generator/Cargo.lock b/pkgs/tools/system/zram-generator/Cargo.lock new file mode 100644 index 0000000000000..439161d7b4ae6 --- /dev/null +++ b/pkgs/tools/system/zram-generator/Cargo.lock @@ -0,0 +1,347 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[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 = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "dlv-list" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" +dependencies = [ + "rand", +] + +[[package]] +name = "fasteval" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4cdac9e4065d7c48e30770f8665b8cef9a3a73a63a4056a33a5f395bc7cf75" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[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.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "liboverdrop" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8bcc76c5aad4677420857a8744ec8aef80b1b21c5501e2f8c7ac3fda2e19ba" +dependencies = [ + "log", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "ordered-multimap" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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 = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rust-ini" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[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 = "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 = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zram-generator" +version = "1.1.2" +dependencies = [ + "anyhow", + "clap", + "ctor", + "fasteval", + "fs_extra", + "liboverdrop", + "log", + "nix", + "rust-ini", + "tempfile", +] diff --git a/pkgs/tools/system/zram-generator/default.nix b/pkgs/tools/system/zram-generator/default.nix new file mode 100644 index 0000000000000..81bf4082d5c14 --- /dev/null +++ b/pkgs/tools/system/zram-generator/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, rust +, rustPlatform +, pkg-config +, ronn +, systemd +, kmod +, nixosTests +}: + +rustPlatform.buildRustPackage rec { + pname = "zram-generator"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-n+ZOWU+sPq9DcHgzQWTxxfMmiz239qdetXypqdy33cM="; + }; + + # RFE: Include Cargo.lock in sources + # https://github.com/systemd/zram-generator/issues/65 + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + substituteInPlace Makefile \ + --replace 'target/$(BUILDTYPE)' 'target/${rust.toRustTargetSpec stdenv.hostPlatform}/$(BUILDTYPE)' + substituteInPlace src/generator.rs \ + --replace 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \ + --replace 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")' + ''; + + nativeBuildInputs = [ + pkg-config + ronn + ]; + + buildInputs = [ + systemd + ]; + + preBuild = '' + # embedded into the binary at build time + # https://github.com/systemd/zram-generator/blob/v1.1.2/Makefile#LL11-L11C56 + export SYSTEMD_UTIL_DIR=$($PKG_CONFIG --variable=systemdutildir systemd) + ''; + + dontCargoInstall = true; + + installFlags = [ + "-o program" # already built by cargoBuildHook + "PREFIX=$(out)" + "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/lib/systemd/system" + "SYSTEMD_SYSTEM_GENERATOR_DIR=$(out)/lib/systemd/system-generators" + ]; + + passthru = { + tests = { + inherit (nixosTests) zram-generator; + }; + updateScript = ./update.sh; + }; + + meta = with lib; { + homepage = "https://github.com/systemd/zram-generator"; + license = licenses.mit; + description = "Systemd unit generator for zram devices"; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/tools/system/zram-generator/update.sh b/pkgs/tools/system/zram-generator/update.sh new file mode 100755 index 0000000000000..bd10e19631a93 --- /dev/null +++ b/pkgs/tools/system/zram-generator/update.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils curl jq common-updater-scripts cargo +# shellcheck shell=bash + +set -euo pipefail + +version=$(curl -s https://api.github.com/repos/systemd/zram-generator/releases/latest | jq -r .tag_name) +update-source-version zram-generator "${version#v}" + +tmp=$(mktemp -d) +trap 'rm -rf -- "${tmp}"' EXIT + +git clone --depth 1 --branch "${version}" https://github.com/systemd/zram-generator.git "${tmp}/zram-generator" +cargo generate-lockfile --manifest-path "${tmp}/zram-generator/Cargo.toml" +cp "${tmp}/zram-generator/Cargo.lock" "$(dirname "$0")/Cargo.lock" diff --git a/pkgs/tools/text/autocorrect/Cargo.lock b/pkgs/tools/text/autocorrect/Cargo.lock new file mode 100644 index 0000000000000..7ab60c63b736f --- /dev/null +++ b/pkgs/tools/text/autocorrect/Cargo.lock @@ -0,0 +1,2369 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "autocorrect" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be6666c6eabb199e7e968e8a64092fafedfc0ac33ba78438f5ce10a9f372e5e" +dependencies = [ + "autocorrect-derive 0.2.0", + "diff", + "ignore", + "lazy_static", + "owo-colors", + "pest", + "pest_derive", + "regex", + "serde", + "serde_json", + "serde_repr", + "serde_yaml", +] + +[[package]] +name = "autocorrect" +version = "2.6.2" +dependencies = [ + "autocorrect-derive 0.3.0", + "criterion", + "diff", + "ignore", + "indoc", + "lazy_static", + "owo-colors", + "pest", + "pest_derive", + "pretty_assertions", + "regex", + "serde", + "serde_json", + "serde_repr", + "serde_yaml", +] + +[[package]] +name = "autocorrect-cli" +version = "2.6.2" +dependencies = [ + "autocorrect 2.6.2", + "clap 4.1.4", + "ignore", + "lazy_static", + "log", + "num_cpus", + "owo-colors", + "reqwest", + "self_update", + "sudo", + "threadpool", + "walkdir", +] + +[[package]] +name = "autocorrect-derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debd029444930ad4091ac6e8af942e13bee8a351ca0b402cf1d3b2afcf3e2d69" +dependencies = [ + "syn", +] + +[[package]] +name = "autocorrect-derive" +version = "0.3.0" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "autocorrect-java" +version = "2.6.2" +dependencies = [ + "autocorrect 2.6.2", + "jni", +] + +[[package]] +name = "autocorrect-node" +version = "2.6.2" +dependencies = [ + "autocorrect 2.6.2", + "napi", + "napi-build", + "napi-derive", +] + +[[package]] +name = "autocorrect-py" +version = "2.6.2" +dependencies = [ + "autocorrect 2.6.2", + "pyo3", +] + +[[package]] +name = "autocorrect-rb" +version = "2.6.2" +dependencies = [ + "autocorrect 2.6.1", + "magnus", +] + +[[package]] +name = "autocorrect-wasm" +version = "2.6.2" +dependencies = [ + "autocorrect 2.6.2", + "serde", + "serde_json", + "wasm-bindgen", +] + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "bindgen" +version = "0.60.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "clap" +version = "4.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "console" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap 2.34.0", + "criterion-plot", + "csv", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "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", + "itertools", +] + +[[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 0.7.1", + "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 = "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 = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.45.0", +] + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" + +[[package]] +name = "futures-io" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" + +[[package]] +name = "futures-sink" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" + +[[package]] +name = "futures-task" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" + +[[package]] +name = "futures-util" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +dependencies = [ + "futures-core", + "futures-io", + "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 = "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.2.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", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "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", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +dependencies = [ + "bytes", + "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 = "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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "ipnet" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "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 = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "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.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "magnus" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc87660cd7daa49fddbfd524c836de54d5c927d520cd163f43700c5087c57d6c" +dependencies = [ + "magnus-macros", + "rb-sys", + "rb-sys-env", +] + +[[package]] +name = "magnus-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206cb23bfeea05180c97522ef6a3e52a4eb17b0ed2f30ee3ca9c4f994d2378ae" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "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 0.42.0", +] + +[[package]] +name = "napi" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2412d19892730f62fd592f8af41606ca6717ea1eca026103cd44b447829f00c1" +dependencies = [ + "bitflags", + "ctor", + "napi-sys", + "once_cell", + "thread_local", +] + +[[package]] +name = "napi-build" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" + +[[package]] +name = "napi-derive" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03f15c1ac0eac01eca2a24c27905ab47f7411acefd829d0d01fb131dc39befd7" +dependencies = [ + "convert_case", + "napi-derive-backend", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "napi-derive-backend" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4930d5fa70f5663b9e7d6b4f0816b70d095574ee7f3c865fdb8c43b0f7e6406d" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn", +] + +[[package]] +name = "napi-sys" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" +dependencies = [ + "libloading", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-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 = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[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 = "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", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[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 = "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 = "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.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset 0.6.5", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quick-xml" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rb-sys" +version = "0.9.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc8945662df8083245deda89e236647173cc7ad750f481ddcd7bbfd3afe3fa5e" +dependencies = [ + "rb-sys-build", +] + +[[package]] +name = "rb-sys-build" +version = "0.9.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8c3cdf9edc3908ee1555b7a1bca58ee1b499439b32cd1c1ec3e66736a8df48" +dependencies = [ + "bindgen", + "regex", + "shell-words", +] + +[[package]] +name = "rb-sys-env" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-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 = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "reqwest" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[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-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "self_update" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c865d17fb512577be02a09fd2fd96c31c7e46fe649205d84feefd8b2a332da" +dependencies = [ + "either", + "flate2", + "hyper", + "indicatif", + "log", + "quick-xml", + "regex", + "reqwest", + "semver", + "serde_json", + "tar", + "tempfile", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +dependencies = [ + "itoa 1.0.5", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "serde_yaml" +version = "0.9.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" +dependencies = [ + "indexmap", + "itoa 1.0.5", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[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 = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[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 = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "sudo" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a88e74edf206f281aff2820aa2066c781331044c770626dcafe19491f214e05" +dependencies = [ + "libc", + "log", +] + +[[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 = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f297120ff9d4efe680df143d5631bba9c75fa371992b7fcb33eb3453cb0a07" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "windows-sys 0.42.0", +] + +[[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-util" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6a3b08b64e6dfad376fa2432c7b1f01522e37a623c3050bc95db2d3ff21583" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-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 = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[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 = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2" + +[[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", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "serde", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "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 = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix new file mode 100644 index 0000000000000..a75245df04c90 --- /dev/null +++ b/pkgs/tools/text/autocorrect/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "autocorrect"; + version = "2.6.2"; + + src = fetchFromGitHub { + owner = "huacnlee"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-QHQQrUQCfDAlAtDcfrAkOwRhQkO+HcwnPfJ5+jb1290="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + buildInputs = lib.optional stdenv.isDarwin Security; + + cargoBuildFlags = [ "-p" "autocorrect-cli" ]; + cargoTestFlags = [ "-p" "autocorrect-cli" ]; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)"; + homepage = "https://huacnlee.github.io/autocorrect"; + changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/tools/text/autocorrect/update.sh b/pkgs/tools/text/autocorrect/update.sh new file mode 100755 index 0000000000000..64af268726316 --- /dev/null +++ b/pkgs/tools/text/autocorrect/update.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils curl jq common-updater-scripts cargo +# shellcheck shell=bash + +set -euo pipefail + +version=$(curl -s https://api.github.com/repos/huacnlee/autocorrect/releases/latest | jq -r .tag_name) +update-source-version autocorrect "${version#v}" + +tmp=$(mktemp -d) +trap 'rm -rf -- "${tmp}"' EXIT + +git clone --depth 1 --branch "${version}" https://github.com/huacnlee/autocorrect.git "${tmp}/autocorrect" +cargo generate-lockfile --manifest-path "${tmp}/autocorrect/Cargo.toml" +cp "${tmp}/autocorrect/Cargo.lock" "$(dirname "$0")/Cargo.lock" diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 1f9ef7701ba16..7b2598a9cfb24 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitHub, buildPackages -, libiconv, nkf, perl, which +, iconv, nkf, perl, which , skk-dicts }: -let - iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc; -in stdenv.mkDerivation { pname = "cmigemo"; version = "1.3e"; @@ -17,7 +14,7 @@ stdenv.mkDerivation { sha256 = "00a6kdmxp16b8x0p04ws050y39qspd1bqlfq74bkirc55b77a2m1"; }; - nativeBuildInputs = [ libiconv nkf perl which ]; + nativeBuildInputs = [ iconv nkf perl which ]; postUnpack = '' cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ @@ -27,10 +24,6 @@ stdenv.mkDerivation { makeFlags = [ "INSTALL=install" ]; - preBuild = '' - makeFlagsArray+=(FILTER_UTF8="${lib.getBin iconvBin}/bin/iconv -t utf-8 -f cp932") - ''; - buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 5d97f8195f7c5..aaafad2794916 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.9.3"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-p8abIgCAXo/LW/AZN2esSYVkVoggQ2vj5QkAseHwXJo="; + sha256 = "sha256-4OEwee7izd2gxv7HMq5ziu88sj78QRtGH4bgooZXLow="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 53cb9b876f42f..27614de6b281f 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM="; + hash = "sha256-1AFioXDIh+qQYhhIaQky2SkGd+amnYdOeoNDU+1+poI="; }; - vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU="; + vendorHash = "sha256-PtKKGHzxshahecbfvvo1nGCseap4o8r8raBpFDUSbx4="; ldflags = [ "-s" diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 9d189f40fb065..a8e8aa1a851df 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -1,21 +1,20 @@ { lib +, rustPlatform , fetchFromGitHub , fetchpatch -, rustPlatform -, tree-sitter -, difftastic , testers +, difftastic }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.42.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-9ooVXGZ7MEB4D0awciJJio3ttqxEQ8EUBbIQ6xxrXh0="; + sha256 = "sha256-UI63OJukot+MH+51h/yLnimJAcy8OFan9sUbuZaJZXc="; }; depsExtraArgs = { @@ -40,14 +39,14 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-Zbnk5tcCRoaEH3A1mbsfpEhLe1EMcZqPQ4vzWxi0oG0="; + cargoSha256 = "sha256-IfwZ800PGbmzxQ0e6okieKR7A8jgt+II2j8FRDkiXfw="; passthru.tests.version = testers.testVersion { package = difftastic; }; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; - changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 figsoda ]; mainProgram = "difft"; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 6a0c5fc57ee93..c6c92b876ffad 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.3"; + version = "7.4.4"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "sha256-to20GVba+TOChCOqMFEOAMEtKe9ZFucV6NTmlP5mynI="; + sha256 = "sha256-KKhB2wvVgn1kXKup2AFeOnGYPcbjmAcLUofuE3rkQ24="; }; nativeBuildInputs = [ perl gettext ]; diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index 796aa0da8f916..8912f3ac2c3f5 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.6"; + version = "5.0.0"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "sha256-f4r0ODKvZrl+YBcP2T9Z+zEuCyvQm9W7GNiLTr4p278="; + sha256 = "sha256-Lcd+rLO4G2i5FTq/okjKQ1+EIfuZ8khkCijgeDxxwq8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index a85e91b1a0c16..c376411e6f7f0 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.2.1"; @@ -31,13 +31,19 @@ stdenv.mkDerivation (rec { ./darwin-no-pma.patch ]; + # PIE is incompatible with the "persistent malloc" ("pma") feature. + # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld` + # wrapped still passes `-pie` flag to linker and breaks linkage. + # Let's disable "pie" until `ld` is fixed to do the right thing. + hardeningDisable = [ "pie" ]; + # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" "info" ] ++ lib.optional (!interactive) "man"; - nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales - # no-pma fix - ++ [ autoreconfHook ]; + # no-pma fix + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; buildInputs = lib.optional withSigsegv libsigsegv ++ lib.optional interactive readline @@ -83,8 +89,4 @@ stdenv.mkDerivation (rec { platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; }; -} // lib.optionalAttrs stdenv.hostPlatform.isMusl { - # PIE is incompatible with the "persistent malloc" ("pma") feature. - # FIXME: make unconditional in staging (added to avoid rebuilds in staging-next) - hardeningDisable = [ "pie" ]; -}) +} diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix index 93cf684c1990b..ee78451aae8d4 100644 --- a/pkgs/tools/text/gpt2tc/default.nix +++ b/pkgs/tools/text/gpt2tc/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "2021-04-24"; src = fetchurl { - url = "https://bellard.org/libnc/gpt2tc-${version}.tar.gz"; - hash = "sha256-kHnRziSNRewifM/oKDQwG27rXRvntuUUX8M+PUNHpA4="; + url = "https://web.archive.org/web/20220603034455/https://bellard.org/libnc/gpt2tc-2021-04-24.tar.gz"; + hash = "sha256-6oTxnbBwjHAXVrWMjOQVwdODbqLRoinx00pi29ff5w0="; }; patches = [ diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index a38251557c090..215f7e7d25b83 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -5,6 +5,7 @@ , autoreconfHook , pkg-config , texinfo +, bison , bash }: @@ -51,7 +52,9 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] + # Required due to the patch that changes .ypp files. + ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") bison; buildInputs = [ perl bash ] ++ lib.optionals enableGhostscript [ ghostscript ] ++ lib.optionals enableHtml [ psutils netpbm ]; diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index c94580588056f..a1d30da61d30d 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -2,38 +2,23 @@ , rustPlatform , fetchFromGitHub , cmake -, stdenv -, darwin }: rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-66wunZuRAJ6QVWgBUy2+HGaow33F5+16LitGSQC4kCE="; + sha256 = "sha256-wsuXEHwnTP+vl8Gn1mfH+cKoasDdZ+ILiAaJ7510lsI="; }; - cargoSha256 = "sha256-4CAj94wm9qxr9wejD2ffKSdRV1UeofMhxNxLi++At+I="; + cargoSha256 = "sha256-qWat0QIMLmMrbK/QCr3dSyWP27wFFQ+IDQAzLngThQE="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - # link System as a dylib instead of a framework on macos - postPatch = lib.optionalString stdenv.isDarwin '' - core_affinity=../$(stripHash $cargoDeps)/core_affinity - oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - substituteInPlace $core_affinity/src/lib.rs --replace framework dylib - substituteInPlace $core_affinity/.cargo-checksum.json \ - --replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - ''; - meta = with lib; { description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string"; homepage = "https://github.com/sstadick/hck"; diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index ea0ecf58a96d8..1e17cda75d5f4 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-pXgmbSmOLeAtI7pP0X9go4KnlLv4RChBQNCPYeG4Q84="; + sha256 = "sha256-g6DY3+HwBNQ+jxByXyTJK5CjAaC48FpmsDf1qGGO/Lk="; }; - cargoHash = "sha256-n1AVD6PuZFdZbTuGxNHvR6ngoVmSAixabcJl6nIcyP0="; + cargoHash = "sha256-7cSUIwWyWPxFDuRWplidbI93zbBV84T7e4Q//Uwj6N4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index d234861590131..acb4e373e8090 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -1,26 +1,25 @@ { lib , fetchFromGitHub +, ghostscript , imagemagick +, poppler_utils , python3 -, tesseract -, xpdf +, tesseract5 }: python3.pkgs.buildPythonApplication rec { pname = "invoice2data"; - version = "0.3.6"; + version = "0.4.2"; format = "setuptools"; src = fetchFromGitHub { owner = "invoice-x"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t1jgLyKtQsLINlnkCdSbVfTM6B/EiD1yGtx9UHjyZVE="; + sha256 = "sha256-ss2h8cg0sga+lzJyQHckrZB/Eb63Oj3FkqmGqWCzCQ8="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools-git - ]; + buildInputs = with python3.pkgs; [ setuptools-git ]; propagatedBuildInputs = with python3.pkgs; [ chardet @@ -28,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { pdfminer-six pillow pyyaml + setuptools unidecode ]; @@ -37,9 +37,10 @@ python3.pkgs.buildPythonApplication rec { ''; makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ + ghostscript imagemagick - tesseract - xpdf + tesseract5 + poppler_utils ])]; # Tests fails even when ran manually on my ubuntu machine !! diff --git a/pkgs/tools/text/justify/default.nix b/pkgs/tools/text/justify/default.nix index 1e18e22db8e25..86de7365663e1 100644 --- a/pkgs/tools/text/justify/default.nix +++ b/pkgs/tools/text/justify/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-406OhJt2Ila/LIhfqJXhbFqFxJJiRyMVI4/VK8Y43kc="; }; + postPatch = '' + sed '1i#include <algorithm>' -i src/stringHelper.h # gcc12 + ''; + nativeBuildInputs = [ cmake ]; installPhase = '' diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index d0ac783ca4f5c..b5100570648fb 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.9.6"; + version = "1.10.0"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-rJIkdvhQYTpzkoTj+vR3yYrDSa0Vpzeity3thFH2srw="; + sha256 = "sha256-s/l+Gz6BF1VKeljVj48PaT/wMKQrvLcwj7RPhZWM1Ss="; }; buildInputs = [ boost ]; diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 9cbc2c030a455..322fa77ebad67 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc-O3.patch ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { homepage = "http://www.phontron.com/kytea/"; diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index dfff4ffefe856..39df62da5e9f4 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "8.6"; + version = "8.8"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-2HcCibcP3/E3nu+PoNFChLFyCwAeAdp6I8mN95747Sg="; + sha256 = "sha256-GPL+1NXoy3Wk088XbBrVjZR7rTG8OsAMWJnprTbmnco="; }; - vendorHash = "sha256-t2xiw1Z0BIT7pO4Z16XmsJE72RgL9Hobfy7LakpEYh4="; + vendorHash = "sha256-V14i+8h0HxxHVDNfgaHUxdzEnB+mKL5iGjBwMjPDZ9s="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 62a23318ca2f5..203a79fa381d9 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mawk"; - version = "1.3.4-20200120"; + version = "1.3.4-20230203"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; - sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; + sha256 = "sha256-bbejKsecURB60xpAfU+SxrhC3eL2inUztOe3sD6JAL4="; }; meta = with lib; { diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index c7303fc2fd841..c2f45425076f5 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -1,33 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-AGOq05NevkRU8qHsJIWd2WfZ4i7w/wexf6c0fUAaoLg="; + hash = "sha256-jo5kR1fzSRQq8fvblJaK3IEHfxeN7h0ZdT6vvPBXTXM="; }; - cargoPatches = [ - # https://github.com/tommilligan/mdbook-admonish/pull/33 - (fetchpatch { - name = "update-mdbook-for-rust-1.64.patch"; - url = "https://github.com/tommilligan/mdbook-admonish/commit/650123645b18a3f8ed170738c7c1813315095ed9.patch"; - hash = "sha256-8LMk+Dgz9k0g9fbGGC0X2byyJtfDDgvdGxO06mD6GDI="; - }) - ]; - - cargoHash = "sha256-5PWfze00/mWmzYqP5M1pAPt+SuknpU9dc0B7RSikuTE="; + cargoHash = "sha256-N0zkdaVWas9jK9IXn9T85s18mNTjoEl8OUF2HA2CuHg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { description = "A preprocessor for mdbook to add Material Design admonishments"; license = licenses.mit; - maintainers = with maintainers; [ jmgilman ]; + maintainers = with maintainers; [ jmgilman Frostman ]; homepage = "https://github.com/tommilligan/mdbook-admonish"; }; } diff --git a/pkgs/tools/text/mdbook-emojicodes/default.nix b/pkgs/tools/text/mdbook-emojicodes/default.nix new file mode 100644 index 0000000000000..01ce8fb3e9db8 --- /dev/null +++ b/pkgs/tools/text/mdbook-emojicodes/default.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-emojicodes"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "blyxyas"; + repo = "mdbook-emojicodes"; + rev = "${version}.1"; + hash = "sha256-SWT01R/+FuzkkOUd/2wpRo0HIaPEtzDelTSh7ewo9gQ="; + }; + + cargoHash = "sha256-z9UKBBCr8R1I9k48JsEBnVokQDfaj9lt+qfIUvJ/5lE="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; + + meta = with lib; { + description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱"; + homepage = "https://github.com/blyxyas/mdbook-emojicodes"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/pkgs/tools/text/mdbook-epub/default.nix b/pkgs/tools/text/mdbook-epub/default.nix new file mode 100644 index 0000000000000..47c118afa43a1 --- /dev/null +++ b/pkgs/tools/text/mdbook-epub/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, CoreServices +}: + +let + pname = "mdbook-epub"; + version = "unstable-2022-12-25"; +in rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "michael-f-bryan"; + repo = pname; + rev = "2e1e48d0d1a1b4c1b0f866267e6666b41c598225"; + hash = "sha256-wjn/7dv/Z2OmwvH/XaEeCz/JOvJWlMJ60q5qozzOEWY="; + }; + + cargoHash = "sha256-4oSpQUYJDK0srABZMwJ8x8jv6DOnLShXSnjLjf8c9Ac="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; + + meta = with lib; { + description = "mdbook backend for generating an e-book in the EPUB format"; + homepage = "https://michael-f-bryan.github.io/mdbook-epub"; + license = licenses.mpl20; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 529009fa616b4..3660b45969013 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "dylanowen"; repo = pname; rev = "v${version}"; - hash = "sha256-HTHGb23wc10iAWXX/TNMXjTLWm+OSf1WWW1+/aQRcsk="; + hash = "sha256-WkjkQll5oETVADYpA8/CIZOJCBnfenGSy49sZ5nAQ+c="; }; - cargoPatches = [ - # Remove when updating mdbook-graphviz past 0.1.4. - ./update-mdbook-for-rust-1.64.patch - ]; - - cargoHash = "sha256-keDyfXooPU/GOx56OTq5psDohfZ0E478bnWn0bbC29o="; + cargoHash = "sha256-whBTPQGozPPTSdXuRx5wamc1yy/EC3wNShQGhRqdY9Y="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -25,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time."; homepage = "https://github.com/dylanowen/mdbook-graphviz"; + changelog = "https://github.com/dylanowen/mdbook-graphviz/releases/tag/v${version}"; license = [ licenses.mpl20 ]; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch b/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch deleted file mode 100644 index 58f52cf00dc4d..0000000000000 --- a/pkgs/tools/text/mdbook-graphviz/update-mdbook-for-rust-1.64.patch +++ /dev/null @@ -1,369 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 292fb1f..ce66190 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -26,15 +26,6 @@ dependencies = [ - "url", - ] - --[[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.52" -@@ -156,32 +147,36 @@ dependencies = [ - - [[package]] - name = "clap" --version = "2.34.0" -+version = "3.2.22" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" - dependencies = [ -- "ansi_term", - "atty", - "bitflags", -- "strsim 0.8.0", -- "textwrap 0.11.0", -- "unicode-width", -- "vec_map", -+ "clap_lex", -+ "indexmap", -+ "once_cell", -+ "strsim", -+ "termcolor", -+ "textwrap", - ] - - [[package]] --name = "clap" --version = "3.0.4" -+name = "clap_complete" -+version = "3.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d01c9347757e131122b19cd19a05c85805b68c2352a97b623efdc3c295290299" -+checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" -+dependencies = [ -+ "clap", -+] -+ -+[[package]] -+name = "clap_lex" -+version = "0.2.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" - dependencies = [ -- "atty", -- "bitflags", -- "indexmap", - "os_str_bytes", -- "strsim 0.10.0", -- "termcolor", -- "textwrap 0.14.2", - ] - - [[package]] -@@ -213,24 +208,21 @@ dependencies = [ - - [[package]] - name = "elasticlunr-rs" --version = "2.3.14" -+version = "3.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "60eee99ae400fb1c4521ea3bd678994cb66572754d240449368e8ecd40281569" -+checksum = "b94d9c8df0fe6879ca12e7633fdfe467c503722cc981fc463703472d2b876448" - dependencies = [ -- "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", -- "strum", -- "strum_macros", - ] - - [[package]] - name = "env_logger" --version = "0.7.1" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" - dependencies = [ - "atty", - "humantime", -@@ -465,7 +457,7 @@ dependencies = [ - "log", - "pest", - "pest_derive", -- "quick-error 2.0.1", -+ "quick-error", - "serde", - "serde_json", - ] -@@ -501,15 +493,6 @@ dependencies = [ - "http", - ] - --[[package]] --name = "heck" --version = "0.3.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" --dependencies = [ -- "unicode-segmentation", --] -- - [[package]] - name = "hermit-abi" - version = "0.1.19" -@@ -569,12 +552,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - - [[package]] - name = "humantime" --version = "1.3.0" -+version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --dependencies = [ -- "quick-error 1.2.3", --] -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - - [[package]] - name = "hyper" -@@ -763,14 +743,15 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - - [[package]] - name = "mdbook" --version = "0.4.15" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6" -+checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" - dependencies = [ - "ammonia", - "anyhow", - "chrono", -- "clap 2.34.0", -+ "clap", -+ "clap_complete", - "elasticlunr-rs", - "env_logger", - "futures-util", -@@ -784,7 +765,6 @@ dependencies = [ - "pulldown-cmark", - "regex", - "serde", -- "serde_derive", - "serde_json", - "shlex", - "tempfile", -@@ -798,7 +778,7 @@ dependencies = [ - name = "mdbook-graphviz" - version = "0.1.4" - dependencies = [ -- "clap 3.0.4", -+ "clap", - "lazy_static", - "mdbook", - "pulldown-cmark", -@@ -810,9 +790,9 @@ dependencies = [ - - [[package]] - name = "memchr" --version = "2.4.1" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - - [[package]] - name = "mime" -@@ -968,6 +948,12 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "once_cell" -+version = "1.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" -+ - [[package]] - name = "opaque-debug" - version = "0.2.3" -@@ -995,9 +981,6 @@ name = "os_str_bytes" - version = "6.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" --dependencies = [ -- "memchr", --] - - [[package]] - name = "parking_lot" -@@ -1166,9 +1149,9 @@ dependencies = [ - - [[package]] - name = "pulldown-cmark" --version = "0.9.0" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "acd16514d1af5f7a71f909a44ef253cdb712a376d7ebc8ae4a471a9be9743548" -+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" - dependencies = [ - "bitflags", - "getopts", -@@ -1185,12 +1168,6 @@ dependencies = [ - "pulldown-cmark", - ] - --[[package]] --name = "quick-error" --version = "1.2.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -- - [[package]] - name = "quick-error" - version = "2.0.1" -@@ -1308,9 +1285,9 @@ dependencies = [ - - [[package]] - name = "regex" --version = "1.5.4" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" -+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" - dependencies = [ - "aho-corasick", - "memchr", -@@ -1325,9 +1302,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - - [[package]] - name = "regex-syntax" --version = "0.6.25" -+version = "0.6.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" -+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - - [[package]] - name = "remove_dir_all" -@@ -1370,6 +1347,9 @@ name = "serde" - version = "1.0.133" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" -+dependencies = [ -+ "serde_derive", -+] - - [[package]] - name = "serde_derive" -@@ -1490,36 +1470,12 @@ dependencies = [ - "quote", - ] - --[[package]] --name = "strsim" --version = "0.8.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -- - [[package]] - name = "strsim" - version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - --[[package]] --name = "strum" --version = "0.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", -- "proc-macro2", -- "quote", -- "syn", --] -- - [[package]] - name = "syn" - version = "1.0.84" -@@ -1567,18 +1523,9 @@ dependencies = [ - - [[package]] - name = "textwrap" --version = "0.11.0" -+version = "0.15.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --dependencies = [ -- "unicode-width", --] -- --[[package]] --name = "textwrap" --version = "0.14.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" - - [[package]] - name = "thiserror" -@@ -1793,12 +1740,6 @@ dependencies = [ - "tinyvec", - ] - --[[package]] --name = "unicode-segmentation" --version = "1.8.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" -- - [[package]] - name = "unicode-width" - version = "0.1.9" -@@ -1829,12 +1770,6 @@ version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - --[[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" -diff --git a/Cargo.toml b/Cargo.toml -index 18b4b0e..3a88235 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -12,7 +12,7 @@ edition = "2018" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - - [dependencies] --mdbook = "^0.4.15" -+mdbook = "^0.4.21" - clap = "3.0" - serde_json = "1.0" - pulldown-cmark = "0.9" diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 1f28ca3ff4aac..7b7062a7526af 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.3"; + version = "0.3.8"; src = fetchCrate { inherit pname version; - hash = "sha256-PmNoux12A6MBlviyCy9kjGUHigBDxCiiqXlwf6Sc76I="; + hash = "sha256-LeI46x5M2ZYUOIxuj9bCNwwucRLvoOkdRhsowmVxS68="; }; - cargoHash = "sha256-YSLJsiIkoeSAh3oUMkbk5jSW0NMdJLB6YsOt1YlGyfs="; + cargoHash = "sha256-pEwPnE2EpS+0bw3/SSKOCy8R5xUiG6mBMoup6wbrf+0="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix new file mode 100644 index 0000000000000..c8bc79c2a6fc2 --- /dev/null +++ b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-kroki-preprocessor"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "joelcourtney"; + repo = "mdbook-kroki-preprocessor"; + rev = "v${version}"; + hash = "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw="; + }; + + cargoHash = "sha256-IKwDWymAQ1OMQN8Op+DcvqPikoLdOz6lltbhCgOAles="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Render Kroki diagrams from files or code blocks in mdbook"; + homepage = "https://github.com/joelcourtney/mdbook-kroki-preprocessor"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index f334645ba5a4a..29c6e54ee5f6c 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -1,26 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.2.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "badboy"; repo = pname; - rev = "2.2.0"; - hash = "sha256-x7ESuXoF5dYnJZpgDyYliVixCG4w/VX/Vhm3VqxsiEI="; + rev = version; + hash = "sha256-K7SkfUxav/r8icrpdfnpFTSZdYV9qUEvYZ2dGSbaP0w="; }; - cargoPatches = [ - # https://github.com/badboy/mdbook-open-on-gh/pull/7 - (fetchpatch { - name = "update-mdbook-for-rust-1.64.patch"; - url = "https://github.com/badboy/mdbook-open-on-gh/commit/bd20601bfcec144c9302b1ba1a1aff4b95b334d9.patch"; - hash = "sha256-3Df9Q3sqCpZzqCN9fi+wdeWjLUW4XdywIS3QUjsDE9g="; - }) - ]; - - cargoHash = "sha256-N0RwengTWk4luPIecIxzbFReGi+PtE77FJalPq1CdbA="; + cargoHash = "sha256-Uvg0h0s3xtv/bVjqWLldvM/R5HQ6yoHdnBXvpUp/E3A="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/tools/text/mdbook-pagetoc/default.nix b/pkgs/tools/text/mdbook-pagetoc/default.nix new file mode 100644 index 0000000000000..7ee5f8fdde4ea --- /dev/null +++ b/pkgs/tools/text/mdbook-pagetoc/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-pagetoc"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "slowsage"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SRrlyUkEdC63NbdAv+J9kb5LTCL/GBwMhnUVdTE4nas="; + }; + + cargoHash = "sha256-Gx6N8VFUnaOvQ290TLeeNj/pVDeK/nUWLjM/KwVAjNo="; + + meta = with lib; { + description = "Table of contents for mdbook (in sidebar)"; + homepage = "https://github.com/slowsage/mdbook-pagetoc"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 020ebdc0ca3dc..d94382524b91e 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-pdf"; - version = "0.1.4"; + version = "0.1.5"; src = fetchCrate { inherit pname version; - hash = "sha256-v57Geqd1YCzR9oM97K+Y9OdeokzNc4Kbh0sDP0+vxjU="; + hash = "sha256-822RQKgedxQ+VFNDv20tFUc2Xl56Ivub+/EXNrLRfGM="; }; - cargoHash = "sha256-mZUif1qBREM/5GYJU9m20p3rC3fnbZELcEKatwhoQEU="; + cargoHash = "sha256-mX2EKjuWM1KW8DXFdYFKQfASjdqZCW78F1twZNQQr7o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index d3bf8b2d8bf4b..9d00c8e1fd125 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.25"; + version = "0.4.26"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-9zq3y7fNbGkprekzPDnJV4/IkAFUGEydkWAtr49mhdg="; + sha256 = "sha256-+K2mbVbOMQDumcPgiPtqDts/RGi+E0lF7Cftt86X/5A="; }; - cargoSha256 = "sha256-6UiE/b6iJkuM/9g5yhB33WwTZ2VYlWFWQdfdHzA39CM="; + cargoHash = "sha256-C9ziW3LUBGR/K+nR3mDr62KoE9p3mn+50nfd/3NFjro="; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 47f74684c6f10..e8a7e4ecf5a26 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -42,10 +42,14 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/mdcat-*/out/mdcat.1 - installShellCompletion \ - --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash \ - --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish \ - --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat + ln -sr $out/bin/{mdcat,mdless} + + for bin in mdcat mdless; do + installShellCompletion \ + --bash $releaseDir/build/mdcat-*/out/completions/$bin.bash \ + --fish $releaseDir/build/mdcat-*/out/completions/$bin.fish \ + --zsh $releaseDir/build/mdcat-*/out/completions/_$bin + done ''; meta = with lib; { diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/tools/text/mmdoc/default.nix index 1a1c531f6296a..470e14988947c 100644 --- a/pkgs/tools/text/mmdoc/default.nix +++ b/pkgs/tools/text/mmdoc/default.nix @@ -12,23 +12,20 @@ stdenv.mkDerivation rec { pname = "mmdoc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = version; - hash = "sha256-ZPdAMlKGwEO54hxHcQh1xgu6eUGsoX12xD/9JehzRdw="; + hash = "sha256-1e6TS4TjshicUdT7wuvLsDpotr2LUxbn15r+eNXMo2M="; }; nativeBuildInputs = [ ninja meson pkg-config xxd ]; buildInputs = [ cmark-gfm fastJson libzip ]; - doCheck = stdenv.isx86_64; - meta = with lib; { - broken = stdenv.isDarwin; description = "Minimal Markdown Documentation"; homepage = "https://github.com/ryantm/mmdoc"; license = licenses.cc0; diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index 54ef6d7cb1c9f..55c66f7a5408c 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ov"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-8xurv4RldKVeakYSkY4rxx9kCeXxKc7ou7bN1+uoY50="; + hash = "sha256-tbJ3Es6huu+0HcpoiNpYLbxsm0QCWYZk6bX2MdQxT2I="; }; - vendorHash = "sha256-hyvWyUJyDZgxlOJI5NhLNC6kf2e1SvH/msg2WMKTW4Y="; + vendorHash = "sha256-EjLslvc0cgvD7LjuDa49h/qt6K4Z9DEtQjV/LYkKwKo="; ldflags = [ "-X main.Version=v${version}" diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index 032e9474128ae..7db56539bf2e2 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=mismatched-new-delete" + ]); + postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace Makefile \ --replace "-msse2" "" --replace "-DUSE_SSE2" "" diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/tools/text/rnr/default.nix index 55a4c2ddf6815..834ecfddee770 100644 --- a/pkgs/tools/text/rnr/default.nix +++ b/pkgs/tools/text/rnr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rnr"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "ismaelgv"; repo = pname; rev = "v${version}"; - sha256 = "1r1ahh8bmqrc7zb4bq5ka8bsngncf7im51nf5il49cvysij1i4q8"; + sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU="; }; - cargoSha256 = "sha256-qgKL+y+w+9ADClxLNwglHMufaysY0K9g29PyuXZ7x7g="; + cargoSha256 = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw="; meta = with lib; { description = "A command-line tool to batch rename files and directories"; diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index ba5c6507fa7ff..e1ee0ae2ab57a 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -1,15 +1,17 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.14.0"; + version = "0.15.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-ucArD3xElLpOukNYHiErCTKDSlW2aDn00D3gr5L8Sm0="; + src = fetchFromGitHub { + owner = "causal-agent"; + repo = "scraper"; + rev = "v${version}"; + hash = "sha256-K0MeZeS60gxo0/kBCaffNVQrR5S1HDoq77hnC//LMQg="; }; - cargoSha256 = "sha256-62rJWpDi2vPHFnJnIrisyj0sEZTzRra+zoMb06zmxdE="; + cargoHash = "sha256-2IvfJaYyX7ZA1y3TETydb7wXRER4CfH69xEvnxKCFTc="; nativeBuildInputs = [ installShellFiles ]; @@ -20,6 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A tool to query HTML files with CSS selectors"; homepage = "https://github.com/causal-agent/scraper"; + changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index 891e26017e68c..a744300bfddec 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnum4 ]; - NIX_CFLAGS_COMPILE = "-Wno-deprecated"; + env.NIX_CFLAGS_COMPILE = "-Wno-deprecated"; # Makefile is missing intra-library depends, fails build as: # ld: cannot find -lsp diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 53146ddd06105..94c5c8cf02fc9 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index 02a29a91f47d9..85e593982e85a 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # _FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = "-O"; + env.NIX_CFLAGS_COMPILE = "-O"; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 0802f7b983612..89c31d0440aac 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE="; }; + # gcc12; see https://github.com/ivan-tkatchev/tab/commit/673bdac998 + postPatch = '' + sed '1i#include <cstring>' -i deps.h + ''; + nativeCheckInputs = [ python3 ]; doCheck = !stdenv.isDarwin; @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programming language/shell calculator"; - homepage = "http://tab-lang.xyz"; + homepage = "https://tab-lang.xyz"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; platforms = with platforms; unix; diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 68bc86f144ab4..7c7ddbb1b8ee3 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -6,15 +6,15 @@ python3.pkgs.buildPythonApplication rec { pname = "txt2tags"; - version = "unstable-2022-10-17"; + version = "3.8"; format = "setuptools"; src = fetchFromGitHub { owner = "txt2tags"; repo = "txt2tags"; - rev = "114ab24ea9111060df136bfc1c8b1a35a59fe0f2"; - hash = "sha256-h2OtlUMzEHKyJ9AIO1Uo9Lx7jMYZNMtC6U+usBu7gNU="; + rev = "refs/tags/${version}"; + hash = "sha256-urLsA2oeQM0WcKNDgaxKJOgBPGohJT6Zq6y6bEYMTxk="; }; postPatch = '' diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index ff48164846322..f5b5dc4c773f2 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.9.5"; + version = "3.10.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - hash = "sha256-vaoEfNhkvbcZwjSMRwmWo42jPg6+7mrZx+jIesQnmL0="; + hash = "sha256-ujLKAJNt2bWIq79Wh94QTFpd+7yUMhS7UMXa8gJScA4="; }; buildInputs = [ diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 9f3375c7e41c5..50cd3d9411ec3 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { postInstall = '' sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv" wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/" - '' + (if installSymlinks then '' + '' + lib.optionalString installSymlinks '' make install-links prefix="$out" - '' else ""); + ''; meta = with lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index cd1147ba4c7fb..1bfdfadd03a8a 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.22.0"; + version = "2.23.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-/8npVrVyyxYLiJotCdqeGE0d9w8pOjShx1fpmRkKW9k="; + hash = "sha256-HvdopsSI5CZOAA+C+FJGc7WhrA2qt43cAHe9HoxO91o="; }; - vendorHash = "sha256-7P77tR2wACRgF+8A/L/wPcq6etwzAX3pFO46FfGVTiE="; + vendorHash = "sha256-aH8KWvTXRlWVR/RdYlGjpZ4bOncQfLap1PVKxEnaz6A="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 9865c302f985c..829ea2c66ebad 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -4,35 +4,42 @@ let flreSrc = fetchFromGitHub { owner = "benibela"; repo = "flre"; - rev = "5aa8a9e032feff7a5790104f2d53fa74c70bb1d9"; # latest as of 0.9.8 release date - sha256 = "1zny494jm92fjgfirzwmxff988j4yygblaxmaclkkmcvzkjrzs05"; + rev = "3e926d45d4352f1b7c7cd411ccd625df117dad5c"; + hash = "sha256-fs7CIjd3fwD/SORYh5pmJxIdrr8F9e36TNmnKUbUxP0="; }; - synapseSrc = fetchsvn { - url = "http://svn.code.sf.net/p/synalist/code/synapse/40/"; - rev = 237; - sha256 = "0ciqd2xgpinwrk42cpyinh9gz2i5s5rlww4mdlsca1h6saivji96"; + synapseSrc = fetchFromGitHub { + owner = "benibela"; + repo = "ararat-synapse"; + rev = "7a77db926de66809080bada68b54172da7f84c0e"; + hash = "sha256-bVLQ0ohGJYtuP88Krxy9a7RnHHrW0OWw8H/uxa3PerU="; }; rcmdlineSrc = fetchFromGitHub { owner = "benibela"; repo = "rcmdline"; - rev = "96859e574e82d76eae49d5552a8c5aa7574a5987"; # latest as of 0.9.8 release date - sha256 = "0vwvpwrxsy9axicbck143yfxxrdifc026pv9c2lzqxzskf9fd78b"; + rev = "ea02b770c4568717dd7b3b72da191a8bbcb4c751"; + hash = "sha256-6YtvAf0joRvtCKbUAaLwuwABw1GEIzammFLhboq9aG0="; }; internettoolsSrc = fetchFromGitHub { owner = "benibela"; repo = "internettools"; - rev = "c9c5cc3a87271180d4fb5bb0b17040763d2cfe06"; # latest as of 0.9.8 release date - sha256 = "057hn7cb1vy827gvim3b6vwgfdh2ckjy8h9yj1ry7lv6hw8ynx6n"; + rev = "dd972caaa4415468fa679ea7262976ead3fd3e38"; + hash = "sha256-09sADxPiE6ky1EX7dTXRBYVT3IarUcLYf5knzi7+CHU="; + }; + pasdblstrutilsSrc = fetchFromGitHub { + owner = "BeRo1985"; + repo = "pasdblstrutils"; + rev = "1696f0a2b822fef26c8992f96620f1be129cfa99"; + hash = "sha256-x0AjOTa1g7gJOR2iBO76yBt1kzcRNujHRUsq5QOlfP0="; }; in stdenv.mkDerivation rec { pname = "xidel"; - version = "0.9.8"; + version = "unstable-2022-11-01"; src = fetchFromGitHub { owner = "benibela"; repo = pname; - rev = "Xidel_${version}"; - sha256 = "0q75jjyciybvj6y17s2283zis9fcw8w5pfsq8bn7diinnbjnzgl6"; + rev = "6d5655c1d73b88ddeb32d2450a35ee36e4762bb8"; + hash = "sha256-9x2d5AKRBjocRawRHdeI4heIM5nb00/F/EIj+/to7ac="; }; nativeBuildInputs = [ fpc ]; @@ -53,9 +60,10 @@ in stdenv.mkDerivation rec { ''; preBuildPhase = '' - mkdir -p import/{flre,synapse} rcmdline internettools + mkdir -p import/{flre,synapse,pasdblstrutils} rcmdline internettools cp -R ${flreSrc}/. import/flre cp -R ${synapseSrc}/. import/synapse + cp -R ${pasdblstrutilsSrc}/. import/pasdblstrutils cp -R ${rcmdlineSrc}/. rcmdline cp -R ${internettoolsSrc}/. internettools ''; @@ -72,20 +80,11 @@ in stdenv.mkDerivation rec { cp xidel "$out/bin/" ''; - doCheck = true; - + # disabled, because tests require network checkPhase = '' - # Not all, if any, of these tests are blockers. Failing or not this phase will pass. - # As of 2021-08-15, all of 37 failed tests are linked with the lack of network access. ./tests/tests.sh ''; - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/xidel --version | grep "${version}" - ''; - meta = with lib; { description = "Command line tool to download and extract data from HTML/XML pages as well as JSON APIs"; homepage = "https://www.videlibri.de/xidel.html"; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index c2d9238bdd69d..f03ee980583f5 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -5,17 +5,20 @@ stdenv.mkDerivation rec { version = "2.36"; src = fetchurl { - url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; + url = "https://hevea.inria.fr/distri/hevea-${version}.tar.gz"; sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg="; }; - buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A quite complete and fast LATEX to HTML translator"; - homepage = "http://pauillac.inria.fr/~maranget/hevea/"; + homepage = "https://hevea.inria.fr/"; + changelog = "https://github.com/maranget/hevea/raw/v${version}/CHANGES"; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 0513035094bd6..a5b677888420b 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmark"; - version = "2.2.30"; + version = "2.2.31"; src = fetchFromGitHub { owner = "mmarkdown"; repo = "mmark"; rev = "v${version}"; - sha256 = "sha256-14SGA3a72i+HYptTEpxf4YiLXZzZ1R/t1agvm3ie4g8="; + sha256 = "sha256-mCnlLsvkkB7ZvBCLYHvYanz9XgWo92v5M/kKulhUKTE="; }; - vendorSha256 = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; + vendorHash = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index 755ac6bb32a3f..26037b05664d1 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml perl ]; installPhase = '' mkdir -p $out/bin cp -p pdfsandwich $out/bin diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index a20aa5dc09e05..6d652c38f2ee3 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.7"; + version = "0.14.8"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "01sx4368bws47989zdahhksgy5jgc1qw4hhvpib4qcz3fs6xpx9j"; + sha256 = "0r00s7c8ycc9haqf7p141gj5jn3k0kxpjdzb538f1jpwkgi6mjh9"; }; configureFlags = [ diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index e6cd6de9e6791..3c3b736bf2c6e 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -5,24 +5,31 @@ , testers }: -ocamlPackages.buildDunePackage rec { +let pname = "soupault"; - version = "4.3.1"; - minimalOCamlVersion = "4.08"; + version = "4.4.0"; +in +ocamlPackages.buildDunePackage { + inherit pname version; + + minimalOCamlVersion = "4.13"; + + duneVersion = "3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "sha256-P8PGSJ7TOlnMoTcE5ZXqc7pJe4l+zRhBh0A/2iIJLQI="; + sha256 = "sha256-M4gaPxBxQ1Bk2C3BwvobYHyaWKIZgQ6buZ6S5wBlvPg="; }; buildInputs = with ocamlPackages; [ base64 camomile containers + digestif ezjsonm fileutils fmt diff --git a/pkgs/tools/typesetting/tex/advi/default.nix b/pkgs/tools/typesetting/tex/advi/default.nix new file mode 100644 index 0000000000000..0be4d4a9574c7 --- /dev/null +++ b/pkgs/tools/typesetting/tex/advi/default.nix @@ -0,0 +1,64 @@ +{ fetchurl +, lib +, makeWrapper +, writeShellScriptBin +, ghostscriptX +, ocamlPackages +, texlive +, which +}: + +let + # simplified fake-opam edited from tweag's opam-nix + fake-opam = writeShellScriptBin "opam" '' + case "$1 $2" in + "config var") + case "$3" in + man) echo "$out/share/man";; + etc) echo "$out/etc";; + doc) echo "$out/share/doc";; + share) echo "$out/share";; + prefix) echo "$out";; + *) echo "fake-opam does not understand arguments: $@" ; exit 1 ;; + esac;; + *) echo "fake-opam does not understand arguments: $@" ; exit 1 ;; + esac + ''; + + # texlive currently does not symlink kpsexpand + kpsexpand = writeShellScriptBin "kpsexpand" '' + exec kpsetool -v + ''; +in +ocamlPackages.buildDunePackage rec { + pname = "advi"; + version = "2.0.0"; + + useDune2 = true; + + minimalOCamlVersion = "4.11"; + + src = fetchurl { + url = "http://advi.inria.fr/advi-${version}.tar.gz"; + hash = "sha256-c0DQHlvdekJyXCxmR4+Ut/njtoCzmqX6hNazNv8PpBQ="; + }; + + nativeBuildInputs = [ fake-opam kpsexpand makeWrapper texlive.combined.scheme-medium which ]; + buildInputs = with ocamlPackages; [ camlimages ghostscriptX graphics ]; + + # TODO: ghostscript linked from texlive.combine will override ghostscriptX and break advi + preInstall = '' + make install + wrapProgram "$out/bin/advi" --prefix PATH : "${lib.makeBinPath [ ghostscriptX ]}" + ''; + + # TODO: redirect /share/advi/tex/latex to tex output compatible with texlive.combine + # (requires patching check() in advi-latex-files) + + meta = with lib; { + homepage = "http://advi.inria.fr/"; + description = "Active-DVI is a Unix-platform DVI previewer and a programmable presenter for slides written in LaTeX."; + license = licenses.lgpl21Only; + maintainers = [ maintainers.xworld21 ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index fbb6fdb0fe016..e9017333c943c 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -82,7 +82,8 @@ rec { findLhs2TeXIncludes = - { rootFile + { lib + , rootFile }: builtins.genericClosure { @@ -97,7 +98,7 @@ rec { { src = key; } "${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}"); - in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else []) + in pkgs.lib.concatMap (x: lib.optionals (builtins.pathExists x) [{key = x;}]) (map (x: dirOf key + ("/" + x)) deps); }; diff --git a/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix b/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix index 1e4c5c2d2fa59..559b34f34ad05 100644 --- a/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix +++ b/pkgs/tools/typesetting/tex/pgf-tikz/pgfplots.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "http://pgfplots.sourceforge.net"; + homepage = "https://pgfplots.sourceforge.net"; description = "TeX package to draw plots directly in TeX in two and three dimensions"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 012f03d0e1203..5caebace7cbde 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -15,7 +15,7 @@ let ]; }; pkgList = rec { - all = lib.filter pkgFilter (combinePkgs pkgSet); + all = lib.filter pkgFilter (combinePkgs (lib.attrValues pkgSet)); splitBin = builtins.partition (p: p.tlType == "bin") all; bin = mkUniqueOutPaths splitBin.right ++ lib.optional diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index e7aaac3c8de60..94b8c2db9035d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -30,9 +30,9 @@ let # the set of TeX Live packages, collections, and schemes; using upstream naming tl = let - orig = import ./pkgs.nix tl; + orig = import ./pkgs.nix; removeSelfDep = lib.mapAttrs - (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } + (n: p: if p ? deps then p // { deps = lib.filter (dn: n != dn) p.deps; } else p); clean = removeSelfDep (orig // { # overrides of texlive.tlpdb @@ -42,24 +42,24 @@ let }; xdvi = orig.xdvi // { # it seems to need it to transform fonts - deps = (orig.xdvi.deps or {}) // { inherit (tl) metafont; }; + deps = (orig.xdvi.deps or []) ++ [ "metafont" ]; }; # remove dependency-heavy packages from the basic collections collection-basic = orig.collection-basic // { - deps = removeAttrs orig.collection-basic.deps [ "metafont" "xdvi" ]; + deps = lib.filter (n: n != "metafont" && n != "xdvi") orig.collection-basic.deps; }; # add them elsewhere so that collections cover all packages collection-metapost = orig.collection-metapost // { - deps = orig.collection-metapost.deps // { inherit (tl) metafont; }; + deps = orig.collection-metapost.deps ++ [ "metafont" ]; }; collection-plaingeneric = orig.collection-plaingeneric // { - deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; }; + deps = orig.collection-plaingeneric.deps ++ [ "xdvi" ]; }; # override cyclic dependency until #167226 is fixed xecjk = orig.xecjk // { - deps = removeAttrs orig.xecjk.deps [ "ctex" ]; + deps = lib.remove "ctex" orig.xecjk.deps; }; texdoc = orig.texdoc // { @@ -82,8 +82,11 @@ let }; }); # overrides - # tl = - in lib.mapAttrs flatDeps clean; + linkDeps = lib.mapAttrs (_: attrs: attrs // lib.optionalAttrs (attrs ? deps) { + deps = builtins.map (n: tl.${n}) attrs.deps; + }); # transform [ "dep1" "dep2" ... ] into [ tl."dep1" ... ] + + in lib.mapAttrs flatDeps (linkDeps clean); # TODO: texlive.infra for web2c config? @@ -113,7 +116,7 @@ let ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") ++ lib.optional (bin ? ${pname}) ( bin.${pname} // { inherit pname; tlType = "bin"; } ) - ++ combinePkgs (attrs.deps or {}); + ++ combinePkgs (attrs.deps or []); }; # for daily snapshots @@ -183,8 +186,8 @@ let ); # combine a set of TL packages into a single TL meta-package - combinePkgs = pkgSet: lib.concatLists # uniqueness is handled in `combine` - (lib.mapAttrsToList (_n: a: a.pkgs) pkgSet); + combinePkgs = pkgList: lib.concatLists # uniqueness is handled in `combine` + (builtins.map (a: a.pkgs) pkgList); in tl // { diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix index 1889f4df197ae..222d56b4f1356 100644 --- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -1,4 +1,4 @@ -tl: { # no indentation +{ # no indentation "12many" = { revision = 15878; stripPrefix = 0; @@ -226,9 +226,11 @@ tl: { # no indentation "acro" = { revision = 62925; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; + deps = [ + "etoolbox" + "l3kernel" + "l3packages" + ]; sha512.run = "25c0dc9cda98db7ead55613aea92946cd90e7edfa1213d59966eb8fdd93ae1bc7b532f7849c43fb8fa77291b23dc5d8dc80cba4584c991a7b38e55564bd59ea3"; sha512.doc = "c827f8dc5fa88b67e84e48d0cfb6d47aa5bfa98fbceed86e6262d98111a956d425d0a2f3cf54b18cba7593dfac17accc2cbe71cc04f1ea2157c511d670c41daa"; hasRunfiles = true; @@ -356,9 +358,11 @@ tl: { # no indentation "adjustbox" = { revision = 64967; stripPrefix = 0; - deps."collectbox" = tl."collectbox"; - deps."graphics" = tl."graphics"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "collectbox" + "graphics" + "xkeyval" + ]; sha512.run = "ac12b052b2112d5bcd942888ab69fa20aca6e2b392bf868959b8573ee8611d93042de3f90eace1519a89d0da64d2dcb3046e26fb0f86f46ea3e673e2a2aee2c8"; sha512.doc = "d48b405a472df491b3ac6db23b126a70acda26e4dc2baf8e60569f110af2c4c740708c84fad9b70f689022e8747013198c98ea0bb3c6798f1dd8065a431d1ba5"; sha512.source = "08da88fe2a344716e7184ac2cadf564a90def84c03af8270a2f5e906ae720a7794dcb2707af5e41ab41406b01021029f4272c3e2844e9e36cd913ab56f049ba3"; @@ -514,12 +518,14 @@ tl: { # no indentation }; "aleph" = { revision = 62387; - deps."cm" = tl."cm"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."lambda" = tl."lambda"; - deps."latex" = tl."latex"; - deps."plain" = tl."plain"; + deps = [ + "cm" + "hyphen-base" + "knuth-lib" + "lambda" + "latex" + "plain" + ]; hasFormats = true; sha512.run = "222d0c7045ddfdde5f0ca0ebe20a029c32fd0d4f35326c5ead6bf4ebbcadc86a2a2ff609bca3a6c3a04a09828c50c885f49ef9da0e6e548c18c2633400865c7f"; sha512.doc = "77d2daaacfa99d7f4ed5b70706751936bed5ae00ac67490e428d900b5fee3d78797d2324039743cbf0cb06a3a03dba17643d67d9057d020a95a536c860d5e78e"; @@ -802,12 +808,14 @@ tl: { # no indentation }; "amstex" = { revision = 63708; - deps."amsfonts" = tl."amsfonts"; - deps."cm" = tl."cm"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."plain" = tl."plain"; - deps."tex" = tl."tex"; + deps = [ + "amsfonts" + "cm" + "hyphen-base" + "knuth-lib" + "plain" + "tex" + ]; hasFormats = true; sha512.run = "d92156cc5a01152776378c8809993b2ccbc9e917125d2ecfd2a06482401008385928e279a8832f328f7a8f4f3eeb746f9725e4986e4eb2f478c20a432ea8698e"; sha512.doc = "ba87f3c3858ad7d86de6bcc03e50c5407e83f9de4bd3b3c63e3ce612fc5f933fba0d10bbad88525bae0a1f489adbd02643687f650874409962ee5b29447e14e8"; @@ -913,7 +921,9 @@ tl: { # no indentation "antomega" = { revision = 21933; stripPrefix = 0; - deps."omega" = tl."omega"; + deps = [ + "omega" + ]; sha512.run = "af2cbe945ac3495e94fbf69797c05d9a7cd8c3874148c54c602a4a152c669638cf7a861949a3cc2d08aa21f378b57beffddf2d13e3afc1157c74472c348f5405"; sha512.doc = "298b2e796736f7598a83a2d4fee53f48e78d0c8b255cc09c686371a3a05a4d36736cef96d812281cfd3fe1024af433f32e117c1c60d7559809220ed8dd5e56a9"; sha512.source = "7ee92461e60834af1f736f387823788a44d680171d9a7acbfd71c858885e190f724b5db11074efb74faf63b471af5c34688af1be5b765de67b170dbcf123fe2f"; @@ -1615,9 +1625,11 @@ tl: { # no indentation "auto-pst-pdf" = { revision = 56596; stripPrefix = 0; - deps."ifplatform" = tl."ifplatform"; - deps."iftex" = tl."iftex"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "ifplatform" + "iftex" + "xkeyval" + ]; sha512.run = "5c1f85a0ec5aa4173181b087a1f5f8e30be6d8c21c3461999a85b42032d45292aa6f8aae4922a5e97d073fff5b2c9d114cd30f5d5bb73ef523718e891ce59473"; sha512.doc = "73d6f4b2e298eedc537a46c1e69bce9e160eb28e6bc2f631596a4fd3aa658d8b51d6dfddb6748b7e629fe564a2ced5e55bcd766650616d936a4197e368b2fcd7"; sha512.source = "199e9fefcb2f96f1ad9e33abeecedcff9c72f20614c48951197703ff65901763ef88f425af08021b1843f30c3ee8e3a9756095ad4b165772b829a29c6e5515f2"; @@ -1627,7 +1639,9 @@ tl: { # no indentation "auto-pst-pdf-lua" = { revision = 54779; stripPrefix = 0; - deps."iftex" = tl."iftex"; + deps = [ + "iftex" + ]; sha512.run = "053adb8525158b1c0703333bc9a20d3923468da54db4400f83c8c651820a01a9569542afb5502b56abf7034122fe5baf17ea6d2e7d7dbe53acdc7c2f9b1de68d"; sha512.doc = "dc7647af18502d3f7d88cb9dde9a4bc467204a78d6f6ef441d7593aeb2f9776532eddb94350081619986a0dece023c2ece54d3dce554188f5b62056b7a1a96b8"; hasRunfiles = true; @@ -2324,8 +2338,10 @@ tl: { # no indentation "bangla" = { revision = 60159; stripPrefix = 0; - deps."charissil" = tl."charissil"; - deps."doulossil" = tl."doulossil"; + deps = [ + "charissil" + "doulossil" + ]; sha512.run = "adeed1b1f42ef1c76406c376d5f672870feedd4ccdc8db382b057dea6dceecca6e53de7d2c0ca154def6b0be67c05aa46e959c89829f564a3acc6805462bb4bc"; sha512.doc = "d62d6a72c268421033767b3d2c131583e62e0c139ea3e101094752616498111badc5f0544294e836715dc7b3fffd5da9d9e4d3a4103fd2090f38e7ee31afe5be"; hasRunfiles = true; @@ -2545,17 +2561,19 @@ tl: { # no indentation "beamer" = { revision = 64388; stripPrefix = 0; - deps."amscls" = tl."amscls"; - deps."amsfonts" = tl."amsfonts"; - deps."amsmath" = tl."amsmath"; - deps."atbegshi" = tl."atbegshi"; - deps."etoolbox" = tl."etoolbox"; - deps."geometry" = tl."geometry"; - deps."hyperref" = tl."hyperref"; - deps."iftex" = tl."iftex"; - deps."pgf" = tl."pgf"; - deps."translator" = tl."translator"; - deps."xcolor" = tl."xcolor"; + deps = [ + "amscls" + "amsfonts" + "amsmath" + "atbegshi" + "etoolbox" + "geometry" + "hyperref" + "iftex" + "pgf" + "translator" + "xcolor" + ]; sha512.run = "27118c5f5dd76a6c7cd0fb74fd8420c5a0b30655ffd57a1677f7e92163f81992ecfaa13cfbf9e2a0d47069980d0364848bcb0c24b120163833fed09c589f54ba"; sha512.doc = "52512e5966c4b6f6b7d4660c61115d8ec3fea2b4e3dfd065fcbf4ea6bb9fb1895f48a69f092482932a73c74004b14026fb844ab3d358af706ead011a63053339"; hasRunfiles = true; @@ -2847,7 +2865,9 @@ tl: { # no indentation "beaulivre" = { revision = 64280; stripPrefix = 0; - deps."colorist" = tl."colorist"; + deps = [ + "colorist" + ]; sha512.run = "7fa9fac71a151bc1e100ed3ad4261cb4d76df8734d424ba5600f73d526f48183f3d7024426be5c35114b20e6ff341f3cf735dfafaa96d17a42a4d7fc0e54179a"; sha512.doc = "d489dadc440661b8c8ceb645a5a2ffbc50c5461d9fb1ac9964be76907aa250f657a1b6bbb7a4f8674babdece60958ce1f089a953e6597af971ace22184eb2d1a"; hasRunfiles = true; @@ -3024,7 +3044,9 @@ tl: { # no indentation }; "bib2gls" = { revision = 65104; - deps."glossaries-extra" = tl."glossaries-extra"; + deps = [ + "glossaries-extra" + ]; sha512.run = "009e393b3083a3260642cb36dc463c714689d1b32d07885c9d20092e4f7386d05118c452e6f97001120f70558a69aa58d757ae0998cefe10e164bb172e432fbf"; sha512.doc = "2a22e662fa0c41581a3c9d9496f97854ea2faa0d01970ab0cc0542048d0ebdcfcbf7ddc7fcf519510d99300eb6634f1c7688874cf02cf6052962d903c5810887"; sha512.source = "da69973053fda82589612813834134837cf9680f4257a6336aed08213df0ff4c34dbef3c7edb833c7987549599cc48ae82dec36bac96dda003e3de3d1422bc6d"; @@ -3042,9 +3064,11 @@ tl: { # no indentation }; "bibcop" = { revision = 65306; - deps."fancyvrb" = tl."fancyvrb"; - deps."iexec" = tl."iexec"; - deps."verbatimcopy" = tl."verbatimcopy"; + deps = [ + "fancyvrb" + "iexec" + "verbatimcopy" + ]; sha512.run = "d0b510a55ba24daf97727cd7b81174839276c4c8d467ec2ca1ea9729341d214fedfdd0b05650e33525e67f0c29b46e5e5337d8e08af8d07ba208b91b5ee526cc"; sha512.doc = "1d36da4a989a59a1a044f310232207a9dd2d20a9cbb55dd5b0f2c52674d1a3ac54cba16de2e634e520a1a4e1e186ceff871ef701165313b4dcac615306700dff"; sha512.source = "66dedb1e1cebd4cffc1aa411caf621b819c3a718561d899bc144574afd84313205bb14a0966838e0ddb77ad9dd7ab5fdf3570e1131bcb6138d4b27a9189ba4d3"; @@ -3084,11 +3108,13 @@ tl: { # no indentation "biblatex" = { revision = 63878; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."kvoptions" = tl."kvoptions"; - deps."logreq" = tl."logreq"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."url" = tl."url"; + deps = [ + "etoolbox" + "kvoptions" + "logreq" + "pdftexcmds" + "url" + ]; sha512.run = "a879c80e266b55d653dead15774e5b08ae827a5bbd8a17d7a6e2f9bf240bbc5be88a0c01df9d4b1ef7ccd3a55d0c7e4ef9b65018bcfd13b209ea370c951cb539"; sha512.doc = "c941c5c976981fec48a86fafec6a7e8f80d36d1aa766f1b8fc798a2ed934f2f7f1ec17467743afc3e9e4d8fce21d0cd95bdfd378be35c7cd4ef239e49872ff7c"; hasRunfiles = true; @@ -3393,11 +3419,13 @@ tl: { # no indentation "biblatex-ms" = { revision = 64180; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."kvoptions" = tl."kvoptions"; - deps."logreq" = tl."logreq"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."url" = tl."url"; + deps = [ + "etoolbox" + "kvoptions" + "logreq" + "pdftexcmds" + "url" + ]; sha512.run = "cef1cecae6fa89d761f5eda158e495e40e0e77500eec84e4a08df7bacfa3a03fffe1b8e50b27e9456cbd6f393fae6293e61df69faa21e5a245e18c2b13722d86"; sha512.doc = "9dce37ce0bc21b81bfbaeb2855b81089fb32c3a8b4547ec8197638d1063f2b126f4e94e3dab6164beab71abb66f8a2cce9e4f7efd5494295556156c55679f586"; hasRunfiles = true; @@ -3684,7 +3712,9 @@ tl: { # no indentation }; "bibtex" = { revision = 64491; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "fadbb6ca18794e52b40a7083db41c5f1d42e47ce93daed7a551bf8e263f8aac8302578f23fe915c3706e4e3603cbdc9cafc55b07c895542a60eb1670ce07d628"; sha512.doc = "6e1433e40fd604e391be05b9b68449cb6804488a42aac802d8960407930f99ae4450b77afe1baae4fe9b4d20b48c359472cf6c1e0a67d6f0a4a87cbffaaf1d8c"; hasRunfiles = true; @@ -3897,7 +3927,9 @@ tl: { # no indentation "bitset" = { revision = 53837; stripPrefix = 0; - deps."bigintcalc" = tl."bigintcalc"; + deps = [ + "bigintcalc" + ]; sha512.run = "b1c9121312404d3daf6907623972c35e0f36cfb4197e589bd937c145506cb5a2d9d8c1f665ae3b4d3ec093e55bb146c0b67cd0858425b704fe29989b9924ccb7"; sha512.doc = "a5a3ba9d27dc3d9658c1d261f798fdc5e6dc4cedd85287ef77d2a0341048d71f8575d4fbd711e499233e0991c51765953931d87d40dd22fa2a4e8ecb9f2a8dab"; sha512.source = "40580c17ac81137d533eb013ed14bc092281b354ce42883c0a3c33ee7843be7ebed0ce642746ba9e173bedf8ee6f6c243b65e692ef2a50654ada23e323166c89"; @@ -4951,7 +4983,9 @@ tl: { # no indentation "cbfonts" = { revision = 54080; stripPrefix = 0; - deps."cbfonts-fd" = tl."cbfonts-fd"; + deps = [ + "cbfonts-fd" + ]; sha512.run = "0e7cecfdfa102113f75f46f9c8bc76f578fca6c967128bb8b203af76cc64cbefd123ae87a8b04a9780f498517bd9f660d12e2dc586220f2c12cc8aa76f1aa40a"; sha512.doc = "a069b7ca1b46e5656a05a5e38a0f9ea5c3ab1e5301edc47d7fdd43817a8f5d641980c2e54b7731dcbcf16e12f0dff17df5a816d66f7bd2b613232788815bb8e0"; hasRunfiles = true; @@ -5311,7 +5345,9 @@ tl: { # no indentation "chemformula" = { revision = 61719; stripPrefix = 0; - deps."units" = tl."units"; + deps = [ + "units" + ]; sha512.run = "907efcb72ebf3a315bffc11a8d78caa82b510993b4a4de1da8a960bbd6c66bdf5bc202933fce5f4f0626ad4507a5095b571487beb2414bc49bd37e735f0299f1"; sha512.doc = "c839fed7313744c6abb77fd4f803524c47af7f9ca0e4b533b307a198cc2fefc072541d58afca8cfab6a17b85ecdda4d3bacd451ac9616b47a448560a97f3b62a"; hasRunfiles = true; @@ -5613,11 +5649,13 @@ tl: { # no indentation "churchslavonic" = { revision = 42751; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."fonts-churchslavonic" = tl."fonts-churchslavonic"; - deps."hyphen-churchslavonic" = tl."hyphen-churchslavonic"; - deps."oberdiek" = tl."oberdiek"; - deps."xcolor" = tl."xcolor"; + deps = [ + "etoolbox" + "fonts-churchslavonic" + "hyphen-churchslavonic" + "oberdiek" + "xcolor" + ]; sha512.run = "6c572235b95bb1f8407addefdefa1d7d3facc09b963f4d65d2be317986eb6523db9a8ff7104f15c526962ea8fbd0e1430b68867bf619cebc9b494f5cc04bfb07"; sha512.doc = "90d563afc8248ded0ea4f30ff685e2fd9da8dec7ea92a3d4313040905be883af3f11393a031ec85ad39e9e51d374557e0f1f373a78caf855d2048fc4e0393e37"; hasRunfiles = true; @@ -5673,14 +5711,16 @@ tl: { # no indentation }; "citation-style-language" = { revision = 65357; - deps."filehook" = tl."filehook"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."lua-uca" = tl."lua-uca"; - deps."lualibs" = tl."lualibs"; - deps."luatex" = tl."luatex"; - deps."luaxml" = tl."luaxml"; - deps."url" = tl."url"; + deps = [ + "filehook" + "l3kernel" + "l3packages" + "lua-uca" + "lualibs" + "luatex" + "luaxml" + "url" + ]; sha512.run = "4260ef2c25c7350e01a0bb7b7372a63da723c81a473ecad7346962c49ce35b68d5385863bf3ad742bd4da79720d4d240293f65677e01cdc41993509a5999cd21"; sha512.doc = "19c2336b57d8da88dcf22a92e54872a0d9548d5b2f9433ef155534c29f935988056240064ee863fa4a86caaa93dd0e4873725342c698bddabcbc90b771fb8d60"; hasRunfiles = true; @@ -5729,12 +5769,14 @@ tl: { # no indentation "cjk" = { revision = 60865; stripPrefix = 0; - deps."arphic" = tl."arphic"; - deps."cns" = tl."cns"; - deps."garuda-c90" = tl."garuda-c90"; - deps."norasi-c90" = tl."norasi-c90"; - deps."uhc" = tl."uhc"; - deps."wadalab" = tl."wadalab"; + deps = [ + "arphic" + "cns" + "garuda-c90" + "norasi-c90" + "uhc" + "wadalab" + ]; sha512.run = "b13712912e479dab68cab9027042be8cb11047ebf9c034f532c857e83d28f19dfea5a1748685cfe1847c7372f2d0982f79736525694d937c88962c5262094585"; sha512.doc = "a8c6b2d4d0899b841ccc32b378855d61bdaa65d5f68fd408df3894d386bcde18f384410f34e6f33ee2a5ce770e1e663a05ab038d9b7483012a3cb414739c3705"; sha512.source = "88be587328daedfed3bdcb289b1a03343bd7257ae180a9e0857a6b00f173f601eccd8e5978dd29c2d95fbab180fcfd5135a682c5218325fc6b664f2cd505213c"; @@ -5752,7 +5794,9 @@ tl: { # no indentation "cjk-ko" = { revision = 63561; stripPrefix = 0; - deps."cjk" = tl."cjk"; + deps = [ + "cjk" + ]; sha512.run = "be65ef03300b8fccc4012ece68570a86797e36267ea2f531fead77659cf7bf2a315cca1a3e3386f8d1dc09cbb3b44b20dafb3e0e0cbd53bddb1a368c984937b0"; sha512.doc = "3ffcae00a4a0dcd175fcf864c3c0c578d7926917216b4a785c0a46074ef013eafe9458ba9010d14f081c63ab4ee0941d0597dace373eb178369de9caa210a16b"; hasRunfiles = true; @@ -5842,8 +5886,10 @@ tl: { # no indentation "clicks" = { revision = 64602; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "etoolbox" + "xkeyval" + ]; sha512.run = "7218b2bf0f28a0ed382e4884aa30b59c2d8bff76a3d7a09461e5e3ebf1f41648889005db3c79fe203a4d3753a65f76a48058582e25f57e61d972e8256657712e"; sha512.doc = "fc84edae6c263a889ea5b1d7a99b5fdf2c22bbb45c9c104e63d821a80b498d1932e654034f289a7470a15cb2ea6082eb8d8fedce24b21b9ccbd5e4304043d6b3"; sha512.source = "ff19c270587c08c28db6cad54e2a58ce23f6041b08b6d611b7ffe6fe2b6506c1a7ae33ded3fe3ec59cee3fcfc276e6a1dc3750291b4f7691255066805ca90158"; @@ -6232,4417 +6278,4495 @@ tl: { # no indentation "collection-basic" = { revision = 59159; stripPrefix = 0; - deps."amsfonts" = tl."amsfonts"; - deps."bibtex" = tl."bibtex"; - deps."cm" = tl."cm"; - deps."colorprofiles" = tl."colorprofiles"; - deps."dvipdfmx" = tl."dvipdfmx"; - deps."dvips" = tl."dvips"; - deps."ec" = tl."ec"; - deps."enctex" = tl."enctex"; - deps."etex" = tl."etex"; - deps."etex-pkg" = tl."etex-pkg"; - deps."glyphlist" = tl."glyphlist"; - deps."graphics-def" = tl."graphics-def"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."hyphenex" = tl."hyphenex"; - deps."ifplatform" = tl."ifplatform"; - deps."iftex" = tl."iftex"; - deps."knuth-lib" = tl."knuth-lib"; - deps."knuth-local" = tl."knuth-local"; - deps."kpathsea" = tl."kpathsea"; - deps."lua-alt-getopt" = tl."lua-alt-getopt"; - deps."luahbtex" = tl."luahbtex"; - deps."luatex" = tl."luatex"; - deps."makeindex" = tl."makeindex"; - deps."metafont" = tl."metafont"; - deps."mflogo" = tl."mflogo"; - deps."mfware" = tl."mfware"; - deps."modes" = tl."modes"; - deps."pdftex" = tl."pdftex"; - deps."plain" = tl."plain"; - deps."tex" = tl."tex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."texlive-common" = tl."texlive-common"; - deps."texlive-en" = tl."texlive-en"; - deps."texlive-msg-translations" = tl."texlive-msg-translations"; - deps."texlive-scripts" = tl."texlive-scripts"; - deps."tlshell" = tl."tlshell"; - deps."unicode-data" = tl."unicode-data"; - deps."xdvi" = tl."xdvi"; + deps = [ + "amsfonts" + "bibtex" + "cm" + "colorprofiles" + "dvipdfmx" + "dvips" + "ec" + "enctex" + "etex" + "etex-pkg" + "glyphlist" + "graphics-def" + "hyph-utf8" + "hyphen-base" + "hyphenex" + "ifplatform" + "iftex" + "knuth-lib" + "knuth-local" + "kpathsea" + "lua-alt-getopt" + "luahbtex" + "luatex" + "makeindex" + "metafont" + "mflogo" + "mfware" + "modes" + "pdftex" + "plain" + "tex" + "tex-ini-files" + "texlive-common" + "texlive-en" + "texlive-msg-translations" + "texlive-scripts" + "tlshell" + "unicode-data" + "xdvi" + ]; sha512.run = "4241bc3a3ef21502faa9a2e0b16295126c357fc15813a625306552b40f9da804164abccce642f4ec1e677092f81d61381958b87fcf515120a12f9b7a19055370"; }; "collection-bibtexextra" = { revision = 65257; stripPrefix = 0; - deps."aaai-named" = tl."aaai-named"; - deps."aichej" = tl."aichej"; - deps."ajl" = tl."ajl"; - deps."amsrefs" = tl."amsrefs"; - deps."annotate" = tl."annotate"; - deps."apacite" = tl."apacite"; - deps."apalike-ejor" = tl."apalike-ejor"; - deps."apalike2" = tl."apalike2"; - deps."archaeologie" = tl."archaeologie"; - deps."authordate" = tl."authordate"; - deps."beebe" = tl."beebe"; - deps."besjournals" = tl."besjournals"; - deps."bestpapers" = tl."bestpapers"; - deps."bib2gls" = tl."bib2gls"; - deps."bibarts" = tl."bibarts"; - deps."bibcop" = tl."bibcop"; - deps."biber" = tl."biber"; - deps."biber-ms" = tl."biber-ms"; - deps."bibexport" = tl."bibexport"; - deps."bibhtml" = tl."bibhtml"; - deps."biblatex" = tl."biblatex"; - deps."biblatex-abnt" = tl."biblatex-abnt"; - deps."biblatex-ajc2020unofficial" = tl."biblatex-ajc2020unofficial"; - deps."biblatex-anonymous" = tl."biblatex-anonymous"; - deps."biblatex-apa" = tl."biblatex-apa"; - deps."biblatex-apa6" = tl."biblatex-apa6"; - deps."biblatex-archaeology" = tl."biblatex-archaeology"; - deps."biblatex-arthistory-bonn" = tl."biblatex-arthistory-bonn"; - deps."biblatex-bath" = tl."biblatex-bath"; - deps."biblatex-bookinarticle" = tl."biblatex-bookinarticle"; - deps."biblatex-bookinother" = tl."biblatex-bookinother"; - deps."biblatex-bwl" = tl."biblatex-bwl"; - deps."biblatex-caspervector" = tl."biblatex-caspervector"; - deps."biblatex-chem" = tl."biblatex-chem"; - deps."biblatex-chicago" = tl."biblatex-chicago"; - deps."biblatex-claves" = tl."biblatex-claves"; - deps."biblatex-cv" = tl."biblatex-cv"; - deps."biblatex-dw" = tl."biblatex-dw"; - deps."biblatex-enc" = tl."biblatex-enc"; - deps."biblatex-ext" = tl."biblatex-ext"; - deps."biblatex-fiwi" = tl."biblatex-fiwi"; - deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015"; - deps."biblatex-german-legal" = tl."biblatex-german-legal"; - deps."biblatex-gost" = tl."biblatex-gost"; - deps."biblatex-historian" = tl."biblatex-historian"; - deps."biblatex-ieee" = tl."biblatex-ieee"; - deps."biblatex-ijsra" = tl."biblatex-ijsra"; - deps."biblatex-iso690" = tl."biblatex-iso690"; - deps."biblatex-jura2" = tl."biblatex-jura2"; - deps."biblatex-juradiss" = tl."biblatex-juradiss"; - deps."biblatex-license" = tl."biblatex-license"; - deps."biblatex-lncs" = tl."biblatex-lncs"; - deps."biblatex-lni" = tl."biblatex-lni"; - deps."biblatex-luh-ipw" = tl."biblatex-luh-ipw"; - deps."biblatex-manuscripts-philology" = tl."biblatex-manuscripts-philology"; - deps."biblatex-mla" = tl."biblatex-mla"; - deps."biblatex-morenames" = tl."biblatex-morenames"; - deps."biblatex-ms" = tl."biblatex-ms"; - deps."biblatex-multiple-dm" = tl."biblatex-multiple-dm"; - deps."biblatex-musuos" = tl."biblatex-musuos"; - deps."biblatex-nature" = tl."biblatex-nature"; - deps."biblatex-nejm" = tl."biblatex-nejm"; - deps."biblatex-nottsclassic" = tl."biblatex-nottsclassic"; - deps."biblatex-opcit-booktitle" = tl."biblatex-opcit-booktitle"; - deps."biblatex-oxref" = tl."biblatex-oxref"; - deps."biblatex-philosophy" = tl."biblatex-philosophy"; - deps."biblatex-phys" = tl."biblatex-phys"; - deps."biblatex-publist" = tl."biblatex-publist"; - deps."biblatex-readbbl" = tl."biblatex-readbbl"; - deps."biblatex-realauthor" = tl."biblatex-realauthor"; - deps."biblatex-sbl" = tl."biblatex-sbl"; - deps."biblatex-science" = tl."biblatex-science"; - deps."biblatex-shortfields" = tl."biblatex-shortfields"; - deps."biblatex-socialscienceshuberlin" = tl."biblatex-socialscienceshuberlin"; - deps."biblatex-software" = tl."biblatex-software"; - deps."biblatex-source-division" = tl."biblatex-source-division"; - deps."biblatex-spbasic" = tl."biblatex-spbasic"; - deps."biblatex-subseries" = tl."biblatex-subseries"; - deps."biblatex-swiss-legal" = tl."biblatex-swiss-legal"; - deps."biblatex-trad" = tl."biblatex-trad"; - deps."biblatex-true-citepages-omit" = tl."biblatex-true-citepages-omit"; - deps."biblatex-unified" = tl."biblatex-unified"; - deps."biblatex-vancouver" = tl."biblatex-vancouver"; - deps."biblatex2bibitem" = tl."biblatex2bibitem"; - deps."biblist" = tl."biblist"; - deps."bibtexperllibs" = tl."bibtexperllibs"; - deps."bibtopic" = tl."bibtopic"; - deps."bibtopicprefix" = tl."bibtopicprefix"; - deps."bibunits" = tl."bibunits"; - deps."biolett-bst" = tl."biolett-bst"; - deps."bookdb" = tl."bookdb"; - deps."breakcites" = tl."breakcites"; - deps."cell" = tl."cell"; - deps."chbibref" = tl."chbibref"; - deps."chembst" = tl."chembst"; - deps."chicago" = tl."chicago"; - deps."chicago-annote" = tl."chicago-annote"; - deps."chicagoa" = tl."chicagoa"; - deps."chscite" = tl."chscite"; - deps."citation-style-language" = tl."citation-style-language"; - deps."citeall" = tl."citeall"; - deps."citeref" = tl."citeref"; - deps."collection-latex" = tl."collection-latex"; - deps."collref" = tl."collref"; - deps."compactbib" = tl."compactbib"; - deps."crossrefware" = tl."crossrefware"; - deps."custom-bib" = tl."custom-bib"; - deps."din1505" = tl."din1505"; - deps."dk-bib" = tl."dk-bib"; - deps."doipubmed" = tl."doipubmed"; - deps."ecobiblatex" = tl."ecobiblatex"; - deps."econ-bst" = tl."econ-bst"; - deps."economic" = tl."economic"; - deps."fbs" = tl."fbs"; - deps."figbib" = tl."figbib"; - deps."footbib" = tl."footbib"; - deps."francais-bst" = tl."francais-bst"; - deps."gbt7714" = tl."gbt7714"; - deps."geschichtsfrkl" = tl."geschichtsfrkl"; - deps."harvard" = tl."harvard"; - deps."harvmac" = tl."harvmac"; - deps."hep-bibliography" = tl."hep-bibliography"; - deps."historische-zeitschrift" = tl."historische-zeitschrift"; - deps."icite" = tl."icite"; - deps."ietfbibs" = tl."ietfbibs"; - deps."ijqc" = tl."ijqc"; - deps."inlinebib" = tl."inlinebib"; - deps."iopart-num" = tl."iopart-num"; - deps."is-bst" = tl."is-bst"; - deps."jbact" = tl."jbact"; - deps."jmb" = tl."jmb"; - deps."jneurosci" = tl."jneurosci"; - deps."jurabib" = tl."jurabib"; - deps."ksfh_nat" = tl."ksfh_nat"; - deps."listbib" = tl."listbib"; - deps."logreq" = tl."logreq"; - deps."ltb2bib" = tl."ltb2bib"; - deps."luabibentry" = tl."luabibentry"; - deps."margbib" = tl."margbib"; - deps."multibib" = tl."multibib"; - deps."multibibliography" = tl."multibibliography"; - deps."munich" = tl."munich"; - deps."nar" = tl."nar"; - deps."newcastle-bst" = tl."newcastle-bst"; - deps."nmbib" = tl."nmbib"; - deps."notes2bib" = tl."notes2bib"; - deps."notex-bst" = tl."notex-bst"; - deps."oscola" = tl."oscola"; - deps."perception" = tl."perception"; - deps."plainyr" = tl."plainyr"; - deps."pnas2009" = tl."pnas2009"; - deps."rsc" = tl."rsc"; - deps."showtags" = tl."showtags"; - deps."sort-by-letters" = tl."sort-by-letters"; - deps."splitbib" = tl."splitbib"; - deps."turabian-formatting" = tl."turabian-formatting"; - deps."uni-wtal-ger" = tl."uni-wtal-ger"; - deps."uni-wtal-lin" = tl."uni-wtal-lin"; - deps."urlbst" = tl."urlbst"; - deps."usebib" = tl."usebib"; - deps."vak" = tl."vak"; - deps."windycity" = tl."windycity"; - deps."xcite" = tl."xcite"; - deps."zootaxa-bst" = tl."zootaxa-bst"; + deps = [ + "aaai-named" + "aichej" + "ajl" + "amsrefs" + "annotate" + "apacite" + "apalike-ejor" + "apalike2" + "archaeologie" + "authordate" + "beebe" + "besjournals" + "bestpapers" + "bib2gls" + "bibarts" + "bibcop" + "biber" + "biber-ms" + "bibexport" + "bibhtml" + "biblatex" + "biblatex-abnt" + "biblatex-ajc2020unofficial" + "biblatex-anonymous" + "biblatex-apa" + "biblatex-apa6" + "biblatex-archaeology" + "biblatex-arthistory-bonn" + "biblatex-bath" + "biblatex-bookinarticle" + "biblatex-bookinother" + "biblatex-bwl" + "biblatex-caspervector" + "biblatex-chem" + "biblatex-chicago" + "biblatex-claves" + "biblatex-cv" + "biblatex-dw" + "biblatex-enc" + "biblatex-ext" + "biblatex-fiwi" + "biblatex-gb7714-2015" + "biblatex-german-legal" + "biblatex-gost" + "biblatex-historian" + "biblatex-ieee" + "biblatex-ijsra" + "biblatex-iso690" + "biblatex-jura2" + "biblatex-juradiss" + "biblatex-license" + "biblatex-lncs" + "biblatex-lni" + "biblatex-luh-ipw" + "biblatex-manuscripts-philology" + "biblatex-mla" + "biblatex-morenames" + "biblatex-ms" + "biblatex-multiple-dm" + "biblatex-musuos" + "biblatex-nature" + "biblatex-nejm" + "biblatex-nottsclassic" + "biblatex-opcit-booktitle" + "biblatex-oxref" + "biblatex-philosophy" + "biblatex-phys" + "biblatex-publist" + "biblatex-readbbl" + "biblatex-realauthor" + "biblatex-sbl" + "biblatex-science" + "biblatex-shortfields" + "biblatex-socialscienceshuberlin" + "biblatex-software" + "biblatex-source-division" + "biblatex-spbasic" + "biblatex-subseries" + "biblatex-swiss-legal" + "biblatex-trad" + "biblatex-true-citepages-omit" + "biblatex-unified" + "biblatex-vancouver" + "biblatex2bibitem" + "biblist" + "bibtexperllibs" + "bibtopic" + "bibtopicprefix" + "bibunits" + "biolett-bst" + "bookdb" + "breakcites" + "cell" + "chbibref" + "chembst" + "chicago" + "chicago-annote" + "chicagoa" + "chscite" + "citation-style-language" + "citeall" + "citeref" + "collection-latex" + "collref" + "compactbib" + "crossrefware" + "custom-bib" + "din1505" + "dk-bib" + "doipubmed" + "ecobiblatex" + "econ-bst" + "economic" + "fbs" + "figbib" + "footbib" + "francais-bst" + "gbt7714" + "geschichtsfrkl" + "harvard" + "harvmac" + "hep-bibliography" + "historische-zeitschrift" + "icite" + "ietfbibs" + "ijqc" + "inlinebib" + "iopart-num" + "is-bst" + "jbact" + "jmb" + "jneurosci" + "jurabib" + "ksfh_nat" + "listbib" + "logreq" + "ltb2bib" + "luabibentry" + "margbib" + "multibib" + "multibibliography" + "munich" + "nar" + "newcastle-bst" + "nmbib" + "notes2bib" + "notex-bst" + "oscola" + "perception" + "plainyr" + "pnas2009" + "rsc" + "showtags" + "sort-by-letters" + "splitbib" + "turabian-formatting" + "uni-wtal-ger" + "uni-wtal-lin" + "urlbst" + "usebib" + "vak" + "windycity" + "xcite" + "zootaxa-bst" + ]; sha512.run = "db80edc251a62547b401d922c954a40dc3887b01a59952bf20829b67953e26083c98249dba83157b0e9db4b0b2b2802f5965d9360b332d45fe4d69762ef38c62"; }; "collection-binextra" = { revision = 65204; stripPrefix = 0; - deps."a2ping" = tl."a2ping"; - deps."adhocfilelist" = tl."adhocfilelist"; - deps."arara" = tl."arara"; - deps."asymptote" = tl."asymptote"; - deps."bibtex8" = tl."bibtex8"; - deps."bibtexu" = tl."bibtexu"; - deps."bundledoc" = tl."bundledoc"; - deps."checklistings" = tl."checklistings"; - deps."chklref" = tl."chklref"; - deps."chktex" = tl."chktex"; - deps."clojure-pamphlet" = tl."clojure-pamphlet"; - deps."cluttex" = tl."cluttex"; - deps."collection-basic" = tl."collection-basic"; - deps."ctan-o-mat" = tl."ctan-o-mat"; - deps."ctan_chk" = tl."ctan_chk"; - deps."ctanbib" = tl."ctanbib"; - deps."ctanify" = tl."ctanify"; - deps."ctanupload" = tl."ctanupload"; - deps."ctie" = tl."ctie"; - deps."cweb" = tl."cweb"; - deps."de-macro" = tl."de-macro"; - deps."detex" = tl."detex"; - deps."digestif" = tl."digestif"; - deps."dtl" = tl."dtl"; - deps."dtxgen" = tl."dtxgen"; - deps."dvi2tty" = tl."dvi2tty"; - deps."dviasm" = tl."dviasm"; - deps."dvicopy" = tl."dvicopy"; - deps."dvidvi" = tl."dvidvi"; - deps."dviinfox" = tl."dviinfox"; - deps."dviljk" = tl."dviljk"; - deps."dviout-util" = tl."dviout-util"; - deps."dvipng" = tl."dvipng"; - deps."dvipos" = tl."dvipos"; - deps."dvisvgm" = tl."dvisvgm"; - deps."findhyph" = tl."findhyph"; - deps."fragmaster" = tl."fragmaster"; - deps."git-latexdiff" = tl."git-latexdiff"; - deps."gsftopk" = tl."gsftopk"; - deps."hook-pre-commit-pkg" = tl."hook-pre-commit-pkg"; - deps."installfont" = tl."installfont"; - deps."ketcindy" = tl."ketcindy"; - deps."lacheck" = tl."lacheck"; - deps."latex-git-log" = tl."latex-git-log"; - deps."latex-papersize" = tl."latex-papersize"; - deps."latex2man" = tl."latex2man"; - deps."latex2nemeth" = tl."latex2nemeth"; - deps."latexdiff" = tl."latexdiff"; - deps."latexfileversion" = tl."latexfileversion"; - deps."latexindent" = tl."latexindent"; - deps."latexmk" = tl."latexmk"; - deps."latexpand" = tl."latexpand"; - deps."light-latex-make" = tl."light-latex-make"; - deps."listings-ext" = tl."listings-ext"; - deps."ltxfileinfo" = tl."ltxfileinfo"; - deps."ltximg" = tl."ltximg"; - deps."luajittex" = tl."luajittex"; - deps."make4ht" = tl."make4ht"; - deps."match_parens" = tl."match_parens"; - deps."mflua" = tl."mflua"; - deps."mkjobtexmf" = tl."mkjobtexmf"; - deps."optexcount" = tl."optexcount"; - deps."patgen" = tl."patgen"; - deps."pdfbook2" = tl."pdfbook2"; - deps."pdfcrop" = tl."pdfcrop"; - deps."pdfjam" = tl."pdfjam"; - deps."pdflatexpicscale" = tl."pdflatexpicscale"; - deps."pdftex-quiet" = tl."pdftex-quiet"; - deps."pdftosrc" = tl."pdftosrc"; - deps."pdfxup" = tl."pdfxup"; - deps."pfarrei" = tl."pfarrei"; - deps."pkfix" = tl."pkfix"; - deps."pkfix-helper" = tl."pkfix-helper"; - deps."purifyeps" = tl."purifyeps"; - deps."pythontex" = tl."pythontex"; - deps."seetexk" = tl."seetexk"; - deps."spix" = tl."spix"; - deps."srcredact" = tl."srcredact"; - deps."sty2dtx" = tl."sty2dtx"; - deps."synctex" = tl."synctex"; - deps."tex4ebook" = tl."tex4ebook"; - deps."texaccents" = tl."texaccents"; - deps."texcount" = tl."texcount"; - deps."texdef" = tl."texdef"; - deps."texdiff" = tl."texdiff"; - deps."texdirflatten" = tl."texdirflatten"; - deps."texdoc" = tl."texdoc"; - deps."texdoctk" = tl."texdoctk"; - deps."texfot" = tl."texfot"; - deps."texlive-scripts-extra" = tl."texlive-scripts-extra"; - deps."texliveonfly" = tl."texliveonfly"; - deps."texloganalyser" = tl."texloganalyser"; - deps."texlogfilter" = tl."texlogfilter"; - deps."texlogsieve" = tl."texlogsieve"; - deps."texosquery" = tl."texosquery"; - deps."texplate" = tl."texplate"; - deps."texware" = tl."texware"; - deps."tie" = tl."tie"; - deps."tlcockpit" = tl."tlcockpit"; - deps."tpic2pdftex" = tl."tpic2pdftex"; - deps."typeoutfileinfo" = tl."typeoutfileinfo"; - deps."web" = tl."web"; - deps."xindex" = tl."xindex"; - deps."xindy" = tl."xindy"; - deps."xpdfopen" = tl."xpdfopen"; + deps = [ + "a2ping" + "adhocfilelist" + "arara" + "asymptote" + "bibtex8" + "bibtexu" + "bundledoc" + "checklistings" + "chklref" + "chktex" + "clojure-pamphlet" + "cluttex" + "collection-basic" + "ctan-o-mat" + "ctan_chk" + "ctanbib" + "ctanify" + "ctanupload" + "ctie" + "cweb" + "de-macro" + "detex" + "digestif" + "dtl" + "dtxgen" + "dvi2tty" + "dviasm" + "dvicopy" + "dvidvi" + "dviinfox" + "dviljk" + "dviout-util" + "dvipng" + "dvipos" + "dvisvgm" + "findhyph" + "fragmaster" + "git-latexdiff" + "gsftopk" + "hook-pre-commit-pkg" + "installfont" + "ketcindy" + "lacheck" + "latex-git-log" + "latex-papersize" + "latex2man" + "latex2nemeth" + "latexdiff" + "latexfileversion" + "latexindent" + "latexmk" + "latexpand" + "light-latex-make" + "listings-ext" + "ltxfileinfo" + "ltximg" + "luajittex" + "make4ht" + "match_parens" + "mflua" + "mkjobtexmf" + "optexcount" + "patgen" + "pdfbook2" + "pdfcrop" + "pdfjam" + "pdflatexpicscale" + "pdftex-quiet" + "pdftosrc" + "pdfxup" + "pfarrei" + "pkfix" + "pkfix-helper" + "purifyeps" + "pythontex" + "seetexk" + "spix" + "srcredact" + "sty2dtx" + "synctex" + "tex4ebook" + "texaccents" + "texcount" + "texdef" + "texdiff" + "texdirflatten" + "texdoc" + "texdoctk" + "texfot" + "texlive-scripts-extra" + "texliveonfly" + "texloganalyser" + "texlogfilter" + "texlogsieve" + "texosquery" + "texplate" + "texware" + "tie" + "tlcockpit" + "tpic2pdftex" + "typeoutfileinfo" + "web" + "xindex" + "xindy" + "xpdfopen" + ]; sha512.run = "4297ddb3f20775c97c2ac4782060ad2c2da469fb68eda24d98c0c84a07403215aaa4e221b82459300887769e9355cb4425f4fe599d5d8413e38f1be5c7f8fab9"; }; "collection-context" = { revision = 54074; stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."context" = tl."context"; - deps."context-account" = tl."context-account"; - deps."context-algorithmic" = tl."context-algorithmic"; - deps."context-animation" = tl."context-animation"; - deps."context-annotation" = tl."context-annotation"; - deps."context-bnf" = tl."context-bnf"; - deps."context-chromato" = tl."context-chromato"; - deps."context-cmscbf" = tl."context-cmscbf"; - deps."context-cmttbf" = tl."context-cmttbf"; - deps."context-construction-plan" = tl."context-construction-plan"; - deps."context-cyrillicnumbers" = tl."context-cyrillicnumbers"; - deps."context-degrade" = tl."context-degrade"; - deps."context-fancybreak" = tl."context-fancybreak"; - deps."context-filter" = tl."context-filter"; - deps."context-french" = tl."context-french"; - deps."context-fullpage" = tl."context-fullpage"; - deps."context-gantt" = tl."context-gantt"; - deps."context-gnuplot" = tl."context-gnuplot"; - deps."context-handlecsv" = tl."context-handlecsv"; - deps."context-inifile" = tl."context-inifile"; - deps."context-layout" = tl."context-layout"; - deps."context-letter" = tl."context-letter"; - deps."context-lettrine" = tl."context-lettrine"; - deps."context-mathsets" = tl."context-mathsets"; - deps."context-notes-zh-cn" = tl."context-notes-zh-cn"; - deps."context-rst" = tl."context-rst"; - deps."context-ruby" = tl."context-ruby"; - deps."context-simplefonts" = tl."context-simplefonts"; - deps."context-simpleslides" = tl."context-simpleslides"; - deps."context-title" = tl."context-title"; - deps."context-transliterator" = tl."context-transliterator"; - deps."context-typearea" = tl."context-typearea"; - deps."context-typescripts" = tl."context-typescripts"; - deps."context-vim" = tl."context-vim"; - deps."context-visualcounter" = tl."context-visualcounter"; - deps."jmn" = tl."jmn"; - deps."npp-for-context" = tl."npp-for-context"; + deps = [ + "collection-basic" + "context" + "context-account" + "context-algorithmic" + "context-animation" + "context-annotation" + "context-bnf" + "context-chromato" + "context-cmscbf" + "context-cmttbf" + "context-construction-plan" + "context-cyrillicnumbers" + "context-degrade" + "context-fancybreak" + "context-filter" + "context-french" + "context-fullpage" + "context-gantt" + "context-gnuplot" + "context-handlecsv" + "context-inifile" + "context-layout" + "context-letter" + "context-lettrine" + "context-mathsets" + "context-notes-zh-cn" + "context-rst" + "context-ruby" + "context-simplefonts" + "context-simpleslides" + "context-title" + "context-transliterator" + "context-typearea" + "context-typescripts" + "context-vim" + "context-visualcounter" + "jmn" + "npp-for-context" + ]; sha512.run = "5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765"; }; "collection-fontsextra" = { revision = 64952; stripPrefix = 0; - deps."aboensis" = tl."aboensis"; - deps."academicons" = tl."academicons"; - deps."accanthis" = tl."accanthis"; - deps."adforn" = tl."adforn"; - deps."adfsymbols" = tl."adfsymbols"; - deps."aesupp" = tl."aesupp"; - deps."alegreya" = tl."alegreya"; - deps."alfaslabone" = tl."alfaslabone"; - deps."algolrevived" = tl."algolrevived"; - deps."allrunes" = tl."allrunes"; - deps."almendra" = tl."almendra"; - deps."almfixed" = tl."almfixed"; - deps."andika" = tl."andika"; - deps."anonymouspro" = tl."anonymouspro"; - deps."antiqua" = tl."antiqua"; - deps."antt" = tl."antt"; - deps."archaic" = tl."archaic"; - deps."archivo" = tl."archivo"; - deps."arev" = tl."arev"; - deps."arimo" = tl."arimo"; - deps."arvo" = tl."arvo"; - deps."asana-math" = tl."asana-math"; - deps."asapsym" = tl."asapsym"; - deps."ascii-font" = tl."ascii-font"; - deps."aspectratio" = tl."aspectratio"; - deps."astro" = tl."astro"; - deps."atkinson" = tl."atkinson"; - deps."augie" = tl."augie"; - deps."auncial-new" = tl."auncial-new"; - deps."aurical" = tl."aurical"; - deps."b1encoding" = tl."b1encoding"; - deps."barcodes" = tl."barcodes"; - deps."baskervald" = tl."baskervald"; - deps."baskervaldx" = tl."baskervaldx"; - deps."baskervillef" = tl."baskervillef"; - deps."bbding" = tl."bbding"; - deps."bbm" = tl."bbm"; - deps."bbm-macros" = tl."bbm-macros"; - deps."bbold" = tl."bbold"; - deps."bbold-type1" = tl."bbold-type1"; - deps."bboldx" = tl."bboldx"; - deps."belleek" = tl."belleek"; - deps."bera" = tl."bera"; - deps."berenisadf" = tl."berenisadf"; - deps."beuron" = tl."beuron"; - deps."bguq" = tl."bguq"; - deps."bitter" = tl."bitter"; - deps."blacklettert1" = tl."blacklettert1"; - deps."boisik" = tl."boisik"; - deps."bookhands" = tl."bookhands"; - deps."boondox" = tl."boondox"; - deps."braille" = tl."braille"; - deps."brushscr" = tl."brushscr"; - deps."cabin" = tl."cabin"; - deps."caladea" = tl."caladea"; - deps."calligra" = tl."calligra"; - deps."calligra-type1" = tl."calligra-type1"; - deps."cantarell" = tl."cantarell"; - deps."carlito" = tl."carlito"; - deps."carolmin-ps" = tl."carolmin-ps"; - deps."cascadia-code" = tl."cascadia-code"; - deps."ccicons" = tl."ccicons"; - deps."cfr-initials" = tl."cfr-initials"; - deps."cfr-lm" = tl."cfr-lm"; - deps."charissil" = tl."charissil"; - deps."cherokee" = tl."cherokee"; - deps."chivo" = tl."chivo"; - deps."cinzel" = tl."cinzel"; - deps."clara" = tl."clara"; - deps."clearsans" = tl."clearsans"; - deps."cm-lgc" = tl."cm-lgc"; - deps."cm-mf-extra-bold" = tl."cm-mf-extra-bold"; - deps."cm-unicode" = tl."cm-unicode"; - deps."cmathbb" = tl."cmathbb"; - deps."cmbright" = tl."cmbright"; - deps."cmexb" = tl."cmexb"; - deps."cmll" = tl."cmll"; - deps."cmpica" = tl."cmpica"; - deps."cmsrb" = tl."cmsrb"; - deps."cmtiup" = tl."cmtiup"; - deps."cmupint" = tl."cmupint"; - deps."cochineal" = tl."cochineal"; - deps."coelacanth" = tl."coelacanth"; - deps."collection-basic" = tl."collection-basic"; - deps."comfortaa" = tl."comfortaa"; - deps."comicneue" = tl."comicneue"; - deps."concmath-fonts" = tl."concmath-fonts"; - deps."concmath-otf" = tl."concmath-otf"; - deps."cookingsymbols" = tl."cookingsymbols"; - deps."cooperhewitt" = tl."cooperhewitt"; - deps."cormorantgaramond" = tl."cormorantgaramond"; - deps."countriesofeurope" = tl."countriesofeurope"; - deps."courier-scaled" = tl."courier-scaled"; - deps."courierten" = tl."courierten"; - deps."crimson" = tl."crimson"; - deps."crimsonpro" = tl."crimsonpro"; - deps."cryst" = tl."cryst"; - deps."cuprum" = tl."cuprum"; - deps."cyklop" = tl."cyklop"; - deps."dancers" = tl."dancers"; - deps."dantelogo" = tl."dantelogo"; - deps."dejavu" = tl."dejavu"; - deps."dejavu-otf" = tl."dejavu-otf"; - deps."dice" = tl."dice"; - deps."dictsym" = tl."dictsym"; - deps."dingbat" = tl."dingbat"; - deps."domitian" = tl."domitian"; - deps."doublestroke" = tl."doublestroke"; - deps."doulossil" = tl."doulossil"; - deps."dozenal" = tl."dozenal"; - deps."drm" = tl."drm"; - deps."droid" = tl."droid"; - deps."dsserif" = tl."dsserif"; - deps."duerer" = tl."duerer"; - deps."duerer-latex" = tl."duerer-latex"; - deps."dutchcal" = tl."dutchcal"; - deps."ean" = tl."ean"; - deps."ebgaramond" = tl."ebgaramond"; - deps."ebgaramond-maths" = tl."ebgaramond-maths"; - deps."ecc" = tl."ecc"; - deps."eco" = tl."eco"; - deps."eczar" = tl."eczar"; - deps."eiad" = tl."eiad"; - deps."eiad-ltx" = tl."eiad-ltx"; - deps."ektype-tanka" = tl."ektype-tanka"; - deps."electrum" = tl."electrum"; - deps."elvish" = tl."elvish"; - deps."epigrafica" = tl."epigrafica"; - deps."epsdice" = tl."epsdice"; - deps."erewhon" = tl."erewhon"; - deps."erewhon-math" = tl."erewhon-math"; - deps."esrelation" = tl."esrelation"; - deps."esstix" = tl."esstix"; - deps."esvect" = tl."esvect"; - deps."etbb" = tl."etbb"; - deps."euler-math" = tl."euler-math"; - deps."eulervm" = tl."eulervm"; - deps."euxm" = tl."euxm"; - deps."fbb" = tl."fbb"; - deps."fdsymbol" = tl."fdsymbol"; - deps."fetamont" = tl."fetamont"; - deps."feyn" = tl."feyn"; - deps."fge" = tl."fge"; - deps."fira" = tl."fira"; - deps."firamath" = tl."firamath"; - deps."firamath-otf" = tl."firamath-otf"; - deps."foekfont" = tl."foekfont"; - deps."fonetika" = tl."fonetika"; - deps."fontawesome" = tl."fontawesome"; - deps."fontawesome5" = tl."fontawesome5"; - deps."fontmfizz" = tl."fontmfizz"; - deps."fonts-churchslavonic" = tl."fonts-churchslavonic"; - deps."forum" = tl."forum"; - deps."fourier" = tl."fourier"; - deps."fouriernc" = tl."fouriernc"; - deps."frcursive" = tl."frcursive"; - deps."frederika2016" = tl."frederika2016"; - deps."frimurer" = tl."frimurer"; - deps."garamond-libre" = tl."garamond-libre"; - deps."garamond-math" = tl."garamond-math"; - deps."genealogy" = tl."genealogy"; - deps."gentium-tug" = tl."gentium-tug"; - deps."gfsartemisia" = tl."gfsartemisia"; - deps."gfsbodoni" = tl."gfsbodoni"; - deps."gfscomplutum" = tl."gfscomplutum"; - deps."gfsdidot" = tl."gfsdidot"; - deps."gfsdidotclassic" = tl."gfsdidotclassic"; - deps."gfsneohellenic" = tl."gfsneohellenic"; - deps."gfsneohellenicmath" = tl."gfsneohellenicmath"; - deps."gfssolomos" = tl."gfssolomos"; - deps."gillcm" = tl."gillcm"; - deps."gillius" = tl."gillius"; - deps."gnu-freefont" = tl."gnu-freefont"; - deps."gofonts" = tl."gofonts"; - deps."gothic" = tl."gothic"; - deps."greenpoint" = tl."greenpoint"; - deps."grotesq" = tl."grotesq"; - deps."gudea" = tl."gudea"; - deps."hacm" = tl."hacm"; - deps."hamnosys" = tl."hamnosys"; - deps."hands" = tl."hands"; - deps."hep-font" = tl."hep-font"; - deps."hep-math-font" = tl."hep-math-font"; - deps."heros-otf" = tl."heros-otf"; - deps."heuristica" = tl."heuristica"; - deps."hfbright" = tl."hfbright"; - deps."hfoldsty" = tl."hfoldsty"; - deps."hindmadurai" = tl."hindmadurai"; - deps."ibarra" = tl."ibarra"; - deps."ifsym" = tl."ifsym"; - deps."imfellenglish" = tl."imfellenglish"; - deps."inconsolata" = tl."inconsolata"; - deps."initials" = tl."initials"; - deps."inriafonts" = tl."inriafonts"; - deps."inter" = tl."inter"; - deps."ipaex-type1" = tl."ipaex-type1"; - deps."iwona" = tl."iwona"; - deps."jablantile" = tl."jablantile"; - deps."jamtimes" = tl."jamtimes"; - deps."josefin" = tl."josefin"; - deps."junicode" = tl."junicode"; - deps."kixfont" = tl."kixfont"; - deps."kpfonts" = tl."kpfonts"; - deps."kpfonts-otf" = tl."kpfonts-otf"; - deps."kurier" = tl."kurier"; - deps."lato" = tl."lato"; - deps."lexend" = tl."lexend"; - deps."lfb" = tl."lfb"; - deps."libertine" = tl."libertine"; - deps."libertinegc" = tl."libertinegc"; - deps."libertinus" = tl."libertinus"; - deps."libertinus-fonts" = tl."libertinus-fonts"; - deps."libertinus-otf" = tl."libertinus-otf"; - deps."libertinus-type1" = tl."libertinus-type1"; - deps."libertinust1math" = tl."libertinust1math"; - deps."librebaskerville" = tl."librebaskerville"; - deps."librebodoni" = tl."librebodoni"; - deps."librecaslon" = tl."librecaslon"; - deps."librefranklin" = tl."librefranklin"; - deps."libris" = tl."libris"; - deps."lineara" = tl."lineara"; - deps."linguisticspro" = tl."linguisticspro"; - deps."lobster2" = tl."lobster2"; - deps."logix" = tl."logix"; - deps."lxfonts" = tl."lxfonts"; - deps."ly1" = tl."ly1"; - deps."magra" = tl."magra"; - deps."marcellus" = tl."marcellus"; - deps."mathabx" = tl."mathabx"; - deps."mathabx-type1" = tl."mathabx-type1"; - deps."mathdesign" = tl."mathdesign"; - deps."mdputu" = tl."mdputu"; - deps."mdsymbol" = tl."mdsymbol"; - deps."merriweather" = tl."merriweather"; - deps."miama" = tl."miama"; - deps."mintspirit" = tl."mintspirit"; - deps."missaali" = tl."missaali"; - deps."mlmodern" = tl."mlmodern"; - deps."mnsymbol" = tl."mnsymbol"; - deps."montserrat" = tl."montserrat"; - deps."mpfonts" = tl."mpfonts"; - deps."mweights" = tl."mweights"; - deps."newcomputermodern" = tl."newcomputermodern"; - deps."newpx" = tl."newpx"; - deps."newtx" = tl."newtx"; - deps."newtxsf" = tl."newtxsf"; - deps."newtxtt" = tl."newtxtt"; - deps."niceframe-type1" = tl."niceframe-type1"; - deps."nimbus15" = tl."nimbus15"; - deps."nkarta" = tl."nkarta"; - deps."noto" = tl."noto"; - deps."noto-emoji" = tl."noto-emoji"; - deps."notomath" = tl."notomath"; - deps."nunito" = tl."nunito"; - deps."obnov" = tl."obnov"; - deps."ocherokee" = tl."ocherokee"; - deps."ocr-b" = tl."ocr-b"; - deps."ocr-b-outline" = tl."ocr-b-outline"; - deps."ogham" = tl."ogham"; - deps."oinuit" = tl."oinuit"; - deps."old-arrows" = tl."old-arrows"; - deps."oldlatin" = tl."oldlatin"; - deps."oldstandard" = tl."oldstandard"; - deps."opensans" = tl."opensans"; - deps."orkhun" = tl."orkhun"; - deps."oswald" = tl."oswald"; - deps."overlock" = tl."overlock"; - deps."pacioli" = tl."pacioli"; - deps."pagella-otf" = tl."pagella-otf"; - deps."paratype" = tl."paratype"; - deps."phaistos" = tl."phaistos"; - deps."phonetic" = tl."phonetic"; - deps."pigpen" = tl."pigpen"; - deps."playfair" = tl."playfair"; - deps."plex" = tl."plex"; - deps."plex-otf" = tl."plex-otf"; - deps."plimsoll" = tl."plimsoll"; - deps."poiretone" = tl."poiretone"; - deps."poltawski" = tl."poltawski"; - deps."prodint" = tl."prodint"; - deps."punk" = tl."punk"; - deps."punk-latex" = tl."punk-latex"; - deps."punknova" = tl."punknova"; - deps."pxtxalfa" = tl."pxtxalfa"; - deps."qualitype" = tl."qualitype"; - deps."quattrocento" = tl."quattrocento"; - deps."raleway" = tl."raleway"; - deps."recycle" = tl."recycle"; - deps."roboto" = tl."roboto"; - deps."romande" = tl."romande"; - deps."rosario" = tl."rosario"; - deps."rsfso" = tl."rsfso"; - deps."sansmathaccent" = tl."sansmathaccent"; - deps."sansmathfonts" = tl."sansmathfonts"; - deps."sauter" = tl."sauter"; - deps."sauterfonts" = tl."sauterfonts"; - deps."schola-otf" = tl."schola-otf"; - deps."scholax" = tl."scholax"; - deps."schulschriften" = tl."schulschriften"; - deps."semaphor" = tl."semaphor"; - deps."shobhika" = tl."shobhika"; - deps."simpleicons" = tl."simpleicons"; - deps."skull" = tl."skull"; - deps."sourcecodepro" = tl."sourcecodepro"; - deps."sourcesanspro" = tl."sourcesanspro"; - deps."sourceserifpro" = tl."sourceserifpro"; - deps."spectral" = tl."spectral"; - deps."srbtiks" = tl."srbtiks"; - deps."starfont" = tl."starfont"; - deps."staves" = tl."staves"; - deps."step" = tl."step"; - deps."stepgreek" = tl."stepgreek"; - deps."stickstoo" = tl."stickstoo"; - deps."stix" = tl."stix"; - deps."stix2-otf" = tl."stix2-otf"; - deps."stix2-type1" = tl."stix2-type1"; - deps."superiors" = tl."superiors"; - deps."svrsymbols" = tl."svrsymbols"; - deps."symbats3" = tl."symbats3"; - deps."tapir" = tl."tapir"; - deps."tempora" = tl."tempora"; - deps."tengwarscript" = tl."tengwarscript"; - deps."termes-otf" = tl."termes-otf"; - deps."tfrupee" = tl."tfrupee"; - deps."theanodidot" = tl."theanodidot"; - deps."theanomodern" = tl."theanomodern"; - deps."theanooldstyle" = tl."theanooldstyle"; - deps."tinos" = tl."tinos"; - deps."tpslifonts" = tl."tpslifonts"; - deps."trajan" = tl."trajan"; - deps."twemoji-colr" = tl."twemoji-colr"; - deps."txfontsb" = tl."txfontsb"; - deps."txuprcal" = tl."txuprcal"; - deps."typicons" = tl."typicons"; - deps."umtypewriter" = tl."umtypewriter"; - deps."universa" = tl."universa"; - deps."universalis" = tl."universalis"; - deps."uppunctlm" = tl."uppunctlm"; - deps."urwchancal" = tl."urwchancal"; - deps."venturisadf" = tl."venturisadf"; - deps."wsuipa" = tl."wsuipa"; - deps."xcharter" = tl."xcharter"; - deps."xcharter-math" = tl."xcharter-math"; - deps."xits" = tl."xits"; - deps."yfonts" = tl."yfonts"; - deps."yfonts-otf" = tl."yfonts-otf"; - deps."yfonts-t1" = tl."yfonts-t1"; - deps."yinit-otf" = tl."yinit-otf"; - deps."zlmtt" = tl."zlmtt"; + deps = [ + "aboensis" + "academicons" + "accanthis" + "adforn" + "adfsymbols" + "aesupp" + "alegreya" + "alfaslabone" + "algolrevived" + "allrunes" + "almendra" + "almfixed" + "andika" + "anonymouspro" + "antiqua" + "antt" + "archaic" + "archivo" + "arev" + "arimo" + "arvo" + "asana-math" + "asapsym" + "ascii-font" + "aspectratio" + "astro" + "atkinson" + "augie" + "auncial-new" + "aurical" + "b1encoding" + "barcodes" + "baskervald" + "baskervaldx" + "baskervillef" + "bbding" + "bbm" + "bbm-macros" + "bbold" + "bbold-type1" + "bboldx" + "belleek" + "bera" + "berenisadf" + "beuron" + "bguq" + "bitter" + "blacklettert1" + "boisik" + "bookhands" + "boondox" + "braille" + "brushscr" + "cabin" + "caladea" + "calligra" + "calligra-type1" + "cantarell" + "carlito" + "carolmin-ps" + "cascadia-code" + "ccicons" + "cfr-initials" + "cfr-lm" + "charissil" + "cherokee" + "chivo" + "cinzel" + "clara" + "clearsans" + "cm-lgc" + "cm-mf-extra-bold" + "cm-unicode" + "cmathbb" + "cmbright" + "cmexb" + "cmll" + "cmpica" + "cmsrb" + "cmtiup" + "cmupint" + "cochineal" + "coelacanth" + "collection-basic" + "comfortaa" + "comicneue" + "concmath-fonts" + "concmath-otf" + "cookingsymbols" + "cooperhewitt" + "cormorantgaramond" + "countriesofeurope" + "courier-scaled" + "courierten" + "crimson" + "crimsonpro" + "cryst" + "cuprum" + "cyklop" + "dancers" + "dantelogo" + "dejavu" + "dejavu-otf" + "dice" + "dictsym" + "dingbat" + "domitian" + "doublestroke" + "doulossil" + "dozenal" + "drm" + "droid" + "dsserif" + "duerer" + "duerer-latex" + "dutchcal" + "ean" + "ebgaramond" + "ebgaramond-maths" + "ecc" + "eco" + "eczar" + "eiad" + "eiad-ltx" + "ektype-tanka" + "electrum" + "elvish" + "epigrafica" + "epsdice" + "erewhon" + "erewhon-math" + "esrelation" + "esstix" + "esvect" + "etbb" + "euler-math" + "eulervm" + "euxm" + "fbb" + "fdsymbol" + "fetamont" + "feyn" + "fge" + "fira" + "firamath" + "firamath-otf" + "foekfont" + "fonetika" + "fontawesome" + "fontawesome5" + "fontmfizz" + "fonts-churchslavonic" + "forum" + "fourier" + "fouriernc" + "frcursive" + "frederika2016" + "frimurer" + "garamond-libre" + "garamond-math" + "genealogy" + "gentium-tug" + "gfsartemisia" + "gfsbodoni" + "gfscomplutum" + "gfsdidot" + "gfsdidotclassic" + "gfsneohellenic" + "gfsneohellenicmath" + "gfssolomos" + "gillcm" + "gillius" + "gnu-freefont" + "gofonts" + "gothic" + "greenpoint" + "grotesq" + "gudea" + "hacm" + "hamnosys" + "hands" + "hep-font" + "hep-math-font" + "heros-otf" + "heuristica" + "hfbright" + "hfoldsty" + "hindmadurai" + "ibarra" + "ifsym" + "imfellenglish" + "inconsolata" + "initials" + "inriafonts" + "inter" + "ipaex-type1" + "iwona" + "jablantile" + "jamtimes" + "josefin" + "junicode" + "kixfont" + "kpfonts" + "kpfonts-otf" + "kurier" + "lato" + "lexend" + "lfb" + "libertine" + "libertinegc" + "libertinus" + "libertinus-fonts" + "libertinus-otf" + "libertinus-type1" + "libertinust1math" + "librebaskerville" + "librebodoni" + "librecaslon" + "librefranklin" + "libris" + "lineara" + "linguisticspro" + "lobster2" + "logix" + "lxfonts" + "ly1" + "magra" + "marcellus" + "mathabx" + "mathabx-type1" + "mathdesign" + "mdputu" + "mdsymbol" + "merriweather" + "miama" + "mintspirit" + "missaali" + "mlmodern" + "mnsymbol" + "montserrat" + "mpfonts" + "mweights" + "newcomputermodern" + "newpx" + "newtx" + "newtxsf" + "newtxtt" + "niceframe-type1" + "nimbus15" + "nkarta" + "noto" + "noto-emoji" + "notomath" + "nunito" + "obnov" + "ocherokee" + "ocr-b" + "ocr-b-outline" + "ogham" + "oinuit" + "old-arrows" + "oldlatin" + "oldstandard" + "opensans" + "orkhun" + "oswald" + "overlock" + "pacioli" + "pagella-otf" + "paratype" + "phaistos" + "phonetic" + "pigpen" + "playfair" + "plex" + "plex-otf" + "plimsoll" + "poiretone" + "poltawski" + "prodint" + "punk" + "punk-latex" + "punknova" + "pxtxalfa" + "qualitype" + "quattrocento" + "raleway" + "recycle" + "roboto" + "romande" + "rosario" + "rsfso" + "sansmathaccent" + "sansmathfonts" + "sauter" + "sauterfonts" + "schola-otf" + "scholax" + "schulschriften" + "semaphor" + "shobhika" + "simpleicons" + "skull" + "sourcecodepro" + "sourcesanspro" + "sourceserifpro" + "spectral" + "srbtiks" + "starfont" + "staves" + "step" + "stepgreek" + "stickstoo" + "stix" + "stix2-otf" + "stix2-type1" + "superiors" + "svrsymbols" + "symbats3" + "tapir" + "tempora" + "tengwarscript" + "termes-otf" + "tfrupee" + "theanodidot" + "theanomodern" + "theanooldstyle" + "tinos" + "tpslifonts" + "trajan" + "twemoji-colr" + "txfontsb" + "txuprcal" + "typicons" + "umtypewriter" + "universa" + "universalis" + "uppunctlm" + "urwchancal" + "venturisadf" + "wsuipa" + "xcharter" + "xcharter-math" + "xits" + "yfonts" + "yfonts-otf" + "yfonts-t1" + "yinit-otf" + "zlmtt" + ]; sha512.run = "e0c3a3142ca8dcdcdc0d7c5328e1624736f20bfe9e3757bad95d0e361b73ecdf3bc53e9d19f42ef5d91b74cbdf4fca1ee62b79f53d4d5a5f8aed47f51553d77e"; }; "collection-fontsrecommended" = { revision = 54074; stripPrefix = 0; - deps."avantgar" = tl."avantgar"; - deps."bookman" = tl."bookman"; - deps."charter" = tl."charter"; - deps."cm-super" = tl."cm-super"; - deps."cmextra" = tl."cmextra"; - deps."collection-basic" = tl."collection-basic"; - deps."courier" = tl."courier"; - deps."euro" = tl."euro"; - deps."euro-ce" = tl."euro-ce"; - deps."eurosym" = tl."eurosym"; - deps."fpl" = tl."fpl"; - deps."helvetic" = tl."helvetic"; - deps."lm" = tl."lm"; - deps."lm-math" = tl."lm-math"; - deps."manfnt-font" = tl."manfnt-font"; - deps."marvosym" = tl."marvosym"; - deps."mathpazo" = tl."mathpazo"; - deps."mflogo-font" = tl."mflogo-font"; - deps."ncntrsbk" = tl."ncntrsbk"; - deps."palatino" = tl."palatino"; - deps."pxfonts" = tl."pxfonts"; - deps."rsfs" = tl."rsfs"; - deps."symbol" = tl."symbol"; - deps."tex-gyre" = tl."tex-gyre"; - deps."tex-gyre-math" = tl."tex-gyre-math"; - deps."times" = tl."times"; - deps."tipa" = tl."tipa"; - deps."txfonts" = tl."txfonts"; - deps."utopia" = tl."utopia"; - deps."wasy" = tl."wasy"; - deps."wasy-type1" = tl."wasy-type1"; - deps."wasysym" = tl."wasysym"; - deps."zapfchan" = tl."zapfchan"; - deps."zapfding" = tl."zapfding"; + deps = [ + "avantgar" + "bookman" + "charter" + "cm-super" + "cmextra" + "collection-basic" + "courier" + "euro" + "euro-ce" + "eurosym" + "fpl" + "helvetic" + "lm" + "lm-math" + "manfnt-font" + "marvosym" + "mathpazo" + "mflogo-font" + "ncntrsbk" + "palatino" + "pxfonts" + "rsfs" + "symbol" + "tex-gyre" + "tex-gyre-math" + "times" + "tipa" + "txfonts" + "utopia" + "wasy" + "wasy-type1" + "wasysym" + "zapfchan" + "zapfding" + ]; sha512.run = "eaa6e54780a0813a88102258ee3bd7a4640787be0b89eff4ba2c9cc19298bf3e2799ffab4e03e49f20131d07fbac9f601a7223fc1b47257dd0feeb04797c56a8"; }; "collection-fontutils" = { revision = 61207; stripPrefix = 0; - deps."accfonts" = tl."accfonts"; - deps."afm2pl" = tl."afm2pl"; - deps."albatross" = tl."albatross"; - deps."collection-basic" = tl."collection-basic"; - deps."dosepsbin" = tl."dosepsbin"; - deps."dvipsconfig" = tl."dvipsconfig"; - deps."epstopdf" = tl."epstopdf"; - deps."fontinst" = tl."fontinst"; - deps."fontools" = tl."fontools"; - deps."fontware" = tl."fontware"; - deps."lcdftypetools" = tl."lcdftypetools"; - deps."luafindfont" = tl."luafindfont"; - deps."metatype1" = tl."metatype1"; - deps."mf2pt1" = tl."mf2pt1"; - deps."ps2eps" = tl."ps2eps"; - deps."ps2pk" = tl."ps2pk"; - deps."psutils" = tl."psutils"; - deps."t1utils" = tl."t1utils"; - deps."ttfutils" = tl."ttfutils"; + deps = [ + "accfonts" + "afm2pl" + "albatross" + "collection-basic" + "dosepsbin" + "dvipsconfig" + "epstopdf" + "fontinst" + "fontools" + "fontware" + "lcdftypetools" + "luafindfont" + "metatype1" + "mf2pt1" + "ps2eps" + "ps2pk" + "psutils" + "t1utils" + "ttfutils" + ]; sha512.run = "430c95b7e104cb837b7424ebb17ab7ee1aefd99d70aaceefff8a1924fa949329aebe0d5a28b939fabf28d3c5dfc2dcb466147e1396514d5dcf4f64af231db8a7"; }; "collection-formatsextra" = { revision = 62226; stripPrefix = 0; - deps."aleph" = tl."aleph"; - deps."antomega" = tl."antomega"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."edmac" = tl."edmac"; - deps."eplain" = tl."eplain"; - deps."hitex" = tl."hitex"; - deps."jadetex" = tl."jadetex"; - deps."lambda" = tl."lambda"; - deps."lollipop" = tl."lollipop"; - deps."mltex" = tl."mltex"; - deps."mxedruli" = tl."mxedruli"; - deps."omega" = tl."omega"; - deps."omegaware" = tl."omegaware"; - deps."otibet" = tl."otibet"; - deps."passivetex" = tl."passivetex"; - deps."psizzl" = tl."psizzl"; - deps."startex" = tl."startex"; - deps."texsis" = tl."texsis"; - deps."xmltex" = tl."xmltex"; - deps."xmltexconfig" = tl."xmltexconfig"; + deps = [ + "aleph" + "antomega" + "collection-basic" + "collection-latex" + "edmac" + "eplain" + "hitex" + "jadetex" + "lambda" + "lollipop" + "mltex" + "mxedruli" + "omega" + "omegaware" + "otibet" + "passivetex" + "psizzl" + "startex" + "texsis" + "xmltex" + "xmltexconfig" + ]; sha512.run = "6c7f0a1829789edea6a42d45f13f482abc0aa1ecc66b0ba4b70197efff349df75c9a89a98f21537cf6f3751b608fc3ee10ac842613deaf2aa21005374a23bab2"; }; "collection-games" = { revision = 64827; stripPrefix = 0; - deps."bartel-chess-fonts" = tl."bartel-chess-fonts"; - deps."chess" = tl."chess"; - deps."chess-problem-diagrams" = tl."chess-problem-diagrams"; - deps."chessboard" = tl."chessboard"; - deps."chessfss" = tl."chessfss"; - deps."chinesechess" = tl."chinesechess"; - deps."collection-latex" = tl."collection-latex"; - deps."crossword" = tl."crossword"; - deps."crosswrd" = tl."crosswrd"; - deps."customdice" = tl."customdice"; - deps."egameps" = tl."egameps"; - deps."gamebook" = tl."gamebook"; - deps."gamebooklib" = tl."gamebooklib"; - deps."go" = tl."go"; - deps."hanoi" = tl."hanoi"; - deps."havannah" = tl."havannah"; - deps."hexboard" = tl."hexboard"; - deps."hexgame" = tl."hexgame"; - deps."hmtrump" = tl."hmtrump"; - deps."horoscop" = tl."horoscop"; - deps."jeuxcartes" = tl."jeuxcartes"; - deps."jigsaw" = tl."jigsaw"; - deps."labyrinth" = tl."labyrinth"; - deps."logicpuzzle" = tl."logicpuzzle"; - deps."mahjong" = tl."mahjong"; - deps."musikui" = tl."musikui"; - deps."nimsticks" = tl."nimsticks"; - deps."onedown" = tl."onedown"; - deps."othello" = tl."othello"; - deps."othelloboard" = tl."othelloboard"; - deps."pas-crosswords" = tl."pas-crosswords"; - deps."psgo" = tl."psgo"; - deps."realtranspose" = tl."realtranspose"; - deps."reverxii" = tl."reverxii"; - deps."rubik" = tl."rubik"; - deps."schwalbe-chess" = tl."schwalbe-chess"; - deps."sgame" = tl."sgame"; - deps."skak" = tl."skak"; - deps."skaknew" = tl."skaknew"; - deps."soup" = tl."soup"; - deps."sudoku" = tl."sudoku"; - deps."sudokubundle" = tl."sudokubundle"; - deps."wargame" = tl."wargame"; - deps."xq" = tl."xq"; - deps."xskak" = tl."xskak"; + deps = [ + "bartel-chess-fonts" + "chess" + "chess-problem-diagrams" + "chessboard" + "chessfss" + "chinesechess" + "collection-latex" + "crossword" + "crosswrd" + "customdice" + "egameps" + "gamebook" + "gamebooklib" + "go" + "hanoi" + "havannah" + "hexboard" + "hexgame" + "hmtrump" + "horoscop" + "jeuxcartes" + "jigsaw" + "labyrinth" + "logicpuzzle" + "mahjong" + "musikui" + "nimsticks" + "onedown" + "othello" + "othelloboard" + "pas-crosswords" + "psgo" + "realtranspose" + "reverxii" + "rubik" + "schwalbe-chess" + "sgame" + "skak" + "skaknew" + "soup" + "sudoku" + "sudokubundle" + "wargame" + "xq" + "xskak" + ]; sha512.run = "0ea226457c553c3db93d7415f1a9e33721b7a41ac17ef049aa52aaeb27a91169769f12532443c34664ccaf4cc76a26761a5d5d0b0a7fa1ccbd2f0142e8d29d67"; }; "collection-humanities" = { revision = 65216; stripPrefix = 0; - deps."adtrees" = tl."adtrees"; - deps."bibleref" = tl."bibleref"; - deps."bibleref-lds" = tl."bibleref-lds"; - deps."bibleref-mouth" = tl."bibleref-mouth"; - deps."bibleref-parse" = tl."bibleref-parse"; - deps."collection-latex" = tl."collection-latex"; - deps."covington" = tl."covington"; - deps."diadia" = tl."diadia"; - deps."dramatist" = tl."dramatist"; - deps."dvgloss" = tl."dvgloss"; - deps."ecltree" = tl."ecltree"; - deps."edfnotes" = tl."edfnotes"; - deps."eledform" = tl."eledform"; - deps."eledmac" = tl."eledmac"; - deps."expex" = tl."expex"; - deps."gb4e" = tl."gb4e"; - deps."gmverse" = tl."gmverse"; - deps."jura" = tl."jura"; - deps."juraabbrev" = tl."juraabbrev"; - deps."juramisc" = tl."juramisc"; - deps."jurarsp" = tl."jurarsp"; - deps."langnames" = tl."langnames"; - deps."ledmac" = tl."ledmac"; - deps."lexikon" = tl."lexikon"; - deps."lexref" = tl."lexref"; - deps."ling-macros" = tl."ling-macros"; - deps."linguex" = tl."linguex"; - deps."liturg" = tl."liturg"; - deps."metrix" = tl."metrix"; - deps."nnext" = tl."nnext"; - deps."parallel" = tl."parallel"; - deps."parrun" = tl."parrun"; - deps."phonrule" = tl."phonrule"; - deps."plari" = tl."plari"; - deps."play" = tl."play"; - deps."poemscol" = tl."poemscol"; - deps."poetry" = tl."poetry"; - deps."poetrytex" = tl."poetrytex"; - deps."qobitree" = tl."qobitree"; - deps."qtree" = tl."qtree"; - deps."reledmac" = tl."reledmac"; - deps."rrgtrees" = tl."rrgtrees"; - deps."rtklage" = tl."rtklage"; - deps."screenplay" = tl."screenplay"; - deps."screenplay-pkg" = tl."screenplay-pkg"; - deps."sides" = tl."sides"; - deps."stage" = tl."stage"; - deps."textglos" = tl."textglos"; - deps."thalie" = tl."thalie"; - deps."theatre" = tl."theatre"; - deps."tree-dvips" = tl."tree-dvips"; - deps."verse" = tl."verse"; - deps."xyling" = tl."xyling"; + deps = [ + "adtrees" + "bibleref" + "bibleref-lds" + "bibleref-mouth" + "bibleref-parse" + "collection-latex" + "covington" + "diadia" + "dramatist" + "dvgloss" + "ecltree" + "edfnotes" + "eledform" + "eledmac" + "expex" + "gb4e" + "gmverse" + "jura" + "juraabbrev" + "juramisc" + "jurarsp" + "langnames" + "ledmac" + "lexikon" + "lexref" + "ling-macros" + "linguex" + "liturg" + "metrix" + "nnext" + "parallel" + "parrun" + "phonrule" + "plari" + "play" + "poemscol" + "poetry" + "poetrytex" + "qobitree" + "qtree" + "reledmac" + "rrgtrees" + "rtklage" + "screenplay" + "screenplay-pkg" + "sides" + "stage" + "textglos" + "thalie" + "theatre" + "tree-dvips" + "verse" + "xyling" + ]; sha512.run = "d2ae12a0b914be72772dadc60021220990f037f40a2ef4f95038cdd603c80e039f94009910aed38513b4a7938ec99ecf2f035a0dbe221b9e166ccd8aa977c30b"; }; "collection-langarabic" = { revision = 59594; stripPrefix = 0; - deps."alkalami" = tl."alkalami"; - deps."alpha-persian" = tl."alpha-persian"; - deps."amiri" = tl."amiri"; - deps."arabi" = tl."arabi"; - deps."arabi-add" = tl."arabi-add"; - deps."arabic-book" = tl."arabic-book"; - deps."arabluatex" = tl."arabluatex"; - deps."arabtex" = tl."arabtex"; - deps."bidi" = tl."bidi"; - deps."bidihl" = tl."bidihl"; - deps."collection-basic" = tl."collection-basic"; - deps."dad" = tl."dad"; - deps."ghab" = tl."ghab"; - deps."hvarabic" = tl."hvarabic"; - deps."hyphen-arabic" = tl."hyphen-arabic"; - deps."hyphen-farsi" = tl."hyphen-farsi"; - deps."imsproc" = tl."imsproc"; - deps."kurdishlipsum" = tl."kurdishlipsum"; - deps."lshort-persian" = tl."lshort-persian"; - deps."luabidi" = tl."luabidi"; - deps."na-box" = tl."na-box"; - deps."persian-bib" = tl."persian-bib"; - deps."quran" = tl."quran"; - deps."sexam" = tl."sexam"; - deps."simurgh" = tl."simurgh"; - deps."texnegar" = tl."texnegar"; - deps."tram" = tl."tram"; - deps."xepersian" = tl."xepersian"; - deps."xepersian-hm" = tl."xepersian-hm"; - deps."xindy-persian" = tl."xindy-persian"; + deps = [ + "alkalami" + "alpha-persian" + "amiri" + "arabi" + "arabi-add" + "arabic-book" + "arabluatex" + "arabtex" + "bidi" + "bidihl" + "collection-basic" + "dad" + "ghab" + "hvarabic" + "hyphen-arabic" + "hyphen-farsi" + "imsproc" + "kurdishlipsum" + "lshort-persian" + "luabidi" + "na-box" + "persian-bib" + "quran" + "sexam" + "simurgh" + "texnegar" + "tram" + "xepersian" + "xepersian-hm" + "xindy-persian" + ]; sha512.run = "3fdcf41fafd94373254281f3f7ee9f2a2e136cfa1adc1dd38e4b5cd6f90d0364e6a20d3284fcf255f245158352421e28cfb794c673b8b96399a20343ed991fc2"; }; "collection-langchinese" = { revision = 63995; stripPrefix = 0; - deps."arphic" = tl."arphic"; - deps."arphic-ttf" = tl."arphic-ttf"; - deps."asymptote-by-example-zh-cn" = tl."asymptote-by-example-zh-cn"; - deps."asymptote-faq-zh-cn" = tl."asymptote-faq-zh-cn"; - deps."asymptote-manual-zh-cn" = tl."asymptote-manual-zh-cn"; - deps."cns" = tl."cns"; - deps."collection-langcjk" = tl."collection-langcjk"; - deps."ctex" = tl."ctex"; - deps."ctex-faq" = tl."ctex-faq"; - deps."exam-zh" = tl."exam-zh"; - deps."fandol" = tl."fandol"; - deps."fduthesis" = tl."fduthesis"; - deps."hanzibox" = tl."hanzibox"; - deps."hyphen-chinese" = tl."hyphen-chinese"; - deps."impatient-cn" = tl."impatient-cn"; - deps."install-latex-guide-zh-cn" = tl."install-latex-guide-zh-cn"; - deps."latex-notes-zh-cn" = tl."latex-notes-zh-cn"; - deps."lshort-chinese" = tl."lshort-chinese"; - deps."nanicolle" = tl."nanicolle"; - deps."njurepo" = tl."njurepo"; - deps."pgfornament-han" = tl."pgfornament-han"; - deps."qyxf-book" = tl."qyxf-book"; - deps."texlive-zh-cn" = tl."texlive-zh-cn"; - deps."texproposal" = tl."texproposal"; - deps."tlmgr-intro-zh-cn" = tl."tlmgr-intro-zh-cn"; - deps."upzhkinsoku" = tl."upzhkinsoku"; - deps."xpinyin" = tl."xpinyin"; - deps."xtuthesis" = tl."xtuthesis"; - deps."zhlineskip" = tl."zhlineskip"; - deps."zhlipsum" = tl."zhlipsum"; - deps."zhmetrics" = tl."zhmetrics"; - deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; - deps."zhnumber" = tl."zhnumber"; - deps."zhspacing" = tl."zhspacing"; + deps = [ + "arphic" + "arphic-ttf" + "asymptote-by-example-zh-cn" + "asymptote-faq-zh-cn" + "asymptote-manual-zh-cn" + "cns" + "collection-langcjk" + "ctex" + "ctex-faq" + "exam-zh" + "fandol" + "fduthesis" + "hanzibox" + "hyphen-chinese" + "impatient-cn" + "install-latex-guide-zh-cn" + "latex-notes-zh-cn" + "lshort-chinese" + "nanicolle" + "njurepo" + "pgfornament-han" + "qyxf-book" + "texlive-zh-cn" + "texproposal" + "tlmgr-intro-zh-cn" + "upzhkinsoku" + "xpinyin" + "xtuthesis" + "zhlineskip" + "zhlipsum" + "zhmetrics" + "zhmetrics-uptex" + "zhnumber" + "zhspacing" + ]; sha512.run = "d10096b2d83dc0378361184a64c347918e75dd51f48d962893371534c375dd8880e8febb1aaf1207e5ce04e59860f629f10c99bbf6304239e1147a5072194137"; }; "collection-langcjk" = { revision = 61912; stripPrefix = 0; - deps."adobemapping" = tl."adobemapping"; - deps."c90" = tl."c90"; - deps."cjk" = tl."cjk"; - deps."cjk-gs-integrate" = tl."cjk-gs-integrate"; - deps."cjkpunct" = tl."cjkpunct"; - deps."cjkutils" = tl."cjkutils"; - deps."collection-basic" = tl."collection-basic"; - deps."dnp" = tl."dnp"; - deps."fixjfm" = tl."fixjfm"; - deps."garuda-c90" = tl."garuda-c90"; - deps."jfmutil" = tl."jfmutil"; - deps."norasi-c90" = tl."norasi-c90"; - deps."pxtatescale" = tl."pxtatescale"; - deps."xcjk2uni" = tl."xcjk2uni"; - deps."xecjk" = tl."xecjk"; - deps."zitie" = tl."zitie"; - deps."zxjafont" = tl."zxjafont"; + deps = [ + "adobemapping" + "c90" + "cjk" + "cjk-gs-integrate" + "cjkpunct" + "cjkutils" + "collection-basic" + "dnp" + "fixjfm" + "garuda-c90" + "jfmutil" + "norasi-c90" + "pxtatescale" + "xcjk2uni" + "xecjk" + "zitie" + "zxjafont" + ]; sha512.run = "6b00955359e063df2a7c02f2d44f88e6190d65834b8e5c77e9c67e44b8c9de9cee612cd298e79fe3cd598fd58996ace0829d3a5463cdc25b543e7565b1455e31"; }; "collection-langcyrillic" = { revision = 54074; stripPrefix = 0; - deps."babel-belarusian" = tl."babel-belarusian"; - deps."babel-bulgarian" = tl."babel-bulgarian"; - deps."babel-russian" = tl."babel-russian"; - deps."babel-serbian" = tl."babel-serbian"; - deps."babel-serbianc" = tl."babel-serbianc"; - deps."babel-ukrainian" = tl."babel-ukrainian"; - deps."churchslavonic" = tl."churchslavonic"; - deps."cmcyr" = tl."cmcyr"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."cyrillic" = tl."cyrillic"; - deps."cyrillic-bin" = tl."cyrillic-bin"; - deps."cyrplain" = tl."cyrplain"; - deps."disser" = tl."disser"; - deps."eskd" = tl."eskd"; - deps."eskdx" = tl."eskdx"; - deps."gost" = tl."gost"; - deps."hyphen-belarusian" = tl."hyphen-belarusian"; - deps."hyphen-bulgarian" = tl."hyphen-bulgarian"; - deps."hyphen-churchslavonic" = tl."hyphen-churchslavonic"; - deps."hyphen-mongolian" = tl."hyphen-mongolian"; - deps."hyphen-russian" = tl."hyphen-russian"; - deps."hyphen-serbian" = tl."hyphen-serbian"; - deps."hyphen-ukrainian" = tl."hyphen-ukrainian"; - deps."lcyw" = tl."lcyw"; - deps."lh" = tl."lh"; - deps."lhcyr" = tl."lhcyr"; - deps."lshort-bulgarian" = tl."lshort-bulgarian"; - deps."lshort-mongol" = tl."lshort-mongol"; - deps."lshort-russian" = tl."lshort-russian"; - deps."lshort-ukr" = tl."lshort-ukr"; - deps."mongolian-babel" = tl."mongolian-babel"; - deps."montex" = tl."montex"; - deps."mpman-ru" = tl."mpman-ru"; - deps."numnameru" = tl."numnameru"; - deps."pst-eucl-translation-bg" = tl."pst-eucl-translation-bg"; - deps."ruhyphen" = tl."ruhyphen"; - deps."russ" = tl."russ"; - deps."serbian-apostrophe" = tl."serbian-apostrophe"; - deps."serbian-date-lat" = tl."serbian-date-lat"; - deps."serbian-def-cyr" = tl."serbian-def-cyr"; - deps."serbian-lig" = tl."serbian-lig"; - deps."t2" = tl."t2"; - deps."texlive-ru" = tl."texlive-ru"; - deps."texlive-sr" = tl."texlive-sr"; - deps."ukrhyph" = tl."ukrhyph"; - deps."xecyrmongolian" = tl."xecyrmongolian"; + deps = [ + "babel-belarusian" + "babel-bulgarian" + "babel-russian" + "babel-serbian" + "babel-serbianc" + "babel-ukrainian" + "churchslavonic" + "cmcyr" + "collection-basic" + "collection-latex" + "cyrillic" + "cyrillic-bin" + "cyrplain" + "disser" + "eskd" + "eskdx" + "gost" + "hyphen-belarusian" + "hyphen-bulgarian" + "hyphen-churchslavonic" + "hyphen-mongolian" + "hyphen-russian" + "hyphen-serbian" + "hyphen-ukrainian" + "lcyw" + "lh" + "lhcyr" + "lshort-bulgarian" + "lshort-mongol" + "lshort-russian" + "lshort-ukr" + "mongolian-babel" + "montex" + "mpman-ru" + "numnameru" + "pst-eucl-translation-bg" + "ruhyphen" + "russ" + "serbian-apostrophe" + "serbian-date-lat" + "serbian-def-cyr" + "serbian-lig" + "t2" + "texlive-ru" + "texlive-sr" + "ukrhyph" + "xecyrmongolian" + ]; sha512.run = "43ba5d0f21162fbdb6fd0e9dc7c990fa845918704020da8ca5c6770139370be55f4b707f98708c28b472f9500ee25ea734bdd96c5541a22e66b69c03ae777ad0"; }; "collection-langczechslovak" = { revision = 54074; stripPrefix = 0; - deps."babel-czech" = tl."babel-czech"; - deps."babel-slovak" = tl."babel-slovak"; - deps."cnbwp" = tl."cnbwp"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."cs" = tl."cs"; - deps."csbulletin" = tl."csbulletin"; - deps."cslatex" = tl."cslatex"; - deps."csplain" = tl."csplain"; - deps."cstex" = tl."cstex"; - deps."hyphen-czech" = tl."hyphen-czech"; - deps."hyphen-slovak" = tl."hyphen-slovak"; - deps."lshort-czech" = tl."lshort-czech"; - deps."lshort-slovak" = tl."lshort-slovak"; - deps."texlive-cz" = tl."texlive-cz"; - deps."vlna" = tl."vlna"; + deps = [ + "babel-czech" + "babel-slovak" + "cnbwp" + "collection-basic" + "collection-latex" + "cs" + "csbulletin" + "cslatex" + "csplain" + "cstex" + "hyphen-czech" + "hyphen-slovak" + "lshort-czech" + "lshort-slovak" + "texlive-cz" + "vlna" + ]; sha512.run = "719c321173ca12660891080dae509080934f72d13a9417b2c40a22add963c7c5a1ee95d3b306f0d6c26b0db97d69979c27fbb15d1690849aa03b06d4b0193a67"; }; "collection-langenglish" = { revision = 63184; stripPrefix = 0; - deps."amiweb2c-guide" = tl."amiweb2c-guide"; - deps."amscls-doc" = tl."amscls-doc"; - deps."amslatex-primer" = tl."amslatex-primer"; - deps."around-the-bend" = tl."around-the-bend"; - deps."ascii-chart" = tl."ascii-chart"; - deps."biblatex-cheatsheet" = tl."biblatex-cheatsheet"; - deps."collection-basic" = tl."collection-basic"; - deps."components" = tl."components"; - deps."comprehensive" = tl."comprehensive"; - deps."dickimaw" = tl."dickimaw"; - deps."docsurvey" = tl."docsurvey"; - deps."dtxtut" = tl."dtxtut"; - deps."first-latex-doc" = tl."first-latex-doc"; - deps."fontinstallationguide" = tl."fontinstallationguide"; - deps."forest-quickstart" = tl."forest-quickstart"; - deps."gentle" = tl."gentle"; - deps."guide-to-latex" = tl."guide-to-latex"; - deps."happy4th" = tl."happy4th"; - deps."hyphen-english" = tl."hyphen-english"; - deps."impatient" = tl."impatient"; - deps."intro-scientific" = tl."intro-scientific"; - deps."knuth-errata" = tl."knuth-errata"; - deps."knuth-hint" = tl."knuth-hint"; - deps."knuth-pdf" = tl."knuth-pdf"; - deps."l2tabu-english" = tl."l2tabu-english"; - deps."latex-brochure" = tl."latex-brochure"; - deps."latex-course" = tl."latex-course"; - deps."latex-doc-ptr" = tl."latex-doc-ptr"; - deps."latex-for-undergraduates" = tl."latex-for-undergraduates"; - deps."latex-graphics-companion" = tl."latex-graphics-companion"; - deps."latex-refsheet" = tl."latex-refsheet"; - deps."latex-veryshortguide" = tl."latex-veryshortguide"; - deps."latex-web-companion" = tl."latex-web-companion"; - deps."latex2e-help-texinfo" = tl."latex2e-help-texinfo"; - deps."latex4wp" = tl."latex4wp"; - deps."latexcheat" = tl."latexcheat"; - deps."latexcourse-rug" = tl."latexcourse-rug"; - deps."latexfileinfo-pkgs" = tl."latexfileinfo-pkgs"; - deps."lshort-english" = tl."lshort-english"; - deps."macros2e" = tl."macros2e"; - deps."math-into-latex-4" = tl."math-into-latex-4"; - deps."maths-symbols" = tl."maths-symbols"; - deps."memdesign" = tl."memdesign"; - deps."memoirchapterstyles" = tl."memoirchapterstyles"; - deps."metafont-beginners" = tl."metafont-beginners"; - deps."metapost-examples" = tl."metapost-examples"; - deps."patgen2-tutorial" = tl."patgen2-tutorial"; - deps."pictexsum" = tl."pictexsum"; - deps."plain-doc" = tl."plain-doc"; - deps."short-math-guide" = tl."short-math-guide"; - deps."simplified-latex" = tl."simplified-latex"; - deps."svg-inkscape" = tl."svg-inkscape"; - deps."tamethebeast" = tl."tamethebeast"; - deps."tds" = tl."tds"; - deps."tex-font-errors-cheatsheet" = tl."tex-font-errors-cheatsheet"; - deps."tex-nutshell" = tl."tex-nutshell"; - deps."tex-overview" = tl."tex-overview"; - deps."tex-refs" = tl."tex-refs"; - deps."tex-vpat" = tl."tex-vpat"; - deps."texbytopic" = tl."texbytopic"; - deps."texonly" = tl."texonly"; - deps."titlepages" = tl."titlepages"; - deps."tlc2" = tl."tlc2"; - deps."tlmgrbasics" = tl."tlmgrbasics"; - deps."undergradmath" = tl."undergradmath"; - deps."visualfaq" = tl."visualfaq"; - deps."webguide" = tl."webguide"; - deps."xetexref" = tl."xetexref"; - deps."yet-another-guide-latex2e" = tl."yet-another-guide-latex2e"; + deps = [ + "amiweb2c-guide" + "amscls-doc" + "amslatex-primer" + "around-the-bend" + "ascii-chart" + "biblatex-cheatsheet" + "collection-basic" + "components" + "comprehensive" + "dickimaw" + "docsurvey" + "dtxtut" + "first-latex-doc" + "fontinstallationguide" + "forest-quickstart" + "gentle" + "guide-to-latex" + "happy4th" + "hyphen-english" + "impatient" + "intro-scientific" + "knuth-errata" + "knuth-hint" + "knuth-pdf" + "l2tabu-english" + "latex-brochure" + "latex-course" + "latex-doc-ptr" + "latex-for-undergraduates" + "latex-graphics-companion" + "latex-refsheet" + "latex-veryshortguide" + "latex-web-companion" + "latex2e-help-texinfo" + "latex4wp" + "latexcheat" + "latexcourse-rug" + "latexfileinfo-pkgs" + "lshort-english" + "macros2e" + "math-into-latex-4" + "maths-symbols" + "memdesign" + "memoirchapterstyles" + "metafont-beginners" + "metapost-examples" + "patgen2-tutorial" + "pictexsum" + "plain-doc" + "short-math-guide" + "simplified-latex" + "svg-inkscape" + "tamethebeast" + "tds" + "tex-font-errors-cheatsheet" + "tex-nutshell" + "tex-overview" + "tex-refs" + "tex-vpat" + "texbytopic" + "texonly" + "titlepages" + "tlc2" + "tlmgrbasics" + "undergradmath" + "visualfaq" + "webguide" + "xetexref" + "yet-another-guide-latex2e" + ]; sha512.run = "94b1ee572454d4a791ab0637cf272f97a35dc5284c8a97a68715fcef36887eaa92ddb78f95722a6281d35c70fa6e5e4b6548ba8ca79fb69d9734c480383bdec2"; }; "collection-langeuropean" = { revision = 64723; stripPrefix = 0; - deps."armtex" = tl."armtex"; - deps."babel-albanian" = tl."babel-albanian"; - deps."babel-bosnian" = tl."babel-bosnian"; - deps."babel-breton" = tl."babel-breton"; - deps."babel-croatian" = tl."babel-croatian"; - deps."babel-danish" = tl."babel-danish"; - deps."babel-dutch" = tl."babel-dutch"; - deps."babel-estonian" = tl."babel-estonian"; - deps."babel-finnish" = tl."babel-finnish"; - deps."babel-friulan" = tl."babel-friulan"; - deps."babel-hungarian" = tl."babel-hungarian"; - deps."babel-icelandic" = tl."babel-icelandic"; - deps."babel-irish" = tl."babel-irish"; - deps."babel-kurmanji" = tl."babel-kurmanji"; - deps."babel-latin" = tl."babel-latin"; - deps."babel-latvian" = tl."babel-latvian"; - deps."babel-macedonian" = tl."babel-macedonian"; - deps."babel-norsk" = tl."babel-norsk"; - deps."babel-occitan" = tl."babel-occitan"; - deps."babel-piedmontese" = tl."babel-piedmontese"; - deps."babel-romanian" = tl."babel-romanian"; - deps."babel-romansh" = tl."babel-romansh"; - deps."babel-samin" = tl."babel-samin"; - deps."babel-scottish" = tl."babel-scottish"; - deps."babel-slovenian" = tl."babel-slovenian"; - deps."babel-swedish" = tl."babel-swedish"; - deps."babel-turkish" = tl."babel-turkish"; - deps."babel-welsh" = tl."babel-welsh"; - deps."collection-basic" = tl."collection-basic"; - deps."finbib" = tl."finbib"; - deps."gloss-occitan" = tl."gloss-occitan"; - deps."hrlatex" = tl."hrlatex"; - deps."huaz" = tl."huaz"; - deps."hulipsum" = tl."hulipsum"; - deps."hyphen-croatian" = tl."hyphen-croatian"; - deps."hyphen-danish" = tl."hyphen-danish"; - deps."hyphen-dutch" = tl."hyphen-dutch"; - deps."hyphen-estonian" = tl."hyphen-estonian"; - deps."hyphen-finnish" = tl."hyphen-finnish"; - deps."hyphen-friulan" = tl."hyphen-friulan"; - deps."hyphen-hungarian" = tl."hyphen-hungarian"; - deps."hyphen-icelandic" = tl."hyphen-icelandic"; - deps."hyphen-irish" = tl."hyphen-irish"; - deps."hyphen-kurmanji" = tl."hyphen-kurmanji"; - deps."hyphen-latin" = tl."hyphen-latin"; - deps."hyphen-latvian" = tl."hyphen-latvian"; - deps."hyphen-lithuanian" = tl."hyphen-lithuanian"; - deps."hyphen-macedonian" = tl."hyphen-macedonian"; - deps."hyphen-norwegian" = tl."hyphen-norwegian"; - deps."hyphen-occitan" = tl."hyphen-occitan"; - deps."hyphen-piedmontese" = tl."hyphen-piedmontese"; - deps."hyphen-romanian" = tl."hyphen-romanian"; - deps."hyphen-romansh" = tl."hyphen-romansh"; - deps."hyphen-slovenian" = tl."hyphen-slovenian"; - deps."hyphen-swedish" = tl."hyphen-swedish"; - deps."hyphen-turkish" = tl."hyphen-turkish"; - deps."hyphen-uppersorbian" = tl."hyphen-uppersorbian"; - deps."hyphen-welsh" = tl."hyphen-welsh"; - deps."kaytannollista-latexia" = tl."kaytannollista-latexia"; - deps."lithuanian" = tl."lithuanian"; - deps."lshort-dutch" = tl."lshort-dutch"; - deps."lshort-estonian" = tl."lshort-estonian"; - deps."lshort-finnish" = tl."lshort-finnish"; - deps."lshort-slovenian" = tl."lshort-slovenian"; - deps."lshort-turkish" = tl."lshort-turkish"; - deps."nevelok" = tl."nevelok"; - deps."rojud" = tl."rojud"; - deps."swebib" = tl."swebib"; - deps."turkmen" = tl."turkmen"; + deps = [ + "armtex" + "babel-albanian" + "babel-bosnian" + "babel-breton" + "babel-croatian" + "babel-danish" + "babel-dutch" + "babel-estonian" + "babel-finnish" + "babel-friulan" + "babel-hungarian" + "babel-icelandic" + "babel-irish" + "babel-kurmanji" + "babel-latin" + "babel-latvian" + "babel-macedonian" + "babel-norsk" + "babel-occitan" + "babel-piedmontese" + "babel-romanian" + "babel-romansh" + "babel-samin" + "babel-scottish" + "babel-slovenian" + "babel-swedish" + "babel-turkish" + "babel-welsh" + "collection-basic" + "finbib" + "gloss-occitan" + "hrlatex" + "huaz" + "hulipsum" + "hyphen-croatian" + "hyphen-danish" + "hyphen-dutch" + "hyphen-estonian" + "hyphen-finnish" + "hyphen-friulan" + "hyphen-hungarian" + "hyphen-icelandic" + "hyphen-irish" + "hyphen-kurmanji" + "hyphen-latin" + "hyphen-latvian" + "hyphen-lithuanian" + "hyphen-macedonian" + "hyphen-norwegian" + "hyphen-occitan" + "hyphen-piedmontese" + "hyphen-romanian" + "hyphen-romansh" + "hyphen-slovenian" + "hyphen-swedish" + "hyphen-turkish" + "hyphen-uppersorbian" + "hyphen-welsh" + "kaytannollista-latexia" + "lithuanian" + "lshort-dutch" + "lshort-estonian" + "lshort-finnish" + "lshort-slovenian" + "lshort-turkish" + "nevelok" + "rojud" + "swebib" + "turkmen" + ]; sha512.run = "4a234c1f9b66d04df7f897ad38e6af56666917106e1a299e00dbccd6a5ba55c635beee78550c410cd4c631c3e91ea250adc79e8e3b29bc473d3e721c5adf75e4"; }; "collection-langfrench" = { revision = 63147; stripPrefix = 0; - deps."aeguill" = tl."aeguill"; - deps."annee-scolaire" = tl."annee-scolaire"; - deps."apprendre-a-programmer-en-tex" = tl."apprendre-a-programmer-en-tex"; - deps."apprends-latex" = tl."apprends-latex"; - deps."babel-basque" = tl."babel-basque"; - deps."babel-french" = tl."babel-french"; - deps."basque-book" = tl."basque-book"; - deps."basque-date" = tl."basque-date"; - deps."bib-fr" = tl."bib-fr"; - deps."bibleref-french" = tl."bibleref-french"; - deps."booktabs-fr" = tl."booktabs-fr"; - deps."collection-basic" = tl."collection-basic"; - deps."droit-fr" = tl."droit-fr"; - deps."e-french" = tl."e-french"; - deps."epslatex-fr" = tl."epslatex-fr"; - deps."expose-expl3-dunkerque-2019" = tl."expose-expl3-dunkerque-2019"; - deps."facture" = tl."facture"; - deps."formation-latex-ul" = tl."formation-latex-ul"; - deps."frenchmath" = tl."frenchmath"; - deps."frletter" = tl."frletter"; - deps."frpseudocode" = tl."frpseudocode"; - deps."hyphen-basque" = tl."hyphen-basque"; - deps."hyphen-french" = tl."hyphen-french"; - deps."impatient-fr" = tl."impatient-fr"; - deps."impnattypo" = tl."impnattypo"; - deps."l2tabu-french" = tl."l2tabu-french"; - deps."latex2e-help-texinfo-fr" = tl."latex2e-help-texinfo-fr"; - deps."letgut" = tl."letgut"; - deps."lshort-french" = tl."lshort-french"; - deps."mafr" = tl."mafr"; - deps."matapli" = tl."matapli"; - deps."profcollege" = tl."profcollege"; - deps."proflabo" = tl."proflabo"; - deps."proflycee" = tl."proflycee"; - deps."tabvar" = tl."tabvar"; - deps."tdsfrmath" = tl."tdsfrmath"; - deps."texlive-fr" = tl."texlive-fr"; - deps."translation-array-fr" = tl."translation-array-fr"; - deps."translation-dcolumn-fr" = tl."translation-dcolumn-fr"; - deps."translation-natbib-fr" = tl."translation-natbib-fr"; - deps."translation-tabbing-fr" = tl."translation-tabbing-fr"; - deps."variations" = tl."variations"; - deps."visualfaq-fr" = tl."visualfaq-fr"; - deps."visualtikz" = tl."visualtikz"; + deps = [ + "aeguill" + "annee-scolaire" + "apprendre-a-programmer-en-tex" + "apprends-latex" + "babel-basque" + "babel-french" + "basque-book" + "basque-date" + "bib-fr" + "bibleref-french" + "booktabs-fr" + "collection-basic" + "droit-fr" + "e-french" + "epslatex-fr" + "expose-expl3-dunkerque-2019" + "facture" + "formation-latex-ul" + "frenchmath" + "frletter" + "frpseudocode" + "hyphen-basque" + "hyphen-french" + "impatient-fr" + "impnattypo" + "l2tabu-french" + "latex2e-help-texinfo-fr" + "letgut" + "lshort-french" + "mafr" + "matapli" + "profcollege" + "proflabo" + "proflycee" + "tabvar" + "tdsfrmath" + "texlive-fr" + "translation-array-fr" + "translation-dcolumn-fr" + "translation-natbib-fr" + "translation-tabbing-fr" + "variations" + "visualfaq-fr" + "visualtikz" + ]; sha512.run = "baec84c93e0b9313b29f807831da39da40902afdbc2305e193e9d4805c631a1e44695c0bc148e973d9021146cc25da9b22b0130b29fe4ff9834667ec83dff9b6"; }; "collection-langgerman" = { revision = 55706; stripPrefix = 0; - deps."apalike-german" = tl."apalike-german"; - deps."babel-german" = tl."babel-german"; - deps."bibleref-german" = tl."bibleref-german"; - deps."booktabs-de" = tl."booktabs-de"; - deps."collection-basic" = tl."collection-basic"; - deps."csquotes-de" = tl."csquotes-de"; - deps."dehyph" = tl."dehyph"; - deps."dehyph-exptl" = tl."dehyph-exptl"; - deps."dhua" = tl."dhua"; - deps."dtk-bibliography" = tl."dtk-bibliography"; - deps."etdipa" = tl."etdipa"; - deps."etoolbox-de" = tl."etoolbox-de"; - deps."fifinddo-info" = tl."fifinddo-info"; - deps."german" = tl."german"; - deps."germbib" = tl."germbib"; - deps."germkorr" = tl."germkorr"; - deps."hausarbeit-jura" = tl."hausarbeit-jura"; - deps."hyphen-german" = tl."hyphen-german"; - deps."koma-script-examples" = tl."koma-script-examples"; - deps."l2picfaq" = tl."l2picfaq"; - deps."l2tabu" = tl."l2tabu"; - deps."latexcheat-de" = tl."latexcheat-de"; - deps."lshort-german" = tl."lshort-german"; - deps."lualatex-doc-de" = tl."lualatex-doc-de"; - deps."microtype-de" = tl."microtype-de"; - deps."milog" = tl."milog"; - deps."quran-de" = tl."quran-de"; - deps."r_und_s" = tl."r_und_s"; - deps."schulmathematik" = tl."schulmathematik"; - deps."templates-fenn" = tl."templates-fenn"; - deps."templates-sommer" = tl."templates-sommer"; - deps."termcal-de" = tl."termcal-de"; - deps."texlive-de" = tl."texlive-de"; - deps."tipa-de" = tl."tipa-de"; - deps."translation-arsclassica-de" = tl."translation-arsclassica-de"; - deps."translation-biblatex-de" = tl."translation-biblatex-de"; - deps."translation-chemsym-de" = tl."translation-chemsym-de"; - deps."translation-ecv-de" = tl."translation-ecv-de"; - deps."translation-enumitem-de" = tl."translation-enumitem-de"; - deps."translation-europecv-de" = tl."translation-europecv-de"; - deps."translation-filecontents-de" = tl."translation-filecontents-de"; - deps."translation-moreverb-de" = tl."translation-moreverb-de"; - deps."udesoftec" = tl."udesoftec"; - deps."uhrzeit" = tl."uhrzeit"; - deps."umlaute" = tl."umlaute"; - deps."voss-mathcol" = tl."voss-mathcol"; + deps = [ + "apalike-german" + "babel-german" + "bibleref-german" + "booktabs-de" + "collection-basic" + "csquotes-de" + "dehyph" + "dehyph-exptl" + "dhua" + "dtk-bibliography" + "etdipa" + "etoolbox-de" + "fifinddo-info" + "german" + "germbib" + "germkorr" + "hausarbeit-jura" + "hyphen-german" + "koma-script-examples" + "l2picfaq" + "l2tabu" + "latexcheat-de" + "lshort-german" + "lualatex-doc-de" + "microtype-de" + "milog" + "quran-de" + "r_und_s" + "schulmathematik" + "templates-fenn" + "templates-sommer" + "termcal-de" + "texlive-de" + "tipa-de" + "translation-arsclassica-de" + "translation-biblatex-de" + "translation-chemsym-de" + "translation-ecv-de" + "translation-enumitem-de" + "translation-europecv-de" + "translation-filecontents-de" + "translation-moreverb-de" + "udesoftec" + "uhrzeit" + "umlaute" + "voss-mathcol" + ]; sha512.run = "19b9f47b68ca6068900c413d8216e13c20d25ab084cdcbd500694a18a10cbaa35ba5681be09392e0b20873788519a436c28c1ea89a728e3f546083ce0883c15c"; }; "collection-langgreek" = { revision = 65038; stripPrefix = 0; - deps."babel-greek" = tl."babel-greek"; - deps."begingreek" = tl."begingreek"; - deps."betababel" = tl."betababel"; - deps."cbfonts" = tl."cbfonts"; - deps."cbfonts-fd" = tl."cbfonts-fd"; - deps."collection-basic" = tl."collection-basic"; - deps."gfsbaskerville" = tl."gfsbaskerville"; - deps."gfsporson" = tl."gfsporson"; - deps."greek-fontenc" = tl."greek-fontenc"; - deps."greek-inputenc" = tl."greek-inputenc"; - deps."greekdates" = tl."greekdates"; - deps."greektex" = tl."greektex"; - deps."greektonoi" = tl."greektonoi"; - deps."hyphen-ancientgreek" = tl."hyphen-ancientgreek"; - deps."hyphen-greek" = tl."hyphen-greek"; - deps."ibycus-babel" = tl."ibycus-babel"; - deps."ibygrk" = tl."ibygrk"; - deps."kerkis" = tl."kerkis"; - deps."levy" = tl."levy"; - deps."lgreek" = tl."lgreek"; - deps."lgrmath" = tl."lgrmath"; - deps."mkgrkindex" = tl."mkgrkindex"; - deps."talos" = tl."talos"; - deps."teubner" = tl."teubner"; - deps."xgreek" = tl."xgreek"; - deps."yannisgr" = tl."yannisgr"; + deps = [ + "babel-greek" + "begingreek" + "betababel" + "cbfonts" + "cbfonts-fd" + "collection-basic" + "gfsbaskerville" + "gfsporson" + "greek-fontenc" + "greek-inputenc" + "greekdates" + "greektex" + "greektonoi" + "hyphen-ancientgreek" + "hyphen-greek" + "ibycus-babel" + "ibygrk" + "kerkis" + "levy" + "lgreek" + "lgrmath" + "mkgrkindex" + "talos" + "teubner" + "xgreek" + "yannisgr" + ]; sha512.run = "800991b6bb8ac7772ad030ad665b812abd9b294498f7b7678be721ccc87d54607e267bd189a0591ebead2c6ecb64047e5b5581c374f067c3b1575b6d442cc6c9"; }; "collection-langitalian" = { revision = 55129; stripPrefix = 0; - deps."amsldoc-it" = tl."amsldoc-it"; - deps."amsmath-it" = tl."amsmath-it"; - deps."amsthdoc-it" = tl."amsthdoc-it"; - deps."antanilipsum" = tl."antanilipsum"; - deps."babel-italian" = tl."babel-italian"; - deps."codicefiscaleitaliano" = tl."codicefiscaleitaliano"; - deps."collection-basic" = tl."collection-basic"; - deps."fancyhdr-it" = tl."fancyhdr-it"; - deps."fixltxhyph" = tl."fixltxhyph"; - deps."frontespizio" = tl."frontespizio"; - deps."hyphen-italian" = tl."hyphen-italian"; - deps."itnumpar" = tl."itnumpar"; - deps."l2tabu-italian" = tl."l2tabu-italian"; - deps."latex4wp-it" = tl."latex4wp-it"; - deps."layaureo" = tl."layaureo"; - deps."lshort-italian" = tl."lshort-italian"; - deps."psfrag-italian" = tl."psfrag-italian"; - deps."texlive-it" = tl."texlive-it"; - deps."verifica" = tl."verifica"; + deps = [ + "amsldoc-it" + "amsmath-it" + "amsthdoc-it" + "antanilipsum" + "babel-italian" + "codicefiscaleitaliano" + "collection-basic" + "fancyhdr-it" + "fixltxhyph" + "frontespizio" + "hyphen-italian" + "itnumpar" + "l2tabu-italian" + "latex4wp-it" + "layaureo" + "lshort-italian" + "psfrag-italian" + "texlive-it" + "verifica" + ]; sha512.run = "6ec5e8a62e3c1ed8e3c23542381091d38c77af507af7088a55e44f1e34b85d01ec19342db4541d9d6cd712c0929d54a3fc663e1d8fde3c53fef0d6fc43be4994"; }; "collection-langjapanese" = { revision = 64603; stripPrefix = 0; - deps."ascmac" = tl."ascmac"; - deps."asternote" = tl."asternote"; - deps."babel-japanese" = tl."babel-japanese"; - deps."bxbase" = tl."bxbase"; - deps."bxcjkjatype" = tl."bxcjkjatype"; - deps."bxghost" = tl."bxghost"; - deps."bxjaholiday" = tl."bxjaholiday"; - deps."bxjalipsum" = tl."bxjalipsum"; - deps."bxjaprnind" = tl."bxjaprnind"; - deps."bxjatoucs" = tl."bxjatoucs"; - deps."bxjscls" = tl."bxjscls"; - deps."bxorigcapt" = tl."bxorigcapt"; - deps."bxwareki" = tl."bxwareki"; - deps."collection-langcjk" = tl."collection-langcjk"; - deps."convbkmk" = tl."convbkmk"; - deps."endnotesj" = tl."endnotesj"; - deps."gckanbun" = tl."gckanbun"; - deps."gentombow" = tl."gentombow"; - deps."haranoaji" = tl."haranoaji"; - deps."haranoaji-extra" = tl."haranoaji-extra"; - deps."ieejtran" = tl."ieejtran"; - deps."ifptex" = tl."ifptex"; - deps."ifxptex" = tl."ifxptex"; - deps."ipaex" = tl."ipaex"; - deps."japanese-mathformulas" = tl."japanese-mathformulas"; - deps."japanese-otf" = tl."japanese-otf"; - deps."jieeetran" = tl."jieeetran"; - deps."jlreq" = tl."jlreq"; - deps."jlreq-deluxe" = tl."jlreq-deluxe"; - deps."jpneduenumerate" = tl."jpneduenumerate"; - deps."jpnedumathsymbols" = tl."jpnedumathsymbols"; - deps."jsclasses" = tl."jsclasses"; - deps."kanbun" = tl."kanbun"; - deps."lshort-japanese" = tl."lshort-japanese"; - deps."luatexja" = tl."luatexja"; - deps."mendex-doc" = tl."mendex-doc"; - deps."morisawa" = tl."morisawa"; - deps."pbibtex-base" = tl."pbibtex-base"; - deps."pbibtex-manual" = tl."pbibtex-manual"; - deps."platex" = tl."platex"; - deps."platex-tools" = tl."platex-tools"; - deps."platexcheat" = tl."platexcheat"; - deps."plautopatch" = tl."plautopatch"; - deps."ptex" = tl."ptex"; - deps."ptex-base" = tl."ptex-base"; - deps."ptex-fontmaps" = tl."ptex-fontmaps"; - deps."ptex-fonts" = tl."ptex-fonts"; - deps."ptex-manual" = tl."ptex-manual"; - deps."ptex2pdf" = tl."ptex2pdf"; - deps."pxbase" = tl."pxbase"; - deps."pxchfon" = tl."pxchfon"; - deps."pxcjkcat" = tl."pxcjkcat"; - deps."pxjahyper" = tl."pxjahyper"; - deps."pxjodel" = tl."pxjodel"; - deps."pxrubrica" = tl."pxrubrica"; - deps."pxufont" = tl."pxufont"; - deps."texlive-ja" = tl."texlive-ja"; - deps."uplatex" = tl."uplatex"; - deps."uptex" = tl."uptex"; - deps."uptex-base" = tl."uptex-base"; - deps."uptex-fonts" = tl."uptex-fonts"; - deps."wadalab" = tl."wadalab"; - deps."zxjafbfont" = tl."zxjafbfont"; - deps."zxjatype" = tl."zxjatype"; + deps = [ + "ascmac" + "asternote" + "babel-japanese" + "bxbase" + "bxcjkjatype" + "bxghost" + "bxjaholiday" + "bxjalipsum" + "bxjaprnind" + "bxjatoucs" + "bxjscls" + "bxorigcapt" + "bxwareki" + "collection-langcjk" + "convbkmk" + "endnotesj" + "gckanbun" + "gentombow" + "haranoaji" + "haranoaji-extra" + "ieejtran" + "ifptex" + "ifxptex" + "ipaex" + "japanese-mathformulas" + "japanese-otf" + "jieeetran" + "jlreq" + "jlreq-deluxe" + "jpneduenumerate" + "jpnedumathsymbols" + "jsclasses" + "kanbun" + "lshort-japanese" + "luatexja" + "mendex-doc" + "morisawa" + "pbibtex-base" + "pbibtex-manual" + "platex" + "platex-tools" + "platexcheat" + "plautopatch" + "ptex" + "ptex-base" + "ptex-fontmaps" + "ptex-fonts" + "ptex-manual" + "ptex2pdf" + "pxbase" + "pxchfon" + "pxcjkcat" + "pxjahyper" + "pxjodel" + "pxrubrica" + "pxufont" + "texlive-ja" + "uplatex" + "uptex" + "uptex-base" + "uptex-fonts" + "wadalab" + "zxjafbfont" + "zxjatype" + ]; sha512.run = "d9f73ff10afe2c91f9f6ad0e92ddcf8425ed7f51c7f08d291451775bcfcf3421d8d2afd78c7dbdceef995ac5a4262df89afce2b35e6c2dd064e8a310e1025f67"; }; "collection-langkorean" = { revision = 54074; stripPrefix = 0; - deps."baekmuk" = tl."baekmuk"; - deps."cjk-ko" = tl."cjk-ko"; - deps."collection-langcjk" = tl."collection-langcjk"; - deps."kotex-oblivoir" = tl."kotex-oblivoir"; - deps."kotex-plain" = tl."kotex-plain"; - deps."kotex-utf" = tl."kotex-utf"; - deps."kotex-utils" = tl."kotex-utils"; - deps."lshort-korean" = tl."lshort-korean"; - deps."nanumtype1" = tl."nanumtype1"; - deps."pmhanguljamo" = tl."pmhanguljamo"; - deps."uhc" = tl."uhc"; - deps."unfonts-core" = tl."unfonts-core"; - deps."unfonts-extra" = tl."unfonts-extra"; + deps = [ + "baekmuk" + "cjk-ko" + "collection-langcjk" + "kotex-oblivoir" + "kotex-plain" + "kotex-utf" + "kotex-utils" + "lshort-korean" + "nanumtype1" + "pmhanguljamo" + "uhc" + "unfonts-core" + "unfonts-extra" + ]; sha512.run = "2d93df728d34137c8f9a884aa2871a2980e806672006f2c5f0c5f79412d5789c6f94958363cfc9a78b5a97a7d76bbb6cb157b2cb2a8a283f7afdfd838fa24883"; }; "collection-langother" = { revision = 59564; stripPrefix = 0; - deps."aalok" = tl."aalok"; - deps."akshar" = tl."akshar"; - deps."amsldoc-vn" = tl."amsldoc-vn"; - deps."aramaic-serto" = tl."aramaic-serto"; - deps."babel-azerbaijani" = tl."babel-azerbaijani"; - deps."babel-esperanto" = tl."babel-esperanto"; - deps."babel-georgian" = tl."babel-georgian"; - deps."babel-hebrew" = tl."babel-hebrew"; - deps."babel-indonesian" = tl."babel-indonesian"; - deps."babel-interlingua" = tl."babel-interlingua"; - deps."babel-malay" = tl."babel-malay"; - deps."babel-sorbian" = tl."babel-sorbian"; - deps."babel-thai" = tl."babel-thai"; - deps."babel-vietnamese" = tl."babel-vietnamese"; - deps."bangla" = tl."bangla"; - deps."bangtex" = tl."bangtex"; - deps."bengali" = tl."bengali"; - deps."burmese" = tl."burmese"; - deps."chhaya" = tl."chhaya"; - deps."cjhebrew" = tl."cjhebrew"; - deps."collection-basic" = tl."collection-basic"; - deps."ctib" = tl."ctib"; - deps."ebong" = tl."ebong"; - deps."ethiop" = tl."ethiop"; - deps."ethiop-t1" = tl."ethiop-t1"; - deps."fc" = tl."fc"; - deps."fonts-tlwg" = tl."fonts-tlwg"; - deps."hindawi-latex-template" = tl."hindawi-latex-template"; - deps."hyphen-afrikaans" = tl."hyphen-afrikaans"; - deps."hyphen-armenian" = tl."hyphen-armenian"; - deps."hyphen-coptic" = tl."hyphen-coptic"; - deps."hyphen-esperanto" = tl."hyphen-esperanto"; - deps."hyphen-ethiopic" = tl."hyphen-ethiopic"; - deps."hyphen-georgian" = tl."hyphen-georgian"; - deps."hyphen-indic" = tl."hyphen-indic"; - deps."hyphen-indonesian" = tl."hyphen-indonesian"; - deps."hyphen-interlingua" = tl."hyphen-interlingua"; - deps."hyphen-sanskrit" = tl."hyphen-sanskrit"; - deps."hyphen-thai" = tl."hyphen-thai"; - deps."hyphen-turkmen" = tl."hyphen-turkmen"; - deps."latex-mr" = tl."latex-mr"; - deps."latexbangla" = tl."latexbangla"; - deps."latino-sine-flexione" = tl."latino-sine-flexione"; - deps."lshort-thai" = tl."lshort-thai"; - deps."lshort-vietnamese" = tl."lshort-vietnamese"; - deps."marathi" = tl."marathi"; - deps."ntheorem-vn" = tl."ntheorem-vn"; - deps."padauk" = tl."padauk"; - deps."quran-bn" = tl."quran-bn"; - deps."quran-ur" = tl."quran-ur"; - deps."sanskrit" = tl."sanskrit"; - deps."sanskrit-t1" = tl."sanskrit-t1"; - deps."thaienum" = tl."thaienum"; - deps."thaispec" = tl."thaispec"; - deps."unicode-alphabets" = tl."unicode-alphabets"; - deps."velthuis" = tl."velthuis"; - deps."vntex" = tl."vntex"; - deps."wnri" = tl."wnri"; - deps."wnri-latex" = tl."wnri-latex"; - deps."xetex-devanagari" = tl."xetex-devanagari"; + deps = [ + "aalok" + "akshar" + "amsldoc-vn" + "aramaic-serto" + "babel-azerbaijani" + "babel-esperanto" + "babel-georgian" + "babel-hebrew" + "babel-indonesian" + "babel-interlingua" + "babel-malay" + "babel-sorbian" + "babel-thai" + "babel-vietnamese" + "bangla" + "bangtex" + "bengali" + "burmese" + "chhaya" + "cjhebrew" + "collection-basic" + "ctib" + "ebong" + "ethiop" + "ethiop-t1" + "fc" + "fonts-tlwg" + "hindawi-latex-template" + "hyphen-afrikaans" + "hyphen-armenian" + "hyphen-coptic" + "hyphen-esperanto" + "hyphen-ethiopic" + "hyphen-georgian" + "hyphen-indic" + "hyphen-indonesian" + "hyphen-interlingua" + "hyphen-sanskrit" + "hyphen-thai" + "hyphen-turkmen" + "latex-mr" + "latexbangla" + "latino-sine-flexione" + "lshort-thai" + "lshort-vietnamese" + "marathi" + "ntheorem-vn" + "padauk" + "quran-bn" + "quran-ur" + "sanskrit" + "sanskrit-t1" + "thaienum" + "thaispec" + "unicode-alphabets" + "velthuis" + "vntex" + "wnri" + "wnri-latex" + "xetex-devanagari" + ]; sha512.run = "3db7709c3545df3713dc0a7df73f676f9f34df5fdc157c6a2d6a124a5bbd14f6f5f1f2938092e76be19417f9dd5ff4f84513c84beddafbe5c9747abd7fa597c0"; }; "collection-langpolish" = { revision = 54074; stripPrefix = 0; - deps."babel-polish" = tl."babel-polish"; - deps."bredzenie" = tl."bredzenie"; - deps."cc-pl" = tl."cc-pl"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."gustlib" = tl."gustlib"; - deps."gustprog" = tl."gustprog"; - deps."hyphen-polish" = tl."hyphen-polish"; - deps."lshort-polish" = tl."lshort-polish"; - deps."mex" = tl."mex"; - deps."mwcls" = tl."mwcls"; - deps."pl" = tl."pl"; - deps."polski" = tl."polski"; - deps."przechlewski-book" = tl."przechlewski-book"; - deps."qpxqtx" = tl."qpxqtx"; - deps."tap" = tl."tap"; - deps."tex-virtual-academy-pl" = tl."tex-virtual-academy-pl"; - deps."texlive-pl" = tl."texlive-pl"; - deps."utf8mex" = tl."utf8mex"; + deps = [ + "babel-polish" + "bredzenie" + "cc-pl" + "collection-basic" + "collection-latex" + "gustlib" + "gustprog" + "hyphen-polish" + "lshort-polish" + "mex" + "mwcls" + "pl" + "polski" + "przechlewski-book" + "qpxqtx" + "tap" + "tex-virtual-academy-pl" + "texlive-pl" + "utf8mex" + ]; sha512.run = "fc0d08f70aeb83869109290e6d1585d513097dcd4e17791752ecd3d26ac202838afb5931f78ceaeeaf72c63b18fe9183edd650c075d03188f24cb2caded178de"; }; "collection-langportuguese" = { revision = 54074; stripPrefix = 0; - deps."babel-portuges" = tl."babel-portuges"; - deps."beamer-tut-pt" = tl."beamer-tut-pt"; - deps."collection-basic" = tl."collection-basic"; - deps."cursolatex" = tl."cursolatex"; - deps."feupphdteses" = tl."feupphdteses"; - deps."hyphen-portuguese" = tl."hyphen-portuguese"; - deps."latex-via-exemplos" = tl."latex-via-exemplos"; - deps."latexcheat-ptbr" = tl."latexcheat-ptbr"; - deps."lshort-portuguese" = tl."lshort-portuguese"; - deps."numberpt" = tl."numberpt"; - deps."ordinalpt" = tl."ordinalpt"; - deps."xypic-tut-pt" = tl."xypic-tut-pt"; + deps = [ + "babel-portuges" + "beamer-tut-pt" + "collection-basic" + "cursolatex" + "feupphdteses" + "hyphen-portuguese" + "latex-via-exemplos" + "latexcheat-ptbr" + "lshort-portuguese" + "numberpt" + "ordinalpt" + "xypic-tut-pt" + ]; sha512.run = "16d67d288fb702807b43dcf8da044a45206c27c5cf0d953688fc341966fb166db8cec69b727b1de079b9bf434f024f7338eaf34529510cab7881147d1635b43d"; }; "collection-langspanish" = { revision = 54141; stripPrefix = 0; - deps."babel-catalan" = tl."babel-catalan"; - deps."babel-galician" = tl."babel-galician"; - deps."babel-spanish" = tl."babel-spanish"; - deps."collection-basic" = tl."collection-basic"; - deps."es-tex-faq" = tl."es-tex-faq"; - deps."hyphen-catalan" = tl."hyphen-catalan"; - deps."hyphen-galician" = tl."hyphen-galician"; - deps."hyphen-spanish" = tl."hyphen-spanish"; - deps."l2tabu-spanish" = tl."l2tabu-spanish"; - deps."latex2e-help-texinfo-spanish" = tl."latex2e-help-texinfo-spanish"; - deps."latexcheat-esmx" = tl."latexcheat-esmx"; - deps."lshort-spanish" = tl."lshort-spanish"; - deps."texlive-es" = tl."texlive-es"; + deps = [ + "babel-catalan" + "babel-galician" + "babel-spanish" + "collection-basic" + "es-tex-faq" + "hyphen-catalan" + "hyphen-galician" + "hyphen-spanish" + "l2tabu-spanish" + "latex2e-help-texinfo-spanish" + "latexcheat-esmx" + "lshort-spanish" + "texlive-es" + ]; sha512.run = "88bdc5cefd5519bc80e50e2d808abf32aae8f7c730023afab3babb82ab817dc034c78d42b4143135df187343de7164a8fd94dc95c5ec8909e317a2f5628de15e"; }; "collection-latex" = { revision = 63515; stripPrefix = 0; - deps."ae" = tl."ae"; - deps."amscls" = tl."amscls"; - deps."amsmath" = tl."amsmath"; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."auxhook" = tl."auxhook"; - deps."babel" = tl."babel"; - deps."babel-english" = tl."babel-english"; - deps."babelbib" = tl."babelbib"; - deps."bigintcalc" = tl."bigintcalc"; - deps."bitset" = tl."bitset"; - deps."bookmark" = tl."bookmark"; - deps."carlisle" = tl."carlisle"; - deps."collection-basic" = tl."collection-basic"; - deps."colortbl" = tl."colortbl"; - deps."epstopdf-pkg" = tl."epstopdf-pkg"; - deps."etexcmds" = tl."etexcmds"; - deps."fancyhdr" = tl."fancyhdr"; - deps."firstaid" = tl."firstaid"; - deps."fix2col" = tl."fix2col"; - deps."geometry" = tl."geometry"; - deps."gettitlestring" = tl."gettitlestring"; - deps."graphics" = tl."graphics"; - deps."graphics-cfg" = tl."graphics-cfg"; - deps."grfext" = tl."grfext"; - deps."hopatch" = tl."hopatch"; - deps."hycolor" = tl."hycolor"; - deps."hyperref" = tl."hyperref"; - deps."intcalc" = tl."intcalc"; - deps."kvdefinekeys" = tl."kvdefinekeys"; - deps."kvoptions" = tl."kvoptions"; - deps."kvsetkeys" = tl."kvsetkeys"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-bin" = tl."latex-bin"; - deps."latex-fonts" = tl."latex-fonts"; - deps."latex-lab" = tl."latex-lab"; - deps."latexconfig" = tl."latexconfig"; - deps."letltxmacro" = tl."letltxmacro"; - deps."ltxcmds" = tl."ltxcmds"; - deps."ltxmisc" = tl."ltxmisc"; - deps."mfnfss" = tl."mfnfss"; - deps."mptopdf" = tl."mptopdf"; - deps."natbib" = tl."natbib"; - deps."oberdiek" = tl."oberdiek"; - deps."pagesel" = tl."pagesel"; - deps."pdfescape" = tl."pdfescape"; - deps."pslatex" = tl."pslatex"; - deps."psnfss" = tl."psnfss"; - deps."pspicture" = tl."pspicture"; - deps."refcount" = tl."refcount"; - deps."rerunfilecheck" = tl."rerunfilecheck"; - deps."stringenc" = tl."stringenc"; - deps."tools" = tl."tools"; - deps."uniquecounter" = tl."uniquecounter"; - deps."url" = tl."url"; + deps = [ + "ae" + "amscls" + "amsmath" + "atbegshi" + "atveryend" + "auxhook" + "babel" + "babel-english" + "babelbib" + "bigintcalc" + "bitset" + "bookmark" + "carlisle" + "collection-basic" + "colortbl" + "epstopdf-pkg" + "etexcmds" + "fancyhdr" + "firstaid" + "fix2col" + "geometry" + "gettitlestring" + "graphics" + "graphics-cfg" + "grfext" + "hopatch" + "hycolor" + "hyperref" + "intcalc" + "kvdefinekeys" + "kvoptions" + "kvsetkeys" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-bin" + "latex-fonts" + "latex-lab" + "latexconfig" + "letltxmacro" + "ltxcmds" + "ltxmisc" + "mfnfss" + "mptopdf" + "natbib" + "oberdiek" + "pagesel" + "pdfescape" + "pslatex" + "psnfss" + "pspicture" + "refcount" + "rerunfilecheck" + "stringenc" + "tools" + "uniquecounter" + "url" + ]; sha512.run = "c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326d4b1852f8415d9876ca52645db939ad7a11c55f550a2096ccd4b8dd8be6a4114d6"; }; "collection-latexextra" = { revision = 65353; stripPrefix = 0; - deps."2up" = tl."2up"; - deps."a0poster" = tl."a0poster"; - deps."a4wide" = tl."a4wide"; - deps."a5comb" = tl."a5comb"; - deps."abraces" = tl."abraces"; - deps."abspos" = tl."abspos"; - deps."abstract" = tl."abstract"; - deps."accessibility" = tl."accessibility"; - deps."accsupp" = tl."accsupp"; - deps."achemso" = tl."achemso"; - deps."acro" = tl."acro"; - deps."acronym" = tl."acronym"; - deps."acroterm" = tl."acroterm"; - deps."actuarialangle" = tl."actuarialangle"; - deps."actuarialsymbol" = tl."actuarialsymbol"; - deps."addfont" = tl."addfont"; - deps."addlines" = tl."addlines"; - deps."adjmulticol" = tl."adjmulticol"; - deps."adjustbox" = tl."adjustbox"; - deps."adrconv" = tl."adrconv"; - deps."advdate" = tl."advdate"; - deps."akktex" = tl."akktex"; - deps."akletter" = tl."akletter"; - deps."alertmessage" = tl."alertmessage"; - deps."alnumsec" = tl."alnumsec"; - deps."alphalph" = tl."alphalph"; - deps."alterqcm" = tl."alterqcm"; - deps."altfont" = tl."altfont"; - deps."altsubsup" = tl."altsubsup"; - deps."amsaddr" = tl."amsaddr"; - deps."animate" = tl."animate"; - deps."anonchap" = tl."anonchap"; - deps."answers" = tl."answers"; - deps."anyfontsize" = tl."anyfontsize"; - deps."appendix" = tl."appendix"; - deps."appendixnumberbeamer" = tl."appendixnumberbeamer"; - deps."apptools" = tl."apptools"; - deps."arabicfront" = tl."arabicfront"; - deps."arcs" = tl."arcs"; - deps."arraycols" = tl."arraycols"; - deps."arrayjobx" = tl."arrayjobx"; - deps."arraysort" = tl."arraysort"; - deps."arydshln" = tl."arydshln"; - deps."asciilist" = tl."asciilist"; - deps."askinclude" = tl."askinclude"; - deps."assignment" = tl."assignment"; - deps."assoccnt" = tl."assoccnt"; - deps."association-matrix" = tl."association-matrix"; - deps."atenddvi" = tl."atenddvi"; - deps."atendofenv" = tl."atendofenv"; - deps."attachfile" = tl."attachfile"; - deps."aurl" = tl."aurl"; - deps."authoraftertitle" = tl."authoraftertitle"; - deps."authorarchive" = tl."authorarchive"; - deps."authorindex" = tl."authorindex"; - deps."autofancyhdr" = tl."autofancyhdr"; - deps."autonum" = tl."autonum"; - deps."autopdf" = tl."autopdf"; - deps."autopuncitems" = tl."autopuncitems"; - deps."avremu" = tl."avremu"; - deps."axessibility" = tl."axessibility"; - deps."background" = tl."background"; - deps."bankstatement" = tl."bankstatement"; - deps."bashful" = tl."bashful"; - deps."basicarith" = tl."basicarith"; - deps."bchart" = tl."bchart"; - deps."beamer-rl" = tl."beamer-rl"; - deps."beamer2thesis" = tl."beamer2thesis"; - deps."beamerappendixnote" = tl."beamerappendixnote"; - deps."beameraudience" = tl."beameraudience"; - deps."beamerauxtheme" = tl."beamerauxtheme"; - deps."beamercolorthemeowl" = tl."beamercolorthemeowl"; - deps."beamerdarkthemes" = tl."beamerdarkthemes"; - deps."beamerposter" = tl."beamerposter"; - deps."beamersubframe" = tl."beamersubframe"; - deps."beamertheme-arguelles" = tl."beamertheme-arguelles"; - deps."beamertheme-cuerna" = tl."beamertheme-cuerna"; - deps."beamertheme-detlevcm" = tl."beamertheme-detlevcm"; - deps."beamertheme-epyt" = tl."beamertheme-epyt"; - deps."beamertheme-focus" = tl."beamertheme-focus"; - deps."beamertheme-light" = tl."beamertheme-light"; - deps."beamertheme-metropolis" = tl."beamertheme-metropolis"; - deps."beamertheme-npbt" = tl."beamertheme-npbt"; - deps."beamertheme-phnompenh" = tl."beamertheme-phnompenh"; - deps."beamertheme-pure-minimalistic" = tl."beamertheme-pure-minimalistic"; - deps."beamertheme-saintpetersburg" = tl."beamertheme-saintpetersburg"; - deps."beamertheme-simpledarkblue" = tl."beamertheme-simpledarkblue"; - deps."beamertheme-simpleplus" = tl."beamertheme-simpleplus"; - deps."beamertheme-tcolorbox" = tl."beamertheme-tcolorbox"; - deps."beamertheme-trigon" = tl."beamertheme-trigon"; - deps."beamertheme-upenn-bc" = tl."beamertheme-upenn-bc"; - deps."beamerthemeamurmaple" = tl."beamerthemeamurmaple"; - deps."beamerthemejltree" = tl."beamerthemejltree"; - deps."beamerthemelalic" = tl."beamerthemelalic"; - deps."beamerthemenirma" = tl."beamerthemenirma"; - deps."beamerthemenord" = tl."beamerthemenord"; - deps."bearwear" = tl."bearwear"; - deps."beaulivre" = tl."beaulivre"; - deps."beton" = tl."beton"; - deps."bewerbung" = tl."bewerbung"; - deps."bez123" = tl."bez123"; - deps."bhcexam" = tl."bhcexam"; - deps."bibletext" = tl."bibletext"; - deps."bigfoot" = tl."bigfoot"; - deps."bigints" = tl."bigints"; - deps."bilingualpages" = tl."bilingualpages"; - deps."biochemistry-colors" = tl."biochemistry-colors"; - deps."bithesis" = tl."bithesis"; - deps."bizcard" = tl."bizcard"; - deps."blindtext" = tl."blindtext"; - deps."blkarray" = tl."blkarray"; - deps."block" = tl."block"; - deps."blowup" = tl."blowup"; - deps."bnumexpr" = tl."bnumexpr"; - deps."boites" = tl."boites"; - deps."bold-extra" = tl."bold-extra"; - deps."book-of-common-prayer" = tl."book-of-common-prayer"; - deps."bookcover" = tl."bookcover"; - deps."bookest" = tl."bookest"; - deps."booklet" = tl."booklet"; - deps."bookshelf" = tl."bookshelf"; - deps."boolexpr" = tl."boolexpr"; - deps."bophook" = tl."bophook"; - deps."boxedminipage" = tl."boxedminipage"; - deps."boxhandler" = tl."boxhandler"; - deps."bracketkey" = tl."bracketkey"; - deps."braket" = tl."braket"; - deps."breakurl" = tl."breakurl"; - deps."bubblesort" = tl."bubblesort"; - deps."bullcntr" = tl."bullcntr"; - deps."bxcalc" = tl."bxcalc"; - deps."bxdpx-beamer" = tl."bxdpx-beamer"; - deps."bxdvidriver" = tl."bxdvidriver"; - deps."bxenclose" = tl."bxenclose"; - deps."bxnewfont" = tl."bxnewfont"; - deps."bxpapersize" = tl."bxpapersize"; - deps."bxpdfver" = tl."bxpdfver"; - deps."bxtexlogo" = tl."bxtexlogo"; - deps."calcage" = tl."calcage"; - deps."calctab" = tl."calctab"; - deps."calculator" = tl."calculator"; - deps."calrsfs" = tl."calrsfs"; - deps."cals" = tl."cals"; - deps."calxxxx-yyyy" = tl."calxxxx-yyyy"; - deps."cancel" = tl."cancel"; - deps."canoniclayout" = tl."canoniclayout"; - deps."capt-of" = tl."capt-of"; - deps."captcont" = tl."captcont"; - deps."captdef" = tl."captdef"; - deps."carbohydrates" = tl."carbohydrates"; - deps."cases" = tl."cases"; - deps."casyl" = tl."casyl"; - deps."catchfile" = tl."catchfile"; - deps."catchfilebetweentags" = tl."catchfilebetweentags"; - deps."catechis" = tl."catechis"; - deps."catoptions" = tl."catoptions"; - deps."cbcoptic" = tl."cbcoptic"; - deps."ccaption" = tl."ccaption"; - deps."cclicenses" = tl."cclicenses"; - deps."cd" = tl."cd"; - deps."cd-cover" = tl."cd-cover"; - deps."cdcmd" = tl."cdcmd"; - deps."cdpbundl" = tl."cdpbundl"; - deps."cellprops" = tl."cellprops"; - deps."cellspace" = tl."cellspace"; - deps."censor" = tl."censor"; - deps."centeredline" = tl."centeredline"; - deps."centerlastline" = tl."centerlastline"; - deps."changebar" = tl."changebar"; - deps."changelayout" = tl."changelayout"; - deps."changelog" = tl."changelog"; - deps."changepage" = tl."changepage"; - deps."changes" = tl."changes"; - deps."chappg" = tl."chappg"; - deps."chapterfolder" = tl."chapterfolder"; - deps."cheatsheet" = tl."cheatsheet"; - deps."checkend" = tl."checkend"; - deps."chet" = tl."chet"; - deps."chextras" = tl."chextras"; - deps."childdoc" = tl."childdoc"; - deps."chkfloat" = tl."chkfloat"; - deps."chletter" = tl."chletter"; - deps."chngcntr" = tl."chngcntr"; - deps."chronology" = tl."chronology"; - deps."circ" = tl."circ"; - deps."circledsteps" = tl."circledsteps"; - deps."circledtext" = tl."circledtext"; - deps."classics" = tl."classics"; - deps."classpack" = tl."classpack"; - deps."clefval" = tl."clefval"; - deps."cleveref" = tl."cleveref"; - deps."clicks" = tl."clicks"; - deps."clipboard" = tl."clipboard"; - deps."clistmap" = tl."clistmap"; - deps."clock" = tl."clock"; - deps."clrdblpg" = tl."clrdblpg"; - deps."clrstrip" = tl."clrstrip"; - deps."cmdstring" = tl."cmdstring"; - deps."cmdtrack" = tl."cmdtrack"; - deps."cmsd" = tl."cmsd"; - deps."cnltx" = tl."cnltx"; - deps."cntformats" = tl."cntformats"; - deps."cntperchap" = tl."cntperchap"; - deps."codebox" = tl."codebox"; - deps."codedoc" = tl."codedoc"; - deps."codehigh" = tl."codehigh"; - deps."codepage" = tl."codepage"; - deps."codesection" = tl."codesection"; - deps."collcell" = tl."collcell"; - deps."collectbox" = tl."collectbox"; - deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-pictures" = tl."collection-pictures"; - deps."colophon" = tl."colophon"; - deps."color-edits" = tl."color-edits"; - deps."colordoc" = tl."colordoc"; - deps."colorframed" = tl."colorframed"; - deps."colorinfo" = tl."colorinfo"; - deps."coloring" = tl."coloring"; - deps."colorist" = tl."colorist"; - deps."colorspace" = tl."colorspace"; - deps."colortab" = tl."colortab"; - deps."colorwav" = tl."colorwav"; - deps."colorweb" = tl."colorweb"; - deps."colourchange" = tl."colourchange"; - deps."combelow" = tl."combelow"; - deps."combine" = tl."combine"; - deps."comma" = tl."comma"; - deps."commado" = tl."commado"; - deps."commedit" = tl."commedit"; - deps."comment" = tl."comment"; - deps."commonunicode" = tl."commonunicode"; - deps."competences" = tl."competences"; - deps."concepts" = tl."concepts"; - deps."concprog" = tl."concprog"; - deps."conditext" = tl."conditext"; - deps."constants" = tl."constants"; - deps."continue" = tl."continue"; - deps."contour" = tl."contour"; - deps."contracard" = tl."contracard"; - deps."conv-xkv" = tl."conv-xkv"; - deps."cooking" = tl."cooking"; - deps."cooking-units" = tl."cooking-units"; - deps."cool" = tl."cool"; - deps."coolfn" = tl."coolfn"; - deps."coollist" = tl."coollist"; - deps."coolstr" = tl."coolstr"; - deps."coolthms" = tl."coolthms"; - deps."cooltooltips" = tl."cooltooltips"; - deps."coop-writing" = tl."coop-writing"; - deps."coordsys" = tl."coordsys"; - deps."copyedit" = tl."copyedit"; - deps."copyrightbox" = tl."copyrightbox"; - deps."coseoul" = tl."coseoul"; - deps."counttexruns" = tl."counttexruns"; - deps."courseoutline" = tl."courseoutline"; - deps."coursepaper" = tl."coursepaper"; - deps."coverpage" = tl."coverpage"; - deps."cprotect" = tl."cprotect"; - deps."cprotectinside" = tl."cprotectinside"; - deps."crbox" = tl."crbox"; - deps."create-theorem" = tl."create-theorem"; - deps."crefthe" = tl."crefthe"; - deps."crossreference" = tl."crossreference"; - deps."crossreftools" = tl."crossreftools"; - deps."crumbs" = tl."crumbs"; - deps."csquotes" = tl."csquotes"; - deps."css-colors" = tl."css-colors"; - deps."csvmerge" = tl."csvmerge"; - deps."csvsimple" = tl."csvsimple"; - deps."cuisine" = tl."cuisine"; - deps."currency" = tl."currency"; - deps."currfile" = tl."currfile"; - deps."currvita" = tl."currvita"; - deps."cutwin" = tl."cutwin"; - deps."cv" = tl."cv"; - deps."cv4tw" = tl."cv4tw"; - deps."cweb-latex" = tl."cweb-latex"; - deps."cyber" = tl."cyber"; - deps."cybercic" = tl."cybercic"; - deps."darkmode" = tl."darkmode"; - deps."dashbox" = tl."dashbox"; - deps."dashrule" = tl."dashrule"; - deps."dashundergaps" = tl."dashundergaps"; - deps."dataref" = tl."dataref"; - deps."datatool" = tl."datatool"; - deps."datax" = tl."datax"; - deps."dateiliste" = tl."dateiliste"; - deps."datenumber" = tl."datenumber"; - deps."datestamp" = tl."datestamp"; - deps."datetime" = tl."datetime"; - deps."datetime2" = tl."datetime2"; - deps."datetime2-bahasai" = tl."datetime2-bahasai"; - deps."datetime2-basque" = tl."datetime2-basque"; - deps."datetime2-breton" = tl."datetime2-breton"; - deps."datetime2-bulgarian" = tl."datetime2-bulgarian"; - deps."datetime2-catalan" = tl."datetime2-catalan"; - deps."datetime2-croatian" = tl."datetime2-croatian"; - deps."datetime2-czech" = tl."datetime2-czech"; - deps."datetime2-danish" = tl."datetime2-danish"; - deps."datetime2-dutch" = tl."datetime2-dutch"; - deps."datetime2-en-fulltext" = tl."datetime2-en-fulltext"; - deps."datetime2-english" = tl."datetime2-english"; - deps."datetime2-esperanto" = tl."datetime2-esperanto"; - deps."datetime2-estonian" = tl."datetime2-estonian"; - deps."datetime2-finnish" = tl."datetime2-finnish"; - deps."datetime2-french" = tl."datetime2-french"; - deps."datetime2-galician" = tl."datetime2-galician"; - deps."datetime2-german" = tl."datetime2-german"; - deps."datetime2-greek" = tl."datetime2-greek"; - deps."datetime2-hebrew" = tl."datetime2-hebrew"; - deps."datetime2-icelandic" = tl."datetime2-icelandic"; - deps."datetime2-irish" = tl."datetime2-irish"; - deps."datetime2-it-fulltext" = tl."datetime2-it-fulltext"; - deps."datetime2-italian" = tl."datetime2-italian"; - deps."datetime2-latin" = tl."datetime2-latin"; - deps."datetime2-lsorbian" = tl."datetime2-lsorbian"; - deps."datetime2-magyar" = tl."datetime2-magyar"; - deps."datetime2-norsk" = tl."datetime2-norsk"; - deps."datetime2-polish" = tl."datetime2-polish"; - deps."datetime2-portuges" = tl."datetime2-portuges"; - deps."datetime2-romanian" = tl."datetime2-romanian"; - deps."datetime2-russian" = tl."datetime2-russian"; - deps."datetime2-samin" = tl."datetime2-samin"; - deps."datetime2-scottish" = tl."datetime2-scottish"; - deps."datetime2-serbian" = tl."datetime2-serbian"; - deps."datetime2-slovak" = tl."datetime2-slovak"; - deps."datetime2-slovene" = tl."datetime2-slovene"; - deps."datetime2-spanish" = tl."datetime2-spanish"; - deps."datetime2-swedish" = tl."datetime2-swedish"; - deps."datetime2-turkish" = tl."datetime2-turkish"; - deps."datetime2-ukrainian" = tl."datetime2-ukrainian"; - deps."datetime2-usorbian" = tl."datetime2-usorbian"; - deps."datetime2-welsh" = tl."datetime2-welsh"; - deps."dblfloatfix" = tl."dblfloatfix"; - deps."dbshow" = tl."dbshow"; - deps."debate" = tl."debate"; - deps."decimal" = tl."decimal"; - deps."decorule" = tl."decorule"; - deps."delimtxt" = tl."delimtxt"; - deps."democodetools" = tl."democodetools"; - deps."denisbdoc" = tl."denisbdoc"; - deps."diabetes-logbook" = tl."diabetes-logbook"; - deps."diagbox" = tl."diagbox"; - deps."diagnose" = tl."diagnose"; - deps."dialogl" = tl."dialogl"; - deps."dichokey" = tl."dichokey"; - deps."dimnum" = tl."dimnum"; - deps."dinbrief" = tl."dinbrief"; - deps."directory" = tl."directory"; - deps."dirtytalk" = tl."dirtytalk"; - deps."dlfltxb" = tl."dlfltxb"; - deps."dnaseq" = tl."dnaseq"; - deps."doclicense" = tl."doclicense"; - deps."docmfp" = tl."docmfp"; - deps."docmute" = tl."docmute"; - deps."docshots" = tl."docshots"; - deps."doctools" = tl."doctools"; - deps."documentation" = tl."documentation"; - deps."docutils" = tl."docutils"; - deps."doi" = tl."doi"; - deps."dotarrow" = tl."dotarrow"; - deps."dotlessi" = tl."dotlessi"; - deps."dotseqn" = tl."dotseqn"; - deps."download" = tl."download"; - deps."dox" = tl."dox"; - deps."dpfloat" = tl."dpfloat"; - deps."dprogress" = tl."dprogress"; - deps."drac" = tl."drac"; - deps."draftcopy" = tl."draftcopy"; - deps."draftfigure" = tl."draftfigure"; - deps."draftwatermark" = tl."draftwatermark"; - deps."dtk" = tl."dtk"; - deps."dtxdescribe" = tl."dtxdescribe"; - deps."dtxgallery" = tl."dtxgallery"; - deps."ducksay" = tl."ducksay"; - deps."duckuments" = tl."duckuments"; - deps."dvdcoll" = tl."dvdcoll"; - deps."dynamicnumber" = tl."dynamicnumber"; - deps."dynblocks" = tl."dynblocks"; - deps."ean13isbn" = tl."ean13isbn"; - deps."easy" = tl."easy"; - deps."easy-todo" = tl."easy-todo"; - deps."easybook" = tl."easybook"; - deps."easyfig" = tl."easyfig"; - deps."easyfloats" = tl."easyfloats"; - deps."easyformat" = tl."easyformat"; - deps."easylist" = tl."easylist"; - deps."easyreview" = tl."easyreview"; - deps."ebezier" = tl."ebezier"; - deps."ecclesiastic" = tl."ecclesiastic"; - deps."econlipsum" = tl."econlipsum"; - deps."ecv" = tl."ecv"; - deps."ed" = tl."ed"; - deps."edichokey" = tl."edichokey"; - deps."edmargin" = tl."edmargin"; - deps."eemeir" = tl."eemeir"; - deps."efbox" = tl."efbox"; - deps."egplot" = tl."egplot"; - deps."ehhline" = tl."ehhline"; - deps."einfart" = tl."einfart"; - deps."elegantbook" = tl."elegantbook"; - deps."elegantnote" = tl."elegantnote"; - deps."elegantpaper" = tl."elegantpaper"; - deps."elements" = tl."elements"; - deps."ellipsis" = tl."ellipsis"; - deps."elmath" = tl."elmath"; - deps."elocalloc" = tl."elocalloc"; - deps."elpres" = tl."elpres"; - deps."elzcards" = tl."elzcards"; - deps."emarks" = tl."emarks"; - deps."embedall" = tl."embedall"; - deps."embedfile" = tl."embedfile"; - deps."embrac" = tl."embrac"; - deps."emptypage" = tl."emptypage"; - deps."emulateapj" = tl."emulateapj"; - deps."endfloat" = tl."endfloat"; - deps."endheads" = tl."endheads"; - deps."endnotes" = tl."endnotes"; - deps."endnotes-hy" = tl."endnotes-hy"; - deps."engpron" = tl."engpron"; - deps."engrec" = tl."engrec"; - deps."enotez" = tl."enotez"; - deps."enumitem" = tl."enumitem"; - deps."enumitem-zref" = tl."enumitem-zref"; - deps."envbig" = tl."envbig"; - deps."environ" = tl."environ"; - deps."envlab" = tl."envlab"; - deps."epigraph" = tl."epigraph"; - deps."epigraph-keys" = tl."epigraph-keys"; - deps."epiolmec" = tl."epiolmec"; - deps."eq-pin2corr" = tl."eq-pin2corr"; - deps."eqell" = tl."eqell"; - deps."eqlist" = tl."eqlist"; - deps."eqnalign" = tl."eqnalign"; - deps."eqname" = tl."eqname"; - deps."eqparbox" = tl."eqparbox"; - deps."errata" = tl."errata"; - deps."erw-l3" = tl."erw-l3"; - deps."esami" = tl."esami"; - deps."esdiff" = tl."esdiff"; - deps."esieecv" = tl."esieecv"; - deps."esindex" = tl."esindex"; - deps."esint" = tl."esint"; - deps."esint-type1" = tl."esint-type1"; - deps."etaremune" = tl."etaremune"; - deps."etextools" = tl."etextools"; - deps."etl" = tl."etl"; - deps."etoc" = tl."etoc"; - deps."eukdate" = tl."eukdate"; - deps."eulerpx" = tl."eulerpx"; - deps."europasscv" = tl."europasscv"; - deps."europecv" = tl."europecv"; - deps."everyhook" = tl."everyhook"; - deps."everypage" = tl."everypage"; - deps."exam" = tl."exam"; - deps."exam-n" = tl."exam-n"; - deps."exam-randomizechoices" = tl."exam-randomizechoices"; - deps."examdesign" = tl."examdesign"; - deps."example" = tl."example"; - deps."examplep" = tl."examplep"; - deps."exceltex" = tl."exceltex"; - deps."excludeonly" = tl."excludeonly"; - deps."exercise" = tl."exercise"; - deps."exercisebank" = tl."exercisebank"; - deps."exercisepoints" = tl."exercisepoints"; - deps."exercises" = tl."exercises"; - deps."exesheet" = tl."exesheet"; - deps."exframe" = tl."exframe"; - deps."exp-testopt" = tl."exp-testopt"; - deps."expdlist" = tl."expdlist"; - deps."export" = tl."export"; - deps."exsheets" = tl."exsheets"; - deps."exsol" = tl."exsol"; - deps."extract" = tl."extract"; - deps."facsimile" = tl."facsimile"; - deps."factura" = tl."factura"; - deps."familytree" = tl."familytree"; - deps."fancyhandout" = tl."fancyhandout"; - deps."fancylabel" = tl."fancylabel"; - deps."fancynum" = tl."fancynum"; - deps."fancypar" = tl."fancypar"; - deps."fancyqr" = tl."fancyqr"; - deps."fancyslides" = tl."fancyslides"; - deps."fancytabs" = tl."fancytabs"; - deps."fancytooltips" = tl."fancytooltips"; - deps."fbox" = tl."fbox"; - deps."fcolumn" = tl."fcolumn"; - deps."fetchcls" = tl."fetchcls"; - deps."fewerfloatpages" = tl."fewerfloatpages"; - deps."ffcode" = tl."ffcode"; - deps."ffslides" = tl."ffslides"; - deps."fgruler" = tl."fgruler"; - deps."fifo-stack" = tl."fifo-stack"; - deps."figsize" = tl."figsize"; - deps."filecontents" = tl."filecontents"; - deps."filecontentsdef" = tl."filecontentsdef"; - deps."filedate" = tl."filedate"; - deps."fileinfo" = tl."fileinfo"; - deps."filemod" = tl."filemod"; - deps."fink" = tl."fink"; - deps."finstrut" = tl."finstrut"; - deps."fithesis" = tl."fithesis"; - deps."fixcmex" = tl."fixcmex"; - deps."fixfoot" = tl."fixfoot"; - deps."fixme" = tl."fixme"; - deps."fixmetodonotes" = tl."fixmetodonotes"; - deps."fjodor" = tl."fjodor"; - deps."flabels" = tl."flabels"; - deps."flacards" = tl."flacards"; - deps."flagderiv" = tl."flagderiv"; - deps."flashcards" = tl."flashcards"; - deps."flashmovie" = tl."flashmovie"; - deps."flexipage" = tl."flexipage"; - deps."flipbook" = tl."flipbook"; - deps."flippdf" = tl."flippdf"; - deps."floatflt" = tl."floatflt"; - deps."floatrow" = tl."floatrow"; - deps."flowfram" = tl."flowfram"; - deps."fmp" = tl."fmp"; - deps."fmtcount" = tl."fmtcount"; - deps."fn2end" = tl."fn2end"; - deps."fnbreak" = tl."fnbreak"; - deps."fncychap" = tl."fncychap"; - deps."fncylab" = tl."fncylab"; - deps."fnpara" = tl."fnpara"; - deps."fnpct" = tl."fnpct"; - deps."fnumprint" = tl."fnumprint"; - deps."foilhtml" = tl."foilhtml"; - deps."foliono" = tl."foliono"; - deps."fontaxes" = tl."fontaxes"; - deps."fontsetup" = tl."fontsetup"; - deps."fontsize" = tl."fontsize"; - deps."fonttable" = tl."fonttable"; - deps."footmisc" = tl."footmisc"; - deps."footmisx" = tl."footmisx"; - deps."footnotebackref" = tl."footnotebackref"; - deps."footnoterange" = tl."footnoterange"; - deps."footnpag" = tl."footnpag"; - deps."forarray" = tl."forarray"; - deps."foreign" = tl."foreign"; - deps."forloop" = tl."forloop"; - deps."formlett" = tl."formlett"; - deps."forms16be" = tl."forms16be"; - deps."formular" = tl."formular"; - deps."fragments" = tl."fragments"; - deps."frame" = tl."frame"; - deps."framed" = tl."framed"; - deps."frankenstein" = tl."frankenstein"; - deps."frege" = tl."frege"; - deps."froufrou" = tl."froufrou"; - deps."ftcap" = tl."ftcap"; - deps."ftnxtra" = tl."ftnxtra"; - deps."fullblck" = tl."fullblck"; - deps."fullminipage" = tl."fullminipage"; - deps."fullwidth" = tl."fullwidth"; - deps."functional" = tl."functional"; - deps."fundus-calligra" = tl."fundus-calligra"; - deps."fundus-cyr" = tl."fundus-cyr"; - deps."fundus-sueterlin" = tl."fundus-sueterlin"; - deps."fvextra" = tl."fvextra"; - deps."fwlw" = tl."fwlw"; - deps."g-brief" = tl."g-brief"; - deps."gatherenum" = tl."gatherenum"; - deps."gauss" = tl."gauss"; - deps."gcard" = tl."gcard"; - deps."gcite" = tl."gcite"; - deps."gender" = tl."gender"; - deps."genmpage" = tl."genmpage"; - deps."gensymb" = tl."gensymb"; - deps."getfiledate" = tl."getfiledate"; - deps."getitems" = tl."getitems"; - deps."gindex" = tl."gindex"; - deps."ginpenc" = tl."ginpenc"; - deps."gitfile-info" = tl."gitfile-info"; - deps."gitinfo" = tl."gitinfo"; - deps."gitinfo2" = tl."gitinfo2"; - deps."gitlog" = tl."gitlog"; - deps."gitstatus" = tl."gitstatus"; - deps."gitver" = tl."gitver"; - deps."globalvals" = tl."globalvals"; - deps."gloss" = tl."gloss"; - deps."glossaries" = tl."glossaries"; - deps."glossaries-danish" = tl."glossaries-danish"; - deps."glossaries-dutch" = tl."glossaries-dutch"; - deps."glossaries-english" = tl."glossaries-english"; - deps."glossaries-estonian" = tl."glossaries-estonian"; - deps."glossaries-extra" = tl."glossaries-extra"; - deps."glossaries-finnish" = tl."glossaries-finnish"; - deps."glossaries-french" = tl."glossaries-french"; - deps."glossaries-german" = tl."glossaries-german"; - deps."glossaries-irish" = tl."glossaries-irish"; - deps."glossaries-italian" = tl."glossaries-italian"; - deps."glossaries-magyar" = tl."glossaries-magyar"; - deps."glossaries-nynorsk" = tl."glossaries-nynorsk"; - deps."glossaries-polish" = tl."glossaries-polish"; - deps."glossaries-portuges" = tl."glossaries-portuges"; - deps."glossaries-serbian" = tl."glossaries-serbian"; - deps."glossaries-slovene" = tl."glossaries-slovene"; - deps."glossaries-spanish" = tl."glossaries-spanish"; - deps."gmdoc" = tl."gmdoc"; - deps."gmdoc-enhance" = tl."gmdoc-enhance"; - deps."gmiflink" = tl."gmiflink"; - deps."gmutils" = tl."gmutils"; - deps."gmverb" = tl."gmverb"; - deps."grabbox" = tl."grabbox"; - deps."gradient-text" = tl."gradient-text"; - deps."grading-scheme" = tl."grading-scheme"; - deps."graphbox" = tl."graphbox"; - deps."graphicscache" = tl."graphicscache"; - deps."graphicx-psmin" = tl."graphicx-psmin"; - deps."graphicxbox" = tl."graphicxbox"; - deps."graphpaper" = tl."graphpaper"; - deps."grayhints" = tl."grayhints"; - deps."grfpaste" = tl."grfpaste"; - deps."grid" = tl."grid"; - deps."grid-system" = tl."grid-system"; - deps."gridpapers" = tl."gridpapers"; - deps."gridset" = tl."gridset"; - deps."gridslides" = tl."gridslides"; - deps."gs1" = tl."gs1"; - deps."guitlogo" = tl."guitlogo"; - deps."ha-prosper" = tl."ha-prosper"; - deps."hackthefootline" = tl."hackthefootline"; - deps."halloweenmath" = tl."halloweenmath"; - deps."handin" = tl."handin"; - deps."handout" = tl."handout"; - deps."handoutwithnotes" = tl."handoutwithnotes"; - deps."hang" = tl."hang"; - deps."hanging" = tl."hanging"; - deps."hardwrap" = tl."hardwrap"; - deps."harnon-cv" = tl."harnon-cv"; - deps."harpoon" = tl."harpoon"; - deps."hc" = tl."hc"; - deps."he-she" = tl."he-she"; - deps."hep-acronym" = tl."hep-acronym"; - deps."hep-float" = tl."hep-float"; - deps."hep-math" = tl."hep-math"; - deps."hep-text" = tl."hep-text"; - deps."hep-title" = tl."hep-title"; - deps."hereapplies" = tl."hereapplies"; - deps."hhtensor" = tl."hhtensor"; - deps."hideanswer" = tl."hideanswer"; - deps."highlightlatex" = tl."highlightlatex"; - deps."histogr" = tl."histogr"; - deps."hitec" = tl."hitec"; - deps."hitreport" = tl."hitreport"; - deps."hletter" = tl."hletter"; - deps."hobsub" = tl."hobsub"; - deps."hpsdiss" = tl."hpsdiss"; - deps."href-ul" = tl."href-ul"; - deps."hrefhide" = tl."hrefhide"; - deps."huawei" = tl."huawei"; - deps."hvextern" = tl."hvextern"; - deps."hvindex" = tl."hvindex"; - deps."hvlogos" = tl."hvlogos"; - deps."hvpygmentex" = tl."hvpygmentex"; - deps."hvqrurl" = tl."hvqrurl"; - deps."hwemoji" = tl."hwemoji"; - deps."hypdestopt" = tl."hypdestopt"; - deps."hypdoc" = tl."hypdoc"; - deps."hypdvips" = tl."hypdvips"; - deps."hyper" = tl."hyper"; - deps."hyperbar" = tl."hyperbar"; - deps."hypernat" = tl."hypernat"; - deps."hyperxmp" = tl."hyperxmp"; - deps."hyphenat" = tl."hyphenat"; - deps."identkey" = tl."identkey"; - deps."idxcmds" = tl."idxcmds"; - deps."idxlayout" = tl."idxlayout"; - deps."iexec" = tl."iexec"; - deps."ifallfalse" = tl."ifallfalse"; - deps."iffont" = tl."iffont"; - deps."ifmslide" = tl."ifmslide"; - deps."ifmtarg" = tl."ifmtarg"; - deps."ifnextok" = tl."ifnextok"; - deps."ifoddpage" = tl."ifoddpage"; - deps."ifthenx" = tl."ifthenx"; - deps."iitem" = tl."iitem"; - deps."image-gallery" = tl."image-gallery"; - deps."imakeidx" = tl."imakeidx"; - deps."import" = tl."import"; - deps."incgraph" = tl."incgraph"; - deps."indextools" = tl."indextools"; - deps."inline-images" = tl."inline-images"; - deps."inlinedef" = tl."inlinedef"; - deps."inlinelabel" = tl."inlinelabel"; - deps."inputenx" = tl."inputenx"; - deps."inputtrc" = tl."inputtrc"; - deps."interactiveworkbook" = tl."interactiveworkbook"; - deps."interfaces" = tl."interfaces"; - deps."intopdf" = tl."intopdf"; - deps."inversepath" = tl."inversepath"; - deps."invoice" = tl."invoice"; - deps."invoice-class" = tl."invoice-class"; - deps."invoice2" = tl."invoice2"; - deps."iso" = tl."iso"; - deps."iso10303" = tl."iso10303"; - deps."isodate" = tl."isodate"; - deps."isodoc" = tl."isodoc"; - deps."isonums" = tl."isonums"; - deps."isopt" = tl."isopt"; - deps."isorot" = tl."isorot"; - deps."isotope" = tl."isotope"; - deps."issuulinks" = tl."issuulinks"; - deps."iwhdp" = tl."iwhdp"; - deps."jlabels" = tl."jlabels"; - deps."jmsdelim" = tl."jmsdelim"; - deps."jobname-suffix" = tl."jobname-suffix"; - deps."jslectureplanner" = tl."jslectureplanner"; - deps."jumplines" = tl."jumplines"; - deps."jvlisting" = tl."jvlisting"; - deps."kalendarium" = tl."kalendarium"; - deps."kantlipsum" = tl."kantlipsum"; - deps."kerntest" = tl."kerntest"; - deps."keycommand" = tl."keycommand"; - deps."keyfloat" = tl."keyfloat"; - deps."keyindex" = tl."keyindex"; - deps."keyparse" = tl."keyparse"; - deps."keyreader" = tl."keyreader"; - deps."keystroke" = tl."keystroke"; - deps."keyval2e" = tl."keyval2e"; - deps."keyvaltable" = tl."keyvaltable"; - deps."kix" = tl."kix"; - deps."knowledge" = tl."knowledge"; - deps."koma-moderncvclassic" = tl."koma-moderncvclassic"; - deps."koma-script-sfs" = tl."koma-script-sfs"; - deps."komacv" = tl."komacv"; - deps."komacv-rg" = tl."komacv-rg"; - deps."ktv-texdata" = tl."ktv-texdata"; - deps."l3build" = tl."l3build"; - deps."labbook" = tl."labbook"; - deps."labels" = tl."labels"; - deps."labels4easylist" = tl."labels4easylist"; - deps."labelschanged" = tl."labelschanged"; - deps."lambdax" = tl."lambdax"; - deps."lastpackage" = tl."lastpackage"; - deps."lastpage" = tl."lastpage"; - deps."latex-amsmath-dev" = tl."latex-amsmath-dev"; - deps."latex-base-dev" = tl."latex-base-dev"; - deps."latex-bin-dev" = tl."latex-bin-dev"; - deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; - deps."latex-graphics-dev" = tl."latex-graphics-dev"; - deps."latex-lab-dev" = tl."latex-lab-dev"; - deps."latex-tools-dev" = tl."latex-tools-dev"; - deps."latex-uni8" = tl."latex-uni8"; - deps."latexcolors" = tl."latexcolors"; - deps."latexdemo" = tl."latexdemo"; - deps."latexgit" = tl."latexgit"; - deps."layouts" = tl."layouts"; - deps."lazylist" = tl."lazylist"; - deps."lccaps" = tl."lccaps"; - deps."lcd" = tl."lcd"; - deps."lcg" = tl."lcg"; - deps."leading" = tl."leading"; - deps."leaflet" = tl."leaflet"; - deps."lebhart" = tl."lebhart"; - deps."lectures" = tl."lectures"; - deps."lectureslides" = tl."lectureslides"; - deps."leftidx" = tl."leftidx"; - deps."leftindex" = tl."leftindex"; - deps."leipzig" = tl."leipzig"; - deps."lengthconvert" = tl."lengthconvert"; - deps."lettre" = tl."lettre"; - deps."lettrine" = tl."lettrine"; - deps."lewis" = tl."lewis"; - deps."lhelp" = tl."lhelp"; - deps."libgreek" = tl."libgreek"; - deps."limap" = tl."limap"; - deps."linegoal" = tl."linegoal"; - deps."linop" = tl."linop"; - deps."lipsum" = tl."lipsum"; - deps."lisp-on-tex" = tl."lisp-on-tex"; - deps."listing" = tl."listing"; - deps."listingsutf8" = tl."listingsutf8"; - deps."listlbls" = tl."listlbls"; - deps."listliketab" = tl."listliketab"; - deps."listofsymbols" = tl."listofsymbols"; - deps."lkproof" = tl."lkproof"; - deps."lmake" = tl."lmake"; - deps."locality" = tl."locality"; - deps."logbox" = tl."logbox"; - deps."logical-markup-utils" = tl."logical-markup-utils"; - deps."logpap" = tl."logpap"; - deps."longfbox" = tl."longfbox"; - deps."longfigure" = tl."longfigure"; - deps."longnamefilelist" = tl."longnamefilelist"; - deps."loops" = tl."loops"; - deps."lsc" = tl."lsc"; - deps."lstaddons" = tl."lstaddons"; - deps."lstfiracode" = tl."lstfiracode"; - deps."lt3graph" = tl."lt3graph"; - deps."lt3rawobjects" = tl."lt3rawobjects"; - deps."ltablex" = tl."ltablex"; - deps."ltabptch" = tl."ltabptch"; - deps."ltxdockit" = tl."ltxdockit"; - deps."ltxguidex" = tl."ltxguidex"; - deps."ltxkeys" = tl."ltxkeys"; - deps."ltxnew" = tl."ltxnew"; - deps."ltxtools" = tl."ltxtools"; - deps."lua-check-hyphen" = tl."lua-check-hyphen"; - deps."lua-physical" = tl."lua-physical"; - deps."luatodonotes" = tl."luatodonotes"; - deps."macrolist" = tl."macrolist"; - deps."macroswap" = tl."macroswap"; - deps."magaz" = tl."magaz"; - deps."magicnum" = tl."magicnum"; - deps."magicwatermark" = tl."magicwatermark"; - deps."mailing" = tl."mailing"; - deps."mailmerge" = tl."mailmerge"; - deps."makebarcode" = tl."makebarcode"; - deps."makebase" = tl."makebase"; - deps."makebox" = tl."makebox"; - deps."makecell" = tl."makecell"; - deps."makecirc" = tl."makecirc"; - deps."makecmds" = tl."makecmds"; - deps."makecookbook" = tl."makecookbook"; - deps."makedtx" = tl."makedtx"; - deps."makeglos" = tl."makeglos"; - deps."makelabels" = tl."makelabels"; - deps."makerobust" = tl."makerobust"; - deps."mandi" = tl."mandi"; - deps."manfnt" = tl."manfnt"; - deps."manuscript" = tl."manuscript"; - deps."manyind" = tl."manyind"; - deps."marginfit" = tl."marginfit"; - deps."marginfix" = tl."marginfix"; - deps."marginnote" = tl."marginnote"; - deps."markdown" = tl."markdown"; - deps."mathalpha" = tl."mathalpha"; - deps."mathastext" = tl."mathastext"; - deps."mathexam" = tl."mathexam"; - deps."mathfam256" = tl."mathfam256"; - deps."mathfont" = tl."mathfont"; - deps."maybemath" = tl."maybemath"; - deps."mcaption" = tl."mcaption"; - deps."mceinleger" = tl."mceinleger"; - deps."mcexam" = tl."mcexam"; - deps."mcite" = tl."mcite"; - deps."mciteplus" = tl."mciteplus"; - deps."mdframed" = tl."mdframed"; - deps."media4svg" = tl."media4svg"; - deps."media9" = tl."media9"; - deps."medstarbeamer" = tl."medstarbeamer"; - deps."meetingmins" = tl."meetingmins"; - deps."memexsupp" = tl."memexsupp"; - deps."memory" = tl."memory"; - deps."mensa-tex" = tl."mensa-tex"; - deps."menu" = tl."menu"; - deps."menucard" = tl."menucard"; - deps."menukeys" = tl."menukeys"; - deps."metalogox" = tl."metalogox"; - deps."metanorma" = tl."metanorma"; - deps."metastr" = tl."metastr"; - deps."method" = tl."method"; - deps."metre" = tl."metre"; - deps."mfirstuc" = tl."mfirstuc"; - deps."mftinc" = tl."mftinc"; - deps."mi-solns" = tl."mi-solns"; - deps."midpage" = tl."midpage"; - deps."mindflow" = tl."mindflow"; - deps."minibox" = tl."minibox"; - deps."minidocument" = tl."minidocument"; - deps."minifp" = tl."minifp"; - deps."minimalist" = tl."minimalist"; - deps."minipage-marginpar" = tl."minipage-marginpar"; - deps."minitoc" = tl."minitoc"; - deps."minorrevision" = tl."minorrevision"; - deps."minted" = tl."minted"; - deps."minutes" = tl."minutes"; - deps."mla-paper" = tl."mla-paper"; - deps."mleftright" = tl."mleftright"; - deps."mlist" = tl."mlist"; - deps."mmap" = tl."mmap"; - deps."mnotes" = tl."mnotes"; - deps."moderncv" = tl."moderncv"; - deps."modernposter" = tl."modernposter"; - deps."moderntimeline" = tl."moderntimeline"; - deps."modref" = tl."modref"; - deps."modroman" = tl."modroman"; - deps."modular" = tl."modular"; - deps."monofill" = tl."monofill"; - deps."moodle" = tl."moodle"; - deps."moreenum" = tl."moreenum"; - deps."morefloats" = tl."morefloats"; - deps."morehype" = tl."morehype"; - deps."moresize" = tl."moresize"; - deps."moreverb" = tl."moreverb"; - deps."morewrites" = tl."morewrites"; - deps."movie15" = tl."movie15"; - deps."mparhack" = tl."mparhack"; - deps."mpostinl" = tl."mpostinl"; - deps."msc" = tl."msc"; - deps."msg" = tl."msg"; - deps."mslapa" = tl."mslapa"; - deps."mtgreek" = tl."mtgreek"; - deps."multenum" = tl."multenum"; - deps."multiaudience" = tl."multiaudience"; - deps."multibbl" = tl."multibbl"; - deps."multicap" = tl."multicap"; - deps."multicolrule" = tl."multicolrule"; - deps."multidef" = tl."multidef"; - deps."multienv" = tl."multienv"; - deps."multiexpand" = tl."multiexpand"; - deps."multifootnote" = tl."multifootnote"; - deps."multilang" = tl."multilang"; - deps."multiple-choice" = tl."multiple-choice"; - deps."multirow" = tl."multirow"; - deps."mversion" = tl."mversion"; - deps."mwe" = tl."mwe"; - deps."mycv" = tl."mycv"; - deps."mylatex" = tl."mylatex"; - deps."mylatexformat" = tl."mylatexformat"; - deps."nag" = tl."nag"; - deps."nameauth" = tl."nameauth"; - deps."namespc" = tl."namespc"; - deps."ncclatex" = tl."ncclatex"; - deps."ncctools" = tl."ncctools"; - deps."needspace" = tl."needspace"; - deps."nestquot" = tl."nestquot"; - deps."newcommand" = tl."newcommand"; - deps."newenviron" = tl."newenviron"; - deps."newfile" = tl."newfile"; - deps."newlfm" = tl."newlfm"; - deps."newspaper" = tl."newspaper"; - deps."newunicodechar" = tl."newunicodechar"; - deps."newvbtm" = tl."newvbtm"; - deps."newverbs" = tl."newverbs"; - deps."nextpage" = tl."nextpage"; - deps."nfssext-cfr" = tl."nfssext-cfr"; - deps."nicefilelist" = tl."nicefilelist"; - deps."niceframe" = tl."niceframe"; - deps."nicetext" = tl."nicetext"; - deps."nidanfloat" = tl."nidanfloat"; - deps."ninecolors" = tl."ninecolors"; - deps."nlctdoc" = tl."nlctdoc"; - deps."noconflict" = tl."noconflict"; - deps."noindentafter" = tl."noindentafter"; - deps."noitcrul" = tl."noitcrul"; - deps."nolbreaks" = tl."nolbreaks"; - deps."nomencl" = tl."nomencl"; - deps."nomentbl" = tl."nomentbl"; - deps."nonfloat" = tl."nonfloat"; - deps."nonumonpart" = tl."nonumonpart"; - deps."nopageno" = tl."nopageno"; - deps."normalcolor" = tl."normalcolor"; - deps."notes" = tl."notes"; - deps."notespages" = tl."notespages"; - deps."notestex" = tl."notestex"; - deps."notoccite" = tl."notoccite"; - deps."nowidow" = tl."nowidow"; - deps."nox" = tl."nox"; - deps."ntheorem" = tl."ntheorem"; - deps."numberedblock" = tl."numberedblock"; - deps."numname" = tl."numname"; - deps."numprint" = tl."numprint"; - deps."numspell" = tl."numspell"; - deps."ocg-p" = tl."ocg-p"; - deps."ocgx" = tl."ocgx"; - deps."ocgx2" = tl."ocgx2"; - deps."ocr-latex" = tl."ocr-latex"; - deps."octavo" = tl."octavo"; - deps."oldstyle" = tl."oldstyle"; - deps."onlyamsmath" = tl."onlyamsmath"; - deps."opcit" = tl."opcit"; - deps."opencolor" = tl."opencolor"; - deps."optidef" = tl."optidef"; - deps."optional" = tl."optional"; - deps."options" = tl."options"; - deps."orcidlink" = tl."orcidlink"; - deps."orientation" = tl."orientation"; - deps."outline" = tl."outline"; - deps."outliner" = tl."outliner"; - deps."outlines" = tl."outlines"; - deps."outlining" = tl."outlining"; - deps."overlays" = tl."overlays"; - deps."overpic" = tl."overpic"; - deps."padcount" = tl."padcount"; - deps."pagecolor" = tl."pagecolor"; - deps."pagecont" = tl."pagecont"; - deps."pagegrid" = tl."pagegrid"; - deps."pagenote" = tl."pagenote"; - deps."pagerange" = tl."pagerange"; - deps."pageslts" = tl."pageslts"; - deps."palette" = tl."palette"; - deps."pangram" = tl."pangram"; - deps."paper" = tl."paper"; - deps."papercdcase" = tl."papercdcase"; - deps."papermas" = tl."papermas"; - deps."papertex" = tl."papertex"; - deps."paracol" = tl."paracol"; - deps."parades" = tl."parades"; - deps."paralist" = tl."paralist"; - deps."paresse" = tl."paresse"; - deps."parnotes" = tl."parnotes"; - deps."parsa" = tl."parsa"; - deps."parselines" = tl."parselines"; - deps."pas-cours" = tl."pas-cours"; - deps."pas-cv" = tl."pas-cv"; - deps."pas-tableur" = tl."pas-tableur"; - deps."patch" = tl."patch"; - deps."patchcmd" = tl."patchcmd"; - deps."pauldoc" = tl."pauldoc"; - deps."pawpict" = tl."pawpict"; - deps."pax" = tl."pax"; - deps."pbalance" = tl."pbalance"; - deps."pbox" = tl."pbox"; - deps."pbsheet" = tl."pbsheet"; - deps."pdf14" = tl."pdf14"; - deps."pdfcol" = tl."pdfcol"; - deps."pdfcolmk" = tl."pdfcolmk"; - deps."pdfcomment" = tl."pdfcomment"; - deps."pdfcprot" = tl."pdfcprot"; - deps."pdfmarginpar" = tl."pdfmarginpar"; - deps."pdfoverlay" = tl."pdfoverlay"; - deps."pdfpagediff" = tl."pdfpagediff"; - deps."pdfpc" = tl."pdfpc"; - deps."pdfpc-movie" = tl."pdfpc-movie"; - deps."pdfprivacy" = tl."pdfprivacy"; - deps."pdfreview" = tl."pdfreview"; - deps."pdfscreen" = tl."pdfscreen"; - deps."pdfslide" = tl."pdfslide"; - deps."pdfsync" = tl."pdfsync"; - deps."pdfwin" = tl."pdfwin"; - deps."pdfx" = tl."pdfx"; - deps."pecha" = tl."pecha"; - deps."perltex" = tl."perltex"; - deps."permute" = tl."permute"; - deps."petiteannonce" = tl."petiteannonce"; - deps."pgfmath-xfp" = tl."pgfmath-xfp"; - deps."phfcc" = tl."phfcc"; - deps."phfextendedabstract" = tl."phfextendedabstract"; - deps."phffullpagefigure" = tl."phffullpagefigure"; - deps."phfnote" = tl."phfnote"; - deps."phfparen" = tl."phfparen"; - deps."phfqit" = tl."phfqit"; - deps."phfquotetext" = tl."phfquotetext"; - deps."phfsvnwatermark" = tl."phfsvnwatermark"; - deps."phfthm" = tl."phfthm"; - deps."philex" = tl."philex"; - deps."phonenumbers" = tl."phonenumbers"; - deps."photo" = tl."photo"; - deps."photobook" = tl."photobook"; - deps."picture" = tl."picture"; - deps."piff" = tl."piff"; - deps."pkgloader" = tl."pkgloader"; - deps."placeins" = tl."placeins"; - deps."plantslabels" = tl."plantslabels"; - deps."plates" = tl."plates"; - deps."plweb" = tl."plweb"; - deps."pmboxdraw" = tl."pmboxdraw"; - deps."polynom" = tl."polynom"; - deps."polynomial" = tl."polynomial"; - deps."polytable" = tl."polytable"; - deps."postcards" = tl."postcards"; - deps."poster-mac" = tl."poster-mac"; - deps."postnotes" = tl."postnotes"; - deps."powerdot" = tl."powerdot"; - deps."ppr-prv" = tl."ppr-prv"; - deps."ppt-slides" = tl."ppt-slides"; - deps."practicalreports" = tl."practicalreports"; - deps."precattl" = tl."precattl"; - deps."prelim2e" = tl."prelim2e"; - deps."preprint" = tl."preprint"; - deps."pressrelease" = tl."pressrelease"; - deps."prettyref" = tl."prettyref"; - deps."prettytok" = tl."prettytok"; - deps."preview" = tl."preview"; - deps."printlen" = tl."printlen"; - deps."probsoln" = tl."probsoln"; - deps."program" = tl."program"; - deps."progress" = tl."progress"; - deps."progressbar" = tl."progressbar"; - deps."projlib" = tl."projlib"; - deps."proofread" = tl."proofread"; - deps."properties" = tl."properties"; - deps."prosper" = tl."prosper"; - deps."protex" = tl."protex"; - deps."protocol" = tl."protocol"; - deps."psfragx" = tl."psfragx"; - deps."pstool" = tl."pstool"; - deps."pstring" = tl."pstring"; - deps."pxgreeks" = tl."pxgreeks"; - deps."pygmentex" = tl."pygmentex"; - deps."python" = tl."python"; - deps."pythonimmediate" = tl."pythonimmediate"; - deps."qcm" = tl."qcm"; - deps."qstest" = tl."qstest"; - deps."qsymbols" = tl."qsymbols"; - deps."quicktype" = tl."quicktype"; - deps."quiz2socrative" = tl."quiz2socrative"; - deps."quotchap" = tl."quotchap"; - deps."quoting" = tl."quoting"; - deps."quotmark" = tl."quotmark"; - deps."ran_toks" = tl."ran_toks"; - deps."randtext" = tl."randtext"; - deps."rccol" = tl."rccol"; - deps."rcs-multi" = tl."rcs-multi"; - deps."rcsinfo" = tl."rcsinfo"; - deps."readablecv" = tl."readablecv"; - deps."readarray" = tl."readarray"; - deps."realboxes" = tl."realboxes"; - deps."recipe" = tl."recipe"; - deps."recipebook" = tl."recipebook"; - deps."recipecard" = tl."recipecard"; - deps."rectopma" = tl."rectopma"; - deps."refcheck" = tl."refcheck"; - deps."refenums" = tl."refenums"; - deps."reflectgraphics" = tl."reflectgraphics"; - deps."refman" = tl."refman"; - deps."refstyle" = tl."refstyle"; - deps."regcount" = tl."regcount"; - deps."regexpatch" = tl."regexpatch"; - deps."register" = tl."register"; - deps."regstats" = tl."regstats"; - deps."relenc" = tl."relenc"; - deps."relsize" = tl."relsize"; - deps."repeatindex" = tl."repeatindex"; - deps."repltext" = tl."repltext"; - deps."rescansync" = tl."rescansync"; - deps."returntogrid" = tl."returntogrid"; - deps."rgltxdoc" = tl."rgltxdoc"; - deps."rjlparshap" = tl."rjlparshap"; - deps."rlepsf" = tl."rlepsf"; - deps."rmpage" = tl."rmpage"; - deps."robustcommand" = tl."robustcommand"; - deps."robustindex" = tl."robustindex"; - deps."romanbar" = tl."romanbar"; - deps."romanbarpagenumber" = tl."romanbarpagenumber"; - deps."romanneg" = tl."romanneg"; - deps."romannum" = tl."romannum"; - deps."rotfloat" = tl."rotfloat"; - deps."rotpages" = tl."rotpages"; - deps."roundbox" = tl."roundbox"; - deps."rterface" = tl."rterface"; - deps."rtkinenc" = tl."rtkinenc"; - deps."rulerbox" = tl."rulerbox"; - deps."rulercompass" = tl."rulercompass"; - deps."runcode" = tl."runcode"; - deps."rvwrite" = tl."rvwrite"; - deps."sanitize-umlaut" = tl."sanitize-umlaut"; - deps."sauerj" = tl."sauerj"; - deps."saveenv" = tl."saveenv"; - deps."savefnmark" = tl."savefnmark"; - deps."savesym" = tl."savesym"; - deps."savetrees" = tl."savetrees"; - deps."scale" = tl."scale"; - deps."scalebar" = tl."scalebar"; - deps."scalerel" = tl."scalerel"; - deps."scanpages" = tl."scanpages"; - deps."schedule" = tl."schedule"; - deps."schooldocs" = tl."schooldocs"; - deps."scontents" = tl."scontents"; - deps."scrambledenvs" = tl."scrambledenvs"; - deps."scrlayer-fancyhdr" = tl."scrlayer-fancyhdr"; - deps."scrlttr2copy" = tl."scrlttr2copy"; - deps."sdaps" = tl."sdaps"; - deps."sdrt" = tl."sdrt"; - deps."secdot" = tl."secdot"; - deps."secnum" = tl."secnum"; - deps."sectionbox" = tl."sectionbox"; - deps."sectionbreak" = tl."sectionbreak"; - deps."sectsty" = tl."sectsty"; - deps."seealso" = tl."seealso"; - deps."selectp" = tl."selectp"; - deps."selinput" = tl."selinput"; - deps."semantex" = tl."semantex"; - deps."semantic" = tl."semantic"; - deps."semantic-markup" = tl."semantic-markup"; - deps."semesterplanner" = tl."semesterplanner"; - deps."semioneside" = tl."semioneside"; - deps."semproc" = tl."semproc"; - deps."semtex" = tl."semtex"; - deps."sepfootnotes" = tl."sepfootnotes"; - deps."seqsplit" = tl."seqsplit"; - deps."sesstime" = tl."sesstime"; - deps."sf298" = tl."sf298"; - deps."sffms" = tl."sffms"; - deps."sfmath" = tl."sfmath"; - deps."shadethm" = tl."shadethm"; - deps."shadow" = tl."shadow"; - deps."shadowtext" = tl."shadowtext"; - deps."shapepar" = tl."shapepar"; - deps."shdoc" = tl."shdoc"; - deps."shipunov" = tl."shipunov"; - deps."shorttoc" = tl."shorttoc"; - deps."show2e" = tl."show2e"; - deps."showcharinbox" = tl."showcharinbox"; - deps."showdim" = tl."showdim"; - deps."showexpl" = tl."showexpl"; - deps."showlabels" = tl."showlabels"; - deps."sidecap" = tl."sidecap"; - deps."sidenotes" = tl."sidenotes"; - deps."sidenotesplus" = tl."sidenotesplus"; - deps."silence" = tl."silence"; - deps."sillypage" = tl."sillypage"; - deps."simplecd" = tl."simplecd"; - deps."simplecv" = tl."simplecv"; - deps."simpleinvoice" = tl."simpleinvoice"; - deps."simplivre" = tl."simplivre"; - deps."sitem" = tl."sitem"; - deps."skb" = tl."skb"; - deps."skdoc" = tl."skdoc"; - deps."skeldoc" = tl."skeldoc"; - deps."skeycommand" = tl."skeycommand"; - deps."skeyval" = tl."skeyval"; - deps."skills" = tl."skills"; - deps."skrapport" = tl."skrapport"; - deps."slantsc" = tl."slantsc"; - deps."smalltableof" = tl."smalltableof"; - deps."smart-eqn" = tl."smart-eqn"; - deps."smartref" = tl."smartref"; - deps."smartunits" = tl."smartunits"; - deps."snapshot" = tl."snapshot"; - deps."snaptodo" = tl."snaptodo"; - deps."snotez" = tl."snotez"; - deps."soulpos" = tl."soulpos"; - deps."soulutf8" = tl."soulutf8"; - deps."spacingtricks" = tl."spacingtricks"; - deps."spark-otf" = tl."spark-otf"; - deps."sparklines" = tl."sparklines"; - deps."sphack" = tl."sphack"; - deps."splitindex" = tl."splitindex"; - deps."spot" = tl."spot"; - deps."spotcolor" = tl."spotcolor"; - deps."spreadtab" = tl."spreadtab"; - deps."spverbatim" = tl."spverbatim"; - deps."srbook-mem" = tl."srbook-mem"; - deps."srcltx" = tl."srcltx"; - deps."sseq" = tl."sseq"; - deps."sslides" = tl."sslides"; - deps."stack" = tl."stack"; - deps."stackengine" = tl."stackengine"; - deps."standalone" = tl."standalone"; - deps."stdclsdv" = tl."stdclsdv"; - deps."stdpage" = tl."stdpage"; - deps."stealcaps" = tl."stealcaps"; - deps."stex" = tl."stex"; - deps."storebox" = tl."storebox"; - deps."storecmd" = tl."storecmd"; - deps."stringstrings" = tl."stringstrings"; - deps."sttools" = tl."sttools"; - deps."stubs" = tl."stubs"; - deps."studenthandouts" = tl."studenthandouts"; - deps."styledcmd" = tl."styledcmd"; - deps."subdepth" = tl."subdepth"; - deps."subdocs" = tl."subdocs"; - deps."subeqn" = tl."subeqn"; - deps."subeqnarray" = tl."subeqnarray"; - deps."subfigmat" = tl."subfigmat"; - deps."subfigure" = tl."subfigure"; - deps."subfiles" = tl."subfiles"; - deps."subfloat" = tl."subfloat"; - deps."substitutefont" = tl."substitutefont"; - deps."substr" = tl."substr"; - deps."supertabular" = tl."supertabular"; - deps."suppose" = tl."suppose"; - deps."svg" = tl."svg"; - deps."svgcolor" = tl."svgcolor"; - deps."svn" = tl."svn"; - deps."svn-multi" = tl."svn-multi"; - deps."svn-prov" = tl."svn-prov"; - deps."svninfo" = tl."svninfo"; - deps."swfigure" = tl."swfigure"; - deps."swungdash" = tl."swungdash"; - deps."syntax" = tl."syntax"; - deps."syntrace" = tl."syntrace"; - deps."synttree" = tl."synttree"; - deps."tabbing" = tl."tabbing"; - deps."tabfigures" = tl."tabfigures"; - deps."tableaux" = tl."tableaux"; - deps."tablefootnote" = tl."tablefootnote"; - deps."tableof" = tl."tableof"; - deps."tablestyles" = tl."tablestyles"; - deps."tablists" = tl."tablists"; - deps."tabls" = tl."tabls"; - deps."tablvar" = tl."tablvar"; - deps."tabstackengine" = tl."tabstackengine"; - deps."tabto-ltx" = tl."tabto-ltx"; - deps."tabu" = tl."tabu"; - deps."tabularborder" = tl."tabularborder"; - deps."tabularcalc" = tl."tabularcalc"; - deps."tabularew" = tl."tabularew"; - deps."tabularray" = tl."tabularray"; - deps."tabulary" = tl."tabulary"; - deps."tagging" = tl."tagging"; - deps."tagpair" = tl."tagpair"; - deps."tagpdf" = tl."tagpdf"; - deps."talk" = tl."talk"; - deps."tamefloats" = tl."tamefloats"; - deps."tasks" = tl."tasks"; - deps."tcldoc" = tl."tcldoc"; - deps."tcolorbox" = tl."tcolorbox"; - deps."tdclock" = tl."tdclock"; - deps."technics" = tl."technics"; - deps."ted" = tl."ted"; - deps."templatetools" = tl."templatetools"; - deps."termcal" = tl."termcal"; - deps."termlist" = tl."termlist"; - deps."termsim" = tl."termsim"; - deps."testhyphens" = tl."testhyphens"; - deps."testidx" = tl."testidx"; - deps."tex-label" = tl."tex-label"; - deps."tex-locale" = tl."tex-locale"; - deps."texlogos" = tl."texlogos"; - deps."texmate" = tl."texmate"; - deps."texments" = tl."texments"; - deps."texpower" = tl."texpower"; - deps."texshade" = tl."texshade"; - deps."texsurgery" = tl."texsurgery"; - deps."textcsc" = tl."textcsc"; - deps."textfit" = tl."textfit"; - deps."textmerg" = tl."textmerg"; - deps."textpos" = tl."textpos"; - deps."textualicomma" = tl."textualicomma"; - deps."texvc" = tl."texvc"; - deps."theoremref" = tl."theoremref"; - deps."thinsp" = tl."thinsp"; - deps."thmtools" = tl."thmtools"; - deps."threadcol" = tl."threadcol"; - deps."threeparttable" = tl."threeparttable"; - deps."threeparttablex" = tl."threeparttablex"; - deps."thumb" = tl."thumb"; - deps."thumbs" = tl."thumbs"; - deps."thumby" = tl."thumby"; - deps."ticket" = tl."ticket"; - deps."tipauni" = tl."tipauni"; - deps."titlecaps" = tl."titlecaps"; - deps."titlefoot" = tl."titlefoot"; - deps."titlepic" = tl."titlepic"; - deps."titleref" = tl."titleref"; - deps."titlesec" = tl."titlesec"; - deps."titling" = tl."titling"; - deps."to-be-determined" = tl."to-be-determined"; - deps."tocbibind" = tl."tocbibind"; - deps."tocdata" = tl."tocdata"; - deps."tocloft" = tl."tocloft"; - deps."tocvsec2" = tl."tocvsec2"; - deps."todo" = tl."todo"; - deps."todonotes" = tl."todonotes"; - deps."tokcycle" = tl."tokcycle"; - deps."tokenizer" = tl."tokenizer"; - deps."toolbox" = tl."toolbox"; - deps."topfloat" = tl."topfloat"; - deps."topiclongtable" = tl."topiclongtable"; - deps."totalcount" = tl."totalcount"; - deps."totcount" = tl."totcount"; - deps."totpages" = tl."totpages"; - deps."translations" = tl."translations"; - deps."transparent" = tl."transparent"; - deps."trfsigns" = tl."trfsigns"; - deps."trimspaces" = tl."trimspaces"; - deps."trivfloat" = tl."trivfloat"; - deps."trsym" = tl."trsym"; - deps."truncate" = tl."truncate"; - deps."tucv" = tl."tucv"; - deps."turnthepage" = tl."turnthepage"; - deps."twoinone" = tl."twoinone"; - deps."twoup" = tl."twoup"; - deps."txgreeks" = tl."txgreeks"; - deps."type1cm" = tl."type1cm"; - deps."typed-checklist" = tl."typed-checklist"; - deps."typeface" = tl."typeface"; - deps."typoaid" = tl."typoaid"; - deps."typogrid" = tl."typogrid"; - deps."uassign" = tl."uassign"; - deps."ucs" = tl."ucs"; - deps."uebungsblatt" = tl."uebungsblatt"; - deps."umoline" = tl."umoline"; - deps."underlin" = tl."underlin"; - deps."underoverlap" = tl."underoverlap"; - deps."undolabl" = tl."undolabl"; - deps."uni-titlepage" = tl."uni-titlepage"; - deps."unicodefonttable" = tl."unicodefonttable"; - deps."unisc" = tl."unisc"; - deps."unitconv" = tl."unitconv"; - deps."units" = tl."units"; - deps."unravel" = tl."unravel"; - deps."upmethodology" = tl."upmethodology"; - deps."upquote" = tl."upquote"; - deps."uri" = tl."uri"; - deps."ushort" = tl."ushort"; - deps."uspace" = tl."uspace"; - deps."utf8add" = tl."utf8add"; - deps."uwmslide" = tl."uwmslide"; - deps."variablelm" = tl."variablelm"; - deps."varindex" = tl."varindex"; - deps."varsfromjobname" = tl."varsfromjobname"; - deps."varwidth" = tl."varwidth"; - deps."vcell" = tl."vcell"; - deps."vdmlisting" = tl."vdmlisting"; - deps."verbasef" = tl."verbasef"; - deps."verbatimbox" = tl."verbatimbox"; - deps."verbatimcopy" = tl."verbatimcopy"; - deps."verbdef" = tl."verbdef"; - deps."verbments" = tl."verbments"; - deps."verifiche" = tl."verifiche"; - deps."version" = tl."version"; - deps."versions" = tl."versions"; - deps."versonotes" = tl."versonotes"; - deps."vertbars" = tl."vertbars"; - deps."vgrid" = tl."vgrid"; - deps."vhistory" = tl."vhistory"; - deps."vmargin" = tl."vmargin"; - deps."volumes" = tl."volumes"; - deps."vpe" = tl."vpe"; - deps."vruler" = tl."vruler"; - deps."vtable" = tl."vtable"; - deps."vwcol" = tl."vwcol"; - deps."wallcalendar" = tl."wallcalendar"; - deps."wallpaper" = tl."wallpaper"; - deps."warning" = tl."warning"; - deps."warpcol" = tl."warpcol"; - deps."was" = tl."was"; - deps."webquiz" = tl."webquiz"; - deps."widetable" = tl."widetable"; - deps."widows-and-orphans" = tl."widows-and-orphans"; - deps."williams" = tl."williams"; - deps."willowtreebook" = tl."willowtreebook"; - deps."withargs" = tl."withargs"; - deps."wordcount" = tl."wordcount"; - deps."wordlike" = tl."wordlike"; - deps."worksheet" = tl."worksheet"; - deps."wrapfig" = tl."wrapfig"; - deps."wrapfig2" = tl."wrapfig2"; - deps."wrapstuff" = tl."wrapstuff"; - deps."wtref" = tl."wtref"; - deps."xargs" = tl."xargs"; - deps."xassoccnt" = tl."xassoccnt"; - deps."xbmks" = tl."xbmks"; - deps."xcntperchap" = tl."xcntperchap"; - deps."xcolor-material" = tl."xcolor-material"; - deps."xcolor-solarized" = tl."xcolor-solarized"; - deps."xcomment" = tl."xcomment"; - deps."xcookybooky" = tl."xcookybooky"; - deps."xcpdftips" = tl."xcpdftips"; - deps."xdoc" = tl."xdoc"; - deps."xellipsis" = tl."xellipsis"; - deps."xfakebold" = tl."xfakebold"; - deps."xfor" = tl."xfor"; - deps."xhfill" = tl."xhfill"; - deps."xifthen" = tl."xifthen"; - deps."xint" = tl."xint"; - deps."xkcdcolors" = tl."xkcdcolors"; - deps."xltabular" = tl."xltabular"; - deps."xmpincl" = tl."xmpincl"; - deps."xnewcommand" = tl."xnewcommand"; - deps."xoptarg" = tl."xoptarg"; - deps."xpatch" = tl."xpatch"; - deps."xpeek" = tl."xpeek"; - deps."xprintlen" = tl."xprintlen"; - deps."xpunctuate" = tl."xpunctuate"; - deps."xsavebox" = tl."xsavebox"; - deps."xsim" = tl."xsim"; - deps."xstring" = tl."xstring"; - deps."xtab" = tl."xtab"; - deps."xurl" = tl."xurl"; - deps."xwatermark" = tl."xwatermark"; - deps."xytree" = tl."xytree"; - deps."yafoot" = tl."yafoot"; - deps."yagusylo" = tl."yagusylo"; - deps."yaletter" = tl."yaletter"; - deps."ycbook" = tl."ycbook"; - deps."ydoc" = tl."ydoc"; - deps."yplan" = tl."yplan"; - deps."zebra-goodies" = tl."zebra-goodies"; - deps."zed-csp" = tl."zed-csp"; - deps."ziffer" = tl."ziffer"; - deps."zref" = tl."zref"; - deps."zref-check" = tl."zref-check"; - deps."zref-clever" = tl."zref-clever"; - deps."zref-vario" = tl."zref-vario"; - deps."zwgetfdate" = tl."zwgetfdate"; - deps."zwpagelayout" = tl."zwpagelayout"; + deps = [ + "2up" + "a0poster" + "a4wide" + "a5comb" + "abraces" + "abspos" + "abstract" + "accessibility" + "accsupp" + "achemso" + "acro" + "acronym" + "acroterm" + "actuarialangle" + "actuarialsymbol" + "addfont" + "addlines" + "adjmulticol" + "adjustbox" + "adrconv" + "advdate" + "akktex" + "akletter" + "alertmessage" + "alnumsec" + "alphalph" + "alterqcm" + "altfont" + "altsubsup" + "amsaddr" + "animate" + "anonchap" + "answers" + "anyfontsize" + "appendix" + "appendixnumberbeamer" + "apptools" + "arabicfront" + "arcs" + "arraycols" + "arrayjobx" + "arraysort" + "arydshln" + "asciilist" + "askinclude" + "assignment" + "assoccnt" + "association-matrix" + "atenddvi" + "atendofenv" + "attachfile" + "aurl" + "authoraftertitle" + "authorarchive" + "authorindex" + "autofancyhdr" + "autonum" + "autopdf" + "autopuncitems" + "avremu" + "axessibility" + "background" + "bankstatement" + "bashful" + "basicarith" + "bchart" + "beamer-rl" + "beamer2thesis" + "beamerappendixnote" + "beameraudience" + "beamerauxtheme" + "beamercolorthemeowl" + "beamerdarkthemes" + "beamerposter" + "beamersubframe" + "beamertheme-arguelles" + "beamertheme-cuerna" + "beamertheme-detlevcm" + "beamertheme-epyt" + "beamertheme-focus" + "beamertheme-light" + "beamertheme-metropolis" + "beamertheme-npbt" + "beamertheme-phnompenh" + "beamertheme-pure-minimalistic" + "beamertheme-saintpetersburg" + "beamertheme-simpledarkblue" + "beamertheme-simpleplus" + "beamertheme-tcolorbox" + "beamertheme-trigon" + "beamertheme-upenn-bc" + "beamerthemeamurmaple" + "beamerthemejltree" + "beamerthemelalic" + "beamerthemenirma" + "beamerthemenord" + "bearwear" + "beaulivre" + "beton" + "bewerbung" + "bez123" + "bhcexam" + "bibletext" + "bigfoot" + "bigints" + "bilingualpages" + "biochemistry-colors" + "bithesis" + "bizcard" + "blindtext" + "blkarray" + "block" + "blowup" + "bnumexpr" + "boites" + "bold-extra" + "book-of-common-prayer" + "bookcover" + "bookest" + "booklet" + "bookshelf" + "boolexpr" + "bophook" + "boxedminipage" + "boxhandler" + "bracketkey" + "braket" + "breakurl" + "bubblesort" + "bullcntr" + "bxcalc" + "bxdpx-beamer" + "bxdvidriver" + "bxenclose" + "bxnewfont" + "bxpapersize" + "bxpdfver" + "bxtexlogo" + "calcage" + "calctab" + "calculator" + "calrsfs" + "cals" + "calxxxx-yyyy" + "cancel" + "canoniclayout" + "capt-of" + "captcont" + "captdef" + "carbohydrates" + "cases" + "casyl" + "catchfile" + "catchfilebetweentags" + "catechis" + "catoptions" + "cbcoptic" + "ccaption" + "cclicenses" + "cd" + "cd-cover" + "cdcmd" + "cdpbundl" + "cellprops" + "cellspace" + "censor" + "centeredline" + "centerlastline" + "changebar" + "changelayout" + "changelog" + "changepage" + "changes" + "chappg" + "chapterfolder" + "cheatsheet" + "checkend" + "chet" + "chextras" + "childdoc" + "chkfloat" + "chletter" + "chngcntr" + "chronology" + "circ" + "circledsteps" + "circledtext" + "classics" + "classpack" + "clefval" + "cleveref" + "clicks" + "clipboard" + "clistmap" + "clock" + "clrdblpg" + "clrstrip" + "cmdstring" + "cmdtrack" + "cmsd" + "cnltx" + "cntformats" + "cntperchap" + "codebox" + "codedoc" + "codehigh" + "codepage" + "codesection" + "collcell" + "collectbox" + "collection-latexrecommended" + "collection-pictures" + "colophon" + "color-edits" + "colordoc" + "colorframed" + "colorinfo" + "coloring" + "colorist" + "colorspace" + "colortab" + "colorwav" + "colorweb" + "colourchange" + "combelow" + "combine" + "comma" + "commado" + "commedit" + "comment" + "commonunicode" + "competences" + "concepts" + "concprog" + "conditext" + "constants" + "continue" + "contour" + "contracard" + "conv-xkv" + "cooking" + "cooking-units" + "cool" + "coolfn" + "coollist" + "coolstr" + "coolthms" + "cooltooltips" + "coop-writing" + "coordsys" + "copyedit" + "copyrightbox" + "coseoul" + "counttexruns" + "courseoutline" + "coursepaper" + "coverpage" + "cprotect" + "cprotectinside" + "crbox" + "create-theorem" + "crefthe" + "crossreference" + "crossreftools" + "crumbs" + "csquotes" + "css-colors" + "csvmerge" + "csvsimple" + "cuisine" + "currency" + "currfile" + "currvita" + "cutwin" + "cv" + "cv4tw" + "cweb-latex" + "cyber" + "cybercic" + "darkmode" + "dashbox" + "dashrule" + "dashundergaps" + "dataref" + "datatool" + "datax" + "dateiliste" + "datenumber" + "datestamp" + "datetime" + "datetime2" + "datetime2-bahasai" + "datetime2-basque" + "datetime2-breton" + "datetime2-bulgarian" + "datetime2-catalan" + "datetime2-croatian" + "datetime2-czech" + "datetime2-danish" + "datetime2-dutch" + "datetime2-en-fulltext" + "datetime2-english" + "datetime2-esperanto" + "datetime2-estonian" + "datetime2-finnish" + "datetime2-french" + "datetime2-galician" + "datetime2-german" + "datetime2-greek" + "datetime2-hebrew" + "datetime2-icelandic" + "datetime2-irish" + "datetime2-it-fulltext" + "datetime2-italian" + "datetime2-latin" + "datetime2-lsorbian" + "datetime2-magyar" + "datetime2-norsk" + "datetime2-polish" + "datetime2-portuges" + "datetime2-romanian" + "datetime2-russian" + "datetime2-samin" + "datetime2-scottish" + "datetime2-serbian" + "datetime2-slovak" + "datetime2-slovene" + "datetime2-spanish" + "datetime2-swedish" + "datetime2-turkish" + "datetime2-ukrainian" + "datetime2-usorbian" + "datetime2-welsh" + "dblfloatfix" + "dbshow" + "debate" + "decimal" + "decorule" + "delimtxt" + "democodetools" + "denisbdoc" + "diabetes-logbook" + "diagbox" + "diagnose" + "dialogl" + "dichokey" + "dimnum" + "dinbrief" + "directory" + "dirtytalk" + "dlfltxb" + "dnaseq" + "doclicense" + "docmfp" + "docmute" + "docshots" + "doctools" + "documentation" + "docutils" + "doi" + "dotarrow" + "dotlessi" + "dotseqn" + "download" + "dox" + "dpfloat" + "dprogress" + "drac" + "draftcopy" + "draftfigure" + "draftwatermark" + "dtk" + "dtxdescribe" + "dtxgallery" + "ducksay" + "duckuments" + "dvdcoll" + "dynamicnumber" + "dynblocks" + "ean13isbn" + "easy" + "easy-todo" + "easybook" + "easyfig" + "easyfloats" + "easyformat" + "easylist" + "easyreview" + "ebezier" + "ecclesiastic" + "econlipsum" + "ecv" + "ed" + "edichokey" + "edmargin" + "eemeir" + "efbox" + "egplot" + "ehhline" + "einfart" + "elegantbook" + "elegantnote" + "elegantpaper" + "elements" + "ellipsis" + "elmath" + "elocalloc" + "elpres" + "elzcards" + "emarks" + "embedall" + "embedfile" + "embrac" + "emptypage" + "emulateapj" + "endfloat" + "endheads" + "endnotes" + "endnotes-hy" + "engpron" + "engrec" + "enotez" + "enumitem" + "enumitem-zref" + "envbig" + "environ" + "envlab" + "epigraph" + "epigraph-keys" + "epiolmec" + "eq-pin2corr" + "eqell" + "eqlist" + "eqnalign" + "eqname" + "eqparbox" + "errata" + "erw-l3" + "esami" + "esdiff" + "esieecv" + "esindex" + "esint" + "esint-type1" + "etaremune" + "etextools" + "etl" + "etoc" + "eukdate" + "eulerpx" + "europasscv" + "europecv" + "everyhook" + "everypage" + "exam" + "exam-n" + "exam-randomizechoices" + "examdesign" + "example" + "examplep" + "exceltex" + "excludeonly" + "exercise" + "exercisebank" + "exercisepoints" + "exercises" + "exesheet" + "exframe" + "exp-testopt" + "expdlist" + "export" + "exsheets" + "exsol" + "extract" + "facsimile" + "factura" + "familytree" + "fancyhandout" + "fancylabel" + "fancynum" + "fancypar" + "fancyqr" + "fancyslides" + "fancytabs" + "fancytooltips" + "fbox" + "fcolumn" + "fetchcls" + "fewerfloatpages" + "ffcode" + "ffslides" + "fgruler" + "fifo-stack" + "figsize" + "filecontents" + "filecontentsdef" + "filedate" + "fileinfo" + "filemod" + "fink" + "finstrut" + "fithesis" + "fixcmex" + "fixfoot" + "fixme" + "fixmetodonotes" + "fjodor" + "flabels" + "flacards" + "flagderiv" + "flashcards" + "flashmovie" + "flexipage" + "flipbook" + "flippdf" + "floatflt" + "floatrow" + "flowfram" + "fmp" + "fmtcount" + "fn2end" + "fnbreak" + "fncychap" + "fncylab" + "fnpara" + "fnpct" + "fnumprint" + "foilhtml" + "foliono" + "fontaxes" + "fontsetup" + "fontsize" + "fonttable" + "footmisc" + "footmisx" + "footnotebackref" + "footnoterange" + "footnpag" + "forarray" + "foreign" + "forloop" + "formlett" + "forms16be" + "formular" + "fragments" + "frame" + "framed" + "frankenstein" + "frege" + "froufrou" + "ftcap" + "ftnxtra" + "fullblck" + "fullminipage" + "fullwidth" + "functional" + "fundus-calligra" + "fundus-cyr" + "fundus-sueterlin" + "fvextra" + "fwlw" + "g-brief" + "gatherenum" + "gauss" + "gcard" + "gcite" + "gender" + "genmpage" + "gensymb" + "getfiledate" + "getitems" + "gindex" + "ginpenc" + "gitfile-info" + "gitinfo" + "gitinfo2" + "gitlog" + "gitstatus" + "gitver" + "globalvals" + "gloss" + "glossaries" + "glossaries-danish" + "glossaries-dutch" + "glossaries-english" + "glossaries-estonian" + "glossaries-extra" + "glossaries-finnish" + "glossaries-french" + "glossaries-german" + "glossaries-irish" + "glossaries-italian" + "glossaries-magyar" + "glossaries-nynorsk" + "glossaries-polish" + "glossaries-portuges" + "glossaries-serbian" + "glossaries-slovene" + "glossaries-spanish" + "gmdoc" + "gmdoc-enhance" + "gmiflink" + "gmutils" + "gmverb" + "grabbox" + "gradient-text" + "grading-scheme" + "graphbox" + "graphicscache" + "graphicx-psmin" + "graphicxbox" + "graphpaper" + "grayhints" + "grfpaste" + "grid" + "grid-system" + "gridpapers" + "gridset" + "gridslides" + "gs1" + "guitlogo" + "ha-prosper" + "hackthefootline" + "halloweenmath" + "handin" + "handout" + "handoutwithnotes" + "hang" + "hanging" + "hardwrap" + "harnon-cv" + "harpoon" + "hc" + "he-she" + "hep-acronym" + "hep-float" + "hep-math" + "hep-text" + "hep-title" + "hereapplies" + "hhtensor" + "hideanswer" + "highlightlatex" + "histogr" + "hitec" + "hitreport" + "hletter" + "hobsub" + "hpsdiss" + "href-ul" + "hrefhide" + "huawei" + "hvextern" + "hvindex" + "hvlogos" + "hvpygmentex" + "hvqrurl" + "hwemoji" + "hypdestopt" + "hypdoc" + "hypdvips" + "hyper" + "hyperbar" + "hypernat" + "hyperxmp" + "hyphenat" + "identkey" + "idxcmds" + "idxlayout" + "iexec" + "ifallfalse" + "iffont" + "ifmslide" + "ifmtarg" + "ifnextok" + "ifoddpage" + "ifthenx" + "iitem" + "image-gallery" + "imakeidx" + "import" + "incgraph" + "indextools" + "inline-images" + "inlinedef" + "inlinelabel" + "inputenx" + "inputtrc" + "interactiveworkbook" + "interfaces" + "intopdf" + "inversepath" + "invoice" + "invoice-class" + "invoice2" + "iso" + "iso10303" + "isodate" + "isodoc" + "isonums" + "isopt" + "isorot" + "isotope" + "issuulinks" + "iwhdp" + "jlabels" + "jmsdelim" + "jobname-suffix" + "jslectureplanner" + "jumplines" + "jvlisting" + "kalendarium" + "kantlipsum" + "kerntest" + "keycommand" + "keyfloat" + "keyindex" + "keyparse" + "keyreader" + "keystroke" + "keyval2e" + "keyvaltable" + "kix" + "knowledge" + "koma-moderncvclassic" + "koma-script-sfs" + "komacv" + "komacv-rg" + "ktv-texdata" + "l3build" + "labbook" + "labels" + "labels4easylist" + "labelschanged" + "lambdax" + "lastpackage" + "lastpage" + "latex-amsmath-dev" + "latex-base-dev" + "latex-bin-dev" + "latex-firstaid-dev" + "latex-graphics-dev" + "latex-lab-dev" + "latex-tools-dev" + "latex-uni8" + "latexcolors" + "latexdemo" + "latexgit" + "layouts" + "lazylist" + "lccaps" + "lcd" + "lcg" + "leading" + "leaflet" + "lebhart" + "lectures" + "lectureslides" + "leftidx" + "leftindex" + "leipzig" + "lengthconvert" + "lettre" + "lettrine" + "lewis" + "lhelp" + "libgreek" + "limap" + "linegoal" + "linop" + "lipsum" + "lisp-on-tex" + "listing" + "listingsutf8" + "listlbls" + "listliketab" + "listofsymbols" + "lkproof" + "lmake" + "locality" + "logbox" + "logical-markup-utils" + "logpap" + "longfbox" + "longfigure" + "longnamefilelist" + "loops" + "lsc" + "lstaddons" + "lstfiracode" + "lt3graph" + "lt3rawobjects" + "ltablex" + "ltabptch" + "ltxdockit" + "ltxguidex" + "ltxkeys" + "ltxnew" + "ltxtools" + "lua-check-hyphen" + "lua-physical" + "luatodonotes" + "macrolist" + "macroswap" + "magaz" + "magicnum" + "magicwatermark" + "mailing" + "mailmerge" + "makebarcode" + "makebase" + "makebox" + "makecell" + "makecirc" + "makecmds" + "makecookbook" + "makedtx" + "makeglos" + "makelabels" + "makerobust" + "mandi" + "manfnt" + "manuscript" + "manyind" + "marginfit" + "marginfix" + "marginnote" + "markdown" + "mathalpha" + "mathastext" + "mathexam" + "mathfam256" + "mathfont" + "maybemath" + "mcaption" + "mceinleger" + "mcexam" + "mcite" + "mciteplus" + "mdframed" + "media4svg" + "media9" + "medstarbeamer" + "meetingmins" + "memexsupp" + "memory" + "mensa-tex" + "menu" + "menucard" + "menukeys" + "metalogox" + "metanorma" + "metastr" + "method" + "metre" + "mfirstuc" + "mftinc" + "mi-solns" + "midpage" + "mindflow" + "minibox" + "minidocument" + "minifp" + "minimalist" + "minipage-marginpar" + "minitoc" + "minorrevision" + "minted" + "minutes" + "mla-paper" + "mleftright" + "mlist" + "mmap" + "mnotes" + "moderncv" + "modernposter" + "moderntimeline" + "modref" + "modroman" + "modular" + "monofill" + "moodle" + "moreenum" + "morefloats" + "morehype" + "moresize" + "moreverb" + "morewrites" + "movie15" + "mparhack" + "mpostinl" + "msc" + "msg" + "mslapa" + "mtgreek" + "multenum" + "multiaudience" + "multibbl" + "multicap" + "multicolrule" + "multidef" + "multienv" + "multiexpand" + "multifootnote" + "multilang" + "multiple-choice" + "multirow" + "mversion" + "mwe" + "mycv" + "mylatex" + "mylatexformat" + "nag" + "nameauth" + "namespc" + "ncclatex" + "ncctools" + "needspace" + "nestquot" + "newcommand" + "newenviron" + "newfile" + "newlfm" + "newspaper" + "newunicodechar" + "newvbtm" + "newverbs" + "nextpage" + "nfssext-cfr" + "nicefilelist" + "niceframe" + "nicetext" + "nidanfloat" + "ninecolors" + "nlctdoc" + "noconflict" + "noindentafter" + "noitcrul" + "nolbreaks" + "nomencl" + "nomentbl" + "nonfloat" + "nonumonpart" + "nopageno" + "normalcolor" + "notes" + "notespages" + "notestex" + "notoccite" + "nowidow" + "nox" + "ntheorem" + "numberedblock" + "numname" + "numprint" + "numspell" + "ocg-p" + "ocgx" + "ocgx2" + "ocr-latex" + "octavo" + "oldstyle" + "onlyamsmath" + "opcit" + "opencolor" + "optidef" + "optional" + "options" + "orcidlink" + "orientation" + "outline" + "outliner" + "outlines" + "outlining" + "overlays" + "overpic" + "padcount" + "pagecolor" + "pagecont" + "pagegrid" + "pagenote" + "pagerange" + "pageslts" + "palette" + "pangram" + "paper" + "papercdcase" + "papermas" + "papertex" + "paracol" + "parades" + "paralist" + "paresse" + "parnotes" + "parsa" + "parselines" + "pas-cours" + "pas-cv" + "pas-tableur" + "patch" + "patchcmd" + "pauldoc" + "pawpict" + "pax" + "pbalance" + "pbox" + "pbsheet" + "pdf14" + "pdfcol" + "pdfcolmk" + "pdfcomment" + "pdfcprot" + "pdfmarginpar" + "pdfoverlay" + "pdfpagediff" + "pdfpc" + "pdfpc-movie" + "pdfprivacy" + "pdfreview" + "pdfscreen" + "pdfslide" + "pdfsync" + "pdfwin" + "pdfx" + "pecha" + "perltex" + "permute" + "petiteannonce" + "pgfmath-xfp" + "phfcc" + "phfextendedabstract" + "phffullpagefigure" + "phfnote" + "phfparen" + "phfqit" + "phfquotetext" + "phfsvnwatermark" + "phfthm" + "philex" + "phonenumbers" + "photo" + "photobook" + "picture" + "piff" + "pkgloader" + "placeins" + "plantslabels" + "plates" + "plweb" + "pmboxdraw" + "polynom" + "polynomial" + "polytable" + "postcards" + "poster-mac" + "postnotes" + "powerdot" + "ppr-prv" + "ppt-slides" + "practicalreports" + "precattl" + "prelim2e" + "preprint" + "pressrelease" + "prettyref" + "prettytok" + "preview" + "printlen" + "probsoln" + "program" + "progress" + "progressbar" + "projlib" + "proofread" + "properties" + "prosper" + "protex" + "protocol" + "psfragx" + "pstool" + "pstring" + "pxgreeks" + "pygmentex" + "python" + "pythonimmediate" + "qcm" + "qstest" + "qsymbols" + "quicktype" + "quiz2socrative" + "quotchap" + "quoting" + "quotmark" + "ran_toks" + "randtext" + "rccol" + "rcs-multi" + "rcsinfo" + "readablecv" + "readarray" + "realboxes" + "recipe" + "recipebook" + "recipecard" + "rectopma" + "refcheck" + "refenums" + "reflectgraphics" + "refman" + "refstyle" + "regcount" + "regexpatch" + "register" + "regstats" + "relenc" + "relsize" + "repeatindex" + "repltext" + "rescansync" + "returntogrid" + "rgltxdoc" + "rjlparshap" + "rlepsf" + "rmpage" + "robustcommand" + "robustindex" + "romanbar" + "romanbarpagenumber" + "romanneg" + "romannum" + "rotfloat" + "rotpages" + "roundbox" + "rterface" + "rtkinenc" + "rulerbox" + "rulercompass" + "runcode" + "rvwrite" + "sanitize-umlaut" + "sauerj" + "saveenv" + "savefnmark" + "savesym" + "savetrees" + "scale" + "scalebar" + "scalerel" + "scanpages" + "schedule" + "schooldocs" + "scontents" + "scrambledenvs" + "scrlayer-fancyhdr" + "scrlttr2copy" + "sdaps" + "sdrt" + "secdot" + "secnum" + "sectionbox" + "sectionbreak" + "sectsty" + "seealso" + "selectp" + "selinput" + "semantex" + "semantic" + "semantic-markup" + "semesterplanner" + "semioneside" + "semproc" + "semtex" + "sepfootnotes" + "seqsplit" + "sesstime" + "sf298" + "sffms" + "sfmath" + "shadethm" + "shadow" + "shadowtext" + "shapepar" + "shdoc" + "shipunov" + "shorttoc" + "show2e" + "showcharinbox" + "showdim" + "showexpl" + "showlabels" + "sidecap" + "sidenotes" + "sidenotesplus" + "silence" + "sillypage" + "simplecd" + "simplecv" + "simpleinvoice" + "simplivre" + "sitem" + "skb" + "skdoc" + "skeldoc" + "skeycommand" + "skeyval" + "skills" + "skrapport" + "slantsc" + "smalltableof" + "smart-eqn" + "smartref" + "smartunits" + "snapshot" + "snaptodo" + "snotez" + "soulpos" + "soulutf8" + "spacingtricks" + "spark-otf" + "sparklines" + "sphack" + "splitindex" + "spot" + "spotcolor" + "spreadtab" + "spverbatim" + "srbook-mem" + "srcltx" + "sseq" + "sslides" + "stack" + "stackengine" + "standalone" + "stdclsdv" + "stdpage" + "stealcaps" + "stex" + "storebox" + "storecmd" + "stringstrings" + "sttools" + "stubs" + "studenthandouts" + "styledcmd" + "subdepth" + "subdocs" + "subeqn" + "subeqnarray" + "subfigmat" + "subfigure" + "subfiles" + "subfloat" + "substitutefont" + "substr" + "supertabular" + "suppose" + "svg" + "svgcolor" + "svn" + "svn-multi" + "svn-prov" + "svninfo" + "swfigure" + "swungdash" + "syntax" + "syntrace" + "synttree" + "tabbing" + "tabfigures" + "tableaux" + "tablefootnote" + "tableof" + "tablestyles" + "tablists" + "tabls" + "tablvar" + "tabstackengine" + "tabto-ltx" + "tabu" + "tabularborder" + "tabularcalc" + "tabularew" + "tabularray" + "tabulary" + "tagging" + "tagpair" + "tagpdf" + "talk" + "tamefloats" + "tasks" + "tcldoc" + "tcolorbox" + "tdclock" + "technics" + "ted" + "templatetools" + "termcal" + "termlist" + "termsim" + "testhyphens" + "testidx" + "tex-label" + "tex-locale" + "texlogos" + "texmate" + "texments" + "texpower" + "texshade" + "texsurgery" + "textcsc" + "textfit" + "textmerg" + "textpos" + "textualicomma" + "texvc" + "theoremref" + "thinsp" + "thmtools" + "threadcol" + "threeparttable" + "threeparttablex" + "thumb" + "thumbs" + "thumby" + "ticket" + "tipauni" + "titlecaps" + "titlefoot" + "titlepic" + "titleref" + "titlesec" + "titling" + "to-be-determined" + "tocbibind" + "tocdata" + "tocloft" + "tocvsec2" + "todo" + "todonotes" + "tokcycle" + "tokenizer" + "toolbox" + "topfloat" + "topiclongtable" + "totalcount" + "totcount" + "totpages" + "translations" + "transparent" + "trfsigns" + "trimspaces" + "trivfloat" + "trsym" + "truncate" + "tucv" + "turnthepage" + "twoinone" + "twoup" + "txgreeks" + "type1cm" + "typed-checklist" + "typeface" + "typoaid" + "typogrid" + "uassign" + "ucs" + "uebungsblatt" + "umoline" + "underlin" + "underoverlap" + "undolabl" + "uni-titlepage" + "unicodefonttable" + "unisc" + "unitconv" + "units" + "unravel" + "upmethodology" + "upquote" + "uri" + "ushort" + "uspace" + "utf8add" + "uwmslide" + "variablelm" + "varindex" + "varsfromjobname" + "varwidth" + "vcell" + "vdmlisting" + "verbasef" + "verbatimbox" + "verbatimcopy" + "verbdef" + "verbments" + "verifiche" + "version" + "versions" + "versonotes" + "vertbars" + "vgrid" + "vhistory" + "vmargin" + "volumes" + "vpe" + "vruler" + "vtable" + "vwcol" + "wallcalendar" + "wallpaper" + "warning" + "warpcol" + "was" + "webquiz" + "widetable" + "widows-and-orphans" + "williams" + "willowtreebook" + "withargs" + "wordcount" + "wordlike" + "worksheet" + "wrapfig" + "wrapfig2" + "wrapstuff" + "wtref" + "xargs" + "xassoccnt" + "xbmks" + "xcntperchap" + "xcolor-material" + "xcolor-solarized" + "xcomment" + "xcookybooky" + "xcpdftips" + "xdoc" + "xellipsis" + "xfakebold" + "xfor" + "xhfill" + "xifthen" + "xint" + "xkcdcolors" + "xltabular" + "xmpincl" + "xnewcommand" + "xoptarg" + "xpatch" + "xpeek" + "xprintlen" + "xpunctuate" + "xsavebox" + "xsim" + "xstring" + "xtab" + "xurl" + "xwatermark" + "xytree" + "yafoot" + "yagusylo" + "yaletter" + "ycbook" + "ydoc" + "yplan" + "zebra-goodies" + "zed-csp" + "ziffer" + "zref" + "zref-check" + "zref-clever" + "zref-vario" + "zwgetfdate" + "zwpagelayout" + ]; sha512.run = "15a6199c93d8a3b2dbbde8761f9889ea8d8ea3720500a9718e405a6146a8d460828e6c1010a3436c547e1bcb28e98fb7ac964c1facad4ed6c2b843b372e9bd89"; }; "collection-latexrecommended" = { revision = 63547; stripPrefix = 0; - deps."anysize" = tl."anysize"; - deps."attachfile2" = tl."attachfile2"; - deps."beamer" = tl."beamer"; - deps."booktabs" = tl."booktabs"; - deps."breqn" = tl."breqn"; - deps."caption" = tl."caption"; - deps."cite" = tl."cite"; - deps."cmap" = tl."cmap"; - deps."collection-latex" = tl."collection-latex"; - deps."crop" = tl."crop"; - deps."ctable" = tl."ctable"; - deps."eso-pic" = tl."eso-pic"; - deps."etoolbox" = tl."etoolbox"; - deps."euenc" = tl."euenc"; - deps."euler" = tl."euler"; - deps."everysel" = tl."everysel"; - deps."everyshi" = tl."everyshi"; - deps."extsizes" = tl."extsizes"; - deps."fancybox" = tl."fancybox"; - deps."fancyref" = tl."fancyref"; - deps."fancyvrb" = tl."fancyvrb"; - deps."filehook" = tl."filehook"; - deps."float" = tl."float"; - deps."fontspec" = tl."fontspec"; - deps."footnotehyper" = tl."footnotehyper"; - deps."fp" = tl."fp"; - deps."grffile" = tl."grffile"; - deps."hologo" = tl."hologo"; - deps."index" = tl."index"; - deps."infwarerr" = tl."infwarerr"; - deps."jknapltx" = tl."jknapltx"; - deps."koma-script" = tl."koma-script"; - deps."l3experimental" = tl."l3experimental"; - deps."latexbug" = tl."latexbug"; - deps."lineno" = tl."lineno"; - deps."listings" = tl."listings"; - deps."lwarp" = tl."lwarp"; - deps."mathspec" = tl."mathspec"; - deps."mathtools" = tl."mathtools"; - deps."mdwtools" = tl."mdwtools"; - deps."memoir" = tl."memoir"; - deps."metalogo" = tl."metalogo"; - deps."microtype" = tl."microtype"; - deps."ms" = tl."ms"; - deps."newfloat" = tl."newfloat"; - deps."ntgclass" = tl."ntgclass"; - deps."parskip" = tl."parskip"; - deps."pdflscape" = tl."pdflscape"; - deps."pdfmanagement-testphase" = tl."pdfmanagement-testphase"; - deps."pdfpages" = tl."pdfpages"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."polyglossia" = tl."polyglossia"; - deps."psfrag" = tl."psfrag"; - deps."ragged2e" = tl."ragged2e"; - deps."rcs" = tl."rcs"; - deps."sansmath" = tl."sansmath"; - deps."section" = tl."section"; - deps."seminar" = tl."seminar"; - deps."sepnum" = tl."sepnum"; - deps."setspace" = tl."setspace"; - deps."subfig" = tl."subfig"; - deps."textcase" = tl."textcase"; - deps."thumbpdf" = tl."thumbpdf"; - deps."translator" = tl."translator"; - deps."typehtml" = tl."typehtml"; - deps."ucharcat" = tl."ucharcat"; - deps."underscore" = tl."underscore"; - deps."unicode-math" = tl."unicode-math"; - deps."xcolor" = tl."xcolor"; - deps."xkeyval" = tl."xkeyval"; - deps."xltxtra" = tl."xltxtra"; - deps."xunicode" = tl."xunicode"; + deps = [ + "anysize" + "attachfile2" + "beamer" + "booktabs" + "breqn" + "caption" + "cite" + "cmap" + "collection-latex" + "crop" + "ctable" + "eso-pic" + "etoolbox" + "euenc" + "euler" + "everysel" + "everyshi" + "extsizes" + "fancybox" + "fancyref" + "fancyvrb" + "filehook" + "float" + "fontspec" + "footnotehyper" + "fp" + "grffile" + "hologo" + "index" + "infwarerr" + "jknapltx" + "koma-script" + "l3experimental" + "latexbug" + "lineno" + "listings" + "lwarp" + "mathspec" + "mathtools" + "mdwtools" + "memoir" + "metalogo" + "microtype" + "ms" + "newfloat" + "ntgclass" + "parskip" + "pdflscape" + "pdfmanagement-testphase" + "pdfpages" + "pdftexcmds" + "polyglossia" + "psfrag" + "ragged2e" + "rcs" + "sansmath" + "section" + "seminar" + "sepnum" + "setspace" + "subfig" + "textcase" + "thumbpdf" + "translator" + "typehtml" + "ucharcat" + "underscore" + "unicode-math" + "xcolor" + "xkeyval" + "xltxtra" + "xunicode" + ]; sha512.run = "4e445e9830476058f6b878f306516de2fdf1b174011dd79e6a7d875adf104f2a15cdceefc7045a8ae404399d3a08d8cd4eda8fc5af317ea043b03e6c648a73b1"; }; "collection-luatex" = { revision = 65354; stripPrefix = 0; - deps."addliga" = tl."addliga"; - deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua"; - deps."barracuda" = tl."barracuda"; - deps."bezierplot" = tl."bezierplot"; - deps."checkcites" = tl."checkcites"; - deps."chickenize" = tl."chickenize"; - deps."chinese-jfm" = tl."chinese-jfm"; - deps."cloze" = tl."cloze"; - deps."collection-basic" = tl."collection-basic"; - deps."combofont" = tl."combofont"; - deps."cstypo" = tl."cstypo"; - deps."ctablestack" = tl."ctablestack"; - deps."ekdosis" = tl."ekdosis"; - deps."emoji" = tl."emoji"; - deps."emojicite" = tl."emojicite"; - deps."enigma" = tl."enigma"; - deps."innerscript" = tl."innerscript"; - deps."interpreter" = tl."interpreter"; - deps."kanaparser" = tl."kanaparser"; - deps."ligtype" = tl."ligtype"; - deps."linebreaker" = tl."linebreaker"; - deps."lt3luabridge" = tl."lt3luabridge"; - deps."lua-typo" = tl."lua-typo"; - deps."lua-uca" = tl."lua-uca"; - deps."lua-ul" = tl."lua-ul"; - deps."lua-uni-algos" = tl."lua-uni-algos"; - deps."lua-visual-debug" = tl."lua-visual-debug"; - deps."lua-widow-control" = tl."lua-widow-control"; - deps."luaaddplot" = tl."luaaddplot"; - deps."luacas" = tl."luacas"; - deps."luacensor" = tl."luacensor"; - deps."luacode" = tl."luacode"; - deps."luacolor" = tl."luacolor"; - deps."luahyphenrules" = tl."luahyphenrules"; - deps."luaimageembed" = tl."luaimageembed"; - deps."luaindex" = tl."luaindex"; - deps."luainputenc" = tl."luainputenc"; - deps."luaintro" = tl."luaintro"; - deps."luakeys" = tl."luakeys"; - deps."lualatex-doc" = tl."lualatex-doc"; - deps."lualatex-math" = tl."lualatex-math"; - deps."lualatex-truncate" = tl."lualatex-truncate"; - deps."lualibs" = tl."lualibs"; - deps."luamathalign" = tl."luamathalign"; - deps."luamodulartables" = tl."luamodulartables"; - deps."luamplib" = tl."luamplib"; - deps."luaoptions" = tl."luaoptions"; - deps."luaotfload" = tl."luaotfload"; - deps."luapackageloader" = tl."luapackageloader"; - deps."luaprogtable" = tl."luaprogtable"; - deps."luaquotes" = tl."luaquotes"; - deps."luarandom" = tl."luarandom"; - deps."luatex85" = tl."luatex85"; - deps."luatexbase" = tl."luatexbase"; - deps."luatexko" = tl."luatexko"; - deps."luatextra" = tl."luatextra"; - deps."luatruthtable" = tl."luatruthtable"; - deps."luavlna" = tl."luavlna"; - deps."luaxml" = tl."luaxml"; - deps."lutabulartools" = tl."lutabulartools"; - deps."minim" = tl."minim"; - deps."minim-math" = tl."minim-math"; - deps."minim-mp" = tl."minim-mp"; - deps."minim-pdf" = tl."minim-pdf"; - deps."minim-xmp" = tl."minim-xmp"; - deps."newpax" = tl."newpax"; - deps."nodetree" = tl."nodetree"; - deps."odsfile" = tl."odsfile"; - deps."optex" = tl."optex"; - deps."pdfarticle" = tl."pdfarticle"; - deps."pdfextra" = tl."pdfextra"; - deps."penlight" = tl."penlight"; - deps."piton" = tl."piton"; - deps."placeat" = tl."placeat"; - deps."plantuml" = tl."plantuml"; - deps."pyluatex" = tl."pyluatex"; - deps."scikgtex" = tl."scikgtex"; - deps."selnolig" = tl."selnolig"; - deps."showhyphenation" = tl."showhyphenation"; - deps."showkerning" = tl."showkerning"; - deps."spacekern" = tl."spacekern"; - deps."spelling" = tl."spelling"; - deps."stricttex" = tl."stricttex"; - deps."truthtable" = tl."truthtable"; - deps."tsvtemplate" = tl."tsvtemplate"; - deps."typewriter" = tl."typewriter"; - deps."uninormalize" = tl."uninormalize"; - deps."yamlvars" = tl."yamlvars"; + deps = [ + "addliga" + "auto-pst-pdf-lua" + "barracuda" + "bezierplot" + "checkcites" + "chickenize" + "chinese-jfm" + "cloze" + "collection-basic" + "combofont" + "cstypo" + "ctablestack" + "ekdosis" + "emoji" + "emojicite" + "enigma" + "innerscript" + "interpreter" + "kanaparser" + "ligtype" + "linebreaker" + "lt3luabridge" + "lua-typo" + "lua-uca" + "lua-ul" + "lua-uni-algos" + "lua-visual-debug" + "lua-widow-control" + "luaaddplot" + "luacas" + "luacensor" + "luacode" + "luacolor" + "luahyphenrules" + "luaimageembed" + "luaindex" + "luainputenc" + "luaintro" + "luakeys" + "lualatex-doc" + "lualatex-math" + "lualatex-truncate" + "lualibs" + "luamathalign" + "luamodulartables" + "luamplib" + "luaoptions" + "luaotfload" + "luapackageloader" + "luaprogtable" + "luaquotes" + "luarandom" + "luatex85" + "luatexbase" + "luatexko" + "luatextra" + "luatruthtable" + "luavlna" + "luaxml" + "lutabulartools" + "minim" + "minim-math" + "minim-mp" + "minim-pdf" + "minim-xmp" + "newpax" + "nodetree" + "odsfile" + "optex" + "pdfarticle" + "pdfextra" + "penlight" + "piton" + "placeat" + "plantuml" + "pyluatex" + "scikgtex" + "selnolig" + "showhyphenation" + "showkerning" + "spacekern" + "spelling" + "stricttex" + "truthtable" + "tsvtemplate" + "typewriter" + "uninormalize" + "yamlvars" + ]; sha512.run = "44e1041adf14954f5da71342247dd8863057ff52db1a05525c01caa87a4f27084580aab0b375c96bdb05e4ab718afebfdd2254146ed1cd69b2abccfa975e0330"; }; "collection-mathscience" = { revision = 65312; stripPrefix = 0; - deps."12many" = tl."12many"; - deps."accents" = tl."accents"; - deps."alg" = tl."alg"; - deps."algobox" = tl."algobox"; - deps."algorithm2e" = tl."algorithm2e"; - deps."algorithmicx" = tl."algorithmicx"; - deps."algorithms" = tl."algorithms"; - deps."algpseudocodex" = tl."algpseudocodex"; - deps."algxpar" = tl."algxpar"; - deps."aligned-overset" = tl."aligned-overset"; - deps."amscdx" = tl."amscdx"; - deps."amstex" = tl."amstex"; - deps."annotate-equations" = tl."annotate-equations"; - deps."apxproof" = tl."apxproof"; - deps."autobreak" = tl."autobreak"; - deps."axodraw2" = tl."axodraw2"; - deps."backnaur" = tl."backnaur"; - deps."begriff" = tl."begriff"; - deps."binomexp" = tl."binomexp"; - deps."biocon" = tl."biocon"; - deps."bitpattern" = tl."bitpattern"; - deps."bodeplot" = tl."bodeplot"; - deps."bohr" = tl."bohr"; - deps."boldtensors" = tl."boldtensors"; - deps."bosisio" = tl."bosisio"; - deps."bpchem" = tl."bpchem"; - deps."bropd" = tl."bropd"; - deps."bussproofs" = tl."bussproofs"; - deps."bussproofs-extra" = tl."bussproofs-extra"; - deps."bytefield" = tl."bytefield"; - deps."calculation" = tl."calculation"; - deps."cartonaugh" = tl."cartonaugh"; - deps."cascade" = tl."cascade"; - deps."causets" = tl."causets"; - deps."ccfonts" = tl."ccfonts"; - deps."ccool" = tl."ccool"; - deps."chemarrow" = tl."chemarrow"; - deps."chemcompounds" = tl."chemcompounds"; - deps."chemcono" = tl."chemcono"; - deps."chemexec" = tl."chemexec"; - deps."chemformula" = tl."chemformula"; - deps."chemgreek" = tl."chemgreek"; - deps."chemmacros" = tl."chemmacros"; - deps."chemnum" = tl."chemnum"; - deps."chemobabel" = tl."chemobabel"; - deps."chemplants" = tl."chemplants"; - deps."chemschemex" = tl."chemschemex"; - deps."chemsec" = tl."chemsec"; - deps."chemstyle" = tl."chemstyle"; - deps."clrscode" = tl."clrscode"; - deps."clrscode3e" = tl."clrscode3e"; - deps."codeanatomy" = tl."codeanatomy"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-latex" = tl."collection-latex"; - deps."commath" = tl."commath"; - deps."commutative-diagrams" = tl."commutative-diagrams"; - deps."complexity" = tl."complexity"; - deps."computational-complexity" = tl."computational-complexity"; - deps."concmath" = tl."concmath"; - deps."concrete" = tl."concrete"; - deps."conteq" = tl."conteq"; - deps."correctmathalign" = tl."correctmathalign"; - deps."cryptocode" = tl."cryptocode"; - deps."csassignments" = tl."csassignments"; - deps."cvss" = tl."cvss"; - deps."decision-table" = tl."decision-table"; - deps."delim" = tl."delim"; - deps."delimseasy" = tl."delimseasy"; - deps."delimset" = tl."delimset"; - deps."derivative" = tl."derivative"; - deps."diffcoeff" = tl."diffcoeff"; - deps."digiconfigs" = tl."digiconfigs"; - deps."dijkstra" = tl."dijkstra"; - deps."drawmatrix" = tl."drawmatrix"; - deps."drawstack" = tl."drawstack"; - deps."dyntree" = tl."dyntree"; - deps."easing" = tl."easing"; - deps."ebproof" = tl."ebproof"; - deps."econometrics" = tl."econometrics"; - deps."eltex" = tl."eltex"; - deps."emf" = tl."emf"; - deps."endiagram" = tl."endiagram"; - deps."engtlc" = tl."engtlc"; - deps."eolang" = tl."eolang"; - deps."eqexpl" = tl."eqexpl"; - deps."eqnarray" = tl."eqnarray"; - deps."eqnnumwarn" = tl."eqnnumwarn"; - deps."euclideangeometry" = tl."euclideangeometry"; - deps."extarrows" = tl."extarrows"; - deps."extpfeil" = tl."extpfeil"; - deps."faktor" = tl."faktor"; - deps."fascicules" = tl."fascicules"; - deps."fixdif" = tl."fixdif"; - deps."fixmath" = tl."fixmath"; - deps."fnspe" = tl."fnspe"; - deps."formal-grammar" = tl."formal-grammar"; - deps."fouridx" = tl."fouridx"; - deps."functan" = tl."functan"; - deps."galois" = tl."galois"; - deps."gastex" = tl."gastex"; - deps."gene-logic" = tl."gene-logic"; - deps."ghsystem" = tl."ghsystem"; - deps."glosmathtools" = tl."glosmathtools"; - deps."gotoh" = tl."gotoh"; - deps."grundgesetze" = tl."grundgesetze"; - deps."gu" = tl."gu"; - deps."helmholtz-ellis-ji-notation" = tl."helmholtz-ellis-ji-notation"; - deps."hep" = tl."hep"; - deps."hep-reference" = tl."hep-reference"; - deps."hepnames" = tl."hepnames"; - deps."hepparticles" = tl."hepparticles"; - deps."hepthesis" = tl."hepthesis"; - deps."hepunits" = tl."hepunits"; - deps."ibrackets" = tl."ibrackets"; - deps."includernw" = tl."includernw"; - deps."interval" = tl."interval"; - deps."ionumbers" = tl."ionumbers"; - deps."isomath" = tl."isomath"; - deps."jkmath" = tl."jkmath"; - deps."jupynotex" = tl."jupynotex"; - deps."karnaugh" = tl."karnaugh"; - deps."karnaugh-map" = tl."karnaugh-map"; - deps."karnaughmap" = tl."karnaughmap"; - deps."kvmap" = tl."kvmap"; - deps."letterswitharrows" = tl."letterswitharrows"; - deps."lie-hasse" = tl."lie-hasse"; - deps."logicproof" = tl."logicproof"; - deps."longdivision" = tl."longdivision"; - deps."lpform" = tl."lpform"; - deps."lplfitch" = tl."lplfitch"; - deps."lstbayes" = tl."lstbayes"; - deps."mathcommand" = tl."mathcommand"; - deps."mathcomp" = tl."mathcomp"; - deps."mathfixs" = tl."mathfixs"; - deps."mathlig" = tl."mathlig"; - deps."mathpartir" = tl."mathpartir"; - deps."mathpunctspace" = tl."mathpunctspace"; - deps."mathsemantics" = tl."mathsemantics"; - deps."matlab-prettifier" = tl."matlab-prettifier"; - deps."matrix-skeleton" = tl."matrix-skeleton"; - deps."mattens" = tl."mattens"; - deps."mecaso" = tl."mecaso"; - deps."membranecomputing" = tl."membranecomputing"; - deps."memorygraphs" = tl."memorygraphs"; - deps."messagepassing" = tl."messagepassing"; - deps."mgltex" = tl."mgltex"; - deps."mhchem" = tl."mhchem"; - deps."mhequ" = tl."mhequ"; - deps."miller" = tl."miller"; - deps."mismath" = tl."mismath"; - deps."multiobjective" = tl."multiobjective"; - deps."namedtensor" = tl."namedtensor"; - deps."natded" = tl."natded"; - deps."nath" = tl."nath"; - deps."nchairx" = tl."nchairx"; - deps."nicematrix" = tl."nicematrix"; - deps."nuc" = tl."nuc"; - deps."nucleardata" = tl."nucleardata"; - deps."numerica" = tl."numerica"; - deps."numerica-plus" = tl."numerica-plus"; - deps."numerica-tables" = tl."numerica-tables"; - deps."objectz" = tl."objectz"; - deps."oplotsymbl" = tl."oplotsymbl"; - deps."ot-tableau" = tl."ot-tableau"; - deps."oubraces" = tl."oubraces"; - deps."pascaltriangle" = tl."pascaltriangle"; - deps."perfectcut" = tl."perfectcut"; - deps."pfdicons" = tl."pfdicons"; - deps."physconst" = tl."physconst"; - deps."physics" = tl."physics"; - deps."physunits" = tl."physunits"; - deps."pinoutikz" = tl."pinoutikz"; - deps."pm-isomath" = tl."pm-isomath"; - deps."polexpr" = tl."polexpr"; - deps."prftree" = tl."prftree"; - deps."principia" = tl."principia"; - deps."proba" = tl."proba"; - deps."proof-at-the-end" = tl."proof-at-the-end"; - deps."prooftrees" = tl."prooftrees"; - deps."pseudo" = tl."pseudo"; - deps."pseudocode" = tl."pseudocode"; - deps."pythonhighlight" = tl."pythonhighlight"; - deps."qsharp" = tl."qsharp"; - deps."rank-2-roots" = tl."rank-2-roots"; - deps."rbt-mathnotes" = tl."rbt-mathnotes"; - deps."rec-thy" = tl."rec-thy"; - deps."rest-api" = tl."rest-api"; - deps."revquantum" = tl."revquantum"; - deps."ribbonproofs" = tl."ribbonproofs"; - deps."rmathbr" = tl."rmathbr"; - deps."sankey" = tl."sankey"; - deps."sasnrdisplay" = tl."sasnrdisplay"; - deps."sciposter" = tl."sciposter"; - deps."sclang-prettifier" = tl."sclang-prettifier"; - deps."scratchx" = tl."scratchx"; - deps."sesamanuel" = tl."sesamanuel"; - deps."sfg" = tl."sfg"; - deps."shuffle" = tl."shuffle"; - deps."simplebnf" = tl."simplebnf"; - deps."simpler-wick" = tl."simpler-wick"; - deps."simples-matrices" = tl."simples-matrices"; - deps."simplewick" = tl."simplewick"; - deps."sistyle" = tl."sistyle"; - deps."siunits" = tl."siunits"; - deps."siunitx" = tl."siunitx"; - deps."skmath" = tl."skmath"; - deps."spalign" = tl."spalign"; - deps."spbmark" = tl."spbmark"; - deps."stanli" = tl."stanli"; - deps."statex" = tl."statex"; - deps."statex2" = tl."statex2"; - deps."statistics" = tl."statistics"; - deps."statistik" = tl."statistik"; - deps."statmath" = tl."statmath"; - deps."steinmetz" = tl."steinmetz"; - deps."stmaryrd" = tl."stmaryrd"; - deps."structmech" = tl."structmech"; - deps."struktex" = tl."struktex"; - deps."substances" = tl."substances"; - deps."subsupscripts" = tl."subsupscripts"; - deps."subtext" = tl."subtext"; - deps."susy" = tl."susy"; - deps."syllogism" = tl."syllogism"; - deps."sympytexpackage" = tl."sympytexpackage"; - deps."synproof" = tl."synproof"; - deps."t-angles" = tl."t-angles"; - deps."tablor" = tl."tablor"; - deps."tensind" = tl."tensind"; - deps."tensor" = tl."tensor"; - deps."tex-ewd" = tl."tex-ewd"; - deps."textgreek" = tl."textgreek"; - deps."textopo" = tl."textopo"; - deps."thermodynamics" = tl."thermodynamics"; - deps."thmbox" = tl."thmbox"; - deps."tiscreen" = tl."tiscreen"; - deps."turnstile" = tl."turnstile"; - deps."ulqda" = tl."ulqda"; - deps."unitsdef" = tl."unitsdef"; - deps."venn" = tl."venn"; - deps."witharrows" = tl."witharrows"; - deps."xymtex" = tl."xymtex"; - deps."yhmath" = tl."yhmath"; - deps."youngtab" = tl."youngtab"; - deps."yquant" = tl."yquant"; - deps."ytableau" = tl."ytableau"; - deps."zx-calculus" = tl."zx-calculus"; + deps = [ + "12many" + "accents" + "alg" + "algobox" + "algorithm2e" + "algorithmicx" + "algorithms" + "algpseudocodex" + "algxpar" + "aligned-overset" + "amscdx" + "amstex" + "annotate-equations" + "apxproof" + "autobreak" + "axodraw2" + "backnaur" + "begriff" + "binomexp" + "biocon" + "bitpattern" + "bodeplot" + "bohr" + "boldtensors" + "bosisio" + "bpchem" + "bropd" + "bussproofs" + "bussproofs-extra" + "bytefield" + "calculation" + "cartonaugh" + "cascade" + "causets" + "ccfonts" + "ccool" + "chemarrow" + "chemcompounds" + "chemcono" + "chemexec" + "chemformula" + "chemgreek" + "chemmacros" + "chemnum" + "chemobabel" + "chemplants" + "chemschemex" + "chemsec" + "chemstyle" + "clrscode" + "clrscode3e" + "codeanatomy" + "collection-fontsrecommended" + "collection-latex" + "commath" + "commutative-diagrams" + "complexity" + "computational-complexity" + "concmath" + "concrete" + "conteq" + "correctmathalign" + "cryptocode" + "csassignments" + "cvss" + "decision-table" + "delim" + "delimseasy" + "delimset" + "derivative" + "diffcoeff" + "digiconfigs" + "dijkstra" + "drawmatrix" + "drawstack" + "dyntree" + "easing" + "ebproof" + "econometrics" + "eltex" + "emf" + "endiagram" + "engtlc" + "eolang" + "eqexpl" + "eqnarray" + "eqnnumwarn" + "euclideangeometry" + "extarrows" + "extpfeil" + "faktor" + "fascicules" + "fixdif" + "fixmath" + "fnspe" + "formal-grammar" + "fouridx" + "functan" + "galois" + "gastex" + "gene-logic" + "ghsystem" + "glosmathtools" + "gotoh" + "grundgesetze" + "gu" + "helmholtz-ellis-ji-notation" + "hep" + "hep-reference" + "hepnames" + "hepparticles" + "hepthesis" + "hepunits" + "ibrackets" + "includernw" + "interval" + "ionumbers" + "isomath" + "jkmath" + "jupynotex" + "karnaugh" + "karnaugh-map" + "karnaughmap" + "kvmap" + "letterswitharrows" + "lie-hasse" + "logicproof" + "longdivision" + "lpform" + "lplfitch" + "lstbayes" + "mathcommand" + "mathcomp" + "mathfixs" + "mathlig" + "mathpartir" + "mathpunctspace" + "mathsemantics" + "matlab-prettifier" + "matrix-skeleton" + "mattens" + "mecaso" + "membranecomputing" + "memorygraphs" + "messagepassing" + "mgltex" + "mhchem" + "mhequ" + "miller" + "mismath" + "multiobjective" + "namedtensor" + "natded" + "nath" + "nchairx" + "nicematrix" + "nuc" + "nucleardata" + "numerica" + "numerica-plus" + "numerica-tables" + "objectz" + "oplotsymbl" + "ot-tableau" + "oubraces" + "pascaltriangle" + "perfectcut" + "pfdicons" + "physconst" + "physics" + "physunits" + "pinoutikz" + "pm-isomath" + "polexpr" + "prftree" + "principia" + "proba" + "proof-at-the-end" + "prooftrees" + "pseudo" + "pseudocode" + "pythonhighlight" + "qsharp" + "rank-2-roots" + "rbt-mathnotes" + "rec-thy" + "rest-api" + "revquantum" + "ribbonproofs" + "rmathbr" + "sankey" + "sasnrdisplay" + "sciposter" + "sclang-prettifier" + "scratchx" + "sesamanuel" + "sfg" + "shuffle" + "simplebnf" + "simpler-wick" + "simples-matrices" + "simplewick" + "sistyle" + "siunits" + "siunitx" + "skmath" + "spalign" + "spbmark" + "stanli" + "statex" + "statex2" + "statistics" + "statistik" + "statmath" + "steinmetz" + "stmaryrd" + "structmech" + "struktex" + "substances" + "subsupscripts" + "subtext" + "susy" + "syllogism" + "sympytexpackage" + "synproof" + "t-angles" + "tablor" + "tensind" + "tensor" + "tex-ewd" + "textgreek" + "textopo" + "thermodynamics" + "thmbox" + "tiscreen" + "turnstile" + "ulqda" + "unitsdef" + "venn" + "witharrows" + "xymtex" + "yhmath" + "youngtab" + "yquant" + "ytableau" + "zx-calculus" + ]; sha512.run = "30620c4a12471f0b880cb45857c52e2540984852c5f17753ef5dde259e92224fcad2f1c3dcae357c8475aacf4552b6704a67e99331edc073ffbd595e47a533b1"; }; "collection-metapost" = { revision = 64878; stripPrefix = 0; - deps."automata" = tl."automata"; - deps."bbcard" = tl."bbcard"; - deps."blockdraw_mp" = tl."blockdraw_mp"; - deps."bpolynomial" = tl."bpolynomial"; - deps."cmarrows" = tl."cmarrows"; - deps."collection-basic" = tl."collection-basic"; - deps."drv" = tl."drv"; - deps."dviincl" = tl."dviincl"; - deps."emp" = tl."emp"; - deps."epsincl" = tl."epsincl"; - deps."expressg" = tl."expressg"; - deps."exteps" = tl."exteps"; - deps."featpost" = tl."featpost"; - deps."feynmf" = tl."feynmf"; - deps."feynmp-auto" = tl."feynmp-auto"; - deps."fiziko" = tl."fiziko"; - deps."garrigues" = tl."garrigues"; - deps."gmp" = tl."gmp"; - deps."hatching" = tl."hatching"; - deps."hershey-mp" = tl."hershey-mp"; - deps."latexmp" = tl."latexmp"; - deps."mcf2graph" = tl."mcf2graph"; - deps."metago" = tl."metago"; - deps."metaobj" = tl."metaobj"; - deps."metaplot" = tl."metaplot"; - deps."metapost" = tl."metapost"; - deps."metapost-colorbrewer" = tl."metapost-colorbrewer"; - deps."metauml" = tl."metauml"; - deps."mfpic" = tl."mfpic"; - deps."mfpic4ode" = tl."mfpic4ode"; - deps."minim-hatching" = tl."minim-hatching"; - deps."mp3d" = tl."mp3d"; - deps."mparrows" = tl."mparrows"; - deps."mpattern" = tl."mpattern"; - deps."mpcolornames" = tl."mpcolornames"; - deps."mpgraphics" = tl."mpgraphics"; - deps."mptrees" = tl."mptrees"; - deps."piechartmp" = tl."piechartmp"; - deps."repere" = tl."repere"; - deps."roex" = tl."roex"; - deps."roundrect" = tl."roundrect"; - deps."shapes" = tl."shapes"; - deps."slideshow" = tl."slideshow"; - deps."splines" = tl."splines"; - deps."suanpan" = tl."suanpan"; - deps."textpath" = tl."textpath"; - deps."threeddice" = tl."threeddice"; + deps = [ + "automata" + "bbcard" + "blockdraw_mp" + "bpolynomial" + "cmarrows" + "collection-basic" + "drv" + "dviincl" + "emp" + "epsincl" + "expressg" + "exteps" + "featpost" + "feynmf" + "feynmp-auto" + "fiziko" + "garrigues" + "gmp" + "hatching" + "hershey-mp" + "latexmp" + "mcf2graph" + "metago" + "metaobj" + "metaplot" + "metapost" + "metapost-colorbrewer" + "metauml" + "mfpic" + "mfpic4ode" + "minim-hatching" + "mp3d" + "mparrows" + "mpattern" + "mpcolornames" + "mpgraphics" + "mptrees" + "piechartmp" + "repere" + "roex" + "roundrect" + "shapes" + "slideshow" + "splines" + "suanpan" + "textpath" + "threeddice" + ]; sha512.run = "c17510f676b4aec1887893083e00438be77d879e44e52aedeb040ae1eb593d1d688fefc8eaa48939db0f83e8d1743cea3030490e73d8c3d65689b3e4db21f016"; }; "collection-music" = { revision = 64966; stripPrefix = 0; - deps."abc" = tl."abc"; - deps."autosp" = tl."autosp"; - deps."bagpipe" = tl."bagpipe"; - deps."chordbars" = tl."chordbars"; - deps."chordbox" = tl."chordbox"; - deps."collection-latex" = tl."collection-latex"; - deps."ddphonism" = tl."ddphonism"; - deps."figbas" = tl."figbas"; - deps."gchords" = tl."gchords"; - deps."gregoriotex" = tl."gregoriotex"; - deps."gtrcrd" = tl."gtrcrd"; - deps."guitar" = tl."guitar"; - deps."guitarchordschemes" = tl."guitarchordschemes"; - deps."guitartabs" = tl."guitartabs"; - deps."harmony" = tl."harmony"; - deps."latex4musicians" = tl."latex4musicians"; - deps."leadsheets" = tl."leadsheets"; - deps."lilyglyphs" = tl."lilyglyphs"; - deps."lyluatex" = tl."lyluatex"; - deps."m-tx" = tl."m-tx"; - deps."musical" = tl."musical"; - deps."musicography" = tl."musicography"; - deps."musixguit" = tl."musixguit"; - deps."musixtex" = tl."musixtex"; - deps."musixtex-fonts" = tl."musixtex-fonts"; - deps."musixtnt" = tl."musixtnt"; - deps."octave" = tl."octave"; - deps."piano" = tl."piano"; - deps."pmx" = tl."pmx"; - deps."pmxchords" = tl."pmxchords"; - deps."songbook" = tl."songbook"; - deps."songproj" = tl."songproj"; - deps."songs" = tl."songs"; - deps."xml2pmx" = tl."xml2pmx"; - deps."xpiano" = tl."xpiano"; + deps = [ + "abc" + "autosp" + "bagpipe" + "chordbars" + "chordbox" + "collection-latex" + "ddphonism" + "figbas" + "gchords" + "gregoriotex" + "gtrcrd" + "guitar" + "guitarchordschemes" + "guitartabs" + "harmony" + "latex4musicians" + "leadsheets" + "lilyglyphs" + "lyluatex" + "m-tx" + "musical" + "musicography" + "musixguit" + "musixtex" + "musixtex-fonts" + "musixtnt" + "octave" + "piano" + "pmx" + "pmxchords" + "songbook" + "songproj" + "songs" + "xml2pmx" + "xpiano" + ]; sha512.run = "5d416eca3382c36a869959d850de6ffb4606c1a15c5adeae2ed0f8800c4a95cb068b4fbacb8d835ba4b0b4880b05f603b4e0ba36b98e357ec5ba637d0fb59100"; }; "collection-pictures" = { revision = 65359; stripPrefix = 0; - deps."adigraph" = tl."adigraph"; - deps."aobs-tikz" = tl."aobs-tikz"; - deps."askmaps" = tl."askmaps"; - deps."asyfig" = tl."asyfig"; - deps."asypictureb" = tl."asypictureb"; - deps."autoarea" = tl."autoarea"; - deps."bardiag" = tl."bardiag"; - deps."beamerswitch" = tl."beamerswitch"; - deps."binarytree" = tl."binarytree"; - deps."blochsphere" = tl."blochsphere"; - deps."bloques" = tl."bloques"; - deps."blox" = tl."blox"; - deps."bodegraph" = tl."bodegraph"; - deps."bondgraph" = tl."bondgraph"; - deps."bondgraphs" = tl."bondgraphs"; - deps."braids" = tl."braids"; - deps."bxeepic" = tl."bxeepic"; - deps."byo-twemojis" = tl."byo-twemojis"; - deps."byrne" = tl."byrne"; - deps."cachepic" = tl."cachepic"; - deps."callouts" = tl."callouts"; - deps."celtic" = tl."celtic"; - deps."chemfig" = tl."chemfig"; - deps."circuit-macros" = tl."circuit-macros"; - deps."circuitikz" = tl."circuitikz"; - deps."coffeestains" = tl."coffeestains"; - deps."collection-basic" = tl."collection-basic"; - deps."combinedgraphics" = tl."combinedgraphics"; - deps."curve" = tl."curve"; - deps."curve2e" = tl."curve2e"; - deps."curves" = tl."curves"; - deps."dcpic" = tl."dcpic"; - deps."diagmac2" = tl."diagmac2"; - deps."ditaa" = tl."ditaa"; - deps."doc-pictex" = tl."doc-pictex"; - deps."dot2texi" = tl."dot2texi"; - deps."dottex" = tl."dottex"; - deps."dpcircling" = tl."dpcircling"; - deps."dratex" = tl."dratex"; - deps."drs" = tl."drs"; - deps."duotenzor" = tl."duotenzor"; - deps."dynkin-diagrams" = tl."dynkin-diagrams"; - deps."ecgdraw" = tl."ecgdraw"; - deps."eepic" = tl."eepic"; - deps."ellipse" = tl."ellipse"; - deps."endofproofwd" = tl."endofproofwd"; - deps."epspdf" = tl."epspdf"; - deps."epspdfconversion" = tl."epspdfconversion"; - deps."esk" = tl."esk"; - deps."euflag" = tl."euflag"; - deps."fast-diagram" = tl."fast-diagram"; - deps."fig4latex" = tl."fig4latex"; - deps."figchild" = tl."figchild"; - deps."figput" = tl."figput"; - deps."fitbox" = tl."fitbox"; - deps."flowchart" = tl."flowchart"; - deps."forest" = tl."forest"; - deps."genealogytree" = tl."genealogytree"; - deps."getmap" = tl."getmap"; - deps."gincltex" = tl."gincltex"; - deps."gnuplottex" = tl."gnuplottex"; - deps."gradientframe" = tl."gradientframe"; - deps."grafcet" = tl."grafcet"; - deps."graph35" = tl."graph35"; - deps."graphicxpsd" = tl."graphicxpsd"; - deps."graphviz" = tl."graphviz"; - deps."gtrlib-largetrees" = tl."gtrlib-largetrees"; - deps."harveyballs" = tl."harveyballs"; - deps."here" = tl."here"; - deps."hf-tikz" = tl."hf-tikz"; - deps."hobby" = tl."hobby"; - deps."hvfloat" = tl."hvfloat"; - deps."istgame" = tl."istgame"; - deps."kblocks" = tl."kblocks"; - deps."kinematikz" = tl."kinematikz"; - deps."knitting" = tl."knitting"; - deps."knittingpattern" = tl."knittingpattern"; - deps."ladder" = tl."ladder"; - deps."lapdf" = tl."lapdf"; - deps."latex-make" = tl."latex-make"; - deps."liftarm" = tl."liftarm"; - deps."lpic" = tl."lpic"; - deps."lroundrect" = tl."lroundrect"; - deps."luamesh" = tl."luamesh"; - deps."luasseq" = tl."luasseq"; - deps."maker" = tl."maker"; - deps."makeshape" = tl."makeshape"; - deps."mathspic" = tl."mathspic"; - deps."mercatormap" = tl."mercatormap"; - deps."milsymb" = tl."milsymb"; - deps."miniplot" = tl."miniplot"; - deps."mkpic" = tl."mkpic"; - deps."modiagram" = tl."modiagram"; - deps."neuralnetwork" = tl."neuralnetwork"; - deps."nl-interval" = tl."nl-interval"; - deps."nndraw" = tl."nndraw"; - deps."numericplots" = tl."numericplots"; - deps."pb-diagram" = tl."pb-diagram"; - deps."penrose" = tl."penrose"; - deps."petri-nets" = tl."petri-nets"; - deps."pgf" = tl."pgf"; - deps."pgf-blur" = tl."pgf-blur"; - deps."pgf-cmykshadings" = tl."pgf-cmykshadings"; - deps."pgf-interference" = tl."pgf-interference"; - deps."pgf-periodictable" = tl."pgf-periodictable"; - deps."pgf-pie" = tl."pgf-pie"; - deps."pgf-soroban" = tl."pgf-soroban"; - deps."pgf-spectra" = tl."pgf-spectra"; - deps."pgf-umlcd" = tl."pgf-umlcd"; - deps."pgf-umlsd" = tl."pgf-umlsd"; - deps."pgfgantt" = tl."pgfgantt"; - deps."pgfkeyx" = tl."pgfkeyx"; - deps."pgfmolbio" = tl."pgfmolbio"; - deps."pgfmorepages" = tl."pgfmorepages"; - deps."pgfopts" = tl."pgfopts"; - deps."pgfornament" = tl."pgfornament"; - deps."pgfplots" = tl."pgfplots"; - deps."picinpar" = tl."picinpar"; - deps."pict2e" = tl."pict2e"; - deps."pictex" = tl."pictex"; - deps."pictex2" = tl."pictex2"; - deps."pinlabel" = tl."pinlabel"; - deps."pixelart" = tl."pixelart"; - deps."pmgraph" = tl."pmgraph"; - deps."postage" = tl."postage"; - deps."prerex" = tl."prerex"; - deps."productbox" = tl."productbox"; - deps."ptolemaicastronomy" = tl."ptolemaicastronomy"; - deps."puyotikz" = tl."puyotikz"; - deps."pxpgfmark" = tl."pxpgfmark"; - deps."pxpic" = tl."pxpic"; - deps."qcircuit" = tl."qcircuit"; - deps."qrcode" = tl."qrcode"; - deps."quantikz" = tl."quantikz"; - deps."randbild" = tl."randbild"; - deps."randomwalk" = tl."randomwalk"; - deps."realhats" = tl."realhats"; - deps."reotex" = tl."reotex"; - deps."robotarm" = tl."robotarm"; - deps."rviewport" = tl."rviewport"; - deps."sa-tikz" = tl."sa-tikz"; - deps."schemabloc" = tl."schemabloc"; - deps."scratch" = tl."scratch"; - deps."scratch3" = tl."scratch3"; - deps."scsnowman" = tl."scsnowman"; - deps."setdeck" = tl."setdeck"; - deps."signchart" = tl."signchart"; - deps."simplenodes" = tl."simplenodes"; - deps."simpleoptics" = tl."simpleoptics"; - deps."smartdiagram" = tl."smartdiagram"; - deps."spath3" = tl."spath3"; - deps."spectralsequences" = tl."spectralsequences"; - deps."strands" = tl."strands"; - deps."swimgraf" = tl."swimgraf"; - deps."syntaxdi" = tl."syntaxdi"; - deps."table-fct" = tl."table-fct"; - deps."texdraw" = tl."texdraw"; - deps."ticollege" = tl."ticollege"; - deps."tikz-3dplot" = tl."tikz-3dplot"; - deps."tikz-among-us" = tl."tikz-among-us"; - deps."tikz-bagua" = tl."tikz-bagua"; - deps."tikz-bayesnet" = tl."tikz-bayesnet"; - deps."tikz-bbox" = tl."tikz-bbox"; - deps."tikz-cd" = tl."tikz-cd"; - deps."tikz-dependency" = tl."tikz-dependency"; - deps."tikz-dimline" = tl."tikz-dimline"; - deps."tikz-ext" = tl."tikz-ext"; - deps."tikz-feynhand" = tl."tikz-feynhand"; - deps."tikz-feynman" = tl."tikz-feynman"; - deps."tikz-imagelabels" = tl."tikz-imagelabels"; - deps."tikz-inet" = tl."tikz-inet"; - deps."tikz-kalender" = tl."tikz-kalender"; - deps."tikz-karnaugh" = tl."tikz-karnaugh"; - deps."tikz-ladder" = tl."tikz-ladder"; - deps."tikz-lake-fig" = tl."tikz-lake-fig"; - deps."tikz-layers" = tl."tikz-layers"; - deps."tikz-mirror-lens" = tl."tikz-mirror-lens"; - deps."tikz-nef" = tl."tikz-nef"; - deps."tikz-network" = tl."tikz-network"; - deps."tikz-opm" = tl."tikz-opm"; - deps."tikz-optics" = tl."tikz-optics"; - deps."tikz-page" = tl."tikz-page"; - deps."tikz-palattice" = tl."tikz-palattice"; - deps."tikz-planets" = tl."tikz-planets"; - deps."tikz-qtree" = tl."tikz-qtree"; - deps."tikz-relay" = tl."tikz-relay"; - deps."tikz-sfc" = tl."tikz-sfc"; - deps."tikz-swigs" = tl."tikz-swigs"; - deps."tikz-timing" = tl."tikz-timing"; - deps."tikz-trackschematic" = tl."tikz-trackschematic"; - deps."tikz-truchet" = tl."tikz-truchet"; - deps."tikzbricks" = tl."tikzbricks"; - deps."tikzcodeblocks" = tl."tikzcodeblocks"; - deps."tikzducks" = tl."tikzducks"; - deps."tikzfill" = tl."tikzfill"; - deps."tikzinclude" = tl."tikzinclude"; - deps."tikzlings" = tl."tikzlings"; - deps."tikzmark" = tl."tikzmark"; - deps."tikzmarmots" = tl."tikzmarmots"; - deps."tikzorbital" = tl."tikzorbital"; - deps."tikzpackets" = tl."tikzpackets"; - deps."tikzpagenodes" = tl."tikzpagenodes"; - deps."tikzpeople" = tl."tikzpeople"; - deps."tikzpfeile" = tl."tikzpfeile"; - deps."tikzpingus" = tl."tikzpingus"; - deps."tikzposter" = tl."tikzposter"; - deps."tikzscale" = tl."tikzscale"; - deps."tikzsymbols" = tl."tikzsymbols"; - deps."tikztosvg" = tl."tikztosvg"; - deps."tile-graphic" = tl."tile-graphic"; - deps."timing-diagrams" = tl."timing-diagrams"; - deps."tipfr" = tl."tipfr"; - deps."tkz-base" = tl."tkz-base"; - deps."tkz-berge" = tl."tkz-berge"; - deps."tkz-doc" = tl."tkz-doc"; - deps."tkz-euclide" = tl."tkz-euclide"; - deps."tkz-fct" = tl."tkz-fct"; - deps."tkz-graph" = tl."tkz-graph"; - deps."tkz-orm" = tl."tkz-orm"; - deps."tkz-tab" = tl."tkz-tab"; - deps."tkzexample" = tl."tkzexample"; - deps."tonevalue" = tl."tonevalue"; - deps."tqft" = tl."tqft"; - deps."tsemlines" = tl."tsemlines"; - deps."tufte-latex" = tl."tufte-latex"; - deps."twemojis" = tl."twemojis"; - deps."tzplot" = tl."tzplot"; - deps."utfsym" = tl."utfsym"; - deps."venndiagram" = tl."venndiagram"; - deps."visualpstricks" = tl."visualpstricks"; - deps."wheelchart" = tl."wheelchart"; - deps."worldflags" = tl."worldflags"; - deps."xistercian" = tl."xistercian"; - deps."xpicture" = tl."xpicture"; - deps."xput" = tl."xput"; - deps."xypic" = tl."xypic"; + deps = [ + "adigraph" + "aobs-tikz" + "askmaps" + "asyfig" + "asypictureb" + "autoarea" + "bardiag" + "beamerswitch" + "binarytree" + "blochsphere" + "bloques" + "blox" + "bodegraph" + "bondgraph" + "bondgraphs" + "braids" + "bxeepic" + "byo-twemojis" + "byrne" + "cachepic" + "callouts" + "celtic" + "chemfig" + "circuit-macros" + "circuitikz" + "coffeestains" + "collection-basic" + "combinedgraphics" + "curve" + "curve2e" + "curves" + "dcpic" + "diagmac2" + "ditaa" + "doc-pictex" + "dot2texi" + "dottex" + "dpcircling" + "dratex" + "drs" + "duotenzor" + "dynkin-diagrams" + "ecgdraw" + "eepic" + "ellipse" + "endofproofwd" + "epspdf" + "epspdfconversion" + "esk" + "euflag" + "fast-diagram" + "fig4latex" + "figchild" + "figput" + "fitbox" + "flowchart" + "forest" + "genealogytree" + "getmap" + "gincltex" + "gnuplottex" + "gradientframe" + "grafcet" + "graph35" + "graphicxpsd" + "graphviz" + "gtrlib-largetrees" + "harveyballs" + "here" + "hf-tikz" + "hobby" + "hvfloat" + "istgame" + "kblocks" + "kinematikz" + "knitting" + "knittingpattern" + "ladder" + "lapdf" + "latex-make" + "liftarm" + "lpic" + "lroundrect" + "luamesh" + "luasseq" + "maker" + "makeshape" + "mathspic" + "mercatormap" + "milsymb" + "miniplot" + "mkpic" + "modiagram" + "neuralnetwork" + "nl-interval" + "nndraw" + "numericplots" + "pb-diagram" + "penrose" + "petri-nets" + "pgf" + "pgf-blur" + "pgf-cmykshadings" + "pgf-interference" + "pgf-periodictable" + "pgf-pie" + "pgf-soroban" + "pgf-spectra" + "pgf-umlcd" + "pgf-umlsd" + "pgfgantt" + "pgfkeyx" + "pgfmolbio" + "pgfmorepages" + "pgfopts" + "pgfornament" + "pgfplots" + "picinpar" + "pict2e" + "pictex" + "pictex2" + "pinlabel" + "pixelart" + "pmgraph" + "postage" + "prerex" + "productbox" + "ptolemaicastronomy" + "puyotikz" + "pxpgfmark" + "pxpic" + "qcircuit" + "qrcode" + "quantikz" + "randbild" + "randomwalk" + "realhats" + "reotex" + "robotarm" + "rviewport" + "sa-tikz" + "schemabloc" + "scratch" + "scratch3" + "scsnowman" + "setdeck" + "signchart" + "simplenodes" + "simpleoptics" + "smartdiagram" + "spath3" + "spectralsequences" + "strands" + "swimgraf" + "syntaxdi" + "table-fct" + "texdraw" + "ticollege" + "tikz-3dplot" + "tikz-among-us" + "tikz-bagua" + "tikz-bayesnet" + "tikz-bbox" + "tikz-cd" + "tikz-dependency" + "tikz-dimline" + "tikz-ext" + "tikz-feynhand" + "tikz-feynman" + "tikz-imagelabels" + "tikz-inet" + "tikz-kalender" + "tikz-karnaugh" + "tikz-ladder" + "tikz-lake-fig" + "tikz-layers" + "tikz-mirror-lens" + "tikz-nef" + "tikz-network" + "tikz-opm" + "tikz-optics" + "tikz-page" + "tikz-palattice" + "tikz-planets" + "tikz-qtree" + "tikz-relay" + "tikz-sfc" + "tikz-swigs" + "tikz-timing" + "tikz-trackschematic" + "tikz-truchet" + "tikzbricks" + "tikzcodeblocks" + "tikzducks" + "tikzfill" + "tikzinclude" + "tikzlings" + "tikzmark" + "tikzmarmots" + "tikzorbital" + "tikzpackets" + "tikzpagenodes" + "tikzpeople" + "tikzpfeile" + "tikzpingus" + "tikzposter" + "tikzscale" + "tikzsymbols" + "tikztosvg" + "tile-graphic" + "timing-diagrams" + "tipfr" + "tkz-base" + "tkz-berge" + "tkz-doc" + "tkz-euclide" + "tkz-fct" + "tkz-graph" + "tkz-orm" + "tkz-tab" + "tkzexample" + "tonevalue" + "tqft" + "tsemlines" + "tufte-latex" + "twemojis" + "tzplot" + "utfsym" + "venndiagram" + "visualpstricks" + "wheelchart" + "worldflags" + "xistercian" + "xpicture" + "xput" + "xypic" + ]; sha512.run = "cad55c99deb26ad1a6f12c60d5a7a0b35f250bad69f982e74163b9bbf027483104914989540c8169a05cdf0f5a853259c00c816ccddf858d0a970fc8b3eca9f9"; }; "collection-plaingeneric" = { revision = 65277; stripPrefix = 0; - deps."abbr" = tl."abbr"; - deps."abstyles" = tl."abstyles"; - deps."apnum" = tl."apnum"; - deps."autoaligne" = tl."autoaligne"; - deps."barr" = tl."barr"; - deps."bitelist" = tl."bitelist"; - deps."borceux" = tl."borceux"; - deps."c-pascal" = tl."c-pascal"; - deps."catcodes" = tl."catcodes"; - deps."chronosys" = tl."chronosys"; - deps."collection-basic" = tl."collection-basic"; - deps."colorsep" = tl."colorsep"; - deps."compare" = tl."compare"; - deps."crossrefenum" = tl."crossrefenum"; - deps."cweb-old" = tl."cweb-old"; - deps."dinat" = tl."dinat"; - deps."dirtree" = tl."dirtree"; - deps."docbytex" = tl."docbytex"; - deps."dowith" = tl."dowith"; - deps."eijkhout" = tl."eijkhout"; - deps."encxvlna" = tl."encxvlna"; - deps."epigram" = tl."epigram"; - deps."epsf" = tl."epsf"; - deps."epsf-dvipdfmx" = tl."epsf-dvipdfmx"; - deps."expex-acro" = tl."expex-acro"; - deps."expkv" = tl."expkv"; - deps."expkv-cs" = tl."expkv-cs"; - deps."expkv-def" = tl."expkv-def"; - deps."expkv-opt" = tl."expkv-opt"; - deps."fenixpar" = tl."fenixpar"; - deps."figflow" = tl."figflow"; - deps."fixpdfmag" = tl."fixpdfmag"; - deps."fltpoint" = tl."fltpoint"; - deps."fntproof" = tl."fntproof"; - deps."font-change" = tl."font-change"; - deps."fontch" = tl."fontch"; - deps."fontname" = tl."fontname"; - deps."gates" = tl."gates"; - deps."getoptk" = tl."getoptk"; - deps."gfnotation" = tl."gfnotation"; - deps."gobble" = tl."gobble"; - deps."graphics-pln" = tl."graphics-pln"; - deps."gtl" = tl."gtl"; - deps."hlist" = tl."hlist"; - deps."hyplain" = tl."hyplain"; - deps."inputnormalization" = tl."inputnormalization"; - deps."insbox" = tl."insbox"; - deps."js-misc" = tl."js-misc"; - deps."kastrup" = tl."kastrup"; - deps."lambda-lists" = tl."lambda-lists"; - deps."langcode" = tl."langcode"; - deps."lecturer" = tl."lecturer"; - deps."letterspacing" = tl."letterspacing"; - deps."librarian" = tl."librarian"; - deps."listofitems" = tl."listofitems"; - deps."localloc" = tl."localloc"; - deps."mathdots" = tl."mathdots"; - deps."metatex" = tl."metatex"; - deps."midnight" = tl."midnight"; - deps."mkpattern" = tl."mkpattern"; - deps."modulus" = tl."modulus"; - deps."multido" = tl."multido"; - deps."namedef" = tl."namedef"; - deps."navigator" = tl."navigator"; - deps."newsletr" = tl."newsletr"; - deps."nth" = tl."nth"; - deps."ofs" = tl."ofs"; - deps."olsak-misc" = tl."olsak-misc"; - deps."outerhbox" = tl."outerhbox"; - deps."path" = tl."path"; - deps."pdf-trans" = tl."pdf-trans"; - deps."pdfmsym" = tl."pdfmsym"; - deps."pitex" = tl."pitex"; - deps."placeins-plain" = tl."placeins-plain"; - deps."plainpkg" = tl."plainpkg"; - deps."plipsum" = tl."plipsum"; - deps."plnfss" = tl."plnfss"; - deps."plstmary" = tl."plstmary"; - deps."poormanlog" = tl."poormanlog"; - deps."present" = tl."present"; - deps."pwebmac" = tl."pwebmac"; - deps."random" = tl."random"; - deps."randomlist" = tl."randomlist"; - deps."resumemac" = tl."resumemac"; - deps."ruler" = tl."ruler"; - deps."schemata" = tl."schemata"; - deps."shade" = tl."shade"; - deps."simplekv" = tl."simplekv"; - deps."soul" = tl."soul"; - deps."swrule" = tl."swrule"; - deps."systeme" = tl."systeme"; - deps."tabto-generic" = tl."tabto-generic"; - deps."termmenu" = tl."termmenu"; - deps."tex-ps" = tl."tex-ps"; - deps."tex4ht" = tl."tex4ht"; - deps."texapi" = tl."texapi"; - deps."texdate" = tl."texdate"; - deps."texdimens" = tl."texdimens"; - deps."texinfo" = tl."texinfo"; - deps."timetable" = tl."timetable"; - deps."tracklang" = tl."tracklang"; - deps."transparent-io" = tl."transparent-io"; - deps."treetex" = tl."treetex"; - deps."trigonometry" = tl."trigonometry"; - deps."ulem" = tl."ulem"; - deps."upca" = tl."upca"; - deps."varisize" = tl."varisize"; - deps."xii" = tl."xii"; - deps."xii-lat" = tl."xii-lat"; - deps."xintsession" = tl."xintsession"; - deps."xlop" = tl."xlop"; - deps."yax" = tl."yax"; - deps."zztex" = tl."zztex"; + deps = [ + "abbr" + "abstyles" + "apnum" + "autoaligne" + "barr" + "bitelist" + "borceux" + "c-pascal" + "catcodes" + "chronosys" + "collection-basic" + "colorsep" + "compare" + "crossrefenum" + "cweb-old" + "dinat" + "dirtree" + "docbytex" + "dowith" + "eijkhout" + "encxvlna" + "epigram" + "epsf" + "epsf-dvipdfmx" + "expex-acro" + "expkv" + "expkv-cs" + "expkv-def" + "expkv-opt" + "fenixpar" + "figflow" + "fixpdfmag" + "fltpoint" + "fntproof" + "font-change" + "fontch" + "fontname" + "gates" + "getoptk" + "gfnotation" + "gobble" + "graphics-pln" + "gtl" + "hlist" + "hyplain" + "inputnormalization" + "insbox" + "js-misc" + "kastrup" + "lambda-lists" + "langcode" + "lecturer" + "letterspacing" + "librarian" + "listofitems" + "localloc" + "mathdots" + "metatex" + "midnight" + "mkpattern" + "modulus" + "multido" + "namedef" + "navigator" + "newsletr" + "nth" + "ofs" + "olsak-misc" + "outerhbox" + "path" + "pdf-trans" + "pdfmsym" + "pitex" + "placeins-plain" + "plainpkg" + "plipsum" + "plnfss" + "plstmary" + "poormanlog" + "present" + "pwebmac" + "random" + "randomlist" + "resumemac" + "ruler" + "schemata" + "shade" + "simplekv" + "soul" + "swrule" + "systeme" + "tabto-generic" + "termmenu" + "tex-ps" + "tex4ht" + "texapi" + "texdate" + "texdimens" + "texinfo" + "timetable" + "tracklang" + "transparent-io" + "treetex" + "trigonometry" + "ulem" + "upca" + "varisize" + "xii" + "xii-lat" + "xintsession" + "xlop" + "yax" + "zztex" + ]; sha512.run = "6a6e3140f67c0903ba5a50cb0a127c3e64e0b9d0c55d2e732e5906ca6572f1122d8e79787da7c19326bfb4839782178f937775dc562b39fb9d11c8dac9c3b0bd"; }; "collection-pstricks" = { revision = 65367; stripPrefix = 0; - deps."auto-pst-pdf" = tl."auto-pst-pdf"; - deps."bclogo" = tl."bclogo"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-plaingeneric" = tl."collection-plaingeneric"; - deps."dsptricks" = tl."dsptricks"; - deps."luapstricks" = tl."luapstricks"; - deps."makeplot" = tl."makeplot"; - deps."pdftricks" = tl."pdftricks"; - deps."pdftricks2" = tl."pdftricks2"; - deps."pedigree-perl" = tl."pedigree-perl"; - deps."psbao" = tl."psbao"; - deps."pst-2dplot" = tl."pst-2dplot"; - deps."pst-3d" = tl."pst-3d"; - deps."pst-3dplot" = tl."pst-3dplot"; - deps."pst-abspos" = tl."pst-abspos"; - deps."pst-am" = tl."pst-am"; - deps."pst-antiprism" = tl."pst-antiprism"; - deps."pst-arrow" = tl."pst-arrow"; - deps."pst-asr" = tl."pst-asr"; - deps."pst-bar" = tl."pst-bar"; - deps."pst-barcode" = tl."pst-barcode"; - deps."pst-bezier" = tl."pst-bezier"; - deps."pst-blur" = tl."pst-blur"; - deps."pst-bspline" = tl."pst-bspline"; - deps."pst-calculate" = tl."pst-calculate"; - deps."pst-calendar" = tl."pst-calendar"; - deps."pst-cie" = tl."pst-cie"; - deps."pst-circ" = tl."pst-circ"; - deps."pst-coil" = tl."pst-coil"; - deps."pst-contourplot" = tl."pst-contourplot"; - deps."pst-cox" = tl."pst-cox"; - deps."pst-dart" = tl."pst-dart"; - deps."pst-dbicons" = tl."pst-dbicons"; - deps."pst-diffraction" = tl."pst-diffraction"; - deps."pst-electricfield" = tl."pst-electricfield"; - deps."pst-eps" = tl."pst-eps"; - deps."pst-eucl" = tl."pst-eucl"; - deps."pst-exa" = tl."pst-exa"; - deps."pst-feyn" = tl."pst-feyn"; - deps."pst-fill" = tl."pst-fill"; - deps."pst-fit" = tl."pst-fit"; - deps."pst-flags" = tl."pst-flags"; - deps."pst-fr3d" = tl."pst-fr3d"; - deps."pst-fractal" = tl."pst-fractal"; - deps."pst-fun" = tl."pst-fun"; - deps."pst-func" = tl."pst-func"; - deps."pst-gantt" = tl."pst-gantt"; - deps."pst-geo" = tl."pst-geo"; - deps."pst-geometrictools" = tl."pst-geometrictools"; - deps."pst-gr3d" = tl."pst-gr3d"; - deps."pst-grad" = tl."pst-grad"; - deps."pst-graphicx" = tl."pst-graphicx"; - deps."pst-hsb" = tl."pst-hsb"; - deps."pst-infixplot" = tl."pst-infixplot"; - deps."pst-intersect" = tl."pst-intersect"; - deps."pst-jtree" = tl."pst-jtree"; - deps."pst-knot" = tl."pst-knot"; - deps."pst-labo" = tl."pst-labo"; - deps."pst-layout" = tl."pst-layout"; - deps."pst-lens" = tl."pst-lens"; - deps."pst-light3d" = tl."pst-light3d"; - deps."pst-lsystem" = tl."pst-lsystem"; - deps."pst-magneticfield" = tl."pst-magneticfield"; - deps."pst-marble" = tl."pst-marble"; - deps."pst-math" = tl."pst-math"; - deps."pst-mirror" = tl."pst-mirror"; - deps."pst-moire" = tl."pst-moire"; - deps."pst-node" = tl."pst-node"; - deps."pst-ob3d" = tl."pst-ob3d"; - deps."pst-ode" = tl."pst-ode"; - deps."pst-optexp" = tl."pst-optexp"; - deps."pst-optic" = tl."pst-optic"; - deps."pst-osci" = tl."pst-osci"; - deps."pst-ovl" = tl."pst-ovl"; - deps."pst-pad" = tl."pst-pad"; - deps."pst-pdf" = tl."pst-pdf"; - deps."pst-pdgr" = tl."pst-pdgr"; - deps."pst-perspective" = tl."pst-perspective"; - deps."pst-platon" = tl."pst-platon"; - deps."pst-plot" = tl."pst-plot"; - deps."pst-poker" = tl."pst-poker"; - deps."pst-poly" = tl."pst-poly"; - deps."pst-pulley" = tl."pst-pulley"; - deps."pst-qtree" = tl."pst-qtree"; - deps."pst-rputover" = tl."pst-rputover"; - deps."pst-rubans" = tl."pst-rubans"; - deps."pst-shell" = tl."pst-shell"; - deps."pst-sigsys" = tl."pst-sigsys"; - deps."pst-slpe" = tl."pst-slpe"; - deps."pst-solarsystem" = tl."pst-solarsystem"; - deps."pst-solides3d" = tl."pst-solides3d"; - deps."pst-soroban" = tl."pst-soroban"; - deps."pst-spectra" = tl."pst-spectra"; - deps."pst-spinner" = tl."pst-spinner"; - deps."pst-stru" = tl."pst-stru"; - deps."pst-support" = tl."pst-support"; - deps."pst-text" = tl."pst-text"; - deps."pst-thick" = tl."pst-thick"; - deps."pst-tools" = tl."pst-tools"; - deps."pst-tree" = tl."pst-tree"; - deps."pst-turtle" = tl."pst-turtle"; - deps."pst-tvz" = tl."pst-tvz"; - deps."pst-uml" = tl."pst-uml"; - deps."pst-vectorian" = tl."pst-vectorian"; - deps."pst-vehicle" = tl."pst-vehicle"; - deps."pst-venn" = tl."pst-venn"; - deps."pst-vowel" = tl."pst-vowel"; - deps."pst2pdf" = tl."pst2pdf"; - deps."pstricks" = tl."pstricks"; - deps."pstricks-add" = tl."pstricks-add"; - deps."pstricks_calcnotes" = tl."pstricks_calcnotes"; - deps."uml" = tl."uml"; - deps."vaucanson-g" = tl."vaucanson-g"; - deps."vocaltract" = tl."vocaltract"; + deps = [ + "auto-pst-pdf" + "bclogo" + "collection-basic" + "collection-plaingeneric" + "dsptricks" + "luapstricks" + "makeplot" + "pdftricks" + "pdftricks2" + "pedigree-perl" + "psbao" + "pst-2dplot" + "pst-3d" + "pst-3dplot" + "pst-abspos" + "pst-am" + "pst-antiprism" + "pst-arrow" + "pst-asr" + "pst-bar" + "pst-barcode" + "pst-bezier" + "pst-blur" + "pst-bspline" + "pst-calculate" + "pst-calendar" + "pst-cie" + "pst-circ" + "pst-coil" + "pst-contourplot" + "pst-cox" + "pst-dart" + "pst-dbicons" + "pst-diffraction" + "pst-electricfield" + "pst-eps" + "pst-eucl" + "pst-exa" + "pst-feyn" + "pst-fill" + "pst-fit" + "pst-flags" + "pst-fr3d" + "pst-fractal" + "pst-fun" + "pst-func" + "pst-gantt" + "pst-geo" + "pst-geometrictools" + "pst-gr3d" + "pst-grad" + "pst-graphicx" + "pst-hsb" + "pst-infixplot" + "pst-intersect" + "pst-jtree" + "pst-knot" + "pst-labo" + "pst-layout" + "pst-lens" + "pst-light3d" + "pst-lsystem" + "pst-magneticfield" + "pst-marble" + "pst-math" + "pst-mirror" + "pst-moire" + "pst-node" + "pst-ob3d" + "pst-ode" + "pst-optexp" + "pst-optic" + "pst-osci" + "pst-ovl" + "pst-pad" + "pst-pdf" + "pst-pdgr" + "pst-perspective" + "pst-platon" + "pst-plot" + "pst-poker" + "pst-poly" + "pst-pulley" + "pst-qtree" + "pst-rputover" + "pst-rubans" + "pst-shell" + "pst-sigsys" + "pst-slpe" + "pst-solarsystem" + "pst-solides3d" + "pst-soroban" + "pst-spectra" + "pst-spinner" + "pst-stru" + "pst-support" + "pst-text" + "pst-thick" + "pst-tools" + "pst-tree" + "pst-turtle" + "pst-tvz" + "pst-uml" + "pst-vectorian" + "pst-vehicle" + "pst-venn" + "pst-vowel" + "pst2pdf" + "pstricks" + "pstricks-add" + "pstricks_calcnotes" + "uml" + "vaucanson-g" + "vocaltract" + ]; sha512.run = "508276fe37018f3d9773fc7cda0cb37edcdd28e9cf8ab54ed5be16b07c2066de4626a561bbe387c7bba0fb82d4102be406efd721a4b5dc90110b8560083d2b07"; }; "collection-publishers" = { revision = 65221; stripPrefix = 0; - deps."aastex" = tl."aastex"; - deps."abnt" = tl."abnt"; - deps."abntex2" = tl."abntex2"; - deps."abntexto" = tl."abntexto"; - deps."acmart" = tl."acmart"; - deps."acmconf" = tl."acmconf"; - deps."active-conf" = tl."active-conf"; - deps."adfathesis" = tl."adfathesis"; - deps."afparticle" = tl."afparticle"; - deps."afthesis" = tl."afthesis"; - deps."aguplus" = tl."aguplus"; - deps."aiaa" = tl."aiaa"; - deps."anonymous-acm" = tl."anonymous-acm"; - deps."anufinalexam" = tl."anufinalexam"; - deps."aomart" = tl."aomart"; - deps."apa" = tl."apa"; - deps."apa6" = tl."apa6"; - deps."apa6e" = tl."apa6e"; - deps."apa7" = tl."apa7"; - deps."arsclassica" = tl."arsclassica"; - deps."articleingud" = tl."articleingud"; - deps."asaetr" = tl."asaetr"; - deps."ascelike" = tl."ascelike"; - deps."asmeconf" = tl."asmeconf"; - deps."asmejour" = tl."asmejour"; - deps."aucklandthesis" = tl."aucklandthesis"; - deps."bangorcsthesis" = tl."bangorcsthesis"; - deps."bangorexam" = tl."bangorexam"; - deps."bath-bst" = tl."bath-bst"; - deps."beamer-fuberlin" = tl."beamer-fuberlin"; - deps."beamer-verona" = tl."beamer-verona"; - deps."beilstein" = tl."beilstein"; - deps."bfh-ci" = tl."bfh-ci"; - deps."bgteubner" = tl."bgteubner"; - deps."bjfuthesis" = tl."bjfuthesis"; - deps."bmstu" = tl."bmstu"; - deps."bmstu-iu8" = tl."bmstu-iu8"; - deps."br-lex" = tl."br-lex"; - deps."brandeis-dissertation" = tl."brandeis-dissertation"; - deps."brandeis-problemset" = tl."brandeis-problemset"; - deps."brandeis-thesis" = tl."brandeis-thesis"; - deps."buctthesis" = tl."buctthesis"; - deps."cascadilla" = tl."cascadilla"; - deps."cesenaexam" = tl."cesenaexam"; - deps."chem-journal" = tl."chem-journal"; - deps."chifoot" = tl."chifoot"; - deps."chs-physics-report" = tl."chs-physics-report"; - deps."cje" = tl."cje"; - deps."classicthesis" = tl."classicthesis"; - deps."cleanthesis" = tl."cleanthesis"; - deps."cmpj" = tl."cmpj"; - deps."collection-latex" = tl."collection-latex"; - deps."confproc" = tl."confproc"; - deps."cquthesis" = tl."cquthesis"; - deps."dccpaper" = tl."dccpaper"; - deps."dithesis" = tl."dithesis"; - deps."ebook" = tl."ebook"; - deps."ebsthesis" = tl."ebsthesis"; - deps."ecothesis" = tl."ecothesis"; - deps."ejpecp" = tl."ejpecp"; - deps."ekaia" = tl."ekaia"; - deps."elbioimp" = tl."elbioimp"; - deps."els-cas-templates" = tl."els-cas-templates"; - deps."elsarticle" = tl."elsarticle"; - deps."elteikthesis" = tl."elteikthesis"; - deps."emisa" = tl."emisa"; - deps."erdc" = tl."erdc"; - deps."estcpmm" = tl."estcpmm"; - deps."etsvthor" = tl."etsvthor"; - deps."facture-belge-simple-sans-tva" = tl."facture-belge-simple-sans-tva"; - deps."fbithesis" = tl."fbithesis"; - deps."fcavtex" = tl."fcavtex"; - deps."fcltxdoc" = tl."fcltxdoc"; - deps."fei" = tl."fei"; - deps."ftc-notebook" = tl."ftc-notebook"; - deps."gaceta" = tl."gaceta"; - deps."gammas" = tl."gammas"; - deps."geradwp" = tl."geradwp"; - deps."gradstudentresume" = tl."gradstudentresume"; - deps."grant" = tl."grant"; - deps."gsemthesis" = tl."gsemthesis"; - deps."gzt" = tl."gzt"; - deps."h2020proposal" = tl."h2020proposal"; - deps."hagenberg-thesis" = tl."hagenberg-thesis"; - deps."har2nat" = tl."har2nat"; - deps."hecthese" = tl."hecthese"; - deps."hep-paper" = tl."hep-paper"; - deps."hfutexam" = tl."hfutexam"; - deps."hfutthesis" = tl."hfutthesis"; - deps."hithesis" = tl."hithesis"; - deps."hitszbeamer" = tl."hitszbeamer"; - deps."hitszthesis" = tl."hitszthesis"; - deps."hobete" = tl."hobete"; - deps."hu-berlin-bundle" = tl."hu-berlin-bundle"; - deps."hustthesis" = tl."hustthesis"; - deps."icsv" = tl."icsv"; - deps."ieeeconf" = tl."ieeeconf"; - deps."ieeepes" = tl."ieeepes"; - deps."ieeetran" = tl."ieeetran"; - deps."ijmart" = tl."ijmart"; - deps."ijsra" = tl."ijsra"; - deps."imac" = tl."imac"; - deps."imtekda" = tl."imtekda"; - deps."inkpaper" = tl."inkpaper"; - deps."iodhbwm" = tl."iodhbwm"; - deps."iscram" = tl."iscram"; - deps."jacow" = tl."jacow"; - deps."jmlr" = tl."jmlr"; - deps."jnuexam" = tl."jnuexam"; - deps."jourcl" = tl."jourcl"; - deps."jpsj" = tl."jpsj"; - deps."kdgdocs" = tl."kdgdocs"; - deps."kdpcover" = tl."kdpcover"; - deps."kfupm-math-exam" = tl."kfupm-math-exam"; - deps."kluwer" = tl."kluwer"; - deps."ksp-thesis" = tl."ksp-thesis"; - deps."ku-template" = tl."ku-template"; - deps."langsci" = tl."langsci"; - deps."langsci-avm" = tl."langsci-avm"; - deps."limecv" = tl."limecv"; - deps."lion-msc" = tl."lion-msc"; - deps."llncs" = tl."llncs"; - deps."llncsconf" = tl."llncsconf"; - deps."lni" = tl."lni"; - deps."lps" = tl."lps"; - deps."matc3" = tl."matc3"; - deps."matc3mem" = tl."matc3mem"; - deps."mcmthesis" = tl."mcmthesis"; - deps."mentis" = tl."mentis"; - deps."mlacls" = tl."mlacls"; - deps."mluexercise" = tl."mluexercise"; - deps."mnras" = tl."mnras"; - deps."modeles-factures-belges-assocs" = tl."modeles-factures-belges-assocs"; - deps."msu-thesis" = tl."msu-thesis"; - deps."mucproc" = tl."mucproc"; - deps."mugsthesis" = tl."mugsthesis"; - deps."muling" = tl."muling"; - deps."musuos" = tl."musuos"; - deps."muthesis" = tl."muthesis"; - deps."mynsfc" = tl."mynsfc"; - deps."nature" = tl."nature"; - deps."navydocs" = tl."navydocs"; - deps."nddiss" = tl."nddiss"; - deps."ndsu-thesis" = tl."ndsu-thesis"; - deps."ndsu-thesis-2022" = tl."ndsu-thesis-2022"; - deps."nih" = tl."nih"; - deps."nihbiosketch" = tl."nihbiosketch"; - deps."njustthesis" = tl."njustthesis"; - deps."njuthesis" = tl."njuthesis"; - deps."njuvisual" = tl."njuvisual"; - deps."nostarch" = tl."nostarch"; - deps."novel" = tl."novel"; - deps."nrc" = tl."nrc"; - deps."nwafuthesis" = tl."nwafuthesis"; - deps."nwejm" = tl."nwejm"; - deps."onrannual" = tl."onrannual"; - deps."opteng" = tl."opteng"; - deps."oup-authoring-template" = tl."oup-authoring-template"; - deps."philosophersimprint" = tl."philosophersimprint"; - deps."pittetd" = tl."pittetd"; - deps."pkuthss" = tl."pkuthss"; - deps."powerdot-fuberlin" = tl."powerdot-fuberlin"; - deps."powerdot-tuliplab" = tl."powerdot-tuliplab"; - deps."pracjourn" = tl."pracjourn"; - deps."prociagssymp" = tl."prociagssymp"; - deps."proposal" = tl."proposal"; - deps."prtec" = tl."prtec"; - deps."ptptex" = tl."ptptex"; - deps."qrbill" = tl."qrbill"; - deps."quantumarticle" = tl."quantumarticle"; - deps."resphilosophica" = tl."resphilosophica"; - deps."resumecls" = tl."resumecls"; - deps."revtex" = tl."revtex"; - deps."revtex4" = tl."revtex4"; - deps."revtex4-1" = tl."revtex4-1"; - deps."rutitlepage" = tl."rutitlepage"; - deps."ryersonsgsthesis" = tl."ryersonsgsthesis"; - deps."ryethesis" = tl."ryethesis"; - deps."sageep" = tl."sageep"; - deps."sapthesis" = tl."sapthesis"; - deps."schule" = tl."schule"; - deps."scientific-thesis-cover" = tl."scientific-thesis-cover"; - deps."scripture" = tl."scripture"; - deps."scrjrnl" = tl."scrjrnl"; - deps."sduthesis" = tl."sduthesis"; - deps."se2thesis" = tl."se2thesis"; - deps."seu-ml-assign" = tl."seu-ml-assign"; - deps."seuthesis" = tl."seuthesis"; - deps."seuthesix" = tl."seuthesix"; - deps."shortmathj" = tl."shortmathj"; - deps."shtthesis" = tl."shtthesis"; - deps."smflatex" = tl."smflatex"; - deps."soton" = tl."soton"; - deps."sphdthesis" = tl."sphdthesis"; - deps."spie" = tl."spie"; - deps."sr-vorl" = tl."sr-vorl"; - deps."srdp-mathematik" = tl."srdp-mathematik"; - deps."stellenbosch" = tl."stellenbosch"; - deps."suftesi" = tl."suftesi"; - deps."sugconf" = tl."sugconf"; - deps."tabriz-thesis" = tl."tabriz-thesis"; - deps."technion-thesis-template" = tl."technion-thesis-template"; - deps."texilikechaps" = tl."texilikechaps"; - deps."texilikecover" = tl."texilikecover"; - deps."thesis-ekf" = tl."thesis-ekf"; - deps."thesis-gwu" = tl."thesis-gwu"; - deps."thesis-qom" = tl."thesis-qom"; - deps."thesis-titlepage-fhac" = tl."thesis-titlepage-fhac"; - deps."thuaslogos" = tl."thuaslogos"; - deps."thubeamer" = tl."thubeamer"; - deps."thucoursework" = tl."thucoursework"; - deps."thuthesis" = tl."thuthesis"; - deps."timbreicmc" = tl."timbreicmc"; - deps."tlc-article" = tl."tlc-article"; - deps."topletter" = tl."topletter"; - deps."toptesi" = tl."toptesi"; - deps."tuda-ci" = tl."tuda-ci"; - deps."tudscr" = tl."tudscr"; - deps."tugboat" = tl."tugboat"; - deps."tugboat-plain" = tl."tugboat-plain"; - deps."tui" = tl."tui"; - deps."turabian" = tl."turabian"; - deps."uaclasses" = tl."uaclasses"; - deps."uafthesis" = tl."uafthesis"; - deps."uantwerpendocs" = tl."uantwerpendocs"; - deps."ucalgmthesis" = tl."ucalgmthesis"; - deps."ucbthesis" = tl."ucbthesis"; - deps."ucdavisthesis" = tl."ucdavisthesis"; - deps."ucsmonograph" = tl."ucsmonograph"; - deps."ucthesis" = tl."ucthesis"; - deps."udes-genie-these" = tl."udes-genie-these"; - deps."uestcthesis" = tl."uestcthesis"; - deps."ufrgscca" = tl."ufrgscca"; - deps."uhhassignment" = tl."uhhassignment"; - deps."uiucredborder" = tl."uiucredborder"; - deps."uiucthesis" = tl."uiucthesis"; - deps."ukbill" = tl."ukbill"; - deps."ulthese" = tl."ulthese"; - deps."umbclegislation" = tl."umbclegislation"; - deps."umich-thesis" = tl."umich-thesis"; - deps."umthesis" = tl."umthesis"; - deps."unam-thesis" = tl."unam-thesis"; - deps."unamth-template" = tl."unamth-template"; - deps."unamthesis" = tl."unamthesis"; - deps."unbtex" = tl."unbtex"; - deps."unifith" = tl."unifith"; - deps."unigrazpub" = tl."unigrazpub"; - deps."unitn-bimrep" = tl."unitn-bimrep"; - deps."univie-ling" = tl."univie-ling"; - deps."unizgklasa" = tl."unizgklasa"; - deps."unswcover" = tl."unswcover"; - deps."uothesis" = tl."uothesis"; - deps."uowthesis" = tl."uowthesis"; - deps."uowthesistitlepage" = tl."uowthesistitlepage"; - deps."urcls" = tl."urcls"; - deps."uspatent" = tl."uspatent"; - deps."ut-thesis" = tl."ut-thesis"; - deps."utexasthesis" = tl."utexasthesis"; - deps."uwa-colours" = tl."uwa-colours"; - deps."uwa-letterhead" = tl."uwa-letterhead"; - deps."uwa-pcf" = tl."uwa-pcf"; - deps."uwa-pif" = tl."uwa-pif"; - deps."uwthesis" = tl."uwthesis"; - deps."vancouver" = tl."vancouver"; - deps."wsemclassic" = tl."wsemclassic"; - deps."xduthesis" = tl."xduthesis"; - deps."xduts" = tl."xduts"; - deps."xmuthesis" = tl."xmuthesis"; - deps."yathesis" = tl."yathesis"; - deps."yazd-thesis" = tl."yazd-thesis"; - deps."yb-book" = tl."yb-book"; - deps."york-thesis" = tl."york-thesis"; + deps = [ + "aastex" + "abnt" + "abntex2" + "abntexto" + "acmart" + "acmconf" + "active-conf" + "adfathesis" + "afparticle" + "afthesis" + "aguplus" + "aiaa" + "anonymous-acm" + "anufinalexam" + "aomart" + "apa" + "apa6" + "apa6e" + "apa7" + "arsclassica" + "articleingud" + "asaetr" + "ascelike" + "asmeconf" + "asmejour" + "aucklandthesis" + "bangorcsthesis" + "bangorexam" + "bath-bst" + "beamer-fuberlin" + "beamer-verona" + "beilstein" + "bfh-ci" + "bgteubner" + "bjfuthesis" + "bmstu" + "bmstu-iu8" + "br-lex" + "brandeis-dissertation" + "brandeis-problemset" + "brandeis-thesis" + "buctthesis" + "cascadilla" + "cesenaexam" + "chem-journal" + "chifoot" + "chs-physics-report" + "cje" + "classicthesis" + "cleanthesis" + "cmpj" + "collection-latex" + "confproc" + "cquthesis" + "dccpaper" + "dithesis" + "ebook" + "ebsthesis" + "ecothesis" + "ejpecp" + "ekaia" + "elbioimp" + "els-cas-templates" + "elsarticle" + "elteikthesis" + "emisa" + "erdc" + "estcpmm" + "etsvthor" + "facture-belge-simple-sans-tva" + "fbithesis" + "fcavtex" + "fcltxdoc" + "fei" + "ftc-notebook" + "gaceta" + "gammas" + "geradwp" + "gradstudentresume" + "grant" + "gsemthesis" + "gzt" + "h2020proposal" + "hagenberg-thesis" + "har2nat" + "hecthese" + "hep-paper" + "hfutexam" + "hfutthesis" + "hithesis" + "hitszbeamer" + "hitszthesis" + "hobete" + "hu-berlin-bundle" + "hustthesis" + "icsv" + "ieeeconf" + "ieeepes" + "ieeetran" + "ijmart" + "ijsra" + "imac" + "imtekda" + "inkpaper" + "iodhbwm" + "iscram" + "jacow" + "jmlr" + "jnuexam" + "jourcl" + "jpsj" + "kdgdocs" + "kdpcover" + "kfupm-math-exam" + "kluwer" + "ksp-thesis" + "ku-template" + "langsci" + "langsci-avm" + "limecv" + "lion-msc" + "llncs" + "llncsconf" + "lni" + "lps" + "matc3" + "matc3mem" + "mcmthesis" + "mentis" + "mlacls" + "mluexercise" + "mnras" + "modeles-factures-belges-assocs" + "msu-thesis" + "mucproc" + "mugsthesis" + "muling" + "musuos" + "muthesis" + "mynsfc" + "nature" + "navydocs" + "nddiss" + "ndsu-thesis" + "ndsu-thesis-2022" + "nih" + "nihbiosketch" + "njustthesis" + "njuthesis" + "njuvisual" + "nostarch" + "novel" + "nrc" + "nwafuthesis" + "nwejm" + "onrannual" + "opteng" + "oup-authoring-template" + "philosophersimprint" + "pittetd" + "pkuthss" + "powerdot-fuberlin" + "powerdot-tuliplab" + "pracjourn" + "prociagssymp" + "proposal" + "prtec" + "ptptex" + "qrbill" + "quantumarticle" + "resphilosophica" + "resumecls" + "revtex" + "revtex4" + "revtex4-1" + "rutitlepage" + "ryersonsgsthesis" + "ryethesis" + "sageep" + "sapthesis" + "schule" + "scientific-thesis-cover" + "scripture" + "scrjrnl" + "sduthesis" + "se2thesis" + "seu-ml-assign" + "seuthesis" + "seuthesix" + "shortmathj" + "shtthesis" + "smflatex" + "soton" + "sphdthesis" + "spie" + "sr-vorl" + "srdp-mathematik" + "stellenbosch" + "suftesi" + "sugconf" + "tabriz-thesis" + "technion-thesis-template" + "texilikechaps" + "texilikecover" + "thesis-ekf" + "thesis-gwu" + "thesis-qom" + "thesis-titlepage-fhac" + "thuaslogos" + "thubeamer" + "thucoursework" + "thuthesis" + "timbreicmc" + "tlc-article" + "topletter" + "toptesi" + "tuda-ci" + "tudscr" + "tugboat" + "tugboat-plain" + "tui" + "turabian" + "uaclasses" + "uafthesis" + "uantwerpendocs" + "ucalgmthesis" + "ucbthesis" + "ucdavisthesis" + "ucsmonograph" + "ucthesis" + "udes-genie-these" + "uestcthesis" + "ufrgscca" + "uhhassignment" + "uiucredborder" + "uiucthesis" + "ukbill" + "ulthese" + "umbclegislation" + "umich-thesis" + "umthesis" + "unam-thesis" + "unamth-template" + "unamthesis" + "unbtex" + "unifith" + "unigrazpub" + "unitn-bimrep" + "univie-ling" + "unizgklasa" + "unswcover" + "uothesis" + "uowthesis" + "uowthesistitlepage" + "urcls" + "uspatent" + "ut-thesis" + "utexasthesis" + "uwa-colours" + "uwa-letterhead" + "uwa-pcf" + "uwa-pif" + "uwthesis" + "vancouver" + "wsemclassic" + "xduthesis" + "xduts" + "xmuthesis" + "yathesis" + "yazd-thesis" + "yb-book" + "york-thesis" + ]; sha512.run = "550fb7f9dd937a7ac66772d7a9f733c9ccd07b79a18d5faa333c66db823528848c8d1f7ac726ef97c4d5df3a87ae807646d5b932ddfa82e256ce3c6d1e917d3b"; }; "collection-texworks" = { revision = 54074; stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."texworks" = tl."texworks"; + deps = [ + "collection-basic" + "texworks" + ]; sha512.run = "b1f38877115fb6efc9b63a5591c399b799f3a258e342d5e198b74b582628461ad67ea7c1ab76e5ae83a3e8e538c62ac3e7c5b3d3f1d29c093331843067cfec57"; }; "collection-wintools" = { @@ -10653,49 +10777,51 @@ tl: { # no indentation "collection-xetex" = { revision = 64951; stripPrefix = 0; - deps."arabxetex" = tl."arabxetex"; - deps."awesomebox" = tl."awesomebox"; - deps."bidi-atbegshi" = tl."bidi-atbegshi"; - deps."bidicontour" = tl."bidicontour"; - deps."bidipagegrid" = tl."bidipagegrid"; - deps."bidipresentation" = tl."bidipresentation"; - deps."bidishadowtext" = tl."bidishadowtext"; - deps."businesscard-qrcode" = tl."businesscard-qrcode"; - deps."collection-basic" = tl."collection-basic"; - deps."cqubeamer" = tl."cqubeamer"; - deps."fixlatvian" = tl."fixlatvian"; - deps."font-change-xetex" = tl."font-change-xetex"; - deps."fontbook" = tl."fontbook"; - deps."fontwrap" = tl."fontwrap"; - deps."interchar" = tl."interchar"; - deps."na-position" = tl."na-position"; - deps."philokalia" = tl."philokalia"; - deps."ptext" = tl."ptext"; - deps."realscripts" = tl."realscripts"; - deps."simple-resume-cv" = tl."simple-resume-cv"; - deps."simple-thesis-dissertation" = tl."simple-thesis-dissertation"; - deps."tetragonos" = tl."tetragonos"; - deps."ucharclasses" = tl."ucharclasses"; - deps."unicode-bidi" = tl."unicode-bidi"; - deps."unimath-plain-xetex" = tl."unimath-plain-xetex"; - deps."unisugar" = tl."unisugar"; - deps."xebaposter" = tl."xebaposter"; - deps."xechangebar" = tl."xechangebar"; - deps."xecolor" = tl."xecolor"; - deps."xecyr" = tl."xecyr"; - deps."xeindex" = tl."xeindex"; - deps."xelatex-dev" = tl."xelatex-dev"; - deps."xesearch" = tl."xesearch"; - deps."xespotcolor" = tl."xespotcolor"; - deps."xetex" = tl."xetex"; - deps."xetex-itrans" = tl."xetex-itrans"; - deps."xetex-pstricks" = tl."xetex-pstricks"; - deps."xetex-tibetan" = tl."xetex-tibetan"; - deps."xetexconfig" = tl."xetexconfig"; - deps."xetexfontinfo" = tl."xetexfontinfo"; - deps."xetexko" = tl."xetexko"; - deps."xevlna" = tl."xevlna"; - deps."zbmath-review-template" = tl."zbmath-review-template"; + deps = [ + "arabxetex" + "awesomebox" + "bidi-atbegshi" + "bidicontour" + "bidipagegrid" + "bidipresentation" + "bidishadowtext" + "businesscard-qrcode" + "collection-basic" + "cqubeamer" + "fixlatvian" + "font-change-xetex" + "fontbook" + "fontwrap" + "interchar" + "na-position" + "philokalia" + "ptext" + "realscripts" + "simple-resume-cv" + "simple-thesis-dissertation" + "tetragonos" + "ucharclasses" + "unicode-bidi" + "unimath-plain-xetex" + "unisugar" + "xebaposter" + "xechangebar" + "xecolor" + "xecyr" + "xeindex" + "xelatex-dev" + "xesearch" + "xespotcolor" + "xetex" + "xetex-itrans" + "xetex-pstricks" + "xetex-tibetan" + "xetexconfig" + "xetexfontinfo" + "xetexko" + "xevlna" + "zbmath-review-template" + ]; sha512.run = "457c4e7a3e2089adc69173950c5d3fa177c6e03c5936c49328bbd3c276d9940ba5aca974aea4b97c5dd51b6ec1ca9ebe28861e730aef63b1312589e0cb16df1e"; }; "collref" = { @@ -11070,17 +11196,19 @@ tl: { # no indentation }; "context" = { revision = 58167; - deps."amsfonts" = tl."amsfonts"; - deps."lm" = tl."lm"; - deps."lm-math" = tl."lm-math"; - deps."luatex" = tl."luatex"; - deps."manfnt-font" = tl."manfnt-font"; - deps."metapost" = tl."metapost"; - deps."mflogo-font" = tl."mflogo-font"; - deps."mptopdf" = tl."mptopdf"; - deps."pdftex" = tl."pdftex"; - deps."stmaryrd" = tl."stmaryrd"; - deps."xetex" = tl."xetex"; + deps = [ + "amsfonts" + "lm" + "lm-math" + "luatex" + "manfnt-font" + "metapost" + "mflogo-font" + "mptopdf" + "pdftex" + "stmaryrd" + "xetex" + ]; hasFormats = true; sha512.run = "61fcc778837ecff88bb0e80e39e2acb3ee64e2c26e4069f7634e5dc6c74dc93caab78e4b0088ed58f494d6dcd3a5084bc55cd471baaeb292dc208cf2a241bf69"; sha512.doc = "ee4458cd6d45a41652ae24b3b82bea5cfa2d8b9c14cf4ba1357f9f07d6572f8ba83e350b74659c471ebf5068f33f5c5762a11669ab2a4f5adb3db41f392956dd"; @@ -11089,7 +11217,9 @@ tl: { # no indentation "context-account" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "755ddb4c62a496873d5362df01307163c79d2a6c3fabce6ea01b442c16dad2f23d72909df71dd44eb4fbbf5c57366e20eb49bfce240807c2e2a9a52cbd76680a"; sha512.doc = "b19f6d0330e5da99a961304f8c022609dedb2dc3a8cc4607cb9b2ca7eda38f9c8b972316bb9fac92cc36166e1c0822afaebda2c5e2d87db1e1efd2781f51956e"; hasRunfiles = true; @@ -11097,7 +11227,9 @@ tl: { # no indentation "context-algorithmic" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "72d4bbfe723b4012f8701c2786f96009bbed3c6b4bd2129f7153306f172e72218920e222f97ee6d5ee4b863e9e915fc38dd92b0c42066385fde35c5c3d0cc42a"; sha512.doc = "19ba676dc7822bc0a6583d6e9e031f3780977835c10d901e1ae02fca781719a0e015ac79cfc35c908a8de40a19614fcd17a35c604c9311b50972d0706d6f07e1"; hasRunfiles = true; @@ -11105,7 +11237,9 @@ tl: { # no indentation "context-animation" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "19691ca3325b3f72154ac8439e616a128b5f3ba8c9447bb1e92979e175daa902cd756853a2b6e6a34a84fbe96e02771a0c6ef27ed5bbb7eac94f62dd72d571f1"; sha512.doc = "a06227508c2dc343598fc6878e2b17b56341f5dd86a473957318eb94ecc6e150adaedf7346ffb931eda184651efd00d8f60e36ec6ea50e9ac94e2ed096058293"; hasRunfiles = true; @@ -11113,7 +11247,9 @@ tl: { # no indentation "context-annotation" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "bb66132ed1e4f146c407bb3b2852c451b82d3d06de1dc25ddec6e692d17f4d994d1a67cfd7ff711dc2de7a4ce7259b1768d6efcfb58856321d5ea5b15271cd34"; sha512.doc = "4491012c8172beb64478b2de5557ed8f97701cfcb3996a8a5ff9990048d79ddce8cc2796dbf4c08812bc8963c0d318f9d79d2d4c2d14bc372f06dbc28e012c3d"; hasRunfiles = true; @@ -11121,7 +11257,9 @@ tl: { # no indentation "context-bnf" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "53e5d3d7c977aab648bb024942263a8aed5da6314506825ace02556db890ea23400c6de714ddf6380235c942dfc02e127736579b6be1c5b0b0ecc65d25fb0d6b"; sha512.doc = "d7ab60c2f8571ce2e2e96b82c1f97b140c5750324efb73275062a8d301d530279a3f9c19f6a6feebd6d7c72727d94f469d9aad05ad67cde5dbd3de9f695dad31"; hasRunfiles = true; @@ -11129,7 +11267,9 @@ tl: { # no indentation "context-chromato" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "52e11c6953e7c2e2f9a3a20b8885fd12f5abef32d32da5ae5415b0321d37ac5ff8ff5bece3d522e1f785470cef542568cd56abd509d26671da9298c3d0ba27cc"; sha512.doc = "5c7c7f03050b0a17dadf23a09dced356a036c6b95ca76aeb0fda583dbc490d82222de64299c121224efaccc78b62364a1bc56daf020c177865c29e343529f040"; hasRunfiles = true; @@ -11137,7 +11277,9 @@ tl: { # no indentation "context-cmscbf" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "cb0e5849ac3168a4ecdd1545edd029a1622ecf1c46d29eec97b28a66f65305e6b4d3a9c83e24d78e1596c8009ad5c9a0e25fa7e09448c3e0ea492e62bc933ea8"; sha512.doc = "8f45989c08f09381ccbf2942a08c0b13792917a18d5b2e92fb45c7ac2f4b4538f5ffd633da0348e12835c03a6f79b0ea7044f1ebea5770365a83d2d097a56df4"; hasRunfiles = true; @@ -11145,7 +11287,9 @@ tl: { # no indentation "context-cmttbf" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "e3bc048c09bfdf114efa25077fa4e6a6c20b4d0e2ba337cefa0a8a82348fd3376f82cae0c85b029b863b7a5db9d9552b4fc5f5487d5ed5f6d88484181ea98ced"; sha512.doc = "2b55367f236330a07120229902405213a495de2ba455f333bc23e1c1abbe0f0a4be16ee95415f613d41572916722e3d023a71698f74e5e37f34a8de4fdca6e47"; hasRunfiles = true; @@ -11153,7 +11297,9 @@ tl: { # no indentation "context-construction-plan" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "b292f8e271fcac88eaedc376257ae16a401a6c31009eaa3d4faeefba25c33d034f57d30ba4638e85b76ffd0d24ef4d541dfbceb1bc0b5c806a8412d239a32146"; sha512.doc = "605e09bedb9e2ad1e98a621c0a4842f28592c93507c3da31f8c6437e95e63a47e795b38fa0263d7fa81fa3b8838f21d2426c8705f8e17ac1d827923cf5e88784"; hasRunfiles = true; @@ -11161,7 +11307,9 @@ tl: { # no indentation "context-cyrillicnumbers" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "14a90656d706d68ce441301aa6bccf2033c36f9c8d8605ec9dedeeedb71a5670dae325a5a198b2ca25373eb2b495e57fff31b85089c6c0fb987738c76ac636b2"; sha512.doc = "d95b1df26033aaff0a9f6759268ac3e68bff02556001e3f9b2bae1db68aa13c839a87047a6ae0a296f8e5817398ba35b7cbacc4f194dd93cf72684904190e7e3"; hasRunfiles = true; @@ -11169,7 +11317,9 @@ tl: { # no indentation "context-degrade" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "b2df5bbee492b7137180bfe7b0b826f4149b8231b78cb839ac9716f02b622e5b3a0eb5964e12625650a224ae463714bb7cafbecae6061a6e3120022d2f545d52"; sha512.doc = "8f24fd70547ecfcbb163df2e3e4450525f0e56583b6984f61fb04559142bd838287e79c9b9d8cdef2c26a882688074b5010615e6d818a11f2f5812d88e31cd82"; hasRunfiles = true; @@ -11177,7 +11327,9 @@ tl: { # no indentation "context-fancybreak" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "1e8e51de47c67a3287dfa4386f9c09b4dfaa494d9b59fe8d117a3a1b65a5041add24c36227f2d2d7fb3bf2ec34d6a5a8b6658d275b63f55793d05dea08722b10"; sha512.doc = "6082670766d63da902d2a53f2a6ee89fcdce942fd73439fea8326ef3117e6a5483b86d9d4271d2f3d9546a5fe44277721cd15510a9da392db36356b44ae2f36d"; hasRunfiles = true; @@ -11185,7 +11337,9 @@ tl: { # no indentation "context-filter" = { revision = 62070; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "c2534b543fd5444776a054f43fafa393040af5bcb67f869d61d200a4a1d0355f1d81c64adab683d15a6be806a21dfc9ad661995bbe51da3c0bfb841ade4b077f"; sha512.doc = "a9c2ea88b0e2514840c368ea7686894dda4b86c93ec8f34989238ffdf5704f1c1898d0ee5e0724035314d2d37803f1a1afdd445dd802a94f5ff4223148f81767"; hasRunfiles = true; @@ -11193,7 +11347,9 @@ tl: { # no indentation "context-french" = { revision = 54215; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "aed7a7f91e909e8b9b7efc5e0b45c67d5ed3e084c5019e1ddd68d8e9e969c0579b1dbbe4e25d74ca22b256324358ed34f3f54a92e2fb3a012a6aa43797e8aaa7"; sha512.doc = "926a054d12f59d45dbe538eaed4087ed2c9f3321f1051c7006fe651af95d2275788030ee9371ffd39a7f7f8a4022776c19721323ab82871f061dca365c081728"; hasRunfiles = true; @@ -11201,7 +11357,9 @@ tl: { # no indentation "context-fullpage" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "280a16b47e04f3099a2f960435bf1c22ec623553303e339df4d06135b768cee6565e20a0c4e0c080d8c6f621a32d862ba6203daacdbf9ecd03b62829dd0014fd"; sha512.doc = "1d4ff98bae26e0d6ec1ce1ca58fac82f8592158f8635eeac737546873f1f468b2ad7a82b9f8956b770fdc0c01443a9327c509265cdecb90d83dca15462cfa23b"; hasRunfiles = true; @@ -11209,8 +11367,10 @@ tl: { # no indentation "context-gantt" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; - deps."hatching" = tl."hatching"; + deps = [ + "context" + "hatching" + ]; sha512.run = "e0c61179f4ecdf93c13dbfe19f59487fbce55e1a0dece76ac025a88a452e7168c5e3b84e53c01bcae4cc412993be36eb554dc5f7299fc1205f4070aa07a834cf"; sha512.doc = "a5cc76238f8377dc8d06869bf23a1367c880b57ba62ab8c8331886cbed145427e2819ba92965924fc7a78579d28b7c1cf331acf7f199cf72672ccb64962c9367"; hasRunfiles = true; @@ -11218,7 +11378,9 @@ tl: { # no indentation "context-gnuplot" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "d3d7dce105707bd8fd903038e458cae614ec63da7932231e1f659570ec3a7960ea0fab338a8405f2ca8ce8b03946b58db8255333d2a4ab5a659566f4d272b0b0"; sha512.doc = "40e471b27d53ced33590792ac62992a220357c6db1c78cba901197362a36817bc14b049f2573ee2e5b5adad5182c5bea2880c4f7a2477bcd1a06ee7ccf88b0b9"; hasRunfiles = true; @@ -11226,7 +11388,9 @@ tl: { # no indentation "context-handlecsv" = { revision = 51306; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "10f862b7152e0efe2a8444fcf847ade2aad2c1499e146b94643a7e08a438359c2f7d1927e7e9773f3dd14475fb4535d17fb4f29ff053e7a29c9463f40c6e5598"; sha512.doc = "39330dfaf22a83181086343ac9ea7d64025fbe779e55161b33e5a9a9802e0928bb1c16941aeb307da641835aefdfe2e431becbc0cfe40ad8bb33a3816b9b177b"; hasRunfiles = true; @@ -11234,7 +11398,9 @@ tl: { # no indentation "context-inifile" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "9dd9b61cd2b5700b0e2b6e59bf4040de9431820c659f121c2681e454ddb4b34454270eac6c442836c90f8a1819761ce0d7659684a1f0c8876fec1f947a0b16f7"; sha512.doc = "9635bc80ae7222c6a38004ad5f985004634b7db9596e03a23123ad71bbf177639bb1b028bdfe79d51b75c1c429c327f65c2b5e0720723d8bcdf63f4939312850"; hasRunfiles = true; @@ -11242,7 +11408,9 @@ tl: { # no indentation "context-layout" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "6cad00783d0bc91000ca0e0c8350fe2a2e99f7fefccd375d5bb2f1a144fc04a59f83122dcd490fc0596b1dc9fd0c0a779bfa35932362927ed50ed8df39ec359e"; sha512.doc = "4ecf7bfe5fbc78453cc116cf7a657f4b6ac7fc21ca7dd6da5beb0ea1af0c1fd48d6a74ab516213f49d1e29cb8bd47fbcc94145157472e3ea22b291f494fc3d1f"; hasRunfiles = true; @@ -11250,7 +11418,9 @@ tl: { # no indentation "context-letter" = { revision = 60787; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "558836a8c95743270f627a18dfe7a29ffc7a2eaeb4cf663d589ef5c07eab4dad6f09db31511379c90a41d1e9e7da5766e8dc3c8bb0902fa06bda4fb33caa97c9"; sha512.doc = "94e1bf68371f3e8c426cfff5c471f93c86ce51fdd92dfad59669d32cc73d86de606113ece55d13a0f25ac4a26f16916407de9175b84acc79ba107156c20cd20a"; hasRunfiles = true; @@ -11258,7 +11428,9 @@ tl: { # no indentation "context-lettrine" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "79e4e246a7bb0a300db53425e2769a3ef61bc0249ce57840c0b9037805e86eadbd1ef4ab8a110fd806584393feef00f498418732cfd53922aed6df67c561e535"; sha512.doc = "ab32697b6c309b1099b809c33182ffc48bb3019c8d520269cbb616b61e8f20678cc2cf4e7e971e06cadb22ffcee0d502deedf21aa95d8d372d1840e4fb4a6591"; hasRunfiles = true; @@ -11266,7 +11438,9 @@ tl: { # no indentation "context-mathsets" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "e4c689c745d06c61d6f693a9832001aa8c79d51664c2a5d6d0c6148a95b30870063f50eecca31ac0924193c6dab8c12cd5ccaca16eeaf5f83a99cef1a8889ec3"; sha512.doc = "f2c33244814da8e8838483038f507fe6b3e146f37691e55a37bb5355985d2af4c5fc423318133c4f13837a3e66a4fe72d5c14f6721bb5ee0417a59691b86d3f1"; hasRunfiles = true; @@ -11274,14 +11448,18 @@ tl: { # no indentation "context-notes-zh-cn" = { revision = 23171; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "a05cd68d609fb9427ca07f64ba1b9ad85762464a3294653c8a790c0a6a41d6af43aab72a1eb7ef0d56a299db2f54af5666dbe974f9fdac014f624350c8bfe50a"; sha512.doc = "4261b8aeb5b3cbebde2890af1b7039c6f557ce36f4979228f40f9e5e99b19aa5c457ed6842f4501f4dc32f51f58d9fcd0764028b9d5c74fd07d41c8c866220a1"; }; "context-rst" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "f93173c1b27afe538d670c791048f495fa3f236cf75511d43b33172d140ac47fa3b5f11c674db5d515733b8ef9cfa7ac2d3c46b78b624768ee95a21884dae904"; sha512.doc = "536f63f9fa02e37c38f445974dab1f75b38abf0769379ee1735001972db71be10d51a1782e850ddd75d73f2a6f1375cf043684c0fae1a88b20a1650248870f9a"; hasRunfiles = true; @@ -11289,7 +11467,9 @@ tl: { # no indentation "context-ruby" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "e219c6da61585d88f8e899278d1c85f0903ed32b6c7368cdb6076697230a0e79f5f88f53dd98514394fa09e7580c1c6b7c167d81c010107f3399dffb18b13d95"; sha512.doc = "179e501b428bd87a49830a68236008ea6e962b80e79ab45a0e75a7b86a7fc11025ac38ad463c459c6d290aa5ac8627da5849d1fd8f7502ea7d97696b53ed2647"; hasRunfiles = true; @@ -11297,7 +11477,9 @@ tl: { # no indentation "context-simplefonts" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "7c817f4a25a8883ce052c9657a3d6117042e8538fadc8d67b4b0194abd69238045c09d365e90e555d5b04d83a1ef82039ca9631aec00eb1f80b56fbefa729cd3"; sha512.doc = "238babc7694bf85c81e3079b5d72feabc9c9eeea4f3b625a57ecb133d70ac745334ca0426097dccfe53e3ffe108ac0859be4da7625bb6b683abec1101367ac06"; hasRunfiles = true; @@ -11305,7 +11487,9 @@ tl: { # no indentation "context-simpleslides" = { revision = 63903; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "2db8348769d60d38266ad3798264864a0453b38c769db02ddaee072e795596fd48cc201caa5023d980c1a748c41a30e4c560ece68def59deb3c467bec2e60f64"; sha512.doc = "532a9a142b30c8fe2ff3431d24988ef96e5da63276cd0084fe8b69b3e9cb572a0beab8d7ee4291d00a4b1d725f3d23ed47632811fde7e2aca41998c5d44a0481"; hasRunfiles = true; @@ -11313,7 +11497,9 @@ tl: { # no indentation "context-title" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "bc7d6cbd373cb6d6214489ed97117929ba381626c854a0a5a950bfa44c06214991d7a90290793c825c96e6d22ba1f6807054d4553d1d3980d9d9bc0e6dabafda"; sha512.doc = "3b910eeca8c8a442939873e082a4025523472b267ed3268e63cbf5fbe0821c9db8d8d183058d139aa02233dfdb6be7e23fb9df360a490f7d551875c59753c7c0"; hasRunfiles = true; @@ -11321,7 +11507,9 @@ tl: { # no indentation "context-transliterator" = { revision = 61127; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "f919d3f9e6ab25932cfaeadfc07f86ebdbe00d84dc21236e4775930fc3866cee69cf9a25d373e13655f4396a3c395ea6ea103a28ffb4f00a4e95b7ceaec155c9"; sha512.doc = "8473c1ca7b48009055f5c33031ec60f80d84dc43396789b0c0c7e6d65bcf014a237088dca07211beae4bfb80377f55cf12a9f379995cff50f52143fc4bc81295"; hasRunfiles = true; @@ -11329,7 +11517,9 @@ tl: { # no indentation "context-typearea" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "c4a2f2317b146b31102273e9b616d403d4ee836a61fae96bd9315670b0bdd5f9d94ecde00b53d2ea5f7073773bd8af5c322b07c3b05bf7ad5262a9f0e0b623a1"; sha512.doc = "7171bc5c5e82b3897f75421e745e876c2aea84e9e9cb74badd6dedc75666b8f9ddb8b6d11c523ea64be6b57dca4f84555827afa32a0c90f6df1c31b68b1f6395"; hasRunfiles = true; @@ -11337,7 +11527,9 @@ tl: { # no indentation "context-typescripts" = { revision = 60422; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "a13d06b9a792cbd2352016df508a7860e45b541d04cef1c9d9c8b5a6199120a71dfd69f990700c4a76ac31ec11209caef431a190b9045bdc46cc44f88cbef0a3"; sha512.doc = "3d948f22da14b1d481817477235657cee714e4a2a69834729c20e18157f1175890ddc7fce992e8f5f27e26cd6d08186ff1521e2186681557cfff1a4778267324"; hasRunfiles = true; @@ -11345,8 +11537,10 @@ tl: { # no indentation "context-vim" = { revision = 62071; stripPrefix = 0; - deps."context" = tl."context"; - deps."context-filter" = tl."context-filter"; + deps = [ + "context" + "context-filter" + ]; sha512.run = "12100c7aa3eb555cf9dbe72454a96e63feda52329a8a192ff86ba30477acab4ebaaf84c15a79f16d4e3f95cef02baf8146e5810b8c9e8e94c25ba1317bf4fc2c"; sha512.doc = "0f49e22b9e1d465f46727a9e952e095eceab55e77a2559fe497cf14690377f77ca42aa23ce7eaca659e9b0983e5a950b36733eef49b0473fd33a8f783edb43b1"; hasRunfiles = true; @@ -11354,7 +11548,9 @@ tl: { # no indentation "context-visualcounter" = { revision = 47085; stripPrefix = 0; - deps."context" = tl."context"; + deps = [ + "context" + ]; sha512.run = "da7799ee31a4298f8e8cb02cb4e480fa49fb4188b776df877648c663c93523636bdd7fa6ca5eb403fc8f3483064bf223fed042c1d27eb0817c224ddf8e21c673"; sha512.doc = "1788355ea4109e7e2bbaa9bbc3798f60a814d549d082638a59a453cc5fb39b54ff8a00471a28a96a5501e91899874ae19981ae0f8a09b6353d19275b851b9f80"; sha512.source = "39bba551e9f0bb8d70c0b60a2b0fba3d7cad30555d4052fc6ae722bfd9cb79d5cca784474a9f1847faccccb1618662bc4dd2fadd1fdacaf2f4cc9c035b5501ec"; @@ -11663,7 +11859,9 @@ tl: { # no indentation "create-theorem" = { revision = 64104; stripPrefix = 0; - deps."crefthe" = tl."crefthe"; + deps = [ + "crefthe" + ]; sha512.run = "dcb4f947d6d0fed303d53c19e29049070b1c3ca47fb0d78c0c1c3455f6de59ea2aa98640ac88549bb8f00f1b5cd4320a84f92f98d08a0ee788eb47417a86486d"; sha512.doc = "4c84bebff2a93f8326fb8ce795a9fe2193194f70d49b5448b51d25a98378336bc931a60d762dc12bcfb2fffc362663391347a4b89e69336fb47efd23dcae4499"; hasRunfiles = true; @@ -11750,9 +11948,11 @@ tl: { # no indentation "crumbs" = { revision = 64602; stripPrefix = 0; - deps."catchfile" = tl."catchfile"; - deps."etoolbox" = tl."etoolbox"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "catchfile" + "etoolbox" + "xkeyval" + ]; sha512.run = "f4e3e045665c16d02c6b1cf2d43957fcbfe38ceb17b6bed9445803d4134a3ad2c22b552230ed685d42c33864169c782c9ef51ba47669d7a975e699ec532a1f76"; sha512.doc = "b6e13f1177eace8e349648dd376e3252b34ada5e84c0a676631ef313507064c68624936730fe9780707bced36f05d4103cd9aa33a4bd511cd23836ed2ab38d03"; sha512.source = "5220b2d854c11d4c0734ec22dded6c1259d470c416c08fec4d4fff35714bd56126f5c4f8785e958454c1a3854541b9d8cb571d4f7a86b636b1c12e739c52072d"; @@ -11778,7 +11978,9 @@ tl: { # no indentation "cs" = { revision = 41553; stripPrefix = 0; - deps."cmexb" = tl."cmexb"; + deps = [ + "cmexb" + ]; sha512.run = "bc956c595d4460f35c64c92e7730a7cc9cd3af95301afba56c49bcf8415666863de926733409ce1afd99ba767fe3a3fa45c68f2dcc912b69c6f72b618289fb30"; hasRunfiles = true; }; @@ -11800,19 +12002,21 @@ tl: { # no indentation }; "cslatex" = { revision = 62387; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."cm" = tl."cm"; - deps."csplain" = tl."csplain"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "cm" + "csplain" + "everyshi" + "firstaid" + "hyphen-base" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "a65516275b53ce0e2487193b537759da447137898915f577c66893d6408c664b7cb830941dac2e80b2922c1597719cc879f66d3378216bfa2dc190e1bf502675"; sha512.doc = "d1be033b7355bb3431193a9a39bdd1e269c7f3a97333c2b753ffdf795ad45a366893267a13472463805ed428760de680aae3377b25ef39bf5522a0186f80f899"; @@ -11821,16 +12025,18 @@ tl: { # no indentation }; "csplain" = { revision = 62771; - deps."cm" = tl."cm"; - deps."cs" = tl."cs"; - deps."enctex" = tl."enctex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."luatex" = tl."luatex"; - deps."luatex85" = tl."luatex85"; - deps."plain" = tl."plain"; - deps."tex" = tl."tex"; - deps."tex-ini-files" = tl."tex-ini-files"; + deps = [ + "cm" + "cs" + "enctex" + "hyph-utf8" + "hyphen-base" + "luatex" + "luatex85" + "plain" + "tex" + "tex-ini-files" + ]; hasFormats = true; sha512.run = "c4dbe1721fc2281cba7e426f6c75d35671cfeddf77a947f147a33c651090bc90528583445736bc2933c2d3986424e1b3ac4984e93cfae5f0ad1cfe41902f63cb"; hasRunfiles = true; @@ -11839,7 +12045,9 @@ tl: { # no indentation "csquotes" = { revision = 64389; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; + deps = [ + "etoolbox" + ]; sha512.run = "68427cbe486f3b53bdb24869a3ad52cf6a006d7872ff9408560d9e4b0f1e8184fcb437d54e10f11d7a3585ff8ff7ad40ab4a95aa66091bb69a75a3e8e60aede8"; sha512.doc = "ceba04fab9ec257c6bbc2fc903e3888bae9ef6bfa5664c8e01da14ee2b1482005aece22b6bf4fa7fb893c2dc1b0cb7f762eb048e0b2c039be80ef73b0bfef131"; hasRunfiles = true; @@ -11947,43 +12155,45 @@ tl: { # no indentation "ctex" = { revision = 63891; stripPrefix = 0; - deps."adobemapping" = tl."adobemapping"; - deps."atbegshi" = tl."atbegshi"; - deps."beamer" = tl."beamer"; - deps."cjk" = tl."cjk"; - deps."cjkpunct" = tl."cjkpunct"; - deps."ec" = tl."ec"; - deps."epstopdf-pkg" = tl."epstopdf-pkg"; - deps."etoolbox" = tl."etoolbox"; - deps."everyhook" = tl."everyhook"; - deps."fandol" = tl."fandol"; - deps."fontspec" = tl."fontspec"; - deps."iftex" = tl."iftex"; - deps."infwarerr" = tl."infwarerr"; - deps."kvoptions" = tl."kvoptions"; - deps."kvsetkeys" = tl."kvsetkeys"; - deps."latex-bin" = tl."latex-bin"; - deps."ltxcmds" = tl."ltxcmds"; - deps."luatexja" = tl."luatexja"; - deps."mptopdf" = tl."mptopdf"; - deps."ms" = tl."ms"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."platex-tools" = tl."platex-tools"; - deps."svn-prov" = tl."svn-prov"; - deps."tipa" = tl."tipa"; - deps."tools" = tl."tools"; - deps."ttfutils" = tl."ttfutils"; - deps."ulem" = tl."ulem"; - deps."uplatex" = tl."uplatex"; - deps."xcjk2uni" = tl."xcjk2uni"; - deps."xecjk" = tl."xecjk"; - deps."xetex" = tl."xetex"; - deps."xkeyval" = tl."xkeyval"; - deps."xpinyin" = tl."xpinyin"; - deps."xunicode" = tl."xunicode"; - deps."zhmetrics" = tl."zhmetrics"; - deps."zhmetrics-uptex" = tl."zhmetrics-uptex"; - deps."zhnumber" = tl."zhnumber"; + deps = [ + "adobemapping" + "atbegshi" + "beamer" + "cjk" + "cjkpunct" + "ec" + "epstopdf-pkg" + "etoolbox" + "everyhook" + "fandol" + "fontspec" + "iftex" + "infwarerr" + "kvoptions" + "kvsetkeys" + "latex-bin" + "ltxcmds" + "luatexja" + "mptopdf" + "ms" + "pdftexcmds" + "platex-tools" + "svn-prov" + "tipa" + "tools" + "ttfutils" + "ulem" + "uplatex" + "xcjk2uni" + "xecjk" + "xetex" + "xkeyval" + "xpinyin" + "xunicode" + "zhmetrics" + "zhmetrics-uptex" + "zhnumber" + ]; sha512.run = "eea93d70d6c7768d8157841db4d4aadc3077422dba7b9cfa9bd4235dc547a43f694c9d3e0002fc2aefa3d8b8823f2478bee712a46cf62742bd30b7cffa7edcdf"; sha512.doc = "9e23c44358c6060f071a5233ec81efa1efad1f280ebfbb025b7d4c5f6070d4480ad34b961591af429637dc2131b2147051a191e7ea20aa52ec6081bbdbe057fc"; sha512.source = "1c0033fd3ee4585c3f81490e89c24f2224fe49966068b30fea229dd9c84b6d0b54e5ab2abbd6e500d211c9403fdaf418c3c7c04dead4cc2119912ac8c8000d42"; @@ -12006,7 +12216,9 @@ tl: { # no indentation }; "ctie" = { revision = 62387; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "c1c69127e1157c15086beb269e1925feaf63eebbc45baec018ce97196a2fc42638bb3107a4c1d065e98a08e490d238d2bffe1827f27f9015ffa5be88be53d6bf"; sha512.doc = "494a3e6569a77b434f66a56f1fa44d4651dc23e7cdcacb101043ed55cc6e32551f148e67976b67b88507da2fe05a0b006c810fb737f9364d47cb010438c7b39e"; version = "1.1"; @@ -12185,7 +12397,9 @@ tl: { # no indentation "cyrillic" = { revision = 63613; stripPrefix = 0; - deps."cyrillic-bin" = tl."cyrillic-bin"; + deps = [ + "cyrillic-bin" + ]; sha512.run = "1b8889d33e5433b32d0b84bd31ef7ea96fe338456ef8e1732ea6c254dfe2f21d3600766b1e51bafa4ddbf0144e8420ad8ba6ad593eaa32c3d45dde99b0b4ec8c"; sha512.doc = "b0b1d24d3e8887c5b9c251922157de7cf042845009c07e62fd324ba850dff9f39bc6ebad04ab216ad69070da93f77f68693d1be57cd15b038374f0253329c8fa"; sha512.source = "4dc564f475a883cb75ae0fad6b5aecb936c1ab9cdaae857dc7cdfb3d8f06f6534542c36b053cc7b74f455a2646f081060c670b35f1eda5fa69418b1c1f97e5dd"; @@ -12273,10 +12487,12 @@ tl: { # no indentation "datatool" = { revision = 52663; stripPrefix = 0; - deps."fp" = tl."fp"; - deps."substr" = tl."substr"; - deps."xfor" = tl."xfor"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "fp" + "substr" + "xfor" + "xkeyval" + ]; sha512.run = "323b1526a32eb4e0d81db77278d66ebb6ac91fa357f7f76c8ac1f199efdc4be17ae4f8fb83fe55f3ac9cfb8a18d163a85d6c21cc11c26e4dea0db5f85dc12dd5"; sha512.doc = "32b5391c7197bc29783bab0c93a5225784fea999f69bdd8b1b5c152ed338716f82dbedfdb6cd19064ee409407c0b808e5f410e6090cda6d1f8ded2ca41f3ace9"; sha512.source = "e149a3be96ee0161b2bd872ab73e74c36ea638f0a1f0a48e0268093bdff2c2c1cfabe5c0a4d3ca8ef7ee4c02bd03710c5c1b2ff9c1b543ed792a444160814493"; @@ -12331,9 +12547,11 @@ tl: { # no indentation "datetime2" = { revision = 63102; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."tracklang" = tl."tracklang"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "etoolbox" + "tracklang" + "xkeyval" + ]; sha512.run = "7f2ad65f95e3881e5016647bff85b10138faaa7d26d097bdce0ec7b30cc0d913a43c2a45b0caa69a6669e54725122cf1a86117d0d4f543caba67058423af7f62"; sha512.doc = "d43970aea6c7971ed6a3564a6681caea0e0f5606607496d9ec51d6c2fa741dd6c28754c9e9f06cde0ad1a79280b53629eb427faf820d00549468a650cbd0eac8"; sha512.source = "511c10e67c7d77ee10d8d75704628313a1598636ce82a5ce114942854b3a9d2da237ed12fdab986f13b04ce3c2123933db91b850360b309aa52305575a7cf2d4"; @@ -12532,7 +12750,9 @@ tl: { # no indentation "datetime2-it-fulltext" = { revision = 54779; stripPrefix = 0; - deps."iftex" = tl."iftex"; + deps = [ + "iftex" + ]; sha512.run = "29a67f9c4414d08adce673ac2b501e92be5822470511b55677b041fa1d89b55760246fea08ba0f4cac7ef6f8e7ff52498f0459d50f94bf2bc6b3e4a944976a99"; sha512.doc = "24bceb74337abc4ae74bbf9101bd32cc65371d60a0461cec91c8e3ecc3822c848eb8c7f0bc8706ec1b2118294df659b44f3139c3a3ed1c0c243f9654ae1b3d6d"; sha512.source = "89a91a69a45100324b24c5cca3e0bdedc8dec2a466c414e65044f55a6c1ec3c715946dd5c5ed942fc9dc8f6a597fe5f2075dd7d05c88d241da4bccb27ba9cb3d"; @@ -12771,12 +12991,14 @@ tl: { # no indentation "debate" = { revision = 64846; stripPrefix = 0; - deps."listings" = tl."listings"; - deps."listingsutf8" = tl."listingsutf8"; - deps."pdfcol" = tl."pdfcol"; - deps."tcolorbox" = tl."tcolorbox"; - deps."xcolor" = tl."xcolor"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "listings" + "listingsutf8" + "pdfcol" + "tcolorbox" + "xcolor" + "xkeyval" + ]; sha512.run = "88f9ff3f473dfbd84509adfe4491d15b7c20229361afde9cbce382be0441378cd6bb7d306c9b0a424dc065f34ab2d86eca8a0334d00fd3a5bae513776c418815"; sha512.doc = "ba5e90ecc8c1733cdb78233099cdc95e09d02786df11606b3f823f2b1b60934cd2881c873ad7afa192ee1b0ff5ad91121896cb30e7405ee3ae9bc960d26e7f9c"; sha512.source = "b9c0b94eea82d7b684aa358788a5ee3cb9709738137827b7a4f70ddd0d02ad92b6feecf03d0de7dd08c1ab233f17db3c973cfafef98134be33a41d6a8d7c4da6"; @@ -12818,8 +13040,10 @@ tl: { # no indentation "dehyph-exptl" = { revision = 62734; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "13c7fe78927fb7e85155284d47fe597e173647efea8d7077e06f55c358b2b851e3b65820829859d4d770b81af836f308a2b9e0e5c3ddb17f1644d1cf803adc63"; sha512.doc = "812af78620465987b65654b1b0e270ac911a18019106c54d24622b4f146534f9474b691247e8cde140c1101bf48d843fb1238e5713f9a59a79e969b9314ae895"; @@ -13186,11 +13410,13 @@ tl: { # no indentation "docshots" = { revision = 65141; stripPrefix = 0; - deps."fancyvrb" = tl."fancyvrb"; - deps."iexec" = tl."iexec"; - deps."pdfcrop" = tl."pdfcrop"; - deps."pgf" = tl."pgf"; - deps."pgf-blur" = tl."pgf-blur"; + deps = [ + "fancyvrb" + "iexec" + "pdfcrop" + "pgf" + "pgf-blur" + ]; sha512.run = "1d4ce9b3bd39d12bc4fc2630c3f9116e7030d623700e951fa99e5bd25fcb2965765d5bf32a709eb9ea2ebd39382ef1ef33205ddd24c6cd5e9b75136de0ff18c2"; sha512.doc = "7ab3122caf188621a0f5045b9d8dff1361b6577c6e80d6f6bf20a9e81703e7060936162356e4c34c44bea6f8611ae8819eafd8abf745a28346ce3d8b065596f8"; sha512.source = "1913dbf266953cd42e9a840e140b00fc785f12f610d0e5c84f70a1eb3bef06b8a4cd5c612c682a8c6ab2fb8ff355fe416cbbe70ef366e123f13419bcaaa1abbc"; @@ -13672,7 +13898,9 @@ tl: { # no indentation }; "dvipdfmx" = { revision = 61101; - deps."glyphlist" = tl."glyphlist"; + deps = [ + "glyphlist" + ]; sha512.run = "6dd78f4b5cabb51c3bd9988fa46bf90a5a79b3d3293257a4c563a8a76a5a03eb167ce3ec0d4ce6ed05412a551eb201f2379a50a97ac5355ebe833f7b34cee4b4"; sha512.doc = "00dce9b36eefd1788bbe455b2e5104efd9afc8bd891aeafb2cd9bdee406eeb25ab520e42e614e9d2363eb6a7273232bc3c4805bacd82a22099c5ffc438e852cb"; hasRunfiles = true; @@ -13808,11 +14036,13 @@ tl: { # no indentation "easyfloats" = { revision = 57204; stripPrefix = 0; - deps."caption" = tl."caption"; - deps."environ" = tl."environ"; - deps."etoolbox" = tl."etoolbox"; - deps."float" = tl."float"; - deps."pgf" = tl."pgf"; + deps = [ + "caption" + "environ" + "etoolbox" + "float" + "pgf" + ]; sha512.run = "2d02a55fc3d50e5fb79ebe8188300db47aaecb42089843033c569ee0508a38f81e9409d872535e1f7fe3b13a067bdabbf8249073b803c8d232d08aa1d5520d48"; sha512.doc = "d6e96d7af908e83b67b77f0432e6ffcdcc55b64bc63ac360e42291f16adec4ab6655a423f5fc8f31180071afc5645f47b7ecb2c1c80af719b6cb0cc6e77948da"; sha512.source = "b21681d30b8963127d603bf81b140851b5e8ea17b63d5979bc05bcfa68efd67460b9f0d0419a69c44606a4d569f5840b3c8d6f0ce7b0cf18d86c1fa104776b5a"; @@ -14133,7 +14363,9 @@ tl: { # no indentation "einfart" = { revision = 64280; stripPrefix = 0; - deps."minimalist" = tl."minimalist"; + deps = [ + "minimalist" + ]; sha512.run = "0038664f40f0cf5c940d44d618876e98f1419058b7bfe27e741d536743c4ca208bd728aa4a193544956efa30c0e970ffbb04559e751b116037c8760d34a615f6"; sha512.doc = "89cb6a140802ed0395bbad43c3bdaeca5879e4564d0f9ae15f333f243490788651bdef214d2aafa5c44c0d720e8fbfc66f3dd584b544d80ad3058015cb883553"; hasRunfiles = true; @@ -14566,7 +14798,9 @@ tl: { # no indentation "environ" = { revision = 56615; stripPrefix = 0; - deps."trimspaces" = tl."trimspaces"; + deps = [ + "trimspaces" + ]; sha512.run = "c8dec70e56651a89ae8da15abc0ad81cc2edb4487837469238e2adc0e7c58cae4c5da82b637a3336839b50103e3d846c5cee8c73141488f644469a0f3e9d363f"; sha512.doc = "78d4d3f570470619c938687a6c9a6925aad901d781e3e893bd731a49bb8eca62bf1870e68d84f7125e10d91d7bec02a323ae42278ff59c04d7e33eefa2261496"; sha512.source = "b30607d21bbf5ddf1c7d36bd9173a16d91bdfcfa004782be50e50f17bf54d94e943d5e524e2331b75f3ce65e81193ba98e69ab56c38959d632007f5b0a87bd6a"; @@ -14585,13 +14819,15 @@ tl: { # no indentation "eolang" = { revision = 65289; stripPrefix = 0; - deps."amsfonts" = tl."amsfonts"; - deps."amsmath" = tl."amsmath"; - deps."fancyvrb" = tl."fancyvrb"; - deps."iexec" = tl."iexec"; - deps."pgf" = tl."pgf"; - deps."pgfopts" = tl."pgfopts"; - deps."stmaryrd" = tl."stmaryrd"; + deps = [ + "amsfonts" + "amsmath" + "fancyvrb" + "iexec" + "pgf" + "pgfopts" + "stmaryrd" + ]; sha512.run = "2c98181e8dccb936d3f87812a5aa7f3bfb1faf5796a790f3d41ecf94f0331a5069341c2843c81f058c4374a0bc4e31b316e7e30045d0e44f729579bea76f1308"; sha512.doc = "90e0a7e29708b4dcc79e9f7492bd218fa84eb0860bf33651fad77eda0e161cabbba20b1bf57aafbaa1077da3335a78436ee9ab3f33965e5e091eb080058cf2e7"; sha512.source = "197fefc52cb241227dea65c14d11a427f0190c6ad6fca97ea6a330471d44c736ad40578338d342c3ace689739e861cc380198c5c05f4648dd0ad423e5ac60da2"; @@ -14639,25 +14875,27 @@ tl: { # no indentation }; "eplain" = { revision = 64721; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."dehyph" = tl."dehyph"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."pdftex" = tl."pdftex"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "dehyph" + "everyshi" + "firstaid" + "hyph-utf8" + "hyphen-base" + "knuth-lib" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "pdftex" + "plain" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "fda8158ae2bdc96187b6e6ace2a94be3e0f68201adbc02553b48a3848481352ac10ddd72babcbc2835e089ce751ade7dfa6cfd1c642c94155c2861db865f5c29"; sha512.doc = "60902b2422d2f5d7570a19daf7f586df7882505d7c156539699a0aa47a0f3bde5688dcbdc92c8a6a9878f11392bc9b9f147626aad230eecd2740d56f104928ed"; @@ -14903,7 +15141,9 @@ tl: { # no indentation "esint-type1" = { revision = 15878; stripPrefix = 0; - deps."esint" = tl."esint"; + deps = [ + "esint" + ]; sha512.run = "5a663d01e9241adf1961c922c588888561f495e6378fdd7aaa90954c3e51c5f0f8e6dc1e1947c9f03ce3472e1aab3dde1b35e6b5f0814f5e2cda564a31a45a1f"; sha512.doc = "081a225225f503fac403d306fac3ee3b2747341ef5c4ee9420f49a56ca959c7757f154c24f90ed9506041b13464ea216e6edb52f29790d189ea7b33c7c797f8e"; hasRunfiles = true; @@ -15877,12 +16117,14 @@ tl: { # no indentation "ffcode" = { revision = 65170; stripPrefix = 0; - deps."environ" = tl."environ"; - deps."microtype" = tl."microtype"; - deps."minted" = tl."minted"; - deps."pgf" = tl."pgf"; - deps."tcolorbox" = tl."tcolorbox"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "environ" + "microtype" + "minted" + "pgf" + "tcolorbox" + "xkeyval" + ]; sha512.run = "e76c0605b8a074d1827a73a3ba4e9fae40ade590b01e90ee10593c4484e0a534cebb556bf49389fa03355424910cc349b73fbae2827153fc717be69d38d007e0"; sha512.doc = "c5302e1113f5d1a05517c4877efd710bc6931bac62157001ea540f0b40388c95202dd457fb1362f8b30dc313a48d9742fcd5c6c6a7e5f3404755a3eafa01041a"; sha512.source = "2863c642dddba771bc4507ed2f0e4a3c4ff12ab4291fb397a2e0f8859776bbba7442a85fefe87d655d0c6236b5e40878ba29cfa19f71870f6932f38247657f5f"; @@ -16606,12 +16848,14 @@ tl: { # no indentation "fontspec" = { revision = 63386; stripPrefix = 0; - deps."euenc" = tl."euenc"; - deps."iftex" = tl."iftex"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."lm" = tl."lm"; - deps."xunicode" = tl."xunicode"; + deps = [ + "euenc" + "iftex" + "l3kernel" + "l3packages" + "lm" + "xunicode" + ]; sha512.run = "fc4516b96eefa9cb896488510f5ac531446acfa7993abc2f361751e06fe95128afbaadad393dd7ce8c22ea731c81ba99cd8182ce8205c55f78f64a69ba815996"; sha512.doc = "e765756f93f1aeb03acf0f15d3388c3a39156f2bc46e951ab5c2e4596ac9babd975af025c0881078f58caeacc3281d3769a701f112b17f10ac474d12b4eac897"; sha512.source = "286db8b9c512c02f2333860b5ff2c980b8b5680de92fc896c95611f2cf1587077f47f9c0aa0e520ad0f64c6f031f8a2fb310f67034ebaca286076d7764bfbc99"; @@ -16721,13 +16965,15 @@ tl: { # no indentation "forest" = { revision = 57398; stripPrefix = 0; - deps."elocalloc" = tl."elocalloc"; - deps."environ" = tl."environ"; - deps."etoolbox" = tl."etoolbox"; - deps."inlinedef" = tl."inlinedef"; - deps."l3packages" = tl."l3packages"; - deps."pgf" = tl."pgf"; - deps."pgfopts" = tl."pgfopts"; + deps = [ + "elocalloc" + "environ" + "etoolbox" + "inlinedef" + "l3packages" + "pgf" + "pgfopts" + ]; sha512.run = "edc3341b84e7e89fba3bb76004562c0bc889f944ed33474ba9cf5ed5e63a690202e851a30f44158caa8351b874b8e91659bd91c50d59ec43de9460869e4213f1"; sha512.doc = "fdaec77023176fc2f7510a9e3b4dcc587898e1f96886340222f932c0d93b1002ad35fba8a38a036f713e41814f3dc6b3f75a5657ae485b15ffea43089895bcae"; sha512.source = "45f912d17d29568e6ee267814d63bc14c20bb0d91c62b39c21301dd611c50db3b5f7de5f16b519da0f2b4d15609727144c34b16a620abb85114a42344cdaf24f"; @@ -17144,7 +17390,9 @@ tl: { # no indentation "garuda-c90" = { revision = 60832; stripPrefix = 0; - deps."fonts-tlwg" = tl."fonts-tlwg"; + deps = [ + "fonts-tlwg" + ]; sha512.run = "a806538598cae0365968ab20936631a052dc65f9f6056c39197f7b1c7a5aad717a7a8b72ed2a1af347f8ce91f27d7dcd74b758db8f01fc7810a8d658990bcc28"; sha512.source = "58f62ec8020489b69743c0591129967730f9ad0729f7cca343ab6e6fa6675122a1e37bf73f090cae050cb695a14dbfb3c52346e3c528e660484d2cb576aaca65"; hasRunfiles = true; @@ -17191,9 +17439,11 @@ tl: { # no indentation "gbt7714" = { revision = 64633; stripPrefix = 0; - deps."bibtex" = tl."bibtex"; - deps."natbib" = tl."natbib"; - deps."url" = tl."url"; + deps = [ + "bibtex" + "natbib" + "url" + ]; sha512.run = "f2f869bf4d507ac76ee576f1bb739bc5e5681d3f2cb1db64841f90dfb22a9b18aab04c5722e231280cb94f055ab002ed99fc965bdbb3d2bdeb8d953f704e73b2"; sha512.doc = "17b79fb795d0b2a0f2c696da83ee1196750c1fef15c77d33353d6742443d43287b5bb96c349be8e58b0df538f4585f45b353234bb100318cbbc6de6f14192da9"; sha512.source = "0d7e44fdd1106800d2dac2cac49dfe4c9154498837e27880f0193fbc8033f2a74fe5670f79c929ce2216fef216288e5e072f1ccddd23cec85b6265ad569d21d0"; @@ -17307,8 +17557,10 @@ tl: { # no indentation "geometry" = { revision = 61719; stripPrefix = 0; - deps."graphics" = tl."graphics"; - deps."iftex" = tl."iftex"; + deps = [ + "graphics" + "iftex" + ]; sha512.run = "ed64996404299bd8379197b293baed752ff064e04eec87ffafdfd55cf21c2c48174560eb1c3bcdb0b06190badb9d9cc699aaa7a2ac8a5c537b0c818a423770fc"; sha512.doc = "a58ab22ae6df349d81b5ddf18a4e9b7dbb5804a497bbaff42acde18ca59fe8a19bfee34293debc23e44c690456e6a1b1d87614fbb85dc6cb3b3b7d330fc866d7"; sha512.source = "f4e1e8c0f5b8f443c8f5e6ad948cb1736ed944384daec20e9402c871872e86248b3167c72e07fc94fe32ef6ab36c17d2f177135ccf99f68d1c892af0a695bcbf"; @@ -17633,13 +17885,15 @@ tl: { # no indentation }; "glossaries" = { revision = 64919; - deps."amsmath" = tl."amsmath"; - deps."datatool" = tl."datatool"; - deps."etoolbox" = tl."etoolbox"; - deps."mfirstuc" = tl."mfirstuc"; - deps."tracklang" = tl."tracklang"; - deps."xfor" = tl."xfor"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "amsmath" + "datatool" + "etoolbox" + "mfirstuc" + "tracklang" + "xfor" + "xkeyval" + ]; sha512.run = "a805158d4c2741c4efc707bfe417032903630d3f235c7431a3767e47592d8b9be2d64f6a14f21a0c7a3f4b37cbcba90d501c0ab1a551fe16357745960f362a1b"; sha512.doc = "24e43bacdaf3d3680b49460849f2d4eb652f2e2103558edecff0cb78d261d0275e5f416c7fe83857fbe09f7016643849ee5f030e4b3db167f469960d7791489b"; sha512.source = "5240de5d2c942ec2eba38e76073f230265ce74dda641622acc8aad4c5856c1e8a749d01829ac39fc4b83479d9d24346270507c0f4bc5b957b7f4f3d07c4e898e"; @@ -18010,8 +18264,10 @@ tl: { # no indentation "graphics" = { revision = 64892; stripPrefix = 0; - deps."graphics-cfg" = tl."graphics-cfg"; - deps."graphics-def" = tl."graphics-def"; + deps = [ + "graphics-cfg" + "graphics-def" + ]; sha512.run = "e123ddcd0af8ddd37519076b86a443ff74af4da4a960446708c344a2fe75b700a4700db71414cfe06470532ef863926e5e45b9292f81dfed07f60323543e92cf"; sha512.doc = "9ff56bfcb46f79ea455797e6582a04ce4e8539b395c988382359cdc7eff81544861b85f3b9303acf12a3f05b66aa52311d776cf3d12404b976068369f3947e08"; sha512.source = "a23d65d454559f6f84f3a810357d31153bec5d44c8ccbf142b1ed14eeebda7cb7c385de9b5da7ce225db169f05e6d155263a097421c84af6e845b1acdbe36902"; @@ -18931,23 +19187,25 @@ tl: { # no indentation }; "hitex" = { revision = 65130; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."etex" = tl."etex"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "etex" + "everyshi" + "firstaid" + "hyphen-base" + "knuth-lib" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "plain" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "5a88c0f4d7bddc0161ce24bbe17884a93469f9ffb56ea6a2dcd3045cb97e5c9d09941e44e365483bc5126e1c9c6970ad151e19573d93b1472534333a507f1c63"; sha512.doc = "3016748caa430c75689e27459c002abc8f68d4aa1c2d0be04b1f82981c44f7a3fd748f900aab5e4c37b16a56f884d5c0cf7d42323288c74cb51b72c19e0b08aa"; @@ -19082,8 +19340,10 @@ tl: { # no indentation "href-ul" = { revision = 64880; stripPrefix = 0; - deps."hyperref" = tl."hyperref"; - deps."ulem" = tl."ulem"; + deps = [ + "hyperref" + "ulem" + ]; sha512.run = "fd3ddb8d494b5b6a80bddf3e28747cb872452d8bf56e0e59cdbd19e811a235683ac0aff7e92e358f7b9f352cfc2b6c03f2263248cc13e147e4dad649fb331381"; sha512.doc = "9318e6fd357b9705e95db7600dea3b3b1fe2e7bcb0dffec4bf92b5375a8d7feaaf1574188bfeaefa71f05f6aa3728b51d9c7c72908cc66945a3bc8d5391583d9"; sha512.source = "cea37410dbfd8094c4028b96f03d8ac631a32f349098ad5acdbdd484a789d2da58a21f65745d647e05075226d8ad3e1c2217850a312afe522206e900c0b00eed"; @@ -19120,33 +19380,35 @@ tl: { # no indentation "huawei" = { revision = 65264; stripPrefix = 0; - deps."biblatex" = tl."biblatex"; - deps."cjk" = tl."cjk"; - deps."currfile" = tl."currfile"; - deps."datetime" = tl."datetime"; - deps."enumitem" = tl."enumitem"; - deps."fancyhdr" = tl."fancyhdr"; - deps."footmisc" = tl."footmisc"; - deps."geometry" = tl."geometry"; - deps."graphics" = tl."graphics"; - deps."hyperref" = tl."hyperref"; - deps."l3packages" = tl."l3packages"; - deps."lastpage" = tl."lastpage"; - deps."libertine" = tl."libertine"; - deps."makecell" = tl."makecell"; - deps."microtype" = tl."microtype"; - deps."minted" = tl."minted"; - deps."paralist" = tl."paralist"; - deps."pgf" = tl."pgf"; - deps."setspace" = tl."setspace"; - deps."svg" = tl."svg"; - deps."tcolorbox" = tl."tcolorbox"; - deps."textpos" = tl."textpos"; - deps."titling" = tl."titling"; - deps."tools" = tl."tools"; - deps."ulem" = tl."ulem"; - deps."wrapfig" = tl."wrapfig"; - deps."xcolor" = tl."xcolor"; + deps = [ + "biblatex" + "cjk" + "currfile" + "datetime" + "enumitem" + "fancyhdr" + "footmisc" + "geometry" + "graphics" + "hyperref" + "l3packages" + "lastpage" + "libertine" + "makecell" + "microtype" + "minted" + "paralist" + "pgf" + "setspace" + "svg" + "tcolorbox" + "textpos" + "titling" + "tools" + "ulem" + "wrapfig" + "xcolor" + ]; sha512.run = "d181f45f8211714674697a8e2e203b3169cb1be998687f315418dca664cb09533b5e3b5f7b1cda0db628401d263d7ca816c2ce1c29da48f1550ea9100d9e2523"; sha512.doc = "3b4112d8b5389ab26034ff126744aa4299cbc5f42630a00a7e7b4245e4355ed0abe42718100439af3cb5b1642db4567b6d16e69ffe852cae0c5c9aa20e8cd7f9"; sha512.source = "93271d9361e0cbf9fff9890f2617c96a381b631332041a576309a28af77150afc1da99f7596d3b89d0685584115cdbfd46d1b5fa7706b7ae4af88984e8fae8ab"; @@ -19306,23 +19568,25 @@ tl: { # no indentation "hyperref" = { revision = 65014; stripPrefix = 0; - deps."atbegshi" = tl."atbegshi"; - deps."auxhook" = tl."auxhook"; - deps."bitset" = tl."bitset"; - deps."etexcmds" = tl."etexcmds"; - deps."gettitlestring" = tl."gettitlestring"; - deps."hycolor" = tl."hycolor"; - deps."intcalc" = tl."intcalc"; - deps."kvdefinekeys" = tl."kvdefinekeys"; - deps."kvsetkeys" = tl."kvsetkeys"; - deps."letltxmacro" = tl."letltxmacro"; - deps."ltxcmds" = tl."ltxcmds"; - deps."pdfescape" = tl."pdfescape"; - deps."refcount" = tl."refcount"; - deps."rerunfilecheck" = tl."rerunfilecheck"; - deps."stringenc" = tl."stringenc"; - deps."url" = tl."url"; - deps."zapfding" = tl."zapfding"; + deps = [ + "atbegshi" + "auxhook" + "bitset" + "etexcmds" + "gettitlestring" + "hycolor" + "intcalc" + "kvdefinekeys" + "kvsetkeys" + "letltxmacro" + "ltxcmds" + "pdfescape" + "refcount" + "rerunfilecheck" + "stringenc" + "url" + "zapfding" + ]; sha512.run = "b0e32f4792039b1e48f4deab6b33a53a0bc32549a6fddada1156880c3ad21bf566d69389c4ae626fc1a844f3b0b94f24a4b1331a9e52b89e4619993bc81c5db5"; sha512.doc = "97bc2f11dc6b023347817fb18ff91ce6ed4d2a9e22ad3f17aea29781a0bacf6173f13e59e64229c6f62a9b2e67f7b1fdf513db11fb6759a5373b7a1d38d703c8"; sha512.source = "f8d405385e10f1d818c6c97ca7919886e3b520e661e465e0f516a36ed884de8011cf907b72dc49f0437741df096af2f49837af4d31fb46159efe7867466292a6"; @@ -19348,8 +19612,10 @@ tl: { # no indentation "hyphen-afrikaans" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "0f969847994b3b377c752c23f802e8c51b4076efc2d43ad2560a72b83cea3bf0a64d7df18a59afe4289a4547a9f23cf81b0c365a499be85a2467579941fa9700"; hasRunfiles = true; @@ -19357,8 +19623,10 @@ tl: { # no indentation "hyphen-ancientgreek" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "3f91560ecf78c5540fd4f5d9890f6aa7a57bcd3a41095985785505b82e40793b91a5da3a01bdc021b11c32db3dd7030a104686b34b496c9094acfb85509cd007"; hasRunfiles = true; @@ -19366,16 +19634,20 @@ tl: { # no indentation "hyphen-arabic" = { revision = 54568; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "85012062097dd4b624cb39c68b293169a25ab3c9cd15b4474c3a3ffbe4b8ab13d6856c6c70a580da45a2d210952df2d9760682da3917cfd24d17772dc2ccce7f"; }; "hyphen-armenian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "59538414bf5a4701199100fbd9d5247999a36bc28c7c6ef2a28deb9024e01605d48839f00f345c848365853ac3a9f1aab7402f44860532d7a5c099d2f27ee189"; sha512.source = "d25e6347545e00a809db1dc8e48ef3fe67678b9ec93a1f3619d2a5a3d786d6e411c2e9f905120e3c5d01d9489c0a83035ce8025836249c88ee768bf07b8e2ca7"; @@ -19390,8 +19662,10 @@ tl: { # no indentation "hyphen-basque" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "b90680dc5692824d60ca603e8bdd2fcade7cc772c8c0f9538d579704fb16165db2baf0c466ccaff46d92491b4a678fa86a127c0d106dbef6d640dfd2f887663d"; sha512.source = "75a20da77fa056c719ecc1f014bb09c67f62f1c4a3abe04b7cadf45c7a4e06e4492cb0d34a8025f19f3ee5e3330e488212885095335d4a7e97baa5b106576223"; @@ -19400,8 +19674,10 @@ tl: { # no indentation "hyphen-belarusian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "19b9bd10d2357d0cb6ecc9ddb5e46b65b3c0eec1b2917a78311f255c1609bbb86595ce617d331271a72de934ae4001597f4a04d61b3810e34f3b197b21cab193"; hasRunfiles = true; @@ -19409,8 +19685,10 @@ tl: { # no indentation "hyphen-bulgarian" = { revision = 58685; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "9763e6ece053594b01cd9255a8a3551eb6b86ab082f6f9283664e256c55d43b9513b624774a650d83215d656334751f569496030187c1c78e2fe80f2d10f2f1f"; hasRunfiles = true; @@ -19418,8 +19696,10 @@ tl: { # no indentation "hyphen-catalan" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "37189e09ee902f2c5145f30180b51211091b07d7d04125c98f1b7c424ad27f6899424b78cd17c559509076eeeb957b4f268fb4130807e7fafb461174fed8200b"; hasRunfiles = true; @@ -19427,8 +19707,10 @@ tl: { # no indentation "hyphen-chinese" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "a78b70095fcfe297e2d85a49108affd5d48451ff4740461eed46d395410a665011614c9a89dff37e9477ee3803de6ebaa68595ac39222f2968a4124355ea7fa7"; hasRunfiles = true; @@ -19436,8 +19718,10 @@ tl: { # no indentation "hyphen-churchslavonic" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "c44b3f5fec7b44958336dcfb1a43c5b71fd1715262278863f5fcd74d7ec0cc6f1d572b741256d791e6979f15e4b0fcda8058725e27f17e1deb6e5df5fdb007ab"; hasRunfiles = true; @@ -19445,8 +19729,10 @@ tl: { # no indentation "hyphen-coptic" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "fe36adfe900e23f2b0c3e9c3a3d96b608c49bf597222537d355d6a68e2f87f587db78a1921ab1c9a80ea175529e353524c35e99b83ef7f5515ab7c0aacd2f680"; hasRunfiles = true; @@ -19454,8 +19740,10 @@ tl: { # no indentation "hyphen-croatian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "8355d0aa95bb2e72bfc45015f9ae9f6a138f94441387a4daadfec5be4060878f6e69d05eab15432d99c256c1a3f68c122d5c915164fe343459d658a4543ddf42"; hasRunfiles = true; @@ -19463,8 +19751,10 @@ tl: { # no indentation "hyphen-czech" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "f5c8b08c2db716dfa6d36fcf337b4e18372978d04e28ff2c8ed0a0b3866f4bb3efb7b498fedbfde5052fc504b8677ae553c2dce73701e219632d8c5460d7e826"; hasRunfiles = true; @@ -19472,8 +19762,10 @@ tl: { # no indentation "hyphen-danish" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "954543a3fb81ff00d9c58315ba59d7a5e3430217dda6c1453bcb7ffb0516025dea4b877eb9d66c9f80ccc69d3d4895bdc6ae1b611d8394435fa647b8b806559d"; hasRunfiles = true; @@ -19481,8 +19773,10 @@ tl: { # no indentation "hyphen-dutch" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "111371e47ca29069a5a9144d694858dd899b19e2b38d0c793b1e4884c69ae2d62398aacb4cd89e23246fc025e42872875bc808c1f327ac1502fac88c962e6c14"; hasRunfiles = true; @@ -19491,8 +19785,10 @@ tl: { # no indentation "hyphen-english" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "a305cf89138e4327844d43a7e21773e31ac97a4655e4d58ae9a46dc0df565e432330debf704c37b4ad552561357521eba0b676755544ceb9c4f21ace09d6dd2c"; hasRunfiles = true; @@ -19500,8 +19796,10 @@ tl: { # no indentation "hyphen-esperanto" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "ed2976e9fb3eec5d2f0759348b284129e43bf161db571dd21270335388b8aec57e1b8393bc9b246f8a6e9cde22f93a4cb3c1a03dcadd64fdda3d70b576789050"; hasRunfiles = true; @@ -19509,8 +19807,10 @@ tl: { # no indentation "hyphen-estonian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "0eb91153214aaca8c3b5816f5315f9afdeb7c19521c87c79ea2b35e82217bfb23c8bb774baf810206f4413fc663e441ebe6b4962880ca0dbcda9209d2acce3b8"; hasRunfiles = true; @@ -19518,8 +19818,10 @@ tl: { # no indentation "hyphen-ethiopic" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "a1532603758e7f774acba7c13ee74f0046ff187598ca86b2e93b91da31317f03fdbab5d4d7c0814978fb2ac159bd6e5a48e6e734c19758da21ad0a031844f52b"; sha512.source = "9d6c8c1b0ce5c40d388937328461336a97fcf1fe780fa6198e029f12ef118d9d98f6eec03ea217743851f0217217d6548298df9336fcf33e6c4c196bbdb9eef0"; @@ -19528,16 +19830,20 @@ tl: { # no indentation "hyphen-farsi" = { revision = 54568; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "5b02582769a55bb07d81e748e83170c16aca1c33b0a240cf547fa9c2212f2be52223e258229c760ddc5dd730419bd9e761614cc4fb3b3ba8102841bb779af511"; }; "hyphen-finnish" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "6aa171d77952165cdcb1b667885f16dd382124ed70ed1db80a9a89553d972720d8ff5f0da1b36669e02c3030d9ff362ab77ba1fa2ba45cddfb460018f0c0191d"; hasRunfiles = true; @@ -19545,8 +19851,10 @@ tl: { # no indentation "hyphen-french" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "b9d2d05311a90f4caa6c4e8aa8a2e80e9c15fc3552f03f0ac6ec70d386610612715deb6e778247248355a3a209fb2413d6d2aee12f18bc35d5a334870b612507"; hasRunfiles = true; @@ -19554,8 +19862,10 @@ tl: { # no indentation "hyphen-friulan" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "d1775a9b6e6b7fa155e44c93271e2ccb41bd1ec143ea0cf624841ad48a123db924dd134e6e60b862a808ad2058ed5b86cb34d98e5728b9dccd3997ba2f06932e"; hasRunfiles = true; @@ -19563,8 +19873,10 @@ tl: { # no indentation "hyphen-galician" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "2d707542f80dc94ad20c0daa776df23b773a5e6ccb261e11db675e1e89f5f303a4f5cd50d97f491cc7ea8b0f3c0d3f6391707812a95d4e72cca3afa7815e566f"; sha512.source = "b9925168b1f9ae5139ffc3bd34810cc05a27475cfae31e98fd0d7618575fc994ca95d7479506024abec2c33bb20121811244d69c490df18a29d6c93fe02174c6"; @@ -19573,8 +19885,10 @@ tl: { # no indentation "hyphen-georgian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "edaf041a2f92b0f7dbf28042c81838e8fd781cf9c3ad529c314227c94917ce4e8728ca676f8bd42e2a81bae76b11aabc1e22896e3ef9cd38ca4b718bc58fa0cb"; hasRunfiles = true; @@ -19582,9 +19896,11 @@ tl: { # no indentation "hyphen-german" = { revision = 59807; stripPrefix = 0; - deps."dehyph" = tl."dehyph"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "dehyph" + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "c27389dea67ffd0d45419d484b0c72577b2d5b8234266483add078b970d5d994d41f7cf9a1509ad93efe9489501f986127ea717135c5f57588094393e0d7219e"; hasRunfiles = true; @@ -19592,8 +19908,10 @@ tl: { # no indentation "hyphen-greek" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "3da84f41aaf7e5d4be0ce609e4d119e65c9189ff6662051cb7e879e9e373d990ef1c59ac7cfead1bdbc6e55b52d4b3ed28d157b22dbec43e5226f16872d5a7de"; sha512.doc = "865aaf1f9f0fbe130f9006e41ef677713667832745fc24c28cffe805a540a19f7104a3f0fef3258ba0e16c1c456959904887899a4c584338c58de7fcc80c5419"; @@ -19603,8 +19921,10 @@ tl: { # no indentation "hyphen-hungarian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "868a4c3f4d0eda078054026bd1ec35e05c2f4013e093bf58147bfa2d861814242b55a900ce60384767558c9552ff9d41cf447e2a157bae83bd2877251012d96b"; sha512.doc = "164180f0485e16a49ba83dcb4721902e8a29f399032d4f5a59d55e424b8178a25dedd9fb99919d9d772142342fb78fe0dbf7a5303382a0b7feae4a381b76f8bb"; @@ -19613,8 +19933,10 @@ tl: { # no indentation "hyphen-icelandic" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "69add7ccde189e86810e2a82692a260de9a9fcc0ba011352881d202d4f4c94c4dbd84fe36dff40ef9b9ad3e8e990947cc61022307790f13cad56744f3ef5e41f"; hasRunfiles = true; @@ -19622,8 +19944,10 @@ tl: { # no indentation "hyphen-indic" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "765be1c13ef3445b056b61c24460cc2f18bad038c04541bf4773c7f61c6d26be25d3079b260a1b9623e2f01155ec52eb5bc87b0ea9234e50a5ca24dd8a7a5937"; hasRunfiles = true; @@ -19631,8 +19955,10 @@ tl: { # no indentation "hyphen-indonesian" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "3f04a63010c02d77cb229c90aec9f1079557493958573be9ce992ac5ae3c229f01f9abc0cac785d9340ff48aa169a01f8b327ecb2e255bef57f1fe85d04d1d2a"; hasRunfiles = true; @@ -19640,8 +19966,10 @@ tl: { # no indentation "hyphen-interlingua" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "dfed82ea70f25d452726b5cd03d8e060bddc23cbbc5deebab2ddad93ce6744c38d357327fbe570bf7a1444f62cee0cc422a6c7d066d6693a238d851b4fe46e32"; hasRunfiles = true; @@ -19649,8 +19977,10 @@ tl: { # no indentation "hyphen-irish" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "478a77c4ab8231a3041c3427075f16c072f58a394eced8ff0cd5da6544f3f2fd65722f33fd8344e18060c96f09bd18b90af71f8508639fc9c59d29d704d9e348"; hasRunfiles = true; @@ -19658,8 +19988,10 @@ tl: { # no indentation "hyphen-italian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "4e79ee31893d6c948a3aac8588d4beb75d89f89df973b1e39cd63894e008af55f8dca774194d7eb105fb0aef692b17bb645d5bd85cca7debafd74aabf241bc30"; hasRunfiles = true; @@ -19668,8 +20000,10 @@ tl: { # no indentation "hyphen-kurmanji" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "e5114da178fc841b1079130c01f8729ac94f0e3592dbd479f44a978ea009fd75b410d6130d9badd6227d115d8f6dad3ed4b553dbfbf4f80be5d1c2adf108e2fa"; hasRunfiles = true; @@ -19677,8 +20011,10 @@ tl: { # no indentation "hyphen-latin" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "9d0db7fcad4ca764379957fa22f9daede79898bcacfbdb62abe54318a52dd82a66f8e39542c18008e3f6b6d0db284b1e9b891531d3c8f3c9cf22c764e83d57b3"; hasRunfiles = true; @@ -19687,8 +20023,10 @@ tl: { # no indentation "hyphen-latvian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "85aeadb0cb3c5de9ef48057132ccd958d17f014b07b56b9ebe2186a709c4e7646fad260e156718e43ec3eac88681654f88c9b53a6d71fb3eaee934dcb4439ed9"; hasRunfiles = true; @@ -19696,8 +20034,10 @@ tl: { # no indentation "hyphen-lithuanian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "7a691e3c55c768b9ea5ef13552dc42025ab613df0a0d5c0d54aad58b63da11a93e59bc53e6a8211d5e054cbea8500846da01e9619bbee723d648e2d369a49d55"; hasRunfiles = true; @@ -19705,8 +20045,10 @@ tl: { # no indentation "hyphen-macedonian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "f88208291212874df493151581205d1b270b2d4278176c42e11edac9b344b73c2ee859f93b6947e4a6003a00abc4d3753024add9caf84f114c8a0cec72aa8c8d"; hasRunfiles = true; @@ -19714,8 +20056,10 @@ tl: { # no indentation "hyphen-mongolian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "159562a8feb25918bc422e7dc78a46423c7fff2f3c61016a0162761411999a5555be3c6e36cf967d5034f65c12f4b0834ae0c0423c2f3ab17a65034b1803dc72"; hasRunfiles = true; @@ -19723,8 +20067,10 @@ tl: { # no indentation "hyphen-norwegian" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "8b02e90bfcdf3c6d4bd1966b21e0512069f1749c638d537e9553f68e61e0bc325db8d3b462f45650db4376c7a769c2cde3e0c0601d7de272898a23cd2251c064"; hasRunfiles = true; @@ -19732,8 +20078,10 @@ tl: { # no indentation "hyphen-occitan" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "b0743d1f6083dac7a347e22aed19d0c5d76119582e4862557a55b817b17dddaa69a2150f14daf6b08689278dd61b27c1b6ed45df5601dd6327bf185a7a46a5c6"; hasRunfiles = true; @@ -19741,8 +20089,10 @@ tl: { # no indentation "hyphen-piedmontese" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "fa7fc73edd582ba20b8236507385f0a30f477bb9c79e35fea56aa4020be966b9c4a16a327848dd051fa4cf6e6117ef8a51eb92ed6cb72f6993cb290fa5cd5ca3"; hasRunfiles = true; @@ -19750,8 +20100,10 @@ tl: { # no indentation "hyphen-polish" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "5580b3865ff8d20d475cb962b0257b909ff0e410b6776cb8153145fb0ee42b2f777069413bc6b3622c8c52318aba1ba836210e8972c5b6a47ef978c24fc8848a"; hasRunfiles = true; @@ -19760,8 +20112,10 @@ tl: { # no indentation "hyphen-portuguese" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "9d9ab3e616522ab9837bb7c7509127f998c442e96f96ee6b6fc0fdc9ac53fd03319d0c0ce28e23a35f1ae0ebb840cdeb19e8ab6444549c33059b28e7b307486e"; hasRunfiles = true; @@ -19769,8 +20123,10 @@ tl: { # no indentation "hyphen-romanian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "124a93a633731dc1b3d6cbf2fc9b8489bf0737911a0c25ea44dbdfffa07c165ba5804dfd7e9cbe0be3b6eceb9fd6e95daefcae2356ee140f644416bbe1b13507"; hasRunfiles = true; @@ -19778,8 +20134,10 @@ tl: { # no indentation "hyphen-romansh" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "a69d3881493c70cfd58e3d79ed76ce6f18bbcb43e1683f31270eafeb743b366a3c52c9945ff94db333e88ca18145263ba74002f5e78bb42d7aefa48c66af7955"; hasRunfiles = true; @@ -19787,9 +20145,11 @@ tl: { # no indentation "hyphen-russian" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."ruhyphen" = tl."ruhyphen"; + deps = [ + "hyph-utf8" + "hyphen-base" + "ruhyphen" + ]; hasHyphens = true; sha512.run = "f17852dffbb8f5c337b8316b92c2b0a60a318df491231047d9c0930d55d8b2be3274ec94d0d87085d53e06e89c585d47250f046300bf3890ce751f6f2052d348"; hasRunfiles = true; @@ -19797,8 +20157,10 @@ tl: { # no indentation "hyphen-sanskrit" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "e84b6ca93e922c9c6edf03f4dbec1fae9eef2462379ef2fd0f3508a5048b54819c5ba12e0d76bafe1336666ca74ba95e27f63224fa048068bc515f3bc41f6eba"; sha512.doc = "95c6ae15687118ffc9019c8634347a602e6590b4a1d18bc060e57fe548a81f097070322975be1f62fa2685c5affff7f31b4854b0ec941bbcb9377ecf16986cea"; @@ -19807,8 +20169,10 @@ tl: { # no indentation "hyphen-serbian" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "390aa9c116b6db7b362fc57aa0758a4c489c5fe33c718fb37675b17a9772a463ce532a2ace3e1ef90275b4afef5ea8d6cff71a7abe625d84e3f461c115306452"; hasRunfiles = true; @@ -19817,8 +20181,10 @@ tl: { # no indentation "hyphen-slovak" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "a0786980e0cda7029a72075023520acdc998b83226e85deb0b8186ee4293560321517d507f74fbe68f1d68a16cd8af67aae68baead9176f9cc687bcc7d0a72e1"; hasRunfiles = true; @@ -19826,8 +20192,10 @@ tl: { # no indentation "hyphen-slovenian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "a605c9149ae452df8b2c25aa0f6bcdde53150e4485147a065f1f56c9740c3544c5c7f9c6049aea913916a62aabaf40777cf6f0f76a858e485c0bd09826a6ef5b"; hasRunfiles = true; @@ -19835,8 +20203,10 @@ tl: { # no indentation "hyphen-spanish" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "d6783537ff44a326b83c2004afd63f5bdbd162fa4865138c2e6d34c9e6a103ac41dd7b382454646b09c74970f8e0d5827a5f4af617936f74fd300b2054a096d4"; sha512.doc = "263fd9480c5f225c7e36169b86e846baa64745b83c1072c9602e873f2e7cf8e63b07ab85b29e9d4263656faff58a39fe83e1eba34517b8ba34720f189c8e7f43"; @@ -19847,8 +20217,10 @@ tl: { # no indentation "hyphen-swedish" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "5f993ae6b22eadb87b6a1839bfa7d78a0dccc1107c5afbec8c248ed001018da38bb179e29f2430cffa90283221b20c5475346a8d5566edf16152266257f2a37d"; hasRunfiles = true; @@ -19856,8 +20228,10 @@ tl: { # no indentation "hyphen-thai" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "8336eee03250859ab4328ad3c1fe437d2af688ef56b43be49c45838965ffe033befa84cdf600e9f48cdf60cbbfbff44450c830bd4c34556f680c5096ed3aecc4"; hasRunfiles = true; @@ -19865,8 +20239,10 @@ tl: { # no indentation "hyphen-turkish" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "5c7023e01bf59af4d36bd451f51ae00c445711c7ecf109c9d835f1d689446d7b0b1b2627b7f9e84e4f4a8ceff52227ff280ac64481e1d29d538a30e093dace85"; sha512.source = "2aa80889b9657b03b6beb6510b6790fba13811b97abbac186eaf4d3f40212b41db0dd2d21583429820faad558b0415a09aa8254d2edd96812cf6396fb18ccf5c"; @@ -19875,8 +20251,10 @@ tl: { # no indentation "hyphen-turkmen" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "c984bb7f09c5816c36a7a790f16df1750ee90f36e2130994ecd1db63f26afb650245985699a80da9b4d7004ad67106771d8c7b79262438369aee3f52fd8374cf"; sha512.source = "a496f681db0b4b85d82ec1dd60c057f63b6d1c1b52d391e7bee98d3d6e1fb596701c91f2ca400d0df13b96ec7a43d275646b7d2874fe1e4efc9d9b2b47f6cc5d"; @@ -19885,9 +20263,11 @@ tl: { # no indentation "hyphen-ukrainian" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."ukrhyph" = tl."ukrhyph"; + deps = [ + "hyph-utf8" + "hyphen-base" + "ukrhyph" + ]; hasHyphens = true; sha512.run = "05a9111b358c659159c6edfd38b9ce3d78febd794cc82968dc3e2acdc3612786304721fbd07f00f0a8278f4c2e46a1bfad821b5da45e60546d6acb5bf9068d08"; hasRunfiles = true; @@ -19895,8 +20275,10 @@ tl: { # no indentation "hyphen-uppersorbian" = { revision = 58609; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "b2cb1bcd953ffabbd3f5acd8c72e9c60415fd300004de56ee446fc77d381aac1db65d613a2f591d3d0e45f2a12ff5340457ae3061b4c77de502923932383bdcb"; hasRunfiles = true; @@ -19904,8 +20286,10 @@ tl: { # no indentation "hyphen-welsh" = { revision = 58652; stripPrefix = 0; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "hyph-utf8" + "hyphen-base" + ]; hasHyphens = true; sha512.run = "12a23e0b9d00eb4381e3c97ecbb449faf5a73b755a17fc0301f1cbad5d0babb370aeec16dcdd316cefb56e142873abaa685288b1a1d3c7dcb76a07a9ef127ac6"; hasRunfiles = true; @@ -20053,8 +20437,10 @@ tl: { # no indentation "iexec" = { revision = 64908; stripPrefix = 0; - deps."tools" = tl."tools"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "tools" + "xkeyval" + ]; sha512.run = "7e6c55383a22d2b47858e02b0d7023a7d130a089c550c0d4aa387035374ba6e0266b35a2f825e4d0bc4fb084bab42686df610f8f6f9007ff155bf7c150383cb1"; sha512.doc = "2b55ea3e886043af3e137be5e23388d1d0311e64f695b3774d85be2305e5ea8389a4139e4b3c84989187d66066ffadeccb0d8b70a5347ecfc6dfef750d28b2ba"; sha512.source = "d4f8b3b253189de2e303c00c5c8e42cd539eaf7eb0cd20feff54473086056fff2e6f8be3bebc071a261c68adffa55f198505dc81df4d095f3ab2dc6932b8e7a1"; @@ -20742,64 +21128,66 @@ tl: { # no indentation }; "jadetex" = { revision = 63654; - deps."amsfonts" = tl."amsfonts"; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."auxhook" = tl."auxhook"; - deps."babel" = tl."babel"; - deps."bigintcalc" = tl."bigintcalc"; - deps."bitset" = tl."bitset"; - deps."cm" = tl."cm"; - deps."colortbl" = tl."colortbl"; - deps."cyrillic" = tl."cyrillic"; - deps."dehyph" = tl."dehyph"; - deps."ec" = tl."ec"; - deps."etexcmds" = tl."etexcmds"; - deps."everyshi" = tl."everyshi"; - deps."fancyhdr" = tl."fancyhdr"; - deps."firstaid" = tl."firstaid"; - deps."gettitlestring" = tl."gettitlestring"; - deps."graphics" = tl."graphics"; - deps."graphics-cfg" = tl."graphics-cfg"; - deps."graphics-def" = tl."graphics-def"; - deps."hycolor" = tl."hycolor"; - deps."hyperref" = tl."hyperref"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."iftex" = tl."iftex"; - deps."infwarerr" = tl."infwarerr"; - deps."intcalc" = tl."intcalc"; - deps."kvdefinekeys" = tl."kvdefinekeys"; - deps."kvoptions" = tl."kvoptions"; - deps."kvsetkeys" = tl."kvsetkeys"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."latexconfig" = tl."latexconfig"; - deps."letltxmacro" = tl."letltxmacro"; - deps."ltxcmds" = tl."ltxcmds"; - deps."marvosym" = tl."marvosym"; - deps."passivetex" = tl."passivetex"; - deps."pdfescape" = tl."pdfescape"; - deps."pdftex" = tl."pdftex"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."psnfss" = tl."psnfss"; - deps."refcount" = tl."refcount"; - deps."rerunfilecheck" = tl."rerunfilecheck"; - deps."stmaryrd" = tl."stmaryrd"; - deps."symbol" = tl."symbol"; - deps."tex" = tl."tex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."tipa" = tl."tipa"; - deps."tools" = tl."tools"; - deps."ulem" = tl."ulem"; - deps."unicode-data" = tl."unicode-data"; - deps."uniquecounter" = tl."uniquecounter"; - deps."url" = tl."url"; - deps."wasysym" = tl."wasysym"; - deps."zapfding" = tl."zapfding"; + deps = [ + "amsfonts" + "atbegshi" + "atveryend" + "auxhook" + "babel" + "bigintcalc" + "bitset" + "cm" + "colortbl" + "cyrillic" + "dehyph" + "ec" + "etexcmds" + "everyshi" + "fancyhdr" + "firstaid" + "gettitlestring" + "graphics" + "graphics-cfg" + "graphics-def" + "hycolor" + "hyperref" + "hyph-utf8" + "hyphen-base" + "iftex" + "infwarerr" + "intcalc" + "kvdefinekeys" + "kvoptions" + "kvsetkeys" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "latexconfig" + "letltxmacro" + "ltxcmds" + "marvosym" + "passivetex" + "pdfescape" + "pdftex" + "pdftexcmds" + "psnfss" + "refcount" + "rerunfilecheck" + "stmaryrd" + "symbol" + "tex" + "tex-ini-files" + "tipa" + "tools" + "ulem" + "unicode-data" + "uniquecounter" + "url" + "wasysym" + "zapfding" + ]; hasFormats = true; sha512.run = "75b9c8be4f87b51798826f5ea070ff9877e8bfa2fbee5112972e9e0fc81a76dcb7081c2fe9eed645f53a38dd85443dfdb394004b2970c2ff5a91b32dc1cab909"; sha512.doc = "f70f85a12d730fc9dfb29da57a6f95239c10aa8ba7b9453ae884cae81399609fb99ccac3bfbc41f0c5f360ef80bd3f78b2f8479a826412bf573e9c5336d7e8ca"; @@ -21193,17 +21581,19 @@ tl: { # no indentation "kdpcover" = { revision = 65150; stripPrefix = 0; - deps."anyfontsize" = tl."anyfontsize"; - deps."geometry" = tl."geometry"; - deps."graphics" = tl."graphics"; - deps."microtype" = tl."microtype"; - deps."pgf" = tl."pgf"; - deps."setspace" = tl."setspace"; - deps."textpos" = tl."textpos"; - deps."tools" = tl."tools"; - deps."xcolor" = tl."xcolor"; - deps."xifthen" = tl."xifthen"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "anyfontsize" + "geometry" + "graphics" + "microtype" + "pgf" + "setspace" + "textpos" + "tools" + "xcolor" + "xifthen" + "xkeyval" + ]; sha512.run = "d68fa467a50f7d1648e51b918201b76c199920e39915a3c5fcc72cd75c4b11b0924082cf8c01363fe5af998c66ffae71137e7f9635e147ed40ed5e7cd4fd63cb"; sha512.doc = "880f981153526b41cc128677d950e52b4ff5449adc4fbb3b0004a983bcc7222fb64714ca033b605172fe0b52107e6cc8ff0fcbd1778bf7aa6b9d20fa994ef452"; sha512.source = "e67cc3eede96c42506beb03d8e4e7db1b5fd4a7ed15026a060c3a5db559c0abc7fe0f9e24c22b23d2aff7c7979005f0c26d250607129d29b6d4bc9babc0e11be"; @@ -21409,7 +21799,9 @@ tl: { # no indentation "koma-script" = { revision = 64685; stripPrefix = 0; - deps."footmisc" = tl."footmisc"; + deps = [ + "footmisc" + ]; sha512.run = "2fe2a07d56107390a191c016c29f7bf77700647b7996957a3802aa89b9b7eacc4cefe1c444b6faa688a147a8b0d9c5d80fca511dc2454a15ada6ddaf6aa3ccb2"; hasRunfiles = true; version = "3.38"; @@ -21449,8 +21841,10 @@ tl: { # no indentation "kotex-oblivoir" = { revision = 64928; stripPrefix = 0; - deps."kotex-utf" = tl."kotex-utf"; - deps."memoir" = tl."memoir"; + deps = [ + "kotex-utf" + "memoir" + ]; sha512.run = "17a5f52990cfdf57fdc8ffdc3fc417a15ab52e21296a95b6b1698166ac215937bc26db8aeac7b38459cdf3411480045af85aec491884cd89f00896916a7702e0"; sha512.doc = "5ef9480a78f216dcf11fe06d8766ba66817a86faa7d0003af77a1fe1079f5e8a8c527bcd333e5fe02153f6ca0b0a82eaa206eb1c5bb7b9517b9ef2865faadc4b"; hasRunfiles = true; @@ -21467,7 +21861,9 @@ tl: { # no indentation "kotex-utf" = { revision = 63690; stripPrefix = 0; - deps."cjk-ko" = tl."cjk-ko"; + deps = [ + "cjk-ko" + ]; sha512.run = "be75556f3857a405d235f920866f8089f105a57f9accff07a541fe110bb8124e049ebe75368ce3282bcd329cc6a02eed0ccffdfad49020986d61221839cae4b5"; sha512.doc = "7226874594b10ee48e8aea30a72e6d6f4db9f770d5d5830dc83a41f828bfe36b0b11f679aff02722e457150548860f1ad719758e6ffd239bbf9ac18d907acded"; hasRunfiles = true; @@ -21475,7 +21871,9 @@ tl: { # no indentation }; "kotex-utils" = { revision = 38727; - deps."kotex-utf" = tl."kotex-utf"; + deps = [ + "kotex-utf" + ]; sha512.run = "569e9677ef0f346e5a53f4cc84302a8ddf2b4ad85708f4ab8ba7d076ebf339ec60998a41fa92fa815167e9bfc37085ebfd921dd13a60b017a0574e4a5d205802"; sha512.doc = "a46c5d09d119fa2fe8b9acea87a37776536e3216b776af6b7037fc5b0a522af5c1a58baf081e60f06c9a4054e8ac2372458c276c779038a030dc92efdfa3aef6"; hasRunfiles = true; @@ -21563,9 +21961,11 @@ tl: { # no indentation "kvmap" = { revision = 56361; stripPrefix = 0; - deps."amsmath" = tl."amsmath"; - deps."l3experimental" = tl."l3experimental"; - deps."pgf" = tl."pgf"; + deps = [ + "amsmath" + "l3experimental" + "pgf" + ]; sha512.run = "54a107c866519e6ce6cb69bd8c13ae085813c4adf235592e32cbfb2bd7eb8039ff8e1fe165f43892367a28ac0984874581424e733b1d3722796204df96d840f3"; sha512.doc = "41fb3957c91e3127b5d7c78fe2114cb4fe6c8167e6f7f2bbf3a5b7c0fdb12c0ac79e47d84fad54c4b6a3165114c333c575eea01d5c0c886c19b21643ab0fb03f"; sha512.source = "5dae9b0972acc7c95b148fb13d9008b27591aa9ff9065c1c43dc799c5096f89a8b6b2da97b17bb5e544b1a10702cf247d9cecaa39d9790993996276741c0d792"; @@ -21642,7 +22042,9 @@ tl: { # no indentation }; "l3build" = { revision = 64987; - deps."luatex" = tl."luatex"; + deps = [ + "luatex" + ]; sha512.run = "25d5696ec1f33dcb90be757a1b0fe16950c82f1db243b1490ed24b6acd94dac836b163e64f1279a66dbd7496cb60072cd9e6ad631cbb2ff532e8d51cb44fabbc"; sha512.doc = "0293c819fad182fdb6928ec2b7a9c3daa20ca53f9e243bea80951645a9ed0f2f0daca095c22dcaca55bb43fff52cca4dff76237d87eff25e6aa0a36215789d25"; sha512.source = "051e6b948ebb9f02581bfbe22f07b12148b9dcb0b779ef98deec8c0f613b77b11c8ae9c32c8c59f50ca5cd104e13f2216b979d636867d79db4044b0c7ef2be1c"; @@ -21651,7 +22053,9 @@ tl: { # no indentation "l3experimental" = { revision = 63089; stripPrefix = 0; - deps."l3kernel" = tl."l3kernel"; + deps = [ + "l3kernel" + ]; sha512.run = "aa8f499d84578afcd72e29a48e8c5ff337d2b1acb4cbf3b4b3754925d60e2bf1f2003e82bafc859701c295d61f572305135bb5d078c194fd0d747059ac69f2ea"; sha512.doc = "71236121e4ca1395e433802a627aae1689f9b0aa55413d87317a0e9c0d0f9cf0ddd47bb7509160f0956d153b6ef9819362fbb95344e3ccb9fa1c8733ac4a427f"; sha512.source = "8aea8b5a80af397443bf3d25c489a02622a63ddd5efbec9335952af310f9888c25e0a18fbdc3694927caf38af63f89bc518e72927fee6343fba48805b25b90ea"; @@ -21660,7 +22064,9 @@ tl: { # no indentation "l3kernel" = { revision = 65299; stripPrefix = 0; - deps."l3backend" = tl."l3backend"; + deps = [ + "l3backend" + ]; sha512.run = "9cbcf410a7d6aaf5477805feb48e19fd751e418718c261a4cea1305322dc8ac7eb6a14af9337de0393b5c6aa49b6496116b9e10c0a1338511aedb307d196f6b2"; sha512.doc = "da9d55dbb019ac88b891ba276c27af91a4747e4c8289804a5fdb52555c81c6a293eaa0adef12157ce4147cce20841902090aed8e2dd58084ecedf1d051b55f83"; sha512.source = "37be0d6c2adea6e62c2b24eff707ecb261e7ffed0d9e774ed43095aaadf859fe7b96d992cd5b20870a14737327c903d8b3d80b2983fce730d7ed168ef939ac08"; @@ -21669,7 +22075,9 @@ tl: { # no indentation "l3packages" = { revision = 65300; stripPrefix = 0; - deps."l3kernel" = tl."l3kernel"; + deps = [ + "l3kernel" + ]; sha512.run = "b163a5f7eccdd650faad6ed6d2539f54d7343f9f11335e54cbedddfad9b1ba06899365583ec44c59bb7b67efe8a2f507b8217f52a3f65d194967981521b39195"; sha512.doc = "c39241a45eac0e1da5be990bee94b99547b22bec1469aba31a999fadff334bbc701f38ba47b01300da578eadc3778af75c77d3180c970e5d0c22de9a09be2692"; sha512.source = "40f19b6e8ef60aead350679a8451b62ec2f833b5413fbc96c706bbd33a020652ed5fcd86b8da6b9b5ee8c812e3aa07371e0e63c7ece51bc21c97e562a5b27fff"; @@ -21814,10 +22222,12 @@ tl: { # no indentation "latex" = { revision = 65161; stripPrefix = 0; - deps."latex-fonts" = tl."latex-fonts"; - deps."latexconfig" = tl."latexconfig"; - deps."luatex" = tl."luatex"; - deps."pdftex" = tl."pdftex"; + deps = [ + "latex-fonts" + "latexconfig" + "luatex" + "pdftex" + ]; sha512.run = "de95ba089738862d57b1139a21da57a8263cbe9ff81a7ab43608ce23fde57b4630057a95c99ecb7be712bc864e0c07a56429019d7aa9f63c01f47a995d5d567d"; sha512.doc = "68ecd2a5c85afe7b39402db416bb7ad0f8e5662c77d77c0839a470f3f70da65377560fbcb5a6952e997da70868533f29a4b7c65d3f7dd63db13aa95ee7159b23"; sha512.source = "59d3d31147fc8a31c6348c2a5f371cd4dc69d2367f9ced0c62150c5d14ead49b4e195c328ad4791638e61b93f69143c0c93bbed5551b31e4de1284a4aa7b6d73"; @@ -21844,60 +22254,64 @@ tl: { # no indentation }; "latex-bin" = { revision = 62387; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."dehyph" = tl."dehyph"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."graphics" = tl."graphics"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."latexconfig" = tl."latexconfig"; - deps."lm" = tl."lm"; - deps."luahbtex" = tl."luahbtex"; - deps."luaotfload" = tl."luaotfload"; - deps."luatex" = tl."luatex"; - deps."pdftex" = tl."pdftex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "dehyph" + "everyshi" + "firstaid" + "graphics" + "hyph-utf8" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "latexconfig" + "lm" + "luahbtex" + "luaotfload" + "luatex" + "pdftex" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "91b6749a7fc520500812c203a1acb0701e7984e5e309eaf0c4815bc7ea0b507f3eeaaae3a6ad715ee53f018b8e38c695c4ff9567f26222cd2c52ba24e1a03c1f"; sha512.doc = "30f9001ed8236f01555f8a21ff8286ea409d75583876f8ba795e1a819dea14cb3f2b3dff31e0258cf5deb75ae2fd9201e33260ef1f32c2ce53fb86bfa4e59f83"; }; "latex-bin-dev" = { revision = 62387; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."dehyph" = tl."dehyph"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-base-dev" = tl."latex-base-dev"; - deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; - deps."latex-fonts" = tl."latex-fonts"; - deps."latex-graphics-dev" = tl."latex-graphics-dev"; - deps."latexconfig" = tl."latexconfig"; - deps."lm" = tl."lm"; - deps."luahbtex" = tl."luahbtex"; - deps."luaotfload" = tl."luaotfload"; - deps."luatex" = tl."luatex"; - deps."pdftex" = tl."pdftex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "dehyph" + "everyshi" + "firstaid" + "hyph-utf8" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-base-dev" + "latex-firstaid-dev" + "latex-fonts" + "latex-graphics-dev" + "latexconfig" + "lm" + "luahbtex" + "luaotfload" + "luatex" + "pdftex" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "dade40731ce41c6a0304cb7472255f2d6c8b1fed45b619282aa747b3ebbdfd707da18947f06c8896d72605b324ffa58c3c7195bd90629531ef1fb54a91f1310c"; sha512.doc = "7434698038dd90f10c51743e238cfcf0d85da2067d458f399e557b855c7ae6fd4e013ef4272e710eb9695d3e4f8757acae95c41a9e704a393202aafc11218754"; @@ -21960,7 +22374,9 @@ tl: { # no indentation "latex-graphics-dev" = { revision = 64899; stripPrefix = 0; - deps."graphics-cfg" = tl."graphics-cfg"; + deps = [ + "graphics-cfg" + ]; sha512.run = "33e2d6ed2e3076219a0438b8d8461110e7edf3a9b0534455d2fc43837a3766d12bdc8d912414bf88bdbd9b10a54a5b8b2045ff3a3cef42ed7cdc49a2d8664d5a"; sha512.doc = "ab0be817107e89a4d87c8e5ce68d20ec06eba0ae37ccf79d2dae1e916fc9ae8e2b1c7f7d9701daeffa5bfb931a881d63cfd188393e075c943d91fccf3eb1753c"; sha512.source = "cb5f6a80b7178dfd1074235d5e1c7a3a2830d4c7eb037cf9e5d51a2770ed85140be7648e288cd5d67f64955212b29d8dc37fe359c0b7a27fc065cdecdc198de7"; @@ -22308,7 +22724,9 @@ tl: { # no indentation }; "lcdftypetools" = { revision = 52851; - deps."glyphlist" = tl."glyphlist"; + deps = [ + "glyphlist" + ]; sha512.run = "3f3cc8f7cce233eb36315b21db408847a267ff393d6d4118de61c4b03ec408f3f29b2d41fdcf84995bfbf5d07bcb25984d7ffc76458d4f2dc12fdb6dfb85e23f"; sha512.doc = "5a1dd1e2fd79351afc65d6786b24aebd9681a2b9e92755b44a836b47da5ceb1817f085483f306991a113dc0c26edfcd84839dec93bb46a003034536f31b31e5f"; }; @@ -22359,7 +22777,9 @@ tl: { # no indentation "lebhart" = { revision = 64280; stripPrefix = 0; - deps."colorist" = tl."colorist"; + deps = [ + "colorist" + ]; sha512.run = "4b1411cfb2cef9639554ef01af946a53d49ae429649af78a9213a79f695d0014cb3c0ef9cb13c3d0f85e0286e27b5ba214ae85ba6f2c94a32655131e4898ddb8"; sha512.doc = "06c091c1a7c05c9c8f3de49b1bb0499e7f95273fd048de20aa59cf67bdd100d623735e8c214e81fe4b2ecbc3ef1dc83911789bd4a6f008baf62bfb12233642d1"; hasRunfiles = true; @@ -22545,7 +22965,9 @@ tl: { # no indentation "lh" = { revision = 15878; stripPrefix = 0; - deps."ec" = tl."ec"; + deps = [ + "ec" + ]; sha512.run = "265aeba5ee99cbec2eca77a273a9e4857d78280e0ff17089a358e7f85d0595025e259b2edd471ce5287479531fe37cfeeaeba405ac9cabc7ac9616242815b6cf"; sha512.doc = "33f1cd39b2e68caa750ca5867bebbbc43c9948a7606f6fe44ba3bd8be84661fb562b5472ec57ccc3f6c18ef2823188c2f81ca4444b562f935e6f041d8ec0f39d"; sha512.source = "a81d3d7295101718dc4e66c6daafca8c480b281d7219956b0007adb4fd7e0f35959277931254fc778bf69c581b7d15ccf445f5037b589cee937211c39f59529e"; @@ -22571,10 +22993,12 @@ tl: { # no indentation "libertine" = { revision = 64359; stripPrefix = 0; - deps."fontaxes" = tl."fontaxes"; - deps."iftex" = tl."iftex"; - deps."mweights" = tl."mweights"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "fontaxes" + "iftex" + "mweights" + "xkeyval" + ]; sha512.run = "7b95b6612f5b46298cddf459184f11752a4b050110bd1d0271e43e364aa5da58c9e27d3b72119b76e863a19ab0987ea408d749ecf18ff40da1ab8a585e31c7cf"; sha512.doc = "c33beec53a939a5b9f672e0c5a7aea7a3b3047e4f1f1e68b7d4d64cd03a7f73da2bbce2a4c56199f71519d4c364a3e0ccddf8f93f24dc9eb1fd3896fd035ec77"; hasRunfiles = true; @@ -23052,7 +23476,9 @@ tl: { # no indentation "logreq" = { revision = 53003; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; + deps = [ + "etoolbox" + ]; sha512.run = "df61c0c6c0b8520f5ec38780d8eb69cfd5fccd21f5120e48eee71e02b004d3da4cc9cb9371a36766852e3ca09a3db86655f1a2639a49741f00134cff1246acd2"; sha512.doc = "fa9277da81dfb3aa235bd795780e8d3e629558fede90fa9234528b50a11507e59e65e49a0ca787af037186890392dfd45bf6de7bd859cec369626fb7d57b543f"; hasRunfiles = true; @@ -23060,8 +23486,10 @@ tl: { # no indentation }; "lollipop" = { revision = 45678; - deps."cm" = tl."cm"; - deps."hyphen-base" = tl."hyphen-base"; + deps = [ + "cm" + "hyphen-base" + ]; hasFormats = true; sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78"; sha512.doc = "206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86"; @@ -23612,15 +24040,17 @@ tl: { # no indentation }; "luahbtex" = { revision = 62387; - deps."cm" = tl."cm"; - deps."etex" = tl."etex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."luatex" = tl."luatex"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "cm" + "etex" + "hyph-utf8" + "hyphen-base" + "knuth-lib" + "luatex" + "plain" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "daafa6e417e7c366dde221488b91708f8c1302cf6db849b91a82bd74619f0b91e16430680aabeb27e43d1469262c9f799cd0bd6547635ac6ad54ef8e2dae5703"; sha512.doc = "5d2915af80990896181a70c24dd3c51748fbaa6f3f9b96b67b1b40bc8ab36d39293e8f76c0f3dabdaffb252423eec61375b6f5aa859a1310236f7d39d6f2fcf3"; @@ -23668,15 +24098,17 @@ tl: { # no indentation }; "luajittex" = { revision = 62774; - deps."cm" = tl."cm"; - deps."etex" = tl."etex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."luatex" = tl."luatex"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "cm" + "etex" + "hyph-utf8" + "hyphen-base" + "knuth-lib" + "luatex" + "plain" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "f7503044bf237ca6d6e33a3a067bba0d73dfecfee7e77b5ebd4f3d6417dd24f7aa263cb08e7ffb86708574ecda31d5c7d89b42d2ad2179119393b99129f8077d"; sha512.doc = "3924029e274913999cf54e2f3a4d3ef85dbfbb4ee93a629b8eeb77c796557c3086eb447fa74d2d7a6f33a17f433f38ceb033f7e1633e240bbb135b4239b588f7"; @@ -23706,8 +24138,10 @@ tl: { # no indentation "lualatex-math" = { revision = 61464; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."filehook" = tl."filehook"; + deps = [ + "etoolbox" + "filehook" + ]; sha512.run = "16c945e72165acd9f4bcf20f81e6c5df9ec22f19d45cbb8f076763d2d1a1a2e230938dabbadfcc065e3a060487885ac2edb223aae22d12f6981f5fca5c0f951f"; sha512.doc = "f5a8db238ae096b7b1a2eaa84643f063cd28e08b328cbcc780171a60c571e858a1cd1941a8ea9053392a8c65b965a81c8cd585ce2accb27e797e3e4e8ad3a127"; sha512.source = "e04a36a2280fbccb9572539ebc9bafba4edb7ccada25c4b3faadaa61c2f4458d9e9a90e54fa00b5ba675e59f42ed2d076b39918e5c126e2f619f2f69ff904d81"; @@ -23775,10 +24209,12 @@ tl: { # no indentation }; "luaotfload" = { revision = 64616; - deps."lm" = tl."lm"; - deps."lua-alt-getopt" = tl."lua-alt-getopt"; - deps."lua-uni-algos" = tl."lua-uni-algos"; - deps."lualibs" = tl."lualibs"; + deps = [ + "lm" + "lua-alt-getopt" + "lua-uni-algos" + "lualibs" + ]; sha512.run = "70f27796fdfe61e0337239a2962052eb2896478358fca0f271287db06a1d2de2f83cd7394d0ec6c281e9a5779ec396e2993f53b8b045ed7a09cb17f100a4a477"; sha512.doc = "9e1c223ec2589f32640aefd2692d031b8ba324da30a814eea98768443eeb76d92d2700c320e6f96006e54635d31a655cae0a27c76931e7640748889ead4fbfb4"; sha512.source = "3ed04272b887f434bfe2dd166974889318597e22c57109647946f2b255efca2fb6d1ecc1f02485a1bf387e77956c64a9f42c4af237b29f9fc7a38400d8cfbef1"; @@ -23788,7 +24224,9 @@ tl: { # no indentation "luapackageloader" = { revision = 54779; stripPrefix = 0; - deps."iftex" = tl."iftex"; + deps = [ + "iftex" + ]; sha512.run = "7f2558dc265746f143520c2c6f3bf2ed05ac8c54988e573519321a7fb5a2a991220d0eb8906893f77964dc01f0e3f16b783dcd20f809042a11d29cd137f557fd"; sha512.doc = "64719d715fc98bc09ab17db5f2053ea3e34d703adda6677f50ffe178a974230e8a03a9019b995238d073580e1faa745e655a7207468965ccb9f67bfccb5b5a49"; hasRunfiles = true; @@ -23836,14 +24274,16 @@ tl: { # no indentation }; "luatex" = { revision = 64839; - deps."cm" = tl."cm"; - deps."etex" = tl."etex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "cm" + "etex" + "hyph-utf8" + "hyphen-base" + "knuth-lib" + "plain" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "3789aa894fa2472f763275ddb045178acb51bbcbfa5f88d0dfee5498932089519b273ca5f6bf413992578638a7331e88b69f976db75cb9aeb50bf7d5f0396a69"; sha512.doc = "f7c0807c1b4548666efa133330f1ecae7d85a0465357c5dc90f77d65b34d73e8755fe825155f2688a066f73f3cd9c76cab29a7ab06ce4406854177db4242fb51"; @@ -23861,7 +24301,9 @@ tl: { # no indentation "luatexbase" = { revision = 52663; stripPrefix = 0; - deps."ctablestack" = tl."ctablestack"; + deps = [ + "ctablestack" + ]; sha512.run = "cb187dcd0f9e454a3b9d021b802ac6f7d09c3eee68adb5da31035f5b7bb36d2938ca940505ee08c8410ee0e5e5c81ffdd21617ea5ba0e9ca7b58abb6ede3defb"; sha512.doc = "5dc696009e84662fc56443d7a5d61b3f30adbfeae3cf7176e81e676087d0fe580cb0575add49999ea8d5651850b7562c775b0727de01934465f3613ab7344be3"; sha512.source = "ebb46d5d4c3f6ccfdbc758f9dab64d7e83c2fe988f7da6852dfd5e786bc757f2438f86010a695eb2e780a02830f15dea941de7fb5bdd6e6561df0774b476dd5a"; @@ -23871,7 +24313,9 @@ tl: { # no indentation "luatexja" = { revision = 65267; stripPrefix = 0; - deps."luatexbase" = tl."luatexbase"; + deps = [ + "luatexbase" + ]; sha512.run = "6f146fd9d98d931094653b6e2d2357ba1f23c7c539489bc6e21db884b3da8a91dd822f3c301a4fc22168331b9760a96e61c6c0cc5c197585c2b02ffd96d6ca8e"; sha512.doc = "f7b5adca5278dbdb05d2bab6eb4c5449c07f4ea6bca6548397bda6a27b73fbe5ce9c6e4dbd9ca19bde9b3b950157d783a1e73040c08ae60f661a486168653f91"; sha512.source = "58ec25306a8203494cb029bb9866d847537723acaeef83b5a0899b9bd27e3045291a4aebfd3e094215f99282d4d744799b876cf26bf9a46908b502cec07863bf"; @@ -24354,7 +24798,9 @@ tl: { # no indentation "mathabx-type1" = { revision = 21129; stripPrefix = 0; - deps."mathabx" = tl."mathabx"; + deps = [ + "mathabx" + ]; sha512.run = "ae2272ac7d79a3bb1a655000a2d5fa1c3d948363763abe194cbac4084d5ef60492648977660c3d9dfbc2c70bea3c207d031d2147097fb1d7af503aa80f257d1c"; sha512.doc = "2504e85d659cba06fa25ae4e154309a6d3dcba2ac8bae0d4066b6637f19081987b0bc774902365e5b723f4b6c35cad07709e316ec1893a018baabc699d755e8b"; hasRunfiles = true; @@ -24465,8 +24911,10 @@ tl: { # no indentation "mathpazo" = { revision = 52663; stripPrefix = 0; - deps."fpl" = tl."fpl"; - deps."palatino" = tl."palatino"; + deps = [ + "fpl" + "palatino" + ]; sha512.run = "72bfba52e37abd933cb7b1b19dd813c3c76438591c94f9c407cabb8a44c8c67f78fae04442027287e5bf30b7239c3703ece4271194716882773eeb50d4cb2f47"; sha512.doc = "94e624f2cea50bf3534300d3332dd61e1bc5b4c834603356831d0f9bf4c6bdc34af5d31df002c10430d4945c2c71dbf7c156b7b05ba08c657cc2d960839c2a35"; sha512.source = "bd6aba477ca38c9778d7d23460420f485ac5658e9514ac2260475a50b6ee7e2ff736bac81a4548fb4aebae952a406a0de1bef01bd7d8fe4984080ab835d328d4"; @@ -24818,8 +25266,10 @@ tl: { # no indentation }; "metafont" = { revision = 62387; - deps."kpathsea" = tl."kpathsea"; - deps."modes" = tl."modes"; + deps = [ + "kpathsea" + "modes" + ]; hasFormats = true; sha512.run = "4e287680b7b14497133165a45ed668dd326e587a305475d90f4b545aa1973a0e6001fef2e3a9afa5fd2f343497d109f4670fcc0f4c0263b20624dbbad1f21bd3"; sha512.doc = "07e574fce34949b71ea0b156c394db80bdd9c9a3018afbdadf786fa431674b6fd0c2f79e8f9a72c872b17b2dbedb755c0ce3def552740a99e63d65e28fc3d2b0"; @@ -24884,7 +25334,9 @@ tl: { # no indentation }; "metapost" = { revision = 62387; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "d807a22bd0f3358d1986a477834c19b2fce636e4ea96f52f745220a165726505849ac4a1048bd4be49cf9e42e098a55df2a4c9b4d267dddbe2fb093ba3029d6d"; sha512.doc = "384730c3f784bb026bb29ee69dc95d179c53636c405e1a037477269e9a3a95d8c296729d7bb54037ca4a76e5ef00eff4876c4538203e400db8c4f0850c48b259"; hasRunfiles = true; @@ -24963,17 +25415,19 @@ tl: { # no indentation }; "mex" = { revision = 58661; - deps."enctex" = tl."enctex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."hyphen-polish" = tl."hyphen-polish"; - deps."knuth-lib" = tl."knuth-lib"; - deps."pdftex" = tl."pdftex"; - deps."pl" = tl."pl"; - deps."plain" = tl."plain"; - deps."tex" = tl."tex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."utf8mex" = tl."utf8mex"; + deps = [ + "enctex" + "hyph-utf8" + "hyphen-base" + "hyphen-polish" + "knuth-lib" + "pdftex" + "pl" + "plain" + "tex" + "tex-ini-files" + "utf8mex" + ]; hasFormats = true; sha512.run = "a79d6a1ecb15f7962826773d7eab4b1ffd86a5c15f8076f096fecf63df1bd661449eb7d14251a57a1eb2bede030ddf93aac170fc3c59ae0a124da6cef69e55be"; sha512.doc = "091f2825376718d8c2190555af7ef54d0ae5202425d57b986fba861df2f8604301df5a121ccfcfcdc91032d07dcda8289fb8de5d81c487b93b0e202a2a5a658e"; @@ -25016,8 +25470,10 @@ tl: { # no indentation }; "mflua" = { revision = 62774; - deps."luatex" = tl."luatex"; - deps."metafont" = tl."metafont"; + deps = [ + "luatex" + "metafont" + ]; hasFormats = true; sha512.run = "fa735fa117e7bd433339efbb709caa5fc25007088500dd5e4f6999cc417d188fd43435f74d526186880ac857f9bfc52e1fb7f1055974cea959e28536150b1a19"; hasRunfiles = true; @@ -25075,12 +25531,14 @@ tl: { # no indentation "mhchem" = { revision = 61456; stripPrefix = 0; - deps."amsmath" = tl."amsmath"; - deps."chemgreek" = tl."chemgreek"; - deps."graphics" = tl."graphics"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."tools" = tl."tools"; + deps = [ + "amsmath" + "chemgreek" + "graphics" + "l3kernel" + "l3packages" + "tools" + ]; sha512.run = "fffeb1ce083d8eb3da6543409e5cc735c9699f9145114c8325c336b93d2dab2a9976fc448c6324318407c3af888cb91cc7764fcf3bd24369e4940f00dda66429"; sha512.doc = "cd4c41a329489149b3f2bc79dd50e0517707681f452888394870459d10888095a0cbb7b7c18500f04264c6c85f791d9af9d799b1b4e221e991af32690e7405ba"; hasRunfiles = true; @@ -25292,21 +25750,23 @@ tl: { # no indentation "minted" = { revision = 65252; stripPrefix = 0; - deps."catchfile" = tl."catchfile"; - deps."etoolbox" = tl."etoolbox"; - deps."fancyvrb" = tl."fancyvrb"; - deps."float" = tl."float"; - deps."framed" = tl."framed"; - deps."fvextra" = tl."fvextra"; - deps."graphics" = tl."graphics"; - deps."ifplatform" = tl."ifplatform"; - deps."kvoptions" = tl."kvoptions"; - deps."lineno" = tl."lineno"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."tools" = tl."tools"; - deps."upquote" = tl."upquote"; - deps."xcolor" = tl."xcolor"; - deps."xstring" = tl."xstring"; + deps = [ + "catchfile" + "etoolbox" + "fancyvrb" + "float" + "framed" + "fvextra" + "graphics" + "ifplatform" + "kvoptions" + "lineno" + "pdftexcmds" + "tools" + "upquote" + "xcolor" + "xstring" + ]; sha512.run = "faf543c7f48371cca2a4af7d1e4e1e9b16c13673908417ec982d773dac561ab9e467f79bed230f5c0e359fc82c5cfff1f83e18cb6261279943d1e5a2f117ea2f"; sha512.doc = "41640837e53d5b9cdce55a8f29707fe4f654da19813efbc1770df39b8f00aabdf600032dd504a8cebe23b4ef91e226014a94e031c52d0458f0684c5a53bd276a"; sha512.source = "384af78dba5447f7169804597afba5b42f8860cabe691e2490d90248ed798880d11471e8cad7ede8a4b1dbaf7b9684dea05ae54719c7637b8f5b6d953fd0ba98"; @@ -25420,25 +25880,27 @@ tl: { # no indentation }; "mltex" = { revision = 62145; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."dehyph" = tl."dehyph"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."latexconfig" = tl."latexconfig"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "dehyph" + "everyshi" + "firstaid" + "hyph-utf8" + "hyphen-base" + "knuth-lib" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "latexconfig" + "plain" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "e04f33b83474e58c4725abbba21ae56659920ad2929faba7f25b47befeeb7e207e36888e1dbf7260ecc95c126e1732f6f5dced3d277db7c3889f2b08590b04dc"; sha512.doc = "e9d5a1cfdc6183bf99ef369b447c73e9ec5926952a80a75708db4fc6343ffc1a10d599276c13f295005f7c8c56e2e35ad9edc9dee3ee06928fa8c7b267d82bbf"; @@ -25499,16 +25961,18 @@ tl: { # no indentation "moderncv" = { revision = 62128; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."fancyhdr" = tl."fancyhdr"; - deps."graphics" = tl."graphics"; - deps."hyperref" = tl."hyperref"; - deps."iftex" = tl."iftex"; - deps."l3packages" = tl."l3packages"; - deps."microtype" = tl."microtype"; - deps."tools" = tl."tools"; - deps."url" = tl."url"; - deps."xcolor" = tl."xcolor"; + deps = [ + "etoolbox" + "fancyhdr" + "graphics" + "hyperref" + "iftex" + "l3packages" + "microtype" + "tools" + "url" + "xcolor" + ]; sha512.run = "988cc5f400af4ecdfc0730a63d7f2a13fde81b9120f198622a5e2d145ca94e1d5bc952e261ef2f4cacefda8a23626119975fd1e00b44f4a66b1fbb7f4c011d40"; sha512.doc = "9527fa84fffc4eb2ac92dab59cf0e5ae87a6f5befd4ed05acdd85cc7050dcc669f8b814ef928e69bb1c1e8bb3bd774aca1f85acf6b750a1c9555a3165eba0281"; hasRunfiles = true; @@ -25602,7 +26066,9 @@ tl: { # no indentation "montex" = { revision = 29349; stripPrefix = 0; - deps."cbfonts" = tl."cbfonts"; + deps = [ + "cbfonts" + ]; sha512.run = "9676cef9e0fbe7a0196b1ea0fb3ea4f0399a3ee8ed76ef06e824848a57922dc4f7cc1f50a1fcea47fc265465407653447ab80e80dbac3c4bc00488d0929f87bc"; sha512.doc = "1965f31e28a9f54d86a495b4b8cea50dc59f409d066918dedf77f86448b60ea547565dcf2069ee0e0a646d53f34d244868600951c4b1a4d4e099fe50e3c2b477"; hasRunfiles = true; @@ -25767,7 +26233,9 @@ tl: { # no indentation }; "mptopdf" = { revision = 61520; - deps."plain" = tl."plain"; + deps = [ + "plain" + ]; hasFormats = true; sha512.run = "3e5bb2983ea7329e4d3a48a29a5902d0245b0bd07f6cc3d272358701bd7df8bef808cd23810a70ab60209dea2d8788624e98497c6c04c917a59874a84ed94a30"; sha512.doc = "7bb6c2bc9dd0bceddb4b5aaa8d7143c40fb41baac2065cfbaf14642acb33bb7f05703d7b8469da0e92453ec10f0b8252d00b05588d7846835d622be097a83f8d"; @@ -26049,7 +26517,9 @@ tl: { # no indentation }; "musixtnt" = { revision = 40307; - deps."musixtex" = tl."musixtex"; + deps = [ + "musixtex" + ]; sha512.run = "eab6332d626f199e46dcd03ea546abbc4446b41c4b0354c066790ebfde154c6fa90f861dcff77206318b58a31565d884576899629520e78b3285bac673d1f4bf"; sha512.doc = "2da473ad2425064747187da005e01d6844731c536b75095828a85d358ffb1344331ef483c0cebe79b346b4fa96a358a1e416cce7d7cfcce6b1242cf3c0a3645e"; hasRunfiles = true; @@ -26183,7 +26653,9 @@ tl: { # no indentation "namedef" = { revision = 55881; stripPrefix = 0; - deps."l3kernel" = tl."l3kernel"; + deps = [ + "l3kernel" + ]; sha512.run = "c413d600911ab1107554ec2aacadc80fad12a95e7486817c002274f282e047915d06f4878e68e423af649569752cd27d7c1b3a802a9abff68e91038719b2fd28"; sha512.doc = "72031cf2858a3b68092c852c216f96aaea212c721e47d90e870c8153f83db921590246fb11b59009d431754720791e3c625fb3abd7bdd9010cd1a49894023ebb"; sha512.source = "adff08a774126c8faff52ba14044a8e2140f9586358dab6ce95e7a941706bf57c32acf0ad75282bd3b01dec8a73fea105c0c65a1453f5903d5eaeb3fe0349b15"; @@ -26460,7 +26932,9 @@ tl: { # no indentation "newtx" = { revision = 62369; stripPrefix = 0; - deps."kastrup" = tl."kastrup"; + deps = [ + "kastrup" + ]; sha512.run = "07c63e655ebb6381bb7eaa4f0f1a35054894ee6db55992cb8fadc04a2dc62470767a12661a8cc697c8d15df40861835463ff7a0bad449f9fb86b59093642b89c"; sha512.doc = "e615ce1c1a9478358af27885cd9c0b8d7ad152a3fb437ab705bf682d5849bd705a248de2d879ea9b4de0833984c15b0ad59c4da7da88c9e12d21fff9e4fd9efa"; hasRunfiles = true; @@ -26591,7 +27065,9 @@ tl: { # no indentation "nimbus15" = { revision = 58839; stripPrefix = 0; - deps."fontools" = tl."fontools"; + deps = [ + "fontools" + ]; sha512.run = "9e39f92dea1fa293d6249d16877dd6b2d990d1d48cfd31f4ac1d66233b97ff178d2b70f428978a084fc9a50b9dd994adb6a8ad29375e54f5d5ccf6ca7ed62f64"; sha512.doc = "8fb9ece6ca17549572a0d79a541397c6545dc01ac0422a5270314bba1cb83b1451fb0f56e34f449cc3d3de326e063e4ea1f2ea03a0fbda7342e9d0a101fb5ed1"; hasRunfiles = true; @@ -26791,7 +27267,9 @@ tl: { # no indentation "norasi-c90" = { revision = 60831; stripPrefix = 0; - deps."fonts-tlwg" = tl."fonts-tlwg"; + deps = [ + "fonts-tlwg" + ]; sha512.run = "5f65927546348815b07c93003a2b0922403d274bfa3d1665d4649c9dbc737df924958c2fd61c1d06cd5e7c1862aff392c8d1e9d827f4ae79e70d9b76467f651d"; sha512.source = "8fb30cc3a1e762ec15c813fff0191b08b64a0d259dbdd21a9edcf70c6eb1b327cff5ef3f48b9dba0b7d99d1ec31b3accef65deca7285e27790261ca659bd525d"; hasRunfiles = true; @@ -27083,13 +27561,15 @@ tl: { # no indentation "oberdiek" = { revision = 64463; stripPrefix = 0; - deps."auxhook" = tl."auxhook"; - deps."grfext" = tl."grfext"; - deps."grffile" = tl."grffile"; - deps."iftex" = tl."iftex"; - deps."infwarerr" = tl."infwarerr"; - deps."kvoptions" = tl."kvoptions"; - deps."pdftexcmds" = tl."pdftexcmds"; + deps = [ + "auxhook" + "grfext" + "grffile" + "iftex" + "infwarerr" + "kvoptions" + "pdftexcmds" + ]; sha512.run = "b3f9d5918b24d6191515b459709afb9364a28f44a8b1ad3adc98c2d10c9a4f10316c80070c575fe4a6a06405bcead5bed312ab75553a32d254b2a80b2afbfb8f"; sha512.doc = "b7f756ceb7dc619bc1941dfc56c5dd2f151e33c57c51444a11dbe74280a23ac27886da05b4b8d0f33dfe9839a5538cbac5e9d506338c89fb223d82867a3f839c"; sha512.source = "688768a47cf782c817cc23e6e527e41c1893fc084702c2ab85e2e4b7df4b3d515033dbae0ea26bf904f6fae77dfce41d21a7b59415fbf67449a3aacc7047afd0"; @@ -27333,16 +27813,18 @@ tl: { # no indentation }; "optex" = { revision = 65185; - deps."amsfonts" = tl."amsfonts"; - deps."cm" = tl."cm"; - deps."ec" = tl."ec"; - deps."hyphen-base" = tl."hyphen-base"; - deps."librarian" = tl."librarian"; - deps."lm" = tl."lm"; - deps."luaotfload" = tl."luaotfload"; - deps."luatex" = tl."luatex"; - deps."rsfs" = tl."rsfs"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "amsfonts" + "cm" + "ec" + "hyphen-base" + "librarian" + "lm" + "luaotfload" + "luatex" + "rsfs" + "unicode-data" + ]; hasFormats = true; sha512.run = "a30b58b6dc9a1e06c3bf2fe196532ca88e5bf9ebae5e36f5ec2b9f146f95f18a70df2b15698bbcfc51300cef2c1b25c28521885c2ac1a44c6bb8cc485eed8739"; sha512.doc = "8b7b46ab7984a0d1f590adabefb99085734532dd0dede6c429fdaa2bcaa3c2dcd1d0e70d37ae3cf9a109ab018f0fd29a7bc36250b8bf5d12c41ee4fa21bf9ccd"; @@ -27845,7 +28327,9 @@ tl: { # no indentation }; "patgen" = { revision = 62387; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "e4b04bdc28d75de619307567716d2c29b41286a82cdafd6eca45df36baf67588cee94c4c320abadee4e3103fac8b33ba9367114875e56f198665388fc93e341d"; sha512.doc = "dcf16fddb0085e8a8984047ff9e500c8b7fdd7d6b24b4f6154f464e05fe137b807c13d910881fda96e617cf80780ed1e75ccfe0fda2477b1d9b95990baf5f279"; version = "2.4"; @@ -28096,10 +28580,12 @@ tl: { # no indentation "pdfpages" = { revision = 65319; stripPrefix = 0; - deps."eso-pic" = tl."eso-pic"; - deps."graphics" = tl."graphics"; - deps."oberdiek" = tl."oberdiek"; - deps."tools" = tl."tools"; + deps = [ + "eso-pic" + "graphics" + "oberdiek" + "tools" + ]; sha512.run = "c29f811574dde6dcd717255d40df7234d0916d6e7e4fe4c25e62639123bcdf4464e3e285c335c11bf2a289e8ca6391278611a0073fbd3ac8a071790717b2778a"; sha512.doc = "d91c5ae383beb5b4d16d69d09124c1e9598d3abebecc5d1f63319a90c8784c361fda0bc68626db752c8b9a3dc3f6b691a1be6d6ed7d16169278228f68b876b2e"; sha512.source = "869945d91d96e3a7936515a84bc4cfaad96193bb198a0a4db88300d1bfcf61ac971c6144820fcdb52045f4fa3511af8ec4045f999bbf8ef07d869d43e68dbee2"; @@ -28164,15 +28650,17 @@ tl: { # no indentation }; "pdftex" = { revision = 64690; - deps."cm" = tl."cm"; - deps."dehyph" = tl."dehyph"; - deps."etex" = tl."etex"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."kpathsea" = tl."kpathsea"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; + deps = [ + "cm" + "dehyph" + "etex" + "hyph-utf8" + "hyphen-base" + "knuth-lib" + "kpathsea" + "plain" + "tex-ini-files" + ]; hasFormats = true; sha512.run = "f35a908deb539efbcab7f7db6b8d1c0aba08f1e6aa1fe39c4f7235d2cfddb61e14252fb71f90df1023a6a30809240dfb45905ff21a0d899a5c480e1b007212ec"; sha512.doc = "018e860e5fc2222cac7d1f00498d74f3ccac00a10d0d226f2b2dd49d9941381ffc5341dea728155c3c0a4b39482b5b7c08e94c26cda99cb561b5044a6098beec"; @@ -28342,12 +28830,14 @@ tl: { # no indentation "pgf" = { revision = 59210; stripPrefix = 0; - deps."atveryend" = tl."atveryend"; - deps."fp" = tl."fp"; - deps."graphics" = tl."graphics"; - deps."ms" = tl."ms"; - deps."pdftexcmds" = tl."pdftexcmds"; - deps."xcolor" = tl."xcolor"; + deps = [ + "atveryend" + "fp" + "graphics" + "ms" + "pdftexcmds" + "xcolor" + ]; sha512.run = "c02a5b4a0f3aab13d39166c30bd456603de012ce6089662ab0b7c091ac906eb5c1719543246db97ac49cc109ad05c1b1d59330a64a43f82689cddcc86a465d06"; sha512.doc = "360aaf8f3a2b2f531c9f24c777fdc687bae4a40b2d03f99f081765690a94711f63902abc3e9a602fc2d2d5bf93d3611cf40e7082fab7176fc0fba07876485238"; sha512.source = "f2779d8172a81882263bd1ff7ec17766fe1273cb824e7fdf695704dfb4575ff0aa3a77ca264e4c57e4c4cb232bfc87782532dcdb69de00eeb1ea3cc23392bb7f"; @@ -28391,9 +28881,11 @@ tl: { # no indentation "pgf-pie" = { revision = 63603; stripPrefix = 0; - deps."carlisle" = tl."carlisle"; - deps."latex" = tl."latex"; - deps."pgf" = tl."pgf"; + deps = [ + "carlisle" + "latex" + "pgf" + ]; sha512.run = "3e5cdb5def0918ab1c3d38d35bb85f07711144d1fcaf0f3af8b2c5e0eacd9af6c3b92bc6e1f45438e40d7f5838770b91ab513970cdd9a3f7dad2918eefb875f6"; sha512.doc = "ac151cb61ea4fc440ffeeea9b987f6dd648b53596934900f41437f787bedcabe2ca8dd53c37828aab816e9334d0d26573f81000333e50d0761d70c586a5d87e3"; hasRunfiles = true; @@ -28418,8 +28910,10 @@ tl: { # no indentation "pgf-umlcd" = { revision = 63386; stripPrefix = 0; - deps."latex" = tl."latex"; - deps."pgf" = tl."pgf"; + deps = [ + "latex" + "pgf" + ]; sha512.run = "a55281a157a2a347f1c9d82679cd663f4493e03123d14dbef0d71582613772252b693a25b3d3e5b72b948c4fd12d0d7b0354d2e38083583b550d7cfb5e634d93"; sha512.doc = "6d798d93590d859d69bda9f0bd391049db91e2d4fb6f0b019a6f76eeaae9e73c9f249ec356cf5a5d4505af6948d4c70c2ad4685c1c41a7ba40ec62d3d8a9dd00"; hasRunfiles = true; @@ -28428,8 +28922,10 @@ tl: { # no indentation "pgf-umlsd" = { revision = 55342; stripPrefix = 0; - deps."latex" = tl."latex"; - deps."pgf" = tl."pgf"; + deps = [ + "latex" + "pgf" + ]; sha512.run = "6b015603e3daa362e473d795d32fa785ce247b58ec9f88872fe4bdb4fa660000bd87da2369de556f998485a6fcb6dd49aaca549b0470b41adacba5a278453197"; sha512.doc = "968d23fcc4f114bab204ec53281975a6fee5f81635ece256351198075cd8463a706954f463beacc162180459fdb3652657f2c060a71c588681f8de6e788a4e6a"; hasRunfiles = true; @@ -28438,7 +28934,9 @@ tl: { # no indentation "pgfgantt" = { revision = 52662; stripPrefix = 0; - deps."pgf" = tl."pgf"; + deps = [ + "pgf" + ]; sha512.run = "0269703fc00f10981d5ce8958159a24814b9f410c1b00516608c039b1ea8a3381392bf1d89e98f3011d42210047bf2e1fec2f103467087f9172e143d9ab6fcf1"; sha512.doc = "4890ae174c92db8df7befcef30d03724ae52fa4b26ac796d247a703794ce745ee892f0d2ab8a4f62e96a5e5f792791a6f7e8b9e71f1c0f11b68e8cbcf5165472"; sha512.source = "668987bd37aebd38697c02bc39d85371c7d40613aba13c0f3b62ece8145608057cf3f76cda03de6df25f7ba820359ff2ba1c340aa1b9ebff94bbd42aed39e401"; @@ -28482,7 +28980,9 @@ tl: { # no indentation "pgfopts" = { revision = 56615; stripPrefix = 0; - deps."pgf" = tl."pgf"; + deps = [ + "pgf" + ]; sha512.run = "7d672d626428c37fa749a810c57be43c6102e1325a6d3e16c57bc560b6d65a57bae94e619a73f3e0efb46ce7b4783d05a6e98c64b1e90c6e0f94f1dd9acd676f"; sha512.doc = "ff82e0502fdeefe6afe90aad4e7615de9be4ef8e2e6a69e7a537202af77aed00c0895269ceed3d38e0f34345efbdd771d22b0c8759fcb46ff8e91ce639dcd21d"; sha512.source = "758da1f3daa0ef888b484ea657fdd4384102868e4eee543bc97e73f103b67c367277f5c00efd06a2080f9ac3fb82c909cd30f641363120e70357450179dab6c5"; @@ -28507,7 +29007,9 @@ tl: { # no indentation "pgfplots" = { revision = 61719; stripPrefix = 0; - deps."pgf" = tl."pgf"; + deps = [ + "pgf" + ]; sha512.run = "8244e65860f37d74d05535a627ef6cd321407a69a142d156bae190c562a9402a0d7e927df732c32cc5f556dede1b51f7aeca5d7d3a26167348a21f2e3d8be5ac"; sha512.doc = "720a77c574c81e7c3619e3b988c8a359bd6cf284ad3fa7c795eb01c371ede85ad727dde8e5f19d8f683947b5dc5752324581e364c59e8a644b5ae34d6b75a96f"; sha512.source = "d840015854794de1a311f1d8a9935a93c71a098c46fb1c5cec8a57228a924685f75ea76fc9cf2a9f9f30ed39920bbf2092fbdef2645ddaa5ad5a3787839c1d2a"; @@ -28945,24 +29447,26 @@ tl: { # no indentation }; "platex" = { revision = 65305; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-base-dev" = tl."latex-base-dev"; - deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; - deps."latex-fonts" = tl."latex-fonts"; - deps."ptex" = tl."ptex"; - deps."ptex-fonts" = tl."ptex-fonts"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "everyshi" + "firstaid" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-base-dev" + "latex-firstaid-dev" + "latex-fonts" + "ptex" + "ptex-fonts" + "tex-ini-files" + "unicode-data" + ]; hasFormats = true; sha512.run = "53a9c0137d35110ce5b1875875f2b5e20d9db884b62bf25eea4a9d9c2724ff6e779680c060ee2aad5ebf36372045b3ef7d711658f6d50af4999e409f5860c09f"; sha512.doc = "7b47db806f6a79ab99c19833f3cbbfdb2bae594f370ccb51288df95c262680a7a789888952edb542321d899f6efa0d4aaec6b9d00adec8826b8a10c4db2d3c27"; @@ -29163,8 +29667,10 @@ tl: { # no indentation "polski" = { revision = 60322; stripPrefix = 0; - deps."hyphen-polish" = tl."hyphen-polish"; - deps."pl" = tl."pl"; + deps = [ + "hyphen-polish" + "pl" + ]; sha512.run = "24bdb98990f66e89085056e6ad3e0930dd16d0f4bbd07a2c9a49931796e143505276d2025fee21b2b52d927c3b2992d31f4edae4668cdb549f6f00ef43dc1c69"; sha512.doc = "755e7625d5ee1e4457e7ee518469d585c9c1e566c57bf147c62195555ae91dadb68f469127cb18a7c30cda1468129db09cb09b1974f5273d41c9491a6e1d5ffc"; sha512.source = "8e216956a95df02134cf411d170a75309c3f167a5bf7d78f77c4e47950c8a5da52e523e367f5ce60492fc0ab7cb205e9b57835b883225752731ca094d7c507b8"; @@ -29182,12 +29688,14 @@ tl: { # no indentation "polyglossia" = { revision = 65144; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."filehook" = tl."filehook"; - deps."fontspec" = tl."fontspec"; - deps."iftex" = tl."iftex"; - deps."makecmds" = tl."makecmds"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "etoolbox" + "filehook" + "fontspec" + "iftex" + "makecmds" + "xkeyval" + ]; sha512.run = "65d91b180f748592c2eb7a98232b7b438c762a56100294995454e54d7759ef00076d63d90660fcded3d0ee5aa03d1a4b328ff3706db1926be2546140325e8e96"; sha512.doc = "88867dbf5e218720a13e0ffeaf0ecc3784adbf5097c99cfc193f35be1c99c82c459e0e27b1e1d72cee1020549bc6131b8da03a47beef42f59d53b4fd4fe036c4"; sha512.source = "e037d2a8c0bebf37a8ed3dcdae764dd2cda3d780379ba70a67eb46447936816e8c43122d691bdf58122fcc7a96f2bcf3d6710d71bf5bb378cf0418efd40ae37f"; @@ -29299,18 +29807,20 @@ tl: { # no indentation "ppt-slides" = { revision = 65194; stripPrefix = 0; - deps."crumbs" = tl."crumbs"; - deps."enumitem" = tl."enumitem"; - deps."hyperref" = tl."hyperref"; - deps."pagecolor" = tl."pagecolor"; - deps."pgf" = tl."pgf"; - deps."pgfopts" = tl."pgfopts"; - deps."qrcode" = tl."qrcode"; - deps."seqsplit" = tl."seqsplit"; - deps."tikzpagenodes" = tl."tikzpagenodes"; - deps."tools" = tl."tools"; - deps."varwidth" = tl."varwidth"; - deps."xcolor" = tl."xcolor"; + deps = [ + "crumbs" + "enumitem" + "hyperref" + "pagecolor" + "pgf" + "pgfopts" + "qrcode" + "seqsplit" + "tikzpagenodes" + "tools" + "varwidth" + "xcolor" + ]; sha512.run = "8741def8d57db17bef3490c881a615340290283860e9978e105b7ba0768b5fbf02023722109dd2f6860e9fa8d44fe7cf742eb2a97ae08d1199a6dea9f73503f2"; sha512.doc = "6528e50797dae2dd928d11f78bdcb3368177412823657baccba10c194bebce97384ed55d10c5307c13aa06883a156abd57a944acc26f9237a138df22b5a33658"; sha512.source = "42dd3fdc96d1ffbf39deba0e2e292392a9aa6a2b266d7787448b93996f12c966abff0b643281fec8b336a395b283e2e88fafb365f616455e3393645cd7c3a55c"; @@ -29396,9 +29906,11 @@ tl: { # no indentation "prettytok" = { revision = 63842; stripPrefix = 0; - deps."filecontentsdef" = tl."filecontentsdef"; - deps."l3kernel" = tl."l3kernel"; - deps."precattl" = tl."precattl"; + deps = [ + "filecontentsdef" + "l3kernel" + "precattl" + ]; sha512.run = "8b9f5e9fec9d50b9f688115e00ad6fde21adfb9cef69e020fb297abcfe489cc6fde08d2ad4b72ea5f6b8e0b7499a97c798e8c0bd306d298427fcd19b6365c300"; sha512.doc = "8dc2afdc9920817b13050bdb6d92164e9322a18fd1d7a7adc7a1655c8dd68181b00faef22c09f9bce45be0744e179c978ba40c6f841e3c2cdba1c88225f7486f"; hasRunfiles = true; @@ -29700,9 +30212,11 @@ tl: { # no indentation "psnfss" = { revision = 54694; stripPrefix = 0; - deps."graphics" = tl."graphics"; - deps."symbol" = tl."symbol"; - deps."zapfding" = tl."zapfding"; + deps = [ + "graphics" + "symbol" + "zapfding" + ]; sha512.run = "f7d1acebcd1d32a691221f396220358f3bb15dff2e2cebec4b537b1b790b68d8ce1164711983a52b4f04d6e470df2e3e5fec63bb1d3bf39fe205d5f0351299de"; sha512.doc = "d1c14edccdf43ed2c786394bc04e9fd683b683532a9dc18d592f918ee8899234d23feb738128aa1418f441288cdbf0c6de832f8c4d98023926baeace36365a1d"; sha512.source = "6862a7e74be6a575996e6f45a2236db810f1c030d3a0c53b2b97c2e803fc7e29010108e4597d637b8abedd63b1f956da268f62ca2c609accaa4d035be7bfd8ed"; @@ -30475,7 +30989,9 @@ tl: { # no indentation "pst-uml" = { revision = 15878; stripPrefix = 0; - deps."multido" = tl."multido"; + deps = [ + "multido" + ]; sha512.run = "e4ff8ea9b7fb9f530e33280de3e9eb20d653c0c062fa80611a544daf74da0b1dd2481b43d8f5258f9ebc1d1bf95b393b32c7152ab8464a9e980cefa105c45ceb"; sha512.doc = "d8aa92785c241b6346762d98349d8464ce604afceb8774ef160e8c24e0a40d3fd8dba7cac3f78cbf38cbf6cfebb79939ad3c76e6b4014c1028859aba38123efe"; sha512.source = "8b7e551154c1b1966046268ed3353b6c78c3a66bfa20f44c7fba3b58f661f2585b71d49d2dd673368f732b2f9446dc7783bad4ae5248169a79721d330a49514c"; @@ -30568,13 +31084,15 @@ tl: { # no indentation }; "ptex" = { revision = 62464; - deps."cm" = tl."cm"; - deps."etex" = tl."etex"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."plain" = tl."plain"; - deps."ptex-base" = tl."ptex-base"; - deps."ptex-fonts" = tl."ptex-fonts"; + deps = [ + "cm" + "etex" + "hyphen-base" + "knuth-lib" + "plain" + "ptex-base" + "ptex-fonts" + ]; hasFormats = true; sha512.run = "6e2e40d86740a24550cb4f55630db81bdc777daf87533cb23b4fe041439d00e10cbb7b5fab92e33828c87945e710ea3579d76a8e0fdae0b8ba069b5eb33968c3"; sha512.doc = "96aed9e990d013c7f5310a5ec86a1f7465d0de8503009669a5e10ccf4d3ed8767bf1408cfb04cfa8876e02640bc4a3b07249c331cc6190e391cb4a5b8aeafa35"; @@ -30824,10 +31342,12 @@ tl: { # no indentation "pythonimmediate" = { revision = 65349; stripPrefix = 0; - deps."currfile" = tl."currfile"; - deps."l3packages" = tl."l3packages"; - deps."precattl" = tl."precattl"; - deps."saveenv" = tl."saveenv"; + deps = [ + "currfile" + "l3packages" + "precattl" + "saveenv" + ]; sha512.run = "970cd28032c551271f97fcae614a03f012684b0f1a09904284ff35e9461195a1e5b8a6f51c12c4e7dc7b54720d13a34d9bbe471469a03c0fd00ddc49d8462d9c"; sha512.doc = "68068245368180f4dff747a18abdc068a2f0fddcc5b3cf3e63403d99ceaf56ddc5ee17bb32ebefb42f92268d3b681c5c5feb94aa76823b90478d77f0b3e511bd"; hasRunfiles = true; @@ -31409,8 +31929,10 @@ tl: { # no indentation "rerunfilecheck" = { revision = 63869; stripPrefix = 0; - deps."atveryend" = tl."atveryend"; - deps."uniquecounter" = tl."uniquecounter"; + deps = [ + "atveryend" + "uniquecounter" + ]; sha512.run = "464daf4ee4f443f4ff329e28b928df94e83e83696e3e5604de7b51beb61c25a0ce50dc00b35d2cc8d0cabb32d10bc28c3c06069f5dd7eafd9fdb2d44a3adf313"; sha512.doc = "7c570d38c989aaeb7db5271501c5384ba8b8601396f629d7ffee32baaf1c289592bb5d69d2cb2784cfb2008fdc047098d43dc20803e4b90eac59848c15dd0cb7"; sha512.source = "2d987c01bc0f67708080d4578f308444ed3220a37ee11ef1a95c2a9bfa0ab49a46ab46d291153f0c748935f473124d70212a821233b22f1e606be6183e4afe81"; @@ -31962,7 +32484,9 @@ tl: { # no indentation "saveenv" = { revision = 65346; stripPrefix = 0; - deps."precattl" = tl."precattl"; + deps = [ + "precattl" + ]; sha512.run = "e0e368dcf3add9d59b22d8e04da1de9110d6f1ad2e31cd2cd44f894ea1d7f0cbd4eb41b500637e896eb179539e19c4a1d0601035e2404726dfc98677f9db0927"; sha512.doc = "2016c815add27dca5b498f4cca3ce69c9c18f544b9651305d5d9a9a7a10b30fe187c526da37813218388f8305fc3df83257b2e9b6289171febb770c7d59d9274"; hasRunfiles = true; @@ -32056,307 +32580,327 @@ tl: { # no indentation "scheme-basic" = { revision = 54191; stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; + deps = [ + "collection-basic" + "collection-latex" + ]; sha512.run = "027a1cd0dd4fc5da2427864bb49fc885a00bec6e8a74da24ce9cd781c69bf4288ddfc3c790307ed48052a8fc00c1989d3939b253da6638370adbb1c43348749b"; }; "scheme-bookpub" = { revision = 63547; stripPrefix = 0; - deps."barcodes" = tl."barcodes"; - deps."biber" = tl."biber"; - deps."biblatex" = tl."biblatex"; - deps."bookcover" = tl."bookcover"; - deps."caption" = tl."caption"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."enumitem" = tl."enumitem"; - deps."fontspec" = tl."fontspec"; - deps."latexmk" = tl."latexmk"; - deps."lipsum" = tl."lipsum"; - deps."listings" = tl."listings"; - deps."markdown" = tl."markdown"; - deps."memoir" = tl."memoir"; - deps."microtype" = tl."microtype"; - deps."minted" = tl."minted"; - deps."novel" = tl."novel"; - deps."octavo" = tl."octavo"; - deps."pdfpages" = tl."pdfpages"; - deps."pgf" = tl."pgf"; - deps."qrcode" = tl."qrcode"; - deps."shapes" = tl."shapes"; - deps."titlesec" = tl."titlesec"; - deps."tocloft" = tl."tocloft"; - deps."tufte-latex" = tl."tufte-latex"; - deps."willowtreebook" = tl."willowtreebook"; + deps = [ + "barcodes" + "biber" + "biblatex" + "bookcover" + "caption" + "collection-basic" + "collection-latex" + "enumitem" + "fontspec" + "latexmk" + "lipsum" + "listings" + "markdown" + "memoir" + "microtype" + "minted" + "novel" + "octavo" + "pdfpages" + "pgf" + "qrcode" + "shapes" + "titlesec" + "tocloft" + "tufte-latex" + "willowtreebook" + ]; sha512.run = "0ea47f8907821e273a581c52494b6a4e9a511a71e11ebfb05756eaded6e5132fc548312cb6365cc4c1906b4e8ffb14ee5ed496484fe5e2a2611e154091d23cf6"; }; "scheme-context" = { revision = 59636; stripPrefix = 0; - deps."antt" = tl."antt"; - deps."asana-math" = tl."asana-math"; - deps."ccicons" = tl."ccicons"; - deps."collection-context" = tl."collection-context"; - deps."collection-metapost" = tl."collection-metapost"; - deps."dejavu" = tl."dejavu"; - deps."eulervm" = tl."eulervm"; - deps."gentium-tug" = tl."gentium-tug"; - deps."iwona" = tl."iwona"; - deps."kurier" = tl."kurier"; - deps."ly1" = tl."ly1"; - deps."manfnt-font" = tl."manfnt-font"; - deps."marvosym" = tl."marvosym"; - deps."mflogo-font" = tl."mflogo-font"; - deps."poltawski" = tl."poltawski"; - deps."pxfonts" = tl."pxfonts"; - deps."tex-gyre" = tl."tex-gyre"; - deps."tex-gyre-math" = tl."tex-gyre-math"; - deps."txfonts" = tl."txfonts"; - deps."wasy" = tl."wasy"; - deps."xits" = tl."xits"; + deps = [ + "antt" + "asana-math" + "ccicons" + "collection-context" + "collection-metapost" + "dejavu" + "eulervm" + "gentium-tug" + "iwona" + "kurier" + "ly1" + "manfnt-font" + "marvosym" + "mflogo-font" + "poltawski" + "pxfonts" + "tex-gyre" + "tex-gyre-math" + "txfonts" + "wasy" + "xits" + ]; sha512.run = "0b041f3c27ef88e7baec105b7cb24fa65c4b1f092f155482d584d9041ced4f329251f0b0d32f7019c15fff3c57b4d17f057cf39781f8be16a4e8c0ce4838163e"; }; "scheme-full" = { revision = 54074; stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."collection-bibtexextra" = tl."collection-bibtexextra"; - deps."collection-binextra" = tl."collection-binextra"; - deps."collection-context" = tl."collection-context"; - deps."collection-fontsextra" = tl."collection-fontsextra"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-fontutils" = tl."collection-fontutils"; - deps."collection-formatsextra" = tl."collection-formatsextra"; - deps."collection-games" = tl."collection-games"; - deps."collection-humanities" = tl."collection-humanities"; - deps."collection-langarabic" = tl."collection-langarabic"; - deps."collection-langchinese" = tl."collection-langchinese"; - deps."collection-langcjk" = tl."collection-langcjk"; - deps."collection-langcyrillic" = tl."collection-langcyrillic"; - deps."collection-langczechslovak" = tl."collection-langczechslovak"; - deps."collection-langenglish" = tl."collection-langenglish"; - deps."collection-langeuropean" = tl."collection-langeuropean"; - deps."collection-langfrench" = tl."collection-langfrench"; - deps."collection-langgerman" = tl."collection-langgerman"; - deps."collection-langgreek" = tl."collection-langgreek"; - deps."collection-langitalian" = tl."collection-langitalian"; - deps."collection-langjapanese" = tl."collection-langjapanese"; - deps."collection-langkorean" = tl."collection-langkorean"; - deps."collection-langother" = tl."collection-langother"; - deps."collection-langpolish" = tl."collection-langpolish"; - deps."collection-langportuguese" = tl."collection-langportuguese"; - deps."collection-langspanish" = tl."collection-langspanish"; - deps."collection-latex" = tl."collection-latex"; - deps."collection-latexextra" = tl."collection-latexextra"; - deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-luatex" = tl."collection-luatex"; - deps."collection-mathscience" = tl."collection-mathscience"; - deps."collection-metapost" = tl."collection-metapost"; - deps."collection-music" = tl."collection-music"; - deps."collection-pictures" = tl."collection-pictures"; - deps."collection-plaingeneric" = tl."collection-plaingeneric"; - deps."collection-pstricks" = tl."collection-pstricks"; - deps."collection-publishers" = tl."collection-publishers"; - deps."collection-texworks" = tl."collection-texworks"; - deps."collection-xetex" = tl."collection-xetex"; + deps = [ + "collection-basic" + "collection-bibtexextra" + "collection-binextra" + "collection-context" + "collection-fontsextra" + "collection-fontsrecommended" + "collection-fontutils" + "collection-formatsextra" + "collection-games" + "collection-humanities" + "collection-langarabic" + "collection-langchinese" + "collection-langcjk" + "collection-langcyrillic" + "collection-langczechslovak" + "collection-langenglish" + "collection-langeuropean" + "collection-langfrench" + "collection-langgerman" + "collection-langgreek" + "collection-langitalian" + "collection-langjapanese" + "collection-langkorean" + "collection-langother" + "collection-langpolish" + "collection-langportuguese" + "collection-langspanish" + "collection-latex" + "collection-latexextra" + "collection-latexrecommended" + "collection-luatex" + "collection-mathscience" + "collection-metapost" + "collection-music" + "collection-pictures" + "collection-plaingeneric" + "collection-pstricks" + "collection-publishers" + "collection-texworks" + "collection-xetex" + ]; sha512.run = "bda507842fde5239d7f45169ff78690bd96066d1834cdcc6a0dcbd3e3439308c694ce4be6a91d1f155ebe5e29d46173fe13c83bcd4356969da95fb7cca1b4e38"; }; "scheme-gust" = { revision = 59755; stripPrefix = 0; - deps."amslatex-primer" = tl."amslatex-primer"; - deps."amstex" = tl."amstex"; - deps."antt" = tl."antt"; - deps."bibtex8" = tl."bibtex8"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-context" = tl."collection-context"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-fontutils" = tl."collection-fontutils"; - deps."collection-langpolish" = tl."collection-langpolish"; - deps."collection-latex" = tl."collection-latex"; - deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-metapost" = tl."collection-metapost"; - deps."collection-plaingeneric" = tl."collection-plaingeneric"; - deps."collection-texworks" = tl."collection-texworks"; - deps."collection-xetex" = tl."collection-xetex"; - deps."comment" = tl."comment"; - deps."comprehensive" = tl."comprehensive"; - deps."concrete" = tl."concrete"; - deps."cyklop" = tl."cyklop"; - deps."dvidvi" = tl."dvidvi"; - deps."dviljk" = tl."dviljk"; - deps."fontinstallationguide" = tl."fontinstallationguide"; - deps."gustprog" = tl."gustprog"; - deps."impatient" = tl."impatient"; - deps."iwona" = tl."iwona"; - deps."metafont-beginners" = tl."metafont-beginners"; - deps."metapost-examples" = tl."metapost-examples"; - deps."poltawski" = tl."poltawski"; - deps."seetexk" = tl."seetexk"; - deps."seminar" = tl."seminar"; - deps."tds" = tl."tds"; - deps."tex4ht" = tl."tex4ht"; - deps."texdoc" = tl."texdoc"; + deps = [ + "amslatex-primer" + "amstex" + "antt" + "bibtex8" + "collection-basic" + "collection-context" + "collection-fontsrecommended" + "collection-fontutils" + "collection-langpolish" + "collection-latex" + "collection-latexrecommended" + "collection-metapost" + "collection-plaingeneric" + "collection-texworks" + "collection-xetex" + "comment" + "comprehensive" + "concrete" + "cyklop" + "dvidvi" + "dviljk" + "fontinstallationguide" + "gustprog" + "impatient" + "iwona" + "metafont-beginners" + "metapost-examples" + "poltawski" + "seetexk" + "seminar" + "tds" + "tex4ht" + "texdoc" + ]; sha512.run = "2b3e2e3d31c8fca7297729e910ada06a0d0282b618c92487b7a0da686938dc1f6f3b0881c7d1f8f3d002806ad8860c25802637c77919e21ca54ae8a23ef08ae7"; }; "scheme-infraonly" = { revision = 54191; stripPrefix = 0; - deps."hyphen-base" = tl."hyphen-base"; - deps."kpathsea" = tl."kpathsea"; - deps."texlive-scripts" = tl."texlive-scripts"; + deps = [ + "hyphen-base" + "kpathsea" + "texlive-scripts" + ]; sha512.run = "f3e449bf0b34deb9ae776685f386245c4ca9644f2175ae51e9c62faa00e3cfac30fa2aa07fbd83b15b21d487ca368c09a18742d2434047783350698ced3b20b9"; }; "scheme-medium" = { revision = 54074; stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; - deps."collection-binextra" = tl."collection-binextra"; - deps."collection-context" = tl."collection-context"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-fontutils" = tl."collection-fontutils"; - deps."collection-langczechslovak" = tl."collection-langczechslovak"; - deps."collection-langenglish" = tl."collection-langenglish"; - deps."collection-langeuropean" = tl."collection-langeuropean"; - deps."collection-langfrench" = tl."collection-langfrench"; - deps."collection-langgerman" = tl."collection-langgerman"; - deps."collection-langitalian" = tl."collection-langitalian"; - deps."collection-langpolish" = tl."collection-langpolish"; - deps."collection-langportuguese" = tl."collection-langportuguese"; - deps."collection-langspanish" = tl."collection-langspanish"; - deps."collection-latex" = tl."collection-latex"; - deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-luatex" = tl."collection-luatex"; - deps."collection-mathscience" = tl."collection-mathscience"; - deps."collection-metapost" = tl."collection-metapost"; - deps."collection-plaingeneric" = tl."collection-plaingeneric"; - deps."collection-texworks" = tl."collection-texworks"; - deps."collection-xetex" = tl."collection-xetex"; + deps = [ + "collection-basic" + "collection-binextra" + "collection-context" + "collection-fontsrecommended" + "collection-fontutils" + "collection-langczechslovak" + "collection-langenglish" + "collection-langeuropean" + "collection-langfrench" + "collection-langgerman" + "collection-langitalian" + "collection-langpolish" + "collection-langportuguese" + "collection-langspanish" + "collection-latex" + "collection-latexrecommended" + "collection-luatex" + "collection-mathscience" + "collection-metapost" + "collection-plaingeneric" + "collection-texworks" + "collection-xetex" + ]; sha512.run = "fdfbbd8fc370bfb0ea35ed9f3137b62eddd3e54777963668b3dfe7af6328a92f37c74e190e7f506ec27a3efbe44458941360599a4061a2765d0072af56808d60"; }; "scheme-minimal" = { revision = 54191; stripPrefix = 0; - deps."collection-basic" = tl."collection-basic"; + deps = [ + "collection-basic" + ]; sha512.run = "ac177b74d9d5b9fa599831275a4084a0eeb7b764a6ed837d8f14f8391f0e6c0757f7b2d4a8e71868e0c8ea4d497f29d78c4c73fb9e6311dbecf29626516bbf82"; }; "scheme-small" = { revision = 54191; stripPrefix = 0; - deps."babel-basque" = tl."babel-basque"; - deps."babel-czech" = tl."babel-czech"; - deps."babel-danish" = tl."babel-danish"; - deps."babel-dutch" = tl."babel-dutch"; - deps."babel-english" = tl."babel-english"; - deps."babel-finnish" = tl."babel-finnish"; - deps."babel-french" = tl."babel-french"; - deps."babel-german" = tl."babel-german"; - deps."babel-hungarian" = tl."babel-hungarian"; - deps."babel-italian" = tl."babel-italian"; - deps."babel-norsk" = tl."babel-norsk"; - deps."babel-polish" = tl."babel-polish"; - deps."babel-portuges" = tl."babel-portuges"; - deps."babel-spanish" = tl."babel-spanish"; - deps."babel-swedish" = tl."babel-swedish"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-latex" = tl."collection-latex"; - deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-metapost" = tl."collection-metapost"; - deps."collection-xetex" = tl."collection-xetex"; - deps."ec" = tl."ec"; - deps."eurosym" = tl."eurosym"; - deps."hyphen-basque" = tl."hyphen-basque"; - deps."hyphen-czech" = tl."hyphen-czech"; - deps."hyphen-danish" = tl."hyphen-danish"; - deps."hyphen-dutch" = tl."hyphen-dutch"; - deps."hyphen-english" = tl."hyphen-english"; - deps."hyphen-finnish" = tl."hyphen-finnish"; - deps."hyphen-french" = tl."hyphen-french"; - deps."hyphen-german" = tl."hyphen-german"; - deps."hyphen-hungarian" = tl."hyphen-hungarian"; - deps."hyphen-italian" = tl."hyphen-italian"; - deps."hyphen-norwegian" = tl."hyphen-norwegian"; - deps."hyphen-polish" = tl."hyphen-polish"; - deps."hyphen-portuguese" = tl."hyphen-portuguese"; - deps."hyphen-spanish" = tl."hyphen-spanish"; - deps."hyphen-swedish" = tl."hyphen-swedish"; - deps."lm" = tl."lm"; - deps."lualibs" = tl."lualibs"; - deps."luaotfload" = tl."luaotfload"; - deps."luatexbase" = tl."luatexbase"; - deps."revtex" = tl."revtex"; - deps."synctex" = tl."synctex"; - deps."times" = tl."times"; - deps."tipa" = tl."tipa"; - deps."ulem" = tl."ulem"; - deps."upquote" = tl."upquote"; - deps."zapfding" = tl."zapfding"; + deps = [ + "babel-basque" + "babel-czech" + "babel-danish" + "babel-dutch" + "babel-english" + "babel-finnish" + "babel-french" + "babel-german" + "babel-hungarian" + "babel-italian" + "babel-norsk" + "babel-polish" + "babel-portuges" + "babel-spanish" + "babel-swedish" + "collection-basic" + "collection-latex" + "collection-latexrecommended" + "collection-metapost" + "collection-xetex" + "ec" + "eurosym" + "hyphen-basque" + "hyphen-czech" + "hyphen-danish" + "hyphen-dutch" + "hyphen-english" + "hyphen-finnish" + "hyphen-french" + "hyphen-german" + "hyphen-hungarian" + "hyphen-italian" + "hyphen-norwegian" + "hyphen-polish" + "hyphen-portuguese" + "hyphen-spanish" + "hyphen-swedish" + "lm" + "lualibs" + "luaotfload" + "luatexbase" + "revtex" + "synctex" + "times" + "tipa" + "ulem" + "upquote" + "zapfding" + ]; sha512.run = "6267151dd73cb8b751ad47b79f9c698b465ad5ae5494d462cf5b3b4e7446a3c014a715381bc6a79eaacfd1ba6efb37c6c1bafbd5e1f82e8db751bbaa9a943013"; }; "scheme-tetex" = { revision = 59715; stripPrefix = 0; - deps."acronym" = tl."acronym"; - deps."amslatex-primer" = tl."amslatex-primer"; - deps."bbm" = tl."bbm"; - deps."bbm-macros" = tl."bbm-macros"; - deps."bbold" = tl."bbold"; - deps."bibtex8" = tl."bibtex8"; - deps."cmbright" = tl."cmbright"; - deps."collection-basic" = tl."collection-basic"; - deps."collection-context" = tl."collection-context"; - deps."collection-fontsrecommended" = tl."collection-fontsrecommended"; - deps."collection-fontutils" = tl."collection-fontutils"; - deps."collection-formatsextra" = tl."collection-formatsextra"; - deps."collection-langcjk" = tl."collection-langcjk"; - deps."collection-langcyrillic" = tl."collection-langcyrillic"; - deps."collection-langczechslovak" = tl."collection-langczechslovak"; - deps."collection-langenglish" = tl."collection-langenglish"; - deps."collection-langeuropean" = tl."collection-langeuropean"; - deps."collection-langfrench" = tl."collection-langfrench"; - deps."collection-langgerman" = tl."collection-langgerman"; - deps."collection-langgreek" = tl."collection-langgreek"; - deps."collection-langitalian" = tl."collection-langitalian"; - deps."collection-langother" = tl."collection-langother"; - deps."collection-langpolish" = tl."collection-langpolish"; - deps."collection-langportuguese" = tl."collection-langportuguese"; - deps."collection-langspanish" = tl."collection-langspanish"; - deps."collection-latex" = tl."collection-latex"; - deps."collection-latexrecommended" = tl."collection-latexrecommended"; - deps."collection-mathscience" = tl."collection-mathscience"; - deps."collection-metapost" = tl."collection-metapost"; - deps."collection-pictures" = tl."collection-pictures"; - deps."collection-plaingeneric" = tl."collection-plaingeneric"; - deps."collection-pstricks" = tl."collection-pstricks"; - deps."ctie" = tl."ctie"; - deps."cweb" = tl."cweb"; - deps."detex" = tl."detex"; - deps."dtl" = tl."dtl"; - deps."dvi2tty" = tl."dvi2tty"; - deps."dvicopy" = tl."dvicopy"; - deps."dvidvi" = tl."dvidvi"; - deps."dviljk" = tl."dviljk"; - deps."eplain" = tl."eplain"; - deps."eulervm" = tl."eulervm"; - deps."gentle" = tl."gentle"; - deps."lshort-english" = tl."lshort-english"; - deps."mltex" = tl."mltex"; - deps."multirow" = tl."multirow"; - deps."nomencl" = tl."nomencl"; - deps."patgen" = tl."patgen"; - deps."pst-pdf" = tl."pst-pdf"; - deps."rsfs" = tl."rsfs"; - deps."seetexk" = tl."seetexk"; - deps."siunits" = tl."siunits"; - deps."subfigure" = tl."subfigure"; - deps."supertabular" = tl."supertabular"; - deps."tamethebeast" = tl."tamethebeast"; - deps."tds" = tl."tds"; - deps."tex-refs" = tl."tex-refs"; - deps."tie" = tl."tie"; - deps."web" = tl."web"; - deps."xpdfopen" = tl."xpdfopen"; + deps = [ + "acronym" + "amslatex-primer" + "bbm" + "bbm-macros" + "bbold" + "bibtex8" + "cmbright" + "collection-basic" + "collection-context" + "collection-fontsrecommended" + "collection-fontutils" + "collection-formatsextra" + "collection-langcjk" + "collection-langcyrillic" + "collection-langczechslovak" + "collection-langenglish" + "collection-langeuropean" + "collection-langfrench" + "collection-langgerman" + "collection-langgreek" + "collection-langitalian" + "collection-langother" + "collection-langpolish" + "collection-langportuguese" + "collection-langspanish" + "collection-latex" + "collection-latexrecommended" + "collection-mathscience" + "collection-metapost" + "collection-pictures" + "collection-plaingeneric" + "collection-pstricks" + "ctie" + "cweb" + "detex" + "dtl" + "dvi2tty" + "dvicopy" + "dvidvi" + "dviljk" + "eplain" + "eulervm" + "gentle" + "lshort-english" + "mltex" + "multirow" + "nomencl" + "patgen" + "pst-pdf" + "rsfs" + "seetexk" + "siunits" + "subfigure" + "supertabular" + "tamethebeast" + "tds" + "tex-refs" + "tie" + "web" + "xpdfopen" + ]; sha512.run = "fe8b53391733392a72be2e2c80892ec68fbdb749c70636c307825c8bfd6284945c9961610fd19f8b5d6b03ec50f0a1543c7d159f5f2a19534d71b221addfb708"; }; "schola-otf" = { @@ -32556,12 +33100,14 @@ tl: { # no indentation "sdaps" = { revision = 65345; stripPrefix = 0; - deps."environ" = tl."environ"; - deps."lastpage" = tl."lastpage"; - deps."pgf" = tl."pgf"; - deps."qrcode" = tl."qrcode"; - deps."sectsty" = tl."sectsty"; - deps."translator" = tl."translator"; + deps = [ + "environ" + "lastpage" + "pgf" + "qrcode" + "sectsty" + "translator" + ]; sha512.run = "57559707a9a5a2a924a767b25ed2f86759826a31788fb2662aa2e3ad2889b2266009ec9754c48ce923561c7587c78b23ab56731322a619b4a225775b7beb91b2"; sha512.doc = "fe1f636c2c21159e5c17aaa75ca0bc89fb1b6ab8dda8d475045efcb3eaf489a876fe9caa4cd077e27b51f37292c5141347233ed6103ebe4f20573ff0899e445b"; sha512.source = "3f5d1073699a71e9e89a3c71704b8b2800925041145a60454cae0ce2fe7f468e5200c7273afb70c64306a347f4037bc0698b3af223f82d755658d54f2d8c08fe"; @@ -32684,7 +33230,9 @@ tl: { # no indentation "semantex" = { revision = 65183; stripPrefix = 0; - deps."semtex" = tl."semtex"; + deps = [ + "semtex" + ]; sha512.run = "057b229640da956b4c36653cc1e4057317d9fb2123a69aa144078b52192a2aa8d43660a41124fd91b147ebba5473ca43c30a70fc55881daa52f6b7ded05666b3"; sha512.doc = "6cddaebc42ce355e536fc515b726cc6344f885efd67041b564a4b8c2bd297969aa5aded0a989c5a4b3a30d574af977e44880e2ef8be8d3fae052ef44c9d6b2f9"; hasRunfiles = true; @@ -33085,32 +33633,34 @@ tl: { # no indentation "shtthesis" = { revision = 62441; stripPrefix = 0; - deps."alphalph" = tl."alphalph"; - deps."biber" = tl."biber"; - deps."biblatex" = tl."biblatex"; - deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015"; - deps."booktabs" = tl."booktabs"; - deps."caption" = tl."caption"; - deps."colortbl" = tl."colortbl"; - deps."ctex" = tl."ctex"; - deps."datetime" = tl."datetime"; - deps."enumitem" = tl."enumitem"; - deps."fancyhdr" = tl."fancyhdr"; - deps."fmtcount" = tl."fmtcount"; - deps."lastpage" = tl."lastpage"; - deps."latexmk" = tl."latexmk"; - deps."listings" = tl."listings"; - deps."lua-alt-getopt" = tl."lua-alt-getopt"; - deps."lualatex-math" = tl."lualatex-math"; - deps."mathtools" = tl."mathtools"; - deps."ntheorem" = tl."ntheorem"; - deps."tex-gyre" = tl."tex-gyre"; - deps."tocvsec2" = tl."tocvsec2"; - deps."transparent" = tl."transparent"; - deps."undolabl" = tl."undolabl"; - deps."unicode-math" = tl."unicode-math"; - deps."xits" = tl."xits"; - deps."xstring" = tl."xstring"; + deps = [ + "alphalph" + "biber" + "biblatex" + "biblatex-gb7714-2015" + "booktabs" + "caption" + "colortbl" + "ctex" + "datetime" + "enumitem" + "fancyhdr" + "fmtcount" + "lastpage" + "latexmk" + "listings" + "lua-alt-getopt" + "lualatex-math" + "mathtools" + "ntheorem" + "tex-gyre" + "tocvsec2" + "transparent" + "undolabl" + "unicode-math" + "xits" + "xstring" + ]; sha512.run = "da3b02cc3558a337d7d35018fad00faf6d9183f3f4bc5b5b31e168a11dcfa705a77cad6c42f3fe3d98ce67f50d94ca1f75a82999d5a27837ea8fba6c01602594"; sha512.doc = "04f1ccf2bef9e11364d7f066ed1a7fc218e39ef7a08824eb65537d88ed03097399eb01d07ba6d0a34e7456fc6de1291ea4f1c9264074eecd2e1af341c42e9197"; hasRunfiles = true; @@ -33299,7 +33849,9 @@ tl: { # no indentation "simplivre" = { revision = 64280; stripPrefix = 0; - deps."minimalist" = tl."minimalist"; + deps = [ + "minimalist" + ]; sha512.run = "9ab406b3c577d9f683d5e4ed8303f4791f9b2a75200ab9cd2eded6699a580eba2cacf6da16b0848f407d7bd04c1fc6afe3881552ee0f4d57b1fb5c32154174fb"; sha512.doc = "4167bcb50e182f7eeb163b5d3ed4e53e65599aa3acfc7ce4bbb20db5d185bace58e28e24f9091e172fa6c516dcfaf948c1fae93efc68398f0708f42b67e5990a"; hasRunfiles = true; @@ -33342,8 +33894,10 @@ tl: { # no indentation "siunitx" = { revision = 65207; stripPrefix = 0; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; + deps = [ + "l3kernel" + "l3packages" + ]; sha512.run = "6116eebfaa5f9b0ae3e63f4c0b26c91c358e48b62651c215c25ac5352385c01e06ff28fcd5422085de0330bdd6ad6d79b5b4ee5cb9a200ed8ffaab515ca261e2"; sha512.doc = "77eedc2cdf10ab386728fac623ed6d0ba895b4bb70c0934086251d96679b38eeedddb7408adcd6005289a20f3bbd4ec7811336509197c51d6be19e5a0cfc9b4d"; sha512.source = "58faa7f7a5809a935303a7e9a779453cef8a5dcc43ded0fd16658e32f170a5052095c8f24d44542c80310cd24463583f5136a6d4986ce559ad3cd92ae8446c6b"; @@ -33586,8 +34140,10 @@ tl: { # no indentation "soulpos" = { revision = 60772; stripPrefix = 0; - deps."oberdiek" = tl."oberdiek"; - deps."soul" = tl."soul"; + deps = [ + "oberdiek" + "soul" + ]; sha512.run = "2b4d2fcaa687ff7d229706e563f739356a450a8ef02180f3c98432b11d027cd097fa895c3c971a944329b8657c74b4d2cf566110919e511e6883706561332678"; sha512.doc = "9577aa2c77e9cafea54eee0ee032acd7c1343d6eb66b76fc25d694b524630bd2f41043187671cd444c9cdd0ccc8b9064e6c71365492cbdbd46517a061efc87cc"; hasRunfiles = true; @@ -33881,7 +34437,9 @@ tl: { # no indentation "stackengine" = { revision = 60019; stripPrefix = 0; - deps."listofitems" = tl."listofitems"; + deps = [ + "listofitems" + ]; sha512.run = "15327eda5a6eda2b58055efc419ef50b8d8cf8c35283bcc41ee85e354f61ede6efeabf5e75bbb4cd022b95e52109bce1ee2e28fc701c5940723f3b15dd44c75a"; sha512.doc = "a0edeaed3766af88d1c5e0508fd285382850bfd072cf4f6fdc1c329c8ca9f5e1eb5fe75357d9a86dd8b2476381747c9a3f7cd7dad0d7c32419bef0d37849928b"; hasRunfiles = true; @@ -33899,11 +34457,13 @@ tl: { # no indentation "standalone" = { revision = 64677; stripPrefix = 0; - deps."adjustbox" = tl."adjustbox"; - deps."currfile" = tl."currfile"; - deps."filemod" = tl."filemod"; - deps."gincltex" = tl."gincltex"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "adjustbox" + "currfile" + "filemod" + "gincltex" + "xkeyval" + ]; sha512.run = "8e74a676232ffe9fbe93ee3a1095c0c29cd65bd23f8e4602308d8fc1abfde9025c01e8ba379782d4c79d3349b4298806419735c624436a7b0c93e2170c592efb"; sha512.doc = "358fb3b29f4c2d37d03b7d98ee02b35ff8571ffaf30b8d3fa1a9b0f74965ca4b0bcbf2a7172b8771dd3f1240c7dad1acccc7710dad302411dc43a301149597cd"; sha512.source = "a29880dfca00e77b19ee828333c72f7c95a26470b8edd5ecea53bae3300868266ad4aa0db2bc6e16f72c14493b43659434ef4880b025b5bccad3305d0ea18b33"; @@ -34279,7 +34839,9 @@ tl: { # no indentation "subfiles" = { revision = 56977; stripPrefix = 0; - deps."import" = tl."import"; + deps = [ + "import" + ]; sha512.run = "8f842b0debcae3110f0a4b2f59047cd55c2726d128bf3e159f2745a4b8a645c3f8471fe218ca34c32f2b35d42d1c5023a25f09fc3bf0c1a4f0c33197776b1cec"; sha512.doc = "f54f52c5cee01b7ae8e01bff5a4d828b5c6708c31f2cf40d7e83c8a91c4c597945695dd7062b6088d3f91f7a9858e3227c850d658ae7a7bf94392e00e3eaf9c7"; sha512.source = "2623a0ec244722c1e3194d9ff1237305c1b7bf8c3baf6f60edd69b165bbd5ea83fb73ad23bf9aac1937b4ecf1059754e798eb2c97f7bab5d550fabbe84b752c0"; @@ -34734,7 +35296,9 @@ tl: { # no indentation "tabu" = { revision = 61719; stripPrefix = 0; - deps."varwidth" = tl."varwidth"; + deps = [ + "varwidth" + ]; sha512.run = "b40dc1e91084912df03175a6529223c6f24ae3c0ec77cfb8f1f8625816ea78c044c8f01f1b473e84696421d6772d9201fa4b59aa93e6f014b73598d16c09a6cd"; sha512.doc = "5ef0a71d643bf5069a622aa8c807bf87db7445caab1f17b5202ee25ddab5368e94e796eb16de4fb183f294cedc232d48cbdba68f45d2451e01a2483d6869822d"; sha512.source = "7c80ee8d25933e5d1c579357cffdf7177b0a419a847ca1e671cb1dda19fbde9b3680658df6b814d5d92953dd13eeee5100a5aa2fdb5fec3cbc1e213545cb3a78"; @@ -35083,11 +35647,13 @@ tl: { # no indentation }; "tex" = { revision = 62387; - deps."cm" = tl."cm"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."kpathsea" = tl."kpathsea"; - deps."plain" = tl."plain"; + deps = [ + "cm" + "hyphen-base" + "knuth-lib" + "kpathsea" + "plain" + ]; hasFormats = true; sha512.run = "7d177346a2df7e7dbd2fce3635a8860c0deee30271beeba585091f8027c796678a3dc9cda2952a073c9ca02e26cd656a3bdcabe4661c23e81af350a987d7e4aa"; sha512.doc = "e545796c64bbce0680d12b9d77ca64b008c369f90639ad9c3e7b7b219ceb85fcf24fa7eccaff65639bb9fe7159c2b2dd124866acd2ad78d860ff4e872a341d23"; @@ -35273,7 +35839,9 @@ tl: { # no indentation }; "texdoc" = { revision = 62815; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "eda9f9c138191f73487c5da101898970cb7f268eade19a7eb44231d05d819b23b182a9ca15e61c23f172c9869659c3bb5f45f35d2590d7da79d10021195284be"; sha512.doc = "0d4ad9b75b0c9f209bed3a5c816bbfb49a49667ca31b59fdf98caf42b60c9e618d6daae5fa9b3bd288dc6dc5fe2c6dc3a4cf7a1348f06006b9f60618d225a639"; hasRunfiles = true; @@ -35281,7 +35849,9 @@ tl: { # no indentation }; "texdoctk" = { revision = 62186; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe"; sha512.doc = "fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba"; hasRunfiles = true; @@ -35499,7 +36069,9 @@ tl: { # no indentation "texpower" = { revision = 29349; stripPrefix = 0; - deps."tpslifonts" = tl."tpslifonts"; + deps = [ + "tpslifonts" + ]; sha512.run = "7e2efadabaf173fd30c592cbcd2338563b8690048ccaffd86efb079a04b7b95c8ab113b99205cbb2912eae3a709a110d7b152270422cf2cbfd2ab85d42f12d69"; sha512.doc = "e61965b5e31b487daba383a4e6ebc0dba85475f8cade2faae6adb8576ec7ec544b518a6e0e105aa185ff82fd6aba7a9ea4abda2a9446d52f5b3acdb42580e315"; sha512.source = "3add8eeda886ce6422d3b7ea53a55dc69bb2f5c2e64cdede105a7b4756b008807bef6245ddc2596b45809311874e566263c51e98ec6751b4db9d3c5c5f58efd3"; @@ -35524,11 +36096,13 @@ tl: { # no indentation }; "texsis" = { revision = 45678; - deps."cm" = tl."cm"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."plain" = tl."plain"; - deps."tex" = tl."tex"; + deps = [ + "cm" + "hyphen-base" + "knuth-lib" + "plain" + "tex" + ]; hasFormats = true; sha512.run = "7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e"; sha512.doc = "2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90"; @@ -35581,7 +36155,9 @@ tl: { # no indentation "textgreek" = { revision = 44192; stripPrefix = 0; - deps."greek-fontenc" = tl."greek-fontenc"; + deps = [ + "greek-fontenc" + ]; sha512.run = "2370f666c2cef43a579e32a755675431717ccfb4bad6f30261a6c67e0617816ffc272c25e0d076d91c4047c41926c92ae375507f36f2fab01673bd7e708f5188"; sha512.doc = "9107ca31b645977d56a3b1e37f7b12f0302b1b2531bd2a21883f7931831e70c4383beae77469aab4663253da3109cdd9c53589cbab95f7f0126389d12509127f"; sha512.source = "367b63cd318c1e69944444f4cab82af7a7b1dde667d6469ade4c6433960b21a6f8922280d5a46e96fc88ddf4c2d5d3f3a440b55045a67512459208ae181bda96"; @@ -35906,7 +36482,9 @@ tl: { # no indentation }; "tie" = { revision = 62387; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "96cab708d9faec3f451302c6141655b79524d3497d9bded141235a2fcfbb27bb2d65fd096e559cc01b01f4ab28b97f5851ba9e202c313240ef1af07c4676085f"; sha512.doc = "519a15cde0a8b52250bdf61926ce44ea9267ff9f75f57f3ee9b390ce1aa6f7bc2a6bc2f30222d41a7606721ed28cbbd44348cb44229fba1c7126196291667917"; version = "2.4"; @@ -35993,8 +36571,10 @@ tl: { # no indentation "tikz-feynman" = { revision = 56615; stripPrefix = 0; - deps."iftex" = tl."iftex"; - deps."pgfopts" = tl."pgfopts"; + deps = [ + "iftex" + "pgfopts" + ]; sha512.run = "34c147e6ee16643e99d2c8fa789b39aea6f3b9ae7de93fd5c65d1b0daca1e9514d484b5b38892a0cffa1aeedcd405df0bc6621bf68e587311bc9fe45205c29fc"; sha512.doc = "ae0510a7971538fe458d83d4da4c78f7d607c7a1298344a139c02c49985f9005f6a81ab15f9dc621929d70d634c2cec4189ac4a2955e994611247af0c96986f3"; hasRunfiles = true; @@ -36156,7 +36736,9 @@ tl: { # no indentation "tikz-timing" = { revision = 64967; stripPrefix = 0; - deps."svn-prov" = tl."svn-prov"; + deps = [ + "svn-prov" + ]; sha512.run = "2c3af958ff5509a470b4e1f93bdbb063f5b911a81de12d749fbd7dc6810715a473814d6d8694a81a49d2f45f1f468ef9d441fe07c2269c9c9a9094e350228b36"; sha512.doc = "33ab52c8b2a60b9bad41a60375aa75432aea20a71c9fa7816d5dbc868e6a70b491dca9572d5c63ea486053294b6b709aa313de464e375e4f0a7a04f76764630a"; sha512.source = "f1c7c0be255d533898bd65e85f2a36b2f86abb6580b716cb239821a243f67a2706cbcfffb99628b060aadc9b56dfee45f66e54851861df2e0cf12e6cd331aa4e"; @@ -36577,8 +37159,10 @@ tl: { # no indentation "to-be-determined" = { revision = 64882; stripPrefix = 0; - deps."soul" = tl."soul"; - deps."xcolor" = tl."xcolor"; + deps = [ + "soul" + "xcolor" + ]; sha512.run = "a7c6b60844601f81bb659f57e212cfdc9e7cf72f24bfc662aed9dd26ebb9385187ebf44d82b59b637544b920c05dd5e3a698b69a0ef7ace4b57cd7531d240e3f"; sha512.doc = "0df7f6b340c28d2ef9db73af4bbad364bbb238a42f37effbde69af30774de627d29b2f03e098482e6fe66d09bec49d7d4a4566ebb3125eb2f3423c1d5fdba066"; sha512.source = "38d70708e3be579d46e086c2e1b227ac081da1d721fff64b51543269b9df11b7ebe67a8e95999bb3ca1b691b91a4c3e1a8d79bce2f367e6965e34a5577377608"; @@ -36633,10 +37217,12 @@ tl: { # no indentation "todonotes" = { revision = 59465; stripPrefix = 0; - deps."pgf" = tl."pgf"; - deps."tools" = tl."tools"; - deps."xcolor" = tl."xcolor"; - deps."xkeyval" = tl."xkeyval"; + deps = [ + "pgf" + "tools" + "xcolor" + "xkeyval" + ]; sha512.run = "78f84bcaf613003f694dfaddff2631cfe34c081ec5aac576a267f99940abcca1c8c71dc801e8df295c585a4db06517e5cce4671aef4188b81feba4be1ed6eccb"; sha512.doc = "89b61bb5630846a7cf739f39cc43a4e08890a4b0af06c884a60d9ac30068044c89cb99578aefe3b08c5761a412e524dacd79b028e69430d87ec17493b42ab7eb"; sha512.source = "e7bf0b61f1ce386b727f54288d1c6486fdb784fb7d7fe42e5a86f0815766df33881214579051c57325d6963fa7e073469ce488aeca816f7566275318e171fecc"; @@ -37012,21 +37598,23 @@ tl: { # no indentation "tudscr" = { revision = 64085; stripPrefix = 0; - deps."cbfonts" = tl."cbfonts"; - deps."environ" = tl."environ"; - deps."etoolbox" = tl."etoolbox"; - deps."geometry" = tl."geometry"; - deps."graphics" = tl."graphics"; - deps."greek-inputenc" = tl."greek-inputenc"; - deps."iwona" = tl."iwona"; - deps."koma-script" = tl."koma-script"; - deps."mathastext" = tl."mathastext"; - deps."mweights" = tl."mweights"; - deps."oberdiek" = tl."oberdiek"; - deps."opensans" = tl."opensans"; - deps."trimspaces" = tl."trimspaces"; - deps."xcolor" = tl."xcolor"; - deps."xpatch" = tl."xpatch"; + deps = [ + "cbfonts" + "environ" + "etoolbox" + "geometry" + "graphics" + "greek-inputenc" + "iwona" + "koma-script" + "mathastext" + "mweights" + "oberdiek" + "opensans" + "trimspaces" + "xcolor" + "xpatch" + ]; sha512.run = "4e17b12a82a18bb1f4babf123f1e84681c6f9524f2113725f14ad85042dcd5b1fb2aeaa45f709c1797512b8e0f35cd0ff743b60901e75676ec321f8bc682e793"; sha512.doc = "3335c87afe969963718137a9f854e0a4935c34bd850471673a3914fb9666e8f3195962d3474df35b876741b37c231851d47b440d49c35e42533b3717be1f442e"; sha512.source = "d317e3fc0624ec762293c972c9feaaf56186faf0962137f43f36b974ef223b094919cd84b9f5183e89e0ea6b922e4ae22b489bc619af466dac41c98fe0b651e5"; @@ -37036,12 +37624,14 @@ tl: { # no indentation "tufte-latex" = { revision = 37649; stripPrefix = 0; - deps."changepage" = tl."changepage"; - deps."ifmtarg" = tl."ifmtarg"; - deps."paralist" = tl."paralist"; - deps."placeins" = tl."placeins"; - deps."sauerj" = tl."sauerj"; - deps."xifthen" = tl."xifthen"; + deps = [ + "changepage" + "ifmtarg" + "paralist" + "placeins" + "sauerj" + "xifthen" + ]; sha512.run = "6dd01a5a6faf37439ca9aab23534f99050b84bfac16df48545417ee03e72700344c25b2de3262e8e28406da705d50296473a815fa14b701c609b3715f01405d1"; sha512.doc = "11ac57e79a05db644235b6db851473c75d1538a1261d7022a63d9ab0cc54486cc13b7cc95c44d16912952e46bc9264c1bfb831a728b51a03495d01f1963410d3"; hasRunfiles = true; @@ -37677,8 +38267,10 @@ tl: { # no indentation "unicode-math" = { revision = 61719; stripPrefix = 0; - deps."fontspec" = tl."fontspec"; - deps."lm-math" = tl."lm-math"; + deps = [ + "fontspec" + "lm-math" + ]; sha512.run = "05dd4b08e8e766c2c8e719a12aa5a28259bc429fb1f1d05850e865ef258ab5e1372a785a2787098ea50bb31c852727ba8269ca656ce55ee0a7355fe4fd7344cc"; sha512.doc = "c8d05fe09c6ed76f29978eff8b7688d8989865f6517f06a58acb899603265e499db5d962895b5b3a0b6bf8d235f29da88f76a3b7b35778953878d02f2910b524"; sha512.source = "b1f21cf06c5ece08e75575cb2e23f7e9815c0670cdb2af0026c1037556e646e81c2103740bcb14e95375cf88b3a665afa3b24a4fd6c33f416c36f588649de79f"; @@ -37869,25 +38461,27 @@ tl: { # no indentation }; "uplatex" = { revision = 65305; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-base-dev" = tl."latex-base-dev"; - deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; - deps."latex-fonts" = tl."latex-fonts"; - deps."platex" = tl."platex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; - deps."uptex" = tl."uptex"; - deps."uptex-fonts" = tl."uptex-fonts"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "everyshi" + "firstaid" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-base-dev" + "latex-firstaid-dev" + "latex-fonts" + "platex" + "tex-ini-files" + "unicode-data" + "uptex" + "uptex-fonts" + ]; hasFormats = true; sha512.run = "aa49098049ae86a286ccd14a3a25060104ade1ecfa1f31d44c36398dc1d9130e78ee2f3dfbda067c5cda54275a5ace7fdfa66ff8a4e30ab2cfef32c52d4c8781"; sha512.doc = "373eaf7028b4528b1e7d1be399d0bc05b477fdb8a429f845d0bc7d767bbc7ff6a991174c8eff0e346a5b4c0a3dbee24b633df97656dcc1a1c5e5f80487f73a64"; @@ -37921,14 +38515,16 @@ tl: { # no indentation }; "uptex" = { revision = 62464; - deps."cm" = tl."cm"; - deps."etex" = tl."etex"; - deps."hyphen-base" = tl."hyphen-base"; - deps."knuth-lib" = tl."knuth-lib"; - deps."plain" = tl."plain"; - deps."ptex-base" = tl."ptex-base"; - deps."uptex-base" = tl."uptex-base"; - deps."uptex-fonts" = tl."uptex-fonts"; + deps = [ + "cm" + "etex" + "hyphen-base" + "knuth-lib" + "plain" + "ptex-base" + "uptex-base" + "uptex-fonts" + ]; hasFormats = true; sha512.run = "9255b1ec06d2b1e214dda666b5f37df20ce98095a3726e2e114082cd0ebb13f9f4e0d46b8cfd28da528a6ab68896fd62a0593e02b5072e6c3196937b098bd626"; sha512.doc = "2a9d880635afb3c848893c371d3aca7796e6aafb11949047a21e9f0df73d06b69d3cc84cfe28438f0424722b41b795be913e79cc01b16dacd5370ec5d1e9ac5b"; @@ -38216,7 +38812,9 @@ tl: { # no indentation }; "velthuis" = { revision = 55475; - deps."xetex-devanagari" = tl."xetex-devanagari"; + deps = [ + "xetex-devanagari" + ]; sha512.run = "451023c09755f3aa884128a6ddd5e70a6820724de66f8923deea812a8e28c337676de95aa98a06a96013502fa24e9855b24977603c675820b1d5a0a056fe4cab"; sha512.doc = "e17270b0e427e3ff02b1d43e578815ec37c0046a20ceb898a357041f9184044162077d9fc64f66d955d774637a8d2ec59d31b624dd743113c972d0854075df10"; hasRunfiles = true; @@ -38537,7 +39135,9 @@ tl: { # no indentation "wasy-type1" = { revision = 53534; stripPrefix = 0; - deps."wasy" = tl."wasy"; + deps = [ + "wasy" + ]; sha512.run = "d7131c025bd97bdaf62697feb698da97d175783e4b0502d3e85b60a663f46a0520268a6063956afaddc6308ddd21954992bf8d216049cb324133e3760ac20825"; sha512.doc = "d9c88d39deabe19393df0b6d83bddd644e347592735cd7511dc70374ea015cd7fdf36ac9f320b44c612c8276eee3d7cd94f9e0b26de050c0771c85ec7dbae53c"; hasRunfiles = true; @@ -38554,7 +39154,9 @@ tl: { # no indentation }; "web" = { revision = 62517; - deps."kpathsea" = tl."kpathsea"; + deps = [ + "kpathsea" + ]; sha512.run = "edac6079f0de1904e008c2a5fd7ee697f32c5324e3b9a7a4d8997b97ef214bfa1a787c84ecd4bcccd38e88c58b9729b4c5684ab58bbfcc97ce159dc5c2b5b312"; sha512.doc = "50ae800de53cecfa6f656ba41d35d7c486e4cfe4b2ed42dd26dc60ecaa9a0b80c178dead765a7076fcc6141e8a2158e9b0854ceecc2cbf7b2e85c23cf22a7da3"; version = "4.5"; @@ -38906,7 +39508,9 @@ tl: { # no indentation "xecjk" = { revision = 64059; stripPrefix = 0; - deps."ctex" = tl."ctex"; + deps = [ + "ctex" + ]; sha512.run = "3382b181053c76e58ba3f77b195765d83e5515a48b0c73580fc19305bd395de8d19b98be3494da8201b0a22a851a53c82dda14beb54a545b652cd0bd5719af67"; sha512.doc = "b2dd0caf3317d708cc001b5aba57979f86eaa20d9d38d360650b45fbb683603e2075658a0c0a9c0631c81ea06ecac27694c45df47f053d9e7440901d66280295"; sha512.source = "07fe51d62358a376d2f3cc2774cf606bd4e9f8b3bd3fb202427f34c3c15b004fed5985f7fe776b3529a83ea4aa3e3e176311e14bb0a02cf055eb501a3f474839"; @@ -38948,24 +39552,26 @@ tl: { # no indentation }; "xelatex-dev" = { revision = 62145; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-base-dev" = tl."latex-base-dev"; - deps."latex-firstaid-dev" = tl."latex-firstaid-dev"; - deps."latex-fonts" = tl."latex-fonts"; - deps."lm" = tl."lm"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; - deps."xetex" = tl."xetex"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "everyshi" + "firstaid" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-base-dev" + "latex-firstaid-dev" + "latex-fonts" + "lm" + "tex-ini-files" + "unicode-data" + "xetex" + ]; hasFormats = true; sha512.run = "088c917758f727ba08b8571d302c93f0b14fc15ca6dcb0ef7a89df4ba144c508d8d42265cc6b1915707329b64aa1d1030ed0b5513987fbd4437d0a58a232b5db"; }; @@ -39015,25 +39621,27 @@ tl: { # no indentation }; "xetex" = { revision = 62387; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."dvipdfmx" = tl."dvipdfmx"; - deps."etex" = tl."etex"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."lm" = tl."lm"; - deps."plain" = tl."plain"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; - deps."xetexconfig" = tl."xetexconfig"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "dvipdfmx" + "etex" + "everyshi" + "firstaid" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "lm" + "plain" + "tex-ini-files" + "unicode-data" + "xetexconfig" + ]; hasFormats = true; sha512.run = "e9f0aebda0a7fb36e2cbce4dd49e965335438c4ebf2d41eb8e19eabe29617239dd67e7e3433a8c75fd40f072a2c6753a7d0762afd34fca4130929e51888aaabf"; sha512.doc = "31f03ee1ae00bc7883109ab7b7374feedc384d86b491873e90797658eae12299dd60b95edc1c86f1faa61a0b7a952cca23993e991863b37e49c27afd6c21c034"; @@ -39108,7 +39716,9 @@ tl: { # no indentation "xfakebold" = { revision = 55654; stripPrefix = 0; - deps."iftex" = tl."iftex"; + deps = [ + "iftex" + ]; sha512.run = "99c735bd449c96b3444a8b50032c9962601a04beeeeb6b0fcb759ee0cc53e4510dc8d077a3cad7b99c968bb9d60bbd37f2f0c7d56ffb5fc667301423bfd32bdb"; sha512.doc = "bb6f1bda41427f4c144402095a79aafe70d6b534b6d0462d951a2c58fabb0bc8dd9edfdabf526bba243b2c79aeacee728741dca778e25019ae909856b164a316"; hasRunfiles = true; @@ -39251,7 +39861,9 @@ tl: { # no indentation "xltxtra" = { revision = 56594; stripPrefix = 0; - deps."metalogo" = tl."metalogo"; + deps = [ + "metalogo" + ]; sha512.run = "ff75c7b2f36f0e3cdc466dde35d83ccbb76c9c95f5d191a5498831247d1d418b69a8f0df8b263eae78e4a13694e628eba64c24e7480c7dbf56948cd5b1504a76"; sha512.doc = "6fc84121dd3486f5f7744d757520e2b4d7baf83686e2630990be7e72ccb121e5b417779e4682e6e8a566b016a8995f80d7d4c6dfb3d6d2c9f70ed506bee99d64"; sha512.source = "c177b99366479f6ed5ef935be07fbfc3425b48f2c3d274e175bbde9c63cbcc93ee4bca4c3c2886fdc2894b627332ff7edffa5b1083ad86dcced56bfb0d9fe03f"; @@ -39265,26 +39877,28 @@ tl: { # no indentation }; "xmltex" = { revision = 62145; - deps."atbegshi" = tl."atbegshi"; - deps."atveryend" = tl."atveryend"; - deps."babel" = tl."babel"; - deps."cm" = tl."cm"; - deps."dehyph" = tl."dehyph"; - deps."everyshi" = tl."everyshi"; - deps."firstaid" = tl."firstaid"; - deps."hyph-utf8" = tl."hyph-utf8"; - deps."hyphen-base" = tl."hyphen-base"; - deps."l3backend" = tl."l3backend"; - deps."l3kernel" = tl."l3kernel"; - deps."l3packages" = tl."l3packages"; - deps."latex" = tl."latex"; - deps."latex-fonts" = tl."latex-fonts"; - deps."latexconfig" = tl."latexconfig"; - deps."pdftex" = tl."pdftex"; - deps."tex" = tl."tex"; - deps."tex-ini-files" = tl."tex-ini-files"; - deps."unicode-data" = tl."unicode-data"; - deps."xmltexconfig" = tl."xmltexconfig"; + deps = [ + "atbegshi" + "atveryend" + "babel" + "cm" + "dehyph" + "everyshi" + "firstaid" + "hyph-utf8" + "hyphen-base" + "l3backend" + "l3kernel" + "l3packages" + "latex" + "latex-fonts" + "latexconfig" + "pdftex" + "tex" + "tex-ini-files" + "unicode-data" + "xmltexconfig" + ]; hasFormats = true; sha512.run = "ee01abb25b18e99f18bc78357be04fb1405473e90fbdf74ed875e2910812550c44fcc7aee960b2bdc53fcd7d78e9aa706e46929da65d5cb78d9ca43ba475d675"; sha512.doc = "d87c6d1f4c472b436104b0746d48a463977dc7eb520de3d7a53f48bc1c8e5682a23d604bbe2ebda1b5029d4a6dd33c2d2bf8b917ad4f54d2c7472874fdfe8509"; @@ -39468,7 +40082,9 @@ tl: { # no indentation "xunicode" = { revision = 30466; stripPrefix = 0; - deps."tipa" = tl."tipa"; + deps = [ + "tipa" + ]; sha512.run = "f49628013bc54e82bc38a2c749ddde9426c65716f04c5c8d8264398b9595e571d380e07c045db9e7ed5d6df7d0b7b1f8e81eaa28d6b67a6756d2c5023b731176"; sha512.doc = "fbd368180c97649944aa23fae4f50f8a8d1aaa776f643ba520f121b9aae196dca94c11906f9d5b2f961b6d494256329670af1f4563502b44a8fc9633e29373e0"; hasRunfiles = true; @@ -39598,36 +40214,38 @@ tl: { # no indentation "yb-book" = { revision = 64586; stripPrefix = 0; - deps."anyfontsize" = tl."anyfontsize"; - deps."biblatex" = tl."biblatex"; - deps."bigfoot" = tl."bigfoot"; - deps."changepage" = tl."changepage"; - deps."chngcntr" = tl."chngcntr"; - deps."csquotes" = tl."csquotes"; - deps."enumitem" = tl."enumitem"; - deps."fancyhdr" = tl."fancyhdr"; - deps."float" = tl."float"; - deps."footmisc" = tl."footmisc"; - deps."geometry" = tl."geometry"; - deps."ifmtarg" = tl."ifmtarg"; - deps."imakeidx" = tl."imakeidx"; - deps."lastpage" = tl."lastpage"; - deps."libertine" = tl."libertine"; - deps."mdframed" = tl."mdframed"; - deps."microtype" = tl."microtype"; - deps."needspace" = tl."needspace"; - deps."paralist" = tl."paralist"; - deps."pgf" = tl."pgf"; - deps."qrcode" = tl."qrcode"; - deps."setspace" = tl."setspace"; - deps."soul" = tl."soul"; - deps."titlesec" = tl."titlesec"; - deps."ulem" = tl."ulem"; - deps."wrapfig" = tl."wrapfig"; - deps."xcolor" = tl."xcolor"; - deps."xifthen" = tl."xifthen"; - deps."xkeyval" = tl."xkeyval"; - deps."zref" = tl."zref"; + deps = [ + "anyfontsize" + "biblatex" + "bigfoot" + "changepage" + "chngcntr" + "csquotes" + "enumitem" + "fancyhdr" + "float" + "footmisc" + "geometry" + "ifmtarg" + "imakeidx" + "lastpage" + "libertine" + "mdframed" + "microtype" + "needspace" + "paralist" + "pgf" + "qrcode" + "setspace" + "soul" + "titlesec" + "ulem" + "wrapfig" + "xcolor" + "xifthen" + "xkeyval" + "zref" + ]; sha512.run = "dea52e5aee243d84ad52bb5eb61957e05b500ea9caf36360fd587d0a38ebb602f2821e040e3acf41e8318c0ce491f3bdcb5a477ef65be7b41ec2fe12df680542"; sha512.doc = "ecb2ed5bf434f96aacd7422bc815cdc8b69c307475f8f71b8b8b5bc2aad916d1db1394eeaf3b7ddd54e3bf7dc059574c821f2d44f9247103153fb5ef3f40f02d"; sha512.source = "20080fd53bc9c749632236d710972bac2db0ab0a7c3cd4a1b39fdc1226a2279332dca41856647b6132f033f381de798b8dc522ba3199e747ea15e5ca571d71c8"; @@ -39644,16 +40262,18 @@ tl: { # no indentation "ydoc" = { revision = 64887; stripPrefix = 0; - deps."etoolbox" = tl."etoolbox"; - deps."float" = tl."float"; - deps."hyperref" = tl."hyperref"; - deps."listings" = tl."listings"; - deps."needspace" = tl."needspace"; - deps."newverbs" = tl."newverbs"; - deps."showexpl" = tl."showexpl"; - deps."tools" = tl."tools"; - deps."url" = tl."url"; - deps."xcolor" = tl."xcolor"; + deps = [ + "etoolbox" + "float" + "hyperref" + "listings" + "needspace" + "newverbs" + "showexpl" + "tools" + "url" + "xcolor" + ]; sha512.run = "116d4be9a7ca06f90967c85a696e893a85555402acf400c0251a71f4d43a5ad244ee041518d4408b6627610ff87792f07ab51309303e442159bce46025d5a27c"; sha512.doc = "714ff9f1fc20d9f3e5effe9159935a45662f7f8dde9be0371055a3e178b9a74618046c1f4ba67cd1b89b6b0abfdf41de2716a097e67138d42f733ece3edb028d"; sha512.source = "1a4d7c462316b3d2689b5121d81af8ff7847909e039564a0d66c859607e5c4fa573dbc607cffbd73223f48f471847057fbfeeb71a31947b5b1a8c02eb88eb35b"; @@ -39898,8 +40518,10 @@ tl: { # no indentation "zref-vario" = { revision = 63874; stripPrefix = 0; - deps."tools" = tl."tools"; - deps."zref-clever" = tl."zref-clever"; + deps = [ + "tools" + "zref-clever" + ]; sha512.run = "a6098a6d02e8ceef899a6dae98af5f4faa4878d450d02dbec9c3d855eacf359d30418ed81b8884b898f2b5b39e65abd7b4572e6797b73050d3f708a73d20f9f2"; sha512.doc = "1fe5da87c16231ed058d42a0bb99d041823e8b81471039773338a09e83f650419d7f11a58322101e178f2682fc655aeac8be5d82d1df55da6929cd119c94b0be"; sha512.source = "3389daa24248921968989cde9386d438c3bc81dcde8a800bc324437cf8e468f24bf8d0eb24296319cb9da45cf42295e45ae01f47a32ce175ce2dfb2508c4372c"; diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 61150fa8b7cf3..506843c0952a1 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -1,38 +1,48 @@ # wrap whole file into an attrset -1itl: { # no indentation +1i{ # no indentation $a} -# trash packages we don't want -/^name .*\./,/^$/d - -# quote package names, as some start with a number :-/ -s/^name (.*)/name "\1"/ - -# extract revision -s/^revision ([0-9]*)$/ revision = \1;/p - # form an attrmap per package -/^name /s/^name (.*)/\1 = {/p -/^$/,1i}; - -# extract hashes of *.tar.xz -s/^containerchecksum (.*)/ sha512.run = "\1";/p -s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p -s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p -/^runfiles /i\ hasRunfiles = true; - -# number of path components to strip, defaulting to 1 ("texmf-dist/") -/^relocated 1/i\ stripPrefix = 0; - -# extract version and clean unwanted chars from it -/^catalogue-version/y/ \/~/_--/ -/^catalogue-version/s/[\#,:\(\)]//g -s/^catalogue-version_(.*)/ version = "\1";/p - -# extract deps -s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p - -# extract hyphenation patterns and formats -# (this may create duplicate lines, use uniq to remove them) -/^execute\sAddHyphen/i\ hasHyphens = true; -/^execute\sAddFormat/i\ hasFormats = true; +# ignore packages whose name contains "." (such as binaries) +/^name ([^.]+)$/,/^$/{ + # quote package names, as some start with a number :-/ + s/^name (.*)$/"\1" = {/p + /^$/,1i}; + + # extract revision + s/^revision ([0-9]*)$/ revision = \1;/p + + # extract hashes of *.tar.xz + s/^containerchecksum (.*)/ sha512.run = "\1";/p + s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p + s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p + /^runfiles /i\ hasRunfiles = true; + + # number of path components to strip, defaulting to 1 ("texmf-dist/") + /^relocated 1/i\ stripPrefix = 0; + + # extract version and clean unwanted chars from it + /^catalogue-version/y/ \/~/_--/ + /^catalogue-version/s/[\#,:\(\)]//g + s/^catalogue-version_(.*)/ version = "\1";/p + + # extract deps + /^depend [^.]+$/{ + s/^depend (.+)$/ deps = [\n "\1"/ + + # loop through following depend lines + :next + h ; N # save & read next line + s/\ndepend (.+)\.(.+)$// + s/\ndepend (.+)$/\n "\1"/ + t next # loop if the previous lines matched + + x; s/$/\n ];/p ; x # print saved deps + s/^.*\n// # remove deps, resume processing + } + + # extract hyphenation patterns and formats + # (this may create duplicate lines, use uniq to remove them) + /^execute\sAddHyphen/i\ hasHyphens = true; + /^execute\sAddFormat/i\ hasFormats = true; +} diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 9e989fcc4750b..28d55f13fe3dd 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "atomicparsley"; - version = "20210715.151551.e7ad03a"; + version = "20221229.172126.d813aa6"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-77yWwfdEul4uLsUNX1dLwj8K0ilcuBaTVKMyXDvKVx4="; + sha256 = "sha256-3otyOpDdiltZ0SR1hImfIDBi53PKuAvh93yq1X3Xkmo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index b9b1b228efa59..675dfc109de13 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; - NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${lib.getDev SDL}/include/SDL"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${lib.getDev SDL}/include/SDL"; postPatch = '' sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index f75c38111a574..32d9cc9d3d7d8 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -3,8 +3,11 @@ , stdenv , rustPlatform , fetchCrate -, nasm +, pkg-config , cargo-c +, libgit2 +, nasm +, zlib , libiconv , Security }: @@ -24,7 +27,9 @@ in rustPlatform.buildRustPackage rec { auditable = true; # TODO: remove when this is the default - nativeBuildInputs = [ nasm cargo-c ]; + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ cargo-c libgit2 nasm zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 32bc31346a00a..8cf9dc8498966 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ aom bsd3 ]; maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' + # error: use of undeclared identifier 'kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange' + broken = stdenv.isAarch64 && stdenv.isDarwin; }; }) diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index dbad79e61ad1d..c2b0efbdec802 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; # Fixes build with GCC 6 - NIX_CFLAGS_COMPILE = "-std=c++03"; + env.NIX_CFLAGS_COMPILE = "-std=c++03"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxslt freetype libpng libxml2 ]; diff --git a/pkgs/tools/video/tsduck/default.nix b/pkgs/tools/video/tsduck/default.nix index e2db2e80ce3ee..bb4757a4cf7fc 100644 --- a/pkgs/tools/video/tsduck/default.nix +++ b/pkgs/tools/video/tsduck/default.nix @@ -49,6 +49,14 @@ stdenv.mkDerivation rec { sed -i"" \ -e '/TSUNIT_TEST(testHomeDirectory);/ d' \ src/utest/utestSysUtils.cpp + + sed -i"" \ + -e '/TSUNIT_TEST(testIPv4Address);/ d' \ + -e '/TSUNIT_TEST(testIPv4AddressConstructors);/ d' \ + -e '/TSUNIT_TEST(testIPv4SocketAddressConstructors);/ d' \ + -e '/TSUNIT_TEST(testTCPSocket);/ d' \ + -e '/TSUNIT_TEST(testUDPSocket);/ d' \ + src/utest/utestNetworking.cpp ''; enableParallelBuilding = true; diff --git a/pkgs/tools/video/wtwitch/default.nix b/pkgs/tools/video/wtwitch/default.nix index 0967653464c2c..91182c8e179d9 100644 --- a/pkgs/tools/video/wtwitch/default.nix +++ b/pkgs/tools/video/wtwitch/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "wtwitch"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "krathalan"; repo = pname; rev = version; - hash = "sha256-KkuXZOquihY3IRVp4FM+AdN3kYi0MqmrXFuNmydTpio="; + hash = "sha256-CHIAxUF0kvt8iV5xRbX5zuOCIecH7NoviQOYiOK0CgY="; }; # hardcode SCRIPT_NAME because #150841 diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index 53d6c49b7e646..e638278f8ba8e 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "xjadeo"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "x42"; repo = "xjadeo"; rev = "v${version}"; - sha256 = "sha256-S8eIkmfjwpcILZc+by0Mk4VPRUlbJT0GBe8NlJ1F9EI="; + sha256 = "sha256-VPmVoCoVyljzqtbkuT3e6jhXClP708V/6zy1bVoET7c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { soundtrack composition, video monitoring or any task that requires to synchronizing movie frames with external events. ''; - homepage = "http://xjadeo.sourceforge.net"; + homepage = "https://xjadeo.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mitchmindtree ]; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 25841ae92b49c..e58b8f342d056 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -16,7 +16,6 @@ let self = localPython; packageOverrides = self: super: { cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; - future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { @@ -48,10 +47,11 @@ with localPython.pkgs; buildPythonApplication rec { preConfigure = '' substituteInPlace setup.py \ --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ - --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ + --replace "requests>=2.20.1,<=2.26" "requests<3" \ --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ + --replace "future>=0.16.0,<0.17.0" "future" \ --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0" ''; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 40e3bfd5c1bd0..97c80ec560cc1 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -118,7 +118,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; license = with licenses; [ asl20 gpl3Plus ]; - maintainers = with maintainers; [ phile314 illustris ]; + maintainers = with maintainers; [ illustris ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index 7d0da22221b03..664f9405500ff 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "guest-agent"; - version = "20230112.00"; + version = "20230221.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-uM71qepYnmE4pK+Bdx5l78upNyp2+Myo3ayOAAlRF9s="; + sha256 = "sha256-AObN9vyEMJeGBmAMyUz7H0pHPtGf5I/oeDzYuZs4KpE="; }; vendorHash = "sha256-ioejOtmsi0QnID3V5JxwAz399I5Jp5nHZqpzU9DjpQE="; diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index fe05078ba3e4b..0e2aae22f728f 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "google-guest-oslogin"; - version = "20220721.00"; + version = "20230217.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "sha256-VIbejaHN9ANk+9vjpGAYS/SjHx4Tf7SkTqRD1svJRPU="; + sha256 = "sha256-MZpm6JgukqdT8B1qZzKT4tO3LBS8ReoVqRGyY5ykWHw="; }; postPatch = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl.dev pam json_c ]; - NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" ]; makeFlags = [ "VERSION=${version}" diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 57c0d51d40702..39aadcf8e3843 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.30.0"; + version = "0.30.2"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-BMkty2H42fAILw/zRiAWE5cOX9WCZIs0503QODLHqxo="; + sha256 = "sha256-Jt71nrviElNj5UjWzdP51x3My59KAT+EtrQfodR3GfA="; }; - vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; + vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; ldflags = [ "-s" diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix new file mode 100644 index 0000000000000..6bb451aa9e853 --- /dev/null +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -0,0 +1,128 @@ +{ cmake +, dnsmasq +, fetchFromGitHub +, git +, gtest +, iproute2 +, iptables +, lib +, libapparmor +, libvirt +, libxml2 +, nixosTests +, openssl +, OVMF +, pkg-config +, qemu +, qemu-utils +, qtbase +, qtx11extras +, slang +, stdenv +, wrapQtAppsHook +, xterm +}: + +let + pname = "multipass"; + version = "1.11.1"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "multipass"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-AIZs+NRAn/r9EjTx9InDZzS4ycni4MZQXmC0A5rpaJk="; + fetchSubmodules = true; + }; + + preConfigure = '' + substituteInPlace ./CMakeLists.txt \ + --replace "determine_version(MULTIPASS_VERSION)" "" \ + --replace 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")' + + substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ + --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ + --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" + ''; + + postPatch = '' + # Patch all of the places where Multipass expects the LXD socket to be provided by a snap + substituteInPlace ./src/network/network_access_manager.cpp \ + --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket" + + substituteInPlace ./src/platform/backends/lxd/lxd_virtual_machine.cpp \ + --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket" + + substituteInPlace ./src/platform/backends/lxd/lxd_request.h \ + --replace "/var/snap/lxd/common/lxd/unix.socket" "/var/lib/lxd/unix.socket" + + substituteInPlace ./tests/CMakeLists.txt \ + --replace "FetchContent_MakeAvailable(googletest)" "" + + cat >> tests/CMakeLists.txt <<'EOF' + add_library(gtest INTERFACE) + target_include_directories(gtest INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest INTERFACE ${gtest}/lib/libgtest.so ''${CMAKE_THREAD_LIBS_INIT}) + add_dependencies(gtest GMock) + + add_library(gtest_main INTERFACE) + target_include_directories(gtest_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest_main INTERFACE ${gtest}/lib/libgtest_main.so gtest) + + add_library(gmock INTERFACE) + target_include_directories(gmock INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock INTERFACE ${gtest}/lib/libgmock.so gtest) + + add_library(gmock_main INTERFACE) + target_include_directories(gmock_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock_main INTERFACE ${gtest}/lib/libgmock_main.so gmock gtest_main) + EOF + ''; + + buildInputs = [ + gtest + libapparmor + libvirt + libxml2 + openssl + qtbase + qtx11extras + ]; + + nativeBuildInputs = [ + cmake + git + pkg-config + slang + wrapQtAppsHook + ]; + + nativeCheckInputs = [ gtest ]; + + postInstall = '' + wrapProgram $out/bin/multipassd --prefix PATH : ${lib.makeBinPath [ + dnsmasq + iproute2 + iptables + OVMF.fd + qemu + qemu-utils + xterm + ]} + ''; + + passthru.tests = { + multipass = nixosTests.multipass; + }; + + meta = with lib; { + description = "Ubuntu VMs on demand for any workstation."; + homepage = "https://multipass.run"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jnsgruk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index 9db01094bb301..825cf8b90c205 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -1,51 +1,12 @@ -{ lib, stdenv, system ? builtins.currentSystem, ovftoolBundles ? {} -, requireFile, buildFHSUserEnv, autoPatchelfHook, makeWrapper, unzip -, glibc, c-ares, libressl, curl, expat, icu60, xercesc, zlib +{ lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} +, requireFile, autoPatchelfHook, makeWrapper, unzip +, glibc, c-ares, libxcrypt, expat, icu60, xercesc, zlib }: let - version = "4.4.1-16812187"; - - # FHS environment required to unpack ovftool on x86. - ovftoolX86Unpacker = buildFHSUserEnv rec { - name = "ovftool-unpacker"; - targetPkgs = pkgs: [ pkgs.bash ]; - multiPkgs = targetPkgs; - runScript = "bash"; - }; - - # unpackPhase for i686 and x86_64 ovftool self-extracting bundles. - ovftoolX86UnpackPhase = '' - runHook preUnpack - # This is a self-extracting shell script and needs a FHS environment to run. - # In reality, it could be doing anything, which is bad for reproducibility. - # Our postUnpack uses nix-hash to verify the hash to prevent problems. - # - # Note that the Arch PKGBUILD at - # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vmware-ovftool - # appears to use xvfb-run - this hasn't been proven necessary so far. - # - cp ${ovftoolSource} ./ovftool.bundle - chmod +x ./ovftool.bundle - ${ovftoolX86Unpacker}/bin/ovftool-unpacker ./ovftool.bundle -x ovftool - rm ovftool.bundle - extracted=ovftool/vmware-ovftool/ - if [ -d "$extracted" ]; then - # Move the directory we care about to ovftool/ - mv "$extracted" . - rm -r ovftool - mv "$(basename -- "$extracted")" ovftool - echo "ovftool extracted successfully" >&2 - else - echo "Could not find $extracted - are you sure this is ovftool?" >&2 - rm -r ovftool - exit 1 - fi - runHook postUnpack - ''; + version = "4.5.0-20459872"; - # unpackPhase for aarch64 .zip. - ovftoolAarch64UnpackPhase = '' + ovftoolZipUnpackPhase = '' runHook preUnpack unzip ${ovftoolSource} extracted=ovftool/ @@ -58,29 +19,20 @@ let runHook postUnpack ''; - # When the version is bumped, postUnpackHash will change - # for all these supported systems. Update it from the printed error on build. - # - # This is just a sanity check, since ovftool is a self-extracting bundle - # that could be doing absolutely anything on 2/3 of the supported platforms. - ovftoolSystems = { - "i686-linux" = { - filename = "VMware-ovftool-${version}-lin.i386.bundle"; - sha256 = "0gx78g3s77mmpir7jbiskna10i6262ihal1ywivlb6xxxxbhqzwj"; - unpackPhase = ovftoolX86UnpackPhase; - postUnpackHash = "1k8rp8ywhs0cl9aad37v1p0493bdvkxrsvwg5pgv2bhvjs4hqk7n"; - }; - "x86_64-linux" = { - filename = "VMware-ovftool-${version}-lin.x86_64.bundle"; - sha256 = "1kp2bp4d9i8y7q25yqff2bn62mh292lws7b66lyn8ka9b35kvnzc"; - unpackPhase = ovftoolX86UnpackPhase; - postUnpackHash = "0zvyakwi4iishqxxisihgh91bmdsfvj5vchm2c192hia03a143py"; + ovftoolSystems = let + baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; + in { + "i686-linux" = rec { + filename = "VMware-ovftool-${version}-lin.i386.zip"; + url = "${baseUrl}/b70b2ad5-861a-4c11-b081-e541586bf934/57109c63-6b80-4ced-95f2-1b7255200a36/${filename}"; + sha256 = "11zs5dm4gmssm94s501p66l4s8v9p7prrd87cfa903mwmyp0ihnx"; + unpackPhase = ovftoolZipUnpackPhase; }; - "aarch64-linux" = { - filename = "VMware-ovftool-${version}-lin.aarch64.zip"; - sha256 = "0all8bwv5p5adnzqvrly6nzmxmfpywvlbfr0finr4n100yv0v1xy"; - unpackPhase = ovftoolAarch64UnpackPhase; - postUnpackHash = "16vyyzrmryi8b7mrd6nxnhywvvj2pw0ban4qfiqfahw763fn6971"; + "x86_64-linux" = rec { + filename = "VMware-ovftool-${version}-lin.x86_64.zip"; + url = "${baseUrl}/f87355ff-f7a9-4532-b312-0be218a92eac/b2916af6-9f4f-4112-adac-49d1d6c81f63/${filename}"; + sha256 = "1fkm18yfkkm92m7ccl6b4nxy5lagwwldq56b567091a5sgad38zw"; + unpackPhase = ovftoolZipUnpackPhase; }; }; @@ -91,9 +43,9 @@ let ovftoolSource = if builtins.hasAttr system ovftoolBundles then ovftoolBundles.${system} else - requireFile { + fetchurl { name = ovftoolSystem.filename; - url = "https://my.vmware.com/group/vmware/downloads/get-download?downloadGroup=OVFTOOL441"; + url = ovftoolSystem.url; sha256 = ovftoolSystem.sha256; }; in @@ -103,11 +55,13 @@ stdenv.mkDerivation rec { src = ovftoolSource; + # Maintainers: try downloading a NixOS OVA and run the following to test: + # `./result/bin/ovftool https://channels.nixos.org/nixos-unstable/latest-nixos-x86_64-linux.ova nixos.ovf` + # Some dependencies are not loaded until operations actually occur! buildInputs = [ glibc - libressl + libxcrypt c-ares - (curl.override { openssl = libressl; }) expat icu60 xercesc @@ -116,12 +70,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; + preferLocalBuild = true; + sourceRoot = "."; unpackPhase = ovftoolSystem.unpackPhase; - postUnpackHash = ovftoolSystem.postUnpackHash; - # Expects a directory named 'ovftool' containing the ovftool install. # Based on https://aur.archlinux.org/packages/vmware-ovftool/ # with the addition of a libexec directory and a Nix-style binary wrapper. @@ -133,22 +87,20 @@ stdenv.mkDerivation rec { fi # libraries install -m 755 -d "$out/lib/${pname}" - # These all appear to be VMWare proprietary except for libgoogleurl. + # These all appear to be VMWare proprietary except for libgoogleurl and libcurl. # The rest of the libraries that the installer extracts are omitted here, - # and provided in buildInputs. + # and provided in buildInputs. Since libcurl depends on VMWare's OpenSSL, + # we have to use both here too. # # FIXME: can we replace libgoogleurl? Possibly from Chromium? + # FIXME: tell VMware to use a modern version of OpenSSL. # install -m 644 -t "$out/lib/${pname}" \ libgoogleurl.so.59 \ libssoclient.so \ - libvim-types.so libvmacore.so libvmomi.so - # ovftool specifically wants 1.0.2 but our libcrypto is named 1.0.0 - ln -s "${lib.getLib libressl}/lib/libcrypto.so" \ - "$out/lib/${pname}/libcrypto.so.1.0.2" - ln -s "${lib.getLib libressl}/lib/libssl.so" \ - "$out/lib/${pname}/libssl.so.1.0.2" - # libexec + libvim-types.so libvmacore.so libvmomi.so \ + libcurl.so.4 libcrypto.so.1.0.2 libssl.so.1.0.2 + # libexec binaries install -m 755 -d "$out/libexec/${pname}" install -m 755 -t "$out/libexec/${pname}" ovftool.bin install -m 644 -t "$out/libexec/${pname}" icudt44l.dat @@ -177,6 +129,20 @@ stdenv.mkDerivation rec { addAutoPatchelfSearchPath "$out/lib" ''; + doInstallCheck = true; + + installCheckPhase = '' + # This is a NixOS 22.11 image (doesn't actually matter) with a 1 MiB root disk that's all zero. + # Make sure that it converts properly. + mkdir -p ovftool-check + cd ovftool-check + + $out/bin/ovftool ${./installCheckPhase.ova} nixos.ovf + if [ ! -f nixos.ovf ] || [ ! -f nixos.mf ] || [ ! -f nixos-disk1.vmdk ]; then + exit 1 + fi + ''; + meta = with lib; { description = "VMWare tools for working with OVF, OVA, and VMX images"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/tools/virtualization/ovftool/installCheckPhase.ova b/pkgs/tools/virtualization/ovftool/installCheckPhase.ova new file mode 100644 index 0000000000000..3bb164029925f --- /dev/null +++ b/pkgs/tools/virtualization/ovftool/installCheckPhase.ova Binary files differdiff --git a/pkgs/tools/wayland/oguri/default.nix b/pkgs/tools/wayland/oguri/default.nix index c9abe1d016c00..4c13a3879fcfa 100644 --- a/pkgs/tools/wayland/oguri/default.nix +++ b/pkgs/tools/wayland/oguri/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "A very nice animated wallpaper daemon for Wayland compositors"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + inherit (wayland.meta) platforms; + broken = stdenv.isDarwin; # this should be enfoced by wayland platforms in the future }; } diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix index 91742a7c1c288..f285fb12821ec 100644 --- a/pkgs/tools/wayland/shotman/default.nix +++ b/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-QNRQInFZcB1nqzESTAqYWwqJ0oiJa6UMCpjY3aHBiyA="; + hash = "sha256-BWHQtaDnM6lBEMkD8Y7M2NrWD78rY3yL8dzsa6PBiR0="; }; - cargoHash = "sha256-BfH1HhBbgdCA1IqKNdl4/FEzZxHgJmoSKNVMJUrSHCA="; + cargoHash = "sha256-uckdpzCD3ItUVvpF2fHofcZFkQZzt8Xz/VWFiQ9Hkrs="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/tools/wayland/swayimg/default.nix index 24f44fa8d3361..f3ba661e91f56 100644 --- a/pkgs/tools/wayland/swayimg/default.nix +++ b/pkgs/tools/wayland/swayimg/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "swayimg"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "artemsen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-864riSvWhWV4X84UeZ+xfQBOAQmwMrX6s90TXMGeruY="; + sha256 = "sha256-Iq7T00hvr9Mv50V/GKJBddjoeHdFa2DneVaXyxhMCE0="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix new file mode 100644 index 0000000000000..808d5c3c31de4 --- /dev/null +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayrbar"; + version = "0.3.4"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "swayrbar-${version}"; + sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo="; + }; + + cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8="; + + # don't build swayr + buildAndTestSubdir = pname; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Status command for sway's swaybar implementing the swaybar-protocol"; + homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 8d8b744583cfe..60f2b3e837464 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -4,7 +4,7 @@ , pkg-config , wayland , libinput -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland - libyamlcpp + yaml-cpp libinput ]; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 3931fe9c3da04..7943457d38152 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -25,12 +25,12 @@ ocamlPackages.buildDunePackage rec { strictDeps = true; nativeBuildInputs = [ - ocamlPackages.ppx_cstruct pkg-config ]; buildInputs = [ libdrm ] ++ (with ocamlPackages; [ dune-configurator + ppx_cstruct wayland cmdliner logs diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index 4551f3d5f4abc..637876e0a3ddb 100644 --- a/pkgs/tools/wayland/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; + sha256 = "sha256-iJSHCQbom+V0TrtEYrjMrMkdc6PoZrjhtcgebZYjQjI="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/tools/wayland/wlrctl/default.nix index 4de7699b35f87..3915e3a18a0e9 100644 --- a/pkgs/tools/wayland/wlrctl/default.nix +++ b/pkgs/tools/wayland/wlrctl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config scdoc ninja wayland-scanner ]; buildInputs = [ libxkbcommon wayland ]; - NIX_CFLAGS_COMPILE = "-Wno-error=type-limits"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=type-limits"; meta = with lib; { description = "Command line utility for miscellaneous wlroots Wayland extensions"; diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 319a9249f0a4f..42f95735de597 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }: +{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }: stdenv.mkDerivation rec { pname = "ydotool"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; rev = "v${version}"; - sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI="; + hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng="; }; + postPatch = '' + substituteInPlace Daemon/ydotoold.c \ + --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput" + substituteInPlace Daemon/ydotool.service.in \ + --replace "/usr/bin/kill" "${util-linux}/bin/kill" + ''; + strictDeps = true; nativeBuildInputs = [ cmake scdoc ]; - postInstall = '' - substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \ - --replace /usr/bin/kill "${util-linux}/bin/kill" - ''; - meta = with lib; { homepage = "https://github.com/ReimuNotMoe/ydotool"; description = "Generic Linux command-line automation tool"; diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 18c32b9a9d92f..948040deecbd6 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, callPackage, newScope, Agda }: +{ pkgs, lib, newScope, Agda }: let mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); mkAgdaPackages' = Agda: self: let - callPackage = self.callPackage; + inherit (self) callPackage; inherit (callPackage ../build-support/agda { inherit Agda self; inherit (pkgs.haskellPackages) ghcWithPackages; @@ -13,10 +13,7 @@ let lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); - agda = withPackages [] // { - inherit withPackages; - passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self)); - }; + agda = withPackages []; standard-library = callPackage ../development/libraries/agda/standard-library { inherit (pkgs.haskellPackages) ghcWithPackages; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 565ce41c5c682..efcad38414ca5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -124,7 +124,9 @@ mapAliases ({ bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 + bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 + bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 @@ -146,6 +148,7 @@ mapAliases ({ boost160 = throw "boost160 has been deprecated in favor of the latest version"; # Added 2023-01-01 botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15 bpftool = bpftools; # Added 2021-05-03 + bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 @@ -217,6 +220,8 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; + clang14Stdenv = lowPrio llvmPackages_14.stdenv; + clang15Stdenv = lowPrio llvmPackages_15.stdenv; clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 clasp = clingo; # added 2022-12-22 @@ -343,7 +348,6 @@ mapAliases ({ debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 - deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 @@ -361,6 +365,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 + devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 @@ -376,6 +381,7 @@ mapAliases ({ docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05 docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05 + dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 @@ -486,6 +492,7 @@ mapAliases ({ ''; foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22 + foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20 fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl"; # Added 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 @@ -510,6 +517,7 @@ mapAliases ({ giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 + git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { darcsToGit = darcs-to-git; @@ -527,7 +535,7 @@ mapAliases ({ glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 gmailieer = lieer; # Added 2020-04-19 - gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 + gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 @@ -577,6 +585,7 @@ mapAliases ({ go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 + gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 @@ -653,6 +662,7 @@ mapAliases ({ idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 + imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 @@ -685,12 +695,15 @@ mapAliases ({ jack2Full = jack2; # moved from top-level 2021-03-14 jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 jami-client-qt = jami-client; # Added 2022-11-06 + jami-client = jami; # Added 2023-02-10 + jami-daemon = jami.daemon; # Added 2023-02-10 jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 + jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; @@ -717,8 +730,10 @@ mapAliases ({ kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 + keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 + keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 @@ -799,11 +814,13 @@ mapAliases ({ libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 + libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 @@ -826,6 +843,8 @@ mapAliases ({ libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; + libyamlcpp = yaml-cpp; # Added 2023-01-29 + libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 @@ -847,6 +866,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_6_1 = linuxKernel.packages.linux_6_1; + linuxPackages_6_2 = linuxKernel.packages.linux_6_2; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -867,6 +887,7 @@ mapAliases ({ linux_5_4 = linuxKernel.kernels.linux_5_4; linux_6_0 = linuxKernel.kernels.linux_6_0; linux_6_1 = linuxKernel.kernels.linux_6_1; + linux_6_2 = linuxKernel.kernels.linux_6_2; linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 @@ -962,6 +983,7 @@ mapAliases ({ moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead"; module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 + moku = throw "moku: Unusable since 2.6.2, not maintained upstream anymore"; # Added 2022-02-26 mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30 mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30 mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 @@ -979,6 +1001,7 @@ mapAliases ({ mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 + mps-youtube = throw "'mps-youtube' has been removed as it's unmaintained and stopped working. Use 'yewtube', a maintained fork"; # Added 2022-12-29 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 @@ -1047,6 +1070,7 @@ mapAliases ({ nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 + nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 @@ -1088,6 +1112,7 @@ mapAliases ({ opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 openssl_3_0 = openssl_3; # Added 2022-06-27 + openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 orchis = orchis-theme; # Added 2021-06-09 osxfuse = macfuse-stubs; # Added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 @@ -1126,6 +1151,7 @@ mapAliases ({ phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 + phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 @@ -1202,6 +1228,7 @@ mapAliases ({ pleroma-otp = pleroma; # Added 2021-07-10 plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure + pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 @@ -1260,6 +1287,8 @@ mapAliases ({ pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 + pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 + pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; @@ -1277,6 +1306,7 @@ mapAliases ({ pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-01 python = python2; # Added 2022-01-11 + python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 python-swiftclient = swiftclient; # Added 2021-09-09 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead"; # Added 2021-03-08 pythonFull = python2Full; # Added 2022-01-11 @@ -1355,6 +1385,7 @@ mapAliases ({ # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, # due to it being inside the linuxPackagesFor function. rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### @@ -1435,6 +1466,7 @@ mapAliases ({ speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 + spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 @@ -1460,6 +1492,7 @@ mapAliases ({ subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 + sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14 @@ -1538,6 +1571,7 @@ mapAliases ({ truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 + tvbrowser-bin = throw "tvbrowser-bin was removed because it is now built from sources; use 'tvbrowser' instead"; # Added 2023-02-04 twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11 @@ -1670,6 +1704,7 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 + yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; @@ -1684,6 +1719,7 @@ mapAliases ({ zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28 zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10. + zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff8c19b68e348..5330ec62b31f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -112,6 +112,12 @@ with pkgs; tests = callPackages ../test {}; + defaultPkgConfigPackages = + # We don't want nix-env -q to enter this, because all of these are aliases. + dontRecurseIntoAttrs ( + import ./pkg-config/defaultPkgConfigPackages.nix pkgs + ); + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; @@ -154,14 +160,15 @@ with pkgs; ### BUILD SUPPORT auditBlasHook = makeSetupHook - { name = "auto-blas-hook"; deps = [ blas lapack ]; } + { name = "auto-blas-hook"; propagatedBuildInputs = [ blas lapack ]; } ../build-support/setup-hooks/audit-blas.sh; autoreconfHook = callPackage ( { makeSetupHook, autoconf, automake, gettext, libtool }: - makeSetupHook - { deps = [ autoconf automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh + makeSetupHook { + name = "autoreconf-hook"; + propagatedBuildInputs = [ autoconf automake gettext libtool ]; + } ../build-support/setup-hooks/autoreconf.sh ) { }; autoreconfHook264 = autoreconfHook.override { @@ -177,7 +184,7 @@ with pkgs; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; - deps = [ bintools ]; + propagatedBuildInputs = [ bintools ]; substitutions = { pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; @@ -203,8 +210,9 @@ with pkgs; substitutions = { canonicalize_jar = canonicalize-jar; }; } ../build-support/setup-hooks/canonicalize-jars.sh; - ensureNewerSourcesHook = { year }: makeSetupHook {} - (writeScript "ensure-newer-sources-hook.sh" '' + ensureNewerSourcesHook = { year }: makeSetupHook { + name = "ensure-newer-sources-hook"; + } (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) _ensureNewerSources() { '${findutils}/bin/find' "$sourceRoot" \ @@ -218,6 +226,8 @@ with pkgs; quickemu = callPackage ../development/quickemu { }; + quickgui = callPackage ../applications/virtualization/quickgui { }; + adcli = callPackage ../os-specific/linux/adcli { }; aether = callPackage ../applications/networking/aether { }; @@ -228,6 +238,8 @@ with pkgs; althttpd = callPackage ../servers/althttpd { }; + amqpcat = callPackage ../development/tools/amqpcat { }; + anders = callPackage ../applications/science/logic/anders { }; ankisyncd = callPackage ../servers/ankisyncd { @@ -276,6 +288,8 @@ with pkgs; activate-linux = callPackage ../applications/misc/activate-linux { }; + ansi = callPackage ../development/tools/ansi { }; + arti = callPackage ../tools/security/arti { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -304,6 +318,8 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity {}; + bibtex-tidy = nodePackages.bibtex-tidy; + binbloom = callPackage ../tools/security/binbloom {}; bingo = callPackage ../development/tools/bingo {}; @@ -337,13 +353,14 @@ with pkgs; # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; - updateAutotoolsGnuConfigScriptsHook = makeSetupHook - { substitutions = { gnu_config = gnu-config;}; } - ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; + updateAutotoolsGnuConfigScriptsHook = makeSetupHook { + name = "update-autotools-gnu-config-scripts-hook"; + substitutions = { gnu_config = gnu-config; }; + } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; gogUnpackHook = makeSetupHook { name = "gog-unpack-hook"; - deps = [ innoextract file-rename ]; } + propagatedBuildInputs = [ innoextract file-rename ]; } ../build-support/setup-hooks/gog-unpack.sh; buildEnv = callPackage ../build-support/buildenv { }; # not actually a package @@ -355,6 +372,8 @@ with pkgs; buildMaven = callPackage ../build-support/build-maven.nix {}; + c64-debugger = callPackage ../applications/emulators/c64-debugger { }; + caroline = callPackage ../development/libraries/caroline { }; castget = callPackage ../applications/networking/feedreaders/castget { }; @@ -367,8 +386,14 @@ with pkgs; catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; + catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { }; + + catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { }; + btdu = callPackage ../tools/misc/btdu { }; + ccal = callPackage ../tools/misc/ccal { }; + cereal = callPackage ../development/libraries/cereal { }; certgraph = callPackage ../tools/security/certgraph { }; @@ -379,6 +404,8 @@ with pkgs; chrysalis = callPackage ../applications/misc/chrysalis { }; + circt = callPackage ../development/compilers/circt { }; + classicube = callPackage ../games/classicube { }; clj-kondo = callPackage ../development/tools/clj-kondo { }; @@ -485,7 +512,9 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; - enumer = callPackage ../tools/misc/enumer { }; + enumer = callPackage ../tools/misc/enumer { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; evans = callPackage ../development/tools/evans { }; @@ -497,6 +526,8 @@ with pkgs; frece = callPackage ../development/tools/frece { }; + frink = callPackage ../development/tools/frink { }; + frugal = callPackage ../development/tools/frugal { }; glade = callPackage ../development/tools/glade { }; @@ -531,6 +562,10 @@ with pkgs; mix2nix = callPackage ../development/tools/mix2nix { }; + n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; + + n98-magerun2 = callPackage ../development/tools/misc/n98-magerun2 { }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -589,6 +624,8 @@ with pkgs; erosmb = callPackage ../tools/security/erosmb { }; + octosuite = callPackage ../tools/security/octosuite { }; + octosql = callPackage ../tools/misc/octosql { }; onesixtyone = callPackage ../tools/security/onesixtyone {}; @@ -611,7 +648,9 @@ with pkgs; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; - dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; + dieHook = makeSetupHook { + name = "die-hook"; + } ../build-support/setup-hooks/die.sh; archiver = callPackage ../applications/misc/archiver { }; @@ -658,14 +697,17 @@ with pkgs; dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; + dotnet-sdk_8 = dotnetCorePackages.sdk_8_0; dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; + dotnet-runtime_8 = dotnetCorePackages.runtime_8_0; dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; + dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; @@ -702,6 +744,8 @@ with pkgs; ebook2cw = callPackage ../applications/radio/ebook2cw { }; + qdmr = libsForQt5.callPackage ../applications/radio/qdmr { }; + edwin = callPackage ../data/fonts/edwin { }; etBook = callPackage ../data/fonts/et-book { }; @@ -755,6 +799,8 @@ with pkgs; flare-floss = callPackage ../tools/security/flare-floss { }; + flare-signal = callPackage ../applications/networking/instant-messengers/flare-signal { }; + prefer-remote-fetch = import ../build-support/prefer-remote-fetch; global-platform-pro = callPackage ../development/tools/global-platform-pro { }; @@ -960,11 +1006,15 @@ with pkgs; madonctl = callPackage ../applications/misc/madonctl { }; - copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + copyDesktopItems = makeSetupHook { + name = "copy-desktop-items-hook"; + } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; - copyPkgconfigItems = makeSetupHook { } ../build-support/setup-hooks/copy-pkgconfig-items.sh; + copyPkgconfigItems = makeSetupHook { + name = "copy-pkg-config-items-hook"; + } ../build-support/setup-hooks/copy-pkgconfig-items.sh; makePkgconfigItem = callPackage ../build-support/make-pkgconfigitem { }; @@ -981,17 +1031,17 @@ with pkgs; makeWrapper = makeShellWrapper; - makeShellWrapper = makeSetupHook - { deps = [ dieHook ]; - substitutions = { - # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) - shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; - }; - passthru = { - tests = tests.makeWrapper; - }; - } - ../build-support/setup-hooks/make-wrapper.sh; + makeShellWrapper = makeSetupHook { + name = "make-shell-wrapper-hook"; + propagatedBuildInputs = [ dieHook ]; + substitutions = { + # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) + shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; + }; + passthru = { + tests = tests.makeWrapper; + }; + } ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; @@ -1002,6 +1052,8 @@ with pkgs; inherit kernel firmware rootModules allowMissing; }; + mkBinaryCache = callPackage ../build-support/binary-cache { }; + mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; @@ -1032,9 +1084,10 @@ with pkgs; setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; - shortenPerlShebang = makeSetupHook - { deps = [ dieHook ]; } - ../build-support/setup-hooks/shorten-perl-shebang.sh; + shortenPerlShebang = makeSetupHook { + name = "shorten-perl-shebang-hook"; + propagatedBuildInputs = [ dieHook ]; + } ../build-support/setup-hooks/shorten-perl-shebang.sh; singularity-tools = callPackage ../build-support/singularity-tools { }; @@ -1071,7 +1124,9 @@ with pkgs; inherit (lib.systems) platforms; - setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; + setJavaClassPath = makeSetupHook { + name = "set-java-classpath-hook"; + } ../build-support/setup-hooks/set-java-classpath.sh; fixDarwinDylibNames = makeSetupHook { name = "fix-darwin-dylib-names-hook"; @@ -1082,23 +1137,31 @@ with pkgs; writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; desktopToDarwinBundle = makeSetupHook { - deps = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; + name = "desktop-to-darwin-bundle-hook"; + propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; - keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; + keepBuildTree = makeSetupHook { + name = "keep-build-tree-hook"; + } ../build-support/setup-hooks/keep-build-tree.sh; - enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + enableGCOVInstrumentation = makeSetupHook { + name = "enable-gcov-instrumentation-hook"; + } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; - makeGCOVReport = makeSetupHook - { deps = [ lcov enableGCOVInstrumentation ]; } - ../build-support/setup-hooks/make-coverage-analysis-report.sh; + makeGCOVReport = makeSetupHook { + name = "make-gcov-report-hook"; + propagatedBuildInputs = [ lcov enableGCOVInstrumentation ]; + } ../build-support/setup-hooks/make-coverage-analysis-report.sh; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; - findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; + findXMLCatalogs = makeSetupHook { + name = "find-xml-catalogs-hook"; + } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { makeWrapper = makeBinaryWrapper; @@ -1108,16 +1171,22 @@ with pkgs; wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; - separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + separateDebugInfo = makeSetupHook { + name = "separate-debug-info-hook"; + } ../build-support/setup-hooks/separate-debug-info.sh; - setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; + setupDebugInfoDirs = makeSetupHook { + name = "setup-debug-info-dirs-hook"; + } ../build-support/setup-hooks/setup-debug-info-dirs.sh; - useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; + useOldCXXAbi = makeSetupHook { + name = "use-old-cxx-abi-hook"; + } ../build-support/setup-hooks/use-old-cxx-abi.sh; iconConvTools = callPackage ../build-support/icon-conv-tools {}; validatePkgConfig = makeSetupHook - { name = "validate-pkg-config"; deps = [ findutils pkg-config ]; } + { name = "validate-pkg-config"; propagatedBuildInputs = [ findutils pkg-config ]; } ../build-support/setup-hooks/validate-pkg-config.sh; patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files {}; @@ -1202,14 +1271,13 @@ with pkgs; arc_unpacker = callPackage ../tools/archivers/arc_unpacker { boost = boost16x; # checkPhase fails with Boost 1.77 - stdenv = gcc10StdenvCompat; }; adminer = callPackage ../servers/adminer { }; akkoma = callPackage ../servers/akkoma { }; akkoma-frontends = recurseIntoAttrs { - pleroma-fe = callPackage ../servers/akkoma/pleroma-fe { }; + akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { }; }; akkoma-emoji = recurseIntoAttrs { @@ -1325,12 +1393,22 @@ with pkgs; albert = libsForQt5.callPackage ../applications/misc/albert {}; + alice-tools = callPackage ../tools/games/alice-tools { + withGUI = false; + }; + + alice-tools-qt5 = libsForQt5.callPackage ../tools/games/alice-tools { }; + + alice-tools-qt6 = qt6Packages.callPackage ../tools/games/alice-tools { }; + allure = callPackage ../development/tools/allure {}; aquosctl = callPackage ../tools/misc/aquosctl { }; arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {}; + argocd-vault-plugin = callPackage ../tools/security/argocd-vault-plugin {}; + arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { }; audible-cli = callPackage ../tools/misc/audible-cli { }; @@ -1371,6 +1449,8 @@ with pkgs; dwarfs = callPackage ../tools/filesystems/dwarfs { }; + copier = callPackage ../tools/misc/copier { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -1393,6 +1473,8 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + gh-actions-cache = callPackage ../tools/misc/gh-actions-cache { }; + gh-cal = callPackage ../tools/misc/gh-cal { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1427,7 +1509,7 @@ with pkgs; headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { }; - httm = callPackage ../tools/filesystems/httm { }; + httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; @@ -1437,6 +1519,8 @@ with pkgs; kanata-with-cmd = kanata.override { withCmd = true; }; + kaufkauflist = callPackage ../applications/misc/kaufkauflist { }; + ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; @@ -1459,14 +1543,20 @@ with pkgs; mnc = callPackage ../tools/misc/mnc { }; - mgmt = callPackage ../applications/system/mgmt {}; + mgmt = callPackage ../applications/system/mgmt { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; mprocs = callPackage ../tools/misc/mprocs { }; + mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; + nominatim = callPackage ../servers/nominatim { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; + paperview = callPackage ../tools/X11/paperview { }; + pferd = callPackage ../tools/misc/pferd {}; proycon-wayout = callPackage ../tools/wayland/proycon-wayout {}; @@ -1479,6 +1569,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { }; + scarab = callPackage ../tools/games/scarab { }; sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; @@ -1487,6 +1579,8 @@ with pkgs; sgrep = callPackage ../tools/text/sgrep { }; + shell-genie = callPackage ../applications/misc/shell-genie { }; + simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { }; sorted-grep = callPackage ../tools/text/sorted-grep { }; @@ -1495,6 +1589,8 @@ with pkgs; spectre-cli = callPackage ../tools/security/spectre-cli { }; + speedtest-rs = callPackage ../tools/networking/speedtest-rs { }; + steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch {}; supermin = callPackage ../tools/virtualization/supermin { }; @@ -1575,8 +1671,6 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; - zq = callPackage ../development/tools/zq { }; - ### APPLICATIONS/VERSION-MANAGEMENT deepgit = callPackage ../applications/version-management/deepgit {}; @@ -1835,11 +1929,6 @@ with pkgs; git-subrepo = callPackage ../applications/version-management/git-subrepo { }; - git-subset = callPackage ../applications/version-management/git-subset { - openssl = openssl_1_1; - inherit (darwin.apple_sdk.frameworks) Security; - }; - git-subtrac = callPackage ../applications/version-management/git-subtrac { }; git-sync = callPackage ../applications/version-management/git-sync { }; @@ -1851,7 +1940,7 @@ with pkgs; git-town = callPackage ../applications/version-management/git-town { }; git-trim = callPackage ../applications/version-management/git-trim { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation; }; git-up = callPackage ../applications/version-management/git-up { @@ -1986,7 +2075,12 @@ with pkgs; wxGTK = wxGTK32; }; - box64 = callPackage ../applications/emulators/box64 { }; + box64 = callPackage ../applications/emulators/box64 { + hello-x86_64 = if stdenv.hostPlatform.isx86_64 then + hello + else + pkgsCross.gnu64.hello; + }; caprice32 = callPackage ../applications/emulators/caprice32 { }; @@ -2134,7 +2228,7 @@ with pkgs; }; ppsspp-qt = ppsspp.override { - inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; + enableQt = true; enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 }; @@ -2142,6 +2236,8 @@ with pkgs; punes = libsForQt5.callPackage ../applications/emulators/punes { }; + punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; resim = callPackage ../applications/emulators/resim {}; @@ -2150,6 +2246,8 @@ with pkgs; ripes = libsForQt5.callPackage ../applications/emulators/ripes { }; + rpcemu = callPackage ../applications/emulators/rpcemu { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; ruffle = callPackage ../applications/emulators/ruffle { }; @@ -2192,6 +2290,8 @@ with pkgs; xcpc = callPackage ../applications/emulators/xcpc { }; + xemu = callPackage ../applications/emulators/xemu { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; zesarux = callPackage ../applications/emulators/zesarux { }; @@ -2209,15 +2309,13 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - - dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { + dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; stdenv = if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv # https://github.com/NixOS/nixpkgs/issues/201254 - else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv + else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; @@ -2308,6 +2406,8 @@ with pkgs; lf = callPackage ../applications/file-managers/lf { }; + ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { }; + llama = callPackage ../applications/file-managers/llama { }; mc = callPackage ../applications/file-managers/mc { @@ -2386,6 +2486,7 @@ with pkgs; kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { + go = go_1_20; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) @@ -2430,6 +2531,8 @@ with pkgs; sakura = callPackage ../applications/terminal-emulators/sakura { }; + scriv = callPackage ../applications/version-management/scriv { }; + st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; @@ -2477,15 +2580,13 @@ with pkgs; writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { stdenv = gcc10StdenvCompat; }; + iqueue = callPackage ../development/libraries/iqueue { }; lifecycled = callPackage ../tools/misc/lifecycled { }; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { - electron = electron_20; - }; + logseq = callPackage ../applications/misc/logseq { }; natls = callPackage ../tools/misc/natls { }; @@ -2788,6 +2889,8 @@ with pkgs; boxes = callPackage ../tools/text/boxes { }; + boxxy = callPackage ../tools/misc/boxxy { }; + boundary = callPackage ../tools/networking/boundary { }; chamber = callPackage ../tools/admin/chamber { }; @@ -2869,7 +2972,9 @@ with pkgs; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { + openjdk11 = openjdk11.override { enableJavaFX = true; }; + }; bic = callPackage ../development/interpreters/bic { }; @@ -2905,7 +3010,9 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { }; + boulder = callPackage ../tools/admin/boulder { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; @@ -2967,6 +3074,8 @@ with pkgs; go-cve-search = callPackage ../tools/security/go-cve-search { }; + go-dork = callPackage ../tools/security/go-dork { }; + chkcrontab = callPackage ../tools/admin/chkcrontab { }; claws = callPackage ../tools/misc/claws { }; @@ -3017,6 +3126,8 @@ with pkgs; cuelsp = callPackage ../development/tools/cuelsp {}; + cyclonedds = callPackage ../development/libraries/cyclonedds { }; + cyclone-scheme = callPackage ../development/interpreters/cyclone { }; cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { }; @@ -3166,7 +3277,7 @@ with pkgs; glances = python3Packages.callPackage ../applications/system/glances { }; - glasgow = with python3Packages; toPythonApplication glasgow; + glasgow = callPackage ../tools/misc/glasgow { }; glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { }; @@ -3277,8 +3388,12 @@ with pkgs; itch = callPackage ../games/itch {}; + itchiodl = callPackage ../games/itchiodl { }; + itd = callPackage ../applications/misc/itd { }; + kord = callPackage ../applications/misc/kord { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; @@ -3317,6 +3432,8 @@ with pkgs; passExtensions = recurseIntoAttrs pass.extensions; + pbpctrl = callPackage ../applications/audio/pbpctrl { }; + pdepend = callPackage ../development/php-packages/pdepend { }; platformsh = callPackage ../misc/platformsh { }; @@ -3345,7 +3462,9 @@ with pkgs; gospider = callPackage ../tools/security/gospider { }; - browserpass = callPackage ../tools/security/browserpass { }; + browserpass = callPackage ../tools/security/browserpass { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; passff-host = callPackage ../tools/security/passff-host { }; @@ -3353,6 +3472,8 @@ with pkgs; goku = callPackage ../os-specific/darwin/goku { }; + grandperspective = callPackage ../os-specific/darwin/grandperspective { }; + grb = callPackage ../applications/misc/grb { }; kerf = kerf_1; /* kerf2 is WIP */ @@ -3409,6 +3530,8 @@ with pkgs; waypoint = callPackage ../applications/networking/cluster/waypoint { }; + xc = callPackage ../development/tools/xc { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; gomobile = callPackage ../development/mobile/gomobile { }; @@ -3580,6 +3703,8 @@ with pkgs; bc = callPackage ../tools/misc/bc { }; + gavin-bc = callPackage ../tools/misc/gavin-bc { }; + bdf2psf = callPackage ../tools/misc/bdf2psf { }; bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; @@ -3727,8 +3852,6 @@ with pkgs; bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; - bpytop = callPackage ../tools/system/bpytop { }; - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; @@ -3748,7 +3871,9 @@ with pkgs; brutespray = callPackage ../tools/security/brutespray { }; breakpointHook = assert stdenv.buildPlatform.isLinux; - makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; + makeSetupHook { + name = "breakpoint-hook"; + } ../build-support/setup-hooks/breakpoint-hook.sh; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -3930,6 +4055,10 @@ with pkgs; clash-geoip = callPackage ../data/misc/clash-geoip { }; + clash-meta = callPackage ../tools/networking/clash-meta { }; + + clash-verge = callPackage ../applications/networking/clash-verge { }; + clevercsv = with python3Packages; toPythonApplication clevercsv; clevis = callPackage ../tools/security/clevis { @@ -3952,7 +4081,9 @@ with pkgs; cloudbrute = callPackage ../tools/security/cloudbrute { }; - cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudflared = callPackage ../applications/networking/cloudflared { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; @@ -4040,6 +4171,8 @@ with pkgs; swayr = callPackage ../tools/wayland/swayr { }; + swayrbar = callPackage ../tools/wayland/swayrbar { }; + swaysome = callPackage ../tools/wayland/swaysome { }; swayimg = callPackage ../tools/wayland/swayimg { }; @@ -4175,6 +4308,8 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; + csvq = callPackage ../development/tools/csvq { }; + csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cucumber = callPackage ../development/tools/cucumber {}; @@ -4325,7 +4460,7 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; dino = callPackage ../applications/networking/instant-messengers/dino { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; @@ -4429,7 +4564,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_20; + electron = electron_22; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -4454,6 +4589,8 @@ with pkgs; enca = callPackage ../tools/text/enca { }; + engage = callPackage ../tools/misc/engage { }; + ent = callPackage ../tools/misc/ent { }; entwine = callPackage ../applications/graphics/entwine { }; @@ -4466,6 +4603,8 @@ with pkgs; er-patcher = callPackage ../tools/games/er-patcher { }; + erdtree = callPackage ../tools/system/erdtree { }; + errcheck = callPackage ../development/tools/errcheck { }; eschalot = callPackage ../tools/security/eschalot { }; @@ -4573,6 +4712,8 @@ with pkgs; ### TOOLS/TYPESETTING/TEX + advi = callPackage ../tools/typesetting/tex/advi { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; blahtexml = callPackage ../tools/typesetting/tex/blahtexml { }; @@ -4697,7 +4838,8 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; - ghidra = callPackage ../tools/security/ghidra/build.nix { }; + ghidra = if stdenv.isDarwin then darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {} + else callPackage ../tools/security/ghidra/build.nix {}; ghidra-bin = callPackage ../tools/security/ghidra { }; @@ -4733,12 +4875,6 @@ with pkgs; gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; - # NOTE: If overriding qt version, krita needs to use the same qt version as - # well. - gmic-qt-krita = gmic-qt.override { - variant = "krita"; - }; - gpg-tui = callPackage ../tools/security/gpg-tui { inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin) libobjc libresolv; @@ -4784,7 +4920,9 @@ with pkgs; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; - gsctl = callPackage ../applications/misc/gsctl { }; + gsctl = callPackage ../applications/misc/gsctl { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gsocket = callPackage ../tools/networking/gsocket { }; @@ -4841,11 +4979,11 @@ with pkgs; }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; hysteria = callPackage ../tools/networking/hysteria { }; @@ -4874,6 +5012,8 @@ with pkgs; invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; + iotas = callPackage ../applications/office/iotas { }; + iotools = callPackage ../tools/misc/iotools { }; irpf = callPackage ../applications/finance/irpf { }; @@ -5037,8 +5177,9 @@ with pkgs; mapcidr = callPackage ../tools/misc/mapcidr { }; - maple-mono = (callPackage ../data/fonts/maple-font { }).Mono-v5; - maple-mono-NF = (callPackage ../data/fonts/maple-font { }).Mono-NF-v5; + maple-mono = (callPackage ../data/fonts/maple-font { }).Mono; + maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF; + maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF; marl = callPackage ../development/libraries/marl {}; @@ -5064,7 +5205,9 @@ with pkgs; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - meson = callPackage ../development/tools/build-managers/meson { }; + meson = callPackage ../development/tools/build-managers/meson { + inherit (darwin.apple_sdk.frameworks) Foundation OpenGL AppKit Cocoa; + }; # while building documentation meson may want to run binaries for host # which needs an emulator @@ -5274,7 +5417,9 @@ with pkgs; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; - pcp = callPackage ../tools/misc/pcp { }; + pcp = callPackage ../tools/misc/pcp { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; persepolis = python3Packages.callPackage ../tools/networking/persepolis { wrapQtAppsHook = qt5.wrapQtAppsHook; @@ -5294,11 +5439,15 @@ with pkgs; pika = callPackage ../applications/graphics/pika { }; + pkg = callPackage ../tools/package-management/pkg { }; + playerctl = callPackage ../tools/audio/playerctl { }; pn = callPackage ../tools/text/pn { }; - pocket-casts = callPackage ../applications/audio/pocket-casts { }; + pocket-casts = callPackage ../applications/audio/pocket-casts { + electron = electron_22; + }; pouf = callPackage ../tools/misc/pouf { }; @@ -5316,8 +5465,9 @@ with pkgs; proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { }; - pueue = callPackage ../applications/misc/pueue { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue { + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; pixcat = with python3Packages; toPythonApplication pixcat; @@ -5351,7 +5501,9 @@ with pkgs; river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { }; + rivercarro = callPackage ../applications/misc/rivercarro { + zig = zig_0_9; + }; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; @@ -5385,6 +5537,8 @@ with pkgs; shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; + shellclear = callPackage ../tools/security/shellclear { }; + shellnoob = callPackage ../tools/security/shellnoob { }; sheesy-cli = callPackage ../tools/security/sheesy-cli { @@ -5575,6 +5729,8 @@ with pkgs; sqlint = callPackage ../development/tools/sqlint { }; + squawk = callPackage ../development/tools/squawk { }; + antibody = callPackage ../shells/zsh/antibody { }; antigen = callPackage ../shells/zsh/antigen { }; @@ -5721,7 +5877,7 @@ with pkgs; bup = callPackage ../tools/backup/bup { }; - bupstash = callPackage ../tools/backup/bupstash { }; + bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { }; burp = callPackage ../tools/backup/burp { }; @@ -5731,6 +5887,8 @@ with pkgs; byzanz = callPackage ../applications/video/byzanz {}; + algolia-cli = callPackage ../development/tools/algolia-cli { }; + anydesk = callPackage ../applications/networking/remote/anydesk { }; anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; @@ -5875,13 +6033,9 @@ with pkgs; cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_21_09_0 - citrix_workspace_21_12_0 - citrix_workspace_22_05_0 - citrix_workspace_22_07_0 - citrix_workspace_22_12_0 + citrix_workspace_23_02_0 ; - citrix_workspace = citrix_workspace_22_12_0; + citrix_workspace = citrix_workspace_23_02_0; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -5936,9 +6090,7 @@ with pkgs; cpuminer = callPackage ../tools/misc/cpuminer { }; - crabz = callPackage ../tools/compression/crabz { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + crabz = callPackage ../tools/compression/crabz { }; ethash = callPackage ../development/libraries/ethash { }; @@ -5954,7 +6106,9 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - unparam = callPackage ../tools/misc/unparam { }; + unparam = callPackage ../tools/misc/unparam { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; inherit (nodePackages) uppy-companion; @@ -6183,6 +6337,8 @@ with pkgs; codebraid = callPackage ../tools/misc/codebraid { }; + codevis = callPackage ../tools/misc/codevis { }; + compass = callPackage ../development/tools/compass { }; cone = callPackage ../development/compilers/cone { @@ -6428,7 +6584,9 @@ with pkgs; dnspeep = callPackage ../tools/security/dnspeep { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -6587,6 +6745,8 @@ with pkgs; drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; + drone-runner-ssh = callPackage ../development/tools/continuous-integration/drone-runner-ssh { }; + dropbear = callPackage ../tools/networking/dropbear { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; @@ -6671,6 +6831,8 @@ with pkgs; edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; + edlib = callPackage ../development/libraries/science/biology/edlib { }; + eff = callPackage ../development/interpreters/eff { }; eflite = callPackage ../applications/audio/eflite {}; @@ -6708,7 +6870,7 @@ with pkgs; mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { }; mozwire = callPackage ../tools/networking/mozwire { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; pax = callPackage ../tools/archivers/pax { @@ -6743,7 +6905,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_20; + electron = electron_22; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh @@ -6927,6 +7089,8 @@ with pkgs; emborg = python3Packages.callPackage ../development/python-modules/emborg { }; + emblem = callPackage ../applications/graphics/emblem { }; + emem = callPackage ../applications/misc/emem { }; empty = callPackage ../tools/misc/empty { }; @@ -6943,11 +7107,15 @@ with pkgs; boost = boost172; }; + enc = callPackage ../tools/security/enc { }; + endlessh = callPackage ../servers/endlessh { }; endlessh-go = callPackage ../servers/endlessh-go { }; - eris-go = callPackage ../servers/eris-go { }; + eris-go = callPackage ../servers/eris-go { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; @@ -7195,7 +7363,9 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - findup = callPackage ../tools/misc/findup { }; + findup = callPackage ../tools/misc/findup { + zig = zig_0_9; + }; bsd-finger = callPackage ../tools/networking/bsd-finger { }; bsd-fingerd = bsd-finger.override({ buildClient = false; }); @@ -7474,8 +7644,12 @@ with pkgs; gtk = gtk2-x11; }; + gcfflasher = callPackage ../applications/misc/gcfflasher { }; + gdmap = callPackage ../tools/system/gdmap { }; + gdtoolkit = callPackage ../development/tools/gdtoolkit { }; + gef = callPackage ../development/tools/misc/gef { }; gelasio = callPackage ../data/fonts/gelasio { }; @@ -7538,11 +7712,8 @@ with pkgs; gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { - openssl = openssl_1_1; - }; + gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-ee = callPackage ../applications/version-management/gitlab { - openssl = openssl_1_1; gitlabEnterprise = true; }; @@ -7633,6 +7804,8 @@ with pkgs; gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnu-cim = callPackage ../development/compilers/gnu-cim { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; gnuclad = callPackage ../applications/graphics/gnuclad { }; @@ -7650,11 +7823,11 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 - gnupg23 = callPackage ../tools/security/gnupg/23.nix { + gnupg24 = callPackage ../tools/security/gnupg/24.nix { guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; - gnupg = gnupg23; + gnupg = gnupg24; gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; @@ -7740,7 +7913,9 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; - gost = callPackage ../tools/networking/gost { }; + gost = callPackage ../tools/networking/gost { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gource = callPackage ../applications/version-management/gource { }; @@ -7757,6 +7932,10 @@ with pkgs; gpt2tc = callPackage ../tools/text/gpt2tc { }; + gptcommit = callPackage ../development/tools/gptcommit { + inherit (darwin.apple_sdk.frameworks) Security; + }; + gptman = callPackage ../tools/system/gptman { }; ldmtool = callPackage ../tools/misc/ldmtool { }; @@ -7808,6 +7987,8 @@ with pkgs; gyb = callPackage ../tools/backup/gyb { }; + harminv = callPackage ../development/libraries/science/chemistry/harminv { }; + igrep = callPackage ../tools/text/igrep { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7839,6 +8020,8 @@ with pkgs; grpcurl = callPackage ../tools/networking/grpcurl { }; + grpc_cli = callPackage ../tools/networking/grpc_cli { }; + grpc-gateway = callPackage ../development/tools/grpc-gateway { }; grpcui = callPackage ../tools/networking/grpcui { }; @@ -8034,9 +8217,7 @@ with pkgs; hashrat = callPackage ../tools/security/hashrat { }; - hash_extender = callPackage ../tools/security/hash_extender { - openssl = openssl_1_1; - }; + hash_extender = callPackage ../tools/security/hash_extender { }; hash-identifier = callPackage ../tools/security/hash-identifier { }; @@ -8384,7 +8565,9 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; @@ -8496,15 +8679,13 @@ with pkgs; jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - jira-cli = callPackage ../development/tools/jira_cli { }; - jira-cli-go = callPackage ../development/tools/jira-cli-go { }; jirafeau = callPackage ../servers/web-apps/jirafeau { }; jitterentropy = callPackage ../development/libraries/jitterentropy { }; - jl = haskellPackages.callPackage ../development/tools/jl { }; + jl = haskellPackages.jl; jless = callPackage ../development/tools/jless { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -8618,7 +8799,8 @@ with pkgs; kakoune-unwrapped = callPackage ../applications/editors/kakoune { # See comments on https://github.com/NixOS/nixpkgs/pull/198836 # Remove below when stdenv for linux-aarch64 become recent enough. - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; kakoune = wrapKakoune kakoune-unwrapped { plugins = [ ]; # override with the list of desired plugins @@ -8633,6 +8815,8 @@ with pkgs; kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; }; + kaniko = callPackage ../applications/networking/cluster/kaniko { }; + katana = callPackage ../tools/security/katana { }; katriawm = callPackage ../applications/window-managers/katriawm { }; @@ -8640,7 +8824,7 @@ with pkgs; kbdd = callPackage ../applications/window-managers/kbdd { }; kbs2 = callPackage ../tools/security/kbs2 { - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit SystemConfiguration; }; kdash = callPackage ../development/tools/kdash { @@ -8699,6 +8883,8 @@ with pkgs; kibi = callPackage ../applications/editors/kibi { }; + kio-admin = libsForQt5.callPackage ../tools/filesystems/kio-admin { }; + kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -8729,6 +8915,8 @@ with pkgs; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; + krunner-translator = libsForQt5.callPackage ../tools/misc/krunner-translator { }; + krunvm = callPackage ../applications/virtualization/krunvm { inherit (darwin) sigtool; }; @@ -8739,13 +8927,19 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { }; + kube-router = callPackage ../applications/networking/cluster/kube-router { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; kubepug = callPackage ../development/tools/kubepug { }; + kubeshark = callPackage ../applications/networking/cluster/kubeshark { }; + kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; - kubo = callPackage ../applications/networking/kubo { }; + kubo = callPackage ../applications/networking/kubo { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; @@ -8936,6 +9130,8 @@ with pkgs; matrix-corporal = callPackage ../servers/matrix-corporal { }; + matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot {}; + mautrix-facebook = callPackage ../servers/mautrix-facebook { }; mautrix-googlechat = callPackage ../servers/mautrix-googlechat { }; @@ -8956,8 +9152,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { }; + + mdbook-epub = callPackage ../tools/text/mdbook-epub { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; + mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { }; + mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8966,6 +9170,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-kroki-preprocessor = callPackage ../tools/text/mdbook-kroki-preprocessor { }; + mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9061,6 +9267,8 @@ with pkgs; natscli = callPackage ../tools/system/natscli { }; + nsc = callPackage ../tools/system/nsc { }; + nbench = callPackage ../tools/misc/nbench { }; nbtscanner = callPackage ../tools/security/nbtscanner { @@ -9113,9 +9321,6 @@ with pkgs; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { - openssl = openssl_1_1; - }; nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; @@ -9146,6 +9351,10 @@ with pkgs; ox = callPackage ../applications/editors/ox { }; + oxigraph = callPackage ../servers/oxigraph { + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; @@ -9403,6 +9612,8 @@ with pkgs; linuxquota = callPackage ../tools/misc/linuxquota { }; + lipl = callPackage ../tools/misc/lipl { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; lmp = callPackage ../tools/security/lmp { }; @@ -9495,7 +9706,7 @@ with pkgs; lzop = callPackage ../tools/compression/lzop { }; - lzwolf = callPackage ../games/lzwolf { }; + lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; }; macchanger = callPackage ../os-specific/linux/macchanger { }; @@ -9627,6 +9838,8 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; + mfoc-hardnested = callPackage ../tools/security/mfoc-hardnested { }; + microbin = callPackage ../servers/microbin { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -9667,7 +9880,13 @@ with pkgs; pythonPackages = python3Packages; }; - mirakurun = callPackage ../applications/video/mirakurun { }; + mirakurun = callPackage ../applications/video/mirakurun { + yarn = yarn.override { nodejs = nodejs-16_x; }; + inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { + nodejs = nodejs-16_x; + yarn = yarn.override { nodejs = nodejs-16_x; }; + }) mkYarnPackage; + }; miredo = callPackage ../tools/networking/miredo { }; @@ -9732,7 +9951,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_15; + electron = electron_22; }; mosh = callPackage ../tools/networking/mosh { }; @@ -9783,6 +10002,10 @@ with pkgs; mubeng = callPackage ../tools/networking/mubeng { }; + muffet = callPackage ../tools/networking/muffet { }; + + multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; + multitime = callPackage ../tools/misc/multitime { }; sta = callPackage ../tools/misc/sta {}; @@ -9967,10 +10190,14 @@ with pkgs; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; + nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { }; + ndstool = callPackage ../tools/archivers/ndstool { }; nfs-ganesha = callPackage ../servers/nfs-ganesha { }; + nflz = callPackage ../misc/nflz { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = callPackage ../tools/networking/ngrok { }; @@ -10206,9 +10433,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - oha = callPackage ../tools/networking/oha { - inherit (darwin.apple_sdk.frameworks) Security; - }; + oha = callPackage ../tools/networking/oha { }; onetun = callPackage ../tools/networking/onetun { inherit (darwin.apple_sdk.frameworks) Security; @@ -10220,7 +10445,11 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { + # Build currently fails on Go > 1.18 + # See https://github.com/evilsocket/opensnitch/issues/851 + buildGoModule = buildGo118Module; + }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; @@ -10256,6 +10485,8 @@ with pkgs; ombi = callPackage ../servers/ombi { }; + ome_zarr = with python3Packages; toPythonApplication ome-zarr; + omping = callPackage ../applications/networking/omping { }; onefetch = callPackage ../tools/misc/onefetch { @@ -10271,7 +10502,9 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; + ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -10318,7 +10551,9 @@ with pkgs; inherit (llvmPackages) openmp; }; - openmvs = callPackage ../applications/science/misc/openmvs { }; + openmvs = callPackage ../applications/science/misc/openmvs { + inherit (llvmPackages) openmp; + }; openntpd = callPackage ../tools/networking/openntpd { }; @@ -10333,6 +10568,15 @@ with pkgs; openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; + openrgb-with-all-plugins = openrgb.withPlugins [ + openrgb-plugin-effects + openrgb-plugin-hardwaresync + ]; + + openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { }; + + openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { }; + openrussian-cli = callPackage ../misc/openrussian-cli { lua = lua5_3; }; @@ -10380,7 +10624,6 @@ with pkgs; opentsdb = callPackage ../tools/misc/opentsdb {}; inherit (callPackages ../tools/networking/openvpn {}) - openvpn_24 openvpn; openvpn3 = callPackage ../tools/networking/openvpn3 { }; @@ -10467,9 +10710,7 @@ with pkgs; otpw = callPackage ../os-specific/linux/otpw { }; - ovftool = callPackage ../tools/virtualization/ovftool { - libressl = libressl_3_4; - }; + ovftool = callPackage ../tools/virtualization/ovftool { }; overcommit = callPackage ../development/tools/overcommit { }; @@ -10517,6 +10758,8 @@ with pkgs; PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + paging-calculator = callPackage ../development/tools/paging-calculator { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; @@ -10674,8 +10917,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - jbig2enc = callPackage ../tools/graphics/jbig2enc { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; briss = callPackage ../tools/graphics/briss { }; @@ -10700,6 +10941,8 @@ with pkgs; pg_top = callPackage ../tools/misc/pg_top { }; + pgagroal = callPackage ../development/tools/database/pgagroal { }; + pgcenter = callPackage ../tools/misc/pgcenter { }; pgmetrics = callPackage ../tools/misc/pgmetrics { }; @@ -10721,8 +10964,6 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -10870,8 +11111,7 @@ with pkgs; pocketbase = callPackage ../servers/pocketbase { }; - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; - podman-unwrapped = callPackage ../applications/virtualization/podman { }; + podman = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -10909,6 +11149,8 @@ with pkgs; libjpeg8 = libjpeg.override { enableJpeg8 = true; }; }; + posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor {}; + postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; povray = callPackage ../tools/graphics/povray { @@ -11084,10 +11326,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + rnm = callPackage ../tools/filesystems/rnm { }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { - pcl = pcl.override { vtk = vtkWithQt5; }; + pcl = pcl.override { vtk_8 = vtk_8_withQt5; }; }; rtaudio = callPackage ../development/libraries/audio/rtaudio { @@ -11118,7 +11362,9 @@ with pkgs; qarte = libsForQt5.callPackage ../applications/video/qarte { }; - qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { }; + qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { + inherit (darwin.apple_sdk_11_0.frameworks) Security; + }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; @@ -11156,7 +11402,9 @@ with pkgs; qovery-cli = callPackage ../tools/admin/qovery-cli { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; + qownnotes = darwin.apple_sdk_11_0.callPackage ../applications/office/qownnotes { + inherit (libsForQt5) qmake qtbase qtdeclarative qtsvg qttools qtwayland qtwebsockets qtx11extras qtxmlpatterns wrapQtAppsHook; + }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -11258,6 +11506,8 @@ with pkgs; redpanda = callPackage ../servers/redpanda { }; + redpanda-server = redpanda.server; + redsocks = callPackage ../tools/networking/redsocks { }; renpy = callPackage ../development/interpreters/renpy { }; @@ -11442,6 +11692,8 @@ with pkgs; rpm-ostree = callPackage ../tools/misc/rpm-ostree { gperf = gperf_3_0; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; rpm2targz = callPackage ../tools/archivers/rpm2targz { }; @@ -11498,6 +11750,8 @@ with pkgs; rustdesk = callPackage ../applications/networking/remote/rustdesk { }; + rustfilt = callPackage ../development/tools/rust/rustfilt { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11518,7 +11772,7 @@ with pkgs; s3bro = callPackage ../tools/admin/s3bro { }; - s3fs = callPackage ../tools/filesystems/s3fs { }; + s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { }; s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; @@ -11784,6 +12038,8 @@ with pkgs; silver-searcher = callPackage ../tools/text/silver-searcher { }; + simple-mtpfs = callPackage ../tools/filesystems/simple-mtpfs { }; + simpleproxy = callPackage ../tools/networking/simpleproxy { }; simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; @@ -11814,6 +12070,10 @@ with pkgs; sing-box = callPackage ../tools/networking/sing-box { }; + sing-geosite = callPackage ../data/misc/sing-geosite { }; + + sing-geoip = callPackage ../data/misc/sing-geoip { }; + sipcalc = callPackage ../tools/networking/sipcalc { }; skribilo = callPackage ../tools/typesetting/skribilo { @@ -12049,14 +12309,14 @@ with pkgs; ssldump = callPackage ../tools/networking/ssldump { }; - sslsplit = callPackage ../tools/networking/sslsplit { - openssl = openssl_1_1; - }; + sslsplit = callPackage ../tools/networking/sslsplit { }; sstp = callPackage ../tools/networking/sstp {}; strip-nondeterminism = perlPackages.strip-nondeterminism; + structorizer = callPackage ../applications/graphics/structorizer { }; + structure-synth = callPackage ../tools/graphics/structure-synth { }; su-exec = callPackage ../tools/security/su-exec {}; @@ -12097,7 +12357,9 @@ with pkgs; sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { }; + sslscan = callPackage ../tools/security/sslscan { + openssl = openssl.override { withZlib = true; }; + }; sslmate = callPackage ../development/tools/sslmate { }; @@ -12168,6 +12430,8 @@ with pkgs; swapview = callPackage ../os-specific/linux/swapview { }; + swc = callPackage ../development/tools/swc { }; + swtpm = callPackage ../tools/security/swtpm { }; svnfs = callPackage ../tools/filesystems/svnfs { }; @@ -12346,7 +12610,7 @@ with pkgs; textadept = callPackage ../applications/editors/textadept { }; - texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + texworks = qt6Packages.callPackage ../applications/editors/texworks { }; tf2pulumi = callPackage ../development/tools/tf2pulumi { }; @@ -12428,6 +12692,8 @@ with pkgs; time-decode = callPackage ../tools/misc/time-decode { }; + timer = callPackage ../tools/misc/timer { }; + tio = callPackage ../tools/misc/tio { }; tiv = callPackage ../applications/misc/tiv { }; @@ -12548,6 +12814,8 @@ with pkgs; tthsum = callPackage ../applications/misc/tthsum { }; + ttdl = callPackage ../applications/misc/ttdl { }; + ttp = with python3.pkgs; toPythonApplication ttp; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; @@ -12626,6 +12894,8 @@ with pkgs; ipbt = callPackage ../tools/misc/ipbt { }; + tuckr = callPackage ../applications/misc/tuckr { }; + tuhi = callPackage ../applications/misc/tuhi { }; tuir = callPackage ../applications/misc/tuir { }; @@ -12636,11 +12906,12 @@ with pkgs; tunnelto = callPackage ../tools/networking/tunnelto { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; tuptime = callPackage ../tools/system/tuptime { }; + turbo = callPackage ../tools/misc/turbo { }; + turses = callPackage ../applications/networking/instant-messengers/turses { }; tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { }; @@ -12651,6 +12922,8 @@ with pkgs; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + ttfb = callPackage ../development/tools/ttfb { }; + twilight = callPackage ../tools/graphics/twilight { libX11 = xorg.libX11; }; @@ -12659,6 +12932,8 @@ with pkgs; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twspace-crawler = callPackage ../tools/misc/twspace-crawler { }; + twspace-dl = callPackage ../tools/misc/twspace-dl { }; twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; @@ -12683,8 +12958,12 @@ with pkgs; ua = callPackage ../tools/networking/ua { }; + uair = callPackage ../tools/misc/uair { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; + ubi_reader = callPackage ../tools/filesystems/ubi_reader { }; + ubridge = callPackage ../tools/networking/ubridge { }; ubertooth = callPackage ../applications/radio/ubertooth { }; @@ -12934,8 +13213,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; + wakapi = callPackage ../tools/misc/wakapi { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; + wambo = callPackage ../development/tools/wambo { }; + weather = callPackage ../applications/misc/weather { }; wego = callPackage ../applications/misc/wego { }; @@ -12951,8 +13234,7 @@ with pkgs; watchlog = callPackage ../tools/misc/watchlog { }; watchman = callPackage ../development/tools/watchman { - inherit (darwin.apple_sdk.frameworks) CoreServices; - autoconf = buildPackages.autoconf269; + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -12972,6 +13254,7 @@ with pkgs; wasmedge = callPackage ../development/tools/wasmedge { llvmPackages = llvmPackages_12; + inherit (darwin.apple_sdk.frameworks) Foundation; }; welkin = callPackage ../tools/graphics/welkin {}; @@ -13044,6 +13327,8 @@ with pkgs; xray = callPackage ../tools/networking/xray { }; + xteve = callPackage ../servers/xteve { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; @@ -13487,10 +13772,6 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; - yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - pkgs = pkgs.__splicedPackages; - nodejs = nodejs.override { openssl = openssl_1_1; }; - }; inherit (yarn2nix-moretea) yarn2nix @@ -13508,6 +13789,8 @@ with pkgs; yamlfix = with python3Packages; toPythonApplication yamlfix; + yamlfmt = callPackage ../development/tools/yamlfmt {}; + yamllint = with python3Packages; toPythonApplication yamllint; yamlpath = callPackage ../development/tools/yamlpath { }; @@ -13603,6 +13886,8 @@ with pkgs; zplug = callPackage ../shells/zsh/zplug { }; + zps = callPackage ../tools/system/zps { }; + zi = callPackage ../shells/zsh/zi {}; zinit = callPackage ../shells/zsh/zinit {} ; @@ -13693,8 +13978,12 @@ with pkgs; runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; + agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { }; + any-nix-shell = callPackage ../shells/any-nix-shell { }; + nix-your-shell = callPackage ../shells/nix-your-shell { }; + bash = lowPrio (callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; }); @@ -13869,6 +14158,10 @@ with pkgs; asciigraph = callPackage ../tools/text/asciigraph { }; + autocorrect = callPackage ../tools/text/autocorrect { + inherit (darwin.apple_sdk.frameworks) Security; + }; + as31 = callPackage ../development/compilers/as31 { }; asl = callPackage ../development/compilers/asl { @@ -13972,6 +14265,7 @@ with pkgs; clang_12 = llvmPackages_12.clang; clang_13 = llvmPackages_13.clang; clang_14 = llvmPackages_14.clang; + clang_15 = llvmPackages_15.clang; clang-tools = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_latest; @@ -14017,6 +14311,10 @@ with pkgs; llvmPackages = llvmPackages_14; }; + clang-tools_15 = callPackage ../development/tools/clang-tools { + llvmPackages = llvmPackages_15; + }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { llvmPackages = llvmPackages_latest; inherit (llvmPackages_latest) clang; @@ -14160,7 +14458,7 @@ with pkgs; num = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9 - else 11; + else 12; numS = toString num; in { gcc = pkgs.${"gcc${numS}"}; @@ -14198,7 +14496,8 @@ with pkgs; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; - gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "11" then gcc10Stdenv else stdenv; + # Meant for packages that fail with newer than gcc10. + gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking @@ -14661,6 +14960,12 @@ with pkgs; then haskell.compiler.native-bignum.ghc92 else haskell.compiler.ghc92); + alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; + + happy = haskell.lib.compose.justStaticExecutables haskellPackages.happy; + + hscolour = haskell.lib.compose.justStaticExecutables haskellPackages.hscolour; + cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install; stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack; @@ -14730,35 +15035,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; fstar = callPackage ../development/compilers/fstar { - # Work around while compatibility with ppxlib >= 0.26 is unavailable - # Should be removed when a fix is available - # See https://github.com/FStarLang/FStar/issues/2681 - ocamlPackages = - ocamlPackages.overrideScope' (self: super: { - ppxlib = super.ppxlib.override { - version = if lib.versionAtLeast self.ocaml.version "4.07" - then if lib.versionAtLeast self.ocaml.version "4.08" - then "0.24.0" else "0.15.0" else "0.13.0"; - }; - ppx_deriving_yojson = super.ppx_deriving_yojson.overrideAttrs (oldAttrs: rec { - version = "3.6.1"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = "ppx_deriving_yojson"; - rev = "v${version}"; - sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk"; - }; - }); - sedlex = super.sedlex.overrideAttrs (oldAttrs: rec { - version = "2.5"; - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = "sedlex"; - rev = "v${version}"; - sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy"; - }; - }); - }); + z3 = z3_4_8_5; }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -14821,7 +15098,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17; + inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19; openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -14874,14 +15151,13 @@ with pkgs; openjdk_headless = jdk_headless; graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { - inherit (darwin.apple_sdk.frameworks) Foundation; - }); + recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvm-ce = graalvm11-ce; graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; - buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { - graalvm = graalvm11-ce; - }; + buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { + graalvmDrv = graalvm-ce; + }).override; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; @@ -14938,9 +15214,7 @@ with pkgs; jwasm = callPackage ../development/compilers/jwasm { }; - kind2 = callPackage ../development/compilers/kind2 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; @@ -15001,6 +15275,7 @@ with pkgs; lld_12 = llvmPackages_12.lld; lld_13 = llvmPackages_13.lld; lld_14 = llvmPackages_14.lld; + lld_15 = llvmPackages_15.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -15013,6 +15288,7 @@ with pkgs; lldb_12 = llvmPackages_12.lldb; lldb_13 = llvmPackages_13.lldb; lldb_14 = llvmPackages_14.lldb; + lldb_15 = llvmPackages_15.lldb; llvm = llvmPackages.llvm; llvm_5 = llvmPackages_5.llvm; @@ -15025,6 +15301,7 @@ with pkgs; llvm_12 = llvmPackages_12.llvm; llvm_13 = llvmPackages_13.llvm; llvm_14 = llvmPackages_14.llvm; + llvm_15 = llvmPackages_15.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; @@ -15119,6 +15396,13 @@ with pkgs; targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; })); + llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_15.tools; + targetLlvmLibraries = targetPackages.llvmPackages_15.libraries or llvmPackages_15.libraries; + targetLlvm = targetPackages.llvmPackages_15.llvm or llvmPackages_15.llvm; + })); + llvmPackages_latest = llvmPackages_14; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -15135,12 +15419,14 @@ with pkgs; microscheme = callPackage ../development/compilers/microscheme { }; + minimacy = callPackage ../development/compilers/minimacy { }; + mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; }; mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { }; mitscheme = callPackage ../development/compilers/mit-scheme - { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; + { texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; mitschemeX11 = mitscheme.override { enableX11 = true; @@ -15520,13 +15806,13 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_66 = callPackage ../development/compilers/rust/1_66.nix { + rust_1_67 = callPackage ../development/compilers/rust/1_67.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_14 = llvmPackages_14.libllvm; + llvm_15 = llvmPackages_15.libllvm; # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; - rust = rust_1_66; + rust = rust_1_67; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -15535,8 +15821,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_66 = rust_1_66.packages.stable; - rustPackages = rustPackages_1_66; + rustPackages_1_67 = rust_1_67.packages.stable; + rustPackages = rustPackages_1_67; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -15568,6 +15854,7 @@ with pkgs; cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15599,7 +15886,7 @@ with pkgs; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; @@ -15637,8 +15924,10 @@ with pkgs; openssl = openssl_1_1; }; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; + cargo-dist = callPackage ../development/tools/rust/cargo-dist { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; @@ -15646,6 +15935,7 @@ with pkgs; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -15674,6 +15964,9 @@ with pkgs; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; + + cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15713,8 +16006,8 @@ with pkgs; cargo-wasi = callPackage ../development/tools/rust/cargo-wasi { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + cargo-watch = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-watch { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { @@ -15740,11 +16033,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devserver = callPackage ../development/tools/rust/devserver { - inherit (darwin.apple_sdk.frameworks) CoreServices; - openssl = openssl_1_1; - }; - devspace = callPackage ../development/tools/misc/devspace { }; maturin = callPackage ../development/tools/rust/maturin { @@ -15850,8 +16138,6 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; - spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; - sqldeveloper = callPackage ../development/tools/database/sqldeveloper { jdk = oraclejdk; }; @@ -15878,7 +16164,10 @@ with pkgs; svdtools = callPackage ../development/embedded/svdtools { }; - swift = callPackage ../development/compilers/swift { }; + swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); + inherit (swiftPackages) swift swiftpm sourcekit-lsp; + + swiftpm2nix = callPackage ../development/tools/swiftpm2nix { }; swiProlog = callPackage ../development/compilers/swi-prolog { openssl = openssl_1_1; @@ -15907,6 +16196,9 @@ with pkgs; llvmPackages = llvmPackages_14; avrgcc = pkgsCross.avr.buildPackages.gcc; wasi-libc = pkgsCross.wasi32.wasilibc; + # go 1.20 build failure + go = go_1_19; + buildGoModule = buildGo119Module; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; @@ -15915,6 +16207,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + ubports-click = python3Packages.callPackage ../development/tools/click { }; + uasm = callPackage ../development/compilers/uasm { }; urn = callPackage ../development/compilers/urn { }; @@ -16247,7 +16541,7 @@ with pkgs; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; love_11 = callPackage ../development/interpreters/love/11.nix { }; - love = love_0_10; + love = love_11; wabt = callPackage ../development/tools/wabt { }; @@ -16425,7 +16719,7 @@ with pkgs; bluezSupport = true; x11Support = true; }; - python311Full = python310.override { + python311Full = python311.override { self = python311Full; pythonAttr = "python311Full"; bluezSupport = true; @@ -16486,6 +16780,8 @@ with pkgs; poetry = callPackage ../tools/package-management/poetry { }; + poetryPlugins = recurseIntoAttrs poetry.plugins; + poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { inherit pkgs lib; }; @@ -16511,6 +16807,8 @@ with pkgs; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; + pw-volume = callPackage ../tools/audio/pw-volume {}; + pyradio = callPackage ../applications/audio/pyradio {}; racket = callPackage ../development/interpreters/racket { @@ -16777,9 +17075,7 @@ with pkgs; srelay = callPackage ../tools/networking/srelay { }; - xidel = callPackage ../tools/text/xidel { - openssl = openssl_1_1; - }; + xidel = callPackage ../tools/text/xidel { }; asdf-vm = callPackage ../tools/misc/asdf-vm { }; @@ -16797,9 +17093,7 @@ with pkgs; adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) + inherit (callPackage ../development/tools/alloy { }) alloy5 alloy6 alloy; @@ -16838,6 +17132,8 @@ with pkgs; ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor; + phpunit = callPackage ../development/tools/misc/phpunit { }; + ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { }; @@ -16862,6 +17158,10 @@ with pkgs; kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { }; + lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; + }; + metals = callPackage ../development/tools/language-servers/metals { }; millet = callPackage ../development/tools/language-servers/millet { }; @@ -16870,16 +17170,16 @@ with pkgs; rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; - sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/sumneko-lua-language-server { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; - }; - svls = callPackage ../development/tools/language-servers/svls { }; vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { }; verible = callPackage ../development/tools/language-servers/verible { }; + zls = callPackage ../development/tools/language-servers/zls { + zig = zig_0_10; + }; + ansible-later = with python3.pkgs; toPythonApplication ansible-later; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; @@ -16930,22 +17230,40 @@ with pkgs; aws-adfs = with python3Packages; toPythonApplication aws-adfs; - inherit (callPackages ../development/tools/electron { }) - electron - electron_9 - electron_10 - electron_11 - electron_12 - electron_13 - electron_14 - electron_15 - electron_16 - electron_17 - electron_18 - electron_19 - electron_20 - electron_21 - electron_22; + inherit (callPackages ../development/tools/electron/binary { }) + electron-bin + electron_9-bin + electron_10-bin + electron_11-bin + electron_12-bin + electron_13-bin + electron_14-bin + electron_15-bin + electron_16-bin + electron_17-bin + electron_18-bin + electron_19-bin + electron_20-bin + electron_21-bin + electron_22-bin + electron_23-bin; + + electron = electron-bin; + electron_9 = electron_9-bin; + electron_10 = electron_10-bin; + electron_11 = electron_11-bin; + electron_12 = electron_12-bin; + electron_13 = electron_13-bin; + electron_14 = electron_14-bin; + electron_15 = electron_15-bin; + electron_16 = electron_16-bin; + electron_17 = electron_17-bin; + electron_18 = electron_18-bin; + electron_19 = electron_19-bin; + electron_20 = electron_20-bin; + electron_21 = electron_21-bin; + electron_22 = electron_22-bin; + electron_23 = electron_23-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -16978,17 +17296,7 @@ with pkgs; bam = callPackage ../development/tools/build-managers/bam {}; - bazel = bazel_3; - - bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk11_headless; - buildJdkName = "java11"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - bazel_self = bazel_3; - }; + bazel = bazel_6; bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 { inherit (darwin) cctools; @@ -17071,13 +17379,9 @@ with pkgs; libc = preLibcCrossHeaders; }; - libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { }; - libopcodes = callPackage ../development/tools/misc/binutils/libopcodes.nix { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libopcodes = callPackage ../development/tools/misc/binutils/libopcodes.nix { }; # Held back 2.38 release. Remove once all dependencies are ported to 2.39. binutils-unwrapped_2_38 = callPackage ../development/tools/misc/binutils/2.38 { @@ -17409,6 +17713,7 @@ with pkgs; libgcc = callPackage ../development/libraries/gcc/libgcc { stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems + gcc = gcc11; # fails to build with gcc12 }; # This is for e.g. LLVM libraries on linux. @@ -17560,7 +17865,9 @@ with pkgs; emma = callPackage ../development/tools/analysis/emma { }; - ent-go = callPackage ../development/tools/ent { }; + ent-go = callPackage ../development/tools/ent { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; epm = callPackage ../development/tools/misc/epm { }; @@ -17647,8 +17954,6 @@ with pkgs; openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - pmdk = callPackage ../development/libraries/pmdk { }; - jdepend = callPackage ../development/tools/analysis/jdepend { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -17807,7 +18112,7 @@ with pkgs; img = callPackage ../development/tools/img { }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; }; indent = callPackage ../development/tools/misc/indent { }; @@ -17955,6 +18260,10 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Virtualization; }; + listenbrainz-mpd = callPackage ../applications/audio/listenbrainz-mpd { + inherit (darwin.apple_sdk.frameworks) Security; + }; + lit = callPackage ../development/tools/misc/lit { }; litecli = callPackage ../development/tools/database/litecli {}; @@ -17963,6 +18272,8 @@ with pkgs; litestream = callPackage ../development/tools/database/litestream {}; + ls-lint = callPackage ../development/tools/ls-lint { }; + lsof = callPackage ../development/tools/misc/lsof { }; ltrace = callPackage ../development/tools/misc/ltrace { }; @@ -18003,8 +18314,6 @@ with pkgs; mdl = callPackage ../development/tools/misc/mdl { }; - python-language-server = callPackage ../development/dotnet-modules/python-language-server { }; - python-matter-server = with python3Packages; toPythonApplication python-matter-server; minify = callPackage ../development/web/minify { }; @@ -18401,7 +18710,7 @@ with pkgs; slimerjs = callPackage ../development/tools/slimerjs {}; slint-lsp = callPackage ../development/tools/misc/slint-lsp { - inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; sloccount = callPackage ../development/tools/misc/sloccount { }; @@ -18424,6 +18733,8 @@ with pkgs; speedtest-cli = with python3Packages; toPythonApplication speedtest-cli; + spicy-parser-generator = callPackage ../development/tools/parsing/spicy { }; + spin = callPackage ../development/tools/analysis/spin { }; spirv-headers = callPackage ../development/libraries/spirv-headers { }; @@ -18664,16 +18975,20 @@ with pkgs; xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { - deps = [ xcbuild ]; + name = "xcbuild-hook"; + propagatedBuildInputs = [ xcbuild ]; } ../development/tools/xcbuild/setup-hook.sh ; # xcbuild with llvm 6 xcbuild6Hook = makeSetupHook { - deps = [ xcodebuild6 ]; + name = "xcbuild6-hook"; + propagatedBuildInputs = [ xcodebuild6 ]; } ../development/tools/xcbuild/setup-hook.sh ; xcpretty = callPackage ../development/tools/xcpretty { }; + xeus = callPackage ../development/libraries/xeus { }; + xmlindent = callPackage ../development/web/xmlindent {}; xpwn = callPackage ../development/mobile/xpwn {}; @@ -18704,8 +19019,6 @@ with pkgs; ytt = callPackage ../development/tools/ytt {}; - zls = callPackage ../development/tools/zls { }; - zydis = callPackage ../development/libraries/zydis { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -18916,11 +19229,11 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; - bobcat = callPackage ../development/libraries/bobcat - (lib.optionalAttrs (with stdenv.hostPlatform; isAarch64 && isLinux) { - # C++20 is required, aarch64-linux has gcc 9 by default - stdenv = gcc10Stdenv; - }); + bobcat = callPackage ../development/libraries/bobcat { + # C++20 is required, aarch64-linux has gcc 9 by default + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; + }; boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -19135,7 +19448,6 @@ with pkgs; coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cointop = callPackage ../applications/misc/cointop { }; @@ -19144,7 +19456,7 @@ with pkgs; cog = callPackage ../development/web/cog { }; - cosmoc = callPackage ../development/tools/cosmoc { }; + cosmocc = callPackage ../development/tools/cosmocc { }; cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; @@ -19174,6 +19486,14 @@ with pkgs; uci = callPackage ../development/libraries/uci { }; + uclient = callPackage ../development/libraries/uclient { }; + + ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; }; + + ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; }; + + ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; }; + uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -19273,6 +19593,8 @@ with pkgs; discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; + discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; + discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -19315,12 +19637,15 @@ with pkgs; eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; + stdenv = if stdenv.isDarwin then gccStdenv else stdenv; }; eclib = callPackage ../development/libraries/eclib {}; editline = callPackage ../development/libraries/editline { }; + edencommon = callPackage ../development/libraries/edencommon { }; + eigen = callPackage ../development/libraries/eigen {}; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; @@ -19395,6 +19720,10 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + fbthrift = callPackage ../development/libraries/fbthrift { }; + + fb303 = callPackage ../development/libraries/fb303 { }; + fcgi = callPackage ../development/libraries/fcgi { }; fcl = callPackage ../development/libraries/fcl { }; @@ -19411,30 +19740,28 @@ with pkgs; linbox = callPackage ../development/libraries/linbox { }; - ffmpeg_4-headless = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; - - sdlSupport = false; - vdpauSupport = false; - pulseaudioSupport = false; - libva = libva-minimal; - }; - ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox + VideoDecodeAcceleration VideoToolbox; }; - - ffmpeg_5-headless = callPackage ../development/libraries/ffmpeg/5.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; - - sdlSupport = false; - vdpauSupport = false; - pulseaudioSupport = false; - libva = libva-minimal; + ffmpeg_4-headless = ffmpeg_4.override { + ffmpegVariant = "headless"; + }; + ffmpeg_4-full = ffmpeg.override { + ffmpegVariant = "full"; }; ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox + VideoDecodeAcceleration VideoToolbox; + }; + ffmpeg_5-headless = ffmpeg_5.override { + ffmpegVariant = "headless"; + }; + ffmpeg_5-full = ffmpeg_5.override { + ffmpegVariant = "full"; }; # Aliases @@ -19443,26 +19770,8 @@ with pkgs; # Packages which use ffmpeg as a library, should pin to the relevant major # version number which the upstream support. ffmpeg = ffmpeg_4; - ffmpeg-headless = ffmpeg_4-headless; - - ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { - svt-av1 = if stdenv.isAarch64 then null else svt-av1; - rtmpdump = null; # Prefer the built-in RTMP implementation - # The following need to be fixed on Darwin - libjack2 = if stdenv.isDarwin then null else libjack2; - libmodplug = if stdenv.isDarwin then null else libmodplug; - libmfx = if stdenv.isDarwin then null else intel-media-sdk; - libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - samba = if stdenv.isDarwin then null else samba; - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio AVFoundation MediaToolbox - VideoDecodeAcceleration VideoToolbox; - }; - - ffmpeg_5-full = ffmpeg-full.override { - ffmpeg = ffmpeg_5; - }; + ffmpeg-full = ffmpeg_4-full; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; @@ -19474,12 +19783,15 @@ with pkgs; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias fftwLongDouble = fftw.override { precision = "long-double"; }; + fftwQuad = fftw.override { precision = "quad-precision"; }; fftwMpi = fftw.override { enableMpi = true; }; filter-audio = callPackage ../development/libraries/filter-audio {}; filtron = callPackage ../servers/filtron { }; + fizz = callPackage ../development/libraries/fizz { }; + flann = callPackage ../development/libraries/flann { }; flatcc = callPackage ../development/libraries/flatcc { }; @@ -19522,7 +19834,6 @@ with pkgs; freeimage = callPackage ../development/libraries/freeimage { inherit (darwin) autoSignDarwinBinariesHook; - libraw = libraw_unstable; }; freetts = callPackage ../development/libraries/freetts { @@ -19575,6 +19886,10 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; + function-runner = callPackage ../development/web/function-runner { }; + + functionalplus = callPackage ../development/libraries/functionalplus { }; + galer = callPackage ../tools/security/galer { }; gallia = callPackage ../tools/security/gallia { }; @@ -20311,6 +20626,8 @@ with pkgs; iniparser = callPackage ../development/libraries/iniparser { }; + initool = callPackage ../development/tools/initool { }; + intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { }; intel-media-driver = callPackage ../development/libraries/intel-media-driver { }; @@ -20321,6 +20638,8 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; + irr1 = callPackage ../development/libraries/irr1 { }; + irrlicht = if !stdenv.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { @@ -20365,14 +20684,20 @@ with pkgs; jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jbig2enc = callPackage ../development/libraries/jbig2enc { }; + jcal = callPackage ../development/libraries/jcal { }; jbigkit = callPackage ../development/libraries/jbigkit { }; + jefferson = callPackage ../tools/filesystems/jefferson { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jose = callPackage ../development/libraries/jose { }; + jpcre2 = callPackage ../development/libraries/jpcre2 { }; + jshon = callPackage ../development/tools/parsing/jshon { }; json2hcl = callPackage ../development/tools/json2hcl { }; @@ -20464,7 +20789,7 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; lemon-graph = callPackage ../development/libraries/lemon-graph { - stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; + stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv; }; levmar = callPackage ../development/libraries/levmar { }; @@ -20730,7 +21055,7 @@ with pkgs; libde265 = callPackage ../development/libraries/libde265 {}; - libdeflate = callPackage ../development/libraries/libdeflate { }; + libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { }; libdeltachat = callPackage ../development/libraries/libdeltachat { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -20751,6 +21076,8 @@ with pkgs; libdiscid = callPackage ../development/libraries/libdiscid { }; + libdisplay-info = callPackage ../development/libraries/libdisplay-info { }; + libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; @@ -20803,9 +21130,7 @@ with pkgs; libedit = callPackage ../development/libraries/libedit { }; - libelf = if stdenv.isFreeBSD - then callPackage ../development/libraries/libelf-freebsd { } - else callPackage ../development/libraries/libelf { }; + libelf = callPackage ../development/libraries/libelf { }; libelfin = callPackage ../development/libraries/libelfin { }; @@ -21211,6 +21536,14 @@ with pkgs; libiconvReal = callPackage ../development/libraries/libiconv { }; + iconv = + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ] then + lib.getBin stdenv.cc.libc + else if stdenv.hostPlatform.isDarwin then + lib.getBin darwin.libiconv + else + lib.getBin libiconvReal; + # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; @@ -21397,6 +21730,8 @@ with pkgs; libopusenc = callPackage ../development/libraries/libopusenc { }; + liboqs = callPackage ../development/libraries/liboqs { }; + libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip {}; @@ -21605,7 +21940,13 @@ with pkgs; libu2f-server = callPackage ../development/libraries/libu2f-server { }; - libubox = callPackage ../development/libraries/libubox { }; + libubox-nossl = callPackage ../development/libraries/libubox { }; + + libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; }; + + libubox-wolfssl = callPackage ../development/libraries/libubox { with_ustream_ssl = true; ustream-ssl = ustream-ssl-wolfssl; }; + + libubox-mbedtls = callPackage ../development/libraries/libubox { with_ustream_ssl = true; ustream-ssl = ustream-ssl-mbedtls; }; libudev-zero = callPackage ../development/libraries/libudev-zero { }; @@ -21818,9 +22159,9 @@ with pkgs; libyaml = callPackage ../development/libraries/libyaml { }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + yaml-cpp = callPackage ../development/libraries/yaml-cpp { }; - libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { }; libyang = callPackage ../development/libraries/libyang { }; @@ -21848,6 +22189,8 @@ with pkgs; libwacom = callPackage ../development/libraries/libwacom { }; + libwacom-surface = callPackage ../development/libraries/libwacom/surface.nix { }; + lightning = callPackage ../development/libraries/lightning { }; lightlocker = callPackage ../misc/screensavers/light-locker { }; @@ -21856,7 +22199,9 @@ with pkgs; lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; - ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; + ligolo-ng = callPackage ../tools/networking/ligolo-ng { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; linenoise = callPackage ../development/libraries/linenoise { }; @@ -21904,6 +22249,8 @@ with pkgs; opencl-clang = callPackage ../development/libraries/opencl-clang { }; + magic-enum = callPackage ../development/libraries/magic-enum { }; + mapnik = callPackage ../development/libraries/mapnik { harfbuzz = harfbuzz.override { withIcu = true; @@ -21935,14 +22282,16 @@ with pkgs; memorymapping = callPackage ../development/libraries/memorymapping { }; memorymappingHook = makeSetupHook { - deps = [ memorymapping ]; + name = "memorymapping-hook"; + propagatedBuildInputs = [ memorymapping ]; } ../development/libraries/memorymapping/setup-hook.sh; memray = callPackage ../development/tools/memray { }; memstream = callPackage ../development/libraries/memstream { }; memstreamHook = makeSetupHook { - deps = [ memstream ]; + name = "memstream-hook"; + propagatedBuildInputs = [ memstream ]; } ../development/libraries/memstream/setup-hook.sh; menu-cache = callPackage ../development/libraries/menu-cache { }; @@ -21965,7 +22314,7 @@ with pkgs; libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_latest; + llvmPackages = llvmPackages_15; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.libs) Xplugin; @@ -21993,8 +22342,8 @@ with pkgs; micropython = callPackage ../development/interpreters/micropython { }; - MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; + MIDIVisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midi-visualizer { + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; mimalloc = callPackage ../development/libraries/mimalloc { }; @@ -22042,6 +22391,8 @@ with pkgs; mpeg2dec = libmpeg2; + mqtt-benchmark = callPackage ../tools/networking/mqtt-benchmark { }; + mqttui = callPackage ../tools/networking/mqttui { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -22068,7 +22419,7 @@ with pkgs; mtxclient = callPackage ../development/libraries/mtxclient { # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; mu = callPackage ../tools/networking/mu { @@ -22483,6 +22834,8 @@ with pkgs; pkgdiff = callPackage ../tools/misc/pkgdiff { }; + pkgtop = callPackage ../tools/misc/pkgtop { }; + place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; platform-folders = callPackage ../development/libraries/platform-folders { }; @@ -22549,13 +22902,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - # https://github.com/protocolbuffers/protobuf/issues/10418 - # protobuf versions have to match between build-time and run-time - # Using "targetPlatform" in the check makes sure that the version of - # pkgsCross.armv7l-hf-multiplatform.buildPackages.protobuf matches the - # version of pkgsCross.armv7l-hf-multiplatform.protobuf - protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else - protobuf3_21; + protobuf = protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; @@ -22620,9 +22967,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; - qmake48Hook = makeSetupHook - { substitutions = { qt4 = qt48; }; } - ../development/libraries/qt-4.x/4.8/qmake-hook.sh; + qmake48Hook = makeSetupHook { + name = "qmake4.8-hook"; + substitutions = { qt4 = qt48; }; + } ../development/libraries/qt-4.x/4.8/qmake-hook.sh; qmake4Hook = qmake48Hook; @@ -22688,6 +23036,8 @@ with pkgs; quark-engine = callPackage ../tools/security/quark-engine { }; + quantlib = callPackage ../development/libraries/quantlib { }; + quesoglc = callPackage ../development/libraries/quesoglc { }; quickder = callPackage ../development/libraries/quickder {}; @@ -22831,6 +23181,8 @@ with pkgs; rover = callPackage ../development/tools/rover { }; + rqlite = callPackage ../servers/sql/rqlite { }; + rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; rttr = callPackage ../development/libraries/rttr { }; @@ -22904,10 +23256,16 @@ with pkgs; SDL2_image = callPackage ../development/libraries/SDL2_image { inherit (darwin.apple_sdk.frameworks) Foundation; }; + SDL2_image_2_0_5 = SDL2_image.override({ # Pinned for pygame, toppler + version = "2.0.5"; + hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; + }); SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; + # SDL2_mixer_2_0 pinned for lzwolf + SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; SDL2_net = callPackage ../development/libraries/SDL2_net { }; @@ -23112,6 +23470,8 @@ with pkgs; soundtouch = callPackage ../development/libraries/soundtouch {}; + span-lite = callPackage ../development/libraries/span-lite { }; + spandsp = callPackage ../development/libraries/spandsp {}; spandsp3 = callPackage ../development/libraries/spandsp/3.nix {}; @@ -23147,8 +23507,6 @@ with pkgs; spice-gtk = callPackage ../development/libraries/spice-gtk { }; - spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; - spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; @@ -23221,9 +23579,11 @@ with pkgs; subdl = callPackage ../applications/video/subdl { }; + subtitleedit = callPackage ../applications/video/subtitleedit { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil = callPackage ../development/libraries/audio/suil { }; + suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { }; sundials = callPackage ../development/libraries/sundials { python = python3; @@ -23301,9 +23661,7 @@ with pkgs; theft = callPackage ../development/libraries/theft { }; - thrift = callPackage ../development/libraries/thrift { - openssl = openssl_1_1; - }; + thrift = callPackage ../development/libraries/thrift { }; thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; @@ -23442,6 +23800,8 @@ with pkgs; vkdt = callPackage ../applications/graphics/vkdt { }; + vkdt-wayland = callPackage ../applications/graphics/vkdt { glfw = glfw-wayland; }; + vlock = callPackage ../misc/screensavers/vlock { }; virtualpg = callPackage ../development/libraries/virtualpg { }; @@ -23458,7 +23818,10 @@ with pkgs; vte = callPackage ../development/libraries/vte { # Needs GCC ≥10 but aarch64 defaults to GCC 9. - stdenv = clangStdenv; + stdenv = + if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10" + then clangStdenv + else stdenv; }; vte-gtk4 = vte.override { @@ -23486,8 +23849,8 @@ with pkgs; vtk_9_withQt5 = vtk_9.override { enableQt = true; }; - vtk = vtk_8; - vtkWithQt5 = vtk_8_withQt5; + vtk = vtk_9; + vtkWithQt5 = vtk_9_withQt5; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; @@ -23510,6 +23873,8 @@ with pkgs; wally-cli = callPackage ../development/tools/wally-cli { }; zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { }; + wangle = callPackage ../development/libraries/wangle { }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { }; @@ -23714,9 +24079,15 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; # requires a newer Apple SDK - zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig { + zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.1.nix { llvmPackages = llvmPackages_13; }; + # requires a newer Apple SDK + zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix { + llvmPackages = llvmPackages_15; + }; + # Zig 0.10.1 is broken on Darwin, so use 0.9.1 on Darwin instead. + zig = if stdenv.isDarwin then zig_0_9 else zig_0_10; zimlib = callPackage ../development/libraries/zimlib { }; @@ -23976,6 +24347,8 @@ with pkgs; _389-ds-base = callPackage ../servers/ldap/389 { }; + _5etools = callPackage ../servers/web-apps/5etools {}; + adguardhome = callPackage ../servers/adguardhome {}; alerta = callPackage ../servers/monitoring/alerta/client.nix { }; @@ -24052,14 +24425,17 @@ with pkgs; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + python = python2; }; cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + python = python2; }; cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix { # Effective Cassandra 4.0.2 there is full Java 11 support # -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html jre = pkgs.jdk11_headless; + python = python3; }; cassandra = cassandra_3_11; @@ -24120,6 +24496,8 @@ with pkgs; clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; + cockpit = callPackage ../servers/monitoring/cockpit { }; + codeowners = callPackage ../development/tools/codeowners { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; @@ -24150,7 +24528,12 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; - directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {}; + directx-headers = callPackage ../development/libraries/directx-headers {}; + + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler { + # https://github.com/NixOS/nixpkgs/issues/216294 + stdenv = if stdenv.cc.isGNU && stdenv.isi686 then gcc11Stdenv else stdenv; + }; dkimproxy = callPackage ../servers/mail/dkimproxy { }; @@ -24236,7 +24619,6 @@ with pkgs; freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - openssl = openssl_1_1; }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; @@ -24262,17 +24644,25 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent {}; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { + buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure + }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure + }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; + phlare = callPackage ../servers/monitoring/phlare { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; + grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { }; + gerbera = callPackage ../servers/gerbera {}; gobetween = callPackage ../servers/gobetween { }; @@ -24512,7 +24902,9 @@ with pkgs; networkaudiod = callPackage ../servers/networkaudiod { }; - unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { }; + unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; unit = callPackage ../servers/http/unit { }; @@ -24711,6 +25103,8 @@ with pkgs; mariadb_106 mariadb_108 mariadb_109 + mariadb_1010 + mariadb_1011 ; mariadb = mariadb_106; mariadb-embedded = mariadb.override { withEmbedded = true; }; @@ -24784,6 +25178,8 @@ with pkgs; mir = callPackage ../servers/mir { }; + miriway = callPackage ../applications/window-managers/miriway { }; + icinga2 = callPackage ../servers/monitoring/icinga2 { }; icinga2-agent = callPackage ../servers/monitoring/icinga2 { @@ -24949,6 +25345,7 @@ with pkgs; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; + prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { }; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; @@ -25009,6 +25406,8 @@ with pkgs; reproxy = callPackage ../servers/reproxy { }; + repro-get = callPackage ../tools/package-management/repro-get { }; + restic = callPackage ../tools/backup/restic { }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; @@ -25062,6 +25461,8 @@ with pkgs; shairport-sync = callPackage ../servers/shairport-sync { }; + sharing = callPackage ../servers/sharing { }; + showoff = callPackage ../servers/http/showoff {}; serfdom = callPackage ../servers/serf { }; @@ -25193,7 +25594,9 @@ with pkgs; vouch-proxy = callPackage ../servers/vouch-proxy { }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; virtiofsd = callPackage ../servers/misc/virtiofsd { }; @@ -25252,8 +25655,7 @@ with pkgs; inherit (buildPackages.darwin) bootstrap_cmds; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` - or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin + abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override` }; generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix {}; @@ -25418,8 +25820,6 @@ with pkgs; bluez = bluez5; - inherit (python3Packages) bedup; - bolt = callPackage ../os-specific/linux/bolt { }; bpf-linker = callPackage ../development/tools/bpf-linker { }; @@ -25522,6 +25922,8 @@ with pkgs; erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; @@ -25534,9 +25936,7 @@ with pkgs; fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { }; - firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { - openssl = openssl_1_1; - }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; @@ -25566,6 +25966,8 @@ with pkgs; fan2go = callPackage ../os-specific/linux/fan2go { }; + fanctl = callPackage ../os-specific/linux/fanctl { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; ffado = libsForQt5.callPackage ../os-specific/linux/ffado { @@ -25598,11 +26000,11 @@ with pkgs; gmailctl = callPackage ../applications/networking/gmailctl { }; - gometer = callPackage ../applications/misc/gometer { }; - gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { }; + gomplate = callPackage ../development/tools/gomplate { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gpm = callPackage ../servers/gpm { withNcurses = false; # Keep curses disabled for lack of value @@ -25643,7 +26045,7 @@ with pkgs; }; btop = callPackage ../tools/system/btop { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; nmon = callPackage ../os-specific/linux/nmon { }; @@ -25747,6 +26149,8 @@ with pkgs; libnl = callPackage ../os-specific/linux/libnl { }; + libnl-tiny = callPackage ../os-specific/linux/libnl-tiny { }; + libtraceevent = callPackage ../os-specific/linux/libtraceevent {}; libtracefs = callPackage ../os-specific/linux/libtracefs {}; @@ -25893,7 +26297,7 @@ with pkgs; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; - cryptodev = linuxKernel.packages.linux_4_9.cryptodev; + cryptodev = linuxPackages.cryptodev; dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod @@ -25912,7 +26316,6 @@ with pkgs; }; libraw = callPackage ../development/libraries/libraw { }; - libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { }; libraw1394 = callPackage ../development/libraries/libraw1394 { }; @@ -26028,9 +26431,9 @@ with pkgs; nsh = callPackage ../shells/nsh { }; - nushell = callPackage ../shells/nushell { - inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security; - inherit (darwin.apple_sdk) sdk; + nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; nettools = if stdenv.isLinux @@ -26144,6 +26547,8 @@ with pkgs; go-migrate = callPackage ../development/tools/go-migrate { }; + go-jet = callPackage ../development/tools/go-jet { }; + go-mockery = callPackage ../development/tools/go-mockery { }; gomacro = callPackage ../development/tools/gomacro { }; @@ -26236,13 +26641,15 @@ with pkgs; perf-tools = callPackage ../os-specific/linux/perf-tools { }; + picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { }; + pipes = callPackage ../misc/screensavers/pipes { }; pipes-rs = callPackage ../misc/screensavers/pipes-rs { }; pipework = callPackage ../os-specific/linux/pipework { }; - pktgen = callPackage ../os-specific/linux/pktgen { stdenv = gcc10StdenvCompat; }; + pktgen = callPackage ../os-specific/linux/pktgen { }; plymouth = callPackage ../os-specific/linux/plymouth { }; @@ -26339,7 +26746,7 @@ with pkgs; rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { }; - rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { }; + rvvm = callPackage ../applications/virtualization/rvvm { }; s3ql = callPackage ../tools/backup/s3ql { }; @@ -26416,7 +26823,7 @@ with pkgs; # break some cyclic dependencies util-linux = util-linuxMinimal; # provide a super minimal gnupg used for systemd-machined - gnupg = callPackage ../tools/security/gnupg/23.nix { + gnupg = gnupg.override { enableMinimal = true; guiSupport = false; }; @@ -26740,6 +27147,8 @@ with pkgs; barlow = callPackage ../data/fonts/barlow { }; + base16-schemes = callPackage ../data/themes/base16-schemes { }; + bgnet = callPackage ../data/documentation/bgnet { }; bibata-cursors = callPackage ../data/icons/bibata-cursors { attrs = python3Packages.attrs; }; @@ -26750,6 +27159,10 @@ with pkgs; blackbird = callPackage ../data/themes/blackbird { }; + blackout = callPackage ../data/fonts/blackout { }; + + breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; + brise = callPackage ../data/misc/brise { }; cacert = callPackage ../data/misc/cacert { }; @@ -26780,6 +27193,8 @@ with pkgs; chonburi-font = callPackage ../data/fonts/chonburi { }; + chunk = callPackage ../data/fonts/chunk { }; + cldr-annotations = callPackage ../data/misc/cldr-annotations { }; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; @@ -26939,6 +27354,8 @@ with pkgs; fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; + fanwood = callPackage ../data/fonts/fanwood { }; + fira = callPackage ../data/fonts/fira { }; fira-code = callPackage ../data/fonts/fira-code { }; @@ -26991,6 +27408,8 @@ with pkgs; go-font = callPackage ../data/fonts/go-font { }; + goudy-bookletter-1911 = callPackage ../data/fonts/goudy-bookletter-1911 { }; + graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; @@ -27082,6 +27501,8 @@ with pkgs; joypixels = callPackage ../data/fonts/joypixels { }; + junction-font = callPackage ../data/fonts/junction { }; + junicode = callPackage ../data/fonts/junicode { }; julia-mono = callPackage ../data/fonts/julia-mono { }; @@ -27100,6 +27521,8 @@ with pkgs; khmeros = callPackage ../data/fonts/khmeros {}; + knewave = callPackage ../data/fonts/knewave { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; @@ -27128,10 +27551,18 @@ with pkgs; lato = callPackage ../data/fonts/lato {}; + league-gothic = callPackage ../data/fonts/league-gothic { }; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + league-script-number-one = callPackage ../data/fonts/league-script-number-one { }; + + league-spartan = callPackage ../data/fonts/league-spartan { }; + ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; + libGDSII = callPackage ../development/libraries/science/chemistry/libGDSII { }; + inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 @@ -27164,6 +27595,8 @@ with pkgs; lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + linden-hill = callPackage ../data/fonts/linden-hill { }; + line-awesome = callPackage ../data/fonts/line-awesome { }; linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin {}; @@ -27196,6 +27629,8 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; + lxgw-neoxihei = callPackage ../data/fonts/lxgw-neoxihei { }; + lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { }; maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; @@ -27232,6 +27667,8 @@ with pkgs; material-icons = callPackage ../data/fonts/material-icons { }; + material-symbols = callPackage ../data/fonts/material-symbols { }; + material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -27294,6 +27731,8 @@ with pkgs; nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; + nasin-nanpa = callPackage ../data/fonts/nasin-nanpa {}; + national-park-typeface = callPackage ../data/fonts/national-park { }; netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; @@ -27373,6 +27812,8 @@ with pkgs; orion = callPackage ../data/themes/orion {}; + ostrich-sans = callPackage ../data/fonts/ostrich-sans { }; + overpass = callPackage ../data/fonts/overpass { }; oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; @@ -27441,6 +27882,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + prociono = callPackage ../data/fonts/prociono { }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -27520,10 +27963,14 @@ with pkgs; snap7 = callPackage ../development/libraries/snap7 {}; + sniglet = callPackage ../data/fonts/sniglet { }; + snowblind = callPackage ../data/themes/snowblind { }; solarc-gtk-theme = callPackage ../data/themes/solarc { }; + sorts-mill-goudy = callPackage ../data/fonts/sorts-mill-goudy { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; soundfont-generaluser = callPackage ../data/soundfonts/generaluser { }; @@ -27582,6 +28029,8 @@ with pkgs; roboto-mono = callPackage ../data/fonts/roboto-mono { }; + roboto-serif = callPackage ../data/fonts/roboto-serif { }; + roboto-slab = callPackage ../data/fonts/roboto-slab { }; hasklig = callPackage ../data/fonts/hasklig {}; @@ -27641,6 +28090,8 @@ with pkgs; theano = callPackage ../data/fonts/theano { }; + the-neue-black = callPackage ../data/fonts/the-neue-black { }; + tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { inherit (gnome) adwaita-icon-theme; }; @@ -27871,8 +28322,6 @@ with pkgs; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; - foxitreader = libsForQt5.callPackage ../applications/misc/foxitreader { }; - pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; @@ -27900,7 +28349,7 @@ with pkgs; ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { }; + airwave = libsForQt5.callPackage ../applications/audio/airwave { }; akira-unstable = callPackage ../applications/graphics/akira { }; @@ -28058,7 +28507,18 @@ with pkgs; azpainter = callPackage ../applications/graphics/azpainter { }; - bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; + bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { + stdenv = if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv; + }; blocky = callPackage ../applications/networking/blocky { }; @@ -28341,6 +28801,8 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; + cavalier = callPackage ../applications/audio/cavalier { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -28457,6 +28919,8 @@ with pkgs; complete-alias = callPackage ../tools/misc/complete-alias { }; + completely = callPackage ../tools/misc/completely { }; + confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; copyq = qt6Packages.callPackage ../applications/misc/copyq { }; @@ -28593,6 +29057,8 @@ with pkgs; plugins = []; }; + denaro = callPackage ../applications/finance/denaro { }; + dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; dht = callPackage ../applications/networking/p2p/dht { }; @@ -28706,7 +29172,7 @@ with pkgs; dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; dutree = callPackage ../tools/misc/dutree { }; @@ -28778,7 +29244,9 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - o = callPackage ../applications/editors/o { }; + o = callPackage ../applications/editors/o { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; oed = callPackage ../applications/editors/oed { }; @@ -28937,6 +29405,8 @@ with pkgs; go-motion = callPackage ../development/tools/go-motion { }; + go-musicfox = callPackage ../applications/audio/go-musicfox { }; + gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; greenfoot = callPackage ../applications/editors/greenfoot { @@ -28957,9 +29427,10 @@ with pkgs; karlender = callPackage ../applications/office/karlender { }; - keepassx = callPackage ../applications/misc/keepassx { }; - keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; + keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc { + inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; keepass-diff = callPackage ../applications/misc/keepass-diff { }; @@ -29025,7 +29496,6 @@ with pkgs; finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils { @@ -29308,6 +29778,8 @@ with pkgs; w_scan = callPackage ../applications/video/w_scan { }; + w_scan2 = callPackage ../applications/video/w_scan2 { }; + wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; @@ -29383,6 +29855,7 @@ with pkgs; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; + wmClass = "firefox-beta"; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { @@ -29395,6 +29868,7 @@ with pkgs; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; + wmClass = "firefox-devedition"; }; librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf {}; @@ -29715,6 +30189,8 @@ with pkgs; gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; + gossa = callPackage ../applications/networking/gossa { }; + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; gpsbabel-gui = gpsbabel.override { @@ -29825,6 +30301,7 @@ with pkgs; hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web; + hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; homebank = callPackage ../applications/office/homebank { gtk = gtk3; @@ -29903,7 +30380,9 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; hypnotix = callPackage ../applications/video/hypnotix { }; @@ -29928,7 +30407,7 @@ with pkgs; meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; musikcube = callPackage ../applications/audio/musikcube { - inherit (darwin.apple_sdk.frameworks) Cocoa SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio SystemConfiguration; }; libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; @@ -29961,6 +30440,8 @@ with pkgs; pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; popura = callPackage ../tools/networking/popura {}; @@ -29969,6 +30450,13 @@ with pkgs; shepherd = nodePackages."@nerdwallet/shepherd"; + inherit (callPackage ../applications/virtualization/singularity/packages.nix { }) + apptainer + singularity + apptainer-overriden-nixos + singularity-overriden-nixos + ; + skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -29979,8 +30467,6 @@ with pkgs; slweb = callPackage ../applications/misc/slweb { }; - singularity = callPackage ../applications/virtualization/singularity { }; - sonixd = callPackage ../applications/audio/sonixd { }; sosreport = python3Packages.callPackage ../applications/logging/sosreport { }; @@ -30044,7 +30530,9 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; - waylock = callPackage ../applications/misc/waylock {}; + waylock = callPackage ../applications/misc/waylock { + zig = zig_0_10; + }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -30149,17 +30637,22 @@ with pkgs; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick; }; + ikiwiki-full = ikiwiki.override { + bazaarSupport = false; # tests broken + cvsSupport = true; + docutilsSupport = true; + gitSupport = true; + mercurialSupport = true; + monotoneSupport = true; + subversionSupport = true; + }; + iksemel = callPackage ../development/libraries/iksemel { texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. }; avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; - imag = callPackage ../applications/misc/imag { - inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; - }; - image-roll = callPackage ../applications/graphics/image-roll { }; imagej = callPackage ../applications/graphics/imagej { }; @@ -30361,7 +30854,11 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s = callPackage ../applications/networking/cluster/k3s { }; + k3s_1_23 = callPackage ../applications/networking/cluster/k3s/1_23 { }; + k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; + k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; + k3s_1_26 = callPackage ../applications/networking/cluster/k3s/1_26 { }; + k3s = k3s_1_26; k3sup = callPackage ../applications/networking/cluster/k3sup {}; @@ -30369,8 +30866,6 @@ with pkgs; kail = callPackage ../tools/networking/kail { }; - kanboard = callPackage ../applications/misc/kanboard { }; - kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; @@ -30411,6 +30906,8 @@ with pkgs; khal = callPackage ../applications/misc/khal { }; + khoj = callPackage ../servers/search/khoj { }; + khard = callPackage ../applications/misc/khard { }; kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; @@ -30587,7 +31084,7 @@ with pkgs; kubernetes-helm-wrapped = wrapHelm kubernetes-helm {}; - kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + kubernetes-helmPlugins = recurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; @@ -30618,7 +31115,8 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -30960,7 +31458,9 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { }; + mepo = callPackage ../applications/misc/mepo { + zig = zig_0_9; + }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -31020,8 +31520,7 @@ with pkgs; MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { - inherit (darwin) libobjc; - wxGTK = wxGTK32.override { + wxGTK32 = wxGTK32.override { withWebKit = true; }; }; @@ -31055,11 +31554,11 @@ with pkgs; xmr-stak = callPackage ../applications/misc/xmr-stak { }; - xmrig = callPackage ../applications/misc/xmrig { }; + xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { }; - xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { }; + xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { }; - xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; @@ -31213,8 +31712,6 @@ with pkgs; mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; - mps-youtube = callPackage ../applications/misc/mps-youtube { }; - mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); @@ -31240,6 +31737,7 @@ with pkgs; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix {}; + webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { }; youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; }; @@ -31368,9 +31866,14 @@ with pkgs; opcr-policy = callPackage ../development/tools/opcr-policy { }; - open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; - openmm = callPackage ../development/libraries/science/chemistry/openmm { }; + openmm = callPackage ../development/libraries/science/chemistry/openmm { + stdenv = gcc11Stdenv; + gfortran = gfortran11; + }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -31404,6 +31907,8 @@ with pkgs; pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; + pdfmm = callPackage ../applications/office/pdfmm {}; + pig = callPackage ../applications/networking/cluster/pig { }; pijul = callPackage ../applications/version-management/pijul { }; @@ -31444,7 +31949,7 @@ with pkgs; polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { - jre = openjdk11; + jre = openjdk17; }; prevo = callPackage ../applications/misc/prevo { }; @@ -31461,6 +31966,8 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; + rime-cli = callPackage ../applications/office/rime-cli {}; + roxctl = callPackage ../applications/networking/cluster/roxctl { }; @@ -31546,7 +32053,9 @@ with pkgs; pdfdiff = callPackage ../applications/misc/pdfdiff { }; - pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; + pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { + jdk19 = openjdk19.override { enableJavaFX = true; }; + }; mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; @@ -31598,7 +32107,10 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { }; + ncdu = callPackage ../tools/misc/ncdu { + zig = zig_0_10; + }; + ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; ncdc = callPackage ../applications/networking/p2p/ncdc { }; @@ -31618,9 +32130,13 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; + nchat = callPackage ../applications/networking/instant-messengers/nchat { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; + }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; @@ -31671,7 +32187,9 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {}; - obsidian = callPackage ../applications/misc/obsidian { }; + obsidian = callPackage ../applications/misc/obsidian { + electron = electron_21; + }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -31761,9 +32279,7 @@ with pkgs; organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { }; - osm2xmap = callPackage ../applications/misc/osm2xmap { - libyamlcpp = libyamlcpp_0_3; - }; + osm2xmap = callPackage ../applications/misc/osm2xmap { }; osmctools = callPackage ../applications/misc/osmctools { }; @@ -31808,6 +32324,7 @@ with pkgs; osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; palemoon = callPackage ../applications/networking/browsers/palemoon { }; + palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { }; pamix = callPackage ../applications/audio/pamix { }; @@ -31914,6 +32431,8 @@ with pkgs; pianoteq = callPackage ../applications/audio/pianoteq { }; + pianotrans = callPackage ../applications/audio/pianotrans { }; + picard = callPackage ../applications/audio/picard { }; picocom = callPackage ../tools/misc/picocom { @@ -32044,6 +32563,8 @@ with pkgs; ponymix = callPackage ../applications/audio/ponymix { }; + pop-launcher = callPackage ../applications/misc/pop-launcher { }; + popcorntime = callPackage ../applications/video/popcorntime {}; pothos = libsForQt5.callPackage ../applications/radio/pothos { }; @@ -32075,7 +32596,9 @@ with pkgs; properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; @@ -32215,7 +32738,9 @@ with pkgs; quantomatic = callPackage ../applications/science/physics/quantomatic { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; + quassel = darwin.apple_sdk_11_0.callPackage ../applications/networking/irc/quassel { + inherit (libsForQt5) kconfigwidgets kcoreaddons knotifications knotifyconfig ktextwidgets kwidgetsaddons kxmlgui phonon qtbase qtscript mkDerivation qca-qt5; + }; quasselClient = quassel.override { monolithic = false; @@ -32234,7 +32759,7 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc {}; - quisk = python38Packages.callPackage ../applications/radio/quisk { }; + quisk = python39Packages.callPackage ../applications/radio/quisk { }; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; @@ -32412,9 +32937,7 @@ with pkgs; rtl-ais = callPackage ../applications/radio/rtl-ais { }; - # librtlsdr is a friendly fork with additional features rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; - librtlsdr = callPackage ../development/libraries/librtlsdr { }; rubyripper = callPackage ../applications/audio/rubyripper {}; @@ -32500,9 +33023,11 @@ with pkgs; shfmt = callPackage ../tools/text/shfmt { }; + shipments = callPackage ../applications/misc/shipments { }; + shortwave = callPackage ../applications/audio/shortwave { }; - shotgun = callPackage ../tools/graphics/shotgun {}; + shotgun = callPackage ../tools/graphics/shotgun { }; shutter = callPackage ../applications/graphics/shutter { }; @@ -32744,6 +33269,8 @@ with pkgs; spotify = callPackage ../applications/audio/spotify { }; + spotify-player = callPackage ../applications/audio/spotify-player { }; + spotifywm = callPackage ../applications/audio/spotifywm { }; psst = callPackage ../applications/audio/psst { }; @@ -32846,7 +33373,9 @@ with pkgs; syncterm = callPackage ../applications/terminal-emulators/syncterm { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo119Module; # go 1.20 build failure + }) syncthing syncthing-discovery syncthing-relay; @@ -33100,6 +33629,8 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; + tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { }; + topydo = callPackage ../applications/misc/topydo {}; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -33128,7 +33659,9 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - toxiproxy = callPackage ../development/tools/toxiproxy { }; + toxiproxy = callPackage ../development/tools/toxiproxy { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; tqsl = callPackage ../applications/radio/tqsl { openssl = openssl_1_1; @@ -33139,10 +33672,7 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { - # https://github.com/NixOS/nixpkgs/issues/207047 - openssl = openssl_legacy; - }; + transmission = callPackage ../applications/networking/p2p/transmission { }; libtransmission = transmission.override { installLib = true; enableDaemon = false; @@ -33259,6 +33789,7 @@ with pkgs; unison = callPackage ../applications/networking/sync/unison { enableX11 = config.unison.enableX11 or true; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; unpaper = callPackage ../tools/graphics/unpaper { }; @@ -33344,7 +33875,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { }; @@ -33604,6 +34135,8 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcord = callPackage ../applications/networking/instant-messengers/webcord {}; + webex = callPackage ../applications/networking/instant-messengers/webex {}; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; @@ -33637,10 +34170,14 @@ with pkgs; pipewire = null; }; - chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; + chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; weston = callPackage ../applications/window-managers/weston { }; + wgnord = callPackage ../applications/networking/wgnord/default.nix {}; + whalebird = callPackage ../applications/misc/whalebird { electron = electron_19; }; @@ -33749,9 +34286,7 @@ with pkgs; xannotate = callPackage ../tools/X11/xannotate {}; - xaos = callPackage ../applications/graphics/xaos { - libpng = libpng12; - }; + xaos = libsForQt5.callPackage ../applications/graphics/xaos { }; xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick6; @@ -34018,6 +34553,8 @@ with pkgs; yelp-tools = callPackage ../development/misc/yelp-tools { }; + yewtube = callPackage ../applications/misc/yewtube { }; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yoshimi = callPackage ../applications/audio/yoshimi { }; @@ -34114,6 +34651,8 @@ with pkgs; inherit (nodePackages) zx; + zxfer = callPackage ../applications/system/zxfer {}; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; @@ -34235,7 +34774,9 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon { }; + erigon = callPackage ../applications/blockchains/erigon { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -34353,6 +34894,8 @@ with pkgs; tessera = callPackage ../applications/blockchains/tessera { }; + ton = callPackage ../applications/blockchains/ton { }; + torq = callPackage ../applications/blockchains/torq { }; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { @@ -34436,6 +34979,10 @@ with pkgs; _1oom = callPackage ../games/1oom { }; + _2048-cli = _2048-cli-terminal; + _2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; }; + _2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; }; + _2048-in-terminal = callPackage ../games/2048-in-terminal { }; _20kly = callPackage ../games/20kly { }; @@ -34514,6 +35061,8 @@ with pkgs; openrct2 = callPackage ../games/openrct2 { }; + opensearch = callPackage ../servers/search/opensearch { }; + osu-lazer = callPackage ../games/osu-lazer { }; osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { }; @@ -34615,7 +35164,9 @@ with pkgs; inherit (perlPackages) PathTiny; }; - blackshades = callPackage ../games/blackshades { }; + blackshades = callPackage ../games/blackshades { + zig = zig_0_9; + }; blobby = callPackage ../games/blobby { }; @@ -35034,7 +35585,7 @@ with pkgs; mari0 = callPackage ../games/mari0 { }; - manaplus = callPackage ../games/manaplus { }; + manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; }; mars = callPackage ../games/mars { }; @@ -35074,7 +35625,7 @@ with pkgs; python = python3; }; - mrrescue = callPackage ../games/mrrescue { }; + mrrescue = callPackage ../games/mrrescue { love = love_0_10; }; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; @@ -35138,6 +35689,8 @@ with pkgs; openjk = callPackage ../games/openjk { }; + openloco = pkgsi686Linux.callPackage ../games/openloco { }; + openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; @@ -35185,7 +35738,7 @@ with pkgs; openxray = callPackage ../games/openxray { }; - orthorobot = callPackage ../games/orthorobot { }; + orthorobot = callPackage ../games/orthorobot { love = love_0_10; }; pacvim = callPackage ../games/pacvim { }; @@ -35401,6 +35954,7 @@ with pkgs; }); steam = steamPackages.steam-fhsenv; + steam-small = steamPackages.steam-fhsenv-small; steam-run = steam.run; @@ -35454,6 +36008,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + theforceengine = callPackage ../games/theforceengine { }; + tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; tbls = callPackage ../tools/misc/tbls { }; @@ -35462,10 +36018,11 @@ with pkgs; teetertorture = callPackage ../games/teetertorture { }; - teeworlds = callPackage ../games/teeworlds { }; + teeworlds = callPackage ../games/teeworlds { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; tengine = callPackage ../servers/http/tengine { - openssl = openssl_1_1; modules = with nginxModules; [ rtmp dav moreheaders modsecurity ]; }; @@ -35485,7 +36042,9 @@ with pkgs; tome4 = callPackage ../games/tome4 { }; - toppler = callPackage ../games/toppler { }; + toppler = callPackage ../games/toppler { + SDL2_image = SDL2_image_2_0_5; + }; torus-trooper = callPackage ../games/torus-trooper { }; @@ -35562,6 +36121,10 @@ with pkgs; libpng = libpng12; }; + vvvvvv = callPackage ../games/vvvvvv { + inherit (darwin.apple_sdk.frameworks) Foundation IOKit; + }; + wargus = callPackage ../games/wargus { }; warmux = callPackage ../games/warmux { }; @@ -35690,6 +36253,8 @@ with pkgs; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; + deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -35806,6 +36371,10 @@ with pkgs; molden = callPackage ../applications/science/chemistry/molden { }; + mopac = callPackage ../applications/science/chemistry/mopac { }; + + nwchem = callPackage ../applications/science/chemistry/nwchem { }; + octopus = callPackage ../applications/science/chemistry/octopus { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { }; @@ -35830,6 +36399,8 @@ with pkgs; siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; }; + wxmacmolplt = callPackage ../applications/science/chemistry/wxmacmolplt { }; + ### SCIENCE/GEOMETRY antiprism = callPackage ../applications/science/geometry/antiprism { }; @@ -35994,11 +36565,15 @@ with pkgs; n3 = callPackage ../applications/science/biology/N3 { }; - neuron = callPackage ../applications/science/biology/neuron { python = null; }; + nest = callPackage ../applications/science/biology/nest { }; + + nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; }; + + neuron = callPackage ../applications/science/biology/neuron { }; neuron-mpi = neuron.override {useMpi = true; }; - neuron-full = neuron-mpi.override { python = python2; }; + neuron-full = neuron-mpi.override { useCore = true; useRx3d = true; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -36209,18 +36784,19 @@ with pkgs; lie = callPackage ../applications/science/math/LiE { }; - magma = callPackage ../development/libraries/science/math/magma { + inherit (callPackage ../development/libraries/science/math/magma { inherit (llvmPackages_rocm) openmp; - }; + }) magma magma_2_7_1 magma_2_6_2; magma-cuda = magma.override { - useCUDA = true; - useROCM = false; + cudaSupport = true; + rocmSupport = false; }; - magma-hip = magma.override { - useCUDA = false; - useROCM = true; + # TODO:AMD won't compile with anything newer than 2.6.2 -- it fails at the linking stage. + magma-hip = magma_2_6_2.override { + cudaSupport = false; + rocmSupport = true; }; clmagma = callPackage ../development/libraries/science/math/clmagma { }; @@ -36623,7 +37199,8 @@ with pkgs; inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_11 - z3_4_8; + z3_4_8 + z3_4_8_5; z3 = z3_4_8; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; @@ -36916,7 +37493,7 @@ with pkgs; python = python3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL; # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { @@ -37186,6 +37763,8 @@ with pkgs; dump = callPackage ../tools/backup/dump { }; dxvk = callPackage ../misc/dxvk { }; + dxvk_1 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "1.10"; }; + dxvk_2 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "2.1"; }; ecdsatool = callPackage ../tools/security/ecdsatool { }; @@ -37335,6 +37914,8 @@ with pkgs; inherit (darwin) sigtool; }; + lima-bin = callPackage ../applications/virtualization/lima/bin.nix { }; + logtop = callPackage ../tools/misc/logtop { }; igraph = callPackage ../development/libraries/igraph { }; @@ -37403,7 +37984,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration; }; - lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; + lilypond = callPackage ../misc/lilypond { }; lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; @@ -37458,6 +38039,8 @@ with pkgs; neo = callPackage ../applications/misc/neo { }; + networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { }; + nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; @@ -37567,13 +38150,13 @@ with pkgs; nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; + nixos-render-docs = callPackage ../tools/nix/nixos-render-docs { }; + nixdoc = callPackage ../tools/nix/nixdoc {}; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_12; # fails to build with 2.13 - }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -37590,6 +38173,8 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; + nix-init = callPackage ../tools/nix/nix-init { }; + nix-index-unwrapped = callPackage ../tools/package-management/nix-index { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -37746,7 +38331,9 @@ with pkgs; pgadmin4 = callPackage ../tools/admin/pgadmin { }; - pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; + pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; }; + + pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { }; physlock = callPackage ../misc/screensavers/physlock { }; @@ -37850,6 +38437,14 @@ with pkgs; sailsd = callPackage ../misc/sailsd { }; + sail-riscv-rv32 = callPackage ../applications/virtualization/sail-riscv { + arch = "RV32"; + }; + + sail-riscv-rv64 = callPackage ../applications/virtualization/sail-riscv { + arch = "RV64"; + }; + shc = callPackage ../tools/security/shc { }; shellz = callPackage ../tools/security/shellz { }; @@ -37983,6 +38578,8 @@ with pkgs; prow = callPackage ../applications/networking/cluster/prow { }; + pv-migrate = callPackage ../applications/networking/cluster/pv-migrate { }; + tagref = callPackage ../tools/misc/tagref { }; tcat = callPackage ../tools/misc/tcat { }; @@ -38061,7 +38658,7 @@ with pkgs; trufflehog = callPackage ../tools/security/trufflehog { }; - tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; + tvbrowser = callPackage ../applications/misc/tvbrowser { }; tvheadend = callPackage ../servers/tvheadend { dtv-scan-tables = dtv-scan-tables_tvheadend; @@ -38275,9 +38872,7 @@ with pkgs; xorex = callPackage ../tools/security/xorex { }; - xbps = callPackage ../tools/package-management/xbps { - openssl = openssl_1_1; - }; + xbps = callPackage ../tools/package-management/xbps { }; xcftools = callPackage ../tools/graphics/xcftools { }; @@ -38345,10 +38940,14 @@ with pkgs; yara = callPackage ../tools/security/yara { }; + yaralyzer = callPackage ../tools/security/yaralyzer { }; + yarGen = callPackage ../tools/security/yarGen { }; yersinia = callPackage ../tools/security/yersinia { }; + yatas = callPackage ../tools/security/yatas { }; + yaxg = callPackage ../tools/graphics/yaxg {}; zap = callPackage ../tools/networking/zap { }; @@ -38489,6 +39088,8 @@ with pkgs; undaemonize = callPackage ../tools/system/undaemonize {}; + wtfis = callPackage ../tools/networking/wtfis { }; + houdini = callPackage ../applications/misc/houdini {}; openfst = callPackage ../development/libraries/openfst {}; @@ -38497,8 +39098,9 @@ with pkgs; openring = callPackage ../applications/misc/openring { }; - openvino = callPackage ../development/libraries/openvino - { stdenv = gcc10StdenvCompat; python = python3; }; + openvino = callPackage ../development/libraries/openvino { + python = python3; + }; phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 @@ -38533,9 +39135,7 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { - inherit (darwin.apple_sdk.frameworks) Security; - }; + simple-http-server = callPackage ../servers/simple-http-server { }; diceware = with python3Packages; toPythonApplication diceware; @@ -38632,6 +39232,8 @@ with pkgs; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + zfxtop = callPackage ../tools/system/zfxtop { }; + zrepl = callPackage ../tools/backup/zrepl { }; uhubctl = callPackage ../tools/misc/uhubctl {}; @@ -38696,12 +39298,11 @@ with pkgs; btcdeb = callPackage ../applications/blockchains/btcdeb { }; - jami = callPackages ../applications/networking/instant-messengers/jami { + jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; }; - inherit (jami) jami-daemon jami-client; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; @@ -38751,12 +39352,16 @@ with pkgs; xmcp = callPackage ../tools/X11/xmcp { }; + yesplaymusic = callPackage ../applications/audio/yesplaymusic { }; + ymuse = callPackage ../applications/audio/ymuse { }; zk = callPackage ../applications/office/zk {}; zktree = callPackage ../applications/misc/zktree {}; + zram-generator = callPackage ../tools/system/zram-generator { }; + zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; }; @@ -38771,7 +39376,7 @@ with pkgs; mictray = callPackage ../tools/audio/mictray { }; - swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { }; + swift-corelibs-libdispatch = swiftPackages.Dispatch; swaysettings = callPackage ../applications/misc/swaysettings { }; @@ -38781,6 +39386,8 @@ with pkgs; alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { }; + flac2all = callPackage ../applications/audio/flac2all {}; + tuner = callPackage ../applications/audio/tuner { }; locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { }; @@ -38796,4 +39403,8 @@ with pkgs; resgate = callPackage ../servers/resgate { }; oversteer = callPackage ../applications/misc/oversteer { }; + + volantes-cursors = callPackage ../data/icons/volantes-cursors { }; + + gnss-share = callPackage ../servers/gnss-share { }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 261bfb09f4106..0b9148d2bb628 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -34,6 +34,7 @@ let coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; + coq-lsp = callPackage ../development/coq-modules/coq-lsp {}; coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; coqeal = callPackage ../development/coq-modules/coqeal {}; coqhammer = callPackage ../development/coq-modules/coqhammer {}; @@ -111,7 +112,10 @@ let trakt = callPackage ../development/coq-modules/trakt {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST {}; + VST = callPackage ../development/coq-modules/VST (lib.optionalAttrs + (lib.versionAtLeast self.coq.version "8.14") { + compcert = self.compcert.override { version = "3.11"; }; + }); zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index c57e486406e1f..2044d74cab79d 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -50,7 +50,7 @@ let autoAddOpenGLRunpathHook = final.callPackage ( { makeSetupHook, addOpenGLRunpath }: makeSetupHook { name = "auto-add-opengl-runpath-hook"; - deps = [ + propagatedBuildInputs = [ addOpenGLRunpath ]; } ../development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index cb32a46ca25d6..68b50fa9ab08f 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -41,7 +41,7 @@ makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spl useAppleSDKLibs = stdenv.hostPlatform.isAarch64; selectAttrs = attrs: names: - lib.listToAttrs (lib.concatMap (n: if attrs ? "${n}" then [(lib.nameValuePair n attrs."${n}")] else []) names); + lib.listToAttrs (lib.concatMap (n: lib.optionals (attrs ? "${n}") [(lib.nameValuePair n attrs."${n}")]) names); chooseLibs = ( # There are differences in which libraries are exported. Avoid evaluation @@ -120,7 +120,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { rewrite-tbd = callPackage ../os-specific/darwin/rewrite-tbd { }; checkReexportsHook = pkgs.makeSetupHook { - deps = [ pkgs.darwin.print-reexports ]; + name = "darwin-check-reexports-hook"; + propagatedBuildInputs = [ pkgs.darwin.print-reexports ]; } ../os-specific/darwin/print-reexports/setup-hook.sh; sigtool = callPackage ../os-specific/darwin/sigtool { }; @@ -140,7 +141,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { signingUtils = callPackage ../os-specific/darwin/signing-utils { }; autoSignDarwinBinariesHook = pkgs.makeSetupHook { - deps = [ self.signingUtils ]; + name = "auto-sign-darwin-binaries-hook"; + propagatedBuildInputs = [ self.signingUtils ]; } ../os-specific/darwin/signing-utils/auto-sign-hook.sh; maloader = callPackage ../os-specific/darwin/maloader { @@ -168,6 +170,10 @@ impure-cmds // appleSourcePackages // chooseLibs // { opencflite = callPackage ../os-specific/darwin/opencflite { }; + openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { + inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers; + }; + stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; trash = callPackage ../os-specific/darwin/trash { }; @@ -176,9 +182,12 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) xcode_8_1 xcode_8_2 - xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1 - xcode_10_2 xcode_10_2_1 xcode_10_3 - xcode_11 + xcode_9_1 xcode_9_2 xcode_9_3 xcode_9_4 xcode_9_4_1 + xcode_10_1 xcode_10_2 xcode_10_2_1 xcode_10_3 + xcode_11 xcode_11_1 xcode_11_2 xcode_11_3_1 xcode_11_4 xcode_11_5 xcode_11_6 xcode_11_7 + xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1 + xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 + xcode_14 xcode_14_1 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index d5f820d0d60b9..15baf5ba72910 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -8,7 +8,7 @@ with pkgs; rec { json_c = (pkgs.json_c.override { stdenv = pkgs.emscriptenStdenv; - }).overrideDerivation + }).overrideAttrs (old: { nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ zlib ]; @@ -47,7 +47,7 @@ rec { libxml2 = (pkgs.libxml2.override { stdenv = emscriptenStdenv; pythonSupport = false; - }).overrideDerivation + }).overrideAttrs (old: { propagatedBuildInputs = [ zlib ]; nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; @@ -138,11 +138,11 @@ rec { zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; - }).overrideDerivation + }).overrideAttrs (old: { nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; # we need to reset this setting! - NIX_CFLAGS_COMPILE=""; + env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; dontStrip = true; outputs = [ "out" ]; buildPhase = '' diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4beafcfd3c4a..6a2ed917c3088 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -18,6 +18,7 @@ let "ghc90" "ghc924" "ghc925" + "ghc926" "ghc92" "ghc942" "ghc943" @@ -32,6 +33,7 @@ let "ghc92" "ghc924" "ghc925" + "ghc926" "ghc94" "ghc942" "ghc943" @@ -187,7 +189,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc92 = ghc924; + ghc926 = callPackage ../development/compilers/ghc/9.2.6.nix { + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + if stdenv.hostPlatform.isAarch then + packages.ghc8107BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc810 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc92 = ghc926; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to @@ -386,7 +405,12 @@ in { ghc = bh.compiler.ghc925; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; - ghc92 = ghc924; + ghc926 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc926; + ghc = bh.compiler.ghc926; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + }; + ghc92 = ghc926; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; @@ -406,7 +430,7 @@ in { ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; ghcjs = packages.ghcjs810; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5d15cff25df15..fa83d6c925fcb 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -45,6 +45,9 @@ let url = "mirror://kernel/linux/kernel/v${major}.x/linux-${version}.tar.xz"; inherit sha256; }; + extraMeta = { + broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4"); + }; }; kernelPatches = kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} @@ -93,8 +96,6 @@ in { rpiVersion = 4; }; - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -148,6 +149,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding ]; }; @@ -159,16 +161,19 @@ in { ]; }; - linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; - - linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; - - linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; - linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding + ]; + }; + + linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding ]; }; @@ -184,9 +189,18 @@ in { then latest else testing; - linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_6_1; - kernelPatches = kernel.kernelPatches; + linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { + # Pinned on the last version which Kent's commits can be cleany rebased up. + kernel = buildLinux rec { + version = "6.1.3"; + modDirVersion = lib.versions.pad 3 version; + extraMeta.branch = lib.versions.majorMinor version; + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; + }; + }; + kernelPatches = linux_6_1.kernelPatches; }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { @@ -226,7 +240,6 @@ in { linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = xanmodKernels.main; linux_xanmod_latest = xanmodKernels.main; - linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -239,11 +252,19 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; + linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; + + } // lib.optionalAttrs config.allowAliases { + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; + linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; + linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; + linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; + + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; + linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; - linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; - })); /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -306,7 +327,7 @@ in { dpdk = pkgs.dpdk.override { inherit kernel; }; - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + exfat-nofuse = if lib.versionOlder kernel.version "5.8" then callPackage ../os-specific/linux/exfat { } else null; evdi = callPackage ../os-specific/linux/evdi { }; @@ -519,16 +540,18 @@ in { vanillaPackages = { # recurse to build modules for the kernels - linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); + linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); + linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2); + } // lib.optionalAttrs config.allowAliases { + linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 - linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); }; rtPackages = { @@ -567,9 +590,6 @@ in { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; - linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); @@ -577,19 +597,23 @@ in { linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); - linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre); linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); + } // lib.optionalAttrs config.allowAliases { + linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; + linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; + linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; }); packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_1; + linux_latest = packages.linux_6_2; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 6858e37fabeb8..ea975a9b6fcc6 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -47,10 +47,10 @@ pkgs.releaseTools.sourceTarball { opts=(--option build-users-group "") nix-store --init - header "checking eval-release.nix" + echo "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null - header "checking find-tarballs.nix" + echo "checking find-tarballs.nix" nix-instantiate --readonly-mode --eval --strict --show-trace --json \ ./maintainers/scripts/find-tarballs.nix \ --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json @@ -61,10 +61,10 @@ pkgs.releaseTools.sourceTarball { exit 1 fi - header "generating packages.json" + echo "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 67863c3ac06d2..ddd33e151ebf8 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -18,6 +18,8 @@ lib.makeScope newScope (self: base32 = callPackage ../development/nim-packages/base32 { }; + base45 = callPackage ../development/nim-packages/base45 { }; + bumpy = callPackage ../development/nim-packages/bumpy { }; c2nim = callPackage ../development/nim-packages/c2nim { }; diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index e2b81b20c5b08..ab9dac4b380ca 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -32,7 +32,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do - header "checking Nixpkgs on $platform" + echo "checking Nixpkgs on $platform" # To get a call trace; see https://nixos.org/manual/nixpkgs/stable/#function-library-lib.trivial.warn # Relies on impure eval diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 03bd642550f18..b91c1ae009ba5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -357,7 +357,12 @@ let then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; - dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; + dune_3 = + if lib.versionAtLeast ocaml.version "4.08" + then callPackage ../development/tools/ocaml/dune/3.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_3 + else throw "dune_3 is not available for OCaml ${ocaml.version}"; dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; @@ -738,6 +743,8 @@ let lastfm = callPackage ../development/ocaml-modules/lastfm { }; + lem = callPackage ../development/ocaml-modules/lem { }; + lens = callPackage ../development/ocaml-modules/lens { }; letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; @@ -752,6 +759,8 @@ let linenoise = callPackage ../development/ocaml-modules/linenoise { }; + linksem = callPackage ../development/ocaml-modules/linksem { }; + llvm = callPackage ../development/ocaml-modules/llvm { libllvm = pkgs.llvmPackages_10.libllvm; }; @@ -1233,6 +1242,10 @@ let rock = callPackage ../development/ocaml-modules/rock { }; + rusage = callPackage ../development/ocaml-modules/rusage { }; + + sail = callPackage ../development/ocaml-modules/sail { }; + samplerate = callPackage ../development/ocaml-modules/samplerate { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { @@ -1247,6 +1260,8 @@ let inherit (pkgs) shine; }; + simple-diff = callPackage ../development/ocaml-modules/simple-diff { }; + sosa = callPackage ../development/ocaml-modules/sosa { }; soundtouch = callPackage ../development/ocaml-modules/soundtouch { @@ -1477,7 +1492,9 @@ let trie = callPackage ../development/ocaml-modules/trie { }; - tsdl = callPackage ../development/ocaml-modules/tsdl { }; + tsdl = callPackage ../development/ocaml-modules/tsdl { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback; + }; tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a25ff5f986de7..c75df40fce2c8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -915,11 +915,11 @@ let }; AppSqitch = buildPerlModule { - version = "1.1.0"; + version = "1.3.1"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.1.0.tar.gz"; - hash = "sha256-7hRs111jAIN+bKVZuwveJH1CEjyWssXUsoAPONPj0as="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.3.1.tar.gz"; + hash = "sha256-9edo0pjNQEfuKuQjGXgujCzaMSc3vL2/r1gL1H7+i5Q="; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; @@ -1147,7 +1147,7 @@ let hash = "sha256-gxJyAnHHrdxLvuwzEs3divS5kKxjYgSllsB5M61sY0o="; }; buildInputs = [ pkgs.zlib TestWarn ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { description = "Fast C metadata and tag reader for all common audio file formats"; @@ -1544,7 +1544,7 @@ let url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; hash = "sha256-o/LKnSuu/BqqQJCLL5y5KS/aPn15fji7146rudna62s="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.db4.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.db4.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.db4.out}/lib -ldb"; buildInputs = [ pkgs.db4 ]; propagatedBuildInputs = [ commonsense ]; @@ -2001,7 +2001,7 @@ let propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; meta = { description = "Perl interface to the cairo 2d vector graphics library"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Only ]; }; }; @@ -2017,7 +2017,7 @@ let propagatedBuildInputs = [ Cairo Glib ]; meta = { description = "Integrate Cairo into the Glib type system"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Only ]; }; }; @@ -4726,7 +4726,7 @@ let hash = "sha256-UeekeuWUz1X2bAdi9mkhVIbn2LNGC9rf55NQzPJtrzg="; }; buildInputs = [ pkgs.gmp DevelChecklib TestRequires ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "Crypt::DH Using GMP Directly"; @@ -5084,7 +5084,7 @@ let url = "mirror://cpan/authors/id/M/MG/MGREGORO/Crypt-Sodium-0.11.tar.gz"; hash = "sha256-kHxzoQVs6gV9qYGa6kipKreG5qqq858c3ZZHsj8RbHg="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.libsodium.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.libsodium.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.libsodium.out}/lib -lsodium"; meta = { description = "Perl bindings for libsodium (NaCL)"; @@ -5144,7 +5144,7 @@ let url = "mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz"; hash = "sha256-tm+rUU7fl/wy9Y2iV1gnBKIQwrNeKX1cMbf6L/0I6Qg="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; meta = { description = "Perl wrapper around OpenSSL's AES library"; @@ -5159,7 +5159,7 @@ let url = "mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz"; hash = "sha256-I05y+4OW1FUn5v1F5DdZxcPzogjPjynmoiFhqZb9Qtw="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; meta = { description = "OpenSSL's multiprecision integer arithmetic"; @@ -5188,7 +5188,7 @@ let url = "mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz"; hash = "sha256-8IdvqhujER45uGqnMMYDIR7/KQXkYMcqV7YejPR1zvQ="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; meta = { @@ -5200,14 +5200,14 @@ let CryptOpenSSLRSA = buildPerlPackage { pname = "Crypt-OpenSSL-RSA"; - version = "0.31"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz"; - hash = "sha256-QXNAOtTPdnMhkgmfgz+/vzzYEE4CRrOEQYeuOE0sVDY="; + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.33.tar.gz"; + hash = "sha256-vb5jD21vVAMldGrZmXcnKshmT/gb0Z8K2rptb0Xv2GQ="; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -lcrypto"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; meta = { description = "RSA encoding and decoding, using the openSSL libraries"; @@ -5222,7 +5222,7 @@ let url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.914.tar.gz"; hash = "sha256-ScV1JX5kCK1aiQEeW1gA1Zj5zK/fQucQBO2Byy9E7no="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; buildInputs = [ CryptOpenSSLGuess ]; propagatedBuildInputs = [ ConvertASN1 ]; @@ -9139,6 +9139,22 @@ let }; }; + FileDirList = buildPerlPackage { + version = "0.05"; + pname = "File-DirList"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TP/TPABA/File-DirList/File-DirList-0.05.tar.gz"; + sha256 = "sha256-mTt9dmLlV5hEih7azLmr0oHSvSO+fquZ9Wm44pYtO8M="; + }; + preCheck = '' + export HOME="$TMPDIR" + ''; + meta = { + description = "Provide a sorted list of directory content"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileFindIterator = buildPerlPackage { pname = "File-Find-Iterator"; version = "0.4"; @@ -10208,7 +10224,7 @@ let propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; meta = { description = "Perl wrappers for the GLib utility and Object libraries"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Only ]; }; }; @@ -10236,7 +10252,7 @@ let doCheck = !stdenv.isDarwin; meta = { description = "Dynamically create Perl language bindings"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Only ]; }; }; @@ -10252,7 +10268,7 @@ let propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; meta = { description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME libraries"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Plus ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gnome2Canvas.x86_64-darwin }; @@ -10552,7 +10568,7 @@ let propagatedBuildInputs = [ Pango ]; meta = { description = "Perl interface to the 2.x series of the Gimp Toolkit library"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Plus ]; }; }; @@ -12911,12 +12927,12 @@ let }; }; - libapreq2 = buildPerlPackage { + libapreq2 = buildPerlPackage rec { pname = "libapreq2"; - version = "2.16"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libapreq2-2.16.tar.gz"; - hash = "sha256-4EyFWj6gcLiGNWn7rgL+go9TSsiHVbI+JNOGPMlZg0k="; + url = "mirror://apache/httpd/libapreq/${pname}-${version}.tar.gz"; + hash = "sha256-BGSH8ITBL6HIIq/8X33lbv7ZtIkFpCbmMaa5ScEU2Gw="; }; outputs = [ "out" ]; buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; @@ -14436,7 +14452,7 @@ let }; buildInputs = [ pkgs.gmp ]; doCheck = false; - NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -14508,7 +14524,7 @@ let hash = "sha256-Ftpfge9SdChiuzyHhASq/bJM2rT4rL/KEoAzJIe8VV8="; }; buildInputs = [ pkgs.gmp AlienGMP ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "High speed arbitrary size integer math"; @@ -14589,7 +14605,7 @@ let # Workaround build failure on -fno-common toolchains: # ld: libPARI/libPARI.a(compat.o):(.bss+0x8): multiple definition of # `overflow'; Pari.o:(.bss+0x80): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz"; makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tgz" ]; src = fetchurl { @@ -14642,7 +14658,7 @@ let hash = "sha256-JpfH/Vx+Nf3sf1DtVqZ76Aei8iZXWJ5jfa01knRAA74="; }; buildInputs = [ pkgs.gmp ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "Utilities related to prime numbers, using GMP"; @@ -17171,7 +17187,7 @@ let }; buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fno-stack-protector"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; meta = { description = "Moose minus the antlers"; @@ -17825,6 +17841,21 @@ let }; }; + NetIPXS = buildPerlPackage { + pname = "Net-IP-XS"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOMHRR/Net-IP-XS-0.22.tar.gz"; + hash = "sha256-JZe0aDizgur3S6XJnD9gpqC1poHsNqFBchJL9E9LGSA="; + }; + propagatedBuildInputs = [ IOCapture TieSimple ]; + meta = { + homepage = "https://github.com/tomhrr/p5-Net-IP-XS"; + description = "IPv4/IPv6 address library"; + license = with lib.licenses; [ gpl2Plus ]; + }; + }; + NetLDAPServer = buildPerlPackage { pname = "Net-LDAP-Server"; version = "0.43"; @@ -18597,7 +18628,7 @@ let # fix "error: format not a string literal and no format arguments [-Werror=format-security]" hardeningDisable = [ "format" ]; # Make the async API accessible - NIX_CFLAGS_COMPILE = "-DTHREADED"; + env.NIX_CFLAGS_COMPILE = "-DTHREADED"; NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; # Most tests are skipped as no server is available in the sandbox. # `t/35_log.t` seems to suffer from a race condition; remove it. See @@ -18701,7 +18732,7 @@ let propagatedBuildInputs = [ Cairo Glib ]; meta = { description = "Layout and render international text"; - homepage = "http://gtk2-perl.sourceforge.net"; + homepage = "https://gtk2-perl.sourceforge.net"; license = with lib.licenses; [ lgpl21Plus ]; }; }; @@ -19469,10 +19500,10 @@ let PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.0.11-1"; + version = "7.1.0-0"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI="; + hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = @@ -22907,10 +22938,10 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "3.009"; + version = "3.101"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz"; - hash = "sha256-1q0ju/Y3pZtd/RrABkYN/LGFmC5IUs3ncVD70IXx9bY="; + url = "mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz"; + hash = "sha256-0qMt1sIeSzfGqT34CHyp6IDPrmE6Pl766jB7C9yu21g="; }; doCheck = !stdenv.isDarwin; propagatedBuildInputs = [ AppConfig ]; @@ -24991,7 +25022,7 @@ let }; propagatedBuildInputs = [ pkgs.aspell ]; ASPELL_CONF = "dict-dir ${pkgs.aspellDicts.en}/lib/aspell"; - NIX_CFLAGS_COMPILE = "-I${pkgs.aspell}/include"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.aspell}/include"; NIX_CFLAGS_LINK = "-L${pkgs.aspell}/lib -laspell"; meta = { description = "Perl interface to the GNU Aspell library"; @@ -25690,7 +25721,7 @@ let hash = "sha256-J45u/Jsk82mclh77NuvmAqNAi1QVcgF97hMdFScocys="; }; # https://rt.cpan.org/Public/Bug/Display.html?id=124815 - NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF"; + env.NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF"; meta = { description = "Remove accents from a string"; license = with lib.licenses; [ gpl2Only ]; @@ -26506,10 +26537,10 @@ let URIdb = buildPerlModule { pname = "URI-db"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz"; - hash = "sha256-xJmd6vRRZSIWAyyOMn/25tZVU56sN5CVu2mww2nvplg="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.20.tar.gz"; + hash = "sha256-FMjaFawgljG445/BJFHJsTEa0LXKX5Aye9+peLfRPxQ="; }; propagatedBuildInputs = [ URINested ]; meta = { @@ -26818,7 +26849,7 @@ let name = "WWWCurl-curl-7.71.0.patch"; }) ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; buildInputs = [ pkgs.curl ]; doCheck = false; # performs network access meta = { @@ -27791,10 +27822,10 @@ let ZonemasterCLI = buildPerlPackage { pname = "Zonemaster-CLI"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v4.0.1.tar.gz"; - hash = "sha256-7dNPe4E35JLmzoR0xFpVBXLcpQVqve/EXAdt+daWXKA="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v5.0.1.tar.gz"; + hash = "sha256-a/PPgavkaw9gCW44rj7+6AjOOSHKglg4H3kr6jXuRE4="; }; propagatedBuildInputs = [ JSONXS @@ -27818,18 +27849,13 @@ let ZonemasterEngine = buildPerlPackage { pname = "Zonemaster-Engine"; - version = "4.5.1"; + version = "4.6.1"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.5.1.tar.gz"; - hash = "sha256-RdIExtrXzZAXYIS/JCe6qM5QNoSlaZ6+sjbk0zvAuoY="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-Engine-v4.6.1.tar.gz"; + hash = "sha256-4AXo3bZTOLnnPjjX5KNb/2O7MRqcAtlqpz5sPwNN9b0="; }; buildInputs = [ PodCoverage TestDifferences TestException TestFatal TestNoWarnings TestPod ]; - propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP Readonly TextCSV ZonemasterLDNS libintl-perl ]; - - preCheck = '' - # disable dnssec test as it fails - rm -f t/Test-dnssec.t t/manifest.t - ''; + propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP NetIPXS Readonly TextCSV ZonemasterLDNS libintl-perl ]; meta = { description = "A tool to check the quality of a DNS zone"; @@ -27839,18 +27865,18 @@ let ZonemasterLDNS = buildPerlPackage { pname = "Zonemaster-LDNS"; - version = "2.2.2"; + version = "3.1.0"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-2.2.2.tar.gz"; - hash = "sha256-4KccPjWqdhkJvjI9QQGCPX/B8vRUGw91eUUgxhHk788="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.1.0.tar.gz"; + hash = "sha256-Rr4uoQg5g9/ZLVnFQiLAz5MB+Uj39U24YWEa+o2+9HE="; }; - NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include -I${pkgs.libidn2}.dev}/include"; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; + env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; - makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl_1_1.dev}" ]; + makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl.dev}" ]; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 45baedbbbd653..f819d2fd365b5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -57,15 +57,22 @@ lib.makeScope pkgs.newScope (self: with self; { # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. - mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${pname}"; - passthru = { - updateScript = nix-update-script {}; - }; - meta = args.meta // { - mainProgram = args.meta.mainProgram or pname; - }; - }); + mkDerivation = origArgs: + let + args = lib.fix (lib.extends + (_: previousAttrs: { + pname = "php-${previousAttrs.pname}"; + passthru = (previousAttrs.passthru or { }) // { + updateScript = nix-update-script { }; + }; + meta = (previousAttrs.meta or { }) // { + mainProgram = previousAttrs.meta.mainProgram or previousAttrs.pname; + }; + }) + (if lib.isFunction origArgs then origArgs else (_: origArgs)) + ); + in + pkgs.stdenv.mkDerivation args; # Function to build an extension which is shipped as part of the php # source, based on the php version. @@ -411,14 +418,15 @@ lib.makeScope pkgs.newScope (self: with self; { valgrind.dev ]; zendExtension = true; - patches = [ ] ++ lib.optionals (lib.versionAtLeast php.version "8.1") [ - (fetchpatch { - # See https://github.com/php/php-src/pull/10266 - name = "avoid-opcache-test-failures.patch"; - url = "https://github.com/PHP/php-src/commit/9216d14b3abfc727b0668592b48699440137aa74.patch"; - sha256 = "sha256-/U6LMn/QGM8BXlh+Etl1z97v3qZFiWL2G3ZopNYShGU="; - }) - ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Tests are flaky on darwin + rm ext/opcache/tests/blacklist.phpt + rm ext/opcache/tests/bug66338.phpt + rm ext/opcache/tests/bug78106.phpt + rm ext/opcache/tests/issue0115.phpt + rm ext/opcache/tests/issue0149.phpt + rm ext/opcache/tests/revalidate_path_01.phpt + ''; # Tests launch the builtin webserver. __darwinAllowLocalNetworking = true; } @@ -555,7 +563,7 @@ lib.makeScope pkgs.newScope (self: with self; { name = "xmlreader"; buildInputs = [ libxml2 ]; internalDeps = [ php.extensions.dom ]; - NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I../.." "-DHAVE_DOM" ]; doCheck = false; configureFlags = [ "--enable-xmlreader" diff --git a/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix new file mode 100644 index 0000000000000..b3cf3cdca2fcd --- /dev/null +++ b/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix @@ -0,0 +1,45 @@ +/* A set of aliases to be used in generated expressions. + + In case of ambiguity, this will pick a sensible default. + + This was initially based on cabal2nix's mapping. + + It'd be nice to generate this mapping, based on a set of derivations. + It can not be fully automated, so it should be a expression or tool + that makes suggestions about which pkg-config module names can be added. + */ +pkgs: + +let + inherit (pkgs) lib; + inherit (lib) + all + flip + mapAttrs + mapAttrsToList + getAttrFromPath + importJSON + ; + + data = importJSON ./pkg-config-data.json; + inherit (data) modules; + + platform = pkgs.stdenv.hostPlatform; + + isSupported = moduleData: + moduleData?supportedWhenPlatformAttrsEqual -> + all (x: x) ( + mapAttrsToList + (k: v: platform?${k} && platform.${k} == v) + moduleData.supportedWhenPlatformAttrsEqual + ); + + modulePkgs = flip mapAttrs modules (_moduleName: moduleData: + if moduleData?attrPath && isSupported moduleData then + getAttrFromPath moduleData.attrPath pkgs + else + null + ); + +in + modulePkgs diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json new file mode 100644 index 0000000000000..758986390b227 --- /dev/null +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -0,0 +1,969 @@ +{ + "version": { + "major": 0, + "minor": 1 + }, + "modules": { + "IL": { + "attrPath": [ + "libdevil" + ] + }, + "ImageMagick": { + "attrPath": [ + "imagemagick" + ] + }, + "MagickWand": { + "attrPath": [ + "imagemagick" + ] + }, + "Qt5Concurrent": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Core": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5DBus": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Gui": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Network": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGL": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGLExtensions": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5PrintSupport": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Qml": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QmlModels": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Quick": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickTest": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickWidgets": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Sql": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Test": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Widgets": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Xml": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "SoapySDR": { + "attrPath": [ + "soapysdr" + ] + }, + "alsa": { + "attrPath": [ + "alsa-lib" + ] + }, + "alsa-topology": { + "attrPath": [ + "alsa-lib" + ] + }, + "appindicator-0.1": { + "attrPath": [ + "libappindicator-gtk2" + ] + }, + "appindicator3-0.1": { + "attrPath": [ + "libappindicator-gtk3" + ] + }, + "bzip2": { + "attrPath": [ + "bzip2" + ] + }, + "cairo-gobject": { + "attrPath": [ + "cairo" + ] + }, + "cairo-pdf": { + "attrPath": [ + "cairo" + ] + }, + "cairo-ps": { + "attrPath": [ + "cairo" + ] + }, + "cairo-svg": { + "attrPath": [ + "cairo" + ] + }, + "dbusmenu-glib-0.4": { + "attrPath": [ + "libdbusmenu" + ] + }, + "dbusmenu-gtk3-0.4": { + "attrPath": [ + "libdbusmenu-gtk3" + ] + }, + "egl": { + "attrPath": [ + "libGL" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "fftw3": { + "attrPath": [ + "fftw" + ] + }, + "fftw3f": { + "attrPath": [ + "fftwFloat" + ] + }, + "form": { + "attrPath": [ + "ncurses" + ] + }, + "formw": { + "attrPath": [ + "ncurses" + ] + }, + "freealut": { + "attrPath": [ + "freealut" + ] + }, + "freetype2": { + "attrPath": [ + "freetype" + ] + }, + "gdk-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gdk-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gdk-pixbuf-2.0": { + "attrPath": [ + "gdk-pixbuf" + ] + }, + "gdk-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gdk-x11-3.0": { + "attrPath": [ + "gtk3-x11" + ] + }, + "geos": { + "attrPath": [ + "geos" + ] + }, + "gio-2.0": { + "attrPath": [ + "glib" + ] + }, + "gl": { + "attrPath": [ + "libGL" + ] + }, + "glew": { + "attrPath": [ + "glew" + ] + }, + "glu": { + "attrPath": [ + "libGLU" + ] + }, + "glut": { + "attrPath": [ + "freeglut" + ] + }, + "gnome-keyring-1": { + "attrPath": [ + "libgnome-keyring" + ] + }, + "gnome-vfs-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gnome-vfs-module-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gobject-2.0": { + "attrPath": [ + "glib" + ] + }, + "gobject-introspection-1.0": { + "attrPath": [ + "gobject-introspection" + ] + }, + "gstreamer-audio-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-base-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-controller-1.0": { + "attrPath": [ + "gst_all_1", + "gstreamer" + ] + }, + "gstreamer-net-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-video-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gthread-2.0": { + "attrPath": [ + "glib" + ] + }, + "gtk+-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gtk+-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gtk+-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gtksourceview-3.0": { + "attrPath": [ + "gtksourceview3" + ] + }, + "hidapi": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": true + } + }, + "hidapi-hidraw": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "hidapi-libusb": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "icu-i18n": { + "attrPath": [ + "icu" + ] + }, + "icu-io": { + "attrPath": [ + "icu" + ] + }, + "icu-uc": { + "attrPath": [ + "icu" + ] + }, + "imlib2": { + "attrPath": [ + "imlib2" + ] + }, + "jack": { + "attrPath": [ + "libjack2" + ] + }, + "javascriptcoregtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "lapack": { + "attrPath": [ + "liblapack" + ] + }, + "libR": { + "attrPath": [ + "R" + ] + }, + "libavutil": { + "attrPath": [ + "ffmpeg" + ] + }, + "libb2": { + "attrPath": [ + "libb2" + ] + }, + "libbrotlidec": { + "attrPath": [ + "brotli" + ] + }, + "libbrotlienc": { + "attrPath": [ + "brotli" + ] + }, + "libcrypto": { + "attrPath": [ + "openssl" + ] + }, + "libcurl": { + "attrPath": [ + "curl" + ] + }, + "libecpg": { + "attrPath": [ + "postgresql" + ] + }, + "libecpg_compat": { + "attrPath": [ + "postgresql" + ] + }, + "libgsasl": { + "attrPath": [ + "gsasl" + ] + }, + "libidn": { + "attrPath": [ + "libidn" + ] + }, + "libjpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "liblzma": { + "attrPath": [ + "xz" + ] + }, + "libmagic": { + "attrPath": [ + "file" + ] + }, + "libmnl": { + "attrPath": [ + "libmnl" + ] + }, + "libnotify": { + "attrPath": [ + "libnotify" + ] + }, + "libpcap": { + "attrPath": [ + "libpcap" + ] + }, + "libpcre": { + "attrPath": [ + "pcre" + ] + }, + "libpcre2-16": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-32": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-8": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-posix": { + "attrPath": [ + "pcre2" + ] + }, + "libpgtypes": { + "attrPath": [ + "postgresql" + ] + }, + "libpng": { + "attrPath": [ + "libpng" + ] + }, + "libpq": { + "attrPath": [ + "postgresql" + ] + }, + "libpulse": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libpulse-mainloop-glib": { + "attrPath": [ + "libpulseaudio" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "libpulse-simple": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libqrencode": { + "attrPath": [ + "qrencode" + ] + }, + "librtlsdr": { + "attrPath": [ + "rtl-sdr" + ] + }, + "libsass": { + "attrPath": [ + "libsass" + ] + }, + "libsctp": { + "attrPath": [ + "lksctp-tools" + ] + }, + "libsecp256k1": { + "attrPath": [ + "secp256k1" + ] + }, + "libsodium": { + "attrPath": [ + "libsodium" + ] + }, + "libsoup-gnome-2.4": { + "attrPath": [ + "libsoup" + ] + }, + "libssh2": { + "attrPath": [ + "libssh2" + ] + }, + "libssl": { + "attrPath": [ + "openssl" + ] + }, + "libstatgrab": { + "attrPath": [ + "libstatgrab" + ] + }, + "libsystemd": { + "attrPath": [ + "systemd" + ] + }, + "libturbojpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "libudev": { + "attrPath": [ + "systemd" + ] + }, + "libxml-2.0": { + "attrPath": [ + "libxml2" + ] + }, + "libzip": { + "attrPath": [ + "libzip" + ] + }, + "libzmq": { + "attrPath": [ + "zeromq" + ] + }, + "menu": { + "attrPath": [ + "ncurses" + ] + }, + "menuw": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++w": { + "attrPath": [ + "ncurses" + ] + }, + "ncursesw": { + "attrPath": [ + "ncurses" + ] + }, + "netsnmp": { + "attrPath": [ + "net_snmp" + ] + }, + "nix-cmd": { + "attrPath": [ + "nix" + ] + }, + "nix-expr": { + "attrPath": [ + "nix" + ] + }, + "nix-main": { + "attrPath": [ + "nix" + ] + }, + "nix-store": { + "attrPath": [ + "nix" + ] + }, + "odbc": { + "attrPath": [ + "unixODBC" + ] + }, + "ompi": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-c": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-cxx": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f77": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f90": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-fort": { + "attrPath": [ + "openmpi" + ] + }, + "openblas": { + "attrPath": [ + "openblasCompat" + ] + }, + "openssl": { + "attrPath": [ + "openssl" + ] + }, + "orte": { + "attrPath": [ + "openmpi" + ] + }, + "panel": { + "attrPath": [ + "ncurses" + ] + }, + "panelw": { + "attrPath": [ + "ncurses" + ] + }, + "pangocairo": { + "attrPath": [ + "pango" + ] + }, + "poppler-glib": { + "attrPath": [ + "poppler_gi" + ] + }, + "python": { + "attrPath": [ + "python3" + ] + }, + "ruby-2.7": { + "attrPath": [ + "ruby_2_7" + ] + }, + "ruby-3.0": { + "attrPath": [ + "ruby_3_0" + ] + }, + "ruby-3.1": { + "attrPath": [ + "ruby_3_1" + ] + }, + "sdl2": { + "attrPath": [ + "SDL2" + ] + }, + "sndfile": { + "attrPath": [ + "libsndfile" + ] + }, + "sqlite3": { + "attrPath": [ + "sqlite" + ] + }, + "taglib": { + "attrPath": [ + "taglib" + ] + }, + "taglib_c": { + "attrPath": [ + "taglib" + ] + }, + "tdjson": { + "attrPath": [ + "tdlib" + ] + }, + "tensorflow": { + "attrPath": [ + "libtensorflow" + ] + }, + "uuid": { + "attrPath": [ + "libossp_uuid" + ] + }, + "vte-2.91": { + "attrPath": [ + "vte" + ] + }, + "wayland-client": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "wayland-cursor": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "wayland-scanner": { + "attrPath": [ + "wayland" + ] + }, + "wayland-server": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "webkit2gtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "webkit2gtk-web-extension-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "x11": { + "attrPath": [ + "xorg", + "libX11" + ] + }, + "xau": { + "attrPath": [ + "xorg", + "libXau" + ] + }, + "xcursor": { + "attrPath": [ + "xorg", + "libXcursor" + ] + }, + "xerces-c": { + "attrPath": [ + "xercesc" + ] + }, + "xext": { + "attrPath": [ + "xorg", + "libXext" + ] + }, + "xft": { + "attrPath": [ + "xorg", + "libXft" + ] + }, + "xi": { + "attrPath": [ + "xorg", + "libXi" + ] + }, + "xinerama": { + "attrPath": [ + "xorg", + "libXinerama" + ] + }, + "xkbcommon": { + "attrPath": [ + "libxkbcommon" + ] + }, + "xpm": { + "attrPath": [ + "xorg", + "libXpm" + ] + }, + "xrandr": { + "attrPath": [ + "xorg", + "libXrandr" + ] + }, + "xrender": { + "attrPath": [ + "xorg", + "libXrender" + ] + }, + "xscrnsaver": { + "attrPath": [ + "xorg", + "libXScrnSaver" + ] + }, + "xtst": { + "attrPath": [ + "xorg", + "libXtst" + ] + }, + "xxf86vm": { + "attrPath": [ + "xorg", + "libXxf86vm" + ] + }, + "yaml-0.1": { + "attrPath": [ + "libyaml" + ] + }, + "zlib": { + "attrPath": [ + "zlib" + ] + } + } +} diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix new file mode 100644 index 0000000000000..37687117987d0 --- /dev/null +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -0,0 +1,45 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config.defaultPkgConfigPackages +{ lib, pkg-config, defaultPkgConfigPackages, runCommand, testers }: +let + inherit (lib.strings) escapeNixIdentifier; + + allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages; + + # nix-build rejects attribute names with periods + # This will build those regardless. + tests-combined = runCommand "pkg-config-checks" { + allTests = lib.attrValues allTests; + } '' + touch $out + ''; + + makePkgConfigTestMaybe = moduleName: pkg: + if ! lib.isDerivation pkg + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` is not defined to be a derivation. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if ! pkg?meta.unsupported + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.unsupported` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if pkg.meta.unsupported + then + # We return `null` instead of doing a `filterAttrs`, because with + # `filterAttrs` the evaluator would not be able to return the attribute + # set without first evaluating all of the attribute _values_. This would + # be rather expensive, and severly slow down the use case of getting a + # single test, which we want to do in `passthru.tests`, or interactively. + null + + else if ! pkg?meta.broken + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.broken` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config.packages.nix` in Nixpkgs." + + else if pkg.meta.broken + then null + + else testers.hasPkgConfigModule { inherit moduleName; package = pkg; }; + +in + lib.recurseIntoAttrs allTests // { inherit tests-combined; } diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix new file mode 100644 index 0000000000000..bcc8e7b4ee3e0 --- /dev/null +++ b/pkgs/top-level/pkg-config/tests.nix @@ -0,0 +1,21 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config +{ lib, stdenv, ... }: + +let + # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform + # in order to filter out the unsupported packages without throwing any errors + # tryEval would be too fragile, masking different problems as if they're + # unsupported platform problems. + allPkgs = import ../default.nix { + system = stdenv.hostPlatform.system; + localSystem = stdenv.hostPlatform.system; + config = { + allowUnsupportedSystem = true; + }; + overlays = []; + }; +in +lib.recurseIntoAttrs { + defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5430ab54c6627..6537b06d26866 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + abodepy = jaraco-abode; # added 2023-02-01 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 @@ -40,6 +41,7 @@ mapAliases ({ asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 + bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bsblan = python-bsblan; # added 2022-11-04 @@ -55,6 +57,7 @@ mapAliases ({ demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 + dictpath = pathable; # added 2023-01-28 diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 @@ -80,24 +83,30 @@ mapAliases ({ fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 + flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17 + flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 + gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute"; # added 2023-02-15 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 GitPython = gitpython; # added 2022-10-28 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 + glasgow = throw "glasgow has been promoted to a top-level attribute"; # added 2023-02-05 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + google-apitools = throw "google-apitools was removed because it is deprecated and unsupported by upstream"; # added 2023-02-25 graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10 graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 + hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 @@ -117,6 +126,7 @@ mapAliases ({ logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 + MDP = mdp; # added 2023-02-24 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 @@ -124,11 +134,14 @@ mapAliases ({ mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 + mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 + nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 + pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 @@ -145,11 +158,13 @@ mapAliases ({ protonup = protonup-ng; # Added 2022-11-06 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 + pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 + pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 PyICU = pyicu; # Added 2022-12-22 @@ -158,6 +173,7 @@ mapAliases ({ PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 pyreadability = readability-lxml; # added 2022-05-24 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 @@ -168,6 +184,7 @@ mapAliases ({ pyroute2-nslink = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-protocols = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pysmart-smartx = pysmart; # added 2021-10-22 + pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 @@ -211,16 +228,21 @@ mapAliases ({ sharkiqpy = sharkiq; # added 2022-05-21 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 SPARQLWrapper = sparqlwrapper; sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 + suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27 + suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 + tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ce5080662a88..404786c7aa281 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,10 +18,10 @@ self: super: with self; { aardwolf = callPackage ../development/python-modules/aardwolf { }; - abodepy = callPackage ../development/python-modules/abodepy { }; - absl-py = callPackage ../development/python-modules/absl-py { }; + accessible-pygments = callPackage ../development/python-modules/accessible-pygments { }; + accuweather = callPackage ../development/python-modules/accuweather { }; accupy = callPackage ../development/python-modules/accupy { }; @@ -122,6 +122,8 @@ self: super: with self; { aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; + aio-pika = callPackage ../development/python-modules/aio-pika { }; + aioairzone = callPackage ../development/python-modules/aioairzone { }; aioairq = callPackage ../development/python-modules/aioairq { }; @@ -162,6 +164,8 @@ self: super: with self; { aiodns = callPackage ../development/python-modules/aiodns { }; + aiodocker = callPackage ../development/python-modules/aiodocker { }; + aioeafm = callPackage ../development/python-modules/aioeafm { }; aioeagle = callPackage ../development/python-modules/aioeagle { }; @@ -274,6 +278,8 @@ self: super: with self; { aioopenexchangerates = callPackage ../development/python-modules/aioopenexchangerates { }; + aioopenssl = callPackage ../development/python-modules/aioopenssl { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; @@ -302,14 +308,20 @@ self: super: with self; { aioridwell = callPackage ../development/python-modules/aioridwell { }; + aiormq = callPackage ../development/python-modules/aiormq { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiortm = callPackage ../development/python-modules/aiortm { }; aiorun = callPackage ../development/python-modules/aiorun { }; + aioruuvigateway = callPackage ../development/python-modules/aioruuvigateway { }; + aiorwlock = callPackage ../development/python-modules/aiorwlock { }; + aiosasl = callPackage ../development/python-modules/aiosasl { }; + aiosenseme = callPackage ../development/python-modules/aiosenseme { }; aiosenz = callPackage ../development/python-modules/aiosenz { }; @@ -332,6 +344,8 @@ self: super: with self; { aiosmtplib = callPackage ../development/python-modules/aiosmtplib { }; + aiosomecomfort = callPackage ../development/python-modules/aiosomecomfort { }; + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; aiosteamist = callPackage ../development/python-modules/aiosteamist { }; @@ -358,6 +372,8 @@ self: super: with self; { aiowinreg = callPackage ../development/python-modules/aiowinreg { }; + aioxmpp = callPackage ../development/python-modules/aioxmpp { }; + aioymaps = callPackage ../development/python-modules/aioymaps { }; aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; @@ -522,6 +538,8 @@ self: super: with self; { aplpy = callPackage ../development/python-modules/aplpy { }; + app-model = callPackage ../development/python-modules/app-model { }; + appdirs = callPackage ../development/python-modules/appdirs { }; applicationinsights = callPackage ../development/python-modules/applicationinsights { }; @@ -530,6 +548,8 @@ self: super: with self; { apprise = callPackage ../development/python-modules/apprise { }; + approval-utilities = callPackage ../development/python-modules/approval-utilities { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; apptools = callPackage ../development/python-modules/apptools { }; @@ -588,6 +608,8 @@ self: super: with self; { ariadne = callPackage ../development/python-modules/ariadne { }; + arpy = callPackage ../development/python-modules/arpy { }; + arnparse = callPackage ../development/python-modules/arnparse { }; arrayqueues = callPackage ../development/python-modules/arrayqueues { }; @@ -596,6 +618,8 @@ self: super: with self; { arrow = callPackage ../development/python-modules/arrow { }; + arsenic = callPackage ../development/python-modules/arsenic { }; + arviz = callPackage ../development/python-modules/arviz { }; arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; @@ -636,6 +660,8 @@ self: super: with self; { asn1tools = callPackage ../development/python-modules/asn1tools { }; + aspectlib = callPackage ../development/python-modules/aspectlib { }; + aspell-python = callPackage ../development/python-modules/aspell-python { }; aspy-refactor-imports = callPackage ../development/python-modules/aspy-refactor-imports { }; @@ -841,6 +867,8 @@ self: super: with self; { awslambdaric = callPackage ../development/python-modules/awslambdaric { }; + awswrangler = callPackage ../development/python-modules/awswrangler { }; + axis = callPackage ../development/python-modules/axis { }; azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { }; @@ -1065,8 +1093,6 @@ self: super: with self; { azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - azure-storage = callPackage ../development/python-modules/azure-storage { }; - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; @@ -1093,6 +1119,8 @@ self: super: with self; { babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; + bambi = callPackage ../development/python-modules/bambi { }; + pad4pi = callPackage ../development/python-modules/pad4pi { }; pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; @@ -1103,6 +1131,8 @@ self: super: with self; { pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python; + pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python; + pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python; backcall = callPackage ../development/python-modules/backcall { }; @@ -1206,12 +1236,12 @@ self: super: with self; { bech32 = callPackage ../development/python-modules/bech32 { }; - bedup = callPackage ../development/python-modules/bedup { }; - behave = callPackage ../development/python-modules/behave { }; bellows = callPackage ../development/python-modules/bellows { }; + bencode-py = callPackage ../development/python-modules/bencode-py { }; + bencoder = callPackage ../development/python-modules/bencoder { }; beniget = callPackage ../development/python-modules/beniget { }; @@ -1260,9 +1290,7 @@ self: super: with self; { bitbox02 = callPackage ../development/python-modules/bitbox02 { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { - openssl = pkgs.openssl_1_1; - }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; @@ -1288,6 +1316,8 @@ self: super: with self; { black = callPackage ../development/python-modules/black { }; + blackjax = callPackage ../development/python-modules/blackjax { }; + black-macchiato = callPackage ../development/python-modules/black-macchiato { }; bleach = callPackage ../development/python-modules/bleach { }; @@ -1407,6 +1437,8 @@ self: super: with self; { brelpy = callPackage ../development/python-modules/brelpy { }; + brian2 = callPackage ../development/python-modules/brian2 { }; + broadlink = callPackage ../development/python-modules/broadlink { }; brother = callPackage ../development/python-modules/brother { }; @@ -1467,7 +1499,7 @@ self: super: with self; { buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards badges ]); buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; @@ -1485,6 +1517,8 @@ self: super: with self; { bundlewrap = callPackage ../development/python-modules/bundlewrap { }; + bx-py-utils = callPackage ../development/python-modules/bx-py-utils { }; + bx-python = callPackage ../development/python-modules/bx-python { }; bwapy = callPackage ../development/python-modules/bwapy { }; @@ -1853,6 +1887,8 @@ self: super: with self; { cma = callPackage ../development/python-modules/cma { }; + cmaes = callPackage ../development/python-modules/cmaes { }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; cmd2 = callPackage ../development/python-modules/cmd2 { }; @@ -1863,9 +1899,7 @@ self: super: with self; { inherit (pkgs) cmigemo; }; - cmsis-pack-manager = callPackage ../development/python-modules/cmsis-pack-manager { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; - }; + cmsis-pack-manager = callPackage ../development/python-modules/cmsis-pack-manager { }; cmsis-svd = callPackage ../development/python-modules/cmsis-svd { }; @@ -2102,6 +2136,8 @@ self: super: with self; { cssutils = callPackage ../development/python-modules/cssutils { }; + cstruct = callPackage ../development/python-modules/cstruct { }; + csvw = callPackage ../development/python-modules/csvw { }; cu2qu = callPackage ../development/python-modules/cu2qu { }; @@ -2229,6 +2265,8 @@ self: super: with self; { datapoint = callPackage ../development/python-modules/datapoint { }; + dataproperty = callPackage ../development/python-modules/dataproperty { }; + dataset = callPackage ../development/python-modules/dataset { }; datasets = callPackage ../development/python-modules/datasets { }; @@ -2353,6 +2391,8 @@ self: super: with self; { deploykit = callPackage ../development/python-modules/deploykit { }; + deprecat = callPackage ../development/python-modules/deprecat { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; @@ -2381,14 +2421,14 @@ self: super: with self; { dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + dicom-numpy = callPackage ../development/python-modules/dicom-numpy { }; + dict2xml = callPackage ../development/python-modules/dict2xml { }; dictdiffer = callPackage ../development/python-modules/dictdiffer { }; dictionaries = callPackage ../development/python-modules/dictionaries { }; - dictpath = callPackage ../development/python-modules/dictpath { }; - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { }; @@ -2445,6 +2485,8 @@ self: super: with self; { dissect-evidence = callPackage ../development/python-modules/dissect-evidence { }; + dissect-executable = callPackage ../development/python-modules/dissect-executable { }; + dissect-extfs = callPackage ../development/python-modules/dissect-extfs { }; dissect-hypervisor = callPackage ../development/python-modules/dissect-hypervisor { }; @@ -2457,6 +2499,8 @@ self: super: with self; { dissect-shellitem = callPackage ../development/python-modules/dissect-shellitem { }; + dissect-squashfs = callPackage ../development/python-modules/dissect-squashfs { }; + dissect-sql = callPackage ../development/python-modules/dissect-sql { }; dissect-target = callPackage ../development/python-modules/dissect-target { }; @@ -2527,6 +2571,8 @@ self: super: with self; { django-compressor = callPackage ../development/python-modules/django-compressor { }; + django-compression-middleware = callPackage ../development/python-modules/django-compression-middleware { }; + django-configurations = callPackage ../development/python-modules/django-configurations { }; django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; @@ -2812,6 +2858,10 @@ self: super: with self; { dragonfly = callPackage ../development/python-modules/dragonfly { }; + drawille = callPackage ../development/python-modules/drawille { }; + + drawilleplot = callPackage ../development/python-modules/drawilleplot { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; @@ -2935,6 +2985,10 @@ self: super: with self; { editorconfig = callPackage ../development/python-modules/editorconfig { }; + edlib = callPackage ../development/python-modules/edlib { + inherit (pkgs) edlib; + }; + edward = callPackage ../development/python-modules/edward { }; effect = callPackage ../development/python-modules/effect { }; @@ -3059,6 +3113,8 @@ self: super: with self; { espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { }; + esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { }; + esprima = callPackage ../development/python-modules/esprima { }; escapism = callPackage ../development/python-modules/escapism { }; @@ -3071,7 +3127,6 @@ self: super: with self; { etebase = callPackage ../development/python-modules/etebase { inherit (pkgs.darwin.apple_sdk.frameworks) Security; - openssl = pkgs.openssl_1_1; }; etebase-server = callPackage ../servers/etebase { }; @@ -3266,6 +3321,8 @@ self: super: with self; { fasttext = callPackage ../development/python-modules/fasttext { }; + fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; + favicon = callPackage ../development/python-modules/favicon { }; fb-re2 = callPackage ../development/python-modules/fb-re2 { }; @@ -3383,8 +3440,6 @@ self: super: with self; { flask-babel = callPackage ../development/python-modules/flask-babel { }; - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - flask-babelex = callPackage ../development/python-modules/flask-babelex { }; flask-basicauth = callPackage ../development/python-modules/flask-basicauth { }; @@ -3437,8 +3492,6 @@ self: super: with self; { flask-restful = callPackage ../development/python-modules/flask-restful { }; - flask-restplus = callPackage ../development/python-modules/flask-restplus { }; - flask-restx = callPackage ../development/python-modules/flask-restx { }; flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { }; @@ -3556,6 +3609,8 @@ self: super: with self; { formbox = callPackage ../development/python-modules/formbox { }; + formulae = callPackage ../development/python-modules/formulae { }; + fortiosapi = callPackage ../development/python-modules/fortiosapi { }; FormEncode = callPackage ../development/python-modules/FormEncode { }; @@ -3691,8 +3746,6 @@ self: super: with self; { gdown = callPackage ../development/python-modules/gdown { }; - gdtoolkit = callPackage ../development/python-modules/gdtoolkit { }; - ge25519 = callPackage ../development/python-modules/ge25519 { }; geant4 = toPythonModule (pkgs.geant4.override { @@ -3708,6 +3761,8 @@ self: super: with self; { gemfileparser = callPackage ../development/python-modules/gemfileparser { }; + gemfileparser2 = callPackage ../development/python-modules/gemfileparser2 { }; + genanki = callPackage ../development/python-modules/genanki { }; generic = callPackage ../development/python-modules/generic { }; @@ -3823,8 +3878,6 @@ self: super: with self; { glances-api = callPackage ../development/python-modules/glances-api { }; - glasgow = callPackage ../development/python-modules/glasgow { }; - glcontext = callPackage ../development/python-modules/glcontext { }; glean-parser = callPackage ../development/python-modules/glean-parser { }; @@ -3867,8 +3920,6 @@ self: super: with self; { google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; - google-apitools = callPackage ../development/python-modules/google-apitools { }; - googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { }; google-auth = callPackage ../development/python-modules/google-auth { }; @@ -4032,6 +4083,8 @@ self: super: with self; { gql = callPackage ../development/python-modules/gql { }; + grad-cam = callPackage ../development/python-modules/grad-cam { }; + gradient = callPackage ../development/python-modules/gradient { }; gradient-utils = callPackage ../development/python-modules/gradient-utils { }; @@ -4209,8 +4262,6 @@ self: super: with self; { handout = callPackage ../development/python-modules/handout { }; - hangups = callPackage ../development/python-modules/hangups { }; - hap-python = callPackage ../development/python-modules/hap-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; @@ -4305,6 +4356,10 @@ self: super: with self; { hiro = callPackage ../development/python-modules/hiro { }; + hist = callPackage ../development/python-modules/hist { }; + + histoprint = callPackage ../development/python-modules/histoprint { }; + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; hjson = callPackage ../development/python-modules/hjson { }; @@ -4313,6 +4368,8 @@ self: super: with self; { hkdf = callPackage ../development/python-modules/hkdf { }; + hledger-utils = callPackage ../development/python-modules/hledger-utils { }; + hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { }; hmmlearn = callPackage ../development/python-modules/hmmlearn { }; @@ -4333,6 +4390,8 @@ self: super: with self; { homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; + homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { }; + homeconnect = callPackage ../development/python-modules/homeconnect { }; homematicip = callPackage ../development/python-modules/homematicip { }; @@ -4591,6 +4650,8 @@ self: super: with self; { imutils = callPackage ../development/python-modules/imutils { }; + in-n-out = callPackage ../development/python-modules/in-n-out { }; + in-place = callPackage ../development/python-modules/in-place { }; incomfort-client = callPackage ../development/python-modules/incomfort-client { }; @@ -4753,6 +4814,8 @@ self: super: with self; { itemloaders = callPackage ../development/python-modules/itemloaders { }; + iteration-utilities = callPackage ../development/python-modules/iteration-utilities { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; itsdangerous = callPackage ../development/python-modules/itsdangerous { }; @@ -4771,10 +4834,14 @@ self: super: with self; { janus = callPackage ../development/python-modules/janus { }; + jaraco-abode = callPackage ../development/python-modules/jaraco-abode { }; + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + jaraco-email = callPackage ../development/python-modules/jaraco-email { }; + jaraco-context = callPackage ../development/python-modules/jaraco-context { }; jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; @@ -4783,6 +4850,8 @@ self: super: with self; { jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + jaraco-net = callPackage ../development/python-modules/jaraco-net { }; + jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; jaraco-test = callPackage ../development/python-modules/jaraco-test { }; @@ -4819,6 +4888,8 @@ self: super: with self; { cudaSupport = false; }; + jaxopt = callPackage ../development/python-modules/jaxopt { }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; jc = callPackage ../development/python-modules/jc { }; @@ -4845,6 +4916,8 @@ self: super: with self; { jinja2 = callPackage ../development/python-modules/jinja2 { }; + jinja2-ansible-filters = callPackage ../development/python-modules/jinja2-ansible-filters { }; + jinja2-git = callPackage ../development/python-modules/jinja2-git { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; @@ -5230,6 +5303,10 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; + leidenalg = callPackage ../development/python-modules/leidenalg { + igraph-c = pkgs.igraph; + }; + lektor = callPackage ../development/python-modules/lektor { }; leveldb = callPackage ../development/python-modules/leveldb { }; @@ -5411,8 +5488,6 @@ self: super: with self; { lightgbm = callPackage ../development/python-modules/lightgbm { }; - lightning = callPackage ../development/python-modules/lightning { }; - lightning-utilities = callPackage ../development/python-modules/lightning-utilities { }; lightparam = callPackage ../development/python-modules/lightparam { }; @@ -5568,10 +5643,7 @@ self: super: with self; { lzstring = callPackage ../development/python-modules/lzstring { }; - m2crypto = callPackage ../development/python-modules/m2crypto { - # https://gitlab.com/m2crypto/m2crypto/-/issues/310 - openssl = pkgs.openssl_1_1; - }; + m2crypto = callPackage ../development/python-modules/m2crypto { }; m2r = callPackage ../development/python-modules/m2r { }; @@ -5734,6 +5806,8 @@ self: super: with self; { mbddns = callPackage ../development/python-modules/mbddns { }; + mbstrdecoder = callPackage ../development/python-modules/mbstrdecoder { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mcstatus = callPackage ../development/python-modules/mcstatus { }; @@ -5752,7 +5826,7 @@ self: super: with self; { mdutils = callPackage ../development/python-modules/mdutils { }; - MDP = callPackage ../development/python-modules/mdp { }; + mdp = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; @@ -5768,6 +5842,8 @@ self: super: with self; { mediapy = callPackage ../development/python-modules/mediapy { }; + meep = callPackage ../development/python-modules/meep { }; + meilisearch = callPackage ../development/python-modules/meilisearch { }; meinheld = callPackage ../development/python-modules/meinheld { }; @@ -5910,6 +5986,8 @@ self: super: with self; { mkdocstrings-python = callPackage ../development/python-modules/mkdocstrings-python { }; + mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; @@ -5961,8 +6039,6 @@ self: super: with self; { mohawk = callPackage ../development/python-modules/mohawk { }; - moku = callPackage ../development/python-modules/moku { }; - monai = callPackage ../development/python-modules/monai { }; monero = callPackage ../development/python-modules/monero { }; @@ -5988,6 +6064,8 @@ self: super: with self; { moonraker-api = callPackage ../development/python-modules/moonraker-api { }; + mopeka-iot-ble = callPackage ../development/python-modules/mopeka-iot-ble { }; + more-itertools = callPackage ../development/python-modules/more-itertools { }; more-properties = callPackage ../development/python-modules/more-properties { }; @@ -6012,8 +6090,6 @@ self: super: with self; { mox3 = callPackage ../development/python-modules/mox3 { }; - mox = callPackage ../development/python-modules/mox { }; - mpd2 = callPackage ../development/python-modules/mpd2 { }; mpi4py = callPackage ../development/python-modules/mpi4py { }; @@ -6142,6 +6218,8 @@ self: super: with self; { myst-parser = callPackage ../development/python-modules/myst-parser { }; + n3fit = callPackage ../development/python-modules/n3fit { }; + nad-receiver = callPackage ../development/python-modules/nad-receiver { }; nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; @@ -6242,6 +6320,8 @@ self: super: with self; { nessclient = callPackage ../development/python-modules/nessclient { }; + nest = toPythonModule(pkgs.nest-mpi.override { withPython = true; python3 = python; }); + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; nested-lookup = callPackage ../development/python-modules/nested-lookup { }; @@ -6268,11 +6348,9 @@ self: super: with self; { networkx = callPackage ../development/python-modules/networkx { }; - neuron-mpi = toPythonModule (pkgs.neuron-mpi.override { inherit python; }); - - neuron = toPythonModule (pkgs.neuron.override { inherit python; }); + neuron-full = pkgs.neuron-full.override { python3 = python; }; - neuronpy = callPackage ../development/python-modules/neuronpy { }; + neuronpy = python.pkgs.toPythonModule neuron-full; nevow = callPackage ../development/python-modules/nevow { }; @@ -6394,8 +6472,6 @@ self: super: with self; { nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; - nose_progressive = callPackage ../development/python-modules/nose_progressive { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; @@ -6488,6 +6564,8 @@ self: super: with self; { nxt-python = callPackage ../development/python-modules/nxt-python { }; + python-jwt = callPackage ../development/python-modules/python-jwt { }; + python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; py-deprecate = callPackage ../development/python-modules/py-deprecate { }; @@ -6516,6 +6594,8 @@ self: super: with self; { objax = callPackage ../development/python-modules/objax { }; + objsize = callPackage ../development/python-modules/objsize { }; + objgraph = callPackage ../development/python-modules/objgraph { # requires both the graphviz package and python package graphvizPkgs = pkgs.graphviz; @@ -6555,6 +6635,8 @@ self: super: with self; { omegaconf = callPackage ../development/python-modules/omegaconf { }; + ome-zarr = callPackage ../development/python-modules/ome-zarr { }; + omnikinverter = callPackage ../development/python-modules/omnikinverter { }; omnilogic = callPackage ../development/python-modules/omnilogic { }; @@ -6637,6 +6719,8 @@ self: super: with self; { openrouteservice = callPackage ../development/python-modules/openrouteservice { }; + opensearch-py = callPackage ../development/python-modules/opensearch-py { }; + opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; opensfm = callPackage ../development/python-modules/opensfm { }; @@ -6658,10 +6742,11 @@ self: super: with self; { opentracing = callPackage ../development/python-modules/opentracing { }; - openvino = toPythonModule (pkgs.openvino.override { - inherit (self) python; - enablePython = true; - }); + openvino = callPackage ../development/python-modules/openvino { + openvino-native = pkgs.openvino.override { + inherit python; + }; + }; openwebifpy = callPackage ../development/python-modules/openwebifpy { }; @@ -6681,6 +6766,8 @@ self: super: with self; { opytimark = callPackage ../development/python-modules/opytimark { }; + oracledb = callPackage ../development/python-modules/oracledb { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; @@ -6765,8 +6852,6 @@ self: super: with self; { packvers = callPackage ../development/python-modules/packvers { }; - pafy = callPackage ../development/python-modules/pafy { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; @@ -6945,6 +7030,8 @@ self: super: with self; { peewee = callPackage ../development/python-modules/peewee { }; + peewee-migrate = callPackage ../development/python-modules/peewee-migrate { }; + pefile = callPackage ../development/python-modules/pefile { }; pelican = callPackage ../development/python-modules/pelican { @@ -7023,6 +7110,8 @@ self: super: with self; { overpy = callPackage ../development/python-modules/overpy { }; + overrides = callPackage ../development/python-modules/overrides { }; + pandas-stubs = callPackage ../development/python-modules/pandas-stubs { }; pdunehd = callPackage ../development/python-modules/pdunehd { }; @@ -7051,6 +7140,8 @@ self: super: with self; { pi1wire = callPackage ../development/python-modules/pi1wire { }; + piano-transcription-inference = callPackage ../development/python-modules/piano-transcription-inference { }; + piccata = callPackage ../development/python-modules/piccata { }; pick = callPackage ../development/python-modules/pick { }; @@ -7127,6 +7218,11 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pjsua2 = (toPythonModule (pkgs.pjsip.override { + pythonSupport = true; + python3 = self.python; + })).py; + pkce = callPackage ../development/python-modules/pkce { }; pkgconfig = callPackage ../development/python-modules/pkgconfig { }; @@ -7163,6 +7259,8 @@ self: super: with self; { pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; + pyfibaro = callPackage ../development/python-modules/pyfibaro { }; + pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; pyflexit = callPackage ../development/python-modules/pyflexit { }; @@ -7171,6 +7269,8 @@ self: super: with self; { pyfreedompro = callPackage ../development/python-modules/pyfreedompro { }; + pygments-style-github = callPackage ../development/python-modules/pygments-style-github { }; + pygti = callPackage ../development/python-modules/pygti { }; pyheos = callPackage ../development/python-modules/pyheos { }; @@ -7199,6 +7299,10 @@ self: super: with self; { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyorthanc = callPackage ../development/python-modules/pyorthanc { }; + + pyoutbreaksnearme = callPackage ../development/python-modules/pyoutbreaksnearme { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; pyownet = callPackage ../development/python-modules/pyownet { }; @@ -7249,6 +7353,8 @@ self: super: with self; { python-fullykiosk = callPackage ../development/python-modules/python-fullykiosk { }; + python-fx = callPackage ../development/python-modules/python-fx { }; + python-glanceclient = callPackage ../development/python-modules/python-glanceclient { }; python-google-nest = callPackage ../development/python-modules/python-google-nest { }; @@ -7667,8 +7773,6 @@ self: super: with self; { pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; - pyalmond = callPackage ../development/python-modules/pyalmond { }; - pyamg = callPackage ../development/python-modules/pyamg { }; pyaml = callPackage ../development/python-modules/pyaml { }; @@ -7993,8 +8097,6 @@ self: super: with self; { pyflume = callPackage ../development/python-modules/pyflume { }; - pyflunearyou = callPackage ../development/python-modules/pyflunearyou { }; - pyfma = callPackage ../development/python-modules/pyfma { }; pyfribidi = callPackage ../development/python-modules/pyfribidi { }; @@ -8023,6 +8125,7 @@ self: super: with self; { pygame = callPackage ../development/python-modules/pygame { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + SDL2_image = pkgs.SDL2_image_2_0_5; }; pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; @@ -8108,6 +8211,8 @@ self: super: with self; { pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + pyheif = callPackage ../development/python-modules/pyheif { }; + pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; pyialarm = callPackage ../development/python-modules/pyialarm { }; @@ -8242,14 +8347,10 @@ self: super: with self; { pylsqpack = callPackage ../development/python-modules/pylsqpack { }; - pyls-black = callPackage ../development/python-modules/pyls-black { }; - pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { }; pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { }; @@ -8304,6 +8405,8 @@ self: super: with self; { pymediaroom = callPackage ../development/python-modules/pymediaroom { }; + pymedio = callPackage ../development/python-modules/pymedio { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymelcloud = callPackage ../development/python-modules/pymelcloud { }; @@ -8511,6 +8614,8 @@ self: super: with self; { pypiserver = callPackage ../development/python-modules/pypiserver { }; + pypitoken = callPackage ../development/python-modules/pypitoken { }; + pyplaato = callPackage ../development/python-modules/pyplaato { }; pyplatec = callPackage ../development/python-modules/pyplatec { }; @@ -8586,6 +8691,8 @@ self: super: with self; { pyqvrpro = callPackage ../development/python-modules/pyqvrpro { }; + pyqwikswitch = callPackage ../development/python-modules/pyqwikswitch { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; pyrad = callPackage ../development/python-modules/pyrad { }; @@ -8604,8 +8711,6 @@ self: super: with self; { pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; - pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; @@ -8828,8 +8933,6 @@ self: super: with self; { pyspark = callPackage ../development/python-modules/pyspark { }; - pysparse = callPackage ../development/python-modules/pysparse { }; - pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { }; pyspellchecker = callPackage ../development/python-modules/pyspellchecker { }; @@ -8886,6 +8989,8 @@ self: super: with self; { pytabix = callPackage ../development/python-modules/pytabix { }; + pytablewriter = callPackage ../development/python-modules/pytablewriter { }; + pytado = callPackage ../development/python-modules/pytado { }; pytaglib = callPackage ../development/python-modules/pytaglib { }; @@ -8894,12 +8999,16 @@ self: super: with self; { pytap2 = callPackage ../development/python-modules/pytap2 { }; + pytapo = callPackage ../development/python-modules/pytapo { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; pyte = callPackage ../development/python-modules/pyte { }; pytenable = callPackage ../development/python-modules/pytenable { }; + pytensor = callPackage ../development/python-modules/pytensor { }; + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; pytesseract = callPackage ../development/python-modules/pytesseract { }; @@ -9587,6 +9696,8 @@ self: super: with self; { pywatchman = callPackage ../development/python-modules/pywatchman { }; + pywaterkotte = callPackage ../development/python-modules/pywaterkotte { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; pywayland = callPackage ../development/python-modules/pywayland { }; @@ -9641,6 +9752,8 @@ self: super: with self; { pyyaml-env-tag = callPackage ../development/python-modules/pyyaml-env-tag { }; + pyyaml-include = callPackage ../development/python-modules/pyyaml-include { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; @@ -9687,6 +9800,8 @@ self: super: with self; { qnapstats = callPackage ../development/python-modules/qnapstats { }; + qpageview = callPackage ../development/python-modules/qpageview { }; + qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -9772,6 +9887,8 @@ self: super: with self; { rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; @@ -9836,6 +9953,8 @@ self: super: with self; { rednose = callPackage ../development/python-modules/rednose { }; + redshift-connector = callPackage ../development/python-modules/redshift-connector { }; + reedsolo = callPackage ../development/python-modules/reedsolo { }; reflink = callPackage ../development/python-modules/reflink { }; @@ -9858,6 +9977,10 @@ self: super: with self; { remi = callPackage ../development/python-modules/remi { }; + remote-pdb = callPackage ../development/python-modules/remote-pdb { }; + + remotezip = callPackage ../development/python-modules/remotezip { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { }; @@ -9954,6 +10077,8 @@ self: super: with self; { retrying = callPackage ../development/python-modules/retrying { }; + returns = callPackage ../development/python-modules/returns { }; + retworkx = callPackage ../development/python-modules/retworkx { }; rfc3339 = callPackage ../development/python-modules/rfc3339 { }; @@ -9976,6 +10101,8 @@ self: super: with self; { rich = callPackage ../development/python-modules/rich { }; + rich-argparse-plus = callPackage ../development/python-modules/rich-argparse-plus { }; + rich-click = callPackage ../development/python-modules/rich-click { }; rich-rst = callPackage ../development/python-modules/rich-rst { }; @@ -9990,6 +10117,12 @@ self: super: with self; { ripser = callPackage ../development/python-modules/ripser { }; + riscof = callPackage ../development/python-modules/riscof { }; + + riscv-config = callPackage ../development/python-modules/riscv-config { }; + + riscv-isac = callPackage ../development/python-modules/riscv-isac { }; + rising = callPackage ../development/python-modules/rising { }; ritassist = callPackage ../development/python-modules/ritassist { }; @@ -10016,6 +10149,8 @@ self: super: with self; { rmrl = callPackage ../development/python-modules/rmrl { }; + rmsd = callPackage ../development/python-modules/rmsd { }; + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; rnginline = callPackage ../development/python-modules/rnginline { }; @@ -10166,6 +10301,8 @@ self: super: with self; { safe = callPackage ../development/python-modules/safe { }; + safe-pysha3 = callPackage ../development/python-modules/safe-pysha3 { }; + safeio = callPackage ../development/python-modules/safeio { }; safety = callPackage ../development/python-modules/safety { }; @@ -10276,6 +10413,8 @@ self: super: with self; { scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + screed = callPackage ../development/python-modules/screed { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; screenlogicpy = callPackage ../development/python-modules/screenlogicpy { }; @@ -10348,6 +10487,8 @@ self: super: with self; { inherit (pkgs) sentencepiece; }; + sentence-transformers = callPackage ../development/python-modules/sentence-transformers { }; + sentinel = callPackage ../development/python-modules/sentinel { }; sentinels = callPackage ../development/python-modules/sentinels { }; @@ -10443,6 +10584,8 @@ self: super: with self; { should-dsl = callPackage ../development/python-modules/should-dsl { }; + show-in-file-manager = callPackage ../development/python-modules/show-in-file-manager { }; + showit = callPackage ../development/python-modules/showit { }; shtab = callPackage ../development/python-modules/shtab { }; @@ -10507,6 +10650,8 @@ self: super: with self; { sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; + siuba = callPackage ../development/python-modules/siuba { }; + six = callPackage ../development/python-modules/six { }; sjcl = callPackage ../development/python-modules/sjcl { }; @@ -10663,8 +10808,6 @@ self: super: with self; { somajo = callPackage ../development/python-modules/somajo { }; - somecomfort = callPackage ../development/python-modules/somecomfort { }; - somfy-mylink-synergy = callPackage ../development/python-modules/somfy-mylink-synergy { }; sonarr = callPackage ../development/python-modules/sonarr { }; @@ -10693,7 +10836,9 @@ self: super: with self; { spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { + inherit (pkgs) jq; + }; spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; @@ -10735,6 +10880,8 @@ self: super: with self; { sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { }; + sphinx-codeautolink = callPackage ../development/python-modules/sphinx-codeautolink { }; + sphinx-comments = callPackage ../development/python-modules/sphinx-comments { }; sphinx-design = callPackage ../development/python-modules/sphinx-design { }; @@ -10743,14 +10890,22 @@ self: super: with self; { sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { }; + sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { }; + sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { }; sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { }; + sphinx-notfound-page = callPackage ../development/python-modules/sphinx-notfound-page { }; + sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { }; + sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { }; + sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { }; + sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { }; + sphinx-togglebutton = callPackage ../development/python-modules/sphinx-togglebutton { }; sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; @@ -10815,10 +10970,14 @@ self: super: with self; { sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; + sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { }; + sphinx = callPackage ../development/python-modules/sphinx { }; sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-jquery = callPackage ../development/python-modules/sphinx-jquery { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { }; @@ -10851,6 +11010,8 @@ self: super: with self; { sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + sphinx-version-warning = callPackage ../development/python-modules/sphinx-version-warning { }; + sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { }; spidev = callPackage ../development/python-modules/spidev { }; @@ -11043,8 +11204,6 @@ self: super: with self; { subzerod = callPackage ../development/python-modules/subzerod { }; - suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - sumo = callPackage ../development/python-modules/sumo { }; sumtypes = callPackage ../development/python-modules/sumtypes { }; @@ -11053,6 +11212,8 @@ self: super: with self; { sunwatcher = callPackage ../development/python-modules/sunwatcher { }; + sunweg = callPackage ../development/python-modules/sunweg { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; supervisor = callPackage ../development/python-modules/supervisor { }; @@ -11067,8 +11228,6 @@ self: super: with self; { survey = callPackage ../development/python-modules/survey { }; - suseapi = callPackage ../development/python-modules/suseapi { }; - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; @@ -11095,6 +11254,8 @@ self: super: with self; { sympy = callPackage ../development/python-modules/sympy { }; + syncedlyrics = callPackage ../development/python-modules/syncedlyrics { }; + syncer = callPackage ../development/python-modules/syncer { }; synergy = callPackage ../development/python-modules/synergy { }; @@ -11115,6 +11276,8 @@ self: super: with self; { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; + tabledata = callPackage ../development/python-modules/tabledata { }; + tables = callPackage ../development/python-modules/tables { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -11153,6 +11316,8 @@ self: super: with self; { tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + tcolorpy = callPackage ../development/python-modules/tcolorpy { }; + tcxparser = callPackage ../development/python-modules/tcxparser { }; tcxreader = callPackage ../development/python-modules/tcxreader { }; @@ -11213,11 +11378,13 @@ self: super: with self; { tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; - tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-estimator-bin = callPackage ../development/python-modules/tensorflow-estimator/bin.nix { }; tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; - tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { + inherit (pkgs.darwin) cctools; + }; tensorflow = self.tensorflow-build; @@ -11390,6 +11557,8 @@ self: super: with self; { timezonefinder = callPackage ../development/python-modules/timezonefinder { }; + timm = callPackage ../development/python-modules/timm { }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; tinycss = callPackage ../development/python-modules/tinycss { }; @@ -11485,6 +11654,8 @@ self: super: with self; { torchinfo = callPackage ../development/python-modules/torchinfo { }; + torchlibrosa = callPackage ../development/python-modules/torchlibrosa { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; @@ -11537,8 +11708,6 @@ self: super: with self; { transforms3d = callPackage ../development/python-modules/transforms3d { }; - transip = callPackage ../development/python-modules/transip { }; - transitions = callPackage ../development/python-modules/transitions { }; translatepy = callPackage ../development/python-modules/translatepy { }; @@ -11585,6 +11754,8 @@ self: super: with self; { trytond = callPackage ../development/python-modules/trytond { }; + ttach = callPackage ../development/python-modules/ttach { }; + ttls = callPackage ../development/python-modules/ttls { }; ttp = callPackage ../development/python-modules/ttp { }; @@ -11673,6 +11844,8 @@ self: super: with self; { typeguard = callPackage ../development/python-modules/typeguard { }; + typepy = callPackage ../development/python-modules/typepy { }; + typer = callPackage ../development/python-modules/typer { }; types-colorama = callPackage ../development/python-modules/types-colorama { }; @@ -11691,6 +11864,8 @@ self: super: with self; { types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + types-pillow = callPackage ../development/python-modules/types-pillow { }; + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; types-psutil = callPackage ../development/python-modules/types-psutil { }; @@ -11770,6 +11945,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; + uhi = callPackage ../development/python-modules/uhi { }; + ujson = callPackage ../development/python-modules/ujson { }; ukkonen = callPackage ../development/python-modules/ukkonen { }; @@ -11860,6 +12037,8 @@ self: super: with self; { uptime = callPackage ../development/python-modules/uptime { }; + uptime-kuma-api = callPackage ../development/python-modules/uptime-kuma-api { }; + uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; uranium = callPackage ../development/python-modules/uranium { }; @@ -12018,6 +12197,8 @@ self: super: with self; { voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + voluptuous-stubs = callPackage ../development/python-modules/voluptuous-stubs { }; + volvooncall = callPackage ../development/python-modules/volvooncall { }; vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; @@ -12090,7 +12271,9 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; - watchfiles = callPackage ../development/python-modules/watchfiles { }; + watchfiles = callPackage ../development/python-modules/watchfiles { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; watchgod = callPackage ../development/python-modules/watchgod { }; @@ -12426,6 +12609,8 @@ self: super: with self; { yara-python = callPackage ../development/python-modules/yara-python { }; + yaramod = callPackage ../development/python-modules/yaramod { }; + yarg = callPackage ../development/python-modules/yarg { }; yark = callPackage ../development/python-modules/yark { }; @@ -12510,7 +12695,7 @@ self: super: with self; { zdaemon = callPackage ../development/python-modules/zdaemon { }; - zeek = (toPythonModule (pkgs.zeek.override { + zeek = (toPythonModule (pkgs.zeek.broker.override { python3 = python; })).py; @@ -12550,8 +12735,6 @@ self: super: with self; { zimports = callPackage ../development/python-modules/zimports { }; - zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - zipp = callPackage ../development/python-modules/zipp { }; zipstream = callPackage ../development/python-modules/zipstream { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 83a90a2a5e6d9..a79dc31ed9dd9 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -83,6 +83,8 @@ with self; with super; { doCheck = false; # circular dependency with pytest }); + wheel = callPackage ../development/python2-modules/wheel { }; + zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f8139b7dab527..9169940f8bd10 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -116,6 +116,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; + kuserfeedback = callPackage ../development/libraries/kuserfeedback { }; + kweathercore = libsForQt5.callPackage ../development/libraries/kweathercore { }; ldutils = callPackage ../development/libraries/ldutils { }; @@ -174,7 +176,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; - qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qca-qt5 = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca-qt5 { + inherit (libsForQt5) qtbase; + }; qcoro = callPackage ../development/libraries/qcoro { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b8719294f98d3..f15349da64fad 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -34,6 +34,8 @@ let nix = nativePlatforms; nixUnstable = nativePlatforms; mesa = nativePlatforms; + rustc = nativePlatforms; + cargo = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ee7e64f1ffaa8..9597320813c63 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -39,9 +39,7 @@ let attrs: if lib.isDerivation attrs then [ attrs ] - else if lib.isAttrs attrs - then accumulateDerivations (lib.attrValues attrs) - else [] + else lib.optionals (lib.isAttrs attrs) (accumulateDerivations (lib.attrValues attrs)) ) jobList; # names of all subsets of `pkgs.haskell.packages` @@ -54,6 +52,7 @@ let ghc902 ghc924 ghc925 + ghc926 ghc944 ]; @@ -333,8 +332,8 @@ let ; }; - haskell.packages.native-bignum.ghc924 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) + haskell.packages.native-bignum.ghc926 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc926) hello lens random @@ -387,11 +386,20 @@ let ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; + ghc-tags = [ + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc924 + compilerNames.ghc925 + compilerNames.ghc926 + compilerNames.ghc944 + ]; weeder = [ compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 compilerNames.ghc925 + compilerNames.ghc926 ]; }) { @@ -461,11 +469,13 @@ let jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc924 jobs.pkgsMusl.haskell.compiler.ghc925 + jobs.pkgsMusl.haskell.compiler.ghc926 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc926 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; @@ -481,7 +491,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc926 ]; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index f341857222014..691f50708ace7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -24,7 +24,7 @@ let packagePython value else []); - in if res.success then res.value else [] + in lib.optionals res.success res.value ); jobs = { diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 4ae1a50eb757e..5d8b2fd12c175 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -1,47 +1,135 @@ { + actioncable = { + dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "195n3qh7956lvnmzd2s7wqnsrwn5dfvv31d17p17k8vrfw9f1qbb"; + type = "gem"; + }; + version = "7.0.4.2"; + }; + actionmailbox = { + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n6cl7kbiqjvz6msdv41w4s1a08633y9klp630vjs55fx2drknrx"; + type = "gem"; + }; + version = "7.0.4.2"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bw15syf1s3s1aa16gy8wjqpchvnhw6flynzzjq44bjmic7dflmq"; + type = "gem"; + }; + version = "7.0.4.2"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02q8mjgw70szmhx3hc5pdcf0yhk5hfhhvfng24xghiqkx7dkgf21"; + type = "gem"; + }; + version = "7.0.4.2"; + }; + actiontext = { + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pra7gb95dlmg6g14a9lak6f7bwrfb06nv8i2zhr8cx6j24s3m9g"; + type = "gem"; + }; + version = "7.0.4.2"; + }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1271f7nyrmb0kk93zjsb3zyxng8jlzhhg9784pwfpwvrlclashlw"; + sha256 = "07fn4brsrz308b01rqql0n582zqva5q8ws2gnx2jdm9ab2ph1l4i"; type = "gem"; }; - version = "6.0.6"; + version = "7.0.4.2"; }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + activejob = { + dependencies = ["activesupport" "globalid"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "091qjiv0mvmn5k9krqkv1lfg8983mgcmrf11gxa6xkchh74csr6a"; + sha256 = "1dis1vvvrh8yzyqq16waf191hqswm19hbvmmlfg285jj60alwymy"; type = "gem"; }; - version = "6.0.6"; + version = "7.0.4.2"; }; - addressable = { - dependencies = ["public_suffix"]; + activemodel = { + dependencies = ["activesupport"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "1a961ak8n53d783k5p0n4clgvlbp9vkwxk32ysfww28nl00jlr0r"; type = "gem"; }; - version = "2.8.1"; + version = "7.0.4.2"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "159z1m6294f2v1mjzbjbfajahiks4x2mg0s01hw407a9y23q07ln"; + type = "gem"; + }; + version = "7.0.4.2"; + }; + activestorage = { + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fwzjs5fsk1lmd2gmqnr2mxf220cz3ag7pvbh0hxa14w7jz1s6qq"; + type = "gem"; + }; + version = "7.0.4.2"; }; - algoliasearch = { - dependencies = ["httpclient" "json"]; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; + sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f"; type = "gem"; }; - version = "1.27.5"; + version = "7.0.4.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + type = "gem"; + }; + version = "2.8.1"; }; ansi = { groups = ["default"]; @@ -69,10 +157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05brc25pfvak610mdwgjsc64di29yff9i9g72m6hyc21pdjwfy3n"; + sha256 = "0agdfwdrvxpikm85ddx5m1nvy8rn321zjn66sxb12pwd0dzb9qsf"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; }; atomos = { groups = ["default"]; @@ -119,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z"; + sha256 = "017jh2lx3z5hqjvnqclc5bfr5q0d3zk0nqjfz73909ybr4h20kmi"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; builder = { groups = ["default"]; @@ -161,10 +249,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "136aa800dgq6bmr0lb59mfj5q72r712wwp5wy5qxnp48adjw1k2h"; + sha256 = "1q6075p69xrg92q6061smdjwcia3fyg2k0sn0hb6590ncj619z5k"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; }; camping = { dependencies = ["mab" "rack"]; @@ -193,10 +281,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; + sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; charlock_holmes = { groups = ["default"]; @@ -229,26 +317,25 @@ version = "1.3.2"; }; cld3 = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjwdzzn54kz22ffil06sq71mb0ych6hnrc99icjkjzq7q98750m"; + sha256 = "0l5prs1agv1mhaca0k92z7ppsmynylksczar3qzn7c74vz18wsng"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.2"; }; cocoapods = { - dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored" "escape" "fourflusher" "molinillo" "nap" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cix57b2si8lc1m15mzg3mr1kmvn5sq0cy01vqwlfvvirrkf3ky3"; + sha256 = "0rnxjwrfk3yz34xx11hh61j7p57l6vwh8b86jvjivzlgrj4a025r"; type = "gem"; }; - version = "1.11.3"; + version = "1.0.1"; }; cocoapods-acknowledgements = { dependencies = ["cocoapods" "redcarpet" "xcodeproj"]; @@ -303,15 +390,15 @@ version = "0.0.3"; }; cocoapods-core = { - dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; + dependencies = ["activesupport" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lqcq7pk3znc9par217h4hv8g70w25m2a2llgyayp30dlgdj45iy"; + sha256 = "1bh69sbljlf3hvg98y2zssx0ch51lllz1k1lc8xysn43dm3ahaa5"; type = "gem"; }; - version = "1.11.3"; + version = "1.0.1"; }; cocoapods-coverage = { dependencies = ["cocoapods-testing" "slather"]; @@ -319,10 +406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04bzk1x67pqrmnmz3pdw107j5p9ncwfm7gdv8n4bk4r9nqxdv3wn"; + sha256 = "1zaid3awk470igr5yilx1wvj1jnh88fbjl11hp93a4qic7j3i6ca"; type = "gem"; }; - version = "0.2.0"; + version = "0.0.6"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -360,10 +447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fxrq0b1x5gr2gr9md6mkwgaj8519gf1sbyqs88yqphbigf5iy75"; + sha256 = "0csgcp2kkmciavnic1yrb8z405dg4lqkzdlw2zscahvggpwr0j2p"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; cocoapods-downloader = { groups = ["default"]; @@ -401,10 +488,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vpn0y2r91cv9kr2kh6rwh51ipi90iyjfya8ir9grxh1ngv179ck"; + sha256 = "06rvrsb5p4j9pwqg7xzx8kv0v4x3wwjbiw6y2i905qhyqxqrww2l"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.4"; }; cocoapods-git_url_rewriter = { groups = ["default"]; @@ -417,15 +504,15 @@ version = "1.0.1"; }; cocoapods-keys = { - dependencies = ["dotenv" "osx_keychain"]; + dependencies = ["dotenv" "ruby-keychain"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153cxxsi77dygc4qrij6qs44dbvc7dw31jx06cmf0ajrhv9qjnxl"; + sha256 = "1zycjq1i3kqzpixngm1jp66r075yrb54qcd0xxxa8rmxngimqhff"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; cocoapods-open = { groups = ["default"]; @@ -458,16 +545,26 @@ }; version = "1.0.1"; }; + cocoapods-stats = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; + type = "gem"; + }; + version = "1.1.0"; + }; cocoapods-testing = { dependencies = ["xctasks"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f7w4gxr45m42ca6fpbq38jfzii00xysz12vcc68myvi8x0krr5l"; + sha256 = "03dqcz9pks7mbzq3zkfm2rzbjwkcwp8z3rip60d4pqs8b2bb61bg"; type = "gem"; }; - version = "0.2.0"; + version = "0.0.6"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -572,6 +669,16 @@ }; version = "1.1.0"; }; + colored = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; colored2 = { groups = ["default"]; platforms = []; @@ -587,20 +694,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; + sha256 = "1q4ai2i4rswhq5l46ny5066z8pavj3j0qvr9hbgqvzj677fa335f"; type = "gem"; }; - version = "0.23.6"; + version = "0.23.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; connection_pool = { groups = ["default"]; @@ -627,10 +734,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1195gisqv1kn4lpshn6frlnjgx5r9a0gnpkzjxzsi6wfmfys1mwy"; + sha256 = "1lgga9ina9gnpp9ycj8lpqkc5hm5qlxb41s4pfg0w6fnnpgmairc"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.5"; }; curses = { groups = ["default"]; @@ -663,6 +770,16 @@ }; version = "0.10.17"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dep-selector-libgecode = { groups = ["default"]; platforms = []; @@ -699,10 +816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqfwfz3pf6mb22r48ybbp7hkzy2qafdpp1bv1knjd74zyilv73h"; + sha256 = "0qbj8lvl8lzrbpfj9612iiwxf53drb8jg1l4bd1mcqyds8lw9z9z"; type = "gem"; }; - version = "7.4.0"; + version = "7.5.0"; }; dnsruby = { dependencies = ["simpleidn"]; @@ -783,10 +900,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; escape = { groups = ["default"]; @@ -804,10 +921,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; eventmachine = { groups = ["default"]; @@ -824,10 +941,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v71iii13cnlkck20xv0yrbz0g60qn88f4r6518k8vk31sddw4hx"; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; type = "gem"; }; - version = "0.93.1"; + version = "0.99.0"; }; execjs = { groups = ["default"]; @@ -845,20 +962,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.4"; }; 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"; }; ffi = { groups = ["default"]; @@ -892,6 +1009,16 @@ }; version = "1.0.7"; }; + fiddle = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s2zib38yr3fn4ggpis9sjar12q3ypgy607ndjyhhnjwslxcfjdy"; + type = "gem"; + }; + version = "1.1.1"; + }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; groups = ["default"]; @@ -950,10 +1077,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1afabh3g3gwj0ad53fs62waks815xcckf7pkci76l6vrghffcg8v"; + sha256 = "0yp0pxj6xsd84h2barwh3z5w289p1a6lqib309m7sbzh643qx3zz"; type = "gem"; }; - version = "2.3.1"; + version = "0.3.2"; }; fuzzy_match = { groups = ["default"]; @@ -971,10 +1098,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hslcfns2ysvjyj21hjvp4hghrafw1sdl627fm0nj0wsncs94m67"; + sha256 = "0f6mgq07wqn59499wzk3sp1ip2lp5a7kask0cb27z2s8as4p9fr9"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; }; gemoji = { groups = ["default"]; @@ -986,26 +1113,16 @@ }; version = "3.0.1"; }; - gh_inspector = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; - type = "gem"; - }; - version = "1.1.3"; - }; gio2 = { - dependencies = ["gobject-introspection"]; + dependencies = ["fiddle" "gobject-introspection"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l30xsr1dgnzqfmln17arnqi8iga97ldf6zgbqrfby6a94v3ammd"; + sha256 = "1cqqk5y51mw5qj02zfz4ddmli1i939gq9ba8gr1mlh34xwia4ack"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -1013,10 +1130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l6mvn60qa215rjy0zjymvjb0vcgnbi4vj9d80v4qq1n6b9ld9xy"; + sha256 = "0llbqaziga5vawfs71r1ijfiw9allsd15wsrm5vr0sqd3yn7ak89"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.2"; }; github-pages = { dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"]; @@ -1024,10 +1141,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kg03q6hvz191pyqhbhz3qis5niy3qvrxsnd3sdxcqz6a750wmw6"; + sha256 = "0brk2sgk01mly2hb1h5hm3ip1l6hjr4xx9zkqfhs5k3swlwnwzq9"; type = "gem"; }; - version = "227"; + version = "228"; }; github-pages-health-check = { dependencies = ["addressable" "dnsruby" "octokit" "public_suffix" "typhoeus"]; @@ -1045,10 +1162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb"; + sha256 = "1m3ypny84jyvlxf060p3q3d8pb4yihxa2br5hh012bgc11d09nky"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; @@ -1056,10 +1173,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l46ymdf7azpd137xq4rarbaq54hxs9rgfry0r6b0ywj74rmw9ih"; + sha256 = "15pk94bzb4wcx9i4zimsl238jq5198h4n9mqsf83m4cisj79mv2p"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; + }; + globalid = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + type = "gem"; + }; + version = "1.1.0"; }; gobject-introspection = { dependencies = ["glib2"]; @@ -1067,10 +1195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11gas9hzq36a2bwqi7h5c6p6jihanbhsarwhv5fw53dxap4iwj25"; + sha256 = "02am50x194wsww08sv9414v6azb6pzmwgyi5dng41w7ihcf41qnf"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1078,21 +1206,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.22"; }; gtk2 = { - dependencies = ["atk" "gdk_pixbuf2" "pango"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v1ag6irp52asm0yaxa7s533czy7yzhanhgn1v0cndqpzqk8icfz"; + sha256 = "09n8gz5h0d0wwrifr8c8z0b4vrd64xdi4lws8p6gpz0j0pxm5fzh"; type = "gem"; }; - version = "3.4.3"; + version = "3.2.6"; }; haml = { dependencies = ["temple" "thor" "tilt"]; @@ -1100,10 +1227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qiz6kbk260v3613z4wrk8iy1mi06j631fglcskfxyhf18lpy05"; + sha256 = "1vcr5wcvfbsq91302playk3i98wdisspkybcmajl04agv4k8xr68"; type = "gem"; }; - version = "6.0.8"; + version = "6.1.1"; }; hashie = { groups = ["default"]; @@ -1120,10 +1247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; hike = { groups = ["default"]; @@ -1176,6 +1303,17 @@ }; version = "1.4.2"; }; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; + type = "gem"; + }; + version = "5.1.1"; + }; http-accept = { groups = ["default"]; platforms = []; @@ -1197,26 +1335,25 @@ }; version = "1.0.5"; }; - "http_parser.rb" = { + http-form_data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; type = "gem"; }; - version = "0.8.0"; + version = "2.3.0"; }; - httparty = { - dependencies = ["multi_xml"]; + "http_parser.rb" = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q42553gp8brkkrn97m7ah4yr6bqs7fsn8lg84yzx6dr6y02bj5i"; + sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; type = "gem"; }; - version = "0.15.7"; + version = "0.8.0"; }; httpclient = { groups = ["default"]; @@ -1234,10 +1371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "0.9.5"; + version = "1.12.0"; }; iconv = { groups = ["default"]; @@ -1254,20 +1391,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm"; + sha256 = "0dy04jx3n1ddz744b80mg7hp87miysnjp0h21lqr43hpmhdglxih"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; - ipaddr = { + indieweb-endpoints = { + dependencies = ["http" "link-header-parser" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; + sha256 = "1yqy5clqrqwprmk8vwzni0vdgyvbzm5x36bj33qhv5b11kgskbwp"; type = "gem"; }; - version = "1.2.4"; + version = "8.0.0"; }; jaro_winkler = { groups = ["default"]; @@ -1296,10 +1434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wzb3ysr43f9acpdfhnndnqh1ypir01w4s4clzi38l9mxkfc4d75"; + sha256 = "0m9yzkiwm751wbyq3aq1355afcx240r24nrick1fzv578bis4kyy"; type = "gem"; }; - version = "3.9.2"; + version = "3.9.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -1340,10 +1478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xkqq0cyca84hxs47ilkg3sjavwjvc6wijz4n0zd4nxj01jz54bh"; + sha256 = "1zps7bb9kc4qf32b9y9h47z08wpsziklg0jnhcrcz2wxn09fijgd"; type = "gem"; }; - version = "0.2.0"; + version = "0.4.0"; }; jekyll-default-layout = { dependencies = ["jekyll"]; @@ -1701,10 +1839,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "141bj7v068s6sdz3syhzrka47w3r6r9r69a6mhfxrzfyrkwqq8a1"; + sha256 = "003lwcl00l13c5r1i1zk5q1p8m50nv83w6h3j2mij6hs2aaz1zwb"; type = "gem"; }; - version = "3.3.6"; + version = "3.3.7"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; @@ -1722,40 +1860,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; json_pure = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04d8lc6mc09bqmcrlygh51an8r0j7l3p9aghjkc1g6i4fvmrmxfc"; + sha256 = "0kn736pb52j8b9xxq6l8wqp2chs74aa14vfnp0rijjn086m8b4f3"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; kramdown = { dependencies = ["rexml"]; @@ -1805,30 +1943,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jbqw7hkx08i5dj74fwfdc16980hsj3mhrxp4mmjxsdzw1kndrvp"; + sha256 = "1xz5mrp103i95r4wfxny1f5x7h7vgnxv2p9cdkmmdjzrsk23rijs"; type = "gem"; }; - version = "3.2.4"; + version = "4.0.0"; }; - link_header = { + link-header-parser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yamrdq4rywmnpdhbygnkkl9fdy249fg5r851nrkkxr97gj5rihm"; + sha256 = "1rc5mzk017rgi56xzy93f80v1jdcpph1ihgdhm4qq4mibfh26f27"; type = "gem"; }; - version = "0.0.8"; + version = "5.0.0"; }; liquid = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; + sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -1836,10 +1974,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; + }; + llhttp-ffi = { + dependencies = ["ffi-compiler" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + type = "gem"; + }; + version = "0.4.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1847,7 +1996,7 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-bGRp797+NJYBAACjRvnTv3EOEaxGYeNTz1aFIyb7ECM="; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; version = "2.19.1"; @@ -1873,6 +2022,27 @@ }; version = "0.2.9"; }; + mail = { + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; + }; + version = "2.8.1"; + }; + marcel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; + type = "gem"; + }; + version = "1.0.2"; + }; markaby = { dependencies = ["builder"]; groups = ["default"]; @@ -1930,30 +2100,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2023.0218.1"; }; mini_magick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + type = "gem"; + }; + version = "4.12.0"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "4.11.0"; + version = "1.1.2"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minima = { dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; @@ -1971,20 +2151,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; molinillo = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; + sha256 = "0msabpxiyhlbgayrvr01316alaxrxwh6h8yzqz6p36v1zhqgddw4"; type = "gem"; }; - version = "0.8.0"; + version = "0.4.5"; }; msgpack = { groups = ["default"]; @@ -2006,16 +2186,6 @@ }; version = "1.15.0"; }; - multi_xml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; - type = "gem"; - }; - version = "0.6.0"; - }; mustermann = { dependencies = ["ruby2_keywords"]; groups = ["default"]; @@ -2032,10 +2202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; + sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.5"; }; nanaimo = { groups = ["default"]; @@ -2077,6 +2247,39 @@ }; version = "1.4.10"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -2088,6 +2291,17 @@ }; version = "4.0.0"; }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; net-ssh = { groups = ["default"]; platforms = []; @@ -2124,10 +2338,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-0+4A8mwVF2PaFpHH/Ghx3dA+Uy90+FEB9aztwtCZ6Vg="; + sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7"; type = "gem"; }; - version = "1.13.10"; + version = "1.14.2"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2140,16 +2354,26 @@ }; version = "4.25.1"; }; + og-corefoundation = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xmz13rb92xy55askn5f3kkmz14qwyyhkdsikk2gd1ydicnaqkh8"; + type = "gem"; + }; + version = "0.2.3"; + }; openssl = { - dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; + sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; type = "gem"; }; - version = "2.2.2"; + version = "3.1.0"; }; optimist = { groups = ["default"]; @@ -2172,17 +2396,6 @@ }; version = "1.0.1"; }; - osx_keychain = { - dependencies = ["RubyInline"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10hr3lihq7s5fv18dp0g4mfncvapkcwcd6xnn5483ximyd7rhfx0"; - type = "gem"; - }; - version = "1.0.2"; - }; ovirt-engine-sdk = { dependencies = ["json"]; groups = ["default"]; @@ -2200,10 +2413,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk3fwwx8zzxhmfmlgzzr050jzsl58ma54wy99xy4xx0ibmw48pv"; + sha256 = "1hi3jcm9s7hkv35gzgdh3nxs0s9h7kkqwv1x6kalww15msk60fxd"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; pango = { dependencies = ["cairo-gobject" "gobject-introspection"]; @@ -2211,10 +2424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05smxn2jank7wqih59lhr30ab8f4qxdsdiiag5v7a0gjgzkmbi7f"; + sha256 = "1pmjf0rkplw528xj40fgzaa600x73zviccq9h0jqd21kd0fnhac7"; type = "gem"; }; - version = "3.4.3"; + version = "4.1.2"; }; parallel = { groups = ["default"]; @@ -2232,20 +2445,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0cdjcasyg7w05kk82dqysq29f1qcf8y5sw8iak5flpxjbdil50qv"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.1.0"; }; paru = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v6my9g7bwjlx92hr9w0blnrcrai1yg3yz6k9xz0i6mq8lml2k87"; + sha256 = "0mzy0s4cdqm5nvgyj55idc2pv51k3zlgw6sa7825dcyrk2ihcx0c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; pastel = { dependencies = ["tty-color"]; @@ -2294,20 +2507,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; pkg-config = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9vmkmpha34lwdhig08kb7z4wk3xmw49dvkl99nz9llxhzqr5hl"; + sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651"; type = "gem"; }; - version = "1.4.9"; + version = "1.5.1"; }; polyglot = { groups = ["default"]; @@ -2335,10 +2548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l5pk6w63bj7cxy4y9mqvpclw6r0pcm7xa44c33vx3f960px8wk8"; + sha256 = "1bbw4czjr2ch6m57rgjib5a35hx3g18975vwzm2iwq13pvdj9hzk"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2346,10 +2559,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; type = "gem"; }; - version = "0.14.1"; + version = "0.14.2"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -2368,10 +2581,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wyvql6pb6m8jl8bsamabxhxhd86bnqblspaxzz05sl0fm2ynj0r"; + sha256 = "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; public_suffix = { groups = ["default"]; @@ -2389,30 +2602,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra"; + sha256 = "1ymaq2m30yx35sninw8mjknsjw23k6458ph9k350khwwn1hh2d1k"; type = "gem"; }; - version = "6.0.0"; + version = "6.1.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-protection = { dependencies = ["rack"]; @@ -2420,10 +2633,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk"; + sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.5"; + }; + rack-test = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + type = "gem"; + }; + version = "2.0.2"; + }; + rails = { + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc4qyjnzib62qij4d3yqd3r7m31dz3lldgybwmrl0mannz2abhc"; + type = "gem"; + }; + version = "7.0.4.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -2442,10 +2677,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-iV0Mh6K2YjiR6FwdUHx/FqzaTnfZRpL1N981unE5i9U="; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0056s3hh67mjqwb2gjsarx6v3ay2cb8dqiwj1zf84krlbj83l9kz"; + type = "gem"; + }; + version = "7.0.4.2"; }; rainbow = { groups = ["default"]; @@ -2462,10 +2708,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "10.5.0"; + version = "13.0.6"; }; rb-fsevent = { groups = ["default"]; @@ -2514,10 +2760,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wd4j2irk88qcrxbhhbrsr6rswz8ckva7n0hsjyffnmx1ya60n8y"; + sha256 = "0vjq0h1mvyw349difprh8r987bmyfyjbj0hb2iq18bz6xyqi4n9z"; type = "gem"; }; - version = "2.7.0"; + version = "3.0.0"; }; rchardet = { groups = ["default"]; @@ -2555,10 +2801,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; redis = { dependencies = ["redis-client"]; @@ -2566,10 +2812,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2hvsq0nyxmh27cqv00zk0s6bb4dlxfhzng5x0w8qijpw0vx9h5"; + sha256 = "10r5z5mg1x5kjx3wvwx5d8bqgd2j8pc4dlaasq7nmnl3nsn7sn9k"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; redis-client = { dependencies = ["connection_pool"]; @@ -2577,10 +2823,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkwqi18cbiil787ivvh2s8i6csrn0z3qb4ccp2vhrc2w6ay6ncq"; + sha256 = "1cvblkifgwi4hjlcz6fxiw64fpwfnjvp6fyyvp5d58ywm58v46x3"; type = "gem"; }; - version = "0.10.0"; + version = "0.12.2"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2599,20 +2845,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d78i6bfyh5zp5jli0r1qqfykfnh7f0ai2kkgcm9kg1jr4dn98jp"; + sha256 = "1i426w3yqd43xi877c1qqkrrr5s1zx2h46g8n738lx1g21sfd684"; type = "gem"; }; - version = "1.3.0"; + version = "1.9.2"; }; regexp_parser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; + sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2647,14 +2893,15 @@ version = "3.2.5"; }; rmagick = { + dependencies = ["pkg-config"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v269bx6bhnrlxpsmhr8xjv64dwnnykiw9hr58dwghsps1qb8ib7"; + sha256 = "11skr2l49cml2wgm74zzcxwdyw0vn0abynhhq1m08jpzr309x730"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; rouge = { groups = ["default"]; @@ -2693,10 +2940,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2704,10 +2951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.2"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2715,10 +2962,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; + sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.3"; }; rspec-support = { groups = ["default"]; @@ -2736,10 +2983,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhm882zzs4z4ivknrymh6lgnd3p90b651dn0fp32dciajdxr9f1"; + sha256 = "162c83q550hvlvdv834mqfkwv5cdsirlymmmmcmw9vlci5nq2imd"; type = "gem"; }; - version = "1.37.1"; + version = "1.46.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2747,10 +2994,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; + sha256 = "1zqk8dgjjhm0zll2rxqvvb8fl5vin7mmbc1ndn1a2q4276ri6ydc"; type = "gem"; }; - version = "1.23.0"; + version = "1.26.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2758,10 +3005,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; + sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -2774,35 +3021,36 @@ }; version = "1.2.5"; }; - ruby-libvirt = { + ruby-keychain = { + dependencies = ["ffi" "og-corefoundation"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; + sha256 = "1g57fr1r39bfh1r887hp87mawfg3miidagvpqyqq3l0152ya43wr"; type = "gem"; }; - version = "0.8.0"; + version = "0.4.0"; }; - ruby-lxc = { + ruby-libvirt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pnghqp15fwylq6w2qh7x1ikkiq87irpy0z03n0gma4gdzzx2qa"; + sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; type = "gem"; }; - version = "1.2.3"; + version = "0.8.0"; }; - ruby-macho = { + ruby-lxc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch"; + sha256 = "08pnghqp15fwylq6w2qh7x1ikkiq87irpy0z03n0gma4gdzzx2qa"; type = "gem"; }; - version = "2.5.1"; + version = "1.2.3"; }; ruby-progressbar = { groups = ["default"]; @@ -2845,17 +3093,6 @@ }; version = "0.0.5"; }; - RubyInline = { - dependencies = ["ZenTest"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zq24qvkqzjsrcwyz9lp3pm602kqw08cp3g1acf3zy0nc7npvx9p"; - type = "gem"; - }; - version = "3.12.6"; - }; rubyzip = { groups = ["default"]; platforms = []; @@ -2871,10 +3108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x"; + sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; type = "gem"; }; - version = "1.5.0.1"; + version = "1.5.1"; }; safe_yaml = { groups = ["default"]; @@ -2946,20 +3183,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yzv7gn539aqwpada2mvfrnbdygr3d61ryp68ncp3kpx6nbz1x25"; + sha256 = "1wizqirxln8f2d4aihqizfbyzlssnan058zkqh24siynk38567lg"; type = "gem"; }; - version = "0.16.0"; + version = "0.18.0"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qg80fqxs1rabsg3xrkfkkicnn1z2p02xsb1lxv78a6iw5p17d73"; + sha256 = "1yf5sqw15gj5vmrbklw144y0wg8r92fwczfg64znwn61k9bz9j21"; type = "gem"; }; - version = "5.61.0"; + version = "5.65.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2967,10 +3204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15ndf1wr45vyqiyc3059f8zv0wp11i6xqfqclsa0v3qf739jb1zw"; + sha256 = "01j51vn47ynyhlxpgz6wj8swm3d8g1hrad1678s0sd43kh2hqxdg"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2978,10 +3215,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-html = { groups = ["default"]; @@ -3020,10 +3257,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2vmy0j5amy9fihs2gz2ssm4bdpqqh4llyjfl6qqqry7f87c6xz"; + sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.5"; }; slather = { dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"]; @@ -3031,20 +3268,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wy8ws5n2gvxgkncbhrp4vkwjcbphcczw4k7y3g2wfl8fdmv5b4n"; + sha256 = "0kdigir21jinkkj4q3cjsswix26lmff1rmnwjz2ywc6y9d8ib9ak"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.4"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf"; + sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb"; type = "gem"; }; - version = "4.9.3"; + version = "4.10.0"; }; snappy = { groups = ["default"]; @@ -3072,10 +3309,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; + sha256 = "1pdy2f5phffknx98j2f5k72s52ayp456m3jkg08vx396yg59l0gi"; type = "gem"; }; - version = "0.47.2"; + version = "0.48.0"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3083,10 +3320,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i95rgfxdj2rhxifps27dz7fjfdih5iyl7b01di9gdmh9m04ylk6"; + sha256 = "064g96zvvx6rb60jl06dmcc73n16m2d89n7w3hdkh79lgsjszf2l"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.1"; }; string_inflection = { groups = ["default"]; @@ -3104,10 +3341,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1im3kskcrmwa12q4pxilps7dyf9jlc82saasp6lkn5q7zqi7ilfh"; + sha256 = "0zkq75hcqnxnipvccsd2f7vqcra6rplzvn1ds73sna6lcy8s6sxa"; type = "gem"; }; - version = "4.3.0"; + version = "6.0.0"; }; syntax_tree-haml = { dependencies = ["haml" "prettier_print" "syntax_tree"]; @@ -3115,10 +3352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2ag309fzz9qvj634aibv2khfc45vvsg1sra227ssn3xwcvx4vq"; + sha256 = "0nnq6z8xhvcv3yc7rf64np3f8dx6j8gmvbi6ws3lwccq4w5cmqnk"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; syntax_tree-rbs = { dependencies = ["prettier_print" "rbs" "syntax_tree"]; @@ -3136,31 +3373,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zf6cavsmj87lszy0b5mzw6mdg0dbsb7f52xy2fx06y9abv78xxw"; + sha256 = "0yvchq3j0splz70796a27hr1v6ifhyab5ddc9fl1x734nhmsy4rb"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; temple = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kzp8c08jl137v62rafmr81b7hg01q3d1q70fr5y5cmmranfpml1"; + sha256 = "07k5wr2ypsmsbyc9d1plhdki4xr7vvggld8r1i49iljkrpx5nbqc"; type = "gem"; }; - version = "0.9.1"; + version = "0.10.0"; }; terminal-table = { - dependencies = ["unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "0hbmzfr17ji5ws5x5z3kypmb5irwwss7q7kkad0gs005ibqrxv0a"; type = "gem"; }; - version = "1.8.0"; + version = "1.6.0"; }; thor = { groups = ["default"]; @@ -3172,35 +3408,35 @@ }; version = "1.2.1"; }; - thread_safe = { + thrift = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "0f7w11b8gnpf8vw465l8l63rvlw1qk2y0vp0f88xdxbzjl9igy13"; type = "gem"; }; - version = "0.3.6"; + version = "0.18.0"; }; - thrift = { + tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; + sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; type = "gem"; }; - version = "0.17.0"; + version = "2.1.0"; }; - tilt = { + timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "2.0.11"; + version = "0.3.2"; }; tiny_tds = { groups = ["default"]; @@ -3218,10 +3454,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; + sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.12"; }; tty-color = { groups = ["default"]; @@ -3266,15 +3502,15 @@ version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "1.2.10"; + version = "2.0.6"; }; uglifier = { dependencies = ["execjs"]; @@ -3313,10 +3549,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "1.8.0"; + version = "2.4.2"; }; uuid4r = { groups = ["default"]; @@ -3329,15 +3565,15 @@ version = "0.2.0"; }; webmention = { - dependencies = ["httparty" "json" "link_header" "nokogiri"]; + dependencies = ["http" "indieweb-endpoints" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s3p572rp1aifk7xxhnwvnpxwvn9sx8hx5zm0mz0ff4lgb2y4yq4"; + sha256 = "1ag06gal14r3rlcv0c951w1a9wb0d04mk5pz2v0f71q9fzwxwwmi"; type = "gem"; }; - version = "0.1.6"; + version = "7.0.0"; }; webrick = { groups = ["default"]; @@ -3349,6 +3585,27 @@ }; version = "1.7.0"; }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + type = "gem"; + }; + version = "0.7.5"; + }; + websocket-extensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; whois = { groups = ["default"]; platforms = []; @@ -3371,15 +3628,14 @@ version = "1.22.0"; }; xctasks = { - dependencies = ["nokogiri" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m01vnmdy9m4hn85ajji5v595faqsy8d3a0r646q79vphw1fikj1"; + sha256 = "1jmxq0dv2q4qs628cykrhsm9piysjsacbq5blsf35a0fj015bw7l"; type = "gem"; }; - version = "0.6.0"; + version = "0.2.2"; }; yard = { dependencies = ["webrick"]; @@ -3397,29 +3653,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18hihq3hxs2ywxh3ixm366cawwy4k733mh680ldaa1vxjiraxj58"; - type = "gem"; - }; - version = "2.6.1"; - }; - ZenTest = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vss0ldskqprnlvl5pczcl8p346p2ib1sc6hyprbprh6gjq4v16y"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "4.12.1"; + version = "2.6.7"; }; zookeeper = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gbmc76cxi4nlhrdch8ykinyzp5f2m6d272g8xhn5rjg3fjp15l1"; + sha256 = "1hc87pbmgc53lksa1aql61kxn9d2kjzmlhnjxa5rcn01qhm3pkvg"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.5"; }; } diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index c133e1472ebc0..7cf5533da7f2a 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -30,7 +30,6 @@ rec { full = base.override { gtkSupport = stdenv.isLinux; gstreamerSupport = true; - openalSupport = true; openclSupport = true; odbcSupport = true; netapiSupport = stdenv.isLinux; @@ -39,8 +38,6 @@ rec { v4lSupport = stdenv.isLinux; gphoto2Support = true; krb5Support = true; - ldapSupport = true; - vkd3dSupport = stdenv.isLinux; embedInstallers = true; }; |
